BSD 4_4 release

[unix-history] / usr / src / usr.sbin / lpr / lpc / lpc.c

diff --git a/usr/src/usr.sbin/lpr/lpc/lpc.c b/usr/src/usr.sbin/lpr/lpc/lpc.c
index de38ba6..01cfc12 100644 (file)
--- a/usr/src/usr.sbin/lpr/lpc/lpc.c
+++ b/usr/src/usr.sbin/lpr/lpc/lpc.c
@@ -1,16 +1,65 @@
-#ifndef lint
-static char sccsid[] = "@(#)lpc.c      4.2 (Berkeley) %G%";
-#endif
-

 /*
 /*

- * lpc -- line printer control program
+ * Copyright (c) 1983, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ *
+ * 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
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * 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.

  */
  */

-#include <stdio.h>
+
+#ifndef lint
+static char copyright[] =
+"@(#) Copyright (c) 1983, 1993\n\
+       The Regents of the University of California.  All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)lpc.c      8.1 (Berkeley) 6/6/93";
+#endif /* not lint */
+
+#include <sys/param.h>
+
+#include <dirent.h>

 #include <signal.h>
 #include <signal.h>

-#include <ctype.h>

 #include <setjmp.h>
 #include <setjmp.h>

-
+#include <syslog.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <string.h>
+#include "lp.h"

 #include "lpc.h"
 #include "lpc.h"

+#include "extern.h"
+
+/*
+ * lpc -- line printer control program
+ */

 
 int    fromatty;
 
 
 int    fromatty;
 


@@ -18,16 +67,24 @@ char        cmdline[200];
 int    margc;
 char   *margv[20];
 int    top;
 int    margc;
 char   *margv[20];
 int    top;

-int    intr();
-struct cmd *getcmd();

 
 jmp_buf        toplevel;
 
 
 jmp_buf        toplevel;
 

+static void             cmdscanner __P((int));
+static struct cmd      *getcmd __P((char *));
+static void             intr __P((int));
+static void             makeargv __P((void));
+
+int

 main(argc, argv)
 main(argc, argv)

+       int argc;

        char *argv[];
 {
        register struct cmd *c;
 
        char *argv[];
 {
        register struct cmd *c;
 

+       name = argv[0];
+       openlog("lpd", 0, LOG_LPR);
+

        if (--argc > 0) {
                c = getcmd(*++argv);
                if (c == (struct cmd *)-1) {
        if (--argc > 0) {
                c = getcmd(*++argv);
                if (c == (struct cmd *)-1) {


@@ -48,14 +105,16 @@ main(argc, argv)
        fromatty = isatty(fileno(stdin));
        top = setjmp(toplevel) == 0;
        if (top)
        fromatty = isatty(fileno(stdin));
        top = setjmp(toplevel) == 0;
        if (top)

-               sigset(SIGINT, intr);
+               signal(SIGINT, intr);

        for (;;) {
                cmdscanner(top);
                top = 1;
        }
 }
 
        for (;;) {
                cmdscanner(top);
                top = 1;
        }
 }
 

-intr()
+static void
+intr(signo)
+       int signo;

 {
        if (!fromatty)
                exit(0);
 {
        if (!fromatty)
                exit(0);


@@ -65,12 +124,11 @@ intr()
 /*
  * Command parser.
  */
 /*
  * Command parser.
  */

+static void

 cmdscanner(top)
        int top;
 {
        register struct cmd *c;
 cmdscanner(top)
        int top;
 {
        register struct cmd *c;

-       extern struct cmd cmdtab[];
-       extern int help();

 
        if (!top)
                putchar('\n');
 
        if (!top)
                putchar('\n');


@@ -79,9 +137,9 @@ cmdscanner(top)
                        printf("lpc> ");
                        fflush(stdout);
                }
                        printf("lpc> ");
                        fflush(stdout);
                }

-               if (gets(cmdline) == 0)
-                       quit();
-               if (cmdline[0] == 0)
+               if (fgets(cmdline, sizeof(cmdline), stdin) == 0)
+                       quit(0, NULL);
+               if (cmdline[0] == 0 || cmdline[0] == '\n')

                        break;
                makeargv();
                c = getcmd(margv[0]);
                        break;
                makeargv();
                c = getcmd(margv[0]);


@@ -134,6 +192,7 @@ getcmd(name)
 /*
  * Slice a string up into argc/argv.
  */
 /*
  * Slice a string up into argc/argv.
  */

+static void

 makeargv()
 {
        register char *cp;
 makeargv()
 {
        register char *cp;


@@ -161,6 +220,7 @@ makeargv()
 /*
  * Help command.
  */
 /*
  * Help command.
  */

+void

 help(argc, argv)
        int argc;
        char *argv[];
 help(argc, argv)
        int argc;
        char *argv[];


@@ -173,7 +233,7 @@ help(argc, argv)
                extern int NCMDS;
 
                printf("Commands may be abbreviated.  Commands are:\n\n");
                extern int NCMDS;
 
                printf("Commands may be abbreviated.  Commands are:\n\n");

-               for (c = cmdtab; c < &cmdtab[NCMDS]; c++) {
+               for (c = cmdtab; c->c_name; c++) {

                        int len = strlen(c->c_name);
 
                        if (len > width)
                        int len = strlen(c->c_name);
 
                        if (len > width)


@@ -187,7 +247,8 @@ help(argc, argv)
                for (i = 0; i < lines; i++) {
                        for (j = 0; j < columns; j++) {
                                c = cmdtab + j * lines + i;
                for (i = 0; i < lines; i++) {
                        for (j = 0; j < columns; j++) {
                                c = cmdtab + j * lines + i;

-                               printf("%s", c->c_name);
+                               if (c->c_name)
+                                       printf("%s", c->c_name);

                                if (c + lines >= &cmdtab[NCMDS]) {
                                        printf("\n");
                                        break;
                                if (c + lines >= &cmdtab[NCMDS]) {
                                        printf("\n");
                                        break;