diff options
| author | Didier Raboud <odyx@debian.org> | 2013-03-19 11:05:58 +0100 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2013-03-19 11:05:58 +0100 |
| commit | ea5667a811b20e235ce1975e763469edd1f7f0de (patch) | |
| tree | a02b8034aba8666f06fdbc971905ca760b1c3aa7 /systemv | |
| parent | 6fd17d1b328ea9230585f7ad1e3c478343157220 (diff) | |
| download | cups-upstream/1.6.2.tar.gz | |
Imported Upstream version 1.6.2upstream/1.6.2
Diffstat (limited to 'systemv')
| -rw-r--r-- | systemv/cupstestppd.c | 8 | ||||
| -rw-r--r-- | systemv/lp.c | 13 |
2 files changed, 14 insertions, 7 deletions
diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c index 141790f5..9a5608ce 100644 --- a/systemv/cupstestppd.c +++ b/systemv/cupstestppd.c @@ -1,5 +1,5 @@ /* - * "$Id: cupstestppd.c 10431 2012-04-23 19:19:19Z mike $" + * "$Id: cupstestppd.c 10661 2012-10-24 11:57:40Z mike $" * * PPD test program for CUPS. * @@ -3279,8 +3279,8 @@ check_sizes(ppd_file_t *ppd, /* I - PPD file */ * Check for EnvSizeName as well... */ - if (strncmp(pwg_media->ppd, "Env", 3) && - !strncmp(size->name, "Env", 3)) + if (strncmp(pwg_media->ppd, "Env", 3) && + !strncmp(size->name, "Env", 3)) snprintf(buf, sizeof(buf), "Env%s", pwg_media->ppd); if (strcmp(size->name, buf)) @@ -3972,5 +3972,5 @@ valid_utf8(const char *s) /* I - String to check */ /* - * End of "$Id: cupstestppd.c 10431 2012-04-23 19:19:19Z mike $". + * End of "$Id: cupstestppd.c 10661 2012-10-24 11:57:40Z mike $". */ diff --git a/systemv/lp.c b/systemv/lp.c index 3ef59bab..fb4d367f 100644 --- a/systemv/lp.c +++ b/systemv/lp.c @@ -1,9 +1,9 @@ /* - * "$Id: lp.c 10494 2012-05-21 22:39:01Z mike $" + * "$Id: lp.c 10830 2013-01-21 13:14:40Z mike $" * * "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; @@ -724,5 +731,5 @@ set_job_attrs(const char *command, /* I - Command name */ /* - * End of "$Id: lp.c 10494 2012-05-21 22:39:01Z mike $". + * End of "$Id: lp.c 10830 2013-01-21 13:14:40Z mike $". */ |