From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Mon, 21 Jan 2013 13:12:23 +0000 (+0000)
Subject: The lp command did not show errors for unknown "--foo" (STR #4261)
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=595fd510c57282fb19b94d678a1e5715c0aeb8b4;p=thirdparty%2Fcups.git

The lp command did not show errors for unknown "--foo" (STR #4261)



git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10829 7a7537e8-13f0-0310-91df-b6672ffda945
---

diff --git a/CHANGES-1.6.txt b/CHANGES-1.6.txt
index 61658d25c4..3b40efd383 100644
--- a/CHANGES-1.6.txt
+++ b/CHANGES-1.6.txt
@@ -12,7 +12,8 @@ CHANGES IN CUPS V1.6.2
 	- Added a French localization (STR #4247)
 	- Added a Russian localization (STR #4228)
 	- Updated the Catalan localization (STR #4202)
-	- Fixed a bug where bad IPP responses could crash ipptool (STR #4262)
+	- The lp command did not show errors for unknown "--foo" (STR #4261)
+	- Bad IPP responses could crash ipptool (STR #4262)
 	- Added a USB quirk rule for Xerox Phaser 3124 printers (STR #4217)
 	- Added USB blacklisting for printers that require a custom backend
 	  (STR #4218)
diff --git a/systemv/lp.c b/systemv/lp.c
index f7b1a3c849..96728b26ea 100644
--- a/systemv/lp.c
+++ b/systemv/lp.c
@@ -3,7 +3,7 @@
  *
  *   "lp" command for CUPS.
  *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -489,6 +489,13 @@ main(int  argc,				/* I - Number of command-line arguments */
 	    break;
 
         case '-' : /* Stop processing options */
+            if (argv[i][2])
+            {
+	      _cupsLangPrintf(stderr, _("%s: Error - unknown option \"%s\"."),
+			      argv[0], argv[i]);
+	      return (1);
+	    }
+
 	    end_options = 1;
 	    break;