[src/trunk]: src/usr.sbin/lpr/lpd This fixes various little problems in the l...

[hubertf <hubertf%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/12f6c8233ab5
branches:  trunk
changeset: 533754:12f6c8233ab5
user:      hubertf <hubertf%NetBSD.org@localhost>
date:      Tue Jul 09 01:12:35 2002 +0000

description:
This fixes various little problems in the lpd source.

        lpd.c           bogus 'c' option in getopt option string

        printjob.c      spelling "prstatic inter" -> "printer"
                        finish ANSIfication

        recvjob.c       finish ANSIfication

Patch contributed by Brian Ginsbach <ginsbach%cray.com@localhost> in PR 17520

diffstat:

 usr.sbin/lpr/lpd/lpd.c      |   6 +++---
 usr.sbin/lpr/lpd/printjob.c |  12 +++++-------
 usr.sbin/lpr/lpd/recvjob.c  |   7 +++----
 3 files changed, 11 insertions(+), 14 deletions(-)

diffs (102 lines):

diff -r b5c791f2e9eb -r 12f6c8233ab5 usr.sbin/lpr/lpd/lpd.c
--- a/usr.sbin/lpr/lpd/lpd.c    Tue Jul 09 01:05:32 2002 +0000
+++ b/usr.sbin/lpr/lpd/lpd.c    Tue Jul 09 01:12:35 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lpd.c,v 1.33 2002/01/21 14:42:29 wiz Exp $     */
+/*     $NetBSD: lpd.c,v 1.34 2002/07/09 01:12:35 hubertf Exp $ */
 
 /*
  * Copyright (c) 1983, 1993, 1994
@@ -45,7 +45,7 @@
 #if 0
 static char sccsid[] = "@(#)lpd.c      8.7 (Berkeley) 5/10/95";
 #else
-__RCSID("$NetBSD: lpd.c,v 1.33 2002/01/21 14:42:29 wiz Exp $");
+__RCSID("$NetBSD: lpd.c,v 1.34 2002/07/09 01:12:35 hubertf Exp $");
 #endif
 #endif /* not lint */
 
@@ -154,7 +154,7 @@
        name = argv[0];
 
        errs = 0;
-       while ((i = getopt(argc, argv, "b:cdln:srw:W")) != -1)
+       while ((i = getopt(argc, argv, "b:dln:srw:W")) != -1)
                switch (i) {
                case 'b':
                        if (blist_addrs >= blist_size) {
diff -r b5c791f2e9eb -r 12f6c8233ab5 usr.sbin/lpr/lpd/printjob.c
--- a/usr.sbin/lpr/lpd/printjob.c       Tue Jul 09 01:05:32 2002 +0000
+++ b/usr.sbin/lpr/lpd/printjob.c       Tue Jul 09 01:12:35 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: printjob.c,v 1.32 2002/06/08 23:40:12 itojun Exp $     */
+/*     $NetBSD: printjob.c,v 1.33 2002/07/09 01:12:35 hubertf Exp $    */
 
 /*
  * Copyright (c) 1983, 1993
@@ -45,7 +45,7 @@
 #if 0
 static char sccsid[] = "@(#)printjob.c 8.7 (Berkeley) 5/10/95";
 #else
-__RCSID("$NetBSD: printjob.c,v 1.32 2002/06/08 23:40:12 itojun Exp $");
+__RCSID("$NetBSD: printjob.c,v 1.33 2002/07/09 01:12:35 hubertf Exp $");
 #endif
 #endif /* not lint */
 
@@ -101,7 +101,7 @@
 static int     lfd;            /* lock file descriptor */
 static int     ofd;            /* output filter file descriptor */
 static int     ofilter;        /* id of output filter, if any */
-static int     pfd;            /* prstatic inter file descriptor */
+static int     pfd;            /* printer file descriptor */
 static int     pid;            /* pid of lpd process */
 static int     prchild;        /* id of pr process */
 static char    title[80];      /* ``pr'' title */
@@ -1040,8 +1040,7 @@
 }
 
 static int
-dropit(c)
-       int c;
+dropit(int c)
 {
        switch(c) {
 
@@ -1189,8 +1188,7 @@
  * Kill child processes to abort current job.
  */
 static void
-abortpr(signo)
-       int signo;
+abortpr(int signo)
 {
        (void)unlink(tempfile);
        kill(0, SIGINT);
diff -r b5c791f2e9eb -r 12f6c8233ab5 usr.sbin/lpr/lpd/recvjob.c
--- a/usr.sbin/lpr/lpd/recvjob.c        Tue Jul 09 01:05:32 2002 +0000
+++ b/usr.sbin/lpr/lpd/recvjob.c        Tue Jul 09 01:12:35 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: recvjob.c,v 1.14 2001/12/04 22:52:44 christos Exp $    */
+/*     $NetBSD: recvjob.c,v 1.15 2002/07/09 01:12:35 hubertf Exp $     */
 
 /*
  * Copyright (c) 1983, 1993
@@ -45,7 +45,7 @@
 #if 0
 static char sccsid[] = "@(#)recvjob.c  8.2 (Berkeley) 4/27/95";
 #else
-__RCSID("$NetBSD: recvjob.c,v 1.14 2001/12/04 22:52:44 christos Exp $");
+__RCSID("$NetBSD: recvjob.c,v 1.15 2002/07/09 01:12:35 hubertf Exp $");
 #endif
 #endif /* not lint */
 
@@ -302,8 +302,7 @@
 }
 
 static int
-read_number(fn)
-       char *fn;
+read_number(char *fn)
 {
        char lin[80];
        FILE *fp;