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

2 files changed, 7 insertions, 6 deletions

diff --git a/usr.sbin/lpr/lptest/lptest.1 b/usr.sbin/lpr/lptest/lptest.1
index b466ea0de0f..247fae2a01b 100644
--- a/usr.sbin/lpr/lptest/lptest.1
+++ b/usr.sbin/lpr/lptest/lptest.1
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: lptest.1,v 1.3 2000/03/19 17:57:07 aaron Exp $
+.\"	$OpenBSD: lptest.1,v 1.4 2002/05/20 23:13:50 millert Exp $
+.\"	$NetBSD: lptest.1,v 1.7 1999/03/22 18:44:00 garbled Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -73,6 +74,6 @@ is to be specified,
 .Ar length
 must be also be specified.
 .Sh HISTORY
-.Nm lptest
+.Nm
 appeared in
 .Bx 4.3 .
diff --git a/usr.sbin/lpr/lptest/lptest.c b/usr.sbin/lpr/lptest/lptest.c
index 5ac3477c0f6..d8806c9d984 100644
--- a/usr.sbin/lpr/lptest/lptest.c
+++ b/usr.sbin/lpr/lptest/lptest.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: lptest.c,v 1.4 2001/08/30 17:38:13 millert Exp $ */
-/*	$NetBSD: lptest.c,v 1.5 1996/03/21 18:13:20 jtc Exp $	*/
+/*	$OpenBSD: lptest.c,v 1.5 2002/05/20 23:13:50 millert Exp $ */
+/*	$NetBSD: lptest.c,v 1.6 1996/12/09 09:57:50 mrg Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -45,7 +45,7 @@ static const char copyright[] =
 #if 0
 static const char sccsid[] = "@(#)lptest.c	8.1 (Berkeley) 6/6/93";
 #else
-static const char rcsid[] = "$OpenBSD: lptest.c,v 1.4 2001/08/30 17:38:13 millert Exp $";
+static const char rcsid[] = "$OpenBSD: lptest.c,v 1.5 2002/05/20 23:13:50 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -85,6 +85,6 @@ main(argc, argv)
 		}
 		putchar('\n');
 	}
-	(void) fflush(stdout);
+	(void)fflush(stdout);
 	exit(0);
 }