sort is good to go.

[oweals/busybox.git] / ls.c

diff --git a/ls.c b/ls.c
index 3b380671d1835be17ae45745ec9b37ae5872c561..571c962c708e9e715b667570b31164a87ff0c931 100644 (file)
--- a/ls.c
+++ b/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);