/*
- * "$Id$"
+ * "$Id: ipp.c 7948 2008-09-17 00:04:12Z mike $"
*
* IPP backend for the Common UNIX Printing System (CUPS).
*
- * Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ * Copyright 2007-2010 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* 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
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* "LICENSE" 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
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
* compress_files() - Compress print files...
* password_cb() - Disable the password prompt for
* cupsDoFileRequest().
+ * report_attr() - Report an IPP attribute value.
* report_printer_state() - Report the printer state.
* run_pictwps_filter() - Convert PICT files to PostScript when printing
* remotely.
*/
#include <cups/http-private.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
+#include "backend-private.h"
#include <sys/types.h>
#include <sys/stat.h>
-#include <cups/backend.h>
-#include <cups/cups.h>
-#include <cups/language.h>
-#include <cups/string.h>
-#include <signal.h>
#include <sys/wait.h>
-
/*
* Globals...
*/
static char *password = NULL; /* Password for device URI */
+static int password_tries = 0; /* Password tries */
+static const char *auth_info_required = "none";
+ /* New auth-info-required value */
#ifdef __APPLE__
static char pstmpname[1024] = ""; /* Temporary PostScript file name */
#endif /* __APPLE__ */
const char *resource, const char *user, int version);
static void check_printer_state(http_t *http, const char *uri,
const char *resource, const char *user,
- int version);
+ int version, int job_id);
#ifdef HAVE_LIBZ
static void compress_files(int num_files, char **files);
#endif /* HAVE_LIBZ */
static const char *password_cb(const char *);
-static int report_printer_state(ipp_t *ipp);
+static void report_attr(ipp_attribute_t *attr);
+static int report_printer_state(ipp_t *ipp, int job_id);
#ifdef __APPLE__
static int run_pictwps_filter(char **argv, const char *filename);
char *argv[]) /* I - Command-line arguments */
{
int i; /* Looping var */
+ int send_options; /* Send job options? */
int num_options; /* Number of printer options */
cups_option_t *options; /* Printer options */
- char method[255], /* Method in URI */
+ const char *device_uri; /* Device URI */
+ char scheme[255], /* Scheme in URI */
hostname[1024], /* Hostname */
username[255], /* Username info */
resource[1024], /* Resource info (printer name) */
+ addrname[256], /* Address name */
*optptr, /* Pointer to URI options */
- name[255], /* Name of option */
- value[255], /* Value of option */
- *ptr; /* Pointer into name or value */
+ *name, /* Name of option */
+ *value, /* Value of option */
+ sep; /* Separator character */
+ int snmp_fd, /* SNMP socket */
+ start_count, /* Page count via SNMP at start */
+ page_count, /* Page count via SNMP */
+ have_supplies; /* Printer supports supply levels? */
int num_files; /* Number of files to print */
char **files, /* Files to print */
*filename; /* Pointer to single filename */
ipp_t *request, /* IPP request */
*response, /* IPP response */
*supported; /* get-printer-attributes response */
+ time_t start_time; /* Time of first connect */
+ int contimeout; /* Connection timeout */
+ int delay; /* Delay for retries... */
int compression, /* Do compression of the job data? */
waitjob, /* Wait for job complete? */
waitprinter; /* Wait for printer ready? */
ipp_attribute_t *format_sup; /* document-format-supported */
ipp_attribute_t *printer_state; /* printer-state attribute */
ipp_attribute_t *printer_accepting; /* printer-is-accepting-jobs */
- int copies; /* Number of copies remaining */
- const char *content_type; /* CONTENT_TYPE environment variable */
+ int copies, /* Number of copies for job */
+ copies_remaining; /* Number of copies remaining */
+ const char *content_type, /* CONTENT_TYPE environment variable */
+ *final_content_type; /* FINAL_CONTENT_TYPE environment var */
#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
struct sigaction action; /* Actions for POSIX signals */
#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
int version; /* IPP version */
- int reasons; /* Number of printer-state-reasons */
static const char * const pattrs[] =
{ /* Printer attributes we want */
"copies-supported",
"document-format-supported",
+ "marker-colors",
+ "marker-high-levels",
+ "marker-levels",
+ "marker-low-levels",
+ "marker-message",
+ "marker-names",
+ "marker-types",
"printer-is-accepting-jobs",
"printer-state",
+ "printer-state-message",
"printer-state-reasons",
};
static const char * const jattrs[] =
else
s = argv[0];
- printf("network %s \"Unknown\" \"Internet Printing Protocol (%s)\"\n",
- s, s);
+ printf("network %s \"Unknown\" \"%s (%s)\"\n",
+ s, _cupsLangString(cupsLangDefault(),
+ _("Internet Printing Protocol")), s);
return (CUPS_BACKEND_OK);
}
else if (argc < 6)
{
- fprintf(stderr,
- "Usage: %s job-id user title copies options [file ... fileN]\n",
- argv[0]);
+ _cupsLangPrintf(stderr,
+ _("Usage: %s job-id user title copies options [file]\n"),
+ argv[0]);
return (CUPS_BACKEND_STOP);
}
* Get the (final) content type...
*/
- if ((content_type = getenv("FINAL_CONTENT_TYPE")) == NULL)
- if ((content_type = getenv("CONTENT_TYPE")) == NULL)
- content_type = "application/octet-stream";
+ if ((content_type = getenv("CONTENT_TYPE")) == NULL)
+ content_type = "application/octet-stream";
+
+ if ((final_content_type = getenv("FINAL_CONTENT_TYPE")) == NULL)
+ {
+ final_content_type = content_type;
+
+ if (!strncmp(final_content_type, "printer/", 8))
+ final_content_type = "application/vnd.cups-raw";
+ }
/*
* Extract the hostname and printer name from the URI...
*/
- if (httpSeparateURI(HTTP_URI_CODING_ALL, cupsBackendDeviceURI(argv),
- method, sizeof(method), username, sizeof(username),
- hostname, sizeof(hostname), &port,
- resource, sizeof(resource)) < HTTP_URI_OK)
- {
- fputs("ERROR: Missing device URI on command-line and no DEVICE_URI "
- "environment variable!\n", stderr);
- return (CUPS_BACKEND_STOP);
- }
+ if ((device_uri = cupsBackendDeviceURI(argv)) == NULL)
+ return (CUPS_BACKEND_FAILED);
+
+ httpSeparateURI(HTTP_URI_CODING_ALL, device_uri, scheme, sizeof(scheme),
+ username, sizeof(username), hostname, sizeof(hostname), &port,
+ resource, sizeof(resource));
+
+ if (!port)
+ port = IPP_PORT; /* Default to port 631 */
- if (!strcmp(method, "https"))
+ if (!strcmp(scheme, "https"))
cupsSetEncryption(HTTP_ENCRYPT_ALWAYS);
+ else
+ cupsSetEncryption(HTTP_ENCRYPT_IF_REQUESTED);
/*
* See if there are any options...
*/
compression = 0;
- version = 1;
+ version = 11;
waitjob = 1;
waitprinter = 1;
+ contimeout = 7 * 24 * 60 * 60;
if ((optptr = strchr(resource, '?')) != NULL)
{
* Get the name...
*/
- for (ptr = name; *optptr && *optptr != '=';)
- if (ptr < (name + sizeof(name) - 1))
- *ptr++ = *optptr++;
- *ptr = '\0';
+ name = optptr;
+
+ while (*optptr && *optptr != '=' && *optptr != '+' && *optptr != '&')
+ optptr ++;
+
+ if ((sep = *optptr) != '\0')
+ *optptr++ = '\0';
- if (*optptr == '=')
+ if (sep == '=')
{
/*
* Get the value...
*/
- optptr ++;
-
- for (ptr = value; *optptr && *optptr != '+' && *optptr != '&';)
- if (ptr < (value + sizeof(value) - 1))
- *ptr++ = *optptr++;
- *ptr = '\0';
+ value = optptr;
- if (*optptr == '+' || *optptr == '&')
+ while (*optptr && *optptr != '+' && *optptr != '&')
optptr ++;
+
+ if (*optptr)
+ *optptr++ = '\0';
}
else
- value[0] = '\0';
+ value = (char *)"";
/*
* Process the option...
cupsSetEncryption(HTTP_ENCRYPT_IF_REQUESTED);
else
{
- fprintf(stderr, "ERROR: Unknown encryption option value \"%s\"!\n",
- value);
+ _cupsLangPrintf(stderr,
+ _("ERROR: Unknown encryption option value \"%s\"\n"),
+ value);
}
}
else if (!strcasecmp(name, "version"))
{
if (!strcmp(value, "1.0"))
- version = 0;
+ version = 10;
else if (!strcmp(value, "1.1"))
- version = 1;
+ version = 11;
+ else if (!strcmp(value, "2.0"))
+ version = 20;
+ else if (!strcmp(value, "2.1"))
+ version = 21;
else
{
- fprintf(stderr, "ERROR: Unknown version option value \"%s\"!\n",
- value);
+ _cupsLangPrintf(stderr,
+ _("ERROR: Unknown version option value \"%s\"\n"),
+ value);
}
}
#ifdef HAVE_LIBZ
!strcasecmp(value, "gzip");
}
#endif /* HAVE_LIBZ */
+ else if (!strcasecmp(name, "contimeout"))
+ {
+ /*
+ * Set the connection timeout...
+ */
+
+ if (atoi(value) > 0)
+ contimeout = atoi(value);
+ }
else
{
/*
* Unknown option...
*/
- fprintf(stderr, "ERROR: Unknown option \"%s\" with value \"%s\"!\n",
- name, value);
+ _cupsLangPrintf(stderr,
+ _("ERROR: Unknown option \"%s\" with value \"%s\"\n"),
+ name, value);
}
}
}
* Copy stdin to a temporary file...
*/
- int fd; /* File descriptor */
- cups_file_t *fp; /* Temporary file */
- char buffer[8192]; /* Buffer for copying */
- int bytes; /* Number of bytes read */
+ int fd; /* File descriptor */
+ http_addrlist_t *addrlist; /* Address list */
+ off_t tbytes; /* Total bytes copied */
+ fputs("STATE: +connecting-to-device\n", stderr);
+ fprintf(stderr, "DEBUG: Looking up \"%s\"...\n", hostname);
+
+ if ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, "1")) == NULL)
+ {
+ _cupsLangPrintf(stderr, _("ERROR: Unable to locate printer \'%s\'\n"),
+ hostname);
+ return (CUPS_BACKEND_STOP);
+ }
+
+ snmp_fd = _cupsSNMPOpen(addrlist->addr.addr.sa_family);
+
if ((fd = cupsTempFd(tmpfilename, sizeof(tmpfilename))) < 0)
{
- perror("ERROR: unable to create temporary file");
+ _cupsLangPrintError(_("ERROR: Unable to create temporary file"));
return (CUPS_BACKEND_FAILED);
}
- if ((fp = cupsFileOpenFd(fd, compression ? "w9" : "w")) == NULL)
+ _cupsLangPuts(stderr, _("INFO: Copying print data...\n"));
+
+ tbytes = backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, 0,
+ backendNetworkSideCB);
+
+ if (snmp_fd >= 0)
+ _cupsSNMPClose(snmp_fd);
+
+ httpAddrFreeList(addrlist);
+
+ close(fd);
+
+ /*
+ * Don't try printing files less than 2 bytes...
+ */
+
+ if (tbytes <= 1)
{
- perror("ERROR: unable to open temporary file");
- close(fd);
+ _cupsLangPuts(stderr, _("ERROR: Empty print file\n"));
unlink(tmpfilename);
return (CUPS_BACKEND_FAILED);
}
- while ((bytes = fread(buffer, 1, sizeof(buffer), stdin)) > 0)
- if (cupsFileWrite(fp, buffer, bytes) < bytes)
- {
- perror("ERROR: unable to write to temporary file");
- cupsFileClose(fp);
- unlink(tmpfilename);
- return (CUPS_BACKEND_FAILED);
- }
-
- cupsFileClose(fp);
-
/*
* Point to the single file from stdin...
*/
- filename = tmpfilename;
- files = &filename;
- num_files = 1;
+ filename = tmpfilename;
+ num_files = 1;
+ files = &filename;
+ send_options = 0;
}
else
{
* Point to the files on the command-line...
*/
- num_files = argc - 6;
- files = argv + 6;
+ num_files = argc - 6;
+ files = argv + 6;
+ send_options = 1;
#ifdef HAVE_LIBZ
if (compression)
else if (!getuid())
{
/*
- * Try loading authentication information from the a##### file.
+ * Try loading authentication information from the environment.
*/
- const char *request_root; /* CUPS_REQUESTROOT env var */
- char afilename[1024], /* a##### filename */
- aline[1024]; /* Line from file */
- FILE *fp; /* File pointer */
+ const char *ptr = getenv("AUTH_USERNAME");
+ if (ptr)
+ cupsSetUser(ptr);
- if ((request_root = getenv("CUPS_REQUESTROOT")) != NULL)
- {
- /*
- * Try opening authentication cache file...
- */
-
- snprintf(afilename, sizeof(afilename), "%s/a%05d", request_root,
- atoi(argv[1]));
- if ((fp = fopen(afilename, "r")) != NULL)
- {
- /*
- * Read username...
- */
-
- if (fgets(aline, sizeof(aline), fp))
- {
- /*
- * Decode username...
- */
-
- i = sizeof(username);
- httpDecode64_2(username, &i, aline);
-
- /*
- * Read password...
- */
-
- if (fgets(aline, sizeof(aline), fp))
- {
- /*
- * Decode password...
- */
-
- i = sizeof(password);
- httpDecode64_2(password, &i, aline);
- }
- }
-
- /*
- * Close the file...
- */
-
- fclose(fp);
- }
- }
+ password = getenv("AUTH_PASSWORD");
}
/*
* Try connecting to the remote server...
*/
+ delay = 5;
+ start_time = time(NULL);
+
fputs("STATE: +connecting-to-device\n", stderr);
do
{
- fprintf(stderr, "INFO: Connecting to %s on port %d...\n", hostname, port);
+ fprintf(stderr, "DEBUG: Connecting to %s:%d\n", hostname, port);
+ _cupsLangPuts(stderr, _("INFO: Connecting to printer...\n"));
if ((http = httpConnectEncrypt(hostname, port, cupsEncryption())) == NULL)
{
+ if (job_cancelled)
+ break;
+
if (getenv("CLASS") != NULL)
{
/*
* available printer in the class.
*/
- fprintf(stderr,
- "INFO: Unable to connect to %s, queuing on next printer in "
- "class...\n",
- hostname);
+ _cupsLangPuts(stderr,
+ _("INFO: Unable to contact printer, queuing on next "
+ "printer in class...\n"));
- if (argc == 6 || strcmp(filename, argv[6]))
- unlink(filename);
+ if (tmpfilename[0])
+ unlink(tmpfilename);
/*
* Sleep 5 seconds to keep the job from requeuing too rapidly...
if (errno == ECONNREFUSED || errno == EHOSTDOWN ||
errno == EHOSTUNREACH)
{
- fprintf(stderr,
- "INFO: Network host \'%s\' is busy; will retry in 30 "
- "seconds...\n",
- hostname);
- sleep(30);
+ if (contimeout && (time(NULL) - start_time) > contimeout)
+ {
+ _cupsLangPuts(stderr, _("ERROR: Printer not responding\n"));
+ return (CUPS_BACKEND_FAILED);
+ }
+
+ _cupsLangPrintf(stderr,
+ _("WARNING: Network host \'%s\' is busy; "
+ "will retry in %d seconds...\n"),
+ hostname, delay);
+
+ sleep(delay);
+
+ if (delay < 30)
+ delay += 5;
}
else if (h_errno)
{
- fprintf(stderr, "INFO: Unable to lookup host \'%s\' - %s\n",
- hostname, hstrerror(h_errno));
- sleep(30);
+ _cupsLangPrintf(stderr, _("ERROR: Unable to locate printer \'%s\'\n"),
+ hostname);
+ return (CUPS_BACKEND_STOP);
}
else
{
- perror("ERROR: Unable to connect to IPP host");
+ fprintf(stderr, "DEBUG: Connection error: %s\n", strerror(errno));
+ _cupsLangPuts(stderr,
+ _("ERROR: Unable to connect to printer; will retry in 30 "
+ "seconds...\n"));
sleep(30);
}
+
+ if (job_cancelled)
+ break;
}
}
while (http == NULL);
+ if (job_cancelled || !http)
+ {
+ if (tmpfilename[0])
+ unlink(tmpfilename);
+
+ return (CUPS_BACKEND_FAILED);
+ }
+
fputs("STATE: -connecting-to-device\n", stderr);
- fprintf(stderr, "INFO: Connected to %s...\n", hostname);
+ _cupsLangPuts(stderr, _("INFO: Connected to printer...\n"));
+
+#ifdef AF_INET6
+ if (http->hostaddr->addr.sa_family == AF_INET6)
+ fprintf(stderr, "DEBUG: Connected to [%s]:%d (IPv6)...\n",
+ httpAddrString(http->hostaddr, addrname, sizeof(addrname)),
+ ntohs(http->hostaddr->ipv6.sin6_port));
+ else
+#endif /* AF_INET6 */
+ if (http->hostaddr->addr.sa_family == AF_INET)
+ fprintf(stderr, "DEBUG: Connected to %s:%d (IPv4)...\n",
+ httpAddrString(http->hostaddr, addrname, sizeof(addrname)),
+ ntohs(http->hostaddr->ipv4.sin_port));
+
+ /*
+ * See if the printer supports SNMP...
+ */
+
+ if ((snmp_fd = _cupsSNMPOpen(http->hostaddr->addr.sa_family)) >= 0)
+ have_supplies = !backendSNMPSupplies(snmp_fd, http->hostaddr, &start_count,
+ NULL);
+ else
+ have_supplies = start_count = 0;
/*
* Build a URI for the printer and fill the standard IPP attributes for
* might contain username:password information...
*/
- snprintf(uri, sizeof(uri), "%s://%s:%d%s", method, hostname, port, resource);
+ httpAssembleURI(HTTP_URI_CODING_ALL, uri, sizeof(uri), scheme, NULL, hostname,
+ port, resource);
/*
* First validate the destination and see if the device supports multiple
do
{
+ /*
+ * Check for side-channel requests...
+ */
+
+ backendCheckSideChannel(snmp_fd, http->hostaddr);
+
/*
* Build the IPP request...
*/
request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
- request->request.op.version[1] = version;
+ request->request.op.version[0] = version / 10;
+ request->request.op.version[1] = version % 10;
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
NULL, uri);
fputs("DEBUG: Getting supported attributes...\n", stderr);
+ if (http->version < HTTP_1_1)
+ httpReconnect(http);
+
if ((supported = cupsDoRequest(http, request, resource)) == NULL)
ipp_status = cupsLastError();
else
if (ipp_status == IPP_PRINTER_BUSY ||
ipp_status == IPP_SERVICE_UNAVAILABLE)
{
- fputs("INFO: Printer busy; will retry in 10 seconds...\n", stderr);
- report_printer_state(supported);
- sleep(10);
+ if (contimeout && (time(NULL) - start_time) > contimeout)
+ {
+ _cupsLangPuts(stderr, _("ERROR: Printer not responding\n"));
+ return (CUPS_BACKEND_FAILED);
+ }
+
+ _cupsLangPrintf(stderr,
+ _("WARNING: Network host \'%s\' is busy; will retry in "
+ "%d seconds...\n"), hostname, delay);
+
+ report_printer_state(supported, 0);
+
+ sleep(delay);
+
+ if (delay < 30)
+ delay += 5;
}
else if ((ipp_status == IPP_BAD_REQUEST ||
- ipp_status == IPP_VERSION_NOT_SUPPORTED) && version == 1)
+ ipp_status == IPP_VERSION_NOT_SUPPORTED) && version > 10)
{
/*
* Switch to IPP/1.0...
*/
- fputs("INFO: Printer does not support IPP/1.1, trying IPP/1.0...\n",
- stderr);
- version = 0;
+ _cupsLangPrintf(stderr,
+ _("INFO: Printer does not support IPP/%d.%d, trying "
+ "IPP/1.0...\n"), version / 10, version % 10);
+ version = 10;
httpReconnect(http);
}
else if (ipp_status == IPP_NOT_FOUND)
{
- fputs("ERROR: Destination printer does not exist!\n", stderr);
+ _cupsLangPuts(stderr, _("ERROR: Destination printer does not exist\n"));
if (supported)
ippDelete(supported);
return (CUPS_BACKEND_STOP);
}
+ else if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN)
+ {
+ if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE),
+ "Negotiate", 9))
+ auth_info_required = "negotiate";
+
+ fprintf(stderr, "ATTR: auth-info-required=%s\n", auth_info_required);
+ return (CUPS_BACKEND_AUTH_REQUIRED);
+ }
else
{
- fprintf(stderr, "ERROR: Unable to get printer status (%s)!\n",
- ippErrorString(ipp_status));
+ _cupsLangPrintf(stderr,
+ _("ERROR: Unable to get printer status (%s)\n"),
+ cupsLastErrorString());
sleep(10);
}
format_sup->values[i].string.text);
}
- report_printer_state(supported);
+ report_printer_state(supported, 0);
}
while (ipp_status > IPP_OK_CONFLICT);
* available printer in the class.
*/
- fprintf(stderr,
- "INFO: Unable to queue job on %s, queuing on next printer in "
- "class...\n",
- hostname);
+ _cupsLangPuts(stderr,
+ _("INFO: Unable to contact printer, queuing on next "
+ "printer in class...\n"));
ippDelete(supported);
httpClose(http);
- if (argc == 6 || strcmp(filename, argv[6]))
- unlink(filename);
+ if (tmpfilename[0])
+ unlink(tmpfilename);
/*
* Sleep 5 seconds to keep the job from requeuing too rapidly...
* See if the printer supports multiple copies...
*/
+ copies = atoi(argv[4]);
+
if (copies_sup || argc < 7)
- copies = 1;
+ {
+ copies_remaining = 1;
+
+ if (argc < 7)
+ copies = 1;
+ }
else
- copies = atoi(argv[4]);
+ copies_remaining = copies;
/*
* Then issue the print-job request...
*/
- reasons = 0;
job_id = 0;
- while (copies > 0)
+ while (copies_remaining > 0)
{
+ /*
+ * Check for side-channel requests...
+ */
+
+ backendCheckSideChannel(snmp_fd, http->hostaddr);
+
/*
* Build the IPP request...
*/
else
request = ippNewRequest(IPP_PRINT_JOB);
- request->request.op.version[1] = version;
+ request->request.op.version[0] = version / 10;
+ request->request.op.version[1] = version % 10;
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
NULL, uri);
fprintf(stderr, "DEBUG: requesting-user-name = \"%s\"\n", argv[2]);
- if (argv[3][0])
+ /*
+ * Only add a "job-name" attribute if the remote server supports
+ * copy generation - some IPP implementations like HP's don't seem
+ * to like UTF-8 job names (STR #1837)...
+ */
+
+ if (argv[3][0] && copies_sup)
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name", NULL,
argv[3]);
num_options = cupsParseOptions(argv[5], 0, &options);
#ifdef __APPLE__
- if (content_type != NULL &&
- !strcasecmp(content_type, "application/pictwps") && num_files == 1)
+ if (!strcasecmp(final_content_type, "application/pictwps") &&
+ num_files == 1)
{
if (format_sup != NULL)
{
for (i = 0; i < format_sup->num_values; i ++)
- if (!strcasecmp(content_type, format_sup->values[i].string.text))
+ if (!strcasecmp(final_content_type, format_sup->values[i].string.text))
break;
}
* so convert the document to PostScript...
*/
- if (run_pictwps_filter(argv, filename))
+ if (run_pictwps_filter(argv, files[0]))
+ {
+ if (pstmpname[0])
+ unlink(pstmpname);
+
+ if (tmpfilename[0])
+ unlink(tmpfilename);
+
return (CUPS_BACKEND_FAILED);
+ }
- filename = pstmpname;
+ files[0] = pstmpname;
/*
* Change the MIME type to application/postscript and change the
* number of copies to 1...
*/
- content_type = "application/postscript";
- copies = 1;
+ final_content_type = "application/postscript";
+ copies = 1;
+ copies_remaining = 1;
+ send_options = 0;
}
}
#endif /* __APPLE__ */
- if (content_type != NULL && format_sup != NULL)
+ if (format_sup != NULL)
{
for (i = 0; i < format_sup->num_values; i ++)
- if (!strcasecmp(content_type, format_sup->values[i].string.text))
+ if (!strcasecmp(final_content_type, format_sup->values[i].string.text))
break;
if (i < format_sup->num_values)
- num_options = cupsAddOption("document-format", content_type,
- num_options, &options);
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+ "document-format", NULL, final_content_type);
}
- if (copies_sup)
+ if (copies_sup && version > 10 && send_options)
{
/*
* Only send options if the destination printer supports the copies
- * attribute. This is a hack for the HP JetDirect implementation of
- * IPP, which does not accept extension attributes and incorrectly
- * reports a client-error-bad-request error instead of the
- * successful-ok-unsupported-attributes status. In short, at least
- * some HP implementations of IPP are non-compliant.
+ * attribute and IPP/1.1. This is a hack for the HP and Lexmark
+ * implementations of IPP, which do not accept extension attributes
+ * and incorrectly report a client-error-bad-request error instead of
+ * the successful-ok-unsupported-attributes status. In short, at least
+ * some HP and Lexmark implementations of IPP are non-compliant.
*/
cupsEncodeOptions(request, num_options, options);
+
ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, "copies",
- atoi(argv[4]));
+ copies);
}
cupsFreeOptions(num_options, options);
/*
* If copies aren't supported, then we are likely dealing with an HP
* JetDirect. The HP IPP implementation seems to close the connection
- * after every request (that is, it does *not* implement HTTP Keep-
+ * after every request - that is, it does *not* implement HTTP Keep-
* Alive, which is REQUIRED by HTTP/1.1...
*/
* Do the request...
*/
+ if (http->version < HTTP_1_1)
+ httpReconnect(http);
+
if (num_files > 1)
response = cupsDoRequest(http, request, resource);
else
if (ipp_status == IPP_SERVICE_UNAVAILABLE ||
ipp_status == IPP_PRINTER_BUSY)
{
- fputs("INFO: Printer is busy; retrying print job...\n", stderr);
+ _cupsLangPuts(stderr,
+ _("INFO: Printer busy; will retry in 10 seconds...\n"));
sleep(10);
}
+ else if ((ipp_status == IPP_BAD_REQUEST ||
+ ipp_status == IPP_VERSION_NOT_SUPPORTED) && version > 10)
+ {
+ /*
+ * Switch to IPP/1.0...
+ */
+
+ _cupsLangPrintf(stderr,
+ _("INFO: Printer does not support IPP/%d.%d, trying "
+ "IPP/1.0...\n"), version / 10, version % 10);
+ version = 10;
+ httpReconnect(http);
+ }
else
- fprintf(stderr, "ERROR: Print file was not accepted (%s)!\n",
- cupsLastErrorString());
+ {
+ /*
+ * Update auth-info-required as needed...
+ */
+
+ _cupsLangPrintf(stderr, _("ERROR: Print file was not accepted (%s)\n"),
+ cupsLastErrorString());
+
+ if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN)
+ {
+ fprintf(stderr, "DEBUG: WWW-Authenticate=\"%s\"\n",
+ httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE));
+
+ /*
+ * Normal authentication goes through the password callback, which sets
+ * auth_info_required to "username,password". Kerberos goes directly
+ * through GSSAPI, so look for Negotiate in the WWW-Authenticate header
+ * here and set auth_info_required as needed...
+ */
+
+ if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE),
+ "Negotiate", 9))
+ auth_info_required = "negotiate";
+ }
+ }
}
else if ((job_id_attr = ippFindAttribute(response, "job-id",
IPP_TAG_INTEGER)) == NULL)
{
- fputs("NOTICE: Print file accepted - job ID unknown.\n", stderr);
+ _cupsLangPuts(stderr,
+ _("NOTICE: Print file accepted - job ID unknown.\n"));
job_id = 0;
}
else
{
job_id = job_id_attr->values[0].integer;
- fprintf(stderr, "NOTICE: Print file accepted - job ID %d.\n", job_id);
+ _cupsLangPrintf(stderr, _("NOTICE: Print file accepted - job ID %d.\n"),
+ job_id);
}
ippDelete(response);
{
for (i = 0; i < num_files; i ++)
{
- request = ippNewRequest(IPP_SEND_DOCUMENT);
+ /*
+ * Check for side-channel requests...
+ */
+
+ backendCheckSideChannel(snmp_fd, http->hostaddr);
- request->request.op.version[1] = version;
+ /*
+ * Send the next file in the job...
+ */
+
+ request = ippNewRequest(IPP_SEND_DOCUMENT);
+ request->request.op.version[0] = version / 10;
+ request->request.op.version[1] = version % 10;
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
NULL, uri);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
"document-format", NULL, content_type);
+ if (http->version < HTTP_1_1)
+ httpReconnect(http);
+
ippDelete(cupsDoFileRequest(http, request, resource, files[i]));
if (cupsLastError() > IPP_OK_CONFLICT)
{
ipp_status = cupsLastError();
- fprintf(stderr, "ERROR: Unable to add file %d to job: %s\n",
- job_id, cupsLastErrorString());
+ _cupsLangPrintf(stderr,
+ _("ERROR: Unable to add file %d to job: %s\n"),
+ job_id, cupsLastErrorString());
break;
}
}
if (ipp_status <= IPP_OK_CONFLICT && argc > 6)
{
fprintf(stderr, "PAGE: 1 %d\n", copies_sup ? atoi(argv[4]) : 1);
- copies --;
+ copies_remaining --;
}
else if (ipp_status == IPP_SERVICE_UNAVAILABLE ||
ipp_status == IPP_PRINTER_BUSY)
- break;
+ continue;
else
- copies --;
+ copies_remaining --;
/*
* Wait for the job to complete...
if (!job_id || !waitjob)
continue;
- fputs("INFO: Waiting for job to complete...\n", stderr);
+ _cupsLangPuts(stderr, _("INFO: Waiting for job to complete...\n"));
- for (; !job_cancelled;)
+ for (delay = 1; !job_cancelled;)
{
+ /*
+ * Check for side-channel requests...
+ */
+
+ backendCheckSideChannel(snmp_fd, http->hostaddr);
+
/*
* Build an IPP_GET_JOB_ATTRIBUTES request...
*/
request = ippNewRequest(IPP_GET_JOB_ATTRIBUTES);
- request->request.op.version[1] = version;
+ request->request.op.version[0] = version / 10;
+ request->request.op.version[1] = version % 10;
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
NULL, uri);
* Do the request...
*/
- if (!copies_sup)
+ if (!copies_sup || http->version < HTTP_1_1)
httpReconnect(http);
response = cupsDoRequest(http, request, resource);
{
ippDelete(response);
- fprintf(stderr, "ERROR: Unable to get job %d attributes (%s)!\n",
- job_id, ippErrorString(ipp_status));
+ _cupsLangPrintf(stderr,
+ _("ERROR: Unable to get job %d attributes (%s)\n"),
+ job_id, cupsLastErrorString());
break;
}
}
* Stop polling if the job is finished or pending-held...
*/
- if (job_state->values[0].integer > IPP_JOB_PROCESSING ||
- job_state->values[0].integer == IPP_JOB_HELD)
+ if (job_state->values[0].integer > IPP_JOB_STOPPED)
{
if ((job_sheets = ippFindAttribute(response,
"job-media-sheets-completed",
break;
}
}
+ else
+ {
+ /*
+ * If the printer does not return a job-state attribute, it does not
+ * conform to the IPP specification - break out immediately and fail
+ * the job...
+ */
+
+ fputs("DEBUG: No job-state available from printer - stopping queue.\n",
+ stderr);
+ ipp_status = IPP_INTERNAL_ERROR;
+ break;
+ }
}
ippDelete(response);
* Check the printer state and report it if necessary...
*/
- check_printer_state(http, uri, resource, argv[2], version);
+ check_printer_state(http, uri, resource, argv[2], version, job_id);
/*
- * Wait 10 seconds before polling again...
+ * Wait 1-10 seconds before polling again...
*/
- sleep(10);
+ sleep(delay);
+
+ delay ++;
+ if (delay > 10)
+ delay = 1;
}
}
* Check the printer state and report it if necessary...
*/
- check_printer_state(http, uri, resource, argv[2], version);
+ check_printer_state(http, uri, resource, argv[2], version, job_id);
+
+ /*
+ * Collect the final page count as needed...
+ */
+
+ if (have_supplies &&
+ !backendSNMPSupplies(snmp_fd, http->hostaddr, &page_count, NULL) &&
+ page_count > start_count)
+ fprintf(stderr, "PAGE: total %d\n", page_count - start_count);
+
+#ifdef HAVE_GSSAPI
+ /*
+ * See if we used Kerberos at all...
+ */
+
+ if (http->gssctx)
+ auth_info_required = "negotiate";
+#endif /* HAVE_GSSAPI */
/*
* Free memory...
* Return the queue status...
*/
- return (ipp_status > IPP_OK_CONFLICT ? CUPS_BACKEND_FAILED : CUPS_BACKEND_OK);
+ fprintf(stderr, "ATTR: auth-info-required=%s\n", auth_info_required);
+
+ if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN)
+ return (CUPS_BACKEND_AUTH_REQUIRED);
+ else if (ipp_status == IPP_INTERNAL_ERROR)
+ return (CUPS_BACKEND_STOP);
+ else if (ipp_status > IPP_OK_CONFLICT)
+ return (CUPS_BACKEND_FAILED);
+ else
+ {
+ _cupsLangPuts(stderr, _("INFO: Ready to print.\n"));
+ return (CUPS_BACKEND_OK);
+ }
}
ipp_t *request; /* Cancel-Job request */
- fputs("INFO: Cancelling print job...\n", stderr);
+ _cupsLangPuts(stderr, _("INFO: Canceling print job...\n"));
request = ippNewRequest(IPP_CANCEL_JOB);
- request->request.op.version[1] = version;
+ request->request.op.version[0] = version / 10;
+ request->request.op.version[1] = version % 10;
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
NULL, uri);
* Do the request...
*/
+ if (http->version < HTTP_1_1)
+ httpReconnect(http);
+
ippDelete(cupsDoRequest(http, request, resource));
if (cupsLastError() > IPP_OK_CONFLICT)
- fprintf(stderr, "ERROR: Unable to cancel job %d: %s\n", id,
- cupsLastErrorString());
+ _cupsLangPrintf(stderr, _("ERROR: Unable to cancel job %d: %s\n"), id,
+ cupsLastErrorString());
}
const char *uri, /* I - Printer URI */
const char *resource, /* I - Resource path */
const char *user, /* I - Username, if any */
- int version) /* I - IPP version */
+ int version, /* I - IPP version */
+ int job_id) /* I - Current job ID */
{
ipp_t *request, /* IPP request */
*response; /* IPP response */
+ static const char * const attrs[] = /* Attributes we want */
+ {
+ "marker-colors",
+ "marker-levels",
+ "marker-message",
+ "marker-names",
+ "marker-types",
+ "printer-state-message",
+ "printer-state-reasons"
+ };
/*
*/
request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
- request->request.op.version[1] = version;
+ request->request.op.version[0] = version / 10;
+ request->request.op.version[1] = version % 10;
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
NULL, uri);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
"requesting-user-name", NULL, user);
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
- "requested-attributes", NULL, "printer-state-reasons");
+ ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
+ "requested-attributes",
+ (int)(sizeof(attrs) / sizeof(attrs[0])), NULL, attrs);
/*
* Do the request...
*/
+ if (http->version < HTTP_1_1)
+ httpReconnect(http);
+
if ((response = cupsDoRequest(http, request, resource)) != NULL)
{
- report_printer_state(response);
+ report_printer_state(response, job_id);
ippDelete(response);
}
}
{
if ((fd = cupsTempFd(filename, sizeof(filename))) < 0)
{
- perror("ERROR: Unable to create temporary compressed print file");
+ _cupsLangPrintf(stderr,
+ _("ERROR: Unable to create temporary compressed print "
+ "file: %s\n"), strerror(errno));
exit(CUPS_BACKEND_FAILED);
}
if ((out = cupsFileOpenFd(fd, "w9")) == NULL)
{
- perror("ERROR: Unable to open temporary compressed print file");
+ _cupsLangPrintf(stderr,
+ _("ERROR: Unable to open temporary compressed print "
+ "file: %s\n"), strerror(errno));
exit(CUPS_BACKEND_FAILED);
}
if ((in = cupsFileOpen(files[i], "r")) == NULL)
{
- fprintf(stderr, "ERROR: Unable to open print file \"%s\": %s\n",
- files[i], strerror(errno));
+ _cupsLangPrintf(stderr,
+ _("ERROR: Unable to open print file \"%s\": %s\n"),
+ files[i], strerror(errno));
cupsFileClose(out);
exit(CUPS_BACKEND_FAILED);
}
while ((bytes = cupsFileRead(in, buffer, sizeof(buffer))) > 0)
if (cupsFileWrite(out, buffer, bytes) < bytes)
{
- fprintf(stderr, "ERROR: Unable to write " CUPS_LLFMT " bytes to \"%s\": %s\n",
- CUPS_LLCAST bytes, filename, strerror(errno));
+ _cupsLangPrintf(stderr,
+ _("ERROR: Unable to write %d bytes to \"%s\": %s\n"),
+ (int)bytes, filename, strerror(errno));
cupsFileClose(in);
cupsFileClose(out);
exit(CUPS_BACKEND_FAILED);
{
(void)prompt;
- if (password)
+ /*
+ * Remember that we need to authenticate...
+ */
+
+ auth_info_required = "username,password";
+
+ if (password && *password && password_tries < 3)
+ {
+ password_tries ++;
+
return (password);
+ }
else
{
/*
- * If there is no password set in the device URI, return the
- * "authentication required" exit code...
+ * Give up after 3 tries or if we don't have a password to begin with...
*/
- if (tmpfilename[0])
- unlink(tmpfilename);
+ return (NULL);
+ }
+}
-#ifdef __APPLE__
- if (pstmpname[0])
- unlink(pstmpname);
-#endif /* __APPLE__ */
- exit(CUPS_BACKEND_AUTH_REQUIRED);
+/*
+ * 'report_attr()' - Report an IPP attribute value.
+ */
+
+static void
+report_attr(ipp_attribute_t *attr) /* I - Attribute */
+{
+ int i; /* Looping var */
+ char value[1024], /* Value string */
+ *valptr, /* Pointer into value string */
+ *attrptr; /* Pointer into attribute value */
+
+
+ /*
+ * Convert the attribute values into quoted strings...
+ */
+
+ for (i = 0, valptr = value;
+ i < attr->num_values && valptr < (value + sizeof(value) - 10);
+ i ++)
+ {
+ if (i > 0)
+ *valptr++ = ',';
+
+ switch (attr->value_tag)
+ {
+ case IPP_TAG_INTEGER :
+ case IPP_TAG_ENUM :
+ snprintf(valptr, sizeof(value) - (valptr - value), "%d",
+ attr->values[i].integer);
+ valptr += strlen(valptr);
+ break;
+
+ case IPP_TAG_TEXT :
+ case IPP_TAG_NAME :
+ case IPP_TAG_KEYWORD :
+ *valptr++ = '\"';
+ for (attrptr = attr->values[i].string.text;
+ *attrptr && valptr < (value + sizeof(value) - 10);
+ attrptr ++)
+ {
+ if (*attrptr == '\\' || *attrptr == '\"')
+ *valptr++ = '\\';
+
+ *valptr++ = *attrptr;
+ }
+ *valptr++ = '\"';
+ break;
+
+ default :
+ /*
+ * Unsupported value type...
+ */
+
+ return;
+ }
}
+
+ *valptr = '\0';
+
+ /*
+ * Tell the scheduler about the new values...
+ */
+
+ fprintf(stderr, "ATTR: %s=%s\n", attr->name, value);
}
*/
static int /* O - Number of reasons shown */
-report_printer_state(ipp_t *ipp) /* I - IPP response */
+report_printer_state(ipp_t *ipp, /* I - IPP response */
+ int job_id) /* I - Current job ID */
{
int i; /* Looping var */
int count; /* Count of reasons shown... */
- ipp_attribute_t *reasons; /* printer-state-reasons */
+ ipp_attribute_t *psm, /* printer-state-message */
+ *reasons, /* printer-state-reasons */
+ *marker; /* marker-* attributes */
const char *reason; /* Current reason */
- const char *message; /* Message to show */
- char unknown[1024]; /* Unknown message string */
const char *prefix; /* Prefix for STATE: line */
char state[1024]; /* State string */
+ if ((psm = ippFindAttribute(ipp, "printer-state-message",
+ IPP_TAG_TEXT)) != NULL)
+ fprintf(stderr, "INFO: %s\n", psm->values[0].string.text);
+
if ((reasons = ippFindAttribute(ipp, "printer-state-reasons",
IPP_TAG_KEYWORD)) == NULL)
return (0);
{
reason = reasons->values[i].string.text;
- strlcat(state, prefix, sizeof(state));
- strlcat(state, reason, sizeof(state));
-
- prefix = ",";
- message = NULL;
-
- if (!strncmp(reason, "media-needed", 12))
- message = "Media tray needs to be filled.";
- else if (!strncmp(reason, "media-jam", 9))
- message = "Media jam!";
- else if (!strncmp(reason, "moving-to-paused", 16) ||
- !strncmp(reason, "paused", 6) ||
- !strncmp(reason, "shutdown", 8))
- message = "Printer off-line.";
- else if (!strncmp(reason, "toner-low", 9))
- message = "Toner low.";
- else if (!strncmp(reason, "toner-empty", 11))
- message = "Out of toner!";
- else if (!strncmp(reason, "cover-open", 10))
- message = "Cover open.";
- else if (!strncmp(reason, "interlock-open", 14))
- message = "Interlock open.";
- else if (!strncmp(reason, "door-open", 9))
- message = "Door open.";
- else if (!strncmp(reason, "input-tray-missing", 18))
- message = "Media tray missing!";
- else if (!strncmp(reason, "media-low", 9))
- message = "Media tray almost empty.";
- else if (!strncmp(reason, "media-empty", 11))
- message = "Media tray empty!";
- else if (!strncmp(reason, "output-tray-missing", 19))
- message = "Output tray missing!";
- else if (!strncmp(reason, "output-area-almost-full", 23))
- message = "Output bin almost full.";
- else if (!strncmp(reason, "output-area-full", 16))
- message = "Output bin full!";
- else if (!strncmp(reason, "marker-supply-low", 17))
- message = "Ink/toner almost empty.";
- else if (!strncmp(reason, "marker-supply-empty", 19))
- message = "Ink/toner empty!";
- else if (!strncmp(reason, "marker-waste-almost-full", 24))
- message = "Ink/toner waste bin almost full.";
- else if (!strncmp(reason, "marker-waste-full", 17))
- message = "Ink/toner waste bin full!";
- else if (!strncmp(reason, "fuser-over-temp", 15))
- message = "Fuser temperature high!";
- else if (!strncmp(reason, "fuser-under-temp", 16))
- message = "Fuser temperature low!";
- else if (!strncmp(reason, "opc-near-eol", 12))
- message = "OPC almost at end-of-life.";
- else if (!strncmp(reason, "opc-life-over", 13))
- message = "OPC at end-of-life!";
- else if (!strncmp(reason, "developer-low", 13))
- message = "Developer almost empty.";
- else if (!strncmp(reason, "developer-empty", 15))
- message = "Developer empty!";
- else if (strstr(reason, "error") != NULL)
+ if (strcmp(reason, "paused") &&
+ strcmp(reason, "com.apple.print.recoverable-warning"))
{
- message = unknown;
+ strlcat(state, prefix, sizeof(state));
+ strlcat(state, reason, sizeof(state));
- snprintf(unknown, sizeof(unknown), "Unknown printer error (%s)!",
- reason);
- }
-
- if (message)
- {
- count ++;
- if (strstr(reasons->values[i].string.text, "error"))
- fprintf(stderr, "ERROR: %s\n", message);
- else if (strstr(reasons->values[i].string.text, "warning"))
- fprintf(stderr, "WARNING: %s\n", message);
- else
- fprintf(stderr, "INFO: %s\n", message);
+ prefix = ",";
}
}
- fprintf(stderr, "%s\n", state);
+ if (state[0])
+ fprintf(stderr, "%s\n", state);
+
+ /*
+ * Relay the current marker-* attribute values...
+ */
+
+ if ((marker = ippFindAttribute(ipp, "marker-colors", IPP_TAG_NAME)) != NULL)
+ report_attr(marker);
+ if ((marker = ippFindAttribute(ipp, "marker-high-levels",
+ IPP_TAG_INTEGER)) != NULL)
+ report_attr(marker);
+ if ((marker = ippFindAttribute(ipp, "marker-levels",
+ IPP_TAG_INTEGER)) != NULL)
+ report_attr(marker);
+ if ((marker = ippFindAttribute(ipp, "marker-low-levels",
+ IPP_TAG_INTEGER)) != NULL)
+ report_attr(marker);
+ if ((marker = ippFindAttribute(ipp, "marker-message", IPP_TAG_TEXT)) != NULL)
+ report_attr(marker);
+ if ((marker = ippFindAttribute(ipp, "marker-names", IPP_TAG_NAME)) != NULL)
+ report_attr(marker);
+ if ((marker = ippFindAttribute(ipp, "marker-types", IPP_TAG_KEYWORD)) != NULL)
+ report_attr(marker);
return (count);
}
printer = getenv("PRINTER");
if (!printer)
{
- fputs("ERROR: PRINTER environment variable not defined!\n", stderr);
+ _cupsLangPuts(stderr,
+ _("ERROR: PRINTER environment variable not defined\n"));
return (-1);
}
if ((ppdfile = cupsGetPPD(printer)) == NULL)
{
- fprintf(stderr, "ERROR: Unable to get PPD file for printer \"%s\" - %s.\n",
- printer, ippErrorString(cupsLastError()));
- /*return (-1);*/
+ _cupsLangPrintf(stderr,
+ _("ERROR: Unable to get PPD file for printer \"%s\" - "
+ "%s.\n"), printer, cupsLastErrorString());
}
else
{
if ((fd = cupsTempFd(pstmpname, sizeof(pstmpname))) < 0)
{
- fprintf(stderr, "ERROR: Unable to create temporary file - %s.\n",
- strerror(errno));
+ _cupsLangPrintError(_("ERROR: Unable to create temporary file"));
if (ppdfile)
unlink(ppdfile);
return (-1);
* file...
*/
- close(1);
- dup(fd);
+ dup2(fd, 1);
close(fd);
if (!getuid())
* Change to an unpriviledged user...
*/
- setgid(fileinfo.st_gid);
- setuid(fileinfo.st_uid);
+ if (setgid(fileinfo.st_gid))
+ return (errno);
+
+ if (setuid(fileinfo.st_uid))
+ return (errno);
}
execlp("pictwpstops", printer, argv[1], argv[2], argv[3], argv[4], argv[5],
filename, NULL);
- perror("ERROR: Unable to exec pictwpstops");
+ _cupsLangPrintf(stderr, _("ERROR: Unable to exec pictwpstops: %s\n"),
+ strerror(errno));
return (errno);
}
* Error!
*/
- perror("ERROR: Unable to fork pictwpstops");
- unlink(filename);
+ _cupsLangPrintf(stderr, _("ERROR: Unable to fork pictwpstops: %s\n"),
+ strerror(errno));
if (ppdfile)
unlink(ppdfile);
return (-1);
if (wait(&status) < 0)
{
- perror("ERROR: Unable to wait for pictwpstops");
+ _cupsLangPrintf(stderr, _("ERROR: Unable to wait for pictwpstops: %s\n"),
+ strerror(errno));
close(fd);
- unlink(filename);
if (ppdfile)
unlink(ppdfile);
return (-1);
if (status)
{
if (status >= 256)
- fprintf(stderr, "ERROR: pictwpstops exited with status %d!\n",
- status / 256);
+ _cupsLangPrintf(stderr, _("ERROR: pictwpstops exited with status %d\n"),
+ status / 256);
else
- fprintf(stderr, "ERROR: pictwpstops exited on signal %d!\n",
- status);
+ _cupsLangPrintf(stderr, _("ERROR: pictwpstops exited on signal %d\n"),
+ status);
- unlink(filename);
return (status);
}
/*
- * End of "$Id$".
+ * End of "$Id: ipp.c 7948 2008-09-17 00:04:12Z mike $".
*/
projects / thirdparty / cups.git / blobdiff