Pull in useful bits from NetBSD and make our lp* easier to diff and

do some minor cleanup of my own:

o IPv6 support
o ANSI function headers
o use getopt()
o synce usage() with man pages
o passes -Wall on both 32bit and 64bit platforms
o add an option to set the max number of children lpd will fork off
o add an lpd option to bind to specific addresses instead of INADDR_ANY.
o allow user to specify how long to wait for a connection to remote servers
o more strlcpy() and snprintf() usage
o Use FOO_FILENO constants instead of hard-coding 0-2
o Add some keeps to man the page SYNOPSIS to avoid options being split

1 files changed, 10 insertions, 5 deletions

diff --git a/usr.sbin/lpr/common_source/lp.h b/usr.sbin/lpr/common_source/lp.h
index d65735ea160..9a3cedb372a 100644
--- a/usr.sbin/lpr/common_source/lp.h
+++ b/usr.sbin/lpr/common_source/lp.h
@@ -1,4 +1,5 @@
-/*	$OpenBSD: lp.h,v 1.8 2002/02/17 19:42:36 millert Exp $	*/
+/*	$OpenBSD: lp.h,v 1.9 2002/05/20 23:13:50 millert Exp $	*/
+/*	$NetBSD: lp.h,v 1.14 2000/04/16 14:43:58 mrg Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -44,7 +45,7 @@ extern char	*AF;		/* accounting file */
 extern long	 BR;		/* baud rate if lp is a tty */
 extern char	*CF;		/* name of cifplot filter (per job) */
 extern char	*DF;		/* name of tex filter (per job) */
-extern long	 DU;		/* daeomon user-id */
+extern long	 DU;		/* daemon user-id */
 extern long	 FC;		/* flags to clear if lp is a tty */
 extern char	*FF;		/* form feed string */
 extern long	 FS;		/* flags to set if lp is a tty */
@@ -56,7 +57,7 @@ extern char	*LO;		/* lock file name */
 extern char	*LP;		/* line printer device name */
 extern long	 MC;		/* maximum number of copies allowed */
 extern char	*MS;		/* stty flags to set if lp is a tty */
-extern long  MX;		/* maximum number of blocks to copy */
+extern long	 MX;		/* maximum number of blocks to copy */
 extern char	*NF;		/* name of ditroff(1) filter (per job) */
 extern char	*OF;		/* name of output filter (created once) */
 extern long	 PL;		/* page length */
@@ -88,7 +89,10 @@ extern char	*printer;	/* printer name */
 extern char	host[MAXHOSTNAMELEN];
 extern char	*from;		/* client's machine name */
 extern int	remote;		/* true if sending files to a remote host */
-extern char	*printcapdb[];  /* printcap database array */
+extern char	*printcapdb[];	/* printcap database array */
+extern u_int	wait_time;	/* time to wait for remote responses */
+
+extern uid_t	uid, euid;	/* real and effective user id's */
 
 extern volatile sig_atomic_t	gotintr;
 
@@ -110,7 +114,8 @@ char	*checkremote(void);
 int      chk(char *);
 void     displayq(int);
 void     dump(char *, char *, int);
-void	 fatal(const char *, ...);
+void	 fatal(const char *, ...)
+	__attribute__((__format__(__printf__, 1, 2)));
 int	 getline(FILE *);
 int	 getport(char *, int);
 int	 getq(struct queue *(*[]));