/*
- * "$Id: ipp.c 6687 2007-07-18 19:49:45Z mike $"
+ * "$Id: ipp.c 6911 2007-09-04 20:35:08Z mike $"
*
* IPP backend for the Common UNIX Printing System (CUPS).
*
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 int report_printer_state(ipp_t *ipp, int job_id);
#ifdef __APPLE__
static int run_pictwps_filter(char **argv, const char *filename);
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 num_files; /* Number of files to print */
char **files, /* Files to print */
*filename; /* Pointer to single filename */
}
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);
}
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);
}
* Get the name...
*/
- for (ptr = name; *optptr && *optptr != '=';)
- if (ptr < (name + sizeof(name) - 1))
- *ptr++ = *optptr++;
- *ptr = '\0';
+ name = optptr;
- if (*optptr == '=')
+ while (*optptr && *optptr != '=' && *optptr != '+' && *optptr != '&')
+ optptr ++;
+
+ if ((sep = *optptr) != '\0')
+ *optptr++ = '\0';
+
+ 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);
}
}
}
* 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 (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);
}
}
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)
{
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 (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);
{
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;)
{
{
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...
* 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);
/*
* Free memory...
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 */
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);
*/
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... */
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))
{
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));
}
}
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));
+ _cupsLangPrintf(stderr, _("ERROR: Unable to fork pictwpstops: %s\n"),
+ strerror(errno));
unlink(filename);
if (ppdfile)
unlink(ppdfile);
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)
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 6687 2007-07-18 19:49:45Z mike $".
+ * End of "$Id: ipp.c 6911 2007-09-04 20:35:08Z mike $".
*/
projects / thirdparty / cups.git / blobdiff