diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2019-01-25 01:34:43 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2020-03-28 20:29:44 +0000 |
| commit | 67295677e7f4b89f55c484b44735728ea610edf4 (patch) | |
| tree | d0463950c4bc4460017b3d35521d7db45c84583f | |
| parent | da8aee4bf2577ec47037705dd09a8ab3e7d5c666 (diff) | |
| download | klibc-67295677e7f4b89f55c484b44735728ea610edf4.tar.gz | |
Revert "[klibc] dash: mkbuiltins: Fix sort order harder"
This reverts commit 5125a8b74971fc22fdc74cfc9dc8e04a4f5c0e4b.
The problem that it solves was fixed differently upstream.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | usr/dash/README.dash | 1 | ||||
| -rw-r--r-- | usr/dash/mkbuiltins | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/usr/dash/README.dash b/usr/dash/README.dash index 11ecff548038a..e33335a5a7211 100644 --- a/usr/dash/README.dash +++ b/usr/dash/README.dash @@ -15,7 +15,6 @@ Several changes have been made for klibc: klibc's own signal name array. decode_signal() is changed similarly. * The read built-in implements the -t option like bash * mktokens is modified to support out-of-tree builds -* mkbuiltins is modified to sort with LC_ALL=C * Some header files have header guards added * Changelog and some manual pages are omitted * Automatic whitespace fixups diff --git a/usr/dash/mkbuiltins b/usr/dash/mkbuiltins index 70308bd82f7b8..f562ae2216cf9 100644 --- a/usr/dash/mkbuiltins +++ b/usr/dash/mkbuiltins @@ -78,7 +78,7 @@ awk '{ for (i = 2 ; i <= NF ; i++) { if ($i ~ /^-/) line = $(++i) "\t" line print line - }}' $temp | LC_ALL=C sort -k 1,1 | tee $temp2 | awk '{ + }}' $temp | LC_COLLATE=C sort -k 1,1 | tee $temp2 | awk '{ opt = "" if (NF > 2) { opt = substr($2, 2) |