[prev in list] [next in list] [prev in thread] [next in thread]
List: cups-commit
Subject: [cups.commit] [CUPS] r7084 - in branches/branch-1.3: . backend
From: cups-dev () easysw ! com
Date: 2007-11-30 3:37:11
Message-ID: 7188-cups.commit () news ! easysw ! com
[Download RAW message or body]
Author: mike
Date: 2007-11-29 19:37:11 -0800 (Thu, 29 Nov 2007)
New Revision: 7084
Log:
Mirror changes from trunk.
Modified:
branches/branch-1.3/CHANGES.txt
branches/branch-1.3/backend/usb-unix.c
branches/branch-1.3/berkeley/lpc.c
branches/branch-1.3/cups/adminutil.c
branches/branch-1.3/cups/string.c
branches/branch-1.3/scheduler/classes.c
branches/branch-1.3/scheduler/printers.c
Modified: branches/branch-1.3/CHANGES.txt
===================================================================
--- branches/branch-1.3/CHANGES.txt 2007-11-30 03:02:53 UTC (rev 7083)
+++ branches/branch-1.3/CHANGES.txt 2007-11-30 03:37:11 UTC (rev 7084)
@@ -1,8 +1,19 @@
-CHANGES.txt - 2007-11-26
+CHANGES.txt - 2007-11-29
------------------------
CHANGES IN CUPS V1.3.5
+ - Printers with untranslated JCL options were not exported to
+ Samba correctly (STR #2570)
+ - The USB backend did not work with some Minolta USB printers
+ (STR #2604)
+ - The strcasecmp() emulation code did not compile (STR #2612)
+ - The scheduler would crash if a job was sent to an empty
+ class (STR #2605)
+ - The lpc command did not work in non-UTF-8 locales (STR
+ #2595)
+ - Subscriptions for printer-stopped events also received
+ other state changes (STR #2572)
- cupstestppd incorrectly reported translation errors for
the "en" locale.
- ppdOpen() did not handle custom options properly when the
Modified: branches/branch-1.3/backend/usb-unix.c
===================================================================
--- branches/branch-1.3/backend/usb-unix.c 2007-11-30 03:02:53 UTC (rev 7083)
+++ branches/branch-1.3/backend/usb-unix.c 2007-11-30 03:37:11 UTC (rev 7084)
@@ -90,8 +90,8 @@
use_bc = strcasecmp(hostname, "Brother") &&
strcasecmp(hostname, "Canon") &&
- strcasecmp(hostname, "Konica Minolta") &&
- strcasecmp(hostname, "Minolta");
+ strncasecmp(hostname, "Konica", 6) &&
+ strncasecmp(hostname, "Minolta", 7);
#endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */
if ((device_fd = open_device(uri, &use_bc)) == -1)
Modified: branches/branch-1.3/berkeley/lpc.c
===================================================================
--- branches/branch-1.3/berkeley/lpc.c 2007-11-30 03:02:53 UTC (rev 7083)
+++ branches/branch-1.3/berkeley/lpc.c 2007-11-30 03:37:11 UTC (rev 7084)
@@ -230,7 +230,6 @@
ipp_t *request, /* IPP Request */
*response; /* IPP Response */
ipp_attribute_t *attr; /* Current attribute */
- cups_lang_t *language; /* Default language */
char *printer, /* Printer name */
*device, /* Device URI */
*delimiter; /* Char search result */
@@ -263,19 +262,8 @@
* attributes-natural-language
*/
- request = ippNew();
+ request = ippNewRequest(CUPS_GET_PRINTERS);
- request->request.op.operation_id = CUPS_GET_PRINTERS;
- request->request.op.request_id = 1;
-
- language = cupsLangDefault();
-
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
- "attributes-charset", NULL, cupsLangEncoding(language));
-
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
- "attributes-natural-language", NULL, language->language);
-
ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
"requested-attributes", sizeof(requested) / sizeof(requested[0]),
NULL, requested);
Modified: branches/branch-1.3/cups/adminutil.c
===================================================================
--- branches/branch-1.3/cups/adminutil.c 2007-11-30 03:02:53 UTC (rev 7083)
+++ branches/branch-1.3/cups/adminutil.c 2007-11-30 03:37:11 UTC (rev 7084)
@@ -291,7 +291,7 @@
return (NULL);
}
- if (sscanf(line, "*%40s%*[ \t]%40[^/]", option, choice) != 2)
+ if (sscanf(line, "*%40s%*[ \t]%40[^:/]", option, choice) != 2)
{
snprintf(line, sizeof(line),
_cupsLangString(language,
Modified: branches/branch-1.3/cups/string.c
===================================================================
--- branches/branch-1.3/cups/string.c 2007-11-30 03:02:53 UTC (rev 7083)
+++ branches/branch-1.3/cups/string.c 2007-11-30 03:37:11 UTC (rev 7084)
@@ -613,7 +613,7 @@
#ifndef HAVE_STRNCASECMP
int /* O - Result of comparison (-1, 0, or 1) */
_cups_strncasecmp(const char *s, /* I - First string */
- vconst char *t, /* I - Second string */
+ const char *t, /* I - Second string */
size_t n) /* I - Maximum number of characters to compare */
{
while (*s != '\0' && *t != '\0' && n > 0)
Modified: branches/branch-1.3/scheduler/classes.c
===================================================================
--- branches/branch-1.3/scheduler/classes.c 2007-11-30 03:02:53 UTC (rev 7083)
+++ branches/branch-1.3/scheduler/classes.c 2007-11-30 03:37:11 UTC (rev 7084)
@@ -256,6 +256,9 @@
return (NULL);
}
+ if (c->num_printers == 0)
+ return (NULL);
+
/*
* Make sure that the last printer is also a valid index into the printer
* array. If not, reset the last printer to 0...
Modified: branches/branch-1.3/scheduler/printers.c
===================================================================
--- branches/branch-1.3/scheduler/printers.c 2007-11-30 03:02:53 UTC (rev 7083)
+++ branches/branch-1.3/scheduler/printers.c 2007-11-30 03:37:11 UTC (rev 7084)
@@ -2631,7 +2631,8 @@
if (old_state != s)
{
- cupsdAddEvent(CUPSD_EVENT_PRINTER_STATE_CHANGED, p, NULL,
+ cupsdAddEvent(s == IPP_PRINTER_STOPPED ? CUPSD_EVENT_PRINTER_STOPPED :
+ CUPSD_EVENT_PRINTER_STATE_CHANGED, p, NULL,
"%s \"%s\" state changed.",
(p->type & CUPS_PRINTER_CLASS) ? "Class" : "Printer",
p->name);
_______________________________________________
cups-commit mailing list
cups-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/cups-commit
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic