summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Andersen2000-01-27 02:40:21 +0000
committerErik Andersen2000-01-27 02:40:21 +0000
commitccc7488615f0079032d8b017f57e6bf6a994cf84 (patch)
tree4f4f709ad3b66e3f94fabd3567eb85df9e935393
parentde7965ca7ee65f21042739f1be5a337da4138343 (diff)
downloadbusybox-ccc7488615f0079032d8b017f57e6bf6a994cf84.zip
busybox-ccc7488615f0079032d8b017f57e6bf6a994cf84.tar.gz
Fixed ls formatting for 8 char user names.
-Erik
-rw-r--r--Changelog1
-rw-r--r--coreutils/ls.c2
-rw-r--r--init.c1
-rw-r--r--init/init.c1
-rw-r--r--ls.c2
5 files changed, 5 insertions, 2 deletions
diff --git a/Changelog b/Changelog
index 46b2a1f..8dc40ca 100644
--- 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 862da43..78193e7 100644
--- 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 09540ff..dd92854 100644
--- 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 09540ff..dd92854 100644
--- 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 862da43..78193e7 100644
--- 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);