/*
- * "$Id: lpadmin.c 5833 2006-08-16 20:05:58Z mike $"
+ * "lpadmin" command for CUPS.
*
- * "lpadmin" command for the Common UNIX Printing System (CUPS).
+ * Copyright 2007-2017 by Apple Inc.
+ * Copyright 1997-2006 by Easy Software Products.
*
- * Copyright 1997-2006 by Easy Software Products.
- *
- * These coded instructions, statements, and computer programs are the
- * property of Easy Software Products 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 please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
- *
- * Contents:
- *
- * main() - Parse options and configure the scheduler.
- * add_printer_to_class() - Add a printer to a class.
- * default_printer() - Set the default printing destination.
- * delete_printer() - Delete a printer from the system...
- * delete_printer_from_class() - Delete a printer from a class.
- * enable_printer() - Enable a printer...
- * set_printer_device() - Set the device-uri attribute.
- * set_printer_file() - Set the interface script or PPD file.
- * set_printer_info() - Set the printer description string.
- * set_printer_location() - Set the printer location string.
- * set_printer_model() - Set the driver model file.
- * set_printer_options() - Set the printer options.
- * validate_name() - Make sure the printer name only contains
- * valid chars...
+ * Licensed under Apache License v2.0. See the file "LICENSE" for more information.
*/
/*
* Include necessary headers...
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
-#include <cups/string.h>
-#include <cups/cups.h>
-#include <cups/i18n.h>
-#include <cups/debug.h>
-#ifdef HAVE_LIBZ
-# include <zlib.h>
-#endif /* HAVE_LIBZ */
+#define _CUPS_NO_DEPRECATED
+#define _PPD_DEPRECATED
+#include <cups/cups-private.h>
+#include <cups/ppd-private.h>
/*
* Local functions...
*/
-static int add_printer_to_class(http_t *, char *, char *);
-static int default_printer(http_t *, char *);
-static int delete_printer(http_t *, char *);
-static int delete_printer_from_class(http_t *, char *, char *);
-static int enable_printer(http_t *, char *);
-static char *get_line(char *, int, FILE *fp);
-static int set_printer_device(http_t *, char *, char *);
-static int set_printer_file(http_t *, char *, char *);
-static int set_printer_info(http_t *, char *, char *);
-static int set_printer_location(http_t *, char *, char *);
-static int set_printer_model(http_t *, char *, char *);
-static int set_printer_options(http_t *, char *, int, cups_option_t *);
-static int validate_name(const char *);
+static int add_printer_to_class(http_t *http, char *printer, char *pclass);
+static int default_printer(http_t *http, char *printer);
+static int delete_printer(http_t *http, char *printer);
+static int delete_printer_from_class(http_t *http, char *printer,
+ char *pclass);
+static int delete_printer_option(http_t *http, char *printer,
+ char *option);
+static int enable_printer(http_t *http, char *printer);
+static char *get_printer_ppd(const char *uri, char *buffer, size_t bufsize);
+static cups_ptype_t get_printer_type(http_t *http, char *printer, char *uri,
+ size_t urisize);
+static int set_printer_options(http_t *http, char *printer,
+ int num_options, cups_option_t *options,
+ char *file);
+static int validate_name(const char *name);
/*
http_t *http; /* Connection to server */
char *printer, /* Destination printer */
*pclass, /* Printer class name */
+ *opt, /* Option pointer */
*val; /* Pointer to allow/deny value */
int num_options; /* Number of options */
cups_option_t *options; /* Options */
+ char *file, /* New PPD file */
+ evefile[1024] = "";
+ /* IPP Everywhere PPD */
+ const char *ppd_name, /* ppd-name value */
+ *device_uri; /* device-uri value */
- _cupsSetLocale();
+ _cupsSetLocale(argv);
http = NULL;
printer = NULL;
num_options = 0;
options = NULL;
+ file = NULL;
for (i = 1; i < argc; i ++)
+ {
if (argv[i][0] == '-')
- switch (argv[i][1])
+ {
+ for (opt = argv[i] + 1; *opt; opt ++)
{
- case 'c' : /* Add printer to class */
- if (!http)
- {
- http = httpConnectEncrypt(cupsServer(), ippPort(),
- cupsEncryption());
+ switch (*opt)
+ {
+ case 'c' : /* Add printer to class */
+ if (!http)
+ {
+ http = httpConnect2(cupsServer(), ippPort(), NULL, AF_UNSPEC, cupsEncryption(), 1, 30000, NULL);
+
+ if (http == NULL)
+ {
+ _cupsLangPrintf(stderr, _("lpadmin: Unable to connect to server: %s"), strerror(errno));
+ return (1);
+ }
+ }
- if (http == NULL)
+ if (printer == NULL)
{
- _cupsLangPrintf(stderr,
- _("lpadmin: Unable to connect to server: %s\n"),
- strerror(errno));
+ _cupsLangPuts(stderr,
+ _("lpadmin: Unable to add a printer to the class:\n"
+ " You must specify a printer name first."));
return (1);
}
- }
-
- if (printer == NULL)
- {
- _cupsLangPuts(stderr,
- _("lpadmin: Unable to add a printer to the class:\n"
- " You must specify a printer name "
- "first!\n"));
- return (1);
- }
- if (argv[i][2])
- pclass = argv[i] + 2;
- else
- {
- i ++;
+ if (opt[1] != '\0')
+ {
+ pclass = opt + 1;
+ opt += strlen(opt) - 1;
+ }
+ else
+ {
+ i ++;
- if (i >= argc)
+ if (i >= argc)
+ {
+ _cupsLangPuts(stderr, _("lpadmin: Expected class name after \"-c\" option."));
+ return (1);
+ }
+
+ pclass = argv[i];
+ }
+
+ if (!validate_name(pclass))
{
_cupsLangPuts(stderr,
- _("lpadmin: Expected class name after \'-c\' "
- "option!\n"));
+ _("lpadmin: Class name can only contain printable "
+ "characters."));
return (1);
}
- pclass = argv[i];
- }
-
- if (!validate_name(pclass))
- {
- _cupsLangPuts(stderr,
- _("lpadmin: Class name can only contain printable "
- "characters!\n"));
- return (1);
- }
+ if (add_printer_to_class(http, printer, pclass))
+ return (1);
+ break;
- if (add_printer_to_class(http, printer, pclass))
- return (1);
- break;
+ case 'd' : /* Set as default destination */
+ if (!http)
+ {
+ http = httpConnect2(cupsServer(), ippPort(), NULL, AF_UNSPEC, cupsEncryption(), 1, 30000, NULL);
- case 'd' : /* Set as default destination */
- if (!http)
- {
- http = httpConnectEncrypt(cupsServer(), ippPort(),
- cupsEncryption());
+ if (http == NULL)
+ {
+ _cupsLangPrintf(stderr, _("lpadmin: Unable to connect to server: %s"), strerror(errno));
+ return (1);
+ }
+ }
- if (http == NULL)
+ if (opt[1] != '\0')
{
- _cupsLangPrintf(stderr,
- _("lpadmin: Unable to connect to server: %s\n"),
- strerror(errno));
- return (1);
+ printer = opt + 1;
+ opt += strlen(opt) - 1;
}
- }
+ else
+ {
+ i ++;
- if (argv[i][2])
- printer = argv[i] + 2;
- else
- {
- i ++;
+ if (i >= argc)
+ {
+ _cupsLangPuts(stderr, _("lpadmin: Expected printer name after \"-d\" option."));
+ return (1);
+ }
- if (i >= argc)
+ printer = argv[i];
+ }
+
+ if (!validate_name(printer))
{
- _cupsLangPuts(stderr,
- _("lpadmin: Expected printer name after \'-d\' "
- "option!\n"));
+ _cupsLangPuts(stderr, _("lpadmin: Printer name can only contain printable characters."));
return (1);
}
- printer = argv[i];
- }
-
- if (!validate_name(printer))
- {
- _cupsLangPuts(stderr,
- _("lpadmin: Printer name can only contain "
- "printable characters!\n"));
- return (1);
- }
-
- if (default_printer(http, printer))
- return (1);
+ if (default_printer(http, printer))
+ return (1);
- i = argc;
- break;
+ i = argc;
+ break;
- case 'h' : /* Connect to host */
- if (http)
- {
- httpClose(http);
- http = NULL;
- }
-
- if (argv[i][2] != '\0')
- cupsSetServer(argv[i] + 2);
- else
- {
- i ++;
+ case 'h' : /* Connect to host */
+ if (http)
+ {
+ httpClose(http);
+ http = NULL;
+ }
- if (i >= argc)
+ if (opt[1] != '\0')
{
- _cupsLangPuts(stderr,
- _("lpadmin: Expected hostname after \'-h\' "
- "option!\n"));
- return (1);
- }
+ cupsSetServer(opt + 1);
+ opt += strlen(opt) - 1;
+ }
+ else
+ {
+ i ++;
- cupsSetServer(argv[i]);
- }
- break;
+ if (i >= argc)
+ {
+ _cupsLangPuts(stderr, _("lpadmin: Expected hostname after \"-h\" option."));
+ return (1);
+ }
- case 'i' : /* Use the specified interface script */
- if (!http)
- {
- http = httpConnectEncrypt(cupsServer(), ippPort(),
- cupsEncryption());
+ cupsSetServer(argv[i]);
+ }
+ break;
- if (http == NULL)
+ case 'P' : /* Use the specified PPD file */
+ case 'i' : /* Use the specified PPD file */
+ if (opt[1] != '\0')
{
- _cupsLangPrintf(stderr,
- _("lpadmin: Unable to connect to server: %s\n"),
- strerror(errno));
- return (1);
+ file = opt + 1;
+ opt += strlen(opt) - 1;
}
- }
-
- if (printer == NULL)
- {
- _cupsLangPuts(stderr,
- _("lpadmin: Unable to set the interface script:\n"
- " You must specify a printer name "
- "first!\n"));
- return (1);
- }
-
- if (argv[i][2])
- {
- if (set_printer_file(http, printer, argv[i] + 2))
- return (1);
- }
- else
- {
- i ++;
-
- if (i >= argc)
+ else
{
- _cupsLangPuts(stderr,
- _("lpadmin: Expected interface after \'-i\' "
- "option!\n"));
- return (1);
+ i ++;
+
+ if (i >= argc)
+ {
+ _cupsLangPrintf(stderr, _("lpadmin: Expected PPD after \"-%c\" option."), argv[i - 1][1]);
+ return (1);
+ }
+
+ file = argv[i];
}
- if (set_printer_file(http, printer, argv[i]))
- return (1);
- }
- break;
+ if (*opt == 'i')
+ {
+ /*
+ * Check to see that the specified file is, in fact, a PPD...
+ */
+
+ cups_file_t *fp = cupsFileOpen(file, "r");
+ char line[256];
+
+ if (!cupsFileGets(fp, line, sizeof(line)) || strncmp(line, "*PPD-Adobe", 10))
+ {
+ _cupsLangPuts(stderr, _("lpadmin: System V interface scripts are no longer supported for security reasons."));
+ cupsFileClose(fp);
+ return (1);
+ }
+
+ cupsFileClose(fp);
+ }
+ break;
- case 'E' : /* Enable the printer */
- if (printer == NULL)
- {
+ case 'E' : /* Enable the printer/enable encryption */
+ if (printer == NULL)
+ {
#ifdef HAVE_SSL
- cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);
+ cupsSetEncryption(HTTP_ENCRYPTION_REQUIRED);
- if (http)
- httpEncryption(http, HTTP_ENCRYPT_REQUIRED);
+ if (http)
+ httpEncryption(http, HTTP_ENCRYPTION_REQUIRED);
#else
- _cupsLangPrintf(stderr,
- _("%s: Sorry, no encryption support compiled in!\n"),
- argv[0]);
+ _cupsLangPrintf(stderr, _("%s: Sorry, no encryption support."), argv[0]);
#endif /* HAVE_SSL */
- break;
- }
-
- if (!http)
- {
- http = httpConnectEncrypt(cupsServer(), ippPort(),
- cupsEncryption());
+ break;
+ }
- if (http == NULL)
+ if (!http)
{
- _cupsLangPrintf(stderr,
- _("lpadmin: Unable to connect to server: %s\n"),
- strerror(errno));
- return (1);
+ http = httpConnect2(cupsServer(), ippPort(), NULL, AF_UNSPEC, cupsEncryption(), 1, 30000, NULL);
+
+ if (http == NULL)
+ {
+ _cupsLangPrintf(stderr,
+ _("lpadmin: Unable to connect to server: %s"),
+ strerror(errno));
+ return (1);
+ }
}
- }
- if (enable_printer(http, printer))
- return (1);
- break;
-
- case 'm' : /* Use the specified standard script/PPD file */
- if (!http)
- {
- http = httpConnectEncrypt(cupsServer(), ippPort(),
- cupsEncryption());
+ if (enable_printer(http, printer))
+ return (1);
+ break;
- if (http == NULL)
+ case 'm' : /* Use the specified standard script/PPD file */
+ if (opt[1] != '\0')
{
- _cupsLangPrintf(stderr,
- _("lpadmin: Unable to connect to server: %s\n"),
- strerror(errno));
- return (1);
+ num_options = cupsAddOption("ppd-name", opt + 1, num_options, &options);
+ opt += strlen(opt) - 1;
}
- }
-
- if (printer == NULL)
- {
- _cupsLangPuts(stderr,
- _("lpadmin: Unable to set the interface script or "
- "PPD file:\n"
- " You must specify a printer name "
- "first!\n"));
- return (1);
- }
-
- if (argv[i][2])
- {
- if (set_printer_model(http, printer, argv[i] + 2))
- return (1);
- }
- else
- {
- i ++;
+ else
+ {
+ i ++;
- if (i >= argc)
+ if (i >= argc)
+ {
+ _cupsLangPuts(stderr, _("lpadmin: Expected model after \"-m\" option."));
+ return (1);
+ }
+
+ num_options = cupsAddOption("ppd-name", argv[i], num_options, &options);
+ }
+ break;
+
+ case 'o' : /* Set option */
+ if (opt[1] != '\0')
{
- _cupsLangPuts(stderr,
- _("lpadmin: Expected model after \'-m\' "
- "option!\n"));
- return (1);
+ num_options = cupsParseOptions(opt + 1, num_options, &options);
+ opt += strlen(opt) - 1;
}
+ else
+ {
+ i ++;
- if (set_printer_model(http, printer, argv[i]))
- return (1);
- }
- break;
+ if (i >= argc)
+ {
+ _cupsLangPuts(stderr, _("lpadmin: Expected name=value after \"-o\" option."));
+ return (1);
+ }
- case 'o' : /* Set option */
- if (argv[i][2])
- num_options = cupsParseOptions(argv[i] + 2, num_options, &options);
- else
- {
- i ++;
+ num_options = cupsParseOptions(argv[i], num_options, &options);
+ }
+ break;
- if (i >= argc)
+ case 'p' : /* Add/modify a printer */
+ if (opt[1] != '\0')
{
- _cupsLangPuts(stderr,
- _("lpadmin: Expected name=value after \'-o\' "
- "option!\n"));
- return (1);
+ printer = opt + 1;
+ opt += strlen(opt) - 1;
}
+ else
+ {
+ i ++;
- num_options = cupsParseOptions(argv[i], num_options, &options);
- }
- break;
+ if (i >= argc)
+ {
+ _cupsLangPuts(stderr, _("lpadmin: Expected printer after \"-p\" option."));
+ return (1);
+ }
- case 'p' : /* Add/modify a printer */
- if (!http)
- {
- http = httpConnectEncrypt(cupsServer(), ippPort(),
- cupsEncryption());
+ printer = argv[i];
+ }
- if (http == NULL)
+ if (!validate_name(printer))
{
- _cupsLangPrintf(stderr,
- _("lpadmin: Unable to connect to server: %s\n"),
- strerror(errno));
+ _cupsLangPuts(stderr, _("lpadmin: Printer name can only contain printable characters."));
return (1);
}
- }
+ break;
- if (argv[i][2])
- printer = argv[i] + 2;
- else
- {
- i ++;
+ case 'r' : /* Remove printer from class */
+ if (!http)
+ {
+ http = httpConnect2(cupsServer(), ippPort(), NULL, AF_UNSPEC, cupsEncryption(), 1, 30000, NULL);
+
+ if (http == NULL)
+ {
+ _cupsLangPrintf(stderr,
+ _("lpadmin: Unable to connect to server: %s"),
+ strerror(errno));
+ return (1);
+ }
+ }
- if (i >= argc)
+ if (printer == NULL)
{
_cupsLangPuts(stderr,
- _("lpadmin: Expected printer after \'-p\' "
- "option!\n"));
+ _("lpadmin: Unable to remove a printer from the class:\n"
+ " You must specify a printer name first."));
return (1);
}
- printer = argv[i];
- }
+ if (opt[1] != '\0')
+ {
+ pclass = opt + 1;
+ opt += strlen(opt) - 1;
+ }
+ else
+ {
+ i ++;
- if (!validate_name(printer))
- {
- _cupsLangPuts(stderr,
- _("lpadmin: Printer name can only contain "
- "printable characters!\n"));
- return (1);
- }
- break;
+ if (i >= argc)
+ {
+ _cupsLangPuts(stderr, _("lpadmin: Expected class after \"-r\" option."));
+ return (1);
+ }
- case 'r' : /* Remove printer from class */
- if (!http)
- {
- http = httpConnectEncrypt(cupsServer(), ippPort(),
- cupsEncryption());
+ pclass = argv[i];
+ }
- if (http == NULL)
+ if (!validate_name(pclass))
{
- _cupsLangPrintf(stderr,
- _("lpadmin: Unable to connect to server: %s\n"),
- strerror(errno));
+ _cupsLangPuts(stderr, _("lpadmin: Class name can only contain printable characters."));
return (1);
}
- }
-
- if (printer == NULL)
- {
- _cupsLangPuts(stderr,
- _("lpadmin: Unable to remove a printer from the "
- "class:\n"
- " You must specify a printer name "
- "first!\n"));
- return (1);
- }
- if (argv[i][2])
- pclass = argv[i] + 2;
- else
- {
- i ++;
+ if (delete_printer_from_class(http, printer, pclass))
+ return (1);
+ break;
- if (i >= argc)
+ case 'R' : /* Remove option */
+ if (!http)
+ {
+ http = httpConnect2(cupsServer(), ippPort(), NULL, AF_UNSPEC, cupsEncryption(), 1, 30000, NULL);
+
+ if (http == NULL)
+ {
+ _cupsLangPrintf(stderr, _("lpadmin: Unable to connect to server: %s"), strerror(errno));
+ return (1);
+ }
+ }
+
+ if (printer == NULL)
{
_cupsLangPuts(stderr,
- _("lpadmin: Expected class after \'-r\' "
- "option!\n"));
+ _("lpadmin: Unable to delete option:\n"
+ " You must specify a printer name first."));
return (1);
}
- pclass = argv[i];
- }
+ if (opt[1] != '\0')
+ {
+ val = opt + 1;
+ opt += strlen(opt) - 1;
+ }
+ else
+ {
+ i ++;
- if (!validate_name(pclass))
- {
- _cupsLangPuts(stderr,
- _("lpadmin: Class name can only contain printable "
- "characters!\n"));
- return (1);
- }
+ if (i >= argc)
+ {
+ _cupsLangPuts(stderr, _("lpadmin: Expected name after \"-R\" option."));
+ return (1);
+ }
- if (delete_printer_from_class(http, printer, pclass))
- return (1);
- break;
+ val = argv[i];
+ }
- case 'U' : /* Username */
- if (argv[i][2] != '\0')
- cupsSetUser(argv[i] + 2);
- else
- {
- i ++;
- if (i >= argc)
+ if (delete_printer_option(http, printer, val))
+ return (1);
+ break;
+
+ case 'U' : /* Username */
+ if (opt[1] != '\0')
{
- _cupsLangPrintf(stderr,
- _("%s: Error - expected username after "
- "\'-U\' option!\n"),
- argv[0]);
- return (1);
+ cupsSetUser(opt + 1);
+ opt += strlen(opt) - 1;
}
+ else
+ {
+ 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 'u' : /* Allow/deny users */
- if (argv[i][2])
- val = argv[i] + 2;
- else
- {
- i ++;
-
- if (i >= argc)
+ case 'u' : /* Allow/deny users */
+ if (opt[1] != '\0')
{
- _cupsLangPuts(stderr,
- _("lpadmin: Expected allow/deny:userlist after "
- "\'-u\' option!\n"));
- return (1);
+ val = opt + 1;
+ opt += strlen(opt) - 1;
}
+ else
+ {
+ i ++;
- val = argv[i];
- }
-
- if (!strncasecmp(val, "allow:", 6))
- num_options = cupsAddOption("requesting-user-name-allowed",
- val + 6, num_options, &options);
- else if (!strncasecmp(val, "deny:", 5))
- num_options = cupsAddOption("requesting-user-name-denied",
- val + 5, num_options, &options);
- else
- {
- _cupsLangPrintf(stderr,
- _("lpadmin: Unknown allow/deny option \"%s\"!\n"),
- val);
- return (1);
- }
- break;
+ if (i >= argc)
+ {
+ _cupsLangPuts(stderr, _("lpadmin: Expected allow/deny:userlist after \"-u\" option."));
+ return (1);
+ }
- case 'v' : /* Set the device-uri attribute */
- if (!http)
- {
- http = httpConnectEncrypt(cupsServer(), ippPort(),
- cupsEncryption());
+ val = argv[i];
+ }
- if (http == NULL)
+ if (!_cups_strncasecmp(val, "allow:", 6))
+ num_options = cupsAddOption("requesting-user-name-allowed", val + 6, num_options, &options);
+ else if (!_cups_strncasecmp(val, "deny:", 5))
+ num_options = cupsAddOption("requesting-user-name-denied", val + 5, num_options, &options);
+ else
{
- _cupsLangPrintf(stderr,
- _("lpadmin: Unable to connect to server: %s\n"),
- strerror(errno));
+ _cupsLangPrintf(stderr, _("lpadmin: Unknown allow/deny option \"%s\"."), val);
return (1);
}
- }
-
- if (printer == NULL)
- {
- _cupsLangPuts(stderr,
- _("lpadmin: Unable to set the device URI:\n"
- " You must specify a printer name "
- "first!\n"));
- return (1);
- }
-
- if (argv[i][2])
- {
- if (set_printer_device(http, printer, argv[i] + 2))
- return (1);
- }
- else
- {
- i ++;
+ break;
- if (i >= argc)
+ case 'v' : /* Set the device-uri attribute */
+ if (opt[1] != '\0')
{
- _cupsLangPuts(stderr,
- _("lpadmin: Expected device URI after \'-v\' "
- "option!\n"));
- return (1);
+ num_options = cupsAddOption("device-uri", opt + 1, num_options, &options);
+ opt += strlen(opt) - 1;
}
+ else
+ {
+ i ++;
- if (set_printer_device(http, printer, argv[i]))
- return (1);
- }
- break;
+ if (i >= argc)
+ {
+ _cupsLangPuts(stderr, _("lpadmin: Expected device URI after \"-v\" option."));
+ return (1);
+ }
- case 'x' : /* Delete a printer */
- if (!http)
- {
- http = httpConnectEncrypt(cupsServer(), ippPort(),
- cupsEncryption());
+ num_options = cupsAddOption("device-uri", argv[i], num_options, &options);
+ }
+ break;
- if (http == NULL)
+ case 'x' : /* Delete a printer */
+ if (!http)
{
- _cupsLangPrintf(stderr,
- _("lpadmin: Unable to connect to server: %s\n"),
- strerror(errno));
- return (1);
+ http = httpConnect2(cupsServer(), ippPort(), NULL, AF_UNSPEC, cupsEncryption(), 1, 30000, NULL);
+
+ if (http == NULL)
+ {
+ _cupsLangPrintf(stderr,
+ _("lpadmin: Unable to connect to server: %s"),
+ strerror(errno));
+ return (1);
+ }
}
- }
-
- if (argv[i][2])
- printer = argv[i] + 2;
- else
- {
- i ++;
- if (i >= argc)
+ if (opt[1] != '\0')
{
- _cupsLangPuts(stderr,
- _("lpadmin: Expected printer or class after "
- "\'-x\' option!\n"));
- return (1);
+ printer = opt + 1;
+ opt += strlen(opt) - 1;
}
+ else
+ {
+ i ++;
- printer = argv[i];
- }
-
- if (!validate_name(printer))
- {
- _cupsLangPuts(stderr,
- _("lpadmin: Printer name can only contain "
- "printable characters!\n"));
- return (1);
- }
-
- if (delete_printer(http, printer))
- return (1);
-
- i = argc;
- break;
+ if (i >= argc)
+ {
+ _cupsLangPuts(stderr, _("lpadmin: Expected printer or class after \"-x\" option."));
+ return (1);
+ }
- case 'D' : /* Set the printer-info attribute */
- if (!http)
- {
- http = httpConnectEncrypt(cupsServer(), ippPort(),
- cupsEncryption());
+ printer = argv[i];
+ }
- if (http == NULL)
+ if (!validate_name(printer))
{
- _cupsLangPrintf(stderr,
- _("lpadmin: Unable to connect to server: %s\n"),
- strerror(errno));
+ _cupsLangPuts(stderr, _("lpadmin: Printer name can only contain printable characters."));
return (1);
}
- }
-
- if (printer == NULL)
- {
- _cupsLangPuts(stderr,
- _("lpadmin: Unable to set the printer "
- "description:\n"
- " You must specify a printer name "
- "first!\n"));
- return (1);
- }
-
- if (argv[i][2])
- {
- if (set_printer_info(http, printer, argv[i] + 2))
- return (1);
- }
- else
- {
- i ++;
- if (i >= argc)
- {
- _cupsLangPuts(stderr,
- _("lpadmin: Expected description after "
- "\'-D\' option!\n"));
+ if (delete_printer(http, printer))
return (1);
- }
- if (set_printer_info(http, printer, argv[i]))
- return (1);
- }
- break;
+ i = argc;
+ break;
- case 'I' : /* Set the supported file types (ignored) */
- i ++;
+ case 'D' : /* Set the printer-info attribute */
+ if (opt[1] != '\0')
+ {
+ num_options = cupsAddOption("printer-info", opt + 1, num_options, &options);
+ opt += strlen(opt) - 1;
+ }
+ else
+ {
+ i ++;
- if (i >= argc)
- {
- _cupsLangPuts(stderr,
- _("lpadmin: Expected file type(s) after \'-I\' "
- "option!\n"));
- return (1);
- }
+ if (i >= argc)
+ {
+ _cupsLangPuts(stderr, _("lpadmin: Expected description after \"-D\" option."));
+ return (1);
+ }
- _cupsLangPuts(stderr,
- _("lpadmin: Warning - content type list ignored!\n"));
- break;
-
- case 'L' : /* Set the printer-location attribute */
- if (!http)
- {
- http = httpConnectEncrypt(cupsServer(), ippPort(),
- cupsEncryption());
-
- if (http == NULL)
- {
- _cupsLangPrintf(stderr,
- _("lpadmin: Unable to connect to server: %s\n"),
- strerror(errno));
- return (1);
+ num_options = cupsAddOption("printer-info", argv[i], num_options, &options);
}
- }
-
- if (printer == NULL)
- {
- _cupsLangPuts(stderr,
- _("lpadmin: Unable to set the printer location:\n"
- " You must specify a printer name "
- "first!\n"));
- return (1);
- }
-
- if (argv[i][2])
- {
- if (set_printer_location(http, printer, argv[i] + 2))
- return (1);
- }
- else
- {
+ break;
+
+ case 'I' : /* Set the supported file types (ignored) */
i ++;
if (i >= argc)
{
- _cupsLangPuts(stderr,
- _("lpadmin: Expected location after \'-L\' "
- "option!\n"));
+ _cupsLangPuts(stderr, _("lpadmin: Expected file type(s) after \"-I\" option."));
return (1);
}
- if (set_printer_location(http, printer, argv[i]))
- return (1);
- }
- break;
-
- case 'P' : /* Use the specified PPD file */
- if (!http)
- {
- http = httpConnectEncrypt(cupsServer(), ippPort(),
- cupsEncryption());
+ _cupsLangPuts(stderr, _("lpadmin: Warning - content type list ignored."));
+ break;
- if (http == NULL)
+ case 'L' : /* Set the printer-location attribute */
+ if (opt[1] != '\0')
{
- _cupsLangPrintf(stderr,
- _("lpadmin: Unable to connect to server: %s\n"),
- strerror(errno));
- return (1);
+ num_options = cupsAddOption("printer-location", opt + 1, num_options, &options);
+ opt += strlen(opt) - 1;
}
- }
-
- if (printer == NULL)
- {
- _cupsLangPuts(stderr,
- _("lpadmin: Unable to set the PPD file:\n"
- " You must specify a printer name "
- "first!\n"));
- return (1);
- }
-
- if (argv[i][2])
- {
- if (set_printer_file(http, printer, argv[i] + 2))
- return (1);
- }
- else
- {
- i ++;
-
- if (i >= argc)
+ else
{
- _cupsLangPuts(stderr,
- _("lpadmin: Expected PPD after \'-P\' option!\n"));
- return (1);
- }
+ i ++;
- if (set_printer_file(http, printer, argv[i]))
- return (1);
- }
- break;
+ if (i >= argc)
+ {
+ _cupsLangPuts(stderr, _("lpadmin: Expected location after \"-L\" option."));
+ return (1);
+ }
+
+ num_options = cupsAddOption("printer-location", argv[i], num_options, &options);
+ }
+ break;
- default :
- _cupsLangPrintf(stderr,
- _("lpadmin: Unknown option \'%c\'!\n"), argv[i][1]);
- return (1);
+ default :
+ _cupsLangPrintf(stderr, _("lpadmin: Unknown option \"%c\"."), *opt);
+ return (1);
+ }
}
+ }
else
{
- _cupsLangPrintf(stderr, _("lpadmin: Unknown argument \'%s\'!\n"),
- argv[i]);
+ _cupsLangPrintf(stderr, _("lpadmin: Unknown argument \"%s\"."), argv[i]);
return (1);
}
+ }
/*
* Set options as needed...
*/
- if (num_options)
+ if ((ppd_name = cupsGetOption("ppd-name", num_options, options)) != NULL && !strcmp(ppd_name, "everywhere") && (device_uri = cupsGetOption("device-uri", num_options, options)) != NULL)
{
- if (!http)
- {
- http = httpConnectEncrypt(cupsServer(), ippPort(), cupsEncryption());
+ if ((file = get_printer_ppd(device_uri, evefile, sizeof(evefile))) == NULL)
+ return (1);
- if (http == NULL)
- {
- _cupsLangPrintf(stderr,
- _("lpadmin: Unable to connect to server: %s\n"),
- strerror(errno));
- return (1);
- }
- }
+ num_options = cupsRemoveOption("ppd-name", num_options, &options);
+ }
+ if (num_options || file)
+ {
if (printer == NULL)
{
_cupsLangPuts(stderr,
_("lpadmin: Unable to set the printer options:\n"
- " You must specify a printer name first!\n"));
+ " You must specify a printer name first."));
return (1);
}
- if (set_printer_options(http, printer, num_options, options))
+ if (!http)
+ {
+ http = httpConnect2(cupsServer(), ippPort(), NULL, AF_UNSPEC,
+ cupsEncryption(), 1, 30000, NULL);
+
+ if (http == NULL) {
+ _cupsLangPrintf(stderr, _("lpadmin: Unable to connect to server: %s"),
+ strerror(errno));
+ return (1);
+ }
+ }
+
+ if (set_printer_options(http, printer, num_options, options, file))
return (1);
}
+ if (evefile[0])
+ unlink(evefile);
+
if (printer == NULL)
{
_cupsLangPuts(stdout,
"[-D description]\n"
" [-P ppd-file] [-o name=value]\n"
" [-u allow:user,user] "
- "[-u deny:user,user]\n"
- "\n"));
+ "[-u deny:user,user]"));
}
if (http)
printer, pclass));
/*
- * Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the following
+ * Build an IPP_OP_GET_PRINTER_ATTRIBUTES request, which requires the following
* attributes:
*
* attributes-charset
* attributes-natural-language
* printer-uri
+ * requesting-user-name
*/
- request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
+ request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES);
httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
"localhost", 0, "/classes/%s", pclass);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
"printer-uri", NULL, uri);
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
+ NULL, cupsUser());
/*
* Do the request and get back a response...
response = cupsDoRequest(http, request, "/");
/*
- * Build a CUPS_ADD_CLASS request, which requires the following
+ * Build a CUPS-Add-Modify-Class request, which requires the following
* attributes:
*
* attributes-charset
* attributes-natural-language
* printer-uri
+ * requesting-user-name
* member-uris
*/
- request = ippNewRequest(CUPS_ADD_CLASS);
+ request = ippNewRequest(IPP_OP_CUPS_ADD_MODIFY_CLASS);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
"printer-uri", NULL, uri);
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
+ NULL, cupsUser());
/*
* See if the printer is already in the class...
*/
if (response != NULL &&
- (members = ippFindAttribute(response, "member-names", IPP_TAG_NAME)) != NULL)
+ (members = ippFindAttribute(response, "member-names",
+ IPP_TAG_NAME)) != NULL)
for (i = 0; i < members->num_values; i ++)
- if (strcasecmp(printer, members->values[i].string.text) == 0)
+ if (_cups_strcasecmp(printer, members->values[i].string.text) == 0)
{
_cupsLangPrintf(stderr,
- _("lpadmin: Printer %s is already a member of class %s.\n"),
- printer, pclass);
+ _("lpadmin: Printer %s is already a member of class "
+ "%s."), printer, pclass);
ippDelete(request);
ippDelete(response);
return (0);
"localhost", 0, "/printers/%s", printer);
if (response != NULL &&
- (members = ippFindAttribute(response, "member-uris", IPP_TAG_URI)) != NULL)
+ (members = ippFindAttribute(response, "member-uris",
+ IPP_TAG_URI)) != NULL)
{
/*
* Add the printer to the existing list...
attr = ippAddStrings(request, IPP_TAG_PRINTER, IPP_TAG_URI,
"member-uris", members->num_values + 1, NULL, NULL);
for (i = 0; i < members->num_values; i ++)
- attr->values[i].string.text = strdup(members->values[i].string.text);
+ attr->values[i].string.text =
+ _cupsStrAlloc(members->values[i].string.text);
- attr->values[i].string.text = strdup(uri);
+ attr->values[i].string.text = _cupsStrAlloc(uri);
}
else
- attr = ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_URI, "member-uris", NULL, uri);
+ ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_URI, "member-uris", NULL,
+ uri);
/*
* Then send the request...
ippDelete(response);
- if ((response = cupsDoRequest(http, request, "/admin/")) == NULL)
- {
- _cupsLangPrintf(stderr, "lpadmin: %s\n", cupsLastErrorString());
-
- return (1);
- }
- else if (response->request.status.status_code > IPP_OK_CONFLICT)
+ ippDelete(cupsDoRequest(http, request, "/admin/"));
+ if (cupsLastError() > IPP_STATUS_OK_CONFLICTING)
{
- _cupsLangPrintf(stderr, "lpadmin: %s\n", cupsLastErrorString());
-
- ippDelete(response);
+ _cupsLangPrintf(stderr, _("%s: %s"), "lpadmin", cupsLastErrorString());
return (1);
}
else
- {
- ippDelete(response);
-
return (0);
- }
}
default_printer(http_t *http, /* I - Server connection */
char *printer) /* I - Printer name */
{
- ipp_t *request, /* IPP Request */
- *response; /* IPP Response */
+ ipp_t *request; /* IPP Request */
char uri[HTTP_MAX_URI]; /* URI for printer/class */
DEBUG_printf(("default_printer(%p, \"%s\")\n", http, printer));
/*
- * Build a CUPS_SET_DEFAULT request, which requires the following
+ * Build a CUPS-Set-Default request, which requires the following
* attributes:
*
* attributes-charset
* attributes-natural-language
* printer-uri
+ * requesting-user-name
*/
httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
"localhost", 0, "/printers/%s", printer);
- request = ippNewRequest(CUPS_SET_DEFAULT);
+ request = ippNewRequest(IPP_OP_CUPS_SET_DEFAULT);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
"printer-uri", NULL, uri);
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
+ NULL, cupsUser());
/*
* Do the request and get back a response...
*/
- if ((response = cupsDoRequest(http, request, "/admin/")) == NULL)
- {
- _cupsLangPrintf(stderr, "lpadmin: %s\n", cupsLastErrorString());
+ ippDelete(cupsDoRequest(http, request, "/admin/"));
- return (1);
- }
- else if (response->request.status.status_code > IPP_OK_CONFLICT)
+ if (cupsLastError() > IPP_STATUS_OK_CONFLICTING)
{
- _cupsLangPrintf(stderr, "lpadmin: %s\n", cupsLastErrorString());
-
- ippDelete(response);
+ _cupsLangPrintf(stderr, _("%s: %s"), "lpadmin", cupsLastErrorString());
return (1);
}
else
- {
- ippDelete(response);
-
return (0);
- }
}
delete_printer(http_t *http, /* I - Server connection */
char *printer) /* I - Printer to delete */
{
- ipp_t *request, /* IPP Request */
- *response; /* IPP Response */
+ ipp_t *request; /* IPP Request */
char uri[HTTP_MAX_URI]; /* URI for printer/class */
DEBUG_printf(("delete_printer(%p, \"%s\")\n", http, printer));
/*
- * Build a CUPS_DELETE_PRINTER request, which requires the following
+ * Build a CUPS-Delete-Printer request, which requires the following
* attributes:
*
* attributes-charset
* attributes-natural-language
* printer-uri
+ * requesting-user-name
*/
- request = ippNewRequest(CUPS_DELETE_PRINTER);
+ request = ippNewRequest(IPP_OP_CUPS_DELETE_PRINTER);
httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
"localhost", 0, "/printers/%s", printer);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
"printer-uri", NULL, uri);
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
+ NULL, cupsUser());
/*
* Do the request and get back a response...
*/
- if ((response = cupsDoRequest(http, request, "/admin/")) == NULL)
- {
- _cupsLangPrintf(stderr, "lpadmin: %s\n", cupsLastErrorString());
+ ippDelete(cupsDoRequest(http, request, "/admin/"));
- return (1);
- }
- else if (response->request.status.status_code > IPP_OK_CONFLICT)
+ if (cupsLastError() > IPP_STATUS_OK_CONFLICTING)
{
- _cupsLangPrintf(stderr, "lpadmin: %s\n", cupsLastErrorString());
-
- ippDelete(response);
+ _cupsLangPrintf(stderr, _("%s: %s"), "lpadmin", cupsLastErrorString());
return (1);
}
else
- {
- ippDelete(response);
-
return (0);
- }
}
printer, pclass));
/*
- * Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the following
+ * Build an IPP_OP_GET_PRINTER_ATTRIBUTES request, which requires the following
* attributes:
*
* attributes-charset
* attributes-natural-language
* printer-uri
+ * requesting-user-name
*/
- request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
+ request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES);
httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
"localhost", 0, "/classes/%s", pclass);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
"printer-uri", NULL, uri);
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
+ NULL, cupsUser());
/*
* Do the request and get back a response...
*/
if ((response = cupsDoRequest(http, request, "/classes/")) == NULL ||
- response->request.status.status_code == IPP_NOT_FOUND)
+ response->request.status.status_code == IPP_STATUS_ERROR_NOT_FOUND)
{
- _cupsLangPrintf(stderr, "lpadmin: %s\n", cupsLastErrorString());
+ _cupsLangPrintf(stderr, _("%s: %s"), "lpadmin", cupsLastErrorString());
ippDelete(response);
if ((members = ippFindAttribute(response, "member-names", IPP_TAG_NAME)) == NULL)
{
- _cupsLangPuts(stderr, _("lpadmin: No member names were seen!\n"));
+ _cupsLangPuts(stderr, _("lpadmin: No member names were seen."));
ippDelete(response);
}
for (i = 0; i < members->num_values; i ++)
- if (!strcasecmp(printer, members->values[i].string.text))
+ if (!_cups_strcasecmp(printer, members->values[i].string.text))
break;
if (i >= members->num_values)
{
_cupsLangPrintf(stderr,
- _("lpadmin: Printer %s is not a member of class %s.\n"),
+ _("lpadmin: Printer %s is not a member of class %s."),
printer, pclass);
ippDelete(response);
if (members->num_values == 1)
{
/*
- * Build a CUPS_DELETE_CLASS request, which requires the following
+ * Build a CUPS-Delete-Class request, which requires the following
* attributes:
*
* attributes-charset
* attributes-natural-language
* printer-uri
+ * requesting-user-name
*/
- request = ippNewRequest(CUPS_DELETE_CLASS);
+ request = ippNewRequest(IPP_OP_CUPS_DELETE_CLASS);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
"printer-uri", NULL, uri);
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+ "requesting-user-name", NULL, cupsUser());
}
else
{
/*
- * Build a CUPS_ADD_CLASS request, which requires the following
+ * Build a IPP_OP_CUPS_ADD_MODIFY_CLASS request, which requires the following
* attributes:
*
* attributes-charset
* attributes-natural-language
* printer-uri
+ * requesting-user-name
* member-uris
*/
- request = ippNewRequest(CUPS_ADD_CLASS);
+ request = ippNewRequest(IPP_OP_CUPS_ADD_MODIFY_CLASS);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
"printer-uri", NULL, uri);
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+ "requesting-user-name", NULL, cupsUser());
/*
* Delete the printer from the class...
for (j = 0, k = 0; j < members->num_values; j ++)
if (j != i)
- attr->values[k ++].string.text = strdup(members->values[j].string.text);
+ attr->values[k ++].string.text =
+ _cupsStrAlloc(members->values[j].string.text);
}
/*
ippDelete(response);
- if ((response = cupsDoRequest(http, request, "/admin/")) == NULL)
- {
- _cupsLangPrintf(stderr, "lpadmin: %s\n", cupsLastErrorString());
+ ippDelete(cupsDoRequest(http, request, "/admin/"));
- return (1);
- }
- else if (response->request.status.status_code > IPP_OK_CONFLICT)
+ if (cupsLastError() > IPP_STATUS_OK_CONFLICTING)
{
- _cupsLangPrintf(stderr, "lpadmin: %s\n", cupsLastErrorString());
-
- ippDelete(response);
+ _cupsLangPrintf(stderr, _("%s: %s"), "lpadmin", cupsLastErrorString());
return (1);
}
else
- {
- ippDelete(response);
-
return (0);
- }
}
/*
- * 'enable_printer()' - Enable a printer...
+ * 'delete_printer_option()' - Delete a printer option.
*/
static int /* O - 0 on success, 1 on fail */
-enable_printer(http_t *http, /* I - Server connection */
- char *printer) /* I - Printer to enable */
+delete_printer_option(http_t *http, /* I - Server connection */
+ char *printer, /* I - Printer */
+ char *option) /* I - Option to delete */
{
- ipp_t *request, /* IPP Request */
- *response; /* IPP Response */
+ ipp_t *request; /* IPP request */
char uri[HTTP_MAX_URI]; /* URI for printer/class */
- DEBUG_printf(("enable_printer(%p, \"%s\")\n", http, printer));
-
/*
- * Build a CUPS_ADD_PRINTER request, which requires the following
- * attributes:
+ * Build a IPP_OP_CUPS_ADD_MODIFY_PRINTER or IPP_OP_CUPS_ADD_MODIFY_CLASS request, which
+ * requires the following attributes:
*
* attributes-charset
* attributes-natural-language
* printer-uri
- * printer-state
- * printer-is-accepting-jobs
+ * requesting-user-name
+ * option with deleteAttr tag
*/
- request = ippNewRequest(CUPS_ADD_PRINTER);
+ if (get_printer_type(http, printer, uri, sizeof(uri)) & CUPS_PRINTER_CLASS)
+ request = ippNewRequest(IPP_OP_CUPS_ADD_MODIFY_CLASS);
+ else
+ request = ippNewRequest(IPP_OP_CUPS_ADD_MODIFY_PRINTER);
- httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
- "localhost", 0, "/printers/%s", printer);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
"printer-uri", NULL, uri);
-
- ippAddInteger(request, IPP_TAG_PRINTER, IPP_TAG_ENUM, "printer-state",
- IPP_PRINTER_IDLE);
-
- ippAddBoolean(request, IPP_TAG_PRINTER, "printer-is-accepting-jobs", 1);
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+ "requesting-user-name", NULL, cupsUser());
+ ippAddInteger(request, IPP_TAG_PRINTER, IPP_TAG_DELETEATTR, option, 0);
/*
* Do the request and get back a response...
*/
- if ((response = cupsDoRequest(http, request, "/admin/")) == NULL)
- {
- _cupsLangPrintf(stderr, "lpadmin: %s\n", cupsLastErrorString());
+ ippDelete(cupsDoRequest(http, request, "/admin/"));
- return (1);
- }
- else if (response->request.status.status_code > IPP_OK_CONFLICT)
+ if (cupsLastError() > IPP_STATUS_OK_CONFLICTING)
{
- _cupsLangPrintf(stderr, "lpadmin: %s\n", cupsLastErrorString());
-
- ippDelete(response);
+ _cupsLangPrintf(stderr, _("%s: %s"), "lpadmin", cupsLastErrorString());
return (1);
}
else
- {
- ippDelete(response);
-
return (0);
- }
-}
-
-
-/*
- * 'get_line()' - Get a line that is terminated by a LF, CR, or CR LF.
- */
-
-static char * /* O - Pointer to buf or NULL on EOF */
-get_line(char *buf, /* I - Line buffer */
- int length, /* I - Length of buffer */
- FILE *fp) /* I - File to read from */
-{
- char *bufptr; /* Pointer into buffer */
- int ch; /* Character from file */
-
-
- length --;
- bufptr = buf;
-
- while ((ch = getc(fp)) != EOF)
- {
- if (ch == '\n')
- break;
- else if (ch == '\r')
- {
- /*
- * Look for LF...
- */
-
- ch = getc(fp);
- if (ch != '\n' && ch != EOF)
- ungetc(ch, fp);
-
- break;
- }
-
- *bufptr++ = ch;
- length --;
- if (length == 0)
- break;
- }
-
- *bufptr = '\0';
-
- if (ch == EOF)
- return (NULL);
- else
- return (buf);
}
/*
- * 'set_printer_device()' - Set the device-uri attribute.
+ * 'enable_printer()' - Enable a printer...
*/
static int /* O - 0 on success, 1 on fail */
-set_printer_device(http_t *http, /* I - Server connection */
- char *printer, /* I - Printer */
- char *device) /* I - New device URI */
+enable_printer(http_t *http, /* I - Server connection */
+ char *printer) /* I - Printer to enable */
{
- ipp_t *request, /* IPP Request */
- *response; /* IPP Response */
+ ipp_t *request; /* IPP Request */
char uri[HTTP_MAX_URI]; /* URI for printer/class */
- DEBUG_printf(("set_printer_device(%p, \"%s\", \"%s\")\n", http, printer,
- device));
+ DEBUG_printf(("enable_printer(%p, \"%s\")\n", http, printer));
/*
- * Build a CUPS_ADD_PRINTER request, which requires the following
- * attributes:
+ * Build a IPP_OP_CUPS_ADD_MODIFY_PRINTER or IPP_OP_CUPS_ADD_MODIFY_CLASS request, which
+ * require the following attributes:
*
* attributes-charset
* attributes-natural-language
* printer-uri
+ * requesting-user-name
+ * printer-state
+ * printer-is-accepting-jobs
*/
- request = ippNewRequest(CUPS_ADD_PRINTER);
+ if (get_printer_type(http, printer, uri, sizeof(uri)) & CUPS_PRINTER_CLASS)
+ request = ippNewRequest(IPP_OP_CUPS_ADD_MODIFY_CLASS);
+ else
+ request = ippNewRequest(IPP_OP_CUPS_ADD_MODIFY_PRINTER);
- httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
- "localhost", 0, "/printers/%s", printer);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
"printer-uri", NULL, uri);
-
- /*
- * Add the device URI...
- */
-
- if (device[0] == '/')
- {
- /*
- * Convert filename to URI...
- */
-
- snprintf(uri, sizeof(uri), "file://%s", device);
- ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_URI, "device-uri", NULL,
- uri);
- }
- else
- ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_URI, "device-uri", NULL,
- device);
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+ "requesting-user-name", NULL, cupsUser());
+ ippAddInteger(request, IPP_TAG_PRINTER, IPP_TAG_ENUM, "printer-state",
+ IPP_PSTATE_IDLE);
+ ippAddBoolean(request, IPP_TAG_PRINTER, "printer-is-accepting-jobs", 1);
/*
* Do the request and get back a response...
*/
- if ((response = cupsDoRequest(http, request, "/admin/")) == NULL)
- {
- _cupsLangPrintf(stderr, "lpadmin: %s\n", cupsLastErrorString());
+ ippDelete(cupsDoRequest(http, request, "/admin/"));
- return (1);
- }
- else if (response->request.status.status_code > IPP_OK_CONFLICT)
+ if (cupsLastError() > IPP_STATUS_OK_CONFLICTING)
{
- _cupsLangPrintf(stderr, "lpadmin: %s\n", cupsLastErrorString());
-
- ippDelete(response);
+ _cupsLangPrintf(stderr, _("%s: %s"), "lpadmin", cupsLastErrorString());
return (1);
}
else
- {
- ippDelete(response);
-
return (0);
- }
}
/*
- * 'set_printer_file()' - Set the interface script or PPD file.
+ * 'get_printer_ppd()' - Get an IPP Everywhere PPD file for the given URI.
*/
-static int /* O - 0 on success, 1 on fail */
-set_printer_file(http_t *http, /* I - Server connection */
- char *printer, /* I - Printer */
- char *file) /* I - PPD file or interface script */
+static char * /* O - Filename or NULL */
+get_printer_ppd(const char *uri, /* I - Printer URI */
+ char *buffer, /* I - Filename buffer */
+ size_t bufsize) /* I - Size of filename buffer */
{
- ipp_t *request, /* IPP Request */
- *response; /* IPP Response */
- char uri[HTTP_MAX_URI]; /* URI for printer/class */
-#ifdef HAVE_LIBZ
- char tempfile[1024]; /* Temporary filename */
- int fd; /* Temporary file */
- gzFile *gz; /* GZIP'd file */
- char buffer[8192]; /* Copy buffer */
- int bytes; /* Bytes in buffer */
-
+ http_t *http; /* Connection to printer */
+ ipp_t *request, /* Get-Printer-Attributes request */
+ *response; /* Get-Printer-Attributes response */
+ char resolved[1024], /* Resolved URI */
+ scheme[32], /* URI scheme */
+ userpass[256], /* Username:password */
+ host[256], /* Hostname */
+ resource[256]; /* Resource path */
+ int port; /* Port number */
- DEBUG_printf(("set_printer_file(%p, \"%s\", \"%s\")\n", http, printer,
- file));
/*
- * See if the file is gzip'd; if so, unzip it to a temporary file and
- * send the uncompressed file.
+ * Connect to the printer...
*/
- if (!strcmp(file + strlen(file) - 3, ".gz"))
+ if (strstr(uri, "._tcp"))
{
/*
- * Yes, the file is compressed; uncompress to a temp file...
+ * Resolve URI...
*/
- if ((fd = cupsTempFd(tempfile, sizeof(tempfile))) < 0)
+ if (!_httpResolveURI(uri, resolved, sizeof(resolved), _HTTP_RESOLVE_DEFAULT, NULL, NULL))
{
- _cupsLangPrintf(stderr,
- _("lpadmin: Unable to create temporary file: %s\n"),
- strerror(errno));
- return (1);
+ _cupsLangPrintf(stderr, _("%s: Unable to resolve \"%s\"."), "lpadmin", uri);
+ return (NULL);
}
- if ((gz = gzopen(file, "rb")) == NULL)
- {
- _cupsLangPrintf(stderr,
- _("lpadmin: Unable to open file \"%s\": %s\n"),
- file, strerror(errno));
- close(fd);
- unlink(tempfile);
- return (1);
- }
-
- while ((bytes = gzread(gz, buffer, sizeof(buffer))) > 0)
- write(fd, buffer, bytes);
-
- close(fd);
- gzclose(gz);
-
- file = tempfile;
+ uri = resolved;
}
-#endif /* HAVE_LIBZ */
- /*
- * Build a CUPS_ADD_PRINTER request, which requires the following
- * attributes:
- *
- * attributes-charset
- * attributes-natural-language
- * printer-uri
- */
-
- request = ippNewRequest(CUPS_ADD_PRINTER);
-
- httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
- "localhost", 0, "/printers/%s", printer);
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
- "printer-uri", NULL, uri);
-
- /*
- * Do the request and get back a response...
- */
-
- response = cupsDoFileRequest(http, request, "/admin/", file);
- ippDelete(response);
-
-#ifdef HAVE_LIBZ
- /*
- * Remove the temporary file as needed...
- */
-
- if (file == tempfile)
- unlink(tempfile);
-#endif /* HAVE_LIBZ */
-
- if (cupsLastError() > IPP_OK_CONFLICT)
+ if (httpSeparateURI(HTTP_URI_CODING_ALL, uri, scheme, sizeof(scheme), userpass, sizeof(userpass), host, sizeof(host), &port, resource, sizeof(resource)) < HTTP_URI_STATUS_OK)
{
- _cupsLangPrintf(stderr, "lpadmin: %s\n", cupsLastErrorString());
-
- return (1);
- }
- else
- return (0);
-}
-
-
-/*
- * 'set_printer_info()' - Set the printer description string.
- */
-
-static int /* O - 0 on success, 1 on fail */
-set_printer_info(http_t *http, /* I - Server connection */
- char *printer, /* I - Printer */
- char *info) /* I - New description string */
-{
- ipp_t *request, /* IPP Request */
- *response; /* IPP Response */
- char uri[HTTP_MAX_URI]; /* URI for printer/class */
-
-
- DEBUG_printf(("set_printer_info(%p, \"%s\", \"%s\")\n", http, printer,
- info));
-
- /*
- * Build a CUPS_ADD_PRINTER request, which requires the following
- * attributes:
- *
- * attributes-charset
- * attributes-natural-language
- * printer-uri
- */
-
- request = ippNewRequest(CUPS_ADD_PRINTER);
-
- httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
- "localhost", 0, "/printers/%s", printer);
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
- "printer-uri", NULL, uri);
-
- /*
- * Add the info string...
- */
-
- ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_TEXT, "printer-info", NULL,
- info);
-
- /*
- * Do the request and get back a response...
- */
-
- if ((response = cupsDoRequest(http, request, "/admin/")) == NULL)
- {
- _cupsLangPrintf(stderr, "lpadmin: %s\n", cupsLastErrorString());
- return (1);
+ _cupsLangPrintf(stderr, _("%s: Bad printer URI \"%s\"."), "lpadmin", uri);
+ return (NULL);
}
- else if (response->request.status.status_code > IPP_OK_CONFLICT)
- {
- _cupsLangPrintf(stderr, "lpadmin: %s\n", cupsLastErrorString());
-
- ippDelete(response);
- return (1);
- }
- else
+ http = httpConnect2(host, port, NULL, AF_UNSPEC, !strcmp(scheme, "ipps") ? HTTP_ENCRYPTION_ALWAYS : HTTP_ENCRYPTION_IF_REQUESTED, 1, 30000, NULL);
+ if (!http)
{
- ippDelete(response);
-
- return (0);
+ _cupsLangPrintf(stderr, _("%s: Unable to connect to \"%s:%d\": %s"), "lpadmin", host, port, cupsLastErrorString());
+ return (NULL);
}
-}
-
-
-/*
- * 'set_printer_location()' - Set the printer location string.
- */
-
-static int /* O - 0 on success, 1 on fail */
-set_printer_location(http_t *http, /* I - Server connection */
- char *printer, /* I - Printer */
- char *location) /* I - New location string */
-{
- ipp_t *request, /* IPP Request */
- *response; /* IPP Response */
- char uri[HTTP_MAX_URI]; /* URI for printer/class */
-
-
- DEBUG_printf(("set_printer_location(%p, \"%s\", \"%s\")\n", http, printer,
- location));
/*
- * Build a CUPS_ADD_PRINTER request, which requires the following
- * attributes:
- *
- * attributes-charset
- * attributes-natural-language
- * printer-uri
+ * Send a Get-Printer-Attributes request...
*/
- request = ippNewRequest(CUPS_ADD_PRINTER);
+ request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES);
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, uri);
+ response = cupsDoRequest(http, request, resource);
- httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
- "localhost", 0, "/printers/%s", printer);
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
- "printer-uri", NULL, uri);
+ if (!_ppdCreateFromIPP(buffer, bufsize, response))
+ _cupsLangPrintf(stderr, _("%s: Unable to create PPD file: %s"), "lpadmin", strerror(errno));
- /*
- * Add the location string...
- */
-
- ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_TEXT, "printer-location", NULL,
- location);
-
- /*
- * Do the request and get back a response...
- */
-
- if ((response = cupsDoRequest(http, request, "/admin/")) == NULL)
- {
- _cupsLangPrintf(stderr, "lpadmin: %s\n", cupsLastErrorString());
-
- return (1);
- }
- else if (response->request.status.status_code > IPP_OK_CONFLICT)
- {
- _cupsLangPrintf(stderr, "lpadmin: %s\n", cupsLastErrorString());
-
- ippDelete(response);
+ ippDelete(response);
+ httpClose(http);
- return (1);
- }
+ if (buffer[0])
+ return (buffer);
else
- {
- ippDelete(response);
-
- return (0);
- }
+ return (NULL);
}
/*
- * 'set_printer_model()' - Set the driver model file.
+ * 'get_printer_type()' - Determine the printer type and URI.
*/
-static int /* O - 0 on success, 1 on fail */
-set_printer_model(http_t *http, /* I - Server connection */
- char *printer, /* I - Printer */
- char *model) /* I - Driver model file */
+static cups_ptype_t /* O - printer-type value */
+get_printer_type(http_t *http, /* I - Server connection */
+ char *printer, /* I - Printer name */
+ char *uri, /* I - URI buffer */
+ size_t urisize) /* I - Size of URI buffer */
{
- ipp_t *request, /* IPP Request */
- *response; /* IPP Response */
- char uri[HTTP_MAX_URI]; /* URI for printer/class */
+ ipp_t *request, /* IPP request */
+ *response; /* IPP response */
+ ipp_attribute_t *attr; /* printer-type attribute */
+ cups_ptype_t type; /* printer-type value */
/*
- * Build a CUPS_ADD_PRINTER request, which requires the following
+ * Build a GET_PRINTER_ATTRIBUTES request, which requires the following
* attributes:
*
* attributes-charset
* attributes-natural-language
* printer-uri
- * ppd-name
+ * requested-attributes
+ * requesting-user-name
*/
- request = ippNewRequest(CUPS_ADD_PRINTER);
+ httpAssembleURIf(HTTP_URI_CODING_ALL, uri, (int)urisize, "ipp", NULL, "localhost", ippPort(), "/printers/%s", printer);
- httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
- "localhost", 0, "/printers/%s", printer);
+ request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
"printer-uri", NULL, uri);
-
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
+ "requested-attributes", NULL, "printer-type");
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
- "ppd-name", NULL, model);
+ "requesting-user-name", NULL, cupsUser());
/*
- * Do the request and get back a response...
+ * Do the request...
*/
- if ((response = cupsDoRequest(http, request, "/admin/")) == NULL)
- {
- _cupsLangPrintf(stderr, "lpadmin: %s\n", cupsLastErrorString());
-
- return (1);
- }
- else if (response->request.status.status_code > IPP_OK_CONFLICT)
+ response = cupsDoRequest(http, request, "/");
+ if ((attr = ippFindAttribute(response, "printer-type",
+ IPP_TAG_ENUM)) != NULL)
{
- _cupsLangPrintf(stderr, "lpadmin: %s\n", cupsLastErrorString());
+ type = (cups_ptype_t)attr->values[0].integer;
- ippDelete(response);
-
- return (1);
+ if (type & CUPS_PRINTER_CLASS)
+ httpAssembleURIf(HTTP_URI_CODING_ALL, uri, (int)urisize, "ipp", NULL, "localhost", ippPort(), "/classes/%s", printer);
}
else
- {
- ippDelete(response);
+ type = CUPS_PRINTER_LOCAL;
- return (0);
- }
+ ippDelete(response);
+
+ return (type);
}
http_t *http, /* I - Server connection */
char *printer, /* I - Printer */
int num_options, /* I - Number of options */
- cups_option_t *options) /* I - Options */
+ cups_option_t *options, /* I - Options */
+ char *file) /* I - PPD file/interface script */
{
- ipp_t *request, /* IPP Request */
- *response; /* IPP Response */
- ipp_attribute_t *attr; /* IPP attribute */
- ipp_op_t op; /* Operation to perform */
+ ipp_t *request; /* IPP Request */
const char *ppdfile; /* PPD filename */
- int ppdchanged; /* PPD changed? */
+ int ppdchanged = 0; /* PPD changed? */
ppd_file_t *ppd; /* PPD file */
ppd_choice_t *choice; /* Marked choice */
char uri[HTTP_MAX_URI], /* URI for printer/class */
keyword[1024], /* Keyword from Default line */
*keyptr, /* Pointer into keyword... */
tempfile[1024]; /* Temporary filename */
- FILE *in, /* PPD file */
+ cups_file_t *in, /* PPD file */
*out; /* Temporary file */
- int outfd; /* Temporary file descriptor */
- const char *protocol; /* Old protocol option */
+ const char *ppdname, /* ppd-name value */
+ *protocol, /* Old protocol option */
+ *customval, /* Custom option value */
+ *boolval; /* Boolean value */
+ int wrote_ipp_supplies = 0, /* Wrote cupsIPPSupplies keyword? */
+ wrote_snmp_supplies = 0,/* Wrote cupsSNMPSupplies keyword? */
+ copied_options = 0; /* Copied options? */
- DEBUG_printf(("set_printer_options(%p, \"%s\", %d, %p)\n", http, printer,
- num_options, options));
-
- httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
- "localhost", 0, "/printers/%s", printer);
+ DEBUG_printf(("set_printer_options(http=%p, printer=\"%s\", num_options=%d, "
+ "options=%p, file=\"%s\")\n", http, printer, num_options,
+ options, file));
/*
- * Build a GET_PRINTER_ATTRIBUTES request, which requires the following
- * attributes:
+ * Build a CUPS-Add-Modify-Printer or CUPS-Add-Modify-Class request,
+ * which requires the following attributes:
*
* attributes-charset
* attributes-natural-language
* printer-uri
- * requested-attributes
+ * requesting-user-name
+ * other options
*/
- request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
+ if (get_printer_type(http, printer, uri, sizeof(uri)) & CUPS_PRINTER_CLASS)
+ request = ippNewRequest(IPP_OP_CUPS_ADD_MODIFY_CLASS);
+ else
+ request = ippNewRequest(IPP_OP_CUPS_ADD_MODIFY_PRINTER);
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
- "printer-uri", NULL, uri);
-
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
- "requested-attributes", NULL, "printer-type");
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, uri);
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name", NULL, cupsUser());
/*
- * Do the request...
+ * Add the options...
*/
- op = CUPS_ADD_PRINTER;
-
- if ((response = cupsDoRequest(http, request, "/")) != NULL)
+ if (file)
+ ppdfile = file;
+ else if ((ppdname = cupsGetOption("ppd-name", num_options, options)) != NULL && strcmp(ppdname, "raw") && num_options > 1)
{
- /*
- * See what kind of printer or class it is...
- */
-
- if ((attr = ippFindAttribute(response, "printer-type",
- IPP_TAG_ENUM)) != NULL)
+ if ((ppdfile = cupsGetServerPPD(http, ppdname)) != NULL)
{
- if (attr->values[0].integer & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT))
- {
- op = CUPS_ADD_CLASS;
- httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
- "localhost", 0, "/classes/%s", printer);
- }
- }
-
- ippDelete(response);
- }
-
- /*
- * Build a CUPS_ADD_PRINTER or CUPS_ADD_CLASS request, which requires
- * the following attributes:
- *
- * attributes-charset
- * attributes-natural-language
- * printer-uri
- * other options
- */
-
- request = ippNewRequest(op);
+ /*
+ * Copy options array and remove ppd-name from it...
+ */
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
- "printer-uri", NULL, uri);
+ cups_option_t *temp = NULL, *optr;
+ int i, num_temp = 0;
+ for (i = num_options, optr = options; i > 0; i --, optr ++)
+ if (strcmp(optr->name, "ppd-name"))
+ num_temp = cupsAddOption(optr->name, optr->value, num_temp, &temp);
- /*
- * Add the options...
- */
+ copied_options = 1;
+ ppdchanged = 1;
+ num_options = num_temp;
+ options = temp;
+ }
+ }
+ else if (request->request.op.operation_id == IPP_OP_CUPS_ADD_MODIFY_PRINTER)
+ ppdfile = cupsGetPPD(printer);
+ else
+ ppdfile = NULL;
+ cupsEncodeOptions2(request, num_options, options, IPP_TAG_OPERATION);
cupsEncodeOptions2(request, num_options, options, IPP_TAG_PRINTER);
if ((protocol = cupsGetOption("protocol", num_options, options)) != NULL)
{
- if (!strcasecmp(protocol, "bcp"))
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "port-monitor",
+ if (!_cups_strcasecmp(protocol, "bcp"))
+ ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_NAME, "port-monitor",
NULL, "bcp");
- else if (!strcasecmp(protocol, "tbcp"))
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "port-monitor",
+ else if (!_cups_strcasecmp(protocol, "tbcp"))
+ ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_NAME, "port-monitor",
NULL, "tbcp");
}
- if (op == CUPS_ADD_PRINTER)
- ppdfile = cupsGetPPD(printer);
- else
- ppdfile = NULL;
-
- if (ppdfile != NULL)
+ if (ppdfile)
{
/*
* Set default options in the PPD file...
*/
- ppd = ppdOpenFile(ppdfile);
+ if ((ppd = ppdOpenFile(ppdfile)) == NULL)
+ {
+ int linenum; /* Line number of error */
+ ppd_status_t status = ppdLastError(&linenum);
+ /* Status code */
+
+ _cupsLangPrintf(stderr, _("lpadmin: Unable to open PPD \"%s\": %s on line %d."), ppdfile, ppdErrorString(status), linenum);
+ }
+
ppdMarkDefaults(ppd);
cupsMarkOptions(ppd, num_options, options);
- if ((outfd = cupsTempFd(tempfile, sizeof(tempfile))) < 0)
+ if ((out = cupsTempFile2(tempfile, sizeof(tempfile))) == NULL)
{
- _cupsLangPrintf(stderr,
- _("lpadmin: Unable to create temporary file - %s\n"),
- strerror(errno));
+ _cupsLangPrintError(NULL, _("lpadmin: Unable to create temporary file"));
ippDelete(request);
- unlink(ppdfile);
+ if (ppdfile != file)
+ unlink(ppdfile);
+ if (copied_options)
+ cupsFreeOptions(num_options, options);
return (1);
}
- if ((in = fopen(ppdfile, "rb")) == NULL)
+ if ((in = cupsFileOpen(ppdfile, "r")) == NULL)
{
_cupsLangPrintf(stderr,
- _("lpadmin: Unable to open PPD file \"%s\" - %s\n"),
+ _("lpadmin: Unable to open PPD file \"%s\" - %s"),
ppdfile, strerror(errno));
ippDelete(request);
- unlink(ppdfile);
- close(outfd);
+ if (ppdfile != file)
+ unlink(ppdfile);
+ if (copied_options)
+ cupsFreeOptions(num_options, options);
+ cupsFileClose(out);
unlink(tempfile);
return (1);
}
- out = fdopen(outfd, "wb");
- ppdchanged = 0;
-
- while (get_line(line, sizeof(line), in) != NULL)
+ while (cupsFileGets(in, line, sizeof(line)))
{
- if (strncmp(line, "*Default", 8))
- fprintf(out, "%s\n", line);
+ if (!strncmp(line, "*cupsIPPSupplies:", 17) &&
+ (boolval = cupsGetOption("cupsIPPSupplies", num_options,
+ options)) != NULL)
+ {
+ wrote_ipp_supplies = 1;
+ cupsFilePrintf(out, "*cupsIPPSupplies: %s\n",
+ (!_cups_strcasecmp(boolval, "true") ||
+ !_cups_strcasecmp(boolval, "yes") ||
+ !_cups_strcasecmp(boolval, "on")) ? "True" : "False");
+ }
+ else if (!strncmp(line, "*cupsSNMPSupplies:", 18) &&
+ (boolval = cupsGetOption("cupsSNMPSupplies", num_options,
+ options)) != NULL)
+ {
+ wrote_snmp_supplies = 1;
+ cupsFilePrintf(out, "*cupsSNMPSupplies: %s\n",
+ (!_cups_strcasecmp(boolval, "true") ||
+ !_cups_strcasecmp(boolval, "yes") ||
+ !_cups_strcasecmp(boolval, "on")) ? "True" : "False");
+ }
+ else if (strncmp(line, "*Default", 8))
+ cupsFilePrintf(out, "%s\n", line);
else
{
/*
if (choice && strcmp(choice->choice, keyptr))
{
- fprintf(out, "*Default%s: %s\n", keyword, choice->choice);
- ppdchanged = 1;
+ if (strcmp(choice->choice, "Custom"))
+ {
+ cupsFilePrintf(out, "*Default%s: %s\n", keyword, choice->choice);
+ ppdchanged = 1;
+ }
+ else if ((customval = cupsGetOption(keyword, num_options,
+ options)) != NULL)
+ {
+ cupsFilePrintf(out, "*Default%s: %s\n", keyword, customval);
+ ppdchanged = 1;
+ }
+ else
+ cupsFilePrintf(out, "%s\n", line);
}
else
- fprintf(out, "%s\n", line);
+ cupsFilePrintf(out, "%s\n", line);
}
}
- fclose(in);
- fclose(out);
- close(outfd);
+ if (!wrote_ipp_supplies &&
+ (boolval = cupsGetOption("cupsIPPSupplies", num_options,
+ options)) != NULL)
+ {
+ cupsFilePrintf(out, "*cupsIPPSupplies: %s\n",
+ (!_cups_strcasecmp(boolval, "true") ||
+ !_cups_strcasecmp(boolval, "yes") ||
+ !_cups_strcasecmp(boolval, "on")) ? "True" : "False");
+ }
+
+ if (!wrote_snmp_supplies &&
+ (boolval = cupsGetOption("cupsSNMPSupplies", num_options,
+ options)) != NULL)
+ {
+ cupsFilePrintf(out, "*cupsSNMPSupplies: %s\n",
+ (!_cups_strcasecmp(boolval, "true") ||
+ !_cups_strcasecmp(boolval, "yes") ||
+ !_cups_strcasecmp(boolval, "on")) ? "True" : "False");
+ }
+
+ cupsFileClose(in);
+ cupsFileClose(out);
ppdClose(ppd);
/*
*/
ippDelete(cupsDoFileRequest(http, request, "/admin/",
- ppdchanged ? tempfile : NULL));
+ ppdchanged ? tempfile : file));
/*
* Clean up temp files... (TODO: catch signals in case we CTRL-C during
* lpadmin)
*/
- unlink(ppdfile);
+ if (ppdfile != file)
+ unlink(ppdfile);
unlink(tempfile);
}
else
ippDelete(cupsDoRequest(http, request, "/admin/"));
}
+ if (copied_options)
+ cupsFreeOptions(num_options, options);
+
/*
* Check the response...
*/
- if (cupsLastError() > IPP_OK_CONFLICT)
+ if (cupsLastError() > IPP_STATUS_OK_CONFLICTING)
{
- _cupsLangPrintf(stderr, "lpadmin: %s\n", cupsLastErrorString());
+ _cupsLangPrintf(stderr, _("%s: %s"), "lpadmin", cupsLastErrorString());
return (1);
}
for (ptr = name; *ptr; ptr ++)
if (*ptr == '@')
break;
- else if ((*ptr >= 0 && *ptr <= ' ') || *ptr == 127 || *ptr == '/' ||
- *ptr == '#')
+ else if ((*ptr >= 0 && *ptr <= ' ') || *ptr == 127 || *ptr == '/' || *ptr == '\\' || *ptr == '?' || *ptr == '\'' || *ptr == '\"' || *ptr == '#')
return (0);
/*
return ((ptr - name) < 128);
}
-
-
-/*
- * End of "$Id: lpadmin.c 5833 2006-08-16 20:05:58Z mike $".
- */
projects / thirdparty / cups.git / blobdiff