Fixed ls formatting for 8 char user names.

 -Erik

diff --git a/Changelog b/Changelog
index 46b2a1f09398a4bf7d1e31e579ceb2184addc2fe..8dc40ca83865c4f616fe721ec1d488a7ba1b27b8 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -37,6 +37,7 @@
        * Fixed mount and umount.  Previously they could leak loop device 
            allocations, causing the system to quickly run out.  Fix for umount
            by Ben Collins <bcollins@debian.org>, and mount was fixed by me.
+       * ls formatting on 8 char user names fixed by Randolph Chung <tausq@debian.org>.
 
 
        -Erik Andersen

diff --git a/coreutils/ls.c b/coreutils/ls.c
index 862da436854de79f2222a60804fe3c25f2e62359..78193e7c150e21018b85cc90f7520d20e19af29c 100644 (file)
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -198,7 +198,7 @@ static void list_single(const char *name, struct stat *info, const char *fullnam
                        if (*scratch) {
                            fputs(scratch, stdout);
                            if ( strlen( scratch) <= 8 )
-                               wr("         ", 8-strlen( scratch));
+                               wr("          ", 9-strlen( scratch));
                        }
                        else {
                                writenum((long) info->st_uid,(short)8);

diff --git a/init.c b/init.c
index 09540ff01587f242f4290b696370f12cac1dc3f0..dd92854b4f803494808e2ebbb32a0c21bdd0a6f4 100644 (file)
--- a/init.c
+++ b/init.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini init implementation for busybox
  *

diff --git a/init/init.c b/init/init.c
index 09540ff01587f242f4290b696370f12cac1dc3f0..dd92854b4f803494808e2ebbb32a0c21bdd0a6f4 100644 (file)
--- a/init/init.c
+++ b/init/init.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini init implementation for busybox
  *

diff --git a/ls.c b/ls.c
index 862da436854de79f2222a60804fe3c25f2e62359..78193e7c150e21018b85cc90f7520d20e19af29c 100644 (file)
--- a/ls.c
+++ b/ls.c
@@ -198,7 +198,7 @@ static void list_single(const char *name, struct stat *info, const char *fullnam
                        if (*scratch) {
                            fputs(scratch, stdout);
                            if ( strlen( scratch) <= 8 )
-                               wr("         ", 8-strlen( scratch));
+                               wr("          ", 9-strlen( scratch));
                        }
                        else {
                                writenum((long) info->st_uid,(short)8);