aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/cat.c4
-rw-r--r--coreutils/ls.c27
2 files changed, 18 insertions, 13 deletions
diff --git a/coreutils/cat.c b/coreutils/cat.c
index 1f4ef4af8..758a83e6b 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -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);
}
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 3b380671d..571c962c7 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -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);