From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 2 Aug 2004 18:21:05 +0000 (+0000)
Subject: (EXT): Use size_t for sizes, not ptrdiff_t, so that we don't have
X-Git-Tag: v5.3.0~962
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4b2eed874e0d47f56adec363c616ba360f7e5a2;p=thirdparty%2Fcoreutils.git

(EXT): Use size_t for sizes, not ptrdiff_t, so that we don't have
to worry about wraparound.
---

diff --git a/lib/fnmatch_loop.c b/lib/fnmatch_loop.c
index 6d627b233a..7cea5a76ed 100644
--- a/lib/fnmatch_loop.c
+++ b/lib/fnmatch_loop.c
@@ -999,7 +999,7 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,
      bool no_leading_period, int flags)
 {
   const CHAR *startp;
-  ptrdiff_t level;
+  size_t level;
   struct patternlist
   {
     struct patternlist *next;
@@ -1013,7 +1013,7 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,
 
   /* Parse the pattern.  Store the individual parts in the list.  */
   level = 0;
-  for (startp = p = pattern + 1; level >= 0; ++p)
+  for (startp = p = pattern + 1; ; ++p)
     if (*p == L('\0'))
       /* This is an invalid pattern.  */
       return -1;
@@ -1066,6 +1066,7 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,
 	    *lastp = newp;						      \
 	    lastp = &newp->next
 	    NEW_PATTERN;
+	    break;
 	  }
       }
     else if (*p == L('|'))