Merge changes from CUPS 1.5svn-r9567

[thirdparty/cups.git] / cups / testppd.c

diff --git a/cups/testppd.c b/cups/testppd.c
index bb5567e0f23680ae23a7627514a18623a65272f4..47cfa01e926fef21a1cc508adafed5346bd46868 100644 (file)
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -826,10 +826,23 @@ main(int  argc,                           /* I - Number of command-line arguments */
 
     if (!strncmp(argv[1], "-d", 2))
     {
-      filename = cupsGetPPD(argv[1] + 2);
+      const char *printer;             /* Printer name */
+
+      if (argv[1][2])
+       printer = argv[1] + 2;
+      else if (argv[2])
+       printer = argv[2];
+      else
+      {
+        puts("Usage: ./testppd -d printer");
+       return (1);
+      }
+
+      filename = cupsGetPPD(printer);
+
       if (!filename)
       {
-        printf("%s: %s\n", argv[1], cupsLastErrorString());
+        printf("%s: %s\n", printer, cupsLastErrorString());
         return (1);
       }
     }