diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-11-22 21:26:53 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-11-22 21:26:53 +0100 |
commit | db4171d842e9bdc1c2903a9d5cfea053aceb35a2 (patch) | |
tree | 7080e1e777784f25148eadfa33bc1e8d871a2a04 /coreutils/ls.c | |
parent | 468c326d6a9035314add6d431301f3840629c976 (diff) | |
download | busybox-w32-1_17_4.tar.gz busybox-w32-1_17_4.tar.bz2 busybox-w32-1_17_4.zip |
Apply post-1.17.3 fixes, bump version to 1.17.41_17_4
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to '')
-rw-r--r-- | coreutils/ls.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c index 1197f7d71..07bb6af92 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c | |||
@@ -184,7 +184,7 @@ static const unsigned opt_flags[] = { | |||
184 | LIST_INO, /* i */ | 184 | LIST_INO, /* i */ |
185 | LIST_LONG | STYLE_LONG, /* l - remember LS_DISP_HR in mask! */ | 185 | LIST_LONG | STYLE_LONG, /* l - remember LS_DISP_HR in mask! */ |
186 | LIST_SHORT | STYLE_SINGLE, /* 1 */ | 186 | LIST_SHORT | STYLE_SINGLE, /* 1 */ |
187 | 0, /* g (don't show group) - handled via OPT_g */ | 187 | 0, /* g (don't show owner) - handled via OPT_g */ |
188 | LIST_ID_NUMERIC, /* n */ | 188 | LIST_ID_NUMERIC, /* n */ |
189 | LIST_BLOCKS, /* s */ | 189 | LIST_BLOCKS, /* s */ |
190 | DISP_ROWS, /* x */ | 190 | DISP_ROWS, /* x */ |
@@ -621,7 +621,7 @@ static NOINLINE unsigned list_single(const struct dnode *dn) | |||
621 | if (all_fmt & LIST_ID_NAME) { | 621 | if (all_fmt & LIST_ID_NAME) { |
622 | if (option_mask32 & OPT_g) { | 622 | if (option_mask32 & OPT_g) { |
623 | column += printf("%-8.8s ", | 623 | column += printf("%-8.8s ", |
624 | get_cached_username(dn->dstat.st_uid)); | 624 | get_cached_groupname(dn->dstat.st_gid)); |
625 | } else { | 625 | } else { |
626 | column += printf("%-8.8s %-8.8s ", | 626 | column += printf("%-8.8s %-8.8s ", |
627 | get_cached_username(dn->dstat.st_uid), | 627 | get_cached_username(dn->dstat.st_uid), |
@@ -631,7 +631,7 @@ static NOINLINE unsigned list_single(const struct dnode *dn) | |||
631 | #endif | 631 | #endif |
632 | if (all_fmt & LIST_ID_NUMERIC) { | 632 | if (all_fmt & LIST_ID_NUMERIC) { |
633 | if (option_mask32 & OPT_g) | 633 | if (option_mask32 & OPT_g) |
634 | column += printf("%-8u ", (int) dn->dstat.st_uid); | 634 | column += printf("%-8u ", (int) dn->dstat.st_gid); |
635 | else | 635 | else |
636 | column += printf("%-8u %-8u ", | 636 | column += printf("%-8u %-8u ", |
637 | (int) dn->dstat.st_uid, | 637 | (int) dn->dstat.st_uid, |