summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-05-27 23:38:40 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-05-27 23:41:07 -0700
commitde65c25dc103b7f4b18e0c3116c31ff7fc6d4726 (patch)
tree42cb6a8b4fb5ee712c2bf0bf9413ec511324ef1b
parenta3318fdbca6002d524f063ab5e98e7e59295d2a2 (diff)
downloaddiffutils-de65c25dc103b7f4b18e0c3116c31ff7fc6d4726.tar.gz
diff: don't use locales after local-specific sorting fails
* src/dir.c (compare_names): Don't invoke strcasecmp if locale-specific sorting fails, because POSIX.1-2008 says strcasecmp has unspecified behavior outside the POSIX locale. See: http://lists.gnu.org/archive/html/bug-diffutils/2011-05/msg00008.html
-rw-r--r--src/dir.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/dir.c b/src/dir.c
index e0e0f65..30bef2c 100644
--- a/src/dir.c
+++ b/src/dir.c
@@ -161,9 +161,7 @@ compare_names (char const *name1, char const *name2)
return r;
}
- return (ignore_file_name_case
- ? strcasecmp (name1, name2)
- : file_name_cmp (name1, name2));
+ return file_name_cmp (name1, name2);
}
/* Compare names FILE1 and FILE2 when sorting a directory.