(keycompare): Ignore any length difference if the

localized comparison says the strings are equal.

diff --git a/src/sort.c b/src/sort.c
index 4106973acf67eff8e4fbb15ea3535fd4c711924c..6e1bd9e66fee3f267effe4caf6c51065b10687e3 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -1324,10 +1324,17 @@ keycompare (const struct line *a, const struct line *b)
        {
 #ifdef ENABLE_NLS
          if (need_locale)
-           diff = memcoll (texta, lena, textb, lenb);
+           {
+             /* Ignore any length difference if the localized comparison
+                says the strings are equal.  */
+             comparable_lengths = 0;
+             diff = memcoll (texta, lena, textb, lenb);
+           }
          else
 #endif
-           diff = memcmp (texta, textb, min (lena, lenb));
+           {
+             diff = memcmp (texta, textb, min (lena, lenb));
+           }
        }
 
       if (diff)