tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (bal) glob.c update to added GLOB_LIMITS.

This commit is contained in:
Ben Lindstrom 2001-03-19 18:58:13 +00:00
parent 55fb9a9064
commit a77d641cea
2 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,6 @@
20010320
- (bal) glob.c update to added GLOB_LIMITS.
20010319 20010319
- (djm) Seed PRNG at startup, rather than waiting for arc4random calls to - (djm) Seed PRNG at startup, rather than waiting for arc4random calls to
do it implicitly. do it implicitly.
@ -4627,4 +4630,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.985 2001/03/19 13:42:21 mouring Exp $ $Id: ChangeLog,v 1.986 2001/03/19 18:58:13 mouring Exp $

56
openbsd-compat/glob.c
View File

@ -44,7 +44,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93"; static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93";
#else #else
static char rcsid[] = "$OpenBSD: glob.c,v 1.8 1998/08/14 21:39:30 deraadt Exp $"; static char rcsid[] = "$OpenBSD: glob.c,v 1.9 2001/03/18 17:18:58 deraadt Exp $";
#endif #endif
#endif /* LIBC_SCCS and not lint */ #endif /* LIBC_SCCS and not lint */
@ -134,11 +134,13 @@ static Char *g_strcat __P((Char *, const Char *));
#endif #endif
static int g_stat __P((Char *, struct stat *, glob_t *)); static int g_stat __P((Char *, struct stat *, glob_t *));
static int glob0 __P((const Char *, glob_t *)); static int glob0 __P((const Char *, glob_t *));
static int glob1 __P((Char *, glob_t *)); static int glob1 __P((Char *, glob_t *, size_t *));
static int glob2 __P((Char *, Char *, Char *, glob_t *)); static int glob2 __P((Char *, Char *, Char *, glob_t *, size_t *));
static int glob3 __P((Char *, Char *, Char *, Char *, glob_t *)); static int glob3 __P((Char *, Char *, Char *, Char *, glob_t *,
static int globextend __P((const Char *, glob_t *)); size_t *));
static const Char * globtilde __P((const Char *, Char *, size_t, glob_t *)); static int globextend __P((const Char *, glob_t *, size_t *));
static const Char *
globtilde __P((const Char *, Char *, size_t, glob_t *));
static int globexp1 __P((const Char *, glob_t *)); static int globexp1 __P((const Char *, glob_t *));
static int globexp2 __P((const Char *, const Char *, glob_t *, int *)); static int globexp2 __P((const Char *, const Char *, glob_t *, int *));
static int match __P((Char *, Char *, Char *)); static int match __P((Char *, Char *, Char *));
@ -403,6 +405,7 @@ glob0(pattern, pglob)
const Char *qpatnext; const Char *qpatnext;
int c, err, oldpathc; int c, err, oldpathc;
Char *bufnext, patbuf[MAXPATHLEN+1]; Char *bufnext, patbuf[MAXPATHLEN+1];
size_t limit = 0;
qpatnext = globtilde(pattern, patbuf, sizeof(patbuf) / sizeof(Char), qpatnext = globtilde(pattern, patbuf, sizeof(patbuf) / sizeof(Char),
pglob); pglob);
@ -461,7 +464,7 @@ glob0(pattern, pglob)
qprintf("glob0:", patbuf); qprintf("glob0:", patbuf);
#endif #endif
if ((err = glob1(patbuf, pglob)) != 0) if ((err = glob1(patbuf, pglob, &limit)) != 0)
return(err); return(err);
/* /*
@ -474,7 +477,7 @@ glob0(pattern, pglob)
if ((pglob->gl_flags & GLOB_NOCHECK) || if ((pglob->gl_flags & GLOB_NOCHECK) ||
((pglob->gl_flags & GLOB_NOMAGIC) && ((pglob->gl_flags & GLOB_NOMAGIC) &&
!(pglob->gl_flags & GLOB_MAGCHAR))) !(pglob->gl_flags & GLOB_MAGCHAR)))
return(globextend(pattern, pglob)); return(globextend(pattern, pglob, &limit));
else else
return(GLOB_NOMATCH); return(GLOB_NOMATCH);
} }
@ -492,16 +495,17 @@ compare(p, q)
} }
static int static int
glob1(pattern, pglob) glob1(pattern, pglob, limitp)
Char *pattern; Char *pattern;
glob_t *pglob; glob_t *pglob;
size_t *limitp;
{ {
Char pathbuf[MAXPATHLEN+1]; Char pathbuf[MAXPATHLEN+1];
/* A null pathname is invalid -- POSIX 1003.1 sect. 2.4. */ /* A null pathname is invalid -- POSIX 1003.1 sect. 2.4. */
if (*pattern == EOS) if (*pattern == EOS)
return(0); return(0);
return(glob2(pathbuf, pathbuf, pattern, pglob)); return(glob2(pathbuf, pathbuf, pattern, pglob, limitp));
} }
/* /*
@ -510,9 +514,10 @@ glob1(pattern, pglob)
* meta characters. * meta characters.
*/ */
static int static int
glob2(pathbuf, pathend, pattern, pglob) glob2(pathbuf, pathend, pattern, pglob, limitp)
Char *pathbuf, *pathend, *pattern; Char *pathbuf, *pathend, *pattern;
glob_t *pglob; glob_t *pglob;
size_t *limitp;
{ {
struct stat sb; struct stat sb;
Char *p, *q; Char *p, *q;
@ -537,7 +542,7 @@ glob2(pathbuf, pathend, pattern, pglob)
*pathend = EOS; *pathend = EOS;
} }
++pglob->gl_matchc; ++pglob->gl_matchc;
return(globextend(pathbuf, pglob)); return(globextend(pathbuf, pglob, limitp));
} }
/* Find end of next segment, copy tentatively to pathend. */ /* Find end of next segment, copy tentatively to pathend. */
@ -555,15 +560,17 @@ glob2(pathbuf, pathend, pattern, pglob)
while (*pattern == SEP) while (*pattern == SEP)
*pathend++ = *pattern++; *pathend++ = *pattern++;
} else /* Need expansion, recurse. */ } else /* Need expansion, recurse. */
return(glob3(pathbuf, pathend, pattern, p, pglob)); return(glob3(pathbuf, pathend, pattern, p, pglob,
limitp));
} }
/* NOTREACHED */ /* NOTREACHED */
} }
static int static int
glob3(pathbuf, pathend, pattern, restpattern, pglob) glob3(pathbuf, pathend, pattern, restpattern, pglob, limitp)
Char *pathbuf, *pathend, *pattern, *restpattern; Char *pathbuf, *pathend, *pattern, *restpattern;
glob_t *pglob; glob_t *pglob;
size_t *limitp;
{ {
register struct dirent *dp; register struct dirent *dp;
DIR *dirp; DIR *dirp;
@ -613,7 +620,7 @@ glob3(pathbuf, pathend, pattern, restpattern, pglob)
*pathend = EOS; *pathend = EOS;
continue; continue;
} }
err = glob2(pathbuf, --dc, restpattern, pglob); err = glob2(pathbuf, --dc, restpattern, pglob, limitp);
if (err) if (err)
break; break;
} }
@ -641,19 +648,19 @@ glob3(pathbuf, pathend, pattern, restpattern, pglob)
* gl_pathv points to (gl_offs + gl_pathc + 1) items. * gl_pathv points to (gl_offs + gl_pathc + 1) items.
*/ */
static int static int
globextend(path, pglob) globextend(path, pglob, limitp)
const Char *path; const Char *path;
glob_t *pglob; glob_t *pglob;
size_t *limitp;
{ {
register char **pathv; register char **pathv;
register int i; register int i;
u_int newsize; u_int newsize, len;
char *copy; char *copy;
const Char *p; const Char *p;
newsize = sizeof(*pathv) * (2 + pglob->gl_pathc + pglob->gl_offs); newsize = sizeof(*pathv) * (2 + pglob->gl_pathc + pglob->gl_offs);
pathv = pglob->gl_pathv ? pathv = pglob->gl_pathv ? realloc((char *)pglob->gl_pathv, newsize) :
realloc((char *)pglob->gl_pathv, newsize) :
malloc(newsize); malloc(newsize);
if (pathv == NULL) { if (pathv == NULL) {
if (pglob->gl_pathv) if (pglob->gl_pathv)
@ -671,11 +678,20 @@ globextend(path, pglob)
for (p = path; *p++;) for (p = path; *p++;)
continue; continue;
if ((copy = malloc(p - path)) != NULL) { len = (size_t)(p - path);
*limitp += len;
if ((copy = malloc(len)) != NULL) {
g_Ctoc(path, copy); g_Ctoc(path, copy);
pathv[pglob->gl_offs + pglob->gl_pathc++] = copy; pathv[pglob->gl_offs + pglob->gl_pathc++] = copy;
} }
pathv[pglob->gl_offs + pglob->gl_pathc] = NULL; pathv[pglob->gl_offs + pglob->gl_pathc] = NULL;
if ((pglob->gl_flags & GLOB_LIMIT) &&
newsize + *limitp >= ARG_MAX) {
errno = 0;
return(GLOB_NOSPACE);
}
return(copy == NULL ? GLOB_NOSPACE : 0); return(copy == NULL ? GLOB_NOSPACE : 0);
} }