diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-05-23 22:51:18 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-05-23 22:51:18 +0000 |
| commit | a29fd7ddb5d63688a4d44d08e4ab16428921c321 (patch) | |
| tree | d8e716c51da91f08d468e90262417f9a6d6fd5b0 /berkeley | |
| parent | f3c17241a42a0845eae2099e6970b5aca9bbd836 (diff) | |
| download | cups-a29fd7ddb5d63688a4d44d08e4ab16428921c321.tar.gz | |
Merge changes from CUPS 1.6svn-r10510.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3833 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'berkeley')
| -rw-r--r-- | berkeley/lpr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/berkeley/lpr.c b/berkeley/lpr.c index 27d73c55c..7d30cc6e6 100644 --- a/berkeley/lpr.c +++ b/berkeley/lpr.c @@ -89,7 +89,7 @@ main(int argc, /* I - Number of command-line arguments */ cupsSetUser(argv[i]); } break; - + case 'H' : /* Connect to host */ if (argv[i][2] != '\0') cupsSetServer(argv[i] + 2); @@ -401,8 +401,9 @@ main(int argc, /* I - Number of command-line arguments */ if (cupsFinishDocument(CUPS_HTTP_DEFAULT, printer) != IPP_OK) { + _cupsLangPrintf(stderr, "%s: %s", argv[0], cupsLastErrorString()); cupsCancelJob2(CUPS_HTTP_DEFAULT, printer, job_id, 0); - job_id = 0; + return (1); } } |