aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-12-31 17:30:02 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2017-12-31 17:30:02 +0100
commit82d1c1f84ae23793d81b50aa0a753ad7c4db4f51 (patch)
treee5c1dc00b04299cf627cf2ef18453aea96c5f1e5 /coreutils
parent36acc4631c94bb0f43ecaac5d61dc773ef773e91 (diff)
downloadbusybox-w32-82d1c1f84ae23793d81b50aa0a753ad7c4db4f51.tar.gz
busybox-w32-82d1c1f84ae23793d81b50aa0a753ad7c4db4f51.tar.bz2
busybox-w32-82d1c1f84ae23793d81b50aa0a753ad7c4db4f51.zip
randomconfig fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/cat.c5
-rw-r--r--coreutils/ls.c5
-rw-r--r--coreutils/stat.c7
-rw-r--r--coreutils/uname.c6
4 files changed, 13 insertions, 10 deletions
diff --git a/coreutils/cat.c b/coreutils/cat.c
index 7e35fa5ee..5f02233ca 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -168,9 +168,12 @@ static int catv(unsigned opts, char **argv)
168int cat_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 168int cat_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
169int cat_main(int argc UNUSED_PARAM, char **argv) 169int cat_main(int argc UNUSED_PARAM, char **argv)
170{ 170{
171#if ENABLE_FEATURE_CATV || ENABLE_FEATURE_CATN
171 unsigned opts; 172 unsigned opts;
172 173
173 opts = getopt32(argv, IF_FEATURE_CATV("^") 174 opts =
175#endif
176 getopt32(argv, IF_FEATURE_CATV("^")
174 /* -u is ignored ("unbuffered") */ 177 /* -u is ignored ("unbuffered") */
175 IF_FEATURE_CATV("etvA")IF_FEATURE_CATN("nb")"u" 178 IF_FEATURE_CATV("etvA")IF_FEATURE_CATN("nb")"u"
176 IF_FEATURE_CATV("\0" "Aetv" /* -A == -vet */) 179 IF_FEATURE_CATV("\0" "Aetv" /* -A == -vet */)
diff --git a/coreutils/ls.c b/coreutils/ls.c
index a4e324b00..4be499088 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -482,12 +482,11 @@ static NOINLINE unsigned display_single(const struct dnode *dn)
482 int opt; 482 int opt;
483#if ENABLE_FEATURE_LS_FILETYPES || ENABLE_FEATURE_LS_COLOR 483#if ENABLE_FEATURE_LS_FILETYPES || ENABLE_FEATURE_LS_COLOR
484 struct stat statbuf; 484 struct stat statbuf;
485 char append;
486#endif 485#endif
487
488#if ENABLE_FEATURE_LS_FILETYPES 486#if ENABLE_FEATURE_LS_FILETYPES
489 append = append_char(dn->dn_mode); 487 char append = append_char(dn->dn_mode);
490#endif 488#endif
489
491 opt = option_mask32; 490 opt = option_mask32;
492 491
493 /* Do readlink early, so that if it fails, error message 492 /* Do readlink early, so that if it fails, error message
diff --git a/coreutils/stat.c b/coreutils/stat.c
index dafbd4e9f..7ba3db155 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -759,10 +759,13 @@ int stat_main(int argc UNUSED_PARAM, char **argv)
759 IF_FEATURE_STAT_FORMAT(char *format = NULL;) 759 IF_FEATURE_STAT_FORMAT(char *format = NULL;)
760 int i; 760 int i;
761 int ok; 761 int ok;
762 unsigned opts;
763 statfunc_ptr statfunc = do_stat; 762 statfunc_ptr statfunc = do_stat;
763#if ENABLE_FEATURE_STAT_FILESYSTEM || ENABLE_SELINUX
764 unsigned opts;
764 765
765 opts = getopt32(argv, "^" 766 opts =
767#endif
768 getopt32(argv, "^"
766 "tL" 769 "tL"
767 IF_FEATURE_STAT_FILESYSTEM("f") 770 IF_FEATURE_STAT_FILESYSTEM("f")
768 IF_SELINUX("Z") 771 IF_SELINUX("Z")
diff --git a/coreutils/uname.c b/coreutils/uname.c
index 57039b1bf..765809658 100644
--- a/coreutils/uname.c
+++ b/coreutils/uname.c
@@ -127,11 +127,9 @@ int uname_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
127{ 127{
128 uname_info_t uname_info; 128 uname_info_t uname_info;
129 IF_UNAME(const char *unknown_str = "unknown";) 129 IF_UNAME(const char *unknown_str = "unknown";)
130 unsigned toprint;
131
132 toprint = (1 << 4); /* "arch" = "uname -m" */
133
134#if ENABLE_UNAME 130#if ENABLE_UNAME
131 unsigned toprint = (1 << 4); /* "arch" = "uname -m" */
132
135 if (!ENABLE_BB_ARCH || applet_name[0] == 'u') { 133 if (!ENABLE_BB_ARCH || applet_name[0] == 'u') {
136# if ENABLE_LONG_OPTS 134# if ENABLE_LONG_OPTS
137 static const char uname_longopts[] ALIGN1 = 135 static const char uname_longopts[] ALIGN1 =