about summary refs log tree commit diff
path: root/Src
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2001-10-08 08:14:10 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2001-10-08 08:14:10 +0000
commitd177e890b607bc18f2850ea2b2aa27db14f05d50 (patch)
tree96cc21852f967b2a37b5aefb1179689c2587414f /Src
parent7668a03cb291f64ecfe89cdb65d070fb68eaff2d (diff)
downloadzsh-d177e890b607bc18f2850ea2b2aa27db14f05d50.tar.gz
zsh-d177e890b607bc18f2850ea2b2aa27db14f05d50.tar.xz
zsh-d177e890b607bc18f2850ea2b2aa27db14f05d50.zip
15965: glob -> zglob
Diffstat (limited to 'Src')
-rw-r--r--Src/exec.c2
-rw-r--r--Src/glob.c2
-rw-r--r--Src/subst.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/Src/exec.c b/Src/exec.c
index fda120d32..4f2916eec 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -1755,7 +1755,7 @@ execcmd(Estate state, int input, int output, int how, int last1)
 	    if (!(cflags & BINF_NOGLOB))
 		while (!checked && !errflag && args && nonempty(args) &&
 		       has_token((char *) peekfirst(args)))
-		    glob(args, firstnode(args), 0);
+		    zglob(args, firstnode(args), 0);
 	    else if (!unglobbed) {
 		for (node = firstnode(args); node; incnode(node))
 		    untokenize((char *) getdata(node));
diff --git a/Src/glob.c b/Src/glob.c
index 2f64434c4..f0fbe2ba1 100644
--- a/Src/glob.c
+++ b/Src/glob.c
@@ -920,7 +920,7 @@ gmatchcmp(Gmatch a, Gmatch b)
 
 /**/
 void
-glob(LinkList list, LinkNode np, int nountok)
+zglob(LinkList list, LinkNode np, int nountok)
 {
     struct qual *qo, *qn, *ql;
     LinkNode node = prevnode(np);
diff --git a/Src/subst.c b/Src/subst.c
index c33302be3..88758aaf3 100644
--- a/Src/subst.c
+++ b/Src/subst.c
@@ -233,7 +233,7 @@ globlist(LinkList list, int nountok)
     badcshglob = 0;
     for (node = firstnode(list); !errflag && node; node = next) {
 	next = nextnode(node);
-	glob(list, node, nountok);
+	zglob(list, node, nountok);
     }
     if (badcshglob == 1)
 	zerr("no match", NULL, 0);