summary refs log tree commit diff
diff options
context:
space:
mode:
authorFredrik Fornwall <fredrik@fornwall.net>2015-05-24 23:05:48 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2015-06-11 14:31:48 +0800
commitfe393c0f9ab72de5a7d32aab53e5e8275cad8735 (patch)
treea3127335de57b92e35e8f507680cab3674eb3026
parentinput: Allow two consecutive calls to pungetc (diff)
downloaddash-fe393c0f9ab72de5a7d32aab53e5e8275cad8735.tar.gz
dash-fe393c0f9ab72de5a7d32aab53e5e8275cad8735.zip
builtin: Clear LC_ALL in mkbuiltins
In mkbuiltins LC_COLLATE is set, but since "The value of the LC_ALL
environment variable has precedence over any of the other environment
variables starting with LC_"
(http://pubs.opengroup.org/onlinepubs/7908799/xbd/envvar.html), this
has no effect when LC_ALL is set.

This breaks when having e.g. LC_ALL=en_US.UTF-8 during make, which
causes the test case
    dash -c :
to fail, probably due to broken ordering in builtins.c. The patch
corrects that by clearing LC_ALL.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to '')
-rw-r--r--src/mkbuiltins7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mkbuiltins b/src/mkbuiltins
index f412a41..8c74d6b 100644
--- a/src/mkbuiltins
+++ b/src/mkbuiltins
@@ -78,7 +78,7 @@ awk '{	for (i = 2 ; i <= NF ; i++) {
 		if ($i ~ /^-/)
 			line = $(++i) "\t" line
 		print line
-	}}' $temp | LC_COLLATE=C sort -k 1,1 | tee $temp2 | awk '{
+	}}' $temp | LC_ALL= LC_COLLATE=C sort -k 1,1 | tee $temp2 | awk '{
 		opt = ""
 		if (NF > 2) {
 			opt = substr($2, 2)
@@ -97,8 +97,9 @@ cat <<\!
  */
 
 !
-sed 's/	-[a-z]*//' $temp2 | nl -b a -v 0 | LC_COLLATE=C sort -u -k 3,3 |
-tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ |
+sed 's/	-[a-z]*//' $temp2 | nl -b a -v 0 |
+	LC_ALL= LC_COLLATE=C sort -u -k 3,3 |
+	tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ |
 	awk '{	printf "#define %s (builtincmd + %d)\n", $3, $1}'
 printf '\n#define NUMBUILTINS %d\n' $(wc -l < $temp2)
 echo '