diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2000-12-05 10:34:23 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2000-12-05 10:34:23 +0000 |
| commit | 0c96a1b9637487a49bcbdf8dbd8577a71a69203c (patch) | |
| tree | e082c3425c0c9b50e2fee1e9a4146fa61f875cc9 /Src/glob.c | |
| parent | c1a4af81c6d00bdb1ef8342388e760ccd0aa1dd8 (diff) | |
| download | zsh-0c96a1b9637487a49bcbdf8dbd8577a71a69203c.tar.gz zsh-0c96a1b9637487a49bcbdf8dbd8577a71a69203c.zip | |
Joel Smith: 13230: avoid name clashes with Linux kernel
Diffstat (limited to 'Src/glob.c')
| -rw-r--r-- | Src/glob.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Src/glob.c b/Src/glob.c index 5e6283ed0..8f2f54952 100644 --- a/Src/glob.c +++ b/Src/glob.c @@ -1626,9 +1626,9 @@ xpandredir(struct redir *fn, LinkList tab) char *s = peekfirst(&fake); fn->name = s; untokenize(s); - if (fn->type == MERGEIN || fn->type == MERGEOUT) { + if (fn->type == REDIR_MERGEIN || fn->type == REDIR_MERGEOUT) { if (s[0] == '-' && !s[1]) - fn->type = CLOSE; + fn->type = REDIR_CLOSE; else if (s[0] == 'p' && !s[1]) fn->fd2 = -2; else { @@ -1636,17 +1636,17 @@ xpandredir(struct redir *fn, LinkList tab) s++; if (!*s && s > fn->name) fn->fd2 = zstrtol(fn->name, NULL, 10); - else if (fn->type == MERGEIN) + else if (fn->type == REDIR_MERGEIN) zerr("file number expected", NULL, 0); else - fn->type = ERRWRITE; + fn->type = REDIR_ERRWRITE; } } - } else if (fn->type == MERGEIN) + } else if (fn->type == REDIR_MERGEIN) zerr("file number expected", NULL, 0); else { - if (fn->type == MERGEOUT) - fn->type = ERRWRITE; + if (fn->type == REDIR_MERGEOUT) + fn->type = REDIR_ERRWRITE; while ((nam = (char *)ugetnode(&fake))) { /* Loop over matches, duplicating the * * redirection for each file found. */ |