mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-10-13 11:21:13 +02:00
15965: glob -> zglob
This commit is contained in:
parent
7668a03cb2
commit
d177e890b6
3 changed files with 3 additions and 3 deletions
|
@ -1755,7 +1755,7 @@ execcmd(Estate state, int input, int output, int how, int last1)
|
||||||
if (!(cflags & BINF_NOGLOB))
|
if (!(cflags & BINF_NOGLOB))
|
||||||
while (!checked && !errflag && args && nonempty(args) &&
|
while (!checked && !errflag && args && nonempty(args) &&
|
||||||
has_token((char *) peekfirst(args)))
|
has_token((char *) peekfirst(args)))
|
||||||
glob(args, firstnode(args), 0);
|
zglob(args, firstnode(args), 0);
|
||||||
else if (!unglobbed) {
|
else if (!unglobbed) {
|
||||||
for (node = firstnode(args); node; incnode(node))
|
for (node = firstnode(args); node; incnode(node))
|
||||||
untokenize((char *) getdata(node));
|
untokenize((char *) getdata(node));
|
||||||
|
|
|
@ -920,7 +920,7 @@ gmatchcmp(Gmatch a, Gmatch b)
|
||||||
|
|
||||||
/**/
|
/**/
|
||||||
void
|
void
|
||||||
glob(LinkList list, LinkNode np, int nountok)
|
zglob(LinkList list, LinkNode np, int nountok)
|
||||||
{
|
{
|
||||||
struct qual *qo, *qn, *ql;
|
struct qual *qo, *qn, *ql;
|
||||||
LinkNode node = prevnode(np);
|
LinkNode node = prevnode(np);
|
||||||
|
|
|
@ -233,7 +233,7 @@ globlist(LinkList list, int nountok)
|
||||||
badcshglob = 0;
|
badcshglob = 0;
|
||||||
for (node = firstnode(list); !errflag && node; node = next) {
|
for (node = firstnode(list); !errflag && node; node = next) {
|
||||||
next = nextnode(node);
|
next = nextnode(node);
|
||||||
glob(list, node, nountok);
|
zglob(list, node, nountok);
|
||||||
}
|
}
|
||||||
if (badcshglob == 1)
|
if (badcshglob == 1)
|
||||||
zerr("no match", NULL, 0);
|
zerr("no match", NULL, 0);
|
||||||
|
|
Loading…
Reference in a new issue