diff options
Diffstat (limited to 'contrib/tcsh/sh.dir.c')
| -rw-r--r-- | contrib/tcsh/sh.dir.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/contrib/tcsh/sh.dir.c b/contrib/tcsh/sh.dir.c index 9f72951..ab89855 100644 --- a/contrib/tcsh/sh.dir.c +++ b/contrib/tcsh/sh.dir.c @@ -1,4 +1,4 @@ -/* $Header: /p/tcsh/cvsroot/tcsh/sh.dir.c,v 3.80 2007/05/08 21:05:34 christos Exp $ */ +/* $Header: /p/tcsh/cvsroot/tcsh/sh.dir.c,v 3.82 2011/10/16 16:25:05 christos Exp $ */ /* * sh.dir.c: Directory manipulation functions */ @@ -33,7 +33,7 @@ #include "sh.h" #include "ed.h" -RCSID("$tcsh: sh.dir.c,v 3.80 2007/05/08 21:05:34 christos Exp $") +RCSID("$tcsh: sh.dir.c,v 3.82 2011/10/16 16:25:05 christos Exp $") /* * C Shell - directory management @@ -204,10 +204,12 @@ skipargs(Char ***v, const char *dstr, const char *str) for (n++; loop && *n != NULL && (*n)[0] == '-'; n++) if (*(s = &((*n)[1])) == '\0') /* test for bare "-" argument */ dflag |= DIR_OLD; - else { + else if ((*n)[1] == '-' && (*n)[2] == '\0') { /* test for -- */ + n++; + break; + } else { char *p; - while (*s != '\0') /* examine flags */ - { + while (*s != '\0') /* examine flags */ { if ((p = strchr(dstr, *s++)) != NULL) dflag |= (1 << (p - dstr)); else @@ -643,9 +645,13 @@ dfollow(Char *cp, int old) Char **cdp; for (cdp = c->vec; *cdp; cdp++) { + size_t len = Strlen(*cdp); buf.len = 0; - Strbuf_append(&buf, *cdp); - Strbuf_append1(&buf, '/'); + if (len > 0) { + Strbuf_append(&buf, *cdp); + if ((*cdp)[len - 1] != '/') + Strbuf_append1(&buf, '/'); + } Strbuf_append(&buf, cp); Strbuf_terminate(&buf); /* |
