diff options
| author | Larry Wall <lwall@jpl-devvax.jpl.nasa.gov> | 1990-10-15 23:07:21 +0000 |
|---|---|---|
| committer | Larry Wall <lwall@jpl-devvax.jpl.nasa.gov> | 1990-10-15 23:07:21 +0000 |
| commit | 20188a906a3fc8fea4839293454a6ca32aa362cc (patch) | |
| tree | da27d1293961a12d429826df7a71ed100812a28e /x2p | |
| parent | 395c379347344a50494d2458b3a5e38ebdeac851 (diff) | |
| download | perl-20188a906a3fc8fea4839293454a6ca32aa362cc.tar.gz | |
perl 3.0 patch #36 patch #29, continued
See patch #29.
Diffstat (limited to 'x2p')
| -rw-r--r-- | x2p/util.c | 35 | ||||
| -rw-r--r-- | x2p/walk.c | 7 |
2 files changed, 9 insertions, 33 deletions
diff --git a/x2p/util.c b/x2p/util.c index 27b08b0862..07f19a3715 100644 --- a/x2p/util.c +++ b/x2p/util.c @@ -1,4 +1,4 @@ -/* $Header: util.c,v 3.0 89/10/18 15:35:35 lwall Locked $ +/* $Header: util.c,v 3.0.1.1 90/10/16 11:34:06 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: util.c,v $ + * Revision 3.0.1.1 90/10/16 11:34:06 lwall + * patch29: removed #ifdef undef + * * Revision 3.0 89/10/18 15:35:35 lwall * 3.0 baseline * @@ -103,36 +106,6 @@ register int len; return to; } -#ifdef undef -/* safe version of string concatenate, with \n deletion and space padding */ - -char * -safecat(to,from,len) -char *to; -register char *from; -register int len; -{ - register char *dest = to; - - len--; /* leave room for null */ - if (*dest) { - while (len && *dest++) len--; - if (len) { - len--; - *(dest-1) = ' '; - } - } - if (from != Nullch) - while (len && (*dest++ = *from++)) len--; - if (len) - dest--; - if (*(dest-1) == '\n') - dest--; - *dest = '\0'; - return to; -} -#endif - /* copy a string up to some (non-backslashed) delimiter, if any */ char * diff --git a/x2p/walk.c b/x2p/walk.c index ce164530b4..555e13c1a3 100644 --- a/x2p/walk.c +++ b/x2p/walk.c @@ -1,4 +1,4 @@ -/* $Header: walk.c,v 3.0.1.5 90/08/09 05:55:01 lwall Locked $ +/* $Header: walk.c,v 3.0.1.6 90/10/16 11:35:51 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: walk.c,v $ + * Revision 3.0.1.6 90/10/16 11:35:51 lwall + * patch29: a2p mistranslated certain weird field separators + * * Revision 3.0.1.5 90/08/09 05:55:01 lwall * patch19: a2p emited local($_) without a semicolon * patch19: a2p didn't make explicit split on whitespace skip leading whitespace @@ -694,7 +697,7 @@ sub Pick {\n\ i = fstr->str_ptr[1] & 127; if (index("*+?.[]()|^$\\",i)) sprintf(tokenbuf,"/\\%c/",i); - else if (i = ' ') + else if (i == ' ') sprintf(tokenbuf,"' '"); else sprintf(tokenbuf,"/%c/",i); |