BSD 4_4_Lite1 release

[unix-history] / usr / src / lib / libc / gen / glob.c

diff --git a/usr/src/lib/libc/gen/glob.c b/usr/src/lib/libc/gen/glob.c
index 288dea2..8c8e162 100644 (file)
--- a/usr/src/lib/libc/gen/glob.c
+++ b/usr/src/lib/libc/gen/glob.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)glob.c     8.1 (Berkeley) 6/4/93";
+static char sccsid[] = "@(#)glob.c     8.3 (Berkeley) 10/13/93";

 #endif /* LIBC_SCCS and not lint */
 
 /*
 #endif /* LIBC_SCCS and not lint */
 
 /*


@@ -401,10 +401,7 @@ glob0(pattern, pglob)
        Char *bufnext, patbuf[MAXPATHLEN+1];
 
        qpatnext = globtilde(pattern, patbuf, pglob);
        Char *bufnext, patbuf[MAXPATHLEN+1];
 
        qpatnext = globtilde(pattern, patbuf, pglob);

-

        oldpathc = pglob->gl_pathc;
        oldpathc = pglob->gl_pathc;

-       pglob->gl_matchc = 0;
-

        bufnext = patbuf;
 
        /* We don't need to check for buffer overflow any more. */
        bufnext = patbuf;
 
        /* We don't need to check for buffer overflow any more. */


@@ -470,7 +467,7 @@ glob0(pattern, pglob)
         */
        if (pglob->gl_pathc == oldpathc && 
            ((pglob->gl_flags & GLOB_NOCHECK) || 
         */
        if (pglob->gl_pathc == oldpathc && 
            ((pglob->gl_flags & GLOB_NOCHECK) || 

-             ((pglob->gl_flags & (GLOB_NOMAGIC|GLOB_BRACE|GLOB_TILDE)) || 
+             ((pglob->gl_flags & GLOB_NOMAGIC) &&

               !(pglob->gl_flags & GLOB_MAGCHAR))))
                return(globextend(pattern, pglob));
        else if (!(pglob->gl_flags & GLOB_NOSORT)) 
               !(pglob->gl_flags & GLOB_MAGCHAR))))
                return(globextend(pattern, pglob));
        else if (!(pglob->gl_flags & GLOB_NOSORT))