svn commit: trunk/busybox/debianutils

vda at busybox.net vda at busybox.net
Thu Feb 28 21:30:23 UTC 2008


Author: vda
Date: 2008-02-28 13:30:22 -0800 (Thu, 28 Feb 2008)
New Revision: 21141

Log:
run-parts: add --reverse



Modified:
   trunk/busybox/debianutils/run_parts.c


Changeset:
Modified: trunk/busybox/debianutils/run_parts.c
===================================================================
--- trunk/busybox/debianutils/run_parts.c	2008-02-28 18:02:23 UTC (rev 21140)
+++ trunk/busybox/debianutils/run_parts.c	2008-02-28 21:30:22 UTC (rev 21141)
@@ -23,11 +23,11 @@
  * report mode. As the original run-parts support only long options, I've
  * broken compatibility because the BusyBox policy doesn't allow them.
  * The supported options are:
- * -t			test. Print the name of the files to be executed, without
- *				execute them.
- * -a ARG		argument. Pass ARG as an argument the program executed. It can
- *				be repeated to pass multiple arguments.
- * -u MASK		umask. Set the umask of the program executed to MASK.
+ * -t           test. Print the name of the files to be executed, without
+ *              execute them.
+ * -a ARG       argument. Pass ARG as an argument the program executed. It can
+ *              be repeated to pass multiple arguments.
+ * -u MASK      umask. Set the umask of the program executed to MASK.
  */
 
 #include <getopt.h>
@@ -47,14 +47,15 @@
 enum { NUM_CMD = (COMMON_BUFSIZE - sizeof(struct globals)) / sizeof(cmd[0]) };
 
 enum {
-	RUN_PARTS_OPT_a = (1 << 0),
-	RUN_PARTS_OPT_u = (1 << 1),
-	RUN_PARTS_OPT_t = (1 << 2),
-	RUN_PARTS_OPT_l = (1 << 3) * ENABLE_FEATURE_RUN_PARTS_FANCY,
+	OPT_r = (1 << 0),
+	OPT_a = (1 << 1),
+	OPT_u = (1 << 2),
+	OPT_t = (1 << 3),
+	OPT_l = (1 << 4) * ENABLE_FEATURE_RUN_PARTS_FANCY,
 };
 
 #if ENABLE_FEATURE_RUN_PARTS_FANCY
-#define list_mode (option_mask32 & RUN_PARTS_OPT_l)
+#define list_mode (option_mask32 & OPT_l)
 #else
 #define list_mode 0
 #endif
@@ -74,7 +75,8 @@
 
 static int bb_alphasort(const void *p1, const void *p2)
 {
-	return strcmp(*(char **) p1, *(char **) p2);
+	int r = strcmp(*(char **) p1, *(char **) p2);
+	return (option_mask32 & OPT_r) ? -r : r;
 }
 
 static int act(const char *file, struct stat *statbuf, void *args, int depth)
@@ -104,7 +106,7 @@
 	"test\0"    No_argument       "t"
 #if ENABLE_FEATURE_RUN_PARTS_FANCY
 	"list\0"    No_argument       "l"
-//TODO: "reverse\0" No_argument       "r"
+	"reverse\0" No_argument       "r"
 //TODO: "verbose\0" No_argument       "v"
 #endif
 	;
@@ -122,8 +124,9 @@
 	applet_long_options = runparts_longopts;
 #endif
 	/* We require exactly one argument: the directory name */
+	/* We require exactly one argument: the directory name */
 	opt_complementary = "=1:a::";
-	getopt32(argv, "a:u:t"USE_FEATURE_RUN_PARTS_FANCY("l"), &arg_list, &umask_p);
+	getopt32(argv, "ra:u:t"USE_FEATURE_RUN_PARTS_FANCY("l"), &arg_list, &umask_p);
 
 	umask(xstrtou_range(umask_p, 8, 0, 07777));
 
@@ -155,7 +158,7 @@
 		char *name = *names++;
 		if (!name)
 			break;
-		if (option_mask32 & (RUN_PARTS_OPT_t | RUN_PARTS_OPT_l)) {
+		if (option_mask32 & (OPT_t | OPT_l)) {
 			puts(name);
 			continue;
 		}
@@ -165,9 +168,9 @@
 			continue;
 		n = 1;
 		if (ret < 0)
-			bb_perror_msg("failed to exec %s", name);
+			bb_perror_msg("can't exec %s", name);
 		else /* ret > 0 */
-			bb_error_msg("%s exited with return code %d", name, ret);
+			bb_error_msg("%s exited with code %d", name, ret);
 	}
 
 	return n;




More information about the busybox-cvs mailing list