/*
- * "$Id: cancel.c 7720 2008-07-11 22:46:21Z mike $"
+ * "cancel" command for CUPS.
*
- * "cancel" command for CUPS.
+ * Copyright 2007-2016 by Apple Inc.
+ * Copyright 1997-2006 by Easy Software Products.
*
- * Copyright 2007-2011 by Apple Inc.
- * Copyright 1997-2006 by Easy Software Products.
- *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law. Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file. If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- * main() - Parse options and cancel jobs.
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * missing or damaged, see the license at "http://www.cups.org/".
*/
/*
int job_id; /* Job ID */
int num_dests; /* Number of destinations */
cups_dest_t *dests; /* Destinations */
- char *dest, /* Destination printer */
+ char *opt, /* Option pointer */
+ *dest, /* Destination printer */
*job, /* Job ID pointer */
*user; /* Cancel jobs for a user */
int purge; /* Purge or cancel jobs? */
*/
for (i = 1; i < argc; i ++)
+ {
if (argv[i][0] == '-' && argv[i][1])
- switch (argv[i][1])
+ {
+ for (opt = argv[i] + 1; *opt; opt ++)
{
- case 'E' : /* Encrypt */
+ switch (*opt)
+ {
+ case 'E' : /* Encrypt */
#ifdef HAVE_SSL
- cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);
+ cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);
- if (http)
- httpEncryption(http, HTTP_ENCRYPT_REQUIRED);
+ if (http)
+ httpEncryption(http, HTTP_ENCRYPT_REQUIRED);
#else
- _cupsLangPrintf(stderr,
- _("%s: Sorry, no encryption support."), argv[0]);
+ _cupsLangPrintf(stderr, _("%s: Sorry, no encryption support."), argv[0]);
#endif /* HAVE_SSL */
- break;
-
- case 'U' : /* Username */
- if (argv[i][2] != '\0')
- cupsSetUser(argv[i] + 2);
- else
- {
- i ++;
- if (i >= argc)
+ break;
+
+ case 'U' : /* Username */
+ if (opt[1] != '\0')
+ {
+ cupsSetUser(opt + 1);
+ opt += strlen(opt) - 1;
+ }
+ else
{
- _cupsLangPrintf(stderr,
- _("%s: Error - expected username after "
- "\"-U\" option."), argv[0]);
- return (1);
+ i ++;
+ if (i >= argc)
+ {
+ _cupsLangPrintf(stderr, _("%s: Error - expected username after \"-U\" option."), argv[0]);
+ return (1);
+ }
+
+ cupsSetUser(argv[i]);
}
+ break;
- cupsSetUser(argv[i]);
- }
- break;
-
- case 'a' : /* Cancel all jobs */
- purge = 1;
- op = IPP_PURGE_JOBS;
- break;
-
- case 'h' : /* Connect to host */
- if (http != NULL)
- {
- httpClose(http);
- http = NULL;
- }
-
- if (argv[i][2] != '\0')
- cupsSetServer(argv[i] + 2);
- else
- {
- i ++;
-
- if (i >= argc)
+ case 'a' : /* Cancel all jobs */
+ op = purge ? IPP_PURGE_JOBS : IPP_CANCEL_JOBS;
+ break;
+
+ case 'h' : /* Connect to host */
+ if (http != NULL)
{
- _cupsLangPrintf(stderr,
- _("%s: Error - expected hostname after "
- "\"-h\" option."), argv[0]);
- return (1);
- }
- else
- cupsSetServer(argv[i]);
- }
- break;
+ httpClose(http);
+ http = NULL;
+ }
- case 'u' : /* Username */
- op = IPP_PURGE_JOBS;
+ if (opt[1] != '\0')
+ {
+ cupsSetServer(opt + 1);
+ opt += strlen(opt) - 1;
+ }
+ else
+ {
+ i ++;
+
+ if (i >= argc)
+ {
+ _cupsLangPrintf(stderr, _("%s: Error - expected hostname after \"-h\" option."), argv[0]);
+ return (1);
+ }
+ else
+ cupsSetServer(argv[i]);
+ }
+ break;
- if (argv[i][2] != '\0')
- user = argv[i] + 2;
- else
- {
- i ++;
+ case 'u' : /* Username */
+ op = IPP_CANCEL_MY_JOBS;
- if (i >= argc)
+ if (opt[1] != '\0')
{
- _cupsLangPrintf(stderr,
- _("%s: Error - expected username after "
- "\"-u\" option."), argv[0]);
- return (1);
- }
+ user = opt + 1;
+ opt += strlen(opt) - 1;
+ }
else
- user = argv[i];
- }
- break;
-
- default :
- _cupsLangPrintf(stderr,
- _("%s: Error - unknown option \"%c\"."),
- argv[0], argv[i][1]);
- return (1);
+ {
+ i ++;
+
+ if (i >= argc)
+ {
+ _cupsLangPrintf(stderr, _("%s: Error - expected username after \"-u\" option."), argv[0]);
+ return (1);
+ }
+ else
+ user = argv[i];
+ }
+ break;
+
+ case 'x' : /* Purge job(s) */
+ purge = 1;
+
+ if (op == IPP_CANCEL_JOBS)
+ op = IPP_PURGE_JOBS;
+ break;
+
+ default :
+ _cupsLangPrintf(stderr, _("%s: Error - unknown option \"%c\"."), argv[0], *opt);
+ return (1);
+ }
}
+ }
else
{
/*
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
"requesting-user-name", NULL, user);
ippAddBoolean(request, IPP_TAG_OPERATION, "my-jobs", 1);
+
+ if (op == IPP_CANCEL_JOBS)
+ op = IPP_CANCEL_MY_JOBS;
}
else
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
"requesting-user-name", NULL, cupsUser());
- if (op == IPP_PURGE_JOBS)
- ippAddBoolean(request, IPP_TAG_OPERATION, "purge-jobs", purge);
+ if (purge)
+ ippAddBoolean(request, IPP_TAG_OPERATION, "purge-jobs", (char)purge);
/*
* Do the request and get back a response...
*/
- if (op == IPP_PURGE_JOBS && (!user || strcasecmp(user, cupsUser())))
+ if (op == IPP_CANCEL_JOBS && (!user || _cups_strcasecmp(user, cupsUser())))
response = cupsDoRequest(http, request, "/admin/");
else
response = cupsDoRequest(http, request, "/jobs/");
ippDelete(response);
}
+ }
- if (num_dests == 0 && op == IPP_PURGE_JOBS)
+ if (num_dests == 0 && op != IPP_CANCEL_JOB)
{
/*
* Open a connection to the server...
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
"requesting-user-name", NULL, cupsUser());
- ippAddBoolean(request, IPP_TAG_OPERATION, "purge-jobs", purge);
+ ippAddBoolean(request, IPP_TAG_OPERATION, "purge-jobs", (char)purge);
/*
* Do the request and get back a response...
return (0);
}
-
-
-/*
- * End of "$Id: cancel.c 7720 2008-07-11 22:46:21Z mike $".
- */
projects / thirdparty / cups.git / blobdiff