/*
- * "$Id: ipp.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: ipp.c 7583 2008-05-16 17:47:16Z mike $"
*
* IPP backend for the Common UNIX Printing System (CUPS).
*
- * Copyright 2007 by Apple Inc.
+ * Copyright 2007-2008 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
* 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/i18n.h>
-#include <cups/string.h>
-#include <signal.h>
#include <sys/wait.h>
/*
*/
static char *password = NULL; /* Password for device URI */
+static int password_tries = 0; /* Password tries */
#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);
int send_options; /* Send job options? */
int num_options; /* Number of printer options */
cups_option_t *options; /* Printer options */
+ const char *device_uri; /* Device URI */
char method[255], /* Method 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 */
int num_files; /* Number of files to print */
char **files, /* Files to print */
*filename; /* Pointer to single filename */
ipp_attribute_t *printer_accepting; /* printer-is-accepting-jobs */
int copies, /* Number of copies for job */
copies_remaining; /* Number of copies remaining */
- const char *content_type; /* CONTENT_TYPE environment variable */
+ 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 */
{ /* Printer attributes we want */
"copies-supported",
"document-format-supported",
+ "marker-colors",
+ "marker-levels",
+ "marker-message",
+ "marker-names",
+ "marker-types",
"printer-is-accepting-jobs",
"printer-state",
"printer-state-message",
}
else if (argc < 6)
{
- fprintf(stderr, _("Usage: %s job-id user title copies options [file]\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 (!strncmp(content_type, "printer/", 8))
- content_type = "application/vnd.cups-raw";
+ 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),
+ if ((device_uri = cupsBackendDeviceURI(argv)) == NULL)
+ return (CUPS_BACKEND_FAILED);
+
+ if (httpSeparateURI(HTTP_URI_CODING_ALL, device_uri,
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);
+ _cupsLangPuts(stderr,
+ _("ERROR: Missing device URI on command-line and no "
+ "DEVICE_URI environment variable!\n"));
return (CUPS_BACKEND_STOP);
}
+ if (!port)
+ port = IPP_PORT; /* Default to port 631 */
+
if (!strcmp(method, "https"))
cupsSetEncryption(HTTP_ENCRYPT_ALWAYS);
else
* 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,
+ _cupsLangPrintf(stderr,
_("ERROR: Unknown encryption option value \"%s\"!\n"),
value);
}
version = 1;
else
{
- fprintf(stderr,
+ _cupsLangPrintf(stderr,
_("ERROR: Unknown version option value \"%s\"!\n"),
value);
}
* 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);
}
}
}
cups_file_t *fp; /* Temporary file */
char buffer[8192]; /* Buffer for copying */
int bytes; /* Number of bytes read */
+ off_t tbytes; /* Total bytes copied */
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)
{
- perror("ERROR: unable to open temporary file");
+ _cupsLangPrintError(_("ERROR: Unable to open temporary file"));
close(fd);
unlink(tmpfilename);
return (CUPS_BACKEND_FAILED);
}
+ tbytes = 0;
+
while ((bytes = fread(buffer, 1, sizeof(buffer), stdin)) > 0)
if (cupsFileWrite(fp, buffer, bytes) < bytes)
{
- perror("ERROR: unable to write to temporary file");
+ _cupsLangPrintError(_("ERROR: Unable to write to temporary file"));
cupsFileClose(fp);
unlink(tmpfilename);
return (CUPS_BACKEND_FAILED);
}
+ else
+ tbytes += bytes;
cupsFileClose(fp);
/*
- * Point to the single file from stdin...
+ * Don't try printing files less than 2 bytes...
*/
- filename = tmpfilename;
- files = &filename;
- num_files = 1;
+ if (tbytes <= 1)
+ {
+ _cupsLangPuts(stderr, _("ERROR: Empty print file!\n"));
+ unlink(tmpfilename);
+ return (CUPS_BACKEND_FAILED);
+ }
+
+ /*
+ * Point to the single file from stdin...
+ */
+ 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;
-
- send_options = strncasecmp(content_type, "application/vnd.cups-", 21) != 0;
+ num_files = argc - 6;
+ files = argv + 6;
+ send_options = 1;
#ifdef HAVE_LIBZ
if (compression)
* Try loading authentication information from the environment.
*/
- if ((ptr = getenv("AUTH_USERNAME")) != NULL)
+ const char *ptr = getenv("AUTH_USERNAME");
+
+ if (ptr)
cupsSetUser(ptr);
password = getenv("AUTH_PASSWORD");
do
{
- fprintf(stderr, _("INFO: Connecting to %s on port %d...\n"),
- hostname, port);
+ _cupsLangPrintf(stderr, _("INFO: Connecting to %s on port %d...\n"),
+ hostname, port);
if ((http = httpConnectEncrypt(hostname, port, cupsEncryption())) == NULL)
{
* available printer in the class.
*/
- fputs(_("INFO: Unable to contact printer, queuing on next "
- "printer in class...\n"), stderr);
+ _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 (contimeout && (time(NULL) - start_time) > contimeout)
{
- fputs(_("ERROR: Printer not responding!\n"), stderr);
+ _cupsLangPuts(stderr, _("ERROR: Printer not responding!\n"));
return (CUPS_BACKEND_FAILED);
}
recoverable = 1;
- fprintf(stderr,
- _("WARNING: recoverable: Network host \'%s\' is busy; will "
- "retry in %d seconds...\n"),
- hostname, delay);
+ _cupsLangPrintf(stderr,
+ _("WARNING: recoverable: Network host \'%s\' is busy; "
+ "will retry in %d seconds...\n"),
+ hostname, delay);
sleep(delay);
}
else if (h_errno)
{
- fprintf(stderr, _("ERROR: Unable to locate printer \'%s\'!\n"),
- hostname);
+ _cupsLangPrintf(stderr, _("ERROR: Unable to locate printer \'%s\'!\n"),
+ hostname);
return (CUPS_BACKEND_STOP);
}
else
recoverable = 1;
fprintf(stderr, "DEBUG: Connection error: %s\n", strerror(errno));
- fputs(_("ERROR: recoverable: Unable to connect to printer; will "
- "retry in 30 seconds...\n"), stderr);
+ _cupsLangPuts(stderr,
+ _("ERROR: recoverable: Unable to connect to printer; will "
+ "retry in 30 seconds...\n"));
sleep(30);
}
if (job_cancelled)
{
- if (argc == 6 || strcmp(filename, argv[6]))
- unlink(filename);
+ if (tmpfilename[0])
+ unlink(tmpfilename);
return (CUPS_BACKEND_FAILED);
}
fputs("STATE: -connecting-to-device\n", stderr);
- fprintf(stderr, _("INFO: Connected to %s...\n"), hostname);
+ _cupsLangPrintf(stderr, _("INFO: Connected to %s...\n"), hostname);
#ifdef AF_INET6
if (http->hostaddr->addr.sa_family == AF_INET6)
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)
+ {
+ if (backendSNMPSupplies(snmp_fd, http->hostaddr, &start_count, NULL))
+ {
+ /*
+ * No, close it...
+ */
+
+ _cupsSNMPClose(snmp_fd);
+ snmp_fd = -1;
+ }
+ }
+ else
+ start_count = 0;
+
/*
* Build a URI for the printer and fill the standard IPP attributes for
* an IPP_PRINT_FILE request. We can't use the URI in argv[0] because it
do
{
+ /*
+ * Check for side-channel requests...
+ */
+
+ backendCheckSideChannel(snmp_fd, http->hostaddr);
+
/*
* Build the IPP request...
*/
{
if (contimeout && (time(NULL) - start_time) > contimeout)
{
- fputs(_("ERROR: Printer not responding!\n"), stderr);
+ _cupsLangPuts(stderr, _("ERROR: Printer not responding!\n"));
return (CUPS_BACKEND_FAILED);
}
recoverable = 1;
- fprintf(stderr,
- _("WARNING: recoverable: Network host \'%s\' is busy; will "
- "retry in %d seconds...\n"),
- hostname, delay);
+ _cupsLangPrintf(stderr,
+ _("WARNING: recoverable: Network host \'%s\' is busy; "
+ "will retry in %d seconds...\n"),
+ hostname, delay);
- report_printer_state(supported);
+ report_printer_state(supported, 0);
sleep(delay);
* Switch to IPP/1.0...
*/
- fputs(_("INFO: Printer does not support IPP/1.1, trying IPP/1.0...\n"),
- stderr);
+ _cupsLangPuts(stderr,
+ _("INFO: Printer does not support IPP/1.1, trying "
+ "IPP/1.0...\n"));
version = 0;
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);
}
else
{
- fprintf(stderr, _("ERROR: Unable to get printer status (%s)!\n"),
- cupsLastErrorString());
+ _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.
*/
- fputs(_("INFO: Unable to contact printer, queuing on next "
- "printer in class...\n"), stderr);
+ _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...
while (copies_remaining > 0)
{
+ /*
+ * Check for side-channel requests...
+ */
+
+ backendCheckSideChannel(snmp_fd, http->hostaddr);
+
/*
* Build the IPP request...
*/
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;
- copies_remaining = 1;
- send_options = 0;
+ 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)
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
- "document-format", NULL, content_type);
+ "document-format", NULL, final_content_type);
}
if (copies_sup && version > 0 && send_options)
if (ipp_status == IPP_SERVICE_UNAVAILABLE ||
ipp_status == IPP_PRINTER_BUSY)
{
- fputs(_("INFO: Printer busy; will retry in 10 seconds...\n"), stderr);
+ _cupsLangPuts(stderr,
+ _("INFO: Printer busy; will retry in 10 seconds...\n"));
sleep(10);
}
else if ((ipp_status == IPP_BAD_REQUEST ||
* Switch to IPP/1.0...
*/
- fputs(_("INFO: Printer does not support IPP/1.1, trying IPP/1.0...\n"),
- stderr);
+ _cupsLangPuts(stderr,
+ _("INFO: Printer does not support IPP/1.1, trying "
+ "IPP/1.0...\n"));
version = 0;
httpReconnect(http);
}
else
- fprintf(stderr, _("ERROR: Print file was not accepted (%s)!\n"),
- cupsLastErrorString());
+ _cupsLangPrintf(stderr, _("ERROR: Print file was not accepted (%s)!\n"),
+ cupsLastErrorString());
}
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 ++)
{
+ /*
+ * Check for side-channel requests...
+ */
+
+ backendCheckSideChannel(snmp_fd, http->hostaddr);
+
+ /*
+ * Send the next file in the job...
+ */
+
request = ippNewRequest(IPP_SEND_DOCUMENT);
request->request.op.version[1] = version;
{
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 (!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...
*/
{
ippDelete(response);
- fprintf(stderr, _("ERROR: Unable to get job %d attributes (%s)!\n"),
- job_id, cupsLastErrorString());
+ _cupsLangPrintf(stderr,
+ _("ERROR: Unable to get job %d attributes (%s)!\n"),
+ job_id, cupsLastErrorString());
break;
}
}
* 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 (snmp_fd >= 0 &&
+ !backendSNMPSupplies(snmp_fd, http->hostaddr, &page_count, NULL) &&
+ page_count > start_count)
+ fprintf(stderr, "PAGE: total %d\n", page_count - start_count);
/*
* Free memory...
* Return the queue status...
*/
- return (ipp_status > IPP_OK_CONFLICT ? CUPS_BACKEND_FAILED : CUPS_BACKEND_OK);
+ if (ipp_status == IPP_NOT_AUTHORIZED)
+ {
+ /*
+ * Authorization failures here mean that we need Kerberos. Username +
+ * password authentication is handled in the password_cb function.
+ */
+
+ fputs("ATTR: auth-info-required=negotiate\n", stderr);
+ return (CUPS_BACKEND_AUTH_REQUIRED);
+ }
+ else if (ipp_status > IPP_OK_CONFLICT)
+ return (CUPS_BACKEND_FAILED);
+ else
+ return (CUPS_BACKEND_OK);
}
ipp_t *request; /* Cancel-Job request */
- fputs(_("INFO: Canceling print job...\n"), stderr);
+ _cupsLangPuts(stderr, _("INFO: Canceling print job...\n"));
request = ippNewRequest(IPP_CANCEL_JOB);
request->request.op.version[1] = version;
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"
};
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)
{
- fprintf(stderr,
- _("ERROR: Unable to create temporary compressed print file: "
- "%s\n"),
- strerror(errno));
+ _cupsLangPrintf(stderr,
+ _("ERROR: Unable to create temporary compressed print "
+ "file: %s\n"), strerror(errno));
exit(CUPS_BACKEND_FAILED);
}
if ((out = cupsFileOpenFd(fd, "w9")) == NULL)
{
- fprintf(stderr,
- _("ERROR: Unable to open temporary compressed print file: %s\n"),
- strerror(errno));
+ _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 %d bytes to \"%s\": %s\n"),
- (int)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)
+ if (password && *password && password_tries < 3)
+ {
+ password_tries ++;
+
return (password);
+ }
else
{
/*
}
+/*
+ * '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);
+}
+
+
/*
* 'report_printer_state()' - Report the printer state.
*/
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 *psm, /* pritner-state-message */
- *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 */
+ cups_lang_t *language; /* Current localization */
if ((psm = ippFindAttribute(ipp, "printer-state-message",
state[0] = '\0';
prefix = "STATE: ";
+ language = cupsLangDefault();
for (i = 0, count = 0; i < reasons->num_values; i ++)
{
reason = reasons->values[i].string.text;
- strlcat(state, prefix, sizeof(state));
- strlcat(state, reason, sizeof(state));
+ if (job_id == 0 || strcmp(reason, "paused"))
+ {
+ strlcat(state, prefix, sizeof(state));
+ strlcat(state, reason, sizeof(state));
+
+ prefix = ",";
+ }
- prefix = ",";
message = "";
if (!strncmp(reason, "media-needed", 12))
else if (!strncmp(reason, "moving-to-paused", 16) ||
!strncmp(reason, "paused", 6) ||
!strncmp(reason, "shutdown", 8))
- message = _("Printer off-line.");
+ message = _("Printer offline.");
else if (!strncmp(reason, "toner-low", 9))
message = _("Toner low.");
else if (!strncmp(reason, "toner-empty", 11))
reason);
}
- if (message)
+ if (message[0])
{
count ++;
if (strstr(reasons->values[i].string.text, "error"))
- fprintf(stderr, "ERROR: %s\n", message);
+ fprintf(stderr, "ERROR: %s\n", _cupsLangString(language, message));
else if (strstr(reasons->values[i].string.text, "warning"))
- fprintf(stderr, "WARNING: %s\n", message);
+ fprintf(stderr, "WARNING: %s\n", _cupsLangString(language, message));
else
- fprintf(stderr, "INFO: %s\n", message);
+ fprintf(stderr, "INFO: %s\n", _cupsLangString(language, message));
}
}
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-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, cupsLastErrorString());
+ _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));
+ _cupsLangPrintf(stderr, _("ERROR: Unable to create temporary file - %s.\n"),
+ strerror(errno));
if (ppdfile)
unlink(ppdfile);
return (-1);
execlp("pictwpstops", printer, argv[1], argv[2], argv[3], argv[4], argv[5],
filename, NULL);
- fprintf(stderr, _("ERROR: Unable to exec pictwpstops: %s\n"),
- strerror(errno));
+ _cupsLangPrintf(stderr, _("ERROR: Unable to exec pictwpstops: %s\n"),
+ strerror(errno));
return (errno);
}
* Error!
*/
- fprintf(stderr, _("ERROR: Unable to fork pictwpstops: %s\n"),
- strerror(errno));
- unlink(filename);
+ _cupsLangPrintf(stderr, _("ERROR: Unable to fork pictwpstops: %s\n"),
+ strerror(errno));
if (ppdfile)
unlink(ppdfile);
return (-1);
if (wait(&status) < 0)
{
- fprintf(stderr, _("ERROR: Unable to wait for pictwpstops: %s\n"),
- strerror(errno));
+ _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: ipp.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: ipp.c 7583 2008-05-16 17:47:16Z mike $".
*/
projects / thirdparty / cups.git / blobdiff