This commit is contained in:
Eric Andersen
1999-11-23 21:38:12 +00:00
parent cb41c2e83b
commit 394f764e7d
6 changed files with 49 additions and 26 deletions

View File

@@ -49,14 +49,12 @@ extern int cat_main(int argc, char **argv)
argv++;
while (argc-- > 0) {
file = fopen(*argv, "r");
file = fopen(*(argv++), "r");
if (file == NULL) {
perror(*argv);
exit(FALSE);
}
print_file( file);
argc--;
argv++;
}
exit(TRUE);
}

View File

@@ -193,27 +193,34 @@ static void list_single(const char *name, struct stat *info, const char *fullnam
fputs(" ", stdout);
#ifdef BB_FEATURE_LS_USERNAME
if (!(opts & DISP_NUMERIC)) {
scratch[8]='\0';
scratch[0]='\0';
my_getpwuid( scratch, info->st_uid);
scratch[8]='\0';
if (*scratch)
fputs(scratch, stdout);
else
writenum((long)info->st_uid,(short)0);
wr(scratch,8);
else {
writenum((long) info->st_uid,(short)8);
fputs(" ", stdout);
}
} else
#endif
writenum((long)info->st_uid,(short)0);
{
writenum((long) info->st_uid,(short)8);
fputs(" ", stdout);
}
tab(16);
#ifdef BB_FEATURE_LS_USERNAME
if (!(opts & DISP_NUMERIC)) {
scratch[8]='\0';
scratch[0]='\0';
my_getgrgid( scratch, info->st_gid);
scratch[8]='\0';
if (*scratch)
fputs(scratch, stdout);
else
writenum((long)info->st_gid,(short)0);
wr(scratch,8);
else
writenum((long) info->st_gid,(short)8);
} else
#endif
writenum((long)info->st_gid,(short)0);
writenum((long) info->st_gid,(short)8);
tab(17);
if (S_ISBLK(mode) || S_ISCHR(mode)) {
writenum((long)MAJOR(info->st_rdev),(short)3);