Merge branch 'busybox' into merge

2 files changed, 12 insertions, 9 deletions

diff --git a/coreutils/ls.c b/coreutils/ls.c
index c48498858..20bd61860 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -668,7 +668,7 @@ static void display_files(struct dnode **dn, unsigned nfiles)
                         if (column_width < len)
                                 column_width = len;
                 }
-                column_width += 1 +
+                column_width += 2 +
                         IF_SELINUX( ((G.all_fmt & LIST_CONTEXT) ? 33 : 0) + )
                                 ((G.all_fmt & LIST_INO) ? 8 : 0) +
                                 ((G.all_fmt & LIST_BLOCKS) ? 5 : 0);
@@ -696,8 +696,8 @@ static void display_files(struct dnode **dn, unsigned nfiles)
                         if (i < nfiles) {
                                 if (column > 0) {
                                         nexttab -= column;
-                                        printf("%*s ", nexttab, "");
-                                        column += nexttab + 1;
+                                        printf("%*s", nexttab, "");
+                                        column += nexttab;
                                 }
                                 nexttab = column + column_width;
                                 column += display_single(dn[i]);
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 07d903388..9139d9f47 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -14,23 +14,23 @@
 
 //usage:#define sort_trivial_usage
 //usage:       "[-nru"
-//usage:        IF_FEATURE_SORT_BIG("gMcszbdfimSTokt] [-o FILE] [-k start[.offset][opts][,end[.offset][opts]] [-t CHAR")
+//usage:        IF_FEATURE_SORT_BIG("gMcszbdfiokt] [-o FILE] [-k start[.offset][opts][,end[.offset][opts]] [-t CHAR")
 //usage:       "] [FILE]..."
 //usage:#define sort_full_usage "\n\n"
 //usage:       "Sort lines of text\n"
 //usage:        IF_FEATURE_SORT_BIG(
-//usage:     "\n        -b      Ignore leading blanks"
+//usage:     "\n        -o FILE Output to FILE"
 //usage:     "\n        -c      Check whether input is sorted"
-//usage:     "\n        -d      Dictionary order (blank or alphanumeric only)"
+//usage:     "\n        -b      Ignore leading blanks"
 //usage:     "\n        -f      Ignore case"
-//usage:     "\n        -g      General numerical sort"
 //usage:     "\n        -i      Ignore unprintable characters"
+//usage:     "\n        -d      Dictionary order (blank or alphanumeric only)"
+//usage:     "\n        -g      General numerical sort"
 //usage:     "\n        -M      Sort month"
 //usage:        )
 //-h, --human-numeric-sort: compare human readable numbers (e.g., 2K 1G)
 //usage:     "\n        -n      Sort numbers"
 //usage:        IF_FEATURE_SORT_BIG(
-//usage:     "\n        -o      Output to file"
 //usage:     "\n        -t CHAR Field separator"
 //usage:     "\n        -k N[,M] Sort by Nth field"
 //usage:        )
@@ -41,7 +41,10 @@
 //usage:     "\n        -u      Suppress duplicate lines"
 //usage:        IF_FEATURE_SORT_BIG(
 //usage:     "\n        -z      Lines are terminated by NUL, not newline"
-//usage:     "\n        -mST    Ignored for GNU compatibility")
+////usage:     "\n      -m      Ignored for GNU compatibility"
+////usage:     "\n      -S BUFSZ Ignored for GNU compatibility"
+////usage:     "\n      -T TMPDIR Ignored for GNU compatibility"
+//usage:        )
 //usage:
 //usage:#define sort_example_usage
 //usage:       "$ echo -e \"e\\nf\\nb\\nd\\nc\\na\" | sort\n"