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

Fixed user and group name listing.

Browse Source
This commit is contained in:
Matt Kraai 2000-11-18 01:08:24 +00:00
parent 5022d0e55f
commit e93abf9e69
2 changed files with 26 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
coreutils/ls.c
View File

@ -531,7 +531,7 @@ int list_single(struct dnode *dn)
char *filetime; char *filetime;
time_t ttime, age; time_t ttime, age;
#endif #endif
#if defined (BB_FEATURE_LS_FILETYPES) || defined (BB_FEATURE_LS_USERNAME) #if defined (BB_FEATURE_LS_FILETYPES)
struct stat info; struct stat info;
#endif #endif
#ifdef BB_FEATURE_LS_FILETYPES #ifdef BB_FEATURE_LS_FILETYPES
@ -574,28 +574,19 @@ int list_single(struct dnode *dn)
break; break;
case LIST_ID_NAME: case LIST_ID_NAME:
#ifdef BB_FEATURE_LS_USERNAME #ifdef BB_FEATURE_LS_USERNAME
{ memset(scratch, 0, sizeof(scratch));
memset(&info, 0, sizeof(struct stat)); my_getpwuid(scratch, dn->dstat.st_uid);
memset(scratch, 0, sizeof(scratch)); if (*scratch)
if (!stat(dn->fullname, &info)) { fprintf(stdout, "%-8.8s ", scratch);
my_getpwuid(scratch, info.st_uid); else
} fprintf(stdout, "%-8d ", dn->dstat.st_uid);
if (*scratch) { memset(scratch, 0, sizeof(scratch));
fprintf(stdout, "%-8.8s ", scratch); my_getgrgid(scratch, dn->dstat.st_gid);
} else { if (*scratch)
fprintf(stdout, "%-8d ", dn->dstat.st_uid); fprintf(stdout, "%-8.8s", scratch);
} else
memset(scratch, 0, sizeof(scratch)); fprintf(stdout, "%-8d", dn->dstat.st_gid);
if (info.st_ctime != 0) {
my_getgrgid(scratch, info.st_gid);
}
if (*scratch) {
fprintf(stdout, "%-8.8s", scratch);
} else {
fprintf(stdout, "%-8d", dn->dstat.st_gid);
}
column += 17; column += 17;
}
break; break;
#endif #endif
case LIST_ID_NUMERIC: case LIST_ID_NUMERIC:

35
ls.c
View File

@ -531,7 +531,7 @@ int list_single(struct dnode *dn)
char *filetime; char *filetime;
time_t ttime, age; time_t ttime, age;
#endif #endif
#if defined (BB_FEATURE_LS_FILETYPES) || defined (BB_FEATURE_LS_USERNAME) #if defined (BB_FEATURE_LS_FILETYPES)
struct stat info; struct stat info;
#endif #endif
#ifdef BB_FEATURE_LS_FILETYPES #ifdef BB_FEATURE_LS_FILETYPES
@ -574,28 +574,19 @@ int list_single(struct dnode *dn)
break; break;
case LIST_ID_NAME: case LIST_ID_NAME:
#ifdef BB_FEATURE_LS_USERNAME #ifdef BB_FEATURE_LS_USERNAME
{ memset(scratch, 0, sizeof(scratch));
memset(&info, 0, sizeof(struct stat)); my_getpwuid(scratch, dn->dstat.st_uid);
memset(scratch, 0, sizeof(scratch)); if (*scratch)
if (!stat(dn->fullname, &info)) { fprintf(stdout, "%-8.8s ", scratch);
my_getpwuid(scratch, info.st_uid); else
} fprintf(stdout, "%-8d ", dn->dstat.st_uid);
if (*scratch) { memset(scratch, 0, sizeof(scratch));
fprintf(stdout, "%-8.8s ", scratch); my_getgrgid(scratch, dn->dstat.st_gid);
} else { if (*scratch)
fprintf(stdout, "%-8d ", dn->dstat.st_uid); fprintf(stdout, "%-8.8s", scratch);
} else
memset(scratch, 0, sizeof(scratch)); fprintf(stdout, "%-8d", dn->dstat.st_gid);
if (info.st_ctime != 0) {
my_getgrgid(scratch, info.st_gid);
}
if (*scratch) {
fprintf(stdout, "%-8.8s", scratch);
} else {
fprintf(stdout, "%-8d", dn->dstat.st_gid);
}
column += 17; column += 17;
}
break; break;
#endif #endif
case LIST_ID_NUMERIC: case LIST_ID_NUMERIC: