diff options
| author | Larry Wall <lwall@jpl-devvax.jpl.nasa.gov> | 1989-11-10 16:20:57 +0000 |
|---|---|---|
| committer | Larry Wall <lwall@jpl-devvax.jpl.nasa.gov> | 1989-11-10 16:20:57 +0000 |
| commit | ae98613044a1084886d80b8283b25bad38cfd171 (patch) | |
| tree | 7dfe17f2ae5835a17db41a0bb4d7ef903d6ff3d9 /toke.c | |
| parent | bf38876a182e0df9dd73362f56cf0ab8b43aa789 (diff) | |
| download | perl-ae98613044a1084886d80b8283b25bad38cfd171.tar.gz | |
perl 3.0 patch #4 Patch #2 continued
Diffstat (limited to 'toke.c')
| -rw-r--r-- | toke.c | 28 |
1 files changed, 19 insertions, 9 deletions
@@ -1,4 +1,4 @@ -/* $Header: toke.c,v 3.0.1.1 89/10/26 23:26:21 lwall Locked $ +/* $Header: toke.c,v 3.0.1.2 89/11/11 05:04:42 lwall Locked $ * * Copyright (c) 1989, Larry Wall * @@ -6,6 +6,9 @@ * as specified in the README file that comes with the perl 3.0 kit. * * $Log: toke.c,v $ + * Revision 3.0.1.2 89/11/11 05:04:42 lwall + * patch2: fixed a CLINE macro conflict + * * Revision 3.0.1.1 89/10/26 23:26:21 lwall * patch1: disambiguated word after "sort" better * @@ -20,6 +23,9 @@ char *reparse; /* if non-null, scanreg found ${foo[$bar]} */ +#ifdef CLINE +#undef CLINE +#endif #define CLINE (cmdline = (line < cmdline ? line : cmdline)) #define META(c) ((c) | 128) @@ -86,7 +92,7 @@ yylex() retry: #ifdef YYDEBUG - if (yydebug) + if (debug & 1) if (index(s,'\n')) fprintf(stderr,"Tokener at %s",s); else @@ -159,7 +165,13 @@ yylex() } #endif bufend = linestr->str_ptr + linestr->str_cur; - firstline = FALSE; + if (firstline) { + while (s < bufend && isspace(*s)) + s++; + if (*s == ':') /* for csh's that have to exec sh scripts */ + s++; + firstline = FALSE; + } goto retry; case ' ': case '\t': case '\f': s++; @@ -2094,10 +2106,8 @@ load_format() set_csh() { - if (!csh) { - if (stat("/bin/csh",&statbuf) < 0) - csh = -1; - else - csh = 1; - } +#ifdef CSH + if (!cshlen) + cshlen = strlen(cshname); +#endif } |