diff options
| author | mp <mp@FreeBSD.org> | 2009-07-11 05:35:08 +0000 |
|---|---|---|
| committer | mp <mp@FreeBSD.org> | 2009-07-11 05:35:08 +0000 |
| commit | e5921a6fae9164c5f8ad6bb718db42f3f7a9e455 (patch) | |
| tree | b22c970391cc429da340ec007eb76294ea034b89 /contrib/tcsh/sh.glob.c | |
| parent | 9b2f8ecbb332eb8e16c52d1731de9082d102e68b (diff) | |
| parent | 50eaa69b9f8628c1a960d67f9226b2178e1af1cb (diff) | |
| download | FreeBSD-src-e5921a6fae9164c5f8ad6bb718db42f3f7a9e455.zip FreeBSD-src-e5921a6fae9164c5f8ad6bb718db42f3f7a9e455.tar.gz | |
Update to tcsh 6.17.00.
Approved by: re (kensmith)
Diffstat (limited to 'contrib/tcsh/sh.glob.c')
| -rw-r--r-- | contrib/tcsh/sh.glob.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/contrib/tcsh/sh.glob.c b/contrib/tcsh/sh.glob.c index a7215f3..6ee5ecc 100644 --- a/contrib/tcsh/sh.glob.c +++ b/contrib/tcsh/sh.glob.c @@ -1,4 +1,4 @@ -/* $Header: /p/tcsh/cvsroot/tcsh/sh.glob.c,v 3.74 2006/10/14 17:57:21 christos Exp $ */ +/* $Header: /p/tcsh/cvsroot/tcsh/sh.glob.c,v 3.76 2008/06/19 15:20:56 christos Exp $ */ /* * sh.glob.c: Regular expression expansion */ @@ -32,7 +32,7 @@ */ #include "sh.h" -RCSID("$tcsh: sh.glob.c,v 3.74 2006/10/14 17:57:21 christos Exp $") +RCSID("$tcsh: sh.glob.c,v 3.76 2008/06/19 15:20:56 christos Exp $") #include "tc.h" #include "tw.h" @@ -667,6 +667,7 @@ dobackp(Char *cp, int literal) } if (!*rp) { oops: + cleanup_until(&bb); stderror(ERR_UNMATCHED, '`'); } ep = Strnsave(lp, rp - lp); @@ -842,10 +843,10 @@ backeval(struct blk_buf *bb, struct Strbuf *word, Char *cp, int literal) c = (*ip++ & TRIM); if (c == 0) break; -#ifdef WINNT_NATIVE +#if defined(WINNT_NATIVE) || defined(__CYGWIN__) if (c == '\r') c = ' '; -#endif /* WINNT_NATIVE */ +#endif /* WINNT_NATIVE || __CYGWIN__ */ if (c == '\n') { /* * Continue around the loop one more time, so that we can eat |
