Version: 1.5-current CUPS.org User: ozancaglayan

When the Accept-Language HTTP header is set to Turkish, CUPS web interface is unable to substitute the templates (device_uri and title for example) which includes the "iI" characters because of locale-dependent case conversion mechanism.

So the case conversions should be done as a locale independent manner to avoid these kind of issues.

See http://www.mattryall.net/blog/2009/02/the-infamous-turkish-locale-bug for a quick explanation of the problem in general.

CUPS.org User: ozancaglayan

The attached patch is tested and works correctly but it seems that there are a lot of other places in CUPS which are still using strcasecmp() and and strncasecmp().

CUPS.org User: mike

Given the scope of the changes required and the limited time remaining for 1.4.x bugs, I am moving this to CUPS 1.5.

Ultimately it looks like we need to provide "safe" implementations of toupper, tolower, strncasecmp, and strcasecmp. We'll also need to do some performance testing/tuning to make sure those implementations do not cause a regression...

CUPS.org User: mike

Fixed in Subversion repository.

"strcasecmp.patch":

Index: cups-1.4.6/cups/string.h

--- cups-1.4.6.orig/cups/string.h +++ cups-1.4.6/cups/string.h @@ -127,11 +127,40 @@ _cups_isupper(int ch) /* I - Character { return (ch >= 'A' && ch <= 'Z'); } + +_CUPS_INLINE int +_cups_tolower(int ch) +{

return (_cups_isupper(ch) ? ch - 'A' + 'a' : ch); +} + +_CUPS_INLINE int +_cups_strcasecmp(const char *s1,
const char *s2) +{
int c1, c2; +
if (s1 == NULL || s2 == NULL)
return 0; +
while (s1 && s2)
{
c1 = _cups_tolower(*s1);
c2 = _cups_tolower(*s2);
if (c1 != c2)
return (c1 - c2);
s1++; s2++;
} +
return ((int) _s1) - ((int) *s2); +}
else

extern int _cups_isalnum(int ch); extern int _cups_isalpha(int ch); extern int _cups_isspace(int ch); extern int _cups_isupper(int ch); +extern int _cups_tolower(int ch); +extern int _cups_strcasecmp(int ch);

endif /_ _CUPS_INLINE */

Index: cups-1.4.6/cgi-bin/var.c

--- cups-1.4.6.orig/cgi-bin/var.c +++ cups-1.4.6/cgi-bin/var.c @@ -608,7 +608,7 @@ cgi_compare_variables( const _cgi_var_t v1, / I - First variable _/ const _cgi_vart *v2) / I - Second variable */ {

return (strcasecmp(v1->name, v2->name));
return (_cups_strcasecmp(v1->name, v2->name)); }

"strcasecmp_v2.patch":

Index: cups-1.4.6/cups/string.h

--- cups-1.4.6.orig/cups/string.h +++ cups-1.4.6/cups/string.h @@ -127,11 +127,18 @@ _cups_isupper(int ch) /* I - Character { return (ch >= 'A' && ch <= 'Z'); } + +_CUPSINLINE int /* O - Converted character / +_cupstolower(int ch) / I - Character to convert */ +{

return (_cups_isupper(ch) ? ch - 'A' + 'a' : ch); +}
else

extern int _cups_isalnum(int ch); extern int _cups_isalpha(int ch); extern int _cups_isspace(int ch); extern int _cups_isupper(int ch); +extern int _cups_tolower(int ch);

endif /* _CUPS_INLINE */

@@ -146,8 +153,8 @@ extern char __cups_strdup(const char *);

define strdup _cups_strdup

endif /_ !HAVE_STRDUP */

-# ifndef HAVE_STRCASECMP extern int _cupsstrcasecmp(const char , const char *); +# ifndef HAVE_STRCASECMP

define strcasecmp _cups_strcasecmp

endif /_ !HAVE_STRCASECMP */

Index: cups-1.4.6/cgi-bin/var.c

return (strcasecmp(v1->name, v2->name));
return (_cups_strcasecmp(v1->name, v2->name)); }

Index: cups-1.4.6/cups/string.c

--- cups-1.4.6.orig/cups/string.c +++ cups-1.4.6/cups/string.c @@ -637,16 +637,15 @@ _cups_strdup(const char s) / I - Stri

'_cups_strcasecmp()' - Do a case-insensitive comparison. */

-#ifndef HAVESTRCASECMP int /* O - Result of comparison (-1, 0, or 1) / _cupsstrcasecmp(const char *s, / I - First string / const char *t) / I - Second string _/ { while (_s != '\0' && *t != '\0') {

if (tolower(_s & 255) < tolower(_t & 255))
if (_cups_tolower(_s & 255) < _cups_tolower(_t & 255)) return (-1);
else if (tolower(_s & 255) > tolower(_t & 255))
else if (_cups_tolower(_s & 255) > _cups_tolower(_t & 255)) return (1);

s ++; @@ -660,7 +659,6 @@ _cups_strcasecmp(const char s, / I - F else return (-1); } -#endif /* !HAVE_STRCASECMP */

/*
- '_cups_strncasecmp()' - Do a case-insensitive comparison on up to N chars.

"str3800.patch":

Index: notifier/mailto.c

--- notifier/mailto.c (revision 9791) +++ notifier/mailto.c (working copy) @@ -453,21 +453,21 @@ return (0); }

if (!strcasecmp(line, "Cc"))
if (!_cups_strcasecmp(line, "Cc")) strlcpy(mailtoCc, value, sizeof(mailtoCc));
else if (!strcasecmp(line, "From"))
else if (!_cups_strcasecmp(line, "From")) strlcpy(mailtoFrom, value, sizeof(mailtoFrom));
else if (!strcasecmp(line, "Sendmail"))
else if (!_cups_strcasecmp(line, "Sendmail")) { strlcpy(mailtoSendmail, value, sizeof(mailtoSendmail)); mailtoSMTPServer[0] = '\0'; }
else if (!strcasecmp(line, "SMTPServer"))
else if (!_cups_strcasecmp(line, "SMTPServer")) { mailtoSendmail[0] = '\0'; strlcpy(mailtoSMTPServer, value, sizeof(mailtoSMTPServer)); }
else if (!strcasecmp(line, "Subject"))
else if (!_cups_strcasecmp(line, "Subject")) strlcpy(mailtoSubject, value, sizeof(mailtoSubject)); else {

Index: backend/usb-libusb.c

--- backend/usb-libusb.c (revision 9791) +++ backend/usb-libusb.c (working copy) @@ -558,9 +558,9 @@

if (mfg) {
if (!strcasecmp(mfg, "Hewlett-Packard"))
if (!_cups_strcasecmp(mfg, "Hewlett-Packard")) mfg = "HP";
else if (!strcasecmp(mfg, "Lexmark International"))
else if (!_cups_strcasecmp(mfg, "Lexmark International")) mfg = "Lexmark"; } else

Index: backend/usb-unix.c

--- backend/usb-unix.c (revision 9791) +++ backend/usb-unix.c (working copy) @@ -96,10 +96,10 @@
- a read request... */
use_bc = strcasecmp(hostname, "Brother") &&
strcasecmp(hostname, "Canon") &&
strncasecmp(hostname, "Konica", 6) &&
strncasecmp(hostname, "Minolta", 7);
use_bc = _cups_strcasecmp(hostname, "Brother") &&
_cups_strcasecmp(hostname, "Canon") &&
_cups_strncasecmp(hostname, "Konica", 6) &&
```
      _cups_strncasecmp(hostname, "Minolta", 7);
```
endif /* FreeBSD || NetBSD || OpenBSD || DragonFly */

if ((device_fd = open_device(uri, &use_bc)) == -1)

Index: backend/usb-darwin.c

--- backend/usb-darwin.c (revision 9791) +++ backend/usb-darwin.c (working copy) @@ -1859,24 +1859,24 @@
- Process the option... */
if (!strcasecmp(name, "waiteof"))
if (!_cups_strcasecmp(name, "waiteof")) {
if (!strcasecmp(value, "on") ||
!strcasecmp(value, "yes") ||
!strcasecmp(value, "true"))
if (!_cups_strcasecmp(value, "on") ||
!_cups_strcasecmp(value, "yes") ||
!_cups_strcasecmp(value, "true")) *wait_eof = true;
else if (!strcasecmp(value, "off") ||
!strcasecmp(value, "no") ||
!strcasecmp(value, "false"))
else if (!_cups_strcasecmp(value, "off") ||
!_cups_strcasecmp(value, "no") ||
!_cups_strcasecmp(value, "false")) *wait_eof = false; else cupsLangPrintFilter(stderr, "WARNING", ("Boolean expected for waiteof option \"%s\"."), value); }
else if (!strcasecmp(name, "serial"))
else if (!_cups_strcasecmp(name, "serial")) strlcpy(serial, value, serial_size);
else if (!strcasecmp(name, "location") && location)
else if (!_cups_strcasecmp(name, "location") && location) location = strtol(value, NULL, 16); } } @@ -2175,9 +2175,9 @@ pCommentEnd += 3; / Skip past "]%%" / *pCommentEnd = '\0'; / There's always room for the nul */

if (strncasecmp(pCommentBegin, "%%[ Error:", 10) == 0)

if (_cups_strncasecmp(pCommentBegin, "%%[ Error:", 10) == 0) logLevel = "DEBUG";
else if (strncasecmp(pCommentBegin, "%%[ Flushing", 12) == 0)
```
else if (_cups_strncasecmp(pCommentBegin, "%%[ Flushing", 12) == 0)
```
logLevel = "DEBUG"; else logLevel = "INFO";

Index: backend/dnssd.c

--- backend/dnssd.c (revision 9791) +++ backend/dnssd.c (working copy) @@ -235,7 +235,7 @@ kDNSServiceInterfaceIndexLocalOnly, "_printer._tcp", NULL, browse_local_callback, devices);
pdl_datastream_ref = main_ref;
pdl_datastream_ref = main_ref; DNSServiceBrowse(&pdl_datastream_ref, kDNSServiceFlagsShareConnection, 0, "_pdl-datastream._tcp", NULL, browse_callback, devices);

@@ -325,8 +325,8 @@

       if (!best)
    best = device;

else if (strcasecmp(best->name, device->name) ||
strcasecmp(best->domain, device->domain))
else if (_cups_strcasecmp(best->name, device->name) ||
_cups_strcasecmp(best->domain, device->domain)) { unquote(uriName, best->fullName, sizeof(uriName));

@@ -573,12 +573,12 @@ for (device = cupsArrayFind(devices, &key); device; device = cupsArrayNext(devices))

if (strcasecmp(device->name, key.name))
if (_cups_strcasecmp(device->name, key.name)) break; else if (device->type == key.type) {
if (!strcasecmp(device->domain, "local.") &&
strcasecmp(device->domain, replyDomain))
if (!_cups_strcasecmp(device->domain, "local.") &&
_cups_strcasecmp(device->domain, replyDomain)) { / \ Update the .local listing to use the "global" domain name instead. @@ -696,8 +696,8 @@ device; device = cupsArrayNext(devices)) {
if (strcasecmp(device->name, dkey.name) ||
strcasecmp(device->domain, dkey.domain))
if (_cups_strcasecmp(device->name, dkey.name) ||
```
 _cups_strcasecmp(device->domain, dkey.domain))
```
{ device = NULL; break; @@ -758,7 +758,7 @@ else continue;
```
 if (!strncasecmp(key, "usb_", 4))
```
```
 if (!_cups_strncasecmp(key, "usb_", 4))
```
{ /*
- Add USB device ID information... @@ -769,12 +769,12 @@ key + 4, value); }

 if (!strcasecmp(key, "usb_MFG") || !strcasecmp(key, "usb_MANU") ||

!strcasecmp(key, "usb_MANUFACTURER"))
if (!_cups_strcasecmp(key, "usb_MFG") || !_cups_strcasecmp(key, "usb_MANU") ||
!_cups_strcasecmp(key, "usb_MANUFACTURER")) strcpy(make_and_model, value);
else if (!strcasecmp(key, "usb_MDL") || !strcasecmp(key, "usb_MODEL"))
else if (!_cups_strcasecmp(key, "usb_MDL") || !_cups_strcasecmp(key, "usb_MODEL")) strcpy(model, value);
else if (!strcasecmp(key, "product") && !strstr(value, "Ghostscript"))
else if (!_cups_strcasecmp(key, "product") && !strstr(value, "Ghostscript")) { if (value[0] == '(') { @@ -790,18 +790,18 @@ else strcpy(model, value); }
else if (!strcasecmp(key, "ty"))
else if (!_cups_strcasecmp(key, "ty")) { strcpy(model, value);

if ((ptr = strchr(model, ',')) != NULL) *ptr = '\0'; }
else if (!strcasecmp(key, "priority"))
else if (!_cups_strcasecmp(key, "priority")) device->priority = atoi(value); else if ((device->type == CUPS_DEVICE_IPP || device->type == CUPS_DEVICE_PRINTER) &&
!strcasecmp(key, "printer-type"))
!_cups_strcasecmp(key, "printer-type")) { /*
- This is a CUPS printer! @@ -822,9 +822,9 @@ if (make_and_model[0]) snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;", make_and_model, model);
else if (!strncasecmp(model, "designjet ", 10))
else if (!_cups_strncasecmp(model, "designjet ", 10)) snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s", model + 10);
else if (!strncasecmp(model, "stylus ", 7))
else if (!_cups_strncasecmp(model, "stylus ", 7)) snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s", model + 7); else if ((ptr = strchr(model, ' ')) != NULL) { Index: backend/snmp.c

--- backend/snmp.c (revision 9791) +++ backend/snmp.c (working copy) @@ -467,7 +467,7 @@ compare_cache(snmp_cache_t a, / I - First cache entry _/ snmp_cachet *b) / I - Second cache entry */ {
return (strcasecmp(a->addrname, b->addrname));
return (_cups_strcasecmp(a->addrname, b->addrname)); }

@@ -509,7 +509,7 @@

that printer driver detection works better... */
if (!strncasecmp(old_make_model, "Hewlett-Packard", 15))
if (!_cups_strncasecmp(old_make_model, "Hewlett-Packard", 15)) { /*
- Strip leading Hewlett-Packard and hp prefixes and replace @@ -521,7 +521,7 @@ while (isspace(*mmptr & 255)) mmptr ++;
if (!strncasecmp(mmptr, "hp", 2))
if (!_cups_strncasecmp(mmptr, "hp", 2)) { mmptr += 2;

@@ -534,11 +534,11 @@ make_model[2] = ' '; strlcpy(make_model + 3, mmptr, make_model_size - 3); }

else if (!strncasecmp(old_make_model, "deskjet", 7))
else if (!_cups_strncasecmp(old_make_model, "deskjet", 7)) snprintf(make_model, make_model_size, "HP DeskJet%s", old_make_model + 7);
else if (!strncasecmp(old_make_model, "officejet", 9))
else if (!_cups_strncasecmp(old_make_model, "officejet", 9)) snprintf(make_model, make_model_size, "HP OfficeJet%s", old_make_model + 9);
else if (!strncasecmp(old_make_model, "styluspro", 11))
else if (!_cups_strncasecmp(old_make_model, "styluspro", 11)) snprintf(make_model, make_model_size, "EPSON Stylus Pro %s", old_make_model + 11); else @@ -844,16 +844,16 @@ if (!value) fprintf(stderr, "ERROR: Missing value on line %d of %s!\n", linenum, filename);
else if (!strcasecmp(line, "Address"))
else if (!_cups_strcasecmp(line, "Address")) { if (!address) add_array(Addresses, value); }
else if (!strcasecmp(line, "Community"))
else if (!_cups_strcasecmp(line, "Community")) add_array(Communities, value);
else if (!strcasecmp(line, "DebugLevel"))
else if (!_cups_strcasecmp(line, "DebugLevel")) DebugLevel = atoi(value);
else if (!strcasecmp(line, "DeviceURI"))
else if (!_cups_strcasecmp(line, "DeviceURI")) { if (*value != '\"') fprintf(stderr, @@ -862,12 +862,12 @@ else add_device_uri(value); }
else if (!strcasecmp(line, "HostNameLookups"))
HostNameLookups = !strcasecmp(value, "on") ||
!strcasecmp(value, "yes") ||
!strcasecmp(value, "true") ||
!strcasecmp(value, "double");
else if (!strcasecmp(line, "MaxRunTime"))
else if (!_cups_strcasecmp(line, "HostNameLookups"))
HostNameLookups = !_cups_strcasecmp(value, "on") ||
!_cups_strcasecmp(value, "yes") ||
!_cups_strcasecmp(value, "true") ||
!_cups_strcasecmp(value, "double");
```
else if (!_cups_strcasecmp(line, "MaxRunTime"))
MaxRunTime = atoi(value);
```
else fprintf(stderr, "ERROR: Unknown directive %s on line %d of %s!\n",

Index: backend/lpd.c

--- backend/lpd.c (revision 9791) +++ backend/lpd.c (working copy) @@ -297,16 +297,16 @@
- Process the option... */
```
if (!strcasecmp(name, "banner"))
```
```
if (!_cups_strcasecmp(name, "banner"))
```
{ / * Set the banner... /

 banner = !value[0] || !strcasecmp(value, "on") ||

!strcasecmp(value, "yes") || !strcasecmp(value, "true");
banner = !value[0] || !_cups_strcasecmp(value, "on") ||
!_cups_strcasecmp(value, "yes") || !_cups_strcasecmp(value, "true"); }
else if (!strcasecmp(name, "format") && value[0])
else if (!_cupsstrcasecmp(name, "format") && value[0]) { / \ Set output format... @@ -319,68 +319,68 @@ ("Unknown format character: \"%c\"."), value[0]); }
else if (!strcasecmp(name, "mode") && value[0])

else if (!_cups_strcasecmp(name, "mode") && value[0])

{ / * Set control/data order... /

```
 if (!strcasecmp(value, "standard"))
```
if (!_cups_strcasecmp(value, "standard")) mode = MODE_STANDARD;
else if (!strcasecmp(value, "stream"))
else if (!_cups_strcasecmp(value, "stream")) mode = MODE_STREAM; else cupsLangPrintFilter(stderr, "ERROR", ("Unknown print mode: \"%s\"."), value); }
else if (!strcasecmp(name, "order") && value[0])

else if (!_cups_strcasecmp(name, "order") && value[0])

{ / * Set control/data order... /

 if (!strcasecmp(value, "control,data"))

if (!_cups_strcasecmp(value, "control,data")) order = ORDER_CONTROL_DATA;
else if (!strcasecmp(value, "data,control"))
else if (!_cups_strcasecmp(value, "data,control")) order = ORDER_DATA_CONTROL; else cupsLangPrintFilter(stderr, "ERROR", ("Unknown file order: \"%s\"."), value); }
else if (!strcasecmp(name, "reserve"))

else if (!_cups_strcasecmp(name, "reserve"))

{ / * Set port reservation mode... /

 if (!value[0] || !strcasecmp(value, "on") ||

!strcasecmp(value, "yes") || !strcasecmp(value, "true") ||
!strcasecmp(value, "rfc1179"))
if (!value[0] || !_cups_strcasecmp(value, "on") ||
!_cups_strcasecmp(value, "yes") || !_cups_strcasecmp(value, "true") ||
!_cups_strcasecmp(value, "rfc1179")) reserve = RESERVE_RFC1179;
else if (!strcasecmp(value, "any"))
else if (!_cups_strcasecmp(value, "any")) reserve = RESERVE_ANY; else reserve = RESERVE_NONE; }
else if (!strcasecmp(name, "manual_copies"))

else if (!_cups_strcasecmp(name, "manual_copies"))

{ / * Set manual copies... /

 manual_copies = !value[0] || !strcasecmp(value, "on") ||

!strcasecmp(value, "yes") || !strcasecmp(value, "true");
manual_copies = !value[0] || !_cups_strcasecmp(value, "on") ||
!_cups_strcasecmp(value, "yes") || !_cups_strcasecmp(value, "true"); }
else if (!strcasecmp(name, "sanitize_title"))

else if (!_cups_strcasecmp(name, "sanitize_title"))

{ / * Set sanitize title... /

 sanitize_title = !value[0] || !strcasecmp(value, "on") ||

!strcasecmp(value, "yes") || !strcasecmp(value, "true");
sanitize_title = !value[0] || !_cups_strcasecmp(value, "on") ||
!_cups_strcasecmp(value, "yes") || !_cups_strcasecmp(value, "true"); }
else if (!strcasecmp(name, "timeout"))
else if (!_cups_strcasecmp(name, "timeout")) { / \ Set the timeout... @@ -389,7 +389,7 @@ if (atoi(value) > 0) timeout = atoi(value); }
else if (!strcasecmp(name, "contimeout"))
```
else if (!_cups_strcasecmp(name, "contimeout"))
```
{ / \ Set the connection timeout...

Index: backend/serial.c

--- backend/serial.c (revision 9791) +++ backend/serial.c (working copy) @@ -318,7 +318,7 @@
- Process the option... */
```
if (!strcasecmp(name, "baud"))
```
if (!_cups_strcasecmp(name, "baud")) { / \ Set the baud rate... @@ -381,7 +381,7 @@ }
endif /* B19200 == 19200 */

}
else if (!strcasecmp(name, "bits"))
else if (!_cups_strcasecmp(name, "bits")) { / \ Set number of data bits... @@ -402,25 +402,25 @@ break; } }
else if (!strcasecmp(name, "parity"))

else if (!_cups_strcasecmp(name, "parity"))

{ /*

Set parity checking... */

if (!strcasecmp(value, "even"))
if (!_cups_strcasecmp(value, "even")) { opts.c_cflag |= PARENB; opts.c_cflag &= ~PARODD; }
else if (!strcasecmp(value, "odd"))
else if (!_cups_strcasecmp(value, "odd")) { opts.c_cflag |= PARENB; opts.c_cflag |= PARODD; }
else if (!strcasecmp(value, "none"))
else if (!_cups_strcasecmp(value, "none")) opts.c_cflag &= ~PARENB;
else if (!strcasecmp(value, "space"))
else if (!_cups_strcasecmp(value, "space")) { /*
- Note: we only support space parity with 7 bits per character... @@ -430,7 +430,7 @@ opts.c_cflag |= CS8; opts.c_cflag &= ~PARENB; }
else if (!strcasecmp(value, "mark"))
else if (!_cups_strcasecmp(value, "mark")) { /*
- Note: we only support mark parity with 7 bits per character @@ -443,29 +443,29 @@ opts.c_cflag |= CSTOPB; } }
else if (!strcasecmp(name, "flow"))

else if (!_cups_strcasecmp(name, "flow"))

{ /*

Set flow control... */

if (!strcasecmp(value, "none"))
if (!_cups_strcasecmp(value, "none")) { opts.c_iflag &= ~(IXON | IXOFF); opts.c_cflag &= ~CRTSCTS; }
else if (!strcasecmp(value, "soft"))
else if (!_cups_strcasecmp(value, "soft")) { opts.c_iflag |= IXON | IXOFF; opts.c_cflag &= ~CRTSCTS; }
else if (!strcasecmp(value, "hard") ||
!strcasecmp(value, "rtscts"))
else if (!_cups_strcasecmp(value, "hard") ||
!_cups_strcasecmp(value, "rtscts")) { opts.c_iflag &= ~(IXON | IXOFF); opts.c_cflag |= CRTSCTS; }
else if (!strcasecmp(value, "dtrdsr"))
else if (!_cups_strcasecmp(value, "dtrdsr")) { opts.c_iflag &= ~(IXON | IXOFF); opts.c_cflag &= ~CRTSCTS; @@ -473,7 +473,7 @@ dtrdsr = 1; } }
else if (!strcasecmp(name, "stop"))
```
else if (!_cups_strcasecmp(name, "stop"))
```
{ switch (atoi(value)) {

Index: backend/snmp-supplies.c

--- backend/snmp-supplies.c (revision 9791) +++ backend/snmp-supplies.c (working copy) @@ -471,7 +471,7 @@

if ((ppd = ppdOpenFile(getenv("PPD"))) == NULL || ((ppdattr = ppdFindAttr(ppd, "cupsSNMPSupplies", NULL)) != NULL &&
ppdattr->value && strcasecmp(ppdattr->value, "true")))
ppdattr->value && _cups_strcasecmp(ppdattr->value, "true"))) { ppdClose(ppd); return; Index: backend/ieee1284.c

--- backend/ieee1284.c (revision 9791) +++ backend/ieee1284.c (working copy) @@ -3,7 +3,7 @@ *
- IEEE-1284 support functions for CUPS.
* Copyright 2007-2010 by Apple Inc.
- Copyright 2007-2011 by Apple Inc.
- Copyright 1997-2007 by Easy Software Products, all rights reserved.
- These coded instructions, statements, and computer programs are the @@ -304,9 +304,9 @@
if (mfg) {
if (!strcasecmp(mfg, "Hewlett-Packard"))
if (!_cups_strcasecmp(mfg, "Hewlett-Packard")) mfg = "HP";
else if (!strcasecmp(mfg, "Lexmark International"))

else if (!_cups_strcasecmp(mfg, "Lexmark International"))
mfg = "Lexmark";

} else @@ -322,7 +322,7 @@ if (!mdl) mdl = "";

if (!strncasecmp(mdl, mfg, strlen(mfg)))
if (!_cups_strncasecmp(mdl, mfg, strlen(mfg))) { mdl += strlen(mfg);

@@ -397,7 +397,7 @@ if ((mfg = cupsGetOption("MANUFACTURER", num_values, values)) == NULL) mfg = cupsGetOption("MFG", num_values, values);

if (!mfg || !strncasecmp(mdl, mfg, strlen(mfg)))
if (!mfg || !_cups_strncasecmp(mdl, mfg, strlen(mfg))) { /*
- Just copy the model string, since it has the manufacturer... Index: backend/ipp.c
  
  --- backend/ipp.c (revision 9791) +++ backend/ipp.c (working copy) @@ -452,39 +452,39 @@
- Process the option... */
```
if (!strcasecmp(name, "waitjob"))
```
```
if (!_cups_strcasecmp(name, "waitjob"))
```
{ / * Wait for job completion? /
```
 waitjob = !strcasecmp(value, "on") ||
```
!strcasecmp(value, "yes") ||
!strcasecmp(value, "true");
waitjob = !_cups_strcasecmp(value, "on") ||
!_cups_strcasecmp(value, "yes") ||
!_cups_strcasecmp(value, "true"); }
else if (!strcasecmp(name, "waitprinter"))

else if (!_cups_strcasecmp(name, "waitprinter"))

{ / * Wait for printer idle? /

 waitprinter = !strcasecmp(value, "on") ||

!strcasecmp(value, "yes") ||
!strcasecmp(value, "true");
waitprinter = !_cups_strcasecmp(value, "on") ||
!_cups_strcasecmp(value, "yes") ||
!_cups_strcasecmp(value, "true"); }
else if (!strcasecmp(name, "encryption"))

else if (!_cups_strcasecmp(name, "encryption"))

{ / * Enable/disable encryption? /

```
 if (!strcasecmp(value, "always"))
```
if (!_cups_strcasecmp(value, "always")) cupsSetEncryption(HTTP_ENCRYPT_ALWAYS);
else if (!strcasecmp(value, "required"))
else if (!_cups_strcasecmp(value, "required")) cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);
else if (!strcasecmp(value, "never"))
else if (!_cups_strcasecmp(value, "never")) cupsSetEncryption(HTTP_ENCRYPT_NEVER);
else if (!strcasecmp(value, "ifrequested"))
else if (!_cups_strcasecmp(value, "ifrequested")) cupsSetEncryption(HTTP_ENCRYPT_IF_REQUESTED); else { @@ -493,7 +493,7 @@ value); } }
else if (!strcasecmp(name, "version"))
else if (!_cups_strcasecmp(name, "version")) { if (!strcmp(value, "1.0")) version = 10; @@ -513,14 +513,14 @@ } }
ifdef HAVE_LIBZ
else if (!strcasecmp(name, "compression"))
else if (!_cups_strcasecmp(name, "compression")) {
if (!strcasecmp(value, "true") || !strcasecmp(value, "yes") ||
!strcasecmp(value, "on") || !strcasecmp(value, "gzip"))
if (!_cups_strcasecmp(value, "true") || !_cups_strcasecmp(value, "yes") ||
!_cups_strcasecmp(value, "on") || !_cups_strcasecmp(value, "gzip")) compression = "gzip"; }
endif /* HAVE_LIBZ */
else if (!strcasecmp(name, "contimeout"))
else if (!_cups_strcasecmp(name, "contimeout")) { / \ Set the connection timeout... @@ -551,9 +551,9 @@ if (argc == 6) { num_files = 0;
send_options = !strcasecmp(final_content_type, "application/pdf") ||
!strcasecmp(final_content_type, "application/vnd.cups-pdf") ||
!strncasecmp(final_content_type, "image/", 6);
send_options = !_cups_strcasecmp(final_content_type, "application/pdf") ||
!_cups_strcasecmp(final_content_type, "application/vnd.cups-pdf") ||
```
            !_cups_strncasecmp(final_content_type, "image/", 6);
```
fputs("DEBUG: Sending stdin for job...\n", stderr); } @@ -925,7 +925,7 @@ else if (!printer_accepting) update_reasons(NULL, "+cups-ipp-conformance-failure-report," "cups-ipp-missing-printer-is-accepting-jobs");
+ if ((printer_state = ippFindAttribute(supported, "printer-state-reasons", IPP_TAG_KEYWORD)) != NULL && !busy) @@ -1149,7 +1149,7 @@ if (format_sup != NULL) { for (i = 0; i < format_sup->num_values; i ++)
if (!strcasecmp(final_content_type, format_sup->values[i].string.text))
if (!_cups_strcasecmp(final_content_type, format_sup->values[i].string.text)) { document_format = final_content_type; break; @@ -1158,7 +1158,7 @@ if (!document_format) { for (i = 0; i < format_sup->num_values; i ++)
if (!strcasecmp("application/octet-stream",
if (!_cups_strcasecmp("application/octet-stream", format_sup->values[i].string.text)) { document_format = "application/octet-stream"; @@ -2225,7 +2225,7 @@ else if ((keyword = cupsGetOption("ColorModel", num_options, options)) != NULL) {
if (!strcasecmp(keyword, "Gray"))
if (!_cups_strcasecmp(keyword, "Gray")) ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "output-mode", NULL, "monochrome"); else @@ -2240,13 +2240,13 @@ else if ((keyword = cupsGetOption("cupsPrintQuality", num_options, options)) != NULL) {
if (!strcasecmp(keyword, "draft"))
if (!_cups_strcasecmp(keyword, "draft")) ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_ENUM, "print-quality", IPP_QUALITY_DRAFT);
else if (!strcasecmp(keyword, "normal"))
else if (!_cups_strcasecmp(keyword, "normal")) ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_ENUM, "print-quality", IPP_QUALITY_NORMAL);
else if (!strcasecmp(keyword, "high"))
else if (!_cups_strcasecmp(keyword, "high")) ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_ENUM, "print-quality", IPP_QUALITY_HIGH); } @@ -2258,13 +2258,13 @@ (keyword = cupsGetOption(pc->sides_option, num_options, options)) != NULL) {
if (!strcasecmp(keyword, pc->sides_1sided))
if (!_cups_strcasecmp(keyword, pc->sides_1sided)) ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "sides", NULL, "one-sided");
else if (!strcasecmp(keyword, pc->sides_2sided_long))
else if (!_cups_strcasecmp(keyword, pc->sides_2sided_long)) ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "sides", NULL, "two-sided-long-edge");
if (!strcasecmp(keyword, pc->sides_2sided_short))
if (!_cups_strcasecmp(keyword, pc->sides_2sided_short)) ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "sides", NULL, "two-sided-short-edge"); } @@ -2272,7 +2272,7 @@ if (doc_handling_sup && (keyword = cupsGetOption("collate", num_options, options)) != NULL) {
if (!strcasecmp(keyword, "true"))
```
 if (!_cups_strcasecmp(keyword, "true"))
```
collate_str = "separate-documents-collated-copies"; else collate_str = "separate-documents-uncollated-copies"; @@ -2496,7 +2496,7 @@

if ((ppd = ppdOpenFile(getenv("PPD"))) != NULL && (ppdattr = ppdFindAttr(ppd, "cupsIPPSupplies", NULL)) != NULL &&
ppdattr->value && strcasecmp(ppdattr->value, "true"))
```
 ppdattr->value && _cups_strcasecmp(ppdattr->value, "true"))
```
ipp_supplies = 0; else ipp_supplies = 1;

Index: backend/socket.c

--- backend/socket.c (revision 9791) +++ backend/socket.c (working copy) @@ -237,16 +237,16 @@
- Process the option... */
```
if (!strcasecmp(name, "waiteof"))
```
```
if (!_cups_strcasecmp(name, "waiteof"))
```
{ / * Set the wait-for-eof value... /

 waiteof = !value[0] || !strcasecmp(value, "on") ||

!strcasecmp(value, "yes") || !strcasecmp(value, "true");
waiteof = !value[0] || !_cups_strcasecmp(value, "on") ||
!_cups_strcasecmp(value, "yes") || !_cups_strcasecmp(value, "true"); }
else if (!strcasecmp(name, "contimeout"))
```
else if (!_cups_strcasecmp(name, "contimeout"))
```
{ / \ Set the connection timeout...

Index: config-scripts/cups-common.m4

--- config-scripts/cups-common.m4 (revision 9791) +++ config-scripts/cups-common.m4 (working copy) @@ -153,7 +153,7 @@ AC_CHECK_FUNCS(statfs statvfs)

dnl Checks for string functions. -AC_CHECK_FUNCS(strdup strcasecmp strncasecmp strlcat strlcpy) +AC_CHECK_FUNCS(strdup strlcat strlcpy) if test "$uname" = "HP-UX" -a "$uversion" = "1020"; then echo Forcing snprintf emulation for HP-UX. else

Index: driver/commandtopclx.c

--- driver/commandtopclx.c (revision 9791) +++ driver/commandtopclx.c (working copy) @@ -3,7 +3,7 @@ *
- Advanced PCL command filter for CUPS.
* Copyright 2007-2010 by Apple Inc.
- Copyright 2007-2011 by Apple Inc.
- Copyright 1993-2005 by Easy Software Products.
- These coded instructions, statements, and computer programs are the @@ -123,7 +123,7 @@
- Parse the command... */
if (strncasecmp(lineptr, "Clean", 5) == 0 &&
if (_cups_strncasecmp(lineptr, "Clean", 5) == 0 && (ppd->model_number & PCL_INKJET)) { /* Index: driver/commandtoescpx.c

--- driver/commandtoescpx.c (revision 9791) +++ driver/commandtoescpx.c (working copy) @@ -3,7 +3,7 @@ *
- Advanced EPSON ESC/P command filter for CUPS.
* Copyright 2007-2010 by Apple Inc.
- Copyright 2007-2011 by Apple Inc.
- Copyright 1993-2005 by Easy Software Products.
- These coded instructions, statements, and computer programs are the @@ -136,7 +136,7 @@
- Parse the command... */
if (strncasecmp(lineptr, "Clean", 5) == 0)
if (_cups_strncasecmp(lineptr, "Clean", 5) == 0) { /*
- Clean heads... @@ -144,7 +144,7 @@
cupsWritePrintData("CH\002\000\000\000", 6); }
else if (strncasecmp(lineptr, "PrintAlignmentPage", 18) == 0)
else if (_cups_strncasecmp(lineptr, "PrintAlignmentPage", 18) == 0) { /*
- Print alignment page... @@ -159,7 +159,7 @@ putchar(phase >> 8); feedpage = 1; }
else if (strncasecmp(lineptr, "PrintSelfTestPage", 17) == 0)
else if (_cups_strncasecmp(lineptr, "PrintSelfTestPage", 17) == 0) { /*
- Print version info and nozzle check... @@ -169,7 +169,7 @@ cupsWritePrintData("NC\002\000\000\000", 6); feedpage = 1; }
else if (strncasecmp(lineptr, "ReportLevels", 12) == 0)
else if (_cups_strncasecmp(lineptr, "ReportLevels", 12) == 0) { /*
- Report ink levels... @@ -177,7 +177,7 @@
cupsWritePrintData("IQ\001\000\001", 5); }
else if (strncasecmp(lineptr, "SetAlignment", 12) == 0)
else if (_cups_strncasecmp(lineptr, "SetAlignment", 12) == 0) { /*
- Set head alignment... Index: cups/emit.c
  
  --- cups/emit.c (revision 9791) +++ cups/emit.c (working copy) @@ -3,7 +3,7 @@
- PPD code emission routines for CUPS. *
* Copyright 2007-2010 by Apple Inc.
- Copyright 2007-2011 by Apple Inc.
- Copyright 1997-2007 by Easy Software Products, all rights reserved.
- These coded instructions, statements, and computer programs are the @@ -417,7 +417,7 @@
if ((charset = ppdFindAttr(ppd, "cupsPJLCharset", NULL)) != NULL) {
if (!charset->value || strcasecmp(charset->value, "UTF-8"))
if (!charset->value || _cups_strcasecmp(charset->value, "UTF-8")) charset = NULL; }

@@ -654,7 +654,7 @@ { if (section == PPD_ORDER_JCL) {

if (!strcasecmp(choices[i]->choice, "Custom") &&
```
if (!_cups_strcasecmp(choices[i]->choice, "Custom") &&
```
(coption = ppdFindCustomOption(ppd, choices[i]->option->keyword)) != NULL) { @@ -690,16 +690,16 @@ { bufsize += 3; /* [{\n */

if ((!strcasecmp(choices[i]->option->keyword, "PageSize") ||

!strcasecmp(choices[i]->option->keyword, "PageRegion")) &&
!strcasecmp(choices[i]->choice, "Custom"))
if ((!_cups_strcasecmp(choices[i]->option->keyword, "PageSize") ||
!_cups_strcasecmp(choices[i]->option->keyword, "PageRegion")) &&

   !_cups_strcasecmp(choices[i]->choice, "Custom"))

{ DEBUG_puts("2ppdEmitString: Custom size set!");

bufsize += 37;         /* %%BeginFeature: *CustomPageSize True\n */
bufsize += 50;         /* Five 9-digit numbers + newline */

}

else if (!strcasecmp(choices[i]->choice, "Custom") &&

else if (!_cups_strcasecmp(choices[i]->choice, "Custom") &&
      (coption = ppdFindCustomOption(ppd,
                                choices[i]->option->keyword))
     != NULL)

@@ -707,7 +707,7 @@ bufsize += 23 + strlen(choices[i]->option->keyword) + 6; /* %%BeginFeature: Customkeyword True\n /

+ for (cparam = (ppd_cparam_t )cupsArrayFirst(coption->params); cparam; cparam = (ppd_cparam_t )cupsArrayNext(coption->params)) @@ -770,7 +770,7 @@ for (i = 0, bufptr = buffer; i < count; i ++, bufptr += strlen(bufptr)) if (section == PPD_ORDER_JCL) {
if (!strcasecmp(choices[i]->choice, "Custom") &&
```
if (!_cups_strcasecmp(choices[i]->choice, "Custom") &&
```
choices[i]->code && (coption = ppdFindCustomOption(ppd, choices[i]->option->keyword)) != NULL) @@ -871,9 +871,9 @@ DEBUG_printf(("2ppdEmitString: Adding code for %s=%s...", choices[i]->option->keyword, choices[i]->choice));

if ((!strcasecmp(choices[i]->option->keyword, "PageSize") ||

!strcasecmp(choices[i]->option->keyword, "PageRegion")) &&
!strcasecmp(choices[i]->choice, "Custom"))
if ((!_cups_strcasecmp(choices[i]->option->keyword, "PageSize") ||
!_cups_strcasecmp(choices[i]->option->keyword, "PageRegion")) &&
!_cups_strcasecmp(choices[i]->choice, "Custom")) { / \ Variable size; write out standard size options, using the @@ -986,7 +986,7 @@ bufptr += strlen(bufptr); } }
else if (!strcasecmp(choices[i]->choice, "Custom") &&

else if (!_cups_strcasecmp(choices[i]->choice, "Custom") &&
      (coption = ppdFindCustomOption(ppd, choices[i]->option->keyword))
     != NULL)

{ @@ -1161,9 +1161,9 @@ if (!rpr) rpr = ppdFindAttr(ppd, "RequiresPageRegion", "All");

if (!strcasecmp(size->name, "Custom") ||
if (!_cups_strcasecmp(size->name, "Custom") || (!manual_feed && !input_slot) ||
(manual_feed && !strcasecmp(manual_feed->choice, "False") &&

(manual_feed && !_cups_strcasecmp(manual_feed->choice, "False") &&
(!input_slot || (input_slot->code && !input_slot->code[0]))) ||

(!rpr && ppd->num_filters > 0)) { @@ -1173,7 +1173,7 @@

ppdMarkOption(ppd, "PageSize", size->name); }

else if (rpr && rpr->value && !strcasecmp(rpr->value, "True"))
else if (rpr && rpr->value && !_cups_strcasecmp(rpr->value, "True")) { /*
- Use PageRegion code... Index: cups/custom.c
  
  --- cups/custom.c (revision 9791) +++ cups/custom.c (working copy) @@ -78,7 +78,7 @@ for (param = (ppd_cparam_t )cupsArrayFirst(opt->params); param; param = (ppd_cparam_t )cupsArrayNext(opt->params))
if (!strcasecmp(param->name, name))
if (!_cups_strcasecmp(param->name, name)) break;

return (param);

Index: cups/pwg-media.c

--- cups/pwg-media.c (revision 9791) +++ cups/pwg-media.c (working copy) @@ -443,7 +443,7 @@ pwg = _pwgMediaForPPD(name); if (pwg && (suffix = name + strlen(name) - 10 /* .FullBleed */) > name &&
!strcasecmp(suffix, ".FullBleed"))
```
  !_cups_strcasecmp(suffix, ".FullBleed"))
```
{ / * Indicate that margins are set with the default values of 0. @@ -586,7 +586,7 @@ struct lconv loc; / Locale data / int custom; / Custom page size? /
if (!strncasecmp(ppd, "Custom.", 7))
if (!_cups_strncasecmp(ppd, "Custom.", 7)) { custom = 1; factor = 2540.0 / 72.0; @@ -608,34 +608,34 @@

if (ptr && (!*ptr ||
!strcasecmp(ptr, "FullBleed") ||
!strcasecmp(ptr, ".FullBleed") ||
!strcasecmp(ptr, "cm") ||
!strcasecmp(ptr, "cm.FullBleed") ||
!strcasecmp(ptr, "ft") ||
!strcasecmp(ptr, "ft.FullBleed") ||
!strcasecmp(ptr, "in") ||
!strcasecmp(ptr, "in.FullBleed") ||
!strcasecmp(ptr, "m") ||
!strcasecmp(ptr, "m.FullBleed") ||
!strcasecmp(ptr, "mm") ||
!strcasecmp(ptr, "mm.FullBleed") ||
!strcasecmp(ptr, "pt") ||
!strcasecmp(ptr, "pt.FullBleed")))
!_cups_strcasecmp(ptr, "FullBleed") ||
!_cups_strcasecmp(ptr, ".FullBleed") ||
!_cups_strcasecmp(ptr, "cm") ||
!_cups_strcasecmp(ptr, "cm.FullBleed") ||
!_cups_strcasecmp(ptr, "ft") ||
!_cups_strcasecmp(ptr, "ft.FullBleed") ||
!_cups_strcasecmp(ptr, "in") ||
!_cups_strcasecmp(ptr, "in.FullBleed") ||
!_cups_strcasecmp(ptr, "m") ||
!_cups_strcasecmp(ptr, "m.FullBleed") ||
!_cups_strcasecmp(ptr, "mm") ||
!_cups_strcasecmp(ptr, "mm.FullBleed") ||
!_cups_strcasecmp(ptr, "pt") ||

!_cups_strcasecmp(ptr, "pt.FullBleed")))

{ size = &(cg->pwg_media);

if (!strncasecmp(ptr, "cm", 2))
if (!_cups_strncasecmp(ptr, "cm", 2)) factor = 1000.0;
else if (!strncasecmp(ptr, "ft", 2))
else if (!_cups_strncasecmp(ptr, "ft", 2)) factor = 2540.0 * 12.0;
else if (!strncasecmp(ptr, "in", 2))
else if (!_cups_strncasecmp(ptr, "in", 2)) factor = 2540.0;
else if (!strncasecmp(ptr, "mm", 2))
else if (!_cups_strncasecmp(ptr, "mm", 2)) factor = 100.0; else if (ptr == 'm' || ptr == 'M') factor = 100000.0;
else if (!strncasecmp(ptr, "pt", 2))
else if (!_cups_strncasecmp(ptr, "pt", 2)) factor = 2540.0 / 72.0;
```
/*
```
Index: cups/testcups.c

--- cups/testcups.c (revision 9791) +++ cups/testcups.c (working copy) @@ -3,7 +3,7 @@ *
- CUPS API test program for CUPS.
* Copyright 2007-2010 by Apple Inc.
- Copyright 2007-2011 by Apple Inc.
- Copyright 2007 by Easy Software Products.
- These coded instructions, statements, and computer programs are the @@ -352,10 +352,10 @@ if (!a || !b) return (0);
if (strcasecmp(a->name, b->name) ||
if (_cups_strcasecmp(a->name, b->name) || (a->instance && !b->instance) || (!a->instance && b->instance) ||
(a->instance && strcasecmp(a->instance, b->instance)) ||
(a->instance && _cups_strcasecmp(a->instance, b->instance)) || a->num_options != b->num_options) return (0);

@@ -388,12 +388,12 @@ puts(" Item cupsGetDest cupsGetNamedDest"); puts(" -------------------- -------------------- --------------------");

if (strcasecmp(a->name, b->name))
if (_cups_strcasecmp(a->name, b->name)) printf(" name %-20.20s %-20.20s\n", a->name, b->name);

if ((a->instance && !b->instance) || (!a->instance && b->instance) ||
(a->instance && strcasecmp(a->instance, b->instance)))
(a->instance && _cups_strcasecmp(a->instance, b->instance))) printf(" instance %-20.20s %-20.20s\n", a->instance ? a->instance : "(null)", b->instance ? b->instance : "(null)"); Index: cups/util.c

--- cups/util.c (revision 9791) +++ cups/util.c (working copy) @@ -374,7 +374,7 @@ { for (attr = response->attrs; attr != NULL; attr = attr->next) if (attr->name != NULL &&
strcasecmp(attr->name, "printer-name") == 0 &&

   _cups_strcasecmp(attr->name, "printer-name") == 0 &&
 attr->value_tag == IPP_TAG_NAME)

{ if (n == 0) @@ -936,7 +936,7 @@ if (!cg->servername[0]) cupsServer();

if (!strcasecmp(cg->servername, "localhost"))
if (!_cupsstrcasecmp(cg->servername, "localhost")) { char ppdname[1024]; /* PPD filename / struct stat ppdinfo; /_ PPD file information */ @@ -1056,7 +1056,7 @@

DEBUG_printf(("2cupsGetPPD3: Local hostname=\"%s\"", localhost));
if (!strcasecmp(localhost, hostname))
if (!_cups_strcasecmp(localhost, hostname)) strcpy(hostname, "localhost");

/* @@ -1073,7 +1073,7 @@
- Reconnect to the correct server as needed... */
if (!strcasecmp(http_hostname, hostname) && port == http_port)
if (!_cups_strcasecmp(http_hostname, hostname) && port == http_port) http2 = http; else if ((http2 = httpConnectEncrypt(hostname, port, cupsEncryption())) == NULL) @@ -1215,7 +1215,7 @@ { for (attr = response->attrs; attr != NULL; attr = attr->next) if (attr->name != NULL &&
strcasecmp(attr->name, "printer-name") == 0 &&

   _cups_strcasecmp(attr->name, "printer-name") == 0 &&
 attr->value_tag == IPP_TAG_NAME)

{ if (n == 0) @@ -1725,7 +1725,7 @@ * Found a class! Connect to the right server... */

if (!strcasecmp(http_hostname, host) && *port == http_port)

if (!_cups_strcasecmp(http_hostname, host) && *port == http_port)
http2 = http;
else if ((http2 = httpConnectEncrypt(host, *port,
               cupsEncryption())) == NULL)

Index: cups/http.c

--- cups/http.c (revision 9791) +++ cups/http.c (working copy) @@ -1056,7 +1056,7 @@ if (!http) return (-1);

if (!strcasecmp(http->fields[HTTP_FIELD_TRANSFER_ENCODING], "chunked"))
if (!_cups_strcasecmp(http->fields[HTTP_FIELD_TRANSFER_ENCODING], "chunked")) { DEBUG_puts("4httpGetLength2: chunked request!");

@@ -2699,7 +2699,7 @@ * Be tolerants of servers that send unknown attribute fields... */

if (!strcasecmp(line, "expect"))
if (!_cups_strcasecmp(line, "expect")) { /*
- "Expect: 100-continue" or similar... @@ -2707,7 +2707,7 @@
http->expect = (http_status_t)atoi(value); }
else if (!strcasecmp(line, "cookie"))
else if (!_cups_strcasecmp(line, "cookie")) { /*
- "Cookie: name=value[; name=value ...]" - replaces previous cookies... @@ -3364,7 +3364,7 @@
for (i = 0; i < HTTP_FIELD_MAX; i ++)
if (strcasecmp(name, http_fields[i]) == 0)
if (_cups_strcasecmp(name, http_fields[i]) == 0) return ((http_field_t)i);

return (HTTP_FIELD_UNKNOWN);

Index: cups/testi18n.c

--- cups/testi18n.c (revision 9791) +++ cups/testi18n.c (working copy) @@ -171,7 +171,7 @@ for (i = 0, encoding = CUPS_AUTO_ENCODING; i < (int)(sizeof(lang_encodings) / sizeof(lang_encodings[0])); i ++)
if (!strcasecmp(lang_encodings[i], argv[2]))
if (!_cups_strcasecmp(lang_encodings[i], argv[2])) { encoding = (cups_encoding_t)i; break; Index: cups/language.c

--- cups/language.c (revision 9791) +++ cups/language.c (working copy) @@ -668,7 +668,7 @@ for (i = 0; i < (int)(sizeof(locale_encodings) / sizeof(locale_encodings[0])); i ++)
if (!strcasecmp(charset, locale_encodings[i]))
```
if (!_cups_strcasecmp(charset, locale_encodings[i]))
```
{ encoding = (cups_encoding_t)i; break; @@ -680,14 +680,14 @@
- Map alternate names for various character sets... */

if (!strcasecmp(charset, "iso-2022-jp") ||

!strcasecmp(charset, "sjis"))
if (!_cups_strcasecmp(charset, "iso-2022-jp") ||
!_cups_strcasecmp(charset, "sjis")) encoding = CUPS_WINDOWS_932;
else if (!strcasecmp(charset, "iso-2022-cn"))
else if (!_cups_strcasecmp(charset, "iso-2022-cn")) encoding = CUPS_WINDOWS_936;
else if (!strcasecmp(charset, "iso-2022-kr"))
else if (!_cups_strcasecmp(charset, "iso-2022-kr")) encoding = CUPS_WINDOWS_949;
else if (!strcasecmp(charset, "big5"))
else if (!_cups_strcasecmp(charset, "big5")) encoding = CUPS_WINDOWS_950; } } Index: cups/http-addrlist.c

--- cups/http-addrlist.c (revision 9791) +++ cups/http-addrlist.c (working copy) @@ -124,9 +124,9 @@ val = 1;

ifdef WIN32

setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (const char )&val,
sizeof(val));
sizeof(val));
else
setsockopt(*sock, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val));
setsockopt(_sock, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val));

endif /_ WIN32 */

ifdef FD_CLOEXEC

@@ -278,7 +278,7 @@ } else

endif /* AF_LOCAL */
if (!hostname || strcasecmp(hostname, "localhost"))
if (!hostname || _cups_strcasecmp(hostname, "localhost")) {
ifdef HAVE_GETADDRINFO

struct addrinfo hints, /* Address lookup hints */ @@ -515,7 +515,7 @@
- Detect some common errors and handle them sanely... */
if (!addr && (!hostname || !strcasecmp(hostname, "localhost")))
if (!addr && (!hostname || !_cups_strcasecmp(hostname, "localhost"))) { struct servent port; / Port number for service / int portnum; / Port number */ @@ -547,7 +547,7 @@ return (NULL); }
if (hostname && !strcasecmp(hostname, "localhost"))
if (hostname && !_cups_strcasecmp(hostname, "localhost")) { /*
- Unfortunately, some users ignore all of the warnings in the Index: cups/ppd.c
  
  --- cups/ppd.c (revision 9791) +++ cups/ppd.c (working copy) @@ -377,17 +377,17 @@ cups_encodingt /* O - CUPS encoding value / ppdGetEncoding(const char *name) / I - LanguageEncoding string */ {
if (!strcasecmp(name, "ISOLatin1"))
if (!_cups_strcasecmp(name, "ISOLatin1")) return (CUPS_ISO8859_1);
else if (!strcasecmp(name, "ISOLatin2"))
else if (!_cups_strcasecmp(name, "ISOLatin2")) return (CUPS_ISO8859_2);
else if (!strcasecmp(name, "ISOLatin5"))
else if (!_cups_strcasecmp(name, "ISOLatin5")) return (CUPS_ISO8859_5);
else if (!strcasecmp(name, "JIS83-RKSJ"))
else if (!_cups_strcasecmp(name, "JIS83-RKSJ")) return (CUPS_JIS_X0213);
else if (!strcasecmp(name, "MacStandard"))
else if (!_cups_strcasecmp(name, "MacStandard")) return (CUPS_MAC_ROMAN);
else if (!strcasecmp(name, "WindowsANSI"))
else if (!_cups_strcasecmp(name, "WindowsANSI")) return (CUPS_WINDOWS_1252); else return (CUPS_UTF8); @@ -906,7 +906,7 @@

goto error; }
+ ppd->fonts = tempfonts; ppd->fonts[ppd->num_fonts] = _cupsStrAlloc(name); ppd->num_fonts ++; @@ -1049,7 +1049,7 @@ goto error; }

if (option && !strcasecmp(option->keyword, keyword + 6))

```
if (option && !_cups_strcasecmp(option->keyword, keyword + 6))
custom_option = option;
```
else custom_option = ppdFindOption(ppd, keyword + 6); @@ -1093,7 +1093,7 @@

ppd_add_size(ppd, "Custom");
if (option && !strcasecmp(option->keyword, "PageRegion"))
if (option && !_cups_strcasecmp(option->keyword, "PageRegion")) custom_option = option; else custom_option = ppdFindOption(ppd, "PageRegion"); @@ -1337,7 +1337,7 @@
- attribute... */
```
if (!strcasecmp(name, "PageRegion"))
```
if (!_cups_strcasecmp(name, "PageRegion")) strcpy(custom_name, "CustomPageSize"); else snprintf(custom_name, sizeof(custom_name), "Custom%s", name); @@ -1717,7 +1717,7 @@ constraint->choice1[0] = '\0'; constraint->choice2[0] = '\0'; break;
+ case 3 : /* Two options, one choice... / / * Check for broken constraints like "* Option"... @@ -1771,7 +1771,7 @@ constraint->choice2[0] = '\0'; } break;
+ case 4 : /* Two options, two choices... / / * Check for broken constraints like "* Option"... @@ -2279,7 +2279,7 @@ ppd_compare_attrs(ppd_attr_t a, / I - First attribute _/ ppd_attrt *b) / I - Second attribute */ {
return (strcasecmp(a->name, b->name));
return (_cups_strcasecmp(a->name, b->name)); }

@@ -2303,7 +2303,7 @@ ppd_compare_coptions(ppd_coption_t a, / I - First option _/ ppd_coptiont *b) / I - Second option */ {

return (strcasecmp(a->keyword, b->keyword));
return (_cups_strcasecmp(a->keyword, b->keyword)); }

@@ -2315,7 +2315,7 @@ ppd_compare_options(ppd_option_t a, / I - First option _/ ppd_optiont *b) / I - Second option */ {

return (strcasecmp(a->keyword, b->keyword));
return (_cups_strcasecmp(a->keyword, b->keyword)); }

@@ -2549,7 +2549,7 @@

   return (NULL);
 }

+ if (ppd->num_groups == 0) group = malloc(sizeof(ppd_group_t)); else @@ -3067,7 +3067,7 @@ */
```
lineptr ++;
```
+ textptr = text;

while (lineptr != '\0' && lineptr != '\n' && *lineptr != ':') @@ -3090,7 +3090,7 @@ cg->ppd_status = PPD_ILLEGAL_TRANSLATION; return (0); }
+ mask |= PPD_TEXT; } } Index: cups/string-private.h

--- cups/string-private.h (revision 9791) +++ cups/string-private.h (working copy) @@ -3,7 +3,7 @@ *
- Private string definitions for CUPS.
* Copyright 2007-2010 by Apple Inc.
- Copyright 2007-2011 by Apple Inc.
- Copyright 1997-2006 by Easy Software Products.
- These coded instructions, statements, and computer programs are the @@ -45,16 +45,6 @@
/*
* Stuff for WIN32 and OS/2...

- */

-# if defined(WIN32) || defined(EMX) -# define strcasecmp _stricmp -# define strncasecmp _strnicmp

-# endif /* WIN32 || EMX */

-/*

C++ magic... */

@@ -82,10 +72,6 @@ /*

Replacements for the ctype macros that are not affected by locale, since we
really only care about testing for ASCII characters when parsing files, etc.
- * These are used only within libcups since the rest of CUPS doesn't call
- * setlocale() for LC_CTYPE and doesn't have to worry about third-party
- * libraries doing so (and if they do that is a bug: NetSNMP, I'm looking at
- * you!)
The _CUPS_INLINE definition controls whether we get an inline function body,
and external function body, or an external definition. @@ -127,11 +113,18 @@ { return (ch >= 'A' && ch <= 'Z'); } + +_CUPSINLINE int /* O - Converted character / +_cupstolower(int ch) / I - Character to convert */ +{
- return (_cups_isupper(ch) ? ch - 'A' + 'a' : ch); +}
  else
  
  extern int _cups_isalnum(int ch); extern int _cups_isalpha(int ch); extern int _cups_isspace(int ch); extern int _cups_isupper(int ch); +extern int _cups_tolower(int ch);
  
  endif /* _CUPS_INLINE */

@@ -146,15 +139,9 @@

define strdup _cups_strdup

endif /* !HAVE_STRDUP */

-# ifndef HAVE_STRCASECMP extern int _cupsstrcasecmp(const char , const char ); -# define strcasecmp _cupsstrcasecmp -# endif / !HAVE_STRCASECMP /

-# ifndef HAVE_STRNCASECMP extern int _cupsstrncasecmp(const char , const char , size_t n); -# define strncasecmp _cupsstrncasecmp -# endif / !HAVE_STRNCASECMP /

ifndef HAVE_STRLCAT

extern size_t _cups_strlcat(char , const char , size_t);

Index: cups/ipp.c

--- cups/ipp.c (revision 9791) +++ cups/ipp.c (working copy) @@ -3,7 +3,7 @@ *

Internet Printing Protocol functions for CUPS. *
- * Copyright 2007-2010 by Apple Inc.
- * Copyright 2007-2011 by Apple Inc.
Copyright 1997-2007 by Easy Software Products, all rights reserved. *
These coded instructions, statements, and computer programs are the @@ -423,7 +423,7 @@
- Force value to be English for the POSIX locale... */
if (type == IPP_TAG_LANGUAGE && !strcasecmp(value, "C"))
if (type == IPP_TAG_LANGUAGE && !_cups_strcasecmp(value, "C")) value = "en";

/ @@ -513,7 +513,7 @@ { if ((int)type & IPP_TAG_COPY) value->string.text = (char )values[i];
else if (type == IPP_TAG_LANGUAGE && !strcasecmp(values[i], "C"))
```
else if (type == IPP_TAG_LANGUAGE && !_cups_strcasecmp(values[i], "C"))
```
{ /*
- Force language to be English for the POSIX locale... @@ -930,7 +930,7 @@
value_tag = (ipp_tag_t)(attr->value_tag & IPP_TAG_MASK);
if (attr->name != NULL && strcasecmp(attr->name, name) == 0 &&
if (attr->name != NULL && _cups_strcasecmp(attr->name, name) == 0 && (value_tag == type || type == IPP_TAG_ZERO || (value_tag == IPP_TAG_TEXTLANG && type == IPP_TAG_TEXT) || (value_tag == IPP_TAG_NAMELANG && type == IPP_TAG_NAME)))

Index: cups/http-support.c

--- cups/http-support.c (revision 9791) +++ cups/http-support.c (working copy) @@ -801,7 +801,7 @@ */

for (i = 0; i < 12; i ++)
if (!strcasecmp(mon, http_months[i]))
if (!_cups_strcasecmp(mon, http_months[i])) break;

if (i >= 12) @@ -1001,7 +1001,7 @@ port = 443; else if (!strcmp(scheme, "ipp") || !strcmp(scheme, "ipps")) port = 631;
else if (!strcasecmp(scheme, "lpd"))
else if (!_cups_strcasecmp(scheme, "lpd")) port = 515; else if (!strcmp(scheme, "socket")) / Not yet registered with IANA... / port = 9100; @@ -1543,8 +1543,8 @@ stimeout.tv_sec = ((int)timeout) / 1000; stimeout.tv_usec = ((int)(timeout) * 1000) % 1000000;

fds = select(DNSServiceRefSockFD(ref)+1, &input_set, NULL, NULL,

timeout < 0.0 ? NULL : &stimeout);
fds = select(DNSServiceRefSockFD(ref)+1, &input_set, NULL, NULL,
```
       timeout < 0.0 ? NULL : &stimeout);
```
endif /* HAVE_POLL */
```
if (fds < 0)
```
@@ -1562,14 +1562,14 @@ * comes in, do an additional domain resolution... */

if (domainsent == 0 && (domain && strcasecmp(domain, "local.")))

if (domainsent == 0 && (domain && _cups_strcasecmp(domain, "local."))) { if (options & _HTTP_RESOLVE_STDERR) fprintf(stderr, "DEBUG: Resolving \"%s\", regtype=\"%s\", " "domain=\"%s\"...\n", hostname, regtype, domain ? domain : "");
+ domainref = ref; if (DNSServiceResolve(&domainref, kDNSServiceFlagsShareConnection, 0, hostname, regtype, domain, @@ -1651,7 +1651,7 @@ */

static const char * /* O - New source pointer or NULL on error _/ -http_copydecode(char *dst, / O - Destination buffer _/ +http_copydecode(char *dst, / O - Destination buffer / const char *src, / I - Source pointer / int dstsize, / I - Destination size / const char *term, / I - Terminating characters / @@ -1719,7 +1719,7 @@ /

static char * /* O - End of current URI _/ -http_copyencode(char *dst, / O - Destination buffer _/ +http_copyencode(char *dst, / O - Destination buffer / const char *src, / I - Source pointer / char *dstend, / I - End of destination buffer / const char *reserved, / I - Extra reserved characters */ @@ -1841,7 +1841,7 @@

if ((uribuf->options & _HTTP_RESOLVE_FQDN) && (hostptr = hostTarget + strlen(hostTarget) - 7) > hostTarget &&
!strcasecmp(hostptr, ".local."))
```
!_cups_strcasecmp(hostptr, ".local."))
```
{ /*
- OK, we got a .local name but the caller needs a real domain. Start by @@ -1867,7 +1867,7 @@ DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn));
if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn ||
strcasecmp(hostptr, ".local"))
```
  _cups_strcasecmp(hostptr, ".local"))
```
{ hostTarget = fqdn; break;

Index: cups/mark.c

--- cups/mark.c (revision 9791) +++ cups/mark.c (working copy) @@ -156,7 +156,7 @@

if (!page_size || !page_size[0]) {
if (!strncasecmp(s, "Custom.", 7) || ppdPageSize(ppd, s))

 if (!_cups_strncasecmp(s, "Custom.", 7) || ppdPageSize(ppd, s))
 ppd_mark_option(ppd, "PageSize", s);
else if ((ppd_keyword = _ppdCacheGetPageSize(cache, NULL, s, NULL)) != NULL)

ppd_mark_option(ppd, "PageSize", ppd_keyword); @@ -241,7 +241,7 @@ }

if (output_bin && !cupsGetOption("OutputBin", num_options, options) &&

(ppd_keyword = _ppdCacheGetOutputBin(cache, output_bin)) != NULL)
(ppd_keyword = _ppdCacheGetOutputBin(cache, output_bin)) != NULL) { /*
- Map output-bin to OutputBin... @@ -271,14 +271,14 @@ */
for (i = num_options, optptr = options; i > 0; i --, optptr ++)
if (!strcasecmp(optptr->name, "media") ||
!strcasecmp(optptr->name, "output-bin") ||
!strcasecmp(optptr->name, "output-mode") ||
!strcasecmp(optptr->name, "print-quality") ||
!strcasecmp(optptr->name, "sides"))
if (!_cups_strcasecmp(optptr->name, "media") ||
!_cups_strcasecmp(optptr->name, "output-bin") ||
!_cups_strcasecmp(optptr->name, "output-mode") ||
!_cups_strcasecmp(optptr->name, "print-quality") ||
!_cups_strcasecmp(optptr->name, "sides")) continue;
else if (!strcasecmp(optptr->name, "resolution") ||
!strcasecmp(optptr->name, "printer-resolution"))
else if (!_cups_strcasecmp(optptr->name, "resolution") ||
!_cups_strcasecmp(optptr->name, "printer-resolution")) { ppd_mark_option(ppd, "Resolution", optptr->value); ppd_mark_option(ppd, "SetResolution", optptr->value); @@ -288,18 +288,18 @@ ppd_mark_option(ppd, "CNRes_PGP", optptr->value); /* Canon */ }
else if (!strcasecmp(optptr->name, "multiple-document-handling"))
else if (!_cups_strcasecmp(optptr->name, "multiple-document-handling")) { if (!cupsGetOption("Collate", num_options, options) && ppdFindOption(ppd, "Collate")) {
if (strcasecmp(optptr->value, "separate-documents-uncollated-copies"))
if (_cups_strcasecmp(optptr->value, "separate-documents-uncollated-copies")) ppd_mark_option(ppd, "Collate", "True"); else ppd_mark_option(ppd, "Collate", "False"); } }
else if (!strcasecmp(optptr->name, "finishings"))
else if (!_cups_strcasecmp(optptr->name, "finishings")) { /*
- Lookup cupsIPPFinishings attributes for each value... @@ -340,7 +340,7 @@ ppd_mark_choices(ppd, attr->value); } }
else if (!strcasecmp(optptr->name, "APPrinterPreset"))
else if (!_cups_strcasecmp(optptr->name, "APPrinterPreset")) { /*
- Lookup APPrinterPreset value... @@ -355,7 +355,7 @@ ppd_mark_choices(ppd, attr->value); } }
else if (!strcasecmp(optptr->name, "mirror"))
else if (!_cups_strcasecmp(optptr->name, "mirror")) ppd_mark_option(ppd, "MirrorPrint", optptr->value); else ppd_mark_option(ppd, optptr->name, optptr->value); @@ -381,11 +381,11 @@ if (!o || !choice) return (NULL);
if (choice[0] == '{' || !strncasecmp(choice, "Custom.", 7))
if (choice[0] == '{' || !_cups_strncasecmp(choice, "Custom.", 7)) choice = "Custom";

for (i = o->num_choices, c = o->choices; i > 0; i --, c ++)
if (!strcasecmp(c->choice, choice))
if (!_cups_strcasecmp(c->choice, choice)) return (c);

return (NULL); @@ -464,7 +464,7 @@ for (j = group->num_options, optptr = group->options; j > 0; j --, optptr ++)
if (!strcasecmp(optptr->keyword, option))
```
 if (!_cups_strcasecmp(optptr->keyword, option))
```
return (optptr);

return (NULL); @@ -726,7 +726,7 @@

for (i = g->num_options, o = g->options; i > 0; i --, o ++)
if (strcasecmp(o->keyword, "PageRegion") != 0)
if (_cups_strcasecmp(o->keyword, "PageRegion") != 0) ppdMarkOption(ppd, o->keyword, o->defchoice);

for (i = g->num_subgroups, sg = g->subgroups; i > 0; i --, sg ++) @@ -786,7 +786,7 @@
- it clears the regular InputSlot choices... */
if (!strcasecmp(option, "AP_D_InputSlot"))
if (!_cups_strcasecmp(option, "AP_D_InputSlot")) { cupsArraySave(ppd->options);

@@ -818,7 +818,7 @@

loc = localeconv();

if (!strncasecmp(choice, "Custom.", 7))
if (!_cups_strncasecmp(choice, "Custom.", 7)) { /*
- Handle a custom option... @@ -827,7 +827,7 @@ if ((c = ppdFindChoice(o, "Custom")) == NULL) return;
if (!strcasecmp(option, "PageSize"))
if (!_cups_strcasecmp(option, "PageSize")) { /*
- Handle custom page sizes... @@ -867,15 +867,15 @@
```
   if (units)
```
{
if (!strcasecmp(units, "cm"))
if (!_cups_strcasecmp(units, "cm")) cparam->current.custom_points *= 72.0f / 2.54f;
else if (!strcasecmp(units, "mm"))
else if (!_cups_strcasecmp(units, "mm")) cparam->current.custom_points *= 72.0f / 25.4f;
else if (!strcasecmp(units, "m"))
else if (!_cups_strcasecmp(units, "m")) cparam->current.custom_points *= 72.0f / 0.0254f;
else if (!strcasecmp(units, "in"))
else if (!_cups_strcasecmp(units, "in")) cparam->current.custom_points *= 72.0f;
else if (!strcasecmp(units, "ft"))

    else if (!_cups_strcasecmp(units, "ft"))
    cparam->current.custom_points *= 12.0f * 72.0f;
     }
break;

@@ -944,15 +944,15 @@

if (units)
{

if (!strcasecmp(units, "cm"))
if (!_cups_strcasecmp(units, "cm")) cparam->current.custom_points *= 72.0f / 2.54f;
else if (!strcasecmp(units, "mm"))
else if (!_cups_strcasecmp(units, "mm")) cparam->current.custom_points *= 72.0f / 25.4f;
else if (!strcasecmp(units, "m"))
else if (!_cups_strcasecmp(units, "m")) cparam->current.custom_points *= 72.0f / 0.0254f;
else if (!strcasecmp(units, "in"))
else if (!_cups_strcasecmp(units, "in")) cparam->current.custom_points *= 72.0f;
else if (!strcasecmp(units, "ft"))
else if (!_cups_strcasecmp(units, "ft")) cparam->current.custom_points = 12.0f \ 72.0f; } break; @@ -978,7 +978,7 @@ else { for (i = o->num_choices, c = o->choices; i > 0; i --, c ++)
if (!strcasecmp(c->choice, choice))
```
if (!_cups_strcasecmp(c->choice, choice))
break;
```
if (!i) @@ -1001,14 +1001,14 @@ cupsArrayRemove(ppd->marked, oldc); }
if (!strcasecmp(option, "PageSize") || !strcasecmp(option, "PageRegion"))
if (!_cups_strcasecmp(option, "PageSize") || !_cups_strcasecmp(option, "PageRegion")) { /*
- Mark current page size... */
for (j = 0; j < ppd->num_sizes; j ++)
ppd->sizes[j].marked = !strcasecmp(ppd->sizes[j].name,
ppd->sizes[j].marked = !_cups_strcasecmp(ppd->sizes[j].name, choice);

/* @@ -1018,7 +1018,7 @@

cupsArraySave(ppd->options);
```
if (!strcasecmp(option, "PageSize"))
```
```
if (!_cups_strcasecmp(option, "PageSize"))
```
{ if ((o = ppdFindOption(ppd, "PageRegion")) != NULL) { @@ -1045,7 +1045,7 @@

cupsArrayRestore(ppd->options); }
else if (!strcasecmp(option, "InputSlot"))
else if (!_cups_strcasecmp(option, "InputSlot")) { /*
- Unmark ManualFeed option... @@ -1065,8 +1065,8 @@
cupsArrayRestore(ppd->options); }
else if (!strcasecmp(option, "ManualFeed") &&
!strcasecmp(choice, "True"))

else if (!_cups_strcasecmp(option, "ManualFeed") &&
```
 !_cups_strcasecmp(choice, "True"))
```
{ /*
- Unmark InputSlot option...
Index: cups/dest.c

--- cups/dest.c (revision 9791) +++ cups/dest.c (working copy) @@ -248,7 +248,7 @@

return (NULL); }
+ DEBUG_printf(("1_cupsAppleCopyDefaultPrinter: Got locations, %d entries.", (int)CFArrayGetCount(locations)));

@@ -404,12 +404,12 @@ /*

'_cupsAppleSetUseLastPrinter()' - Set whether to use the last used printer. */
- -void
- +void _cupsAppleSetUseLastPrinter( int uselast) /* O - 1 to use last printer, 0 otherwise */ {
- CFPreferencesSetAppValue(kUseLastPrinter,
- CFPreferencesSetAppValue(kUseLastPrinter, uselast ? kCFBooleanTrue : kCFBooleanFalse, kCUPSPrintingPrefs); CFPreferencesAppSynchronize(kCUPSPrintingPrefs); @@ -688,7 +688,7 @@ int i; /* Looping var */
for (i = 0; i < attr->num_values; i ++)
- if (!strcasecmp(media_default, attr->values[i].string.text))
- if (!_cups_strcasecmp(media_default, attr->values[i].string.text)) { num_options = cupsAddOption("media", media_default, num_options, &options); @@ -715,7 +715,7 @@ strlcpy(optname, attr->name, sizeof(optname)); optname[ptr - attr->name] = '\0';
if (strcasecmp(optname, "media") ||

if (_cups_strcasecmp(optname, "media") ||
!cupsGetOption("media", num_options, options))
num_options = cupsAddOption(optname,
          cups_make_string(attr, value,

@@ -1178,10 +1178,10 @@ */

for (i = num_dests, dest = dests; i > 0; i --, dest ++)

dest->is_default = !strcasecmp(name, dest->name) &&
dest->is_default = !_cups_strcasecmp(name, dest->name) && ((!instance && !dest->instance) || (instance && dest->instance &&
!strcasecmp(instance, dest->instance)));
!_cups_strcasecmp(instance, dest->instance))); }

@@ -1346,7 +1346,7 @@ if (temp && (val = cupsGetOption(option->name, temp->num_options, temp->options)) != NULL &&

!strcasecmp(val, option->value))
```
     !_cups_strcasecmp(val, option->value))
```
continue;
```
/*
```
@@ -1360,7 +1360,7 @@ fprintf(fp, "/%s", dest->instance); wrote = 1; }
+ if (option->value[0]) { if (strchr(option->value, ' ') || @@ -1537,8 +1537,8 @@ CFStringRef key; /* Current network configuration key _/ CFDictionaryRef ipdict; / Network configuration data / CFStringRef network = NULL; / Current network ID */
if ((dynamicStore = SCDynamicStoreCreate(NULL, CFSTR("libcups"), NULL, NULL)) != NULL) { @@ -1742,10 +1742,10 @@ int diff; /* Difference */
if ((diff = strcasecmp(a->name, b->name)) != 0)
if ((diff = _cups_strcasecmp(a->name, b->name)) != 0) return (diff); else if (a->instance && b->instance)
return (strcasecmp(a->instance, b->instance));
return (_cupsstrcasecmp(a->instance, b->instance)); else return ((a->instance && !b->instance) - (!a->instance && b->instance)); } @@ -1868,7 +1868,7 @@ char line[8192], /* Line from file / value, / Value for line / nameptr; /_ Pointer into name */
int linenum; /* Current line */
int linenum; /* Current line */

*namebuf = '\0'; @@ -1879,7 +1879,7 @@

while (cupsFileGetConf(fp, line, sizeof(line), &value, &linenum)) {
if (!strcasecmp(line, "default") && value)
if (!_cups_strcasecmp(line, "default") && value) { strlcpy(namebuf, value, namesize);

@@ -1956,7 +1956,7 @@ DEBUG_printf(("9cups_get_dests: linenum=%d line=\"%s\" lineptr=\"%s\"", linenum, line, lineptr));

if ((strcasecmp(line, "dest") && strcasecmp(line, "default")) || !lineptr)
if ((_cups_strcasecmp(line, "dest") && _cups_strcasecmp(line, "default")) || !lineptr) { DEBUG_puts("9cups_get_dests: Not a dest or default line..."); continue; @@ -2003,10 +2003,10 @@

if (match_name) {
if (strcasecmp(name, match_name) ||
if (_cups_strcasecmp(name, match_name) || (!instance && match_inst) || (instance && !match_inst) ||
(instance && strcasecmp(instance, match_inst)))
```
(instance && _cups_strcasecmp(instance, match_inst)))
```
continue;

dest = *dests; @@ -2053,7 +2053,7 @@
- Set this as default if needed... */
if (!user_default_set && !strcasecmp(line, "default"))
if (!user_default_set && !_cups_strcasecmp(line, "default")) { DEBUG_puts("9cups_get_dests: Setting as default...");

@@ -2068,7 +2068,7 @@

Close the file and return... */
cupsFileClose(fp);
cupsFileClose(fp);

return (num_dests); }

Index: cups/auth.c

--- cups/auth.c (revision 9791) +++ cups/auth.c (working copy) @@ -195,7 +195,7 @@ cupsUser(), http->hostname[0] == '/' ? "localhost" : http->hostname);
http->digest_tries = strncasecmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE],
http->digest_tries = _cups_strncasecmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Digest", 5) != 0; http->userpass[0] = '\0';

@@ -679,7 +679,7 @@ */

if (!httpAddrLocalhost(http->hostaddr) &&

strcasecmp(http->hostname, "localhost") != 0)
_cups_strcasecmp(http->hostname, "localhost") != 0) { DEBUG_puts("8cups_local_auth: Not a local connection!"); return (1); Index: cups/ipp-support.c

--- cups/ipp-support.c (revision 9791) +++ cups/ipp-support.c (working copy) @@ -3,7 +3,7 @@ *
- Internet Printing Protocol support functions for CUPS.
* Copyright 2007-2010 by Apple Inc.
- Copyright 2007-2011 by Apple Inc.
- Copyright 1997-2007 by Easy Software Products, all rights reserved.
- These coded instructions, statements, and computer programs are the @@ -566,25 +566,25 @@
for (i = 0; i < (sizeof(ipp_status_oks) / sizeof(ipp_status_oks[0])); i ++)
if (!strcasecmp(name, ipp_status_oks[i]))
if (!_cups_strcasecmp(name, ipp_status_oks[i])) return ((ipp_status_t)i);
if (!strcasecmp(name, "redirection-other-site"))
if (!_cups_strcasecmp(name, "redirection-other-site")) return (IPP_REDIRECTION_OTHER_SITE);
if (!strcasecmp(name, "cups-see-other"))
if (!_cups_strcasecmp(name, "cups-see-other")) return (CUPS_SEE_OTHER);

for (i = 0; i < (sizeof(ipp_status_400s) / sizeof(ipp_status_400s[0])); i ++)
if (!strcasecmp(name, ipp_status_400s[i]))
if (!_cups_strcasecmp(name, ipp_status_400s[i])) return ((ipp_status_t)(i + 0x400));

for (i = 0; i < (sizeof(ipp_status_500s) / sizeof(ipp_status_500s[0])); i ++)
if (!strcasecmp(name, ipp_status_500s[i]))
if (!_cups_strcasecmp(name, ipp_status_500s[i])) return ((ipp_status_t)(i + 0x500));

for (i = 0; i < (sizeof(ipp_status_1000s) / sizeof(ipp_status_1000s[0])); i ++)
if (!strcasecmp(name, ipp_status_1000s[i]))
if (!_cups_strcasecmp(name, ipp_status_1000s[i])) return ((ipp_status_t)(i + 0x1000));

return ((ipp_status_t)-1); @@ -639,24 +639,24 @@

for (i = 0; i < (sizeof(ipp_std_ops) / sizeof(ipp_std_ops[0])); i ++)
if (!strcasecmp(name, ipp_std_ops[i]))
if (!_cups_strcasecmp(name, ipp_std_ops[i])) return ((ipp_op_t)i);
if (!strcasecmp(name, "windows-ext"))
if (!_cups_strcasecmp(name, "windows-ext")) return (IPP_PRIVATE);

for (i = 0; i < (sizeof(ipp_cups_ops) / sizeof(ipp_cups_ops[0])); i ++)
if (!strcasecmp(name, ipp_cups_ops[i]))
if (!_cups_strcasecmp(name, ipp_cups_ops[i])) return ((ipp_op_t)(i + 0x4001));

for (i = 0; i < (sizeof(ipp_cups_ops2) / sizeof(ipp_cups_ops2[0])); i ++)
if (!strcasecmp(name, ipp_cups_ops2[i]))
if (!_cups_strcasecmp(name, ipp_cups_ops2[i])) return ((ipp_op_t)(i + 0x4027));
if (!strcasecmp(name, "CUPS-Add-Class"))
if (!_cups_strcasecmp(name, "CUPS-Add-Class")) return (CUPS_ADD_MODIFY_CLASS);
if (!strcasecmp(name, "CUPS-Add-Printer"))
if (!_cups_strcasecmp(name, "CUPS-Add-Printer")) return (CUPS_ADD_MODIFY_PRINTER);

return ((ipp_op_t)-1); @@ -732,30 +732,30 @@

for (i = 0; i < (sizeof(ipp_tag_names) / sizeof(ipp_tag_names[0])); i ++)
if (!strcasecmp(name, ipp_tag_names[i]))
if (!_cups_strcasecmp(name, ipp_tag_names[i])) return ((ipp_tag_t)i);
if (!strcasecmp(name, "operation"))
if (!_cups_strcasecmp(name, "operation")) return (IPP_TAG_OPERATION);
else if (!strcasecmp(name, "job"))
else if (!_cups_strcasecmp(name, "job")) return (IPP_TAG_JOB);
else if (!strcasecmp(name, "printer"))
else if (!_cups_strcasecmp(name, "printer")) return (IPP_TAG_PRINTER);
else if (!strcasecmp(name, "unsupported"))
else if (!_cups_strcasecmp(name, "unsupported")) return (IPP_TAG_UNSUPPORTED_GROUP);
else if (!strcasecmp(name, "subscription"))
else if (!_cups_strcasecmp(name, "subscription")) return (IPP_TAG_SUBSCRIPTION);
else if (!strcasecmp(name, "event"))
else if (!_cups_strcasecmp(name, "event")) return (IPP_TAG_EVENT_NOTIFICATION);
else if (!strcasecmp(name, "language"))
else if (!_cups_strcasecmp(name, "language")) return (IPP_TAG_LANGUAGE);
else if (!strcasecmp(name, "mimetype"))
else if (!_cups_strcasecmp(name, "mimetype")) return (IPP_TAG_MIMETYPE);
else if (!strcasecmp(name, "name"))
else if (!_cups_strcasecmp(name, "name")) return (IPP_TAG_NAME);
else if (!strcasecmp(name, "text"))
else if (!_cups_strcasecmp(name, "text")) return (IPP_TAG_TEXT);
else if (!strcasecmp(name, "begCollection"))
else if (!_cups_strcasecmp(name, "begCollection")) return (IPP_TAG_BEGIN_COLLECTION); else return (IPP_TAG_ZERO); Index: cups/attr.c

--- cups/attr.c (revision 9791) +++ cups/attr.c (working copy) @@ -3,7 +3,7 @@ *
- PPD model-specific attribute routines for CUPS.
* Copyright 2007-2010 by Apple Inc.
- Copyright 2007-2011 by Apple Inc.
- Copyright 1997-2006 by Easy Software Products.
- These coded instructions, statements, and computer programs are the @@ -71,10 +71,10 @@
- Loop until we find the first matching attribute for "spec"... */

while (attr && strcasecmp(spec, attr->spec))

while (attr && _cups_strcasecmp(spec, attr->spec)) { if ((attr = (ppd_attr_t *)cupsArrayNext(ppd->sorted_attrs)) != NULL &&
strcasecmp(attr->name, name))
```
_cups_strcasecmp(attr->name, name))
```
attr = NULL; } } @@ -115,7 +115,7 @@
- Check the next attribute to see if it is a match... */
if (strcasecmp(attr->name, name))
if (_cups_strcasecmp(attr->name, name)) { /*
- Nope, reset the current pointer to the end of the array... @@ -126,7 +126,7 @@ return (NULL); }
if (!spec || !strcasecmp(attr->spec, spec))
if (!spec || !_cups_strcasecmp(attr->spec, spec)) break; }

@@ -180,7 +180,7 @@ if ((bufptr = strrchr(buffer, ')')) != NULL) *bufptr = '\0'; }

else if (!strncasecmp(make_and_model, "XPrint", 6))
else if (!_cups_strncasecmp(make_and_model, "XPrint", 6)) { /*
- Xerox XPrint... @@ -188,7 +188,7 @@
snprintf(buffer, bufsize, "Xerox %s", make_and_model); }
else if (!strncasecmp(make_and_model, "Eastman", 7))
else if (!_cups_strncasecmp(make_and_model, "Eastman", 7)) { /*
- Kodak... @@ -196,7 +196,7 @@
snprintf(buffer, bufsize, "Kodak %s", make_and_model + 7); }
else if (!strncasecmp(make_and_model, "laserwriter", 11))
else if (!_cups_strncasecmp(make_and_model, "laserwriter", 11)) { /*
- Apple LaserWriter... @@ -204,7 +204,7 @@
snprintf(buffer, bufsize, "Apple LaserWriter%s", make_and_model + 11); }
else if (!strncasecmp(make_and_model, "colorpoint", 10))
else if (!_cups_strncasecmp(make_and_model, "colorpoint", 10)) { /*
- Seiko... @@ -212,7 +212,7 @@
snprintf(buffer, bufsize, "Seiko %s", make_and_model); }
else if (!strncasecmp(make_and_model, "fiery", 5))
else if (!_cups_strncasecmp(make_and_model, "fiery", 5)) { /*
- EFI... @@ -220,8 +220,8 @@
snprintf(buffer, bufsize, "EFI %s", make_and_model); }
else if (!strncasecmp(make_and_model, "ps ", 3) ||
!strncasecmp(make_and_model, "colorpass", 9))
else if (!_cups_strncasecmp(make_and_model, "ps ", 3) ||
```
!_cups_strncasecmp(make_and_model, "colorpass", 9))
```
{ /*
- Canon... @@ -229,7 +229,7 @@
snprintf(buffer, bufsize, "Canon %s", make_and_model); }
else if (!strncasecmp(make_and_model, "primera", 7))
else if (!_cups_strncasecmp(make_and_model, "primera", 7)) { /*
- Fargo... @@ -237,8 +237,8 @@
snprintf(buffer, bufsize, "Fargo %s", make_and_model); }
else if (!strncasecmp(make_and_model, "designjet", 9) ||
!strncasecmp(make_and_model, "deskjet", 7))
else if (!_cups_strncasecmp(make_and_model, "designjet", 9) ||

    !_cups_strncasecmp(make_and_model, "deskjet", 7))

{ /*

HP... @@ -253,7 +253,7 @@
Clean up the make... */

if (!strncasecmp(buffer, "agfa", 4))
if (!_cups_strncasecmp(buffer, "agfa", 4)) { /*
- Replace with AGFA (all uppercase)... @@ -264,7 +264,7 @@ buffer[2] = 'F'; buffer[3] = 'A'; }
else if (!strncasecmp(buffer, "Hewlett-Packard hp ", 19))
else if (!_cups_strncasecmp(buffer, "Hewlett-Packard hp ", 19)) { /*
- Just put "HP" on the front... @@ -274,7 +274,7 @@ buffer[1] = 'P'; _cups_strcpy(buffer + 2, buffer + 18); }
else if (!strncasecmp(buffer, "Hewlett-Packard ", 16))
else if (!_cups_strncasecmp(buffer, "Hewlett-Packard ", 16)) { /*
- Just put "HP" on the front... @@ -284,7 +284,7 @@ buffer[1] = 'P'; _cups_strcpy(buffer + 2, buffer + 15); }
else if (!strncasecmp(buffer, "Lexmark International", 21))
else if (!_cups_strncasecmp(buffer, "Lexmark International", 21)) { /*
- Strip "International"... @@ -292,7 +292,7 @@
_cups_strcpy(buffer + 8, buffer + 21); }
else if (!strncasecmp(buffer, "herk", 4))
else if (!_cups_strncasecmp(buffer, "herk", 4)) { /*
- Replace with LHAG... @@ -303,7 +303,7 @@ buffer[2] = 'A'; buffer[3] = 'G'; }
else if (!strncasecmp(buffer, "linotype", 8))
else if (!_cups_strncasecmp(buffer, "linotype", 8)) { /*
- Replace with LHAG... Index: cups/usersys.c
  
  --- cups/usersys.c (revision 9791) +++ cups/usersys.c (working copy) @@ -653,36 +653,36 @@ while (cupsFileGetConf(fp, line, sizeof(line), &value, &linenum)) { if (!cups_encryption && cg->encryption == (http_encryption_t)-1 &&
!strcasecmp(line, "Encryption") && value)
!_cups_strcasecmp(line, "Encryption") && value) { strlcpy(encryption, value, sizeof(encryption)); cups_encryption = encryption; } else if (!cups_server && (!cg->server[0] || !cg->ipp_port) &&
!strcasecmp(line, "ServerName") && value)
!_cups_strcasecmp(line, "ServerName") && value) { strlcpy(server_name, value, sizeof(server_name)); cups_server = server_name; }
else if (!cups_anyroot && !strcasecmp(line, "AllowAnyRoot") && value)
else if (!cups_anyroot && !_cups_strcasecmp(line, "AllowAnyRoot") && value) { strlcpy(any_root, value, sizeof(any_root)); cups_anyroot = any_root; }
else if (!cups_expiredroot && !strcasecmp(line, "AllowExpiredRoot") &&
else if (!cups_expiredroot && !_cups_strcasecmp(line, "AllowExpiredRoot") && value) { strlcpy(expired_root, value, sizeof(expired_root)); cups_expiredroot = expired_root; }
else if (!cups_expiredcerts && !strcasecmp(line, "AllowExpiredCerts") &&
else if (!cups_expiredcerts && !_cups_strcasecmp(line, "AllowExpiredCerts") && value) { strlcpy(expired_certs, value, sizeof(expired_certs)); cups_expiredcerts = expired_certs; }
ifdef HAVE_GSSAPI
else if (!cups_gssservicename && !strcasecmp(line, "GSSServiceName") &&
else if (!cups_gssservicename && !_cups_strcasecmp(line, "GSSServiceName") && value) { strlcpy(gss_service_name, value, sizeof(gss_service_name)); @@ -697,11 +697,11 @@

if (cg->encryption == (http_encryption_t)-1 && cups_encryption) {
if (!strcasecmp(cups_encryption, "never"))
if (!_cups_strcasecmp(cups_encryption, "never")) cg->encryption = HTTP_ENCRYPT_NEVER;
else if (!strcasecmp(cups_encryption, "always"))
else if (!_cups_strcasecmp(cups_encryption, "always")) cg->encryption = HTTP_ENCRYPT_ALWAYS;
else if (!strcasecmp(cups_encryption, "required"))
else if (!_cups_strcasecmp(cups_encryption, "required")) cg->encryption = HTTP_ENCRYPT_REQUIRED; else cg->encryption = HTTP_ENCRYPT_IF_REQUESTED; @@ -781,19 +781,19 @@

endif /* HAVE_GSSAPI */

if (cups_anyroot)
cg->any_root = !strcasecmp(cups_anyroot, "yes") ||
!strcasecmp(cups_anyroot, "on") ||
!strcasecmp(cups_anyroot, "true");
cg->any_root = !_cups_strcasecmp(cups_anyroot, "yes") ||
!_cups_strcasecmp(cups_anyroot, "on") ||

   !_cups_strcasecmp(cups_anyroot, "true");

if (cups_expiredroot)

cg->expired_root = !strcasecmp(cups_expiredroot, "yes") ||
!strcasecmp(cups_expiredroot, "on") ||
!strcasecmp(cups_expiredroot, "true");
cg->expired_root = !_cups_strcasecmp(cups_expiredroot, "yes") ||
!_cups_strcasecmp(cups_expiredroot, "on") ||

    !_cups_strcasecmp(cups_expiredroot, "true");

if (cups_expiredcerts)

cg->expired_certs = !strcasecmp(cups_expiredcerts, "yes") ||
!strcasecmp(cups_expiredcerts, "on") ||
!strcasecmp(cups_expiredcerts, "true");
cg->expired_certs = !_cups_strcasecmp(cups_expiredcerts, "yes") ||
!_cups_strcasecmp(cups_expiredcerts, "on") ||
!_cups_strcasecmp(cups_expiredcerts, "true"); }

Index: cups/ppd-cache.c

--- cups/ppd-cache.c (revision 9791) +++ cups/ppd-cache.c (working copy) @@ -189,7 +189,7 @@ _cupsSetError(IPP_INTERNALERROR, ("Bad PPD cache file."), 1); goto create_error; }

else if (!strcasecmp(line, "Filter"))
else if (!_cups_strcasecmp(line, "Filter")) { if (!pc->filters) pc->filters = cupsArrayNew3(NULL, NULL, NULL, 0, @@ -198,7 +198,7 @@

cupsArrayAdd(pc->filters, value); }
else if (!strcasecmp(line, "PreFilter"))
else if (!_cups_strcasecmp(line, "PreFilter")) { if (!pc->prefilters) pc->prefilters = cupsArrayNew3(NULL, NULL, NULL, 0, @@ -207,15 +207,15 @@

cupsArrayAdd(pc->prefilters, value); }
else if (!strcasecmp(line, "Product"))
else if (!_cups_strcasecmp(line, "Product")) { pc->product = _cupsStrAlloc(value); }
else if (!strcasecmp(line, "SingleFile"))
else if (!_cups_strcasecmp(line, "SingleFile")) {
pc->single_file = !strcasecmp(value, "true");
pc->single_file = !_cups_strcasecmp(value, "true"); }
else if (!strcasecmp(line, "IPP"))
else if (!_cups_strcasecmp(line, "IPP")) { off_t pos = cupsFileTell(fp), /* Position in file */ length = strtol(value, NULL, 10); @@ -266,7 +266,7 @@ goto create_error; } }
else if (!strcasecmp(line, "NumBins"))
else if (!_cups_strcasecmp(line, "NumBins")) { if (num_bins > 0) { @@ -291,7 +291,7 @@ goto create_error; } }
else if (!strcasecmp(line, "Bin"))
else if (!_cups_strcasecmp(line, "Bin")) { if (sscanf(value, "%127s%40s", pwg_keyword, ppd_keyword) != 2) { @@ -314,7 +314,7 @@

pc->num_bins ++; }
else if (!strcasecmp(line, "NumSizes"))
else if (!_cups_strcasecmp(line, "NumSizes")) { if (num_sizes > 0) { @@ -339,7 +339,7 @@ goto create_error; } }
else if (!strcasecmp(line, "Size"))
else if (!_cups_strcasecmp(line, "Size")) { if (pc->num_sizes >= num_sizes) { @@ -366,7 +366,7 @@

pc->num_sizes ++; }
else if (!strcasecmp(line, "CustomSize"))
else if (!_cups_strcasecmp(line, "CustomSize")) { if (pc->custom_max_width > 0) { @@ -396,11 +396,11 @@ pc->custom_min_width, pc->custom_min_length); pc->custom_min_keyword = _cupsStrAlloc(pwg_keyword); }
else if (!strcasecmp(line, "SourceOption"))
else if (!_cups_strcasecmp(line, "SourceOption")) { pc->source_option = _cupsStrAlloc(value); }
else if (!strcasecmp(line, "NumSources"))
else if (!_cups_strcasecmp(line, "NumSources")) { if (num_sources > 0) { @@ -426,7 +426,7 @@ goto create_error; } }
else if (!strcasecmp(line, "Source"))
else if (!_cups_strcasecmp(line, "Source")) { if (sscanf(value, "%127s%40s", pwg_keyword, ppd_keyword) != 2) { @@ -450,7 +450,7 @@

pc->num_sources ++; }
else if (!strcasecmp(line, "NumTypes"))
else if (!_cups_strcasecmp(line, "NumTypes")) { if (num_types > 0) { @@ -475,7 +475,7 @@ goto create_error; } }
else if (!strcasecmp(line, "Type"))
else if (!_cups_strcasecmp(line, "Type")) { if (sscanf(value, "%127s%40s", pwg_keyword, ppd_keyword) != 2) { @@ -499,7 +499,7 @@

pc->num_types ++; }
else if (!strcasecmp(line, "Preset"))
else if (!_cups_strcasecmp(line, "Preset")) { /*
- Preset output-mode print-quality name=value ... @@ -524,13 +524,13 @@ cupsParseOptions(valueptr, 0, pc->presets[print_color_mode] + print_quality); }
else if (!strcasecmp(line, "SidesOption"))
else if (!_cups_strcasecmp(line, "SidesOption")) pc->sides_option = _cupsStrAlloc(value);
else if (!strcasecmp(line, "Sides1Sided"))
else if (!_cups_strcasecmp(line, "Sides1Sided")) pc->sides_1sided = _cupsStrAlloc(value);
else if (!strcasecmp(line, "Sides2SidedLong"))
else if (!_cups_strcasecmp(line, "Sides2SidedLong")) pc->sides_2sided_long = _cupsStrAlloc(value);
else if (!strcasecmp(line, "Sides2SidedShort"))
else if (!_cups_strcasecmp(line, "Sides2SidedShort")) pc->sides_2sided_short = _cupsStrAlloc(value); else { @@ -679,7 +679,7 @@
- Don't copy over custom size... */
if (!strcasecmp(ppd_size->name, "Custom"))
if (!_cups_strcasecmp(ppd_size->name, "Custom")) continue;

/* @@ -850,33 +850,33 @@ i > 0; i --, choice ++, map ++) {
if (!strncasecmp(choice->choice, "Auto", 4) ||
!strcasecmp(choice->choice, "Default"))
if (!_cups_strncasecmp(choice->choice, "Auto", 4) ||
!_cups_strcasecmp(choice->choice, "Default")) pwg_name = "auto";
else if (!strcasecmp(choice->choice, "Cassette"))
else if (!_cups_strcasecmp(choice->choice, "Cassette")) pwg_name = "main";
else if (!strcasecmp(choice->choice, "PhotoTray"))
else if (!_cups_strcasecmp(choice->choice, "PhotoTray")) pwg_name = "photo";
else if (!strcasecmp(choice->choice, "CDTray"))
else if (!_cups_strcasecmp(choice->choice, "CDTray")) pwg_name = "disc";
else if (!strncasecmp(choice->choice, "Multipurpose", 12) ||
!strcasecmp(choice->choice, "MP") ||
!strcasecmp(choice->choice, "MPTray"))
else if (!_cups_strncasecmp(choice->choice, "Multipurpose", 12) ||
!_cups_strcasecmp(choice->choice, "MP") ||
!_cups_strcasecmp(choice->choice, "MPTray")) pwg_name = "alternate";
else if (!strcasecmp(choice->choice, "LargeCapacity"))
else if (!_cups_strcasecmp(choice->choice, "LargeCapacity")) pwg_name = "large-capacity";
else if (!strncasecmp(choice->choice, "Lower", 5))
else if (!_cups_strncasecmp(choice->choice, "Lower", 5)) pwg_name = "bottom";
else if (!strncasecmp(choice->choice, "Middle", 6))
else if (!_cups_strncasecmp(choice->choice, "Middle", 6)) pwg_name = "middle";
else if (!strncasecmp(choice->choice, "Upper", 5))
else if (!_cups_strncasecmp(choice->choice, "Upper", 5)) pwg_name = "top";
else if (!strncasecmp(choice->choice, "Side", 4))
else if (!_cups_strncasecmp(choice->choice, "Side", 4)) pwg_name = "side";
else if (!strcasecmp(choice->choice, "Roll") ||
!strcasecmp(choice->choice, "Roll1"))
else if (!_cups_strcasecmp(choice->choice, "Roll") ||
!_cups_strcasecmp(choice->choice, "Roll1")) pwg_name = "main-roll";
else if (!strcasecmp(choice->choice, "Roll2"))
else if (!_cups_strcasecmp(choice->choice, "Roll2")) pwg_name = "alternate-roll"; else { @@ -914,31 +914,31 @@ i > 0; i --, choice ++, map ++) {
if (!strncasecmp(choice->choice, "Auto", 4) ||
!strcasecmp(choice->choice, "Any") ||
!strcasecmp(choice->choice, "Default"))
if (!_cups_strncasecmp(choice->choice, "Auto", 4) ||
!_cups_strcasecmp(choice->choice, "Any") ||
!_cups_strcasecmp(choice->choice, "Default")) pwg_name = "auto";
else if (!strncasecmp(choice->choice, "Card", 4))
else if (!_cups_strncasecmp(choice->choice, "Card", 4)) pwg_name = "cardstock";
else if (!strncasecmp(choice->choice, "Env", 3))
else if (!_cups_strncasecmp(choice->choice, "Env", 3)) pwg_name = "envelope";
else if (!strncasecmp(choice->choice, "Gloss", 5))
else if (!_cups_strncasecmp(choice->choice, "Gloss", 5)) pwg_name = "photographic-glossy";
else if (!strcasecmp(choice->choice, "HighGloss"))
else if (!_cups_strcasecmp(choice->choice, "HighGloss")) pwg_name = "photographic-high-gloss";
else if (!strcasecmp(choice->choice, "Matte"))
else if (!_cups_strcasecmp(choice->choice, "Matte")) pwg_name = "photographic-matte";
else if (!strncasecmp(choice->choice, "Plain", 5))
else if (!_cups_strncasecmp(choice->choice, "Plain", 5)) pwg_name = "stationery";
else if (!strncasecmp(choice->choice, "Coated", 6))
else if (!_cups_strncasecmp(choice->choice, "Coated", 6)) pwg_name = "stationery-coated";
else if (!strcasecmp(choice->choice, "Inkjet"))
else if (!_cups_strcasecmp(choice->choice, "Inkjet")) pwg_name = "stationery-inkjet";
else if (!strcasecmp(choice->choice, "Letterhead"))
else if (!_cups_strcasecmp(choice->choice, "Letterhead")) pwg_name = "stationery-letterhead";
else if (!strncasecmp(choice->choice, "Preprint", 8))
else if (!_cups_strncasecmp(choice->choice, "Preprint", 8)) pwg_name = "stationery-preprinted";
else if (!strncasecmp(choice->choice, "Transparen", 10))
else if (!_cups_strncasecmp(choice->choice, "Transparen", 10)) pwg_name = "transparency"; else { @@ -1057,7 +1057,7 @@ } else if (color_model_val) {
if (!strcasecmp(color_model_val, "Gray"))
if (!_cups_strcasecmp(color_model_val, "Gray")) pwg_print_color_mode = _PWG_PRINT_COLOR_MODE_MONOCHROME; else pwg_print_color_mode = _PWG_PRINT_COLOR_MODE_COLOR; @@ -1200,16 +1200,16 @@ i > 0; i --, choice ++) {
if ((!strcasecmp(choice->choice, "None") ||
!strcasecmp(choice->choice, "False")) && !pc->sides_1sided)
if ((!_cups_strcasecmp(choice->choice, "None") ||
!_cups_strcasecmp(choice->choice, "False")) && !pc->sides_1sided) pc->sides_1sided = _cupsStrAlloc(choice->choice);
else if ((!strcasecmp(choice->choice, "DuplexNoTumble") ||
!strcasecmp(choice->choice, "LongEdge") ||
!strcasecmp(choice->choice, "Top")) && !pc->sides_2sided_long)
else if ((!_cups_strcasecmp(choice->choice, "DuplexNoTumble") ||
!_cups_strcasecmp(choice->choice, "LongEdge") ||
!_cups_strcasecmp(choice->choice, "Top")) && !pc->sides_2sided_long) pc->sides_2sided_long = _cupsStrAlloc(choice->choice);
else if ((!strcasecmp(choice->choice, "DuplexTumble") ||
!strcasecmp(choice->choice, "ShortEdge") ||
!strcasecmp(choice->choice, "Bottom")) &&
else if ((!_cups_strcasecmp(choice->choice, "DuplexTumble") ||
!_cups_strcasecmp(choice->choice, "ShortEdge") ||
!_cups_strcasecmp(choice->choice, "Bottom")) && !pc->sides_2sided_short) pc->sides_2sided_short = _cupsStrAlloc(choice->choice); } @@ -1249,13 +1249,13 @@ for (filter = (const char )cupsArrayFirst(pc->filters); filter; filter = (const char )cupsArrayNext(pc->filters))
if (!strncasecmp(filter, "application/vnd.cups-command", 28) &&
if (!_cups_strncasecmp(filter, "application/vnd.cups-command", 28) && _cups_isspace(filter[28])) break;

if (!filter && ((ppd_attr = ppdFindAttr(ppd, "cupsCommands", NULL)) == NULL ||
strcasecmp(ppd_attr->value, "none")))
_cups_strcasecmp(ppd_attr->value, "none"))) { /*
- No command filter and no cupsCommands keyword telling us not to use one. @@ -1266,7 +1266,7 @@ for (filter = (const char )cupsArrayFirst(pc->filters); filter; filter = (const char )cupsArrayNext(pc->filters))
if (!strncasecmp(filter, "application/vnd.cups-postscript", 31) &&
if (!_cups_strncasecmp(filter, "application/vnd.cups-postscript", 31) && _cups_isspace(filter[31])) break;

@@ -1289,7 +1289,7 @@ }

if ((ppd_attr = ppdFindAttr(ppd, "cupsSingleFile", NULL)) != NULL)

pc->single_file = !strcasecmp(ppd_attr->value, "true");
pc->single_file = !_cups_strcasecmp(ppd_attr->value, "true");

/*
- Copy the product string, if any... @@ -1427,7 +1427,7 @@
for (i = 0; i < pc->num_bins; i ++)
if (!strcasecmp(output_bin, pc->bins[i].ppd))
if (!_cups_strcasecmp(output_bin, pc->bins[i].ppd)) return (pc->bins[i].pwg);

return (NULL); @@ -1491,7 +1491,7 @@ int i; /* Looping var */

for (i = 0; i < pc->num_sources; i ++)
if (!strcasecmp(keyword, pc->sources[i].pwg))
if (!_cups_strcasecmp(keyword, pc->sources[i].pwg)) return (pc->sources[i].ppd); }

@@ -1545,7 +1545,7 @@ int i; /* Looping var */

 for (i = 0; i < pc->num_types; i ++)

if (!strcasecmp(keyword, pc->types[i].pwg))
if (!_cups_strcasecmp(keyword, pc->types[i].pwg)) return (pc->types[i].ppd); }

@@ -1579,7 +1579,7 @@

for (i = 0; i < pc->num_bins; i ++)

if (!strcasecmp(output_bin, pc->bins[i].pwg))
if (!_cups_strcasecmp(output_bin, pc->bins[i].pwg)) return (pc->bins[i].ppd);

return (NULL); @@ -1667,8 +1667,8 @@ DEBUG_printf(("2_ppdCacheGetPageSize: size[%d]=[\"%s\" \"%s\"]", (int)(size - pc->sizes), size->map.pwg, size->map.ppd));

if (!strcasecmp(ppd_name, size->map.ppd) ||

!strcasecmp(ppd_name, size->map.pwg))
if (!_cups_strcasecmp(ppd_name, size->map.ppd) ||
```
   !_cups_strcasecmp(ppd_name, size->map.pwg))
```
{ if (exact) *exact = 1; @@ -1717,8 +1717,8 @@ closest = NULL; dclosest = 999999999;
if (!ppd_name || strncasecmp(ppd_name, "Custom.", 7) ||
strncasecmp(ppdname, "custom", 7))
if (!ppd_name || _cups_strncasecmp(ppd_name, "Custom.", 7) ||
```
_cups_strncasecmp(ppd_name, "custom_", 7))
```
{ for (i = pc->num_sizes, size = pc->sizes; i > 0; i --, size ++) { @@ -1846,7 +1846,7 @@ if (!pc || !page_size) return (NULL);
if (!strncasecmp(page_size, "Custom.", 7))
if (!_cups_strncasecmp(page_size, "Custom.", 7)) { /*
- Custom size; size name can be one of the following: @@ -1872,27 +1872,27 @@ if (!ptr) return (NULL);
if (!strcasecmp(ptr, "in"))
if (!_cups_strcasecmp(ptr, "in")) { w = 2540.0; l = 2540.0; }
else if (!strcasecmp(ptr, "ft"))
else if (!_cups_strcasecmp(ptr, "ft")) { w = 12.0 * 2540.0; l = 12.0 * 2540.0; }
else if (!strcasecmp(ptr, "mm"))
else if (!_cups_strcasecmp(ptr, "mm")) { w = 100.0; l = 100.0; }
else if (!strcasecmp(ptr, "cm"))
else if (!_cups_strcasecmp(ptr, "cm")) { w = 1000.0; l = 1000.0; }
else if (!strcasecmp(ptr, "m"))
else if (!_cups_strcasecmp(ptr, "m")) { w = 100000.0; l = 100000.0; @@ -1914,7 +1914,7 @@ */

for (i = pc->num_sizes, size = pc->sizes; i > 0; i --, size ++)
if (!strcasecmp(page_size, size->map.ppd))
if (!_cups_strcasecmp(page_size, size->map.ppd)) return (size);

return (NULL); @@ -1943,7 +1943,7 @@ return (NULL);

for (i = pc->num_sources, source = pc->sources; i > 0; i --, source ++)
if (!strcasecmp(input_slot, source->ppd))
if (!_cups_strcasecmp(input_slot, source->ppd)) return (source->pwg);

return (NULL); @@ -1972,7 +1972,7 @@ return (NULL);

for (i = pc->num_types, type = pc->types; i > 0; i --, type ++)
if (!strcasecmp(media_type, type->ppd))
if (!_cups_strcasecmp(media_type, type->ppd)) return (type->pwg);

return (NULL); @@ -2173,27 +2173,27 @@ if (!media_source || !name || namesize < PPD_MAX_NAME) return (NULL);
if (strcasecmp(media_source, "main"))
if (_cups_strcasecmp(media_source, "main")) strlcpy(name, "Cassette", namesize);
else if (strcasecmp(media_source, "alternate"))
else if (_cups_strcasecmp(media_source, "alternate")) strlcpy(name, "Multipurpose", namesize);
else if (strcasecmp(media_source, "large-capacity"))
else if (_cups_strcasecmp(media_source, "large-capacity")) strlcpy(name, "LargeCapacity", namesize);
else if (strcasecmp(media_source, "bottom"))
else if (_cups_strcasecmp(media_source, "bottom")) strlcpy(name, "Lower", namesize);
else if (strcasecmp(media_source, "middle"))
else if (_cups_strcasecmp(media_source, "middle")) strlcpy(name, "Middle", namesize);
else if (strcasecmp(media_source, "top"))
else if (_cups_strcasecmp(media_source, "top")) strlcpy(name, "Upper", namesize);
else if (strcasecmp(media_source, "rear"))
else if (_cups_strcasecmp(media_source, "rear")) strlcpy(name, "Rear", namesize);
else if (strcasecmp(media_source, "side"))
else if (_cups_strcasecmp(media_source, "side")) strlcpy(name, "Side", namesize);
else if (strcasecmp(media_source, "envelope"))
else if (_cups_strcasecmp(media_source, "envelope")) strlcpy(name, "Envelope", namesize);
else if (strcasecmp(media_source, "main-roll"))
else if (_cups_strcasecmp(media_source, "main-roll")) strlcpy(name, "Roll", namesize);
else if (strcasecmp(media_source, "alternate-roll"))
else if (_cups_strcasecmp(media_source, "alternate-roll")) strlcpy(name, "Roll2", namesize); else pwg_ppdize_name(media_source, name, namesize); @@ -2220,29 +2220,29 @@ if (!media_type || !name || namesize < PPD_MAX_NAME) return (NULL);
if (strcasecmp(media_type, "auto"))
if (_cups_strcasecmp(media_type, "auto")) strlcpy(name, "Auto", namesize);
else if (strcasecmp(media_type, "cardstock"))
else if (_cups_strcasecmp(media_type, "cardstock")) strlcpy(name, "Cardstock", namesize);
else if (strcasecmp(media_type, "envelope"))
else if (_cups_strcasecmp(media_type, "envelope")) strlcpy(name, "Envelope", namesize);
else if (strcasecmp(media_type, "photographic-glossy"))
else if (_cups_strcasecmp(media_type, "photographic-glossy")) strlcpy(name, "Glossy", namesize);
else if (strcasecmp(media_type, "photographic-high-gloss"))
else if (_cups_strcasecmp(media_type, "photographic-high-gloss")) strlcpy(name, "HighGloss", namesize);
else if (strcasecmp(media_type, "photographic-matte"))
else if (_cups_strcasecmp(media_type, "photographic-matte")) strlcpy(name, "Matte", namesize);
else if (strcasecmp(media_type, "stationery"))
else if (_cups_strcasecmp(media_type, "stationery")) strlcpy(name, "Plain", namesize);
else if (strcasecmp(media_type, "stationery-coated"))
else if (_cups_strcasecmp(media_type, "stationery-coated")) strlcpy(name, "Coated", namesize);
else if (strcasecmp(media_type, "stationery-inkjet"))
else if (_cups_strcasecmp(media_type, "stationery-inkjet")) strlcpy(name, "Inkjet", namesize);
else if (strcasecmp(media_type, "stationery-letterhead"))
else if (_cups_strcasecmp(media_type, "stationery-letterhead")) strlcpy(name, "Letterhead", namesize);
else if (strcasecmp(media_type, "stationery-preprinted"))
else if (_cups_strcasecmp(media_type, "stationery-preprinted")) strlcpy(name, "Preprinted", namesize);
else if (strcasecmp(media_type, "transparency"))
else if (_cups_strcasecmp(media_type, "transparency")) strlcpy(name, "Transparency", namesize); else pwg_ppdize_name(media_type, name, namesize); Index: cups/testconflicts.c

--- cups/testconflicts.c (revision 9791) +++ cups/testconflicts.c (working copy) @@ -3,7 +3,7 @@ *
- PPD constraint test program for CUPS.
* Copyright 2008-2010 by Apple Inc.
* Copyright 2008-2011 by Apple Inc. *
- These coded instructions, statements, and computer programs are the
- property of Apple Inc. and are protected by Federal copyright @@ -81,7 +81,7 @@ { fputs("Resolved conflicts with the following options:\n ", stdout); for (i = 0; i < num_options; i ++)
if (!option || strcasecmp(option, options[i].name))
if (!option || _cups_strcasecmp(option, options[i].name)) printf(" %s=%s", options[i].name, options[i].value); putchar('\n');

Index: cups/adminutil.c

--- cups/adminutil.c (revision 9791) +++ cups/adminutil.c (working copy) @@ -531,7 +531,7 @@

return (0);
   }

+ /*
- Do the rpcclient command needed for the CUPS drivers... */ @@ -735,7 +735,7 @@
return (0); }
+ /*
- Do the rpcclient command needed for the CUPS drivers... */ @@ -991,7 +991,7 @@ if (!value && strncmp(line, "</", 2)) value = line + strlen(line);

if ((!strcasecmp(line, "Port") || !strcasecmp(line, "Listen")) && value)

if ((!_cups_strcasecmp(line, "Port") || !_cups_strcasecmp(line, "Listen")) && value) { char port; / Pointer to port number, if any */

@@ -1008,7 +1008,7 @@ continue; }

if (strcasecmp(value, "localhost") && strcmp(value, "127.0.0.1")
if (_cups_strcasecmp(value, "localhost") && strcmp(value, "127.0.0.1")
ifdef AF_LOCAL
```
     && _value != '/'
```
endif /_ AF_LOCAL */

@@ -1018,36 +1018,36 @@ ) remote_access = 1; }
else if (!strcasecmp(line, "Browsing"))
else if (!_cups_strcasecmp(line, "Browsing")) {
browsing = !strcasecmp(value, "yes") || !strcasecmp(value, "on") ||
!strcasecmp(value, "true");
browsing = !_cups_strcasecmp(value, "yes") || !_cups_strcasecmp(value, "on") ||
!_cups_strcasecmp(value, "true"); }
else if (!strcasecmp(line, "BrowseAddress"))
else if (!_cups_strcasecmp(line, "BrowseAddress")) { browse_address = 1; }
else if (!strcasecmp(line, "BrowseAllow"))
else if (!_cups_strcasecmp(line, "BrowseAllow")) { browse_allow = 1; }
else if (!strcasecmp(line, "BrowseOrder"))
else if (!_cups_strcasecmp(line, "BrowseOrder")) {
browse_allow = !strncasecmp(value, "deny,", 5);
browse_allow = !_cups_strncasecmp(value, "deny,", 5); }
else if (!strcasecmp(line, "LogLevel"))
else if (!_cups_strcasecmp(line, "LogLevel")) {
debug_logging = !strncasecmp(value, "debug", 5);
debug_logging = !_cups_strncasecmp(value, "debug", 5); }
else if (!strcasecmp(line, "<Policy") && !strcasecmp(value, "default"))
else if (!_cups_strcasecmp(line, "<Policy") && !_cups_strcasecmp(value, "default")) { in_policy = 1; }
else if (!strcasecmp(line, ""))
else if (!_cups_strcasecmp(line, "")) { in_policy = 0; }
else if (!strcasecmp(line, "<Limit") && in_policy && value)
```
else if (!_cups_strcasecmp(line, "<Limit") && in_policy && value)
```
{ /*
- See if the policy limit is for the Cancel-Job operation... @@ -1063,7 +1063,7 @@ if (valptr) valptr++ = '\0';

   if (!strcasecmp(value, "cancel-job") || !strcasecmp(value, "all"))

if (!_cups_strcasecmp(value, "cancel-job") || !_cups_strcasecmp(value, "all")) { in_cancel_job = 1; break; @@ -1072,26 +1072,26 @@ for (value = valptr; _cups_isspace(*value); value ++); } }
else if (!strcasecmp(line, ""))
else if (!_cups_strcasecmp(line, "")) { in_cancel_job = 0; }
else if (!strcasecmp(line, "Require") && in_cancel_job)
else if (!_cups_strcasecmp(line, "Require") && in_cancel_job) { cancel_policy = 0; }
else if (!strcasecmp(line, "<Location") && value)
else if (!_cups_strcasecmp(line, "<Location") && value) {
in_admin_location = !strcasecmp(value, "/admin");
in_admin_location = !_cups_strcasecmp(value, "/admin"); in_location = 1; }
else if (!strcasecmp(line, ""))
else if (!_cups_strcasecmp(line, "")) { in_admin_location = 0; in_location = 0; }
else if (!strcasecmp(line, "Allow") && value &&
strcasecmp(value, "localhost") && strcasecmp(value, "127.0.0.1")
else if (!_cups_strcasecmp(line, "Allow") && value &&
_cups_strcasecmp(value, "localhost") && _cups_strcasecmp(value, "127.0.0.1")
ifdef AF_LOCAL
```
   && _value != '/'
```
endif /_ AF_LOCAL */

@@ -1102,16 +1102,16 @@ { if (in_admin_location) remote_admin = 1;
else if (!strcasecmp(value, "all"))
else if (!_cups_strcasecmp(value, "all")) remote_any = 1; } else if (line[0] != '<' && !in_location && !in_policy &&
strcasecmp(line, "Allow") &&
strcasecmp(line, "AuthType") &&
strcasecmp(line, "Deny") &&
strcasecmp(line, "Order") &&
strcasecmp(line, "Require") &&
strcasecmp(line, "Satisfy"))
_cups_strcasecmp(line, "Allow") &&
_cups_strcasecmp(line, "AuthType") &&
_cups_strcasecmp(line, "Deny") &&
_cups_strcasecmp(line, "Order") &&
_cups_strcasecmp(line, "Require") &&

   _cups_strcasecmp(line, "Satisfy"))
cg->cupsd_num_settings = cupsAddOption(line, value,
                                 cg->cupsd_num_settings,
                 &(cg->cupsd_settings));

@@ -1484,7 +1484,7 @@

while (cupsFileGetConf(cupsd, line, sizeof(line), &value, &linenum)) {

if ((!strcasecmp(line, "Port") || !strcasecmp(line, "Listen")) &&
if ((!_cups_strcasecmp(line, "Port") || !_cups_strcasecmp(line, "Listen")) && (remote_admin >= 0 || remote_any > 0 || share_printers >= 0)) { if (!wrote_port_listen) @@ -1516,13 +1516,13 @@ ) cupsFilePrintf(temp, "Listen %s\n", value); }
else if ((!strcasecmp(line, "Browsing") ||
!strcasecmp(line, "BrowseAddress") ||
!strcasecmp(line, "BrowseAllow") ||
!strcasecmp(line, "BrowseDeny") ||
!strcasecmp(line, "BrowseLocalProtocols") ||
!strcasecmp(line, "BrowseRemoteProtocols") ||
!strcasecmp(line, "BrowseOrder")) &&
else if ((!_cups_strcasecmp(line, "Browsing") ||
!_cups_strcasecmp(line, "BrowseAddress") ||
!_cups_strcasecmp(line, "BrowseAllow") ||
!_cups_strcasecmp(line, "BrowseDeny") ||
!_cups_strcasecmp(line, "BrowseLocalProtocols") ||
!_cups_strcasecmp(line, "BrowseRemoteProtocols") ||
!_cups_strcasecmp(line, "BrowseOrder")) && (remote_printers >= 0 || share_printers >= 0)) { if (!wrote_browsing) @@ -1604,7 +1604,7 @@ } } }
else if (!strcasecmp(line, "LogLevel") && debug_logging >= 0)
else if (!_cups_strcasecmp(line, "LogLevel") && debug_logging >= 0) { wrote_loglevel = 1;

@@ -1620,15 +1620,15 @@ cupsFilePuts(temp, "LogLevel " CUPS_DEFAULT_LOG_LEVEL "\n"); } }

else if (!strcasecmp(line, "<Policy"))
else if (!_cups_strcasecmp(line, "<Policy")) {
in_default_policy = !strcasecmp(value, "default");
```
in_default_policy = !_cups_strcasecmp(value, "default");
```
in_policy = 1;

cupsFilePrintf(temp, "%s %s>\n", line, value); indent += 2; }
else if (!strcasecmp(line, ""))
else if (!_cups_strcasecmp(line, "")) { indent -= 2; if (!wrote_policy && in_default_policy) @@ -1650,7 +1650,7 @@

cupsFilePuts(temp, "\n"); }
else if (!strcasecmp(line, "<Location"))
else if (!_cups_strcasecmp(line, "<Location")) { in_location = 1; indent += 2; @@ -1663,7 +1663,7 @@

cupsFilePrintf(temp, "%s %s>\n", line, value); }
else if (!strcasecmp(line, ""))
else if (!_cups_strcasecmp(line, "")) { in_location = 0; indent -= 2; @@ -1729,50 +1729,50 @@

cupsFilePuts(temp, "\n"); }
else if (!strcasecmp(line, "<Limit"))
else if (!_cups_strcasecmp(line, "<Limit")) { if (in_default_policy) { /*
- See if the policy limit is for the Cancel-Job operation... */
+ char valptr; / Pointer into value */

if (!strcasecmp(value, "cancel-job") && user_cancel_any >= 0) + +
if (!_cups_strcasecmp(value, "cancel-job") && user_cancel_any >= 0) { /*
- Don't write anything for this limit section... */
+ in_cancel_job = 2; } else { cupsFilePrintf(temp, "%*s%s", indent, "", line);
+ while (_value) { for (valptr = value; *valptr && !_cups_isspace(_valptr); valptr ++);
+ if (valptr) valptr++ = '\0';
if (!strcasecmp(value, "cancel-job") && user_cancel_any >= 0) +
if (!_cups_strcasecmp(value, "cancel-job") && user_cancel_any >= 0) { / * Write everything except for this definition... /
+ in_cancel_job = 1; } else cupsFilePrintf(temp, " %s", value);
+ for (value = valptr; _cups_isspace(*value); value ++); }
+ cupsFilePuts(temp, ">\n"); } } @@ -1781,7 +1781,7 @@

indent += 2; }
else if (!strcasecmp(line, "") && in_cancel_job)
else if (!_cups_strcasecmp(line, "") && in_cancel_job) { indent -= 2;

@@ -1804,8 +1804,8 @@ else if ((((in_admin_location || in_conf_location || in_root_location) && (remote_admin >= 0 || remote_any > 0)) || (in_root_location && share_printers >= 0)) &&

(!strcasecmp(line, "Allow") || !strcasecmp(line, "Deny") ||
!strcasecmp(line, "Order")))
(!_cups_strcasecmp(line, "Allow") || !_cups_strcasecmp(line, "Deny") ||
```
  !_cups_strcasecmp(line, "Order")))
```
continue; else if (in_cancel_job == 2) continue; @@ -2034,8 +2034,8 @@

for (i = numsettings, setting = settings; i > 0; i --, setting ++) if (setting->name[0] != '' &&
strcasecmp(setting->name, "Listen") &&
strcasecmp(setting->name, "Port") &&
_cups_strcasecmp(setting->name, "Listen") &&
_cups_strcasecmp(setting->name, "Port") && !cupsGetOption(setting->name, cupsd_num_settings, cupsd_settings)) { /* @@ -2254,14 +2254,14 @@

httpGetHostname(http, host, sizeof(host));
if (strcasecmp(cg->cupsd_hostname, host))
if (_cups_strcasecmp(cg->cupsd_hostname, host)) invalidate_cupsd_cache(cg);

snprintf(name, namesize, "%s/cupsd.conf", cg->cups_serverroot); *remote = 0;

ifndef WIN32
if (!strcasecmp(host, "localhost") && !access(name, R_OK))
if (!_cups_strcasecmp(host, "localhost") && !access(name, R_OK)) { /*
- Read the local file rather than using HTTP... Index: cups/request.c
  
  --- cups/request.c (revision 9791) +++ cups/request.c (working copy) @@ -657,7 +657,7 @@
- Reconnect if the last response had a "Connection: close"... */
if (!strcasecmp(http->fields[HTTP_FIELD_CONNECTION], "close"))
if (!_cups_strcasecmp(http->fields[HTTP_FIELD_CONNECTION], "close")) if (httpReconnect(http)) { _cupsSetError(IPP_SERVICE_UNAVAILABLE, NULL, 0); Index: cups/encode.c

--- cups/encode.c (revision 9791) +++ cups/encode.c (working copy) @@ -3,7 +3,7 @@ *
- Option encoding routines for CUPS.
* Copyright 2007-2010 by Apple Inc.
- Copyright 2007-2011 by Apple Inc.
- Copyright 1997-2007 by Easy Software Products.
- These coded instructions, statements, and computer programs are the @@ -271,8 +271,8 @@
- Skip document format options that are handled above... */
if (!strcasecmp(option->name, "raw") ||
!strcasecmp(option->name, "document-format") ||
if (!_cups_strcasecmp(option->name, "raw") ||
!_cups_strcasecmp(option->name, "document-format") || !option->name[0]) continue;

@@ -302,8 +302,8 @@ else if (group_tag != IPP_TAG_PRINTER) continue;

if (!strcasecmp(option->value, "true") ||
!strcasecmp(option->value, "false"))
if (!_cups_strcasecmp(option->value, "true") ||
```
   !_cups_strcasecmp(option->value, "false"))
```
value_tag = IPP_TAG_BOOLEAN; else value_tag = IPP_TAG_NAME; @@ -460,9 +460,9 @@ break;

case IPP_TAG_BOOLEAN :
if (!strcasecmp(val, "true") ||
!strcasecmp(val, "on") ||
!strcasecmp(val, "yes"))
if (!_cups_strcasecmp(val, "true") ||
!_cups_strcasecmp(val, "on") ||
```
    !_cups_strcasecmp(val, "yes"))
{
/*
* Boolean value - true...
```
@@ -524,7 +524,7 @@ else attr->values[j].resolution.yres = attr->values[j].resolution.xres;
```
if (!strcasecmp(s, "dpc"))
```
if (!_cups_strcasecmp(s, "dpc")) attr->values[j].resolution.units = IPP_RES_PER_CM; else attr->values[j].resolution.units = IPP_RES_PER_INCH; Index: cups/string.c

--- cups/string.c (revision 9791) +++ cups/string.c (working copy) @@ -3,7 +3,7 @@ *
- String functions for CUPS.
* Copyright 2007-2010 by Apple Inc.
- Copyright 2007-2011 by Apple Inc.
- Copyright 1997-2007 by Easy Software Products.
- These coded instructions, statements, and computer programs are the @@ -571,7 +571,7 @@
void _cups_strcpy(char dst, / I - Destination string */
const char src) / I - Source string */
const char src) / I - Source string _/ { while (_src) dst++ = src++; @@ -606,16 +606,15 @@
- '_cups_strcasecmp()' - Do a case-insensitive comparison. */

-#ifndef HAVESTRCASECMP int /* O - Result of comparison (-1, 0, or 1) / _cupsstrcasecmp(const char *s, / I - First string */

const char t) / I - Second string */
const char t) / I - Second string _/ { while (_s != '\0' && *t != '\0') {
if (tolower(_s & 255) < tolower(_t & 255))
if (_cups_tolower(_s) < _cups_tolower(_t)) return (-1);
else if (tolower(_s & 255) > tolower(_t & 255))
else if (_cups_tolower(_s) > _cups_tolower(_t)) return (1);

s ++; @@ -629,13 +628,11 @@ else return (-1); } -#endif /* !HAVE_STRCASECMP */

/*
- '_cups_strncasecmp()' - Do a case-insensitive comparison on up to N chars. */

-#ifndef HAVESTRNCASECMP int /* O - Result of comparison (-1, 0, or 1) / _cupsstrncasecmp(const char *s, / I - First string / const char *t, / I - Second string _/ @@ -643,9 +640,9 @@ { while (_s != '\0' && *t != '\0' && n > 0) {

if (tolower(_s & 255) < tolower(_t & 255))
if (_cups_tolower(_s) < _cups_tolower(_t)) return (-1);
else if (tolower(_s & 255) > tolower(_t & 255))
else if (_cups_tolower(_s) > _cups_tolower(_t)) return (1);

s ++; @@ -662,7 +659,6 @@ else return (-1); } -#endif /* !HAVE_STRNCASECMP */

ifndef HAVE_STRLCAT

Index: cups/page.c

--- cups/page.c (revision 9791) +++ cups/page.c (working copy) @@ -3,7 +3,7 @@ *
- Page size functions for CUPS.
* Copyright 2007-2010 by Apple Inc.
- Copyright 2007-2011 by Apple Inc.
- Copyright 1997-2007 by Easy Software Products, all rights reserved.
- These coded instructions, statements, and computer programs are the @@ -96,27 +96,27 @@ if (!nameptr) return (NULL);
```
if (!strcasecmp(nameptr, "in"))
```
if (!_cups_strcasecmp(nameptr, "in")) { w = 72.0; l = 72.0; }
else if (!strcasecmp(nameptr, "ft"))
else if (!_cups_strcasecmp(nameptr, "ft")) { w = 12.0 * 72.0; l = 12.0 * 72.0; }
else if (!strcasecmp(nameptr, "mm"))
else if (!_cups_strcasecmp(nameptr, "mm")) { w = 72.0 / 25.4; l = 72.0 / 25.4; }
else if (!strcasecmp(nameptr, "cm"))
else if (!_cups_strcasecmp(nameptr, "cm")) { w = 72.0 / 2.54; l = 72.0 / 2.54; }
else if (!strcasecmp(nameptr, "m"))
```
else if (!_cups_strcasecmp(nameptr, "m"))
```
{ w = 72.0 / 0.0254; l = 72.0 / 0.0254; @@ -158,7 +158,7 @@ */

for (i = ppd->num_sizes, size = ppd->sizes; i > 0; i --, size ++)
if (!strcasecmp(name, size->name))
if (!_cups_strcasecmp(name, size->name)) { DEBUG_printf(("3ppdPageSize: Returning %p (\"%s\", %gx%g)", size, size->name, size->width, size->length)); Index: cups/snmp.c

--- cups/snmp.c (revision 9791) +++ cups/snmp.c (working copy) @@ -3,7 +3,7 @@ *
- SNMP functions for CUPS.
* Copyright 2007-2010 by Apple Inc.
* Copyright 2007-2011 by Apple Inc.
- Copyright 2006-2007 by Easy Software Products, all rights reserved.
- These coded instructions, statements, and computer programs are the @@ -178,7 +178,7 @@ { linenum = 0; while (cupsFileGetConf(fp, line, sizeof(line), &value, &linenum))
if (!strcasecmp(line, "Community") && value)
if (!_cups_strcasecmp(line, "Community") && value) { strlcpy(cg->snmp_community, value, sizeof(cg->snmp_community)); break; @@ -728,7 +728,7 @@ packet.request_type = request_type; packet.request_id = request_id; packet.object_type = CUPS_ASN1_NULL_VALUE;
+ strlcpy(packet.community, community, sizeof(packet.community));

for (i = 0; oid[i] >= 0 && i < (CUPS_SNMP_MAX_OID - 1); i ++) @@ -963,8 +963,8 @@ } } }
/*
'asn1_decode_snmp()' - Decode a SNMP packet. */ Index: cups/testfile.c

--- cups/testfile.c (revision 9791) +++ cups/testfile.c (working copy) @@ -3,7 +3,7 @@ *
File test program for CUPS. *
- * Copyright 2007-2010 by Apple Inc.
- * Copyright 2007-2011 by Apple Inc.
Copyright 1997-2007 by Easy Software Products. *
These coded instructions, statements, and computer programs are the @@ -429,7 +429,7 @@ */

unlink("testfile.dat");
- /*
- Return the test status... */ @@ -676,7 +676,7 @@ for (i = 0; i < 1000; i ++) if (!cupsFileGetConf(fp, line, sizeof(line), &value, &linenum)) break;
- else if (strcasecmp(line, "TestLine") || !value || atoi(value) != i ||
- else if (_cups_strcasecmp(line, "TestLine") || !value || atoi(value) != i || linenum != (i + 2)) break;

@@ -807,7 +807,7 @@ */

unlink(compression ? "testfile.dat.gz" : "testfile.dat");

+ /*

Return the test status... */

Index: cups/conflicts.c

--- cups/conflicts.c (revision 9791) +++ cups/conflicts.c (working copy) @@ -125,7 +125,7 @@ for (i = c->num_constraints, cptr = c->constraints; i > 0; i --, cptr ++)
- if (strcasecmp(cptr->option->keyword, option))
- if (_cups_strcasecmp(cptr->option->keyword, option)) { if (cptr->choice) num_options = cupsAddOption(cptr->option->keyword, @@ -229,7 +229,7 @@ for (i = 0; i < _num_options; i ++) num_newopts = cupsAddOption((_options)[i].name, (*options)[i].value, num_newopts, &newopts);
- if (option && strcasecmp(option, "Collate"))
- if (option && _cups_strcasecmp(option, "Collate")) num_newopts = cupsAddOption(option, choice, num_newopts, &newopts);
/* @@ -239,7 +239,7 @@ cupsArraySave(ppd->sorted_attrs);

resolvers = NULL;
- pass = cupsArrayNew((cups_array_func_t)strcasecmp, NULL);
- pass = cupsArrayNew((cups_array_func_t)_cups_strcasecmp, NULL); tries = 0;
while (tries < 100 && @@ -249,7 +249,7 @@ tries ++;

if (!resolvers)
- resolvers = cupsArrayNew((cups_array_func_t)strcasecmp, NULL);
- ```
resolvers = cupsArrayNew((cups_array_func_t)_cups_strcasecmp, NULL);
```
for (consts = (_ppd_cups_uiconsts_t *)cupsArrayFirst(active), changed = 0; consts; @@ -334,20 +334,20 @@ snprintf(firstpage, sizeof(firstpage), "APFIRSTPAGE%s", resoption);

if (option &&
- (!strcasecmp(resoption, option) ||
- !strcasecmp(firstpage, option) ||
- (!strcasecmp(option, "PageSize") &&
- !strcasecmp(resoption, "PageRegion")) ||
- (!strcasecmp(option, "AP_FIRSTPAGE_PageSize") &&
- !strcasecmp(resoption, "PageSize")) ||
- (!strcasecmp(option, "AP_FIRSTPAGE_PageSize") &&
- !strcasecmp(resoption, "PageRegion")) ||
- (!strcasecmp(option, "PageRegion") &&
- !strcasecmp(resoption, "PageSize")) ||
- (!strcasecmp(option, "AP_FIRSTPAGE_PageRegion") &&
- !strcasecmp(resoption, "PageSize")) ||
- (!strcasecmp(option, "AP_FIRSTPAGE_PageRegion") &&
- !strcasecmp(resoption, "PageRegion"))))
- (!_cups_strcasecmp(resoption, option) ||
- !_cups_strcasecmp(firstpage, option) ||
- (!_cups_strcasecmp(option, "PageSize") &&
- !_cups_strcasecmp(resoption, "PageRegion")) ||
- (!_cups_strcasecmp(option, "AP_FIRSTPAGE_PageSize") &&
- !_cups_strcasecmp(resoption, "PageSize")) ||
- (!_cups_strcasecmp(option, "AP_FIRSTPAGE_PageSize") &&
- !_cups_strcasecmp(resoption, "PageRegion")) ||
- (!_cups_strcasecmp(option, "PageRegion") &&
- !_cups_strcasecmp(resoption, "PageSize")) ||
- (!_cups_strcasecmp(option, "AP_FIRSTPAGE_PageRegion") &&
- !_cups_strcasecmp(resoption, "PageSize")) ||
- (!_cups_strcasecmp(option, "AP_FIRSTPAGE_PageRegion") &&
- ```
  !_cups_strcasecmp(resoption, "PageRegion"))))
```
continue;

/ @@ -405,11 +405,11 @@ /

if (option &&
- (!strcasecmp(constptr->option->keyword, option) ||
- (!strcasecmp(option, "PageSize") &&
- !strcasecmp(constptr->option->keyword, "PageRegion")) ||
- (!strcasecmp(option, "PageRegion") &&
- !strcasecmp(constptr->option->keyword, "PageSize"))))
- (!_cups_strcasecmp(constptr->option->keyword, option) ||
- (!_cups_strcasecmp(option, "PageSize") &&
- !_cups_strcasecmp(constptr->option->keyword, "PageRegion")) ||
- (!_cups_strcasecmp(option, "PageRegion") &&
- ```
!_cups_strcasecmp(constptr->option->keyword, "PageSize"))))
```
continue;

/* @@ -419,8 +419,8 @@ if ((value = cupsGetOption(constptr->option->keyword, num_newopts, newopts)) == NULL) {
- if (!strcasecmp(constptr->option->keyword, "PageSize") ||
- !strcasecmp(constptr->option->keyword, "PageRegion"))
- if (!_cups_strcasecmp(constptr->option->keyword, "PageSize") ||
- !_cups_strcasecmp(constptr->option->keyword, "PageRegion")) { if ((value = cupsGetOption("PageSize", num_newopts, newopts)) == NULL) @@ -441,7 +441,7 @@ } }
if (!strncasecmp(value, "Custom.", 7))

if (!_cups_strncasecmp(value, "Custom.", 7))
value = "Custom";

/*

@@ -450,7 +450,7 @@

 test = NULL;

   if (strcasecmp(value, constptr->option->defchoice) &&

   if (_cups_strcasecmp(value, constptr->option->defchoice) &&
(test = ppd_test_constraints(ppd, constptr->option->keyword,
                             constptr->option->defchoice,
             num_newopts, newopts,

@@ -479,9 +479,9 @@ cupsArrayDelete(test); test = NULL;

  if (strcasecmp(value, cptr->choice) &&

strcasecmp(constptr->option->defchoice, cptr->choice) &&
strcasecmp("Custom", cptr->choice) &&
if (_cups_strcasecmp(value, cptr->choice) &&
_cups_strcasecmp(constptr->option->defchoice, cptr->choice) &&

  _cups_strcasecmp("Custom", cptr->choice) &&
    (test = ppd_test_constraints(ppd, constptr->option->keyword,
                                 cptr->choice, num_newopts,
                 newopts,

@@ -532,7 +532,7 @@

handle manual collation... */

if (option && !strcasecmp(option, "Collate"))
if (option && !_cups_strcasecmp(option, "Collate")) num_newopts = cupsAddOption(option, choice, num_newopts, &newopts); else num_newopts = cupsRemoveOption("Collate", num_newopts, &newopts); @@ -704,7 +704,7 @@ for (i = installable->num_options, option = installable->options; i > 0; i --, option ++)
if (!strcasecmp(option->keyword, name))
if (!_cups_strcasecmp(option->keyword, name)) return (1); }

@@ -746,7 +746,7 @@ for (i = ppd->num_groups, installable = ppd->groups; i > 0; i --, installable ++)

if (!strcasecmp(installable->name, "InstallableOptions"))

if (!_cups_strcasecmp(installable->name, "InstallableOptions")) break;

if (i <= 0) @@ -764,10 +764,10 @@ */

if (i > 1 &&
!strcasecmp(oldconst[0].option1, oldconst[1].option2) &&
!strcasecmp(oldconst[0].choice1, oldconst[1].choice2) &&
!strcasecmp(oldconst[0].option2, oldconst[1].option1) &&
!strcasecmp(oldconst[0].choice2, oldconst[1].choice1))
!_cups_strcasecmp(oldconst[0].option1, oldconst[1].option2) &&
!_cups_strcasecmp(oldconst[0].choice1, oldconst[1].choice2) &&
!_cups_strcasecmp(oldconst[0].option2, oldconst[1].option1) &&
!_cups_strcasecmp(oldconst[0].choice2, oldconst[1].choice1)) continue;

/* @@ -796,8 +796,8 @@ consts->num_constraints = 2; consts->constraints = constptr;
if (!strncasecmp(oldconst->option1, "Custom", 6) &&
!strcasecmp(oldconst->choice1, "True"))
if (!_cups_strncasecmp(oldconst->option1, "Custom", 6) &&
!_cups_strcasecmp(oldconst->choice1, "True")) { constptr[0].option = ppdFindOption(ppd, oldconst->option1 + 6); constptr[0].choice = ppdFindChoice(constptr[0].option, "Custom"); @@ -821,8 +821,8 @@ continue; }
if (!strncasecmp(oldconst->option2, "Custom", 6) &&
!strcasecmp(oldconst->choice2, "True"))
if (!_cups_strncasecmp(oldconst->option2, "Custom", 6) &&
!_cups_strcasecmp(oldconst->choice2, "True")) { constptr[1].option = ppdFindOption(ppd, oldconst->option2 + 6); constptr[1].choice = ppdFindChoice(constptr[1].option, "Custom"); @@ -927,7 +927,7 @@ *ptr = '\0'; }

if (!strncasecmp(option, "Custom", 6) && !strcasecmp(choice, "True"))

if (!_cups_strncasecmp(option, "Custom", 6) && !_cups_strcasecmp(choice, "True")) { _cups_strcpy(option, option + 6); strcpy(choice, "Custom"); @@ -1024,11 +1024,11 @@ i > 0; i --, constptr ++) {
if (!strcasecmp(constptr->option->keyword, option))

 if (!_cups_strcasecmp(constptr->option->keyword, option))

break;

 if (!strncasecmp(option, "AP_FIRSTPAGE_", 13) &&

!strcasecmp(constptr->option->keyword, option + 13))
if (!_cups_strncasecmp(option, "APFIRSTPAGE", 13) &&
!_cups_strcasecmp(constptr->option->keyword, option + 13)) break; }

@@ -1046,8 +1046,8 @@ constptr->choice ? constptr->choice->choice : ""));

   if (constptr->choice &&

(!strcasecmp(constptr->option->keyword, "PageSize") ||
!strcasecmp(constptr->option->keyword, "PageRegion")))
(!_cups_strcasecmp(constptr->option->keyword, "PageSize") ||
```
    !_cups_strcasecmp(constptr->option->keyword, "PageRegion")))
```
{ / * PageSize and PageRegion are used depending on the selected input slot @@ -1056,8 +1056,8 @@ /
```
if (option && choice &&
```
(!strcasecmp(option, "PageSize") ||
!strcasecmp(option, "PageRegion")))
(!_cups_strcasecmp(option, "PageSize") ||
```
 !_cups_strcasecmp(option, "PageRegion")))
```
{ value = choice; } @@ -1073,12 +1073,12 @@ value = size->name; }

 if (value && !strncasecmp(value, "Custom.", 7))

 if (value && !_cups_strncasecmp(value, "Custom.", 7))

value = "Custom";

if (option && choice &&

(!strcasecmp(option, "AP_FIRSTPAGE_PageSize") ||
!strcasecmp(option, "AP_FIRSTPAGE_PageRegion")))
(!_cups_strcasecmp(option, "AP_FIRSTPAGE_PageSize") ||
```
 !_cups_strcasecmp(option, "AP_FIRSTPAGE_PageRegion")))
```
{ firstvalue = choice; } @@ -1087,11 +1087,11 @@ firstvalue = cupsGetOption("AP_FIRSTPAGE_PageRegion", num_options, options);

 if (firstvalue && !strncasecmp(firstvalue, "Custom.", 7))

 if (firstvalue && !_cups_strncasecmp(firstvalue, "Custom.", 7))

firstvalue = "Custom";

 if ((!value || strcasecmp(value, constptr->choice->choice)) &&

(!firstvalue || strcasecmp(firstvalue, constptr->choice->choice)))
if ((!value || _cups_strcasecmp(value, constptr->choice->choice)) &&
```
(!firstvalue || _cups_strcasecmp(firstvalue, constptr->choice->choice)))
```
{ DEBUG_puts("9ppd_test_constraints: NO"); break; @@ -1103,9 +1103,9 @@ * Compare against the constrained choice... */

 if (option && choice && !strcasecmp(option, constptr->option->keyword))

if (option && choice && !_cups_strcasecmp(option, constptr->option->keyword)) {
if (!strncasecmp(choice, "Custom.", 7))
if (!_cups_strncasecmp(choice, "Custom.", 7)) value = "Custom"; else value = choice; @@ -1113,7 +1113,7 @@ else if ((value = cupsGetOption(constptr->option->keyword, num_options, options)) != NULL) {
if (!strncasecmp(value, "Custom.", 7))
```
if (!_cups_strncasecmp(value, "Custom.", 7))
value = "Custom";
```
} else if (constptr->choice->marked) @@ -1128,9 +1128,9 @@ snprintf(firstpage, sizeof(firstpage), "APFIRSTPAGE%s", constptr->option->keyword);

 if (option && choice && !strcasecmp(option, firstpage))

if (option && choice && !_cups_strcasecmp(option, firstpage)) {
if (!strncasecmp(choice, "Custom.", 7))
if (!_cups_strncasecmp(choice, "Custom.", 7)) firstvalue = "Custom"; else firstvalue = choice; @@ -1138,7 +1138,7 @@ else if ((firstvalue = cupsGetOption(firstpage, num_options, options)) != NULL) {
if (!strncasecmp(firstvalue, "Custom.", 7))
```
if (!_cups_strncasecmp(firstvalue, "Custom.", 7))
firstvalue = "Custom";
```
} else @@ -1147,18 +1147,18 @@ DEBUG_printf(("9ppd_test_constraints: value=%s, firstvalue=%s", value, firstvalue));

 if ((!value || strcasecmp(value, constptr->choice->choice)) &&

(!firstvalue || strcasecmp(firstvalue, constptr->choice->choice)))
if ((!value || _cups_strcasecmp(value, constptr->choice->choice)) &&
(!firstvalue || _cups_strcasecmp(firstvalue, constptr->choice->choice))) { DEBUG_puts("9ppd_test_constraints: NO"); break; } } else if (option && choice &&
!strcasecmp(option, constptr->option->keyword))
!_cups_strcasecmp(option, constptr->option->keyword)) {
if (!strcasecmp(choice, "None") || !strcasecmp(choice, "Off") ||
!strcasecmp(choice, "False"))
if (!_cups_strcasecmp(choice, "None") || !_cups_strcasecmp(choice, "Off") ||
!_cups_strcasecmp(choice, "False")) { DEBUG_puts("9ppd_test_constraints: NO"); break; @@ -1167,8 +1167,8 @@ else if ((value = cupsGetOption(constptr->option->keyword, num_options, options)) != NULL) {
if (!strcasecmp(value, "None") || !strcasecmp(value, "Off") ||
!strcasecmp(value, "False"))
if (!_cups_strcasecmp(value, "None") || !_cups_strcasecmp(value, "Off") ||
```
!_cups_strcasecmp(value, "False"))
```
{ DEBUG_puts("9ppd_test_constraints: NO"); break; @@ -1180,9 +1180,9 @@

if ((marked = (ppd_choice_t *)cupsArrayFind(ppd->marked, &key)) == NULL ||
(!strcasecmp(marked->choice, "None") ||
!strcasecmp(marked->choice, "Off") ||
!strcasecmp(marked->choice, "False")))
(!_cups_strcasecmp(marked->choice, "None") ||
!_cups_strcasecmp(marked->choice, "Off") ||
!_cups_strcasecmp(marked->choice, "False"))) { DEBUG_puts("9ppd_test_constraints: NO"); break; Index: cups/testpwg.c

--- cups/testpwg.c (revision 9791) +++ cups/testpwg.c (working copy) @@ -124,7 +124,7 @@ puts("FAIL (Not Found)"); status = 1; }
else if (media && strcasecmp(pagesize, media->values[0].string.text))
else if (media && _cups_strcasecmp(pagesize, media->values[0].string.text)) { printf("FAIL (Got \"%s\", Expected \"%s\")\n", pagesize, media->values[0].string.text); @@ -288,7 +288,7 @@ puts("FAIL (Not Found)"); status = 1; }
else if (strcasecmp(pagesize, ppdsize))
else if (_cups_strcasecmp(pagesize, ppdsize)) { printf("FAIL (Got \"%s\", Expected \"%s\")\n", pagesize, ppdsize); status = 1; @@ -307,7 +307,7 @@ puts("FAIL (Not Found)"); status = 1; }
else if (strcasecmp(pagesize, ppdsize))
else if (_cups_strcasecmp(pagesize, ppdsize)) { printf("FAIL (Got \"%s\", Expected \"%s\")\n", pagesize, ppdsize); status = 1; Index: cups/testppd.c

--- cups/testppd.c (revision 9791) +++ cups/testppd.c (working copy) @@ -301,9 +301,9 @@ num_options = cupsGetConflicts(ppd, "InputSlot", "Envelope", &options); if (num_options != 2 || (val = cupsGetOption("PageRegion", num_options, options)) == NULL ||
strcasecmp(val, "Letter") ||
_cups_strcasecmp(val, "Letter") || (val = cupsGetOption("PageSize", num_options, options)) == NULL ||
strcasecmp(val, "Letter"))
_cups_strcasecmp(val, "Letter")) { printf("FAIL (%d options:", num_options); for (i = 0; i < num_options; i ++) @@ -352,8 +352,8 @@ num_options = 0; options = NULL; if (cupsResolveConflicts(ppd, NULL, NULL, &num_options, &options) &&
num_options == 1 && !strcasecmp(options[0].name, "InputSlot") &&
!strcasecmp(options[0].value, "Tray"))
num_options == 1 && !_cups_strcasecmp(options[0].name, "InputSlot") &&
!_cups_strcasecmp(options[0].value, "Tray")) puts("PASS (Resolved by changing InputSlot)"); else if (num_options > 0) { @@ -690,8 +690,8 @@ num_options = 0; options = NULL; if (cupsResolveConflicts(ppd, NULL, NULL, &num_options, &options) &&
num_options == 1 && !strcasecmp(options->name, "Quality") &&
!strcasecmp(options->value, "Normal"))
num_options == 1 && !_cups_strcasecmp(options->name, "Quality") &&
!_cups_strcasecmp(options->value, "Normal")) puts("PASS"); else if (num_options > 0) { Index: cups/options.c

--- cups/options.c (revision 9791) +++ cups/options.c (working copy) @@ -3,7 +3,7 @@ *
- Option routines for CUPS.
* Copyright 2007-2010 by Apple Inc.
- Copyright 2007-2011 by Apple Inc.
- Copyright 1997-2007 by Easy Software Products.
- These coded instructions, statements, and computer programs are the @@ -62,7 +62,7 @@
DEBUG_printf(("2cupsAddOption(name=\"%s\", value=\"%s\", num_options=%d, " "options=%p)", name, value, num_options, options));
+ if (!name || !name[0] || !value || !options || num_options < 0) { DEBUG_printf(("3cupsAddOption: Returning %d", num_options)); @@ -323,7 +323,7 @@
- Boolean option... */
```
if (!strncasecmp(name, "no", 2))
```

if (!_cups_strncasecmp(name, "no", 2))
num_options = cupsAddOption(name + 2, "false", num_options,
                      options);

else @@ -469,7 +469,7 @@ */

for (i = num_options, option = *options; i > 0; i --, option ++)

if (!strcasecmp(name, option->name))
if (!_cups_strcasecmp(name, option->name)) break;

if (i) @@ -590,7 +590,7 @@ cups_compare_options(cups_option_t a, / I - First option _/ cups_optiont *b) / I - Second option */ {
return (strcasecmp(a->name, b->name));
return (_cups_strcasecmp(a->name, b->name)); }

Index: systemv/lpstat.c

--- systemv/lpstat.c (revision 9791) +++ systemv/lpstat.c (working copy) @@ -3,7 +3,7 @@ *

"lpstat" command for CUPS. *
- * Copyright 2007-2010 by Apple Inc.
- * Copyright 2007-2011 by Apple Inc.
Copyright 1997-2006 by Easy Software Products. *
These coded instructions, statements, and computer programs are the @@ -143,7 +143,7 @@ cupsSetUser(argv[i]); } break;
- case 'W' : /* Show which jobs? */ if (argv[i][2]) which = argv[i] + 2; @@ -517,7 +517,7 @@
- Scan the name string for printer/class name(s)... */
for (dptr = name; *dptr;)
for (dptr = name; dptr;) { /
- Skip leading whitespace and commas... @@ -756,7 +756,7 @@ }
  
  for (i = 0; i < num_dests; i ++)
if (!strcasecmp(dests[i].name, printer) && dests[i].instance)
```
if (!_cups_strcasecmp(dests[i].name, printer) && dests[i].instance)
```
{ if (accepting) cupsLangPrintf(stdout, ("%s/%s accepting requests since %s"), @@ -911,7 +911,7 @@ username, sizeof(username), server, sizeof(server), &port, resource, sizeof(resource));
```
 if (!strcasecmp(server, cupsServer()))
```
```
 if (!_cups_strcasecmp(server, cupsServer()))
```
http2 = CUPS_HTTP_DEFAULT; else http2 = httpConnectEncrypt(server, port, cupsEncryption()); @@ -1193,7 +1193,7 @@ printer, device);
```
for (i = 0; i < num_dests; i ++)
```
if (!strcasecmp(printer, dests[i].name) && dests[i].instance)

if (!_cups_strcasecmp(printer, dests[i].name) && dests[i].instance)

{ if (device == NULL) _cupsLangPrintf(stdout, @@ -1222,7 +1222,7 @@ printer, device);

for (i = 0; i < num_dests; i ++)

if (!strcasecmp(printer, dests[i].name) && dests[i].instance)

if (!_cups_strcasecmp(printer, dests[i].name) && dests[i].instance)

{ if (device == NULL) cupsLangPrintf(stdout, ("device for %s/%s: %s"), @@ -1883,7 +1883,7 @@ }

for (i = 0; i < num_dests; i ++)

if (!strcasecmp(printer, dests[i].name) && dests[i].instance)
if (!_cups_strcasecmp(printer, dests[i].name) && dests[i].instance) { switch (pstate) { Index: systemv/cupstestppd.c

--- systemv/cupstestppd.c (revision 9791) +++ systemv/cupstestppd.c (working copy) @@ -616,7 +616,7 @@ ptr = attr->value; if (*ptr == '4' && ptr[1] == '.') {
+ for (ptr += 2; _ptr; ptr ++) if (!isdigit(_ptr & 255)) break; @@ -697,8 +697,8 @@

if (ppd->manufacturer != NULL) {
if (!strncasecmp(ppd->manufacturer, "Hewlett-Packard", 15) ||
!strncasecmp(ppd->manufacturer, "Hewlett Packard", 15))
if (!_cups_strncasecmp(ppd->manufacturer, "Hewlett-Packard", 15) ||

!_cups_strncasecmp(ppd->manufacturer, "Hewlett Packard", 15))

{ if (verbose >= 0) { @@ -713,8 +713,8 @@

errors ++; }

else if (!strncasecmp(ppd->manufacturer, "OkiData", 7) ||
!strncasecmp(ppd->manufacturer, "Oki Data", 8))
else if (!_cups_strncasecmp(ppd->manufacturer, "OkiData", 7) ||

     !_cups_strncasecmp(ppd->manufacturer, "Oki Data", 8))

{ if (verbose >= 0) { @@ -1194,7 +1194,7 @@

   errors ++;

}

+ /*
- Loop through all options and choices... */ @@ -1332,7 +1332,7 @@ !strcmp(attr->name, "DefaultTransfer")) continue;

if (!strncmp(attr->name, "Default", 7) &&

if (!strncmp(attr->name, "Default", 7) &&
!ppdFindOption(ppd, attr->name + 7))
   _cupsLangPrintf(stdout,
              _("        WARN    %s has no corresponding "

@@ -1380,7 +1380,7 @@ "5.3.")); }

if (!strcasecmp(ppd->pcfilename, "unused.ppd"))

if (!_cups_strcasecmp(ppd->pcfilename, "unused.ppd"))
_cupsLangPuts(stdout,
            _("        WARN    PCFileName should contain a "
              "unique filename.\n"

@@ -1466,7 +1466,7 @@

Then list the options, if "-v" was provided...

*/
```
*/
```
if (verbose > 1) { @@ -1684,7 +1684,7 @@ else if (eol != EOL_CR) mixed = 1; }
+ if (col > 0 && whitespace) cupsLangPrintf(stdout, (" WARN Line %d only contains whitespace."), @@ -1841,7 +1841,7 @@ *ptr = '\0'; }

 if (!strncasecmp(option, "Custom", 6) && !strcasecmp(choice, "True"))

if (!_cups_strncasecmp(option, "Custom", 6) && !_cups_strcasecmp(choice, "True")) { _cupsstrcpy(option, option + 6); strcpy(choice, "Custom"); @@ -1856,7 +1856,7 @@ (" %s Missing option %s in " "cupsUIConstraints %s: \"%s\""), prefix, option, constattr->spec, constattr->value);
+ if (!warn) errors ++;

@@ -1885,9 +1885,9 @@ else { for (i = 0; i < o->num_choices; i ++)

if (strcasecmp(o->choices[i].choice, "None") &&
strcasecmp(o->choices[i].choice, "Off") &&
strcasecmp(o->choices[i].choice, "False"))
if (_cups_strcasecmp(o->choices[i].choice, "None") &&
_cups_strcasecmp(o->choices[i].choice, "Off") &&

    _cups_strcasecmp(o->choices[i].choice, "False"))
   {
num_options = cupsAddOption(option, o->choices[i].choice,
                            num_options, &options);

@@ -1942,8 +1942,8 @@

for (i = ppd->num_consts, c = ppd->consts; i > 0; i --, c ++) {

if (!strncasecmp(c->option1, "Custom", 6) &&
!strcasecmp(c->choice1, "True"))
if (!_cups_strncasecmp(c->option1, "Custom", 6) &&
```
   !_cups_strcasecmp(c->choice1, "True"))
```
{ strcpy(option, c->option1 + 6); strcpy(choice, "Custom"); @@ -1983,8 +1983,8 @@ errors ++; }

if (!strncasecmp(c->option2, "Custom", 6) &&

!strcasecmp(c->choice2, "True"))
if (!_cups_strncasecmp(c->option2, "Custom", 6) &&
```
   !_cups_strcasecmp(c->choice2, "True"))
```
{ strcpy(option, c->option2 + 6); strcpy(choice, "Custom"); @@ -2055,7 +2055,7 @@

for (i = ppd->num_groups, groupa = ppd->groups; i > 1; i --, groupa ++) for (j = i - 1, groupb = groupa + 1; j > 0; j --, groupb ++)
if (!strcasecmp(groupa->name, groupb->name))
if (!_cups_strcasecmp(groupa->name, groupb->name)) { if (!errors && !verbose) cupsLangPuts(stdout, (" FAIL")); @@ -2077,7 +2077,7 @@ { cupsArraySave(ppd->options); for (optionb = ppdNextOption(ppd); optionb; optionb = ppdNextOption(ppd))
if (!strcasecmp(optiona->keyword, optionb->keyword))
if (!_cups_strcasecmp(optiona->keyword, optionb->keyword)) { if (!errors && !verbose) cupsLangPuts(stdout, (" FAIL")); @@ -2117,7 +2117,7 @@ i --; break; }
else if (!strcasecmp(choicea->choice, choiceb->choice))
```
 else if (!_cups_strcasecmp(choicea->choice, choiceb->choice))
```
{ if (!errors && !verbose) cupsLangPuts(stdout, (" FAIL")); @@ -2478,8 +2478,8 @@
- APDialogExtension */
for (attr = ppdFindAttr(ppd, "APDialogExtension", NULL);
attr != NULL;
for (attr = ppdFindAttr(ppd, "APDialogExtension", NULL);
attr != NULL; attr = ppdFindNextAttr(ppd, "APDialogExtension", NULL)) { if (strcmp(attr->name, "APDialogExtension")) @@ -2495,7 +2495,7 @@ if (!warn) errors ++; }
+ snprintf(pathprog, sizeof(pathprog), "%s%s", root, attr->value ? attr->value : "(null)");

@@ -3075,7 +3075,7 @@ { snprintf(buf, sizeof(buf), "%s.Fullbleed", pwg_media->ppd); if (strcmp(size->name, buf))

is_ok = 0;
is_ok = 0; } else if (size->width > size->length) { @@ -3092,7 +3092,7 @@ { snprintf(buf, sizeof(buf), "%s.Transverse", pwg_media->ppd); if (strcmp(size->name, buf))
is_ok = 0;
is_ok = 0; } } } @@ -3112,7 +3112,7 @@ else is_ok = 0; }
+ if (!is_ok) cupsLangPrintf(stdout, (" %s Size \"%s\" should be the Adobe " @@ -3288,7 +3288,7 @@
- Check custom choices differently... */

if (!strcasecmp(option->choices[j].choice, "Custom") &&

if (!_cups_strcasecmp(option->choices[j].choice, "Custom") &&
(coption = ppdFindCustomOption(ppd,
               option->keyword)) != NULL)

{ @@ -3314,7 +3314,7 @@ errors ++; }

if (strcasecmp(option->keyword, "PageSize"))

if (_cups_strcasecmp(option->keyword, "PageSize"))
{
for (cparam = (ppd_cparam_t *)cupsArrayFirst(coption->params);
 cparam;

@@ -3498,9 +3498,9 @@ break;

if (j == 0 ||

!strcasecmp(c1->choice, "None") ||
!strcasecmp(c1->choice, "Off") ||
!strcasecmp(c1->choice, "False"))
!_cups_strcasecmp(c1->choice, "None") ||
!_cups_strcasecmp(c1->choice, "Off") ||
!_cups_strcasecmp(c1->choice, "False")) c1 = NULL; }

@@ -3531,9 +3531,9 @@ break;

   if (j == 0 ||

!strcasecmp(c2->choice, "None") ||
!strcasecmp(c2->choice, "Off") ||
!strcasecmp(c2->choice, "False"))
!_cups_strcasecmp(c2->choice, "None") ||
!_cups_strcasecmp(c2->choice, "Off") ||
!_cups_strcasecmp(c2->choice, "False")) c2 = NULL; }

Index: systemv/lpadmin.c

--- systemv/lpadmin.c (revision 9791) +++ systemv/lpadmin.c (working copy) @@ -443,7 +443,7 @@ cupsSetUser(argv[i]); }

break;

+ case 'u' : /* Allow/deny users */ if (argv[i][2]) val = argv[i] + 2; @@ -462,10 +462,10 @@ val = argv[i]; }

if (!strncasecmp(val, "allow:", 6))
if (!_cups_strncasecmp(val, "allow:", 6)) num_options = cupsAddOption("requesting-user-name-allowed", val + 6, num_options, &options);
else if (!strncasecmp(val, "deny:", 5))
else if (!_cups_strncasecmp(val, "deny:", 5)) num_options = cupsAddOption("requesting-user-name-denied", val + 5, num_options, &options); else @@ -579,7 +579,7 @@ cupsLangPuts(stderr, ("lpadmin: Warning - content type list ignored.")); break;
+ case 'L' : /* Set the printer-location attribute */ if (argv[i][2]) num_options = cupsAddOption("printer-location", argv[i] + 2, @@ -756,7 +756,7 @@ (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 " @@ -980,7 +980,7 @@ }

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) @@ -1302,10 +1302,10 @@

if ((protocol = cupsGetOption("protocol", num_options, options)) != NULL) {
if (!strcasecmp(protocol, "bcp"))
if (!_cups_strcasecmp(protocol, "bcp")) ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_NAME, "port-monitor", NULL, "bcp");
else if (!strcasecmp(protocol, "tbcp"))
else if (!_cups_strcasecmp(protocol, "tbcp")) ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_NAME, "port-monitor", NULL, "tbcp"); } @@ -1359,9 +1359,9 @@ { wrote_ipp_supplies = 1; cupsFilePrintf(out, "*cupsIPPSupplies: %s\n",
(!strcasecmp(boolval, "true") ||
!strcasecmp(boolval, "yes") ||
!strcasecmp(boolval, "on")) ? "True" : "False");
(!_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, @@ -1369,9 +1369,9 @@ { wrote_snmp_supplies = 1; cupsFilePrintf(out, "_cupsSNMPSupplies: %s\n",
(!strcasecmp(boolval, "true") ||
!strcasecmp(boolval, "yes") ||
!strcasecmp(boolval, "on")) ? "True" : "False");
(!_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); @@ -1428,9 +1428,9 @@ options)) != NULL) { cupsFilePrintf(out, "_cupsIPPSupplies: %s\n",
(!strcasecmp(boolval, "true") ||
!strcasecmp(boolval, "yes") ||
!strcasecmp(boolval, "on")) ? "True" : "False");
(!_cups_strcasecmp(boolval, "true") ||
!_cups_strcasecmp(boolval, "yes") ||
```
      !_cups_strcasecmp(boolval, "on")) ? "True" : "False");
```
}

if (!wrote_snmp_supplies && @@ -1438,9 +1438,9 @@ options)) != NULL) { cupsFilePrintf(out, "*cupsSNMPSupplies: %s\n",
(!strcasecmp(boolval, "true") ||
!strcasecmp(boolval, "yes") ||
!strcasecmp(boolval, "on")) ? "True" : "False");
(!_cups_strcasecmp(boolval, "true") ||
!_cups_strcasecmp(boolval, "yes") ||
```
      !_cups_strcasecmp(boolval, "on")) ? "True" : "False");
```
}

cupsFileClose(in);

Index: systemv/cancel.c

--- systemv/cancel.c (revision 9791) +++ systemv/cancel.c (working copy) @@ -99,7 +99,7 @@ cupsSetUser(argv[i]); } break;
+ case 'a' : /* Cancel all jobs */ purge = 1; op = IPP_PURGE_JOBS; @@ -283,7 +283,7 @@
- Do the request and get back a response... */

if (op == IPP_PURGE_JOBS && (!user || strcasecmp(user, cupsUser())))

if (op == IPP_PURGE_JOBS && (!user || _cups_strcasecmp(user, cupsUser()))) response = cupsDoRequest(http, request, "/admin/"); else response = cupsDoRequest(http, request, "/jobs/"); Index: systemv/lpoptions.c

--- systemv/lpoptions.c (revision 9791) +++ systemv/lpoptions.c (working copy) @@ -3,7 +3,7 @@ *
- Printer option program for CUPS.
* Copyright 2007-2010 by Apple Inc.
* Copyright 2007-2011 by Apple Inc.
- Copyright 1997-2006 by Easy Software Products.
- These coded instructions, statements, and computer programs are the @@ -52,7 +52,7 @@ cups_dest_t dests; / Destinations _/ cups_destt *dest; / Current destination / char *printer, / Printer name */
instance, / Instance name */
instance, / Instance name / *option; / Current option */

@@ -265,7 +265,7 @@ }

         for (j = 0; j < num_options; j ++)

if (!strcasecmp(options[j].name, option))
```
  if (!_cups_strcasecmp(options[j].name, option))
{
 /*
  * Remove this option...
```
@@ -421,7 +421,7 @@

for (i = group->num_options, option = group->options; i > 0; i --, option ++) {
if (!strcasecmp(option->keyword, "PageRegion"))
if (!_cups_strcasecmp(option->keyword, "PageRegion")) continue;

snprintf(buffer, sizeof(buffer), "%s/%s:", option->keyword, option->text); @@ -431,7 +431,7 @@ j > 0 && ptr < (buffer + sizeof(buffer) - 1); j --, choice ++) {
if (!strcasecmp(choice->choice, "Custom"))
if (!_cups_strcasecmp(choice->choice, "Custom")) { ppd_coption_t coption; / Custom option _/ ppd_cparamt *cparam; / Custom parameter / @@ -452,8 +452,8 @@ cupsArrayCount(coption->params) == 0) snprintf(ptr, sizeof(buffer) - (ptr - buffer), " %sCustom", choice->marked ? "" : "");
else if (!strcasecmp(option->keyword, "PageSize") ||
!strcasecmp(option->keyword, "PageRegion"))
else if (!_cups_strcasecmp(option->keyword, "PageSize") ||
```
     !_cups_strcasecmp(option->keyword, "PageRegion"))
```
snprintf(ptr, sizeof(buffer) - (ptr - buffer), " %sCustom.WIDTHxHEIGHT", choice->marked ? "*" : ""); else

Index: test/ippserver.c

--- test/ippserver.c (revision 9791) +++ test/ippserver.c (working copy) @@ -1358,7 +1358,7 @@ *ptr++ = '\0'; formats[num_formats++] = ptr;
if (!strcasecmp(ptr, "application/octet-stream"))
if (!_cups_strcasecmp(ptr, "application/octet-stream")) defformat = ptr; }

@@ -1367,17 +1367,17 @@ prefix = "CMD:"; for (i = 0; i < num_formats; i ++) {

if (!strcasecmp(formats[i], "application/pdf"))
if (!_cups_strcasecmp(formats[i], "application/pdf")) snprintf(ptr, sizeof(device_id) - (ptr - device_id), "%sPDF", prefix);
else if (!strcasecmp(formats[i], "application/postscript"))
else if (!_cups_strcasecmp(formats[i], "application/postscript")) snprintf(ptr, sizeof(device_id) - (ptr - device_id), "%sPS", prefix);
else if (!strcasecmp(formats[i], "application/vnd.hp-PCL"))
else if (!_cups_strcasecmp(formats[i], "application/vnd.hp-PCL")) snprintf(ptr, sizeof(device_id) - (ptr - device_id), "%sPCL", prefix);
else if (!strcasecmp(formats[i], "image/jpeg"))
else if (!_cups_strcasecmp(formats[i], "image/jpeg")) snprintf(ptr, sizeof(device_id) - (ptr - device_id), "%sJPEG", prefix);
else if (!strcasecmp(formats[i], "image/png"))
else if (!_cups_strcasecmp(formats[i], "image/png")) snprintf(ptr, sizeof(device_id) - (ptr - device_id), "%sPNG", prefix);
else if (strcasecmp(formats[i], "application/octet-stream"))
else if (_cups_strcasecmp(formats[i], "application/octet-stream")) snprintf(ptr, sizeof(device_id) - (ptr - device_id), "%s%s", prefix, formats[i]);

@@ -2147,7 +2147,7 @@ regtype, (int)errorCode); return; }

else if (strcasecmp(name, printer->dnssd_name))
else if (_cups_strcasecmp(name, printer->dnssd_name)) { if (Verbosity) fprintf(stderr, "Now using DNS-SD service name \"%s\".\n", name); @@ -2723,7 +2723,7 @@ (job_comparison == 0 && job->state != job_state) || (job_comparison > 0 && job->state < job_state) || job->id < first_job_id ||
(username && job->username && strcasecmp(username, job->username)))
(username && job->username && _cups_strcasecmp(username, job->username))) continue;

if (count > 0) @@ -2883,16 +2883,16 @@
- Create a file for the request data... */
if (!strcasecmp(job->format, "image/jpeg"))
if (!_cups_strcasecmp(job->format, "image/jpeg")) snprintf(filename, sizeof(filename), "%s/%d.jpg", client->printer->directory, job->id);
else if (!strcasecmp(job->format, "image/png"))
else if (!_cups_strcasecmp(job->format, "image/png")) snprintf(filename, sizeof(filename), "%s/%d.png", client->printer->directory, job->id);
else if (!strcasecmp(job->format, "application/pdf"))
else if (!_cups_strcasecmp(job->format, "application/pdf")) snprintf(filename, sizeof(filename), "%s/%d.pdf", client->printer->directory, job->id);
else if (!strcasecmp(job->format, "application/postscript"))
else if (!_cups_strcasecmp(job->format, "application/postscript")) snprintf(filename, sizeof(filename), "%s/%d.ps", client->printer->directory, job->id); else @@ -3221,7 +3221,7 @@
- Handle HTTP Upgrade... */
if (!strcasecmp(client->http.fields[HTTP_FIELD_CONNECTION], "Upgrade"))
if (!_cups_strcasecmp(client->http.fields[HTTP_FIELD_CONNECTION], "Upgrade")) { if (!respond_http(client, HTTP_NOT_IMPLEMENTED, NULL, 0)) return (0); @@ -3521,8 +3521,8 @@ language ? language->values[0].string.text : "en");

if (charset &&
strcasecmp(charset->values[0].string.text, "us-ascii") &&
strcasecmp(charset->values[0].string.text, "utf-8"))
_cups_strcasecmp(charset->values[0].string.text, "us-ascii") &&
_cups_strcasecmp(charset->values[0].string.text, "utf-8")) { / \ Bad character set... @@ -4183,7 +4183,7 @@ IPP_TAG_MIMETYPE)) != NULL) { for (i = 0; i < supported->num_values; i ++)
if (!strcasecmp(format, supported->values[i].string.text))
```
if (!_cups_strcasecmp(format, supported->values[i].string.text))
```
break;

if (i >= supported->num_values)

Index: test/ipptool.c

--- test/ipptool.c (revision 9791) +++ test/ipptool.c (working copy) @@ -588,7 +588,7 @@ compare_vars(_cups_var_t a, / I - First variable _/ _cups_vart *b) / I - Second variable */ {
return (strcasecmp(a->name, b->name));
return (_cups_strcasecmp(a->name, b->name)); }

@@ -745,9 +745,9 @@ */

   if (get_token(fp, temp, sizeof(temp), &linenum) &&

(!strcasecmp(temp, "yes") || !strcasecmp(temp, "no")))
(!_cups_strcasecmp(temp, "yes") || !_cups_strcasecmp(temp, "no"))) {
IgnoreErrors = !strcasecmp(temp, "yes");
```
 IgnoreErrors = !_cups_strcasecmp(temp, "yes");
```
} else { @@ -1006,20 +1006,20 @@

while (get_token(fp, token, sizeof(token), &linenum) != NULL) {
if (strcasecmp(token, "COUNT") &&
strcasecmp(token, "DEFINE-MATCH") &&
strcasecmp(token, "DEFINE-NO-MATCH") &&
strcasecmp(token, "DEFINE-VALUE") &&
strcasecmp(token, "IF-DEFINED") &&
strcasecmp(token, "IF-NOT-DEFINED") &&
strcasecmp(token, "IN-GROUP") &&
strcasecmp(token, "OF-TYPE") &&
strcasecmp(token, "SAME-COUNT-AS") &&
strcasecmp(token, "WITH-VALUE"))
if (_cups_strcasecmp(token, "COUNT") &&
_cups_strcasecmp(token, "DEFINE-MATCH") &&
_cups_strcasecmp(token, "DEFINE-NO-MATCH") &&
_cups_strcasecmp(token, "DEFINE-VALUE") &&
_cups_strcasecmp(token, "IF-DEFINED") &&
_cups_strcasecmp(token, "IF-NOT-DEFINED") &&
_cups_strcasecmp(token, "IN-GROUP") &&
_cups_strcasecmp(token, "OF-TYPE") &&
_cups_strcasecmp(token, "SAME-COUNT-AS") &&

   _cups_strcasecmp(token, "WITH-VALUE"))
last_expect = NULL;

```
if (strcasecmp(token, "IF-DEFINED") &&
```
strcasecmp(token, "IF-NOT-DEFINED"))
if (_cups_strcasecmp(token, "IF-DEFINED") &&
```
   _cups_strcasecmp(token, "IF-NOT-DEFINED"))
last_status = NULL;
```
if (!strcmp(token, "}")) @@ -1102,9 +1102,9 @@ */

if (get_token(fp, temp, sizeof(temp), &linenum) &&
(!strcasecmp(temp, "yes") || !strcasecmp(temp, "no")))
(!_cups_strcasecmp(temp, "yes") || !_cups_strcasecmp(temp, "no"))) {
ignore_errors = !strcasecmp(temp, "yes");

ignore_errors = !_cups_strcasecmp(temp, "yes");

} else { @@ -1115,7 +1115,7 @@

continue; }

else if (!strcasecmp(token, "NAME"))
else if (!_cups_strcasecmp(token, "NAME")) { / \ Name of test... @@ -1134,7 +1134,7 @@ { if (isdigit(temp[0] & 255)) request_id = atoi(temp);
else if (!strcasecmp(temp, "random"))

else if (!_cups_strcasecmp(temp, "random"))
request_id = (CUPS_RAND() % 1000) * 137 + 1;

else { @@ -1197,9 +1197,9 @@ */

if (get_token(fp, temp, sizeof(temp), &linenum) &&

(!strcasecmp(temp, "yes") || !strcasecmp(temp, "no")))
(!_cups_strcasecmp(temp, "yes") || !_cups_strcasecmp(temp, "no"))) {
skip_previous = !strcasecmp(temp, "yes");
skip_previous = !_cups_strcasecmp(temp, "yes"); } else { @@ -1241,7 +1241,7 @@ goto test_exit; } }
else if (!strcasecmp(token, "VERSION"))
else if (!_cups_strcasecmp(token, "VERSION")) { if (get_token(fp, temp, sizeof(temp), &linenum)) { @@ -1271,7 +1271,7 @@ goto test_exit; } }
else if (!strcasecmp(token, "RESOURCE"))
else if (!_cups_strcasecmp(token, "RESOURCE")) { / \ Resource name... @@ -1284,7 +1284,7 @@ goto test_exit; } }
else if (!strcasecmp(token, "OPERATION"))
else if (!_cups_strcasecmp(token, "OPERATION")) { / \ Operation... @@ -1306,7 +1306,7 @@ goto test_exit; } }
else if (!strcasecmp(token, "GROUP"))

else if (!_cups_strcasecmp(token, "GROUP"))

{ / \ Attribute group... @@ -1331,7 +1331,7 @@

group = value;

}

else if (!strcasecmp(token, "DELAY"))
else if (!_cups_strcasecmp(token, "DELAY")) { / * Delay before operation... @@ -1361,7 +1361,7 @@ usleep((int)(1000000.0 \ delay)); } }
else if (!strcasecmp(token, "ATTR"))
else if (!_cups_strcasecmp(token, "ATTR")) { / \ Attribute... @@ -1401,7 +1401,7 @@ switch (value) { case IPP_TAG_BOOLEAN :
if (!strcasecmp(token, "true"))

  if (!_cups_strcasecmp(token, "true"))
ippAddBoolean(request, group, attr, 1);
     else
ippAddBoolean(request, group, attr, atoi(token));

@@ -1456,8 +1456,8 @@ }

  if (ptr <= token || xres <= 0 || yres <= 0 || !ptr ||

(strcasecmp(ptr, "dpi") && strcasecmp(ptr, "dpc") &&
strcasecmp(ptr, "other")))
(_cups_strcasecmp(ptr, "dpi") && _cups_strcasecmp(ptr, "dpc") &&

         _cups_strcasecmp(ptr, "other")))
  {
    print_fatal_error("Bad resolution value \"%s\" on line %d.",
                  token, linenum);

@@ -1465,10 +1465,10 @@ goto test_exit; }

```
    if (!strcasecmp(ptr, "dpi"))
```
if (!_cups_strcasecmp(ptr, "dpi")) ippAddResolution(request, group, attr, IPP_RES_PER_INCH, xres, yres);
else if (!strcasecmp(ptr, "dpc"))
else if (!_cups_strcasecmp(ptr, "dpc")) ippAddResolution(request, group, attr, IPP_RES_PER_CM, xres, yres); else @@ -1574,7 +1574,7 @@ break; } }
else if (!strcasecmp(token, "FILE"))
else if (!_cups_strcasecmp(token, "FILE")) { / \ File... @@ -1590,7 +1590,7 @@ expand_variables(vars, token, temp, sizeof(token)); get_filename(testfile, filename, token, sizeof(filename)); }
else if (!strcasecmp(token, "STATUS"))
else if (!_cups_strcasecmp(token, "STATUS")) { / \ Status... @@ -1626,7 +1626,7 @@ last_status->if_defined = NULL; last_status->if_not_defined = NULL; }
else if (!strcasecmp(token, "EXPECT"))
else if (!_cups_strcasecmp(token, "EXPECT")) { / \ Expected attributes... @@ -1664,7 +1664,7 @@ else last_expect->name = strdup(token); }
else if (!strcasecmp(token, "COUNT"))
else if (!_cups_strcasecmp(token, "COUNT")) { if (!get_token(fp, token, sizeof(token), &linenum)) { @@ -1690,7 +1690,7 @@ goto test_exit; } }
else if (!strcasecmp(token, "DEFINE-MATCH"))
else if (!_cups_strcasecmp(token, "DEFINE-MATCH")) { if (!get_token(fp, token, sizeof(token), &linenum)) { @@ -1710,7 +1710,7 @@ goto test_exit; } }
else if (!strcasecmp(token, "DEFINE-NO-MATCH"))
else if (!_cups_strcasecmp(token, "DEFINE-NO-MATCH")) { if (!get_token(fp, token, sizeof(token), &linenum)) { @@ -1730,7 +1730,7 @@ goto test_exit; } }
else if (!strcasecmp(token, "DEFINE-VALUE"))
else if (!_cups_strcasecmp(token, "DEFINE-VALUE")) { if (!get_token(fp, token, sizeof(token), &linenum)) { @@ -1750,7 +1750,7 @@ goto test_exit; } }
else if (!strcasecmp(token, "OF-TYPE"))
else if (!_cups_strcasecmp(token, "OF-TYPE")) { if (!get_token(fp, token, sizeof(token), &linenum)) { @@ -1770,7 +1770,7 @@ goto test_exit; } }
else if (!strcasecmp(token, "IN-GROUP"))
else if (!_cups_strcasecmp(token, "IN-GROUP")) { ipp_tag_t in_group; /* IN-GROUP value */

@@ -1795,7 +1795,7 @@ goto test_exit; } }

else if (!strcasecmp(token, "SAME-COUNT-AS"))
else if (!_cups_strcasecmp(token, "SAME-COUNT-AS")) { if (!get_token(fp, token, sizeof(token), &linenum)) { @@ -1814,7 +1814,7 @@ goto test_exit; } }
else if (!strcasecmp(token, "IF-DEFINED"))
else if (!_cups_strcasecmp(token, "IF-DEFINED")) { if (!get_token(fp, token, sizeof(token), &linenum)) { @@ -1835,7 +1835,7 @@ goto test_exit; } }
else if (!strcasecmp(token, "IF-NOT-DEFINED"))
else if (!_cups_strcasecmp(token, "IF-NOT-DEFINED")) { if (!get_token(fp, token, sizeof(token), &linenum)) { @@ -1856,7 +1856,7 @@ goto test_exit; } }
else if (!strcasecmp(token, "WITH-VALUE"))
else if (!_cups_strcasecmp(token, "WITH-VALUE")) { if (!get_token(fp, temp, sizeof(temp), &linenum)) { @@ -1904,7 +1904,7 @@ goto test_exit; } }
else if (!strcasecmp(token, "DISPLAY"))
```
else if (!_cups_strcasecmp(token, "DISPLAY"))
```
{ / \ Display attributes... @@ -2264,7 +2264,7 @@ else if (!prev_pass) fprintf(stderr, "%s\n", cupsLastErrorString());
if (prev_pass && Output != _CUPS_OUTPUT_PLIST &&
if (prev_pass && Output != _CUPS_OUTPUT_PLIST && Output != _CUPS_OUTPUT_QUIET && !Verbosity && num_displayed > 0) { if (Output >= _CUPS_OUTPUT_LIST) @@ -2893,7 +2893,7 @@ else goto col_error; }
else if (!strcasecmp(token, "MEMBER"))
else if (!_cups_strcasecmp(token, "MEMBER")) { /*
- Attribute... @@ -2931,7 +2931,7 @@ switch (value) { case IPP_TAG_BOOLEAN :
if (!strcasecmp(token, "true"))

if (!_cups_strcasecmp(token, "true"))
ippAddBoolean(col, IPP_TAG_ZERO, attr, 1);
else
ippAddBoolean(col, IPP_TAG_ZERO, attr, atoi(token));

@@ -2949,18 +2949,18 @@ char units[6]; /* Units */

if (sscanf(token, "%dx%d%5s", &xres, &yres, units) != 3 ||

(strcasecmp(units, "dpi") && strcasecmp(units, "dpc") &&
strcasecmp(units, "other")))
(_cups_strcasecmp(units, "dpi") && _cups_strcasecmp(units, "dpc") &&

   _cups_strcasecmp(units, "other")))
{
print_fatal_error("Bad resolution value \"%s\" on line %d.",
        token, *linenum);
goto col_error;
}

```
  if (!strcasecmp(units, "dpi"))
```
if (!_cups_strcasecmp(units, "dpi")) ippAddResolution(col, IPP_TAG_ZERO, attr, xres, yres, IPP_RES_PER_INCH);
else if (!strcasecmp(units, "dpc"))
else if (!_cups_strcasecmp(units, "dpc")) ippAddResolution(col, IPP_TAG_ZERO, attr, xres, yres, IPP_RES_PER_CM); else Index: vcnet/config.h

--- vcnet/config.h (revision 9791) +++ vcnet/config.h (working copy) @@ -86,8 +86,8 @@
- Version of software... */

-#define CUPS_SVERSION "CUPS v1.5svn" -#define CUPS_MINIMAL "CUPS/1.5svn" +#define CUPS_SVERSION "CUPS v1.5.0" +#define CUPS_MINIMAL "CUPS/1.5.0"

/ @@ -277,8 +277,6 @@ /

define HAVE_STRDUP 1

-#define HAVE_STRCASECMP 1 -#define HAVE_STRNCASECMP 1 /* #undef HAVESTRLCAT / /_ #undef HAVE_STRLCPY */

Index: standards/rfctohtml.c

--- standards/rfctohtml.c (revision 9791) +++ standards/rfctohtml.c (working copy) @@ -3,7 +3,7 @@ *

RFC file to HTML conversion program. *
- * Copyright 2007-2010 by Apple Inc.
- * Copyright 2007-2011 by Apple Inc.
These coded instructions, statements, and computer programs are the @@ -132,7 +132,7 @@

if (!line[0]) break;
- else if (!strncasecmp(line, "Request for Comments:", 21))
- else if (!_cups_strncasecmp(line, "Request for Comments:", 21)) rfc = atoi(line + 21); }

@@ -385,7 +385,7 @@

   put_line(outfile, line);

intoc = !strcasecmp(line, "Table of Contents");
intoc = !_cups_strcasecmp(line, "Table of Contents"); toclevel = 0; } } Index: filter/imagetoraster.c

--- filter/imagetoraster.c (revision 9791) +++ filter/imagetoraster.c (working copy) @@ -3,7 +3,7 @@ *
- Image file to raster filter for CUPS.
- Copyright 2007-2011 by Apple Inc.
- Copyright 1993-2007 by Easy Software Products.
- These coded instructions, statements, and computer programs are the @@ -341,11 +341,11 @@
- separate-documents-collated-copies allows for uncollated copies. */
Collate = strcasecmp(val, "separate-documents-collated-copies") != 0;
Collate = _cups_strcasecmp(val, "separate-documents-collated-copies") != 0; }

if ((val = cupsGetOption("Collate", num_options, options)) != NULL &&
strcasecmp(val, "True") == 0)
```
_cups_strcasecmp(val, "True") == 0)
```
Collate = 1;

if ((val = cupsGetOption("gamma", num_options, options)) != NULL) @@ -379,10 +379,10 @@ if ((val = cupsGetOption("scaling", num_options, options)) != NULL) zoom = atoi(val) * 0.01; else if ((val = cupsGetOption("fitplot", num_options, options)) != NULL &&
!strcasecmp(val, "true"))
!_cups_strcasecmp(val, "true")) zoom = 1.0; else if ((val = cupsGetOption("fit-to-page", num_options, options)) != NULL &&
!strcasecmp(val, "true"))
```
    !_cups_strcasecmp(val, "true"))
```
zoom = 1.0;

if ((val = cupsGetOption("ppi", num_options, options)) != NULL) @@ -391,47 +391,47 @@

if ((val = cupsGetOption("position", num_options, options)) != NULL) {
if (strcasecmp(val, "center") == 0)
if (_cups_strcasecmp(val, "center") == 0) { XPosition = 0; YPosition = 0; }
else if (strcasecmp(val, "top") == 0)
else if (_cups_strcasecmp(val, "top") == 0) { XPosition = 0; YPosition = 1; }
else if (strcasecmp(val, "left") == 0)
else if (_cups_strcasecmp(val, "left") == 0) { XPosition = -1; YPosition = 0; }
else if (strcasecmp(val, "right") == 0)
else if (_cups_strcasecmp(val, "right") == 0) { XPosition = 1; YPosition = 0; }
else if (strcasecmp(val, "top-left") == 0)
else if (_cups_strcasecmp(val, "top-left") == 0) { XPosition = -1; YPosition = 1; }
else if (strcasecmp(val, "top-right") == 0)
else if (_cups_strcasecmp(val, "top-right") == 0) { XPosition = 1; YPosition = 1; }
else if (strcasecmp(val, "bottom") == 0)
else if (_cups_strcasecmp(val, "bottom") == 0) { XPosition = 0; YPosition = -1; }
else if (strcasecmp(val, "bottom-left") == 0)
else if (_cups_strcasecmp(val, "bottom-left") == 0) { XPosition = -1; YPosition = -1; }
else if (strcasecmp(val, "bottom-right") == 0)
else if (_cups_strcasecmp(val, "bottom-right") == 0) { XPosition = 1; YPosition = -1; @@ -452,8 +452,8 @@ else val = cupsGetOption("mirror", num_options, options);
if (val && (!strcasecmp(val, "true") || !strcasecmp(val, "on") ||
!strcasecmp(val, "yes")))
if (val && (!_cups_strcasecmp(val, "true") || !_cups_strcasecmp(val, "on") ||
```
       !_cups_strcasecmp(val, "yes")))
```
Flip = 1;

/ @@ -870,7 +870,7 @@ /

if ((choice = ppdFindMarkedChoice(ppd, "PageSize")) != NULL &&
strcasecmp(choice->choice, "Custom") == 0)
```
_cups_strcasecmp(choice->choice, "Custom") == 0)
```
{ float width, /* New width in points / length; / New length in points */

Index: filter/pdftops.c

--- filter/pdftops.c (revision 9791) +++ filter/pdftops.c (working copy) @@ -320,8 +320,8 @@ if ((val = cupsGetOption("fitplot", num_options, options)) == NULL) val = cupsGetOption("fit-to-page", num_options, options);
if (val && strcasecmp(val, "no") && strcasecmp(val, "off") &&
strcasecmp(val, "false"))
if (val && _cups_strcasecmp(val, "no") && _cups_strcasecmp(val, "off") &&
_cups_strcasecmp(val, "false")) fit = 1; else fit = 0; @@ -341,8 +341,8 @@

if ((val = cupsGetOption("landscape", num_options, options)) != NULL) {
if (strcasecmp(val, "no") != 0 && strcasecmp(val, "off") != 0 &&
strcasecmp(val, "false") != 0)
if (_cups_strcasecmp(val, "no") != 0 && _cups_strcasecmp(val, "off") != 0 &&
_cups_strcasecmp(val, "false") != 0) orientation = 1; } else if ((val = cupsGetOption("orientation-requested", num_options, Index: filter/imagetops.c

--- filter/imagetops.c (revision 9791) +++ filter/imagetops.c (working copy) @@ -3,7 +3,7 @@ *
- Image file to PostScript filter for CUPS.
- Copyright 2007-2011 by Apple Inc.
- Copyright 1993-2007 by Easy Software Products.
- These coded instructions, statements, and computer programs are the @@ -183,11 +183,11 @@
- separate-documents-uncollated-copies allows for uncollated copies. */
Collate = strcasecmp(val, "separate-documents-uncollated-copies") != 0;
Collate = _cups_strcasecmp(val, "separate-documents-uncollated-copies") != 0; }

if ((val = cupsGetOption("Collate", num_options, options)) != NULL &&
strcasecmp(val, "True") == 0)
```
_cups_strcasecmp(val, "True") == 0)
```
Collate = 1;

if ((val = cupsGetOption("gamma", num_options, options)) != NULL) @@ -221,10 +221,10 @@ if ((val = cupsGetOption("scaling", num_options, options)) != NULL) zoom = atoi(val) * 0.01; else if ((val = cupsGetOption("fitplot", num_options, options)) != NULL &&
!strcasecmp(val, "true"))
!_cups_strcasecmp(val, "true")) zoom = 1.0; else if ((val = cupsGetOption("fit-to-page", num_options, options)) != NULL &&
!strcasecmp(val, "true"))
```
    !_cups_strcasecmp(val, "true"))
```
zoom = 1.0;

if ((val = cupsGetOption("ppi", num_options, options)) != NULL) @@ -233,47 +233,47 @@

if ((val = cupsGetOption("position", num_options, options)) != NULL) {
if (strcasecmp(val, "center") == 0)
if (_cups_strcasecmp(val, "center") == 0) { XPosition = 0; YPosition = 0; }
else if (strcasecmp(val, "top") == 0)
else if (_cups_strcasecmp(val, "top") == 0) { XPosition = 0; YPosition = 1; }
else if (strcasecmp(val, "left") == 0)
else if (_cups_strcasecmp(val, "left") == 0) { XPosition = -1; YPosition = 0; }
else if (strcasecmp(val, "right") == 0)
else if (_cups_strcasecmp(val, "right") == 0) { XPosition = 1; YPosition = 0; }
else if (strcasecmp(val, "top-left") == 0)
else if (_cups_strcasecmp(val, "top-left") == 0) { XPosition = -1; YPosition = 1; }
else if (strcasecmp(val, "top-right") == 0)
else if (_cups_strcasecmp(val, "top-right") == 0) { XPosition = 1; YPosition = 1; }
else if (strcasecmp(val, "bottom") == 0)
else if (_cups_strcasecmp(val, "bottom") == 0) { XPosition = 0; YPosition = -1; }
else if (strcasecmp(val, "bottom-left") == 0)
else if (_cups_strcasecmp(val, "bottom-left") == 0) { XPosition = -1; YPosition = -1; }
else if (strcasecmp(val, "bottom-right") == 0)
else if (_cups_strcasecmp(val, "bottom-right") == 0) { XPosition = 1; YPosition = -1; @@ -294,13 +294,13 @@ else val = cupsGetOption("mirror", num_options, options);
if (val && (!strcasecmp(val, "true") || !strcasecmp(val, "on") ||
!strcasecmp(val, "yes")))
if (val && (!_cups_strcasecmp(val, "true") || !_cups_strcasecmp(val, "on") ||
```
       !_cups_strcasecmp(val, "yes")))
```
Flip = 1;

if ((val = cupsGetOption("emit-jcl", num_options, options)) != NULL &&
(!strcasecmp(val, "false") || !strcasecmp(val, "off") ||
!strcasecmp(val, "no") || !strcmp(val, "0")))
(!_cups_strcasecmp(val, "false") || !_cups_strcasecmp(val, "off") ||
```
!_cups_strcasecmp(val, "no") || !strcmp(val, "0")))
```
emit_jcl = 0; else emit_jcl = 1; @@ -512,7 +512,7 @@ */

if ((choice = ppdFindMarkedChoice(ppd, "PageSize")) != NULL &&
strcasecmp(choice->choice, "Custom") == 0)
_cupsstrcasecmp(choice->choice, "Custom") == 0) { float width, /* New width in points / length; /_ New length in points */ Index: filter/bannertops.c

--- filter/bannertops.c (revision 9791) +++ filter/bannertops.c (working copy) @@ -3,7 +3,7 @@ *
- Banner to PostScript filter for CUPS.
- Copyright 2008-2011 by Apple Inc.
- These coded instructions, statements, and computer programs are the
- property of Apple Inc. and are protected by Federal copyright @@ -228,7 +228,7 @@
- Save keyword values in the appropriate places... */
if (!strcasecmp(line, "Footer"))
if (!_cups_strcasecmp(line, "Footer")) { if (banner->footer) fprintf(stderr, "DEBUG: Extra \"Footer\" on line %d of banner file\n", @@ -236,7 +236,7 @@ else banner->footer = strdup(ptr); }
else if (!strcasecmp(line, "Header"))
else if (!_cups_strcasecmp(line, "Header")) { if (banner->header) fprintf(stderr, "DEBUG: Extra \"Header\" on line %d of banner file\n", @@ -244,7 +244,7 @@ else banner->header = strdup(ptr); }
else if (!strcasecmp(line, "Image"))
else if (!_cups_strcasecmp(line, "Image")) { char imagefile[1024]; /* Image filename */

@@ -267,14 +267,14 @@ cupsArrayAdd(banner->images, strdup(imagefile)); } }

else if (!strcasecmp(line, "Notice"))
else if (!_cups_strcasecmp(line, "Notice")) { if (!banner->notices) banner->notices = cupsArrayNew(NULL, NULL);

cupsArrayAdd(banner->notices, strdup(ptr)); }
else if (!strcasecmp(line, "Show"))
else if (!_cups_strcasecmp(line, "Show")) { char value; / Current value */

@@ -294,41 +294,41 @@ / * Add the value to the show flags... /

if (!strcasecmp(value, "imageable-area"))
if (!_cups_strcasecmp(value, "imageable-area")) banner->show |= SHOW_IMAGEABLE_AREA;
else if (!strcasecmp(value, "job-billing"))
else if (!_cups_strcasecmp(value, "job-billing")) banner->show |= SHOW_JOB_BILLING;
else if (!strcasecmp(value, "job-id"))
else if (!_cups_strcasecmp(value, "job-id")) banner->show |= SHOW_JOB_ID;
else if (!strcasecmp(value, "job-name"))
else if (!_cups_strcasecmp(value, "job-name")) banner->show |= SHOW_JOB_NAME;
else if (!strcasecmp(value, "job-originating-host-name"))
else if (!_cups_strcasecmp(value, "job-originating-host-name")) banner->show |= SHOW_JOB_ORIGINATING_HOST_NAME;
else if (!strcasecmp(value, "job-originating-user-name"))
else if (!_cups_strcasecmp(value, "job-originating-user-name")) banner->show |= SHOW_JOB_ORIGINATING_USER_NAME;
else if (!strcasecmp(value, "job-uuid"))
else if (!_cups_strcasecmp(value, "job-uuid")) banner->show |= SHOW_JOB_UUID;
else if (!strcasecmp(value, "options"))
else if (!_cups_strcasecmp(value, "options")) banner->show |= SHOW_OPTIONS;
else if (!strcasecmp(value, "paper-name"))
else if (!_cups_strcasecmp(value, "paper-name")) banner->show |= SHOW_PAPER_NAME;
else if (!strcasecmp(value, "paper-size"))
else if (!_cups_strcasecmp(value, "paper-size")) banner->show |= SHOW_PAPER_SIZE;
else if (!strcasecmp(value, "printer-driver-name"))
else if (!_cups_strcasecmp(value, "printer-driver-name")) banner->show |= SHOW_PRINTER_DRIVER_NAME;
else if (!strcasecmp(value, "printer-driver-version"))
else if (!_cups_strcasecmp(value, "printer-driver-version")) banner->show |= SHOW_PRINTER_DRIVER_VERSION;
else if (!strcasecmp(value, "printer-info"))
else if (!_cups_strcasecmp(value, "printer-info")) banner->show |= SHOW_PRINTER_INFO;
else if (!strcasecmp(value, "printer-location"))
else if (!_cups_strcasecmp(value, "printer-location")) banner->show |= SHOW_PRINTER_LOCATION;
else if (!strcasecmp(value, "printer-make-and-model"))
else if (!_cups_strcasecmp(value, "printer-make-and-model")) banner->show |= SHOW_PRINTER_MAKE_AND_MODEL;
else if (!strcasecmp(value, "printer-name"))
else if (!_cups_strcasecmp(value, "printer-name")) banner->show |= SHOW_PRINTER_NAME;
else if (!strcasecmp(value, "time-at-creation"))
else if (!_cups_strcasecmp(value, "time-at-creation")) banner->show |= SHOW_TIME_AT_CREATION;
else if (!strcasecmp(value, "time-at-processing"))
else if (!_cups_strcasecmp(value, "time-at-processing")) banner->show |= SHOW_TIME_AT_PROCESSING; else { @@ -486,18 +486,18 @@ { for (j = 0; j < num_options; j ++) {
if (strcasecmp("media", options[j].name) &&
strcasecmp("PageSize", options[j].name) &&
strcasecmp("PageRegion", options[j].name) &&
strcasecmp("InputSlot", options[j].name) &&
strcasecmp("MediaType", options[j].name) &&
strcasecmp("finishings", options[j].name) &&
strcasecmp("sides", options[j].name) &&
strcasecmp("Duplex", options[j].name) &&
strcasecmp("orientation-requested", options[j].name) &&
strcasecmp("landscape", options[j].name) &&
strcasecmp("number-up", options[j].name) &&
strcasecmp("OutputOrder", options[j].name))
if (_cups_strcasecmp("media", options[j].name) &&
_cups_strcasecmp("PageSize", options[j].name) &&
_cups_strcasecmp("PageRegion", options[j].name) &&
_cups_strcasecmp("InputSlot", options[j].name) &&
_cups_strcasecmp("MediaType", options[j].name) &&
_cups_strcasecmp("finishings", options[j].name) &&
_cups_strcasecmp("sides", options[j].name) &&
_cups_strcasecmp("Duplex", options[j].name) &&
_cups_strcasecmp("orientation-requested", options[j].name) &&
_cups_strcasecmp("landscape", options[j].name) &&
_cups_strcasecmp("number-up", options[j].name) &&

_cups_strcasecmp("OutputOrder", options[j].name))

continue;

showlines ++; @@ -675,23 +675,23 @@

for (j = 0; j < num_options; j ++)

{

if (strcasecmp("media", options[j].name) &&
strcasecmp("PageSize", options[j].name) &&
strcasecmp("PageRegion", options[j].name) &&
strcasecmp("InputSlot", options[j].name) &&
strcasecmp("MediaType", options[j].name) &&
strcasecmp("finishings", options[j].name) &&
strcasecmp("sides", options[j].name) &&
strcasecmp("Duplex", options[j].name) &&
strcasecmp("orientation-requested", options[j].name) &&
strcasecmp("landscape", options[j].name) &&
strcasecmp("number-up", options[j].name) &&
strcasecmp("OutputOrder", options[j].name))
if (_cups_strcasecmp("media", options[j].name) &&
_cups_strcasecmp("PageSize", options[j].name) &&
_cups_strcasecmp("PageRegion", options[j].name) &&
_cups_strcasecmp("InputSlot", options[j].name) &&
_cups_strcasecmp("MediaType", options[j].name) &&
_cups_strcasecmp("finishings", options[j].name) &&
_cups_strcasecmp("sides", options[j].name) &&
_cups_strcasecmp("Duplex", options[j].name) &&
_cups_strcasecmp("orientation-requested", options[j].name) &&
_cups_strcasecmp("landscape", options[j].name) &&
_cups_strcasecmp("number-up", options[j].name) &&

  _cups_strcasecmp("OutputOrder", options[j].name))
 continue;

   if (!strcasecmp("landscape", options[j].name))

if (!_cups_strcasecmp("landscape", options[j].name)) strlcpy(text, "orientation-requested=landscape", sizeof(text));
else if (!strcasecmp("orientation-requested", options[j].name))
```
else if (!_cups_strcasecmp("orientation-requested", options[j].name))
```
{ switch (atoi(options[j].value)) {

Index: filter/commandtops.c

--- filter/commandtops.c (revision 9791) +++ filter/commandtops.c (working copy) @@ -112,11 +112,11 @@
- Parse the command... */
if (!strcasecmp(line, "AutoConfigure"))
if (!_cups_strcasecmp(line, "AutoConfigure")) auto_configure(ppd, argv[2]);
else if (!strcasecmp(line, "PrintSelfTestPage"))
else if (!_cups_strcasecmp(line, "PrintSelfTestPage")) print_self_test_page(ppd, argv[2]);
else if (!strcasecmp(line, "ReportLevels"))
else if (!_cups_strcasecmp(line, "ReportLevels")) report_levels(ppd, argv[2]); else fprintf(stderr, "ERROR: Invalid printer command \"%s\"!\n", line);

Index: filter/common.c

--- filter/common.c (revision 9791) +++ filter/common.c (working copy) @@ -95,8 +95,8 @@

if ((val = cupsGetOption("landscape", num_options, options)) != NULL) {
if (strcasecmp(val, "no") != 0 && strcasecmp(val, "off") != 0 &&
strcasecmp(val, "false") != 0)
if (_cups_strcasecmp(val, "no") != 0 && _cups_strcasecmp(val, "off") != 0 &&
```
 _cups_strcasecmp(val, "false") != 0)
```
{ if (ppd && ppd->landscape > 0) Orientation = 1;

Index: filter/pstops.c

--- filter/pstops.c (revision 9791) +++ filter/pstops.c (working copy) @@ -500,10 +500,10 @@
- See if we only print even or odd pages... */
if (!strcasecmp(doc->page_set, "even") && (page & 1))
if (!_cups_strcasecmp(doc->page_set, "even") && (page & 1)) return (0);
if (!strcasecmp(doc->page_set, "odd") && !(page & 1))
if (!_cups_strcasecmp(doc->page_set, "odd") && !(page & 1)) return (0); }

@@ -2482,12 +2482,12 @@ * separate-documents-uncollated-copies allows for uncollated copies. */

doc->collate = strcasecmp(val, "separate-documents-uncollated-copies") != 0;
doc->collate = _cups_strcasecmp(val, "separate-documents-uncollated-copies") != 0; }

if ((val = cupsGetOption("Collate", num_options, options)) != NULL &&
(!strcasecmp(val, "true") ||!strcasecmp(val, "on") ||
!strcasecmp(val, "yes")))
(!_cups_strcasecmp(val, "true") ||!_cups_strcasecmp(val, "on") ||
```
!_cups_strcasecmp(val, "yes")))
```
doc->collate = 1;

/ @@ -2495,8 +2495,8 @@ /

if ((val = cupsGetOption("emit-jcl", num_options, options)) != NULL &&
(!strcasecmp(val, "false") || !strcasecmp(val, "off") ||
!strcasecmp(val, "no") || !strcmp(val, "0")))

(!_cups_strcasecmp(val, "false") || !_cups_strcasecmp(val, "off") ||
```
!_cups_strcasecmp(val, "no") || !strcmp(val, "0")))
```
doc->emit_jcl = 0; else doc->emit_jcl = 1; @@ -2510,17 +2510,17 @@ if ((content_type = getenv("CONTENT_TYPE")) == NULL) content_type = "application/postscript";
if (!strcasecmp(content_type, "application/postscript"))
if (!_cups_strcasecmp(content_type, "application/postscript")) { if ((val = cupsGetOption("fitplot", num_options, options)) != NULL &&
!strcasecmp(val, "true"))
!_cups_strcasecmp(val, "true")) doc->fitplot = 1; else if ((val = cupsGetOption("fit-to-page", num_options, options)) != NULL &&
!strcasecmp(val, "true"))
!_cups_strcasecmp(val, "true")) doc->fitplot = 1; else if ((val = cupsGetOption("ipp-attribute-fidelity", num_options, options)) != NULL &&
!strcasecmp(val, "true"))
!_cups_strcasecmp(val, "true")) doc->fitplot = 1; }

@@ -2561,8 +2561,8 @@ else val = cupsGetOption("mirror", num_options, options);

if (val && (!strcasecmp(val, "true") || !strcasecmp(val, "on") ||
!strcasecmp(val, "yes")))
if (val && (!_cups_strcasecmp(val, "true") || !_cups_strcasecmp(val, "on") ||
```
       !_cups_strcasecmp(val, "yes")))
```
doc->mirror = 1;

/* @@ -2598,21 +2598,21 @@

if ((val = cupsGetOption("number-up-layout", num_options, options)) != NULL) {
if (!strcasecmp(val, "lrtb"))
if (!_cups_strcasecmp(val, "lrtb")) doc->number_up_layout = PSTOPS_LAYOUT_LRTB;
else if (!strcasecmp(val, "lrbt"))
else if (!_cups_strcasecmp(val, "lrbt")) doc->number_up_layout = PSTOPS_LAYOUT_LRBT;
else if (!strcasecmp(val, "rltb"))
else if (!_cups_strcasecmp(val, "rltb")) doc->number_up_layout = PSTOPS_LAYOUT_RLTB;
else if (!strcasecmp(val, "rlbt"))
else if (!_cups_strcasecmp(val, "rlbt")) doc->number_up_layout = PSTOPS_LAYOUT_RLBT;
else if (!strcasecmp(val, "tblr"))
else if (!_cups_strcasecmp(val, "tblr")) doc->number_up_layout = PSTOPS_LAYOUT_TBLR;
else if (!strcasecmp(val, "tbrl"))
else if (!_cups_strcasecmp(val, "tbrl")) doc->number_up_layout = PSTOPS_LAYOUT_TBRL;
else if (!strcasecmp(val, "btlr"))
else if (!_cups_strcasecmp(val, "btlr")) doc->number_up_layout = PSTOPS_LAYOUT_BTLR;
else if (!strcasecmp(val, "btrl"))
else if (!_cups_strcasecmp(val, "btrl")) doc->number_up_layout = PSTOPS_LAYOUT_BTRL; else { @@ -2631,7 +2631,7 @@

if ((val = cupsGetOption("OutputOrder", num_options, options)) != NULL) {
if (!strcasecmp(val, "Reverse"))
if (!_cups_strcasecmp(val, "Reverse")) doc->output_order = 1; } else if (ppd) @@ -2643,10 +2643,10 @@ if ((choice = ppdFindMarkedChoice(ppd, "OutputBin")) != NULL && (attr = ppdFindAttr(ppd, "PageStackOrder", choice->choice)) != NULL && attr->value)
doc->output_order = !strcasecmp(attr->value, "Reverse");
doc->output_order = !_cups_strcasecmp(attr->value, "Reverse"); else if ((attr = ppdFindAttr(ppd, "DefaultOutputOrder", NULL)) != NULL && attr->value)
doc->output_order = !strcasecmp(attr->value, "Reverse");
```
doc->output_order = !_cups_strcasecmp(attr->value, "Reverse");
```
}

/* @@ -2655,15 +2655,15 @@

if ((val = cupsGetOption("page-border", num_options, options)) != NULL) {
if (!strcasecmp(val, "none"))
if (!_cups_strcasecmp(val, "none")) doc->page_border = PSTOPS_BORDERNONE;
else if (!strcasecmp(val, "single"))
else if (!_cups_strcasecmp(val, "single")) doc->page_border = PSTOPS_BORDERSINGLE;
else if (!strcasecmp(val, "single-thick"))
else if (!_cups_strcasecmp(val, "single-thick")) doc->page_border = PSTOPS_BORDERSINGLE2;
else if (!strcasecmp(val, "double"))
else if (!_cups_strcasecmp(val, "double")) doc->page_border = PSTOPS_BORDERDOUBLE;
else if (!strcasecmp(val, "double-thick"))
else if (!_cups_strcasecmp(val, "double-thick")) doc->page_border = PSTOPS_BORDERDOUBLE2; else { @@ -2723,7 +2723,7 @@ doc->slow_collate = 1;

if ((choice = ppdFindMarkedChoice(ppd, "Collate")) != NULL &&
!strcasecmp(choice->choice, "True"))
!_cups_strcasecmp(choice->choice, "True")) { /*
- Hardware collate option is selected, see if the option is @@ -2749,7 +2749,7 @@ if (Duplex && (doc->slow_collate || doc->slow_order || ((attr = ppdFindAttr(ppd, "cupsEvenDuplex", NULL)) != NULL &&
attr->value && !strcasecmp(attr->value, "true"))))
attr->value && !_cups_strcasecmp(attr->value, "true")))) doc->slow_duplex = 1; else doc->slow_duplex = 0; Index: filter/textcommon.c

--- filter/textcommon.c (revision 9791) +++ filter/textcommon.c (working copy) @@ -3,7 +3,7 @@ *
- Common text filter routines for CUPS.
- Copyright 2007-2011 by Apple Inc.
- Copyright 1997-2007 by Easy Software Products.
- These coded instructions, statements, and computer programs are the @@ -548,8 +548,8 @@ num_options = cupsParseOptions(argv[5], 0, &options);
if ((val = cupsGetOption("prettyprint", num_options, options)) != NULL &&
strcasecmp(val, "no") && strcasecmp(val, "off") &&
strcasecmp(val, "false"))
_cups_strcasecmp(val, "no") && _cups_strcasecmp(val, "off") &&
_cups_strcasecmp(val, "false")) { PageLeft = 72.0f; PageRight = PageWidth - 36.0f; @@ -564,25 +564,25 @@ NumKeywords = 0; Keywords = NULL; }
else if (strcasecmp(val, "application/x-cshell") == 0)
else if (_cups_strcasecmp(val, "application/x-cshell") == 0) { PrettyPrint = PRETTY_SHELL; NumKeywords = sizeof(csh_keywords) / sizeof(csh_keywords[0]); Keywords = csh_keywords; }
else if (strcasecmp(val, "application/x-csource") == 0)
else if (_cups_strcasecmp(val, "application/x-csource") == 0) { PrettyPrint = PRETTY_CODE; NumKeywords = sizeof(code_keywords) / sizeof(code_keywords[0]); Keywords = code_keywords; }
else if (strcasecmp(val, "application/x-perl") == 0)
else if (_cups_strcasecmp(val, "application/x-perl") == 0) { PrettyPrint = PRETTY_PERL; NumKeywords = sizeof(perl_keywords) / sizeof(perl_keywords[0]); Keywords = perl_keywords; }
else if (strcasecmp(val, "application/x-shell") == 0)
else if (_cups_strcasecmp(val, "application/x-shell") == 0) { PrettyPrint = PRETTY_SHELL; NumKeywords = sizeof(sh_keywords) / sizeof(sh_keywords[0]); @@ -601,8 +601,8 @@ if ((val = cupsGetOption("wrap", num_options, options)) == NULL) WrapLines = 1; else
WrapLines = !strcasecmp(val, "true") || !strcasecmp(val, "on") ||
!strcasecmp(val, "yes");
WrapLines = !_cups_strcasecmp(val, "true") || !_cups_strcasecmp(val, "on") ||
```
         !_cups_strcasecmp(val, "yes");
```
if ((val = cupsGetOption("columns", num_options, options)) != NULL) { @@ -1092,7 +1092,7 @@ }
```
 column ++;
```
break;
```
   break;
```
}

/*

Index: ppdc/ppdc-driver.cxx

--- ppdc/ppdc-driver.cxx (revision 9791) +++ ppdc/ppdc-driver.cxx (working copy) @@ -3,7 +3,7 @@ // // PPD file compiler definitions for the CUPS PPD Compiler. // -// Copyright 2007-2010 by Apple Inc. +// Copyright 2007-2011 by Apple Inc. // Copyright 2002-2006 by Easy Software Products. // // These coded instructions, statements, and computer programs are the @@ -208,7 +208,7 @@

for (g = (ppdcGroup )groups->first(); g; g = (ppdcGroup )groups->next())
if (!strcasecmp(n, g->name->value))
if (!_cups_strcasecmp(n, g->name->value)) return (g);

return (0); @@ -241,7 +241,7 @@

for (g = (ppdcGroup )groups->first(); g; g = (ppdcGroup )groups->next()) for (o = (ppdcOption )g->options->first(); o; o = (ppdcOption )g->options->next())
if (!strcasecmp(n, o->name->value))
if (!_cups_strcasecmp(n, o->name->value)) { if (mg) _mg = g; @@ -475,7 +475,7 @@ if ((a = find_attr("ModelName", NULL)) != NULL) cupsFilePrintf(fp, "_ModelName: \"%s\"%s", catalog->find_message(a->value->value), lf);
else if (strncasecmp(model_name->value, manufacturer->value,
else if (_cups_strncasecmp(model_name->value, manufacturer->value, strlen(manufacturer->value))) cupsFilePrintf(fp, "_ModelName: \"%s %s\"%s", catalog->find_message(manufacturer->value), @@ -487,7 +487,7 @@ if ((a = find_attr("ShortNickName", NULL)) != NULL) cupsFilePrintf(fp, "_ShortNickName: \"%s\"%s", catalog->find_message(a->value->value), lf);
else if (strncasecmp(model_name->value, manufacturer->value,
else if (_cups_strncasecmp(model_name->value, manufacturer->value, strlen(manufacturer->value))) cupsFilePrintf(fp, "_ShortNickName: \"%s %s\"%s", catalog->find_message(manufacturer->value), @@ -499,7 +499,7 @@ if ((a = find_attr("NickName", NULL)) != NULL) cupsFilePrintf(fp, "_NickName: \"%s\"%s", catalog->find_message(a->value->value), lf);
else if (strncasecmp(model_name->value, manufacturer->value,
else if (_cups_strncasecmp(model_name->value, manufacturer->value, strlen(manufacturer->value))) cupsFilePrintf(fp, "*NickName: \"%s %s, %s\"%s", catalog->find_message(manufacturer->value), @@ -1014,7 +1014,7 @@ if (!g->options->count) continue;
if (strcasecmp(g->name->value, "General"))
if (_cups_strcasecmp(g->name->value, "General")) cupsFilePrintf(fp, "*OpenGroup: %s/%s%s", g->name->value, catalog->find_message(g->text->value), lf);

@@ -1148,7 +1148,7 @@ } }

if (strcasecmp(g->name->value, "General"))
if (_cups_strcasecmp(g->name->value, "General")) cupsFilePrintf(fp, "*CloseGroup: %s%s", g->name->value, lf); }

@@ -1181,7 +1181,7 @@ cupsFilePrintf(fp, "*%s.Translation ModelName/%s: \"\"%s", locale->value, locatalog->find_message(a->value->value), lf);

else if (strncasecmp(model_name->value, manufacturer->value,
else if (_cups_strncasecmp(modelname->value, manufacturer->value, strlen(manufacturer->value))) cupsFilePrintf(fp, "%s.Translation ModelName/%s %s: \"\"%s", locale->value, @@ -1196,7 +1196,7 @@ cupsFilePrintf(fp, "_%s.Translation ShortNickName/%s: \"\"%s", locale->value, locatalog->find_message(a->value->value), lf);
else if (strncasecmp(model_name->value, manufacturer->value,
else if (_cups_strncasecmp(modelname->value, manufacturer->value, strlen(manufacturer->value))) cupsFilePrintf(fp, "%s.Translation ShortNickName/%s %s: \"\"%s", locale->value, @@ -1211,7 +1211,7 @@ cupsFilePrintf(fp, "_%s.Translation NickName/%s: \"\"%s", locale->value, locatalog->find_message(a->value->value), lf);
else if (strncasecmp(model_name->value, manufacturer->value,
```
else if (_cups_strncasecmp(model_name->value, manufacturer->value,
             strlen(manufacturer->value)))
```
cupsFilePrintf(fp, "*%s.Translation NickName/%s %s, %s: \"\"%s", locale->value, @@ -1243,7 +1243,7 @@ if (!g->options->count) continue;
if (strcasecmp(g->name->value, "General"))
if (_cups_strcasecmp(g->name->value, "General")) cupsFilePrintf(fp, "*%s.Translation %s/%s: \"\"%s", locale->value, g->name->value, locatalog->find_message(g->text->value), lf);

Index: ppdc/ppdc-group.cxx

--- ppdc/ppdc-group.cxx (revision 9791) +++ ppdc/ppdc-group.cxx (working copy) @@ -3,7 +3,7 @@ // // Group class for the CUPS PPD Compiler. // -// Copyright 2007-2009 by Apple Inc. +// Copyright 2007-2011 by Apple Inc. // Copyright 2002-2005 by Easy Software Products. // // These coded instructions, statements, and computer programs are the @@ -91,7 +91,7 @@

for (o = (ppdcOption )options->first(); o; o = (ppdcOption )options->next())
if (!strcasecmp(n, o->name->value))
if (!_cups_strcasecmp(n, o->name->value)) return (o);

return (0);

Index: ppdc/ppdc-option.cxx

--- ppdc/ppdc-option.cxx (revision 9791) +++ ppdc/ppdc-option.cxx (working copy) @@ -3,7 +3,7 @@ // // Option class for the CUPS PPD Compiler. // -// Copyright 2007-2009 by Apple Inc. +// Copyright 2007-2011 by Apple Inc. // Copyright 2002-2005 by Easy Software Products. // // These coded instructions, statements, and computer programs are the @@ -100,7 +100,7 @@

for (c = (ppdcChoice )choices->first(); c; c = (ppdcChoice )choices->next())
if (!strcasecmp(n, c->name->value))
if (!_cups_strcasecmp(n, c->name->value)) return (c);

return (0);

Index: ppdc/ppdmerge.cxx

--- ppdc/ppdmerge.cxx (revision 9791) +++ ppdc/ppdmerge.cxx (working copy) @@ -104,18 +104,18 @@ ppd_status_t status; // PPD open status int curline, // Current line linenum; // Line number

+ + status = ppdLastError(&linenum);
+ cupsLangPrintf(stderr, ("%s: Unable to open PPD file: %s on line %d."), "ppdmerge", ppdErrorString(status), linenum); cupsFileRewind(infile);
+ line[0] = '\0'; curline = 0;
+ while (cupsFileGets(infile, line, sizeof(line))) { curline ++; @@ -128,7 +128,7 @@ cupsFileClose(infile); return (1); }
+ // Figure out the locale... if ((locale = ppd_locale(ppd)) == NULL) { @@ -147,13 +147,13 @@ languages = _ppdGetLanguages(ppd);
```
if (outname && !strcmp(inname, outname))
```
{
{ // Rename input filename so that we don't overwrite it... char bckname[1024]; // Backup filename

+ + snprintf(bckname, sizeof(bckname), "%s.bck", inname);
+ if (rename(inname, bckname)) { _cupsLangPrintf(stderr, @@ -177,7 +177,7 @@ argv[i]); ppdClose(ppd); }
+ // Close and move on... cupsFileClose(infile); } @@ -341,7 +341,7 @@ { vlen = strlen(languages[i].version);
if (!strncasecmp(ppd->lang_version, languages[i].version, vlen))
if (!_cups_strncasecmp(ppd->lang_version, languages[i].version, vlen)) { if (ppd->lang_version[vlen] == '-' || ppd->langversion[vlen] == '')

Index: ppdc/ppdpo.cxx

--- ppdc/ppdpo.cxx (revision 9791) +++ ppdc/ppdpo.cxx (working copy) @@ -190,7 +190,7 @@ if (!g->options->count) continue;
if (strcasecmp(g->name->value, "General"))
if (_cups_strcasecmp(g->name->value, "General")) catalog->add_message(g->text->value);

for (o = (ppdcOption *)g->options->first();

Index: ppdc/genstrings.cxx

--- ppdc/genstrings.cxx (revision 9791) +++ ppdc/genstrings.cxx (working copy) @@ -7,7 +7,7 @@ // the standard media and sample driver strings. The results are picked up // by GNU gettext and placed in the CUPS message catalog. // -// Copyright 2008-2010 by Apple Inc. +// Copyright 2008-2011 by Apple Inc. // // These coded instructions, statements, and computer programs are the // property of Apple Inc. and are protected by Federal copyright @@ -126,7 +126,7 @@ if (!g->options->count) continue;
if (strcasecmp(g->name->value, "General"))
if (_cups_strcasecmp(g->name->value, "General")) catalog->add_message(g->text->value);

for (o = (ppdcOption *)g->options->first();

Index: ppdc/ppdc-source.cxx

--- ppdc/ppdc-source.cxx (revision 9791) +++ ppdc/ppdc-source.cxx (working copy) @@ -3,7 +3,7 @@ // // Source class for the CUPS PPD Compiler. // -// Copyright 2007-2010 by Apple Inc. +// Copyright 2007-2011 by Apple Inc. // Copyright 2002-2007 by Easy Software Products. // // These coded instructions, statements, and computer programs are the @@ -189,7 +189,7 @@

for (d = (ppdcDriver )drivers->first(); d; d = (ppdcDriver )drivers->next())
if (!strcasecmp(f, d->pc_file_name->value))
if (!_cups_strcasecmp(f, d->pc_file_name->value)) return (d);

return (NULL); @@ -289,7 +289,7 @@ for (cat = (ppdcCatalog )po_files->first(); cat; cat = (ppdcCatalog )po_files->next())
if (!strcasecmp(l, cat->locale->value))
if (!_cups_strcasecmp(l, cat->locale->value)) return (cat);

return (NULL); @@ -307,7 +307,7 @@

for (m = (ppdcMediaSize )sizes->first(); m; m = (ppdcMediaSize )sizes->next())
if (!strcasecmp(s, m->name->value))
if (!_cups_strcasecmp(s, m->name->value)) return (m);

return (NULL); @@ -325,7 +325,7 @@

for (v = (ppdcVariable )vars->first(); v; v = (ppdcVariable )vars->next())
if (!strcasecmp(n, v->name->value))
if (!_cups_strcasecmp(n, v->name->value)) return (v);

return (NULL); @@ -398,13 +398,13 @@ return (-1); }
if (!strcasecmp(buffer, "on") ||
!strcasecmp(buffer, "yes") ||
!strcasecmp(buffer, "true"))
if (!_cups_strcasecmp(buffer, "on") ||
!_cups_strcasecmp(buffer, "yes") ||
!_cups_strcasecmp(buffer, "true")) return (1);
else if (!strcasecmp(buffer, "off") ||
!strcasecmp(buffer, "no") ||
!strcasecmp(buffer, "false"))
else if (!_cups_strcasecmp(buffer, "off") ||
!_cups_strcasecmp(buffer, "no") ||
!_cups_strcasecmp(buffer, "false")) return (0); else { @@ -537,12 +537,12 @@ ppdcSource::get_color_order( const char *co) // I - Color order string {
if (!strcasecmp(co, "chunked") ||
!strcasecmp(co, "chunky"))
if (!_cups_strcasecmp(co, "chunked") ||
!_cups_strcasecmp(co, "chunky")) return (CUPS_ORDER_CHUNKED);
else if (!strcasecmp(co, "banded"))
else if (!_cups_strcasecmp(co, "banded")) return (CUPS_ORDER_BANDED);
else if (!strcasecmp(co, "planar"))
else if (!_cups_strcasecmp(co, "planar")) return (CUPS_ORDER_PLANAR); else return (-1); @@ -599,71 +599,71 @@ ppdcSource::get_color_space( const char *cs) // I - Colorspace string {
if (!strcasecmp(cs, "w"))
if (!_cups_strcasecmp(cs, "w")) return (CUPS_CSPACE_W);
else if (!strcasecmp(cs, "rgb"))
else if (!_cups_strcasecmp(cs, "rgb")) return (CUPS_CSPACE_RGB);
else if (!strcasecmp(cs, "rgba"))
else if (!_cups_strcasecmp(cs, "rgba")) return (CUPS_CSPACE_RGBA);
else if (!strcasecmp(cs, "k"))
else if (!_cups_strcasecmp(cs, "k")) return (CUPS_CSPACE_K);
else if (!strcasecmp(cs, "cmy"))
else if (!_cups_strcasecmp(cs, "cmy")) return (CUPS_CSPACE_CMY);
else if (!strcasecmp(cs, "ymc"))
else if (!_cups_strcasecmp(cs, "ymc")) return (CUPS_CSPACE_YMC);
else if (!strcasecmp(cs, "cmyk"))
else if (!_cups_strcasecmp(cs, "cmyk")) return (CUPS_CSPACE_CMYK);
else if (!strcasecmp(cs, "ymck"))
else if (!_cups_strcasecmp(cs, "ymck")) return (CUPS_CSPACE_YMCK);
else if (!strcasecmp(cs, "kcmy"))
else if (!_cups_strcasecmp(cs, "kcmy")) return (CUPS_CSPACE_KCMY);
else if (!strcasecmp(cs, "kcmycm"))
else if (!_cups_strcasecmp(cs, "kcmycm")) return (CUPS_CSPACE_KCMYcm);
else if (!strcasecmp(cs, "gmck"))
else if (!_cups_strcasecmp(cs, "gmck")) return (CUPS_CSPACE_GMCK);
else if (!strcasecmp(cs, "gmcs"))
else if (!_cups_strcasecmp(cs, "gmcs")) return (CUPS_CSPACE_GMCS);
else if (!strcasecmp(cs, "white"))
else if (!_cups_strcasecmp(cs, "white")) return (CUPS_CSPACE_WHITE);
else if (!strcasecmp(cs, "gold"))
else if (!_cups_strcasecmp(cs, "gold")) return (CUPS_CSPACE_GOLD);
else if (!strcasecmp(cs, "silver"))
else if (!_cups_strcasecmp(cs, "silver")) return (CUPS_CSPACE_SILVER);
else if (!strcasecmp(cs, "CIEXYZ"))
else if (!_cups_strcasecmp(cs, "CIEXYZ")) return (CUPS_CSPACE_CIEXYZ);
else if (!strcasecmp(cs, "CIELab"))
else if (!_cups_strcasecmp(cs, "CIELab")) return (CUPS_CSPACE_CIELab);
else if (!strcasecmp(cs, "RGBW"))
else if (!_cups_strcasecmp(cs, "RGBW")) return (CUPS_CSPACE_RGBW);
else if (!strcasecmp(cs, "ICC1"))
else if (!_cups_strcasecmp(cs, "ICC1")) return (CUPS_CSPACE_ICC1);
else if (!strcasecmp(cs, "ICC2"))
else if (!_cups_strcasecmp(cs, "ICC2")) return (CUPS_CSPACE_ICC2);
else if (!strcasecmp(cs, "ICC3"))
else if (!_cups_strcasecmp(cs, "ICC3")) return (CUPS_CSPACE_ICC3);
else if (!strcasecmp(cs, "ICC4"))
else if (!_cups_strcasecmp(cs, "ICC4")) return (CUPS_CSPACE_ICC4);
else if (!strcasecmp(cs, "ICC5"))
else if (!_cups_strcasecmp(cs, "ICC5")) return (CUPS_CSPACE_ICC5);
else if (!strcasecmp(cs, "ICC6"))
else if (!_cups_strcasecmp(cs, "ICC6")) return (CUPS_CSPACE_ICC6);
else if (!strcasecmp(cs, "ICC7"))
else if (!_cups_strcasecmp(cs, "ICC7")) return (CUPS_CSPACE_ICC7);
else if (!strcasecmp(cs, "ICC8"))
else if (!_cups_strcasecmp(cs, "ICC8")) return (CUPS_CSPACE_ICC8);
else if (!strcasecmp(cs, "ICC9"))
else if (!_cups_strcasecmp(cs, "ICC9")) return (CUPS_CSPACE_ICC9);
else if (!strcasecmp(cs, "ICCA"))
else if (!_cups_strcasecmp(cs, "ICCA")) return (CUPS_CSPACE_ICCA);
else if (!strcasecmp(cs, "ICCB"))
else if (!_cups_strcasecmp(cs, "ICCB")) return (CUPS_CSPACE_ICCB);
else if (!strcasecmp(cs, "ICCC"))
else if (!_cups_strcasecmp(cs, "ICCC")) return (CUPS_CSPACE_ICCC);
else if (!strcasecmp(cs, "ICCD"))
else if (!_cups_strcasecmp(cs, "ICCD")) return (CUPS_CSPACE_ICCD);
else if (!strcasecmp(cs, "ICCE"))
else if (!_cups_strcasecmp(cs, "ICCE")) return (CUPS_CSPACE_ICCE);
else if (!strcasecmp(cs, "ICCF"))
else if (!_cups_strcasecmp(cs, "ICCF")) return (CUPS_CSPACE_ICCF); else return (-1); @@ -833,8 +833,8 @@ if (cond_state) return;
if (!strcasecmp(temp, "none") || !strcasecmp(temp, "false") ||
!strcasecmp(temp, "no") || !strcasecmp(temp, "off"))
if (!_cups_strcasecmp(temp, "none") || !_cups_strcasecmp(temp, "false") ||
!_cups_strcasecmp(temp, "no") || !_cups_strcasecmp(temp, "off")) { g = d->find_group("General"); if ((o = g->find_option("Duplex")) != NULL) @@ -849,10 +849,10 @@ break; } }
else if (!strcasecmp(temp, "normal") || !strcasecmp(temp, "true") ||
!strcasecmp(temp, "yes") || !strcasecmp(temp, "on") ||
!strcasecmp(temp, "flip") || !strcasecmp(temp, "rotated") ||
!strcasecmp(temp, "manualtumble"))
else if (!_cups_strcasecmp(temp, "normal") || !_cups_strcasecmp(temp, "true") ||
!_cups_strcasecmp(temp, "yes") || !_cups_strcasecmp(temp, "on") ||
!_cups_strcasecmp(temp, "flip") || !_cups_strcasecmp(temp, "rotated") ||
!_cups_strcasecmp(temp, "manualtumble")) { g = d->find_group("General"); o = g->find_option("Duplex"); @@ -860,7 +860,7 @@ if (!o) { o = new ppdcOption(PPDC_PICKONE, "Duplex", "2-Sided Printing",
!strcasecmp(temp, "flip") ? PPDC_SECTION_PAGE :
!_cups_strcasecmp(temp, "flip") ? PPDC_SECTION_PAGE : PPDC_SECTION_ANY, 10.0f); o->add_choice(new ppdcChoice("None", "Off (1-Sided)", "<</Duplex false>>setpagedevice")); @@ -877,12 +877,12 @@ attr = (ppdcAttr *)d->attrs->next()) if (!strcmp(attr->name->value, "cupsFlipDuplex")) {
if (strcasecmp(temp, "flip"))

 if (_cups_strcasecmp(temp, "flip"))
 d->attrs->remove(attr);

break; }

if (!strcasecmp(temp, "flip") && !attr)
if (!_cups_strcasecmp(temp, "flip") && !attr) d->add_attr(new ppdcAttr("cupsFlipDuplex", NULL, NULL, "true"));

for (attr = (ppdcAttr *)d->attrs->first(); @@ -894,11 +894,11 @@ break; }
if (!strcasecmp(temp, "flip"))
if (!_cups_strcasecmp(temp, "flip")) d->add_attr(new ppdcAttr("cupsBackSide", NULL, NULL, "Flipped"));
else if (!strcasecmp(temp, "rotated"))
else if (!_cups_strcasecmp(temp, "rotated")) d->add_attr(new ppdcAttr("cupsBackSide", NULL, NULL, "Rotated"));
else if (!strcasecmp(temp, "manualtumble"))
else if (!_cups_strcasecmp(temp, "manualtumble")) d->add_attr(new ppdcAttr("cupsBackSide", NULL, NULL, "ManualTumble")); else d->add_attr(new ppdcAttr("cupsBackSide", NULL, NULL, "Normal")); @@ -1105,9 +1105,9 @@ return (0); }
if (!strcasecmp(temp, "ROM"))
if (!_cups_strcasecmp(temp, "ROM")) status = PPDC_FONT_ROM;
else if (!strcasecmp(temp, "Disk"))
else if (!_cups_strcasecmp(temp, "Disk")) status = PPDC_FONT_DISK; else { @@ -1530,17 +1530,17 @@ val = (float)strtod(buffer, &ptr);

// Check for a trailing unit specifier...
if (!strcasecmp(ptr, "mm"))
if (!_cups_strcasecmp(ptr, "mm")) val *= 72.0f / 25.4f;
else if (!strcasecmp(ptr, "cm"))
else if (!_cups_strcasecmp(ptr, "cm")) val *= 72.0f / 2.54f;
else if (!strcasecmp(ptr, "m"))
else if (!_cups_strcasecmp(ptr, "m")) val *= 72.0f / 0.0254f;
else if (!strcasecmp(ptr, "in"))
else if (!_cups_strcasecmp(ptr, "in")) val *= 72.0f;
else if (!strcasecmp(ptr, "ft"))
else if (!_cups_strcasecmp(ptr, "ft")) val = 72.0f \ 12.0f;
else if (strcasecmp(ptr, "pt") && *ptr)
else if (_cups_strcasecmp(ptr, "pt") && *ptr) return (-1.0f);

return (val); @@ -1589,11 +1589,11 @@ return (NULL); }
if (!strcasecmp(type, "boolean"))
if (!_cups_strcasecmp(type, "boolean")) ot = PPDC_BOOLEAN;
else if (!strcasecmp(type, "pickone"))
else if (!_cups_strcasecmp(type, "pickone")) ot = PPDC_PICKONE;
else if (!strcasecmp(type, "pickmany"))
else if (!_cups_strcasecmp(type, "pickmany")) ot = PPDC_PICKMANY; else { @@ -1611,17 +1611,17 @@ return (NULL); }
if (!strcasecmp(type, "AnySetup"))
if (!_cups_strcasecmp(type, "AnySetup")) section = PPDC_SECTION_ANY;
else if (!strcasecmp(type, "DocumentSetup"))
else if (!_cups_strcasecmp(type, "DocumentSetup")) section = PPDC_SECTION_DOCUMENT;
else if (!strcasecmp(type, "ExitServer"))
else if (!_cups_strcasecmp(type, "ExitServer")) section = PPDC_SECTION_EXIT;
else if (!strcasecmp(type, "JCLSetup"))
else if (!_cups_strcasecmp(type, "JCLSetup")) section = PPDC_SECTION_JCL;
else if (!strcasecmp(type, "PageSetup"))
else if (!_cups_strcasecmp(type, "PageSetup")) section = PPDC_SECTION_PAGE;
else if (!strcasecmp(type, "Prolog"))
else if (!_cups_strcasecmp(type, "Prolog")) section = PPDC_SECTION_PROLOG; else { @@ -2313,7 +2313,7 @@
```
bytes += cupsFilePrintf(fp, tformat, va_arg(ap, int));
break;
```
+ case 'p' : // Pointer value if ((format - bufformat + 1) > (int)sizeof(tformat)) break; @@ -2468,17 +2468,17 @@ isdefault = 0; }
if (!strcasecmp(temp, "}"))
if (!_cups_strcasecmp(temp, "}")) { // Close this one out... break; }
else if (!strcasecmp(temp, "{"))
else if (!_cups_strcasecmp(temp, "{")) { // Open a new child... scan_file(fp, d); }
else if (!strcasecmp(temp, "#if"))
else if (!_cups_strcasecmp(temp, "#if")) { if ((cond_current - cond_stack) >= 100) { @@ -2497,7 +2497,7 @@ cond_state |= PPDC_COND_SKIP; } }
else if (!strcasecmp(temp, "#elif"))
else if (!_cups_strcasecmp(temp, "#elif")) { if (cond_current == cond_stack) { @@ -2532,7 +2532,7 @@ else cond_temp --; }
else if (!strcasecmp(temp, "#else"))
else if (!_cups_strcasecmp(temp, "#else")) { if (cond_current == cond_stack) { @@ -2562,7 +2562,7 @@ else cond_temp --; }
else if (!strcasecmp(temp, "#endif"))
else if (!_cups_strcasecmp(temp, "#endif")) { if (cond_current == cond_stack) { @@ -2586,12 +2586,12 @@ else cond_temp --; }
else if (!strcasecmp(temp, "#define"))
else if (!_cups_strcasecmp(temp, "#define")) { // Get the variable... get_variable(fp); }
else if (!strcasecmp(temp, "#include"))
else if (!_cups_strcasecmp(temp, "#include")) { // #include filename char basedir[1024], // Base directory @@ -2644,7 +2644,7 @@ break; } }
else if (!strcasecmp(temp, "#media"))
else if (!_cups_strcasecmp(temp, "#media")) { ppdcMediaSize *m; // Media size

@@ -2659,7 +2659,7 @@ sizes->add(m); } }

else if (!strcasecmp(temp, "#po"))
else if (!_cups_strcasecmp(temp, "#po")) { ppdcCatalog *cat; // Message catalog

@@ -2674,14 +2674,14 @@ po_files->add(cat); } }

else if (!strcasecmp(temp, "Attribute") ||
!strcasecmp(temp, "LocAttribute"))
else if (!_cups_strcasecmp(temp, "Attribute") ||
```
      !_cups_strcasecmp(temp, "LocAttribute"))
```
{ ppdcAttr *a; // Attribute

// Get an attribute...
a = get_attr(fp, !strcasecmp(temp, "LocAttribute"));
a = get_attr(fp, !_cups_strcasecmp(temp, "LocAttribute")); if (a) { if (cond_state) @@ -2690,7 +2690,7 @@ d->add_attr(a); } }
else if (!strcasecmp(temp, "Choice"))
else if (!_cups_strcasecmp(temp, "Choice")) { // Get a choice... c = get_choice(fp); @@ -2717,7 +2717,7 @@ if (isdefault) o->set_defchoice(c); }
else if (!strcasecmp(temp, "ColorDevice"))
else if (!_cups_strcasecmp(temp, "ColorDevice")) { // ColorDevice boolean if (cond_state) @@ -2725,7 +2725,7 @@ else d->color_device = get_boolean(fp); }
else if (!strcasecmp(temp, "ColorModel"))
else if (!_cups_strcasecmp(temp, "ColorModel")) { // Get the color model c = get_color_model(fp); @@ -2754,7 +2754,7 @@

o = NULL; }
else if (!strcasecmp(temp, "ColorProfile"))
else if (!_cups_strcasecmp(temp, "ColorProfile")) { ppdcProfile *p; // Color profile

@@ -2770,7 +2770,7 @@ d->profiles->add(p); } }

else if (!strcasecmp(temp, "Copyright"))
else if (!_cups_strcasecmp(temp, "Copyright")) { // Copyright string char copytemp[8192], // Copyright string @@ -2799,7 +2799,7 @@ d->copyright->add(new ppdcString(copyptr)); } }
else if (!strcasecmp(temp, "CustomMedia"))
else if (!_cups_strcasecmp(temp, "CustomMedia")) { ppdcMediaSize *m; // Media size

@@ -2819,7 +2819,7 @@ if (isdefault) d->set_default_size(m); }

else if (!strcasecmp(temp, "Cutter"))
else if (!_cups_strcasecmp(temp, "Cutter")) { // Cutter boolean int have_cutter; // Have a paper cutter? @@ -2846,7 +2846,7 @@

o = NULL; }
else if (!strcasecmp(temp, "Darkness"))
else if (!_cups_strcasecmp(temp, "Darkness")) { // Get the darkness choice... c = get_generic(fp, "Darkness", NULL, "cupsCompression"); @@ -2884,7 +2884,7 @@

o = NULL; }
else if (!strcasecmp(temp, "DriverType"))
else if (!_cups_strcasecmp(temp, "DriverType")) { int i; // Looping var

@@ -2903,21 +2903,21 @@ continue;

   for (i = 0; i < (int)(sizeof(driver_types) / sizeof(driver_types[0])); i ++)

if (!strcasecmp(temp, driver_types[i]))
```
 if (!_cups_strcasecmp(temp, driver_types[i]))
```
break;

if (i < (int)(sizeof(driver_types) / sizeof(driver_types[0]))) d->type = (ppdcDrvType)i;
else if (!strcasecmp(temp, "dymo"))
else if (!_cups_strcasecmp(temp, "dymo")) d->type = PPDC_DRIVER_LABEL; else cupsLangPrintf(stderr, ("ppdc: Unknown driver type %s on line %d of %s."), temp, fp->line, fp->filename); }
else if (!strcasecmp(temp, "Duplex"))
else if (!_cups_strcasecmp(temp, "Duplex")) get_duplex(fp, d);
else if (!strcasecmp(temp, "Filter"))
else if (!_cups_strcasecmp(temp, "Filter")) { ppdcFilter *f; // Filter

@@ -2932,7 +2932,7 @@ d->filters->add(f); } }

else if (!strcasecmp(temp, "Finishing"))
else if (!_cups_strcasecmp(temp, "Finishing")) { // Get the finishing choice... c = get_generic(fp, "Finishing", "OutputType", NULL); @@ -2970,8 +2970,8 @@

o = NULL; }
else if (!strcasecmp(temp, "Font") ||
!strcasecmp(temp, "#font"))
else if (!_cups_strcasecmp(temp, "Font") ||
!_cups_strcasecmp(temp, "#font")) { ppdcFont *f; // Font

@@ -2984,7 +2984,7 @@ f->release(); else {

if (!strcasecmp(temp, "#font"))
if (!_cups_strcasecmp(temp, "#font")) base_fonts->add(f); else d->add_font(f); @@ -2994,7 +2994,7 @@ } } }
else if (!strcasecmp(temp, "Group"))
else if (!_cups_strcasecmp(temp, "Group")) { // Get a group... ppdcGroup *tempg = get_group(fp, d); @@ -3015,7 +3015,7 @@ g = tempg; } }
else if (!strcasecmp(temp, "HWMargins"))
else if (!_cups_strcasecmp(temp, "HWMargins")) { // HWMargins left bottom right top d->left_margin = get_measurement(fp); @@ -3023,7 +3023,7 @@ d->right_margin = get_measurement(fp); d->top_margin = get_measurement(fp); }
else if (!strcasecmp(temp, "InputSlot"))
else if (!_cups_strcasecmp(temp, "InputSlot")) { // Get the input slot choice... c = get_generic(fp, "InputSlot", NULL, "MediaPosition"); @@ -3037,7 +3037,7 @@ }

// Add the choice to the InputSlot option...
+ if ((o = d->find_option_group("InputSlot", &mg)) == NULL) { // Create the InputSlot option... @@ -3063,7 +3063,7 @@

o = NULL; }
else if (!strcasecmp(temp, "Installable"))
else if (!_cups_strcasecmp(temp, "Installable")) { // Get the installable option... o = get_installable(fp); @@ -3079,7 +3079,7 @@ o = NULL; } }
else if (!strcasecmp(temp, "ManualCopies"))
else if (!_cups_strcasecmp(temp, "ManualCopies")) { // ManualCopies boolean if (cond_state) @@ -3087,7 +3087,7 @@ else d->manual_copies = get_boolean(fp); }
else if (!strcasecmp(temp, "Manufacturer"))
else if (!_cups_strcasecmp(temp, "Manufacturer")) { // Manufacturer name char name[256]; // Model name string @@ -3104,7 +3104,7 @@ if (!cond_state) d->set_manufacturer(name); }
else if (!strcasecmp(temp, "MaxSize"))
else if (!_cups_strcasecmp(temp, "MaxSize")) { // MaxSize width length if (cond_state) @@ -3118,7 +3118,7 @@ d->max_length = get_measurement(fp); } }
else if (!strcasecmp(temp, "MediaSize"))
else if (!_cups_strcasecmp(temp, "MediaSize")) { // MediaSize keyword char name[41]; // Media size name @@ -3157,7 +3157,7 @@ if (isdefault) d->set_default_size(dm); }
else if (!strcasecmp(temp, "MediaType"))
else if (!_cups_strcasecmp(temp, "MediaType")) { // Get the media type choice... c = get_generic(fp, "MediaType", "MediaType", "cupsMediaType"); @@ -3196,7 +3196,7 @@

o = NULL; }
else if (!strcasecmp(temp, "MinSize"))
else if (!_cups_strcasecmp(temp, "MinSize")) { // MinSize width length if (cond_state) @@ -3210,7 +3210,7 @@ d->min_length = get_measurement(fp); } }
else if (!strcasecmp(temp, "ModelName"))
else if (!_cups_strcasecmp(temp, "ModelName")) { // ModelName name char name[256]; // Model name string @@ -3227,7 +3227,7 @@ if (!cond_state) d->set_model_name(name); }
else if (!strcasecmp(temp, "ModelNumber"))
else if (!_cups_strcasecmp(temp, "ModelNumber")) { // ModelNumber number if (cond_state) @@ -3235,7 +3235,7 @@ else d->model_number = get_integer(fp); }
else if (!strcasecmp(temp, "Option"))
else if (!_cups_strcasecmp(temp, "Option")) { // Get an option... ppdcOption *tempo = get_option(fp, d, g); @@ -3256,7 +3256,7 @@ o = tempo; } }
else if (!strcasecmp(temp, "FileName"))
else if (!_cups_strcasecmp(temp, "FileName")) { // FileName name char name[256]; // Filename string @@ -3273,7 +3273,7 @@ if (!cond_state) d->set_file_name(name); }
else if (!strcasecmp(temp, "PCFileName"))
else if (!_cups_strcasecmp(temp, "PCFileName")) { // PCFileName name char name[256]; // PC filename string @@ -3290,7 +3290,7 @@ if (!cond_state) d->set_pc_file_name(name); }
else if (!strcasecmp(temp, "Resolution"))
else if (!_cups_strcasecmp(temp, "Resolution")) { // Get the resolution choice... c = get_resolution(fp); @@ -3329,7 +3329,7 @@

o = NULL; }
else if (!strcasecmp(temp, "SimpleColorProfile"))
else if (!_cups_strcasecmp(temp, "SimpleColorProfile")) { ppdcProfile *p; // Color profile

@@ -3345,7 +3345,7 @@ d->profiles->add(p); } }

else if (!strcasecmp(temp, "Throughput"))
else if (!_cups_strcasecmp(temp, "Throughput")) { // Throughput number if (cond_state) @@ -3353,7 +3353,7 @@ else d->throughput = get_integer(fp); }
else if (!strcasecmp(temp, "UIConstraints"))
else if (!_cups_strcasecmp(temp, "UIConstraints")) { ppdcConstraint *con; // Constraint

@@ -3368,7 +3368,7 @@ d->constraints->add(con); } }

else if (!strcasecmp(temp, "VariablePaperSize"))
else if (!_cups_strcasecmp(temp, "VariablePaperSize")) { // VariablePaperSize boolean if (cond_state) @@ -3376,7 +3376,7 @@ else d->variable_paper_size = get_boolean(fp); }
else if (!strcasecmp(temp, "Version"))
else if (!_cups_strcasecmp(temp, "Version")) { // Version string char name[256]; // Model name string Index: ppdc/ppdc.cxx

--- ppdc/ppdc.cxx (revision 9791) +++ ppdc/ppdc.cxx (working copy) @@ -80,7 +80,7 @@ src = new ppdcSource(); use_model_name = 0; verbose = 0;
filenames = cupsArrayNew((cups_array_func_t)strcasecmp, NULL);
filenames = cupsArrayNew((cups_array_func_t)_cups_strcasecmp, NULL);

for (i = 1; i < argc; i ++) if (argv[i][0] == '-') @@ -213,7 +213,7 @@ case 'v' : // Be verbose... verbose ++; break;
+ case 'z' : // Compress files... comp = 1; break; @@ -237,7 +237,7 @@ opt += strlen(opt) - 1; break; }
+ default : // Unknown usage(); break; @@ -319,7 +319,7 @@ // Write the PPD file for this driver... if (use_model_name) {
if (!strncasecmp(d->model_name->value, d->manufacturer->value,
```
if (!_cups_strncasecmp(d->model_name->value, d->manufacturer->value,
             strlen(d->manufacturer->value)))
```
{ // Model name already starts with the manufacturer...

Index: ppdc/ppdc-import.cxx

--- ppdc/ppdc-import.cxx (revision 9791) +++ ppdc/ppdc-import.cxx (working copy) @@ -3,7 +3,7 @@ // // PPD file import methods for the CUPS PPD Compiler. // -// Copyright 2007-2010 by Apple Inc. +// Copyright 2007-2011 by Apple Inc. // Copyright 2002-2006 by Easy Software Products. // // These coded instructions, statements, and computer programs are the @@ -101,7 +101,7 @@

// Then add the stuff from the PPD file... if (ppd->modelname && ppd->manufacturer &&
!strncasecmp(ppd->modelname, ppd->manufacturer,
!_cups_strncasecmp(ppd->modelname, ppd->manufacturer, strlen(ppd->manufacturer))) { ptr = ppd->modelname + strlen(ppd->manufacturer); @@ -171,7 +171,7 @@ for (i = ppd->num_sizes, size = ppd->sizes; i > 0; i --, size ++) { // Don't do custom size here...
if (!strcasecmp(size->name, "Custom"))

if (!_cups_strcasecmp(size->name, "Custom"))
continue;

// Get the code for the PageSize and PageRegion options... @@ -187,7 +187,7 @@

driver->add_size(csize);

if (!strcasecmp(size_option->defchoice, size->name))

if (!_cups_strcasecmp(size_option->defchoice, size->name)) driver->set_default_size(csize); }

@@ -215,7 +215,7 @@ cchoice = new ppdcChoice(choice->choice, choice->text, choice->code); coption->add_choice(cchoice);

if (!strcasecmp(option->defchoice, choice->choice))
```
   if (!_cups_strcasecmp(option->defchoice, choice->choice))
   coption->set_defchoice(cchoice);
}
```
}

Index: config.h.in

--- config.h.in (revision 9791) +++ config.h.in (working copy) @@ -218,8 +218,6 @@ */

undef HAVE_STRDUP

-#undef HAVE_STRCASECMP -#undef HAVE_STRNCASECMP

undef HAVE_STRLCAT

undef HAVE_STRLCPY

Index: xcode/CUPS.xcodeproj/project.pbxproj

--- xcode/CUPS.xcodeproj/project.pbxproj (revision 9791) +++ xcode/CUPS.xcodeproj/project.pbxproj (working copy) @@ -1869,9 +1869,9 @@ 72220EB41333050100FCA411 /* libcups */ = { isa = PBXGroup; children = (

276683561337A8C5000D33D0 /* cups.strings /, 27D3037C134148CB00F022B1 / libcupss.exp /, 27D3037D134148CB00F022B1 /_ libcups2.def */,
276683561337A8C5000D33D0 /* cups.strings /, 72220EB51333052D00FCA411 / adminutil.c /, 72220EB81333056300FCA411 / array.c /, 72220EBA1333056300FCA411 / attr.c */, Index: xcode/config.h

--- xcode/config.h (revision 9791) +++ xcode/config.h (working copy) @@ -21,8 +21,8 @@
- Version of software... */

-#define CUPS_SVERSION "CUPS v1.5svn" -#define CUPS_MINIMAL "CUPS/1.5svn" +#define CUPS_SVERSION "CUPS v1.5.0" +#define CUPS_MINIMAL "CUPS/1.5.0"

/ @@ -216,8 +216,6 @@ /

define HAVE_STRDUP 1

-#define HAVE_STRCASECMP 1 -#define HAVE_STRNCASECMP 1

define HAVE_STRLCAT 1

define HAVE_STRLCPY 1

Index: cgi-bin/search.c

--- cgi-bin/search.c (revision 9791) +++ cgi-bin/search.c (working copy) @@ -145,7 +145,7 @@ * Look for logic words: AND, OR */

if (wlen == 3 && !strncasecmp(qptr, "AND", 3))
if (wlen == 3 && !_cups_strncasecmp(qptr, "AND", 3)) { /*
- Logical AND with the following text... @@ -156,7 +156,7 @@
qptr = qend; }
else if (wlen == 2 && !strncasecmp(qptr, "OR", 2))
else if (wlen == 2 && !_cups_strncasecmp(qptr, "OR", 2)) { /*
- Logical OR with the following text... Index: cgi-bin/printers.c
  
  --- cgi-bin/printers.c (revision 9791) +++ cgi-bin/printers.c (working copy) @@ -174,15 +174,15 @@ do_printer_op(http, printer, CUPS_REJECTJOBS, cgiText(("Reject Jobs"))); else if (!strcmp(op, "purge-jobs")) do_printer_op(http, printer, IPP_PURGEJOBS, cgiText(("Purge Jobs")));
else if (!strcasecmp(op, "print-self-test-page"))
else if (!_cupsstrcasecmp(op, "print-self-test-page")) cgiPrintCommand(http, printer, "PrintSelfTestPage", cgiText(("Print Self-Test Page")));
else if (!strcasecmp(op, "clean-print-heads"))
else if (!_cupsstrcasecmp(op, "clean-print-heads")) cgiPrintCommand(http, printer, "Clean all", cgiText(("Clean Print Heads")));
else if (!strcasecmp(op, "print-test-page"))
else if (!_cups_strcasecmp(op, "print-test-page")) cgiPrintTestPage(http, printer);
else if (!strcasecmp(op, "move-jobs"))
else if (!_cups_strcasecmp(op, "move-jobs")) cgiMoveJobs(http, printer, 0); else { @@ -398,7 +398,7 @@ cgiSetVariable("TOTAL", val);

if ((var = cgiGetVariable("ORDER")) != NULL)
ascending = !strcasecmp(var, "asc");
ascending = !_cups_strcasecmp(var, "asc"); else ascending = 1;

Index: cgi-bin/template.c

--- cgi-bin/template.c (revision 9791) +++ cgi-bin/template.c (working copy) @@ -3,7 +3,7 @@ *

CGI template function. *
- * Copyright 2007-2010 by Apple Inc.
- * Copyright 2007-2011 by Apple Inc.
These coded instructions, statements, and computer programs are the @@ -423,7 +423,7 @@ { if (uriencode) cgi_puturi(outptr, out);
- else if (!strcasecmp(name, "?cupsdconf_default"))
- else if (!_cups_strcasecmp(name, "?cupsdconf_default")) fputs(outptr, stdout); else cgi_puts(outptr, out); @@ -536,16 +536,16 @@ switch (op) { case '<' :
- result = strcasecmp(outptr, compare) < 0;
- result = _cups_strcasecmp(outptr, compare) < 0; break; case '>' :
- result = strcasecmp(outptr, compare) > 0;
- result = _cups_strcasecmp(outptr, compare) > 0; break; case '=' :
- result = strcasecmp(outptr, compare) == 0;
- result = _cups_strcasecmp(outptr, compare) == 0; break; case '!' :
- result = strcasecmp(outptr, compare) != 0;
- result = _cups_strcasecmp(outptr, compare) != 0; break; case '~' : fprintf(stderr, "DEBUG: Regular expression \"%s\"\n", compare); @@ -664,7 +664,7 @@
- Pass and , otherwise quote it... */
if (!strncasecmp(s, "<A HREF=\"", 9))
```
if (!_cups_strncasecmp(s, "<A HREF=\"", 9))
```
{ fputs("<A HREF=\"", out); s += 9; @@ -684,7 +684,7 @@

fputs("\">", out); }
else if (!strncasecmp(s, "", 4))
```
else if (!_cups_strncasecmp(s, "</A>", 4))
```
{ fputs("", out); s += 3;

Index: cgi-bin/ipp-var.c

--- cgi-bin/ipp-var.c (revision 9791) +++ cgi-bin/ipp-var.c (working copy) @@ -404,7 +404,7 @@ * If the name is not the same as the current destination, add it! */
```
 if (strcasecmp(name, dest))
```
```
 if (_cups_strcasecmp(name, dest))
```
{ cgiSetArray("JOB_PRINTER_URI", i, attr->values[0].string.text); cgiSetArray("JOB_PRINTER_NAME", i, name); @@ -906,12 +906,12 @@
- Map local access to a local URI... */
if (!strcasecmp(hostname, "127.0.0.1") ||
!strcasecmp(hostname, "[::1]") ||
!strcasecmp(hostname, "localhost") ||
!strncasecmp(hostname, "localhost.", 10) ||
!strcasecmp(hostname, server) ||
!strcasecmp(hostname, servername))
if (!_cups_strcasecmp(hostname, "127.0.0.1") ||
!_cups_strcasecmp(hostname, "[::1]") ||
!_cups_strcasecmp(hostname, "localhost") ||
!_cups_strncasecmp(hostname, "localhost.", 10) ||
!_cups_strcasecmp(hostname, server) ||
!_cups_strcasecmp(hostname, servername)) { /*
- Make URI relative to the current server... @@ -1347,7 +1347,7 @@ (filter->value_tag >= IPP_TAG_TEXTLANG && filter->value_tag <= IPP_TAG_MIMETYPE)) && filter->values[0].string.text != NULL &&
!strcasecmp(filter->values[0].string.text, filter_value))
```
!_cups_strcasecmp(filter->values[0].string.text, filter_value))
```
break;

if (!filter) @@ -1481,9 +1481,9 @@ first = 0;

if ((var = cgiGetVariable("ORDER")) != NULL)
ascending = !strcasecmp(var, "asc");
ascending = !_cups_strcasecmp(var, "asc"); else
ascending = !which_jobs || !strcasecmp(which_jobs, "not-completed");

ascending = !which_jobs || !_cups_strcasecmp(which_jobs, "not-completed");

section = cgiGetVariable("SECTION");

Index: cgi-bin/makedocset.c

--- cgi-bin/makedocset.c (revision 9791) +++ cgi-bin/makedocset.c (working copy) @@ -3,7 +3,7 @@ *

Xcode documentation set generator. *
- * Copyright 2007-2009 by Apple Inc.
- * Copyright 2007-2011 by Apple Inc.
These coded instructions, statements, and computer programs are the @@ -171,7 +171,7 @@ compare_html(_cups_html_t a, / I - First file _/ _cups_htmlt *b) / I - Second file */ {
- return (strcasecmp(a->title, b->title));
- return (_cups_strcasecmp(a->title, b->title)); }

@@ -183,7 +183,7 @@ compare_sections(_cups_section_t a, / I - First section _/ _cups_sectiont *b) / I - Second section */ {

return (strcasecmp(a->name, b->name));
return (_cups_strcasecmp(a->name, b->name)); }

@@ -201,7 +201,7 @@ if (ret) return (ret); else

return (strcasecmp(a->name, b->name));
return (_cups_strcasecmp(a->name, b->name)); }

@@ -442,7 +442,7 @@ cupsFilePuts(fp, "\n"); subnodes = 1;

}

+ cupsFilePrintf(fp, "<Node id=\"%d\">\n" "Documentation/%s\n" "%s\n"

Index: cgi-bin/help.c

--- cgi-bin/help.c (revision 9791) +++ cgi-bin/help.c (working copy) @@ -342,12 +342,12 @@ { if (inbody) {

if (!strncasecmp(line, "", 7))

if (!_cups_strncasecmp(line, "</BODY>", 7))
break;

printf("%s\n", line); }

else if (!strncasecmp(line, "<BODY", 5))
else if (!_cups_strncasecmp(line, "<BODY", 5)) inbody = 1; }

Index: cgi-bin/admin.c

--- cgi-bin/admin.c (revision 9791) +++ cgi-bin/admin.c (working copy) @@ -496,7 +496,7 @@

request = ippNewRequest(IPP_CREATE_PRINTER_SUBSCRIPTION);

if (!strcasecmp(printer_uri, "#ALL#"))
if (!_cups_strcasecmp(printer_uri, "#ALL#")) ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, "ipp://localhost/"); else @@ -611,7 +611,7 @@ if (attr->name && !strcmp(attr->name, "printer-uri-supported")) { if ((ptr = strrchr(attr->values[0].string.text, '/')) != NULL &&
(!name || strcasecmp(name, ptr + 1)))
(!name || _cups_strcasecmp(name, ptr + 1))) { / \ Don't show the current class... @@ -627,7 +627,7 @@ attr = attr->next) if (attr->name && !strcmp(attr->name, "printer-name")) {
if (!name || strcasecmp(name, attr->values[0].string.text))
if (!name || _cups_strcasecmp(name, attr->values[0].string.text)) { / \ Don't show the current class... @@ -688,7 +688,7 @@ { for (j = 0; j < num_printers; j ++) {
if (!strcasecmp(attr->values[i].string.text,
if (!_cups_strcasecmp(attr->values[i].string.text, cgiGetArray("MEMBER_NAMES", j))) { cgiSetArray("MEMBER_SELECTED", j, "SELECTED"); @@ -960,13 +960,13 @@ makeptr = '\0'; else if ((makeptr = strchr(make, '-')) != NULL) makeptr = '\0';
else if (!strncasecmp(make, "laserjet", 8) ||
!strncasecmp(make, "deskjet", 7) ||
!strncasecmp(make, "designjet", 9))
else if (!_cups_strncasecmp(make, "laserjet", 8) ||
!_cups_strncasecmp(make, "deskjet", 7) ||
!_cups_strncasecmp(make, "designjet", 9)) strcpy(make, "HP");
else if (!strncasecmp(make, "phaser", 6))
else if (!_cups_strncasecmp(make, "phaser", 6)) strcpy(make, "Xerox");
else if (!strncasecmp(make, "stylus", 6))
```
else if (!_cups_strncasecmp(make, "stylus", 6))
strcpy(make, "Epson");
```
else strcpy(make, "Generic"); @@ -1725,7 +1725,7 @@ { val = cupsGetOption("DefaultAuthType", num_settings, settings);

if (!val || !strcasecmp(val, "Negotiate"))

```
if (!val || !_cups_strcasecmp(val, "Negotiate"))
strlcpy(default_auth_type, "Basic", sizeof(default_auth_type));
```
else strlcpy(default_auth_type, val, sizeof(default_auth_type)); @@ -1793,14 +1793,14 @@ num_settings, settings));

if (advanced && !changed)
changed = strcasecmp(local_protocols, current_local_protocols) ||
strcasecmp(remote_protocols, current_remote_protocols) ||
strcasecmp(browse_web_if, current_browse_web_if) ||
strcasecmp(preserve_job_history, current_preserve_job_history) ||
strcasecmp(preserve_job_files, current_preserve_job_files) ||
strcasecmp(max_clients, current_max_clients) ||
strcasecmp(max_jobs, current_max_jobs) ||
strcasecmp(max_log_size, current_max_log_size);
changed = _cups_strcasecmp(local_protocols, current_local_protocols) ||
_cups_strcasecmp(remote_protocols, current_remote_protocols) ||
_cups_strcasecmp(browse_web_if, current_browse_web_if) ||
_cups_strcasecmp(preserve_job_history, current_preserve_job_history) ||
_cups_strcasecmp(preserve_job_files, current_preserve_job_files) ||
_cups_strcasecmp(max_clients, current_max_clients) ||
_cups_strcasecmp(max_jobs, current_max_jobs) ||
```
_cups_strcasecmp(max_log_size, current_max_log_size);
```
if (changed) { @@ -1834,29 +1834,29 @@ * Add advanced settings... */
if (strcasecmp(local_protocols, current_local_protocols))
if (_cups_strcasecmp(local_protocols, current_local_protocols)) num_settings = cupsAddOption("BrowseLocalProtocols", local_protocols, num_settings, &settings);
if (strcasecmp(remote_protocols, current_remote_protocols))
if (_cups_strcasecmp(remote_protocols, current_remote_protocols)) num_settings = cupsAddOption("BrowseRemoteProtocols", remote_protocols, num_settings, &settings);
if (strcasecmp(browse_web_if, current_browse_web_if))
if (_cups_strcasecmp(browse_web_if, current_browse_web_if)) num_settings = cupsAddOption("BrowseWebIF", browse_web_if, num_settings, &settings);
if (strcasecmp(preserve_job_history, current_preserve_job_history))
if (_cups_strcasecmp(preserve_job_history, current_preserve_job_history)) num_settings = cupsAddOption("PreserveJobHistory", preserve_job_history, num_settings, &settings);
if (strcasecmp(preserve_job_files, current_preserve_job_files))
if (_cups_strcasecmp(preserve_job_files, current_preserve_job_files)) num_settings = cupsAddOption("PreserveJobFiles", preserve_job_files, num_settings, &settings);
if (strcasecmp(max_clients, current_max_clients))
if (_cups_strcasecmp(max_clients, current_max_clients)) num_settings = cupsAddOption("MaxClients", max_clients, num_settings, &settings);
if (strcasecmp(max_jobs, current_max_jobs))
if (_cups_strcasecmp(max_jobs, current_max_jobs)) num_settings = cupsAddOption("MaxJobs", max_jobs, num_settings, &settings);
if (strcasecmp(max_log_size, current_max_log_size))
```
 if (_cups_strcasecmp(max_log_size, current_max_log_size))
```
num_settings = cupsAddOption("MaxLogSize", max_log_size, num_settings, &settings); } @@ -2379,7 +2379,7 @@ dest = cgiGetArray("PRINTER_NAME", i);
```
for (j = 0; j < export_count; j ++)
```
if (!strcasecmp(dest, cgiGetArray("EXPORT_NAME", j)))

if (!_cups_strcasecmp(dest, cgiGetArray("EXPORT_NAME", j)))
   break;

cgiSetArray("PRINTER_EXPORT", i, j < export_count ? "Y" : "");

@@ -2567,7 +2567,7 @@ */

if (device_info && device_make_and_model && device_uri &&

strcasecmp(device_make_and_model, "unknown") &&

_cups_strcasecmp(device_make_and_model, "unknown") &&
strchr(device_uri, ':'))

{ / @@ -2594,7 +2594,7 @@ * suitable name. /

     if (strncasecmp(device_info, "unknown", 7))

     if (_cups_strncasecmp(device_info, "unknown", 7))
ptr = device_info;
   else if ((ptr = strstr(device_uri, "://")) != NULL)
ptr += 3;

@@ -2712,7 +2712,7 @@ cgiSetVariable("HAVE_GSSAPI", "1");

if ((val = cupsGetOption("DefaultAuthType", num_settings,

settings)) != NULL && !strcasecmp(val, "Negotiate"))
```
                    settings)) != NULL && !_cups_strcasecmp(val, "Negotiate"))
```
cgiSetVariable("KERBEROS", "CHECKED"); else

endif /* HAVE_GSSAPI */

@@ -2769,16 +2769,16 @@ settings)) == NULL) val = "No";
if (!strcasecmp(val, "yes") || !strcasecmp(val, "on") ||
!strcasecmp(val, "true"))
if (!_cups_strcasecmp(val, "yes") || !_cups_strcasecmp(val, "on") ||
```
!_cups_strcasecmp(val, "true"))
```
cgiSetVariable("BROWSE_WEB_IF", "CHECKED");

if ((val = cupsGetOption("PreserveJobHistory", num_settings, settings)) == NULL) val = "Yes";
if (!strcasecmp(val, "yes") || !strcasecmp(val, "on") ||
!strcasecmp(val, "true"))
if (!_cups_strcasecmp(val, "yes") || !_cups_strcasecmp(val, "on") ||
!_cups_strcasecmp(val, "true")) { cgiSetVariable("PRESERVE_JOB_HISTORY", "CHECKED");

@@ -2786,8 +2786,8 @@ settings)) == NULL) val = "No";

if (!strcasecmp(val, "yes") || !strcasecmp(val, "on") ||
!strcasecmp(val, "true"))
if (!_cups_strcasecmp(val, "yes") || !_cups_strcasecmp(val, "on") ||
!_cups_strcasecmp(val, "true")) cgiSetVariable("PRESERVE_JOB_FILES", "CHECKED"); }

@@ -3530,9 +3530,9 @@ cparam; cparam = ppdNextCustomParam(coption), m ++) {

if (!strcasecmp(option->keyword, "PageSize") &&
strcasecmp(cparam->name, "Width") &&
strcasecmp(cparam->name, "Height"))
if (!_cups_strcasecmp(option->keyword, "PageSize") &&
_cups_strcasecmp(cparam->name, "Width") &&
_cups_strcasecmp(cparam->name, "Height")) { m --; continue; @@ -3545,7 +3545,7 @@ switch (cparam->type) { case PPD_CUSTOM_POINTS :
if (!strncasecmp(option->defchoice, "Custom.", 7))
if (!_cups_strncasecmp(option->defchoice, "Custom.", 7)) { units = option->defchoice + strlen(option->defchoice) - 2;

@@ -4085,7 +4085,7 @@

 return (NULL);

}

else if (strcasecmp(val, "Custom") ||
else if (_cups_strcasecmp(val, "Custom") || (coption = ppdFindCustomOption(ppd, name)) == NULL) { /* Index: cgi-bin/var.c

--- cgi-bin/var.c (revision 9791) +++ cgi-bin/var.c (working copy) @@ -3,7 +3,7 @@ *
- CGI form variable and array functions for CUPS.
- Copyright 2007-2011 by Apple Inc.
- Copyright 1997-2005 by Easy Software Products.
- These coded instructions, statements, and computer programs are the @@ -328,9 +328,9 @@
- Grab form data from the corresponding location... */
if (!strcasecmp(method, "GET"))
if (!_cups_strcasecmp(method, "GET")) return (cgi_initialize_get());
else if (!strcasecmp(method, "POST") && content_type)
else if (!_cups_strcasecmp(method, "POST") && content_type) { const char *boundary = strstr(content_type, "boundary=");

@@ -607,7 +607,7 @@ const _cgi_var_t v1, / I - First variable _/ const _cgi_vart *v2) / I - Second variable */ {

return (strcasecmp(v1->name, v2->name));
return (_cups_strcasecmp(v1->name, v2->name)); }

@@ -824,7 +824,7 @@ / \ Copy file data to the temp file...

*/

+ ptr = line;

while ((ch = getchar()) != EOF)

@@ -928,7 +928,7 @@ filename[0] = '\0'; mimetype[0] = '\0'; }

else if (!strncasecmp(line, "Content-Disposition:", 20))
else if (!_cups_strncasecmp(line, "Content-Disposition:", 20)) { if ((ptr = strstr(line + 20, " name=\"")) != NULL) { @@ -946,7 +946,7 @@ *ptr = '\0'; } }
else if (!strncasecmp(line, "Content-Type:", 13))
else if (!_cups_strncasecmp(line, "Content-Type:", 13)) { for (ptr = line + 13; isspace(*ptr & 255); ptr ++);

@@ -1234,7 +1234,7 @@ _cupsMD5Init(&md5); _cupsMD5Append(&md5, (unsigned char *)buffer, (int)strlen(buffer));

_cupsMD5Finish(&md5, sum);

+ cgiSetCookie(CUPS_SID, httpMD5String(sum, sid), "/", NULL, 0, 0);

return (cupsGetOption(CUPS_SID, num_cookies, cookies));

Index: cgi-bin/help-index.c

--- cgi-bin/help-index.c (revision 9791) +++ cgi-bin/help-index.c (working copy) @@ -919,7 +919,7 @@ * Look for "", "<A NAME", or "<!-- SECTION:" prefix... */</p> <ul> <li>if (!strncasecmp(line, "<!-- SECTION:", 13))</li> <li>if (!_cups_strncasecmp(line, "<!-- SECTION:", 13)) { /* <ul> <li>Got section line, copy it! @@ -946,7 +946,7 @@ { ptr ++;</li> </ul></li> <li> <pre><code>if (!strncasecmp(ptr, "TITLE>", 6))</code></pre> </li> <li>if (!_cups_strncasecmp(ptr, "TITLE>", 6)) { /<em> \</em> Found the title... @@ -955,7 +955,7 @@ anchor = NULL; ptr += 6; }</li> <li>else if (!strncasecmp(ptr, "A NAME=", 7))</li> <li>else if (!_cups_strncasecmp(ptr, "A NAME=", 7)) { /<em> * Found an anchor... @@ -1192,7 +1192,7 @@ sizeof(help_common_words[0])), sizeof(help_common_words[0]), (int (</em>)(const void <em>, const void </em>))</li> <li>strcasecmp))</li> <li> <pre><code> _cups_strcasecmp)) help_add_word(node, temp);</code></pre> <p>} } @@ -1307,7 +1307,7 @@ (diff = strcmp(n1->section, n2->section)) != 0) return (diff);</p> </li> <li>return (strcasecmp(n1->text, n2->text));</li> <li>return (_cups_strcasecmp(n1->text, n2->text)); }</li> </ul> <p>@@ -1322,7 +1322,7 @@ DEBUG_printf(("help_sort_words(w1=%p(\"%s\"), w2=%p(\"%s\"))\n", w1, w1->text, w2, w2->text));</p> <ul> <li>return (strcasecmp(w1->text, w2->text));</li> <li>return (_cups_strcasecmp(w1->text, w2->text)); }</li> </ul> <h1>Index: cgi-bin/classes.c</h1> <p>--- cgi-bin/classes.c (revision 9791)</p> </div> </div> <div class="comment"> <div class="user"> <a rel="noreferrer nofollow" target="_blank" href="https://github.com/michaelrsweet"><img src="https://avatars.githubusercontent.com/u/488103?v=4" />michaelrsweet</a> commented <strong> 13 years ago</strong> </div> <div class="markdown-body"> <p>+++ cgi-bin/classes.c (working copy) @@ -171,9 +171,9 @@ do_class_op(http, pclass, CUPS_REJECT<em>JOBS, cgiText(</em>("Reject Jobs"))); else if (!strcmp(op, "purge-jobs")) do_class_op(http, pclass, IPP_PURGE<em>JOBS, cgiText(</em>("Purge Jobs")));</p> <ul> <li>else if (!strcasecmp(op, "print-test-page"))</li> <li>else if (!_cups_strcasecmp(op, "print-test-page")) cgiPrintTestPage(http, pclass);</li> <li>else if (!strcasecmp(op, "move-jobs"))</li> <li> <p>else if (!_cups_strcasecmp(op, "move-jobs")) cgiMoveJobs(http, pclass, 0); else { @@ -381,7 +381,7 @@ cgiSetVariable("TOTAL", val);</p> <p>if ((var = cgiGetVariable("ORDER")) != NULL)</p> </li> <li>ascending = !strcasecmp(var, "asc");</li> <li>ascending = !_cups_strcasecmp(var, "asc"); else ascending = 1;</li> </ul> <h1>Index: scheduler/policy.c</h1> <p>--- scheduler/policy.c (revision 9791) +++ scheduler/policy.c (working copy) @@ -3,7 +3,7 @@ *</p> <ul> <li>Policy routines for the CUPS scheduler. * <ul> <li>* Copyright 2007-2010 by Apple Inc.</li> <li>* Copyright 2007-2011 by Apple Inc.</li> </ul></li> <li>Copyright 1997-2006 by Easy Software Products, all rights reserved. *</li> <li> <p>These coded instructions, statements, and computer programs are the @@ -325,7 +325,7 @@ */</p> <p>if ((name = (char *)cupsArrayFirst(attrs_ptr)) != NULL &&</p> <ul> <li>!strcasecmp(name, "none"))</li> <li>!_cups_strcasecmp(name, "none")) { <h1>ifdef DEBUG</h1> <p>cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdGetPrivateAttrs: Returning NULL."); @@ -371,7 +371,7 @@ cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdGetPrivateAttrs: name=%s", name);</p> <h1>endif /* DEBUG */</h1></li> </ul> </li> <li>if (printer && !strcasecmp(name, "@ACL"))</li> <li>if (printer && !_cups_strcasecmp(name, "@ACL")) { char <em>acl; /</em> Current ACL user/group */</li> </ul> <p>@@ -397,12 +397,12 @@ if (cupsdCheckGroup(username, pw, acl)) break; }</p> <ul> <li>else if (!strcasecmp(username, acl))</li> <li>else if (!_cups_strcasecmp(username, acl)) break; } }</li> <li>else if (owner && !strcasecmp(name, "@OWNER") &&</li> <li>!strcasecmp(username, owner))</li> <li>else if (owner && !_cups_strcasecmp(name, "@OWNER") &&</li> <li> <pre><code> !_cups_strcasecmp(username, owner))</code></pre> <p>{</p> <h1>ifdef DEBUG</h1> <p>cupsdLogMessage(CUPSD_LOG_DEBUG2, @@ -411,7 +411,7 @@</p> <p>return (NULL); }</p> </li> <li>else if (!strcasecmp(name, "@SYSTEM"))</li> <li>else if (!_cups_strcasecmp(name, "@SYSTEM")) { int i; /* Looping var */</li> </ul> <p>@@ -438,7 +438,7 @@ return (NULL); } }</p> <ul> <li>else if (!strcasecmp(username, name))</li> <li>else if (!_cups_strcasecmp(username, name)) { <h1>ifdef DEBUG</h1> <p>cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdGetPrivateAttrs: Returning NULL."); @@ -480,7 +480,7 @@ compare_policies(cupsd_policy_t <em>a, /</em> I - First policy _/ cupsd_policy<em>t *b) /</em> I - Second policy */ {</p></li> <li>return (strcasecmp(a->name, b->name));</li> <li>return (_cups_strcasecmp(a->name, b->name)); }</li> </ul> <h1>Index: scheduler/subscriptions.c</h1> <p>--- scheduler/subscriptions.c (revision 9791) +++ scheduler/subscriptions.c (working copy) @@ -748,7 +748,7 @@</p> <p>while (cupsFileGetConf(fp, line, sizeof(line), &value, &linenum)) {</p> <ul> <li>if (!strcasecmp(line, "NextSubscriptionId") && value)</li> <li>if (!_cups_strcasecmp(line, "NextSubscriptionId") && value) { /* <ul> <li>NextSubscriptionId NNN @@ -758,7 +758,7 @@ if (i >= NextSubscriptionId && i > 0) NextSubscriptionId = i; }</li> </ul></li> <li>else if (!strcasecmp(line, "<Subscription"))</li> <li>else if (!_cups_strcasecmp(line, "<Subscription")) { /* <ul> <li><Subscription #> @@ -777,7 +777,7 @@ break; } }</li> </ul></li> <li>else if (!strcasecmp(line, "</Subscription>"))</li> <li>else if (!_cups_strcasecmp(line, "</Subscription>")) { if (!sub) { @@ -799,7 +799,7 @@ "Syntax error on line %d of subscriptions.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "Events"))</li> <li>else if (!_cups_strcasecmp(line, "Events")) { /* <ul> <li>Events name @@ -840,7 +840,7 @@ value = valueptr; } }</li> </ul></li> <li>else if (!strcasecmp(line, "Owner"))</li> <li>else if (!_cups_strcasecmp(line, "Owner")) { /* <ul> <li>Owner @@ -856,7 +856,7 @@ break; } }</li> </ul></li> <li>else if (!strcasecmp(line, "Recipient"))</li> <li>else if (!_cups_strcasecmp(line, "Recipient")) { /* <ul> <li>Recipient uri @@ -872,7 +872,7 @@ break; } }</li> </ul></li> <li>else if (!strcasecmp(line, "JobId"))</li> <li>else if (!_cups_strcasecmp(line, "JobId")) { /* <ul> <li>JobId # @@ -896,7 +896,7 @@ break; } }</li> </ul></li> <li>else if (!strcasecmp(line, "PrinterName"))</li> <li>else if (!_cups_strcasecmp(line, "PrinterName")) { /* <ul> <li>PrinterName name @@ -920,7 +920,7 @@ break; } }</li> </ul></li> <li>else if (!strcasecmp(line, "UserData"))</li> <li>else if (!_cups_strcasecmp(line, "UserData")) { /* <ul> <li>UserData encoded-string @@ -982,7 +982,7 @@ break; } }</li> </ul></li> <li>else if (!strcasecmp(line, "LeaseDuration"))</li> <li>else if (!_cups_strcasecmp(line, "LeaseDuration")) { /* <ul> <li>LeaseDuration # @@ -1001,7 +1001,7 @@ break; } }</li> </ul></li> <li>else if (!strcasecmp(line, "Interval"))</li> <li>else if (!_cups_strcasecmp(line, "Interval")) { /* <ul> <li>Interval # @@ -1017,7 +1017,7 @@ break; } }</li> </ul></li> <li>else if (!strcasecmp(line, "ExpirationTime"))</li> <li>else if (!_cups_strcasecmp(line, "ExpirationTime")) { /* <ul> <li>ExpirationTime # @@ -1033,7 +1033,7 @@ break; } }</li> </ul></li> <li>else if (!strcasecmp(line, "NextEventId"))</li> <li>else if (!_cups_strcasecmp(line, "NextEventId")) { /* <ul> <li> <h1>NextEventId # Index: scheduler/quotas.c</h1> <p>--- scheduler/quotas.c (revision 9791) +++ scheduler/quotas.c (working copy) @@ -3,7 +3,7 @@</p> </li> <li> </li> <li>Quota routines for the CUPS scheduler. *</li> </ul></li> <li>* Copyright 2007-2010 by Apple Inc.</li> <li> <ul> <li>Copyright 2007-2011 by Apple Inc.</li> <li>Copyright 1997-2007 by Easy Software Products.</li> <li> </li> <li>These coded instructions, statements, and computer programs are the @@ -146,8 +146,8 @@</li> <li>We only care about the current printer/class and user... */</li> </ul> </li> <li>if (strcasecmp(job->dest, p->name) != 0 ||</li> <li>strcasecmp(job->username, q->username) != 0)</li> <li>if (_cups_strcasecmp(job->dest, p->name) != 0 ||</li> <li> <pre><code> _cups_strcasecmp(job->username, q->username) != 0)</code></pre> <p>continue;</p> <p>/<em> @@ -235,7 +235,7 @@ compare_quotas(const cupsd_quota_t <em>q1, /</em> I - First quota record _/ const cupsd_quota_t </em>q2) /_ I - Second quota record */ {</p> </li> <li>return (strcasecmp(q1->username, q2->username));</li> <li>return (_cups_strcasecmp(q1->username, q2->username)); }</li> </ul> <h1>Index: scheduler/util.c</h1> <p>--- scheduler/util.c (revision 9791) +++ scheduler/util.c (working copy) @@ -36,13 +36,13 @@</p> <h1>ifdef <strong>APPLE</strong></h1> <h1>include <libgen.h></h1> <p>extern char <em><em>environ; -#endif /</em> <strong>APPLE</strong> <em>/ +#endif /</em> <strong>APPLE</strong> </em>/</p> <p>/*</p> <ul> <li>'cupsdCompareNames()' - Compare two names. * <ul> <li>* This function basically does a strcasecmp() of the two strings,</li> <li>* This function basically does a _cups_strcasecmp() of the two strings,</li> </ul></li> <li>but is also aware of numbers so that "a2" < "a100". */</li> </ul> <p>@@ -91,7 +91,7 @@ else if (!isdigit(_s & 255) && isdigit(_t & 255)) return (-1); else if (!isdigit(_s & 255) || !isdigit(_t & 255))</p> <ul> <li>continue; </li> <li> <pre><code> continue;</code></pre> <p>if (<em>s < </em>t) diff = -1;</p> <h1>Index: scheduler/conf.c</h1> <p>--- scheduler/conf.c (revision 9791) +++ scheduler/conf.c (working copy) @@ -759,7 +759,7 @@</p> <p>if ((host = gethostbyname(temp)) != NULL) {</p> </li> <li>if (strcasecmp(temp, host->h_name))</li> <li>if (_cups_strcasecmp(temp, host->h_name)) { cupsdSetString(&ServerName, host->h_name); cupsdAddAlias(ServerAlias, host->h_name); @@ -770,7 +770,7 @@ if (host->h_aliases) { for (i = 0; host->h_aliases[i]; i ++)</li> <li>if (strcasecmp(temp, host->h_aliases[i]))</li> <li>if (_cups_strcasecmp(temp, host->h_aliases[i])) { cupsdAddAlias(ServerAlias, host->h_aliases[i]); cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", @@ -1078,13 +1078,13 @@ else <h1>endif /* HAVE_LIBPAPER */</h1> <p>if (!DefaultLanguage ||</p></li> <li>!strcasecmp(DefaultLanguage, "C") ||</li> <li>!strcasecmp(DefaultLanguage, "POSIX") ||</li> <li>!strcasecmp(DefaultLanguage, "en") ||</li> <li>!strncasecmp(DefaultLanguage, "en.", 3) ||</li> <li>!strncasecmp(DefaultLanguage, "en_US", 5) ||</li> <li>!strncasecmp(DefaultLanguage, "en_CA", 5) ||</li> <li>!strncasecmp(DefaultLanguage, "fr_CA", 5))</li> <li>!_cups_strcasecmp(DefaultLanguage, "C") ||</li> <li>!_cups_strcasecmp(DefaultLanguage, "POSIX") ||</li> <li>!_cups_strcasecmp(DefaultLanguage, "en") ||</li> <li>!_cups_strncasecmp(DefaultLanguage, "en.", 3) ||</li> <li>!_cups_strncasecmp(DefaultLanguage, "en_US", 5) ||</li> <li>!_cups_strncasecmp(DefaultLanguage, "en_CA", 5) ||</li> <li>!_cups_strncasecmp(DefaultLanguage, "fr_CA", 5)) { /* <ul> <li>These are the only locales that will default to "letter" size... @@ -1100,7 +1100,7 @@</li> <li>Update classification setting as needed... */</li> </ul></li> <li>if (Classification && !strcasecmp(Classification, "none"))</li> <li> <p>if (Classification && !_cups_strcasecmp(Classification, "none")) cupsdClearString(&Classification);</p> <p>if (Classification) @@ -1855,15 +1855,15 @@ mask[4]; /* IP netmask components */</p> </li> <li>if (!strcasecmp(line, "Encryption"))</li> <li>if (!_cups_strcasecmp(line, "Encryption")) { /* <ul> <li>"Encryption xxx" - set required encryption level... */</li> </ul></li> <li>if (!strcasecmp(value, "never"))</li> <li>if (!_cups_strcasecmp(value, "never")) loc->encryption = HTTP_ENCRYPT_NEVER;</li> <li>else if (!strcasecmp(value, "always"))</li> <li> <p>else if (!_cups_strcasecmp(value, "always")) { cupsdLogMessage(CUPSD_LOG_ERROR, "Encryption value \"%s\" on line %d is invalid in this " @@ -1871,9 +1871,9 @@</p> <p>loc->encryption = HTTP_ENCRYPT_REQUIRED; }</p> </li> <li>else if (!strcasecmp(value, "required"))</li> <li>else if (!_cups_strcasecmp(value, "required")) loc->encryption = HTTP_ENCRYPT_REQUIRED;</li> <li>else if (!strcasecmp(value, "ifrequested"))</li> <li>else if (!_cups_strcasecmp(value, "ifrequested")) loc->encryption = HTTP_ENCRYPT_IF_REQUESTED; else { @@ -1882,15 +1882,15 @@ return (0); } }</li> <li>else if (!strcasecmp(line, "Order"))</li> <li>else if (!_cups_strcasecmp(line, "Order")) { /* <ul> <li>"Order Deny,Allow" or "Order Allow,Deny"... */</li> </ul></li> <li>if (!strncasecmp(value, "deny", 4))</li> <li>if (!_cups_strncasecmp(value, "deny", 4)) loc->order_type = CUPSD_AUTH_ALLOW;</li> <li>else if (!strncasecmp(value, "allow", 5))</li> <li>else if (!_cups_strncasecmp(value, "allow", 5)) loc->order_type = CUPSD_AUTH_DENY; else { @@ -1899,7 +1899,7 @@ return (0); } }</li> <li>else if (!strcasecmp(line, "Allow") || !strcasecmp(line, "Deny"))</li> <li> <p>else if (!_cups_strcasecmp(line, "Allow") || !_cups_strcasecmp(line, "Deny")) { /*</p> <ul> <li>Allow [From] host/ip... @@ -1908,7 +1908,7 @@</li> </ul> <p>while (*value) {</p> </li> <li>if (!strncasecmp(value, "from", 4))</li> <li> <pre><code>if (!_cups_strncasecmp(value, "from", 4))</code></pre> <p>{ /*</p> <ul> <li>Strip leading "from"... @@ -1948,24 +1948,24 @@</li> <li>nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm */</li> </ul> </li> <li> <pre><code>if (!strcasecmp(value, "all"))</code></pre> </li> <li> <pre><code>if (!_cups_strcasecmp(value, "all"))</code></pre> <p>{ /*</p> <ul> <li>All hosts... */</li> </ul> </li> <li>if (!strcasecmp(line, "Allow"))</li> <li>if (!_cups_strcasecmp(line, "Allow")) cupsdAddIPMask(&(loc->allow), zeros, zeros); else cupsdAddIPMask(&(loc->deny), zeros, zeros); }</li> <li>else if (!strcasecmp(value, "none"))</li> <li> <pre><code>else if (!_cups_strcasecmp(value, "none"))</code></pre> <p>{ /*</p> <ul> <li>No hosts... */</li> </ul> </li> <li>if (!strcasecmp(line, "Allow"))</li> <li>if (!_cups_strcasecmp(line, "Allow")) cupsdAddIPMask(&(loc->allow), ones, zeros); else cupsdAddIPMask(&(loc->deny), ones, zeros); @@ -1984,7 +1984,7 @@ if (value[0] == '*') value ++;</li> <li>if (!strcasecmp(line, "Allow"))</li> <li>if (!_cups_strcasecmp(line, "Allow")) cupsdAddNameMask(&(loc->allow), value); else cupsdAddNameMask(&(loc->deny), value); @@ -2002,7 +2002,7 @@ return (0); }</li> <li>if (!strcasecmp(line, "Allow"))</li> <li>if (!_cups_strcasecmp(line, "Allow")) cupsdAddIPMask(&(loc->allow), ip, mask); else cupsdAddIPMask(&(loc->deny), ip, mask); @@ -2015,39 +2015,39 @@ value = valptr; } }</li> <li>else if (!strcasecmp(line, "AuthType"))</li> <li>else if (!_cups_strcasecmp(line, "AuthType")) { /* <ul> <li>AuthType {none,basic,digest,basicdigest,negotiate,default} */</li> </ul></li> <li>if (!strcasecmp(value, "none"))</li> <li>if (!_cups_strcasecmp(value, "none")) { loc->type = CUPSD_AUTH_NONE; loc->level = CUPSD_AUTH_ANON; }</li> <li>else if (!strcasecmp(value, "basic"))</li> <li> <p>else if (!_cups_strcasecmp(value, "basic")) { loc->type = CUPSD_AUTH_BASIC;</p> <p>if (loc->level == CUPSD_AUTH_ANON) loc->level = CUPSD_AUTH_USER; }</p> </li> <li>else if (!strcasecmp(value, "digest"))</li> <li> <p>else if (!_cups_strcasecmp(value, "digest")) { loc->type = CUPSD_AUTH_DIGEST;</p> <p>if (loc->level == CUPSD_AUTH_ANON) loc->level = CUPSD_AUTH_USER; }</p> </li> <li>else if (!strcasecmp(value, "basicdigest"))</li> <li> <p>else if (!_cups_strcasecmp(value, "basicdigest")) { loc->type = CUPSD_AUTH_BASICDIGEST;</p> <p>if (loc->level == CUPSD_AUTH_ANON) loc->level = CUPSD_AUTH_USER; }</p> </li> <li>else if (!strcasecmp(value, "default"))</li> <li>else if (!_cups_strcasecmp(value, "default")) { loc->type = CUPSD_AUTH_DEFAULT;</li> </ul> <p>@@ -2055,7 +2055,7 @@ loc->level = CUPSD_AUTH_USER; }</p> <h1>ifdef HAVE_GSSAPI</h1> <ul> <li>else if (!strcasecmp(value, "negotiate"))</li> <li>else if (!_cups_strcasecmp(value, "negotiate")) { loc->type = CUPSD_AUTH_NEGOTIATE;</li> </ul> <p>@@ -2071,13 +2071,13 @@ return (0); } }</p> <ul> <li>else if (!strcasecmp(line, "AuthClass"))</li> <li>else if (!_cups_strcasecmp(line, "AuthClass")) { /* <ul> <li>AuthClass anonymous, user, system, group */</li> </ul></li> <li>if (!strcasecmp(value, "anonymous"))</li> <li>if (!_cups_strcasecmp(value, "anonymous")) { loc->type = CUPSD_AUTH_NONE; loc->level = CUPSD_AUTH_ANON; @@ -2087,7 +2087,7 @@ "it from line %d.", value, linenum); }</li> <li>else if (!strcasecmp(value, "user"))</li> <li>else if (!_cups_strcasecmp(value, "user")) { loc->level = CUPSD_AUTH_USER;</li> </ul> <p>@@ -2096,7 +2096,7 @@ "\"Require valid-user\" on line %d.", value, linenum); }</p> <ul> <li>else if (!strcasecmp(value, "group"))</li> <li>else if (!_cups_strcasecmp(value, "group")) { loc->level = CUPSD_AUTH_GROUP;</li> </ul> <p>@@ -2105,7 +2105,7 @@ "\"Require user @groupname\" on line %d.", value, linenum); }</p> <ul> <li>else if (!strcasecmp(value, "system"))</li> <li>else if (!_cups_strcasecmp(value, "system")) { loc->level = CUPSD_AUTH_GROUP;</li> </ul> <p>@@ -2124,7 +2124,7 @@ return (0); } }</p> <ul> <li>else if (!strcasecmp(line, "AuthGroupName"))</li> <li>else if (!_cups_strcasecmp(line, "AuthGroupName")) { cupsdAddName(loc, value);</li> </ul> <p>@@ -2133,7 +2133,7 @@ "using \"Require user @%s\" on line %d.", value, value, linenum); }</p> <ul> <li>else if (!strcasecmp(line, "Require"))</li> <li>else if (!_cups_strcasecmp(line, "Require")) { /* <ul> <li>Apache synonym for AuthClass and AuthGroupName... @@ -2150,10 +2150,10 @@ if (<em>valptr) </em>valptr++ = '\0';</li> </ul></li> <li>if (!strcasecmp(value, "valid-user") ||</li> <li>!strcasecmp(value, "user"))</li> <li>if (!_cups_strcasecmp(value, "valid-user") ||</li> <li>!_cups_strcasecmp(value, "user")) loc->level = CUPSD_AUTH_USER;</li> <li>else if (!strcasecmp(value, "group"))</li> <li>else if (!_cups_strcasecmp(value, "group")) loc->level = CUPSD_AUTH_GROUP; else { @@ -2212,11 +2212,11 @@ for (value = valptr; _cups_isspace(*value); value ++); } }</li> <li>else if (!strcasecmp(line, "Satisfy"))</li> <li>else if (!_cups_strcasecmp(line, "Satisfy")) {</li> <li>if (!strcasecmp(value, "all"))</li> <li>if (!_cups_strcasecmp(value, "all")) loc->satisfy = CUPSD_AUTH_SATISFY_ALL;</li> <li>else if (!strcasecmp(value, "any"))</li> <li>else if (!_cups_strcasecmp(value, "any")) loc->satisfy = CUPSD_AUTH_SATISFY_ANY; else { @@ -2277,29 +2277,29 @@ <ul> <li>Add the error to the bitmask... */</li> </ul></li> <li>if (!strcasecmp(valstart, "all"))</li> <li>if (!_cups_strcasecmp(valstart, "all")) fatal = CUPSD_FATAL_ALL;</li> <li>else if (!strcasecmp(valstart, "browse"))</li> <li>else if (!_cups_strcasecmp(valstart, "browse")) fatal |= CUPSD_FATAL_BROWSE;</li> <li>else if (!strcasecmp(valstart, "-browse"))</li> <li>else if (!_cups_strcasecmp(valstart, "-browse")) fatal &= ~CUPSD_FATAL_BROWSE;</li> <li>else if (!strcasecmp(valstart, "config"))</li> <li>else if (!_cups_strcasecmp(valstart, "config")) fatal |= CUPSD_FATAL_CONFIG;</li> <li>else if (!strcasecmp(valstart, "-config"))</li> <li>else if (!_cups_strcasecmp(valstart, "-config")) fatal &= ~CUPSD_FATAL_CONFIG;</li> <li>else if (!strcasecmp(valstart, "listen"))</li> <li>else if (!_cups_strcasecmp(valstart, "listen")) fatal |= CUPSD_FATAL_LISTEN;</li> <li>else if (!strcasecmp(valstart, "-listen"))</li> <li>else if (!_cups_strcasecmp(valstart, "-listen")) fatal &= ~CUPSD_FATAL_LISTEN;</li> <li>else if (!strcasecmp(valstart, "log"))</li> <li>else if (!_cups_strcasecmp(valstart, "log")) fatal |= CUPSD_FATAL_LOG;</li> <li>else if (!strcasecmp(valstart, "-log"))</li> <li>else if (!_cups_strcasecmp(valstart, "-log")) fatal &= ~CUPSD_FATAL_LOG;</li> <li>else if (!strcasecmp(valstart, "permissions"))</li> <li>else if (!_cups_strcasecmp(valstart, "permissions")) fatal |= CUPSD_FATAL_PERMISSIONS;</li> <li>else if (!strcasecmp(valstart, "-permissions"))</li> <li>else if (!_cups_strcasecmp(valstart, "-permissions")) fatal &= ~CUPSD_FATAL_PERMISSIONS;</li> <li>else if (strcasecmp(valstart, "none"))</li> <li>else if (_cups_strcasecmp(valstart, "none")) cupsdLogMessage(CUPSD_LOG_ERROR, "Unknown FatalErrors kind \"%s\" ignored.", valstart);</li> </ul> <p>@@ -2432,23 +2432,23 @@ * Add the protocol to the bitmask... */</p> <ul> <li>if (!strcasecmp(valstart, "cups"))</li> <li>if (!_cups_strcasecmp(valstart, "cups")) protocols |= BROWSE_CUPS;</li> <li>else if (!strcasecmp(valstart, "slp"))</li> <li>else if (!_cups_strcasecmp(valstart, "slp")) protocols |= BROWSE_SLP;</li> <li>else if (!strcasecmp(valstart, "ldap"))</li> <li>else if (!_cups_strcasecmp(valstart, "ldap")) protocols |= BROWSE_LDAP;</li> <li>else if (!strcasecmp(valstart, "dnssd") ||</li> <li>!strcasecmp(valstart, "dns-sd") ||</li> <li>!strcasecmp(valstart, "bonjour"))</li> <li>else if (!_cups_strcasecmp(valstart, "dnssd") ||</li> <li>!_cups_strcasecmp(valstart, "dns-sd") ||</li> <li>!_cups_strcasecmp(valstart, "bonjour")) protocols |= BROWSE_DNSSD;</li> <li>else if (!strcasecmp(valstart, "lpd"))</li> <li>else if (!_cups_strcasecmp(valstart, "lpd")) protocols |= BROWSE_LPD;</li> <li>else if (!strcasecmp(valstart, "smb"))</li> <li>else if (!_cups_strcasecmp(valstart, "smb")) protocols |= BROWSE_SMB;</li> <li>else if (!strcasecmp(valstart, "all"))</li> <li>else if (!_cups_strcasecmp(valstart, "all")) protocols |= BROWSE_ALL;</li> <li>else if (strcasecmp(valstart, "none"))</li> <li>else if (_cups_strcasecmp(valstart, "none")) cupsdLogMessage(CUPSD_LOG_ERROR, "Unknown browse protocol \"%s\" ignored.", valstart);</li> </ul> <p>@@ -2503,7 +2503,7 @@ * Decode the directive... */</p> <ul> <li>if (!strcasecmp(line, "Include") && value)</li> <li>if (!_cups_strcasecmp(line, "Include") && value) { /* <ul> <li>Include filename @@ -2524,7 +2524,7 @@ cupsFileClose(incfile); } }</li> </ul></li> <li>else if (!strcasecmp(line, "<Location") && value)</li> <li>else if (!_cups_strcasecmp(line, "<Location") && value) { /* <ul> <li> <Location path> @@ -2534,7 +2534,7 @@ if (linenum == 0) return (0); } </li> </ul></li> <li>else if (!strcasecmp(line, "<Policy") && value)</li> <li>else if (!_cups_strcasecmp(line, "<Policy") && value) { /* <ul> <li> <Policy name> @@ -2544,25 +2544,25 @@ if (linenum == 0) return (0); } </li> </ul></li> <li>else if (!strcasecmp(line, "FatalErrors"))</li> <li>else if (!_cups_strcasecmp(line, "FatalErrors")) FatalErrors = parse_fatal_errors(value);</li> <li>else if (!strcasecmp(line, "FaxRetryInterval") && value)</li> <li>else if (!_cups_strcasecmp(line, "FaxRetryInterval") && value) { JobRetryInterval = atoi(value); cupsdLogMessage(CUPSD_LOG_WARN, "FaxRetryInterval is deprecated; use " "JobRetryInterval on line %d.", linenum); }</li> <li>else if (!strcasecmp(line, "FaxRetryLimit") && value)</li> <li>else if (!_cups_strcasecmp(line, "FaxRetryLimit") && value) { JobRetryLimit = atoi(value); cupsdLogMessage(CUPSD_LOG_WARN, "FaxRetryLimit is deprecated; use " "JobRetryLimit on line %d.", linenum); }</li> <li>else if (!strcasecmp(line, "Port") || !strcasecmp(line, "Listen")</li> <li>else if (!_cups_strcasecmp(line, "Port") || !_cups_strcasecmp(line, "Listen") <h1>ifdef HAVE_SSL</h1></li> <li>|| !strcasecmp(line, "SSLPort") || !strcasecmp(line, "SSLListen")</li> <li> <pre><code> || !_cups_strcasecmp(line, "SSLPort") || !_cups_strcasecmp(line, "SSLListen")</code></pre> <h1>endif /* HAVE_SSL */</h1> <pre><code> )</code></pre> <p>{ @@ -2644,7 +2644,7 @@ lis->fd = -1;</p> <h1>ifdef HAVE_SSL</h1> </li> <li>if (!strcasecmp(line, "SSLPort") || !strcasecmp(line, "SSLListen"))</li> <li>if (!_cups_strcasecmp(line, "SSLPort") || !_cups_strcasecmp(line, "SSLListen")) lis->encryption = HTTP_ENCRYPT_ALWAYS; <h1>endif /* HAVE_SSL */</h1></li> </ul> <p>@@ -2669,7 +2669,7 @@</p> <pre><code> httpAddrFreeList(addrlist); }</code></pre> <ul> <li>else if (!strcasecmp(line, "BrowseAddress") && value)</li> <li> <p>else if (!_cups_strcasecmp(line, "BrowseAddress") && value) { /*</p> <ul> <li>Add a browse address to the list... @@ -2696,7 +2696,7 @@</li> </ul> <p>memset(dira, 0, sizeof(cupsd_dirsvc_addr_t));</p> </li> <li> <pre><code>if (!strcasecmp(value, "@LOCAL"))</code></pre> </li> <li>if (!_cups_strcasecmp(value, "@LOCAL")) { /* <ul> <li>Send browse data to all local interfaces... @@ -2705,7 +2705,7 @@ strcpy(dira->iface, "*"); NumBrowsers ++; }</li> </ul></li> <li>else if (!strncasecmp(value, "@IF(", 4))</li> <li>else if (!_cups_strncasecmp(value, "@IF(", 4)) { /* <ul> <li>Send browse data to the named interface... @@ -2750,7 +2750,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Bad BrowseAddress %s at line %d.", value, linenum); }</li> </ul></li> <li>else if (!strcasecmp(line, "BrowseOrder") && value)</li> <li>else if (!_cups_strcasecmp(line, "BrowseOrder") && value) { /* <ul> <li>"BrowseOrder Deny,Allow" or "BrowseOrder Allow,Deny"... @@ -2763,18 +2763,18 @@ if (location == NULL) cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to initialize browse access control list.");</li> </ul></li> <li>else if (!strncasecmp(value, "deny", 4))</li> <li>else if (!_cups_strncasecmp(value, "deny", 4)) location->order_type = CUPSD_AUTH_ALLOW;</li> <li>else if (!strncasecmp(value, "allow", 5))</li> <li>else if (!_cups_strncasecmp(value, "allow", 5)) location->order_type = CUPSD_AUTH_DENY; else cupsdLogMessage(CUPSD_LOG_ERROR, "Unknown BrowseOrder value %s on line %d.", value, linenum); }</li> <li>else if (!strcasecmp(line, "BrowseProtocols") ||</li> <li>!strcasecmp(line, "BrowseLocalProtocols") ||</li> <li>!strcasecmp(line, "BrowseRemoteProtocols"))</li> <li>else if (!_cups_strcasecmp(line, "BrowseProtocols") ||</li> <li>!_cups_strcasecmp(line, "BrowseLocalProtocols") ||</li> <li> <pre><code> !_cups_strcasecmp(line, "BrowseRemoteProtocols"))</code></pre> <p>{ /*</p> <ul> <li>"BrowseProtocols name [... name]" @@ -2792,13 +2792,13 @@ break; }</li> </ul> </li> <li> <pre><code>if (strcasecmp(line, "BrowseLocalProtocols"))</code></pre> </li> <li>if (_cups_strcasecmp(line, "BrowseLocalProtocols")) BrowseRemoteProtocols = protocols;</li> <li>if (strcasecmp(line, "BrowseRemoteProtocols"))</li> <li>if (_cups_strcasecmp(line, "BrowseRemoteProtocols")) BrowseLocalProtocols = protocols; }</li> <li>else if ((!strcasecmp(line, "BrowseAllow") ||</li> <li>!strcasecmp(line, "BrowseDeny")) && value)</li> <li>else if ((!_cups_strcasecmp(line, "BrowseAllow") ||</li> <li>!_cups_strcasecmp(line, "BrowseDeny")) && value) { /* <ul> <li>BrowseAllow [From] host/ip... @@ -2815,7 +2815,7 @@ "Unable to initialize browse access control list."); else {</li> </ul></li> <li>if (!strncasecmp(value, "from", 4))</li> <li>if (!_cups_strncasecmp(value, "from", 4)) { /* <ul> <li>Skip leading "from"... @@ -2863,24 +2863,24 @@</li> <li>nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm */</li> </ul></li> <li> <pre><code>if (!strcasecmp(value, "all"))</code></pre> </li> <li> <pre><code>if (!_cups_strcasecmp(value, "all"))</code></pre> <p>{ /<em> * All hosts... </em>/</p> </li> <li> <pre><code>if (!strcasecmp(line, "BrowseAllow"))</code></pre> </li> <li>if (!_cups_strcasecmp(line, "BrowseAllow")) cupsdAddIPMask(&(location->allow), zeros, zeros); else cupsdAddIPMask(&(location->deny), zeros, zeros); }</li> <li>else if (!strcasecmp(value, "none"))</li> <li> <pre><code>else if (!_cups_strcasecmp(value, "none"))</code></pre> <p>{ /<em> * No hosts... </em>/</p> </li> <li> <pre><code>if (!strcasecmp(line, "BrowseAllow"))</code></pre> </li> <li> <pre><code>if (!_cups_strcasecmp(line, "BrowseAllow")) cupsdAddIPMask(&(location->allow), ones, zeros); else cupsdAddIPMask(&(location->deny), ones, zeros);</code></pre> <p>@@ -2897,7 +2897,7 @@ * Host or domain name... */</p> </li> <li> <pre><code>if (!strcasecmp(line, "BrowseAllow"))</code></pre> </li> <li> <pre><code>if (!_cups_strcasecmp(line, "BrowseAllow")) cupsdAddNameMask(&(location->allow), value); else cupsdAddNameMask(&(location->deny), value);</code></pre> <p>@@ -2915,7 +2915,7 @@ break; }</p> </li> <li> <pre><code>if (!strcasecmp(line, "BrowseAllow"))</code></pre> </li> <li>if (!_cups_strcasecmp(line, "BrowseAllow")) cupsdAddIPMask(&(location->allow), ip, mask); else cupsdAddIPMask(&(location->deny), ip, mask); @@ -2929,7 +2929,7 @@ } } }</li> <li>else if (!strcasecmp(line, "BrowseRelay") && value)</li> <li> <p>else if (!_cups_strcasecmp(line, "BrowseRelay") && value) { /*</p> <ul> <li>BrowseRelay [from] source [to] destination @@ -2953,7 +2953,7 @@</li> </ul> <p>memset(relay, 0, sizeof(cupsd_dirsvc_relay_t));</p> </li> <li> <pre><code>if (!strncasecmp(value, "from ", 5))</code></pre> </li> <li> <pre><code>if (!_cups_strncasecmp(value, "from ", 5))</code></pre> <p>{ /*</p> <ul> <li>Skip leading "from"... @@ -3039,7 +3039,7 @@</li> <li>Get "to" address and port... */</li> </ul> </li> <li> <pre><code>if (!strncasecmp(valueptr, "to ", 3))</code></pre> </li> <li>if (!_cups_strncasecmp(valueptr, "to ", 3)) { /<em> \</em> Strip leading "to"... @@ -3092,7 +3092,7 @@ valueptr, linenum); } }</li> <li>else if (!strcasecmp(line, "BrowsePoll") && value)</li> <li>else if (!_cups_strcasecmp(line, "BrowsePoll") && value) { /* <ul> <li>BrowsePoll address[:port] @@ -3154,22 +3154,22 @@ cupsdLogMessage(CUPSD_LOG_INFO, "Polling %s:%d", pollp->hostname, pollp->port); }</li> </ul></li> <li>else if (!strcasecmp(line, "DefaultAuthType") && value)</li> <li>else if (!_cups_strcasecmp(line, "DefaultAuthType") && value) { /* <ul> <li>DefaultAuthType {basic,digest,basicdigest,negotiate} */</li> </ul></li> <li> <pre><code>if (!strcasecmp(value, "none"))</code></pre> </li> <li>if (!_cups_strcasecmp(value, "none")) DefaultAuthType = CUPSD_AUTH_NONE;</li> <li>else if (!strcasecmp(value, "basic"))</li> <li>else if (!_cups_strcasecmp(value, "basic")) DefaultAuthType = CUPSD_AUTH_BASIC;</li> <li>else if (!strcasecmp(value, "digest"))</li> <li>else if (!_cups_strcasecmp(value, "digest")) DefaultAuthType = CUPSD_AUTH_DIGEST;</li> <li>else if (!strcasecmp(value, "basicdigest"))</li> <li>else if (!_cups_strcasecmp(value, "basicdigest")) DefaultAuthType = CUPSD_AUTH_BASICDIGEST; <h1>ifdef HAVE_GSSAPI</h1></li> <li>else if (!strcasecmp(value, "negotiate"))</li> <li>else if (!_cups_strcasecmp(value, "negotiate")) DefaultAuthType = CUPSD_AUTH_NEGOTIATE; <h1>endif /* HAVE_GSSAPI */</h1> <p>else @@ -3182,17 +3182,17 @@ } }</p> <h1>ifdef HAVE_SSL</h1></li> <li>else if (!strcasecmp(line, "DefaultEncryption"))</li> <li>else if (!_cups_strcasecmp(line, "DefaultEncryption")) { /* <ul> <li>DefaultEncryption {Never,IfRequested,Required} */</li> </ul></li> <li> <pre><code>if (!value || !strcasecmp(value, "never"))</code></pre> </li> <li>if (!value || !_cups_strcasecmp(value, "never")) DefaultEncryption = HTTP_ENCRYPT_NEVER;</li> <li>else if (!strcasecmp(value, "required"))</li> <li>else if (!_cups_strcasecmp(value, "required")) DefaultEncryption = HTTP_ENCRYPT_REQUIRED;</li> <li>else if (!strcasecmp(value, "ifrequested"))</li> <li>else if (!_cups_strcasecmp(value, "ifrequested")) DefaultEncryption = HTTP_ENCRYPT_IF_REQUESTED; else { @@ -3204,7 +3204,7 @@ } } <h1>endif /* HAVE_SSL */</h1></li> <li>else if (!strcasecmp(line, "User") && value)</li> <li>else if (!_cups_strcasecmp(line, "User") && value) { /* <ul> <li>User ID to run as... @@ -3247,7 +3247,7 @@ value, linenum); } }</li> </ul></li> <li>else if (!strcasecmp(line, "Group") && value)</li> <li>else if (!_cups_strcasecmp(line, "Group") && value) { /* <ul> <li>Group ID to run as... @@ -3268,7 +3268,7 @@ value, linenum); } }</li> </ul></li> <li>else if (!strcasecmp(line, "SystemGroup") && value)</li> <li>else if (!_cups_strcasecmp(line, "SystemGroup") && value) { /* <ul> <li>SystemGroup (admin) group(s)... @@ -3279,101 +3279,101 @@ "Unknown SystemGroup \"%s\" on line %d, ignoring.", value, linenum); }</li> </ul></li> <li>else if (!strcasecmp(line, "HostNameLookups") && value)</li> <li>else if (!_cups_strcasecmp(line, "HostNameLookups") && value) { /* <ul> <li>Do hostname lookups? */</li> </ul></li> <li> <pre><code>if (!strcasecmp(value, "off") || !strcasecmp(value, "no") ||</code></pre> </li> <li>!strcasecmp(value, "false"))</li> <li>if (!_cups_strcasecmp(value, "off") || !_cups_strcasecmp(value, "no") ||</li> <li>!_cups_strcasecmp(value, "false")) HostNameLookups = 0;</li> <li>else if (!strcasecmp(value, "on") || !strcasecmp(value, "yes") ||</li> <li>!strcasecmp(value, "true"))</li> <li>else if (!_cups_strcasecmp(value, "on") || !_cups_strcasecmp(value, "yes") ||</li> <li>!_cups_strcasecmp(value, "true")) HostNameLookups = 1;</li> <li>else if (!strcasecmp(value, "double"))</li> <li>else if (!_cups_strcasecmp(value, "double")) HostNameLookups = 2; else cupsdLogMessage(CUPSD_LOG_WARN, "Unknown HostNameLookups %s on line %d.", value, linenum); }</li> <li>else if (!strcasecmp(line, "AccessLogLevel") && value)</li> <li>else if (!_cups_strcasecmp(line, "AccessLogLevel") && value) { /* <ul> <li>Amount of logging to do to access log... */</li> </ul></li> <li> <pre><code>if (!strcasecmp(value, "all"))</code></pre> </li> <li>if (!_cups_strcasecmp(value, "all")) AccessLogLevel = CUPSD_ACCESSLOG_ALL;</li> <li>else if (!strcasecmp(value, "actions"))</li> <li>else if (!_cups_strcasecmp(value, "actions")) AccessLogLevel = CUPSD_ACCESSLOG_ACTIONS;</li> <li>else if (!strcasecmp(value, "config"))</li> <li>else if (!_cups_strcasecmp(value, "config")) AccessLogLevel = CUPSD_ACCESSLOG_CONFIG; else cupsdLogMessage(CUPSD_LOG_WARN, "Unknown AccessLogLevel %s on line %d.", value, linenum); }</li> <li>else if (!strcasecmp(line, "LogLevel") && value)</li> <li>else if (!_cups_strcasecmp(line, "LogLevel") && value) { /* <ul> <li>Amount of logging to do to error log... */</li> </ul></li> <li> <pre><code>if (!strcasecmp(value, "debug2"))</code></pre> </li> <li>if (!_cups_strcasecmp(value, "debug2")) LogLevel = CUPSD_LOG_DEBUG2;</li> <li>else if (!strcasecmp(value, "debug"))</li> <li>else if (!_cups_strcasecmp(value, "debug")) LogLevel = CUPSD_LOG_DEBUG;</li> <li>else if (!strcasecmp(value, "info"))</li> <li>else if (!_cups_strcasecmp(value, "info")) LogLevel = CUPSD_LOG_INFO;</li> <li>else if (!strcasecmp(value, "notice"))</li> <li>else if (!_cups_strcasecmp(value, "notice")) LogLevel = CUPSD_LOG_NOTICE;</li> <li>else if (!strcasecmp(value, "warn"))</li> <li>else if (!_cups_strcasecmp(value, "warn")) LogLevel = CUPSD_LOG_WARN;</li> <li>else if (!strcasecmp(value, "error"))</li> <li>else if (!_cups_strcasecmp(value, "error")) LogLevel = CUPSD_LOG_ERROR;</li> <li>else if (!strcasecmp(value, "crit"))</li> <li>else if (!_cups_strcasecmp(value, "crit")) LogLevel = CUPSD_LOG_CRIT;</li> <li>else if (!strcasecmp(value, "alert"))</li> <li>else if (!_cups_strcasecmp(value, "alert")) LogLevel = CUPSD_LOG_ALERT;</li> <li>else if (!strcasecmp(value, "emerg"))</li> <li>else if (!_cups_strcasecmp(value, "emerg")) LogLevel = CUPSD_LOG_EMERG;</li> <li>else if (!strcasecmp(value, "none"))</li> <li>else if (!_cups_strcasecmp(value, "none")) LogLevel = CUPSD_LOG_NONE; else cupsdLogMessage(CUPSD_LOG_WARN, "Unknown LogLevel %s on line %d.", value, linenum); }</li> <li>else if (!strcasecmp(line, "LogTimeFormat") && value)</li> <li>else if (!_cups_strcasecmp(line, "LogTimeFormat") && value) { /* <ul> <li>Amount of logging to do to error log... */</li> </ul></li> <li> <pre><code>if (!strcasecmp(value, "standard"))</code></pre> </li> <li>if (!_cups_strcasecmp(value, "standard")) LogTimeFormat = CUPSD_TIME_STANDARD;</li> <li>else if (!strcasecmp(value, "usecs"))</li> <li>else if (!_cups_strcasecmp(value, "usecs")) LogTimeFormat = CUPSD_TIME_USECS; else cupsdLogMessage(CUPSD_LOG_WARN, "Unknown LogTimeFormat %s on line %d.", value, linenum); }</li> <li>else if (!strcasecmp(line, "PrintcapFormat") && value)</li> <li>else if (!_cups_strcasecmp(line, "PrintcapFormat") && value) { /* <ul> <li>Format of printcap file? */</li> </ul></li> <li> <pre><code>if (!strcasecmp(value, "bsd"))</code></pre> </li> <li>if (!_cups_strcasecmp(value, "bsd")) PrintcapFormat = PRINTCAP_BSD;</li> <li>else if (!strcasecmp(value, "plist"))</li> <li>else if (!_cups_strcasecmp(value, "plist")) PrintcapFormat = PRINTCAP_PLIST;</li> <li>else if (!strcasecmp(value, "solaris"))</li> <li>else if (!_cups_strcasecmp(value, "solaris")) PrintcapFormat = PRINTCAP_SOLARIS; else cupsdLogMessage(CUPSD_LOG_WARN, "Unknown PrintcapFormat %s on line %d.", value, linenum); }</li> <li>else if (!strcasecmp(line, "ServerTokens") && value)</li> <li> <p>else if (!_cups_strcasecmp(line, "ServerTokens") && value) { /*</p> <ul> <li>Set the string used for the Server header... @@ -3384,26 +3384,26 @@</li> </ul> <p>uname(&plat);</p> </li> <li> <pre><code>if (!strcasecmp(value, "ProductOnly"))</code></pre> </li> <li>if (!_cups_strcasecmp(value, "ProductOnly")) cupsdSetString(&ServerHeader, "CUPS");</li> <li>else if (!strcasecmp(value, "Major"))</li> <li>else if (!_cups_strcasecmp(value, "Major")) cupsdSetString(&ServerHeader, "CUPS/1");</li> <li>else if (!strcasecmp(value, "Minor"))</li> <li>else if (!_cups_strcasecmp(value, "Minor")) cupsdSetString(&ServerHeader, "CUPS/1.4");</li> <li>else if (!strcasecmp(value, "Minimal"))</li> <li>else if (!_cups_strcasecmp(value, "Minimal")) cupsdSetString(&ServerHeader, CUPS_MINIMAL);</li> <li>else if (!strcasecmp(value, "OS"))</li> <li>else if (!_cups_strcasecmp(value, "OS")) cupsdSetStringf(&ServerHeader, CUPS_MINIMAL " (%s)", plat.sysname);</li> <li>else if (!strcasecmp(value, "Full"))</li> <li>else if (!_cups_strcasecmp(value, "Full")) cupsdSetStringf(&ServerHeader, CUPS_MINIMAL " (%s) IPP/1.1", plat.sysname);</li> <li>else if (!strcasecmp(value, "None"))</li> <li>else if (!_cups_strcasecmp(value, "None")) cupsdClearString(&ServerHeader); else cupsdLogMessage(CUPSD_LOG_WARN, "Unknown ServerTokens %s on line %d.", value, linenum); }</li> <li>else if (!strcasecmp(line, "PassEnv") && value)</li> <li>else if (!_cups_strcasecmp(line, "PassEnv") && value) { /* <ul> <li>PassEnv variable [... variable] @@ -3428,7 +3428,7 @@ break; } }</li> </ul></li> <li>else if (!strcasecmp(line, "ServerAlias") && value)</li> <li>else if (!_cups_strcasecmp(line, "ServerAlias") && value) { /* <ul> <li>ServerAlias name [... name] @@ -3456,7 +3456,7 @@ break; } }</li> </ul></li> <li>else if (!strcasecmp(line, "SetEnv") && value)</li> <li>else if (!_cups_strcasecmp(line, "SetEnv") && value) { /* <ul> <li>SetEnv variable value @@ -3481,15 +3481,15 @@ linenum); } <h1>ifdef HAVE_SSL</h1></li> </ul></li> <li>else if (!strcasecmp(line, "SSLOptions"))</li> <li>else if (!_cups_strcasecmp(line, "SSLOptions")) { /* <ul> <li>SSLOptions options */</li> </ul></li> <li> <pre><code>if (!value || !strcasecmp(value, "none"))</code></pre> </li> <li>if (!value || !_cups_strcasecmp(value, "none")) SSLOptions = CUPSD_SSL_NONE;</li> <li>else if (!strcasecmp(value, "noemptyfragments"))</li> <li> <pre><code>else if (!_cups_strcasecmp(value, "noemptyfragments")) SSLOptions = CUPSD_SSL_NOEMPTY;</code></pre> <p>else cupsdLogMessage(CUPSD_LOG_ERROR, @@ -3504,7 +3504,7 @@ */</p> <p>for (i = NUM_VARS, var = variables; i > 0; i --, var ++)</p> </li> <li>if (!strcasecmp(line, var->name))</li> <li> <pre><code> if (!_cups_strcasecmp(line, var->name))</code></pre> <p>break;</p> <p>if (i == 0) @@ -3563,17 +3563,17 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Missing boolean value for %s on line %d.", line, linenum);</p> </li> <li>else if (!strcasecmp(value, "true") ||</li> <li>!strcasecmp(value, "on") ||</li> <li>!strcasecmp(value, "enabled") ||</li> <li>!strcasecmp(value, "yes") ||</li> <li>else if (!_cups_strcasecmp(value, "true") ||</li> <li>!_cups_strcasecmp(value, "on") ||</li> <li>!_cups_strcasecmp(value, "enabled") ||</li> <li>!_cups_strcasecmp(value, "yes") || atoi(value) != 0) <em>((int </em>)var->ptr) = TRUE;</li> <li>else if (!strcasecmp(value, "false") ||</li> <li>!strcasecmp(value, "off") ||</li> <li>!strcasecmp(value, "disabled") ||</li> <li>!strcasecmp(value, "no") ||</li> <li>!strcasecmp(value, "0"))</li> <li>else if (!_cups_strcasecmp(value, "false") ||</li> <li>!_cups_strcasecmp(value, "off") ||</li> <li>!_cups_strcasecmp(value, "disabled") ||</li> <li>!_cups_strcasecmp(value, "no") ||</li> <li> <pre><code> !_cups_strcasecmp(value, "0")) *((int *)var->ptr) = FALSE; else cupsdLogMessage(CUPSD_LOG_ERROR,</code></pre> <p>@@ -3651,10 +3651,10 @@</p> <ul> <li>Decode the directive... */</li> </ul> </li> <li>if (!strcasecmp(line, "</Location>"))</li> <li>if (!_cups_strcasecmp(line, "</Location>")) return (linenum);</li> <li>else if (!strcasecmp(line, "<Limit") ||</li> <li>!strcasecmp(line, "<LimitExcept"))</li> <li>else if (!_cups_strcasecmp(line, "<Limit") ||</li> <li> <pre><code> !_cups_strcasecmp(line, "<LimitExcept"))</code></pre> <p>{ if (!value) { @@ -3699,13 +3699,13 @@ for (value = valptr; isspace(*value & 255); value ++); }</p> </li> <li> <pre><code>if (!strcasecmp(line, "<LimitExcept"))</code></pre> </li> <li> <pre><code>if (!_cups_strcasecmp(line, "<LimitExcept")) loc->limit = CUPSD_AUTH_LIMIT_ALL ^ loc->limit;</code></pre> <p>parent->limit &= ~loc->limit; }</p> </li> <li>else if (!strcasecmp(line, "</Limit>") ||</li> <li>!strcasecmp(line, "</LimitExcept>"))</li> <li>else if (!_cups_strcasecmp(line, "</Limit>") ||</li> <li> <pre><code> !_cups_strcasecmp(line, "</LimitExcept>"))</code></pre> <p>loc = parent; else if (!parse_aaa(loc, line, value, linenum)) { @@ -3768,7 +3768,7 @@</p> <ul> <li>Decode the directive... */</li> </ul> </li> <li>if (!strcasecmp(line, "</Policy>"))</li> <li> <p>if (!_cups_strcasecmp(line, "</Policy>")) { if (op) cupsdLogMessage(CUPSD_LOG_WARN, @@ -3779,7 +3779,7 @@</p> <p>return (linenum); }</p> </li> <li>else if (!strcasecmp(line, "<Limit") && !op)</li> <li> <p>else if (!_cups_strcasecmp(line, "<Limit") && !op) { if (!value) { @@ -3805,7 +3805,7 @@</p> <pre><code>if (num_ops < (int)(sizeof(ops) / sizeof(ops[0])))</code></pre> <p>{</p> </li> <li>if (!strcasecmp(value, "All"))</li> <li> <pre><code>if (!_cups_strcasecmp(value, "All")) ops[num_ops] = IPP_ANY_OPERATION;</code></pre> <p>else if ((ops[num_ops] = ippOpValue(value)) == IPP_BAD_OPERATION) cupsdLogMessage(CUPSD_LOG_ERROR, @@ -3838,7 +3838,7 @@</p> <p>op = cupsdAddPolicyOp(pol, NULL, ops[0]); }</p> </li> <li>else if (!strcasecmp(line, "</Limit>") && op)</li> <li> <p>else if (!_cups_strcasecmp(line, "</Limit>") && op) { /*</p> <ul> <li>Finish the current operation limit... @@ -3856,10 +3856,10 @@</li> </ul> <p>op = NULL; }</p> </li> <li>else if (!strcasecmp(line, "JobPrivateAccess") ||</li> <li>!strcasecmp(line, "JobPrivateValues") ||</li> <li>!strcasecmp(line, "SubscriptionPrivateAccess") ||</li> <li>!strcasecmp(line, "SubscriptionPrivateValues"))</li> <li>else if (!_cups_strcasecmp(line, "JobPrivateAccess") ||</li> <li>!_cups_strcasecmp(line, "JobPrivateValues") ||</li> <li>!_cups_strcasecmp(line, "SubscriptionPrivateAccess") ||</li> <li> <pre><code> !_cups_strcasecmp(line, "SubscriptionPrivateValues"))</code></pre> <p>{ if (op) { @@ -3890,13 +3890,13 @@</p> <ul> <li>Save it appropriately... */</li> </ul> </li> <li> <pre><code>if (!strcasecmp(line, "JobPrivateAccess"))</code></pre> </li> <li> <pre><code>if (!_cups_strcasecmp(line, "JobPrivateAccess"))</code></pre> <p>{ /<em> * JobPrivateAccess {all|default|user/group list|@@ACL} </em>/</p> </li> <li> <pre><code> if (!strcasecmp(value, "default"))</code></pre> </li> <li>if (!_cups_strcasecmp(value, "default")) { cupsdAddString(&(pol->job_access), "@OWNER"); cupsdAddString(&(pol->job_access), "@SYSTEM"); @@ -3904,13 +3904,13 @@ else cupsdAddString(&(pol->job_access), value); }</li> <li>else if (!strcasecmp(line, "JobPrivateValues"))</li> <li> <pre><code>else if (!_cups_strcasecmp(line, "JobPrivateValues"))</code></pre> <p>{ /<em> * JobPrivateValues {all|none|default|attribute list} </em>/</p> </li> <li> <pre><code>if (!strcasecmp(value, "default"))</code></pre> </li> <li>if (!_cups_strcasecmp(value, "default")) { cupsdAddString(&(pol->job_attrs), "job-name"); cupsdAddString(&(pol->job_attrs), "job-originating-host-name"); @@ -3919,13 +3919,13 @@ else cupsdAddString(&(pol->job_attrs), value); }</li> <li>else if (!strcasecmp(line, "SubscriptionPrivateAccess"))</li> <li> <pre><code>else if (!_cups_strcasecmp(line, "SubscriptionPrivateAccess"))</code></pre> <p>{ /<em> * SubscriptionPrivateAccess {all|default|user/group list|@@ACL} </em>/</p> </li> <li> <pre><code> if (!strcasecmp(value, "default"))</code></pre> </li> <li>if (!_cups_strcasecmp(value, "default")) { cupsdAddString(&(pol->sub_access), "@OWNER"); cupsdAddString(&(pol->sub_access), "@SYSTEM"); @@ -3933,13 +3933,13 @@ else cupsdAddString(&(pol->sub_access), value); }</li> <li>else /* if (!strcasecmp(line, "SubscriptionPrivateValues")) */</li> <li> <pre><code>else /* if (!_cups_strcasecmp(line, "SubscriptionPrivateValues")) */</code></pre> <p>{ /<em> * SubscriptionPrivateValues {all|none|default|attribute list} </em>/</p> </li> <li> <pre><code>if (!strcasecmp(value, "default"))</code></pre> </li> <li> <h1>if (!_cups_strcasecmp(value, "default")) { cupsdAddString(&(pol->sub_attrs), "notify-events"); cupsdAddString(&(pol->sub_attrs), "notify-pull-method"); Index: scheduler/testmime.c</h1> <p>--- scheduler/testmime.c (revision 9791) +++ scheduler/testmime.c (working copy) @@ -3,7 +3,7 @@ *</p> <ul> <li>MIME test program for CUPS.</li> <li> </li> </ul> </li> <li>* Copyright 2007-2010 by Apple Inc.</li> <li>* Copyright 2007-2011 by Apple Inc. <ul> <li>Copyright 1997-2006 by Easy Software Products, all rights reserved.</li> <li> </li> <li>These coded instructions, statements, and computer programs are the @@ -286,9 +286,9 @@ for (temptype = mimeFirstType(mime); temptype; temptype = mimeNextType(mime))</li> </ul></li> <li>if (((super[0] == '*' && strcasecmp(temptype->super, "printer")) ||</li> <li>!strcasecmp(temptype->super, super)) &&</li> <li>(type[0] == '*' || !strcasecmp(temptype->type, type)))</li> <li>if (((super[0] == '*' && _cups_strcasecmp(temptype->super, "printer")) ||</li> <li>!_cups_strcasecmp(temptype->super, super)) &&</li> <li> <pre><code> (type[0] == '*' || !_cups_strcasecmp(temptype->type, type)))</code></pre> <p>{ if (desttype != filtertype) {</p> <h1>Index: scheduler/cups-driverd.cxx</h1> <p>--- scheduler/cups-driverd.cxx (revision 9791) +++ scheduler/cups-driverd.cxx (working copy) @@ -101,7 +101,7 @@ make_and<em>model[128], /* NickName/ModelName </em>/ device<em>id[256], /</em> IEEE 1284 Device ID <em>/ scheme[128]; /</em> PPD scheme */ -} ppd_rec_t; +} ppd_rec_t;</p> <p>typedef struct /<strong><em>\</em> In-memory record **</strong>/ { @@ -284,7 +284,7 @@ const char <em>datadir; // CUPS_DATADIR env var ppdcSource </em>src; // PPD source file data ppdcDriver *d; // Current driver</p> </li> <li>cups_file_t *out; // Stdout via CUPS file API </li> <li>cups_file_t *out; // Stdout via CUPS file API char message[2048], // status-message filename[1024], // Full path to .drv file(s) scheme[32], // URI scheme ("drv") @@ -745,7 +745,7 @@ <ul> <li>First compare manufacturers... */</li> </ul></li> <li>if ((diff = strcasecmp(p0->record.make, p1->record.make)) != 0)</li> <li>if ((diff = _cups_strcasecmp(p0->record.make, p1->record.make)) != 0) return (diff); else if ((diff = cupsdCompareNames(p0->record.make_and_model, p1->record.make_and_model)) != 0) @@ -1160,7 +1160,7 @@ } }</li> <li> <pre><code>if (make && !strcasecmp(ppd->record.make, make))</code></pre> </li> <li> <pre><code>if (make && !_cups_strcasecmp(ppd->record.make, make)) ppd->matches ++;</code></pre> <p>if (make_and_model_re && @@ -1188,7 +1188,7 @@ for (i = 0; i < PPD_MAX_PROD; i ++) if (!ppd->record.products[i][0]) break;</p> </li> <li>else if (!strcasecmp(ppd->record.products[i], product))</li> <li>else if (!_cups_strcasecmp(ppd->record.products[i], product)) { ppd->matches += 3; break; @@ -1200,7 +1200,7 @@ for (i = 0; i < PPD_MAX_VERS; i ++) if (!ppd->record.psversions[i][0]) break;</li> <li>else if (!strcasecmp(ppd->record.psversions[i], psversion))</li> <li>else if (!_cups_strcasecmp(ppd->record.psversions[i], psversion)) { ppd->matches ++; break; @@ -1342,7 +1342,7 @@ ppd = (ppd_info_t <em>)cupsArrayNext(matches); ppd; ppd = (ppd_info_t </em>)cupsArrayNext(matches))</li> <li>if (strcasecmp(this_make, ppd->record.make))</li> <li> <p>if (_cups_strcasecmp(this_make, ppd->record.make)) break;</p> <p>cupsArrayPrev(matches); @@ -1431,7 +1431,7 @@</p> <p>if (nick_name) strlcpy(make_model, nick_name->value->value, sizeof(make_model));</p> </li> <li>else if (strncasecmp(d->model_name->value, d->manufacturer->value,</li> <li> <p>else if (_cups_strncasecmp(d->model_name->value, d->manufacturer->value, strlen(d->manufacturer->value))) snprintf(make_model, sizeof(make_model), "%s %s, %s", d->manufacturer->value, d->model_name->value, @@ -1441,7 +1441,7 @@ d->version->value);</p> <p>if ((cups_fax = d->find_attr("cupsFax", NULL)) != NULL &&</p> </li> <li>!strcasecmp(cups_fax->value->value, "true"))</li> <li>!_cups_strcasecmp(cups_fax->value->value, "true")) type = PPD_TYPE_FAX; else if (d->type == PPDC_DRIVER_PS) type = PPD_TYPE_POSTSCRIPT; @@ -1453,9 +1453,9 @@ type = PPD_TYPE_POSTSCRIPT; filter; filter = (ppdcFilter *)d->filters->next())</li> <li>if (strcasecmp(filter->mime_type->value, "application/vnd.cups-raster"))</li> <li>if (_cups_strcasecmp(filter->mime_type->value, "application/vnd.cups-raster")) type = PPD_TYPE_RASTER;</li> <li>else if (strcasecmp(filter->mime_type->value,</li> <li>else if (_cups_strcasecmp(filter->mime_type->value, "application/vnd.cups-pdf")) type = PPD_TYPE<em>PDF; } @@ -2003,7 +2003,7 @@ sscanf(line, "%</em>[^:]:%63s", lang_version); else if (!strncmp(line, "_NickName:", 10)) sscanf(line, "%*[^\"]\"%255[^\"]", nick_name);</li> <li>else if (!strncasecmp(line, "*1284DeviceID:", 14))</li> <li>else if (!_cups_strncasecmp(line, "<em>1284DeviceID:", 14)) { sscanf(line, "%</em>[^\"]\"%255[^\"]", device_id);</li> </ul> <p>@@ -2071,7 +2071,7 @@ { for (ptr = line + 9; isspace(*ptr & 255); ptr ++);</p> <ul> <li>if (!strncasecmp(ptr, "true", 4))</li> <li>if (!_cups_strncasecmp(ptr, "true", 4)) type = PPD_TYPE_FAX; } else if (!strncmp(line, "*cupsFilter:", 12) && type == PPD_TYPE_POSTSCRIPT) @@ -2149,7 +2149,7 @@ while (isspace(manufacturer[0] & 255)) _cups_strcpy(manufacturer, manufacturer + 1);</li> <li>if (!strncasecmp(make_model, manufacturer, strlen(manufacturer)))</li> <li>if (!_cups_strncasecmp(make_model, manufacturer, strlen(manufacturer))) strlcpy(temp, make_model, sizeof(temp)); else snprintf(temp, sizeof(temp), "%s %s", manufacturer, make_model); @@ -2182,10 +2182,10 @@ else strcpy(manufacturer, "Other"); }</li> <li>else if (!strncasecmp(manufacturer, "LHAG", 4) ||</li> <li>!strncasecmp(manufacturer, "linotype", 8))</li> <li>else if (!_cups_strncasecmp(manufacturer, "LHAG", 4) ||</li> <li>!_cups_strncasecmp(manufacturer, "linotype", 8)) strcpy(manufacturer, "LHAG");</li> <li>else if (!strncasecmp(manufacturer, "Hewlett", 7))</li> <li> <p>else if (!_cups_strncasecmp(manufacturer, "Hewlett", 7)) strcpy(manufacturer, "HP");</p> <p>/* @@ -2216,7 +2216,7 @@ }</p> <p>for (i = 0; i < (int)(sizeof(languages) / sizeof(languages[0])); i ++)</p> </li> <li>if (!strcasecmp(languages[i].version, lang_version))</li> <li> <pre><code>if (!_cups_strcasecmp(languages[i].version, lang_version)) break;</code></pre> <p>if (i < (int)(sizeof(languages) / sizeof(languages[0]))) @@ -2434,14 +2434,14 @@</p> <p>while (*device_id && ptr < (res + sizeof(res) - 6)) {</p> </li> <li>cmd = !strncasecmp(device_id, "COMMAND SET:", 12) ||</li> <li>!strncasecmp(device_id, "CMD:", 4);</li> <li>cmd = !_cups_strncasecmp(device_id, "COMMAND SET:", 12) ||</li> <li> <pre><code> !_cups_strncasecmp(device_id, "CMD:", 4);</code></pre> </li> <li>if (cmd || !strncasecmp(device_id, "MANUFACTURER:", 13) ||</li> <li>!strncasecmp(device_id, "MFG:", 4) ||</li> <li>!strncasecmp(device_id, "MFR:", 4) ||</li> <li>!strncasecmp(device_id, "MODEL:", 6) ||</li> <li>!strncasecmp(device_id, "MDL:", 4))</li> <li>if (cmd || !_cups_strncasecmp(device_id, "MANUFACTURER:", 13) ||</li> <li>!_cups_strncasecmp(device_id, "MFG:", 4) ||</li> <li>!_cups_strncasecmp(device_id, "MFR:", 4) ||</li> <li>!_cups_strncasecmp(device_id, "MODEL:", 6) ||</li> <li> <pre><code> !_cups_strncasecmp(device_id, "MDL:", 4))</code></pre> <p>{ if (ptr > res) {</p> <h1>Index: scheduler/ipp.c</h1> <p>--- scheduler/ipp.c (revision 9792) +++ scheduler/ipp.c (working copy) @@ -412,8 +412,8 @@ "attributes-natural-language", NULL, DefaultLanguage);</p> <p>if (charset &&</p> </li> <li>strcasecmp(charset->values[0].string.text, "us-ascii") &&</li> <li>strcasecmp(charset->values[0].string.text, "utf-8"))</li> <li>_cups_strcasecmp(charset->values[0].string.text, "us-ascii") &&</li> <li> <pre><code> _cups_strcasecmp(charset->values[0].string.text, "utf-8"))</code></pre> <p>{ /<em> * Bad character set... @@ -502,7 +502,7 @@ </em>/</p> <p>if (!strcmp(username->values[0].string.text, "root") &&</p> </li> <li>strcasecmp(con->http.hostname, "localhost") &&</li> <li> <pre><code> _cups_strcasecmp(con->http.hostname, "localhost") && strcmp(con->username, "root"))</code></pre> <p>{ /<em> @@ -1377,8 +1377,8 @@ </em>/</p> <p>if (!printer->shared &&</p> </li> <li>strcasecmp(con->http.hostname, "localhost") &&</li> <li>strcasecmp(con->http.hostname, ServerName))</li> <li>_cups_strcasecmp(con->http.hostname, "localhost") &&</li> <li>_cups_strcasecmp(con->http.hostname, ServerName)) { send_ipp_status(con, IPP_NOT<em>AUTHORIZED, </em>("The printer or class is not shared.")); @@ -4353,7 +4353,7 @@ for (i = 0; i < job_ids->num_values; i ++) { if ((job = cupsdFindJob(job_ids->values[i].integer)) == NULL ||</li> <li>strcasecmp(job->dest, printer->name))</li> <li>_cups_strcasecmp(job->dest, printer->name)) break; }</li> </ul> <p>@@ -4463,7 +4463,7 @@ job; job = (cupsd_job_t *)cupsArrayNext(ActiveJobs)) if (job->state_value <= IPP_JOB_PROCESSING &&</p> <ul> <li>!strcasecmp(job->dest, printer->name))</li> <li> <pre><code>!_cups_strcasecmp(job->dest, printer->name))</code></pre> <p>break;</p> <p>if (job) @@ -4478,7 +4478,7 @@ job; job = (cupsd_job_t *)cupsArrayNext(ActiveJobs)) if (job->state_value == IPP_JOB_STOPPED &&</p> </li> <li>!strcasecmp(job->dest, printer->name))</li> <li> <pre><code> !_cups_strcasecmp(job->dest, printer->name)) break;</code></pre> <p>if (job) @@ -4884,7 +4884,7 @@ break; }</p> <h1>else</h1> </li> <li>else if (!strcasecmp(username, name))</li> <li>else if (!_cups_strcasecmp(username, name)) break; <h1>endif /* HAVE_MBR_UID_TO_UUID */</h1></li> </ul> <p>@@ -5533,7 +5533,7 @@ case IPP_TAG_KEYWORD : case IPP_TAG_CHARSET : case IPP_TAG_LANGUAGE :</p> <ul> <li>if (!strcasecmp(banner->filetype->type, "postscript"))</li> <li> <pre><code> if (!_cups_strcasecmp(banner->filetype->type, "postscript")) { /* * Need to quote strings for PS banners...</code></pre> <p>@@ -7798,7 +7798,7 @@ continue; }</p> </li> <li> <pre><code>if (username[0] && strcasecmp(username, job->username))</code></pre> </li> <li> <pre><code>if (username[0] && _cups_strcasecmp(username, job->username))</code></pre> <p>continue;</p> <p>if (count > 0) @@ -8506,7 +8506,7 @@ if ((!type || (printer->type & CUPS_PRINTER_CLASS) == type) && (printer->type & printer_mask) == printer_type && (!location ||</p> </li> <li>(printer->location && !strcasecmp(printer->location, location))))</li> <li>(printer->location && !_cups_strcasecmp(printer->location, location)))) { /* <ul> <li>If HideImplicitMembers is enabled, see if this printer or class @@ -8746,7 +8746,7 @@ sub; sub = (cupsd_subscription_t *)cupsArrayNext(Subscriptions)) if ((!printer || sub->dest == printer) && (!job || sub->job == job) &&</li> </ul></li> <li>(!username[0] || !strcasecmp(username, sub->owner)))</li> <li>(!username[0] || !_cups_strcasecmp(username, sub->owner))) { ippAddSeparator(con->response);</li> </ul> <p>@@ -9198,7 +9198,7 @@ * completed... */</p> <ul> <li>if (strcasecmp(job->dest, src) ||</li> <li>if (_cups_strcasecmp(job->dest, src) || job->state_value > IPP_JOB_STOPPED) continue;</li> </ul> <p>@@ -9497,9 +9497,9 @@</p> <ul> <li>Read any embedded job ticket info from PS files... */</li> <li>if (!strcasecmp(filetype->super, "application") &&</li> <li>(!strcasecmp(filetype->type, "postscript") ||</li> <li>!strcasecmp(filetype->type, "pdf")))</li> <li>if (!_cups_strcasecmp(filetype->super, "application") &&</li> <li>(!_cups_strcasecmp(filetype->type, "postscript") ||</li> <li> <pre><code>!_cups_strcasecmp(filetype->type, "pdf")))</code></pre> <p>read_job_ticket(con);</p> <p>/* @@ -12044,7 +12044,7 @@ if (cupsdCheckGroup(username, pw, name)) break; }</p> </li> <li>else if (!strcasecmp(username, name))</li> <li>else if (!_cups_strcasecmp(username, name)) break; }</li> </ul> <h1>Index: scheduler/cert.c</h1> <p>--- scheduler/cert.c (revision 9791) +++ scheduler/cert.c (working copy) @@ -3,7 +3,7 @@ *</p> <ul> <li>Authentication certificate routines for the CUPS scheduler. * <ul> <li>* Copyright 2007-2010 by Apple Inc.</li> <li>* Copyright 2007-2011 by Apple Inc.</li> </ul></li> <li>Copyright 1997-2006 by Easy Software Products. *</li> <li>These coded instructions, statements, and computer programs are the @@ -368,7 +368,7 @@ cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdFindCert(certificate=%s)", certificate); for (cert = Certs; cert != NULL; cert = cert->next) <ul> <li>if (!strcasecmp(certificate, cert->certificate))</li> <li> <h1>if (!_cups_strcasecmp(certificate, cert->certificate)) { cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdFindCert: Returning %s...", cert->username); Index: scheduler/auth.c</h1> <p>--- scheduler/auth.c (revision 9791) +++ scheduler/auth.c (working copy) @@ -252,7 +252,7 @@ "cupsdAddNameMask(masks=%p(%p), name=\"%s\")", masks, *masks, name);</p> </li> </ul></li> <li>if (!strcasecmp(name, "@LOCAL"))</li> <li>if (!_cups_strcasecmp(name, "@LOCAL")) { /* <ul> <li>Deny <em>interface</em>... @@ -261,7 +261,7 @@ temp.type = CUPSD_AUTH<em>INTERFACE; temp.mask.name.name = (char </em>)"_"; }</li> </ul></li> <li>else if (!strncasecmp(name, "@IF(", 4))</li> <li>else if (!_cups_strncasecmp(name, "@IF(", 4)) { /* <ul> <li>Deny <em>interface</em>... @@ -405,7 +405,7 @@ } <h1>ifdef HAVE_AUTHORIZATION_H</h1> <p>else if (!strncmp(authorization, "AuthRef ", 8) &&</p></li> </ul></li> <li>!strcasecmp(con->http.hostname, "localhost"))</li> <li>!_cups<em>strcasecmp(con->http.hostname, "localhost")) { OSStatus status; /* Status </em>/ int authlen; /_ Auth string length <em>/ @@ -510,7 +510,7 @@ for (name = (char </em>)cupsArrayFirst(con->best->names); name; name = (char *)cupsArrayNext(con->best->names))</li> <li>if (!strncasecmp(name, "@AUTHKEY(", 9) || !strcasecmp(name, "@SYSTEM"))</li> <li>if (!_cups_strncasecmp(name, "@AUTHKEY(", 9) || !_cups_strcasecmp(name, "@SYSTEM")) { cupsdLogMessage(CUPSD_LOG_ERROR, "PeerCred authentication not allowed for resource."); @@ -571,7 +571,7 @@ } <h1>endif /* SO_PEERCRED && AF_LOCAL */</h1> <p>else if (!strncmp(authorization, "Local", 5) &&</p></li> <li>!strcasecmp(con->http.hostname, "localhost"))</li> <li> <pre><code> !_cups_strcasecmp(con->http.hostname, "localhost"))</code></pre> <p>{ /*</p> <ul> <li>Get Local certificate authentication data... @@ -1193,7 +1193,7 @@ int allow; /* 1 if allowed, 0 otherwise */</li> </ul> </li> <li>if (!strcasecmp(name, "localhost"))</li> <li>if (!_cups_strcasecmp(name, "localhost")) { /* <ul> <li>Access from localhost (127.0.0.1 or ::1) is always allowed... @@ -1386,7 +1386,7 @@</li> <li>Check for exact name match... */</li> </ul></li> <li> <pre><code> if (!strcasecmp(name, mask->mask.name.name))</code></pre> </li> <li> <pre><code> if (!_cups_strcasecmp(name, mask->mask.name.name)) return (1); /*</code></pre> <p>@@ -1395,7 +1395,7 @@</p> <p>if (name_len >= mask->mask.name.length && mask->mask.name.name[0] == '.' &&</p> </li> <li>!strcasecmp(name + name_len - mask->mask.name.length,</li> <li> <pre><code> !_cups_strcasecmp(name + name_len - mask->mask.name.length, mask->mask.name.name)) return (1); break;</code></pre> <p>@@ -1465,7 +1465,7 @@ */</p> <p>for (i = 0; group->gr_mem[i]; i ++)</p> </li> <li>if (!strcasecmp(username, group->gr_mem[i]))</li> <li>if (!_cups_strcasecmp(username, group->gr_mem[i])) return (1); }</li> </ul> <p>@@ -1714,7 +1714,7 @@ */</p> <pre><code> if (loc->length > bestlen && loc->location &&</code></pre> <ul> <li>!strncasecmp(uri, loc->location, loc->length) &&</li> <li> <pre><code> !_cups_strncasecmp(uri, loc->location, loc->length) &&</code></pre> <p>loc->location[0] == '/' && (limit & loc->limit) != 0) { @@ -1904,7 +1904,7 @@ */</p> <p>if ((best->encryption >= HTTP_ENCRYPT_REQUIRED && !con->http.tls &&</p> </li> <li>strcasecmp(con->http.hostname, "localhost") &&</li> <li>_cups_strcasecmp(con->http.hostname, "localhost") && best->satisfy == CUPSD_AUTH_SATISFY_ALL) && !(type == CUPSD_AUTH_NEGOTIATE || (type == CUPSD_AUTH_NONE && DefaultAuthType == CUPSD_AUTH_NEGOTIATE))) @@ -2045,9 +2045,9 @@ name; name = (char *)cupsArrayNext(best->names)) {</li> <li>if (!strncasecmp(name, "@AUTHKEY(", 9) && check_authref(con, name + 9))</li> <li>if (!_cups_strncasecmp(name, "@AUTHKEY(", 9) && check_authref(con, name + 9)) return (HTTP_OK);</li> <li>else if (!strcasecmp(name, "@SYSTEM") && SystemGroupAuthKey &&</li> <li>else if (!_cups_strcasecmp(name, "@SYSTEM") && SystemGroupAuthKey && check_authref(con, SystemGroupAuthKey)) return (HTTP_OK); } @@ -2060,10 +2060,10 @@ name; name = (char *)cupsArrayNext(best->names)) {</li> <li>if (!strcasecmp(name, "@OWNER") && owner &&</li> <li>!strcasecmp(username, ownername))</li> <li>if (!_cups_strcasecmp(name, "@OWNER") && owner &&</li> <li>!_cups_strcasecmp(username, ownername)) return (HTTP_OK);</li> <li>else if (!strcasecmp(name, "@SYSTEM"))</li> <li>else if (!_cups_strcasecmp(name, "@SYSTEM")) { for (i = 0; i < NumSystemGroups; i ++) if (cupsdCheckGroup(username, pw, SystemGroups[i])) @@ -2074,7 +2074,7 @@ if (cupsdCheckGroup(username, pw, name + 1)) return (HTTP_OK); }</li> <li>else if (!strcasecmp(username, name))</li> <li>else if (!_cups_strcasecmp(username, name)) return (HTTP_OK); }</li> </ul> <p>@@ -2100,7 +2100,7 @@ "cupsdIsAuthorized: Checking group \"%s\" membership...", name);</p> <ul> <li>if (!strcasecmp(name, "@SYSTEM"))</li> <li> <p>if (!_cups_strcasecmp(name, "@SYSTEM")) { for (i = 0; i < NumSystemGroups; i ++) if (cupsdCheckGroup(username, pw, SystemGroups[i]))</p> <h1>Index: scheduler/printers.c</h1> <p>--- scheduler/printers.c (revision 9791) +++ scheduler/printers.c (working copy) @@ -971,8 +971,8 @@</p> <ul> <li>Decode the directive... */</li> </ul> </li> <li>if (!strcasecmp(line, "<Printer") ||</li> <li>!strcasecmp(line, "<DefaultPrinter"))</li> <li>if (!_cups_strcasecmp(line, "<Printer") ||</li> <li> <pre><code> !_cups_strcasecmp(line, "<DefaultPrinter"))</code></pre> <p>{ /*</p> <ul> <li> <Printer name> or <DefaultPrinter name> @@ -994,14 +994,14 @@ </li> <li>Set the default printer as needed... */</li> </ul> </li> <li> <pre><code> if (!strcasecmp(line, "<DefaultPrinter"))</code></pre> </li> <li>if (!_cups_strcasecmp(line, "<DefaultPrinter")) DefaultPrinter = p; } else cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of printers.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "</Printer>"))</li> <li>else if (!_cups_strcasecmp(line, "</Printer>")) { if (p != NULL) { @@ -1047,7 +1047,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of printers.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "UUID"))</li> <li>else if (!_cups_strcasecmp(line, "UUID")) { if (value && !strncmp(value, "urn:uuid:", 9)) cupsdSetString(&(p->uuid), value); @@ -1055,29 +1055,29 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Bad UUID on line %d of printers.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "AuthInfoRequired"))</li> <li>else if (!_cups_strcasecmp(line, "AuthInfoRequired")) { if (!cupsdSetAuthInfoRequired(p, value, NULL)) cupsdLogMessage(CUPSD_LOG_ERROR, "Bad AuthInfoRequired on line %d of printers.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "Info"))</li> <li>else if (!_cups_strcasecmp(line, "Info")) { if (value) cupsdSetString(&p->info, value); }</li> <li>else if (!strcasecmp(line, "MakeModel"))</li> <li>else if (!_cups_strcasecmp(line, "MakeModel")) { if (value) cupsdSetString(&p->make_model, value); }</li> <li>else if (!strcasecmp(line, "Location"))</li> <li>else if (!_cups_strcasecmp(line, "Location")) { if (value) cupsdSetString(&p->location, value); }</li> <li>else if (!strcasecmp(line, "DeviceURI"))</li> <li>else if (!_cups_strcasecmp(line, "DeviceURI")) { if (value) cupsdSetDeviceURI(p, value); @@ -1085,7 +1085,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of printers.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "Option") && value)</li> <li>else if (!_cups_strcasecmp(line, "Option") && value) { /* <ul> <li>Option name value @@ -1104,7 +1104,7 @@ &(p->options)); } }</li> </ul></li> <li>else if (!strcasecmp(line, "PortMonitor"))</li> <li>else if (!_cups_strcasecmp(line, "PortMonitor")) { if (value && strcmp(value, "none")) cupsdSetString(&p->port_monitor, value); @@ -1114,7 +1114,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of printers.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "Reason"))</li> <li>else if (!_cups_strcasecmp(line, "Reason")) { if (value && strcmp(value, "connecting-to-device") && @@ -1136,15 +1136,15 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of printers.conf.", linenum);</li> </ul> </div> </div> <div class="comment"> <div class="user"> <a rel="noreferrer nofollow" target="_blank" href="https://github.com/michaelrsweet"><img src="https://avatars.githubusercontent.com/u/488103?v=4" />michaelrsweet</a> commented <strong> 13 years ago</strong> </div> <div class="markdown-body"> <pre><code> }</code></pre> <ul> <li>else if (!strcasecmp(line, "State"))</li> <li>else if (!_cups_strcasecmp(line, "State")) { /* <ul> <li>Set the initial queue state... */</li> </ul></li> <li> <pre><code>if (value && !strcasecmp(value, "idle"))</code></pre> </li> <li>if (value && !_cups_strcasecmp(value, "idle")) p->state = IPP_PRINTER_IDLE;</li> <li>else if (value && !strcasecmp(value, "stopped"))</li> <li>else if (value && !_cups_strcasecmp(value, "stopped")) { p->state = IPP_PRINTER_STOPPED;</li> </ul> <p>@@ -1163,7 +1163,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of printers.conf.", linenum); }</p> <ul> <li>else if (!strcasecmp(line, "StateMessage"))</li> <li>else if (!_cups_strcasecmp(line, "StateMessage")) { /* <ul> <li>Set the initial queue state message... @@ -1172,7 +1172,7 @@ if (value) strlcpy(p->state_message, value, sizeof(p->state_message)); }</li> </ul></li> <li>else if (!strcasecmp(line, "StateTime"))</li> <li>else if (!_cups_strcasecmp(line, "StateTime")) { /* <ul> <li>Set the state time... @@ -1181,27 +1181,27 @@ if (value) p->state_time = atoi(value); }</li> </ul></li> <li>else if (!strcasecmp(line, "Accepting"))</li> <li> <p>else if (!_cups_strcasecmp(line, "Accepting")) { /*</p> <ul> <li>Set the initial accepting state... */</li> </ul> <p>if (value &&</p> </li> <li>(!strcasecmp(value, "yes") ||</li> <li>!strcasecmp(value, "on") ||</li> <li>!strcasecmp(value, "true")))</li> <li>(!_cups_strcasecmp(value, "yes") ||</li> <li>!_cups_strcasecmp(value, "on") ||</li> <li>!_cups_strcasecmp(value, "true"))) p->accepting = 1; else if (value &&</li> <li>(!strcasecmp(value, "no") ||</li> <li>!strcasecmp(value, "off") ||</li> <li>!strcasecmp(value, "false")))</li> <li>(!_cups_strcasecmp(value, "no") ||</li> <li>!_cups_strcasecmp(value, "off") ||</li> <li>!_cups_strcasecmp(value, "false"))) p->accepting = 0; else cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of printers.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "Type"))</li> <li>else if (!_cups_strcasecmp(line, "Type")) { if (value) p->type = atoi(value); @@ -1209,27 +1209,27 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of printers.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "Shared"))</li> <li> <p>else if (!_cups_strcasecmp(line, "Shared")) { /*</p> <ul> <li>Set the initial shared state... */</li> </ul> <p>if (value &&</p> </li> <li>(!strcasecmp(value, "yes") ||</li> <li>!strcasecmp(value, "on") ||</li> <li>!strcasecmp(value, "true")))</li> <li>(!_cups_strcasecmp(value, "yes") ||</li> <li>!_cups_strcasecmp(value, "on") ||</li> <li>!_cups_strcasecmp(value, "true"))) p->shared = 1; else if (value &&</li> <li>(!strcasecmp(value, "no") ||</li> <li>!strcasecmp(value, "off") ||</li> <li>!strcasecmp(value, "false")))</li> <li>(!_cups_strcasecmp(value, "no") ||</li> <li>!_cups_strcasecmp(value, "off") ||</li> <li>!_cups_strcasecmp(value, "false"))) p->shared = 0; else cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of printers.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "JobSheets"))</li> <li>else if (!_cups_strcasecmp(line, "JobSheets")) { /* <ul> <li>Set the initial job sheets... @@ -1261,7 +1261,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of printers.conf.", linenum); }</li> </ul></li> <li>else if (!strcasecmp(line, "AllowUser"))</li> <li>else if (!_cups_strcasecmp(line, "AllowUser")) { if (value) { @@ -1272,7 +1272,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of printers.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "DenyUser"))</li> <li>else if (!_cups_strcasecmp(line, "DenyUser")) { if (value) { @@ -1283,7 +1283,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of printers.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "QuotaPeriod"))</li> <li>else if (!_cups_strcasecmp(line, "QuotaPeriod")) { if (value) p->quota_period = atoi(value); @@ -1291,7 +1291,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of printers.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "PageLimit"))</li> <li>else if (!_cups_strcasecmp(line, "PageLimit")) { if (value) p->page_limit = atoi(value); @@ -1299,7 +1299,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of printers.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "KLimit"))</li> <li>else if (!_cups_strcasecmp(line, "KLimit")) { if (value) p->k_limit = atoi(value); @@ -1307,7 +1307,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of printers.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "OpPolicy"))</li> <li>else if (!_cups_strcasecmp(line, "OpPolicy")) { if (value) { @@ -1328,7 +1328,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of printers.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "ErrorPolicy"))</li> <li>else if (!_cups_strcasecmp(line, "ErrorPolicy")) { if (value) cupsdSetString(&p->error_policy, value); @@ -1336,7 +1336,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of printers.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "Attribute") && value)</li> <li>else if (!_cups_strcasecmp(line, "Attribute") && value) { for (valueptr = value; _valueptr && !isspace(_valueptr & 255); valueptr ++);</li> </ul> <p>@@ -1356,9 +1356,9 @@ cupsdSetPrinterAttr(p, value, valueptr); } }</p> <ul> <li>else if (strcasecmp(line, "Filter") &&</li> <li>strcasecmp(line, "Prefilter") &&</li> <li>strcasecmp(line, "Product"))</li> <li>else if (_cups_strcasecmp(line, "Filter") &&</li> <li>_cups_strcasecmp(line, "Prefilter") &&</li> <li> <pre><code> _cups_strcasecmp(line, "Product"))</code></pre> <p>{ /*</p> <ul> <li>Something else we don't understand (and that wasn't used in a prior @@ -3168,12 +3168,12 @@</li> <li>Change localhost to the server name... */</li> </ul> </li> <li>if (!strcasecmp(hostname, "localhost"))</li> <li> <p>if (!_cups_strcasecmp(hostname, "localhost")) strlcpy(hostname, ServerName, sizeof(hostname));</p> <p>strlcpy(localname, hostname, sizeof(localname));</p> </li> <li>if (!strcasecmp(hostname, ServerName))</li> <li> <p>if (!_cups_strcasecmp(hostname, ServerName)) { /*</p> <ul> <li>Localize the hostname... @@ -3190,7 +3190,7 @@</li> </ul> <p>while (lptr != NULL) {</p> </li> <li>if (!strcasecmp(lptr, sptr))</li> <li>if (!_cups_strcasecmp(lptr, sptr)) { <em>lptr = '\0'; break; @@ -3210,8 +3210,8 @@ for (p = (cupsd_printer_t </em>)cupsArrayFirst(Printers); p; p = (cupsd_printer_t *)cupsArrayNext(Printers))</li> <li>if (!strcasecmp(p->hostname, localname) &&</li> <li>!strcasecmp(p->name, rptr))</li> <li>if (!_cups_strcasecmp(p->hostname, localname) &&</li> <li>!_cups_strcasecmp(p->name, rptr)) { if (printer) *printer = p; @@ -3632,9 +3632,9 @@ for (temptype = mimeFirstType(MimeDatabase); temptype; temptype = mimeNextType(MimeDatabase))</li> <li>if (((super[0] == '*' && strcasecmp(temptype->super, "printer")) ||</li> <li>!strcasecmp(temptype->super, super)) &&</li> <li>(type[0] == '*' || !strcasecmp(temptype->type, type)))</li> <li>if (((super[0] == '*' && _cups_strcasecmp(temptype->super, "printer")) ||</li> <li>!_cups_strcasecmp(temptype->super, super)) &&</li> <li>(type[0] == '*' || !_cups_strcasecmp(temptype->type, type))) { if (desttype != filtertype) { @@ -3717,7 +3717,7 @@ type; type = mimeNextType(MimeDatabase)) {</li> <li>if (!strcasecmp(type->super, "printer"))</li> <li> <p>if (!_cups_strcasecmp(type->super, "printer")) continue;</p> <p>snprintf(mimetype, sizeof(mimetype), "%s/%s", type->super, type->type); @@ -3800,20 +3800,20 @@ type; type = (mime_type_t *)cupsArrayNext(p->filetypes)) {</p> </li> <li>if (!strcasecmp(type->super, "application"))</li> <li>if (!_cups_strcasecmp(type->super, "application")) {</li> <li>if (!strcasecmp(type->type, "pdf"))</li> <li>if (!_cups_strcasecmp(type->type, "pdf")) strlcat(pdl, "application/pdf,", sizeof(pdl));</li> <li>else if (!strcasecmp(type->type, "postscript"))</li> <li>else if (!_cups_strcasecmp(type->type, "postscript")) strlcat(pdl, "application/postscript,", sizeof(pdl)); }</li> <li>else if (!strcasecmp(type->super, "image"))</li> <li>else if (!_cups_strcasecmp(type->super, "image")) {</li> <li>if (!strcasecmp(type->type, "jpeg"))</li> <li>if (!_cups_strcasecmp(type->type, "jpeg")) strlcat(pdl, "image/jpeg,", sizeof(pdl));</li> <li>else if (!strcasecmp(type->type, "png"))</li> <li>else if (!_cups_strcasecmp(type->type, "png")) strlcat(pdl, "image/png,", sizeof(pdl));</li> <li>else if (!strcasecmp(type->type, "pwg-raster"))</li> <li>else if (!_cups_strcasecmp(type->type, "pwg-raster")) strlcat(pdl, "image/pwg-raster,", sizeof(pdl)); } } @@ -3838,7 +3838,7 @@ { (void)data;</li> <li>return (strcasecmp(((cupsd_printer_t *)first)->name,</li> <li>return (_cups_strcasecmp(((cupsd_printer_t <em>)first)->name, ((cupsd_printer_t </em>)second)->name)); }</li> </ul> <p>@@ -4031,7 +4031,7 @@ if (!ppd->manual_copies) p->type |= CUPS_PRINTER_COPIES; if ((ppd_attr = ppdFindAttr(ppd, "cupsFax", NULL)) != NULL)</p> <ul> <li>if (ppd_attr->value && !strcasecmp(ppd_attr->value, "true"))</li> <li> <pre><code>if (ppd_attr->value && !_cups_strcasecmp(ppd_attr->value, "true"))</code></pre> <p>p->type |= CUPS_PRINTER_FAX;</p> <p>ippAddBoolean(p->ppd_attrs, IPP_TAG_PRINTER, "color-supported", @@ -4452,10 +4452,10 @@ } else if (((ppd_attr = ppdFindAttr(ppd, "DefaultOutputOrder", NULL)) != NULL &&</p> </li> <li>!strcasecmp(ppd_attr->value, "Reverse")) ||</li> <li>!_cups_strcasecmp(ppd_attr->value, "Reverse")) || (!ppd_attr && ppd->manufacturer && /* "Compatibility heuristic" */</li> <li>(!strcasecmp(ppd->manufacturer, "epson") ||</li> <li>!strcasecmp(ppd->manufacturer, "lexmark"))))</li> <li>(!_cups_strcasecmp(ppd->manufacturer, "epson") ||</li> <li> <pre><code> !_cups_strcasecmp(ppd->manufacturer, "lexmark"))))</code></pre> <p>{ /*</p> <ul> <li>Report that this printer has a single output bin that leaves pages face @@ -4621,10 +4621,10 @@ ippAddStrings(p->ppd_attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD, "sides-supported", 3, NULL, sides);</li> </ul> </li> <li> <pre><code>if (!strcasecmp(duplex->defchoice, "DuplexTumble"))</code></pre> </li> <li>if (!_cups_strcasecmp(duplex->defchoice, "DuplexTumble")) ippAddString(p->ppd_attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD, "sides-default", NULL, "two-sided-short-edge");</li> <li>else if (!strcasecmp(duplex->defchoice, "DuplexNoTumble"))</li> <li> <pre><code>else if (!_cups_strcasecmp(duplex->defchoice, "DuplexNoTumble"))</code></pre> <p>ippAddString(p->ppd_attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD, "sides-default", NULL, "two-sided-long-edge"); else @@ -4663,10 +4663,10 @@ p->type |= CUPS_PRINTER_SMALL;</p> <p>if ((ppd_attr = ppdFindAttr(ppd, "APICADriver", NULL)) != NULL &&</p> </li> <li>ppd_attr->value && !strcasecmp(ppd_attr->value, "true"))</li> <li>ppd_attr->value && !_cups_strcasecmp(ppd_attr->value, "true")) { if ((ppd_attr = ppdFindAttr(ppd, "APScannerOnly", NULL)) != NULL &&</li> <li>ppd_attr->value && !strcasecmp(ppd_attr->value, "true"))</li> <li>ppd_attr->value && !_cups_strcasecmp(ppd_attr->value, "true")) p->type |= CUPS_PRINTER_SCANNER; else p->type |= CUPS_PRINTER_MFP; @@ -4682,7 +4682,7 @@ filter; filter = (const char *)cupsArrayNext(p->pc->filters)) {</li> <li>if (!strncasecmp(filter, "application/vnd.cups-command", 28) &&</li> <li> <h1>if (!_cups_strncasecmp(filter, "application/vnd.cups-command", 28) && _cups_isspace(filter[28])) { p->type |= CUPS_PRINTER_COMMANDS; Index: scheduler/job.c</h1> <p>--- scheduler/job.c (revision 9791) +++ scheduler/job.c (working copy) @@ -745,11 +745,11 @@ banner_page = 0; else if (job->job_sheets == NULL) banner_page = 0;</p> </li> <li>else if (strcasecmp(job->job_sheets->values[0].string.text, "none") != 0 &&</li> <li>else if (_cups_strcasecmp(job->job_sheets->values[0].string.text, "none") != 0 && job->current_file == 0) banner_page = 1; else if (job->job_sheets->num_values > 1 &&</li> <li>strcasecmp(job->job_sheets->values[1].string.text, "none") != 0 &&</li> <li>_cups_strcasecmp(job->job_sheets->values[1].string.text, "none") != 0 && job->current_file == (job->num_files - 1)) banner_page = 1; else @@ -1428,7 +1428,7 @@ for (job = (cupsd_job_t <em>)cupsArrayFirst(ActiveJobs), count = 0; job; job = (cupsd_job_t </em>)cupsArrayNext(ActiveJobs))</li> <li>if (job->dest && !strcasecmp(job->dest, dest))</li> <li> <p>if (job->dest && !_cups_strcasecmp(job->dest, dest)) count ++;</p> <p>return (count); @@ -1451,7 +1451,7 @@ for (job = (cupsd_job_t <em>)cupsArrayFirst(ActiveJobs), count = 0; job; job = (cupsd_job_t </em>)cupsArrayNext(ActiveJobs))</p> </li> <li>if (!strcasecmp(job->username, username))</li> <li> <p>if (!_cups_strcasecmp(job->username, username)) count ++;</p> <p>return (count); @@ -3436,11 +3436,11 @@ !strncmp(attr->name, "number-up", 9) || !strcmp(attr->name, "page-ranges") || !strcmp(attr->name, "page-set") ||</p> </li> <li>!strcasecmp(attr->name, "AP_FIRSTPAGE_InputSlot") ||</li> <li>!strcasecmp(attr->name, "AP_FIRSTPAGE_ManualFeed") ||</li> <li>!strcasecmp(attr->name, "com.apple.print.PrintSettings."</li> <li>!_cups_strcasecmp(attr->name, "AP_FIRSTPAGE_InputSlot") ||</li> <li>!_cups_strcasecmp(attr->name, "AP_FIRSTPAGE_ManualFeed") ||</li> <li>!_cups_strcasecmp(attr->name, "com.apple.print.PrintSettings." "PMTotalSidesImaged..n.") ||</li> <li>!strcasecmp(attr->name, "com.apple.print.PrintSettings."</li> <li> <pre><code>!_cups_strcasecmp(attr->name, "com.apple.print.PrintSettings." "PMTotalBeginPages..n.")) &&</code></pre> <p>banner_page) continue; @@ -3708,12 +3708,12 @@</p> <p>while (cupsFileGetConf(fp, line, sizeof(line), &value, &linenum)) {</p> </li> <li>if (!strcasecmp(line, "NextJobId"))</li> <li>if (!_cups_strcasecmp(line, "NextJobId")) { if (value) NextJobId = atoi(value); }</li> <li>else if (!strcasecmp(line, "<Job"))</li> <li>else if (!_cups_strcasecmp(line, "<Job")) { if (job) { @@ -3776,7 +3776,7 @@ "Missing <Job #> directive on line %d!", linenum); continue; }</li> <li>else if (!strcasecmp(line, "</Job>"))</li> <li>else if (!_cups_strcasecmp(line, "</Job>")) { cupsArrayAdd(Jobs, job);</li> </ul> <p>@@ -3790,7 +3790,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Missing value on line %d!", linenum); continue; }</p> <ul> <li>else if (!strcasecmp(line, "State"))</li> <li>else if (!_cups_strcasecmp(line, "State")) { job->state_value = (ipp_jstate_t)atoi(value);</li> </ul> <p>@@ -3799,27 +3799,27 @@ else if (job->state_value > IPP_JOB_COMPLETED) job->state_value = IPP_JOB_COMPLETED; }</p> <ul> <li>else if (!strcasecmp(line, "HoldUntil"))</li> <li>else if (!_cups_strcasecmp(line, "HoldUntil")) { job->hold_until = atoi(value); }</li> <li>else if (!strcasecmp(line, "Priority"))</li> <li>else if (!_cups_strcasecmp(line, "Priority")) { job->priority = atoi(value); }</li> <li>else if (!strcasecmp(line, "Username"))</li> <li>else if (!_cups_strcasecmp(line, "Username")) { cupsdSetString(&job->username, value); }</li> <li>else if (!strcasecmp(line, "Destination"))</li> <li>else if (!_cups_strcasecmp(line, "Destination")) { cupsdSetString(&job->dest, value); }</li> <li>else if (!strcasecmp(line, "DestType"))</li> <li>else if (!_cups_strcasecmp(line, "DestType")) { job->dtype = (cups_ptype_t)atoi(value); }</li> <li>else if (!strcasecmp(line, "NumFiles"))</li> <li>else if (!_cups_strcasecmp(line, "NumFiles")) { job->num_files = atoi(value);</li> </ul> <p>@@ -3855,7 +3855,7 @@ } } }</p> <ul> <li>else if (!strcasecmp(line, "File"))</li> <li> <p>else if (!_cups<em>strcasecmp(line, "File")) { int number, /* File number </em>/ compression; /_ Compression value */ @@ -3951,7 +3951,7 @@</p> <p>while (cupsFileGetConf(fp, line, sizeof(line), &value, &linenum)) {</p> </li> <li>if (!strcasecmp(line, "NextJobId"))</li> <li> <p>if (!_cups_strcasecmp(line, "NextJobId")) { if (value) { @@ -4342,7 +4342,7 @@</p> <p>if (job->sheets) {</p> </li> <li>if (!strncasecmp(message, "total ", 6))</li> <li> <pre><code> if (!_cups_strncasecmp(message, "total ", 6))</code></pre> <p>{ /*</p> <ul> <li> <h1>Got a total count of pages from a backend or filter... Index: scheduler/cups-deviced.c</h1> <p>--- scheduler/cups-deviced.c (revision 9791) +++ scheduler/cups-deviced.c (working copy) @@ -457,10 +457,10 @@</p> </li> </ul> <p>if ((diff = cupsdCompareNames(d0->device_info, d1->device_info)) != 0) return (diff);</p> </li> <li>else if ((diff = strcasecmp(d0->device_class, d1->device_class)) != 0)</li> <li>else if ((diff = _cups_strcasecmp(d0->device_class, d1->device_class)) != 0) return (diff); else</li> <li>return (strcasecmp(d0->device_uri, d1->device_uri));</li> <li>return (_cups_strcasecmp(d0->device_uri, d1->device_uri)); }</li> </ul> <h1>Index: scheduler/cups-lpd.c</h1> <p>--- scheduler/cups-lpd.c (revision 9791) +++ scheduler/cups-lpd.c (working copy) @@ -3,7 +3,7 @@ *</p> <ul> <li>Line Printer Daemon interface for CUPS. * <ul> <li>* Copyright 2007-2010 by Apple Inc.</li> <li>* Copyright 2007-2011 by Apple Inc.</li> </ul></li> <li>Copyright 1997-2006 by Easy Software Products, all rights reserved. *</li> <li> <p>These coded instructions, statements, and computer programs are the @@ -574,7 +574,7 @@ }</p> <p>if (info_attr && name_attr &&</p> <ul> <li>!strcasecmp(name, info_attr->values[0].string.text))</li> <li>!_cups_strcasecmp(name, info_attr->values[0].string.text)) { /*</li> <li>Found a match, use this one! @@ -669,7 +669,7 @@</li> <li>Make sure we have "Dest name options" or "Default name options"... */</li> </ul> </li> <li>if ((strcasecmp(line, "Dest") && strcasecmp(line, "Default")) || !value)</li> <li> <p>if ((_cups_strcasecmp(line, "Dest") && _cups_strcasecmp(line, "Default")) || !value) continue;</p> <pre><code>/*</code></pre> <p>@@ -686,7 +686,7 @@</p> <ul> <li>the loop - we're done! */</li> </ul> </li> <li>if (!strcasecmp(value, name))</li> <li> <p>if (!_cups_strcasecmp(value, name)) { num_options = cupsParseOptions(optptr, num_options, options); break;</p> <h1>Index: scheduler/client.c</h1> <p>--- scheduler/client.c (revision 9791) +++ scheduler/client.c (working copy) @@ -918,8 +918,8 @@ */</p> <p>if (strcmp(scheme, "file") &&</p> </li> <li>strcasecmp(hostname, ServerName) &&</li> <li>strcasecmp(hostname, "localhost") &&</li> <li>_cups_strcasecmp(hostname, ServerName) &&</li> <li> <pre><code> _cups_strcasecmp(hostname, "localhost") && !isdigit(hostname[0]) && hostname[0] != '[')</code></pre> <p>{ /* @@ -1076,10 +1076,10 @@</p> <p>cupsdAuthorize(con);</p> </li> <li>if (!strncasecmp(con->http.fields[HTTP_FIELD_CONNECTION], "Keep-Alive",</li> <li>if (!_cups_strncasecmp(con->http.fields[HTTP_FIELD_CONNECTION], "Keep-Alive", 10) && KeepAlive) con->http.keep_alive = HTTP_KEEPALIVE_ON;</li> <li>else if (!strncasecmp(con->http.fields[HTTP_FIELD_CONNECTION], "close", 5))</li> <li> <p>else if (!_cups_strncasecmp(con->http.fields[HTTP_FIELD_CONNECTION], "close", 5)) con->http.keep_alive = HTTP_KEEPALIVE_OFF;</p> <p>if (!con->http.fields[HTTP_FIELD_HOST][0] && @@ -1128,7 +1128,7 @@ } }</p> </li> <li> <pre><code>if (!strcasecmp(con->http.fields[HTTP_FIELD_CONNECTION], "Upgrade") &&</code></pre> </li> <li>if (!_cups_strcasecmp(con->http.fields[HTTP_FIELD_CONNECTION], "Upgrade") && con->http.tls == NULL) { <h1>ifdef HAVE_SSL</h1> <p>@@ -1200,7 +1200,7 @@ } else {</p></li> <li>if (!strcasecmp(con->http.fields[HTTP_FIELD_CONNECTION], "Upgrade") &&</li> <li> <pre><code>if (!_cups_strcasecmp(con->http.fields[HTTP_FIELD_CONNECTION], "Upgrade") &&</code></pre> <p>con->http.tls == NULL) {</p> <h1>ifdef HAVE_SSL</h1> <p>@@ -2372,7 +2372,7 @@</p> <p>if (code == HTTP_UNAUTHORIZED && DefaultEncryption == HTTP_ENCRYPT_REQUIRED &&</p> </li> <li>strcasecmp(con->http.hostname, "localhost") &&</li> <li> <pre><code>_cups_strcasecmp(con->http.hostname, "localhost") &&</code></pre> <p>!con->http.tls) { code = HTTP_UPGRADE_REQUIRED; @@ -2600,7 +2600,7 @@</p> <h1>endif /* HAVE_GSSAPI */</h1> <p>if (con->best && auth_type != CUPSD_AUTH_NEGOTIATE &&</p> </li> <li>!strcasecmp(con->http.hostname, "localhost"))</li> <li>!_cups_strcasecmp(con->http.hostname, "localhost")) { /* <ul> <li>Add a "trc" (try root certification) parameter for local non-Kerberos @@ -2623,7 +2623,7 @@ name = (char *)cupsArrayNext(con->best->names)) { <h1>ifdef HAVE_AUTHORIZATION_H</h1></li> </ul></li> <li>if (!strncasecmp(name, "@AUTHKEY(", 9))</li> <li>if (!_cups_strncasecmp(name, "@AUTHKEY(", 9)) { snprintf(auth_key, auth<em>size, ", authkey=\"%s\"", name + 9); /* end parenthesis is stripped in conf.c </em>/ @@ -2631,7 +2631,7 @@ } else <h1>endif /_ HAVE_AUTHORIZATION_H */</h1></li> <li>if (!strcasecmp(name, "@SYSTEM"))</li> <li>if (!_cups_strcasecmp(name, "@SYSTEM")) { <h1>ifdef HAVE_AUTHORIZATION_H</h1> <p>if (SystemGroupAuthKey) @@ -2813,7 +2813,7 @@ * Handle redirection and CGI status codes... */</p></li> <li> <pre><code> if (!strncasecmp(con->header, "Location:", 9))</code></pre> </li> <li>if (!_cups_strncasecmp(con->header, "Location:", 9)) { if (!cupsdSendHeader(con, HTTP_SEE_OTHER, NULL, CUPSD_AUTH_NONE)) { @@ -2826,7 +2826,7 @@ if (httpPrintf(HTTP(con), "Content-Length: 0\r\n") < 0) return; }</li> <li>else if (!strncasecmp(con->header, "Status:", 7))</li> <li> <pre><code>else if (!_cups_strncasecmp(con->header, "Status:", 7)) { cupsdSendError(con, (http_status_t)atoi(con->header + 7), CUPSD_AUTH_NONE);</code></pre> <p>@@ -2850,7 +2850,7 @@ } }</p> </li> <li> <pre><code>if (strncasecmp(con->header, "Status:", 7))</code></pre> </li> <li> <pre><code>if (_cups_strncasecmp(con->header, "Status:", 7)) httpPrintf(HTTP(con), "%s\r\n", con->header); /*</code></pre> <p>@@ -3035,7 +3035,7 @@ while (isspace(<em>ptr) || </em>ptr == ';') ptr ++;</p> </li> <li>if (strncasecmp(ptr, "length=", 7) == 0)</li> <li>if (_cups_strncasecmp(ptr, "length=", 7) == 0) { ptr += 7; size = strtoll(ptr, NULL, 10); @@ -3937,7 +3937,7 @@ <ul> <li>Check for known types... */</li> </ul></li> <li>if (!type || strcasecmp(type->super, "application"))</li> <li>if (!type || _cups_strcasecmp(type->super, "application")) { cupsdLogMessage(CUPSD_LOG_DEBUG2, "is_cgi(con=%p(%d), filename=\"%s\", filestats=%p, " @@ -3947,7 +3947,7 @@ return (0); }</li> <li>if (!strcasecmp(type->type, "x-httpd-cgi") &&</li> <li>if (!_cups_strcasecmp(type->type, "x-httpd-cgi") && (filestats->st_mode & 0111)) { /* @@ -3966,7 +3966,7 @@ return (1); } <h1>ifdef HAVE_JAVA</h1></li> <li>else if (!strcasecmp(type->type, "x-httpd-java"))</li> <li>else if (!_cups_strcasecmp(type->type, "x-httpd-java")) { /* <ul> <li>"application/x-httpd-java" is a Java servlet. @@ -3987,7 +3987,7 @@ } <h1>endif /* HAVE_JAVA */</h1> <h1>ifdef HAVE_PERL</h1></li> </ul></li> <li>else if (!strcasecmp(type->type, "x-httpd-perl"))</li> <li>else if (!_cups_strcasecmp(type->type, "x-httpd-perl")) { /* <ul> <li>"application/x-httpd-perl" is a Perl page. @@ -4008,7 +4008,7 @@ } <h1>endif /* HAVE_PERL */</h1> <h1>ifdef HAVE_PHP</h1></li> </ul></li> <li>else if (!strcasecmp(type->type, "x-httpd-php"))</li> <li>else if (!_cups_strcasecmp(type->type, "x-httpd-php")) { /* <ul> <li>"application/x-httpd-php" is a PHP page. @@ -4029,7 +4029,7 @@ } <h1>endif /* HAVE_PHP */</h1> <h1>ifdef HAVE_PYTHON</h1></li> </ul></li> <li>else if (!strcasecmp(type->type, "x-httpd-python"))</li> <li>else if (!_cups_strcasecmp(type->type, "x-httpd-python")) { /* <ul> <li>"application/x-httpd-python" is a Python page. @@ -4973,13 +4973,13 @@</li> <li>addresses when accessing CUPS via the loopback interface... */</li> </ul></li> <li>return (!strcasecmp(host, "localhost") ||</li> <li>!strncasecmp(host, "localhost:", 10) ||</li> <li>!strcasecmp(host, "localhost.") ||</li> <li>!strncasecmp(host, "localhost.:", 11) ||</li> <li>return (!_cups_strcasecmp(host, "localhost") ||</li> <li>!_cups_strncasecmp(host, "localhost:", 10) ||</li> <li>!_cups_strcasecmp(host, "localhost.") ||</li> <li>!_cups_strncasecmp(host, "localhost.:", 11) || <h1>ifdef __linux</h1></li> <li>!strcasecmp(host, "localhost.localdomain") ||</li> <li>!strncasecmp(host, "localhost.localdomain:", 22) ||</li> <li>!_cups_strcasecmp(host, "localhost.localdomain") ||</li> <li> <pre><code> !_cups_strncasecmp(host, "localhost.localdomain:", 22) ||</code></pre> <h1>endif /* __linux */</h1> <pre><code> !strcmp(host, "127.0.0.1") || !strncmp(host, "127.0.0.1:", 10) ||</code></pre> <p>@@ -4993,8 +4993,8 @@ */</p> <p>if ((end = strrchr(host, '.')) != NULL &&</p> </li> <li>(!strcasecmp(end, ".local") || !strncasecmp(end, ".local:", 7) ||</li> <li>!strcasecmp(end, ".local.") || !strncasecmp(end, ".local.:", 8)))</li> <li>(!_cups_strcasecmp(end, ".local") || !_cups_strncasecmp(end, ".local:", 7) ||</li> <li>!_cups_strcasecmp(end, ".local.") || !_cups_strncasecmp(end, ".local.:", 8))) return (1); <h1>endif /* HAVE_DNSSD */</h1></li> </ul> <p>@@ -5043,7 +5043,7 @@ if (!strcmp(a->name, "*")) return (1);</p> <ul> <li>if (!strncasecmp(host, a->name, a->namelen))</li> <li>if (!_cups_strncasecmp(host, a->name, a->namelen)) { /* <ul> <li>Prefix matches; check the character at the end - it must be ":", ".", @@ -5069,7 +5069,7 @@ if (!strcmp(a->name, "*")) return (1);</li> </ul></li> <li>if (!strncasecmp(host, a->name, a->namelen))</li> <li>if (!_cups_strncasecmp(host, a->name, a->namelen)) { /* <ul> <li>Prefix matches; check the character at the end - it must be ":", ".", @@ -5092,7 +5092,7 @@ netif; netif = (cupsd_netif_t *)cupsArrayNext(NetIFList)) {</li> </ul></li> <li>if (!strncasecmp(host, netif->hostname, netif->hostlen))</li> <li> <p>if (!_cups_strncasecmp(host, netif->hostname, netif->hostlen)) { /*</p> <ul> <li> <h1>Prefix matches; check the character at the end - it must be ":", ".", Index: scheduler/cupsfilter.c</h1> <p>--- scheduler/cupsfilter.c (revision 9791) +++ scheduler/cupsfilter.c (working copy) @@ -46,7 +46,7 @@</p> <h1>include <sys/wait.h></h1> <h1>if defined(<strong>APPLE</strong>)</h1> <h1>include <libgen.h></h1> <p>-#endif /* <strong>APPLE</strong> <em>/ +#endif /</em> <strong>APPLE</strong> */</p> </li> </ul> <p>/* @@ -435,7 +435,7 @@ }</p> <p>sscanf(dsttype, "%15[^/]/%255s", super, type);</p> </li> <li>if (!strcasecmp(super, "printer"))</li> <li>if (!_cups_strcasecmp(super, "printer")) dst = printer_type; else if ((dst = mimeType(mime, super, type)) == NULL) { @@ -623,9 +623,9 @@ for (temptype = mimeFirstType(mime); temptype; temptype = mimeNextType(mime))</li> <li>if (((super[0] == '*' && strcasecmp(temptype->super, "printer")) ||</li> <li>!strcasecmp(temptype->super, super)) &&</li> <li>(type[0] == '*' || !strcasecmp(temptype->type, type)))</li> <li>if (((super[0] == '*' && _cups_strcasecmp(temptype->super, "printer")) ||</li> <li>!_cups_strcasecmp(temptype->super, super)) &&</li> <li> <pre><code> (type[0] == '*' || !_cups_strcasecmp(temptype->type, type)))</code></pre> <p>{ if (desttype != filtertype) { @@ -818,7 +818,7 @@</p> <p>/*</p> </li> <li>* Add special voodoo magic for MacOS X - this allows MacOS X </li> <li>* Add special voodoo magic for MacOS X - this allows MacOS X <ul> <li>programs to access their bundle resources properly... */</li> </ul></li> </ul> <p>@@ -1362,15 +1362,15 @@</p> <pre><code> while (cupsFileGetConf(fp, line, sizeof(line), &ptr, &linenum)) {</code></pre> <ul> <li>if (!strcasecmp(line, "DataDir"))</li> <li>if (!_cups_strcasecmp(line, "DataDir")) set_string(&DataDir, ptr);</li> <li>else if (!strcasecmp(line, "FontPath"))</li> <li>else if (!_cups_strcasecmp(line, "FontPath")) set_string(&FontPath, ptr);</li> <li>else if (!strcasecmp(line, "RIPCache"))</li> <li>else if (!_cups_strcasecmp(line, "RIPCache")) set_string(&RIPCache, ptr);</li> <li>else if (!strcasecmp(line, "ServerBin"))</li> <li>else if (!_cups_strcasecmp(line, "ServerBin")) set_string(&ServerBin, ptr);</li> <li>else if (!strcasecmp(line, "ServerRoot"))</li> <li>else if (!_cups_strcasecmp(line, "ServerRoot")) set_string(&ServerRoot, ptr); }</li> </ul> <h1>Index: scheduler/type.c</h1> <p>--- scheduler/type.c (revision 9791) +++ scheduler/type.c (working copy) @@ -715,8 +715,8 @@ int i; /* Result of comparison */</p> <ul> <li>if ((i = strcasecmp(t0->super, t1->super)) == 0)</li> <li>i = strcasecmp(t0->type, t1->type);</li> <li>if ((i = _cups_strcasecmp(t0->super, t1->super)) == 0)</li> <li> <p>i = _cups_strcasecmp(t0->type, t1->type);</p> <p>return (i); } @@ -917,7 +917,7 @@ if ((rules->offset + rules->length) > (fb->offset + fb->length)) result = 0; else</p> </li> <li>result = (strncasecmp((char *)fb->buffer + rules->offset -</li> <li> <h1>result = (_cups_strncasecmp((char *)fb->buffer + rules->offset - fb->offset, rules->value.stringv, rules->length) == 0); break; Index: scheduler/banners.c</h1> <p>--- scheduler/banners.c (revision 9791) +++ scheduler/banners.c (working copy) @@ -3,7 +3,7 @@ *</p> <ul> <li>Banner routines for the CUPS scheduler.</li> <li> </li> </ul> </li> <li>* Copyright 2007-2010 by Apple Inc.</li> <li>* Copyright 2007-2011 by Apple Inc. <ul> <li>Copyright 1997-2006 by Easy Software Products.</li> <li> </li> <li>These coded instructions, statements, and computer programs are the @@ -192,7 +192,7 @@ const cupsd_banner_t <em>b0, /</em> I - First banner _/ const cupsd_banner<em>t *b1) /</em> I - Second banner */ {</li> </ul></li> <li>return (strcasecmp(b0->name, b1->name));</li> <li>return (_cups_strcasecmp(b0->name, b1->name)); }</li> </ul> <h1>Index: scheduler/dirsvc.c</h1> <p>--- scheduler/dirsvc.c (revision 9791) +++ scheduler/dirsvc.c (working copy) @@ -171,7 +171,7 @@ static char <em>dnssdPackTxtRecord(int </em>txt_len, char *keyvalue[][2], int count); static void dnssdRegisterCallback(DNSServiceRef sdRef,</p> <ul> <li>DNSServiceFlags flags, </li> <li>DNSServiceFlags flags, DNSServiceErrorType errorCode, const char _name, const char <em>regtype, const char </em>domain, void *context); @@ -192,7 +192,7 @@ }; <h1>endif /_ HAVE_LDAP */</h1></li> </ul> <p>-#ifdef HAVE_LIBSLP +#ifdef HAVE_LIBSLP /*</p> <ul> <li>SLP definitions... */ @@ -205,7 +205,7 @@ <h1>define SLP_CUPS_SRVLEN 15</h1></li> </ul> <p>-/* +/*</p> <ul> <li>Printer service URL structure */</li> </ul> <p>@@ -235,7 +235,7 @@</p> <p>/*</p> <ul> <li>* 'cupsdDeregisterPrinter()' - Stop sending broadcast information for a </li> <li> <ul> <li>'cupsdDeregisterPrinter()' - Stop sending broadcast information for a</li> <li>local printer and remove any pending</li> <li>references to remote printers. */ @@ -347,8 +347,8 @@</li> <li>Decode the directive... */</li> </ul> </li> <li>if (!strcasecmp(line, "<Printer") ||</li> <li>!strcasecmp(line, "<DefaultPrinter"))</li> <li>if (!_cups_strcasecmp(line, "<Printer") ||</li> <li> <pre><code> !_cups_strcasecmp(line, "<DefaultPrinter"))</code></pre> <p>{ /*</p> <ul> <li> <Printer name> or <DefaultPrinter name> @@ -388,7 +388,7 @@ </li> <li>Set the default printer as needed... */</li> </ul> </li> <li> <pre><code> if (!strcasecmp(line, "<DefaultPrinter"))</code></pre> </li> <li>if (!_cups_strcasecmp(line, "<DefaultPrinter")) DefaultPrinter = p; } else @@ -398,8 +398,8 @@ break; } }</li> <li>else if (!strcasecmp(line, "<Class") ||</li> <li>!strcasecmp(line, "<DefaultClass"))</li> <li>else if (!_cups_strcasecmp(line, "<Class") ||</li> <li> <pre><code> !_cups_strcasecmp(line, "<DefaultClass"))</code></pre> <p>{ /*</p> <ul> <li> <Class name> or <DefaultClass name> @@ -429,7 +429,7 @@ </li> <li>Set the default printer as needed... */</li> </ul> </li> <li> <pre><code> if (!strcasecmp(line, "<DefaultClass"))</code></pre> </li> <li>if (!_cups_strcasecmp(line, "<DefaultClass")) DefaultPrinter = p; } else @@ -439,8 +439,8 @@ break; } }</li> <li>else if (!strcasecmp(line, "</Printer>") ||</li> <li>!strcasecmp(line, "</Class>"))</li> <li>else if (!_cups_strcasecmp(line, "</Printer>") ||</li> <li>!_cups_strcasecmp(line, "</Class>")) { if (p != NULL) { @@ -461,7 +461,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of remote.cache.", linenum); }</li> <li>else if (!strcasecmp(line, "UUID"))</li> <li>else if (!_cups_strcasecmp(line, "UUID")) { if (value && !strncmp(value, "urn:uuid:", 9)) cupsdSetString(&(p->uuid), value); @@ -469,22 +469,22 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Bad UUID on line %d of remote.cache.", linenum); }</li> <li>else if (!strcasecmp(line, "Info"))</li> <li>else if (!_cups_strcasecmp(line, "Info")) { if (value) cupsdSetString(&p->info, value); }</li> <li>else if (!strcasecmp(line, "MakeModel"))</li> <li>else if (!_cups_strcasecmp(line, "MakeModel")) { if (value) cupsdSetString(&p->make_model, value); }</li> <li>else if (!strcasecmp(line, "Location"))</li> <li>else if (!_cups_strcasecmp(line, "Location")) { if (value) cupsdSetString(&p->location, value); }</li> <li>else if (!strcasecmp(line, "DeviceURI"))</li> <li>else if (!_cups_strcasecmp(line, "DeviceURI")) { if (value) { @@ -500,7 +500,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of remote.cache.", linenum); }</li> <li>else if (!strcasecmp(line, "Option") && value)</li> <li>else if (!_cups_strcasecmp(line, "Option") && value) { /* <ul> <li>Option name value @@ -519,7 +519,7 @@ &(p->options)); } }</li> </ul></li> <li>else if (!strcasecmp(line, "Reason"))</li> <li>else if (!_cups_strcasecmp(line, "Reason")) { if (value) { @@ -538,15 +538,15 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of remote.cache.", linenum); }</li> <li>else if (!strcasecmp(line, "State"))</li> <li>else if (!_cups_strcasecmp(line, "State")) { /* <ul> <li>Set the initial queue state... */</li> </ul></li> <li> <pre><code>if (value && !strcasecmp(value, "idle"))</code></pre> </li> <li>if (value && !_cups_strcasecmp(value, "idle")) p->state = IPP_PRINTER_IDLE;</li> <li>else if (value && !strcasecmp(value, "stopped"))</li> <li>else if (value && !_cups_strcasecmp(value, "stopped")) { p->state = IPP_PRINTER_STOPPED; cupsdSetPrinterReasons(p, "+paused"); @@ -555,7 +555,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of remote.cache.", linenum); }</li> <li>else if (!strcasecmp(line, "StateMessage"))</li> <li>else if (!_cups_strcasecmp(line, "StateMessage")) { /* <ul> <li>Set the initial queue state message... @@ -564,27 +564,27 @@ if (value) strlcpy(p->state_message, value, sizeof(p->state_message)); }</li> </ul></li> <li>else if (!strcasecmp(line, "Accepting"))</li> <li> <p>else if (!_cups_strcasecmp(line, "Accepting")) { /*</p> <ul> <li>Set the initial accepting state... */</li> </ul> <p>if (value &&</p> </li> <li>(!strcasecmp(value, "yes") ||</li> <li>!strcasecmp(value, "on") ||</li> <li>!strcasecmp(value, "true")))</li> <li>(!_cups_strcasecmp(value, "yes") ||</li> <li>!_cups_strcasecmp(value, "on") ||</li> <li>!_cups_strcasecmp(value, "true"))) p->accepting = 1; else if (value &&</li> <li>(!strcasecmp(value, "no") ||</li> <li>!strcasecmp(value, "off") ||</li> <li>!strcasecmp(value, "false")))</li> <li>(!_cups_strcasecmp(value, "no") ||</li> <li>!_cups_strcasecmp(value, "off") ||</li> <li>!_cups_strcasecmp(value, "false"))) p->accepting = 0; else cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of remote.cache.", linenum); }</li> <li>else if (!strcasecmp(line, "Type"))</li> <li>else if (!_cups_strcasecmp(line, "Type")) { if (value) p->type = atoi(value); @@ -592,7 +592,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of remote.cache.", linenum); }</li> <li>else if (!strcasecmp(line, "BrowseTime"))</li> <li>else if (!_cups_strcasecmp(line, "BrowseTime")) { if (value) { @@ -605,7 +605,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of remote.cache.", linenum); }</li> <li>else if (!strcasecmp(line, "JobSheets"))</li> <li>else if (!_cups_strcasecmp(line, "JobSheets")) { /* <ul> <li>Set the initial job sheets... @@ -637,7 +637,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of remote.cache.", linenum); }</li> </ul></li> <li>else if (!strcasecmp(line, "AllowUser"))</li> <li>else if (!_cups_strcasecmp(line, "AllowUser")) { if (value) { @@ -648,7 +648,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of remote.cache.", linenum); }</li> <li>else if (!strcasecmp(line, "DenyUser"))</li> <li>else if (!_cups_strcasecmp(line, "DenyUser")) { if (value) { @@ -1142,9 +1142,9 @@ <ul> <li>LDAP stuff currently only supports ldapi EXTERNAL SASL binds... */</li> </ul></li> <li>if (!BrowseLDAPServer || !strcasecmp(BrowseLDAPServer, "localhost")) </li> <li>if (!BrowseLDAPServer || !_cups_strcasecmp(BrowseLDAPServer, "localhost")) rc = ldap_initialize(&TempBrowseLDAPHandle, "ldapi:///");</li> <li>else </li> <li> <p>else rc = ldap_initialize(&TempBrowseLDAPHandle, BrowseLDAPServer);</p> <h1>else /* HAVE_OPENLDAP */</h1> <p>@@ -1323,7 +1323,7 @@ bval.bv_val = BrowseLDAPPassword; bval.bv_len = (BrowseLDAPPassword == NULL) ? 0 : strlen(BrowseLDAPPassword);</p> </li> <li>if (!BrowseLDAPServer || !strcasecmp(BrowseLDAPServer, "localhost"))</li> <li>if (!BrowseLDAPServer || !_cups_strcasecmp(BrowseLDAPServer, "localhost")) rc = ldap_sasl_bind_s(TempBrowseLDAPHandle, NULL, "EXTERNAL", &bv, NULL, NULL, NULL); else @@ -1613,7 +1613,7 @@ <h1>ifdef HAVE_LIBSLP</h1> <p>if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP) {</p></li> <li>/* </li> <li>/* <ul> <li>Open SLP handle... */</li> </ul></li> </ul> <p>@@ -1843,7 +1843,7 @@ if (((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP) && BrowseSLPHandle) {</p> <ul> <li>/* </li> <li>/* <ul> <li>Close SLP handle... */</li> </ul></li> </ul> <p>@@ -2106,7 +2106,7 @@</p> <ul> <li>and temporary disable LDAP updates... */</li> <li>if (rc != LDAP_SUCCESS) </li> <li>if (rc != LDAP_SUCCESS) { if (BrowseLDAPUpdate && ((rc == LDAP_SERVER_DOWN) || (rc == LDAP_CONNECT_ERROR))) { @@ -2189,7 +2189,7 @@ <h1>endif /* HAVE_LDAP */</h1></li> </ul> <p>-#ifdef HAVE_LIBSLP +#ifdef HAVE_LIBSLP /*</p> <ul> <li> <p>'cupsdUpdateSLPBrowse()' - Get browsing information via SLP. */ @@ -2211,7 +2211,7 @@</p> <p>BrowseSLPRefresh = time(NULL) + BrowseInterval;</p> </li> <li>/* </li> <li>/* <ul> <li>Poll for remote printers using SLP... */</li> </ul></li> </ul> <p>@@ -2232,7 +2232,7 @@</p> <pre><code> next = s->next;</code></pre> <ul> <li>/* </li> <li>/* <ul> <li>Load a cupsd_printer_t structure with the SLP service attributes... */</li> </ul></li> </ul> <p>@@ -2264,7 +2264,7 @@ cupsdClearString(&p.make_model);</p> <pre><code> free(s);</code></pre> <ul> <li>} </li> <li>} } <h1>endif /* HAVE_LIBSLP */</h1></li> </ul> <p>@@ -2373,7 +2373,7 @@ if (for_lpd) strlcpy(rp_str, p->name, sizeof(rp_str)); else</p> <ul> <li>snprintf(rp_str, sizeof(rp_str), "%s/%s", </li> <li> <p>snprintf(rp_str, sizeof(rp_str), "%s/%s", (p->type & CUPS_PRINTER_CLASS) ? "classes" : "printers", p->name);</p> <p>keyvalue[i ][0] = "ty"; @@ -2474,7 +2474,7 @@ dnssdComparePrinters(cupsd_printer_t <em>a,/</em> I - First printer _/ cupsd_printer<em>t *b)/</em> I - Second printer */ {</p> </li> <li>return (strcasecmp(a->reg_name, b->reg_name));</li> <li>return (_cups_strcasecmp(a->reg_name, b->reg_name)); }</li> </ul> <p>@@ -2560,7 +2560,7 @@ return (NULL);</p> <p>for (length = i = 0; i < count; i++)</p> <ul> <li>length += 1 + strlen(keyvalue[i][0]) + </li> <li> <p>length += 1 + strlen(keyvalue[i][0]) + (keyvalue[i][1] ? 1 + strlen(keyvalue[i][1]) : 0);</p> <p>/* @@ -2628,11 +2628,11 @@</p> <p>if (errorCode) {</p> </li> <li>cupsdLogMessage(CUPSD_LOG_ERROR, </li> <li>cupsdLogMessage(CUPSD_LOG_ERROR, "DNSServiceRegister failed with error %d", (int)errorCode); return; }</li> <li>else if (p && (!p->reg_name || strcasecmp(name, p->reg_name)))</li> <li>else if (p && (!p->reg_name || _cups_strcasecmp(name, p->reg_name))) { cupsdLogMessage(CUPSD_LOG_INFO, "Using service name \"%s\" for \"%s\"", name, p->name); @@ -2651,7 +2651,7 @@ <ul> <li>or update the broadcast contents. */</li> </ul></li> </ul> <p>-static void +static void dnssdRegisterPrinter(cupsd_printer_t <em>p)/</em> I - Printer <em>/ { DNSServiceErrorType se; /</em> dnssd errors */ @@ -2756,7 +2756,7 @@</p> <pre><code> regtype = (p->type & CUPS_PRINTER_FAX) ? "_fax-ipp._tcp" : DNSSDRegType;</code></pre> <ul> <li>cupsdLogMessage(CUPSD_LOG_DEBUG, </li> <li>cupsdLogMessage(CUPSD_LOG_DEBUG, "Registering DNS-SD printer %s with name \"%s\" and " "type \"%s\"", p->name, name, regtype);</li> </ul> <p>@@ -2853,14 +2853,14 @@ p->printer_ref = NULL; }</p> <h2>}</h2> <p>+ if (!p->printer_ref) { /<em> * Initial registration... </em>/</p> <ul> <li>cupsdLogMessage(CUPSD_LOG_DEBUG, </li> <li>cupsdLogMessage(CUPSD_LOG_DEBUG, "Registering DNS-SD printer %s with name \"%s\" and " "type \"_printer._tcp\"", p->name, name);</li> </ul> <p>@@ -3066,13 +3066,13 @@</p> <pre><code> *ptr++ = '\0';</code></pre> <ul> <li>if (!strcasecmp(line, name))</li> <li> <pre><code>if (!_cups_strcasecmp(line, name))</code></pre> <p>{ /<em> * Found the service, see if it is set to "-NO-"... </em>/</p> </li> <li>if (!strncasecmp(ptr, "-NO-", 4))</li> <li>if (!_cups_strncasecmp(ptr, "-NO-", 4)) state = 0; break; } @@ -3118,7 +3118,7 @@ <ul> <li>Check for local server addresses... */</li> </ul></li> <li>if (!strcasecmp(host, ServerName) && port == LocalPort)</li> <li> <p>if (!_cups_strcasecmp(host, ServerName) && port == LocalPort) return (1);</p> <p>cupsdNetIFUpdate(); @@ -3126,7 +3126,7 @@ for (iface = (cupsd_netif_t <em>)cupsArrayFirst(NetIFList); iface; iface = (cupsd_netif_t </em>)cupsArrayNext(NetIFList))</p> </li> <li>if (!strcasecmp(host, iface->hostname) && port == iface->port)</li> <li> <p>if (!_cups_strcasecmp(host, iface->hostname) && port == iface->port) return (1);</p> <p>/* @@ -3266,7 +3266,7 @@</p> <p>while (hptr != NULL) {</p> </li> <li>if (!strcasecmp(hptr, sptr))</li> <li> <pre><code>if (!_cups_strcasecmp(hptr, sptr))</code></pre> <p>{ *hptr = '\0'; break; @@ -3337,7 +3337,7 @@</p> <p>if (p->type & CUPS_PRINTER_IMPLICIT) p = NULL; /* Don't replace implicit classes */</p> </li> <li>else if (p->hostname && strcasecmp(p->hostname, host))</li> <li> <pre><code>else if (p->hostname && _cups_strcasecmp(p->hostname, host))</code></pre> <p>{ /*</p> <ul> <li>Short name exists but is for a different host. If this is a remote @@ -3548,7 +3548,7 @@ is_class ? "Class" : "Printer", p->name);</li> </ul> <p>cupsdExpireSubscriptions(p, NULL);</p> </li> <li> <p>+ cupsdDeletePrinter(p, 1); cupsdUpdateImplicitClasses(); cupsdMarkDirty(CUPSD_DIRTY_PRINTCAP | CUPSD_DIRTY_REMOTE); @@ -3637,7 +3637,7 @@ cupsArraySave(Printers);</p> <p>if (len > 0 &&</p> </li> <li>!strncasecmp(p->name, name + offset, len) &&</li> <li>!_cups_strncasecmp(p->name, name + offset, len) && (p->name[len] == '\0' || p->name[len] == '@')) { /* @@ -3645,7 +3645,7 @@ <ul> <li>we have a class, and if this printer is a member... */</li> </ul></li> <li> <pre><code>if (pclass && strcasecmp(pclass->name, name))</code></pre> </li> <li>if (pclass && _cups_strcasecmp(pclass->name, name)) { if (update) cupsdSetPrinterAttrs(pclass); @@ -4203,7 +4203,7 @@ ou_value[1] = NULL; desc[0] = descstring; desc[1] = NULL;</li> <li> <p>+ mods[0].mod_type = "ou"; mods[0].mod_values = ou_value; mods[1].mod_type = "description"; @@ -4541,7 +4541,7 @@ } } }</p> </li> <li>else </li> <li> <p>else { /*</p> <ul> <li>No LDAP entry exists for the printer. Printer has never been registered, @@ -4741,7 +4741,7 @@ p->name);</li> </ul> <p>/*</p> </li> <li>* Make the SLP service URL that conforms to the IANA </li> <li>* Make the SLP service URL that conforms to the IANA <ul> <li>'printer:' template. */</li> </ul></li> </ul> <p>@@ -4896,7 +4896,7 @@</p> <p>/*</p> <ul> <li>* 'slp_attr_callback()' - SLP attribute callback </li> <li> <ul> <li>'slp_attr_callback()' - SLP attribute callback */</li> </ul> <p>static SLPBoolean /* O - SLP_TRUE for success */ @@ -4947,7 +4947,7 @@</p> <ul> <li>'slp_dereg_printer()' - SLPDereg() the specified printer */</li> </ul> </li> </ul> <p>-static void +static void slp_dereg_printer(cupsd_printer_t <em>p) /</em> I - Printer _/ { char srvurl[HTTP_MAX<em>URI]; /</em> Printer service URI _/ @@ -4958,7 +4958,7 @@ if (!(p->type & CUPS_PRINTER<em>REMOTE)) { /</em></p> <ul> <li>* Make the SLP service URL that conforms to the IANA </li> <li>* Make the SLP service URL that conforms to the IANA <ul> <li>'printer:' template. */</li> </ul></li> </ul> <p>@@ -5083,7 +5083,7 @@</p> <p>strlcpy(s->url, srvurl, sizeof(s->url));</p> <ul> <li>/* </li> <li>/* <ul> <li>Link the SLP service URL into the head of the list */</li> </ul></li> </ul> <p>@@ -5131,7 +5131,7 @@ */</p> <p>srclen = sizeof(srcaddr);</p> <ul> <li>if ((bytes = recvfrom(BrowseSocket, packet, sizeof(packet) - 1, 0, </li> <li> <p>if ((bytes = recvfrom(BrowseSocket, packet, sizeof(packet) - 1, 0, (struct sockaddr <em>)&srcaddr, &srclen)) < 0) { /</em> @@ -5205,7 +5205,7 @@</p> <p>if (BrowseACL) {</p> </li> <li>if (httpAddrLocalhost(&srcaddr) || !strcasecmp(srcname, "localhost"))</li> <li>if (httpAddrLocalhost(&srcaddr) || !_cups_strcasecmp(srcname, "localhost")) { /* <ul> <li> <h1>Access from localhost (127.0.0.1) is always allowed... Index: scheduler/classes.c</h1> <p>--- scheduler/classes.c (revision 9791) +++ scheduler/classes.c (working copy) @@ -3,7 +3,7 @@</p> </li> <li> </li> <li>Printer class routines for the CUPS scheduler. *</li> </ul></li> <li>* Copyright 2007-2010 by Apple Inc.</li> <li> <ul> <li>Copyright 2007-2011 by Apple Inc.</li> <li>Copyright 1997-2007 by Easy Software Products, all rights reserved.</li> <li> </li> <li>These coded instructions, statements, and computer programs are the @@ -325,8 +325,8 @@</li> <li>Decode the directive... */</li> </ul> </li> <li>if (!strcasecmp(line, "<Class") ||</li> <li>!strcasecmp(line, "<DefaultClass"))</li> <li>if (!_cups_strcasecmp(line, "<Class") ||</li> <li> <pre><code> !_cups_strcasecmp(line, "<DefaultClass"))</code></pre> <p>{ /*</p> <ul> <li> <Class name> or <DefaultClass name> @@ -354,14 +354,14 @@ p->accepting = 1; p->state = IPP_PRINTER_IDLE; </li> </ul> </li> <li> <pre><code> if (!strcasecmp(line, "<DefaultClass"))</code></pre> </li> <li>if (!_cups_strcasecmp(line, "<DefaultClass")) DefaultPrinter = p; } else cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of classes.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "</Class>"))</li> <li>else if (!_cups_strcasecmp(line, "</Class>")) { if (p != NULL) { @@ -377,7 +377,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of classes.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "UUID"))</li> <li>else if (!_cups_strcasecmp(line, "UUID")) { if (value && !strncmp(value, "urn:uuid:", 9)) cupsdSetString(&(p->uuid), value); @@ -385,24 +385,24 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Bad UUID on line %d of classes.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "AuthInfoRequired"))</li> <li>else if (!_cups_strcasecmp(line, "AuthInfoRequired")) { if (!cupsdSetAuthInfoRequired(p, value, NULL)) cupsdLogMessage(CUPSD_LOG_ERROR, "Bad AuthInfoRequired on line %d of classes.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "Info"))</li> <li>else if (!_cups_strcasecmp(line, "Info")) { if (value) cupsdSetString(&p->info, value); }</li> <li>else if (!strcasecmp(line, "Location"))</li> <li>else if (!_cups_strcasecmp(line, "Location")) { if (value) cupsdSetString(&p->location, value); }</li> <li>else if (!strcasecmp(line, "Option") && value)</li> <li>else if (!_cups_strcasecmp(line, "Option") && value) { /* <ul> <li>Option name value @@ -421,7 +421,7 @@ &(p->options)); } }</li> </ul></li> <li>else if (!strcasecmp(line, "Printer"))</li> <li>else if (!_cups_strcasecmp(line, "Printer")) { if (!value) { @@ -458,15 +458,15 @@ if (temp) cupsdAddPrinterToClass(p, temp); }</li> <li>else if (!strcasecmp(line, "State"))</li> <li>else if (!_cups_strcasecmp(line, "State")) { /* <ul> <li>Set the initial queue state... */</li> </ul></li> <li> <pre><code>if (!strcasecmp(value, "idle"))</code></pre> </li> <li>if (!_cups_strcasecmp(value, "idle")) p->state = IPP_PRINTER_IDLE;</li> <li>else if (!strcasecmp(value, "stopped"))</li> <li>else if (!_cups_strcasecmp(value, "stopped")) { p->state = IPP_PRINTER_STOPPED;</li> </ul> <p>@@ -486,7 +486,7 @@ "Syntax error on line %d of classes.conf.", linenum); }</p> <ul> <li>else if (!strcasecmp(line, "StateMessage"))</li> <li>else if (!_cups_strcasecmp(line, "StateMessage")) { /* <ul> <li>Set the initial queue state message... @@ -495,7 +495,7 @@ if (value) strlcpy(p->state_message, value, sizeof(p->state_message)); }</li> </ul></li> <li>else if (!strcasecmp(line, "StateTime"))</li> <li>else if (!_cups_strcasecmp(line, "StateTime")) { /* <ul> <li>Set the state time... @@ -504,49 +504,49 @@ if (value) p->state_time = atoi(value); }</li> </ul></li> <li>else if (!strcasecmp(line, "Accepting"))</li> <li> <p>else if (!_cups_strcasecmp(line, "Accepting")) { /*</p> <ul> <li>Set the initial accepting state... */</li> </ul> <p>if (value &&</p> </li> <li>(!strcasecmp(value, "yes") ||</li> <li>!strcasecmp(value, "on") ||</li> <li>!strcasecmp(value, "true")))</li> <li>(!_cups_strcasecmp(value, "yes") ||</li> <li>!_cups_strcasecmp(value, "on") ||</li> <li>!_cups_strcasecmp(value, "true"))) p->accepting = 1; else if (value &&</li> <li>(!strcasecmp(value, "no") ||</li> <li>!strcasecmp(value, "off") ||</li> <li>!strcasecmp(value, "false")))</li> <li>(!_cups_strcasecmp(value, "no") ||</li> <li>!_cups_strcasecmp(value, "off") ||</li> <li>!_cups_strcasecmp(value, "false"))) p->accepting = 0; else cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of classes.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "Shared"))</li> <li> <p>else if (!_cups_strcasecmp(line, "Shared")) { /*</p> <ul> <li>Set the initial shared state... */</li> </ul> <p>if (value &&</p> </li> <li>(!strcasecmp(value, "yes") ||</li> <li>!strcasecmp(value, "on") ||</li> <li>!strcasecmp(value, "true")))</li> <li>(!_cups_strcasecmp(value, "yes") ||</li> <li>!_cups_strcasecmp(value, "on") ||</li> <li>!_cups_strcasecmp(value, "true"))) p->shared = 1; else if (value &&</li> <li>(!strcasecmp(value, "no") ||</li> <li>!strcasecmp(value, "off") ||</li> <li>!strcasecmp(value, "false")))</li> <li>(!_cups_strcasecmp(value, "no") ||</li> <li>!_cups_strcasecmp(value, "off") ||</li> <li>!_cups_strcasecmp(value, "false"))) p->shared = 0; else cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of classes.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "JobSheets"))</li> <li>else if (!_cups_strcasecmp(line, "JobSheets")) { /* <ul> <li>Set the initial job sheets... @@ -582,7 +582,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of classes.conf.", linenum); }</li> </ul></li> <li>else if (!strcasecmp(line, "AllowUser"))</li> <li>else if (!_cups_strcasecmp(line, "AllowUser")) { if (value) { @@ -593,7 +593,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of classes.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "DenyUser"))</li> <li>else if (!_cups_strcasecmp(line, "DenyUser")) { if (value) { @@ -604,7 +604,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of classes.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "QuotaPeriod"))</li> <li>else if (!_cups_strcasecmp(line, "QuotaPeriod")) { if (value) p->quota_period = atoi(value); @@ -612,7 +612,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of classes.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "PageLimit"))</li> <li>else if (!_cups_strcasecmp(line, "PageLimit")) { if (value) p->page_limit = atoi(value); @@ -620,7 +620,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of classes.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "KLimit"))</li> <li>else if (!_cups_strcasecmp(line, "KLimit")) { if (value) p->k_limit = atoi(value); @@ -628,7 +628,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of classes.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "OpPolicy"))</li> <li>else if (!_cups_strcasecmp(line, "OpPolicy")) { if (value) { @@ -649,7 +649,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d of classes.conf.", linenum); }</li> <li>else if (!strcasecmp(line, "ErrorPolicy"))</li> <li>else if (!_cups_strcasecmp(line, "ErrorPolicy")) { if (value) {</li> </ul> </div> </div> <div class="page-bar-simple"> </div> <div class="footer"> <ul class="body"> <li>© <script> document.write(new Date().getFullYear()) </script> Githubissues.</li> <li>Githubissues is a development platform for aggregating issues.</li> </ul> </div> <script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.min.js"></script> <script src="/githubissues/assets/js.js"></script> <script src="/githubissues/assets/markdown.js"></script> <script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.4.0/build/highlight.min.js"></script> <script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.4.0/build/languages/go.min.js"></script> <script> hljs.highlightAll(); </script> </body> </html>

apple / cups

Web interface not functional when the browser language is Turkish #3800

Index: cups-1.4.6/cups/string.h

else

endif /_ _CUPS_INLINE */

Index: cups-1.4.6/cgi-bin/var.c

Index: cups-1.4.6/cups/string.h

else

endif /* _CUPS_INLINE */

define strdup _cups_strdup

endif /_ !HAVE_STRDUP */

define strcasecmp _cups_strcasecmp

endif /_ !HAVE_STRCASECMP */

Index: cups-1.4.6/cgi-bin/var.c

Index: cups-1.4.6/cups/string.c

Index: notifier/mailto.c

Index: backend/usb-libusb.c

Index: backend/usb-unix.c

endif /* FreeBSD || NetBSD || OpenBSD || DragonFly */

Index: backend/usb-darwin.c

Index: backend/dnssd.c

else if (!_cups_strncasecmp(model, "stylus ", 7)) snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s", model + 7); else if ((ptr = strchr(model, ' ')) != NULL) { Index: backend/snmp.c

Index: backend/lpd.c

Index: backend/serial.c

endif /* B19200 == 19200 */

Index: backend/snmp-supplies.c

ppdattr->value && _cups_strcasecmp(ppdattr->value, "true"))) { ppdClose(ppd); return; Index: backend/ieee1284.c

Just copy the model string, since it has the manufacturer... Index: backend/ipp.c

ifdef HAVE_LIBZ

endif /* HAVE_LIBZ */

Index: backend/socket.c

Index: config-scripts/cups-common.m4

Index: driver/commandtopclx.c

if (_cups_strncasecmp(lineptr, "Clean", 5) == 0 && (ppd->model_number & PCL_INKJET)) { /* Index: driver/commandtoescpx.c

Set head alignment... Index: cups/emit.c

Use PageRegion code... Index: cups/custom.c

Index: cups/pwg-media.c

Index: cups/testcups.c

(a->instance && _cups_strcasecmp(a->instance, b->instance))) printf(" instance %-20.20s %-20.20s\n", a->instance ? a->instance : "(null)", b->instance ? b->instance : "(null)"); Index: cups/util.c

Index: cups/http.c

Index: cups/testi18n.c

if (!_cups_strcasecmp(lang_encodings[i], argv[2])) { encoding = (cups_encoding_t)i; break; Index: cups/language.c

else if (!_cups_strcasecmp(charset, "big5")) encoding = CUPS_WINDOWS_950; } } Index: cups/http-addrlist.c

ifdef WIN32

else

endif /_ WIN32 */

ifdef FD_CLOEXEC

endif /* AF_LOCAL */

ifdef HAVE_GETADDRINFO

Unfortunately, some users ignore all of the warnings in the Index: cups/ppd.c

+ mask |= PPD_TEXT; } } Index: cups/string-private.h

- */

-# endif /* WIN32 || EMX */

else

endif /* _CUPS_INLINE */

define strdup _cups_strdup

endif /* !HAVE_STRDUP */

ifndef HAVE_STRLCAT

Index: cups/ipp.c

Index: cups/http-support.c

endif /* HAVE_POLL */

Index: cups/mark.c

Index: cups/dest.c

Index: cups/auth.c

_cups_strcasecmp(http->hostname, "localhost") != 0) { DEBUG_puts("8cups_local_auth: Not a local connection!"); return (1); Index: cups/ipp-support.c

else if (!_cups_strcasecmp(name, "begCollection")) return (IPP_TAG_BEGIN_COLLECTION); else return (IPP_TAG_ZERO); Index: cups/attr.c

Replace with LHAG... Index: cups/usersys.c

ifdef HAVE_GSSAPI

endif /* HAVE_GSSAPI */

Index: cups/ppd-cache.c

else if (_cups_strcasecmp(media_type, "transparency")) strlcpy(name, "Transparency", namesize); else pwg_ppdize_name(media_type, name, namesize); Index: cups/testconflicts.c

Index: cups/adminutil.c

ifdef AF_LOCAL

endif /_ AF_LOCAL */

ifdef AF_LOCAL

endif /_ AF_LOCAL */

ifndef WIN32

Read the local file rather than using HTTP... Index: cups/request.c

if (!_cups_strcasecmp(http->fields[HTTP_FIELD_CONNECTION], "close")) if (httpReconnect(http)) { _cupsSetError(IPP_SERVICE_UNAVAILABLE, NULL, 0); Index: cups/encode.c

if (!_cups_strcasecmp(s, "dpc")) attr->values[j].resolution.units = IPP_RES_PER_CM; else attr->values[j].resolution.units = IPP_RES_PER_INCH; Index: cups/string.c