BSD 4_3_Net_2 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 ecc47e3..0f38315 100644 (file)
--- a/usr/src/usr.sbin/lpr/lpc/lpc.c
+++ b/usr/src/usr.sbin/lpr/lpc/lpc.c
@@ -1,18 +1,45 @@
 /*
  * Copyright (c) 1983 Regents of the University of California.
 /*
  * Copyright (c) 1983 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * 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.

  */
 
 #ifndef lint
 char copyright[] =
 "@(#) Copyright (c) 1983 Regents of the University of California.\n\
  All rights reserved.\n";
  */
 
 #ifndef lint
 char copyright[] =
 "@(#) Copyright (c) 1983 Regents of the University of California.\n\
  All rights reserved.\n";

-#endif not lint
+#endif /* not lint */

 
 #ifndef lint
 
 #ifndef lint

-static char sccsid[] = "@(#)lpc.c      5.2 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)lpc.c      5.11 (Berkeley) 3/2/91";
+#endif /* not lint */

 
 /*
  * lpc -- line printer control program
 
 /*
  * lpc -- line printer control program


@@ -31,7 +58,7 @@ char  cmdline[200];
 int    margc;
 char   *margv[20];
 int    top;
 int    margc;
 char   *margv[20];
 int    top;

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

 struct cmd *getcmd();
 
 jmp_buf        toplevel;
 struct cmd *getcmd();
 
 jmp_buf        toplevel;


@@ -72,6 +99,7 @@ main(argc, argv)
        }
 }
 
        }
 }
 

+void

 intr()
 {
        if (!fromatty)
 intr()
 {
        if (!fromatty)


@@ -86,8 +114,6 @@ cmdscanner(top)
        int top;
 {
        register struct cmd *c;
        int top;
 {
        register struct cmd *c;

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

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


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

-               if (gets(cmdline) == 0)
+               if (fgets(cmdline, sizeof(cmdline), stdin) == 0)

                        quit();
                        quit();

-               if (cmdline[0] == 0)
+               if (cmdline[0] == 0 || cmdline[0] == '\n')

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


@@ -119,6 +145,8 @@ cmdscanner(top)
        longjmp(toplevel, 0);
 }
 
        longjmp(toplevel, 0);
 }
 

+extern struct cmd cmdtab[];
+

 struct cmd *
 getcmd(name)
        register char *name;
 struct cmd *
 getcmd(name)
        register char *name;


@@ -190,7 +218,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)


@@ -204,7 +232,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;