bash-4.3-rc1 overlay

lib/glob/glob.c

@@ -227,7 +227,7 @@ skipname (pat, dname, flags)
      int flags;
 {
 #if EXTENDED_GLOB
-  if (extglob_pattern (pat))		/* XXX */
+  if (extglob_pattern_p (pat))		/* XXX */
     return (extglob_skipname (pat, dname, flags));
 #endif
 
@@ -239,7 +239,7 @@ skipname (pat, dname, flags)
 	  (dname[1] == '\0' || (dname[1] == '.' && dname[2] == '\0'))))
     return 1;
 
-  /* If a dot must be explicity matched, check to see if they do. */
+  /* If a dot must be explicitly matched, check to see if they do. */
   else if (noglob_dot_filenames && dname[0] == '.' && pat[0] != '.' &&
 	(pat[0] != '\\' || pat[1] != '.'))
     return 1;
@@ -261,7 +261,7 @@ wchkname (pat_wc, dn_wc)
 	  (dn_wc[1] == L'\0' || (dn_wc[1] == L'.' && dn_wc[2] == L'\0'))))
     return 1;
 
-  /* If a leading dot must be explicity matched, check to see if the
+  /* If a leading dot must be explicitly matched, check to see if the
      pattern and dirname both have one. */
  else if (noglob_dot_filenames && dn_wc[0] == L'.' &&
 	pat_wc[0] != L'.' &&
@@ -330,7 +330,7 @@ mbskipname (pat, dname, flags)
 
   ext = 0;
 #if EXTENDED_GLOB
-  ext = extglob_pattern (pat);
+  ext = extglob_pattern_p (pat);
 #endif
 
   pat_wc = dn_wc = (wchar_t *)NULL;

lib/glob/glob.h

@@ -35,6 +35,8 @@ extern int glob_pattern_p __P((const char *));
 extern char **glob_vector __P((char *, char *, int));
 extern char **glob_filename __P((char *, int));
 
+extern int extglob_pattern_p __P((const char *));
+
 extern char *glob_error_return;
 extern int noglob_dot_filenames;
 extern int glob_ignore_case;

lib/glob/gmisc.c

@@ -201,7 +201,7 @@ bad_bracket:
 #endif
 
 int
-extglob_pattern (pat)
+extglob_pattern_p (pat)
      char *pat;
 {
   switch (pat[0])