diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2009-03-27 17:22:00 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2009-03-27 17:22:00 +0000 |
| commit | 4d3a812b71d1933860b268dbea15ffcea396e394 (patch) | |
| tree | f995e85877501dd84f4fbb52c7e23dbea3bcf2cd /coreutils | |
| parent | 3603cd2808b3025460f2ad920d4622ed17194a32 (diff) | |
| download | busybox-w32-4d3a812b71d1933860b268dbea15ffcea396e394.tar.gz busybox-w32-4d3a812b71d1933860b268dbea15ffcea396e394.tar.bz2 busybox-w32-4d3a812b71d1933860b268dbea15ffcea396e394.zip | |
ls: warning fix
rm: accept and ignore -v (verbose)
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/ls.c | 2 | ||||
| -rw-r--r-- | coreutils/rm.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c index 85c6729ea..61baa9a11 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c | |||
| @@ -742,7 +742,7 @@ static int print_name(const char *name) | |||
| 742 | static int list_single(const struct dnode *dn) | 742 | static int list_single(const struct dnode *dn) |
| 743 | { | 743 | { |
| 744 | int column = 0; | 744 | int column = 0; |
| 745 | char *lpath; | 745 | char *lpath = lpath; /* for compiler */ |
| 746 | #if ENABLE_FEATURE_LS_TIMESTAMPS | 746 | #if ENABLE_FEATURE_LS_TIMESTAMPS |
| 747 | char *filetime; | 747 | char *filetime; |
| 748 | time_t ttime, age; | 748 | time_t ttime, age; |
diff --git a/coreutils/rm.c b/coreutils/rm.c index 975f2267b..6b3fbcf25 100644 --- a/coreutils/rm.c +++ b/coreutils/rm.c | |||
| @@ -27,13 +27,14 @@ int rm_main(int argc UNUSED_PARAM, char **argv) | |||
| 27 | unsigned opt; | 27 | unsigned opt; |
| 28 | 28 | ||
| 29 | opt_complementary = "f-i:i-f"; | 29 | opt_complementary = "f-i:i-f"; |
| 30 | opt = getopt32(argv, "fiRr"); | 30 | /* -v (verbose) is ignored */ |
| 31 | opt = getopt32(argv, "fiRrv"); | ||
| 31 | argv += optind; | 32 | argv += optind; |
| 32 | if (opt & 1) | 33 | if (opt & 1) |
| 33 | flags |= FILEUTILS_FORCE; | 34 | flags |= FILEUTILS_FORCE; |
| 34 | if (opt & 2) | 35 | if (opt & 2) |
| 35 | flags |= FILEUTILS_INTERACTIVE; | 36 | flags |= FILEUTILS_INTERACTIVE; |
| 36 | if (opt & 12) | 37 | if (opt & (8|4)) |
| 37 | flags |= FILEUTILS_RECUR; | 38 | flags |= FILEUTILS_RECUR; |
| 38 | 39 | ||
| 39 | if (*argv != NULL) { | 40 | if (*argv != NULL) { |
