svn commit: [25842] trunk/busybox/coreutils

[vda at busybox.net]

Author: vda
Date: 2009-03-27 17:22:00 +0000 (Fri, 27 Mar 2009)
New Revision: 25842

Log:
ls: warning fix
rm: accept and ignore -v (verbose)



Modified:
   trunk/busybox/coreutils/ls.c
   trunk/busybox/coreutils/rm.c


Changeset:
Modified: trunk/busybox/coreutils/ls.c
===================================================================
--- trunk/busybox/coreutils/ls.c	2009-03-27 12:22:11 UTC (rev 25841)
+++ trunk/busybox/coreutils/ls.c	2009-03-27 17:22:00 UTC (rev 25842)
@@ -742,7 +742,7 @@
 static int list_single(const struct dnode *dn)
 {
 	int column = 0;
-	char *lpath;
+	char *lpath = lpath; /* for compiler */
 #if ENABLE_FEATURE_LS_TIMESTAMPS
 	char *filetime;
 	time_t ttime, age;

Modified: trunk/busybox/coreutils/rm.c
===================================================================
--- trunk/busybox/coreutils/rm.c	2009-03-27 12:22:11 UTC (rev 25841)
+++ trunk/busybox/coreutils/rm.c	2009-03-27 17:22:00 UTC (rev 25842)
@@ -27,13 +27,14 @@
 	unsigned opt;
 
 	opt_complementary = "f-i:i-f";
-	opt = getopt32(argv, "fiRr");
+	/* -v (verbose) is ignored */
+	opt = getopt32(argv, "fiRrv");
 	argv += optind;
 	if (opt & 1)
 		flags |= FILEUTILS_FORCE;
 	if (opt & 2)
 		flags |= FILEUTILS_INTERACTIVE;
-	if (opt & 12)
+	if (opt & (8|4))
 		flags |= FILEUTILS_RECUR;
 
 	if (*argv != NULL) {