minor integration in 4BSD source tree

SCCS-vsn: usr.bin/pr/egetopt.c 5.2
SCCS-vsn: usr.bin/pr/extern.h 5.2
SCCS-vsn: usr.bin/pr/pr.1 5.2
SCCS-vsn: usr.bin/pr/pr.c 5.2
SCCS-vsn: usr.bin/pr/pr.h 5.2

diff --git a/usr/src/usr.bin/pr/egetopt.c b/usr/src/usr.bin/pr/egetopt.c
index 1fcdb51..31df87a 100644 (file)
--- a/usr/src/usr.bin/pr/egetopt.c
+++ b/usr/src/usr.bin/pr/egetopt.c
@@ -1,18 +1,23 @@
 /*-
 /*-

- * Copyright (c) 1991 The Regents of the University of California.
+ * Copyright (c) 1991 Keith Muller.
+ * Copyright (c) 1993 The Regents of the University of California.

  * All rights reserved.
  *
  * All rights reserved.
  *

+ * This code is derived from software contributed to Berkeley by
+ * Keith Muller of the University of California, San Diego.
+ *

  * %sccs.include.redist.c%
  */
 
 #ifndef lint
  * %sccs.include.redist.c%
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)egetopt.c  5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)egetopt.c  5.2 (Berkeley) %G%";

 #endif /* not lint */
 
 #endif /* not lint */
 

-#include <stdio.h>

 #include <ctype.h>
 #include <ctype.h>

+#include <stdio.h>

 #include <stdlib.h>
 #include <string.h>
 #include <stdlib.h>
 #include <string.h>

+

 #include "extern.h"
 
 /*
 #include "extern.h"
 
 /*


@@ -35,16 +40,11 @@ char        *eoptarg;               /* argument associated with option */
 #define        BADCH   (int)'?'
 #define        EMSG    ""
 
 #define        BADCH   (int)'?'
 #define        EMSG    ""
 

-#if __STDC__
-int
-egetopt(int nargc, char * const *nargv, const char *ostr)
-#else

 int
 egetopt(nargc, nargv, ostr)
        int nargc;
 int
 egetopt(nargc, nargv, ostr)
        int nargc;

-       char **nargv;
-       char *ostr;
-#endif
+       char * const *nargv;
+       const char *ostr;

 {
        static char *place = EMSG;      /* option letter processing */
        register char *oli;             /* option letter list index */
 {
        static char *place = EMSG;      /* option letter processing */
        register char *oli;             /* option letter list index */


@@ -64,7 +64,7 @@ egetopt(nargc, nargv, ostr)
                if ((eoptind >= nargc) ||
                    ((*(place = nargv[eoptind]) != '-') && (*place != '+'))) {
                        place = EMSG;
                if ((eoptind >= nargc) ||
                    ((*(place = nargv[eoptind]) != '-') && (*place != '+'))) {
                        place = EMSG;

-                       return(EOF);
+                       return (EOF);

                }
 
                delim = (int)*place;
                }
 
                delim = (int)*place;


@@ -74,7 +74,7 @@ egetopt(nargc, nargv, ostr)
                         */
                        ++eoptind;
                        place = EMSG;
                         */
                        ++eoptind;
                        place = EMSG;

-                       return(EOF);
+                       return (EOF);

                }
        }
 
                }
        }
 


@@ -82,14 +82,14 @@ egetopt(nargc, nargv, ostr)
         * check option letter
         */
        if ((eoptopt = (int)*place++) == (int)':' || (eoptopt == (int)'?') ||
         * check option letter
         */
        if ((eoptopt = (int)*place++) == (int)':' || (eoptopt == (int)'?') ||

-           !(oli = index(ostr, eoptopt))) {
+           !(oli = strchr(ostr, eoptopt))) {

                /*
                 * if the user didn't specify '-' as an option,
                 * assume it means EOF when by itself.
                 */
                if ((eoptopt == (int)'-') && !*place)
                /*
                 * if the user didn't specify '-' as an option,
                 * assume it means EOF when by itself.
                 */
                if ((eoptopt == (int)'-') && !*place)

-                       return(EOF);
-               if (index(ostr, '#') && (isdigit(eoptopt) ||
+                       return (EOF);
+               if (strchr(ostr, '#') && (isdigit(eoptopt) ||

                    (((eoptopt == (int)'-') || (eoptopt == (int)'+')) &&
                      isdigit(*place)))) {
                        /*
                    (((eoptopt == (int)'-') || (eoptopt == (int)'+')) &&
                      isdigit(*place)))) {
                        /*


@@ -109,20 +109,20 @@ egetopt(nargc, nargv, ostr)
                                savec = *p;
                                *place = '\0';
                        }
                                savec = *p;
                                *place = '\0';
                        }

-                       return(delim);
+                       return (delim);

                }
 
                if (!*place)
                        ++eoptind;
                if (eopterr) {
                }
 
                if (!*place)
                        ++eoptind;
                if (eopterr) {

-                       if (!(p = rindex(*nargv, '/')))
+                       if (!(p = strrchr(*nargv, '/')))

                                p = *nargv;
                        else
                                ++p;
                        (void)fprintf(stderr, "%s: illegal option -- %c\n",
                            p, eoptopt);
                }
                                p = *nargv;
                        else
                                ++p;
                        (void)fprintf(stderr, "%s: illegal option -- %c\n",
                            p, eoptopt);
                }

-               return(BADCH);
+               return (BADCH);

        }
        if (delim == (int)'+') {
                /*
        }
        if (delim == (int)'+') {
                /*


@@ -131,7 +131,7 @@ egetopt(nargc, nargv, ostr)
                if (!*place)
                        ++eoptind;
                if (eopterr) {
                if (!*place)
                        ++eoptind;
                if (eopterr) {

-                       if (!(p = rindex(*nargv, '/')))
+                       if (!(p = strrchr(*nargv, '/')))

                                p = *nargv;
                        else
                                ++p;
                                p = *nargv;
                        else
                                ++p;


@@ -139,7 +139,7 @@ egetopt(nargc, nargv, ostr)
                                "%s: illegal '+' delimiter with option -- %c\n",
                                p, eoptopt);
                }
                                "%s: illegal '+' delimiter with option -- %c\n",
                                p, eoptopt);
                }

-               return(BADCH);
+               return (BADCH);

        }
        ++oli;
        if ((*oli != ':') && (*oli != '?')) {
        }
        ++oli;
        if ((*oli != ':') && (*oli != '?')) {


@@ -149,7 +149,7 @@ egetopt(nargc, nargv, ostr)
                eoptarg = NULL;
                if (!*place)
                        ++eoptind;
                eoptarg = NULL;
                if (!*place)
                        ++eoptind;

-               return(eoptopt);
+               return (eoptopt);

        }
 
        if (*place) {
        }
 
        if (*place) {


@@ -168,7 +168,7 @@ egetopt(nargc, nargv, ostr)
                 */
                place = EMSG;
                if (eopterr) {
                 */
                place = EMSG;
                if (eopterr) {

-                       if (!(p = rindex(*nargv, '/')))
+                       if (!(p = strrchr(*nargv, '/')))

                                p = *nargv;
                        else
                                ++p;
                                p = *nargv;
                        else
                                ++p;


@@ -176,7 +176,7 @@ egetopt(nargc, nargv, ostr)
                            "%s: option requires an argument -- %c\n", p,
                            eoptopt);
                }
                            "%s: option requires an argument -- %c\n", p,
                            eoptopt);
                }

-               return(BADCH);
+               return (BADCH);

        } else {
                /*
                 * arg has white space
        } else {
                /*
                 * arg has white space


@@ -185,5 +185,5 @@ egetopt(nargc, nargv, ostr)
        }
        place = EMSG;
        ++eoptind;
        }
        place = EMSG;
        ++eoptind;

-       return(eoptopt);
+       return (eoptopt);

 }
 }

diff --git a/usr/src/usr.bin/pr/extern.h b/usr/src/usr.bin/pr/extern.h
index bdb9588..7c371e7 100644 (file)
--- a/usr/src/usr.bin/pr/extern.h
+++ b/usr/src/usr.bin/pr/extern.h
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 1991 Keith Muller.
 /*-
  * Copyright (c) 1991 Keith Muller.

- * Copyright (c) 1991 The Regents of the University of California.
+ * Copyright (c) 1993 The Regents of the University of California.

  * All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by


@@ -8,36 +8,27 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *      @(#)extern.h   5.1 (Berkeley) %G%
+ *      @(#)extern.h   5.2 (Berkeley) %G%

  */
 
  */
 

-/*
- * External references from each source file
- */
-
-#include <sys/cdefs.h>
+extern int eoptind;
+extern char *eoptarg;

 
 

-extern int     eoptind;
-extern char    *eoptarg;
-
-/*
- * functions
- */
-int onecol __P((int, char **));
-int vertcol __P((int, char **));
-int horzcol __P((int, char **));
-int mulfile __P((int, char **));
-int inln __P((FILE *, char *, register int, int *, int, int *));
-int otln __P((register char *, int, int *, int *, int));
-int inskip __P((FILE *, register int, register int));
-void addnum __P((register char *, register int, register int));
-int prhead __P((char *, char *, int));
-int prtail __P((register int, int));
-void terminate __P((int));
-void flsh_errs __P((void));
-void mfail __P((void));
-void pfail __P((void));
-void usage __P((void));
-FILE * nxtfile __P((int, char **, char **, char *, int));
-int setup __P((register int, register char **));
-int egetopt __P((int, char * const *, const char *));
+void    addnum __P((char *, int, int));
+int     egetopt __P((int, char * const *, const char *));
+void    flsh_errs __P((void));
+int     horzcol __P((int, char **));
+int     inln __P((FILE *, char *, int, int *, int, int *));
+int     inskip __P((FILE *, int, int));
+void    mfail __P((void));
+int     mulfile __P((int, char **));
+FILE   *nxtfile __P((int, char **, char **, char *, int));
+int     onecol __P((int, char **));
+int     otln __P((char *, int, int *, int *, int));
+void    pfail __P((void));
+int     prhead __P((char *, char *, int));
+int     prtail __P((int, int));
+int     setup __P((int, char **));
+void    terminate __P((int));
+void    usage __P((void));
+int     vertcol __P((int, char **));

diff --git a/usr/src/usr.bin/pr/pr.1 b/usr/src/usr.bin/pr/pr.1
index 9dda637..8fc493b 100644 (file)
--- a/usr/src/usr.bin/pr/pr.1
+++ b/usr/src/usr.bin/pr/pr.1
@@ -1,9 +1,13 @@
-.\" Copyright (c) 1991 The Regents of the University of California.
+.\" Copyright (c) 1991 Keith Muller.
+.\" Copyright (c) 1993 The Regents of the University of California.

 .\" All rights reserved.
 .\"
 .\" All rights reserved.
 .\"

+.\" This code is derived from software contributed to Berkeley by
+.\" Keith Muller of the University of California, San Diego.
+.\"

 .\" %sccs.include.redist.man%
 .\"
 .\" %sccs.include.redist.man%
 .\"

-.\"     @(#)pr.1       5.1 (Berkeley) %G%
+.\"     @(#)pr.1       5.2 (Berkeley) %G%

 .\"
 .Dd 
 .Dt PR 1
 .\"
 .Dd 
 .Dt PR 1


@@ -307,6 +311,7 @@ Error messages are written to standard error during the printing
 process (if output is redirected) or after all successful
 file printing is complete (when printing to a terminal).
 .Sh SEE ALSO
 process (if output is redirected) or after all successful
 file printing is complete (when printing to a terminal).
 .Sh SEE ALSO

+.Xr cat 1 ,

 .Xr more 1
 .Sh STANDARDS
 The
 .Xr more 1
 .Sh STANDARDS
 The


@@ -314,5 +319,3 @@ The
 utility is
 .St -p1003.2
  compatible.
 utility is
 .St -p1003.2
  compatible.

-.Sh AUTHOR
-Keith Muller at the University of California, San Diego

diff --git a/usr/src/usr.bin/pr/pr.c b/usr/src/usr.bin/pr/pr.c
index 6cfe73f..4a5e195 100644 (file)
--- a/usr/src/usr.bin/pr/pr.c
+++ b/usr/src/usr.bin/pr/pr.c
@@ -1,7 +1,6 @@
-

 /*-
  * Copyright (c) 1991 Keith Muller.
 /*-
  * Copyright (c) 1991 Keith Muller.

- * Copyright (c) 1991 The Regents of the University of California.
+ * Copyright (c) 1993 The Regents of the University of California.

  * All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by


@@ -12,24 +11,26 @@
 
 #ifndef lint
 static char copyright[] =
 
 #ifndef lint
 static char copyright[] =

-"@(#) Copyright (c) 1991 The Regents of the University of California.\n\
+"@(#) Copyright (c) 1993 The Regents of the University of California.\n\

  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)pr.c       5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)pr.c       5.2 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>

-#include <stdio.h>
-#include <signal.h>
+

 #include <ctype.h>
 #include <ctype.h>

-#include <stdlib.h>

 #include <errno.h>
 #include <errno.h>

+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>

 #include <string.h>
 #include <unistd.h>
 #include <string.h>
 #include <unistd.h>

+

 #include "pr.h"
 #include "extern.h"
 
 #include "pr.h"
 #include "extern.h"
 


@@ -77,15 +78,10 @@ int addone;                 /* page length is odd with double space */
 int    errcnt;                 /* error count on file processing */
 char   digs[] = "0123456789";  /* page number translation map */
 
 int    errcnt;                 /* error count on file processing */
 char   digs[] = "0123456789";  /* page number translation map */
 

-#if __STDC__
-int
-main(int argc, char **argv)
-#else

 int
 main(argc, argv)
         int argc;
 int
 main(argc, argv)
         int argc;

-        char **argv;
-#endif
+        char *argv[];

 {
        int ret_val;
 
 {
        int ret_val;
 


@@ -116,15 +112,10 @@ main(argc, argv)
  * onecol:     print files with only one column of output.
  *             Line length is unlimited.
  */
  * onecol:     print files with only one column of output.
  *             Line length is unlimited.
  */

-#if __STDC__
-int
-onecol(int argc, char **argv)
-#else

 int
 onecol(argc, argv)
         int argc;
 int
 onecol(argc, argv)
         int argc;

-        char **argv;
-#endif
+        char *argv[];

 {
        register int cnt = -1;
        register int off;
 {
        register int cnt = -1;
        register int off;


@@ -266,15 +257,10 @@ onecol(argc, argv)
 /*
  * vertcol:    print files with more than one column of output down a page
  */
 /*
  * vertcol:    print files with more than one column of output down a page
  */

-#if __STDC__
-int
-vertcol(int argc, char **argv)
-#else

 int
 vertcol(argc, argv)
         int argc;
 int
 vertcol(argc, argv)
         int argc;

-        char **argv;
-#endif
+        char *argv[];

 {
        register char *ptbf;
        register char **lstdat;
 {
        register char *ptbf;
        register char **lstdat;


@@ -592,15 +578,10 @@ vertcol(argc, argv)
 /*
  * horzcol:    print files with more than one column of output across a page
  */
 /*
  * horzcol:    print files with more than one column of output across a page
  */

-#if __STDC__
-int
-horzcol(int argc, char **argv)
-#else

 int
 horzcol(argc, argv)
         int argc;
 int
 horzcol(argc, argv)
         int argc;

-        char **argv;
-#endif
+        char *argv[];

 {
        register char *ptbf;
        register int pln;
 {
        register char *ptbf;
        register int pln;


@@ -740,15 +721,10 @@ horzcol(argc, argv)
  * mulfile:    print files with more than one column of output and
  *             more than one file concurrently
  */
  * mulfile:    print files with more than one column of output and
  *             more than one file concurrently
  */

-#if __STDC__
-int
-mulfile(int argc, char **argv)
-#else

 int
 mulfile(argc, argv)
         int argc;
 int
 mulfile(argc, argv)
         int argc;

-        char **argv;
-#endif
+        char *argv[];

 {
        register char *ptbf;
        register int j;
 {
        register char *ptbf;
        register int j;


@@ -959,10 +935,6 @@ mulfile(argc, argv)
  *     trnc:   throw away data more than lim up to \n 
  *     mor:    set if more data in line (not truncated)
  */
  *     trnc:   throw away data more than lim up to \n 
  *     mor:    set if more data in line (not truncated)
  */

-#if __STDC__
-int
-inln(FILE *inf, char *buf, register int lim, int *cps, int trnc, int *mor)
-#else

 int
 inln(inf, buf, lim, cps, trnc, mor)
        FILE *inf;
 int
 inln(inf, buf, lim, cps, trnc, mor)
        FILE *inf;


@@ -971,7 +943,6 @@ inln(inf, buf, lim, cps, trnc, mor)
        int *cps;
        int trnc;
        int *mor;
        int *cps;
        int trnc;
        int *mor;

-#endif

 {
        register int col;
        register int gap = ingap;
 {
        register int col;
        register int gap = ingap;


@@ -1075,10 +1046,6 @@ inln(inf, buf, lim, cps, trnc, mor)
  *     mor:    output line not complete in this buf; more data to come.        
  *             1 is more, 0 is complete, -1 is no \n's
  */
  *     mor:    output line not complete in this buf; more data to come.        
  *             1 is more, 0 is complete, -1 is no \n's
  */

-#if __STDC__
-int
-otln(register char *buf, int cnt, int *svops, int *svips, int mor)
-#else

 int
 otln(buf, cnt, svips, svops, mor)
        register char *buf;
 int
 otln(buf, cnt, svips, svops, mor)
        register char *buf;


@@ -1086,7 +1053,6 @@ otln(buf, cnt, svips, svops, mor)
        int *svops;
        int *svips;
        int mor;
        int *svops;
        int *svips;
        int mor;

-#endif

 {
        register int ops;               /* last col output */
        register int ips;               /* last col in buf examined */
 {
        register int ops;               /* last col output */
        register int ips;               /* last col in buf examined */


@@ -1222,16 +1188,11 @@ otln(buf, cnt, svips, svops, mor)
  *     pgcnt   number of pages to skip
  *     lncnt   number of lines per page
  */
  *     pgcnt   number of pages to skip
  *     lncnt   number of lines per page
  */

-#if __STDC__
-int
-inskip(FILE *inf, register int pgcnt, register int lncnt)
-#else

 int
 inskip(inf, pgcnt, lncnt)
        FILE *inf;
        register int pgcnt;
        register int lncnt;
 int
 inskip(inf, pgcnt, lncnt)
        FILE *inf;
        register int pgcnt;
        register int lncnt;

-#endif

 {
        register int c;
        register int cnt;
 {
        register int c;
        register int cnt;


@@ -1258,10 +1219,6 @@ inskip(inf, pgcnt, lncnt)
  *     buf     array to store proper date for the header.
  *     dt      if set skips the date processing (used with -m)
  */
  *     buf     array to store proper date for the header.
  *     dt      if set skips the date processing (used with -m)
  */

-#if __STDC__
-FILE *
-nxtfile(int argc, char **argv, char **fname, char *buf, int dt)
-#else

 FILE *
 nxtfile(argc, argv, fname, buf, dt)
        int argc;
 FILE *
 nxtfile(argc, argv, fname, buf, dt)
        int argc;


@@ -1269,7 +1226,6 @@ nxtfile(argc, argv, fname, buf, dt)
        char **fname;
        char *buf;
        int dt;
        char **fname;
        char *buf;
        int dt;

-#endif

 {
        FILE *inf = NULL;
        struct timeval tv;
 {
        FILE *inf = NULL;
        struct timeval tv;


@@ -1400,16 +1356,11 @@ nxtfile(argc, argv, fname, buf, dt)
  *             part of the column. The usage of addnum currently treats
  *             numbers as part of the column so spaces may be replaced.
  */
  *             part of the column. The usage of addnum currently treats
  *             numbers as part of the column so spaces may be replaced.
  */

-#if __STDC__
-void
-addnum(register char *buf, register int wdth, register int line)
-#else

 void
 addnum(buf, wdth, line)
        register char *buf;
        register int wdth;
        register int line;
 void
 addnum(buf, wdth, line)
        register char *buf;
        register int wdth;
        register int line;

-#endif

 {
        register char *pt = buf + wdth;
 
 {
        register char *pt = buf + wdth;
 


@@ -1433,16 +1384,11 @@ addnum(buf, wdth, line)
  *     fname   fname field for header
  *     pagcnt  page number
  */
  *     fname   fname field for header
  *     pagcnt  page number
  */

-#if __STDC__
-int
-prhead(char *buf, char *fname, int pagcnt)
-#else

 int
 prhead(buf, fname, pagcnt)
        char *buf;
        char *fname;
        int pagcnt;
 int
 prhead(buf, fname, pagcnt)
        char *buf;
        char *fname;
        int pagcnt;

-#endif

 {
        int ips = 0;
        int ops = 0;
 {
        int ips = 0;
        int ops = 0;


@@ -1476,15 +1422,10 @@ prhead(buf, fname, pagcnt)
  *     cnt     number of lines of padding needed
  *     incomp  was a '\n' missing from last line output
  */
  *     cnt     number of lines of padding needed
  *     incomp  was a '\n' missing from last line output
  */

-#if __STDC__
-int
-prtail(register int cnt, int incomp)
-#else

 int
 prtail(cnt, incomp)
        register int cnt;
        int incomp;
 int
 prtail(cnt, incomp)
        register int cnt;
        int incomp;

-#endif

 {
        if (nohead) {
                /*
 {
        if (nohead) {
                /*


@@ -1536,14 +1477,9 @@ prtail(cnt, incomp)
 /*
  * terminate():        when a SIGINT is recvd
  */
 /*
  * terminate():        when a SIGINT is recvd
  */

-#if __STDC__
-void
-terminate(int which_sig)
-#else

 void
 terminate(which_sig)
 void
 terminate(which_sig)

-int which_sig;
-#endif
+       int which_sig;

 {
        flsh_errs();
        exit(1);
 {
        flsh_errs();
        exit(1);


@@ -1554,13 +1490,8 @@ int which_sig;
  * flsh_errs():        output saved up diagnostic messages after all normal
  *             processing has completed
  */
  * flsh_errs():        output saved up diagnostic messages after all normal
  *             processing has completed
  */

-#if __STDC__
-void
-flsh_errs(void)
-#else

 void
 flsh_errs()
 void
 flsh_errs()

-#endif

 {
        char buf[BUFSIZ];
 
 {
        char buf[BUFSIZ];
 


@@ -1573,35 +1504,20 @@ flsh_errs()
                (void)fputs(buf, stderr);
 }
 
                (void)fputs(buf, stderr);
 }
 

-#if __STDC__
-void
-mfail(void)
-#else

 void
 mfail()
 void
 mfail()

-#endif

 {
        (void)fputs("pr: memory allocation failed\n", err);
 }
 
 {
        (void)fputs("pr: memory allocation failed\n", err);
 }
 

-#if __STDC__
-void
-pfail(void)
-#else

 void
 pfail()
 void
 pfail()

-#endif

 {
        (void)fprintf(err, "pr: write failure, %s\n", strerror(errno));
 }
 
 {
        (void)fprintf(err, "pr: write failure, %s\n", strerror(errno));
 }
 

-#if __STDC__
-void
-usage(void)
-#else

 void
 usage()
 void
 usage()

-#endif

 {
        (void)fputs(
         "usage: pr [+page] [-col] [-adFmrt] [-e[ch][gap]] [-h header]\n",err);
 {
        (void)fputs(
         "usage: pr [+page] [-col] [-adFmrt] [-e[ch][gap]] [-h header]\n",err);


@@ -1615,15 +1531,10 @@ usage()
  * setup:      Validate command args, initialize and perform sanity 
  *             checks on options
  */
  * setup:      Validate command args, initialize and perform sanity 
  *             checks on options
  */

-#if __STDC__
-int
-setup(register int argc, register char **argv)
-#else

 int
 setup(argc, argv)
        register int argc;
        register char **argv;
 int
 setup(argc, argv)
        register int argc;
        register char **argv;

-#endif

 {
        register int c;
        int eflag = 0;
 {
        register int c;
        int eflag = 0;

diff --git a/usr/src/usr.bin/pr/pr.h b/usr/src/usr.bin/pr/pr.h
index 8032ea5..796f166 100644 (file)
--- a/usr/src/usr.bin/pr/pr.h
+++ b/usr/src/usr.bin/pr/pr.h
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 1991 Keith Muller.
 /*-
  * Copyright (c) 1991 Keith Muller.

- * Copyright (c) 1991 The Regents of the University of California.
+ * Copyright (c) 1993 The Regents of the University of California.

  * All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by


@@ -8,7 +8,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *      @(#)pr.h       5.1 (Berkeley) %G%
+ *      @(#)pr.h       5.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*