aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2004-02-05 13:52:03 +0000
committerEric Andersen <andersen@codepoet.org>2004-02-05 13:52:03 +0000
commitd07cf59a98c0aa43cc546b667fb413ca4daab0c0 (patch)
tree9efb027f7dd41031c59b4c48c98eff7a6b3aaf5b
parent54426d5297126eb824888508ec1f2617b9eba298 (diff)
downloadbusybox-w32-d07cf59a98c0aa43cc546b667fb413ca4daab0c0.tar.gz
busybox-w32-d07cf59a98c0aa43cc546b667fb413ca4daab0c0.tar.bz2
busybox-w32-d07cf59a98c0aa43cc546b667fb413ca4daab0c0.zip
Vladimir N. Oleynik writes:
Hi, Glenn. Current CVS "ls" applet have small problem: some options ignoring. Last patch attached ;-) --w vodz
-rw-r--r--coreutils/ls.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 2f81ee05a..89e502115 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -938,6 +938,7 @@ static const unsigned opt_flags[] = {
938#ifdef CONFIG_SELINUX 938#ifdef CONFIG_SELINUX
939 LIST_MODEBITS|LIST_NLINKS|LIST_CONTEXT|LIST_SIZE|LIST_DATE_TIME, /* K */ 939 LIST_MODEBITS|LIST_NLINKS|LIST_CONTEXT|LIST_SIZE|LIST_DATE_TIME, /* K */
940#endif 940#endif
941 (1U<<31)
941}; 942};
942 943
943 944
@@ -1000,8 +1001,7 @@ extern int ls_main(int argc, char **argv)
1000#else 1001#else
1001 opt = bb_getopt_ulflags(argc, argv, ls_options); 1002 opt = bb_getopt_ulflags(argc, argv, ls_options);
1002#endif 1003#endif
1003 /* 16 = maximum options minus tabsize and screewn width */ 1004 for (i = 0; opt_flags[i] != (1U<<31); i++) {
1004 for (i = 0; i < 16; i++) {
1005 if (opt & (1 << i)) { 1005 if (opt & (1 << i)) {
1006 unsigned int flags = opt_flags[i]; 1006 unsigned int flags = opt_flags[i];
1007 if (flags & LIST_MASK_TRIGGER) { 1007 if (flags & LIST_MASK_TRIGGER) {