From: Dmitry V. Levin <ldv@altlinux.org>
Date: Tue, 19 May 2015 18:00:07 +0000 (+0000)
Subject: maint: avoid effects of locale when sorting files
X-Git-Tag: v4.11~517
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7e88896a16ac57d968c4246030af4bf547b23f06;p=strace

maint: avoid effects of locale when sorting files

* maint/ioctls_gen.sh: Invoke sort with LC_COLLATE=C.
* maint/ioctls_hex.sh: Likewise.
* maint/ioctls_sym.sh: Likewise.

Reported-by: Philippe De Muyter <phdm@macqel.be>
---

diff --git a/maint/ioctls_gen.sh b/maint/ioctls_gen.sh
index d8da875b..90d7c1f6 100755
--- a/maint/ioctls_gen.sh
+++ b/maint/ioctls_gen.sh
@@ -90,7 +90,7 @@ msg "generated $(grep -c '^{' ioctls_sym.h) symbolic ioctls from $inc_dir"
 
 # Output all ioctl definitions fetched from include-directory.
 echo "/* Generated by $me from definitions found in ${inc_dir%%/}/ tree. */" > ioctls_inc.h
-sort -u ioctls_hex.h ioctls_sym.h >> ioctls_inc.h
+LC_COLLATE=C sort -u ioctls_hex.h ioctls_sym.h >> ioctls_inc.h
 msg "generated $(grep -c '^{' ioctls_inc.h) ioctls from $inc_dir"
 
 [ -n "$arch_dir" ] || exit 0
@@ -110,5 +110,5 @@ msg "generated $(grep -c '^{' ioctls_sym.h) symbolic ioctls from $arch_dir"
 
 # Output all ioctl definitions fetched from arch-include-directory.
 echo "/* Generated by $me from definitions found in ${arch_dir%%/}/ tree. */" > ioctls_arch.h
-sort -u ioctls_hex.h ioctls_sym.h >> ioctls_arch.h
+LC_COLLATE=C sort -u ioctls_hex.h ioctls_sym.h >> ioctls_arch.h
 msg "generated $(grep -c '^{' ioctls_arch.h) ioctls from $arch_dir"
diff --git a/maint/ioctls_hex.sh b/maint/ioctls_hex.sh
index 2e380b9c..a7987333 100755
--- a/maint/ioctls_hex.sh
+++ b/maint/ioctls_hex.sh
@@ -46,4 +46,4 @@ for f; do
 done |
 	sed 's|^uapi/||' |
 	sed -n 's/^\([^:]*\):'"$regexp"'.*/{ "\1", "\2", 0, \3, 0 },/p' |
-	sort -u
+	LC_COLLATE=C sort -u
diff --git a/maint/ioctls_sym.sh b/maint/ioctls_sym.sh
index 19e0ddab..d0298ed6 100755
--- a/maint/ioctls_sym.sh
+++ b/maint/ioctls_sym.sh
@@ -78,7 +78,7 @@ find . -type f -name '*.h' -print0 |
 		exit 0
 cd - > /dev/null
 sed 's|^\./\(uapi/\)\?||' < "$tmpdir"/headers1.list > "$tmpdir"/headers.list
-sort -u -o "$tmpdir"/headers.list "$tmpdir"/headers.list
+LC_COLLATE=C sort -u -o "$tmpdir"/headers.list "$tmpdir"/headers.list
 
 msg "processing $(wc -l < "$tmpdir"/headers.list) header files from $inc_dir"
 failed=0