emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ls: fix -lg to show group (was showing user)

Browse Source 
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
This commit is contained in:
Denys Vlasenko 2010-11-06 00:46:57 +01:00
parent 3bbfb58bec
commit 4909fec73e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
coreutils/ls.c
View File

@ -182,7 +182,7 @@ static const unsigned opt_flags[] = {
LIST_INO, /* i */ LIST_INO, /* i */
LIST_LONG | STYLE_LONG, /* l - remember LS_DISP_HR in mask! */ LIST_LONG | STYLE_LONG, /* l - remember LS_DISP_HR in mask! */
LIST_SHORT | STYLE_SINGLE, /* 1 */ LIST_SHORT | STYLE_SINGLE, /* 1 */
0, /* g (don't show group) - handled via OPT_g */ 0, /* g (don't show owner) - handled via OPT_g */
LIST_ID_NUMERIC, /* n */ LIST_ID_NUMERIC, /* n */
LIST_BLOCKS, /* s */ LIST_BLOCKS, /* s */
DISP_ROWS, /* x */ DISP_ROWS, /* x */
@ -620,7 +620,7 @@ static NOINLINE unsigned list_single(const struct dnode *dn)
if (all_fmt & LIST_ID_NAME) { if (all_fmt & LIST_ID_NAME) {
if (option_mask32 & OPT_g) { if (option_mask32 & OPT_g) {
column += printf("%-8.8s ", column += printf("%-8.8s ",
get_cached_username(dn->dstat.st_uid)); get_cached_groupname(dn->dstat.st_gid));
} else { } else {
column += printf("%-8.8s %-8.8s ", column += printf("%-8.8s %-8.8s ",
get_cached_username(dn->dstat.st_uid), get_cached_username(dn->dstat.st_uid),
@ -630,7 +630,7 @@ static NOINLINE unsigned list_single(const struct dnode *dn)
#endif #endif
if (all_fmt & LIST_ID_NUMERIC) { if (all_fmt & LIST_ID_NUMERIC) {
if (option_mask32 & OPT_g) if (option_mask32 & OPT_g)
column += printf("%-8u ", (int) dn->dstat.st_uid); column += printf("%-8u ", (int) dn->dstat.st_gid);
else else
column += printf("%-8u %-8u ", column += printf("%-8u %-8u ",
(int) dn->dstat.st_uid, (int) dn->dstat.st_uid,