Mirror 1.1.x change.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@3726 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index 64a676faba4c4ce0f13a30654e280b8eb72e567f..af30c716ca26526f6654dff926ea2c496ae92ad3 100644 (file)
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,6 +3,8 @@ CHANGES-1.1.txt
 
 CHANGES IN CUPS V1.1.19
 
+       - "lpq -P" would segfault instead of showing a usage
+         message (STR #94)
        - Fixed compiler warnings in pdftops filter (STR #96)
 
 

diff --git a/berkeley/lpq.c b/berkeley/lpq.c
index dfc876359c9ec3c871b36a3c13482d86b71ed1c9..b9a0b09c2be56fc534ce62920c5d3244e852ae3a 100644 (file)
--- a/berkeley/lpq.c
+++ b/berkeley/lpq.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpq.c,v 1.17.2.9 2003/01/15 04:25:47 mike Exp $"
+ * "$Id: lpq.c,v 1.17.2.10 2003/05/14 18:35:15 mike Exp $"
  *
  *   "lpq" command for the Common UNIX Printing System (CUPS).
  *
@@ -26,6 +26,7 @@
  *   main()         - Parse options and commands.
  *   show_jobs()    - Show jobs.
  *   show_printer() - Show printer status.
+ *   usage()        - Show program usage.
  */
 
 /*
@@ -51,6 +52,7 @@
 static int     show_jobs(http_t *, const char *, const char *, const int,
                          const int);
 static void    show_printer(http_t *, const char *);
+static void    usage(void);
 
 
 /*
@@ -128,6 +130,15 @@ main(int  argc,            /* I - Number of command-line arguments */
            else
            {
              i ++;
+
+             if (i >= argc)
+             {
+               httpClose(http);
+               cupsFreeDests(num_dests, dests);
+               
+               usage();
+             }
+
              dest = argv[i];
            }
 
@@ -155,10 +166,11 @@ main(int  argc,           /* I - Number of command-line arguments */
            break;
 
        default :
-           fputs("Usage: lpq [-P dest] [-l] [+interval]\n", stderr);
            httpClose(http);
-            cupsFreeDests(num_dests, dests);
-           return (1);
+           cupsFreeDests(num_dests, dests);
+
+           usage();
+           break;
       }
     }
     else if (isdigit(argv[i][0]))
@@ -545,5 +557,17 @@ show_printer(http_t     *http,     /* I - HTTP connection to server */
 
 
 /*
- * End of "$Id: lpq.c,v 1.17.2.9 2003/01/15 04:25:47 mike Exp $".
+ * 'usage()' - Show program usage.
+ */
+
+static void
+usage(void)
+{
+  fputs("Usage: lpq [-P dest] [-l] [+interval]\n", stderr);
+  exit(1);
+}
+
+
+/*
+ * End of "$Id: lpq.c,v 1.17.2.10 2003/05/14 18:35:15 mike Exp $".
  */