From: msweet Date: Thu, 12 May 2011 06:22:31 +0000 (+0000) Subject: Merge changes from CUPS 1.5b1-r9774. X-Git-Tag: release-1.6.3~46 X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fcups.git;a=commitdiff_plain;h=321d8d57dacf00e4ae19558dc9444519f4d9ade1 Merge changes from CUPS 1.5b1-r9774. git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3247 a1ca3aef-8c08-0410-bb20-df032aa958be --- diff --git a/CHANGES.txt b/CHANGES.txt index beadcb06c..f7d609ecf 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,8 +1,11 @@ -CHANGES.txt - 2011-05-10 +CHANGES.txt - 2011-05-11 ------------------------ CHANGES IN CUPS V1.5b1 + - Fixed some minor issues discovered by a Coverity scan (STR #3838) + - The scheduler now more carefully creates and removes configuration, + cache, and state files (STR #3715) - The lpadmin command now allows default option values to be deleted (STR #2959) - The lpadmin command now allows the cupsIPPSupplies and diff --git a/INSTALL.txt b/INSTALL.txt index ec242f999..85757f0b7 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -1,4 +1,4 @@ -INSTALL - CUPS v1.5.0 - 2011-05-06 +INSTALL - CUPS v1.5b1 - 2011-05-11 ---------------------------------- This file describes how to compile and install CUPS from source code. For more diff --git a/IPPTOOL.txt b/IPPTOOL.txt index c13da01ae..f4e218a87 100644 --- a/IPPTOOL.txt +++ b/IPPTOOL.txt @@ -1,4 +1,4 @@ -IPPTOOL.txt - 2010-10-17 +IPPTOOL.txt - 2011-05-11 ------------------------ @@ -72,7 +72,7 @@ GETTING SUPPORT AND OTHER RESOURCES LEGAL STUFF - CUPS is Copyright 2007-2010 by Apple Inc. CUPS and the CUPS logo are + CUPS is Copyright 2007-2011 by Apple Inc. CUPS and the CUPS logo are trademarks of Apple Inc. The MD5 Digest code is Copyright 1999 Aladdin Enterprises. diff --git a/LICENSE.txt b/LICENSE.txt index 2c386e0f9..7d80518a3 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ CUPS License Agreement - Copyright 2007-2010 by Apple Inc. + Copyright 2007-2011 by Apple Inc. 1 Infinite Loop Cupertino, CA 95014 USA @@ -129,7 +129,7 @@ redistribute it freely, subject to the following restrictions: software. 3. This notice may not be removed or altered from any source - distribution. + distribution. TRADEMARKS diff --git a/README.txt b/README.txt index 3e9c6d8b5..38875d9d1 100644 --- a/README.txt +++ b/README.txt @@ -1,5 +1,5 @@ -README - CUPS v1.5svn - 2011-05-06 ----------------------------------- +README - CUPS v1.5b1 - 2011-05-11 +--------------------------------- Looking for compile instructions? Read the file "INSTALL.txt" instead... diff --git a/backend/Dependencies b/backend/Dependencies index b195e61e9..4f99c17ef 100644 --- a/backend/Dependencies +++ b/backend/Dependencies @@ -8,7 +8,7 @@ ipp.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h ipp.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h ipp.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h ipp.o: ../cups/thread-private.h ../cups/snmp-private.h ../cups/backend.h -ipp.o: ../cups/sidechannel.h +ipp.o: ../cups/sidechannel.h ../cups/array-private.h lpd.o: ../cups/http-private.h ../config.h ../cups/http.h lpd.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h lpd.o: backend-private.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h diff --git a/backend/dnssd.c b/backend/dnssd.c index 3e527c6a6..c78558ec9 100644 --- a/backend/dnssd.c +++ b/backend/dnssd.c @@ -873,6 +873,8 @@ query_callback( static void sigterm_handler(int sig) /* I - Signal number (unused) */ { + (void)sig; + if (job_canceled) exit(CUPS_BACKEND_OK); else diff --git a/backend/ieee1284.c b/backend/ieee1284.c index bf994891c..13fb5cbeb 100644 --- a/backend/ieee1284.c +++ b/backend/ieee1284.c @@ -46,6 +46,15 @@ backendGetDeviceID( int uri_size) /* I - Size of buffer */ { #ifdef __APPLE__ /* This function is a no-op */ + (void)fd; + (void)device_id; + (void)device_id_size; + (void)make_model; + (void)make_model_size; + (void)scheme; + (void)uri; + (void)uri_size; + return (-1); #else /* Get the device ID from the specified file descriptor... */ @@ -404,10 +413,7 @@ backendGetMakeModel( char temp[1024]; /* Temporary make and model */ - if (mfg) - snprintf(temp, sizeof(temp), "%s %s", mfg, mdl); - else - snprintf(temp, sizeof(temp), "%s", mdl); + snprintf(temp, sizeof(temp), "%s %s", mfg, mdl); _ppdNormalizeMakeAndModel(temp, make_model, make_model_size); } diff --git a/backend/ipp.c b/backend/ipp.c index ca45a2f89..2c13360bc 100644 --- a/backend/ipp.c +++ b/backend/ipp.c @@ -72,10 +72,6 @@ typedef struct _cups_monitor_s /**** Monitoring data ****/ * Globals... */ -static int num_attr_cache = 0; - /* Number of cached attributes */ -static cups_option_t *attr_cache = NULL; - /* Cached attributes */ static const char *auth_info_required; /* New auth-info-required value */ #if defined(HAVE_GSSAPI) && defined(HAVE_XPC) @@ -126,9 +122,13 @@ static const char * const remote_job_states[] = "cups-remote-aborted", "cups-remote-completed" }; -static cups_array_t *state_reasons; /* Array of printe-state-reasons keywords */ -static _cups_mutex_t state_mutex = _CUPS_MUTEX_INITIALIZER; +static _cups_mutex_t report_mutex = _CUPS_MUTEX_INITIALIZER; /* Mutex to control access */ +static int num_attr_cache = 0; + /* Number of cached attributes */ +static cups_option_t *attr_cache = NULL; + /* Cached attributes */ +static cups_array_t *state_reasons; /* Array of printe-state-reasons keywords */ static char tmpfilename[1024] = ""; /* Temporary spool file name */ @@ -142,8 +142,7 @@ static void cancel_job(http_t *http, const char *uri, int id, int version); static ipp_pstate_t check_printer_state(http_t *http, const char *uri, const char *resource, - const char *user, int version, - int job_id); + const char *user, int version); #ifdef HAVE_LIBZ static void compress_files(int num_files, char **files); #endif /* HAVE_LIBZ */ @@ -157,7 +156,7 @@ static ipp_t *new_request(ipp_op_t op, int version, const char *uri, ipp_attribute_t *doc_handling_sup); static const char *password_cb(const char *); static void report_attr(ipp_attribute_t *attr); -static int report_printer_state(ipp_t *ipp, int job_id); +static void report_printer_state(ipp_t *ipp); #if defined(HAVE_GSSAPI) && defined(HAVE_XPC) static int run_as_user(int argc, char *argv[], uid_t uid, const char *device_uri, int fd); @@ -848,7 +847,7 @@ main(int argc, /* I - Number of command-line args */ _cupsLangPrintFilter(stderr, "INFO", _("The printer is busy.")); - report_printer_state(supported, 0); + report_printer_state(supported); sleep(delay); @@ -949,7 +948,7 @@ main(int argc, /* I - Number of command-line args */ { _cupsLangPrintFilter(stderr, "INFO", _("The printer is busy.")); - report_printer_state(supported, 0); + report_printer_state(supported); sleep(delay); @@ -1057,7 +1056,7 @@ main(int argc, /* I - Number of command-line args */ "multiple-document-handling-supported", IPP_TAG_KEYWORD); - report_printer_state(supported, 0); + report_printer_state(supported); } while (ipp_status > IPP_OK_CONFLICT); @@ -1700,7 +1699,7 @@ main(int argc, /* I - Number of command-line args */ * Check the printer state and report it if necessary... */ - check_printer_state(http, uri, resource, argv[2], version, job_id); + check_printer_state(http, uri, resource, argv[2], version); /* * Collect the final page count as needed... @@ -1825,9 +1824,8 @@ check_printer_state( const char *uri, /* I - Printer URI */ const char *resource, /* I - Resource path */ const char *user, /* I - Username, if any */ - int version, /* I - IPP version */ - int job_id) -{ + int version) /* I - IPP version */ + { ipp_t *request, /* IPP request */ *response; /* IPP response */ ipp_attribute_t *attr; /* Attribute in response */ @@ -1856,7 +1854,7 @@ check_printer_state( if ((response = cupsDoRequest(http, request, resource)) != NULL) { - report_printer_state(response, job_id); + report_printer_state(response); if ((attr = ippFindAttribute(response, "printer-state", IPP_TAG_ENUM)) != NULL) @@ -1992,8 +1990,7 @@ monitor_printer( monitor->printer_state = check_printer_state(http, monitor->uri, monitor->resource, monitor->user, - monitor->version, - monitor->job_id); + monitor->version); if (monitor->job_id > 0) { @@ -2399,6 +2396,8 @@ report_attr(ipp_attribute_t *attr) /* I - Attribute */ *valptr = '\0'; + _cupsMutexLock(&report_mutex); + if ((cached = cupsGetOption(attr->name, num_attr_cache, attr_cache)) == NULL || strcmp(cached, value)) { @@ -2410,6 +2409,8 @@ report_attr(ipp_attribute_t *attr) /* I - Attribute */ &attr_cache); fprintf(stderr, "ATTR: %s=%s\n", attr->name, value); } + + _cupsMutexUnlock(&report_mutex); } @@ -2417,11 +2418,9 @@ report_attr(ipp_attribute_t *attr) /* I - Attribute */ * 'report_printer_state()' - Report the printer state. */ -static int /* O - Number of reasons shown */ -report_printer_state(ipp_t *ipp, /* I - IPP response */ - int job_id) /* I - Current job ID */ +static void +report_printer_state(ipp_t *ipp) /* I - IPP response */ { - int count; /* Count of reasons shown... */ ipp_attribute_t *pa, /* printer-alert */ *pam, /* printer-alert-message */ *psm, /* printer-state-message */ @@ -2482,7 +2481,7 @@ report_printer_state(ipp_t *ipp, /* I - IPP response */ if ((reasons = ippFindAttribute(ipp, "printer-state-reasons", IPP_TAG_KEYWORD)) == NULL) - return (0); + return; update_reasons(reasons, NULL); @@ -2527,8 +2526,6 @@ report_printer_state(ipp_t *ipp, /* I - IPP response */ IPP_TAG_KEYWORD)) != NULL) report_attr(marker); } - - return (count); } @@ -2834,7 +2831,7 @@ update_reasons(ipp_attribute_t *attr, /* I - printer-state-reasons or NULL */ op ? op : ' ', cupsArrayCount(new_reasons), cupsArrayCount(state_reasons)); - _cupsMutexLock(&state_mutex); + _cupsMutexLock(&report_mutex); if (op == '+') { @@ -2943,7 +2940,7 @@ update_reasons(ipp_attribute_t *attr, /* I - printer-state-reasons or NULL */ } } - _cupsMutexUnlock(&state_mutex); + _cupsMutexUnlock(&report_mutex); /* * Report changes and return... diff --git a/backend/parallel.c b/backend/parallel.c index 3f9c33a94..125aa8141 100644 --- a/backend/parallel.c +++ b/backend/parallel.c @@ -85,7 +85,7 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */ device_fd, /* Parallel device */ use_bc; /* Read back-channel data? */ int copies; /* Number of copies to print */ - size_t tbytes; /* Total number of bytes written */ + ssize_t tbytes; /* Total number of bytes written */ struct termios opts; /* Parallel port options */ #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) struct sigaction action; /* Actions for POSIX signals */ diff --git a/backend/testsupplies.c b/backend/testsupplies.c index c380f280f..6cbdf8091 100644 --- a/backend/testsupplies.c +++ b/backend/testsupplies.c @@ -1,9 +1,9 @@ /* * "$Id$" * - * SNMP supplies test program for the Common UNIX Printing System (CUPS). + * SNMP supplies test program for CUPS. * - * Copyright 2008 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 diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c index 2f0001997..7f634328d 100644 --- a/backend/usb-darwin.c +++ b/backend/usb-darwin.c @@ -269,7 +269,7 @@ static Boolean find_device_cb(void *refcon, io_service_t obj); static Boolean list_device_cb(void *refcon, io_service_t obj); static CFStringRef cfstr_create_trim(const char *cstr); static CFStringRef copy_value_for_key(CFStringRef deviceID, CFStringRef *keys); -static kern_return_t load_classdriver(CFStringRef driverPath, printer_interface_t intf, classdriver_t ***printerDriver); +static kern_return_t load_classdriver(CFStringRef driverPath, printer_interface_t interface, classdriver_t ***printerDriver); static kern_return_t load_printerdriver(CFStringRef *driverBundlePath); static kern_return_t registry_close(void); static kern_return_t registry_open(CFStringRef *driverBundlePath); @@ -346,6 +346,8 @@ print_device(const char *uri, /* I - Device URI */ struct timespec cond_timeout; /* pthread condition timeout */ + (void)uri; + /* * See if the side-channel descriptor is valid... */ @@ -909,6 +911,9 @@ static void *read_thread(void *reference) uint64_t start, delay; + + (void)reference; + /* Calculate what 250 milliSeconds are in mach absolute time... */ mach_timebase_info(&timeBaseInfo); @@ -984,6 +989,8 @@ sidechannel_thread(void *reference) int datalen; /* Request/response data size */ + (void)reference; + do { datalen = sizeof(data); @@ -1175,6 +1182,9 @@ static Boolean list_device_cb(void *refcon, { Boolean keepRunning = (obj != 0x0); + + (void)refcon; + if (keepRunning) { CFStringRef deviceIDString = NULL; @@ -1318,6 +1328,9 @@ static Boolean find_device_cb(void *refcon, static void status_timer_cb(CFRunLoopTimerRef timer, void *info) { + (void)timer; + (void)info; + fputs("STATE: +offline-report\n", stderr); _cupsLangPrintFilter(stderr, "INFO", _("Printer is offline.")); @@ -1398,7 +1411,7 @@ static void release_deviceinfo(CFStringRef *make, */ static kern_return_t load_classdriver(CFStringRef driverPath, - printer_interface_t intf, + printer_interface_t interface, classdriver_t ***printerDriver) { kern_return_t kr = kUSBPrinterClassDeviceNotOpen; @@ -1420,7 +1433,7 @@ static kern_return_t load_classdriver(CFStringRef driverPath, _cupsFileCheckFilter, NULL); if (result && driverPath) - return (load_classdriver(NULL, intf, printerDriver)); + return (load_classdriver(NULL, interface, printerDriver)); else if (result) return (kr); @@ -1452,15 +1465,15 @@ static kern_return_t load_classdriver(CFStringRef driverPath, { classdriver_t **genericDriver = NULL; if (driverPath != NULL && CFStringCompare(driverPath, kUSBGenericTOPrinterClassDriver, 0) != kCFCompareEqualTo) - kr = load_classdriver(NULL, intf, &genericDriver); + kr = load_classdriver(NULL, interface, &genericDriver); if (kr == kIOReturnSuccess) { - (*driver)->interface = intf; + (*driver)->interface = interface; (*driver)->Initialize(driver, genericDriver); (*driver)->plugin = plugin; - (*driver)->interface = intf; + (*driver)->interface = interface; *printerDriver = driver; } } @@ -1503,20 +1516,20 @@ static kern_return_t load_printerdriver(CFStringRef *driverBundlePath) IOCFPlugInInterface **iodev = NULL; SInt32 score; kern_return_t kr; - printer_interface_t intf; + printer_interface_t interface; HRESULT res; kr = IOCreatePlugInInterfaceForService(g.printer_obj, kIOUSBInterfaceUserClientTypeID, kIOCFPlugInInterfaceID, &iodev, &score); if (kr == kIOReturnSuccess) { - if ((res = (*iodev)->QueryInterface(iodev, USB_INTERFACE_KIND, (LPVOID *) &intf)) == noErr) + if ((res = (*iodev)->QueryInterface(iodev, USB_INTERFACE_KIND, (LPVOID *) &interface)) == noErr) { *driverBundlePath = IORegistryEntryCreateCFProperty(g.printer_obj, kUSBClassDriverProperty, NULL, kNilOptions); - kr = load_classdriver(*driverBundlePath, intf, &g.classdriver); + kr = load_classdriver(*driverBundlePath, interface, &g.classdriver); if (kr != kIOReturnSuccess) - (*intf)->Release(intf); + (*interface)->Release(interface); } IODestroyPlugInInterface(iodev); } @@ -1674,7 +1687,7 @@ static void copy_devicestring(io_service_t usbInterface, IOCFPlugInInterface **iodev = NULL; SInt32 score; kern_return_t kr; - printer_interface_t intf; + printer_interface_t interface; HRESULT res; classdriver_t **klassDriver = NULL; CFStringRef driverBundlePath; @@ -1685,19 +1698,19 @@ static void copy_devicestring(io_service_t usbInterface, &iodev, &score)) == kIOReturnSuccess) { if ((res = (*iodev)->QueryInterface(iodev, USB_INTERFACE_KIND, (LPVOID *) - &intf)) == noErr) + &interface)) == noErr) { - (*intf)->GetLocationID(intf, deviceLocation); - (*intf)->GetInterfaceNumber(intf, interfaceNumber); + (*interface)->GetLocationID(interface, deviceLocation); + (*interface)->GetInterfaceNumber(interface, interfaceNumber); driverBundlePath = IORegistryEntryCreateCFProperty(usbInterface, kUSBClassDriverProperty, NULL, kNilOptions); - kr = load_classdriver(driverBundlePath, intf, &klassDriver); + kr = load_classdriver(driverBundlePath, interface, &klassDriver); if (kr != kIOReturnSuccess && driverBundlePath != NULL) - kr = load_classdriver(NULL, intf, &klassDriver); + kr = load_classdriver(NULL, interface, &klassDriver); if (kr == kIOReturnSuccess && klassDriver != NULL) kr = copy_deviceid(klassDriver, deviceID); @@ -1707,7 +1720,7 @@ static void copy_devicestring(io_service_t usbInterface, if (driverBundlePath != NULL) CFRelease(driverBundlePath); - /* (*intf)->Release(intf); */ + /* (*interface)->Release(interface); */ } IODestroyPlugInInterface(iodev); } diff --git a/backend/usb-unix.c b/backend/usb-unix.c index 698457a39..4c410174b 100644 --- a/backend/usb-unix.c +++ b/backend/usb-unix.c @@ -56,7 +56,7 @@ print_device(const char *uri, /* I - Device URI */ { int use_bc; /* Use backchannel path? */ int device_fd; /* USB device */ - size_t tbytes; /* Total number of bytes written */ + ssize_t tbytes; /* Total number of bytes written */ struct termios opts; /* Parallel port options */ diff --git a/backend/usb.c b/backend/usb.c index 171188dbd..65fba4746 100644 --- a/backend/usb.c +++ b/backend/usb.c @@ -1,9 +1,9 @@ /* * "$Id: usb.c 7687 2008-06-24 01:28:36Z mike $" * - * USB port backend for the Common UNIX Printing System (CUPS). + * USB port backend for CUPS. * - * Copyright 2007-2009 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 diff --git a/berkeley/Makefile b/berkeley/Makefile index d294e6d0c..9c60400d6 100644 --- a/berkeley/Makefile +++ b/berkeley/Makefile @@ -1,9 +1,9 @@ # # "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $" # -# Berkeley commands makefile for the Common UNIX Printing System (CUPS). +# Berkeley commands makefile for CUPS. # -# Copyright 2007-2009 by Apple Inc. +# Copyright 2007-2011 by Apple Inc. # Copyright 1997-2006 by Easy Software Products, all rights reserved. # # These coded instructions, statements, and computer programs are the diff --git a/cgi-bin/help-index.c b/cgi-bin/help-index.c index cae6e5a26..a88a6eb1c 100644 --- a/cgi-bin/help-index.c +++ b/cgi-bin/help-index.c @@ -1,9 +1,9 @@ /* * "$Id: help-index.c 7717 2008-07-04 02:35:33Z mike $" * - * Online help index routines for the Common UNIX Printing System (CUPS). + * Online help index routines for CUPS. * - * Copyright 2007-2008 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 @@ -599,7 +599,7 @@ helpSearchIndex(help_index_t *hi, /* I - Index */ search->nodes = cupsArrayNew((cups_array_func_t)help_sort_by_name, NULL); search->sorted = cupsArrayNew((cups_array_func_t)help_sort_by_score, NULL); - + if (!search->nodes || !search->sorted) { cupsArrayDelete(search->nodes); @@ -639,8 +639,8 @@ helpSearchIndex(help_index_t *hi, /* I - Index */ node->score = matches; - cupsArrayAdd(search->nodes, node); - cupsArrayAdd(search->sorted, node); + cupsArrayAdd(search->nodes, node); + cupsArrayAdd(search->sorted, node); } } diff --git a/cgi-bin/help-index.h b/cgi-bin/help-index.h index d64cec02a..676be6756 100644 --- a/cgi-bin/help-index.h +++ b/cgi-bin/help-index.h @@ -1,9 +1,9 @@ /* * "$Id: help-index.h 7615 2008-05-25 07:17:07Z mike $" * - * Online help index definitions for the Common UNIX Printing System (CUPS). + * Online help index definitions for CUPS. * - * Copyright 2007 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 diff --git a/cgi-bin/help.c b/cgi-bin/help.c index 7c0b6b628..6cc7b61ce 100644 --- a/cgi-bin/help.c +++ b/cgi-bin/help.c @@ -1,9 +1,9 @@ /* * "$Id$" * - * Online help CGI for the Common UNIX Printing System (CUPS). + * Online help CGI for CUPS. * - * Copyright 2007-2009 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 diff --git a/cgi-bin/ipp-var.c b/cgi-bin/ipp-var.c index fe9bc52db..777e57b1b 100644 --- a/cgi-bin/ipp-var.c +++ b/cgi-bin/ipp-var.c @@ -1,9 +1,9 @@ /* * "$Id: ipp-var.c 7940 2008-09-16 00:45:16Z mike $" * - * CGI <-> IPP variable routines for the Common UNIX Printing System (CUPS). + * CGI <-> IPP variable routines for CUPS. * - * Copyright 2007-2009 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 diff --git a/cgi-bin/jobs.c b/cgi-bin/jobs.c index cf1f6e680..dc79aec70 100644 --- a/cgi-bin/jobs.c +++ b/cgi-bin/jobs.c @@ -1,9 +1,9 @@ /* * "$Id: jobs.c 7237 2008-01-22 01:38:39Z mike $" * - * Job status CGI for the Common UNIX Printing System (CUPS). + * Job status CGI for CUPS. * - * Copyright 2007-2008 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 diff --git a/cgi-bin/search.c b/cgi-bin/search.c index 175906b8b..708cc5b0b 100644 --- a/cgi-bin/search.c +++ b/cgi-bin/search.c @@ -1,9 +1,9 @@ /* * "$Id: search.c 7720 2008-07-11 22:46:21Z mike $" * - * Search routines for the Common UNIX Printing System (CUPS). + * Search routines for CUPS. * - * Copyright 2007-2008 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 diff --git a/cgi-bin/testcgi.c b/cgi-bin/testcgi.c index 6d9285a02..88fcce4f5 100644 --- a/cgi-bin/testcgi.c +++ b/cgi-bin/testcgi.c @@ -1,9 +1,9 @@ /* * "$Id: testcgi.c 6649 2007-07-11 21:46:42Z mike $" * - * CGI test program for the Common UNIX Printing System (CUPS). + * CGI test program for CUPS. * - * Copyright 2007 by Apple Inc. + * Copyright 2007-2011 by Apple Inc. * Copyright 1997-2005 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -61,7 +61,7 @@ main(int argc, /* I - Number of command-line arguments */ } else puts("FAIL (init)"); - + /* * Return with no errors... */ diff --git a/cgi-bin/testhi.c b/cgi-bin/testhi.c index 0ef102e74..3defe45e5 100644 --- a/cgi-bin/testhi.c +++ b/cgi-bin/testhi.c @@ -1,9 +1,9 @@ /* * "$Id: testhi.c 6649 2007-07-11 21:46:42Z mike $" * - * Help index test program for the Common UNIX Printing System (CUPS). + * Help index test program for CUPS. * - * Copyright 2007 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 diff --git a/cgi-bin/testtemplate.c b/cgi-bin/testtemplate.c index 9ecc95c1c..a257fc06f 100644 --- a/cgi-bin/testtemplate.c +++ b/cgi-bin/testtemplate.c @@ -1,9 +1,9 @@ /* * "$Id: testtemplate.c 6649 2007-07-11 21:46:42Z mike $" * - * CGI template test program for the Common UNIX Printing System (CUPS). + * CGI template test program for CUPS. * - * Copyright 2007 by Apple Inc. + * Copyright 2007-2011 by Apple Inc. * Copyright 2006 by Easy Software Products. * * These coded instructions, statements, and computer programs are the diff --git a/conf/Makefile b/conf/Makefile index 4e3963e21..5114174f1 100644 --- a/conf/Makefile +++ b/conf/Makefile @@ -1,9 +1,9 @@ # # "$Id: Makefile 7938 2008-09-11 23:53:59Z mike $" # -# Configuration file makefile for the Common UNIX Printing System (CUPS). +# Configuration file makefile for CUPS. # -# Copyright 2007-2008 by Apple Inc. +# Copyright 2007-2011 by Apple Inc. # Copyright 1993-2006 by Easy Software Products. # # These coded instructions, statements, and computer programs are the diff --git a/config-scripts/cups-3264.m4 b/config-scripts/cups-3264.m4 index 43c466487..850469732 100644 --- a/config-scripts/cups-3264.m4 +++ b/config-scripts/cups-3264.m4 @@ -1,9 +1,9 @@ dnl dnl "$Id$" dnl -dnl 32/64-bit library support stuff for the Common UNIX Printing System (CUPS). +dnl 32/64-bit library support stuff for CUPS. dnl -dnl Copyright 2007-2009 by Apple Inc. +dnl Copyright 2007-2011 by Apple Inc. dnl Copyright 1997-2006 by Easy Software Products, all rights reserved. dnl dnl These coded instructions, statements, and computer programs are the diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index 88a2e4378..b1a7337d5 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -20,11 +20,11 @@ dnl Set the name of the config header file... AC_CONFIG_HEADER(config.h) dnl Version number information... -CUPS_VERSION="1.5svn" +CUPS_VERSION="1.5b1" CUPS_REVISION="" -if test -z "$CUPS_REVISION" -a -d .svn; then - CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`" -fi +#if test -z "$CUPS_REVISION" -a -d .svn; then +# CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`" +#fi CUPS_BUILD="cups-$CUPS_VERSION" AC_ARG_WITH(cups_build, [ --with-cups-build set "cups-config --build" string ], diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4 index 34050c7ef..2afbb3ff0 100644 --- a/config-scripts/cups-compiler.m4 +++ b/config-scripts/cups-compiler.m4 @@ -145,10 +145,10 @@ if test -n "$GCC"; then if test "x$with_optim" = x; then # Add useful warning options for tracking down problems... - OPTIM="-Wall -Wno-format-y2k $OPTIM" + OPTIM="-Wall -Wno-format-y2k -Wunused $OPTIM" # Additional warning options for development testing... if test -d .svn; then - OPTIM="-Wshadow -Wunused $OPTIM" + OPTIM="-Wshadow $OPTIM" CFLAGS="-Werror-implicit-function-declaration $CFLAGS" PHPOPTIONS="-Wno-shadow" fi diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 index c46afec78..5b1d89b7b 100644 --- a/config-scripts/cups-directories.m4 +++ b/config-scripts/cups-directories.m4 @@ -1,9 +1,9 @@ dnl dnl "$Id: cups-directories.m4 7799 2008-07-25 20:06:08Z mike $" dnl -dnl Directory stuff for the Common UNIX Printing System (CUPS). +dnl Directory stuff for CUPS. dnl -dnl Copyright 2007 by Apple Inc. +dnl Copyright 2007-2011 by Apple Inc. dnl Copyright 1997-2007 by Easy Software Products, all rights reserved. dnl dnl These coded instructions, statements, and computer programs are the @@ -153,7 +153,7 @@ if test x$rcdir = x; then # Darwin and MacOS X... if test -x /sbin/launchd; then INITDDIR="/System/Library/LaunchDaemons" - else + else INITDDIR="/System/Library/StartupItems/PrintingServices" fi ;; diff --git a/config-scripts/cups-dnssd.m4 b/config-scripts/cups-dnssd.m4 index cd209cdbd..1999be3ff 100644 --- a/config-scripts/cups-dnssd.m4 +++ b/config-scripts/cups-dnssd.m4 @@ -1,13 +1,9 @@ dnl dnl "$Id: cups-dnssd.m4 7890 2008-08-29 22:19:39Z mike $" dnl -dnl DNS Service Discovery (aka Bonjour) stuff for the Common UNIX Printing System (CUPS). +dnl DNS Service Discovery (aka Bonjour) stuff for CUPS. dnl -dnl http://www.dns-sd.org -dnl http://www.multicastdns.org/ -dnl http://developer.apple.com/networking/bonjour/ -dnl -dnl Copyright 2007-2009 by Apple Inc. +dnl Copyright 2007-2011 by Apple Inc. dnl dnl These coded instructions, statements, and computer programs are the dnl property of Apple Inc. and are protected by Federal copyright diff --git a/config-scripts/cups-gssapi.m4 b/config-scripts/cups-gssapi.m4 index dc1092890..04977ee64 100644 --- a/config-scripts/cups-gssapi.m4 +++ b/config-scripts/cups-gssapi.m4 @@ -1,9 +1,9 @@ dnl dnl "$Id$" dnl -dnl GSSAPI/Kerberos library detection. +dnl GSSAPI/Kerberos library detection for CUPS. dnl -dnl Copyright 2007-2009 by Apple Inc. +dnl Copyright 2007-2011 by Apple Inc. dnl Copyright 2006-2007 by Easy Software Products. dnl dnl This file contains Kerberos support code, copyright 2006 by diff --git a/config-scripts/cups-largefile.m4 b/config-scripts/cups-largefile.m4 index dbfcb499c..8243de787 100644 --- a/config-scripts/cups-largefile.m4 +++ b/config-scripts/cups-largefile.m4 @@ -1,9 +1,9 @@ dnl dnl "$Id: cups-largefile.m4 6649 2007-07-11 21:46:42Z mike $" dnl -dnl Large file support stuff for the Common UNIX Printing System (CUPS). +dnl Large file support stuff for CUPS. dnl -dnl Copyright 2007 by Apple Inc. +dnl Copyright 2007-2011 by Apple Inc. dnl Copyright 1997-2005 by Easy Software Products, all rights reserved. dnl dnl These coded instructions, statements, and computer programs are the diff --git a/config-scripts/cups-ldap.m4 b/config-scripts/cups-ldap.m4 index 678faed07..16c017ce4 100644 --- a/config-scripts/cups-ldap.m4 +++ b/config-scripts/cups-ldap.m4 @@ -1,9 +1,9 @@ dnl dnl "$Id: cups-ldap.m4 7800 2008-07-25 21:01:34Z mike $" dnl -dnl LDAP configuration stuff for the Common UNIX Printing System (CUPS). +dnl LDAP configuration stuff for CUPS. dnl -dnl Copyright 2007-2009 by Apple Inc. +dnl Copyright 2007-2011 by Apple Inc. dnl Copyright 2003-2006 by Easy Software Products, all rights reserved. dnl dnl These coded instructions, statements, and computer programs are the diff --git a/config-scripts/cups-libtool.m4 b/config-scripts/cups-libtool.m4 index 614548f37..d6026b24b 100644 --- a/config-scripts/cups-libtool.m4 +++ b/config-scripts/cups-libtool.m4 @@ -1,9 +1,9 @@ dnl dnl "$Id: cups-libtool.m4 6649 2007-07-11 21:46:42Z mike $" dnl -dnl Libtool stuff for the Common UNIX Printing System (CUPS). +dnl Libtool stuff for CUPS. dnl -dnl Copyright 2007-2009 by Apple Inc. +dnl Copyright 2007-2011 by Apple Inc. dnl Copyright 1997-2005 by Easy Software Products, all rights reserved. dnl dnl These coded instructions, statements, and computer programs are the diff --git a/config-scripts/cups-manpages.m4 b/config-scripts/cups-manpages.m4 index 44d31369b..a40fb5651 100644 --- a/config-scripts/cups-manpages.m4 +++ b/config-scripts/cups-manpages.m4 @@ -1,9 +1,9 @@ dnl dnl "$Id: cups-manpages.m4 6649 2007-07-11 21:46:42Z mike $" dnl -dnl Manpage stuff for the Common UNIX Printing System (CUPS). +dnl Manpage stuff for CUPS. dnl -dnl Copyright 2007 by Apple Inc. +dnl Copyright 2007-2011 by Apple Inc. dnl Copyright 1997-2006 by Easy Software Products, all rights reserved. dnl dnl These coded instructions, statements, and computer programs are the diff --git a/config-scripts/cups-network.m4 b/config-scripts/cups-network.m4 index bf673025e..b97fb4a49 100644 --- a/config-scripts/cups-network.m4 +++ b/config-scripts/cups-network.m4 @@ -1,9 +1,9 @@ dnl dnl "$Id: cups-network.m4 7918 2008-09-08 22:03:01Z mike $" dnl -dnl Networking stuff for the Common UNIX Printing System (CUPS). +dnl Networking stuff for CUPS. dnl -dnl Copyright 2007-2008 by Apple Inc. +dnl Copyright 2007-2011 by Apple Inc. dnl Copyright 1997-2005 by Easy Software Products, all rights reserved. dnl dnl These coded instructions, statements, and computer programs are the diff --git a/config-scripts/cups-opsys.m4 b/config-scripts/cups-opsys.m4 index ae81eb481..5b38975b5 100644 --- a/config-scripts/cups-opsys.m4 +++ b/config-scripts/cups-opsys.m4 @@ -1,9 +1,9 @@ dnl dnl "$Id: cups-opsys.m4 6649 2007-07-11 21:46:42Z mike $" dnl -dnl Operating system stuff for the Common UNIX Printing System (CUPS). +dnl Operating system stuff for CUPS. dnl -dnl Copyright 2007 by Apple Inc. +dnl Copyright 2007-2011 by Apple Inc. dnl Copyright 1997-2006 by Easy Software Products, all rights reserved. dnl dnl These coded instructions, statements, and computer programs are the diff --git a/config-scripts/cups-pam.m4 b/config-scripts/cups-pam.m4 index 1cb1efc9d..9a281e785 100644 --- a/config-scripts/cups-pam.m4 +++ b/config-scripts/cups-pam.m4 @@ -1,9 +1,9 @@ dnl dnl "$Id: cups-pam.m4 7960 2008-09-17 19:42:02Z mike $" dnl -dnl PAM stuff for the Common UNIX Printing System (CUPS). +dnl PAM stuff for CUPS. dnl -dnl Copyright 2007-2009 by Apple Inc. +dnl Copyright 2007-2011 by Apple Inc. dnl Copyright 1997-2005 by Easy Software Products, all rights reserved. dnl dnl These coded instructions, statements, and computer programs are the diff --git a/config-scripts/cups-poll.m4 b/config-scripts/cups-poll.m4 index 639530dba..901068c27 100644 --- a/config-scripts/cups-poll.m4 +++ b/config-scripts/cups-poll.m4 @@ -1,9 +1,9 @@ dnl dnl "$Id$" dnl -dnl Select/poll stuff for the Common UNIX Printing System (CUPS). +dnl Select/poll stuff for CUPS. dnl -dnl Copyright 2007 by Apple Inc. +dnl Copyright 2007-2011 by Apple Inc. dnl Copyright 2006 by Easy Software Products, all rights reserved. dnl dnl These coded instructions, statements, and computer programs are the diff --git a/config-scripts/cups-slp.m4 b/config-scripts/cups-slp.m4 index 36a00b7f1..fdf1b4338 100644 --- a/config-scripts/cups-slp.m4 +++ b/config-scripts/cups-slp.m4 @@ -1,9 +1,9 @@ dnl dnl "$Id: cups-slp.m4 7241 2008-01-22 22:34:52Z mike $" dnl -dnl OpenSLP configuration stuff for the Common UNIX Printing System (CUPS). +dnl OpenSLP configuration stuff for CUPS. dnl -dnl Copyright 2007-2009 by Apple Inc. +dnl Copyright 2007-2011 by Apple Inc. dnl Copyright 1997-2005 by Easy Software Products, all rights reserved. dnl dnl These coded instructions, statements, and computer programs are the diff --git a/config-scripts/cups-threads.m4 b/config-scripts/cups-threads.m4 index aa07c8950..b95c79fa4 100644 --- a/config-scripts/cups-threads.m4 +++ b/config-scripts/cups-threads.m4 @@ -1,9 +1,9 @@ dnl dnl "$Id: cups-threads.m4 6649 2007-07-11 21:46:42Z mike $" dnl -dnl Threading stuff for the Common UNIX Printing System (CUPS). +dnl Threading stuff for CUPS. dnl -dnl Copyright 2007-2009 by Apple Inc. +dnl Copyright 2007-2011 by Apple Inc. dnl Copyright 1997-2005 by Easy Software Products, all rights reserved. dnl dnl These coded instructions, statements, and computer programs are the diff --git a/cups/Dependencies b/cups/Dependencies index 5b374f882..5e6359f7d 100644 --- a/cups/Dependencies +++ b/cups/Dependencies @@ -6,7 +6,8 @@ adminutil.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h adminutil.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h adminutil.o: language-private.h ../cups/transcode.h thread-private.h adminutil.o: adminutil.h -array.o: string-private.h ../config.h debug-private.h array.h versioning.h +array.o: string-private.h ../config.h debug-private.h array-private.h array.h +array.o: versioning.h attr.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h attr.o: array.h language.h string-private.h ../config.h debug-private.h attr.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h @@ -250,7 +251,8 @@ adminutil.32.o: adminutil.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h ht adminutil.32.o: adminutil.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h adminutil.32.o: adminutil.c language-private.h ../cups/transcode.h thread-private.h adminutil.32.o: adminutil.c adminutil.h -array.32.o: array.c string-private.h ../config.h debug-private.h array.h versioning.h +array.32.o: array.c string-private.h ../config.h debug-private.h array-private.h array.h +array.32.o: array.c versioning.h attr.32.o: attr.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h attr.32.o: attr.c array.h language.h string-private.h ../config.h debug-private.h attr.32.o: attr.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h @@ -494,7 +496,8 @@ adminutil.64.o: adminutil.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h ht adminutil.64.o: adminutil.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h adminutil.64.o: adminutil.c language-private.h ../cups/transcode.h thread-private.h adminutil.64.o: adminutil.c adminutil.h -array.64.o: array.c string-private.h ../config.h debug-private.h array.h versioning.h +array.64.o: array.c string-private.h ../config.h debug-private.h array-private.h array.h +array.64.o: array.c versioning.h attr.64.o: attr.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h attr.64.o: attr.c array.h language.h string-private.h ../config.h debug-private.h attr.64.o: attr.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h diff --git a/cups/api-array.header b/cups/api-array.header index 0f929c8e4..4d5acf0d1 100644 --- a/cups/api-array.header +++ b/cups/api-array.header @@ -1,9 +1,9 @@