cupsfilter showing particular errors.

diff --git a/scheduler/cupsfilter.c b/scheduler/cupsfilter.c
index fa914d215adf10a03ab40a1ae06db2aeed18df86..21a18a3a61eed53ee7121e19114bc40a2eb268fe 100644 (file)
--- a/scheduler/cupsfilter.c
+++ b/scheduler/cupsfilter.c
@@ -184,9 +184,11 @@ main(int  argc,                            /* I - Number of command-line args */
                i ++;
                if (i < argc)
                  num_options = cupsParseOptions(argv[i], num_options, &options);
-               else
+               else{
+      _cupsLangPrintf(stderr,"%s: Error - expected option after \"-a\" option.",argv[0]);
                  usage(opt);
-               break;
+    }
+    break;
 
            case 'c' : /* Specify cups-files.conf file location... */
                i ++;
@@ -197,16 +199,20 @@ main(int  argc,                           /* I - Number of command-line args */
                  else
                    strlcpy(cupsfilesconf, argv[i], sizeof(cupsfilesconf));
                }
-               else
-                 usage(opt);
+               else{
+      _cupsLangPrintf(stderr,"%s: Error - expected config-file after \"-c\" option.",argv[0]);
+      usage(NULL);
+    }
                break;
 
            case 'd' : /* Specify the real printer name */
                i ++;
                if (i < argc)
                  printer = argv[i];
-               else
-                 usage(opt);
+               else{
+      _cupsLangPrintf(stderr,"%s: Error - expected printer name after \"-d\" option.",argv[0]);
+                 usage(NULL);
+    }
                break;
 
            case 'D' : /* Delete input file after conversion */
@@ -221,8 +227,10 @@ main(int  argc,                            /* I - Number of command-line args */
                i ++;
                if (i < argc && !infile)
                  infile = argv[i];
-               else
-                 usage(opt);
+               else{
+      _cupsLangPrintf(stderr,"%s: Error - expected input file after \"-f\" option.",argv[0]);
+                 usage(NULL);
+    }
                break;
 
            case 'i' : /* Specify source MIME type... */
@@ -234,8 +242,10 @@ main(int  argc,                            /* I - Number of command-line args */
 
                  srctype = argv[i];
                }
-               else
-                 usage(opt);
+               else{
+      _cupsLangPrintf(stderr,"%s: Error - expected source MIME type after \"-i\" option.",argv[0]);
+                 usage(NULL);
+      }
                break;
 
            case 'j' : /* Get job file or specify destination MIME type... */
@@ -247,8 +257,10 @@ main(int  argc,                            /* I - Number of command-line args */
                    get_job_file(argv[i]);
                    infile = TempFile;
                  }
-                 else
-                   usage(opt);
+                 else{
+        _cupsLangPrintf(stdout,"%s: Error - expected job-id after \"-j\" option.",argv[0]);
+                   usage(NULL);
+      }
 
                  break;
                }
@@ -262,17 +274,21 @@ main(int  argc,                           /* I - Number of command-line args */
 
                  dsttype = argv[i];
                }
-               else
-                 usage(opt);
+               else{
+      _cupsLangPrintf(stderr,"%s: Error - expected destination mime type after \"-m\" option.",argv[0]);
+                 usage(NULL);
+    }
                break;
 
            case 'n' : /* Specify number of copies... */
                i ++;
                if (i < argc)
                  num_options = cupsAddOption("copies", argv[i], num_options, &options);
-               else
-                 usage(opt);
-               break;
+               else{
+      _cupsLangPrintf(stderr,"%s: Error - expected \"number of copies\" after \"-n\" option.",argv[0]);
+                 usage(NULL);
+    }
+    break;
 
            case 'o' : /* Specify option(s) or output filename */
                i ++;
@@ -288,27 +304,49 @@ main(int  argc,                           /* I - Number of command-line args */
                  else
                    num_options = cupsParseOptions(argv[i], num_options, &options);
                }
-               else
-                 usage(opt);
+    else{
+      _cupsLangPrintf(stderr,"%s: Error - expected \"options\" after \"-o\" option.",argv[0]);
+                 usage(NULL);
+    }
                break;
 
            case 'p' : /* Specify PPD file... */
+      i ++;
+               if (i < argc)
+                 ppdfile = argv[i];
+               else{
+      _cupsLangPrintf(stderr,"%s: Error - expected \"PPD file\" after \"-p\" option.",argv[0]);
+                 usage(NULL);
+    }
+    break;
            case 'P' : /* Specify PPD file... */
                i ++;
                if (i < argc)
                  ppdfile = argv[i];
-               else
-                 usage(opt);
-               break;
+               else{
+      _cupsLangPrintf(stderr,"%s: Error - expected \"PPD file\" after \"-P\" option.",argv[0]);
+                 usage(NULL);
+    }
+    break;
 
            case 't' : /* Specify title... */
+       i ++;
+               if (i < argc)
+                 title = argv[i];
+               else{
+      _cupsLangPrintf(stderr,"%s: Error - expected title after \"-t\" option.",argv[0]);
+                 usage(NULL);
+    }
+    break;
            case 'J' : /* Specify title... */
                i ++;
                if (i < argc)
                  title = argv[i];
-               else
-                 usage(opt);
-               break;
+               else{
+      _cupsLangPrintf(stderr,"%s: Error - expected title after \"-J\" option.",argv[0]);
+                 usage(NULL);
+    }
+    break;
 
            case 'u' : /* Delete PPD file after conversion */
                removeppd = 1;
@@ -318,12 +356,15 @@ main(int  argc,                           /* I - Number of command-line args */
                i ++;
                if (i < argc)
                  user = argv[i];
-               else
-                 usage(opt);
-               break;
+               else{
+      _cupsLangPrintf(stderr,"%s: Error - expected \"username\" after \"-U\" option.",argv[0]);
+                 usage(NULL);
+    }
+    break;
 
            default : /* Something we don't understand... */
-               usage(opt);
+      _cupsLangPrintf(stderr,"%s: Error - unknown option %s.",argv[0],opt);
+               usage(NULL);
                break;
          }
        }