diff options
| author | Tanaka Akira <akr@users.sourceforge.net> | 2000-02-17 14:44:51 +0000 |
|---|---|---|
| committer | Tanaka Akira <akr@users.sourceforge.net> | 2000-02-17 14:44:51 +0000 |
| commit | 493876e0c7669b1185af83e99a7a3345793d628c (patch) | |
| tree | 056c614ff6b4236df596057c86ef086885c0d043 /Src/glob.c | |
| parent | 9aa1735b63b733f062f4061975d8fa65252dee18 (diff) | |
| download | zsh-493876e0c7669b1185af83e99a7a3345793d628c.tar.gz zsh-493876e0c7669b1185af83e99a7a3345793d628c.tar.xz zsh-493876e0c7669b1185af83e99a7a3345793d628c.zip | |
zsh-workers/9777
Diffstat (limited to 'Src/glob.c')
| -rw-r--r-- | Src/glob.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Src/glob.c b/Src/glob.c index f7c67a00f..15fa446ee 100644 --- a/Src/glob.c +++ b/Src/glob.c @@ -872,7 +872,7 @@ gmatchcmp(Gmatch a, Gmatch b) /**/ void -glob(LinkList list, LinkNode np) +glob(LinkList list, LinkNode np, int nountok) { struct qual *qo, *qn, *ql; LinkNode node = prevnode(np); @@ -887,7 +887,8 @@ glob(LinkList list, LinkNode np) MUSTUSEHEAP("glob"); if (unset(GLOBOPT) || !haswilds(ostr)) { - untokenize(ostr); + if (!nountok) + untokenize(ostr); return; } save_globstate(saved); @@ -1339,7 +1340,8 @@ glob(LinkList list, LinkNode np) if (!q || errflag) { /* if parsing failed */ restore_globstate(saved); if (unset(BADPATTERN)) { - untokenize(ostr); + if (!nountok) + untokenize(ostr); insertlinknode(list, node, ostr); return; } @@ -1578,7 +1580,7 @@ xpandredir(struct redir *fn, LinkList tab) prefork(fake, isset(MULTIOS) ? 0 : PF_SINGLE); /* Globbing is only done for multios. */ if (!errflag && isset(MULTIOS)) - globlist(fake); + globlist(fake, 0); if (errflag) return 0; if (nonempty(fake) && !nextnode(firstnode(fake))) { |