diff options
| -rwxr-xr-x | Configure | 6 | ||||
| -rw-r--r-- | doarg.c | 20 | ||||
| -rw-r--r-- | doio.c | 9 | ||||
| -rw-r--r-- | hints/isc_3_2_3.sh | 2 | ||||
| -rw-r--r-- | installperl | 1 | ||||
| -rw-r--r-- | patchlevel.h | 2 | ||||
| -rw-r--r-- | perlsh | 2 | ||||
| -rw-r--r-- | perly.y | 7 | ||||
| -rw-r--r-- | str.c | 7 | ||||
| -rw-r--r-- | toke.c | 8 | ||||
| -rw-r--r-- | util.c | 7 | ||||
| -rw-r--r-- | util.h | 6 |
12 files changed, 54 insertions, 23 deletions
@@ -8,7 +8,7 @@ # and edit it to reflect your system. Some packages may include samples # of config.h for certain machines, so you might look for one of those.) # -# $RCSfile: Configure,v $$Revision: 4.0.1.7 $$Date: 92/06/08 11:38:16 $ +# $RCSfile: Configure,v $$Revision: 4.0.1.8 $$Date: 92/06/11 21:04:45 $ # # Yes, you may rip this off to use in other distribution packages. # (Note: this Configure script was generated automatically. Rather than @@ -2080,7 +2080,7 @@ main() exit(0); } EOCP - if $cc safebcpy.c -o safebcpy $ccflags >/dev/null 2>&1 ; then + if $cc safebcpy.c -o safebcpy $ccflags $libs >/dev/null 2>&1 ; then if ./safebcpy; then echo "It can." d_safebcpy=define @@ -2465,7 +2465,7 @@ main() exit(0); } EOCP - if $cc safemcpy.c -o safemcpy $ccflags >/dev/null 2>&1 ; then + if $cc safemcpy.c -o safemcpy $ccflags $libs >/dev/null 2>&1 ; then if ./safemcpy; then echo "It can." d_safemcpy=define @@ -1,4 +1,4 @@ -/* $RCSfile: doarg.c,v $$Revision: 4.0.1.6 $$Date: 92/06/08 12:34:30 $ +/* $RCSfile: doarg.c,v $$Revision: 4.0.1.7 $$Date: 92/06/11 21:07:11 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,10 @@ * License or the Artistic License, as specified in the README file. * * $Log: doarg.c,v $ + * Revision 4.0.1.7 92/06/11 21:07:11 lwall + * patch34: join with null list attempted negative allocation + * patch34: sprintf("%6.4s", "abcdefg") didn't print "abcd " + * * Revision 4.0.1.6 92/06/08 12:34:30 lwall * patch20: removed implicit int declarations on funcions * patch20: pattern modifiers i and o didn't interact right @@ -406,7 +410,7 @@ int *arglast; st += sp + 1; - len = delimlen * (items - 1); + len = (items > 0 ? (delimlen * (items - 1) ) : 0); if (str->str_len < len + items) { /* current length is way too short */ while (items-- > 0) { if (*st) @@ -982,28 +986,28 @@ register STR **sarg; char *mp = index(f, '.'); int min = atoi(f+2); - if (xlen < min) - post = min - xlen; - else if (mp) { + if (mp) { int max = atoi(mp+1); if (xlen > max) xlen = max; } + if (xlen < min) + post = min - xlen; break; } else if (isDIGIT(f[1])) { char *mp = index(f, '.'); int min = atoi(f+1); - if (xlen < min) - pre = min - xlen; - else if (mp) { + if (mp) { int max = atoi(mp+1); if (xlen > max) xlen = max; } + if (xlen < min) + pre = min - xlen; break; } strcpy(tokenbuf+64,f); /* sprintf($s,...$s...) */ @@ -1,4 +1,4 @@ -/* $RCSfile: doio.c,v $$Revision: 4.0.1.5 $$Date: 92/06/08 13:00:21 $ +/* $RCSfile: doio.c,v $$Revision: 4.0.1.6 $$Date: 92/06/11 21:08:16 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: doio.c,v $ + * Revision 4.0.1.6 92/06/11 21:08:16 lwall + * patch34: some systems don't declare h_errno extern in header files + * * Revision 4.0.1.5 92/06/08 13:00:21 lwall * patch20: some machines don't define ENOTSOCK in errno.h * patch20: new warnings for failed use of stat operators on filenames with \n @@ -64,6 +67,10 @@ #endif #endif +#ifdef HOST_NOT_FOUND +extern int h_errno; +#endif + #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) #include <sys/ipc.h> #ifdef HAS_MSG diff --git a/hints/isc_3_2_3.sh b/hints/isc_3_2_3.sh new file mode 100644 index 0000000000..ca1b549426 --- /dev/null +++ b/hints/isc_3_2_3.sh @@ -0,0 +1,2 @@ +set `echo $libswanted | sed -e 's/ socket / inet /'` +libswanted="$*" diff --git a/installperl b/installperl index 7f9d36e741..b5ef496f91 100644 --- a/installperl +++ b/installperl @@ -150,6 +150,7 @@ if (chdir "lib") { if ($?) { &unlink("$installprivlib/$file"); &cmd("cp $file $installprivlib"); + &chmod(0644, "$installprivlib/$file"); } } } diff --git a/patchlevel.h b/patchlevel.h index 1d5b76f174..3b47b479b6 100644 --- a/patchlevel.h +++ b/patchlevel.h @@ -1 +1 @@ -#define PATCHLEVEL 33 +#define PATCHLEVEL 34 @@ -6,7 +6,7 @@ # Note that it must be a complete perl statement--don't type double # carriage return in the middle of a loop. -$/ = ''; # set paragraph mode +$/ = "\n\n"; # set paragraph mode $SHlinesep = "\n"; while ($SHcmd = <>) { $/ = $SHlinesep; @@ -1,4 +1,4 @@ -/* $RCSfile: perly.y,v $$Revision: 4.0.1.4 $$Date: 92/06/08 17:33:25 $ +/* $RCSfile: perly.y,v $$Revision: 4.0.1.5 $$Date: 92/06/11 21:12:50 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: perly.y,v $ + * Revision 4.0.1.5 92/06/11 21:12:50 lwall + * patch34: expectterm incorrectly set to indicate start of program or block + * * Revision 4.0.1.4 92/06/08 17:33:25 lwall * patch20: one of the backdoors to expectterm was on the wrong reduction * @@ -106,8 +109,8 @@ prog : /* NULL */ { #if defined(YYDEBUG) && defined(DEBUGGING) yydebug = (debug & 1); - expectterm = 2; #endif + expectterm = 2; } /*CONTINUED*/ lineseq { if (in_eval) @@ -1,4 +1,4 @@ -/* $RCSfile: str.c,v $$Revision: 4.0.1.5 $$Date: 92/06/08 15:40:43 $ +/* $RCSfile: str.c,v $$Revision: 4.0.1.6 $$Date: 92/06/11 21:14:21 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: str.c,v $ + * Revision 4.0.1.6 92/06/11 21:14:21 lwall + * patch34: quotes containing subscripts containing variables didn't parse right + * * Revision 4.0.1.5 92/06/08 15:40:43 lwall * patch20: removed implicit int declarations on functions * patch20: Perl now distinguishes overlapped copies from non-overlapped @@ -1048,7 +1051,7 @@ STR *src; case '&': case '*': s = scanident(s,send,tokenbuf); - break; + continue; case '\'': case '"': /*SUPPRESS 68*/ @@ -1,4 +1,4 @@ -/* $RCSfile: toke.c,v $$Revision: 4.0.1.6 $$Date: 92/06/08 16:03:49 $ +/* $RCSfile: toke.c,v $$Revision: 4.0.1.7 $$Date: 92/06/11 21:16:30 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: toke.c,v $ + * Revision 4.0.1.7 92/06/11 21:16:30 lwall + * patch34: expectterm incorrectly set to indicate start of program or block + * * Revision 4.0.1.6 92/06/08 16:03:49 lwall * patch20: an EXPR may now start with a bareword * patch20: print $fh EXPR can now expect term rather than operator in EXPR @@ -532,7 +535,8 @@ yylex() yylval.ival = curcmd->c_line; if (isSPACE(*s) || *s == '#') cmdline = NOLINE; /* invalidate current command line number */ - OPERATOR(tmp); + expectterm = 2; + RETURN(tmp); case ';': if (curcmd->c_line < cmdline) cmdline = curcmd->c_line; @@ -1,4 +1,4 @@ -/* $RCSfile: util.c,v $$Revision: 4.0.1.5 $$Date: 92/06/08 16:08:37 $ +/* $RCSfile: util.c,v $$Revision: 4.0.1.6 $$Date: 92/06/11 21:18:47 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: util.c,v $ + * Revision 4.0.1.6 92/06/11 21:18:47 lwall + * patch34: boneheaded typo in my_bcopy() + * * Revision 4.0.1.5 92/06/08 16:08:37 lwall * patch20: removed implicit int declarations on functions * patch20: Perl now distinguishes overlapped copies from non-overlapped @@ -1185,7 +1188,7 @@ register int len; to += len; from += len; while (len--) - --*to = --*from; + *(--to) = *(--from); } return retval; } @@ -1,4 +1,4 @@ -/* $RCSfile: util.h,v $$Revision: 4.0.1.3 $$Date: 92/06/08 16:09:20 $ +/* $RCSfile: util.h,v $$Revision: 4.0.1.4 $$Date: 92/06/11 21:19:36 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: util.h,v $ + * Revision 4.0.1.4 92/06/11 21:19:36 lwall + * patch34: pidgone() wasn't declared right + * * Revision 4.0.1.3 92/06/08 16:09:20 lwall * patch20: bcopy() and memcpy() now tested for overlap safety * @@ -52,3 +55,4 @@ int my_memcmp(); #endif unsigned long scanoct(); unsigned long scanhex(); +void pidgone(); |