oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Rename FOO -> CHAR_FOO to avoid collision with symbol in sys/ioctl.h

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1224 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-02-09 19:11:13 +00:00
parent 6fac2d13f3
commit e7768cfc7c
2 changed files with 166 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

166
appl/ftp/common/glob.c
View File

@@ -91,23 +91,23 @@
#include "glob.h" #include "glob.h"
#include "roken.h" #include "roken.h"
#define DOLLAR '$' #define CHAR_DOLLAR '$'
#define DOT '.' #define CHAR_DOT '.'
#define EOS '\0' #define CHAR_EOS '\0'
#define LBRACKET '[' #define CHAR_LBRACKET '['
#define NOT '!' #define CHAR_NOT '!'
#define QUESTION '?' #define CHAR_QUESTION '?'
#define QUOTE '\\' #define CHAR_QUOTE '\\'
#define RANGE '-' #define CHAR_RANGE '-'
#define RBRACKET ']' #define CHAR_RBRACKET ']'
#define SEP '/' #define CHAR_SEP '/'
#define STAR '*' #define CHAR_STAR '*'
#define TILDE '~' #define CHAR_TILDE '~'
#define UNDERSCORE '_' #define CHAR_UNDERSCORE '_'
#define LBRACE '{' #define CHAR_LBRACE '{'
#define RBRACE '}' #define CHAR_RBRACE '}'
#define SLASH '/' #define CHAR_SLASH '/'
#define COMMA ',' #define CHAR_COMMA ','
#ifndef DEBUG #ifndef DEBUG
@@ -188,10 +188,10 @@ glob(const char *pattern,
bufend = bufnext + MaxPathLen; bufend = bufnext + MaxPathLen;
if (flags & GLOB_QUOTE) { if (flags & GLOB_QUOTE) {
/* Protect the quoted characters. */ /* Protect the quoted characters. */
while (bufnext < bufend && (c = *patnext++) != EOS) while (bufnext < bufend && (c = *patnext++) != CHAR_EOS)
if (c == QUOTE) { if (c == CHAR_QUOTE) {
if ((c = *patnext++) == EOS) { if ((c = *patnext++) == CHAR_EOS) {
c = QUOTE; c = CHAR_QUOTE;
--patnext; --patnext;
} }
*bufnext++ = c | M_PROTECT; *bufnext++ = c | M_PROTECT;
@@ -200,9 +200,9 @@ glob(const char *pattern,
*bufnext++ = c; *bufnext++ = c;
} }
else else
while (bufnext < bufend && (c = *patnext++) != EOS) while (bufnext < bufend && (c = *patnext++) != CHAR_EOS)
*bufnext++ = c; *bufnext++ = c;
*bufnext = EOS; *bufnext = CHAR_EOS;
if (flags & GLOB_BRACE) if (flags & GLOB_BRACE)
return globexp1(patbuf, pglob); return globexp1(patbuf, pglob);
@@ -221,10 +221,10 @@ static int globexp1(const Char *pattern, glob_t *pglob)
int rv; int rv;
/* Protect a single {}, for find(1), like csh */ /* Protect a single {}, for find(1), like csh */
if (pattern[0] == LBRACE && pattern[1] == RBRACE && pattern[2] == EOS) if (pattern[0] == CHAR_LBRACE && pattern[1] == CHAR_RBRACE && pattern[2] == CHAR_EOS)
return glob0(pattern, pglob); return glob0(pattern, pglob);
while ((ptr = (const Char *) g_strchr((Char *) ptr, LBRACE)) != NULL) while ((ptr = (const Char *) g_strchr((Char *) ptr, CHAR_LBRACE)) != NULL)
if (!globexp2(ptr, pattern, pglob, &rv)) if (!globexp2(ptr, pattern, pglob, &rv))
return rv; return rv;
@@ -252,59 +252,59 @@ static int globexp2(const Char *ptr, const Char *pattern,
/* Find the balanced brace */ /* Find the balanced brace */
for (i = 0, pe = ++ptr; *pe; pe++) for (i = 0, pe = ++ptr; *pe; pe++)
if (*pe == LBRACKET) { if (*pe == CHAR_LBRACKET) {
/* Ignore everything between [] */ /* Ignore everything between [] */
for (pm = pe++; *pe != RBRACKET && *pe != EOS; pe++) for (pm = pe++; *pe != CHAR_RBRACKET && *pe != CHAR_EOS; pe++)
continue; continue;
if (*pe == EOS) { if (*pe == CHAR_EOS) {
/* /*
* We could not find a matching RBRACKET. * We could not find a matching CHAR_RBRACKET.
* Ignore and just look for RBRACE * Ignore and just look for CHAR_RBRACE
*/ */
pe = pm; pe = pm;
} }
} }
else if (*pe == LBRACE) else if (*pe == CHAR_LBRACE)
i++; i++;
else if (*pe == RBRACE) { else if (*pe == CHAR_RBRACE) {
if (i == 0) if (i == 0)
break; break;
i--; i--;
} }
/* Non matching braces; just glob the pattern */ /* Non matching braces; just glob the pattern */
if (i != 0 || *pe == EOS) { if (i != 0 || *pe == CHAR_EOS) {
*rv = glob0(patbuf, pglob); *rv = glob0(patbuf, pglob);
return 0; return 0;
} }
for (i = 0, pl = pm = ptr; pm <= pe; pm++) for (i = 0, pl = pm = ptr; pm <= pe; pm++)
switch (*pm) { switch (*pm) {
case LBRACKET: case CHAR_LBRACKET:
/* Ignore everything between [] */ /* Ignore everything between [] */
for (pl = pm++; *pm != RBRACKET && *pm != EOS; pm++) for (pl = pm++; *pm != CHAR_RBRACKET && *pm != CHAR_EOS; pm++)
continue; continue;
if (*pm == EOS) { if (*pm == CHAR_EOS) {
/* /*
* We could not find a matching RBRACKET. * We could not find a matching CHAR_RBRACKET.
* Ignore and just look for RBRACE * Ignore and just look for CHAR_RBRACE
*/ */
pm = pl; pm = pl;
} }
break; break;
case LBRACE: case CHAR_LBRACE:
i++; i++;
break; break;
case RBRACE: case CHAR_RBRACE:
if (i) { if (i) {
i--; i--;
break; break;
} }
/* FALLTHROUGH */ /* FALLTHROUGH */
case COMMA: case CHAR_COMMA:
if (i && *pm == COMMA) if (i && *pm == CHAR_COMMA)
break; break;
else { else {
/* Append the current string */ /* Append the current string */
@@ -314,7 +314,7 @@ static int globexp2(const Char *ptr, const Char *pattern,
* Append the rest of the pattern after the * Append the rest of the pattern after the
* closing brace * closing brace
*/ */
for (pl = pe + 1; (*lm++ = *pl++) != EOS;) for (pl = pe + 1; (*lm++ = *pl++) != CHAR_EOS;)
continue; continue;
/* Expand the current pattern */ /* Expand the current pattern */
@@ -348,17 +348,17 @@ globtilde(const Char *pattern, Char *patbuf, glob_t *pglob)
const Char *p; const Char *p;
Char *b; Char *b;
if (*pattern != TILDE || !(pglob->gl_flags & GLOB_TILDE)) if (*pattern != CHAR_TILDE || !(pglob->gl_flags & GLOB_TILDE))
return pattern; return pattern;
/* Copy up to the end of the string or / */ /* Copy up to the end of the string or / */
for (p = pattern + 1, h = (char *) patbuf; *p && *p != SLASH; for (p = pattern + 1, h = (char *) patbuf; *p && *p != CHAR_SLASH;
*h++ = *p++) *h++ = *p++)
continue; continue;
*h = EOS; *h = CHAR_EOS;
if (((char *) patbuf)[0] == EOS) { if (((char *) patbuf)[0] == CHAR_EOS) {
/* /*
* handle a plain ~ or ~/ by expanding $HOME * handle a plain ~ or ~/ by expanding $HOME
* first and then trying the password file * first and then trying the password file
@@ -385,7 +385,7 @@ globtilde(const Char *pattern, Char *patbuf, glob_t *pglob)
continue; continue;
/* Append the rest of the pattern */ /* Append the rest of the pattern */
while ((*b++ = *p++) != EOS) while ((*b++ = *p++) != CHAR_EOS)
continue; continue;
return patbuf; return patbuf;
@@ -411,40 +411,40 @@ glob0(const Char *pattern, glob_t *pglob)
bufnext = patbuf; bufnext = patbuf;
/* We don't need to check for buffer overflow any more. */ /* We don't need to check for buffer overflow any more. */
while ((c = *qpatnext++) != EOS) { while ((c = *qpatnext++) != CHAR_EOS) {
switch (c) { switch (c) {
case LBRACKET: case CHAR_LBRACKET:
c = *qpatnext; c = *qpatnext;
if (c == NOT) if (c == CHAR_NOT)
++qpatnext; ++qpatnext;
if (*qpatnext == EOS || if (*qpatnext == CHAR_EOS ||
g_strchr((Char *) qpatnext+1, RBRACKET) == NULL) { g_strchr((Char *) qpatnext+1, CHAR_RBRACKET) == NULL) {
*bufnext++ = LBRACKET; *bufnext++ = CHAR_LBRACKET;
if (c == NOT) if (c == CHAR_NOT)
--qpatnext; --qpatnext;
break; break;
} }
*bufnext++ = M_SET; *bufnext++ = M_SET;
if (c == NOT) if (c == CHAR_NOT)
*bufnext++ = M_NOT; *bufnext++ = M_NOT;
c = *qpatnext++; c = *qpatnext++;
do { do {
*bufnext++ = CHAR(c); *bufnext++ = CHAR(c);
if (*qpatnext == RANGE && if (*qpatnext == CHAR_RANGE &&
(c = qpatnext[1]) != RBRACKET) { (c = qpatnext[1]) != CHAR_RBRACKET) {
*bufnext++ = M_RNG; *bufnext++ = M_RNG;
*bufnext++ = CHAR(c); *bufnext++ = CHAR(c);
qpatnext += 2; qpatnext += 2;
} }
} while ((c = *qpatnext++) != RBRACKET); } while ((c = *qpatnext++) != CHAR_RBRACKET);
pglob->gl_flags |= GLOB_MAGCHAR; pglob->gl_flags |= GLOB_MAGCHAR;
*bufnext++ = M_END; *bufnext++ = M_END;
break; break;
case QUESTION: case CHAR_QUESTION:
pglob->gl_flags |= GLOB_MAGCHAR; pglob->gl_flags |= GLOB_MAGCHAR;
*bufnext++ = M_ONE; *bufnext++ = M_ONE;
break; break;
case STAR: case CHAR_STAR:
pglob->gl_flags |= GLOB_MAGCHAR; pglob->gl_flags |= GLOB_MAGCHAR;
/* collapse adjacent stars to one, /* collapse adjacent stars to one,
* to avoid exponential behavior * to avoid exponential behavior
@@ -457,7 +457,7 @@ glob0(const Char *pattern, glob_t *pglob)
break; break;
} }
} }
*bufnext = EOS; *bufnext = CHAR_EOS;
#ifdef DEBUG #ifdef DEBUG
qprintf("glob0:", patbuf); qprintf("glob0:", patbuf);
#endif #endif
@@ -494,7 +494,7 @@ glob1(Char *pattern, glob_t *pglob)
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 == CHAR_EOS)
return(0); return(0);
return(glob2(pathbuf, pathbuf, pattern, pglob)); return(glob2(pathbuf, pathbuf, pattern, pglob));
} }
@@ -525,18 +525,18 @@ glob2(Char *pathbuf, Char *pathend, Char *pattern, glob_t *pglob)
* segment with meta character found. * segment with meta character found.
*/ */
for (anymeta = 0;;) { for (anymeta = 0;;) {
if (*pattern == EOS) { /* End of pattern? */ if (*pattern == CHAR_EOS) { /* End of pattern? */
*pathend = EOS; *pathend = CHAR_EOS;
if (g_lstat(pathbuf, &sb, pglob)) if (g_lstat(pathbuf, &sb, pglob))
return(0); return(0);
if (((pglob->gl_flags & GLOB_MARK) && if (((pglob->gl_flags & GLOB_MARK) &&
pathend[-1] != SEP) && (S_ISDIR(sb.st_mode) pathend[-1] != CHAR_SEP) && (S_ISDIR(sb.st_mode)
|| (S_ISLNK(sb.st_mode) && || (S_ISLNK(sb.st_mode) &&
(g_stat(pathbuf, &sb, pglob) == 0) && (g_stat(pathbuf, &sb, pglob) == 0) &&
S_ISDIR(sb.st_mode)))) { S_ISDIR(sb.st_mode)))) {
*pathend++ = SEP; *pathend++ = CHAR_SEP;
*pathend = EOS; *pathend = CHAR_EOS;
} }
++pglob->gl_matchc; ++pglob->gl_matchc;
return(globextend(pathbuf, pglob)); return(globextend(pathbuf, pglob));
@@ -545,7 +545,7 @@ glob2(Char *pathbuf, Char *pathend, Char *pattern, glob_t *pglob)
/* Find end of next segment, copy tentatively to pathend. */ /* Find end of next segment, copy tentatively to pathend. */
q = pathend; q = pathend;
p = pattern; p = pattern;
while (*p != EOS && *p != SEP) { while (*p != CHAR_EOS && *p != CHAR_SEP) {
if (ismeta(*p)) if (ismeta(*p))
anymeta = 1; anymeta = 1;
*q++ = *p++; *q++ = *p++;
@@ -554,12 +554,12 @@ glob2(Char *pathbuf, Char *pathend, Char *pattern, glob_t *pglob)
if (!anymeta) { /* No expansion, do next segment. */ if (!anymeta) { /* No expansion, do next segment. */
pathend = q; pathend = q;
pattern = p; pattern = p;
while (*pattern == SEP) while (*pattern == CHAR_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));
} }
/* NOTREACHED */ /* CHAR_NOTREACHED */
} }
static int static int
@@ -579,7 +579,7 @@ glob3(Char *pathbuf, Char *pathend, Char *pattern, Char *restpattern,
*/ */
struct dirent *(*readdirfunc)(void *); struct dirent *(*readdirfunc)(void *);
*pathend = EOS; *pathend = CHAR_EOS;
errno = 0; errno = 0;
if ((dirp = g_opendir(pathbuf, pglob)) == NULL) { if ((dirp = g_opendir(pathbuf, pglob)) == NULL) {
@@ -604,14 +604,14 @@ glob3(Char *pathbuf, Char *pathend, Char *pattern, Char *restpattern,
u_char *sc; u_char *sc;
Char *dc; Char *dc;
/* Initial DOT must be matched literally. */ /* Initial CHAR_DOT must be matched literally. */
if (dp->d_name[0] == DOT && *pattern != DOT) if (dp->d_name[0] == CHAR_DOT && *pattern != CHAR_DOT)
continue; continue;
for (sc = (u_char *) dp->d_name, dc = pathend; for (sc = (u_char *) dp->d_name, dc = pathend;
(*dc++ = *sc++) != EOS;) (*dc++ = *sc++) != CHAR_EOS;)
continue; continue;
if (!match(pathend, pattern, restpattern)) { if (!match(pathend, pattern, restpattern)) {
*pathend = EOS; *pathend = CHAR_EOS;
continue; continue;
} }
err = glob2(pathbuf, --dc, restpattern, pglob); err = glob2(pathbuf, --dc, restpattern, pglob);
@@ -695,17 +695,17 @@ match(Char *name, Char *pat, Char *patend)
do do
if (match(name, pat, patend)) if (match(name, pat, patend))
return(1); return(1);
while (*name++ != EOS); while (*name++ != CHAR_EOS);
return(0); return(0);
case M_ONE: case M_ONE:
if (*name++ == EOS) if (*name++ == CHAR_EOS)
return(0); return(0);
break; break;
case M_SET: case M_SET:
ok = 0; ok = 0;
if ((k = *name++) == EOS) if ((k = *name++) == CHAR_EOS)
return(0); return(0);
if ((negate_range = ((*pat & M_MASK) == M_NOT)) != EOS) if ((negate_range = ((*pat & M_MASK) == M_NOT)) != CHAR_EOS)
++pat; ++pat;
while (((c = *pat++) & M_MASK) != M_END) while (((c = *pat++) & M_MASK) != M_END)
if ((*pat & M_MASK) == M_RNG) { if ((*pat & M_MASK) == M_RNG) {
@@ -723,7 +723,7 @@ match(Char *name, Char *pat, Char *patend)
break; break;
} }
} }
return(*name == EOS); return(*name == CHAR_EOS);
} }
/* Free allocated data belonging to a glob_t structure. */ /* Free allocated data belonging to a glob_t structure. */
@@ -799,7 +799,7 @@ g_strcat(Char *dst, const Char *src)
while (*dst++) while (*dst++)
continue; continue;
--dst; --dst;
while((*dst++ = *src++) != EOS) while((*dst++ = *src++) != CHAR_EOS)
continue; continue;
return (sdst); return (sdst);
@@ -811,7 +811,7 @@ g_Ctoc(const Char *str, char *buf)
{ {
char *dc; char *dc;
for (dc = buf; (*dc++ = *str++) != EOS;) for (dc = buf; (*dc++ = *str++) != CHAR_EOS;)
continue; continue;
} }

166
lib/roken/glob.c
View File

@@ -91,23 +91,23 @@
#include "glob.h" #include "glob.h"
#include "roken.h" #include "roken.h"
#define DOLLAR '$' #define CHAR_DOLLAR '$'
#define DOT '.' #define CHAR_DOT '.'
#define EOS '\0' #define CHAR_EOS '\0'
#define LBRACKET '[' #define CHAR_LBRACKET '['
#define NOT '!' #define CHAR_NOT '!'
#define QUESTION '?' #define CHAR_QUESTION '?'
#define QUOTE '\\' #define CHAR_QUOTE '\\'
#define RANGE '-' #define CHAR_RANGE '-'
#define RBRACKET ']' #define CHAR_RBRACKET ']'
#define SEP '/' #define CHAR_SEP '/'
#define STAR '*' #define CHAR_STAR '*'
#define TILDE '~' #define CHAR_TILDE '~'
#define UNDERSCORE '_' #define CHAR_UNDERSCORE '_'
#define LBRACE '{' #define CHAR_LBRACE '{'
#define RBRACE '}' #define CHAR_RBRACE '}'
#define SLASH '/' #define CHAR_SLASH '/'
#define COMMA ',' #define CHAR_COMMA ','
#ifndef DEBUG #ifndef DEBUG
@@ -188,10 +188,10 @@ glob(const char *pattern,
bufend = bufnext + MaxPathLen; bufend = bufnext + MaxPathLen;
if (flags & GLOB_QUOTE) { if (flags & GLOB_QUOTE) {
/* Protect the quoted characters. */ /* Protect the quoted characters. */
while (bufnext < bufend && (c = *patnext++) != EOS) while (bufnext < bufend && (c = *patnext++) != CHAR_EOS)
if (c == QUOTE) { if (c == CHAR_QUOTE) {
if ((c = *patnext++) == EOS) { if ((c = *patnext++) == CHAR_EOS) {
c = QUOTE; c = CHAR_QUOTE;
--patnext; --patnext;
} }
*bufnext++ = c | M_PROTECT; *bufnext++ = c | M_PROTECT;
@@ -200,9 +200,9 @@ glob(const char *pattern,
*bufnext++ = c; *bufnext++ = c;
} }
else else
while (bufnext < bufend && (c = *patnext++) != EOS) while (bufnext < bufend && (c = *patnext++) != CHAR_EOS)
*bufnext++ = c; *bufnext++ = c;
*bufnext = EOS; *bufnext = CHAR_EOS;
if (flags & GLOB_BRACE) if (flags & GLOB_BRACE)
return globexp1(patbuf, pglob); return globexp1(patbuf, pglob);
@@ -221,10 +221,10 @@ static int globexp1(const Char *pattern, glob_t *pglob)
int rv; int rv;
/* Protect a single {}, for find(1), like csh */ /* Protect a single {}, for find(1), like csh */
if (pattern[0] == LBRACE && pattern[1] == RBRACE && pattern[2] == EOS) if (pattern[0] == CHAR_LBRACE && pattern[1] == CHAR_RBRACE && pattern[2] == CHAR_EOS)
return glob0(pattern, pglob); return glob0(pattern, pglob);
while ((ptr = (const Char *) g_strchr((Char *) ptr, LBRACE)) != NULL) while ((ptr = (const Char *) g_strchr((Char *) ptr, CHAR_LBRACE)) != NULL)
if (!globexp2(ptr, pattern, pglob, &rv)) if (!globexp2(ptr, pattern, pglob, &rv))
return rv; return rv;
@@ -252,59 +252,59 @@ static int globexp2(const Char *ptr, const Char *pattern,
/* Find the balanced brace */ /* Find the balanced brace */
for (i = 0, pe = ++ptr; *pe; pe++) for (i = 0, pe = ++ptr; *pe; pe++)
if (*pe == LBRACKET) { if (*pe == CHAR_LBRACKET) {
/* Ignore everything between [] */ /* Ignore everything between [] */
for (pm = pe++; *pe != RBRACKET && *pe != EOS; pe++) for (pm = pe++; *pe != CHAR_RBRACKET && *pe != CHAR_EOS; pe++)
continue; continue;
if (*pe == EOS) { if (*pe == CHAR_EOS) {
/* /*
* We could not find a matching RBRACKET. * We could not find a matching CHAR_RBRACKET.
* Ignore and just look for RBRACE * Ignore and just look for CHAR_RBRACE
*/ */
pe = pm; pe = pm;
} }
} }
else if (*pe == LBRACE) else if (*pe == CHAR_LBRACE)
i++; i++;
else if (*pe == RBRACE) { else if (*pe == CHAR_RBRACE) {
if (i == 0) if (i == 0)
break; break;
i--; i--;
} }
/* Non matching braces; just glob the pattern */ /* Non matching braces; just glob the pattern */
if (i != 0 || *pe == EOS) { if (i != 0 || *pe == CHAR_EOS) {
*rv = glob0(patbuf, pglob); *rv = glob0(patbuf, pglob);
return 0; return 0;
} }
for (i = 0, pl = pm = ptr; pm <= pe; pm++) for (i = 0, pl = pm = ptr; pm <= pe; pm++)
switch (*pm) { switch (*pm) {
case LBRACKET: case CHAR_LBRACKET:
/* Ignore everything between [] */ /* Ignore everything between [] */
for (pl = pm++; *pm != RBRACKET && *pm != EOS; pm++) for (pl = pm++; *pm != CHAR_RBRACKET && *pm != CHAR_EOS; pm++)
continue; continue;
if (*pm == EOS) { if (*pm == CHAR_EOS) {
/* /*
* We could not find a matching RBRACKET. * We could not find a matching CHAR_RBRACKET.
* Ignore and just look for RBRACE * Ignore and just look for CHAR_RBRACE
*/ */
pm = pl; pm = pl;
} }
break; break;
case LBRACE: case CHAR_LBRACE:
i++; i++;
break; break;
case RBRACE: case CHAR_RBRACE:
if (i) { if (i) {
i--; i--;
break; break;
} }
/* FALLTHROUGH */ /* FALLTHROUGH */
case COMMA: case CHAR_COMMA:
if (i && *pm == COMMA) if (i && *pm == CHAR_COMMA)
break; break;
else { else {
/* Append the current string */ /* Append the current string */
@@ -314,7 +314,7 @@ static int globexp2(const Char *ptr, const Char *pattern,
* Append the rest of the pattern after the * Append the rest of the pattern after the
* closing brace * closing brace
*/ */
for (pl = pe + 1; (*lm++ = *pl++) != EOS;) for (pl = pe + 1; (*lm++ = *pl++) != CHAR_EOS;)
continue; continue;
/* Expand the current pattern */ /* Expand the current pattern */
@@ -348,17 +348,17 @@ globtilde(const Char *pattern, Char *patbuf, glob_t *pglob)
const Char *p; const Char *p;
Char *b; Char *b;
if (*pattern != TILDE || !(pglob->gl_flags & GLOB_TILDE)) if (*pattern != CHAR_TILDE || !(pglob->gl_flags & GLOB_TILDE))
return pattern; return pattern;
/* Copy up to the end of the string or / */ /* Copy up to the end of the string or / */
for (p = pattern + 1, h = (char *) patbuf; *p && *p != SLASH; for (p = pattern + 1, h = (char *) patbuf; *p && *p != CHAR_SLASH;
*h++ = *p++) *h++ = *p++)
continue; continue;
*h = EOS; *h = CHAR_EOS;
if (((char *) patbuf)[0] == EOS) { if (((char *) patbuf)[0] == CHAR_EOS) {
/* /*
* handle a plain ~ or ~/ by expanding $HOME * handle a plain ~ or ~/ by expanding $HOME
* first and then trying the password file * first and then trying the password file
@@ -385,7 +385,7 @@ globtilde(const Char *pattern, Char *patbuf, glob_t *pglob)
continue; continue;
/* Append the rest of the pattern */ /* Append the rest of the pattern */
while ((*b++ = *p++) != EOS) while ((*b++ = *p++) != CHAR_EOS)
continue; continue;
return patbuf; return patbuf;
@@ -411,40 +411,40 @@ glob0(const Char *pattern, glob_t *pglob)
bufnext = patbuf; bufnext = patbuf;
/* We don't need to check for buffer overflow any more. */ /* We don't need to check for buffer overflow any more. */
while ((c = *qpatnext++) != EOS) { while ((c = *qpatnext++) != CHAR_EOS) {
switch (c) { switch (c) {
case LBRACKET: case CHAR_LBRACKET:
c = *qpatnext; c = *qpatnext;
if (c == NOT) if (c == CHAR_NOT)
++qpatnext; ++qpatnext;
if (*qpatnext == EOS || if (*qpatnext == CHAR_EOS ||
g_strchr((Char *) qpatnext+1, RBRACKET) == NULL) { g_strchr((Char *) qpatnext+1, CHAR_RBRACKET) == NULL) {
*bufnext++ = LBRACKET; *bufnext++ = CHAR_LBRACKET;
if (c == NOT) if (c == CHAR_NOT)
--qpatnext; --qpatnext;
break; break;
} }
*bufnext++ = M_SET; *bufnext++ = M_SET;
if (c == NOT) if (c == CHAR_NOT)
*bufnext++ = M_NOT; *bufnext++ = M_NOT;
c = *qpatnext++; c = *qpatnext++;
do { do {
*bufnext++ = CHAR(c); *bufnext++ = CHAR(c);
if (*qpatnext == RANGE && if (*qpatnext == CHAR_RANGE &&
(c = qpatnext[1]) != RBRACKET) { (c = qpatnext[1]) != CHAR_RBRACKET) {
*bufnext++ = M_RNG; *bufnext++ = M_RNG;
*bufnext++ = CHAR(c); *bufnext++ = CHAR(c);
qpatnext += 2; qpatnext += 2;
} }
} while ((c = *qpatnext++) != RBRACKET); } while ((c = *qpatnext++) != CHAR_RBRACKET);
pglob->gl_flags |= GLOB_MAGCHAR; pglob->gl_flags |= GLOB_MAGCHAR;
*bufnext++ = M_END; *bufnext++ = M_END;
break; break;
case QUESTION: case CHAR_QUESTION:
pglob->gl_flags |= GLOB_MAGCHAR; pglob->gl_flags |= GLOB_MAGCHAR;
*bufnext++ = M_ONE; *bufnext++ = M_ONE;
break; break;
case STAR: case CHAR_STAR:
pglob->gl_flags |= GLOB_MAGCHAR; pglob->gl_flags |= GLOB_MAGCHAR;
/* collapse adjacent stars to one, /* collapse adjacent stars to one,
* to avoid exponential behavior * to avoid exponential behavior
@@ -457,7 +457,7 @@ glob0(const Char *pattern, glob_t *pglob)
break; break;
} }
} }
*bufnext = EOS; *bufnext = CHAR_EOS;
#ifdef DEBUG #ifdef DEBUG
qprintf("glob0:", patbuf); qprintf("glob0:", patbuf);
#endif #endif
@@ -494,7 +494,7 @@ glob1(Char *pattern, glob_t *pglob)
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 == CHAR_EOS)
return(0); return(0);
return(glob2(pathbuf, pathbuf, pattern, pglob)); return(glob2(pathbuf, pathbuf, pattern, pglob));
} }
@@ -525,18 +525,18 @@ glob2(Char *pathbuf, Char *pathend, Char *pattern, glob_t *pglob)
* segment with meta character found. * segment with meta character found.
*/ */
for (anymeta = 0;;) { for (anymeta = 0;;) {
if (*pattern == EOS) { /* End of pattern? */ if (*pattern == CHAR_EOS) { /* End of pattern? */
*pathend = EOS; *pathend = CHAR_EOS;
if (g_lstat(pathbuf, &sb, pglob)) if (g_lstat(pathbuf, &sb, pglob))
return(0); return(0);
if (((pglob->gl_flags & GLOB_MARK) && if (((pglob->gl_flags & GLOB_MARK) &&
pathend[-1] != SEP) && (S_ISDIR(sb.st_mode) pathend[-1] != CHAR_SEP) && (S_ISDIR(sb.st_mode)
|| (S_ISLNK(sb.st_mode) && || (S_ISLNK(sb.st_mode) &&
(g_stat(pathbuf, &sb, pglob) == 0) && (g_stat(pathbuf, &sb, pglob) == 0) &&
S_ISDIR(sb.st_mode)))) { S_ISDIR(sb.st_mode)))) {
*pathend++ = SEP; *pathend++ = CHAR_SEP;
*pathend = EOS; *pathend = CHAR_EOS;
} }
++pglob->gl_matchc; ++pglob->gl_matchc;
return(globextend(pathbuf, pglob)); return(globextend(pathbuf, pglob));
@@ -545,7 +545,7 @@ glob2(Char *pathbuf, Char *pathend, Char *pattern, glob_t *pglob)
/* Find end of next segment, copy tentatively to pathend. */ /* Find end of next segment, copy tentatively to pathend. */
q = pathend; q = pathend;
p = pattern; p = pattern;
while (*p != EOS && *p != SEP) { while (*p != CHAR_EOS && *p != CHAR_SEP) {
if (ismeta(*p)) if (ismeta(*p))
anymeta = 1; anymeta = 1;
*q++ = *p++; *q++ = *p++;
@@ -554,12 +554,12 @@ glob2(Char *pathbuf, Char *pathend, Char *pattern, glob_t *pglob)
if (!anymeta) { /* No expansion, do next segment. */ if (!anymeta) { /* No expansion, do next segment. */
pathend = q; pathend = q;
pattern = p; pattern = p;
while (*pattern == SEP) while (*pattern == CHAR_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));
} }
/* NOTREACHED */ /* CHAR_NOTREACHED */
} }
static int static int
@@ -579,7 +579,7 @@ glob3(Char *pathbuf, Char *pathend, Char *pattern, Char *restpattern,
*/ */
struct dirent *(*readdirfunc)(void *); struct dirent *(*readdirfunc)(void *);
*pathend = EOS; *pathend = CHAR_EOS;
errno = 0; errno = 0;
if ((dirp = g_opendir(pathbuf, pglob)) == NULL) { if ((dirp = g_opendir(pathbuf, pglob)) == NULL) {
@@ -604,14 +604,14 @@ glob3(Char *pathbuf, Char *pathend, Char *pattern, Char *restpattern,
u_char *sc; u_char *sc;
Char *dc; Char *dc;
/* Initial DOT must be matched literally. */ /* Initial CHAR_DOT must be matched literally. */
if (dp->d_name[0] == DOT && *pattern != DOT) if (dp->d_name[0] == CHAR_DOT && *pattern != CHAR_DOT)
continue; continue;
for (sc = (u_char *) dp->d_name, dc = pathend; for (sc = (u_char *) dp->d_name, dc = pathend;
(*dc++ = *sc++) != EOS;) (*dc++ = *sc++) != CHAR_EOS;)
continue; continue;
if (!match(pathend, pattern, restpattern)) { if (!match(pathend, pattern, restpattern)) {
*pathend = EOS; *pathend = CHAR_EOS;
continue; continue;
} }
err = glob2(pathbuf, --dc, restpattern, pglob); err = glob2(pathbuf, --dc, restpattern, pglob);
@@ -695,17 +695,17 @@ match(Char *name, Char *pat, Char *patend)
do do
if (match(name, pat, patend)) if (match(name, pat, patend))
return(1); return(1);
while (*name++ != EOS); while (*name++ != CHAR_EOS);
return(0); return(0);
case M_ONE: case M_ONE:
if (*name++ == EOS) if (*name++ == CHAR_EOS)
return(0); return(0);
break; break;
case M_SET: case M_SET:
ok = 0; ok = 0;
if ((k = *name++) == EOS) if ((k = *name++) == CHAR_EOS)
return(0); return(0);
if ((negate_range = ((*pat & M_MASK) == M_NOT)) != EOS) if ((negate_range = ((*pat & M_MASK) == M_NOT)) != CHAR_EOS)
++pat; ++pat;
while (((c = *pat++) & M_MASK) != M_END) while (((c = *pat++) & M_MASK) != M_END)
if ((*pat & M_MASK) == M_RNG) { if ((*pat & M_MASK) == M_RNG) {
@@ -723,7 +723,7 @@ match(Char *name, Char *pat, Char *patend)
break; break;
} }
} }
return(*name == EOS); return(*name == CHAR_EOS);
} }
/* Free allocated data belonging to a glob_t structure. */ /* Free allocated data belonging to a glob_t structure. */
@@ -799,7 +799,7 @@ g_strcat(Char *dst, const Char *src)
while (*dst++) while (*dst++)
continue; continue;
--dst; --dst;
while((*dst++ = *src++) != EOS) while((*dst++ = *src++) != CHAR_EOS)
continue; continue;
return (sdst); return (sdst);
@@ -811,7 +811,7 @@ g_Ctoc(const Char *str, char *buf)
{ {
char *dc; char *dc;
for (dc = buf; (*dc++ = *str++) != EOS;) for (dc = buf; (*dc++ = *str++) != CHAR_EOS;)
continue; continue;
} }