use the library globbing routines instead of rolling our own

[unix-history] / usr / src / bin / csh / exec.c

diff --git a/usr/src/bin/csh/exec.c b/usr/src/bin/csh/exec.c
index bf6c89e..70c38a4 100644 (file)
--- a/usr/src/bin/csh/exec.c
+++ b/usr/src/bin/csh/exec.c
@@ -5,7 +5,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char *sccsid = "@(#)exec.c      5.7 (Berkeley) %G%";
+static char *sccsid = "@(#)sh.exec.c   5.7 (Berkeley) 5/27/90";

 #endif
 
 #include "sh.h"
 #endif
 
 #include "sh.h"


@@ -67,7 +67,7 @@ doexec(t)
        char *sav;
        register char *dp, **pv, **av;
        register struct varent *v;
        char *sav;
        register char *dp, **pv, **av;
        register struct varent *v;

-       bool slash = any('/', t->t_dcom[0]);
+       bool slash = (bool)index(t->t_dcom[0], '/');

        int hashval, hashval1, i;
        char *blk[2];
 
        int hashval, hashval1, i;
        char *blk[2];
 


@@ -93,7 +93,7 @@ doexec(t)
        gflag = 0; av = &t->t_dcom[1];
        tglob(av);
        if (gflag) {
        gflag = 0; av = &t->t_dcom[1];
        tglob(av);
        if (gflag) {

-               av = glob(av);
+               av = globall(av);

                if (av == 0)
                        error("No match");
        }
                if (av == 0)
                        error("No match");
        }