1 files changed, 17 insertions, 22 deletions

diff --git a/gl/strncasecmp.c b/gl/strncasecmp.c
index c79161f3..c6bec00d 100644
--- a/gl/strncasecmp.c
+++ b/gl/strncasecmp.c
@@ -1,5 +1,5 @@
-/* strncasecmp.c -- case insensitive string comparator
-   Copyright (C) 1998-1999, 2005-2007, 2009-2024 Free Software Foundation, Inc.
+/* Case-insensitive string comparison function for unibyte locales.
+   Copyright (C) 1998-1999, 2005-2007, 2009-2026 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -17,7 +17,7 @@
 #include <config.h>
 
 /* Specification.  */
-#include <string.h>
+#include <strings.h>
 
 #include <ctype.h>
 #include <limits.h>
@@ -32,29 +32,24 @@ strncasecmp (const char *s1, const char *s2, size_t n)
 {
   register const unsigned char *p1 = (const unsigned char *) s1;
   register const unsigned char *p2 = (const unsigned char *) s2;
-  unsigned char c1, c2;
 
   if (p1 == p2 || n == 0)
     return 0;
 
-  do
+  for (;; p1++, p2++)
     {
-      c1 = tolower (*p1);
-      c2 = tolower (*p2);
-
-      if (--n == 0 || c1 == '\0')
-        break;
-
-      ++p1;
-      ++p2;
+      unsigned char c1 = tolower (*p1);
+      unsigned char c2 = tolower (*p2);
+
+      if (--n == 0 || c1 == '\0' || c1 != c2)
+        {
+          if (UCHAR_MAX <= INT_MAX)
+            return c1 - c2;
+          else
+            /* On machines where 'char' and 'int' are types of the same size,
+               the difference of two 'unsigned char' values - including the
+               sign bit - doesn't fit in an 'int'.  */
+            return _GL_CMP (c1, c2);
+        }
     }
-  while (c1 == c2);
-
-  if (UCHAR_MAX <= INT_MAX)
-    return c1 - c2;
-  else
-    /* On machines where 'char' and 'int' are types of the same size, the
-       difference of two 'unsigned char' values - including the sign bit -
-       doesn't fit in an 'int'.  */
-    return _GL_CMP (c1, c2);
 }