diff options
Diffstat (limited to 'gnu/usr.bin/perl/x2p')
-rw-r--r-- | gnu/usr.bin/perl/x2p/EXTERN.h | 9 | ||||
-rw-r--r-- | gnu/usr.bin/perl/x2p/INTERN.h | 9 | ||||
-rw-r--r-- | gnu/usr.bin/perl/x2p/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/perl/x2p/a2p.h | 11 | ||||
-rw-r--r-- | gnu/usr.bin/perl/x2p/a2py.c | 11 | ||||
-rw-r--r-- | gnu/usr.bin/perl/x2p/handy.h | 11 | ||||
-rw-r--r-- | gnu/usr.bin/perl/x2p/hash.c | 9 | ||||
-rw-r--r-- | gnu/usr.bin/perl/x2p/hash.h | 9 | ||||
-rw-r--r-- | gnu/usr.bin/perl/x2p/malloc.c | 37 | ||||
-rw-r--r-- | gnu/usr.bin/perl/x2p/str.c | 13 | ||||
-rw-r--r-- | gnu/usr.bin/perl/x2p/str.h | 9 | ||||
-rw-r--r-- | gnu/usr.bin/perl/x2p/util.c | 13 | ||||
-rw-r--r-- | gnu/usr.bin/perl/x2p/util.h | 11 | ||||
-rw-r--r-- | gnu/usr.bin/perl/x2p/walk.c | 15 |
14 files changed, 104 insertions, 65 deletions
diff --git a/gnu/usr.bin/perl/x2p/EXTERN.h b/gnu/usr.bin/perl/x2p/EXTERN.h index f3048ed..b0bb6d0 100644 --- a/gnu/usr.bin/perl/x2p/EXTERN.h +++ b/gnu/usr.bin/perl/x2p/EXTERN.h @@ -1,4 +1,4 @@ -/* $RCSfile: EXTERN.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:11 $ +/* $RCSfile: EXTERN.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:54 $ * * Copyright (c) 1991, Larry Wall * @@ -6,15 +6,18 @@ * License or the Artistic License, as specified in the README file. * * $Log: EXTERN.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:54 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:30:11 nate * PERL! * * Revision 4.0.1.1 91/06/07 12:11:15 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:56:53 lwall * 4.0 baseline. - * + * */ #undef EXT diff --git a/gnu/usr.bin/perl/x2p/INTERN.h b/gnu/usr.bin/perl/x2p/INTERN.h index e1967d2..d8a8a3e 100644 --- a/gnu/usr.bin/perl/x2p/INTERN.h +++ b/gnu/usr.bin/perl/x2p/INTERN.h @@ -1,4 +1,4 @@ -/* $RCSfile: INTERN.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:11 $ +/* $RCSfile: INTERN.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:54 $ * * Copyright (c) 1991, Larry Wall * @@ -6,15 +6,18 @@ * License or the Artistic License, as specified in the README file. * * $Log: INTERN.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:54 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:30:11 nate * PERL! * * Revision 4.0.1.1 91/06/07 12:11:20 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:56:58 lwall * 4.0 baseline. - * + * */ #undef EXT diff --git a/gnu/usr.bin/perl/x2p/Makefile b/gnu/usr.bin/perl/x2p/Makefile index 3d371c6..cc6c2fe 100644 --- a/gnu/usr.bin/perl/x2p/Makefile +++ b/gnu/usr.bin/perl/x2p/Makefile @@ -8,7 +8,7 @@ CLEANFILES+= y.tab.h a2p.c LDADD= -lm DPADD= ${LIBM} -MAN1+= a2p.1 s2p.1 h2ph.1 +MAN1+= a2p.1 s2p.1 h2ph.1 beforeinstall: install -c -o ${BINOWN} -g ${BINGRP} -m 555 ${.CURDIR}/s2p \ diff --git a/gnu/usr.bin/perl/x2p/a2p.h b/gnu/usr.bin/perl/x2p/a2p.h index 7c6a66dd..cc59fb7 100644 --- a/gnu/usr.bin/perl/x2p/a2p.h +++ b/gnu/usr.bin/perl/x2p/a2p.h @@ -1,4 +1,4 @@ -/* $RCSfile: a2p.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:09 $ +/* $RCSfile: a2p.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:53 $ * * Copyright (c) 1991, Larry Wall * @@ -6,18 +6,21 @@ * License or the Artistic License, as specified in the README file. * * $Log: a2p.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:53 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:30:09 nate * PERL! * * Revision 4.0.1.2 92/06/08 16:12:23 lwall * patch20: hash tables now split only if the memory is available to do so - * + * * Revision 4.0.1.1 91/06/07 12:12:27 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:57:07 lwall * 4.0 baseline. - * + * */ #define VOIDUSED 1 diff --git a/gnu/usr.bin/perl/x2p/a2py.c b/gnu/usr.bin/perl/x2p/a2py.c index 1558f99..fcc196b 100644 --- a/gnu/usr.bin/perl/x2p/a2py.c +++ b/gnu/usr.bin/perl/x2p/a2py.c @@ -1,4 +1,4 @@ -/* $RCSfile: a2py.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:10 $ +/* $RCSfile: a2py.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:53 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: a2py.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:53 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:30:10 nate * PERL! * @@ -13,13 +16,13 @@ * patch20: in a2p, now warns about spurious backslashes * patch20: in a2p, now allows [ to be backslashed in pattern * patch20: in a2p, now allows numbers of the form 2. - * + * * Revision 4.0.1.1 91/06/07 12:12:59 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:57:26 lwall * 4.0 baseline. - * + * */ #ifdef OS2 diff --git a/gnu/usr.bin/perl/x2p/handy.h b/gnu/usr.bin/perl/x2p/handy.h index 85a777c..1db94d4 100644 --- a/gnu/usr.bin/perl/x2p/handy.h +++ b/gnu/usr.bin/perl/x2p/handy.h @@ -1,4 +1,4 @@ -/* $RCSfile: handy.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:10 $ +/* $RCSfile: handy.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:54 $ * * Copyright (c) 1991, Larry Wall * @@ -6,18 +6,21 @@ * License or the Artistic License, as specified in the README file. * * $Log: handy.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:54 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:30:10 nate * PERL! * * Revision 4.0.1.2 91/06/07 12:15:43 lwall * patch4: new copyright notice - * + * * Revision 4.0.1.1 91/04/12 09:29:08 lwall * patch1: random cleanup in cpp namespace - * + * * Revision 4.0 91/03/20 01:57:45 lwall * 4.0 baseline. - * + * */ #define Null(type) ((type)0) diff --git a/gnu/usr.bin/perl/x2p/hash.c b/gnu/usr.bin/perl/x2p/hash.c index d525882..d1ae8ac 100644 --- a/gnu/usr.bin/perl/x2p/hash.c +++ b/gnu/usr.bin/perl/x2p/hash.c @@ -1,4 +1,4 @@ -/* $RCSfile: hash.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:10 $ +/* $RCSfile: hash.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:54 $ * * Copyright (c) 1991, Larry Wall * @@ -6,15 +6,18 @@ * License or the Artistic License, as specified in the README file. * * $Log: hash.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:54 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:30:10 nate * PERL! * * Revision 4.0.1.1 91/06/07 12:15:55 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:57:49 lwall * 4.0 baseline. - * + * */ #include <stdio.h> diff --git a/gnu/usr.bin/perl/x2p/hash.h b/gnu/usr.bin/perl/x2p/hash.h index ae4ffaf..452321c 100644 --- a/gnu/usr.bin/perl/x2p/hash.h +++ b/gnu/usr.bin/perl/x2p/hash.h @@ -1,4 +1,4 @@ -/* $RCSfile: hash.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:10 $ +/* $RCSfile: hash.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:54 $ * * Copyright (c) 1991, Larry Wall * @@ -6,15 +6,18 @@ * License or the Artistic License, as specified in the README file. * * $Log: hash.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:54 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:30:10 nate * PERL! * * Revision 4.0.1.1 91/06/07 12:16:04 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:57:53 lwall * 4.0 baseline. - * + * */ #define FILLPCT 60 /* don't make greater than 99 */ diff --git a/gnu/usr.bin/perl/x2p/malloc.c b/gnu/usr.bin/perl/x2p/malloc.c index dd43390..e7fff7f 100644 --- a/gnu/usr.bin/perl/x2p/malloc.c +++ b/gnu/usr.bin/perl/x2p/malloc.c @@ -1,6 +1,9 @@ -/* $RCSfile: malloc.c,v $$Revision: 1.2 $$Date: 1993/08/24 17:57:39 $ +/* $RCSfile: malloc.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:54 $ * * $Log: malloc.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:54 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.2 1993/08/24 17:57:39 nate * Fix for ALIGN macros in PERL that conflict with 4.4 macros * @@ -11,19 +14,19 @@ * patch20: removed implicit int declarations on functions * patch20: hash tables now split only if the memory is available to do so * patch20: realloc(0, size) now does malloc in case library routines call it - * + * * Revision 4.0.1.3 91/11/05 17:57:40 lwall * patch11: safe malloc code now integrated into Perl's malloc when possible - * + * * Revision 4.0.1.2 91/06/07 11:20:45 lwall * patch4: many, many itty-bitty portability fixes - * + * * Revision 4.0.1.1 91/04/11 17:48:31 lwall * patch1: Configure now figures out malloc ptr type - * + * * Revision 4.0 91/03/20 01:28:52 lwall * 4.0 baseline. - * + * */ #ifndef lint @@ -37,12 +40,12 @@ static char sccsid[] = "@(#)malloc.c 4.3 (Berkeley) 9/16/83"; * malloc.c (Caltech) 2/21/82 * Chris Kingsley, kingsley@cit-20. * - * This is a very fast storage allocator. It allocates blocks of a small + * This is a very fast storage allocator. It allocates blocks of a small * number of different sizes, and keeps free lists of each size. Blocks that - * don't exactly fit are passed up to the next larger size. In this + * don't exactly fit are passed up to the next larger size. In this * implementation, the available sizes are 2^n-4 (or 2^n-12) bytes long. * This is designed for use in a program that uses vast quantities of memory, - * but bombs when it runs out. + * but bombs when it runs out. */ #include "EXTERN.h" @@ -161,7 +164,7 @@ malloc(nbytes) * space used per block for accounting. */ nbytes += sizeof (union overhead) + RSLOP; - nbytes = (nbytes + 3) &~ 3; + nbytes = (nbytes + 3) &~ 3; shiftr = (nbytes - 1) >> 2; /* apart from this loop, this is O(1) */ while (shiftr >>= 1) @@ -170,7 +173,7 @@ malloc(nbytes) * If nothing in hash bucket right now, * request more memory from the system. */ - if (nextf[bucket] == NULL) + if (nextf[bucket] == NULL) morecore(bucket); if ((p = (union overhead *)nextf[bucket]) == NULL) { #ifdef safemalloc @@ -256,7 +259,7 @@ morecore(bucket) /* take 2k unless the block is bigger than that */ rnu = (bucket <= 8) ? 11 : bucket + 3; #else - /* take 16k unless the block is bigger than that + /* take 16k unless the block is bigger than that (80286s like large segments!), probably good on the atari too */ rnu = (bucket <= 11) ? 14 : bucket + 3; #endif @@ -294,7 +297,7 @@ morecore(bucket) void free(mp) MALLOCPTRTYPE *mp; -{ +{ register MEM_SIZE size; register union overhead *op; char *cp = (char*)mp; @@ -353,9 +356,9 @@ int reall_srchlen = 4; /* 4 should be plenty, -1 =>'s whole list */ MALLOCPTRTYPE * realloc(mp, nbytes) - MALLOCPTRTYPE *mp; + MALLOCPTRTYPE *mp; MEM_SIZE nbytes; -{ +{ register MEM_SIZE onb; union overhead *op; char *res; @@ -419,7 +422,7 @@ realloc(mp, nbytes) * space used per block for accounting. */ nbytes += sizeof (union overhead) + RSLOP; - nbytes = (nbytes + 3) &~ 3; + nbytes = (nbytes + 3) &~ 3; op->ov_size = nbytes - 1; *((u_int *)((caddr_t)op + nbytes - RSLOP)) = RMAGIC; } @@ -480,7 +483,7 @@ findbucket(freep, srchlen) #ifdef MSTATS /* * mstats - print out statistics about malloc - * + * * Prints two lines of numbers, one showing the length of the free list * for each size category, the second showing the number of mallocs - * frees for each size category. diff --git a/gnu/usr.bin/perl/x2p/str.c b/gnu/usr.bin/perl/x2p/str.c index 0461194..4e078a6 100644 --- a/gnu/usr.bin/perl/x2p/str.c +++ b/gnu/usr.bin/perl/x2p/str.c @@ -1,4 +1,4 @@ -/* $RCSfile: str.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:09 $ +/* $RCSfile: str.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:54 $ * * Copyright (c) 1991, Larry Wall * @@ -6,15 +6,18 @@ * License or the Artistic License, as specified in the README file. * * $Log: str.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:54 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:30:09 nate * PERL! * * Revision 4.0.1.1 91/06/07 12:20:08 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:58:15 lwall * 4.0 baseline. - * + * */ #include "handy.h" @@ -215,7 +218,7 @@ str_new(len) int len; { register STR *str; - + if (freestrroot) { str = freestrroot; freestrroot = str->str_link.str_next; @@ -314,7 +317,7 @@ register FILE *fp; bp -= 2; } } - + fp->_cnt = cnt; /* deregisterize cnt and ptr */ fp->_ptr = ptr; i = _filbuf(fp); /* get more characters */ diff --git a/gnu/usr.bin/perl/x2p/str.h b/gnu/usr.bin/perl/x2p/str.h index 765d9ea..642e18e 100644 --- a/gnu/usr.bin/perl/x2p/str.h +++ b/gnu/usr.bin/perl/x2p/str.h @@ -1,4 +1,4 @@ -/* $RCSfile: str.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:10 $ +/* $RCSfile: str.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:55 $ * * Copyright (c) 1991, Larry Wall * @@ -6,15 +6,18 @@ * License or the Artistic License, as specified in the README file. * * $Log: str.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:55 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:30:10 nate * PERL! * * Revision 4.0.1.1 91/06/07 12:20:22 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:58:21 lwall * 4.0 baseline. - * + * */ struct string { diff --git a/gnu/usr.bin/perl/x2p/util.c b/gnu/usr.bin/perl/x2p/util.c index 4c5b078..70a6cd7 100644 --- a/gnu/usr.bin/perl/x2p/util.c +++ b/gnu/usr.bin/perl/x2p/util.c @@ -1,4 +1,4 @@ -/* $RCSfile: util.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:10 $ +/* $RCSfile: util.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:55 $ * * Copyright (c) 1991, Larry Wall * @@ -6,15 +6,18 @@ * License or the Artistic License, as specified in the README file. * * $Log: util.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:55 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:30:10 nate * PERL! * * Revision 4.0.1.1 91/06/07 12:20:35 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:58:25 lwall * 4.0 baseline. - * + * */ #include <stdio.h> @@ -103,7 +106,7 @@ register int len; { register char *dest = to; - if (from != Nullch) + if (from != Nullch) for (len--; len && (*dest++ = *from++); len--) ; *dest = '\0'; return to; @@ -234,7 +237,7 @@ char *nam, *val; #else char **tmpenv = Null(char **); #endif /* lint */ - + firstsetenv = FALSE; for (j=0; j<i; j++) /* copy environment */ tmpenv[j] = environ[j]; diff --git a/gnu/usr.bin/perl/x2p/util.h b/gnu/usr.bin/perl/x2p/util.h index 15bf78e5..ad94422 100644 --- a/gnu/usr.bin/perl/x2p/util.h +++ b/gnu/usr.bin/perl/x2p/util.h @@ -1,4 +1,4 @@ -/* $RCSfile: util.h,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:10 $ +/* $RCSfile: util.h,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:55 $ * * Copyright (c) 1991, Larry Wall * @@ -6,18 +6,21 @@ * License or the Artistic License, as specified in the README file. * * $Log: util.h,v $ + * Revision 1.1.1.1 1994/09/10 06:27:55 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:30:10 nate * PERL! * * Revision 4.0.1.2 91/11/05 19:21:20 lwall * patch11: various portability fixes - * + * * Revision 4.0.1.1 91/06/07 12:20:43 lwall * patch4: new copyright notice - * + * * Revision 4.0 91/03/20 01:58:29 lwall * 4.0 baseline. - * + * */ /* is the string for makedir a directory name or a filename? */ diff --git a/gnu/usr.bin/perl/x2p/walk.c b/gnu/usr.bin/perl/x2p/walk.c index 4cc4a79..c7e5e44 100644 --- a/gnu/usr.bin/perl/x2p/walk.c +++ b/gnu/usr.bin/perl/x2p/walk.c @@ -1,4 +1,4 @@ -/* $RCSfile: walk.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:30:11 $ +/* $RCSfile: walk.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:55 $ * * Copyright (c) 1991, Larry Wall * @@ -6,6 +6,9 @@ * License or the Artistic License, as specified in the README file. * * $Log: walk.c,v $ + * Revision 1.1.1.1 1994/09/10 06:27:55 gclarkii + * Initial import of Perl 4.046 bmaked + * * Revision 1.1.1.1 1993/08/23 21:30:11 nate * PERL! * @@ -14,17 +17,17 @@ * patch20: in a2p, made RS="" translate to $/ = "\n\n" * patch20: in a2p, do {...} while ... was missing some reconstruction code * patch20: in a2p, getline should allow variable to be array element - * + * * Revision 4.0.1.2 91/11/05 19:25:09 lwall * patch11: in a2p, split on whitespace produced extra null field - * + * * Revision 4.0.1.1 91/06/07 12:22:04 lwall * patch4: new copyright notice * patch4: a2p didn't correctly implement -n switch - * + * * Revision 4.0 91/03/20 01:58:36 lwall * 4.0 baseline. - * + * */ #include "handy.h" @@ -645,7 +648,7 @@ sub Pick {\n\ else tmpstr = str_make(""); sprintf(tokenbuf," = &Getline%d(%s)",len,tmpstr->str_ptr); - str_cat(str,tokenbuf); + str_cat(str,tokenbuf); str_free(tmpstr); if (useval) str_cat(str,",$getline_ok)"); |