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 d8da875b3b01464ec62ea3f475a1c36122694167..90d7c1f6e9895955496345d0cb6f9322e69fc3d2 100755 (executable)
--- 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 2e380b9ca8d62bd3d8895325da08c4a42962d2ac..a79873334911d30e29c6c1103c6befb9ad940642 100755 (executable)
--- 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 19e0ddab4b8c99840ab0f7c3cd6785993a5bc680..d0298ed63266a11a959c5ae579d09450451bea21 100755 (executable)
--- 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