diff options
author | Ron Yorston <rmy@pobox.com> | 2018-02-13 09:44:44 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2018-02-13 09:44:44 +0000 |
commit | dc19a361bd6c6df30338371532691bbc7f7126bb (patch) | |
tree | 1fb2cd646d54b5f8e425c4f11f3e09fc21d1966b /coreutils/ls.c | |
parent | 096aee2bb468d1ab044de36e176ed1f6c7e3674d (diff) | |
parent | 3459024bf404af814cacfe90a0deb719e282ae62 (diff) | |
download | busybox-w32-dc19a361bd6c6df30338371532691bbc7f7126bb.tar.gz busybox-w32-dc19a361bd6c6df30338371532691bbc7f7126bb.tar.bz2 busybox-w32-dc19a361bd6c6df30338371532691bbc7f7126bb.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'coreutils/ls.c')
-rw-r--r-- | coreutils/ls.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c index 22286d713..4cc9517b1 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 |