/*
- * "$Id: lprm.c 4906 2006-01-10 20:53:28Z mike $"
+ * "$Id: lprm.c 5878 2006-08-24 15:55:42Z mike $"
*
* "lprm" command for the Common UNIX Printing System (CUPS).
*
ipp_t *request; /* IPP request */
ipp_t *response; /* IPP response */
ipp_op_t op; /* Operation */
- cups_lang_t *language; /* Language */
int num_dests; /* Number of destinations */
- cups_dest_t *dests; /* Destinations */
+ cups_dest_t *dests, /* Destinations */
+ *defdest; /* Default destination */
http_encryption_t encryption; /* Encryption? */
+ _cupsSetLocale();
+
/*
* Setup to cancel individual print jobs...
*/
response = NULL;
http = NULL;
encryption = cupsEncryption();
- language = cupsLangDefault();
- num_dests = cupsGetDests(&dests);
-
- for (i = 0; i < num_dests; i ++)
- if (dests[i].is_default)
- dest = dests[i].name;
/*
* Open a connection to the server...
if ((http = httpConnectEncrypt(cupsServer(), ippPort(), encryption)) == NULL)
{
- _cupsLangPuts(stderr, language, _("lprm: Unable to contact server!\n"));
- cupsFreeDests(num_dests, dests);
+ _cupsLangPuts(stderr, _("lprm: Unable to contact server!\n"));
return (1);
}
+ num_dests = cupsGetDests2(http, &dests);
+ defdest = cupsGetDest(NULL, NULL, num_dests, dests);
+ dest = defdest ? defdest->name : NULL;
+
/*
* Process command-line arguments...
*/
encryption = HTTP_ENCRYPT_REQUIRED;
httpEncryption(http, encryption);
+ cupsSetEncryption(encryption);
#else
- _cupsLangPrintf(stderr, language,
+ _cupsLangPrintf(stderr,
_("%s: Sorry, no encryption support compiled in!\n"),
argv[0]);
#endif /* HAVE_SSL */
if (cupsGetDest(dest, NULL, num_dests, dests) == NULL)
{
- _cupsLangPrintf(stderr, language,
- _("lprm: Unknown destination \"%s\"!\n"), dest);
+ _cupsLangPrintf(stderr,
+ _("%s: Error - unknown destination \"%s\"!\n"),
+ argv[0], dest);
cupsFreeDests(num_dests, dests);
httpClose(http);
return(1);
}
break;
+ case 'U' : /* Username */
+ if (argv[i][2] != '\0')
+ cupsSetUser(argv[i] + 2);
+ else
+ {
+ i ++;
+ if (i >= argc)
+ {
+ _cupsLangPrintf(stderr,
+ _("%s: Error - expected username after "
+ "\'-U\' option!\n"),
+ argv[0]);
+ return (1);
+ }
+
+ cupsSetUser(argv[i]);
+ }
+ break;
+
+ case 'h' : /* Connect to host */
+ if (argv[i][2] != '\0')
+ cupsSetServer(argv[i] + 2);
+ else
+ {
+ i ++;
+
+ if (i >= argc)
+ {
+ _cupsLangPrintf(stderr,
+ _("%s: Error - expected hostname after "
+ "\'-h\' option!\n"),
+ argv[0]);
+ return (1);
+ }
+ else
+ cupsSetServer(argv[i]);
+ }
+
+ httpClose(http);
+ cupsFreeDests(num_dests, dests);
+
+ if ((http = httpConnectEncrypt(cupsServer(), ippPort(),
+ encryption)) == NULL)
+ {
+ _cupsLangPuts(stderr, _("lprm: Unable to contact server!\n"));
+ return (1);
+ }
+
+ num_dests = cupsGetDests2(http, &dests);
+ defdest = cupsGetDest(NULL, NULL, num_dests, dests);
+ dest = defdest ? defdest->name : NULL;
+ break;
+
default :
- _cupsLangPrintf(stderr, language,
- _("lprm: Unknown option \'%c\'!\n"), argv[i][1]);
+ _cupsLangPrintf(stderr,
+ _("%s: Error - unknown option \'%c\'!\n"),
+ argv[0], argv[i][1]);
cupsFreeDests(num_dests, dests);
httpClose(http);
return (1);
op = IPP_CANCEL_JOB;
job_id = atoi(argv[i]);
}
- else if (strcmp(argv[i], "-") == 0)
+ else if (!strcmp(argv[i], "-"))
{
/*
* Cancel all jobs
* [requesting-user-name]
*/
- request = ippNew();
-
- request->request.op.operation_id = op;
- request->request.op.request_id = 1;
-
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
- "attributes-charset", NULL, cupsLangEncoding(language));
-
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
- "attributes-natural-language", NULL, language->language);
+ request = ippNewRequest(op);
if (dest)
{
- httpAssembleURIf(uri, sizeof(uri), "ipp", NULL, "localhost", 0,
- "/printers/%s", dest);
+ httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
+ "localhost", 0, "/printers/%s", dest);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
"printer-uri", NULL, uri);
ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "job-id",
else
response = cupsDoRequest(http, request, "/jobs/");
- if (response != NULL)
- {
- switch (response->request.status.status_code)
- {
- case IPP_NOT_FOUND :
- _cupsLangPuts(stderr, language,
- _("lprm: Job or printer not found!\n"));
- break;
- case IPP_NOT_AUTHORIZED :
- _cupsLangPuts(stderr, language,
- _("lprm: Not authorized to lprm job(s)!\n"));
- break;
- case IPP_FORBIDDEN :
- _cupsLangPrintf(stderr, language,
- _("lprm: You don't own job ID %d!\n"), job_id);
- break;
- default :
- if (response->request.status.status_code > IPP_OK_CONFLICT)
- _cupsLangPuts(stderr, language,
- _("lprm: Unable to lprm job(s)!\n"));
- break;
- }
-
- if (response->request.status.status_code > IPP_OK_CONFLICT)
- {
- ippDelete(response);
- cupsFreeDests(num_dests, dests);
- httpClose(http);
- return (1);
- }
-
- ippDelete(response);
- }
- else
+ ippDelete(response);
+
+ if (cupsLastError() > IPP_OK_CONFLICT)
{
- _cupsLangPuts(stderr, language,
- _("lprm: Unable to cancel job(s)!\n"));
+ _cupsLangPrintf(stderr, "%s: %s\n", argv[0], cupsLastErrorString());
+
cupsFreeDests(num_dests, dests);
httpClose(http);
return (1);
}
/*
- * If nothing has been cancelled yet, cancel the current job on the specified
+ * If nothing has been canceled yet, cancel the current job on the specified
* (or default) printer...
*/
if (response == NULL)
if (!cupsCancelJob(dest, 0))
{
- _cupsLangPuts(stderr, language,
- _("lprm: Unable to cancel job(s)!\n"));
+ _cupsLangPrintf(stderr, "%s: %s\n", argv[0], cupsLastErrorString());
cupsFreeDests(num_dests, dests);
httpClose(http);
return (1);
/*
- * End of "$Id: lprm.c 4906 2006-01-10 20:53:28Z mike $".
+ * End of "$Id: lprm.c 5878 2006-08-24 15:55:42Z mike $".
*/
projects / thirdparty / cups.git / blobdiff