 @@ -1,14 +1,14 @@
-/*	$NetBSD: pr.c,v 1.20 2009/04/13 00:37:05 lukem Exp $	*/
+/*	$NetBSD: pr.c,v 1.21 2011/09/06 18:26:06 joerg Exp $	*/
 /*-
  * Copyright (c) 1991 Keith Muller.
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Keith Muller of the University of California, San Diego.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -33,27 +33,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 from: static char sccsid[] = "@(#)pr.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: pr.c,v 1.20 2009/04/13 00:37:05 lukem Exp $");
+__RCSID("$NetBSD: pr.c,v 1.21 2011/09/06 18:26:06 joerg Exp $");
 #endif
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <ctype.h>
 #include <errno.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 @@ -67,63 +67,77 @@ __RCSID("$NetBSD: pr.c,v 1.20 2009/04/13
 /*
  * pr:	a printing and pagination filter. If multiple input files
  *	are specified, each is read, formatted, and written to standard
  *	output. By default, input is separated into 66-line pages, each
  *	with a header that includes the page number, date, time and the
  *	files pathname.
+ *
  *	Complies with posix P1003.2/D11
  */
 /*
  * parameter variables
  */
-int	pgnm;			/* starting page number */
+static int	pgnm;			/* starting page number */
-int	clcnt;			/* number of columns */
+static int	clcnt;			/* number of columns */
-int	colwd;			/* column data width - multiple columns */
+static int	colwd;			/* column data width - multiple columns */
-int	across;			/* mult col flag; write across page */
+static int	across;			/* mult col flag; write across page */
-int	dspace;			/* double space flag */
+static int	dspace;			/* double space flag */
-char	inchar;			/* expand input char */
+static char	inchar;			/* expand input char */
-int	ingap;			/* expand input gap */
+static int	ingap;			/* expand input gap */
-int	formfeed;		/* use formfeed as trailer */
+static int	formfeed;		/* use formfeed as trailer */
-char	*header;		/* header name instead of file name */
+static char	*header;		/* header name instead of file name */
-char	ochar;			/* contract output char */
+static char	ochar;			/* contract output char */
-int	ogap;			/* contract output gap */
+static int	ogap;			/* contract output gap */
-int	lines;			/* number of lines per page */
+static int	lines;			/* number of lines per page */
-int	merge;			/* merge multiple files in output */
+static int	merge;			/* merge multiple files in output */
-char	nmchar;			/* line numbering append char */
+static char	nmchar;			/* line numbering append char */
-int	nmwd;			/* width of line number field */
+static int	nmwd;			/* width of line number field */
-int	offst;			/* number of page offset spaces */
+static int	offst;			/* number of page offset spaces */
-int	nodiag;			/* do not report file open errors */
+static int	nodiag;			/* do not report file open errors */
-char	schar;			/* text column separation character */
+static char	schar;			/* text column separation character */
-int	sflag;			/* -s option for multiple columns */
+static int	sflag;			/* -s option for multiple columns */
-int	nohead;			/* do not write head and trailer */
+static int	nohead;			/* do not write head and trailer */
-int	pgwd;			/* page width with multiple col output */
+static int	pgwd;			/* page width with multiple col output */
-const char *timefrmt = TIMEFMT;	/* time conversion string */
+static const char *timefrmt = TIMEFMT;	/* time conversion string */
 /*
  * misc globals
  */
-FILE	*err;			/* error message file pointer */
+static FILE	*errf;			/* error message file pointer */
-int	addone;			/* page length is odd with double space */
+static int	addone;			/* page length is odd with double space */
-int	errcnt;			/* error count on file processing */
+static int	errcnt;			/* error count on file processing */
-char	digs[] = "0123456789";	/* page number translation map */
+static const char	digs[] = "0123456789";	/* page number translation map */
-int	main __P((int, char **));
+static void	 addnum(char *, int, int);
 static void	 flsh_errs(void);
 static int	 horzcol(int, char **);
 static int	 inln(FILE *, char *, int, int *, int, int *);
 static int	 inskip(FILE *, int, int);
 static void	 mfail(void);
 static int	 mulfile(int, char **);
 static FILE	*nxtfile(int, char **, const char **, char *, int);
 static int	 onecol(int, char **);
 static int	 otln(char *, int, int *, int *, int);
 static void	 pfail(void);
 static int	 prhead(char *, const char *, int);
 static int	 prtail(int, int);
 static int	 setup(int, char **);
 __dead static void	 terminate(int);
 static void	 usage(void);
 static int	 vertcol(int, char **);
 int
-main(argc, argv)
+main(int argc, char *argv[])
         int argc;
         char *argv[];
+{
 	int ret_val;
 	if (signal(SIGINT, SIG_IGN) != SIG_IGN)
 		(void)signal(SIGINT, terminate);
 	ret_val = setup(argc, argv);
 	if (!ret_val) {
 		/*
 		 * select the output format based on options
 		 */
 		if (merge)
 			ret_val = mulfile(argc, argv);
 		else if (clcnt == 1)
 @@ -134,30 +148,28 @@ main(argc, argv)
 			ret_val = vertcol(argc, argv);
 	} else
 		usage();
 	flsh_errs();
 	if (errcnt || ret_val)
 		exit(1);
 	return(0);
+}
 /*
  * onecol:	print files with only one column of output.
  *		Line length is unlimited.
  */
-int
+static int
-onecol(argc, argv)
+onecol(int argc, char *argv[])
         int argc;
         char *argv[];
+{
 	int cnt = -1;
 	int off;
 	int lrgln;
 	int linecnt;
 	int num;
 	int lncnt;
 	int pagecnt;
 	int ips;
 	int ops;
 	int cps;
 	char *obuf = NULL;
 	char *lbuf;
 @@ -275,42 +287,38 @@ onecol(argc, argv)
 				break;
 			++pagecnt;
+		}
 		if (inf != stdin)
 			(void)fclose(inf);
+	}
 	if (eoptind < argc)
 		goto out;
 	error = 0;
 	goto out;
 oomem:
 	mfail();
 out:
-	if (obuf)
+	free(obuf);
-		free(obuf);
+	free(hbuf);
 	if (hbuf)
 		free(hbuf);
 	if (inf != NULL && inf != stdin)
 		(void)fclose(inf);
 	return error;
+}
 /*
  * vertcol:	print files with more than one column of output down a page
  */
-int
+static int
-vertcol(argc, argv)
+vertcol(int argc, char *argv[])
         int argc;
         char *argv[];
+{
 	char *ptbf;
 	char **lstdat = NULL;
 	int i;
 	int j;
 	int cnt = -1;
 	int pln;
 	int *indy = NULL;
 	int cvc;
 	int *lindy = NULL;
 	int lncnt;
 	int stp;
 	int pagecnt;
 @@ -597,48 +605,41 @@ vertcol(argc, argv)
 				break;
 			++pagecnt;
+		}
 		if (inf != stdin)
 			(void)fclose(inf);
+	}
 	if (eoptind < argc)
 		goto out;
 	error = 0;
 	goto out;
 oomem:
 	mfail();
 out:
-	if (buf)
+	free(buf);
-		free(buf);
+	free(hbuf);
-	if (hbuf)
+	free(vc);
-		free(hbuf);
+	free(lstdat);
-	if (vc)
+	free(lindy);
 		free(vc);
 	if (lstdat)
 		free(lstdat);
 	if (indy)
 		free(lindy);
 	if (inf != NULL && inf != stdin)
 		(void)fclose(inf);
 	return error;
+}
 /*
  * horzcol:	print files with more than one column of output across a page
  */
-int
+static int
-horzcol(argc, argv)
+horzcol(int argc, char *argv[])
         int argc;
         char *argv[];
+{
 	char *ptbf;
 	int pln;
 	int cnt = -1;
 	char *lstdat;
 	int col = colwd + 1;
 	int j;
 	int i;
 	int lncnt;
 	int pagecnt;
 	char *buf = NULL;
 	char *hbuf = NULL;
 	char *ohbuf;
 @@ -753,43 +754,39 @@ horzcol(argc, argv)
 				break;
 			++pagecnt;
+		}
 		if (inf != stdin)
 			(void)fclose(inf);
+	}
 	if (eoptind < argc)
 		goto out;
 	error = 0;
 	goto out;
 oomem:
 	mfail();
 out:
-	if (buf)
+	free(buf);
-		free(buf);
+	free(hbuf);
 	if (hbuf)
 		free(hbuf);
 	if (inf != NULL && inf != stdin)
 		(void)fclose(inf);
 	return error;
+}
 /*
  * mulfile:	print files with more than one column of output and
  *		more than one file concurrently
  */
-int
+static int
-mulfile(argc, argv)
+mulfile(int argc, char *argv[])
         int argc;
         char *argv[];
+{
 	char *ptbf;
 	int j;
 	int pln;
 	int cnt;
 	char *lstdat;
 	int i;
 	FILE **fbuf = NULL;
 	int actf;
 	int lncnt;
 	int col;
 	int pagecnt;
 	int fproc;
 @@ -840,27 +837,27 @@ mulfile(argc, argv)
 	/*
 	 * calculate page boundries based on open file count
 	 */
 	clcnt = j;
 	if (nmwd) {
 		colwd = (pgwd - clcnt - nmwd)/clcnt;
 		pgwd = ((colwd + 1) * clcnt) - nmwd - 2;
 	} else {
 		colwd = (pgwd + 1 - clcnt)/clcnt;
 		pgwd = ((colwd + 1) * clcnt) - 1;
+	}
 	if (colwd < 1) {
-		(void)fprintf(err,
+		(void)fprintf(errf,
 		  "pr: page width too small for %d columns\n", clcnt);
 		goto out;
+	}
 	actf = clcnt;
 	col = colwd + 1;
 	/*
 	 * line buffer
 	 */
 	if ((buf = malloc((unsigned)(pgwd+offst+1)*sizeof(char))) == NULL)
 		goto out;
 	if (offst) {
 		(void)memset(buf, (int)' ', offst);
 @@ -972,52 +969,44 @@ mulfile(argc, argv)
 	if (eoptind < argc)
 		goto out;
 	error = 0;
 	goto out;
 oomem:
 	mfail();
 out:
 	if (fbuf) {
 		for (j = 0; j < clcnt; j++)
 			if (fbuf[j] && fbuf[j] != stdin)
 				(void)fclose(fbuf[j]);
 		free(fbuf);
+	}
-	if (hbuf)
+	free(hbuf);
-		free(hbuf);
+	free(buf);
 	if (buf)
 		free(buf);
 	return error;
+}
 /*
  * inln():	input a line of data (unlimited length lines supported)
  *		Input is optionally expanded to spaces
+ *
  *	inf:	file
  *	buf:	buffer
  *	lim:	buffer length
  *	cps:	column positon 1st char in buffer (large line support)
  *	trnc:	throw away data more than lim up to \n
  *	mor:	set if more data in line (not truncated)
  */
-int
+static int
-inln(inf, buf, lim, cps, trnc, mor)
+inln(FILE *inf, char *buf, int lim, int *cps, int trnc, int *mor)
 	FILE *inf;
 	char *buf;
 	int lim;
 	int *cps;
 	int trnc;
 	int *mor;
+{
 	int col;
 	int gap = ingap;
 	int ch = EOF;
 	char *ptbuf;
 	int chk = (int)inchar;
 	ptbuf = buf;
 	if (gap) {
 		/*
 		 * expanding input option
 		 */
 @@ -1101,33 +1090,28 @@ inln(inf, buf, lim, cps, trnc, mor)
+}
 /*
  * otln():	output a line of data. (Supports unlimited length lines)
  *		output is optionally contracted to tabs
+ *
  *	buf:	output buffer with data
  *	cnt:	number of chars of valid data in buf
  *	svips:	buffer input column position (for large lines)
  *	svops:	buffer output column position (for large lines)
  *	mor:	output line not complete in this buf; more data to come.
  *		1 is more, 0 is complete, -1 is no \n's
  */
-int
+static int
-otln(buf, cnt, svips, svops, mor)
+otln(char *buf, int cnt, int *svips, int *svops, int mor)
 	char *buf;
 	int cnt;
 	int *svops;
 	int *svips;
 	int mor;
+{
 	int ops;		/* last col output */
 	int ips;		/* last col in buf examined */
 	int gap = ogap;
 	int tbps;
 	char *endbuf;
 	if (ogap) {
 		/*
 		 * contracting on output
 		 */
 		endbuf = buf + cnt;
 		ops = *svops;
 @@ -1257,231 +1241,217 @@ otln(buf, cnt, svips, svops, mor)
 		return(1);
+	}
 	return(0);
+}
 /*
  * inskip():	skip over pgcnt pages with lncnt lines per page
  *		file is closed at EOF (if not stdin).
+ *
  *	inf	FILE * to read from
  *	pgcnt	number of pages to skip
  *	lncnt	number of lines per page
  */
-int
+static int
-inskip(inf, pgcnt, lncnt)
+inskip(FILE *inf, int pgcnt, int lncnt)
 	FILE *inf;
 	int pgcnt;
 	int lncnt;
+{
 	int c;
 	int cnt;
 	while(--pgcnt > 0) {
 		cnt = lncnt;
 		while ((c = getc(inf)) != EOF) {
 			if ((c == '\n') && (--cnt == 0))
 				break;
+		}
 		if (c == EOF) {
 			if (inf != stdin)
 				(void)fclose(inf);
 			return(1);
+		}
+	}
 	return(0);
+}
 /*
  * nxtfile:	returns a FILE * to next file in arg list and sets the
  *		time field for this file (or current date).
+ *
  *	buf	array to store proper date for the header.
  *	dt	if set skips the date processing (used with -m)
  */
-FILE *
+static FILE *
-nxtfile(argc, argv, fname, buf, dt)
+nxtfile(int argc, char **argv, const char **fname, char *buf, int dt)
 	int argc;
 	char **argv;
 	const char **fname;
 	char *buf;
 	int dt;
+{
 	FILE *inf = NULL;
 	struct timeval tv;
 	struct timezone tz;
 	struct tm *timeptr = NULL;
 	struct stat statbuf;
 	time_t curtime;
 	static int twice = -1;
 	++twice;
 	if (eoptind >= argc) {
 		/*
 		 * no file listed; default, use standard input
 		 */
 		if (twice)
 			return(NULL);
 		clearerr(stdin);
 		inf = stdin;
 		if (header != NULL)
 			*fname = header;
 		else
 			*fname = FNAME;
 		if (nohead)
 			return(inf);
 		if (gettimeofday(&tv, &tz) < 0) {
 			++errcnt;
-			(void)fprintf(err, "pr: cannot get time of day, %s\n",
+			(void)fprintf(errf, "pr: cannot get time of day, %s\n",
 				strerror(errno));
 			eoptind = argc - 1;
 			return(NULL);
+		}
 		curtime = tv.tv_sec;
 		timeptr = localtime(&curtime);
+	}
 	for (; eoptind < argc; ++eoptind) {
 		if (strcmp(argv[eoptind], "-") == 0) {
 			/*
 			 * process a "-" for filename
 			 */
 			clearerr(stdin);
 			inf = stdin;
 			if (header != NULL)
 				*fname = header;
 			else
 				*fname = FNAME;
 			++eoptind;
 			if (nohead || (dt && twice))
 				return(inf);
 			if (gettimeofday(&tv, &tz) < 0) {
 				++errcnt;
-				(void)fprintf(err,
+				(void)fprintf(errf,
 					"pr: cannot get time of day, %s\n",
 					strerror(errno));
 				return(NULL);
+			}
 			curtime = tv.tv_sec;
 			timeptr = localtime(&curtime);
 		} else {
 			/*
 			 * normal file processing
 			 */
 			if ((inf = fopen(argv[eoptind], "r")) == NULL) {
 				++errcnt;
 				if (nodiag)
 					continue;
-				(void)fprintf(err, "pr: Cannot open %s, %s\n",
+				(void)fprintf(errf, "pr: Cannot open %s, %s\n",
 					argv[eoptind], strerror(errno));
 				continue;
+			}
 			if (header != NULL)
 				*fname = header;
 			else if (dt)
 				*fname = FNAME;
 			else
 				*fname = argv[eoptind];
 			++eoptind;
 			if (nohead || (dt && twice))
 				return(inf);
 			if (dt) {
 				if (gettimeofday(&tv, &tz) < 0) {
 					++errcnt;
-					(void)fprintf(err,
+					(void)fprintf(errf,
 					     "pr: cannot get time of day, %s\n",
 					     strerror(errno));
 					return(NULL);
+				}
 				curtime = tv.tv_sec;
 				timeptr = localtime(&curtime);
 			} else {
 				if (fstat(fileno(inf), &statbuf) < 0) {
 					++errcnt;
 					(void)fclose(inf);
-					(void)fprintf(err,
+					(void)fprintf(errf,
 						"pr: Cannot stat %s, %s\n",
 						argv[eoptind], strerror(errno));
 					return(NULL);
+				}
 				timeptr = localtime(&(statbuf.st_mtime));
+			}
+		}
 		break;
+	}
 	if (inf == NULL)
 		return(NULL);
 	/*
 	 * set up time field used in header
 	 */
 	if (strftime(buf, HDBUF, timefrmt, timeptr) <= 0) {
 		++errcnt;
 		if (inf != stdin)
 			(void)fclose(inf);
-		(void)fputs("pr: time conversion failed\n", err);
+		(void)fputs("pr: time conversion failed\n", errf);
 		return(NULL);
+	}
 	return(inf);
+}
 /*
  * addnum():	adds the line number to the column
  *		Truncates from the front or pads with spaces as required.
  *		Numbers are right justified.
+ *
  *	buf	buffer to store the number
  *	wdth	width of buffer to fill
  *	line	line number
+ *
  *		NOTE: numbers occupy part of the column. The posix
  *		spec does not specify if -i processing should or should not
  *		occur on number padding. The spec does say it occupies
  *		part of the column. The usage of addnum	currently treats
  *		numbers as part of the column so spaces may be replaced.
  */
 void
-addnum(buf, wdth, line)
+addnum(char *buf, int wdth, int line)
 	char *buf;
 	int wdth;
 	int line;
+{
 	char *pt = buf + wdth;
 	do {
 		*--pt = digs[line % 10];
 		line /= 10;
 	} while (line && (pt > buf));
 	/*
 	 * pad with space as required
 	 */
 	while (pt > buf)
 		*--pt = ' ';
+}
 /*
  * prhead():	prints the top of page header
+ *
  *	buf	buffer with time field (and offset)
  *	cnt	number of chars in buf
  *	fname	fname field for header
  *	pagcnt	page number
  */
-int
+static int
-prhead(buf, fname, pagcnt)
+prhead(char *buf, const char *fname, int pagcnt)
 	char *buf;
 	const char *fname;
 	int pagcnt;
+{
 	int ips = 0;
 	int ops = 0;
 	if ((putchar('\n') == EOF) || (putchar('\n') == EOF)) {
 		pfail();
 		return(1);
+	}
 	/*
 	 * posix is not clear if the header is subject to line length
 	 * restrictions. The specification for header line format
 	 * in the spec clearly does not limit length. No pr currently
 	 * restricts header length. However if we need to truncate in
 @@ -1495,30 +1465,28 @@ prhead(buf, fname, pagcnt)
 	if (offst && otln(buf, offst, &ips, &ops, -1))
 		return(1);
 	(void)printf(HDFMT,buf+offst, fname, pagcnt);
 	return(0);
+}
 /*
  * prtail():	pad page with empty lines (if required) and print page trailer
  *		if requested
+ *
  *	cnt	number of lines of padding needed
  *	incomp	was a '\n' missing from last line output
  */
-int
+static int
-prtail(cnt, incomp)
+prtail(int cnt, int incomp)
 	int cnt;
 	int incomp;
+{
 	if (nohead) {
 		/*
 		 * only pad with no headers when incomplete last line
 		 */
 		if (!incomp)
 			return(0);
 		if ((dspace && (putchar('\n') == EOF)) ||
 		    (putchar('\n') == EOF)) {
 			pfail();
 			return(1);
+		}
 		return(0);
 @@ -1550,306 +1518,303 @@ prtail(cnt, incomp)
 	cnt += TAILLEN;
 	while (--cnt >= 0) {
 		if (putchar('\n') == EOF) {
 			pfail();
 			return(1);
+		}
+	}
 	return(0);
+}
 /*
  * terminate():	when a SIGINT is recvd
  */
-void
+static void
-terminate(which_sig)
+terminate(int which_sig)
 	int which_sig;
+{
 	flsh_errs();
 	(void)raise_default_signal(which_sig);
 	exit(1);
+}
 /*
  * flsh_errs():	output saved up diagnostic messages after all normal
  *		processing has completed
  */
-void
+static void
-flsh_errs()
+flsh_errs(void)
+{
 	char buf[BUFSIZ];
 	(void)fflush(stdout);
-	(void)fflush(err);
+	(void)fflush(errf);
-	if (err == stderr)
+	if (errf == stderr)
 		return;
-	rewind(err);
+	rewind(errf);
-	while (fgets(buf, BUFSIZ, err) != NULL)
+	while (fgets(buf, BUFSIZ, errf) != NULL)
 		(void)fputs(buf, stderr);
+}
-void
+static void
-mfail()
+mfail(void)
+{
-	(void)fputs("pr: memory allocation failed\n", err);
+	(void)fputs("pr: memory allocation failed\n", errf);
+}
-void
+static void
-pfail()
+pfail(void)
+{
-	(void)fprintf(err, "pr: write failure, %s\n", strerror(errno));
+	(void)fprintf(errf, "pr: write failure, %s\n", strerror(errno));
+}
-void
+static void
-usage()
+usage(void)
+{
 	(void)fputs(
-	 "usage: pr [+page] [-col] [-adFmrt] [-e[ch][gap]] [-h header]\n",err);
+	 "usage: pr [+page] [-col] [-adFmrt] [-e[ch][gap]] [-h header]\n",errf);
 	(void)fputs(
-	 "          [-i[ch][gap]] [-l line] [-n[ch][width]] [-o offset]\n",err);
+	 "          [-i[ch][gap]] [-l line] [-n[ch][width]] [-o offset]\n",errf);
 	(void)fputs(
-	 "          [-s[ch]] [-w width] [-] [file ...]\n", err);
+	 "          [-s[ch]] [-w width] [-] [file ...]\n", errf);
+}
 /*
  * setup:	Validate command args, initialize and perform sanity
  *		checks on options
  */
-int
+static int
-setup(argc, argv)
+setup(int argc, char **argv)
 	int argc;
 	char **argv;
+{
 	int c;
 	int eflag = 0;
 	int iflag = 0;
 	int wflag = 0;
 	int cflag = 0;
 	if (isatty(fileno(stdout))) {
 		/*
 		 * defer diagnostics until processing is done
 		 */
-		if ((err = tmpfile()) == NULL) {
+		if ((errf = tmpfile()) == NULL) {
 		       (void)fputs("Cannot defer diagnostic messages\n",stderr);
 		       return(1);
+		}
 	} else
-		err = stderr;
+		errf = stderr;
 	while ((c = egetopt(argc, argv, "#adFmrte?h:i?l:n?o:s?T:w:")) != -1) {
 		switch (c) {
 		case '+':
 			if ((pgnm = atoi(eoptarg)) < 1) {
 			    (void)fputs("pr: +page number must be 1 or more\n",
-				err);
+				errf);
 			    return(1);
+			}
 			break;
 		case '-':
 			if ((clcnt = atoi(eoptarg)) < 1) {
-			    (void)fputs("pr: -columns must be 1 or more\n",err);
+			    (void)fputs("pr: -columns must be 1 or more\n",errf);
 			    return(1);
+			}
 			if (clcnt > 1)
 				++cflag;
 			break;
 		case 'a':
 			++across;
 			break;
 		case 'd':
 			++dspace;
 			break;
 		case 'e':
 			++eflag;
 			if ((eoptarg != NULL) &&
 			    !isdigit((unsigned char)*eoptarg))
 				inchar = *eoptarg++;
 			else
 				inchar = INCHAR;
 			if ((eoptarg != NULL) &&
 			    isdigit((unsigned char)*eoptarg)) {
 				if ((ingap = atoi(eoptarg)) < 0) {
 					(void)fputs(
-					"pr: -e gap must be 0 or more\n", err);
+					"pr: -e gap must be 0 or more\n", errf);
 					return(1);
+				}
 				if (ingap == 0)
 					ingap = INGAP;
 			} else if ((eoptarg != NULL) && (*eoptarg != '\0')) {
-				(void)fprintf(err,
+				(void)fprintf(errf,
 				      "pr: invalid value for -e %s\n", eoptarg);
 				return(1);
 			} else
 				ingap = INGAP;
 			break;
 		case 'F':
 			++formfeed;
 			break;
 		case 'h':
 			header = eoptarg;
 			break;
 		case 'i':
 			++iflag;
 			if ((eoptarg != NULL) &&
 			    !isdigit((unsigned char)*eoptarg))
 				ochar = *eoptarg++;
 			else
 				ochar = OCHAR;
 			if ((eoptarg != NULL) &&
 			    isdigit((unsigned char)*eoptarg)) {
 				if ((ogap = atoi(eoptarg)) < 0) {
 					(void)fputs(
-					"pr: -i gap must be 0 or more\n", err);
+					"pr: -i gap must be 0 or more\n", errf);
 					return(1);
+				}
 				if (ogap == 0)
 					ogap = OGAP;
 			} else if ((eoptarg != NULL) && (*eoptarg != '\0')) {
-				(void)fprintf(err,
+				(void)fprintf(errf,
 				      "pr: invalid value for -i %s\n", eoptarg);
 				return(1);
 			} else
 				ogap = OGAP;
 			break;
 		case 'l':
 			if (!isdigit((unsigned char)*eoptarg) ||
 			    ((lines=atoi(eoptarg)) < 1)) {
 				(void)fputs(
-				 "pr: Number of lines must be 1 or more\n",err);
+				 "pr: Number of lines must be 1 or more\n",errf);
 				return(1);
+			}
 			break;
 		case 'm':
 			++merge;
 			break;
 		case 'n':
 			if ((eoptarg != NULL) &&
 			    !isdigit((unsigned char)*eoptarg))
 				nmchar = *eoptarg++;
 			else
 				nmchar = NMCHAR;
 			if ((eoptarg != NULL) &&
 			    isdigit((unsigned char)*eoptarg)) {
 				if ((nmwd = atoi(eoptarg)) < 1) {
 					(void)fputs(
-					"pr: -n width must be 1 or more\n",err);
+					"pr: -n width must be 1 or more\n",errf);
 					return(1);
+				}
 			} else if ((eoptarg != NULL) && (*eoptarg != '\0')) {
-				(void)fprintf(err,
+				(void)fprintf(errf,
 				      "pr: invalid value for -n %s\n", eoptarg);
 				return(1);
 			} else
 				nmwd = NMWD;
 			break;
 		case 'o':
 			if (!isdigit((unsigned char)*eoptarg) ||
 			    ((offst = atoi(eoptarg))< 1)){
 				(void)fputs("pr: -o offset must be 1 or more\n",
-					err);
+					errf);
 				return(1);
+			}
 			break;
 		case 'r':
 			++nodiag;
 			break;
 		case 's':
 			++sflag;
 			if (eoptarg == NULL)
 				schar = SCHAR;
 			else
 				schar = *eoptarg++;
 			if (eoptarg && *eoptarg != '\0') {
-				(void)fprintf(err,
+				(void)fprintf(errf,
 				      "pr: invalid value for -s %s\n", eoptarg);
 				return(1);
+			}
 			break;
 		case 'T':
 			timefrmt = eoptarg;
 			break;
 		case 't':
 			++nohead;
 			break;
 		case 'w':
 			++wflag;
 			if (!isdigit((unsigned char)*eoptarg) ||
 			    ((pgwd = atoi(eoptarg)) < 1)){
 				(void)fputs(
-				   "pr: -w width must be 1 or more \n",err);
+				   "pr: -w width must be 1 or more \n",errf);
 				return(1);
+			}
 			break;
 		case '?':
 		default:
 			return(1);
+		}
+	}
 	/*
 	 * default and sanity checks
 	 */
 	if (!clcnt) {
 		if (merge) {
 			if ((clcnt = argc - eoptind) <= 1) {
 				clcnt = CLCNT;
 				merge = 0;
+			}
 		} else
 			clcnt = CLCNT;
+	}
 	if (across) {
 		if (clcnt == 1) {
 			(void)fputs("pr: -a flag requires multiple columns\n",
-				err);
+				errf);
 			return(1);
+		}
 		if (merge) {
-			(void)fputs("pr: -m cannot be used with -a\n", err);
+			(void)fputs("pr: -m cannot be used with -a\n", errf);
 			return(1);
+		}
+	}
 	if (!wflag) {
 		if (sflag)
 			pgwd = SPGWD;
 		else
 			pgwd = PGWD;
+	}
 	if (cflag || merge) {
 		if (!eflag) {
 			inchar = INCHAR;
 			ingap = INGAP;
+		}
 		if (!iflag) {
 			ochar = OCHAR;
 			ogap = OGAP;
+		}
+	}
 	if (cflag) {
 		if (merge) {
 			(void)fputs(
-			  "pr: -m cannot be used with multiple columns\n", err);
+			  "pr: -m cannot be used with multiple columns\n", errf);
 			return(1);
+		}
 		if (nmwd) {
 			colwd = (pgwd + 1 - (clcnt * (nmwd + 2)))/clcnt;
 			pgwd = ((colwd + nmwd + 2) * clcnt) - 1;
 		} else {
 			colwd = (pgwd + 1 - clcnt)/clcnt;
 			pgwd = ((colwd + 1) * clcnt) - 1;
+		}
 		if (colwd < 1) {
-			(void)fprintf(err,
+			(void)fprintf(errf,
 			  "pr: page width is too small for %d columns\n",clcnt);
 			return(1);
+		}
+	}
 	if (!lines)
 		lines = LINES;
 	/*
 	 * make sure long enough for headers. if not disable
 	 */
 	if (lines <= HEADLEN + TAILLEN)
 		++nohead;
 	else if (!nohead)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: egetopt.c,v 1.8 2009/04/13 00:37:05 lukem Exp $	*/
+/*	$NetBSD: egetopt.c,v 1.9 2011/09/06 18:26:06 joerg Exp $	*/
 /*-
  * Copyright (c) 1991 Keith Muller.
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Keith Muller of the University of California, San Diego.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -28,27 +28,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 from: static char sccsid[] = "@(#)egetopt.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: egetopt.c,v 1.8 2009/04/13 00:37:05 lukem Exp $");
+__RCSID("$NetBSD: egetopt.c,v 1.9 2011/09/06 18:26:06 joerg Exp $");
 #endif
 #endif /* not lint */
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "extern.h"
 /*
  * egetopt:	get option letter from argument vector (an extended
  *		version of getopt).
 @@ -57,33 +57,30 @@ __RCSID("$NetBSD: egetopt.c,v 1.8 2009/0
  * 1) '?': immediate value following arg is optional (no white space
  *    between the arg and the value)
  * 2) '#': +/- followed by a number (with an optional sign but
  *    no white space between the arg and the number). The - may be
  *    combined with other options, but the + cannot.
  */
 int	eopterr = 1;		/* if error message should be printed */
 int	eoptind = 1;		/* index into parent argv vector */
 int	eoptopt;		/* character checked for validity */
 char	*eoptarg;		/* argument associated with option */
 #define	BADCH	(int)'?'
-char EMSG[1] = { '\0' };
+static char EMSG[1] = { '\0' };
 int
-egetopt(nargc, nargv, ostr)
+egetopt(int nargc, char * const *nargv, const char *ostr)
 	int nargc;
 	char * const *nargv;
 	const char *ostr;
+{
 	static char *place = EMSG;	/* option letter processing */
 	char *oli;			/* option letter list index */
 	static int delim;		/* which option delimiter */
 	char *p;
 	static char savec = '\0';
 	if (savec != '\0') {
 		*place = savec;
 		savec = '\0';
+	}
 	if (!*place) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: extern.h,v 1.5 2009/04/13 00:37:05 lukem Exp $	*/
+/*	$NetBSD: extern.h,v 1.6 2011/09/06 18:26:06 joerg Exp $	*/
 /*-
  * Copyright (c) 1991 Keith Muller.
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Keith Muller of the University of California, San Diego.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -23,37 +23,20 @@
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *      from: @(#)extern.h	8.1 (Berkeley) 6/6/93
- *	$NetBSD: extern.h,v 1.5 2009/04/13 00:37:05 lukem Exp $
+ *	$NetBSD: extern.h,v 1.6 2011/09/06 18:26:06 joerg Exp $
  */
 extern int eoptind;
 extern char *eoptarg;
-void	 addnum __P((char *, int, int));
+int	 egetopt(int, char * const *, const char *);
 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 **, const char **, char *, int));
 int	 onecol __P((int, char **));
 int	 otln __P((char *, int, int *, int *, int));
 void	 pfail __P((void));
 int	 prhead __P((char *, const 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 **));