diff options
author | mp <mp@FreeBSD.org> | 2001-09-05 17:49:32 +0000 |
---|---|---|
committer | mp <mp@FreeBSD.org> | 2001-09-05 17:49:32 +0000 |
commit | 538cdbc622d96ebd9ba6fae4c5b21f8704e88d90 (patch) | |
tree | 836fb15b752f30ac10f0e8bc35125091d7a821a3 /contrib/tcsh/sh.glob.c | |
parent | 9b07833722e76f7d023c491eaf74bf278221b55d (diff) | |
download | FreeBSD-src-538cdbc622d96ebd9ba6fae4c5b21f8704e88d90.zip FreeBSD-src-538cdbc622d96ebd9ba6fae4c5b21f8704e88d90.tar.gz |
Import tcsh-6.11
Diffstat (limited to 'contrib/tcsh/sh.glob.c')
-rw-r--r-- | contrib/tcsh/sh.glob.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/contrib/tcsh/sh.glob.c b/contrib/tcsh/sh.glob.c index 0af5825..2b39c76 100644 --- a/contrib/tcsh/sh.glob.c +++ b/contrib/tcsh/sh.glob.c @@ -1,4 +1,4 @@ -/* $Header: /src/pub/tcsh/sh.glob.c,v 3.47 2000/11/11 23:03:37 christos Exp $ */ +/* $Header: /src/pub/tcsh/sh.glob.c,v 3.48 2001/01/04 18:51:57 christos Exp $ */ /* * sh.glob.c: Regular expression expansion */ @@ -36,7 +36,7 @@ */ #include "sh.h" -RCSID("$Id: sh.glob.c,v 3.47 2000/11/11 23:03:37 christos Exp $") +RCSID("$Id: sh.glob.c,v 3.48 2001/01/04 18:51:57 christos Exp $") #include "tc.h" @@ -450,14 +450,12 @@ globexpand(v) /* * Step 4: expand .. if the variable symlinks==expand is set */ - if ( symlinks == SYM_EXPAND ) + if (symlinks == SYM_EXPAND) { for (s = *vl; s; s = *++vl) { - char *path = short2str(s); - if (strstr(path, "..") != NULL && access(path, F_OK) == 0) { - *vl = dnormalize(s, 1); - xfree((ptr_t) s); - } + *vl = dnormalize(s, 1); + xfree((ptr_t) s); } + } vl = nv; return (vl); |