Import cups.org releases

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-1.5.4@4306 a1ca3aef-8c08-0410-bb20-df032aa958be

CHANGES-1.5.txt

@@ -1,228 +0,0 @@
-CHANGES-1.5.txt
----------------
-
-CHANGES IN CUPS V1.5.1
-
-	- Documentation updates (STR #3885, STR #3886, STR #3946, STR #3969)
-	- Localization updates (STR #3840, STR #3989, STR #3997)
-	- Build fixes (STR #3956, STR #3999)
-	- The SNMP backend did not validate the device URIs reported by printers
-	  (STR #4004)
-	- cupsBackendReport() did not handle newlines in 1284 Device IDs
-	  (STR #4005)
-	- USB backend fixes for libusb (STR #3965, STR #3978)
-	- The DBUS notifier did not validate string parameters (STR #3984)
-	- Group quota ACLs did not work with Kerberos (STR #3972)
-	- The IPP backend did not retry when a printer responded with
-	  client-error-not-possible (STR #3963)
-	- PostScript PPDs with filters used the wrong command filter (STR #3973)
-	- The scheduler incorrectly used free() on a POSIX ACL value, which
-	  could cause a crash (STR #3970)
-	- PPD files using the MacStandard encoding did not work.
-	- The web interface did not work on some platforms (STR #3902)
-	- The lpstat command would crash when then "-u" option was used by a
-	  non-administrator (STR #3953)
-	- Japanese supply level reporting did not always work.
-	- The DBUS notifier could crash (STR #3947)
-	- Relaxed some of the page size checks in cupstestppd.
-	- The ipptool program now reports attributes that are repeated within
-	  the same attribute group.
-	- Updated the PWG raster support to match the current draft
-	  specification.
-	- Fixed some IPP conformance issues in the scheduler.
-	- Added ipptool support for repeating requests.
-	- Added IPP/2.2 conformance tests and greatly improved the IPP/1.1,
-	  IPP/2.0, and IPP/2.1 conformance testing.
-	- IPP messages containing mixed integer/rangeOfInteger values did not
-	  work (STR #3942)
-	- The ipptool program now provides additional diagnostics for badly-
-	  formatted responses (STR #3857)
-	- When possible, the IPP backend now stops sending job data early on a
-	  cancel.
-	- cupsSendRequest and cupsWriteRequestData did not properly read all
-	  HTTP headers, preventing authentication and encryption upgrades from
-	  working in all cases.
-	- The client.conf Server directive is no longer supported on Mac OS X
-	  10.7 and later.
-	- The IPP backend sent the wrong margins in media-col.
-	- The scheduler did not save or restore large Kerberos credentials for
-	  jobs.
-	- The dnssd backend did not properly browse for secure IPP printers.
-	- httpAssembleURI* did not properly escape all special characters in the
-	  username/password field.
-	- The scheduler now logs config file errors to stderr (STR #3936)
-	- The configure script incorrectly used bundle-based localizations on
-	  Linux (STR #3938)
-	- The cups-driverd helper program did not cache .drv files properly,
-	  sometimes leading to a crash (STR #3921)
-	- CUPS did not build on stock Mac OS X installations.
-	- Encryption was broken with OpenSSL.
-	- ipptool's XML output used date/time values with timezone offsets,
-	  which are not supported by Mac OS X's NSDate class.
-	- Several programs did not support the cupsFilter2 keyword in PPD files.
-	- The IPP backend incorrectly reported spool-area-full states.
-	- cupsMarkOptions() did not protect against a bad PPD that was missing
-	  one or more standard Duplex options.
-	- The PostScript filter did not mirror N-up output properly.
-	- The ipptool program did not validate UTF-8 strings in XML output.
-	- Fixed supply level reporting for some printers.
-	- The scheduler no longer automatically logs debug messages for jobs
-	  that were held or canceled.
-	- The cupsSendRequest function did not flush remaining response data
-	  from a previous request, leading to apparent chunking issues.
-	- The scheduler did not report the correct version in the Server: header
-	  (STR #3903)
-	- The scheduler did not support 1284 device IDs reported by driver
-	  interface programs longer than 127 characters (STR #3871)
-	- The image filters did not support loading images larger than the
-	  RIPCache setting (STR #3901)
-	- "PAGE: total NNN" messages did not get logged properly (STR #3887)
-	- Updated the PWG Raster support to conform to the current draft of the
-	  PWG Raster Format specification.
-	- The PWG Raster filter did not always write the correct number of
-	  padding lines on the bottom of the page (STR #3904)
-	- When reporting a denial-of-service attack from the domain socket, the
-	  address reported does not always contain the correct path (STR #3888)
-	- Badly formed GIF files could cause the image filters to crash
-	  (STR #3914)
-	- Jobs canceled at the printer were retried by the IPP backend.
-	- "cupsfilter -u" deleted the input file instead of the PPD file.
-	- The scheduler did not compute the cost of PPD filters defined using
-	  the cupsFilter2 keyword properly.
-	- The scheduler did not correctly support the maxsize() attribute for
-	  PPD filters.
-
-
-CHANGES IN CUPS V1.5.0
-
-	- Documentation updates.
-	- Localization update (STR #3865)
-	- Needed to limit TLS to v1.0 on some versions of Mac OS X.
-	- The snmp backend did not work with some printers.
-
-
-CHANGES IN CUPS V1.5rc1
-
-	- Compile fixes (STR #3849, STR #3850)
-	- The scheduler didn't check for empty values for several configuration
-	  directives (STR #3861)
-	- ipptool didn't generate valid XML when a test was skipped.
-	- Added additional error checking to the 1284 device ID code (STR #3858)
-	- Fixed some compatibility issues migrating from the old usblp backend
-	  to the libusb backend (STR #3860)
-	- Fixed the wake-from-sleep printing behavior on Mac OS X.
-	- The scheduler incorrectly allowed jobs to be held from a terminating
-	  state.
-	- The cups-driverd program could crash when a PPD was renamed.
-	- The dnssd backend took too long to discover printers on large or busy
-	  networks with the new default timeout used by lpinfo and the web
-	  interface. This resulted in "lost" printers.
-
-
-CHANGES IN CUPS V1.5b2
-
-	- Documentation updates.
-	- Localization updates (STR #3845)
-	- Compiler warning cleanup.
-	- Fixed PIE support for Linux (STR #3846)
-	- Made httpSetTimeout API public and use it in the IPP backend to avoid
-	  timeout errors.
-	- The scheduler incorrectly set the "authenticated" printer-type bit for
-	  remote queues using authentication.
-
-
-CHANGES IN CUPS V1.5b1
-
-	- The CUPS library now supports per-connection HTTP timeouts and
-	  callbacks.
-	- The CUPS library now supports (limited) SSL/TLS X.509 certificate
-	  validation and revocation (STR #1616)
-	- Updated the PostScript filter to support IncludeFeature in more
-	  circumstances (STR #3417)
-	- The schedule did not correctly parse some IPv6 addresses and masks in
-	  the cupsd.conf file (STR #3533)
-	- Fixed a case-insensitive string comparison issue for locales that do
-	  not treat "I" and "i" as equivalent (STR #3800)
-	- The scheduler reported an incorrect job-printer-uri value when sharing
-	  was not enabled (STR #3639)
-	- The scheduler now allows the ServerAlias directive to contain multiple
-	  hostnames separated by spaces or commas (STR #3813)
-	- The scheduler now sets the process group for child processes and
-	  manages the group (STR #2829)
-	- 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
-	  cupsSNMPSupplies keywords to be set in a PPD file (STR #3825)
-	- Moving a held job no longer releases it (STR #3839)
-	- Restored support for GNU TLS and OpenSSL with threading enabled
-	  (STR #3605)
-	- Fixed a confusing error message from cups-polld (STR #3806)
-	- Increased the default RIPCache value to 128MB (STR #3535)
-	- MIME errors are now routed to the error_log file (STR #2410)
-	- Updated PDF filter to support new Ghostscript ps2write device
-	  (STR #3766)
-	- Updated PDF filter to support new Poppler option to preserve page
-	  sizes in PDF files when the user has not selected a particular media
-	  size (STR #3689)
-	- Added new PWG Raster filter for IPP Everywhere printer support.
-	- Added job-uuid, printer-uuid, and subscription-uuid attributes.
-	- Added support for the cupsSingleFile PPD keyword.
-	- Dropped support for the printer-state-history attribute (STR #3654)
-	- Added support for a new cupsIPPSupplies keyword in PPD files to allow
-	  drivers to disable IPP supply level reporting.
-	- Added support for a new cupsFilter2 keyword in PPD files to allow for
-	  the propagation of the actual MIME media type produced by a filter.
-	- The scheduler did not always get the correct Kerberos username when
-	  authenticating (STR #3670)
-	- Added new cupsRasterOpenIO function and CUPS_RASTER_WRITE_PWG to the
-	  CUPS imaging library to support printing to IPP Everywhere raster
-	  printers.
-	- The scheduler now provides default values for the pages-per-minute and
-	  pages-per-minute-color attributes for PPD files that lack a
-	  Throughput keyword.
-	- Email notifications did not work on Mac OS X.
-	- The cupstestppd program now shows an error for files missing a
-	  CloseGroup keyword (STR #3668)
-	- Name resolution errors no longer cause queues to stop (STR #3719,
-	  STR #3753)
-	- Added a new cups-exec helper program that applies security profiles
-	  to filters, port monitors, backends, CGI programs, and mini-daemons.
-	- The web interface can now be disabled using the WebInterface directive
-	  in cupsd.conf (STR #2625)
-	- The scheduler now provides privacy controls for jobs and subscriptions
-	  (STR #2969)
-	- Added new cupsArrayNew3 API which offers memory management of array
-	  elements.
-	- Added several new color spaces to the CUPS raster format (STR #3419)
-	- The Validate-Job operation now uses the same policy as Print-Job by
-	  default.
-	- CUPS now uses iconv to implement all of its character encoding
-	  support (STR #3097)
-	- The scheduler now implements the Cancel-Jobs, Cancel-My-Jobs, and
-	  Close-Job operations along with the job-ids operation attribute from
-	  PWG 5100.11.
-	- The main CUPS header (<cups/cups.h>) no longer includes the PPD header
-	  (<cups/ppd.h>).
-	- The scheduler and CUPS API now support the print-quality job template
-	  attribute.
-	- The scheduler no longer supports the old Mac OS X Server quota
-	  plugin.
-	- The scheduler now allows writing to /Users/Shared from print filters
-	  on Mac OS X.
-	- CUPS no longer supports the old ~/.cupsrc or ~/.lpoptions files from
-	  CUPS 1.1.x.  The ~/.cups/client.conf and ~/.cups/lpoptions files that
-	  were introduced in CUPS 1.2 must now be used.
-	- The ipptest tool is now a first-class user program and has several
-	  improvements along with new documentation (STR #3484)
-	- The cupstestppd tool now warns about non-unique filenames and
-	  provides a way to ignore all filename warnings.
-	- Dropped support for the recoverable: and recovered: message prefixes.
-	- The scheduler now requires that filters and backends have group write
-	  permissions disabled.
-	- The PPD compiler now checks for overlapping filenames when writing
-	  PPD files.
-	- The HP-GL/2 filter is no longer included with CUPS (STR #3322)
-	- The SCSI backend is no longer included with CUPS (STR #3500)

CHANGES-IPPTOOL.txt

@@ -1,107 +0,0 @@
-CHANGES-IPPTOOL.txt - 2012-01-10
---------------------------------
-
-This file provides a list of changes to the ipptool binary distribution posted
-on cups.org.
-
-
-2012-01-10
-
-	- Fixed an issue with the IPP/1.1 test file where the "waiting for job
-	  completion" test did not work.
-	- The attribute groups out of order error was not shown for the
-	  operation-attributes-tag group.
-
-
-2011-12-02
-
-	- Fixed a truncated XML output bug that would happen for certain errors.
-	- Fixed the order-of-groups tests.
-	- Fixed "WITH-VALUE >N" for rangeOfInteger attributes.
-	- The Windows installer was missing the get-printer-attributes.test
-	  file.
-	- The Linux binaries are now compiled for all LSB 4.x-compliant Linux
-	  distributions.
-	- The Linux binaries no longer support SSL or TLS.
-
-
-2011-10-05
-
-	- Fixed a crasher bug that showed up on Windows.
-	- The IPP/1.1 test would hang if the initial Print-Job test failed.
-	- Fixed a typo in the IPP/2.0 test.
-
-
-2011-10-03
-
-	- Using OF-TYPE with the "no-value" or "unknown" out-of-band value tags
-	  now works without special WITH-VALUE strings.
-	- ipptool now shows an error when an attribute appears more than once
-	  within the same attribute group.
-	- ipptool did not display attributes as specified by the DISPLAY
-	  directive when a test error failed.
-	- Fixed one spot where DEFINE-VALUE was still treated as an error when
-	  the EXPECT test failed.
-	- uriScheme values were not displayed properly.
-	- Updated the IPP/1.1 tests to properly validate support for
-	  job-hold-until-default and job-hold-until-supported when the Hold-Job
-	  operation is supported.
-	- Updated the IPP/1.1 tests to properly check for the various standard
-	  media sizes for the printing tests.
-	- Updated the IPP/1.1 tests to accept "no-value" for media-default an
-	  orientation-requested-default.
-	- Updated the IPP/1.1 tests to accept "unknown" for job-state.
-	- Updated the IPP/1.1 tests to not perform the bogus URI printing tests
-	  unless the "document-uri" variable is defined.
-	- Updated the IPP/2.0 tests to properly validate media-col
-	  "media-xxx-supported" attributes.
-	- Updated the IPP/2.2 tests to properly validate media-ready and
-	  media-col-ready.
-
-
-2011-09-28
-
-	- Test output now includes a summary and overall score at the end.
-	- The MATCH-VALUE predicate now correctly deals with a failed EXPECT
-	  condition.
-	- The IPP/1.1 test suite now looks for legacy media names and uses them
-	  if the corresponding PWG standard names are not present.
-	- The IPP/1.1 test suite now tests the Print-Job+Release-Job when the
-	  printer supports the job-hold-until attribute, Hold-Job operation, and
-	  Release-Job operation.
-
-
-2011-09-21
-
-	- Fixes for HTTP chunking, timeout, and encryption issues reported by
-	  various users.
-	- Greatly improved IPP tests with added IPP/2.2 tests.
-	- New test documents - 1-page and 4-page mixed A4/Letter PDF/PS and a
-	  couple JPEGs.
-	- New REPEAT directives to programmatically repeat tests as needed.
-
-
-2011-08-16
-
-	- The Windows version no longer requires Visual Studio to be installed.
-	- The Windows version now supports SSL.
-	- Added "ipps" URI support.
-	- Added a new "-T" option.
-	- Added support for fractional seconds for the -i option and DELAY
-	  directive.
-	- Added support for authentication.
-	- Added DEFINE-MATCH, DEFINE-NO-MATCH, DEFINE-VALUE, IF-NOT-DEFINED,
-	  IGNORE-ERRORS, SKIP-IF-DEFINED, SKIP-IF-NOT-DEFINED,
-	  SKIP-PREVIOUS-ERROR directives.
-	- WITH-VALUE now supports variable expansion.
-	- Updated the IPP/1.1 conformance test to skip the "my-jobs different
-	  user" test if the printer URI contains a username.
-	- Updated the IPP conformance tests to validate media, media-default,
-	  and media-supported values.
-	- No longer error out if a Printer returns a different version number in
-	  the response when the request contains the version 0.0.
-
-
-2010-10-16
-
-	- Initial release of standalone binary.

CHANGES.txt

@@ -1,40 +1,312 @@
-CHANGES.txt - 1.6b1 - 2012-01-30
---------------------------------
+CHANGES.txt - 2012-07-16
+------------------------
 
-CHANGES IN CUPS V1.6b1
+CHANGES IN CUPS V1.5.4
 
-	- The configure script and build system no longer support building of
-	  separate 32-bit and 64-bit libraries.
-	- The "brightness", "columns", "fitplot", "gamma", "hue",
-	  "natural-scaling", "penwidth", "position", "ppi", "saturation", and
-	  "scaling" options are not longer supported (STR #4010)
-	- The "page-bottom", "page-left", "page-right", "page-top",
-	  "prettyprint", and "wrap" options have been deprecated (STR #4010)
-	- The scheduler now reports the standard "number-of-documents" attribute
-	  instead of the CUPS-specific "document-count" attribute in
-	  job objects.
-	- Added new destination connection and enumeration functions (STR #3924)
-	- Added new option, localization, and job submission functions that do
-	  not depend on PPD files (STR #3925)
-	- Added a new MaxJobTime directive for cupsd that specifies the maximum
-	  amount of time allowed for a job to complete before it is canceled.
-	- The default password callback now supports passwords up to 127
-	  characters.
-	- The scheduler now supports a DefaultAuthType of "auto" to
-	  automatically choose between Basic (username/password) and Negotiate
-	  (Kerberos) authentication.
-	- cupsSideChannelSNMPGet/Walk now support OIDs and values up to 64k in
-	  length.
-	- CUPS no longer supports automatic remote printers or implicit classes
-	  via the CUPS, LDAP, or SLP protocols (STR #3922, STR #3923)
-	- The PPD APIs are now deprecated and will be removed in a future
-	  version of CUPS (STR #3927)
-	- The default IPP version for requests is now 2.0 (STR #3929)
-	- The IPP APIs no longer expose the ipp_t or ipp_attribute_t structures
-	  and instead provide accessor functions (STR #3928)
-	- The scheduler will no longer run programs with group write permission.
-	- The PHP module has been removed (STR #3932)
-	- The bannertops, commandtoescpx, commandtopclx, imagetops,
-	  imagetoraster, pdftops, rastertoescpx, rastertopclx, and texttops
-	  filters have been removed (STR #3930)
-	- The serial and parallel backends have been removed (STR 3935)
+	- Documentation updates (STR #4112, STR #4130, STR #4134)
+	- Fixes for libusb-based USB backend (STR #4128)
+	- The lpq command did not show the owner or title of jobs unless passed
+	  a username on the command-line (STR #4135)
+	- Localized empty strings contained the message catalog metadata
+	  (STR #4119)
+	- Fixed a crash in the libusb-based USB backend (STR #4099)
+	- The cups-lpd mini-daemon no longer handled jobs with multiple copies
+	  (STR #4118)
+	- Multiple libusb backend fixes (STR #4098, STR #4100)
+	- The IPP backend no longer tries to get the job status for printers
+	  that do not implement the required operation (STR #4083)
+	- Sending a document in an unsupported format to an IPP printer now
+	  automatically cancels the job (STR #4093)
+	- Fix some error reporting issues when printing from /dev/null and
+	  other unusual situations (STR #4015)
+	- The scheduler now sets the CUPS_MAX_MESSAGE environment variable for
+	  filters (STR #4074)
+	- Fixed a build issue when using older versions of autoconf (STR #4084)
+	- The IPP backend now treats the client-error-not-possible status code
+	  as a job history issue, allowing IPP printing to Windows to work
+	  (STR #4047)
+	- The IPP backend incorrectly included the document-format and
+	  compression attributes in Create-Job requests (STR #4086)
+	- The libusb-based USB backend did not work on non-Linux platforms
+	  (STR #4088)
+
+
+CHANGES IN CUPS V1.5.3
+
+	- httpReconnect() did not reset the read/write buffers (STR #4065)
+	- Compiling without threading support failed (STR #4060)
+	- Fixed compile problem with old versions of OpenSSL (STR #4036)
+	- The network backends did not check SNMP supply levels regularly
+	  (STR #4040)
+	- The online help always included the "help on help" text (STR #4042)
+	- Fixed a SSL handshake issue on OS X (STR #4045)
+	- The scheduler could crash if a PPD file contained an invalid paper
+	  size (STR #4049)
+	- The CUPS polling daemon did not reinitialize its connection to the
+	  remote server on errors in all cases (STR #4031)
+	- PostScript auto-configuration was slow and unreliable with some
+	  printers (STR #4028)
+	- Missing localizations caused empty output (STR #4033)
+	- The cups-driverd program could temporarily "forget" a PPD file if it
+	  was updated in place.
+	- The dnssd backend now prefers IPPS over IPP.
+	- The USB backend now uses and requires LIBUSB 1.0 or later (STR #3477)
+	- The LIBUSB-based USB backend now supports the back-channel (STR #2890)
+	- Changed how timeouts are implemented in the LPD backend (STR #4013)
+	- Added more supported color names for SNMP supplies (STR #3981)
+	- The default InputSlot setting was never used (STR #3957)
+	- POSIX ACLs are now set properly on certificate files (STR #3970)
+	- Supplies with commas in their names were not reported correctly
+	  (STR #4020)
+	- The cupsGetPPD3() function created a temporary file when one was not
+	  needed (STR #4018)
+	- The scheduler now ensures that job notifications contain a value for
+	  the notify-printer-uri attribute (STR #4014)
+	- The lp and lpr commands did not cancel jobs queued from stdin on an
+	  error (STR #4015)
+	- Fixed the IPP backend's handling of HTTP/1.0 compatibility (STR #3988)
+	- The IPP backend did not always setup username/password authentication
+	  for printers (STR #3985)
+	- The IPP backend no longer re-queues print jobs that are too large for
+	  the printer/server (STR #3977)
+	- The RPM spec file did not work (STR #4021, STR #4057)
+	- Encryption did not work when the server name ended with "."
+	  (STR #4011)
+	- The multi-purpose tray is now mapped to the IPP "by-pass-tray"
+	  (STR #4009)
+	- The correct media size was not always passed to IPP printers
+	  (STR #4001)
+	- Finishing options were not passed to IPP printers (STR #3995)
+	- Fixed iCloud-based Back to My Mac printing (STR #3996)
+
+
+CHANGES IN CUPS V1.5.2
+
+	- Reposted what should have been CUPS 1.5.1.
+
+
+CHANGES IN CUPS V1.5.1
+
+	- Documentation updates (STR #3885, STR #3886, STR #3946, STR #3969)
+	- Localization updates (STR #3840, STR #3989, STR #3997)
+	- Build fixes (STR #3956, STR #3999)
+	- The SNMP backend did not validate the device URIs reported by printers
+	  (STR #4004)
+	- cupsBackendReport() did not handle newlines in 1284 Device IDs
+	  (STR #4005)
+	- USB backend fixes for libusb (STR #3965, STR #3978)
+	- The DBUS notifier did not validate string parameters (STR #3984)
+	- Group quota ACLs did not work with Kerberos (STR #3972)
+	- The IPP backend did not retry when a printer responded with
+	  client-error-not-possible (STR #3963)
+	- PostScript PPDs with filters used the wrong command filter (STR #3973)
+	- The scheduler incorrectly used free() on a POSIX ACL value, which
+	  could cause a crash (STR #3970)
+	- PPD files using the MacStandard encoding did not work.
+	- The web interface did not work on some platforms (STR #3902)
+	- The lpstat command would crash when then "-u" option was used by a
+	  non-administrator (STR #3953)
+	- Japanese supply level reporting did not always work.
+	- The DBUS notifier could crash (STR #3947)
+	- Relaxed some of the page size checks in cupstestppd.
+	- The ipptool program now reports attributes that are repeated within
+	  the same attribute group.
+	- Updated the PWG raster support to match the current draft
+	  specification.
+	- Fixed some IPP conformance issues in the scheduler.
+	- Added ipptool support for repeating requests.
+	- Added IPP/2.2 conformance tests and greatly improved the IPP/1.1,
+	  IPP/2.0, and IPP/2.1 conformance testing.
+	- IPP messages containing mixed integer/rangeOfInteger values did not
+	  work (STR #3942)
+	- The ipptool program now provides additional diagnostics for badly-
+	  formatted responses (STR #3857)
+	- When possible, the IPP backend now stops sending job data early on a
+	  cancel.
+	- cupsSendRequest and cupsWriteRequestData did not properly read all
+	  HTTP headers, preventing authentication and encryption upgrades from
+	  working in all cases.
+	- The client.conf Server directive is no longer supported on Mac OS X
+	  10.7 and later.
+	- The IPP backend sent the wrong margins in media-col.
+	- The scheduler did not save or restore large Kerberos credentials for
+	  jobs.
+	- The dnssd backend did not properly browse for secure IPP printers.
+	- httpAssembleURI* did not properly escape all special characters in the
+	  username/password field.
+	- The scheduler now logs config file errors to stderr (STR #3936)
+	- The configure script incorrectly used bundle-based localizations on
+	  Linux (STR #3938)
+	- The cups-driverd helper program did not cache .drv files properly,
+	  sometimes leading to a crash (STR #3921)
+	- CUPS did not build on stock Mac OS X installations.
+	- Encryption was broken with OpenSSL.
+	- ipptool's XML output used date/time values with timezone offsets,
+	  which are not supported by Mac OS X's NSDate class.
+	- Several programs did not support the cupsFilter2 keyword in PPD files.
+	- The IPP backend incorrectly reported spool-area-full states.
+	- cupsMarkOptions() did not protect against a bad PPD that was missing
+	  one or more standard Duplex options.
+	- The PostScript filter did not mirror N-up output properly.
+	- The ipptool program did not validate UTF-8 strings in XML output.
+	- Fixed supply level reporting for some printers.
+	- The scheduler no longer automatically logs debug messages for jobs
+	  that were held or canceled.
+	- The cupsSendRequest function did not flush remaining response data
+	  from a previous request, leading to apparent chunking issues.
+	- The scheduler did not report the correct version in the Server: header
+	  (STR #3903)
+	- The scheduler did not support 1284 device IDs reported by driver
+	  interface programs longer than 127 characters (STR #3871)
+	- The image filters did not support loading images larger than the
+	  RIPCache setting (STR #3901)
+	- "PAGE: total NNN" messages did not get logged properly (STR #3887)
+	- Updated the PWG Raster support to conform to the current draft of the
+	  PWG Raster Format specification.
+	- The PWG Raster filter did not always write the correct number of
+	  padding lines on the bottom of the page (STR #3904)
+	- When reporting a denial-of-service attack from the domain socket, the
+	  address reported does not always contain the correct path (STR #3888)
+	- Badly formed GIF files could cause the image filters to crash
+	  (STR #3914)
+	- Jobs canceled at the printer were retried by the IPP backend.
+	- "cupsfilter -u" deleted the input file instead of the PPD file.
+	- The scheduler did not compute the cost of PPD filters defined using
+	  the cupsFilter2 keyword properly.
+	- The scheduler did not correctly support the maxsize() attribute for
+	  PPD filters.
+
+
+CHANGES IN CUPS V1.5.0
+
+	- Documentation updates.
+	- Localization update (STR #3865)
+	- Needed to limit TLS to v1.0 on some versions of Mac OS X.
+	- The snmp backend did not work with some printers.
+
+
+CHANGES IN CUPS V1.5rc1
+
+	- Compile fixes (STR #3849, STR #3850)
+	- The scheduler didn't check for empty values for several configuration
+	  directives (STR #3861)
+	- ipptool didn't generate valid XML when a test was skipped.
+	- Added additional error checking to the 1284 device ID code (STR #3858)
+	- Fixed some compatibility issues migrating from the old usblp backend
+	  to the libusb backend (STR #3860)
+	- Fixed the wake-from-sleep printing behavior on Mac OS X.
+	- The scheduler incorrectly allowed jobs to be held from a terminating
+	  state.
+	- The cups-driverd program could crash when a PPD was renamed.
+	- The dnssd backend took too long to discover printers on large or busy
+	  networks with the new default timeout used by lpinfo and the web
+	  interface. This resulted in "lost" printers.
+
+
+CHANGES IN CUPS V1.5b2
+
+	- Documentation updates.
+	- Localization updates (STR #3845)
+	- Compiler warning cleanup.
+	- Fixed PIE support for Linux (STR #3846)
+	- Made httpSetTimeout API public and use it in the IPP backend to avoid
+	  timeout errors.
+	- The scheduler incorrectly set the "authenticated" printer-type bit for
+	  remote queues using authentication.
+
+
+CHANGES IN CUPS V1.5b1
+
+	- The CUPS library now supports per-connection HTTP timeouts and
+	  callbacks.
+	- The CUPS library now supports (limited) SSL/TLS X.509 certificate
+	  validation and revocation (STR #1616)
+	- Updated the PostScript filter to support IncludeFeature in more
+	  circumstances (STR #3417)
+	- The schedule did not correctly parse some IPv6 addresses and masks in
+	  the cupsd.conf file (STR #3533)
+	- Fixed a case-insensitive string comparison issue for locales that do
+	  not treat "I" and "i" as equivalent (STR #3800)
+	- The scheduler reported an incorrect job-printer-uri value when sharing
+	  was not enabled (STR #3639)
+	- The scheduler now allows the ServerAlias directive to contain multiple
+	  hostnames separated by spaces or commas (STR #3813)
+	- The scheduler now sets the process group for child processes and
+	  manages the group (STR #2829)
+	- 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
+	  cupsSNMPSupplies keywords to be set in a PPD file (STR #3825)
+	- Moving a held job no longer releases it (STR #3839)
+	- Restored support for GNU TLS and OpenSSL with threading enabled
+	  (STR #3605)
+	- Fixed a confusing error message from cups-polld (STR #3806)
+	- Increased the default RIPCache value to 128MB (STR #3535)
+	- MIME errors are now routed to the error_log file (STR #2410)
+	- Updated PDF filter to support new Ghostscript ps2write device
+	  (STR #3766)
+	- Updated PDF filter to support new Poppler option to preserve page
+	  sizes in PDF files when the user has not selected a particular media
+	  size (STR #3689)
+	- Added new PWG Raster filter for IPP Everywhere printer support.
+	- Added job-uuid, printer-uuid, and subscription-uuid attributes.
+	- Added support for the cupsSingleFile PPD keyword.
+	- Dropped support for the printer-state-history attribute (STR #3654)
+	- Added support for a new cupsIPPSupplies keyword in PPD files to allow
+	  drivers to disable IPP supply level reporting.
+	- Added support for a new cupsFilter2 keyword in PPD files to allow for
+	  the propagation of the actual MIME media type produced by a filter.
+	- The scheduler did not always get the correct Kerberos username when
+	  authenticating (STR #3670)
+	- Added new cupsRasterOpenIO function and CUPS_RASTER_WRITE_PWG to the
+	  CUPS imaging library to support printing to IPP Everywhere raster
+	  printers.
+	- The scheduler now provides default values for the pages-per-minute and
+	  pages-per-minute-color attributes for PPD files that lack a
+	  Throughput keyword.
+	- Email notifications did not work on Mac OS X.
+	- The cupstestppd program now shows an error for files missing a
+	  CloseGroup keyword (STR #3668)
+	- Name resolution errors no longer cause queues to stop (STR #3719,
+	  STR #3753)
+	- Added a new cups-exec helper program that applies security profiles
+	  to filters, port monitors, backends, CGI programs, and mini-daemons.
+	- The web interface can now be disabled using the WebInterface directive
+	  in cupsd.conf (STR #2625)
+	- The scheduler now provides privacy controls for jobs and subscriptions
+	  (STR #2969)
+	- Added new cupsArrayNew3 API which offers memory management of array
+	  elements.
+	- Added several new color spaces to the CUPS raster format (STR #3419)
+	- The Validate-Job operation now uses the same policy as Print-Job by
+	  default.
+	- CUPS now uses iconv to implement all of its character encoding
+	  support (STR #3097)
+	- The scheduler now implements the Cancel-Jobs, Cancel-My-Jobs, and
+	  Close-Job operations along with the job-ids operation attribute from
+	  PWG 5100.11.
+	- The main CUPS header (<cups/cups.h>) no longer includes the PPD header
+	  (<cups/ppd.h>).
+	- The scheduler and CUPS API now support the print-quality job template
+	  attribute.
+	- The scheduler no longer supports the old Mac OS X Server quota
+	  plugin.
+	- The scheduler now allows writing to /Users/Shared from print filters
+	  on Mac OS X.
+	- CUPS no longer supports the old ~/.cupsrc or ~/.lpoptions files from
+	  CUPS 1.1.x.  The ~/.cups/client.conf and ~/.cups/lpoptions files that
+	  were introduced in CUPS 1.2 must now be used.
+	- The ipptest tool is now a first-class user program and has several
+	  improvements along with new documentation (STR #3484)
+	- The cupstestppd tool now warns about non-unique filenames and
+	  provides a way to ignore all filename warnings.
+	- Dropped support for the recoverable: and recovered: message prefixes.
+	- The scheduler now requires that filters and backends have group write
+	  permissions disabled.
+	- The PPD compiler now checks for overlapping filenames when writing
+	  PPD files.
+	- The HP-GL/2 filter is no longer included with CUPS (STR #3322)
+	- The SCSI backend is no longer included with CUPS (STR #3500)

INSTALL.txt

@@ -1,4 +1,4 @@
-INSTALL - CUPS v1.5.0 - 2011-07-25
+INSTALL - CUPS v1.5.4 - 2012-07-16
 ----------------------------------
 
 This file describes how to compile and install CUPS from source code. For more

IPPTOOL.txt

@@ -1,8 +1,6 @@
-IPPTOOL.txt - 2011-12-02
+IPPTOOL.txt - 2011-09-20
 ------------------------
 
-See the file CHANGES-IPPTOOL.txt for a list of changes to this software.
-
 
 INTRODUCTION
 
@@ -103,34 +101,6 @@ GETTING SUPPORT AND OTHER RESOURCES
     See the CUPS web site at "http://www.cups.org/" for other resources.
 
 
-REPORTING BUGS
-
-    If you believe you have discovered a bug in ipptool, please fill out the
-    bug form at:
-
-	http://www.cups.org/str.php
-
-    Be sure to identify the version of CUPS and ipptool (if you downloaded the
-    standalone version) you are using, the printer (if any) and firmware
-    version, and include any files that apply.
-
-    If you downloaded the standalone version of ipptool, please also re-run the
-    test with debug logging enabled.  Run the following commands on Windows to
-    enable debug logging:
-
-	set CUPS_DEBUG_LOG=ipptool.log
-	set CUPS_DEBUG_LEVEL=6
-
-    For Linux and Mac OS X use:
-
-	CUPS_DEBUG_LOG=ipptool.log; export CUPS_DEBUG_LOG
-	CUPS_DEBUG_LEVEL=6; export CUPS_DEBUG_LEVEL
-
-    Then when you run the ipptool command a new "ipptool.log" file will be
-    created with detailed information - attach this file to the bug you file
-    as well.
-
-
 LEGAL STUFF
 
     CUPS is Copyright 2007-2011 by Apple Inc.  CUPS and the CUPS logo are
@@ -138,6 +108,8 @@ LEGAL STUFF
 
     The MD5 Digest code is Copyright 1999 Aladdin Enterprises.
 
+    This software is based in part on the work of the Independent JPEG Group.
+
     CUPS is provided under the terms of version 2 of the GNU General Public
     License and GNU Library General Public License. This program is distributed
     in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even

Makedefs.in

@@ -3,7 +3,7 @@
 #
 #   Common makefile definitions for CUPS.
 #
-#   Copyright 2007-2012 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
@@ -30,6 +30,7 @@ LD		=	@LD@
 LIBTOOL		=	@LIBTOOL@
 LN		=	@LN@ -sf
 MV		=	@MV@
+PHPCONFIG	=	@PHPCONFIG@
 RANLIB		=	@RANLIB@
 RM		=	@RM@ -f
 RMDIR		=	@RMDIR@
@@ -42,6 +43,7 @@ SHELL		=	/bin/sh
 
 INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
 INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
+INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
 INSTALL_DATA	=	$(INSTALL) -c -m 444
 INSTALL_DIR	=	$(INSTALL) -d
 INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
@@ -78,14 +80,19 @@ UNINSTALL_LANGUAGES =	@UNINSTALL_LANGUAGES@
 
 LIBCUPS		=	@LIBCUPS@
 LIBCUPSCGI	=	@LIBCUPSCGI@
+LIBCUPSDRIVER	=	@LIBCUPSDRIVER@
 LIBCUPSIMAGE	=	@LIBCUPSIMAGE@
 LIBCUPSMIME	=	@LIBCUPSMIME@
 LIBCUPSPPDC	=	@LIBCUPSPPDC@
 LIBCUPSSTATIC	=	@LIBCUPSSTATIC@
-LIBGSSAPI	=	@LIBGSSAPI@
+LIBJPEG		=	@LIBJPEG@
+LIBLDAP		=	@LIBLDAP@
 LIBMALLOC	=	@LIBMALLOC@
-LIBMXML		=	@LIBMXML@
 LIBPAPER	=	@LIBPAPER@
+LIBPNG		=	@LIBPNG@
+LIBSLP		=	@LIBSLP@
+LIBGSSAPI	=	@LIBGSSAPI@
+LIBTIFF		=	@LIBTIFF@
 LIBUSB		=	@LIBUSB@
 LIBWRAP		=	@LIBWRAP@
 LIBZ		=	@LIBZ@
@@ -112,6 +119,10 @@ INSTALLXPC	=	@INSTALLXPC@
 # Program options...
 #
 # ARCHFLAGS     Defines the default architecture build options.
+# ARCH32FLAGS   Defines the 32-bit architecture build options, used
+#               when compiling separate 32/64-bit libraries.
+# ARCH64FLAGS   Defines the 64-bit architecture build options, used
+#               when compiling separate 32/64-bit libraries.
 # OPTIM         Defines the common compiler optimization/debugging options
 #               for all architectures.
 # OPTIONS       Defines other compile-time options (currently only -DDEBUG
@@ -125,6 +136,7 @@ ALL_CXXFLAGS	=	-I.. -D_CUPS_SOURCE $(CXXFLAGS) $(SSLFLAGS) \
 ARCHFLAGS	=	@ARCHFLAGS@
 ARFLAGS		=	@ARFLAGS@
 BACKLIBS	=	@BACKLIBS@
+BANNERTOPS	=	@BANNERTOPS@
 BUILDDIRS	=	@BUILDDIRS@
 CFLAGS		=	@CPPFLAGS@ @CFLAGS@
 COMMONLIBS	=	@LIBS@
@@ -136,22 +148,51 @@ DNSSD_BACKEND	=	@DNSSD_BACKEND@
 DSOFLAGS	=	-L../cups @DSOFLAGS@
 DSOLIBS		=	@DSOLIBS@ $(COMMONLIBS)
 DNSSDLIBS	=	@DNSSDLIBS@
+FONTS		=	@FONTS@
+IMGLIBS		=	@IMGLIBS@
+IMGFILTERS	=	@IMGFILTERS@
 LAUNCHDLIBS	=	@LAUNCHDLIBS@
 LDFLAGS		=	-L../cgi-bin -L../cups -L../filter -L../ppdc \
 			-L../scheduler @LDARCHFLAGS@ \
 			@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
+LEGACY_BACKENDS	=	@LEGACY_BACKENDS@
 LINKCUPS	=	@LINKCUPS@ $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LIBZ)
 LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
 LIBS		=	$(LINKCUPS) $(COMMONLIBS)
 OPTIM		=	@OPTIM@
 OPTIONS		=
 PAMLIBS		=	@PAMLIBS@
+PAP		=	@PAP@
+PDFTOPS		=	@PDFTOPS@
+PHPDIR		=	@PHPDIR@
+PHPOPTIONS	=	@PHPOPTIONS@ -I../.. `$(PHPCONFIG) --includes`
 SERVERLIBS	=	@SERVERLIBS@
 SSLFLAGS	=	@SSLFLAGS@
 SSLLIBS		=	@SSLLIBS@
+TEXTTOPS	=	@TEXTTOPS@
 UNITTESTS	=	@UNITTESTS@
 
 
+#
+# Separate 32/64-bit library support...
+#
+
+ARCH32FLAGS	=	@ARCH32FLAGS@
+DSO32FLAGS	=	@DSO32FLAGS@
+INSTALL32	=	@INSTALL32@
+LIB32CUPS	=	@LIB32CUPS@
+LIB32CUPSIMAGE	=	@LIB32CUPSIMAGE@
+LIB32DIR	=	$(BUILDROOT)@LIB32DIR@
+UNINSTALL32	=	@UNINSTALL32@
+
+ARCH64FLAGS	=	@ARCH64FLAGS@
+DSO64FLAGS	=	@DSO64FLAGS@
+INSTALL64	=	@INSTALL64@
+LIB64CUPS	=	@LIB64CUPS@
+LIB64CUPSIMAGE	=	@LIB64CUPSIMAGE@
+LIB64DIR	=	$(BUILDROOT)@LIB64DIR@
+UNINSTALL64	=	@UNINSTALL64@
+
 #
 # Directories...
 #
@@ -234,12 +275,20 @@ DBUSDIR		=	@DBUSDIR@
 #
 
 .SILENT:
-.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
+.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz
 
 .c.o:
 	echo Compiling $<...
 	$(CC) $(ARCHFLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $<
 
+.c.32.o:
+	echo Compiling 32-bit $<...
+	$(CC) $(ARCH32FLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $<
+
+.c.64.o:
+	echo Compiling 64-bit $<...
+	$(CC) $(ARCH64FLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $<
+
 .cxx.o:
 	echo Compiling $<...
 	$(CXX) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c -o $@ $<

Makefile

@@ -20,7 +20,7 @@ include Makedefs
 # Directories to make...
 #
 
-DIRS	=	cups test $(BUILDDIRS)
+DIRS	=	cups test $(BUILDDIRS) $(PHPDIR) $(FONTS)
 
 
 #
@@ -234,11 +234,7 @@ test:	all unittests
 
 check:	all unittests
 	echo Running CUPS test suite with defaults...
-	cd test; ./run-stp-tests.sh 1 0 n n
-
-debugcheck:	all unittests
-	echo Running CUPS test suite with debug printfs...
-	cd test; ./run-stp-tests.sh 1 0 n y
+	cd test; ./run-stp-tests.sh 1 0 n
 
 
 #
@@ -246,13 +242,13 @@ debugcheck:	all unittests
 #
 
 apihelp:
-	for dir in cgi-bin cups filter ppdc scheduler; do\
+	for dir in cgi-bin cups filter driver ppdc scheduler; do\
 		echo Generating API help in $$dir... ;\
 		(cd $$dir; $(MAKE) $(MFLAGS) apihelp) || exit 1;\
 	done
 
 framedhelp:
-	for dir in cgi-bin cups filter ppdc scheduler; do\
+	for dir in cgi-bin cups filter driver ppdc scheduler; do\
 		echo Generating framed API help in $$dir... ;\
 		(cd $$dir; $(MAKE) $(MFLAGS) framedhelp) || exit 1;\
 	done

README.txt

@@ -1,5 +1,5 @@
-README - CUPS v1.5.0 - 2011-07-25
-----------------------------------
+README - CUPS v1.5.4 - 2012-07-16
+---------------------------------
 
 Looking for compile instructions?  Read the file "INSTALL.txt"
 instead...
@@ -150,7 +150,7 @@ PRINTING FILES
 
 LEGAL STUFF
 
-    CUPS is Copyright 2007-2011 by Apple Inc.  CUPS and the CUPS logo are
+    CUPS is Copyright 2007-2012 by Apple Inc.  CUPS and the CUPS logo are
     trademarks of Apple Inc.
 
     The MD5 Digest code is Copyright 1999 Aladdin Enterprises.

backend/Dependencies

@@ -1,72 +1,107 @@
-ipp.o: ipp.c backend-private.h ../cups/cups-private.h ../cups/cups.h \
-  ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h \
-  ../cups/array.h ../cups/language.h ../cups/string-private.h \
-  ../config.h ../cups/debug-private.h ../cups/ppd-private.h \
-  ../cups/ppd.h ../cups/pwg-private.h ../cups/http-private.h \
-  ../cups/md5-private.h ../cups/ipp-private.h ../cups/language-private.h \
-  ../cups/transcode.h ../cups/thread-private.h ../cups/snmp-private.h \
-  ../cups/backend.h ../cups/sidechannel.h ../cups/array-private.h
-lpd.o: lpd.c ../cups/http-private.h ../config.h ../cups/http.h \
-  ../cups/versioning.h ../cups/array.h ../cups/md5-private.h \
-  ../cups/ipp-private.h ../cups/ipp.h backend-private.h \
-  ../cups/cups-private.h ../cups/cups.h ../cups/file.h \
-  ../cups/language.h ../cups/string-private.h ../cups/debug-private.h \
-  ../cups/ppd-private.h ../cups/ppd.h ../cups/pwg-private.h \
-  ../cups/language-private.h ../cups/transcode.h \
-  ../cups/thread-private.h ../cups/snmp-private.h ../cups/backend.h \
-  ../cups/sidechannel.h
-dnssd.o: dnssd.c backend-private.h ../cups/cups-private.h ../cups/cups.h \
-  ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h \
-  ../cups/array.h ../cups/language.h ../cups/string-private.h \
-  ../config.h ../cups/debug-private.h ../cups/ppd-private.h \
-  ../cups/ppd.h ../cups/pwg-private.h ../cups/http-private.h \
-  ../cups/md5-private.h ../cups/ipp-private.h ../cups/language-private.h \
-  ../cups/transcode.h ../cups/thread-private.h ../cups/snmp-private.h \
-  ../cups/backend.h ../cups/sidechannel.h
-snmp.o: snmp.c backend-private.h ../cups/cups-private.h ../cups/cups.h \
-  ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h \
-  ../cups/array.h ../cups/language.h ../cups/string-private.h \
-  ../config.h ../cups/debug-private.h ../cups/ppd-private.h \
-  ../cups/ppd.h ../cups/pwg-private.h ../cups/http-private.h \
-  ../cups/md5-private.h ../cups/ipp-private.h ../cups/language-private.h \
-  ../cups/transcode.h ../cups/thread-private.h ../cups/snmp-private.h \
-  ../cups/backend.h ../cups/sidechannel.h
-socket.o: socket.c ../cups/http-private.h ../config.h ../cups/http.h \
-  ../cups/versioning.h ../cups/array.h ../cups/md5-private.h \
-  ../cups/ipp-private.h ../cups/ipp.h backend-private.h \
-  ../cups/cups-private.h ../cups/cups.h ../cups/file.h \
-  ../cups/language.h ../cups/string-private.h ../cups/debug-private.h \
-  ../cups/ppd-private.h ../cups/ppd.h ../cups/pwg-private.h \
-  ../cups/language-private.h ../cups/transcode.h \
-  ../cups/thread-private.h ../cups/snmp-private.h ../cups/backend.h \
-  ../cups/sidechannel.h
-test1284.o: test1284.c ../cups/string-private.h ../config.h ieee1284.c \
-  backend-private.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h \
-  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/debug-private.h ../cups/ppd-private.h \
-  ../cups/ppd.h ../cups/pwg-private.h ../cups/http-private.h \
-  ../cups/md5-private.h ../cups/ipp-private.h ../cups/language-private.h \
-  ../cups/transcode.h ../cups/thread-private.h ../cups/snmp-private.h \
-  ../cups/backend.h ../cups/sidechannel.h
-testbackend.o: testbackend.c ../cups/string-private.h ../config.h \
-  ../cups/cups.h ../cups/file.h ../cups/versioning.h ../cups/ipp.h \
-  ../cups/http.h ../cups/array.h ../cups/language.h \
-  ../cups/sidechannel.h
-testsupplies.o: testsupplies.c backend-private.h ../cups/cups-private.h \
-  ../cups/cups.h ../cups/file.h ../cups/versioning.h ../cups/ipp.h \
-  ../cups/http.h ../cups/array.h ../cups/language.h \
-  ../cups/string-private.h ../config.h ../cups/debug-private.h \
-  ../cups/ppd-private.h ../cups/ppd.h ../cups/pwg-private.h \
-  ../cups/http-private.h ../cups/md5-private.h ../cups/ipp-private.h \
-  ../cups/language-private.h ../cups/transcode.h \
-  ../cups/thread-private.h ../cups/snmp-private.h ../cups/backend.h \
-  ../cups/sidechannel.h
-usb.o: usb.c backend-private.h ../cups/cups-private.h ../cups/cups.h \
-  ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h \
-  ../cups/array.h ../cups/language.h ../cups/string-private.h \
-  ../config.h ../cups/debug-private.h ../cups/ppd-private.h \
-  ../cups/ppd.h ../cups/pwg-private.h ../cups/http-private.h \
-  ../cups/md5-private.h ../cups/ipp-private.h ../cups/language-private.h \
-  ../cups/transcode.h ../cups/thread-private.h ../cups/snmp-private.h \
-  ../cups/backend.h ../cups/sidechannel.h usb-darwin.c \
-  ../cups/file-private.h
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+ipp.o: backend-private.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h
+ipp.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
+ipp.o: ../cups/language.h ../cups/string-private.h ../config.h
+ipp.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h
+ipp.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h
+ipp.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h
+ipp.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h
+ipp.o: ../cups/transcode.h ../cups/thread-private.h ../cups/snmp-private.h
+ipp.o: ../cups/backend.h ../cups/sidechannel.h ../cups/array-private.h
+ipp.o: ../cups/array.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
+lpd.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
+lpd.o: ../cups/language.h ../cups/string-private.h ../cups/debug-private.h
+lpd.o: ../cups/versioning.h ../cups/ppd-private.h ../cups/ppd.h
+lpd.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
+lpd.o: ../cups/language-private.h ../cups/transcode.h
+lpd.o: ../cups/thread-private.h ../cups/snmp-private.h ../cups/backend.h
+lpd.o: ../cups/sidechannel.h
+dnssd.o: backend-private.h ../cups/cups-private.h ../cups/cups.h
+dnssd.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h
+dnssd.o: ../cups/array.h ../cups/language.h ../cups/string-private.h
+dnssd.o: ../config.h ../cups/debug-private.h ../cups/versioning.h
+dnssd.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
+dnssd.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
+dnssd.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
+dnssd.o: ../cups/language-private.h ../cups/transcode.h
+dnssd.o: ../cups/thread-private.h ../cups/snmp-private.h ../cups/backend.h
+dnssd.o: ../cups/sidechannel.h ../cups/array.h
+parallel.o: backend-private.h ../cups/cups-private.h ../cups/cups.h
+parallel.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h
+parallel.o: ../cups/array.h ../cups/language.h ../cups/string-private.h
+parallel.o: ../config.h ../cups/debug-private.h ../cups/versioning.h
+parallel.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
+parallel.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
+parallel.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
+parallel.o: ../cups/language-private.h ../cups/transcode.h
+parallel.o: ../cups/thread-private.h ../cups/snmp-private.h ../cups/backend.h
+parallel.o: ../cups/sidechannel.h
+serial.o: backend-private.h ../cups/cups-private.h ../cups/cups.h
+serial.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h
+serial.o: ../cups/array.h ../cups/language.h ../cups/string-private.h
+serial.o: ../config.h ../cups/debug-private.h ../cups/versioning.h
+serial.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
+serial.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
+serial.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
+serial.o: ../cups/language-private.h ../cups/transcode.h
+serial.o: ../cups/thread-private.h ../cups/snmp-private.h ../cups/backend.h
+serial.o: ../cups/sidechannel.h
+snmp.o: backend-private.h ../cups/cups-private.h ../cups/cups.h
+snmp.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h
+snmp.o: ../cups/array.h ../cups/language.h ../cups/string-private.h
+snmp.o: ../config.h ../cups/debug-private.h ../cups/versioning.h
+snmp.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
+snmp.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
+snmp.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
+snmp.o: ../cups/language-private.h ../cups/transcode.h
+snmp.o: ../cups/thread-private.h ../cups/snmp-private.h ../cups/backend.h
+snmp.o: ../cups/sidechannel.h ../cups/array.h ../cups/file.h
+snmp.o: ../cups/http-private.h
+socket.o: ../cups/http-private.h ../config.h ../cups/http.h
+socket.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
+socket.o: backend-private.h ../cups/cups-private.h ../cups/cups.h
+socket.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h
+socket.o: ../cups/array.h ../cups/language.h ../cups/string-private.h
+socket.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h
+socket.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h
+socket.o: ../cups/http-private.h ../cups/language-private.h
+socket.o: ../cups/transcode.h ../cups/thread-private.h ../cups/snmp-private.h
+socket.o: ../cups/backend.h ../cups/sidechannel.h
+test1284.o: ../cups/string-private.h ../config.h ieee1284.c backend-private.h
+test1284.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
+test1284.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
+test1284.o: ../cups/language.h ../cups/string-private.h
+test1284.o: ../cups/debug-private.h ../cups/versioning.h
+test1284.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
+test1284.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
+test1284.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
+test1284.o: ../cups/language-private.h ../cups/transcode.h
+test1284.o: ../cups/thread-private.h ../cups/snmp-private.h ../cups/backend.h
+test1284.o: ../cups/sidechannel.h
+testbackend.o: ../cups/string-private.h ../config.h ../cups/cups.h
+testbackend.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h
+testbackend.o: ../cups/http.h ../cups/array.h ../cups/language.h
+testbackend.o: ../cups/sidechannel.h
+testsupplies.o: backend-private.h ../cups/cups-private.h ../cups/cups.h
+testsupplies.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h
+testsupplies.o: ../cups/http.h ../cups/array.h ../cups/language.h
+testsupplies.o: ../cups/string-private.h ../config.h ../cups/debug-private.h
+testsupplies.o: ../cups/versioning.h ../cups/ppd-private.h ../cups/ppd.h
+testsupplies.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
+testsupplies.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
+testsupplies.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+testsupplies.o: ../cups/thread-private.h ../cups/snmp-private.h
+testsupplies.o: ../cups/backend.h ../cups/sidechannel.h
+usb.o: backend-private.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h
+usb.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
+usb.o: ../cups/language.h ../cups/string-private.h ../config.h
+usb.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h
+usb.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h
+usb.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h
+usb.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h
+usb.o: ../cups/transcode.h ../cups/thread-private.h ../cups/snmp-private.h
+usb.o: ../cups/backend.h ../cups/sidechannel.h

backend/Makefile

@@ -21,37 +21,13 @@ include ../Makedefs
 # Object files...
 #
 
-RBACKENDS =	\
-		ipp \
-		lpd \
-		$(DNSSD_BACKEND)
-UBACKENDS =	\
-		snmp \
-		socket \
-		usb
-UNITTESTS =	\
-		test1284 \
-		testbackend \
-		testsupplies
-TARGETS =	\
-		libbackend.a \
-		$(RBACKENDS) \
-		$(UBACKENDS)
-LIBOBJS	=	\
-		ieee1284.o \
-		network.o \
-		runloop.o \
-		snmp-supplies.o
-OBJS	=	\
-		ipp.o \
-		lpd.o \
-		dnssd.o \
-		snmp.o \
-		socket.o \
-		test1284.o \
-		testbackend.o \
-		testsupplies.o \
-		usb.o
+RBACKENDS =	ipp lpd $(DNSSD_BACKEND)
+UBACKENDS =	$(LEGACY_BACKENDS) serial snmp socket usb
+UNITTESTS =	test1284 testbackend testsupplies
+TARGETS =	libbackend.a $(RBACKENDS) $(UBACKENDS)
+LIBOBJS	=	ieee1284.o network.o runloop.o snmp-supplies.o
+OBJS	=	ipp.o lpd.o dnssd.o parallel.o serial.o snmp.o \
+		socket.o test1284.o testbackend.o testsupplies.o usb.o
 
 
 #
@@ -80,7 +56,7 @@ unittests:	$(UNITTESTS)
 #
 
 clean:
-	$(RM) $(OBJS) $(TARGETS) $(UNITTESTS) $(LIBOBJS) http https ipps mdns
+	$(RM) $(OBJS) $(TARGETS) $(UNITTESTS) $(LIBOBJS) http mdns
 
 
 #
@@ -88,7 +64,7 @@ clean:
 #
 
 depend:
-	$(CC) -MM $(ALL_CFLAGS) $(OBJS:.o=.c) >Dependencies
+	makedepend -Y -I.. -fDependencies $(OBJS:.o=.c) >/dev/null 2>&1
 
 
 #
@@ -122,7 +98,7 @@ install-exec:	$(INSTALLXPC)
 		$(RM) $(SERVERBIN)/backend/$$file; \
 		$(LN) ipp $(SERVERBIN)/backend/$$file; \
 	done
-	if test "x$(DNSSD_BACKEND)" != x; then \
+	if test "x$(DNSSD_BACKEND)" != x -a `uname` = Darwin; then \
 		$(RM) $(SERVERBIN)/backend/mdns; \
 		$(LN) $(DNSSD_BACKEND) $(SERVERBIN)/backend/mdns; \
 	fi
@@ -250,6 +226,24 @@ lpd:	lpd.o ../cups/$(LIBCUPS) libbackend.a
 	$(CC) $(LDFLAGS) -o lpd lpd.o libbackend.a $(LIBS)
 
 
+#
+# parallel
+#
+
+parallel:	parallel.o ../cups/$(LIBCUPS) libbackend.a
+	echo Linking $@...
+	$(CC) $(LDFLAGS) -o parallel parallel.o libbackend.a $(LIBS)
+
+
+#
+# serial
+#
+
+serial:	serial.o ../cups/$(LIBCUPS) libbackend.a
+	echo Linking $@...
+	$(CC) $(LDFLAGS) -o serial serial.o libbackend.a $(BACKLIBS) $(LIBS)
+
+
 #
 # snmp
 #
@@ -274,7 +268,7 @@ socket:	socket.o ../cups/$(LIBCUPS) libbackend.a
 
 usb:	usb.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB) \
+	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB) \
 		$(BACKLIBS) $(LIBS)
 usb.o:	usb.c usb-darwin.c usb-libusb.c usb-unix.c
 

backend/dnssd.c

@@ -3,7 +3,7 @@
  *
  *   DNS-SD discovery backend for CUPS.
  *
- *   Copyright 2008-2011 by Apple Inc.
+ *   Copyright 2008-2012 by Apple Inc.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Apple Inc. and are protected by Federal copyright
@@ -43,8 +43,8 @@
 typedef enum
 {
   CUPS_DEVICE_PRINTER = 0,		/* lpd://... */
-  CUPS_DEVICE_IPP,			/* ipp://... */
   CUPS_DEVICE_IPPS,			/* ipps://... */
+  CUPS_DEVICE_IPP,			/* ipp://... */
   CUPS_DEVICE_FAX_IPP,			/* ipp://... */
   CUPS_DEVICE_PDL_DATASTREAM,		/* socket://... */
   CUPS_DEVICE_RIOUSBPRINT		/* riousbprint://... */
@@ -84,7 +84,8 @@ static void		browse_callback(DNSServiceRef sdRef,
 				        DNSServiceErrorType errorCode,
 				        const char *serviceName,
 				        const char *regtype,
-				        const char *replyDomain, void *context);
+				        const char *replyDomain, void *context)
+					__attribute__((nonnull(1,5,6,7,8)));
 static void		browse_local_callback(DNSServiceRef sdRef,
 					      DNSServiceFlags flags,
 					      uint32_t interfaceIndex,
@@ -92,13 +93,15 @@ static void		browse_local_callback(DNSServiceRef sdRef,
 					      const char *serviceName,
 					      const char *regtype,
 					      const char *replyDomain,
-					      void *context);
+					      void *context)
+					      __attribute__((nonnull(1,5,6,7,8)));
 static int		compare_devices(cups_device_t *a, cups_device_t *b);
 static void		exec_backend(char **argv);
 static cups_device_t	*get_device(cups_array_t *devices,
 			            const char *serviceName,
 			            const char *regtype,
-				    const char *replyDomain);
+				    const char *replyDomain)
+				    __attribute__((nonnull(1,2,3,4)));
 static void		query_callback(DNSServiceRef sdRef,
 			               DNSServiceFlags flags,
 				       uint32_t interfaceIndex,
@@ -106,9 +109,11 @@ static void		query_callback(DNSServiceRef sdRef,
 				       const char *fullName, uint16_t rrtype,
 				       uint16_t rrclass, uint16_t rdlen,
 				       const void *rdata, uint32_t ttl,
-				       void *context);
+				       void *context)
+				       __attribute__((nonnull(1,5,9,11)));
 static void		sigterm_handler(int sig);
-static void		unquote(char *dst, const char *src, size_t dstsize);
+static void		unquote(char *dst, const char *src, size_t dstsize)
+			    __attribute__((nonnull(1,2)));
 
 
 /*

backend/ipp.c

@@ -62,7 +62,8 @@ typedef struct _cups_monitor_s		/**** Monitoring data ****/
 			*resource;	/* Resource path */
   int			port,		/* Port number */
 			version,	/* IPP version */
-			job_id;		/* Job ID for submitted job */
+			job_id,		/* Job ID for submitted job */
+			get_job_attrs;	/* Support Get-Job-Attributes? */
   const char		*job_name;	/* Job name for submitted job */
   http_encryption_t	encryption;	/* Use encryption? */
   ipp_jstate_t		job_state;	/* Current job state */
@@ -90,7 +91,9 @@ static const char * const jattrs[] =	/* Job attributes we want */
 };
 static int		job_canceled = 0;
 					/* Job cancelled? */
-static char		*password = NULL;
+static char		username[256] = "",
+					/* Username for device URI */
+			*password = NULL;
 					/* Password for device URI */
 static int		password_tries = 0;
 					/* Password tries */
@@ -189,7 +192,6 @@ main(int  argc,				/* I - Number of command-line args */
   const char	*device_uri;		/* Device URI */
   char		scheme[255],		/* Scheme in URI */
 		hostname[1024],		/* Hostname */
-		username[255],		/* Username info */
 		resource[1024],		/* Resource info (printer name) */
 		addrname[256],		/* Address name */
 		*optptr,		/* Pointer to URI options */
@@ -236,6 +238,7 @@ main(int  argc,				/* I - Number of command-line args */
   ipp_attribute_t *printer_state;	/* printer-state attribute */
   ipp_attribute_t *printer_accepting;	/* printer-is-accepting-jobs */
   int		create_job = 0,		/* Does printer support Create-Job? */
+		get_job_attrs = 0,	/* Does printer support Get-Job-Attributes? */
 		send_document = 0,	/* Does printer support Send-Document? */
 		validate_job = 0;	/* Does printer support Validate-Job? */
   int		copies,			/* Number of copies for job */
@@ -610,7 +613,10 @@ main(int  argc,				/* I - Number of command-line args */
     const char *ptr = getenv("AUTH_USERNAME");
 
     if (ptr)
+    {
+      strlcpy(username, ptr, sizeof(username));
       cupsSetUser(ptr);
+    }
 
     password = getenv("AUTH_PASSWORD");
   }
@@ -839,7 +845,9 @@ main(int  argc,				/* I - Number of command-line args */
     fprintf(stderr, "DEBUG: Get-Printer-Attributes: %s (%s)\n",
             ippErrorString(ipp_status), cupsLastErrorString());
 
-    if (ipp_status > IPP_OK_CONFLICT)
+    if (ipp_status <= IPP_OK_CONFLICT)
+      password_tries = 0;
+    else
     {
       fprintf(stderr, "DEBUG: Get-Printer-Attributes returned %s.\n",
               ippErrorString(ipp_status));
@@ -896,16 +904,21 @@ main(int  argc,				/* I - Number of command-line args */
 
 	return (CUPS_BACKEND_STOP);
       }
-      else if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN)
+      else if (ipp_status == IPP_FORBIDDEN ||
+               ipp_status == IPP_AUTHENTICATION_CANCELED)
       {
-	if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE),
-		     "Negotiate", 9))
+        const char *www_auth = httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE);
+        				/* WWW-Authenticate field value */
+
+	if (!strncmp(www_auth, "Negotiate", 9))
 	  auth_info_required = "negotiate";
+        else if (www_auth[0])
+          auth_info_required = "username,password";
 
 	fprintf(stderr, "ATTR: auth-info-required=%s\n", auth_info_required);
 	return (CUPS_BACKEND_AUTH_REQUIRED);
       }
-      else
+      else if (ipp_status != IPP_NOT_AUTHORIZED)
       {
 	_cupsLangPrintFilter(stderr, "ERROR",
 	                     _("Unable to get printer status."));
@@ -1054,6 +1067,8 @@ main(int  argc,				/* I - Number of command-line args */
 	  create_job = 1;
         else if (operations_sup->values[i].integer == IPP_SEND_DOCUMENT)
 	  send_document = 1;
+        else if (operations_sup->values[i].integer == IPP_GET_JOB_ATTRIBUTES)
+	  get_job_attrs = 1;
       }
 
       if (!send_document)
@@ -1168,7 +1183,8 @@ main(int  argc,				/* I - Number of command-line args */
   if (format_sup != NULL)
   {
     for (i = 0; i < format_sup->num_values; i ++)
-      if (!_cups_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;
@@ -1178,7 +1194,7 @@ main(int  argc,				/* I - Number of command-line args */
     {
       for (i = 0; i < format_sup->num_values; i ++)
 	if (!_cups_strcasecmp("application/octet-stream",
-	                format_sup->values[i].string.text))
+	                      format_sup->values[i].string.text))
 	{
 	  document_format = "application/octet-stream";
 	  break;
@@ -1186,6 +1202,9 @@ main(int  argc,				/* I - Number of command-line args */
     }
   }
 
+  fprintf(stderr, "DEBUG: final_content_type=\"%s\", document_format=\"%s\"\n",
+          final_content_type, document_format ? document_format : "(null)");
+
  /*
   * If the printer does not support HTTP/1.1 (which IPP requires), copy stdin
   * to a temporary file so that we can do a HTTP/1.0 submission...
@@ -1203,8 +1222,17 @@ main(int  argc,				/* I - Number of command-line args */
 
     _cupsLangPrintFilter(stderr, "INFO", _("Copying print data."));
 
-    compatsize = backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, 0,
-		                backendNetworkSideCB);
+    if ((compatsize = write(fd, buffer, bytes)) < 0)
+    {
+      perror("DEBUG: Unable to write temporary file");
+      return (CUPS_BACKEND_FAILED);
+    }
+
+    if ((bytes = backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, 0,
+		                backendNetworkSideCB)) < 0)
+      return (CUPS_BACKEND_FAILED);
+
+    compatsize += bytes;
 
     close(fd);
 
@@ -1231,6 +1259,7 @@ main(int  argc,				/* I - Number of command-line args */
   monitor.port          = port;
   monitor.version       = version;
   monitor.job_id        = 0;
+  monitor.get_job_attrs = get_job_attrs;
   monitor.encryption    = cupsEncryption();
   monitor.job_state     = IPP_JOB_PENDING;
   monitor.printer_state = IPP_PRINTER_IDLE;
@@ -1274,26 +1303,18 @@ main(int  argc,				/* I - Number of command-line args */
       _cupsLangPrintFilter(stderr, "INFO", _("The printer is busy."));
       sleep(10);
     }
-    else if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN ||
+    else if (ipp_status == IPP_DOCUMENT_FORMAT)
+      goto cleanup;
+    else if (ipp_status == IPP_FORBIDDEN ||
 	     ipp_status == IPP_AUTHENTICATION_CANCELED)
     {
-     /*
-      * Update auth-info-required as needed...
-      */
+      const char *www_auth = httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE);
+					/* WWW-Authenticate field value */
 
-      fprintf(stderr, "DEBUG: WWW-Authenticate=\"%s\"\n",
-	      httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE));
-
-     /*
-      * Normal authentication goes through the password callback, which sets
-      * auth_info_required to "username,password".  Kerberos goes directly
-      * through GSSAPI, so look for Negotiate in the WWW-Authenticate header
-      * here and set auth_info_required as needed...
-      */
-
-      if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE),
-		   "Negotiate", 9))
+      if (!strncmp(www_auth, "Negotiate", 9))
 	auth_info_required = "negotiate";
+      else if (www_auth[0])
+	auth_info_required = "username,password";
 
       goto cleanup;
     }
@@ -1307,7 +1328,8 @@ main(int  argc,				/* I - Number of command-line args */
 			   "cups-ipp-missing-validate-job");
       break;
     }
-    else if (ipp_status < IPP_REDIRECTION_OTHER_SITE)
+    else if (ipp_status < IPP_REDIRECTION_OTHER_SITE ||
+             ipp_status == IPP_BAD_REQUEST)
       break;
   }
 
@@ -1444,6 +1466,8 @@ main(int  argc,				/* I - Number of command-line args */
       }
       else if (ipp_status == IPP_ERROR_JOB_CANCELED)
         goto cleanup;
+      else if (ipp_status == IPP_NOT_AUTHORIZED)
+        continue;
       else
       {
        /*
@@ -1453,21 +1477,24 @@ main(int  argc,				/* I - Number of command-line args */
         _cupsLangPrintFilter(stderr, "ERROR",
 	                     _("Print file was not accepted."));
 
-	if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN)
+        if (ipp_status == IPP_FORBIDDEN ||
+            ipp_status == IPP_AUTHENTICATION_CANCELED)
 	{
-	  fprintf(stderr, "DEBUG: WWW-Authenticate=\"%s\"\n",
-		  httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE));
+	  const char *www_auth = httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE);
+					/* WWW-Authenticate field value */
 
-         /*
-	  * Normal authentication goes through the password callback, which sets
-	  * auth_info_required to "username,password".  Kerberos goes directly
-	  * through GSSAPI, so look for Negotiate in the WWW-Authenticate header
-	  * here and set auth_info_required as needed...
+	  if (!strncmp(www_auth, "Negotiate", 9))
+	    auth_info_required = "negotiate";
+	  else if (www_auth[0])
+	    auth_info_required = "username,password";
+	}
+	else if (ipp_status == IPP_REQUEST_VALUE)
+	{
+	 /*
+	  * Print file is too large, abort this job...
 	  */
 
-	  if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE),
-		       "Negotiate", 9))
-	    auth_info_required = "negotiate";
+	  goto cleanup;
 	}
 	else
 	  sleep(10);
@@ -1494,6 +1521,7 @@ main(int  argc,				/* I - Number of command-line args */
     }
     else
     {
+      password_tries = 0;
       monitor.job_id = job_id = job_id_attr->values[0].integer;
       _cupsLangPrintFilter(stderr, "INFO",
                            _("Print file accepted - job ID %d."), job_id);
@@ -1536,8 +1564,9 @@ main(int  argc,				/* I - Number of command-line args */
         if ((i + 1) >= num_files)
 	  ippAddBoolean(request, IPP_TAG_OPERATION, "last-document", 1);
 
-        ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
-	             "document-format", NULL, document_format);
+	if (document_format)
+	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+		       "document-format", NULL, document_format);
 
 	fprintf(stderr, "DEBUG: Sending file %d using chunking...\n", i + 1);
 	http_status = cupsSendRequest(http, request, resource, 0);
@@ -1562,10 +1591,11 @@ main(int  argc,				/* I - Number of command-line args */
 
 	if (fd >= 0)
 	{
-	  while (!job_canceled &&
+	  while (!job_canceled && http_status == HTTP_CONTINUE &&
 	         (bytes = read(fd, buffer, sizeof(buffer))) > 0)
 	  {
-	    if (cupsWriteRequestData(http, buffer, bytes) != HTTP_CONTINUE)
+	    if ((http_status = cupsWriteRequestData(http, buffer, bytes))
+	            != HTTP_CONTINUE)
 	      break;
 	    else
 	    {
@@ -1595,8 +1625,13 @@ main(int  argc,				/* I - Number of command-line args */
 			       _("Unable to add document to print job."));
 	  break;
 	}
-	else if (num_files == 0 || fd < 0)
-	  break;
+	else
+	{
+	  password_tries = 0;
+
+	  if (num_files == 0 || fd < 0)
+	    break;
+	}
       }
     }
 
@@ -1609,6 +1644,14 @@ main(int  argc,				/* I - Number of command-line args */
              ipp_status == IPP_NOT_POSSIBLE ||
 	     ipp_status == IPP_PRINTER_BUSY)
       continue;
+    else if (ipp_status == IPP_REQUEST_VALUE)
+    {
+     /*
+      * Print file is too large, abort this job...
+      */
+
+      goto cleanup;
+    }
     else
       copies_remaining --;
 
@@ -1616,7 +1659,7 @@ main(int  argc,				/* I - Number of command-line args */
     * Wait for the job to complete...
     */
 
-    if (!job_id || !waitjob)
+    if (!job_id || !waitjob || !get_job_attrs)
       continue;
 
     _cupsLangPrintFilter(stderr, "INFO", _("Waiting for job to complete."));
@@ -1659,7 +1702,7 @@ main(int  argc,				/* I - Number of command-line args */
       response   = cupsDoRequest(http, request, resource);
       ipp_status = cupsLastError();
 
-      if (ipp_status == IPP_NOT_FOUND)
+      if (ipp_status == IPP_NOT_FOUND || ipp_status == IPP_NOT_POSSIBLE)
       {
        /*
         * Job has gone away and/or the server has no job history...
@@ -1676,16 +1719,14 @@ main(int  argc,				/* I - Number of command-line args */
       fprintf(stderr, "DEBUG: Get-Job-Attributes: %s (%s)\n",
 	      ippErrorString(ipp_status), cupsLastErrorString());
 
-      if (ipp_status > IPP_OK_CONFLICT)
+      if (ipp_status <= IPP_OK_CONFLICT)
+	password_tries = 0;
+      else
       {
 	if (ipp_status != IPP_SERVICE_UNAVAILABLE &&
-	    ipp_status != IPP_NOT_POSSIBLE &&
 	    ipp_status != IPP_PRINTER_BUSY)
 	{
 	  ippDelete(response);
-
-          _cupsLangPrintFilter(stderr, "ERROR",
-			       _("Unable to get print job status."));
           ipp_status = IPP_OK;
           break;
 	}
@@ -1830,9 +1871,19 @@ main(int  argc,				/* I - Number of command-line args */
     return (CUPS_BACKEND_AUTH_REQUIRED);
   else if (ipp_status == IPP_INTERNAL_ERROR)
     return (CUPS_BACKEND_STOP);
-  else if (ipp_status == IPP_DOCUMENT_FORMAT ||
-           ipp_status == IPP_CONFLICT)
+  else if (ipp_status == IPP_CONFLICT)
     return (CUPS_BACKEND_FAILED);
+  else if (ipp_status == IPP_REQUEST_VALUE ||
+           ipp_status == IPP_DOCUMENT_FORMAT)
+  {
+    if (ipp_status == IPP_REQUEST_VALUE)
+      _cupsLangPrintFilter(stderr, "ERROR", _("Print job too large."));
+    else
+      _cupsLangPrintFilter(stderr, "ERROR",
+                           _("Printer cannot print supplied content."));
+
+    return (CUPS_BACKEND_CANCEL);
+  }
   else if (ipp_status > IPP_OK_CONFLICT && ipp_status != IPP_ERROR_JOB_CANCELED)
     return (CUPS_BACKEND_RETRY_CURRENT);
   else
@@ -1935,6 +1986,9 @@ check_printer_state(
   fprintf(stderr, "DEBUG: Get-Printer-Attributes: %s (%s)\n",
 	  ippErrorString(cupsLastError()), cupsLastErrorString());
 
+  if (cupsLastError() <= IPP_OK_CONFLICT)
+    password_tries = 0;
+
  /*
   * Return the printer-state value...
   */
@@ -2042,6 +2096,8 @@ monitor_printer(
   http = _httpCreate(monitor->hostname, monitor->port, NULL, monitor->encryption,
                      AF_UNSPEC);
   httpSetTimeout(http, 30.0, timeout_cb, NULL);
+  if (username[0])
+    cupsSetUser(username);
   cupsSetPasswordCB(password_cb);
 
  /*
@@ -2071,7 +2127,8 @@ monitor_printer(
       * Check the status of the job itself...
       */
 
-      job_op  = monitor->job_id > 0 ? IPP_GET_JOB_ATTRIBUTES : IPP_GET_JOBS;
+      job_op  = (monitor->job_id > 0 && monitor->get_job_attrs) ?
+                    IPP_GET_JOB_ATTRIBUTES : IPP_GET_JOBS;
       request = ippNewRequest(job_op);
       request->request.op.version[0] = monitor->version / 10;
       request->request.op.version[1] = monitor->version % 10;
@@ -2099,6 +2156,9 @@ monitor_printer(
       fprintf(stderr, "DEBUG: %s: %s (%s)\n", ippOpString(job_op),
 	      ippErrorString(cupsLastError()), cupsLastErrorString());
 
+      if (cupsLastError() <= IPP_OK_CONFLICT)
+        password_tries = 0;
+
       if (job_op == IPP_GET_JOB_ATTRIBUTES)
       {
 	if ((attr = ippFindAttribute(response, "job-state",
@@ -2258,7 +2318,7 @@ new_request(
     fprintf(stderr, "DEBUG: job-name=\"%s\"\n", title);
   }
 
-  if (format)
+  if (format && op != IPP_CREATE_JOB)
   {
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
 		 "document-format", NULL, format);
@@ -2266,7 +2326,7 @@ new_request(
   }
 
 #ifdef HAVE_LIBZ
-  if (compression)
+  if (compression && op != IPP_CREATE_JOB)
   {
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
 		 "compression", NULL, compression);
@@ -2466,7 +2526,7 @@ new_request(
       * When talking to another CUPS server, send all options...
       */
 
-      cupsEncodeOptions(request, num_options, options);
+      cupsEncodeOptions2(request, num_options, options, IPP_TAG_JOB);
     }
 
     if (copies > 1)
@@ -2484,6 +2544,9 @@ new_request(
 static const char *			/* O - Password  */
 password_cb(const char *prompt)		/* I - Prompt (not used) */
 {
+  fprintf(stderr, "DEBUG: password_cb(prompt=\"%s\"), password=%p, "
+          "password_tries=%d\n", prompt, password, password_tries);
+
   (void)prompt;
 
  /*
@@ -2546,17 +2609,23 @@ report_attr(ipp_attribute_t *attr)	/* I - Attribute */
       case IPP_TAG_TEXT :
       case IPP_TAG_NAME :
       case IPP_TAG_KEYWORD :
+          *valptr++ = '\'';
           *valptr++ = '\"';
 	  for (attrptr = attr->values[i].string.text;
 	       *attrptr && valptr < (value + sizeof(value) - 10);
 	       attrptr ++)
 	  {
-	    if (*attrptr == '\\' || *attrptr == '\"')
+	    if (*attrptr == '\\' || *attrptr == '\"' || *attrptr == '\'')
+	    {
 	      *valptr++ = '\\';
+	      *valptr++ = '\\';
+	      *valptr++ = '\\';
+	    }
 
 	    *valptr++ = *attrptr;
 	  }
           *valptr++ = '\"';
+          *valptr++ = '\'';
           break;
 
       default :

backend/lpd.c

@@ -3,7 +3,7 @@
  *
  *   Line Printer Daemon backend for CUPS.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -19,7 +19,6 @@
  *   main()            - Send a file to the printer or server.
  *   lpd_command()     - Send an LPR command sequence and wait for a reply.
  *   lpd_queue()       - Queue a file using the Line Printer Daemon protocol.
- *   lpd_timeout()     - Handle timeout alarms...
  *   lpd_write()       - Write a buffer of data to an LPD server.
  *   rresvport_af()    - A simple implementation of rresvport_af().
  *   sigterm_handler() - Handle 'terminate' signals that stop the backend.
@@ -87,14 +86,13 @@ static int	abort_job = 0;		/* Non-zero if we get SIGTERM */
  * Local functions...
  */
 
-static int	lpd_command(int lpd_fd, int timeout, char *format, ...);
+static int	lpd_command(int lpd_fd, char *format, ...);
 static int	lpd_queue(const char *hostname, http_addrlist_t *addrlist,
 			  const char *printer, int print_fd, int snmp_fd,
 			  int mode, const char *user, const char *title,
 			  int copies, int banner, int format, int order,
 			  int reserve, int manual_copies, int timeout,
 			  int contimeout);
-static void	lpd_timeout(int sig);
 static int	lpd_write(int lpd_fd, char *buffer, int length);
 #ifndef HAVE_RRESVPORT_AF
 static int	rresvport_af(int *port, int family);
@@ -564,7 +562,6 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 
 static int			/* O - Status of command */
 lpd_command(int  fd,		/* I - Socket connection to LPD host */
-            int  timeout,	/* I - Seconds to wait for a response */
             char *format,	/* I - printf()-style format string */
             ...)		/* I - Additional args as necessary */
 {
@@ -609,18 +606,12 @@ lpd_command(int  fd,		/* I - Socket connection to LPD host */
 
   fputs("DEBUG: Reading command status...\n", stderr);
 
-  alarm(timeout);
-
   if (recv(fd, &status, 1, 0) < 1)
   {
-    _cupsLangPrintFilter(stderr, "WARNING",
-		         _("Printer did not respond after %d seconds."),
-			 timeout);
+    _cupsLangPrintFilter(stderr, "WARNING", _("Printer did not respond."));
     status = errno;
   }
 
-  alarm(0);
-
   fprintf(stderr, "DEBUG: lpd_command returning %d\n", status);
 
   return (status);
@@ -666,26 +657,12 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
   size_t		nbytes;		/* Number of bytes written */
   off_t			tbytes;		/* Total bytes written */
   char			buffer[32768];	/* Output buffer */
-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  struct sigaction	action;		/* Actions for POSIX signals */
-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-
-
- /*
-  * Setup an alarm handler for timeouts...
-  */
-
-#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-  sigset(SIGALRM, lpd_timeout);
-#elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
-
-  sigemptyset(&action.sa_mask);
-  action.sa_handler = lpd_timeout;
-  sigaction(SIGALRM, &action, NULL);
+#ifdef WIN32
+  DWORD			tv;		/* Timeout in milliseconds */
 #else
-  signal(SIGALRM, lpd_timeout);
-#endif /* HAVE_SIGSET */
+  struct timeval	tv;		/* Timeout in secs and usecs */
+#endif /* WIN32 */
+
 
  /*
   * Remember when we started trying to connect to the printer...
@@ -864,6 +841,23 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
       }
     }
 
+   /*
+    * Set the timeout...
+    */
+
+#ifdef WIN32
+    tv = (DWORD)(timeout * 1000);
+
+    setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv, sizeof(tv));
+    setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, (char *)&tv, sizeof(tv));
+#else
+    tv.tv_sec  = timeout;
+    tv.tv_usec = 0;
+
+    setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
+    setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
+#endif /* WIN32 */
+
     fputs("STATE: -connecting-to-device\n", stderr);
     _cupsLangPrintFilter(stderr, "INFO", _("Connected to printer."));
 
@@ -926,7 +920,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
     * literal output...
     */
 
-    if (lpd_command(fd, timeout, "\002%s\n",
+    if (lpd_command(fd, "\002%s\n",
                     printer))		/* Receive print job(s) */
     {
       close(fd);
@@ -978,7 +972,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
       * Send the control file...
       */
 
-      if (lpd_command(fd, timeout, "\002%d cfA%03.3d%.15s\n", strlen(control),
+      if (lpd_command(fd, "\002%d cfA%03.3d%.15s\n", strlen(control),
                       (int)getpid() % 1000, localhost))
       {
 	close(fd);
@@ -997,17 +991,12 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
       }
       else
       {
-        alarm(timeout);
-
         if (read(fd, &status, 1) < 1)
 	{
 	  _cupsLangPrintFilter(stderr, "WARNING",
-			       _("Printer did not respond after %d seconds."),
-			       timeout);
+	                       _("Printer did not respond."));
 	  status = errno;
 	}
-
-        alarm(0);
       }
 
       if (status != 0)
@@ -1033,7 +1022,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
       * Send the print file...
       */
 
-      if (lpd_command(fd, timeout, "\003" CUPS_LLFMT " dfA%03.3d%.15s\n",
+      if (lpd_command(fd, "\003" CUPS_LLFMT " dfA%03.3d%.15s\n",
                       CUPS_LLCAST filestats.st_size, (int)getpid() % 1000,
 		      localhost))
       {
@@ -1084,17 +1073,12 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
 	  * want to requeue it over and over...
 	  */
 
-	  alarm(timeout);
-
           if (recv(fd, &status, 1, 0) < 1)
 	  {
 	    _cupsLangPrintFilter(stderr, "WARNING",
-			         _("Printer did not respond after %d seconds."),
-			         timeout);
+			         _("Printer did not respond."));
 	    status = 0;
           }
-
-	  alarm(0);
 	}
       }
       else
@@ -1121,7 +1105,7 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
       * Send control file...
       */
 
-      if (lpd_command(fd, timeout, "\002%d cfA%03.3d%.15s\n", strlen(control),
+      if (lpd_command(fd, "\002%d cfA%03.3d%.15s\n", strlen(control),
                       (int)getpid() % 1000, localhost))
       {
 	close(fd);
@@ -1139,17 +1123,12 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
       }
       else
       {
-        alarm(timeout);
-
         if (read(fd, &status, 1) < 1)
 	{
 	  _cupsLangPrintFilter(stderr, "WARNING",
-			       _("Printer did not respond after %d seconds."),
-			       timeout);
+			       _("Printer did not respond."));
 	  status = errno;
 	}
-
-	alarm(0);
       }
 
       if (status != 0)
@@ -1192,21 +1171,6 @@ lpd_queue(const char      *hostname,	/* I - Host to connect to */
 }
 
 
-/*
- * 'lpd_timeout()' - Handle timeout alarms...
- */
-
-static void
-lpd_timeout(int sig)			/* I - Signal number */
-{
-  (void)sig;
-
-#if !defined(HAVE_SIGSET) && !defined(HAVE_SIGACTION)
-  signal(SIGALRM, lpd_timeout);
-#endif /* !HAVE_SIGSET && !HAVE_SIGACTION */
-}
-
-
 /*
  * 'lpd_write()' - Write a buffer of data to an LPD server.
  */

backend/network.c

@@ -71,7 +71,7 @@ backendNetworkSideCB(
 {
   cups_sc_command_t	command;	/* Request command */
   cups_sc_status_t	status;		/* Request/response status */
-  char			data[65536];	/* Request/response data */
+  char			data[2048];	/* Request/response data */
   int			datalen;	/* Request/response data size */
   const char		*device_id;	/* 1284DEVICEID env var */
 

backend/parallel.c

@@ -0,0 +1,676 @@
+/*
+ * "$Id$"
+ *
+ *   Parallel port backend for CUPS.
+ *
+ *   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
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   "LICENSE" which should have been included with this file.  If this
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
+ *
+ *   This file is subject to the Apple OS-Developed Software exception.
+ *
+ * Contents:
+ *
+ *   main()         - Send a file to the specified parallel port.
+ *   list_devices() - List all parallel devices.
+ *   side_cb()      - Handle side-channel requests...
+ */
+
+/*
+ * Include necessary headers.
+ */
+
+#include "backend-private.h"
+
+#ifdef __hpux
+#  include <sys/time.h>
+#else
+#  include <sys/select.h>
+#endif /* __hpux */
+
+#ifdef WIN32
+#  include <io.h>
+#else
+#  include <unistd.h>
+#  include <fcntl.h>
+#  include <termios.h>
+#  include <sys/socket.h>
+#endif /* WIN32 */
+
+#ifdef __sgi
+#  include <invent.h>
+#  ifndef INV_EPP_ECP_PLP
+#    define INV_EPP_ECP_PLP	6	/* From 6.3/6.4/6.5 sys/invent.h */
+#    define INV_ASO_SERIAL	14	/* serial portion of SGI ASO board */
+#    define INV_IOC3_DMA	16	/* DMA mode IOC3 serial */
+#    define INV_IOC3_PIO	17	/* PIO mode IOC3 serial */
+#    define INV_ISA_DMA		19	/* DMA mode ISA serial -- O2 */
+#  endif /* !INV_EPP_ECP_PLP */
+#endif /* __sgi */
+
+
+/*
+ * Local functions...
+ */
+
+static void	list_devices(void);
+static int	side_cb(int print_fd, int device_fd, int snmp_fd,
+		        http_addr_t *addr, int use_bc);
+
+
+/*
+ * 'main()' - Send a file to the specified parallel port.
+ *
+ * Usage:
+ *
+ *    printer-uri job-id user title copies options [file]
+ */
+
+int					/* O - Exit status */
+main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
+     char *argv[])			/* I - Command-line arguments */
+{
+  char		method[255],		/* Method in URI */
+		hostname[1024],		/* Hostname */
+		username[255],		/* Username info (not used) */
+		resource[1024],		/* Resource info (device and options) */
+		*options;		/* Pointer to options */
+  int		port;			/* Port number (not used) */
+  int		print_fd,		/* Print file */
+		device_fd,		/* Parallel device */
+		use_bc;			/* Read back-channel data? */
+  int		copies;			/* Number of copies to print */
+  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 */
+#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
+
+
+ /*
+  * Make sure status messages are not buffered...
+  */
+
+  setbuf(stderr, NULL);
+
+ /*
+  * Ignore SIGPIPE signals...
+  */
+
+#ifdef HAVE_SIGSET
+  sigset(SIGPIPE, SIG_IGN);
+#elif defined(HAVE_SIGACTION)
+  memset(&action, 0, sizeof(action));
+  action.sa_handler = SIG_IGN;
+  sigaction(SIGPIPE, &action, NULL);
+#else
+  signal(SIGPIPE, SIG_IGN);
+#endif /* HAVE_SIGSET */
+
+ /*
+  * Check command-line...
+  */
+
+  if (argc == 1)
+  {
+    list_devices();
+    return (CUPS_BACKEND_OK);
+  }
+  else if (argc < 6 || argc > 7)
+  {
+    _cupsLangPrintf(stderr,
+		    _("Usage: %s job-id user title copies options [file]"),
+		    argv[0]);
+    return (CUPS_BACKEND_FAILED);
+  }
+
+ /*
+  * If we have 7 arguments, print the file named on the command-line.
+  * Otherwise, send stdin instead...
+  */
+
+  if (argc == 6)
+  {
+    print_fd = 0;
+    copies   = 1;
+  }
+  else
+  {
+   /*
+    * Try to open the print file...
+    */
+
+    if ((print_fd = open(argv[6], O_RDONLY)) < 0)
+    {
+      _cupsLangPrintError("ERROR", _("Unable to open print file"));
+      return (CUPS_BACKEND_FAILED);
+    }
+
+    copies = atoi(argv[4]);
+  }
+
+ /*
+  * Extract the device name and options from the URI...
+  */
+
+  httpSeparateURI(HTTP_URI_CODING_ALL, cupsBackendDeviceURI(argv),
+                  method, sizeof(method), username, sizeof(username),
+		  hostname, sizeof(hostname), &port,
+		  resource, sizeof(resource));
+
+ /*
+  * See if there are any options...
+  */
+
+  if ((options = strchr(resource, '?')) != NULL)
+  {
+   /*
+    * Yup, terminate the device name string and move to the first
+    * character of the options...
+    */
+
+    *options++ = '\0';
+  }
+
+ /*
+  * Open the parallel port device...
+  */
+
+  fputs("STATE: +connecting-to-device\n", stderr);
+
+  do
+  {
+#if defined(__linux) || defined(__FreeBSD__)
+   /*
+    * The Linux and FreeBSD parallel port drivers currently are broken WRT
+    * select() and bidirection I/O...
+    */
+
+    device_fd = open(resource, O_WRONLY | O_EXCL);
+    use_bc    = 0;
+
+#else
+    if ((device_fd = open(resource, O_RDWR | O_EXCL)) < 0)
+    {
+      device_fd = open(resource, O_WRONLY | O_EXCL);
+      use_bc    = 0;
+    }
+    else
+      use_bc = 1;
+#endif /* __linux || __FreeBSD__ */
+
+    if (device_fd == -1)
+    {
+      if (getenv("CLASS") != NULL)
+      {
+       /*
+        * If the CLASS environment variable is set, the job was submitted
+	* to a class and not to a specific queue.  In this case, we want
+	* to abort immediately so that the job can be requeued on the next
+	* available printer in the class.
+	*/
+
+        _cupsLangPrintFilter(stderr, "INFO",
+			     _("Unable to contact printer, queuing on next "
+			       "printer in class."));
+
+       /*
+        * Sleep 5 seconds to keep the job from requeuing too rapidly...
+	*/
+
+	sleep(5);
+
+        return (CUPS_BACKEND_FAILED);
+      }
+
+      if (errno == EBUSY)
+      {
+        _cupsLangPrintFilter(stderr, "INFO",
+	                     _("Printer busy; will retry in 30 seconds."));
+	sleep(30);
+      }
+      else if (errno == ENXIO || errno == EIO || errno == ENOENT)
+      {
+        _cupsLangPrintFilter(stderr, "INFO",
+	                     _("Printer not connected; will retry in 30 "
+		               "seconds."));
+	sleep(30);
+      }
+      else
+      {
+	_cupsLangPrintError("ERROR", _("Unable to open device file"));
+	return (CUPS_BACKEND_FAILED);
+      }
+    }
+  }
+  while (device_fd < 0);
+
+  fputs("STATE: -connecting-to-device\n", stderr);
+
+ /*
+  * Set any options provided...
+  */
+
+  tcgetattr(device_fd, &opts);
+
+  opts.c_lflag &= ~(ICANON | ECHO | ISIG);	/* Raw mode */
+
+  /**** No options supported yet ****/
+
+  tcsetattr(device_fd, TCSANOW, &opts);
+
+ /*
+  * Finally, send the print file...
+  */
+
+  tbytes = 0;
+
+  while (copies > 0 && tbytes >= 0)
+  {
+    copies --;
+
+    if (print_fd != 0)
+    {
+      fputs("PAGE: 1 1\n", stderr);
+      lseek(print_fd, 0, SEEK_SET);
+    }
+
+    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, side_cb);
+
+    if (print_fd != 0 && tbytes >= 0)
+      _cupsLangPrintFilter(stderr, "INFO", _("Print file sent."));
+  }
+
+ /*
+  * Close the socket connection and input file and return...
+  */
+
+  close(device_fd);
+
+  if (print_fd != 0)
+    close(print_fd);
+
+  return (CUPS_BACKEND_OK);
+}
+
+
+/*
+ * 'list_devices()' - List all parallel devices.
+ */
+
+static void
+list_devices(void)
+{
+#if defined(__hpux) || defined(__sgi) || defined(__sun)
+  static char	*funky_hex = "0123456789abcdefghijklmnopqrstuvwxyz";
+				/* Funky hex numbering used for some devices */
+#endif /* __hpux || __sgi || __sun */
+
+#ifdef __linux
+  int	i;			/* Looping var */
+  int	fd;			/* File descriptor */
+  char	device[255],		/* Device filename */
+	basedevice[255],	/* Base device filename for ports */
+	device_id[1024],	/* Device ID string */
+	make_model[1024],	/* Make and model */
+	info[1024],		/* Info string */
+	uri[1024];		/* Device URI */
+
+
+  if (!access("/dev/parallel/", 0))
+    strcpy(basedevice, "/dev/parallel/");
+  else if (!access("/dev/printers/", 0))
+    strcpy(basedevice, "/dev/printers/");
+  else
+    strcpy(basedevice, "/dev/lp");
+
+  for (i = 0; i < 4; i ++)
+  {
+   /*
+    * Open the port, if available...
+    */
+
+    sprintf(device, "%s%d", basedevice, i);
+    if ((fd = open(device, O_RDWR | O_EXCL)) < 0)
+      fd = open(device, O_WRONLY);
+
+    if (fd >= 0)
+    {
+     /*
+      * Now grab the IEEE 1284 device ID string...
+      */
+
+      snprintf(uri, sizeof(uri), "parallel:%s", device);
+
+      if (!backendGetDeviceID(fd, device_id, sizeof(device_id),
+                              make_model, sizeof(make_model),
+			      NULL, uri, sizeof(uri)))
+      {
+        snprintf(info, sizeof(info), "%s LPT #%d", make_model, i + 1);
+	cupsBackendReport("direct", uri, make_model, info, device_id, NULL);
+      }
+      else
+      {
+        snprintf(info, sizeof(info), "LPT #%d", i + 1);
+	cupsBackendReport("direct", uri, NULL, info, NULL, NULL);
+      }
+
+      close(fd);
+    }
+  }
+#elif defined(__sgi)
+  int		i, j, n;	/* Looping vars */
+  char		device[255];	/* Device filename */
+  inventory_t	*inv;		/* Hardware inventory info */
+
+
+ /*
+  * IRIX maintains a hardware inventory of most devices...
+  */
+
+  setinvent();
+
+  while ((inv = getinvent()) != NULL)
+  {
+    if (inv->inv_class == INV_PARALLEL &&
+        (inv->inv_type == INV_ONBOARD_PLP ||
+         inv->inv_type == INV_EPP_ECP_PLP))
+    {
+     /*
+      * Standard parallel port...
+      */
+
+      puts("direct parallel:/dev/plp \"Unknown\" \"Onboard Parallel Port\"");
+    }
+    else if (inv->inv_class == INV_PARALLEL &&
+             inv->inv_type == INV_EPC_PLP)
+    {
+     /*
+      * EPC parallel port...
+      */
+
+      printf("direct parallel:/dev/plp%d \"Unknown\" \"Integral EPC parallel port, Ebus slot %d\"\n",
+             inv->inv_controller, inv->inv_controller);
+    }
+  }
+
+  endinvent();
+
+ /*
+  * Central Data makes serial and parallel "servers" that can be
+  * connected in a number of ways.  Look for ports...
+  */
+
+  for (i = 0; i < 10; i ++)
+    for (j = 0; j < 8; j ++)
+      for (n = 0; n < 32; n ++)
+      {
+        if (i == 8)		/* EtherLite */
+          sprintf(device, "/dev/lpn%d%c", j, funky_hex[n]);
+        else if (i == 9)	/* PCI */
+          sprintf(device, "/dev/lpp%d%c", j, funky_hex[n]);
+        else			/* SCSI */
+          sprintf(device, "/dev/lp%d%d%c", i, j, funky_hex[n]);
+
+	if (access(device, 0) == 0)
+	{
+	  if (i == 8)
+	    printf("direct parallel:%s \"Unknown\" \"Central Data EtherLite Parallel Port, ID %d, port %d\"\n",
+	           device, j, n);
+	  else if (i == 9)
+	    printf("direct parallel:%s \"Unknown\" \"Central Data PCI Parallel Port, ID %d, port %d\"\n",
+	           device, j, n);
+  	  else
+	    printf("direct parallel:%s \"Unknown\" \"Central Data SCSI Parallel Port, logical bus %d, ID %d, port %d\"\n",
+	           device, i, j, n);
+	}
+      }
+#elif defined(__sun)
+  int		i, j, n;	/* Looping vars */
+  char		device[255];	/* Device filename */
+
+
+ /*
+  * Standard parallel ports...
+  */
+
+  for (i = 0; i < 10; i ++)
+  {
+    sprintf(device, "/dev/ecpp%d", i);
+    if (access(device, 0) == 0)
+      printf("direct parallel:%s \"Unknown\" \"Sun IEEE-1284 Parallel Port #%d\"\n",
+             device, i + 1);
+  }
+
+  for (i = 0; i < 10; i ++)
+  {
+    sprintf(device, "/dev/bpp%d", i);
+    if (access(device, 0) == 0)
+      printf("direct parallel:%s \"Unknown\" \"Sun Standard Parallel Port #%d\"\n",
+             device, i + 1);
+  }
+
+  for (i = 0; i < 3; i ++)
+  {
+    sprintf(device, "/dev/lp%d", i);
+
+    if (access(device, 0) == 0)
+      printf("direct parallel:%s \"Unknown\" \"PC Parallel Port #%d\"\n",
+             device, i + 1);
+  }
+
+ /*
+  * MAGMA parallel ports...
+  */
+
+  for (i = 0; i < 40; i ++)
+  {
+    sprintf(device, "/dev/pm%02d", i);
+    if (access(device, 0) == 0)
+      printf("direct parallel:%s \"Unknown\" \"MAGMA Parallel Board #%d Port #%d\"\n",
+             device, (i / 10) + 1, (i % 10) + 1);
+  }
+
+ /*
+  * Central Data parallel ports...
+  */
+
+  for (i = 0; i < 9; i ++)
+    for (j = 0; j < 8; j ++)
+      for (n = 0; n < 32; n ++)
+      {
+        if (i == 8)	/* EtherLite */
+          sprintf(device, "/dev/sts/lpN%d%c", j, funky_hex[n]);
+        else
+          sprintf(device, "/dev/sts/lp%c%d%c", i + 'C', j,
+                  funky_hex[n]);
+
+	if (access(device, 0) == 0)
+	{
+	  if (i == 8)
+	    printf("direct parallel:%s \"Unknown\" \"Central Data EtherLite Parallel Port, ID %d, port %d\"\n",
+	           device, j, n);
+  	  else
+	    printf("direct parallel:%s \"Unknown\" \"Central Data SCSI Parallel Port, logical bus %d, ID %d, port %d\"\n",
+	           device, i, j, n);
+	}
+      }
+#elif defined(__hpux)
+  int		i, j, n;	/* Looping vars */
+  char		device[255];	/* Device filename */
+
+
+ /*
+  * Standard parallel ports...
+  */
+
+  if (access("/dev/rlp", 0) == 0)
+    puts("direct parallel:/dev/rlp \"Unknown\" \"Standard Parallel Port (/dev/rlp)\"");
+
+  for (i = 0; i < 7; i ++)
+    for (j = 0; j < 7; j ++)
+    {
+      sprintf(device, "/dev/c%dt%dd0_lp", i, j);
+      if (access(device, 0) == 0)
+	printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d,%d\"\n",
+	       device, i, j);
+    }
+
+ /*
+  * Central Data parallel ports...
+  */
+
+  for (i = 0; i < 9; i ++)
+    for (j = 0; j < 8; j ++)
+      for (n = 0; n < 32; n ++)
+      {
+        if (i == 8)	/* EtherLite */
+          sprintf(device, "/dev/lpN%d%c", j, funky_hex[n]);
+        else
+          sprintf(device, "/dev/lp%c%d%c", i + 'C', j,
+                  funky_hex[n]);
+
+	if (access(device, 0) == 0)
+	{
+	  if (i == 8)
+	    printf("direct parallel:%s \"Unknown\" \"Central Data EtherLite Parallel Port, ID %d, port %d\"\n",
+	           device, j, n);
+  	  else
+	    printf("direct parallel:%s \"Unknown\" \"Central Data SCSI Parallel Port, logical bus %d, ID %d, port %d\"\n",
+	           device, i, j, n);
+	}
+      }
+#elif defined(__osf__)
+  int	i;			/* Looping var */
+  int	fd;			/* File descriptor */
+  char	device[255];		/* Device filename */
+
+
+  for (i = 0; i < 3; i ++)
+  {
+    sprintf(device, "/dev/lp%d", i);
+    if ((fd = open(device, O_WRONLY)) >= 0)
+    {
+      close(fd);
+      printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
+    }
+  }
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+  int	i;			/* Looping var */
+  int	fd;			/* File descriptor */
+  char	device[255];		/* Device filename */
+
+
+  for (i = 0; i < 3; i ++)
+  {
+    sprintf(device, "/dev/lpt%d", i);
+    if ((fd = open(device, O_WRONLY)) >= 0)
+    {
+      close(fd);
+      printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d (interrupt-driven)\"\n", device, i + 1);
+    }
+
+    sprintf(device, "/dev/lpa%d", i);
+    if ((fd = open(device, O_WRONLY)) >= 0)
+    {
+      close(fd);
+      printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d (polled)\"\n", device, i + 1);
+    }
+  }
+#elif defined(_AIX)
+  int	i;			/* Looping var */
+  int	fd;			/* File descriptor */
+  char	device[255];		/* Device filename */
+
+
+  for (i = 0; i < 8; i ++)
+  {
+    sprintf(device, "/dev/lp%d", i);
+    if ((fd = open(device, O_WRONLY)) >= 0)
+    {
+      close(fd);
+      printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
+    }
+  }
+#endif
+}
+
+
+/*
+ * 'side_cb()' - Handle side-channel requests...
+ */
+
+static int				/* O - 0 on success, -1 on error */
+side_cb(int         print_fd,		/* I - Print file */
+        int         device_fd,		/* I - Device file */
+        int         snmp_fd,		/* I - SNMP socket (unused) */
+	http_addr_t *addr,		/* I - Device address (unused) */
+	int         use_bc)		/* I - Using back-channel? */
+{
+  cups_sc_command_t	command;	/* Request command */
+  cups_sc_status_t	status;		/* Request/response status */
+  char			data[2048];	/* Request/response data */
+  int			datalen;	/* Request/response data size */
+
+
+  (void)snmp_fd;
+  (void)addr;
+
+  datalen = sizeof(data);
+
+  if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0))
+    return (-1);
+
+  switch (command)
+  {
+    case CUPS_SC_CMD_DRAIN_OUTPUT :
+        if (backendDrainOutput(print_fd, device_fd))
+	  status = CUPS_SC_STATUS_IO_ERROR;
+	else if (tcdrain(device_fd))
+	  status = CUPS_SC_STATUS_IO_ERROR;
+	else
+	  status = CUPS_SC_STATUS_OK;
+
+	datalen = 0;
+        break;
+
+    case CUPS_SC_CMD_GET_BIDI :
+	status  = CUPS_SC_STATUS_OK;
+        data[0] = use_bc;
+        datalen = 1;
+        break;
+
+    case CUPS_SC_CMD_GET_DEVICE_ID :
+        memset(data, 0, sizeof(data));
+
+        if (backendGetDeviceID(device_fd, data, sizeof(data) - 1,
+	                       NULL, 0, NULL, NULL, 0))
+        {
+	  status  = CUPS_SC_STATUS_NOT_IMPLEMENTED;
+	  datalen = 0;
+	}
+	else
+        {
+	  status  = CUPS_SC_STATUS_OK;
+	  datalen = strlen(data);
+	}
+        break;
+
+    default :
+        status  = CUPS_SC_STATUS_NOT_IMPLEMENTED;
+	datalen = 0;
+	break;
+  }
+
+  return (cupsSideChannelWrite(command, status, data, datalen, 1.0));
+}
+
+
+/*
+ * End of "$Id$".
+ */

backend/runloop.c

@@ -3,7 +3,7 @@
  *
  *   Common run loop APIs for CUPS backends.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
  *   Copyright 2006-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -434,9 +434,11 @@ backendWaitLoop(
     int          use_bc,		/* I - Use back-channel? */
     _cups_sccb_t side_cb)		/* I - Side-channel callback */
 {
-  fd_set	input;			/* Input set for reading */
-  time_t	curtime,		/* Current time */
-		snmp_update = 0;	/* Last SNMP status update */
+  int			nfds;		/* Number of file descriptors */
+  fd_set		input;		/* Input set for reading */
+  time_t		curtime,	/* Current time */
+			snmp_update = 0;/* Last SNMP status update */
+  struct timeval	timeout;	/* Timeout for select() */
 
 
   fprintf(stderr, "DEBUG: backendWaitLoop(snmp_fd=%d, addr=%p, side_cb=%p)\n",
@@ -446,6 +448,9 @@ backendWaitLoop(
   * Now loop until we receive data from stdin...
   */
 
+  if (snmp_fd >= 0)
+    snmp_update = time(NULL) + 5;
+
   for (;;)
   {
    /*
@@ -457,7 +462,18 @@ backendWaitLoop(
     if (side_cb)
       FD_SET(CUPS_SC_FD, &input);
 
-    if (select(CUPS_SC_FD + 1, &input, NULL, NULL, NULL) < 0)
+    if (snmp_fd >= 0)
+    {
+      curtime         = time(NULL);
+      timeout.tv_sec  = curtime >= snmp_update ? 0 : snmp_update - curtime;
+      timeout.tv_usec = 0;
+
+      nfds = select(CUPS_SC_FD + 1, &input, NULL, NULL, &timeout);
+    }
+    else
+      nfds = select(CUPS_SC_FD + 1, &input, NULL, NULL, NULL);
+
+    if (nfds < 0)
     {
      /*
       * Pause printing to clear any pending errors...
@@ -501,10 +517,10 @@ backendWaitLoop(
     * Do SNMP updates periodically...
     */
 
-    if (snmp_fd >= 0 && time(&curtime) >= snmp_update)
+    if (snmp_fd >= 0 && curtime >= snmp_update)
     {
       if (backendSNMPSupplies(snmp_fd, addr, NULL, NULL))
-        snmp_update = INT_MAX;
+        snmp_fd = -1;
       else
         snmp_update = curtime + 5;
     }

backend/snmp-supplies.c

@@ -3,7 +3,7 @@
  *
  *   SNMP supplies functions for CUPS.
  *
- *   Copyright 2008-2011 by Apple Inc.
+ *   Copyright 2008-2012 by Apple Inc.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Apple Inc. and are protected by Federal copyright
@@ -408,7 +408,7 @@ backend_init_supplies(
 		cachefilename[1024],	/* Cache filename */
 		description[CUPS_SNMP_MAX_STRING],
 					/* Device description string */
-		value[CUPS_MAX_SUPPLIES * (CUPS_SNMP_MAX_STRING * 2 + 3)],
+		value[CUPS_MAX_SUPPLIES * (CUPS_SNMP_MAX_STRING * 4 + 3)],
 					/* Value string */
 		*ptr,			/* Pointer into value string */
 		*name_ptr;		/* Pointer into name string */
@@ -659,7 +659,8 @@ backend_init_supplies(
   fprintf(stderr, "ATTR: marker-colors=%s\n", value);
 
  /*
-  * Output the marker-names attribute...
+  * Output the marker-names attribute (the double quoting is necessary to deal
+  * with embedded quotes and commas in the marker names...)
   */
 
   for (i = 0, ptr = value; i < num_supplies; i ++)
@@ -667,15 +668,21 @@ backend_init_supplies(
     if (i)
       *ptr++ = ',';
 
+    *ptr++ = '\'';
     *ptr++ = '\"';
     for (name_ptr = supplies[i].name; *name_ptr;)
     {
-      if (*name_ptr == '\\' || *name_ptr == '\"')
+      if (*name_ptr == '\\' || *name_ptr == '\"' || *name_ptr == '\'')
+      {
         *ptr++ = '\\';
+        *ptr++ = '\\';
+        *ptr++ = '\\';
+      }
 
       *ptr++ = *name_ptr++;
     }
     *ptr++ = '\"';
+    *ptr++ = '\'';
   }
 
   *ptr = '\0';
@@ -712,16 +719,33 @@ backend_walk_cb(cups_snmp_t *packet,	/* I - SNMP packet */
                 void        *data)	/* I - User data (unused) */
 {
   int	i, j, k;			/* Looping vars */
-  static const char * const colors[8][2] =
+  static const char * const colors[][2] =
   {					/* Standard color names */
-    { "black",   "#000000" },
-    { "blue",    "#0000FF" },
-    { "cyan",    "#00FFFF" },
-    { "green",   "#00FF00" },
-    { "magenta", "#FF00FF" },
-    { "red",     "#FF0000" },
-    { "white",   "#FFFFFF" },
-    { "yellow",  "#FFFF00" }
+    { "black",         "#000000" },
+    { "blue",          "#0000FF" },
+    { "brown",         "#A52A2A" },
+    { "cyan",          "#00FFFF" },
+    { "dark-gray",     "#404040" },
+    { "dark gray",     "#404040" },
+    { "dark-yellow",   "#FFCC00" },
+    { "dark yellow",   "#FFCC00" },
+    { "gold",          "#FFD700" },
+    { "gray",          "#808080" },
+    { "green",         "#00FF00" },
+    { "light-black",   "#606060" },
+    { "light black",   "#606060" },
+    { "light-cyan",    "#E0FFFF" },
+    { "light cyan",    "#E0FFFF" },
+    { "light-gray",    "#D3D3D3" },
+    { "light gray",    "#D3D3D3" },
+    { "light-magenta", "#FF77FF" },
+    { "light magenta", "#FF77FF" },
+    { "magenta",       "#FF00FF" },
+    { "orange",        "#FFA500" },
+    { "red",           "#FF0000" },
+    { "silver",        "#C0C0C0" },
+    { "white",         "#FFFFFF" },
+    { "yellow",        "#FFFF00" }
   };
 
 
@@ -743,7 +767,8 @@ backend_walk_cb(cups_snmp_t *packet,	/* I - SNMP packet */
       if (supplies[j].colorant == i)
       {
 	for (k = 0; k < (int)(sizeof(colors) / sizeof(colors[0])); k ++)
-	  if (!strcmp(colors[k][0], (char *)packet->object_value.string.bytes))
+	  if (!_cups_strcasecmp(colors[k][0],
+	                        (char *)packet->object_value.string.bytes))
 	  {
 	    strcpy(supplies[j].color, colors[k][1]);
 	    break;
@@ -834,7 +859,6 @@ backend_walk_cb(cups_snmp_t *packet,	/* I - SNMP packet */
           {
 	    char	*src, *dst;	/* Pointers into strings */
 
-
            /*
 	    * Loop safe because both the object_value and supplies char arrays
 	    * are CUPS_SNMP_MAX_STRING elements long.

backend/testbackend.c

@@ -3,7 +3,7 @@
  *
  *   Backend test program for CUPS.
  *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -47,7 +47,7 @@ static int	job_canceled = 0;
  */
 
 static void	sigterm_handler(int sig);
-static void	usage(void) __attribute__((noreturn));
+static void	usage(void);
 static void	walk_cb(const char *oid, const char *data, int datalen,
 		        void *context);
 
@@ -57,7 +57,7 @@ static void	walk_cb(const char *oid, const char *data, int datalen,
  *
  * Usage:
  *
- *    testbackend [-s] [-t] device-uri job-id user title copies options [file]
+ *    betest [-s] [-t] device-uri job-id user title copies options [file]
  */
 
 int					/* O - Exit status */
@@ -75,9 +75,7 @@ main(int  argc,				/* I - Number of command-line args */
   const char	*oid = ".1.3.6.1.2.1.43.10.2.1.4.1.1";
   					/* OID to lookup or walk */
   char		scheme[255],		/* Scheme in URI == backend */
-		backend[1024],		/* Backend path */
-		libpath[1024],		/* Path for libcups */
-		*ptr;			/* Pointer into path */
+		backend[1024];		/* Backend path */
   const char	*serverbin;		/* CUPS_SERVERBIN environment variable */
   int		fd,			/* Temporary file descriptor */
 		back_fds[2],		/* Back-channel pipe */
@@ -89,23 +87,6 @@ main(int  argc,				/* I - Number of command-line args */
 		status;			/* Exit status */
 
 
- /*
-  * Get the current directory and point the run-time linker at the "cups"
-  * subdirectory...
-  */
-
-  if (getcwd(libpath, sizeof(libpath)) &&
-      (ptr = strrchr(libpath, '/')) != NULL && !strcmp(ptr, "/backend"))
-  {
-    strlcpy(ptr, "/cups", sizeof(libpath) - (ptr - libpath));
-    if (access(libpath, 0))
-#ifdef __APPLE__
-      setenv("DYLD_LIBRARY_PATH", libpath, 1);
-#else
-      setenv("LD_LIBRARY_PATH", libpath, 1);
-#endif /* __APPLE__ */
-  }
-
  /*
   * See if we have side-channel tests to do...
   */
@@ -588,7 +569,7 @@ main(int  argc,				/* I - Number of command-line args */
     kill(data_pid, SIGTERM);
     kill(back_pid, SIGTERM);
   }
-
+  
   while ((pid = wait(&status)) > 0)
   {
     if (status)

backend/usb.c

@@ -3,7 +3,7 @@
  *
  *   USB port backend for CUPS.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -55,7 +55,7 @@ int	print_device(const char *uri, const char *hostname,
  * Include the vendor-specific USB implementation...
  */
 
-#ifdef HAVE_USB_H
+#ifdef HAVE_LIBUSB
 #  include "usb-libusb.c"
 #elif defined(__APPLE__)
 #  include "usb-darwin.c"
@@ -118,7 +118,7 @@ print_device(const char *uri,		/* I - Device URI */
 
   return (CUPS_BACKEND_FAILED);
 }
-#endif /* __APPLE__ */
+#endif /* HAVE_LIBUSB */
 
 
 /*

berkeley/Dependencies

@@ -1,28 +1,34 @@
-lpc.o: lpc.c ../cups/cups-private.h ../cups/cups.h ../cups/file.h \
-  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/string-private.h ../config.h \
-  ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h \
-  ../cups/pwg-private.h ../cups/http-private.h ../cups/md5-private.h \
-  ../cups/ipp-private.h ../cups/language-private.h ../cups/transcode.h \
-  ../cups/thread-private.h
-lpq.o: lpq.c ../cups/cups-private.h ../cups/cups.h ../cups/file.h \
-  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/string-private.h ../config.h \
-  ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h \
-  ../cups/pwg-private.h ../cups/http-private.h ../cups/md5-private.h \
-  ../cups/ipp-private.h ../cups/language-private.h ../cups/transcode.h \
-  ../cups/thread-private.h
-lpr.o: lpr.c ../cups/cups-private.h ../cups/cups.h ../cups/file.h \
-  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/string-private.h ../config.h \
-  ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h \
-  ../cups/pwg-private.h ../cups/http-private.h ../cups/md5-private.h \
-  ../cups/ipp-private.h ../cups/language-private.h ../cups/transcode.h \
-  ../cups/thread-private.h
-lprm.o: lprm.c ../cups/cups-private.h ../cups/cups.h ../cups/file.h \
-  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/string-private.h ../config.h \
-  ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h \
-  ../cups/pwg-private.h ../cups/http-private.h ../cups/md5-private.h \
-  ../cups/ipp-private.h ../cups/language-private.h ../cups/transcode.h \
-  ../cups/thread-private.h
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+lpc.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
+lpc.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
+lpc.o: ../cups/language.h ../cups/string-private.h ../config.h
+lpc.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h
+lpc.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h
+lpc.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h
+lpc.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h
+lpc.o: ../cups/transcode.h ../cups/thread-private.h
+lpq.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
+lpq.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
+lpq.o: ../cups/language.h ../cups/string-private.h ../config.h
+lpq.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h
+lpq.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h
+lpq.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h
+lpq.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h
+lpq.o: ../cups/transcode.h ../cups/thread-private.h
+lpr.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
+lpr.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
+lpr.o: ../cups/language.h ../cups/string-private.h ../config.h
+lpr.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h
+lpr.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h
+lpr.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h
+lpr.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h
+lpr.o: ../cups/transcode.h ../cups/thread-private.h
+lprm.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
+lprm.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
+lprm.o: ../cups/language.h ../cups/string-private.h ../config.h
+lprm.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h
+lprm.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h
+lprm.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h
+lprm.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h
+lprm.o: ../cups/transcode.h ../cups/thread-private.h

berkeley/Makefile

@@ -3,7 +3,7 @@
 #
 #   Berkeley commands makefile for CUPS.
 #
-#   Copyright 2007-2012 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
@@ -54,7 +54,7 @@ clean:
 #
 
 depend:
-	$(CC) -MM $(ALL_CFLAGS) $(OBJS:.o=.c) >Dependencies
+	makedepend -Y -I.. -fDependencies $(OBJS:.o=.c) >/dev/null 2>&1
 
 
 #

berkeley/lpc.c

@@ -3,7 +3,7 @@
  *
  *   "lpc" command for CUPS.
  *
- *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -364,7 +364,8 @@ show_status(http_t     *http,		/* I - HTTP connection to server */
 
 	  for (ptr = printer;
 	       *ptr != '\0' && *dptr != '\0' && *ptr == *dptr;
-	       ptr ++, dptr ++);
+	       ptr ++, dptr ++)
+	    /* do nothing */;
 
           if (*ptr == '\0' && (*dptr == '\0' || *dptr == ',' ||
 	                       isspace(*dptr & 255)))

berkeley/lpq.c

@@ -3,7 +3,7 @@
  *
  *   "lpq" command for CUPS.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -39,7 +39,7 @@ static http_t	*connect_server(const char *, http_t *);
 static int	show_jobs(const char *, http_t *, const char *,
 		          const char *, const int, const int);
 static void	show_printer(const char *, http_t *, const char *);
-static void	usage(void) __attribute__((noreturn));
+static void	usage(void);
 
 
 /*
@@ -371,6 +371,7 @@ show_jobs(const char *command,		/* I - Command name */
   *    attributes-natural-language
   *    job-uri or printer-uri
   *    requested-attributes
+  *    requesting-user-name
   */
 
   request = ippNewRequest(id ? IPP_GET_JOB_ATTRIBUTES : IPP_GET_JOBS);
@@ -399,6 +400,9 @@ show_jobs(const char *command,		/* I - Command name */
                  "requesting-user-name", NULL, user);
     ippAddBoolean(request, IPP_TAG_OPERATION, "my-jobs", 1);
   }
+  else
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+                 "requesting-user-name", NULL, cupsUser());
 
   ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                 "requested-attributes",
@@ -447,8 +451,8 @@ show_jobs(const char *command,		/* I - Command name */
       jobpriority = 50;
 #endif /* __osf__ */
       jobstate    = IPP_JOB_PENDING;
-      jobname     = "untitled";
-      jobuser     = NULL;
+      jobname     = "unknown";
+      jobuser     = "unknown";
       jobdest     = NULL;
       jobcopies   = 1;
 

berkeley/lpr.c

@@ -3,7 +3,7 @@
  *
  *   "lpr" command for CUPS.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -89,7 +89,7 @@ main(int  argc,				/* I - Number of command-line arguments */
               cupsSetUser(argv[i]);
 	    }
 	    break;
-	    
+
         case 'H' : /* Connect to host */
 	    if (argv[i][2] != '\0')
               cupsSetServer(argv[i] + 2);
@@ -377,7 +377,6 @@ main(int  argc,				/* I - Number of command-line arguments */
     const char		*format;	/* Document format */
     ssize_t		bytes;		/* Bytes read */
 
-
     if (cupsGetOption("raw", num_options, options))
       format = CUPS_FORMAT_RAW;
     else if ((format = cupsGetOption("document-format", num_options,
@@ -395,11 +394,17 @@ main(int  argc,				/* I - Number of command-line arguments */
     {
       _cupsLangPrintf(stderr, _("%s: Error - unable to queue from stdin - %s."),
 		      argv[0], httpStatus(status));
+      cupsFinishDocument(CUPS_HTTP_DEFAULT, printer);
+      cupsCancelJob2(CUPS_HTTP_DEFAULT, printer, job_id, 0);
       return (1);
     }
 
     if (cupsFinishDocument(CUPS_HTTP_DEFAULT, printer) != IPP_OK)
-      job_id = 0;
+    {
+      _cupsLangPrintf(stderr, "%s: %s", argv[0], cupsLastErrorString());
+      cupsCancelJob2(CUPS_HTTP_DEFAULT, printer, job_id, 0);
+      return (1);
+    }
   }
 
   if (job_id < 1)

cgi-bin/Dependencies

@@ -1,73 +1,84 @@
-help-index.o: help-index.c cgi-private.h cgi.h ../cups/cups.h \
-  ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h \
-  ../cups/array.h ../cups/language.h help-index.h \
-  ../cups/debug-private.h ../cups/language-private.h ../cups/transcode.h \
-  ../cups/string-private.h ../config.h ../cups/ipp-private.h \
-  ../cups/dir.h
-html.o: html.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
-  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h help-index.h ../cups/debug-private.h \
-  ../cups/language-private.h ../cups/transcode.h \
-  ../cups/string-private.h ../config.h ../cups/ipp-private.h
-ipp-var.o: ipp-var.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
-  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h help-index.h ../cups/debug-private.h \
-  ../cups/language-private.h ../cups/transcode.h \
-  ../cups/string-private.h ../config.h ../cups/ipp-private.h
-search.o: search.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
-  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h help-index.h ../cups/debug-private.h \
-  ../cups/language-private.h ../cups/transcode.h \
-  ../cups/string-private.h ../config.h ../cups/ipp-private.h
-template.o: template.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
-  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h help-index.h ../cups/debug-private.h \
-  ../cups/language-private.h ../cups/transcode.h \
-  ../cups/string-private.h ../config.h ../cups/ipp-private.h
-var.o: var.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
-  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h help-index.h ../cups/debug-private.h \
-  ../cups/language-private.h ../cups/transcode.h \
-  ../cups/string-private.h ../config.h ../cups/ipp-private.h \
-  ../cups/md5-private.h
-admin.o: admin.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
-  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h help-index.h ../cups/debug-private.h \
-  ../cups/language-private.h ../cups/transcode.h \
-  ../cups/string-private.h ../config.h ../cups/ipp-private.h \
-  ../cups/adminutil.h ../cups/ppd.h
-classes.o: classes.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
-  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h help-index.h ../cups/debug-private.h \
-  ../cups/language-private.h ../cups/transcode.h \
-  ../cups/string-private.h ../config.h ../cups/ipp-private.h
-help.o: help.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
-  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h help-index.h ../cups/debug-private.h \
-  ../cups/language-private.h ../cups/transcode.h \
-  ../cups/string-private.h ../config.h ../cups/ipp-private.h
-jobs.o: jobs.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
-  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h help-index.h ../cups/debug-private.h \
-  ../cups/language-private.h ../cups/transcode.h \
-  ../cups/string-private.h ../config.h ../cups/ipp-private.h
-makedocset.o: makedocset.c cgi.h ../cups/cups.h ../cups/file.h \
-  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h help-index.h
-printers.o: printers.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
-  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h help-index.h ../cups/debug-private.h \
-  ../cups/language-private.h ../cups/transcode.h \
-  ../cups/string-private.h ../config.h ../cups/ipp-private.h
-testcgi.o: testcgi.c cgi.h ../cups/cups.h ../cups/file.h \
-  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h help-index.h
-testhi.o: testhi.c cgi.h ../cups/cups.h ../cups/file.h \
-  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h help-index.h
-testtemplate.o: testtemplate.c cgi.h ../cups/cups.h ../cups/file.h \
-  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h help-index.h
-websearch.o: websearch.c cgi.h ../cups/cups.h ../cups/file.h \
-  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h help-index.h
+# DO NOT DELETE
+
+help-index.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h
+help-index.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h
+help-index.o: ../cups/array.h ../cups/language.h ../cups/array.h help-index.h
+help-index.o: ../cups/debug-private.h ../cups/versioning.h
+help-index.o: ../cups/language-private.h ../cups/transcode.h
+help-index.o: ../cups/string-private.h ../config.h ../cups/dir.h
+html.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h
+html.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
+html.o: ../cups/language.h ../cups/array.h help-index.h
+html.o: ../cups/debug-private.h ../cups/versioning.h
+html.o: ../cups/language-private.h ../cups/transcode.h
+html.o: ../cups/string-private.h ../config.h
+ipp-var.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h
+ipp-var.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
+ipp-var.o: ../cups/language.h ../cups/array.h help-index.h
+ipp-var.o: ../cups/debug-private.h ../cups/versioning.h
+ipp-var.o: ../cups/language-private.h ../cups/transcode.h
+ipp-var.o: ../cups/string-private.h ../config.h
+search.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h
+search.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
+search.o: ../cups/language.h ../cups/array.h help-index.h
+search.o: ../cups/debug-private.h ../cups/versioning.h
+search.o: ../cups/language-private.h ../cups/transcode.h
+search.o: ../cups/string-private.h ../config.h
+template.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h
+template.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
+template.o: ../cups/language.h ../cups/array.h help-index.h
+template.o: ../cups/debug-private.h ../cups/versioning.h
+template.o: ../cups/language-private.h ../cups/transcode.h
+template.o: ../cups/string-private.h ../config.h
+var.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h ../cups/versioning.h
+var.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h
+var.o: ../cups/array.h help-index.h ../cups/debug-private.h
+var.o: ../cups/versioning.h ../cups/language-private.h ../cups/transcode.h
+var.o: ../cups/string-private.h ../config.h ../cups/http.h
+var.o: ../cups/md5-private.h
+admin.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h
+admin.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
+admin.o: ../cups/language.h ../cups/array.h help-index.h
+admin.o: ../cups/debug-private.h ../cups/versioning.h
+admin.o: ../cups/language-private.h ../cups/transcode.h
+admin.o: ../cups/string-private.h ../config.h ../cups/adminutil.h
+admin.o: ../cups/cups.h ../cups/ppd.h
+classes.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h
+classes.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
+classes.o: ../cups/language.h ../cups/array.h help-index.h
+classes.o: ../cups/debug-private.h ../cups/versioning.h
+classes.o: ../cups/language-private.h ../cups/transcode.h
+classes.o: ../cups/string-private.h ../config.h
+help.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h
+help.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
+help.o: ../cups/language.h ../cups/array.h help-index.h
+help.o: ../cups/debug-private.h ../cups/versioning.h
+help.o: ../cups/language-private.h ../cups/transcode.h
+help.o: ../cups/string-private.h ../config.h
+jobs.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h
+jobs.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
+jobs.o: ../cups/language.h ../cups/array.h help-index.h
+jobs.o: ../cups/debug-private.h ../cups/versioning.h
+jobs.o: ../cups/language-private.h ../cups/transcode.h
+jobs.o: ../cups/string-private.h ../config.h
+makedocset.o: cgi.h ../cups/cups.h ../cups/file.h ../cups/versioning.h
+makedocset.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h
+makedocset.o: ../cups/array.h help-index.h
+printers.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h
+printers.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
+printers.o: ../cups/language.h ../cups/array.h help-index.h
+printers.o: ../cups/debug-private.h ../cups/versioning.h
+printers.o: ../cups/language-private.h ../cups/transcode.h
+printers.o: ../cups/string-private.h ../config.h
+testcgi.o: cgi.h ../cups/cups.h ../cups/file.h ../cups/versioning.h
+testcgi.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h
+testcgi.o: ../cups/array.h help-index.h
+testhi.o: cgi.h ../cups/cups.h ../cups/file.h ../cups/versioning.h
+testhi.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h
+testhi.o: ../cups/array.h help-index.h
+testtemplate.o: cgi.h ../cups/cups.h ../cups/file.h ../cups/versioning.h
+testtemplate.o: ../cups/ipp.h ../cups/http.h ../cups/array.h
+testtemplate.o: ../cups/language.h ../cups/array.h help-index.h
+websearch.o: cgi.h ../cups/cups.h ../cups/file.h ../cups/versioning.h
+websearch.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h
+websearch.o: ../cups/array.h help-index.h

cgi-bin/Makefile

@@ -3,7 +3,7 @@
 #
 #   CGI makefile for CUPS.
 #
-#   Copyright 2007-2012 by Apple Inc.
+#   Copyright 2007-2010 by Apple Inc.
 #   Copyright 1997-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -90,7 +90,7 @@ clean:
 #
 
 depend:
-	$(CC) -MM $(ALL_CFLAGS) $(OBJS:.o=.c) >Dependencies
+	makedepend -Y -I.. -fDependencies $(OBJS:.o=.c) >/dev/null 2>&1
 
 
 #

cgi-bin/admin.c

@@ -586,7 +586,8 @@ do_am_class(http_t *http,		/* I - HTTP connection */
     ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_ENUM, "printer-type",
 		  CUPS_PRINTER_LOCAL);
     ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_ENUM, "printer-type-mask",
-		  CUPS_PRINTER_CLASS | CUPS_PRINTER_REMOTE);
+		  CUPS_PRINTER_CLASS | CUPS_PRINTER_REMOTE |
+		      CUPS_PRINTER_IMPLICIT);
 
    /*
     * Do the request and get back a response...
@@ -1559,6 +1560,8 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     const char		*debug_logging,	/* DEBUG_LOGGING value */
 			*remote_admin,	/* REMOTE_ADMIN value */
 			*remote_any,	/* REMOTE_ANY value */
+			*remote_printers,
+					/* REMOTE_PRINTERS value */
 			*share_printers,/* SHARE_PRINTERS value */
 			*user_cancel_any,
 					/* USER_CANCEL_ANY value */
@@ -1574,6 +1577,10 @@ do_config_server(http_t *http)		/* I - HTTP connection */
 					/* MaxJobs value */
 			*max_log_size = NULL;
 					/* MaxLogSize value */
+    char		local_protocols[255],
+					/* BrowseLocalProtocols */
+			remote_protocols[255];
+					/* BrowseRemoteProtocols */
     const char		*current_browse_web_if,
 					/* BrowseWebIF value */
 			*current_preserve_job_history,
@@ -1584,8 +1591,12 @@ do_config_server(http_t *http)		/* I - HTTP connection */
 					/* MaxClients value */
 			*current_max_jobs,
 					/* MaxJobs value */
-			*current_max_log_size;
+			*current_max_log_size,
 					/* MaxLogSize value */
+			*current_local_protocols,
+					/* BrowseLocalProtocols */
+			*current_remote_protocols;
+					/* BrowseRemoteProtocols */
 #ifdef HAVE_GSSAPI
     char		default_auth_type[255];
 					/* DefaultAuthType value */
@@ -1600,6 +1611,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
     debug_logging        = cgiGetVariable("DEBUG_LOGGING") ? "1" : "0";
     remote_admin         = cgiGetVariable("REMOTE_ADMIN") ? "1" : "0";
     remote_any           = cgiGetVariable("REMOTE_ANY") ? "1" : "0";
+    remote_printers      = cgiGetVariable("REMOTE_PRINTERS") ? "1" : "0";
     share_printers       = cgiGetVariable("SHARE_PRINTERS") ? "1" : "0";
     user_cancel_any      = cgiGetVariable("USER_CANCEL_ANY") ? "1" : "0";
 
@@ -1625,6 +1637,66 @@ do_config_server(http_t *http)		/* I - HTTP connection */
 
       if (!max_log_size || atof(max_log_size) <= 0.0)
 	max_log_size = "1m";
+
+      if (cgiGetVariable("BROWSE_LOCAL_CUPS"))
+	strcpy(local_protocols, "cups");
+      else
+	local_protocols[0] = '\0';
+
+#ifdef HAVE_DNSSD
+      if (cgiGetVariable("BROWSE_LOCAL_DNSSD"))
+      {
+	if (local_protocols[0])
+	  strcat(local_protocols, " dnssd");
+	else
+	  strcat(local_protocols, "dnssd");
+      }
+#endif /* HAVE_DNSSD */
+
+#ifdef HAVE_LDAP
+      if (cgiGetVariable("BROWSE_LOCAL_LDAP"))
+      {
+	if (local_protocols[0])
+	  strcat(local_protocols, " ldap");
+	else
+	  strcat(local_protocols, "ldap");
+      }
+#endif /* HAVE_LDAP */
+
+#ifdef HAVE_LIBSLP
+      if (cgiGetVariable("BROWSE_LOCAL_SLP"))
+      {
+	if (local_protocols[0])
+	  strcat(local_protocols, " slp");
+	else
+	  strcat(local_protocols, "slp");
+      }
+#endif /* HAVE_SLP */
+
+      if (cgiGetVariable("BROWSE_REMOTE_CUPS"))
+	strcpy(remote_protocols, "cups");
+      else
+	remote_protocols[0] = '\0';
+
+#ifdef HAVE_LDAP
+      if (cgiGetVariable("BROWSE_REMOTE_LDAP"))
+      {
+	if (remote_protocols[0])
+	  strcat(remote_protocols, " ldap");
+	else
+	  strcat(remote_protocols, "ldap");
+      }
+#endif /* HAVE_LDAP */
+
+#ifdef HAVE_LIBSLP
+      if (cgiGetVariable("BROWSE_REMOTE_SLP"))
+      {
+	if (remote_protocols[0])
+	  strcat(remote_protocols, " slp");
+	else
+	  strcat(remote_protocols, "slp");
+      }
+#endif /* HAVE_SLP */
     }
 
    /*
@@ -1688,6 +1760,16 @@ do_config_server(http_t *http)		/* I - HTTP connection */
                                               settings)) == NULL)
       current_max_log_size = "1m";
 
+    if ((current_local_protocols = cupsGetOption("BrowseLocalProtocols",
+                                                 num_settings,
+						settings)) == NULL)
+      current_local_protocols = CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS;
+
+    if ((current_remote_protocols = cupsGetOption("BrowseRemoteProtocols",
+                                                  num_settings,
+						  settings)) == NULL)
+      current_remote_protocols = CUPS_DEFAULT_BROWSE_REMOTE_PROTOCOLS;
+
    /*
     * See if the settings have changed...
     */
@@ -1698,6 +1780,8 @@ do_config_server(http_t *http)		/* I - HTTP connection */
 						 num_settings, settings)) ||
 	      strcmp(remote_any, cupsGetOption(CUPS_SERVER_REMOTE_ANY,
 					       num_settings, settings)) ||
+	      strcmp(remote_printers, cupsGetOption(CUPS_SERVER_REMOTE_PRINTERS,
+						    num_settings, settings)) ||
 	      strcmp(share_printers, cupsGetOption(CUPS_SERVER_SHARE_PRINTERS,
 						   num_settings, settings)) ||
 #ifdef HAVE_GSSAPI
@@ -1709,7 +1793,9 @@ do_config_server(http_t *http)		/* I - HTTP connection */
 						    num_settings, settings));
 
     if (advanced && !changed)
-      changed = _cups_strcasecmp(browse_web_if, current_browse_web_if) ||
+      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) ||
@@ -1731,6 +1817,8 @@ do_config_server(http_t *http)		/* I - HTTP connection */
                                    remote_admin, num_settings, &settings);
       num_settings = cupsAddOption(CUPS_SERVER_REMOTE_ANY,
                                    remote_any, num_settings, &settings);
+      num_settings = cupsAddOption(CUPS_SERVER_REMOTE_PRINTERS,
+                                   remote_printers, num_settings, &settings);
       num_settings = cupsAddOption(CUPS_SERVER_SHARE_PRINTERS,
                                    share_printers, num_settings, &settings);
       num_settings = cupsAddOption(CUPS_SERVER_USER_CANCEL_ANY,
@@ -1746,6 +1834,12 @@ do_config_server(http_t *http)		/* I - HTTP connection */
         * Add advanced settings...
 	*/
 
+	if (_cups_strcasecmp(local_protocols, current_local_protocols))
+	  num_settings = cupsAddOption("BrowseLocalProtocols", local_protocols,
+				       num_settings, &settings);
+	if (_cups_strcasecmp(remote_protocols, current_remote_protocols))
+	  num_settings = cupsAddOption("BrowseRemoteProtocols", remote_protocols,
+				       num_settings, &settings);
 	if (_cups_strcasecmp(browse_web_if, current_browse_web_if))
 	  num_settings = cupsAddOption("BrowseWebIF", browse_web_if,
 				       num_settings, &settings);
@@ -1784,8 +1878,7 @@ do_config_server(http_t *http)		/* I - HTTP connection */
       else
       {
         if (advanced)
-	  cgiSetVariable("refresh_page", "5;URL=/admin/?OP=redirect&"
-	                                 "URL=/admin/?ADVANCEDSETTINGS=YES");
+	  cgiSetVariable("refresh_page", "5;URL=/admin/?OP=redirect&URL=/admin/?ADVANCEDSETTINGS=YES");
         else
 	  cgiSetVariable("refresh_page", "5;URL=/admin/?OP=redirect");
 	cgiStartHTML(cgiText(_("Change Settings")));
@@ -2266,7 +2359,8 @@ do_export(http_t *http)			/* I - HTTP connection */
                 "printer-type", 0);
 
   ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_ENUM,
-                "printer-type-mask", CUPS_PRINTER_CLASS | CUPS_PRINTER_REMOTE);
+                "printer-type-mask", CUPS_PRINTER_CLASS | CUPS_PRINTER_REMOTE |
+		                     CUPS_PRINTER_IMPLICIT);
 
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                "requested-attributes", NULL, "printer-name");
@@ -2602,6 +2696,10 @@ do_menu(http_t *http)			/* I - HTTP connection */
                            settings)) != NULL && atoi(val))
     cgiSetVariable("REMOTE_ANY", "CHECKED");
 
+  if ((val = cupsGetOption(CUPS_SERVER_REMOTE_PRINTERS, num_settings,
+                           settings)) != NULL && atoi(val))
+    cgiSetVariable("REMOTE_PRINTERS", "CHECKED");
+
   if ((val = cupsGetOption(CUPS_SERVER_SHARE_PRINTERS, num_settings,
                            settings)) != NULL && atoi(val))
     cgiSetVariable("SHARE_PRINTERS", "CHECKED");
@@ -2624,6 +2722,49 @@ do_menu(http_t *http)			/* I - HTTP connection */
   cgiSetVariable("HAVE_DNSSD", "1");
 #endif /* HAVE_DNSSD */
 
+#ifdef HAVE_LDAP
+  cgiSetVariable("HAVE_LDAP", "1");
+#endif /* HAVE_LDAP */
+
+#ifdef HAVE_LIBSLP
+  cgiSetVariable("HAVE_LIBSLP", "1");
+#endif /* HAVE_LIBSLP */
+
+  if ((val = cupsGetOption("BrowseRemoteProtocols", num_settings,
+                           settings)) == NULL)
+    if ((val = cupsGetOption("BrowseProtocols", num_settings,
+                           settings)) == NULL)
+      val = CUPS_DEFAULT_BROWSE_REMOTE_PROTOCOLS;
+
+  if (strstr(val, "cups") || strstr(val, "CUPS"))
+    cgiSetVariable("BROWSE_REMOTE_CUPS", "CHECKED");
+
+  if (strstr(val, "ldap") || strstr(val, "LDAP"))
+    cgiSetVariable("BROWSE_REMOTE_LDAP", "CHECKED");
+
+  if (strstr(val, "slp") || strstr(val, "SLP"))
+    cgiSetVariable("BROWSE_REMOTE_SLP", "CHECKED");
+
+  if ((val = cupsGetOption("BrowseLocalProtocols", num_settings,
+                           settings)) == NULL)
+    if ((val = cupsGetOption("BrowseProtocols", num_settings,
+                           settings)) == NULL)
+      val = CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS;
+
+  if (strstr(val, "cups") || strstr(val, "CUPS"))
+    cgiSetVariable("BROWSE_LOCAL_CUPS", "CHECKED");
+
+  if (strstr(val, "dnssd") || strstr(val, "DNSSD") ||
+      strstr(val, "dns-sd") || strstr(val, "DNS-SD") ||
+      strstr(val, "bonjour") || strstr(val, "BONJOUR"))
+    cgiSetVariable("BROWSE_LOCAL_DNSSD", "CHECKED");
+
+  if (strstr(val, "ldap") || strstr(val, "LDAP"))
+    cgiSetVariable("BROWSE_LOCAL_LDAP", "CHECKED");
+
+  if (strstr(val, "slp") || strstr(val, "SLP"))
+    cgiSetVariable("BROWSE_LOCAL_SLP", "CHECKED");
+
   if ((val = cupsGetOption("BrowseWebIF", num_settings,
                            settings)) == NULL)
     val = "No";

cgi-bin/cgi-private.h

@@ -3,7 +3,7 @@
  *
  *   Private CGI definitions for CUPS.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -21,7 +21,6 @@
 #include <cups/debug-private.h>
 #include <cups/language-private.h>
 #include <cups/string-private.h>
-#include <cups/ipp-private.h>	/* TODO: Update so we don't need this */
 
 
 /*

cgi-bin/help-index.c

@@ -161,8 +161,7 @@ static int		help_load_file(help_index_t *hi,
 static help_node_t	*help_new_node(const char *filename, const char *anchor,
 			               const char *section, const char *text,
 				       time_t mtime, off_t offset,
-				       size_t length)
-				       __attribute__((nonnull(1,3,4)));
+				       size_t length);
 static int		help_sort_by_name(help_node_t *p1, help_node_t *p2);
 static int		help_sort_by_score(help_node_t *p1, help_node_t *p2);
 static int		help_sort_words(help_word_t *w1, help_word_t *w2);
@@ -178,7 +177,7 @@ helpDeleteIndex(help_index_t *hi)	/* I - Help index */
   help_node_t	*node;			/* Current node */
 
 
-  DEBUG_printf(("helpDeleteIndex(hi=%p)", hi));
+  DEBUG_printf(("helpDeleteIndex(hi=%p)\n", hi));
 
   if (!hi)
     return;
@@ -210,8 +209,8 @@ helpFindNode(help_index_t *hi,		/* I - Index */
   help_node_t	key;			/* Search key */
 
 
-  DEBUG_printf(("helpFindNode(hi=%p, filename=\"%s\", anchor=\"%s\")",
-                hi, filename, anchor));
+  DEBUG_printf(("helpFindNode(hi=%p, filename=\"%s\", anchor=\"%s\")\n",
+                hi, filename ? filename : "(nil)", anchor ? anchor : "(nil)"));
 
  /*
   * Range check input...
@@ -260,7 +259,7 @@ helpLoadIndex(const char *hifile,	/* I - Index filename */
   help_word_t	*word;			/* Current word */
 
 
-  DEBUG_printf(("helpLoadIndex(hifile=\"%s\", directory=\"%s\")",
+  DEBUG_printf(("helpLoadIndex(hifile=\"%s\", directory=\"%s\")\n",
                 hifile, directory));
 
  /*
@@ -465,7 +464,7 @@ helpSaveIndex(help_index_t *hi,		/* I - Index */
   help_word_t	*word;			/* Current word */
 
 
-  DEBUG_printf(("helpSaveIndex(hi=%p, hifile=\"%s\")", hi, hifile));
+  DEBUG_printf(("helpSaveIndex(hi=%p, hifile=\"%s\")\n", hi, hifile));
 
  /*
   * Try creating a new index file...
@@ -546,8 +545,9 @@ helpSearchIndex(help_index_t *hi,	/* I - Index */
   int		matches;		/* Number of matches */
 
 
-  DEBUG_printf(("helpSearchIndex(hi=%p, query=\"%s\", filename=\"%s\")",
-                hi, query, filename));
+  DEBUG_printf(("helpSearchIndex(hi=%p, query=\"%s\", filename=\"%s\")\n",
+                hi, query ? query : "(nil)",
+		filename ? filename : "(nil)"));
 
  /*
   * Range check...
@@ -670,7 +670,7 @@ help_add_word(help_node_t *n,		/* I - Node */
 		key;			/* Search key */
 
 
-  DEBUG_printf(("2help_add_word(n=%p, text=\"%s\")", n, text));
+  DEBUG_printf(("help_add_word(n=%p, text=\"%s\")\n", n, text));
 
  /*
   * Create the words array as needed...
@@ -723,7 +723,7 @@ help_delete_node(help_node_t *n)	/* I - Node */
   help_word_t	*w;			/* Current word */
 
 
-  DEBUG_printf(("2help_delete_node(n=%p)", n));
+  DEBUG_printf(("help_delete_node(n=%p)\n", n));
 
   if (!n)
     return;
@@ -758,7 +758,7 @@ help_delete_node(help_node_t *n)	/* I - Node */
 static void
 help_delete_word(help_word_t *w)	/* I - Word */
 {
-  DEBUG_printf(("2help_delete_word(w=%p)", w));
+  DEBUG_printf(("help_delete_word(w=%p)\n", w));
 
   if (!w)
     return;
@@ -789,8 +789,8 @@ help_load_directory(
   help_node_t	*node;			/* Current node */
 
 
-  DEBUG_printf(("2help_load_directory(hi=%p, directory=\"%s\", relative=\"%s\")",
-                hi, directory, relative));
+  DEBUG_printf(("help_load_directory(hi=%p, directory=\"%s\", relative=\"%s\")\n",
+                hi, directory ? directory : "(nil)", relative ? relative : "(nil)"));
 
  /*
   * Open the directory and scan it...
@@ -901,8 +901,9 @@ help_load_file(
   int		wordlen;		/* Length of word */
 
 
-  DEBUG_printf(("2help_load_file(hi=%p, filename=\"%s\", relative=\"%s\", "
-                "mtime=%ld)", hi, filename, relative, mtime));
+  DEBUG_printf(("help_load_file(hi=%p, filename=\"%s\", relative=\"%s\", mtime=%ld)\n",
+                hi, filename ? filename : "(nil)",
+		relative ? relative : "(nil)", mtime));
 
   if ((fp = cupsFileOpen(filename, "r")) == NULL)
     return (-1);
@@ -1228,9 +1229,11 @@ help_new_node(const char   *filename,	/* I - Filename */
   help_node_t	*n;			/* Node */
 
 
-  DEBUG_printf(("2help_new_node(filename=\"%s\", anchor=\"%s\", text=\"%s\", "
-                "mtime=%ld, offset=%ld, length=%ld)", filename, anchor, text,
-                (long)mtime, (long)offset, (long)length));
+  DEBUG_printf(("help_new_node(filename=\"%s\", anchor=\"%s\", text=\"%s\", "
+                "mtime=%ld, offset=%ld, length=%ld)\n",
+                filename ? filename : "(nil)", anchor ? anchor : "(nil)",
+		text ? text : "(nil)", (long)mtime, (long)offset,
+		(long)length));
 
   n = (help_node_t *)calloc(1, sizeof(help_node_t));
   if (!n)
@@ -1259,9 +1262,9 @@ help_sort_by_name(help_node_t *n1,	/* I - First node */
   int		diff;			/* Difference */
 
 
-  DEBUG_printf(("2help_sort_by_name(n1=%p(%s#%s), n2=%p(%s#%s)",
-                n1, n1->filename, n1->anchor,
-		n2, n2->filename, n2->anchor));
+  DEBUG_printf(("help_sort_by_name(n1=%p(%s#%s), n2=%p(%s#%s)\n",
+                n1, n1->filename, n1->anchor ? n1->anchor : "",
+		n2, n2->filename, n2->anchor ? n2->anchor : ""));
 
   if ((diff = strcmp(n1->filename, n2->filename)) != 0)
     return (diff);
@@ -1288,10 +1291,10 @@ help_sort_by_score(help_node_t *n1,	/* I - First node */
   int		diff;			/* Difference */
 
 
-  DEBUG_printf(("2help_sort_by_score(n1=%p(%d \"%s\" \"%s\"), "
-                "n2=%p(%d \"%s\" \"%s\")",
-                n1, n1->score, n1->section, n1->text,
-                n2, n2->score, n2->section, n2->text));
+  DEBUG_printf(("help_sort_by_score(n1=%p(%d \"%s\" \"%s\"), "
+                "n2=%p(%d \"%s\" \"%s\")\n",
+                n1, n1->score, n1->section ? n1->section : "", n1->text,
+                n2, n2->score, n2->section ? n2->section : "", n2->text));
 
   if (n1->score != n2->score)
     return (n2->score - n1->score);
@@ -1316,7 +1319,7 @@ static int				/* O - Difference */
 help_sort_words(help_word_t *w1,	/* I - Second word */
                 help_word_t *w2)	/* I - Second word */
 {
-  DEBUG_printf(("2help_sort_words(w1=%p(\"%s\"), w2=%p(\"%s\"))",
+  DEBUG_printf(("help_sort_words(w1=%p(\"%s\"), w2=%p(\"%s\"))\n",
                 w1, w1->text, w2, w2->text));
 
   return (_cups_strcasecmp(w1->text, w2->text));

cgi-bin/help.c

@@ -39,7 +39,8 @@ main(int  argc,				/* I - Number of command-line arguments */
   const char	*query;			/* Search query */
   const char	*cache_dir;		/* CUPS_CACHEDIR environment variable */
   const char	*docroot;		/* CUPS_DOCROOT environment variable */
-  const char	*helpfile;		/* Current help file */
+  const char	*helpfile,		/* Current help file */
+		*helptitle = NULL;	/* Current help title */
   const char	*topic;			/* Current topic */
   char		topic_data[1024];	/* Topic form data */
   const char	*section;		/* Current section */
@@ -88,7 +89,7 @@ main(int  argc,				/* I - Number of command-line arguments */
     perror(filename);
 
     cgiStartHTML(cgiText(_("Online Help")));
-    cgiSetVariable("ERROR", "Unable to load help index!");
+    cgiSetVariable("ERROR", cgiText(_("Unable to load help index.")));
     cgiCopyTemplateLang("error.tmpl");
     cgiEndHTML();
 
@@ -129,7 +130,7 @@ main(int  argc,				/* I - Number of command-line arguments */
       perror(filename);
 
       cgiStartHTML(cgiText(_("Online Help")));
-      cgiSetVariable("ERROR", "Unable to access help file!");
+      cgiSetVariable("ERROR", cgiText(_("Unable to access help file.")));
       cgiCopyTemplateLang("error.tmpl");
       cgiEndHTML();
 
@@ -139,7 +140,7 @@ main(int  argc,				/* I - Number of command-line arguments */
     if ((n = helpFindNode(hi, helpfile, NULL)) == NULL)
     {
       cgiStartHTML(cgiText(_("Online Help")));
-      cgiSetVariable("ERROR", "Help file not in index!");
+      cgiSetVariable("ERROR", cgiText(_("Help file not in index.")));
       cgiCopyTemplateLang("error.tmpl");
       cgiEndHTML();
 
@@ -147,12 +148,11 @@ main(int  argc,				/* I - Number of command-line arguments */
     }
 
    /*
-    * Set the page title and save the help file...
+    * Save the page title and help file...
     */
 
-    cgiSetVariable("HELPFILE", helpfile);
-    cgiSetVariable("HELPTITLE", n->text);
-    cgiSetVariable("TOPIC", n->section);
+    helptitle = n->text;
+    topic     = n->section;
 
    /*
     * Send a standard page header...
@@ -170,6 +170,8 @@ main(int  argc,				/* I - Number of command-line arguments */
     */
 
     cgiStartHTML(cgiText(_("Online Help")));
+
+    topic = cgiGetVariable("TOPIC");
   }
 
  /*
@@ -180,7 +182,6 @@ main(int  argc,				/* I - Number of command-line arguments */
     cgiSetVariable("QUERY", "");
 
   query = cgiGetVariable("QUERY");
-  topic = cgiGetVariable("TOPIC");
   si    = helpSearchIndex(hi, query, topic, helpfile);
 
   cgiClearVariables();
@@ -188,6 +189,10 @@ main(int  argc,				/* I - Number of command-line arguments */
     cgiSetVariable("QUERY", query);
   if (topic)
     cgiSetVariable("TOPIC", topic);
+  if (helpfile)
+    cgiSetVariable("HELPFILE", helpfile);
+  if (helptitle)
+    cgiSetVariable("HELPTITLE", helptitle);
 
   fprintf(stderr, "DEBUG: query=\"%s\", topic=\"%s\"\n",
           query ? query : "(null)", topic ? topic : "(null)");
@@ -356,7 +361,7 @@ main(int  argc,				/* I - Number of command-line arguments */
     else
     {
       perror(filename);
-      cgiSetVariable("ERROR", "Unable to open help file.");
+      cgiSetVariable("ERROR", cgiText(_("Unable to open help file.")));
       cgiCopyTemplateLang("error.tmpl");
     }
   }

cgi-bin/var.c

@@ -167,6 +167,8 @@ cgiClearVariables(void)
   _cgi_var_t	*v;			/* Current variable */
 
 
+  fputs("DEBUG: cgiClearVariables called.\n", stderr);
+
   for (v = form_vars, i = form_count; i > 0; v ++, i --)
   {
     _cupsStrFree(v->name);
@@ -401,6 +403,8 @@ cgiSetArray(const char *name,		/* I - Name of variable */
   if (name == NULL || value == NULL || element < 0 || element > 100000)
     return;
 
+  fprintf(stderr, "DEBUG: cgiSetArray: %s[%d]=\"%s\"\n", name, element, value);
+
   if ((var = cgi_find_variable(name)) == NULL)
   {
     cgi_add_variable(name, element, value);
@@ -532,6 +536,8 @@ cgiSetVariable(const char *name,	/* I - Name of variable */
   if (name == NULL || value == NULL)
     return;
 
+  fprintf(stderr, "cgiSetVariable: %s=\"%s\"\n", name, value);
+
   if ((var = cgi_find_variable(name)) == NULL)
   {
     cgi_add_variable(name, 0, value);

conf/mime.convs.in

@@ -38,13 +38,51 @@
 # PostScript filters
 #
 
+@DEFAULT_PDFTOPS@application/pdf			application/vnd.cups-postscript	66	pdftops
 application/postscript		application/vnd.cups-postscript	66	pstops
+@DEFAULT_TEXTTOPS@application/x-cshell		application/postscript		33	texttops
+@DEFAULT_TEXTTOPS@application/x-csource		application/postscript		33	texttops
+@DEFAULT_TEXTTOPS@application/x-perl		application/postscript		33	texttops
+@DEFAULT_TEXTTOPS@application/x-shell		application/postscript		33	texttops
+@DEFAULT_TEXTTOPS@text/plain			application/postscript		33	texttops
+@DEFAULT_TEXTTOPS@text/css			application/postscript		33	texttops
+@DEFAULT_TEXTTOPS@text/html			application/postscript		33	texttops
+@DEFAULT_IMAGEFILTERS@image/gif			application/vnd.cups-postscript	66	imagetops
+@DEFAULT_IMAGEFILTERS@image/png			application/vnd.cups-postscript	66	imagetops
+@DEFAULT_IMAGEFILTERS@image/jpeg			application/vnd.cups-postscript	66	imagetops
+@DEFAULT_IMAGEFILTERS@image/tiff			application/vnd.cups-postscript	66	imagetops
+@DEFAULT_IMAGEFILTERS@image/x-bitmap			application/vnd.cups-postscript	66	imagetops
+@DEFAULT_IMAGEFILTERS@image/x-photocd			application/vnd.cups-postscript	66	imagetops
+@DEFAULT_IMAGEFILTERS@image/x-portable-anymap		application/vnd.cups-postscript	66	imagetops
+@DEFAULT_IMAGEFILTERS@image/x-portable-bitmap		application/vnd.cups-postscript	66	imagetops
+@DEFAULT_IMAGEFILTERS@image/x-portable-graymap	application/vnd.cups-postscript	66	imagetops
+@DEFAULT_IMAGEFILTERS@image/x-portable-pixmap		application/vnd.cups-postscript	66	imagetops
+@DEFAULT_IMAGEFILTERS@image/x-sgi-rgb			application/vnd.cups-postscript	66	imagetops
+@DEFAULT_IMAGEFILTERS@image/x-xbitmap			application/vnd.cups-postscript	66	imagetops
+@DEFAULT_IMAGEFILTERS@image/x-xpixmap			application/vnd.cups-postscript	66	imagetops
+@DEFAULT_IMAGEFILTERS@image/x-sun-raster		application/vnd.cups-postscript	66	imagetops
+@DEFAULT_BANNERTOPS@application/vnd.cups-banner	application/postscript		33	bannertops
 
 ########################################################################
 #
 # Raster filters...
 #
 
+@DEFAULT_IMAGEFILTERS@image/gif			application/vnd.cups-raster	100	imagetoraster
+@DEFAULT_IMAGEFILTERS@image/png			application/vnd.cups-raster	100	imagetoraster
+@DEFAULT_IMAGEFILTERS@image/jpeg			application/vnd.cups-raster	100	imagetoraster
+@DEFAULT_IMAGEFILTERS@image/tiff			application/vnd.cups-raster	100	imagetoraster
+@DEFAULT_IMAGEFILTERS@image/x-bitmap			application/vnd.cups-raster	100	imagetoraster
+@DEFAULT_IMAGEFILTERS@image/x-photocd			application/vnd.cups-raster	100	imagetoraster
+@DEFAULT_IMAGEFILTERS@image/x-portable-anymap		application/vnd.cups-raster	100	imagetoraster
+@DEFAULT_IMAGEFILTERS@image/x-portable-bitmap		application/vnd.cups-raster	100	imagetoraster
+@DEFAULT_IMAGEFILTERS@image/x-portable-graymap	application/vnd.cups-raster	100	imagetoraster
+@DEFAULT_IMAGEFILTERS@image/x-portable-pixmap		application/vnd.cups-raster	100	imagetoraster
+@DEFAULT_IMAGEFILTERS@image/x-sgi-rgb			application/vnd.cups-raster	100	imagetoraster
+@DEFAULT_IMAGEFILTERS@image/x-xbitmap			application/vnd.cups-raster	100	imagetoraster
+@DEFAULT_IMAGEFILTERS@image/x-xpixmap			application/vnd.cups-raster	100	imagetoraster
+@DEFAULT_IMAGEFILTERS@image/x-sun-raster		application/vnd.cups-raster	100	imagetoraster
+
 # PWG Raster filter for IPP Everywhere...
 application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 

config-scripts/cups-3264.m4

@@ -0,0 +1,140 @@
+dnl
+dnl "$Id: cups-3264.m4 9771 2011-05-12 05:21:56Z mike $"
+dnl
+dnl   32/64-bit library support stuff for CUPS.
+dnl
+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
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
+dnl
+
+dnl Setup support for separate 32/64-bit library generation...
+AC_ARG_ENABLE(32bit, [  --enable-32bit          generate 32-bit libraries on 32/64-bit systems])
+
+INSTALL32=""
+LIB32CUPS=""
+LIB32CUPSIMAGE=""
+LIB32DIR=""
+UNINSTALL32=""
+
+AC_SUBST(INSTALL32)
+AC_SUBST(LIB32CUPS)
+AC_SUBST(LIB32CUPSIMAGE)
+AC_SUBST(LIB32DIR)
+AC_SUBST(UNINSTALL32)
+
+AC_ARG_ENABLE(64bit, [  --enable-64bit          generate 64-bit libraries on 32/64-bit systems])
+
+INSTALL64=""
+LIB64CUPS=""
+LIB64CUPSIMAGE=""
+LIB64DIR=""
+UNINSTALL64=""
+
+AC_SUBST(INSTALL64)
+AC_SUBST(LIB64CUPS)
+AC_SUBST(LIB64CUPSIMAGE)
+AC_SUBST(LIB64DIR)
+AC_SUBST(UNINSTALL64)
+
+case "$uname" in
+	HP-UX*)
+		if test "x$enable_32bit" = xyes; then
+			# Build 32-bit libraries, 64-bit base...
+			INSTALL32="install32bit"
+			LIB32CUPS="32bit/libcups.so.2"
+			LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
+			LIB32DIR="$exec_prefix/lib"
+			if test -d /usr/lib/hpux32; then
+				LIB32DIR="${LIB32DIR}/hpux32"
+			fi
+			UNINSTALL32="uninstall32bit"
+		fi
+
+		if test "x$enable_64bit" = xyes; then
+			# Build 64-bit libraries, 32-bit base...
+			INSTALL64="install64bit"
+			LIB64CUPS="64bit/libcups.so.2"
+			LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
+			LIB64DIR="$exec_prefix/lib"
+			if test -d /usr/lib/hpux64; then
+				LIB64DIR="${LIB64DIR}/hpux64"
+			fi
+			UNINSTALL64="uninstall64bit"
+		fi
+		;;
+
+	IRIX)
+		if test "x$enable_32bit" = xyes; then
+			INSTALL32="install32bit"
+			LIB32CUPS="32bit/libcups.so.2"
+			LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
+			LIB32DIR="$prefix/lib32"
+			UNINSTALL32="uninstall32bit"
+		fi
+
+		if test "x$enable_64bit" = xyes; then
+			# Build 64-bit libraries, 32-bit base...
+			INSTALL64="install64bit"
+			LIB64CUPS="64bit/libcups.so.2"
+			LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
+			LIB64DIR="$prefix/lib64"
+			UNINSTALL64="uninstall64bit"
+		fi
+		;;
+
+	Linux*)
+		if test "x$enable_32bit" = xyes; then
+			# Build 32-bit libraries, 64-bit base...
+			INSTALL32="install32bit"
+			LIB32CUPS="32bit/libcups.so.2"
+			LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
+			LIB32DIR="$exec_prefix/lib"
+			if test -d /usr/lib32; then
+				LIB32DIR="${LIB32DIR}32"
+			fi
+			UNINSTALL32="uninstall32bit"
+		fi
+
+		if test "x$enable_64bit" = xyes; then
+			# Build 64-bit libraries, 32-bit base...
+			INSTALL64="install64bit"
+			LIB64CUPS="64bit/libcups.so.2"
+			LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
+			LIB64DIR="$exec_prefix/lib"
+			if test -d /usr/lib64; then
+				LIB64DIR="${LIB64DIR}64"
+			fi
+			UNINSTALL64="uninstall64bit"
+		fi
+		;;
+
+	SunOS*)
+		if test "x$enable_32bit" = xyes; then
+			# Build 32-bit libraries, 64-bit base...
+			INSTALL32="install32bit"
+			LIB32CUPS="32bit/libcups.so.2"
+			LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
+			LIB32DIR="$exec_prefix/lib/32"
+			UNINSTALL32="uninstall32bit"
+		fi
+
+		if test "x$enable_64bit" = xyes; then
+			# Build 64-bit libraries, 32-bit base...
+			INSTALL64="install64bit"
+			LIB64CUPS="64bit/libcups.so.2"
+			LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
+			LIB64DIR="$exec_prefix/lib/64"
+			UNINSTALL64="uninstall64bit"
+		fi
+		;;
+esac
+
+dnl
+dnl End of "$Id: cups-3264.m4 9771 2011-05-12 05:21:56Z mike $".
+dnl

config-scripts/cups-common.m4

@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-common.m4 10192 2012-01-20 21:49:02Z mike $"
+dnl "$Id: cups-common.m4 10466 2012-05-15 14:21:57Z mike $"
 dnl
 dnl   Common configuration stuff for CUPS.
 dnl
-dnl   Copyright 2007-2011 by Apple Inc.
+dnl   Copyright 2007-2012 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
@@ -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.6svn"
+CUPS_VERSION="1.5.4"
 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 ],
@@ -50,6 +50,7 @@ AC_PROG_CXX
 AC_PROG_RANLIB
 AC_PATH_PROG(AR,ar)
 AC_PATH_PROG(CHMOD,chmod)
+AC_PATH_PROG(GZIP,gzip)
 AC_PATH_PROG(HTMLDOC,htmldoc)
 AC_PATH_PROG(LD,ld)
 AC_PATH_PROG(LN,ln)
@@ -124,7 +125,6 @@ AC_SUBST(LIBPAPER)
 
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADER(stdlib.h,AC_DEFINE(HAVE_STDLIB_H))
 AC_CHECK_HEADER(crypt.h,AC_DEFINE(HAVE_CRYPT_H))
 AC_CHECK_HEADER(langinfo.h,AC_DEFINE(HAVE_LANGINFO_H))
 AC_CHECK_HEADER(malloc.h,AC_DEFINE(HAVE_MALLOC_H))
@@ -147,16 +147,6 @@ AC_CHECK_HEADER(iconv.h,
 		SAVELIBS="$SAVELIBS $LIBS")
 	LIBS="$SAVELIBS")
 
-dnl Checks for Mini-XML (www.minixml.org)...
-LIBMXML=""
-AC_CHECK_HEADER(mxml.h,
-	SAVELIBS="$LIBS"
-	AC_SEARCH_LIBS(mmxlNewElement,mxml,
-		AC_DEFINE(HAVE_MXML_H)
-		LIBMXML="-lmxml")
-	LIBS="$SAVELIBS")
-AC_SUBST(LIBMXML)
-
 dnl Checks for statfs and its many headers...
 AC_CHECK_HEADER(sys/mount.h,AC_DEFINE(HAVE_SYS_MOUNT_H))
 AC_CHECK_HEADER(sys/statfs.h,AC_DEFINE(HAVE_SYS_STATFS_H))
@@ -225,19 +215,20 @@ AC_ARG_ENABLE(libusb, [  --enable-libusb         use libusb for USB printing])
 LIBUSB=""
 AC_SUBST(LIBUSB)
 
-if test x$enable_libusb = xyes; then
-	check_libusb=yes
-elif test x$enable_libusb != xno -a $uname != Darwin; then
-	check_libusb=yes
-else
-	check_libusb=no
-fi
-
-if test $check_libusb = yes; then
-	AC_CHECK_LIB(usb, usb_get_string_simple,[
-		AC_CHECK_HEADER(usb.h,
-			AC_DEFINE(HAVE_USB_H)
-			LIBUSB="-lusb")])
+if test "x$PKGCONFIG" != x; then
+	if test x$enable_libusb = xyes -o $uname != Darwin; then
+		AC_MSG_CHECKING(for libusb-1.0)
+		if $PKGCONFIG --exists libusb-1.0; then
+			AC_MSG_RESULT(yes)
+			AC_DEFINE(HAVE_LIBUSB)
+			CFLAGS="$CFLAGS `$PKGCONFIG --cflags libusb-1.0`"
+			LIBUSB="`$PKGCONFIG --libs libusb-1.0`"
+		else
+			AC_MSG_RESULT(no)
+		fi
+	fi
+elif test x$enable_libusb = xyes; then
+	AC_MSG_ERROR(Need pkg-config to enable libusb support.)
 fi
 
 dnl See if we have libwrap for TCP wrappers support...
@@ -253,15 +244,6 @@ if test x$enable_tcp_wrappers = xyes; then
 			LIBWRAP="-lwrap")])
 fi
 
-dnl ZLIB
-LIBZ=""
-AC_CHECK_HEADER(zlib.h,
-    AC_CHECK_LIB(z, gzgets,
-	AC_DEFINE(HAVE_LIBZ)
-	LIBZ="-lz"
-	LIBS="$LIBS -lz"))
-AC_SUBST(LIBZ)
-
 dnl Flags for "ar" command...
 case $uname in
         Darwin* | *BSD*)
@@ -331,9 +313,11 @@ dnl Extra platform-specific libraries...
 CUPS_DEFAULT_PRINTOPERATOR_AUTH="@SYSTEM"
 CUPS_SYSTEM_AUTHKEY=""
 INSTALLXPC=""
+LEGACY_BACKENDS="parallel"
 
 case $uname in
         Darwin*)
+		LEGACY_BACKENDS=""
                 BACKLIBS="$BACKLIBS -framework IOKit"
                 SERVERLIBS="$SERVERLIBS -framework IOKit -weak_framework ApplicationServices"
                 LIBS="-framework SystemConfiguration -framework CoreFoundation -framework Security $LIBS"
@@ -423,6 +407,7 @@ AC_SUBST(CUPS_DEFAULT_PRINTOPERATOR_AUTH)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_PRINTOPERATOR_AUTH, "$CUPS_DEFAULT_PRINTOPERATOR_AUTH")
 AC_SUBST(CUPS_SYSTEM_AUTHKEY)
 AC_SUBST(INSTALLXPC)
+AC_SUBST(LEGACY_BACKENDS)
 
 dnl Check for build components
 COMPONENTS="all"
@@ -434,7 +419,7 @@ AC_ARG_WITH(components, [  --with-components       set components to build:
 
 case "$COMPONENTS" in
 	all)
-		BUILDDIRS="filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates"
+		BUILDDIRS="filter backend berkeley cgi-bin driver monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates"
 		;;
 
 	core)
@@ -449,5 +434,5 @@ esac
 AC_SUBST(BUILDDIRS)
 
 dnl
-dnl End of "$Id: cups-common.m4 10192 2012-01-20 21:49:02Z mike $".
+dnl End of "$Id: cups-common.m4 10466 2012-05-15 14:21:57Z mike $".
 dnl

config-scripts/cups-compiler.m4

@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-compiler.m4 10190 2012-01-20 16:22:58Z mike $"
+dnl "$Id: cups-compiler.m4 9981 2011-09-09 17:28:58Z mike $"
 dnl
 dnl   Compiler stuff for CUPS.
 dnl
-dnl   Copyright 2007-2012 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
@@ -66,8 +66,8 @@ fi
 
 if test -z "$with_ldarchflags"; then
 	if test "$uname" = Darwin; then
-		# Only create Intel programs by default
-		LDARCHFLAGS="`echo $ARCHFLAGS | sed -e '1,$s/-arch ppc64//'`"
+		# Only create 32-bit programs by default
+		LDARCHFLAGS="`echo $ARCHFLAGS | sed -e '1,$s/-arch x86_64//' -e '1,$s/-arch ppc64//'`"
 	else
 		LDARCHFLAGS="$ARCHFLAGS"
 	fi
@@ -78,6 +78,15 @@ fi
 AC_SUBST(ARCHFLAGS)
 AC_SUBST(LDARCHFLAGS)
 
+dnl Setup support for separate 32/64-bit library generation...
+AC_ARG_WITH(arch32flags, [  --with-arch32flags      set 32-bit architecture flags])
+ARCH32FLAGS=""
+AC_SUBST(ARCH32FLAGS)
+
+AC_ARG_WITH(arch64flags, [  --with-arch64flags      set 64-bit architecture flags])
+ARCH64FLAGS=""
+AC_SUBST(ARCH64FLAGS)
+
 dnl Read-only data/program support on Linux...
 AC_ARG_ENABLE(relro, [  --enable-relro          build with the GCC relro option])
 
@@ -91,6 +100,9 @@ AC_SUBST(PIEFLAGS)
 RELROFLAGS=""
 AC_SUBST(RELROFLAGS)
 
+PHPOPTIONS=""
+AC_SUBST(PHPOPTIONS)
+
 if test -n "$GCC"; then
 	# Add GCC-specific compiler options...
 	if test -z "$OPTIM"; then
@@ -145,6 +157,7 @@ if test -n "$GCC"; then
 		# Additional warning options for development testing...
 		if test -d .svn; then
 			OPTIM="-Wshadow -Werror $OPTIM"
+			PHPOPTIONS="-Wno-shadow"
 		else
 			AC_MSG_CHECKING(if GCC supports -Wno-tautological-compare)
 			OLDCFLAGS="$CFLAGS"
@@ -167,12 +180,154 @@ if test -n "$GCC"; then
 			CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
 			;;
 
+		HP-UX*)
+			if test "x$enable_32bit" = xyes; then
+				# Build 32-bit libraries, 64-bit base...
+				if test -z "$with_arch32flags"; then
+					ARCH32FLAGS="-milp32"
+				else
+					ARCH32FLAGS="$with_arch32flags"
+				fi
+
+				if test -z "$with_archflags"; then
+					if test -z "$with_arch64flags"; then
+						ARCHFLAGS="-mlp64"
+					else
+						ARCHFLAGS="$with_arch64flags"
+					fi
+				fi
+			fi
+
+			if test "x$enable_64bit" = xyes; then
+				# Build 64-bit libraries, 32-bit base...
+				if test -z "$with_arch64flags"; then
+					ARCH64FLAGS="-mlp64"
+				else
+					ARCH64FLAGS="$with_arch64flags"
+				fi
+
+				if test -z "$with_archflags"; then
+					if test -z "$with_arch32flags"; then
+						ARCHFLAGS="-milp32"
+					else
+						ARCHFLAGS="$with_arch32flags"
+					fi
+				fi
+			fi
+			;;
+
+		IRIX)
+			if test "x$enable_32bit" = xyes; then
+				# Build 32-bit libraries, 64-bit base...
+				if test -z "$with_arch32flags"; then
+					ARCH32FLAGS="-n32 -mips3"
+				else
+					ARCH32FLAGS="$with_arch32flags"
+				fi
+
+				if test -z "$with_archflags"; then
+					if test -z "$with_arch64flags"; then
+						ARCHFLAGS="-64 -mips4"
+					else
+						ARCHFLAGS="$with_arch64flags"
+					fi
+				fi
+			fi
+
+			if test "x$enable_64bit" = xyes; then
+				# Build 64-bit libraries, 32-bit base...
+				if test -z "$with_arch64flags"; then
+					ARCH64FLAGS="-64 -mips4"
+				else
+					ARCH64FLAGS="$with_arch64flags"
+				fi
+
+				if test -z "$with_archflags"; then
+					if test -z "$with_arch32flags"; then
+						ARCHFLAGS="-n32 -mips3"
+					else
+						ARCHFLAGS="$with_arch32flags"
+					fi
+				fi
+			fi
+			;;
+
 		Linux*)
 			# The -z relro option is provided by the Linux linker command to
 			# make relocatable data read-only.
 			if test x$enable_relro = xyes; then
 				RELROFLAGS="-Wl,-z,relro"
 			fi
+
+			if test "x$enable_32bit" = xyes; then
+				# Build 32-bit libraries, 64-bit base...
+				if test -z "$with_arch32flags"; then
+					ARCH32FLAGS="-m32"
+				else
+					ARCH32FLAGS="$with_arch32flags"
+				fi
+
+				if test -z "$with_archflags"; then
+					if test -z "$with_arch64flags"; then
+						ARCHFLAGS="-m64"
+					else
+						ARCHFLAGS="$with_arch64flags"
+					fi
+				fi
+			fi
+
+			if test "x$enable_64bit" = xyes; then
+				# Build 64-bit libraries, 32-bit base...
+				if test -z "$with_arch64flags"; then
+					ARCH64FLAGS="-m64"
+				else
+					ARCH64FLAGS="$with_arch64flags"
+				fi
+
+				if test -z "$with_archflags"; then
+					if test -z "$with_arch32flags"; then
+						ARCHFLAGS="-m32"
+					else
+						ARCHFLAGS="$with_arch32flags"
+					fi
+				fi
+			fi
+			;;
+
+		SunOS*)
+			if test "x$enable_32bit" = xyes; then
+				# Build 32-bit libraries, 64-bit base...
+				if test -z "$with_arch32flags"; then
+					ARCH32FLAGS="-m32"
+				else
+					ARCH32FLAGS="$with_arch32flags"
+				fi
+
+				if test -z "$with_archflags"; then
+					if test -z "$with_arch64flags"; then
+						ARCHFLAGS="-m64"
+					else
+						ARCHFLAGS="$with_arch64flags"
+					fi
+				fi
+			fi
+
+			if test "x$enable_64bit" = xyes; then
+				# Build 64-bit libraries, 32-bit base...
+				if test -z "$with_arch64flags"; then
+					ARCH64FLAGS="-m64"
+				else
+					ARCH64FLAGS="$with_arch64flags"
+				fi
+
+				if test -z "$with_archflags"; then
+					if test -z "$with_arch32flags"; then
+						ARCHFLAGS="-m32"
+					else
+						ARCHFLAGS="$with_arch32flags"
+					fi
+				fi
+			fi
 			;;
 	esac
 else
@@ -201,6 +356,40 @@ else
 			if test $PICFLAG = 1; then
 				OPTIM="+z $OPTIM"
 			fi
+
+			if test "x$enable_32bit" = xyes; then
+				# Build 32-bit libraries, 64-bit base...
+				if test -z "$with_arch32flags"; then
+					ARCH32FLAGS="+DD32"
+				else
+					ARCH32FLAGS="$with_arch32flags"
+				fi
+
+				if test -z "$with_archflags"; then
+					if test -z "$with_arch64flags"; then
+						ARCHFLAGS="+DD64"
+					else
+						ARCHFLAGS="$with_arch64flags"
+					fi
+				fi
+			fi
+
+			if test "x$enable_64bit" = xyes; then
+				# Build 64-bit libraries, 32-bit base...
+				if test -z "$with_arch64flags"; then
+					ARCH64FLAGS="+DD64"
+				else
+					ARCH64FLAGS="$with_arch64flags"
+				fi
+
+				if test -z "$with_archflags"; then
+					if test -z "$with_arch32flags"; then
+						ARCHFLAGS="+DD32"
+					else
+						ARCHFLAGS="$with_arch32flags"
+					fi
+				fi
+			fi
 			;;
         	IRIX)
 			if test -z "$OPTIM"; then
@@ -214,6 +403,40 @@ else
 			if test "x$with_optim" = x; then
 				OPTIM="-fullwarn -woff 1183,1209,1349,1506,3201 $OPTIM"
 			fi
+
+			if test "x$enable_32bit" = xyes; then
+				# Build 32-bit libraries, 64-bit base...
+				if test -z "$with_arch32flags"; then
+					ARCH32FLAGS="-n32 -mips3"
+				else
+					ARCH32FLAGS="$with_arch32flags"
+				fi
+
+				if test -z "$with_archflags"; then
+					if test -z "$with_arch64flags"; then
+						ARCHFLAGS="-64 -mips4"
+					else
+						ARCHFLAGS="$with_arch64flags"
+					fi
+				fi
+			fi
+
+			if test "x$enable_64bit" = xyes; then
+				# Build 64-bit libraries, 32-bit base...
+				if test -z "$with_arch64flags"; then
+					ARCH64FLAGS="-64 -mips4"
+				else
+					ARCH64FLAGS="$with_arch64flags"
+				fi
+
+				if test -z "$with_archflags"; then
+					if test -z "$with_arch32flags"; then
+						ARCHFLAGS="-n32 -mips3"
+					else
+						ARCHFLAGS="$with_arch32flags"
+					fi
+				fi
+			fi
 			;;
 		OSF*)
 			# Tru64 UNIX aka Digital UNIX aka OSF/1
@@ -238,6 +461,47 @@ else
 			if test $PICFLAG = 1; then
 				OPTIM="-KPIC $OPTIM"
 			fi
+
+			if test "x$enable_32bit" = xyes; then
+				# Compiling on a Solaris system, build 64-bit
+				# binaries with separate 32-bit libraries...
+				ARCH32FLAGS="-xarch=generic"
+
+				if test "x$with_optim" = x; then
+					# Suppress all of Sun's questionable
+					# warning messages, and default to
+					# 64-bit compiles of everything else...
+					OPTIM="-w $OPTIM"
+				fi
+
+				if test -z "$with_archflags"; then
+					if test -z "$with_arch64flags"; then
+						ARCHFLAGS="-xarch=generic64"
+					else
+						ARCHFLAGS="$with_arch64flags"
+					fi
+				fi
+			else
+				if test "x$enable_64bit" = xyes; then
+					# Build 64-bit libraries...
+					ARCH64FLAGS="-xarch=generic64"
+				fi
+
+				if test "x$with_optim" = x; then
+					# Suppress all of Sun's questionable
+					# warning messages, and default to
+					# 32-bit compiles of everything else...
+					OPTIM="-w $OPTIM"
+				fi
+
+				if test -z "$with_archflags"; then
+					if test -z "$with_arch32flags"; then
+						ARCHFLAGS="-xarch=generic"
+					else
+						ARCHFLAGS="$with_arch32flags"
+					fi
+				fi
+			fi
 			;;
 		UNIX_SVR*)
 			# UnixWare
@@ -295,5 +559,5 @@ case $uname in
 esac
 
 dnl
-dnl End of "$Id: cups-compiler.m4 10190 2012-01-20 16:22:58Z mike $".
+dnl End of "$Id: cups-compiler.m4 9981 2011-09-09 17:28:58Z mike $".
 dnl

config-scripts/cups-defaults.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-defaults.m4 10104 2011-11-04 06:37:03Z mike $"
+dnl "$Id: cups-defaults.m4 9750 2011-05-06 22:53:53Z mike $"
 dnl
 dnl   Default cupsd configuration settings for CUPS.
 dnl
@@ -64,6 +64,7 @@ AC_ARG_WITH(fatal_errors, [  --with-fatal-errors     set default FatalErrors val
 AC_SUBST(CUPS_FATAL_ERRORS)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_FATAL_ERRORS, "$CUPS_FATAL_ERRORS")
 
+
 dnl Default LogLevel
 AC_ARG_WITH(log_level, [  --with-log-level        set default LogLevel value, default=warn],
 	CUPS_LOG_LEVEL="$withval",
@@ -90,16 +91,16 @@ fi
 AC_SUBST(CUPS_BROWSING)
 
 dnl Default BrowseLocalProtocols
-AC_ARG_WITH(local_protocols, [  --with-local-protocols  set default BrowseLocalProtocols, default=""],
+AC_ARG_WITH(local_protocols, [  --with-local-protocols  set default BrowseLocalProtocols, default="CUPS"],
 	default_local_protocols="$withval",
 	default_local_protocols="default")
 
 if test x$with_local_protocols != xno; then
 	if test "x$default_local_protocols" = "xdefault"; then
 		if test "x$DNSSDLIBS" != "x"; then
-			CUPS_BROWSE_LOCAL_PROTOCOLS="dnssd"
-		else
-			CUPS_BROWSE_LOCAL_PROTOCOLS=""
+		CUPS_BROWSE_LOCAL_PROTOCOLS="CUPS dnssd"
+	else
+		CUPS_BROWSE_LOCAL_PROTOCOLS="CUPS"
 		fi
 	else
 		CUPS_BROWSE_LOCAL_PROTOCOLS="$default_local_protocols"
@@ -112,6 +113,41 @@ AC_SUBST(CUPS_BROWSE_LOCAL_PROTOCOLS)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS,
 	"$CUPS_BROWSE_LOCAL_PROTOCOLS")
 
+dnl Default BrowseRemoteProtocols
+AC_ARG_WITH(remote_protocols, [  --with-remote-protocols set default BrowseRemoteProtocols, default="CUPS"],
+	default_remote_protocols="$withval",
+	default_remote_protocols="default")
+
+if test x$with_remote_protocols != xno; then
+	if test "x$default_remote_protocols" = "xdefault"; then
+		if test "$uname" = "Darwin" -a $uversion -ge 90; then
+			CUPS_BROWSE_REMOTE_PROTOCOLS=""
+		else
+			CUPS_BROWSE_REMOTE_PROTOCOLS="CUPS"
+		fi
+	else
+		CUPS_BROWSE_REMOTE_PROTOCOLS="$default_remote_protocols"
+	fi
+else
+	CUPS_BROWSE_REMOTE_PROTOCOLS=""
+fi
+
+AC_SUBST(CUPS_BROWSE_REMOTE_PROTOCOLS)
+AC_DEFINE_UNQUOTED(CUPS_DEFAULT_BROWSE_REMOTE_PROTOCOLS,
+	"$CUPS_BROWSE_REMOTE_PROTOCOLS")
+
+dnl Default BrowseShortNames
+AC_ARG_ENABLE(browse_short, [  --disable-browse-short-names
+			  disable BrowseShortNames by default])
+if test "x$enable_browse_short" = xno; then
+	CUPS_BROWSE_SHORT_NAMES="No"
+	AC_DEFINE_UNQUOTED(CUPS_DEFAULT_BROWSE_SHORT_NAMES, 0)
+else
+	CUPS_BROWSE_SHORT_NAMES="Yes"
+	AC_DEFINE_UNQUOTED(CUPS_DEFAULT_BROWSE_SHORT_NAMES, 1)
+fi
+AC_SUBST(CUPS_BROWSE_SHORT_NAMES)
+
 dnl Default DefaultShared
 AC_ARG_ENABLE(default_shared, [  --disable-default-shared
 			  disable DefaultShared by default])
@@ -124,6 +160,38 @@ else
 fi
 AC_SUBST(CUPS_DEFAULT_SHARED)
 
+dnl Default ImplicitClasses
+AC_ARG_ENABLE(implicit, [  --disable-implicit-classes
+                          disable ImplicitClasses by default])
+if test "x$enable_implicit" = xno; then
+	CUPS_IMPLICIT_CLASSES="No"
+	AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IMPLICIT_CLASSES, 0)
+else
+	CUPS_IMPLICIT_CLASSES="Yes"
+	AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IMPLICIT_CLASSES, 1)
+fi
+AC_SUBST(CUPS_IMPLICIT_CLASSES)
+
+dnl Default UseNetworkDefault
+AC_ARG_ENABLE(use_network_default, [  --enable-use-network-default
+                          set UseNetworkDefault to Yes by default])
+if test "x$enable_use_network_default" != xno; then
+	AC_MSG_CHECKING(whether to use network default printers)
+	if test "x$enable_use_network_default" = xyes -o $uname != Darwin; then
+		CUPS_USE_NETWORK_DEFAULT="Yes"
+		AC_DEFINE_UNQUOTED(CUPS_DEFAULT_USE_NETWORK_DEFAULT, 1)
+		AC_MSG_RESULT(yes)
+	else
+		CUPS_USE_NETWORK_DEFAULT="No"
+		AC_DEFINE_UNQUOTED(CUPS_DEFAULT_USE_NETWORK_DEFAULT, 0)
+		AC_MSG_RESULT(no)
+	fi
+else
+	CUPS_USE_NETWORK_DEFAULT="No"
+	AC_DEFINE_UNQUOTED(CUPS_DEFAULT_USE_NETWORK_DEFAULT, 0)
+fi
+AC_SUBST(CUPS_USE_NETWORK_DEFAULT)
+
 dnl Determine the correct username and group for this OS...
 AC_ARG_WITH(cups_user, [  --with-cups-user        set default user for CUPS],
 	CUPS_USER="$withval",
@@ -366,6 +434,52 @@ AC_ARG_WITH(ipp-port, [  --with-ipp-port         set port number for IPP, defaul
 AC_SUBST(DEFAULT_IPP_PORT)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT)
 
+dnl Filters
+AC_ARG_ENABLE(bannertops, [  --enable-bannertops     always build the banner filter ])
+AC_ARG_ENABLE(texttops, [  --enable-texttops       always build the text filter ])
+
+if test "x$enable_bannertops" = xno; then
+	BANNERTOPS=""
+	DEFAULT_BANNERTOPS="#"
+elif test "x$enable_bannertops" = xyes; then
+	BANNERTOPS="bannertops"
+	DEFAULT_BANNERTOPS=""
+elif test $uname = Darwin; then
+	BANNERTOPS=""
+	DEFAULT_BANNERTOPS="#"
+else
+	BANNERTOPS="bannertops"
+	DEFAULT_BANNERTOPS=""
+fi
+
+if test "x$enable_texttops" = xno; then
+	TEXTTOPS=""
+	DEFAULT_TEXTTOPS="#"
+elif test "x$enable_texttops" = xyes; then
+	TEXTTOPS="texttops"
+	DEFAULT_TEXTTOPS=""
+elif test $uname = Darwin; then
+	TEXTTOPS=""
+	DEFAULT_TEXTTOPS="#"
+else
+	TEXTTOPS="texttops"
+	DEFAULT_TEXTTOPS=""
+fi
+
+AC_SUBST(BANNERTOPS)
+AC_SUBST(DEFAULT_BANNERTOPS)
+AC_SUBST(DEFAULT_TEXTTOPS)
+AC_SUBST(TEXTTOPS)
+
+dnl Fonts
+if test "x$BANNERTOPS" = x -a "x$TEXTTOPS" = x; then
+	FONTS=""
+else
+	FONTS="fonts"
+fi
+
+AC_SUBST(FONTS)
+
 dnl Web interface...
 AC_ARG_ENABLE(webif, [  --enable-webif          enable the web interface by default, default=no for Mac OS X])
 case "x$enable_webif" in
@@ -392,5 +506,5 @@ AC_SUBST(CUPS_WEBIF)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_WEBIF, $CUPS_DEFAULT_WEBIF)
 
 dnl
-dnl End of "$Id: cups-defaults.m4 10104 2011-11-04 06:37:03Z mike $".
+dnl End of "$Id: cups-defaults.m4 9750 2011-05-06 22:53:53Z mike $".
 dnl

config-scripts/cups-gssapi.m4

@@ -1,5 +1,5 @@
 dnl
-dnl   "$Id: cups-gssapi.m4 10137 2011-12-02 04:04:49Z mike $"
+dnl   "$Id: cups-gssapi.m4 10083 2011-10-19 20:21:16Z mike $"
 dnl
 dnl   GSSAPI/Kerberos library detection for CUPS.
 dnl
@@ -163,9 +163,8 @@ else
 	CUPS_DEFAULT_GSSSERVICENAME=""
 fi
 
-AC_SUBST(CUPS_DEFAULT_GSSSERVICENAME)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_GSSSERVICENAME, "$CUPS_DEFAULT_GSSSERVICENAME")
 
 dnl
-dnl End of "$Id: cups-gssapi.m4 10137 2011-12-02 04:04:49Z mike $".
+dnl End of "$Id: cups-gssapi.m4 10083 2011-10-19 20:21:16Z mike $".
 dnl

config-scripts/cups-image.m4

@@ -0,0 +1,117 @@
+dnl
+dnl "$Id: cups-image.m4 10317 2012-03-01 00:05:55Z mike $"
+dnl
+dnl   Image library/filter stuff for CUPS.
+dnl
+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
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
+dnl
+
+dnl See if we want the image filters included at all...
+AC_ARG_ENABLE(image, [  --enable-image          always build the image filters])
+
+DEFAULT_IMAGEFILTERS="#"
+IMGFILTERS=""
+if test "x$enable_image" != xno; then
+        AC_MSG_CHECKING(whether to build image filters)
+        if test "x$enable_image" = xyes -o $uname != Darwin; then
+		IMGFILTERS="imagetops imagetoraster"
+		DEFAULT_IMAGEFILTERS=""
+                AC_MSG_RESULT(yes)
+        else
+                AC_MSG_RESULT(no)
+        fi
+fi
+
+AC_SUBST(DEFAULT_IMAGEFILTERS)
+AC_SUBST(IMGFILTERS)
+
+dnl Check for image libraries...
+AC_ARG_ENABLE(jpeg, [  --disable-jpeg          disable JPEG support])
+AC_ARG_ENABLE(png, [  --disable-png           disable PNG support])
+AC_ARG_ENABLE(tiff, [  --disable-tiff          disable TIFF support])
+
+LIBJPEG=""
+LIBPNG=""
+LIBTIFF=""
+LIBZ=""
+
+AC_SUBST(LIBJPEG)
+AC_SUBST(LIBPNG)
+AC_SUBST(LIBTIFF)
+AC_SUBST(LIBZ)
+
+dnl Image libraries use math library functions...
+AC_SEARCH_LIBS(pow, m)
+
+dnl Save the current libraries since we don't want the image libraries
+dnl included with every program...
+SAVELIBS="$LIBS"
+
+dnl JPEG library...
+if test x$enable_jpeg != xno; then
+    AC_CHECK_HEADER(jpeglib.h,
+	AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
+	    AC_DEFINE(HAVE_LIBJPEG)
+	    LIBJPEG="-ljpeg"
+	    LIBS="$LIBS -ljpeg"))
+else
+    AC_MSG_NOTICE([JPEG support disabled with --disable-jpeg.])
+fi
+
+dnl ZLIB library...
+INSTALL_GZIP=""
+AC_CHECK_HEADER(zlib.h,
+    AC_CHECK_LIB(z, gzgets,
+	AC_DEFINE(HAVE_LIBZ)
+	LIBZ="-lz"
+	LIBS="$LIBS -lz"
+	if test "x$GZIP" != x; then
+		INSTALL_GZIP="-z"
+	fi))
+AC_SUBST(INSTALL_GZIP)
+
+dnl PNG library...
+if test x$enable_png != xno; then
+    AC_CHECK_HEADER(png.h,
+	AC_CHECK_LIB(png, png_create_read_struct,
+	    AC_DEFINE(HAVE_LIBPNG)
+	    LIBPNG="-lpng"))
+else
+    AC_MSG_NOTICE([PNG support disabled with --disable-png.])
+fi
+
+dnl TIFF library...
+if test x$enable_tiff != xno; then
+    AC_CHECK_HEADER(tiff.h,
+	AC_CHECK_LIB(tiff, TIFFReadScanline,
+	AC_DEFINE(HAVE_LIBTIFF)
+	LIBTIFF="-ltiff"))
+else
+    AC_MSG_NOTICE([TIFF support disabled with --disable-tiff.])
+fi
+
+dnl Restore original LIBS settings...
+LIBS="$SAVELIBS"
+
+EXPORT_LIBJPEG="$LIBJPEG"
+EXPORT_LIBPNG="$LIBPNG"
+EXPORT_LIBTIFF="$LIBTIFF"
+EXPORT_LIBZ="$LIBZ"
+
+AC_SUBST(EXPORT_LIBJPEG)
+AC_SUBST(EXPORT_LIBPNG)
+AC_SUBST(EXPORT_LIBTIFF)
+AC_SUBST(EXPORT_LIBZ)
+
+AC_CHECK_HEADER(stdlib.h,AC_DEFINE(HAVE_STDLIB_H))
+
+dnl
+dnl End of "$Id: cups-image.m4 10317 2012-03-01 00:05:55Z mike $".
+dnl

config-scripts/cups-ldap.m4

@@ -0,0 +1,52 @@
+dnl
+dnl "$Id: cups-ldap.m4 9771 2011-05-12 05:21:56Z mike $"
+dnl
+dnl   LDAP configuration stuff for CUPS.
+dnl
+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
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
+dnl
+
+AC_ARG_ENABLE(ldap, [  --disable-ldap          disable LDAP support])
+AC_ARG_WITH(ldap-libs, [  --with-ldap-libs        set directory for LDAP library],
+    LDFLAGS="-L$withval $LDFLAGS"
+    DSOFLAGS="-L$withval $DSOFLAGS",)
+AC_ARG_WITH(ldap-includes, [  --with-ldap-includes    set directory for LDAP includes],
+    CFLAGS="-I$withval $CFLAGS"
+    CPPFLAGS="-I$withval $CPPFLAGS",)
+
+LIBLDAP=""
+
+if test x$enable_ldap != xno; then
+    AC_CHECK_HEADER(ldap.h, [
+	AC_CHECK_LIB(ldap, ldap_initialize,
+	    AC_DEFINE(HAVE_LDAP)
+	    AC_DEFINE(HAVE_OPENLDAP)
+	    LIBLDAP="-lldap"
+	    AC_CHECK_LIB(ldap, ldap_start_tls,
+		AC_DEFINE(HAVE_LDAP_SSL)),
+
+	    AC_CHECK_LIB(ldap, ldap_init,
+		AC_DEFINE(HAVE_LDAP)
+		AC_DEFINE(HAVE_MOZILLA_LDAP)
+		LIBLDAP="-lldap"
+		AC_CHECK_HEADER(ldap_ssl.h, AC_DEFINE(HAVE_LDAP_SSL_H),,[#include <ldap.h>])
+		AC_CHECK_LIB(ldap, ldapssl_init,
+		    AC_DEFINE(HAVE_LDAP_SSL)))
+	)
+	AC_CHECK_LIB(ldap, ldap_set_rebind_proc, AC_DEFINE(HAVE_LDAP_REBIND_PROC))
+    ])
+fi
+
+AC_SUBST(LIBLDAP)
+
+
+dnl
+dnl End of "$Id: cups-ldap.m4 9771 2011-05-12 05:21:56Z mike $".
+dnl

config-scripts/cups-pdf.m4

@@ -0,0 +1,113 @@
+dnl
+dnl "$Id: cups-pdf.m4 9750 2011-05-06 22:53:53Z mike $"
+dnl
+dnl   PDF filter configuration stuff for CUPS.
+dnl
+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
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
+dnl
+
+AC_ARG_WITH(pdftops, [  --with-pdftops          set pdftops filter (gs,/path/to/gs,pdftops,/path/to/pdftops,none), default=pdftops ])
+
+PDFTOPS=""
+CUPS_PDFTOPS=""
+CUPS_GHOSTSCRIPT=""
+
+case "x$with_pdftops" in
+	x) # Default/auto
+	if test $uname != Darwin; then
+		AC_PATH_PROG(CUPS_PDFTOPS, pdftops)
+		if test "x$CUPS_PDFTOPS" != x; then
+			AC_DEFINE(HAVE_PDFTOPS)
+			PDFTOPS="pdftops"
+		else
+			AC_PATH_PROG(CUPS_GHOSTSCRIPT, gs)
+			if test "x$CUPS_GHOSTSCRIPT" != x; then
+				AC_DEFINE(HAVE_GHOSTSCRIPT)
+				PDFTOPS="pdftops"
+			fi
+		fi
+	fi
+	;;
+
+	xgs)
+	AC_PATH_PROG(CUPS_GHOSTSCRIPT, gs)
+	if test "x$CUPS_GHOSTSCRIPT" != x; then
+		AC_DEFINE(HAVE_GHOSTSCRIPT)
+		PDFTOPS="pdftops"
+	else
+		AC_MSG_ERROR(Unable to find gs program!)
+		exit 1
+	fi
+	;;
+
+	x/*/gs) # Use /path/to/gs without any check:
+	CUPS_GHOSTSCRIPT="$with_pdftops"
+	AC_DEFINE(HAVE_GHOSTSCRIPT)
+	PDFTOPS="pdftops"
+	;;
+
+	xpdftops)
+	AC_PATH_PROG(CUPS_PDFTOPS, pdftops)
+	if test "x$CUPS_PDFTOPS" != x; then
+		AC_DEFINE(HAVE_PDFTOPS)
+		PDFTOPS="pdftops"
+	else
+		AC_MSG_ERROR(Unable to find pdftops program!)
+		exit 1
+	fi
+	;;
+
+	x/*/pdftops) # Use /path/to/pdftops without any check:
+	CUPS_PDFTOPS="$with_pdftops"
+	AC_DEFINE(HAVE_PDFTOPS)
+	PDFTOPS="pdftops"
+	;;
+
+	xnone) # Make no pdftops filter if with_pdftops=none:
+	;;
+
+	*) # Invalid with_pdftops value:
+	AC_MSG_ERROR(Invalid with_pdftops value!)
+	exit 1
+	;;
+esac
+
+if test "x$CUPS_PDFTOPS" != x; then
+	AC_MSG_CHECKING(whether pdftops supports -origpagesizes)
+	if ($CUPS_PDFTOPS -h 2>&1 | grep -q -- -origpagesizes); then
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_PDFTOPS_WITH_ORIGPAGESIZES)
+	else
+		AC_MSG_RESULT(no)
+	fi
+
+	DEFAULT_PDFTOPS=""
+elif test "x$CUPS_GHOSTSCRIPT" != x; then
+	AC_MSG_CHECKING(whether gs supports the ps2write device)
+	if ($CUPS_GHOSTSCRIPT -h 2>&1 | grep -q ps2write); then
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_GHOSTSCRIPT_PS2WRITE)
+	else
+		AC_MSG_RESULT(no)
+	fi
+
+	DEFAULT_PDFTOPS=""
+else
+	DEFAULT_PDFTOPS="#"
+fi
+
+AC_DEFINE_UNQUOTED(CUPS_PDFTOPS, "$CUPS_PDFTOPS")
+AC_DEFINE_UNQUOTED(CUPS_GHOSTSCRIPT, "$CUPS_GHOSTSCRIPT")
+AC_SUBST(DEFAULT_PDFTOPS)
+AC_SUBST(PDFTOPS)
+
+dnl
+dnl End of "$Id: cups-pdf.m4 9750 2011-05-06 22:53:53Z mike $".
+dnl

config-scripts/cups-scripting.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-scripting.m4 9927 2011-08-27 09:28:30Z mike $"
+dnl "$Id: cups-scripting.m4 9099 2010-04-11 07:16:05Z mike $"
 dnl
 dnl   Scripting configuration stuff for CUPS.
 dnl
@@ -68,6 +68,17 @@ else
 	AC_DEFINE(HAVE_PHP)
 fi
 
+PHPDIR=""
+if test "x$CUPS_PHP" != xno; then
+	AC_PATH_PROG(PHPCONFIG, php-config)
+
+	if test "x$PHPCONFIG" != x; then
+		PHPDIR="scripting/php"
+	fi
+fi
+
+AC_SUBST(PHPDIR)
+
 dnl Do we have Python?
 AC_ARG_WITH(python, [  --with-python           set Python interpreter for web interfaces ],
 	CUPS_PYTHON="$withval",
@@ -85,5 +96,5 @@ if test "x$CUPS_PYTHON" != x; then
 fi
 
 dnl
-dnl End of "$Id: cups-scripting.m4 9927 2011-08-27 09:28:30Z mike $".
+dnl End of "$Id: cups-scripting.m4 9099 2010-04-11 07:16:05Z mike $".
 dnl

config-scripts/cups-sharedlibs.m4

@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-sharedlibs.m4 10190 2012-01-20 16:22:58Z mike $"
+dnl "$Id: cups-sharedlibs.m4 9153 2010-06-16 00:48:25Z mike $"
 dnl
 dnl   Shared library support for CUPS.
 dnl
-dnl   Copyright 2007-2012 by Apple Inc.
+dnl   Copyright 2007-2010 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
@@ -27,6 +27,7 @@ if test x$enable_shared != xno; then
 		SunOS*)
 			LIBCUPS="lib$cupsbase.so.2"
 			LIBCUPSCGI="libcupscgi.so.1"
+			LIBCUPSDRIVER="libcupsdriver.so.1"
 			LIBCUPSIMAGE="libcupsimage.so.2"
 			LIBCUPSMIME="libcupsmime.so.1"
 			LIBCUPSPPDC="libcupsppdc.so.1"
@@ -37,6 +38,7 @@ if test x$enable_shared != xno; then
 		UNIX_S*)
 			LIBCUPS="lib$cupsbase.so.2"
 			LIBCUPSCGI="libcupscgi.so.1"
+			LIBCUPSDRIVER="libcupsdriver.so.1"
 			LIBCUPSIMAGE="libcupsimage.so.2"
 			LIBCUPSMIME="libcupsmime.so.1"
 			LIBCUPSPPDC="libcupsppdc.so.1"
@@ -49,6 +51,7 @@ if test x$enable_shared != xno; then
 				ia64)
 					LIBCUPS="lib$cupsbase.so.2"
 					LIBCUPSCGI="libcupscgi.so.1"
+					LIBCUPSDRIVER="libcupsdriver.so.1"
 					LIBCUPSIMAGE="libcupsimage.so.2"
 					LIBCUPSMIME="libcupsmime.so.1"
 					LIBCUPSPPDC="libcupsppdc.so.1"
@@ -59,6 +62,7 @@ if test x$enable_shared != xno; then
 				*)
 					LIBCUPS="lib$cupsbase.sl.2"
 					LIBCUPSCGI="libcupscgi.sl.1"
+					LIBCUPSDRIVER="libcupsdriver.sl.1"
 					LIBCUPSIMAGE="libcupsimage.sl.2"
 					LIBCUPSMIME="libcupsmime.sl.1"
 					LIBCUPSPPDC="libcupsppdc.sl.1"
@@ -71,6 +75,7 @@ if test x$enable_shared != xno; then
 		IRIX)
 			LIBCUPS="lib$cupsbase.so.2"
 			LIBCUPSCGI="libcupscgi.so.1"
+			LIBCUPSDRIVER="libcupsdriver.so.1"
 			LIBCUPSIMAGE="libcupsimage.so.2"
 			LIBCUPSMIME="libcupsmime.so.1"
 			LIBCUPSPPDC="libcupsppdc.so.1"
@@ -81,6 +86,7 @@ if test x$enable_shared != xno; then
 		OSF1* | Linux | GNU | *BSD*)
 			LIBCUPS="lib$cupsbase.so.2"
 			LIBCUPSCGI="libcupscgi.so.1"
+			LIBCUPSDRIVER="libcupsdriver.so.1"
 			LIBCUPSIMAGE="libcupsimage.so.2"
 			LIBCUPSMIME="libcupsmime.so.1"
 			LIBCUPSPPDC="libcupsppdc.so.1"
@@ -91,6 +97,7 @@ if test x$enable_shared != xno; then
 		Darwin*)
 			LIBCUPS="lib$cupsbase.2.dylib"
 			LIBCUPSCGI="libcupscgi.1.dylib"
+			LIBCUPSDRIVER="libcupsdriver.1.dylib"
 			LIBCUPSIMAGE="libcupsimage.2.dylib"
 			LIBCUPSMIME="libcupsmime.1.dylib"
 			LIBCUPSPPDC="libcupsppdc.1.dylib"
@@ -102,6 +109,7 @@ if test x$enable_shared != xno; then
 			LIBCUPS="lib${cupsbase}_s.a"
 			LIBCUPSBASE="${cupsbase}_s"
 			LIBCUPSCGI="libcupscgi_s.a"
+			LIBCUPSDRIVER="libcupsdriver_s.a"
 			LIBCUPSIMAGE="libcupsimage_s.a"
 			LIBCUPSMIME="libcupsmime_s.a"
 			LIBCUPSPPDC="libcupsppdc_s.a"
@@ -114,6 +122,7 @@ if test x$enable_shared != xno; then
 			echo "         option with compiler."
 			LIBCUPS="lib$cupsbase.so.2"
 			LIBCUPSCGI="libcupscgi.so.1"
+			LIBCUPSDRIVER="libcupsdriver.so.1"
 			LIBCUPSIMAGE="libcupsimage.so.2"
 			LIBCUPSMIME="libcupsmime.so.1"
 			LIBCUPSPPDC="libcupsppdc.so.1"
@@ -126,6 +135,7 @@ else
 	PICFLAG=0
 	LIBCUPS="lib$cupsbase.a"
 	LIBCUPSCGI="libcupscgi.a"
+	LIBCUPSDRIVER="libcupsdriver.a"
 	LIBCUPSIMAGE="libcupsimage.a"
 	LIBCUPSMIME="libcupsmime.a"
 	LIBCUPSPPDC="libcupsppdc.a"
@@ -133,12 +143,20 @@ else
 	DSOXX=":"
 fi
 
+# 32-bit and 64-bit libraries need variations of the standard
+# DSOFLAGS...
+DSO32FLAGS="$DSOFLAGS"
+DSO64FLAGS="$DSOFLAGS"
+
 AC_SUBST(DSO)
 AC_SUBST(DSOXX)
 AC_SUBST(DSOFLAGS)
+AC_SUBST(DSO32FLAGS)
+AC_SUBST(DSO64FLAGS)
 AC_SUBST(LIBCUPS)
 AC_SUBST(LIBCUPSBASE)
 AC_SUBST(LIBCUPSCGI)
+AC_SUBST(LIBCUPSDRIVER)
 AC_SUBST(LIBCUPSIMAGE)
 AC_SUBST(LIBCUPSMIME)
 AC_SUBST(LIBCUPSPPDC)
@@ -149,6 +167,7 @@ if test x$enable_shared = xno; then
 	LINKCUPSIMAGE="../filter/libcupsimage.a"
 
 	EXTLINKCUPS="-lcups"
+	EXTLINKCUPSDRIVER="-lcupsdriver"
 	EXTLINKCUPSIMAGE="-lcupsimage"
 else
 	if test $uname = AIX; then
@@ -156,17 +175,20 @@ else
 		LINKCUPSIMAGE="-lcupsimage_s"
 
 		EXTLINKCUPS="-lcups_s"
+		EXTLINKCUPSDRIVER="-lcupsdriver_s"
 		EXTLINKCUPSIMAGE="-lcupsimage_s"
 	else
 		LINKCUPS="-l${cupsbase}"
 		LINKCUPSIMAGE="-lcupsimage"
 
 		EXTLINKCUPS="-lcups"
+		EXTLINKCUPSDRIVER="-lcupsdriver"
 		EXTLINKCUPSIMAGE="-lcupsimage"
 	fi
 fi
 
 AC_SUBST(EXTLINKCUPS)
+AC_SUBST(EXTLINKCUPSDRIVER)
 AC_SUBST(EXTLINKCUPSIMAGE)
 AC_SUBST(LINKCUPS)
 AC_SUBST(LINKCUPSIMAGE)
@@ -179,7 +201,7 @@ if test "$DSO" != ":"; then
 	# rather than to the executables.  This makes things smaller if you
 	# are using any static libraries, and it also allows us to distribute
 	# a single DSO rather than a bunch...
-	DSOLIBS="\$(LIBZ)"
+	DSOLIBS="\$(LIBTIFF) \$(LIBPNG) \$(LIBJPEG) \$(LIBZ)"
 	IMGLIBS=""
 
 	# Tell the run-time linkers where to find a DSO.  Some platforms
@@ -191,9 +213,13 @@ if test "$DSO" != ":"; then
 			case "$uarch" in
 				ia64)
 					DSOFLAGS="-Wl,+s,+b,$libdir $DSOFLAGS"
+					DSO32FLAGS="-Wl,+s,+b,$LIB32DIR $DSO32FLAGS"
+					DSO64FLAGS="-Wl,+s,+b,$LIB64DIR $DSO64FLAGS"
 					;;
 				*)
                 			DSOFLAGS="+s +b $libdir $DSOFLAGS"
+                			DSO32FLAGS="+s +b $LIB32DIR $DSO32FLAGS"
+                			DSO64FLAGS="+s +b $LIB64DIR $DSO64FLAGS"
 					;;
 			esac
                 	LDFLAGS="$LDFLAGS -Wl,+s,+b,$libdir"
@@ -203,6 +229,8 @@ if test "$DSO" != ":"; then
                 	# Solaris...
 			if test $exec_prefix != /usr; then
 				DSOFLAGS="-R$libdir $DSOFLAGS"
+				DSO32FLAGS="-R$LIB32DIR $DSO32FLAGS"
+				DSO64FLAGS="-R$LIB64DIR $DSO64FLAGS"
 				LDFLAGS="$LDFLAGS -R$libdir"
 				EXPORT_LDFLAGS="-R$libdir"
 			fi
@@ -211,6 +239,8 @@ if test "$DSO" != ":"; then
                         # *BSD...
 			if test $exec_prefix != /usr; then
 				DSOFLAGS="-Wl,-R$libdir $DSOFLAGS"
+				DSO32FLAGS="-Wl,-R$LIB32DIR $DSO32FLAGS"
+				DSO64FLAGS="-Wl,-R$LIB64DIR $DSO64FLAGS"
 				LDFLAGS="$LDFLAGS -Wl,-R$libdir"
 				EXPORT_LDFLAGS="-Wl,-R$libdir"
 			fi
@@ -219,6 +249,8 @@ if test "$DSO" != ":"; then
                         # IRIX, Linux, and HURD...
 			if test $exec_prefix != /usr; then
 				DSOFLAGS="-Wl,-rpath,$libdir $DSOFLAGS"
+				DSO32FLAGS="-Wl,-rpath,$LIB32DIR $DSO32FLAGS"
+				DSO64FLAGS="-Wl,-rpath,$LIB64DIR $DSO64FLAGS"
 				LDFLAGS="$LDFLAGS -Wl,-rpath,$libdir"
 				EXPORT_LDFLAGS="-Wl,-rpath,$libdir"
 			fi
@@ -226,7 +258,7 @@ if test "$DSO" != ":"; then
 	esac
 else
 	DSOLIBS=""
-	IMGLIBS="\$(LIBZ)"
+	IMGLIBS="\$(LIBTIFF) \$(LIBPNG) \$(LIBJPEG) \$(LIBZ)"
 fi
 
 AC_SUBST(DSOLIBS)
@@ -234,5 +266,5 @@ AC_SUBST(IMGLIBS)
 AC_SUBST(EXPORT_LDFLAGS)
 
 dnl
-dnl End of "$Id: cups-sharedlibs.m4 10190 2012-01-20 16:22:58Z mike $".
+dnl End of "$Id: cups-sharedlibs.m4 9153 2010-06-16 00:48:25Z mike $".
 dnl

config-scripts/cups-slp.m4

@@ -0,0 +1,38 @@
+dnl
+dnl "$Id: cups-slp.m4 9771 2011-05-12 05:21:56Z mike $"
+dnl
+dnl   OpenSLP configuration stuff for CUPS.
+dnl
+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
+dnl   property of Apple Inc. and are protected by Federal copyright
+dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl   which should have been included with this file.  If this file is
+dnl   file is missing or damaged, see the license at "http://www.cups.org/".
+dnl
+
+AC_ARG_ENABLE(slp, [  --disable-slp           disable SLP support])
+AC_ARG_WITH(openslp-libs, [  --with-openslp-libs     set directory for OpenSLP library],
+    LDFLAGS="-L$withval $LDFLAGS"
+    DSOFLAGS="-L$withval $DSOFLAGS",)
+AC_ARG_WITH(openslp-includes, [  --with-openslp-includes set directory for OpenSLP includes],
+    CFLAGS="-I$withval $CFLAGS"
+    CPPFLAGS="-I$withval $CPPFLAGS",)
+
+LIBSLP=""
+
+if test x$enable_slp != xno; then
+    AC_CHECK_HEADER(slp.h,
+	AC_CHECK_LIB(slp, SLPOpen,
+            AC_DEFINE(HAVE_LIBSLP)
+	    LIBSLP="-lslp"))
+fi
+
+AC_SUBST(LIBSLP)
+
+
+dnl
+dnl End of "$Id: cups-slp.m4 9771 2011-05-12 05:21:56Z mike $".
+dnl

config-scripts/cups-ssl.m4

@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-ssl.m4 9837 2011-06-16 20:12:16Z mike $"
+dnl "$Id: cups-ssl.m4 10481 2012-05-18 18:02:10Z mike $"
 dnl
 dnl   OpenSSL/GNUTLS stuff for CUPS.
 dnl
-dnl   Copyright 2007-2011 by Apple Inc.
+dnl   Copyright 2007-2012 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
@@ -124,7 +124,7 @@ if test x$enable_ssl != xno; then
 
     dnl Check for the OpenSSL library last...
     if test $have_ssl = 0 -a "x$enable_openssl" != "xno"; then
-	AC_CHECK_HEADER(openssl/ssl.h,
+	AC_CHECK_HEADER(openssl/ssl.h,[
 	    dnl Save the current libraries so the crypto stuff isn't always
 	    dnl included...
 	    SAVELIBS="$LIBS"
@@ -136,9 +136,9 @@ if test x$enable_ssl != xno; then
 	    dnl case the RSAREF libraries are needed.
 
 	    for libcrypto in \
-	        "-lcrypto" \
-	        "-lcrypto -lrsaref" \
-	        "-lcrypto -lRSAglue -lrsaref"
+		"-lcrypto" \
+		"-lcrypto -lrsaref" \
+		"-lcrypto -lRSAglue -lrsaref"
 	    do
 		AC_CHECK_LIB(ssl,SSL_new,
 		    [have_ssl=1
@@ -153,7 +153,12 @@ if test x$enable_ssl != xno; then
 		fi
 	    done
 
-	    LIBS="$SAVELIBS")
+	    if test "x${SSLLIBS}" != "x"; then
+		LIBS="$SAVELIBS $SSLLIBS"
+		AC_CHECK_FUNCS(SSL_set_tlsext_host_name)
+	    fi
+
+	    LIBS="$SAVELIBS"])
     fi
 fi
 
@@ -173,7 +178,6 @@ AC_SUBST(SSLLIBS)
 EXPORT_SSLLIBS="$SSLLIBS"
 AC_SUBST(EXPORT_SSLLIBS)
 
-
 dnl
-dnl End of "$Id: cups-ssl.m4 9837 2011-06-16 20:12:16Z mike $".
+dnl End of "$Id: cups-ssl.m4 10481 2012-05-18 18:02:10Z mike $".
 dnl

config.h.in

@@ -3,7 +3,7 @@
  *
  *   Configuration file for CUPS.
  *
- *   Copyright 2007-2012 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,8 +62,12 @@
  */
 
 #define CUPS_DEFAULT_BROWSING	1
-#define CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS	""
+#define CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS	"CUPS"
+#define CUPS_DEFAULT_BROWSE_REMOTE_PROTOCOLS	"CUPS"
+#define CUPS_DEFAULT_BROWSE_SHORT_NAMES	1
 #define CUPS_DEFAULT_DEFAULT_SHARED 1
+#define CUPS_DEFAULT_IMPLICIT_CLASSES	1
+#define CUPS_DEFAULT_USE_NETWORK_DEFAULT 1
 
 
 /*
@@ -295,6 +299,13 @@
 #undef HAVE_SSL
 
 
+/*
+ * Do we have the SSL_set_tlsext_host_name function?
+ */
+
+#undef HAVE_SSL_SET_TLSEXT_HOST_NAME
+
+
 /*
  * What Security framework headers do we have?
  */
@@ -687,7 +698,7 @@
  * Do we have libusb?
  */
 
-#undef HAVE_USB_H
+#undef HAVE_LIBUSB
 
 
 /*
@@ -737,13 +748,6 @@
 #undef HAVE_XPC
 
 
-/*
- * Do we have Mini-XML?
- */
-
-#undef HAVE_MXML_H
-
-
 #endif /* !_CUPS_CONFIG_H_ */
 
 /*

configure.in

@@ -3,7 +3,7 @@ dnl "$Id$"
 dnl
 dnl   Configuration script for CUPS.
 dnl
-dnl   Copyright 2007-2012 by Apple Inc.
+dnl   Copyright 2007-2010 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
@@ -20,13 +20,17 @@ sinclude(config-scripts/cups-common.m4)
 sinclude(config-scripts/cups-directories.m4)
 sinclude(config-scripts/cups-manpages.m4)
 
+sinclude(config-scripts/cups-3264.m4)
 sinclude(config-scripts/cups-sharedlibs.m4)
 sinclude(config-scripts/cups-libtool.m4)
 sinclude(config-scripts/cups-compiler.m4)
 
+sinclude(config-scripts/cups-image.m4)
 sinclude(config-scripts/cups-network.m4)
 sinclude(config-scripts/cups-poll.m4)
+sinclude(config-scripts/cups-slp.m4)
 sinclude(config-scripts/cups-gssapi.m4)
+sinclude(config-scripts/cups-ldap.m4)
 sinclude(config-scripts/cups-threads.m4)
 sinclude(config-scripts/cups-ssl.m4)
 sinclude(config-scripts/cups-pam.m4)
@@ -34,6 +38,7 @@ sinclude(config-scripts/cups-largefile.m4)
 sinclude(config-scripts/cups-dnssd.m4)
 sinclude(config-scripts/cups-launchd.m4)
 sinclude(config-scripts/cups-defaults.m4)
+sinclude(config-scripts/cups-pdf.m4)
 sinclude(config-scripts/cups-scripting.m4)
 
 INSTALL_LANGUAGES=""

cups-config.in

@@ -1,10 +1,10 @@
 #! /bin/sh
 #
 # "$Id$"
-#
+# 
 #   CUPS configuration utility.
 #
-#   Copyright 2007-2011 by Apple Inc.
+#   Copyright 2007-2010 by Apple Inc.
 #   Copyright 2001-2006 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -15,7 +15,7 @@
 #
 
 VERSION="@CUPS_VERSION@"
-APIVERSION="1.6"
+APIVERSION="1.5"
 BUILD="@CUPS_BUILD@"
 
 prefix=@prefix@
@@ -35,7 +35,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
 # flags for C++ compiler:
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBS="@LIBGSSAPI@ @EXPORT_SSLLIBS@ @EXPORT_LIBZ@ @LIBS@"
+IMGLIBS="@EXPORT_LIBTIFF@ @EXPORT_LIBJPEG@ @EXPORT_LIBPNG@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -45,6 +46,9 @@ if test -f "$selfdir/cups/cups.h"; then
     LDFLAGS="-L$selfdir/cups -L$selfdir/filter $LDFLAGS"
     libdir="$selfdir/cups"
     imagelibdir="$selfdir/filter"
+    if test ! -f "$selfdir/cups/raster.h"; then
+        ln -s ../filter/raster.h "$selfdir/cups"
+    fi
 else
     if test $includedir != /usr/include; then
 	CFLAGS="$CFLAGS -I$includedir"
@@ -64,7 +68,7 @@ usage ()
     echo "       cups-config --datadir"
     echo "       cups-config --help"
     echo "       cups-config --ldflags"
-    echo "       cups-config [--image] [--static] --libs"
+    echo "       cups-config [--driver] [--image] [--static] --libs"
     echo "       cups-config --serverbin"
     echo "       cups-config --serverroot"
     echo "       cups-config --version"
@@ -79,6 +83,7 @@ fi
 # Parse command line options
 static=no
 image=no
+driver=no
 
 while test $# -gt 0; do
     case $1 in
@@ -94,6 +99,9 @@ while test $# -gt 0; do
 	--datadir)
 	    echo $cups_datadir
 	    ;;
+	--driver)
+	    driver=yes
+	    ;;
 	--help)
 	    usage 0
 	    ;;
@@ -109,10 +117,16 @@ while test $# -gt 0; do
  	        if test $image = yes; then
  	            libs="@EXTLINKCUPSIMAGE@ $libs"
 		fi
+ 	        if test $driver = yes; then
+ 	            libs="@EXTLINKCUPSDRIVER@ $libs"
+		fi
 	    else
 	        libs="$libdir/libcups.a $LIBS";
  	        if test $image = yes; then
- 	            libs="$libdir/libcupsimage.a $libs"
+ 	            libs="$libdir/libcupsimage.a $IMGLIBS $libs"
+		fi
+ 	        if test $driver = yes; then
+ 	            libs="$libdir/libcupsdriver.a $libs"
 		fi
 	    fi
 	    echo $libs

cups/Makefile

@@ -3,7 +3,7 @@
 #
 #   API library Makefile for CUPS.
 #
-#   Copyright 2007-2012 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
@@ -32,9 +32,6 @@ LIBOBJS	=	\
 		custom.o \
 		debug.o \
 		dest.o \
-		dest-job.o \
-		dest-localization.o \
-		dest-options.o \
 		dir.o \
 		emit.o \
 		encode.o \
@@ -71,7 +68,12 @@ LIBOBJS	=	\
 		transcode.o \
 		usersys.o \
 		util.o
-TESTOBJS	= \
+LIB32OBJS	= $(LIBOBJS:.o=.32.o)
+LIB64OBJS	= $(LIBOBJS:.o=.64.o)
+OBJS	=	\
+		$(LIBOBJS) \
+		$(LIB32OBJS) \
+		$(LIB64OBJS) \
 		testadmin.o \
 		testarray.o \
 		testconflicts.o \
@@ -85,9 +87,6 @@ TESTOBJS	= \
 		testppd.o \
 		testpwg.o \
 		testsnmp.o
-OBJS	=	\
-		$(LIBOBJS) \
-		$(TESTOBJS)
 
 
 #
@@ -121,7 +120,6 @@ HEADERSPRIV =	\
 		md5-private.h \
 		ppd-private.h \
 		pwg-private.h \
-		raster-private.h \
 		snmp-private.h \
 		string-private.h \
 		thread-private.h
@@ -133,7 +131,9 @@ HEADERSPRIV =	\
 
 LIBTARGETS =	\
 		$(LIBCUPSSTATIC) \
-		$(LIBCUPS)
+		$(LIBCUPS) \
+		$(LIB32CUPS) \
+		$(LIB64CUPS)
 
 UNITTARGETS =	\
 		testadmin \
@@ -182,6 +182,7 @@ unittests:	$(UNITTARGETS)
 clean:
 	$(RM) $(OBJS) $(TARGETS) $(UNITTARGETS)
 	$(RM) libcups.so libcups.sl libcups.dylib
+	$(RM) -r 32bit 64bit
 
 
 #
@@ -189,7 +190,13 @@ clean:
 #
 
 depend:
-	$(CC) -MM $(ALL_CFLAGS) $(OBJS:.o=.c) >Dependencies
+	touch Dependencies.tmp
+	makedepend -Y -I.. -fDependencies.tmp $(OBJS:.o=.c) >/dev/null 2>&1
+	$(RM) Dependencies
+	cp Dependencies.tmp Dependencies
+	sed -E -e '1,$$s/^([^.]+)\.o:/\1\.32.o: \1\.c /' Dependencies.tmp >>Dependencies
+	sed -E -e '1,$$s/^([^.]+)\.o:/\1\.64.o: \1\.c /' Dependencies.tmp >>Dependencies
+	$(RM) Dependencies.tmp
 
 
 #
@@ -236,7 +243,7 @@ install-headers:
 # Install libraries...
 #
 
-install-libs: $(INSTALLSTATIC)
+install-libs: $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
 	echo Installing libraries in $(LIBDIR)...
 	$(INSTALL_DIR) -m 755 $(LIBDIR)
 	$(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
@@ -259,12 +266,24 @@ installstatic:
 	$(RANLIB) $(LIBDIR)/$(LIBCUPSSTATIC)
 	$(CHMOD) 555 $(LIBDIR)/$(LIBCUPSSTATIC)
 
+install32bit:
+	echo Installing libraries in $(LIB32DIR)...
+	$(INSTALL_DIR) -m 755 $(LIB32DIR)
+	$(INSTALL_LIB) 32bit/libcups.so.2 $(LIB32DIR)/libcups.so.2
+	$(LN) libcups.so.2 $(LIB32DIR)/libcups.so
+
+install64bit:
+	echo Installing libraries in $(LIB64DIR)...
+	$(INSTALL_DIR) -m 755 $(LIB64DIR)
+	$(INSTALL_LIB) 64bit/libcups.so.2 $(LIB64DIR)/libcups.so.2
+	$(LN) libcups.so.2 $(LIB64DIR)/libcups.so
+
 
 #
 # Uninstall object and target files...
 #
 
-uninstall:
+uninstall: $(UNINSTALL32) $(UNINSTALL64)
 	$(RM) $(LIBDIR)/libcups.2.dylib
 	$(RM) $(LIBDIR)/$(LIBCUPSSTATIC)
 	$(RM) $(LIBDIR)/libcups.dylib
@@ -279,6 +298,16 @@ uninstall:
 	done
 	-$(RMDIR) $(INCLUDEDIR)/cups
 
+uninstall32bit:
+	$(RM) $(LIB32DIR)/libcups.so
+	$(RM) $(LIB32DIR)/libcups.so.2
+	-$(RMDIR) $(LIB32DIR)
+
+uninstall64bit:
+	$(RM) $(LIB64DIR)/libcups.so
+	$(RM) $(LIB64DIR)/libcups.so.2
+	-$(RMDIR) $(LIB64DIR)
+
 
 #
 # libcups.so.2, libcups.sl.2
@@ -292,6 +321,32 @@ libcups.so.2 libcups.sl.2:	$(LIBOBJS)
 	$(LN) $@ `basename $@ .2`
 
 
+#
+# 32bit/libcups.so.2
+#
+
+32bit/libcups.so.2:	$(LIB32OBJS)
+	echo Linking 32-bit $@...
+	-mkdir 32bit
+	$(DSO) $(ARCH32FLAGS) $(DSO32FLAGS) -o $@ $(LIB32OBJS) $(LIBGSSAPI) \
+		$(DNSSDLIBS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+	$(RM) 32bit/libcups.so
+	$(LN) libcups.so.2 32bit/libcups.so
+
+
+#
+# 64bit/libcups.so.2
+#
+
+64bit/libcups.so.2:	$(LIB64OBJS)
+	echo Linking 64-bit $@...
+	-mkdir 64bit
+	$(DSO) $(ARCH64FLAGS) $(DSO64FLAGS) -o $@ $(LIB64OBJS) $(LIBGSSAPI) \
+		$(DNSSDLIBS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+	$(RM) 64bit/libcups.so
+	$(LN) libcups.so.2 64bit/libcups.so
+
+
 #
 # libcups.2.dylib
 #
@@ -530,7 +585,7 @@ apihelp:
 		file.h file.c dir.h dir.c >../doc/help/api-filedir.html
 	mxmldoc --tokens api-filedir.xml >../doc/help/api-filedir.tokens
 	$(RM) api-filedir.xml
-	mxmldoc --section "Programming" --title "PPD API (DEPRECATED)" \
+	mxmldoc --section "Programming" --title "PPD API" \
 		--css ../doc/cups-printable.css \
 		--header api-ppd.header --intro api-ppd.shtml \
 		api-ppd.xml \
@@ -582,7 +637,7 @@ framedhelp:
 		--header api-filedir.header --intro api-filedir.shtml \
 		file.h file.c dir.h dir.c
 	mxmldoc --framed api-ppd \
-		--section "Programming" --title "PPD API (DEPRECATED)" \
+		--section "Programming" --title "PPD API" \
 		--css ../doc/cups-printable.css \
 		--header api-ppd.header --intro api-ppd.shtml \
 		ppd.h attr.c conflicts.c custom.c emit.c localize.c mark.c \

cups/adminutil.c

@@ -970,6 +970,8 @@ cupsAdminGetServerSettings(
 		remote_admin = 0,	/* Remote administration allowed? */
 		remote_any = 0,		/* Remote access from anywhere allowed? */
 		browsing = 1,		/* Browsing enabled? */
+		browse_allow = 1,	/* Browse address set? */
+		browse_address = 0,	/* Browse address set? */
 		cancel_policy = 1,	/* Cancel-job policy set? */
 		debug_logging = 0;	/* LogLevel debug set? */
     int		linenum = 0,		/* Line number in file */
@@ -1018,16 +1020,26 @@ cupsAdminGetServerSettings(
       }
       else if (!_cups_strcasecmp(line, "Browsing"))
       {
-	browsing = !_cups_strcasecmp(value, "yes") ||
-	           !_cups_strcasecmp(value, "on") ||
+	browsing = !_cups_strcasecmp(value, "yes") || !_cups_strcasecmp(value, "on") ||
 	           !_cups_strcasecmp(value, "true");
       }
+      else if (!_cups_strcasecmp(line, "BrowseAddress"))
+      {
+	browse_address = 1;
+      }
+      else if (!_cups_strcasecmp(line, "BrowseAllow"))
+      {
+	browse_allow = 1;
+      }
+      else if (!_cups_strcasecmp(line, "BrowseOrder"))
+      {
+	browse_allow = !_cups_strncasecmp(value, "deny,", 5);
+      }
       else if (!_cups_strcasecmp(line, "LogLevel"))
       {
 	debug_logging = !_cups_strncasecmp(value, "debug", 5);
       }
-      else if (!_cups_strcasecmp(line, "<Policy") &&
-               !_cups_strcasecmp(value, "default"))
+      else if (!_cups_strcasecmp(line, "<Policy") && !_cups_strcasecmp(value, "default"))
       {
 	in_policy = 1;
       }
@@ -1051,8 +1063,7 @@ cupsAdminGetServerSettings(
 	  if (*valptr)
 	    *valptr++ = '\0';
 
-          if (!_cups_strcasecmp(value, "cancel-job") ||
-              !_cups_strcasecmp(value, "all"))
+          if (!_cups_strcasecmp(value, "cancel-job") || !_cups_strcasecmp(value, "all"))
 	  {
 	    in_cancel_job = 1;
 	    break;
@@ -1080,8 +1091,7 @@ cupsAdminGetServerSettings(
 	in_location       = 0;
       }
       else if (!_cups_strcasecmp(line, "Allow") && value &&
-               _cups_strcasecmp(value, "localhost") &&
-               _cups_strcasecmp(value, "127.0.0.1")
+               _cups_strcasecmp(value, "localhost") && _cups_strcasecmp(value, "127.0.0.1")
 #ifdef AF_LOCAL
 	       && *value != '/'
 #endif /* AF_LOCAL */
@@ -1125,9 +1135,15 @@ cupsAdminGetServerSettings(
 					   cg->cupsd_num_settings,
 					   &(cg->cupsd_settings));
 
+    cg->cupsd_num_settings = cupsAddOption(CUPS_SERVER_REMOTE_PRINTERS,
+                                           (browsing && browse_allow) ?
+					       "1" : "0",
+					   cg->cupsd_num_settings,
+					   &(cg->cupsd_settings));
+
     cg->cupsd_num_settings = cupsAddOption(CUPS_SERVER_SHARE_PRINTERS,
-                                           (remote_access && browsing) ? "1" :
-                                                                         "0",
+                                           (remote_access && browsing &&
+					    browse_address) ? "1" : "0",
 					   cg->cupsd_num_settings,
 					   &(cg->cupsd_settings));
 
@@ -1188,7 +1204,8 @@ cupsAdminSetServerSettings(
 		in_conf_location,	/* In the /admin/conf location? */
 		in_root_location;	/* In the / location? */
   const char	*val;			/* Setting value */
-  int		share_printers,		/* Share local printers */
+  int		remote_printers,	/* Show remote printers */
+		share_printers,		/* Share local printers */
 		remote_admin,		/* Remote administration allowed? */
 		remote_any,		/* Remote access from anywhere? */
 		user_cancel_any,	/* Cancel-job policy set? */
@@ -1202,7 +1219,8 @@ cupsAdminSetServerSettings(
 		wrote_root_location;	/* Wrote the / location? */
   int		indent;			/* Indentation */
   int		cupsd_num_settings;	/* New number of settings */
-  int		old_share_printers,	/* Share local printers */
+  int		old_remote_printers,	/* Show remote printers */
+		old_share_printers,	/* Share local printers */
 		old_remote_admin,	/* Remote administration allowed? */
 		old_user_cancel_any,	/* Cancel-job policy set? */
 		old_debug_logging;	/* LogLevel debug set? */
@@ -1276,6 +1294,15 @@ cupsAdminSetServerSettings(
   DEBUG_printf(("1cupsAdminSetServerSettings: old remote_any=%d",
                 remote_any));
 
+  if ((val = cupsGetOption(CUPS_SERVER_REMOTE_PRINTERS, cupsd_num_settings,
+                           cupsd_settings)) != NULL)
+    old_remote_printers = atoi(val);
+  else
+    old_remote_printers = 1;
+
+  DEBUG_printf(("1cupsAdminSetServerSettings: old remote_printers=%d",
+                old_remote_printers));
+
   if ((val = cupsGetOption(CUPS_SERVER_SHARE_PRINTERS, cupsd_num_settings,
                            cupsd_settings)) != NULL)
     old_share_printers = atoi(val);
@@ -1347,6 +1374,26 @@ cupsAdminSetServerSettings(
   DEBUG_printf(("1cupsAdminSetServerSettings: remote_admin=%d",
                 remote_admin));
 
+  if ((val = cupsGetOption(CUPS_SERVER_REMOTE_PRINTERS, num_settings,
+                           settings)) != NULL)
+  {
+    remote_printers = atoi(val);
+
+    if (remote_printers == old_remote_printers)
+    {
+     /*
+      * No change to this setting...
+      */
+
+      remote_printers = -1;
+    }
+  }
+  else
+    remote_printers = -1;
+
+  DEBUG_printf(("1cupsAdminSetServerSettings: remote_printers=%d",
+                remote_printers));
+
   if ((val = cupsGetOption(CUPS_SERVER_SHARE_PRINTERS, num_settings,
                            settings)) != NULL)
   {
@@ -1470,33 +1517,80 @@ cupsAdminSetServerSettings(
         cupsFilePrintf(temp, "Listen %s\n", value);
     }
     else if ((!_cups_strcasecmp(line, "Browsing") ||
-              !_cups_strcasecmp(line, "BrowseLocalProtocols")) &&
-	     share_printers >= 0)
+              !_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)
       {
+	int new_remote_printers = (remote_printers > 0 ||
+				   (remote_printers == -1 &&
+				    old_remote_printers > 0));
 	int new_share_printers = (share_printers > 0 ||
 				  (share_printers == -1 &&
 				   old_share_printers > 0));
 
         wrote_browsing = 1;
 
-        if (new_share_printers)
+        if (new_remote_printers || new_share_printers)
 	{
 	  const char *localp = cupsGetOption("BrowseLocalProtocols",
 					     num_settings, settings);
+	  const char *remotep = cupsGetOption("BrowseRemoteProtocols",
+					      num_settings, settings);
 
           if (!localp || !localp[0])
 	    localp = cupsGetOption("BrowseLocalProtocols", cupsd_num_settings,
 	                           cupsd_settings);
 
-	  cupsFilePuts(temp, "# Share local printers on the local network.\n");
+          if (!remotep)
+	    remotep = cupsGetOption("BrowseRemoteProtocols", cupsd_num_settings,
+	                            cupsd_settings);
+
+	  if (new_remote_printers && new_share_printers)
+	    cupsFilePuts(temp,
+	                 "# Enable printer sharing and shared printers.\n");
+	  else if (new_remote_printers)
+	    cupsFilePuts(temp,
+	                 "# Show shared printers on the local network.\n");
+	  else
+	    cupsFilePuts(temp,
+	                 "# Share local printers on the local network.\n");
+
 	  cupsFilePuts(temp, "Browsing On\n");
+	  cupsFilePuts(temp, "BrowseOrder allow,deny\n");
 
-	  if (!localp)
-	    localp = CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS;
+	  if (new_remote_printers)
+	  {
+	    cupsFilePuts(temp, "BrowseAllow all\n");
 
-	  cupsFilePrintf(temp, "BrowseLocalProtocols %s\n", localp);
+	    if (!remotep)
+	      remotep = CUPS_DEFAULT_BROWSE_REMOTE_PROTOCOLS;
+
+	    cupsFilePrintf(temp, "BrowseRemoteProtocols %s\n", remotep);
+          }
+	  else
+	    cupsFilePuts(temp, "BrowseRemoteProtocols\n");
+
+	  cupsd_num_settings = cupsAddOption("BrowseRemoteProtocols", remotep,
+					     cupsd_num_settings,
+					     &cupsd_settings);
+
+	  if (new_share_printers)
+	  {
+	    cupsFilePuts(temp, "BrowseAddress @LOCAL\n");
+
+	    if (!localp)
+	      localp = CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS;
+
+	    cupsFilePrintf(temp, "BrowseLocalProtocols %s\n", localp);
+	  }
+	  else
+	    cupsFilePuts(temp, "BrowseLocalProtocols\n");
 
 	  cupsd_num_settings = cupsAddOption("BrowseLocalProtocols", localp,
 					     cupsd_num_settings,
@@ -1504,7 +1598,8 @@ cupsAdminSetServerSettings(
         }
 	else
 	{
-	  cupsFilePuts(temp, "# Disable printer sharing.\n");
+	  cupsFilePuts(temp,
+	               "# Disable printer sharing and shared printers.\n");
 	  cupsFilePuts(temp, "Browsing Off\n");
 	}
       }
@@ -1770,12 +1865,25 @@ cupsAdminSetServerSettings(
   * Write any missing info...
   */
 
-  if (!wrote_browsing && share_printers >= 0)
+  if (!wrote_browsing && (remote_printers >= 0 || share_printers >= 0))
   {
-    if (share_printers > 0)
+    if (remote_printers > 0 || share_printers > 0)
     {
-      cupsFilePuts(temp, "# Share local printers on the local network.\n");
+      if (remote_printers > 0 && share_printers > 0)
+	cupsFilePuts(temp, "# Enable printer sharing and shared printers.\n");
+      else if (remote_printers > 0)
+	cupsFilePuts(temp, "# Show shared printers on the local network.\n");
+      else
+	cupsFilePuts(temp, "# Share local printers on the local network.\n");
+
       cupsFilePuts(temp, "Browsing On\n");
+      cupsFilePuts(temp, "BrowseOrder allow,deny\n");
+
+      if (remote_printers > 0)
+	cupsFilePuts(temp, "BrowseAllow all\n");
+
+      if (share_printers > 0)
+	cupsFilePuts(temp, "BrowseAddress @LOCAL\n");
     }
     else
     {
@@ -1982,6 +2090,15 @@ cupsAdminSetServerSettings(
                                        remote_any ? "1" : "0",
 				       cupsd_num_settings, &cupsd_settings);
 
+    if (remote_printers >= 0)
+      cupsd_num_settings = cupsAddOption(CUPS_SERVER_REMOTE_PRINTERS,
+                                	 remote_printers ? "1" : "0",
+					 cupsd_num_settings, &cupsd_settings);
+    else
+      cupsd_num_settings = cupsAddOption(CUPS_SERVER_REMOTE_PRINTERS,
+                                	 old_remote_printers ? "1" : "0",
+					 cupsd_num_settings, &cupsd_settings);
+
     if (share_printers >= 0)
       cupsd_num_settings = cupsAddOption(CUPS_SERVER_SHARE_PRINTERS,
                                 	 share_printers ? "1" : "0",

cups/adminutil.h

@@ -3,7 +3,7 @@
  *
  *   Administration utility API definitions for CUPS.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 2001-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -42,7 +42,7 @@ extern "C" {
 #  define CUPS_SERVER_DEBUG_LOGGING	"_debug_logging"
 #  define CUPS_SERVER_REMOTE_ADMIN	"_remote_admin"
 #  define CUPS_SERVER_REMOTE_ANY	"_remote_any"
-/*#  define CUPS_SERVER_REMOTE_PRINTERS	"_remote_printers"*/
+#  define CUPS_SERVER_REMOTE_PRINTERS	"_remote_printers"
 #  define CUPS_SERVER_SHARE_PRINTERS	"_share_printers"
 #  define CUPS_SERVER_USER_CANCEL_ANY	"_user_cancel_any"
 

cups/api-ppd.header

@@ -1,5 +1,5 @@
 <!--
-  "$Id: api-ppd.header 10103 2011-11-03 20:44:57Z mike $"
+  "$Id: api-ppd.header 9771 2011-05-12 05:21:56Z mike $"
 
   PPD API header for CUPS.
 
@@ -12,9 +12,7 @@
   file is missing or damaged, see the license at "http://www.cups.org/".
 -->
 
-<h1 class='title'>PPD API (DEPRECATED)</h1>
-
-<blockquote>The PPD API is deprecated starting in CUPS 1.6. Please use the new Job Ticket APIs in the <a href="api-cups.html">CUPS API</a> documentation. These functions will be removed in a future release of CUPS.</blockquote>
+<h1 class='title'>PPD API</h1>
 
 <div class='summary'><table summary='General Information'>
 <thead>

cups/api-ppd.shtml

@@ -1,5 +1,5 @@
 <!--
-  "$Id: api-ppd.shtml 10103 2011-11-03 20:44:57Z mike $"
+  "$Id: api-ppd.shtml 9727 2011-04-28 21:20:12Z mike $"
 
   PPD API introduction for CUPS.
 
@@ -15,8 +15,6 @@
 
 <h2 class='title'><a name='OVERVIEW'>Overview</a></h2>
 
-<blockquote>The PPD API is deprecated starting in CUPS 1.6. Please use the new Job Ticket APIs in the <a href="api-cups.html">CUPS API</a> documentation. These functions will be removed in a future release of CUPS.</blockquote>
-
 <p>The CUPS PPD API provides read-only access the data in PostScript Printer
 Description ("PPD") files which are used for all printers with a driver. With
 it you can obtain the data necessary to display printer options to users, mark

cups/auth.c

@@ -124,7 +124,8 @@ cupsDoAuthentication(
     const char *method,			/* I - Request method ("GET", "POST", "PUT") */
     const char *resource)		/* I - Resource path */
 {
-  const char	*password;		/* Password string */
+  const char	*password,		/* Password string */
+		*www_auth;		/* WWW-Authenticate header */
   char		prompt[1024],		/* Prompt for user */
 		realm[HTTP_MAX_VALUE],	/* realm="xyz" string */
 		nonce[HTTP_MAX_VALUE];	/* nonce="xyz" string */
@@ -179,9 +180,11 @@ cupsDoAuthentication(
   * Nope, see if we should retry the current username:password...
   */
 
+  www_auth = http->fields[HTTP_FIELD_WWW_AUTHENTICATE];
+
   if ((http->digest_tries > 1 || !http->userpass[0]) &&
-      (!strncmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) ||
-       !strncmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Digest", 6)))
+      (!_cups_strncasecmp(www_auth, "Basic", 5) ||
+       !_cups_strncasecmp(www_auth, "Digest", 6)))
   {
    /*
     * Nope - get a new password from the user...
@@ -197,8 +200,7 @@ cupsDoAuthentication(
 	     cupsUser(),
 	     http->hostname[0] == '/' ? "localhost" : http->hostname);
 
-    http->digest_tries  = _cups_strncasecmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE],
-                                      "Digest", 5) != 0;
+    http->digest_tries  = _cups_strncasecmp(www_auth, "Digest", 6) != 0;
     http->userpass[0]   = '\0';
 
     if ((password = cupsGetPassword2(prompt, http, method, resource)) == NULL)
@@ -227,7 +229,7 @@ cupsDoAuthentication(
   */
 
 #ifdef HAVE_GSSAPI
-  if (!strncmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Negotiate", 9))
+  if (!_cups_strncasecmp(www_auth, "Negotiate", 9))
   {
    /*
     * Kerberos authentication...
@@ -241,7 +243,7 @@ cupsDoAuthentication(
   }
   else
 #endif /* HAVE_GSSAPI */
-  if (!strncmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5))
+  if (!_cups_strncasecmp(www_auth, "Basic", 5))
   {
    /*
     * Basic authentication...
@@ -254,7 +256,7 @@ cupsDoAuthentication(
                    (int)strlen(http->userpass));
     httpSetAuthString(http, "Basic", encode);
   }
-  else if (!strncmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Digest", 6))
+  else if (!_cups_strncasecmp(www_auth, "Digest", 6))
   {
    /*
     * Digest authentication...
@@ -277,7 +279,7 @@ cupsDoAuthentication(
   else
   {
     DEBUG_printf(("1cupsDoAuthentication: Unknown auth type: \"%s\"",
-                  http->fields[HTTP_FIELD_WWW_AUTHENTICATE]));
+                  www_auth));
     http->status = HTTP_AUTHORIZATION_CANCELED;
     return (-1);
   }

cups/cups-private.h

@@ -3,7 +3,7 @@
  *
  *   Private definitions for CUPS.
  *
- *   Copyright 2007-2012 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
@@ -50,14 +50,6 @@ extern "C" {
  * Types...
  */
 
-typedef struct _cups_buffer_s		/**** Read/write buffer ****/
-{
-  struct _cups_buffer_s	*next;		/* Next buffer in list */
-  size_t		size;		/* Size of buffer */
-  char			used,		/* Is this buffer used? */
-			d[1];		/* Data buffer */
-} _cups_buffer_t;
-
 typedef struct _cups_globals_s		/**** CUPS global state data ****/
 {
   /* Multiple places... */
@@ -103,7 +95,7 @@ typedef struct _cups_globals_s		/**** CUPS global state data ****/
 
   /* ipp.c */
   ipp_uchar_t		ipp_date[11];	/* RFC-1903 date/time data */
-  _cups_buffer_t	*cups_buffers;	/* Buffer list */
+  _ipp_buffer_t		*ipp_buffers;	/* Buffer list */
 
   /* ipp-support.c */
   int			ipp_port;	/* IPP port number */
@@ -146,8 +138,7 @@ typedef struct _cups_globals_s		/**** CUPS global state data ****/
   http_encryption_t	encryption;	/* Encryption setting */
   char			user[65],	/* User name */
 			server[256],	/* Server address */
-			servername[256],/* Server hostname */
-			password[128];	/* Password for default callback */
+			servername[256];/* Server hostname */
   cups_password_cb2_t	password_cb;	/* Password callback */
   void			*password_data;	/* Password user data */
   http_tls_credentials_t tls_credentials;
@@ -169,40 +160,6 @@ typedef struct _cups_globals_s		/**** CUPS global state data ****/
 					/* PPD filename */
 } _cups_globals_t;
 
-typedef struct _cups_media_db_s		/* Media database */
-{
-  char		*color,			/* Media color, if any */
-		*key,			/* Media key, if any */
-		*info,			/* Media human-readable name, if any */
-		*size_name,		/* Media PWG size name, if provided */
-		*source,		/* Media source, if any */
-		*type;			/* Media type, if any */
-  int		width,			/* Width in hundredths of millimeters */
-		length,			/* Length in hundredths of
-					 * millimeters */
-		bottom,			/* Bottom margin in hundredths of
-					 * millimeters */
-		left,			/* Left margin in hundredths of
-					 * millimeters */
-		right,			/* Right margin in hundredths of
-					 * millimeters */
-		top;			/* Top margin in hundredths of
-					 * millimeters */
-} _cups_media_db_t;
-
-struct _cups_dinfo_s			/* Destination capability and status
-					 * information */
-{
-  const char		*uri;		/* Printer URI */
-  char			*resource;	/* Resource path */
-  ipp_t			*attrs;		/* Printer attributes */
-  cups_array_t		*constraints;	/* Job constraints */
-  cups_array_t		*localizations;	/* Localization information */
-  cups_array_t		*media_db;	/* Media database */
-  _cups_media_db_t	min_size,	/* Minimum size */
-			max_size;	/* Maximum size */
-};
-
 
 /*
  * Prototypes...
@@ -217,17 +174,11 @@ extern void		_cupsAppleSetDefaultPrinter(CFStringRef name);
 extern void		_cupsAppleSetUseLastPrinter(int uselast);
 #  endif /* __APPLE__ */
 
-extern char		*_cupsBufferGet(size_t size);
-extern void		_cupsBufferRelease(char *b);
-
 extern http_t		*_cupsConnect(void);
 extern int		_cupsGet1284Values(const char *device_id,
 			                   cups_option_t **values);
-extern const char	*_cupsGetDestResource(cups_dest_t *dest, char *resource,
-			                      size_t resourcesize);
 extern int		_cupsGetDests(http_t *http, ipp_op_t op,
-			              const char *name, cups_dest_t **dests,
-			              cups_ptype_t type, cups_ptype_t mask);
+			              const char *name, cups_dest_t **dests);
 extern const char	*_cupsGetPassword(const char *prompt);
 extern void		_cupsGlobalLock(void);
 extern _cups_globals_t	*_cupsGlobals(void);

cups/cups.h

@@ -3,7 +3,7 @@
  *
  *   API definitions for CUPS.
  *
- *   Copyright 2007-2012 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
@@ -30,15 +30,23 @@
 typedef off_t ssize_t;			/* @private@ */
 #  endif /* WIN32 && !__CUPS_SSIZE_T_DEFINED */
 
-#  ifdef __BLOCKS__
-#    include <dispatch/dispatch.h>
-#  endif /* __BLOCKS__ */
-
 #  include "file.h"
 #  include "ipp.h"
 #  include "language.h"
 
 
+/*
+ * With GCC 3.0 and higher, we can mark old APIs "deprecated" so you get
+ * a warning at compile-time.
+ */
+
+#  if defined(__GNUC__) && __GNUC__ > 2
+#    define _CUPS_DEPRECATED __attribute__ ((__deprecated__))
+#  else
+#    define _CUPS_DEPRECATED
+#  endif /* __GNUC__ && __GNUC__ > 2 */
+
+
 /*
  * C++ magic...
  */
@@ -52,160 +60,37 @@ extern "C" {
  * Constants...
  */
 
-#  define CUPS_VERSION			1.0599
-#  define CUPS_VERSION_MAJOR		1
-#  define CUPS_VERSION_MINOR		6
-#  define CUPS_VERSION_PATCH		-1
+#  define CUPS_VERSION		1.0504
+#  define CUPS_VERSION_MAJOR	1
+#  define CUPS_VERSION_MINOR	5
+#  define CUPS_VERSION_PATCH	4
 
-#  define CUPS_BC_FD			3
-					/* Back-channel file descriptor for
-					 * select/poll */
-#  define CUPS_DATE_ANY			(time_t)-1
-#  define CUPS_EXCLUDE_NONE		(const char *)0
-#  define CUPS_FORMAT_AUTO		"application/octet-stream"
-#  define CUPS_FORMAT_COMMAND		"application/vnd.cups-command"
-#  define CUPS_FORMAT_JPEG		"image/jpeg"
-#  define CUPS_FORMAT_PDF		"application/pdf"
-#  define CUPS_FORMAT_POSTSCRIPT	"application/postscript"
-#  define CUPS_FORMAT_RAW		"application/vnd.cups-raw"
-#  define CUPS_FORMAT_TEXT		"text/plain"
-#  define CUPS_HTTP_DEFAULT		(http_t *)0
-#  define CUPS_INCLUDE_ALL		(const char *)0
-#  define CUPS_JOBID_ALL		-1
-#  define CUPS_JOBID_CURRENT		0
-#  define CUPS_LENGTH_VARIABLE		(ssize_t)0
-#  define CUPS_TIMEOUT_DEFAULT		0
-#  define CUPS_WHICHJOBS_ALL		-1
-#  define CUPS_WHICHJOBS_ACTIVE		0
-#  define CUPS_WHICHJOBS_COMPLETED	1
-
-/* Flags for cupsConnectDest and cupsEnumDests */
-#  define CUPS_DEST_FLAGS_NONE		0x00
-					/* No flags are set */
-#  define CUPS_DEST_FLAGS_UNCONNECTED	0x01
-					/* There is not connection */
-#  define CUPS_DEST_FLAGS_MORE		0x02
-					/* There are more destinations */
-#  define CUPS_DEST_FLAGS_REMOVED	0x04
-					/* The destination has gone away */
-#  define CUPS_DEST_FLAGS_ERROR		0x08
-					/* An error occurred */
-#  define CUPS_DEST_FLAGS_RESOLVING	0x10
-					/* The destination address is being
-					 * resolved */
-#  define CUPS_DEST_FLAGS_CONNECTING	0x20
-					/* A connection is being established */
-#  define CUPS_DEST_FLAGS_CANCELED	0x40
-					/* Operation was canceled */
-
-/* Flags for cupsGetDestMediaByName/Size */
-#  define CUPS_MEDIA_FLAGS_DEFAULT 	0x00
-					/* Find the closest size supported by
-					 * the printer */
-#  define CUPS_MEDIA_FLAGS_BORDERLESS	0x01
-					/* Find a borderless size */
-#  define CUPS_MEDIA_FLAGS_DUPLEX	0x02
-					/* Find a size compatible with 2-sided
-					 * printing */
-#  define CUPS_MEDIA_FLAGS_EXACT	0x04
-					/* Find an exact match for the size */
-#  define CUPS_MEDIA_FLAGS_READY	0x08
-					/* If the printer supports media
-					 * sensing, find the size amongst the
-					 * "ready" media. */
-
-/* Options and values */
-#  define CUPS_COPIES			"copies"
-#  define CUPS_COPIES_SUPPORTED		"copies-supported"
-
-#  define CUPS_FINISHINGS		"finishings"
-#  define CUPS_FINISHINGS_SUPPORTED	"finishings-supported"
-
-#  define CUPS_FINISHINGS_BIND		"7"
-#  define CUPS_FINISHINGS_COVER		"6"
-#  define CUPS_FINISHINGS_FOLD		"10"
-#  define CUPS_FINISHINGS_NONE		"3"
-#  define CUPS_FINISHINGS_PUNCH		"5"
-#  define CUPS_FINISHINGS_STAPLE	"4"
-#  define CUPS_FINISHINGS_TRIM		"11"
-
-#  define CUPS_MEDIA			"media"
-#  define CUPS_MEDIA_READY		"media-ready"
-#  define CUPS_MEDIA_SUPPORTED		"media-supported"
-
-#  define CUPS_MEDIA_3X5		"na_index-3x5_3x5in"
-#  define CUPS_MEDIA_4X6		"na_index-4x6_4x6in"
-#  define CUPS_MEDIA_5X7		"na_5x7_5x7in"
-#  define CUPS_MEDIA_8X10		"na_govt-letter_8x10in"
-#  define CUPS_MEDIA_A3			"iso_a3_297x420mm"
-#  define CUPS_MEDIA_A4			"iso_a4_210x297mm"
-#  define CUPS_MEDIA_A5			"iso_a5_148x210mm"
-#  define CUPS_MEDIA_A6			"iso_a6_105x148mm"
-#  define CUPS_MEDIA_ENV10		"na_number-10_4.125x9.5in"
-#  define CUPS_MEDIA_ENVDL		"iso_dl_110x220mm"
-#  define CUPS_MEDIA_LEGAL		"na_legal_8.5x14in"
-#  define CUPS_MEDIA_LETTER		"na_letter_8.5x11in"
-#  define CUPS_MEDIA_PHOTO_L		"oe_photo-l_3.5x5in"
-#  define CUPS_MEDIA_SUPERBA3		"na_super-b_13x19in"
-#  define CUPS_MEDIA_TABLOID		"na_ledger_11x17in"
-
-#  define CUPS_MEDIA_SOURCE		"media-source"
-#  define CUPS_MEDIA_SOURCE_SUPPORTED	"media-source-supported"
-
-#  define CUPS_MEDIA_SOURCE_AUTO	"auto"
-#  define CUPS_MEDIA_SOURCE_MANUAL	"manual"
-
-#  define CUPS_MEDIA_TYPE		"media-type"
-#  define CUPS_MEDIA_TYPE_SUPPORTED	"media-type-supported"
-
-#  define CUPS_MEDIA_TYPE_AUTO		"auto"
-#  define CUPS_MEDIA_TYPE_ENVELOPE	"envelope"
-#  define CUPS_MEDIA_TYPE_LABELS	"labels"
-#  define CUPS_MEDIA_TYPE_LETTERHEAD	"stationery-letterhead"
-#  define CUPS_MEDIA_TYPE_PHOTO		"photographic"
-#  define CUPS_MEDIA_TYPE_PHOTO_GLOSSY	"photographic-glossy"
-#  define CUPS_MEDIA_TYPE_PHOTO_MATTE	"photographic-matte"
-#  define CUPS_MEDIA_TYPE_PLAIN		"stationery"
-#  define CUPS_MEDIA_TYPE_TRANSPARENCY	"transparency"
-
-#  define CUPS_NUMBER_UP		"number-up"
-#  define CUPS_NUMBER_UP_SUPPORTED	"number-up-supported"
-
-#  define CUPS_ORIENTATION		"orientation-requested"
-#  define CUPS_ORIENTATION_SUPPORTED	"orientation-requested-supported"
-
-#  define CUPS_ORIENTATION_PORTRAIT	"3"
-#  define CUPS_ORIENTATION_LANDSCAPE	"4"
-
-#  define CUPS_PRINT_COLOR_MODE		"print-color-mode"
-#  define CUPS_PRINT_COLOR_MODE_SUPPORTED "print-color-mode-supported"
-
-#  define CUPS_PRINT_COLOR_MODE_AUTO	"auto"
-#  define CUPS_PRINT_COLOR_MODE_MONOCHROME "monochrome"
-#  define CUPS_PRINT_COLOR_MODE_COLOR	"color"
-
-#  define CUPS_PRINT_QUALITY		"print-quality"
-#  define CUPS_PRINT_QUALITY_SUPPORTED	"print-quality-supported"
-
-#  define CUPS_PRINT_QUALITY_DRAFT	"3"
-#  define CUPS_PRINT_QUALITY_NORMAL	"4"
-#  define CUPS_PRINT_QUALITY_HIGH	"5"
-
-#  define CUPS_SIDES			"sides"
-#  define CUPS_SIDES_SUPPORTED		"sides-supported"
-
-#  define CUPS_SIDES_ONE_SIDED		"one-sided"
-#  define CUPS_SIDES_TWO_SIDED_PORTRAIT	"two-sided-long-edge"
-#  define CUPS_SIDES_TWO_SIDED_LANDSCAPE "two-sided-short-edge"
+#  define CUPS_BC_FD		3	/* Back-channel file descriptor for select/poll */
+#  define CUPS_DATE_ANY		(time_t)-1
+#  define CUPS_EXCLUDE_NONE	(const char *)0
+#  define CUPS_FORMAT_AUTO	"application/octet-stream"
+#  define CUPS_FORMAT_COMMAND	"application/vnd.cups-command"
+#  define CUPS_FORMAT_PDF	"application/pdf"
+#  define CUPS_FORMAT_POSTSCRIPT "application/postscript"
+#  define CUPS_FORMAT_RAW	"application/vnd.cups-raw"
+#  define CUPS_FORMAT_TEXT	"text/plain"
+#  define CUPS_HTTP_DEFAULT	(http_t *)0
+#  define CUPS_INCLUDE_ALL	(const char *)0
+#  define CUPS_JOBID_ALL	-1
+#  define CUPS_JOBID_CURRENT	0
+#  define CUPS_LENGTH_VARIABLE	(ssize_t)0
+#  define CUPS_TIMEOUT_DEFAULT	0
+#  define CUPS_WHICHJOBS_ALL	-1
+#  define CUPS_WHICHJOBS_ACTIVE	0
+#  define CUPS_WHICHJOBS_COMPLETED 1
 
 
 /*
  * Types and structures...
  */
 
-typedef unsigned cups_ptype_t;		/* Printer type/capability bits */
-enum cups_ptype_e			/* Printer type/capability bit
-					 * constants */
+typedef unsigned cups_ptype_t;		/**** Printer type/capability bits ****/
+enum cups_ptype_e			/**** Printer type/capability bit constants ****/
 {					/* Not a typedef'd enum so we can OR */
   CUPS_PRINTER_LOCAL = 0x0000,		/* Local printer or class */
   CUPS_PRINTER_CLASS = 0x0001,		/* Printer class */
@@ -224,32 +109,36 @@ enum cups_ptype_e			/* Printer type/capability bit
   CUPS_PRINTER_MEDIUM = 0x2000,		/* Can do Tabloid/B/C/A3/A2 */
   CUPS_PRINTER_LARGE = 0x4000,		/* Can do D/E/A1/A0 */
   CUPS_PRINTER_VARIABLE = 0x8000,	/* Can do variable sizes */
-  CUPS_PRINTER_IMPLICIT = 0x10000,	/* Implicit class @private@
-					 * @since Deprecated@ */
+  CUPS_PRINTER_IMPLICIT = 0x10000,	/* Implicit class */
   CUPS_PRINTER_DEFAULT = 0x20000,	/* Default printer on network */
   CUPS_PRINTER_FAX = 0x40000,		/* Fax queue */
   CUPS_PRINTER_REJECTING = 0x80000,	/* Printer is rejecting jobs */
-  CUPS_PRINTER_DELETE = 0x100000,	/* Delete printer
-					 * @since CUPS 1.2/Mac OS X 10.5@ */
-  CUPS_PRINTER_NOT_SHARED = 0x200000,	/* Printer is not shared
-					 * @since CUPS 1.2/Mac OS X 10.5@ */
-  CUPS_PRINTER_AUTHENTICATED = 0x400000,/* Printer requires authentication
-					 * @since CUPS 1.2/Mac OS X 10.5@ */
-  CUPS_PRINTER_COMMANDS = 0x800000,	/* Printer supports maintenance commands
-					 * @since CUPS 1.2/Mac OS X 10.5@ */
-  CUPS_PRINTER_DISCOVERED = 0x1000000,	/* Printer was automatically discovered
-					 * and added @private@
-					 * @since Deprecated@ */
-  CUPS_PRINTER_SCANNER = 0x2000000,	/* Scanner-only device
-					 * @since CUPS 1.4/Mac OS X 10.6@ */
-  CUPS_PRINTER_MFP = 0x4000000,		/* Printer with scanning capabilities
-					 * @since CUPS 1.4/Mac OS X 10.6@ */
-  CUPS_PRINTER_OPTIONS = 0x6fffc	/* ~(CLASS | REMOTE | IMPLICIT |
-					 * DEFAULT | FAX | REJECTING | DELETE |
-					 * NOT_SHARED | AUTHENTICATED |
-					 * COMMANDS | DISCOVERED) @private@ */
+  CUPS_PRINTER_DELETE = 0x100000,	/* Delete printer @since CUPS 1.2/Mac OS X 10.5@ */
+  CUPS_PRINTER_NOT_SHARED = 0x200000,	/* Printer is not shared @since CUPS 1.2/Mac OS X 10.5@ */
+  CUPS_PRINTER_AUTHENTICATED = 0x400000,/* Printer requires authentication @since CUPS 1.2/Mac OS X 10.5@ */
+  CUPS_PRINTER_COMMANDS = 0x800000,	/* Printer supports maintenance commands @since CUPS 1.2/Mac OS X 10.5@ */
+  CUPS_PRINTER_DISCOVERED = 0x1000000,	/* Printer was automatically discovered and added @since CUPS 1.3/Mac OS X 10.5@ */
+  CUPS_PRINTER_SCANNER = 0x2000000,	/* Scanner-only device @since CUPS 1.4/Mac OS X 10.6@ */
+  CUPS_PRINTER_MFP = 0x4000000,		/* Printer with scanning capabilities @since CUPS 1.4/Mac OS X 10.6@ */
+  CUPS_PRINTER_OPTIONS = 0x6fffc	/* ~(CLASS | REMOTE | IMPLICIT | DEFAULT | FAX | REJECTING | DELETE | NOT_SHARED | AUTHENTICATED | COMMANDS | DISCOVERED) @private@ */
 };
 
+typedef const char *(*cups_password_cb_t)(const char *prompt);
+					/**** Password callback ****/
+
+typedef const char *(*cups_password_cb2_t)(const char *prompt, http_t *http,
+					   const char *method,
+					   const char *resource,
+					   void *user_data);
+					/**** New password callback @since CUPS 1.4/Mac OS X 10.6@ ****/
+
+typedef void (*cups_device_cb_t)(const char *device_class,
+                                 const char *device_id, const char *device_info,
+                                 const char *device_make_and_model,
+                                 const char *device_uri,
+				 const char *device_location, void *user_data);
+					/**** Device callback @since CUPS 1.4/Mac OS X 10.6@ ****/
+
 typedef struct cups_option_s		/**** Printer Options ****/
 {
   char		*name;			/* Name of option */
@@ -265,10 +154,6 @@ typedef struct cups_dest_s		/**** Destination ****/
   cups_option_t	*options;		/* Options */
 } cups_dest_t;
 
-typedef struct _cups_dinfo_s cups_dinfo_t;
-					/* Destination capability and status
-					 * information @since CUPS 1.6@ */
-
 typedef struct cups_job_s		/**** Job ****/
 {
   int		id;			/* The job ID */
@@ -284,61 +169,14 @@ typedef struct cups_job_s		/**** Job ****/
   time_t	processing_time;	/* Time the job was processed */
 } cups_job_t;
 
-typedef struct cups_size_s		/**** Media Size @since CUPS 1.6@ ****/
-{
-  char		media[128];		/* Media name to use */
-  int		width,			/* Width in hundredths of millimeters */
-		length,			/* Length in hundredths of
-					 * millimeters */
-		bottom,			/* Bottom margin in hundredths of
-					 * millimeters */
-		left,			/* Left margin in hundredths of
-					 * millimeters */
-		right,			/* Right margin in hundredths of
-					 * millimeters */
-		top;			/* Top margin in hundredths of
-					 * millimeters */
-} cups_size_t;
-
 typedef int (*cups_client_cert_cb_t)(http_t *http, void *tls,
 				     cups_array_t *distinguished_names,
 				     void *user_data);
-					/* Client credentials callback
-					 * @since CUPS 1.5/Mac OS X 10.7@ */
-
-typedef int (*cups_dest_cb_t)(void *user_data, unsigned flags,
-			      cups_dest_t *dest);
-			      		/* Destination enumeration callback
-					 * @since CUPS 1.6@ */
-
-#  ifdef __BLOCKS__
-typedef int (^cups_dest_block_t)(unsigned flags, cups_dest_t *dest);
-			      		/* Destination enumeration block
-					 * @since CUPS 1.6@ */
-#  endif /* __BLOCKS__ */
-
-typedef void (*cups_device_cb_t)(const char *device_class,
-                                 const char *device_id, const char *device_info,
-                                 const char *device_make_and_model,
-                                 const char *device_uri,
-				 const char *device_location, void *user_data);
-					/* Device callback
-					 * @since CUPS 1.4/Mac OS X 10.6@ */
-
-typedef const char *(*cups_password_cb_t)(const char *prompt);
-					/* Password callback */
-
-typedef const char *(*cups_password_cb2_t)(const char *prompt, http_t *http,
-					   const char *method,
-					   const char *resource,
-					   void *user_data);
-					/* New password callback
-					 * @since CUPS 1.4/Mac OS X 10.6@ */
+					/**** Client credentials callback @since CUPS 1.5/Mac OS X 10.7@ ****/
 
 typedef int (*cups_server_cert_cb_t)(http_t *http, void *tls,
 				     cups_array_t *certs, void *user_data);
-					/* Server credentials callback
-					 * @since CUPS 1.5/Mac OS X 10.7@ */
+					/**** Server credentials callback @since CUPS 1.5/Mac OS X 10.7@ ****/
 
 
 /*
@@ -381,8 +219,7 @@ extern int		cupsAddOption(const char *name, const char *value,
 			              int num_options, cups_option_t **options);
 extern void		cupsEncodeOptions(ipp_t *ipp, int num_options,
 					  cups_option_t *options);
-extern void		cupsFreeOptions(int num_options,
-			                cups_option_t *options);
+extern void		cupsFreeOptions(int num_options, cups_option_t *options);
 extern const char	*cupsGetOption(const char *name, int num_options,
 			               cups_option_t *options);
 extern int		cupsParseOptions(const char *arg, int num_options,
@@ -398,25 +235,21 @@ extern const char	*cupsUser(void);
 
 /**** New in CUPS 1.1.20 ****/
 extern int		cupsDoAuthentication(http_t *http, const char *method,
-			                     const char *resource)
-			                     _CUPS_API_1_1_20;
+			                     const char *resource) _CUPS_API_1_1_20;
 extern http_status_t	cupsGetFile(http_t *http, const char *resource,
 			            const char *filename) _CUPS_API_1_1_20;
 extern http_status_t	cupsGetFd(http_t *http, const char *resource, int fd);
 extern http_status_t	cupsPutFile(http_t *http, const char *resource,
 			            const char *filename) _CUPS_API_1_1_20;
-extern http_status_t	cupsPutFd(http_t *http, const char *resource, int fd)
-			          _CUPS_API_1_1_20;
+extern http_status_t	cupsPutFd(http_t *http, const char *resource, int fd) _CUPS_API_1_1_20;
 
 /**** New in CUPS 1.1.21 ****/
 extern const char	*cupsGetDefault2(http_t *http) _CUPS_API_1_1_21;
-extern int		cupsGetDests2(http_t *http, cups_dest_t **dests)
-			              _CUPS_API_1_1_21;
+extern int		cupsGetDests2(http_t *http, cups_dest_t **dests) _CUPS_API_1_1_21;
 extern int		cupsGetJobs2(http_t *http, cups_job_t **jobs,
 			             const char *name, int myjobs,
 				     int whichjobs) _CUPS_API_1_1_21;
-extern const char	*cupsGetPPD2(http_t *http, const char *name)
-			             _CUPS_API_1_1_21;
+extern const char	*cupsGetPPD2(http_t *http, const char *name) _CUPS_API_1_1_21;
 extern int		cupsPrintFile2(http_t *http, const char *name,
 			               const char *filename,
 				       const char *title, int num_options,
@@ -424,8 +257,7 @@ extern int		cupsPrintFile2(http_t *http, const char *name,
 extern int		cupsPrintFiles2(http_t *http, const char *name,
 			                int num_files, const char **files,
 					const char *title, int num_options,
-					cups_option_t *options)
-					_CUPS_API_1_1_21;
+					cups_option_t *options) _CUPS_API_1_1_21;
 extern int		cupsSetDests2(http_t *http, int num_dests,
 			              cups_dest_t *dests) _CUPS_API_1_1_21;
 
@@ -438,10 +270,8 @@ extern void		cupsEncodeOptions2(ipp_t *ipp, int num_options,
 					   cups_option_t *options,
 					   ipp_tag_t group_tag) _CUPS_API_1_2;
 extern const char	*cupsLastErrorString(void) _CUPS_API_1_2;
-extern char		*cupsNotifySubject(cups_lang_t *lang, ipp_t *event)
-			                   _CUPS_API_1_2;
-extern char		*cupsNotifyText(cups_lang_t *lang, ipp_t *event)
-			                _CUPS_API_1_2;
+extern char		*cupsNotifySubject(cups_lang_t *lang, ipp_t *event) _CUPS_API_1_2;
+extern char		*cupsNotifyText(cups_lang_t *lang, ipp_t *event) _CUPS_API_1_2;
 extern int		cupsRemoveOption(const char *name, int num_options,
 			                 cups_option_t **options) _CUPS_API_1_2;
 extern cups_file_t	*cupsTempFile2(char *filename, int len) _CUPS_API_1_2;
@@ -450,12 +280,10 @@ extern cups_file_t	*cupsTempFile2(char *filename, int len) _CUPS_API_1_2;
 extern ipp_t		*cupsDoIORequest(http_t *http, ipp_t *request,
 			                 const char *resource, int infile,
 					 int outfile) _CUPS_API_1_3;
-extern char		*cupsGetServerPPD(http_t *http, const char *name)
-			                  _CUPS_API_1_3;
+extern char		*cupsGetServerPPD(http_t *http, const char *name) _CUPS_API_1_3;
 extern int		cupsRemoveDest(const char *name,
 			               const char *instance,
-				       int num_dests, cups_dest_t **dests)
-				       _CUPS_API_1_3;
+				       int num_dests, cups_dest_t **dests) _CUPS_API_1_3;
 extern void		cupsSetDefaultDest(const char *name,
 			                   const char *instance,
 					   int num_dests,
@@ -505,87 +333,6 @@ extern int		cupsSetCredentials(cups_array_t *certs) _CUPS_API_1_5;
 extern void		cupsSetServerCertCB(cups_server_cert_cb_t cb,
 					    void *user_data) _CUPS_API_1_5;
 
-/**** New in CUPS 1.6 ****/
-extern ipp_status_t	cupsCancelDestJob(http_t *http, cups_dest_t *dest,
-			                  int job_id) _CUPS_API_1_6;
-extern int		cupsCheckDestSupported(http_t *http, cups_dest_t *dest,
-					       cups_dinfo_t *info,
-			                       const char *option,
-					       const char *value) _CUPS_API_1_6;
-extern ipp_status_t	cupsCloseDestJob(http_t *http, cups_dest_t *dest,
-			                 int job_id) _CUPS_API_1_6;
-extern http_t		*cupsConnectDest(cups_dest_t *dest, unsigned flags,
-			                 int msec, int *cancel,
-					 char *resource, size_t resourcesize,
-					 cups_dest_cb_t cb, void *user_data)
-					 _CUPS_API_1_6;
-#  ifdef __BLOCKS__
-extern http_t		*cupsConnectDestBlock(cups_dest_t *dest,
-					      unsigned flags, int msec,
-					      int *cancel, char *resource,
-					      size_t resourcesize,
-					      cups_dest_block_t block)
-					      _CUPS_API_1_6;
-#  endif /* __BLOCKS__ */
-extern int		cupsCopyDest(cups_dest_t *dest, int num_dests,
-			             cups_dest_t **dests) _CUPS_API_1_6;
-extern cups_dinfo_t	*cupsCopyDestInfo(http_t *http, cups_dest_t *dest)
-					  _CUPS_API_1_6;
-extern int		cupsCopyDestConflicts(http_t *http, cups_dest_t *dest,
-					      cups_dinfo_t *info,
-					      int num_options,
-					      cups_option_t *options,
-					      const char *new_option,
-					      const char *new_value,
-					      int *num_conflicts,
-					      cups_option_t **conflicts,
-					      int *num_resolved,
-					      cups_option_t **resolved)
-					      _CUPS_API_1_6;
-extern ipp_status_t	cupsCreateDestJob(http_t *http, cups_dest_t *dest,
-					  cups_dinfo_t *info, int *job_id,
-					  const char *title, int num_options,
-			                  cups_option_t *options) _CUPS_API_1_6;
-extern int		cupsEnumDests(unsigned flags, int msec, int *cancel,
-				      cups_ptype_t type, cups_ptype_t mask,
-				      cups_dest_cb_t cb, void *user_data)
-				      _CUPS_API_1_6;
-#  ifdef __BLOCKS__
-extern int		cupsEnumDestsBlock(unsigned flags, int msec,
-					   int *cancel, cups_ptype_t type,
-					   cups_ptype_t mask,
-					   cups_dest_block_t block)
-					   _CUPS_API_1_6;
-#  endif /* __BLOCKS__ */
-extern ipp_status_t	cupsFinishDestDocument(http_t *http,
-			                       cups_dest_t *dest) _CUPS_API_1_6;
-extern void		cupsFreeDestInfo(cups_dinfo_t *dinfo) _CUPS_API_1_6;
-extern int		cupsGetDestMediaByName(http_t *http, cups_dest_t *dest,
-			                       cups_dinfo_t *dinfo,
-					       const char *media,
-					       unsigned flags,
-					       cups_size_t *size) _CUPS_API_1_6;
-extern int		cupsGetDestMediaBySize(http_t *http, cups_dest_t *dest,
-			                       cups_dinfo_t *dinfo,
-					       int width, int length,
-					       unsigned flags,
-					       cups_size_t *size) _CUPS_API_1_6;
-extern const char	*cupsLocalizeDestOption(http_t *http, cups_dest_t *dest,
-			                        cups_dinfo_t *info,
-			                        const char *option)
-			                        _CUPS_API_1_6;
-extern const char	*cupsLocalizeDestValue(http_t *http, cups_dest_t *dest,
-					       cups_dinfo_t *info,
-					       const char *option,
-					       const char *value)
-					       _CUPS_API_1_6;
-extern http_status_t	cupsStartDestDocument(http_t *http, cups_dest_t *dest,
-					      cups_dinfo_t *info, int job_id,
-					      const char *docname,
-					      const char *format,
-					      int num_options,
-					      cups_option_t *options,
-					      int last_document) _CUPS_API_1_6;
 
 #  ifdef __cplusplus
 }

cups/debug.c

@@ -45,8 +45,8 @@ _cups_gettimeofday(struct timeval *tv,	/* I  - Timeval struct */
 #else
 #  include <sys/time.h>
 #  include <unistd.h>
-#  include <regex.h>
 #endif /* WIN32 */
+#include <regex.h>
 #include <fcntl.h>
 
 
@@ -65,10 +65,8 @@ int			_cups_debug_level = 1;
  * Local globals...
  */
 
-#  ifndef WIN32
 static regex_t		*debug_filter = NULL;
 					/* Filter expression for messages */
-#  endif /* !WIN32 */
 static int		debug_init = 0;	/* Did we initialize debugging? */
 static _cups_mutex_t	debug_mutex = _CUPS_MUTEX_INITIALIZER;
 					/* Mutex to control initialization */
@@ -455,7 +453,6 @@ _cups_debug_printf(const char *format,	/* I - Printf-style format string */
   if (level > _cups_debug_level)
     return;
 
-#  ifndef WIN32
   if (debug_filter)
   {
     int	result;				/* Filter result */
@@ -467,7 +464,6 @@ _cups_debug_printf(const char *format,	/* I - Printf-style format string */
     if (result)
       return;
   }
-#  endif /* !WIN32 */
 
  /*
   * Format the message...
@@ -538,7 +534,6 @@ _cups_debug_puts(const char *s)		/* I - String to output */
   if (level > _cups_debug_level)
     return;
 
-#  ifndef WIN32
   if (debug_filter)
   {
     int	result;				/* Filter result */
@@ -550,7 +545,6 @@ _cups_debug_puts(const char *s)		/* I - String to output */
     if (result)
       return;
   }
-#  endif /* !WIN32 */
 
  /*
   * Format the message...
@@ -606,13 +600,11 @@ _cups_debug_set(const char *logfile,	/* I - Log file or NULL */
       _cups_debug_fd = -1;
     }
 
-#  ifndef WIN32
     if (debug_filter)
     {
       regfree((regex_t *)debug_filter);
       debug_filter = NULL;
     }
-#  endif /* !WIN32 */
 
     _cups_debug_level = 1;
 
@@ -639,7 +631,6 @@ _cups_debug_set(const char *logfile,	/* I - Log file or NULL */
     if (level)
       _cups_debug_level = atoi(level);
 
-#  ifndef WIN32
     if (filter)
     {
       if ((debug_filter = (regex_t *)calloc(1, sizeof(regex_t))) == NULL)
@@ -653,7 +644,6 @@ _cups_debug_set(const char *logfile,	/* I - Log file or NULL */
 	debug_filter = NULL;
       }
     }
-#  endif /* !WIN32 */
 
     debug_init = 1;
   }

cups/dest-job.c

@@ -1,145 +0,0 @@
-/*
- * "$Id$"
- *
- *   Destination job support for CUPS.
- *
- *   Copyright 2012 by Apple Inc.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   cupsCancelDestJob()      - Cancel a job on a destination.
- *   cupsCloseDestJob()       - Close a job and start printing.
- *   cupsCreateDestJob()      - Create a job on a destination.
- *   cupsFinishDestDocument() - Finish the current document.
- *   cupsStartDestDocument()  - Start a new document.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "cups-private.h"
-
-
-/*
- * 'cupsCancelDestJob()' - Cancel a job on a destination.
- *
- * The "job_id" is the number returned by cupsCreateDestJob.
- *
- * Returns IPP_OK on success and IPP_NOT_AUTHORIZED or IPP_FORBIDDEN on
- * failure.
- *
- * @since CUPS 1.6@
- */
-
-ipp_status_t
-cupsCancelDestJob(http_t      *http,	/* I - Connection to destination */
-                  cups_dest_t *dest,	/* I - Destination */
-                  int         job_id)	/* I - Job ID */
-{
-  return (IPP_NOT_FOUND);
-}
-
-
-/*
- * 'cupsCloseDestJob()' - Close a job and start printing.
- *
- * Use when the last call to cupsStartDocument passed 0 for "last_document".
- * "job_id" is the job ID returned by cupsCreateDestJob. Returns IPP_OK on
- * success.
- *
- * @since CUPS 1.6@
- */
-
-ipp_status_t
-cupsCloseDestJob(
-    http_t      *http,			/* I - Connection to destination */
-    cups_dest_t *dest,			/* I - Destination */
-    int         job_id)			/* I - Job ID */
-{
-  return (IPP_NOT_FOUND);
-}
-
-
-/*
- * 'cupsCreateDestJob()' - Create a job on a destination.
- *
- * Returns IPP_OK or IPP_OK_SUBST on success, saving the job ID in the variable
- * pointed to by "job_id".
- *
- * @since CUPS 1.6@
- */
-
-ipp_status_t				/* O - IPP status code */
-cupsCreateDestJob(
-    http_t        *http,		/* I - Connection to destination */
-    cups_dest_t   *dest,		/* I - Destination */
-    cups_dinfo_t  *info, 		/* I - Destination information */
-    int           *job_id,		/* O - Job ID or 0 on error */
-    const char    *title,		/* I - Job name */
-    int           num_options,		/* I - Number of job options */
-    cups_option_t *options)		/* I - Job options */
-{
-  *job_id = 0;
-
-  return (IPP_NOT_POSSIBLE);
-}
-
-
-/*
- * 'cupsFinishDestDocument()' - Finish the current document.
- *
- * Returns IPP_OK on success.
- *
- * @since CUPS 1.6@
- */
-
-ipp_status_t
-cupsFinishDestDocument(
-    http_t      *http,			/* I - Connection to destination */
-    cups_dest_t *dest)			/* I - Destination */
-{
-  return (IPP_NOT_FOUND);
-}
-
-
-/*
- * 'cupsStartDestDocument()' - Start a new document.
- *
- * "job_id" is the job ID returned by cupsCreateDestJob.  "docname" is the name
- * of the document/file being printed, "format" is the MIME media type for the
- * document (see CUPS_FORMAT_xxx constants), and "num_options" and "options"
- * are the options do be applied to the document. "last_document" should be 1
- * if this is the last document to be submitted in the job.  Returns
- * HTTP_CONTINUE on success.
- *
- * @since CUPS 1.6@
- */
-
-http_status_t
-cupsStartDestDocument(
-    http_t        *http,		/* I - Connection to destination */
-    cups_dest_t   *dest,		/* I - Destination */
-    cups_dinfo_t  *info, 		/* I - Destination information */
-    int           job_id,		/* I - Job ID */
-    const char    *docname,		/* I - Document name */
-    const char    *format,		/* I - Document format */
-    int           num_options,		/* I - Number of document options */
-    cups_option_t *options,		/* I - Document options */
-    int           last_document)	/* I - 1 if this is the last document */
-{
-  return (HTTP_CONTINUE);
-}
-
-
-/*
- * End of "$Id$".
- */

cups/dest-localization.c

@@ -1,76 +0,0 @@
-/*
- * "$Id$"
- *
- *   Destination localization support for CUPS.
- *
- *   Copyright 2012 by Apple Inc.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   cupsLocalizeDestOption() - Get the localized string for a destination
- *				option.
- *   cupsLocalizeDestValue()  - Get the localized string for a destination
- *				option+value pair.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "cups-private.h"
-
-
-/*
- * 'cupsLocalizeDestOption()' - Get the localized string for a destination
- *                              option.
- *
- * The returned string is stored in the localization array and will become
- * invalid if the localization array is deleted.
- *
- * @since CUPS 1.6@
- */
-
-const char *				/* O - Localized string */
-cupsLocalizeDestOption(
-    http_t       *http,			/* I - Connection to destination */
-    cups_dest_t  *dest,			/* I - Destination */
-    cups_dinfo_t *dinfo,		/* I - Destination information */
-    const char   *option)		/* I - Option to localize */
-{
-  return (option);
-}
-
-
-/*
- * 'cupsLocalizeDestValue()' - Get the localized string for a destination
- *                             option+value pair.
- *
- * The returned string is stored in the localization array and will become
- * invalid if the localization array is deleted.
- *
- * @since CUPS 1.6@
- */
-
-const char *				/* O - Localized string */
-cupsLocalizeDestValue(
-    http_t       *http,			/* I - Connection to destination */
-    cups_dest_t  *dest,			/* I - Destination */
-    cups_dinfo_t *dinfo,		/* I - Destination information */
-    const char   *option,		/* I - Option to localize */
-    const char   *value)		/* I - Value to localize */
-{
-  return (value);
-}
-
-
-/*
- * End of "$Id$".
- */

cups/encode.c

@@ -47,22 +47,15 @@ static const _ipp_option_t ipp_options[] =
   { 0, "columns",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
   { 0, "columns-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
   { 0, "compression",		IPP_TAG_KEYWORD,	IPP_TAG_OPERATION },
-  { 0, "copies",		IPP_TAG_INTEGER,	IPP_TAG_JOB,
-							IPP_TAG_DOCUMENT },
+  { 0, "copies",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
   { 0, "copies-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
   { 0, "device-uri",		IPP_TAG_URI,		IPP_TAG_PRINTER },
-  { 1, "document-copies",	IPP_TAG_RANGE,		IPP_TAG_JOB,
-							IPP_TAG_DOCUMENT },
   { 0, "document-format",	IPP_TAG_MIMETYPE,	IPP_TAG_OPERATION },
   { 0, "document-format-default", IPP_TAG_MIMETYPE,	IPP_TAG_PRINTER },
-  { 1, "document-numbers",	IPP_TAG_RANGE,		IPP_TAG_JOB,
-							IPP_TAG_DOCUMENT },
   { 1, "exclude-schemes",	IPP_TAG_NAME,		IPP_TAG_OPERATION },
-  { 1, "finishings",		IPP_TAG_ENUM,		IPP_TAG_JOB,
-							IPP_TAG_DOCUMENT },
+  { 1, "finishings",		IPP_TAG_ENUM,		IPP_TAG_JOB },
   { 1, "finishings-default",	IPP_TAG_ENUM,		IPP_TAG_PRINTER },
-  { 0, "fit-to-page",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB,
-							IPP_TAG_DOCUMENT },
+  { 0, "fit-to-page",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
   { 0, "fit-to-page-default",	IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
   { 0, "fitplot",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
   { 0, "fitplot-default",	IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
@@ -88,20 +81,14 @@ static const _ipp_option_t ipp_options[] =
   { 0, "marker-message",	IPP_TAG_TEXT,		IPP_TAG_PRINTER },
   { 1, "marker-names",		IPP_TAG_NAME,		IPP_TAG_PRINTER },
   { 1, "marker-types",		IPP_TAG_KEYWORD,	IPP_TAG_PRINTER },
-  { 1, "media",			IPP_TAG_KEYWORD,	IPP_TAG_JOB,
-							IPP_TAG_DOCUMENT },
-  { 0, "media-col",		IPP_TAG_BEGIN_COLLECTION, IPP_TAG_JOB,
-							IPP_TAG_DOCUMENT },
+  { 1, "media",			IPP_TAG_KEYWORD,	IPP_TAG_JOB },
+  { 0, "media-col",		IPP_TAG_BEGIN_COLLECTION, IPP_TAG_JOB },
   { 0, "media-col-default",	IPP_TAG_BEGIN_COLLECTION, IPP_TAG_PRINTER },
-  { 0, "media-color",		IPP_TAG_KEYWORD,	IPP_TAG_JOB,
-							IPP_TAG_DOCUMENT },
+  { 0, "media-color",		IPP_TAG_KEYWORD,	IPP_TAG_JOB },
   { 1, "media-default",		IPP_TAG_KEYWORD,	IPP_TAG_PRINTER },
-  { 0, "media-key",		IPP_TAG_KEYWORD,	IPP_TAG_JOB,
-							IPP_TAG_DOCUMENT },
-  { 0, "media-size",		IPP_TAG_BEGIN_COLLECTION, IPP_TAG_JOB,
-							IPP_TAG_DOCUMENT },
-  { 0, "media-type",		IPP_TAG_KEYWORD,	IPP_TAG_JOB,
-							IPP_TAG_DOCUMENT },
+  { 0, "media-key",		IPP_TAG_KEYWORD,	IPP_TAG_JOB },
+  { 0, "media-size",		IPP_TAG_BEGIN_COLLECTION, IPP_TAG_JOB },
+  { 0, "media-type",		IPP_TAG_KEYWORD,	IPP_TAG_JOB },
   { 0, "mirror",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
   { 0, "mirror-default",	IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
   { 0, "natural-scaling",	IPP_TAG_INTEGER,	IPP_TAG_JOB },
@@ -116,27 +103,20 @@ static const _ipp_option_t ipp_options[] =
   { 0, "notify-recipient-uri",	IPP_TAG_URI,		IPP_TAG_SUBSCRIPTION },
   { 0, "notify-time-interval",	IPP_TAG_INTEGER,	IPP_TAG_SUBSCRIPTION },
   { 0, "notify-user-data",	IPP_TAG_STRING,		IPP_TAG_SUBSCRIPTION },
-  { 0, "number-up",		IPP_TAG_INTEGER,	IPP_TAG_JOB,
-							IPP_TAG_DOCUMENT },
+  { 0, "number-up",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
   { 0, "number-up-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "orientation-requested",	IPP_TAG_ENUM,		IPP_TAG_JOB,
-							IPP_TAG_DOCUMENT },
+  { 0, "orientation-requested",	IPP_TAG_ENUM,		IPP_TAG_JOB },
   { 0, "orientation-requested-default", IPP_TAG_ENUM,	IPP_TAG_PRINTER },
-  { 1, "overrides",		IPP_TAG_BEGIN_COLLECTION, IPP_TAG_JOB,
-							IPP_TAG_DOCUMENT },
   { 0, "page-bottom",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
   { 0, "page-bottom-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
   { 0, "page-left",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
   { 0, "page-left-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 1, "page-ranges",		IPP_TAG_RANGE,		IPP_TAG_JOB,
-							IPP_TAG_DOCUMENT },
+  { 1, "page-ranges",		IPP_TAG_RANGE,		IPP_TAG_JOB },
   { 1, "page-ranges-default",	IPP_TAG_RANGE,		IPP_TAG_PRINTER },
   { 0, "page-right",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
   { 0, "page-right-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
   { 0, "page-top",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
   { 0, "page-top-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 1, "pages",			IPP_TAG_RANGE,		IPP_TAG_JOB,
-							IPP_TAG_DOCUMENT },
   { 0, "penwidth",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
   { 0, "penwidth-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
   { 0, "port-monitor",		IPP_TAG_NAME,		IPP_TAG_PRINTER },
@@ -145,8 +125,7 @@ static const _ipp_option_t ipp_options[] =
   { 0, "ppi-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
   { 0, "prettyprint",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
   { 0, "prettyprint-default",	IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
-  { 0, "print-quality",		IPP_TAG_ENUM,		IPP_TAG_JOB,
-							IPP_TAG_DOCUMENT },
+  { 0, "print-quality",		IPP_TAG_ENUM,		IPP_TAG_JOB },
   { 0, "print-quality-default",	IPP_TAG_ENUM,		IPP_TAG_PRINTER },
   { 1, "printer-commands",	IPP_TAG_KEYWORD,	IPP_TAG_PRINTER },
   { 0, "printer-error-policy",	IPP_TAG_NAME,		IPP_TAG_PRINTER },
@@ -157,8 +136,7 @@ static const _ipp_option_t ipp_options[] =
   { 0, "printer-make-and-model", IPP_TAG_TEXT,		IPP_TAG_PRINTER },
   { 0, "printer-more-info",	IPP_TAG_URI,		IPP_TAG_PRINTER },
   { 0, "printer-op-policy",	IPP_TAG_NAME,		IPP_TAG_PRINTER },
-  { 0, "printer-resolution",	IPP_TAG_RESOLUTION,	IPP_TAG_JOB,
-							IPP_TAG_DOCUMENT },
+  { 0, "printer-resolution",	IPP_TAG_RESOLUTION,	IPP_TAG_JOB },
   { 0, "printer-state",		IPP_TAG_ENUM,		IPP_TAG_PRINTER },
   { 0, "printer-state-change-time", IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
   { 1, "printer-state-reasons",	IPP_TAG_KEYWORD,	IPP_TAG_PRINTER },
@@ -176,15 +154,12 @@ static const _ipp_option_t ipp_options[] =
   { 0, "saturation-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
   { 0, "scaling",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
   { 0, "scaling-default",	IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
-  { 0, "sides",			IPP_TAG_KEYWORD,	IPP_TAG_JOB,
-							IPP_TAG_DOCUMENT },
+  { 0, "sides",			IPP_TAG_KEYWORD,	IPP_TAG_JOB },
   { 0, "sides-default",		IPP_TAG_KEYWORD,	IPP_TAG_PRINTER },
   { 0, "wrap",			IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
   { 0, "wrap-default",		IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
-  { 0, "x-dimension",		IPP_TAG_INTEGER,	IPP_TAG_JOB,
-							IPP_TAG_DOCUMENT },
-  { 0, "y-dimension",		IPP_TAG_INTEGER,	IPP_TAG_JOB,
-							IPP_TAG_DOCUMENT }
+  { 0, "x-dimension",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
+  { 0, "y-dimension",		IPP_TAG_INTEGER,	IPP_TAG_JOB }
 };
 
 
@@ -307,7 +282,7 @@ cupsEncodeOptions2(
 
     if ((match = _ippFindOption(option->name)) != NULL)
     {
-      if (match->group_tag != group_tag && match->alt_group_tag != group_tag)
+      if (match->group_tag != group_tag)
         continue;
 
       value_tag = match->value_tag;
@@ -319,11 +294,9 @@ cupsEncodeOptions2(
 
       namelen = (int)strlen(option->name);
 
-      if (namelen < 10 ||
-          (strcmp(option->name + namelen - 8, "-default") &&
-           strcmp(option->name + namelen - 10, "-supported")))
+      if (namelen < 9 || strcmp(option->name + namelen - 8, "-default"))
       {
-	if (group_tag != IPP_TAG_JOB && group_tag != IPP_TAG_DOCUMENT)
+	if (group_tag != IPP_TAG_JOB)
           continue;
       }
       else if (group_tag != IPP_TAG_PRINTER)
@@ -370,8 +343,7 @@ cupsEncodeOptions2(
     * Allocate memory for the attribute values...
     */
 
-    if ((attr = ippAddStrings(ipp, group_tag, value_tag, option->name, count,
-                              NULL, NULL)) == NULL)
+    if ((attr = _ippAddAttr(ipp, count)) == NULL)
     {
      /*
       * Ran out of memory!
@@ -381,6 +353,19 @@ cupsEncodeOptions2(
       return;
     }
 
+   /*
+    * Now figure out what type of value we have...
+    */
+
+    attr->group_tag = group_tag;
+    attr->value_tag = value_tag;
+
+   /*
+    * Copy the name over...
+    */
+
+    attr->name = _cupsStrAlloc(option->name);
+
     if (count > 1)
     {
      /*

cups/file.c

@@ -168,13 +168,19 @@ _cupsFileCheck(
   * Verify permission of the file itself:
   *
   * 1. Must be owned by root
-  * 2. Must not be writable by group
+  * 2. Must not be writable by group unless group is root/wheel/admin
   * 3. Must not be setuid
   * 4. Must not be writable by others
   */
 
   if (fileinfo.st_uid ||		/* 1. Must be owned by root */
-      (fileinfo.st_mode & S_IWGRP)  ||	/* 2. Must not be writable by group */
+#ifdef __APPLE__
+      ((fileinfo.st_mode & S_IWGRP) && fileinfo.st_gid &&
+       fileinfo.st_gid != 80) ||	/* 2. Must not be writable by group */
+#else
+      ((fileinfo.st_mode & S_IWGRP) && fileinfo.st_gid) ||
+					/* 2. Must not be writable by group */
+#endif /* __APPLE__ */
       (fileinfo.st_mode & S_ISUID) ||	/* 3. Must not be setuid */
       (fileinfo.st_mode & S_IWOTH))	/* 4. Must not be writable by others */
   {
@@ -213,7 +219,13 @@ _cupsFileCheck(
   }
 
   if (fileinfo.st_uid ||		/* 1. Must be owned by root */
-      (fileinfo.st_mode & S_IWGRP) ||	/* 2. Must not be writable by group */
+#ifdef __APPLE__
+      ((fileinfo.st_mode & S_IWGRP) && fileinfo.st_gid &&
+       fileinfo.st_gid != 80) ||	/* 2. Must not be writable by group */
+#else
+      ((fileinfo.st_mode & S_IWGRP) && fileinfo.st_gid) ||
+					/* 2. Must not be writable by group */
+#endif /* __APPLE__ */
       (fileinfo.st_mode & S_ISUID) ||	/* 3. Must not be setuid */
       (fileinfo.st_mode & S_IWOTH))	/* 4. Must not be writable by others */
   {

cups/file.h

@@ -72,29 +72,26 @@ extern const char	*cupsFileFind(const char *filename, const char *path,
 				      int bufsize) _CUPS_API_1_2;
 extern int		cupsFileFlush(cups_file_t *fp) _CUPS_API_1_2;
 extern int		cupsFileGetChar(cups_file_t *fp) _CUPS_API_1_2;
-extern char		*cupsFileGetConf(cups_file_t *fp, char *buf,
-			                 size_t buflen, char **value,
-			                 int *linenum) _CUPS_API_1_2;
+extern char		*cupsFileGetConf(cups_file_t *fp, char *buf, size_t buflen,
+			                 char **value, int *linenum) _CUPS_API_1_2;
 extern size_t		cupsFileGetLine(cups_file_t *fp, char *buf,
 			                size_t buflen) _CUPS_API_1_2;
-extern char		*cupsFileGets(cups_file_t *fp, char *buf, size_t buflen)
-			_CUPS_API_1_2;
+extern char		*cupsFileGets(cups_file_t *fp, char *buf, size_t buflen) _CUPS_API_1_2;
 extern int		cupsFileLock(cups_file_t *fp, int block) _CUPS_API_1_2;
 extern int		cupsFileNumber(cups_file_t *fp) _CUPS_API_1_2;
-extern cups_file_t	*cupsFileOpen(const char *filename, const char *mode)
-			_CUPS_API_1_2;
+extern cups_file_t	*cupsFileOpen(const char *filename, const char *mode) _CUPS_API_1_2;
 extern cups_file_t	*cupsFileOpenFd(int fd, const char *mode) _CUPS_API_1_2;
 extern int		cupsFilePeekChar(cups_file_t *fp) _CUPS_API_1_2;
 extern int		cupsFilePrintf(cups_file_t *fp, const char *format, ...)
-			__attribute__((__format__ (__printf__, 2, 3)))
-			_CUPS_API_1_2;
+#ifdef __GNUC__
+__attribute__ ((__format__ (__printf__, 2, 3)))
+#endif /* __GNUC__ */
+_CUPS_API_1_2;
 extern int		cupsFilePutChar(cups_file_t *fp, int c) _CUPS_API_1_2;
 extern ssize_t		cupsFilePutConf(cups_file_t *fp, const char *directive,
 			                const char *value) _CUPS_API_1_4;
-extern int		cupsFilePuts(cups_file_t *fp, const char *s)
-			_CUPS_API_1_2;
-extern ssize_t		cupsFileRead(cups_file_t *fp, char *buf, size_t bytes)
-			_CUPS_API_1_2;
+extern int		cupsFilePuts(cups_file_t *fp, const char *s) _CUPS_API_1_2;
+extern ssize_t		cupsFileRead(cups_file_t *fp, char *buf, size_t bytes) _CUPS_API_1_2;
 extern off_t		cupsFileRewind(cups_file_t *fp) _CUPS_API_1_2;
 extern off_t		cupsFileSeek(cups_file_t *fp, off_t pos) _CUPS_API_1_2;
 extern cups_file_t	*cupsFileStderr(void) _CUPS_API_1_2;
@@ -102,8 +99,7 @@ extern cups_file_t	*cupsFileStdin(void) _CUPS_API_1_2;
 extern cups_file_t	*cupsFileStdout(void) _CUPS_API_1_2;
 extern off_t		cupsFileTell(cups_file_t *fp) _CUPS_API_1_2;
 extern int		cupsFileUnlock(cups_file_t *fp) _CUPS_API_1_2;
-extern ssize_t		cupsFileWrite(cups_file_t *fp, const char *buf,
-			              size_t bytes) _CUPS_API_1_2;
+extern ssize_t		cupsFileWrite(cups_file_t *fp, const char *buf, size_t bytes) _CUPS_API_1_2;
 
 
 #  ifdef __cplusplus

cups/getdevices.c

@@ -3,7 +3,7 @@
  *
  *   cupsGetDevices implementation for CUPS.
  *
- *   Copyright 2008-2011 by Apple Inc.
+ *   Copyright 2008-2010 by Apple Inc.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Apple Inc. and are protected by Federal copyright
@@ -258,7 +258,7 @@ cupsGetDevices(
   httpFlush(http);
 
   if (status == HTTP_ERROR)
-    _cupsSetError(IPP_INTERNAL_ERROR, strerror(http->error), 0);
+    _cupsSetError(IPP_ERROR, NULL, 0);
   else
   {
     attr = ippFindAttribute(response, "status-message", IPP_TAG_TEXT);

cups/globals.c

@@ -43,8 +43,10 @@ static _cups_threadkey_t cups_globals_key = _CUPS_THREADKEY_INITIALIZER;
 static pthread_once_t	cups_globals_key_once = PTHREAD_ONCE_INIT;
 					/* One-time initialization object */
 #endif /* HAVE_PTHREAD_H */
+#if defined(HAVE_PTHREAD_H) || defined(WIN32)
 static _cups_mutex_t	cups_global_mutex = _CUPS_MUTEX_INITIALIZER;
 					/* Global critical section */
+#endif /* HAVE_PTHREAD_H || WIN32 */
 
 
 /*
@@ -52,7 +54,9 @@ static _cups_mutex_t	cups_global_mutex = _CUPS_MUTEX_INITIALIZER;
  */
 
 static _cups_globals_t	*cups_globals_alloc(void);
+#if defined(HAVE_PTHREAD_H) || defined(WIN32)
 static void		cups_globals_free(_cups_globals_t *g);
+#endif /* HAVE_PTHREAD_H || WIN32 */
 #ifdef HAVE_PTHREAD_H
 static void		cups_globals_init(void);
 #endif /* HAVE_PTHREAD_H */
@@ -298,17 +302,18 @@ cups_globals_alloc(void)
  * 'cups_globals_free()' - Free global data.
  */
 
+#if defined(HAVE_PTHREAD_H) || defined(WIN32)
 static void
 cups_globals_free(_cups_globals_t *cg)	/* I - Pointer to global data */
 {
-  _cups_buffer_t	*buffer,	/* Current read/write buffer */
+  _ipp_buffer_t		*buffer,	/* Current IPP read/write buffer */
 			*next;		/* Next buffer */
 
 
   if (cg->last_status_message)
     _cupsStrFree(cg->last_status_message);
 
-  for (buffer = cg->cups_buffers; buffer; buffer = next)
+  for (buffer = cg->ipp_buffers; buffer; buffer = next)
   {
     next = buffer->next;
     free(buffer);
@@ -330,6 +335,7 @@ cups_globals_free(_cups_globals_t *cg)	/* I - Pointer to global data */
 
   free(cg);
 }
+#endif /* HAVE_PTHREAD_H || WIN32 */
 
 
 #ifdef HAVE_PTHREAD_H

cups/http-addrlist.c

@@ -3,7 +3,7 @@
  *
  *   HTTP address list routines for CUPS.
  *
- *   Copyright 2007-2012 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
@@ -15,8 +15,6 @@
  * Contents:
  *
  *   httpAddrConnect()  - Connect to any of the addresses in the list.
- *   httpAddrConnect2() - Connect to any of the addresses in the list with a
- *                        timeout and optional cancel.
  *   httpAddrFreeList() - Free an address list.
  *   httpAddrGetList()  - Get a list of addresses for a hostname.
  */
@@ -29,9 +27,6 @@
 #ifdef HAVE_RESOLV_H
 #  include <resolv.h>
 #endif /* HAVE_RESOLV_H */
-#ifdef HAVE_POLL
-#  include <poll.h>
-#endif /* HAVE_POLL */
 
 
 /*
@@ -44,62 +39,24 @@ http_addrlist_t *			/* O - Connected address or NULL on failure */
 httpAddrConnect(
     http_addrlist_t *addrlist,		/* I - List of potential addresses */
     int             *sock)		/* O - Socket */
-{
-  DEBUG_printf(("httpAddrConnect(addrlist=%p, sock=%p)", addrlist, sock));
-
-  return (httpAddrConnect2(addrlist, sock, 30000, NULL));
-}
-
-
-/*
- * 'httpAddrConnect2()' - Connect to any of the addresses in the list with a
- *                        timeout and optional cancel.
- *
- * @since CUPS 1.6@
- */
-
-http_addrlist_t *			/* O - Connected address or NULL on failure */
-httpAddrConnect2(
-    http_addrlist_t *addrlist,		/* I - List of potential addresses */
-    int             *sock,		/* O - Socket */
-    int             msec,		/* I - Timeout in milliseconds */
-    int             *cancel)		/* I - Pointer to "cancel" variable */
 {
   int			val;		/* Socket option value */
-#ifdef O_NONBLOCK
-  socklen_t		len;		/* Length of value */
-  int			flags,		/* Socket flags */
-			remaining;	/* Remaining timeout */
-#  ifdef HAVE_POLL
-  struct pollfd		pfd;		/* Polled file descriptor */
-#  else
-  fd_set		input_set,	/* select() input set */
-			output_set;	/* select() output set */
-  struct timeval	timeout;	/* Timeout */
-#  endif /* HAVE_POLL */
-  int			nfds;		/* Result from select()/poll() */
-#endif /* O_NONBLOCK */
+#ifdef __APPLE__
+  struct timeval	timeout;	/* Socket timeout value */
+#endif /* __APPLE__ */
 #ifdef DEBUG
   char			temp[256];	/* Temporary address string */
 #endif /* DEBUG */
 
 
-  DEBUG_printf(("httpAddrConnect2(addrlist=%p, sock=%p, msec=%d, cancel=%p)",
-                addrlist, sock, msec, cancel));
+  DEBUG_printf(("httpAddrConnect(addrlist=%p, sock=%p)", addrlist, sock));
 
   if (!sock)
   {
     errno = EINVAL;
-    _cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0);
     return (NULL);
   }
 
-  if (cancel && *cancel)
-    return (NULL);
-
-  if (msec <= 0)
-    msec = INT_MAX;
-
  /*
   * Loop through each address until we connect or run out of addresses...
   */
@@ -110,7 +67,7 @@ httpAddrConnect2(
     * Create the socket...
     */
 
-    DEBUG_printf(("2httpAddrConnect2: Trying %s:%d...",
+    DEBUG_printf(("2httpAddrConnect: Trying %s:%d...",
 		  httpAddrString(&(addrlist->addr), temp, sizeof(temp)),
 		  _httpAddrPort(&(addrlist->addr))));
 
@@ -148,6 +105,17 @@ httpAddrConnect2(
     setsockopt(*sock, SOL_SOCKET, SO_NOSIGPIPE, &val, sizeof(val));
 #endif /* SO_NOSIGPIPE */
 
+#ifdef __APPLE__
+   /*
+    * Use a 30-second read timeout when connecting to limit the amount of time
+    * we block...
+    */
+
+    timeout.tv_sec  = 30;
+    timeout.tv_usec = 0;
+    setsockopt(*sock, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout));
+#endif /* __APPLE__ */
+
    /*
     * Using TCP_NODELAY improves responsiveness, especially on systems
     * with a slow loopback interface...
@@ -169,18 +137,6 @@ httpAddrConnect2(
     fcntl(*sock, F_SETFD, FD_CLOEXEC);
 #endif /* FD_CLOEXEC */
 
-#ifdef O_NONBLOCK
-   /*
-    * Do an asynchronous connect by setting the socket non-blocking...
-    */
-
-    DEBUG_printf(("httpAddrConnect2: Setting non-blocking connect()"));
-
-    flags = fcntl(*sock, F_GETFL, 0);
-    if (msec > 0)
-      fcntl(*sock, F_SETFL, flags | O_NONBLOCK);
-#endif /* O_NONBLOCK */
-
    /*
     * Then connect...
     */
@@ -188,107 +144,16 @@ httpAddrConnect2(
     if (!connect(*sock, &(addrlist->addr.addr),
                  httpAddrLength(&(addrlist->addr))))
     {
-      DEBUG_printf(("1httpAddrConnect2: Connected to %s:%d...",
+      DEBUG_printf(("1httpAddrConnect: Connected to %s:%d...",
 		    httpAddrString(&(addrlist->addr), temp, sizeof(temp)),
 		    _httpAddrPort(&(addrlist->addr))));
-
-#ifdef O_NONBLOCK
-      fcntl(*sock, F_SETFL, flags);
-#endif /* O_NONBLOCK */
-
-      return (addrlist);
+      break;
     }
 
-#ifdef O_NONBLOCK
-#  ifdef WIN32
-    if (errno == WSAEINPROGRESS)
-#  else
-    if (errno == EINPROGRESS)
-#  endif /* WIN32 */
-    {
-      DEBUG_puts("1httpAddrConnect2: Finishing async connect()");
-
-      for (remaining = msec; remaining > 0; remaining -= 250)
-      {
-	do
-        {
-          if (cancel && *cancel)
-          {
-	   /*
-	    * Close this socket and return...
-	    */
-
-            DEBUG_puts("1httpAddrConnect2: Canceled connect()");
-
-#    ifdef WIN32
-	    closesocket(*sock);
-#    else
-	    close(*sock);
-#    endif /* WIN32 */
-
-	    *sock = -1;
-
-	    return (NULL);
-          }
-
-#  ifdef HAVE_POLL
-	  pfd.fd     = *sock;
-	  pfd.events = POLLIN | POLLOUT;
-
-          nfds = poll(&pfd, 1, remaining > 250 ? 250 : remaining);
-
-	  DEBUG_printf(("1httpAddrConnect2: poll() returned %d (%d)", nfds,
-	                errno));
-
-#  else
-	  FD_ZERO(&input_set);
-	  FD_SET(*sock, &input_set);
-	  output_set = input_set;
-
-	  timeout.tv_sec  = 0;
-	  timeout.tv_usec = (remaining > 250 ? 250 : remaining) * 1000;
-
-	  nfds = select(*sock + 1, &input_set, &output_set, NULL, &timeout);
-
-	  DEBUG_printf(("1httpAddrConnect2: select() returned %d (%d)", nfds,
-	                errno));
-#  endif /* HAVE_POLL */
-	}
-#  ifdef WIN32
-	while (nfds < 0 && (WSAGetLastError() == WSAEINTR ||
-			    WSAGetLastError() == WSAEWOULDBLOCK));
-#  else
-	while (nfds < 0 && (errno == EINTR || errno == EAGAIN));
-#  endif /* WIN32 */
-
-        if (nfds > 0)
-        {
-          len = sizeof(val);
-          if (getsockopt(*sock, SOL_SOCKET, SO_ERROR, &val, &len) >= 0)
-          {
-	    DEBUG_printf(("1httpAddrConnect2: Connected to %s:%d...",
-			  httpAddrString(&(addrlist->addr), temp, sizeof(temp)),
-			  _httpAddrPort(&(addrlist->addr))));
-
-	    fcntl(*sock, F_SETFL, flags);
-	    return (addrlist);
-	  }
-
-          break;
-        }
-      }
-    }
-#endif /* O_NONBLOCK */
-
-    DEBUG_printf(("1httpAddrConnect2: Unable to connect to %s:%d: %s",
+    DEBUG_printf(("1httpAddrConnect: Unable to connect to %s:%d: %s",
 		  httpAddrString(&(addrlist->addr), temp, sizeof(temp)),
 		  _httpAddrPort(&(addrlist->addr)), strerror(errno)));
 
-#ifndef WIN32
-    if (errno == EINPROGRESS)
-      errno = ETIMEDOUT;
-#endif /* !WIN32 */
-
    /*
     * Close this socket and move to the next address...
     */
@@ -304,11 +169,7 @@ httpAddrConnect2(
   }
 
   if (!addrlist)
-#ifdef WIN32
-    _cupsSetError(IPP_SERVICE_UNAVAILABLE, "Connection failed", 0);
-#else
     _cupsSetError(IPP_SERVICE_UNAVAILABLE, strerror(errno), 0);
-#endif /* WIN32 */
 
   return (addrlist);
 }
@@ -395,6 +256,7 @@ httpAddrGetList(const char *hostname,	/* I - Hostname, IP address, or NULL for p
   }
 #endif /* HAVE_RES_INIT */
 
+
  /*
   * Lookup the address the best way we can...
   */
@@ -495,7 +357,6 @@ httpAddrGetList(const char *hostname,	/* I - Hostname, IP address, or NULL for p
 	  if (!temp)
 	  {
 	    httpAddrFreeList(first);
-	    _cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0);
 	    return (NULL);
 	  }
 
@@ -525,13 +386,8 @@ httpAddrGetList(const char *hostname,	/* I - Hostname, IP address, or NULL for p
 
       freeaddrinfo(results);
     }
-    else
-    {
-      if (error == EAI_FAIL)
-        cg->need_res_init = 1;
-
-      _cupsSetError(IPP_INTERNAL_ERROR, gai_strerror(error), 0);
-    }
+    else if (error == EAI_FAIL)
+      cg->need_res_init = 1;
 
 #else
     if (hostname)
@@ -649,13 +505,8 @@ httpAddrGetList(const char *hostname,	/* I - Hostname, IP address, or NULL for p
 	  addr = temp;
 	}
       }
-      else
-      {
-        if (h_errno == NO_RECOVERY)
-          cg->need_res_init = 1;
-
-	_cupsSetError(IPP_INTERNAL_ERROR, hstrerror(h_errno), 0);
-      }
+      else if (h_errno == NO_RECOVERY)
+        cg->need_res_init = 1;
     }
 #endif /* HAVE_GETADDRINFO */
   }
@@ -693,8 +544,6 @@ httpAddrGetList(const char *hostname,	/* I - Hostname, IP address, or NULL for p
     else
     {
       httpAddrFreeList(first);
-
-      _cupsSetError(IPP_INTERNAL_ERROR, _("Unknown service name."), 1);
       return (NULL);
     }
 
@@ -717,7 +566,6 @@ httpAddrGetList(const char *hostname,	/* I - Hostname, IP address, or NULL for p
 	temp = (http_addrlist_t *)calloc(1, sizeof(http_addrlist_t));
 	if (!temp)
 	{
-	  _cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0);
 	  httpAddrFreeList(first);
 	  return (NULL);
 	}
@@ -746,7 +594,6 @@ httpAddrGetList(const char *hostname,	/* I - Hostname, IP address, or NULL for p
 	temp = (http_addrlist_t *)calloc(1, sizeof(http_addrlist_t));
 	if (!temp)
 	{
-	  _cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0);
 	  httpAddrFreeList(first);
 	  return (NULL);
 	}
@@ -778,7 +625,6 @@ httpAddrGetList(const char *hostname,	/* I - Hostname, IP address, or NULL for p
 	temp = (http_addrlist_t *)calloc(1, sizeof(http_addrlist_t));
 	if (!temp)
 	{
-	  _cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0);
 	  httpAddrFreeList(first);
 	  return (NULL);
 	}
@@ -802,7 +648,6 @@ httpAddrGetList(const char *hostname,	/* I - Hostname, IP address, or NULL for p
 	temp = (http_addrlist_t *)calloc(1, sizeof(http_addrlist_t));
 	if (!temp)
 	{
-	  _cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0);
 	  httpAddrFreeList(first);
 	  return (NULL);
 	}

cups/http-support.c

@@ -757,10 +757,13 @@ httpGetDateString2(time_t t,		/* I - UNIX time */
 
 
   tdate = gmtime(&t);
-  snprintf(s, slen, "%s, %02d %s %d %02d:%02d:%02d GMT",
-           http_days[tdate->tm_wday], tdate->tm_mday,
-	   http_months[tdate->tm_mon], tdate->tm_year + 1900,
-	   tdate->tm_hour, tdate->tm_min, tdate->tm_sec);
+  if (tdate)
+    snprintf(s, slen, "%s, %02d %s %d %02d:%02d:%02d GMT",
+	     http_days[tdate->tm_wday], tdate->tm_mday,
+	     http_months[tdate->tm_mon], tdate->tm_year + 1900,
+	     tdate->tm_hour, tdate->tm_min, tdate->tm_sec);
+  else
+    s[0] = '\0';
 
   return (s);
 }

cups/http.c

@@ -3,7 +3,7 @@
  *
  *   HTTP routines for CUPS.
  *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   This file contains Kerberos support code, copyright 2006 by
@@ -19,105 +19,103 @@
  *
  * Contents:
  *
- *   httpAddCredential()      - Allocates and adds a single credential to an
- *				array.
- *   _httpBIOMethods()	      - Get the OpenSSL BIO methods for HTTP
- *				connections.
- *   httpBlocking()	      - Set blocking/non-blocking behavior on a
- *				connection.
- *   httpCheck()	      - Check to see if there is a pending response
- *				from the server.
- *   httpClearCookie()	      - Clear the cookie value(s).
- *   httpClearFields()	      - Clear HTTP request fields.
- *   httpClose()	      - Close an HTTP connection.
- *   httpConnect()	      - Connect to a HTTP server.
- *   httpConnectEncrypt()     - Connect to a HTTP server using encryption.
- *   httpCopyCredentials()    - Copy the credentials associated with an
- *				encrypted connection.
- *   _httpCreate()	      - Create an unconnected HTTP connection.
- *   _httpCreateCredentials() - Create credentials in the internal format.
- *   httpDelete()	      - Send a DELETE request to the server.
- *   _httpDisconnect()	      - Disconnect a HTTP connection.
- *   httpEncryption()	      - Set the required encryption on the link.
- *   httpError()	      - Get the last error on a connection.
- *   httpFlush()	      - Flush data from a HTTP connection.
- *   httpFlushWrite()	      - Flush data in write buffer.
- *   _httpFreeCredentials()   - Free internal credentials.
- *   httpFreeCredentials()    - Free an array of credentials.
- *   httpGet()		      - Send a GET request to the server.
- *   httpGetAuthString()      - Get the current authorization string.
- *   httpGetBlocking()	      - Get the blocking/non-block state of a
- *				connection.
- *   httpGetCookie()	      - Get any cookie data from the response.
- *   httpGetFd()	      - Get the file descriptor associated with a
- *				connection.
- *   httpGetField()	      - Get a field value from a request/response.
- *   httpGetLength()	      - Get the amount of data remaining from the
- *				content-length or transfer-encoding fields.
- *   httpGetLength2()	      - Get the amount of data remaining from the
- *				content-length or transfer-encoding fields.
- *   httpGets() 	      - Get a line of text from a HTTP connection.
- *   httpGetState()	      - Get the current state of the HTTP request.
- *   httpGetStatus()	      - Get the status of the last HTTP request.
- *   httpGetSubField()	      - Get a sub-field value.
- *   httpGetSubField2()       - Get a sub-field value.
- *   httpGetVersion()	      - Get the HTTP version at the other end.
- *   httpHead() 	      - Send a HEAD request to the server.
- *   httpInitialize()	      - Initialize the HTTP interface library and set
- *				the default HTTP proxy (if any).
- *   httpOptions()	      - Send an OPTIONS request to the server.
- *   _httpPeek()	      - Peek at data from a HTTP connection.
- *   httpPost() 	      - Send a POST request to the server.
- *   httpPrintf()	      - Print a formatted string to a HTTP connection.
- *   httpPut()		      - Send a PUT request to the server.
- *   httpRead() 	      - Read data from a HTTP connection.
- *   httpRead2()	      - Read data from a HTTP connection.
- *   _httpReadCDSA()	      - Read function for the CDSA library.
- *   _httpReadGNUTLS()	      - Read function for the GNU TLS library.
- *   httpReconnect()	      - Reconnect to a HTTP server.
- *   httpReconnect2()	      - Reconnect to a HTTP server with timeout and
- *				optional cancel.
- *   httpSetAuthString()      - Set the current authorization string.
- *   httpSetCredentials()     - Set the credentials associated with an
- *				encrypted connection.
- *   httpSetCookie()	      - Set the cookie value(s).
- *   httpSetExpect()	      - Set the Expect: header in a request.
- *   httpSetField()	      - Set the value of an HTTP header.
- *   httpSetLength()	      - Set the content-length and content-encoding.
- *   httpSetTimeout()	      - Set read/write timeouts and an optional
- *				callback.
- *   httpTrace()	      - Send an TRACE request to the server.
- *   _httpUpdate()	      - Update the current HTTP status for incoming
- *				data.
- *   httpUpdate()	      - Update the current HTTP state for incoming
- *				data.
- *   _httpWait()	      - Wait for data available on a connection (no
- *				flush).
- *   httpWait() 	      - Wait for data available on a connection.
- *   httpWrite()	      - Write data to a HTTP connection.
- *   httpWrite2()	      - Write data to a HTTP connection.
- *   _httpWriteCDSA()	      - Write function for the CDSA library.
- *   _httpWriteGNUTLS()       - Write function for the GNU TLS library.
- *   http_bio_ctrl()	      - Control the HTTP connection.
- *   http_bio_free()	      - Free OpenSSL data.
- *   http_bio_new()	      - Initialize an OpenSSL BIO structure.
- *   http_bio_puts()	      - Send a string for OpenSSL.
- *   http_bio_read()	      - Read data for OpenSSL.
- *   http_bio_write()	      - Write data for OpenSSL.
- *   http_debug_hex()	      - Do a hex dump of a buffer.
- *   http_field()	      - Return the field index for a field name.
- *   http_read_ssl()	      - Read from a SSL/TLS connection.
- *   http_send()	      - Send a request with all fields and the trailing
- *				blank line.
- *   http_set_credentials()   - Set the SSL/TLS credentials.
- *   http_set_timeout()       - Set the socket timeout values.
- *   http_set_wait()	      - Set the default wait value for reads.
- *   http_setup_ssl()	      - Set up SSL/TLS support on a connection.
- *   http_shutdown_ssl()      - Shut down SSL/TLS on a connection.
- *   http_upgrade()	      - Force upgrade to TLS encryption.
- *   http_write()	      - Write a buffer to a HTTP connection.
- *   http_write_chunk()       - Write a chunked buffer.
- *   http_write_ssl()	      - Write to a SSL/TLS connection.
+ *   httpAddCredential()       - Allocates and adds a single credential to an
+ *                               array.
+ *   _httpBIOMethods()         - Get the OpenSSL BIO methods for HTTP
+ *                               connections.
+ *   httpBlocking()            - Set blocking/non-blocking behavior on a
+ *                               connection.
+ *   httpCheck()               - Check to see if there is a pending response
+ *                               from the server.
+ *   httpClearCookie()         - Clear the cookie value(s).
+ *   httpClearFields()         - Clear HTTP request fields.
+ *   httpClose()               - Close an HTTP connection.
+ *   httpConnect()             - Connect to a HTTP server.
+ *   httpConnectEncrypt()      - Connect to a HTTP server using encryption.
+ *   httpCopyCredentials()     - Copy the credentials associated with an
+ *                               encrypted connection.
+ *   _httpCreate()             - Create an unconnected HTTP connection.
+ *   _httpCreateCredentials()  - Create credentials in the internal format.
+ *   httpDelete()              - Send a DELETE request to the server.
+ *   _httpDisconnect()         - Disconnect a HTTP connection.
+ *   httpEncryption()          - Set the required encryption on the link.
+ *   httpError()               - Get the last error on a connection.
+ *   httpFlush()               - Flush data from a HTTP connection.
+ *   httpFlushWrite()          - Flush data in write buffer.
+ *   _httpFreeCredentials()    - Free internal credentials.
+ *   httpFreeCredentials()     - Free an array of credentials.
+ *   httpGet()                 - Send a GET request to the server.
+ *   httpGetAuthString()       - Get the current authorization string.
+ *   httpGetBlocking()         - Get the blocking/non-block state of a
+ *                               connection.
+ *   httpGetCookie()           - Get any cookie data from the response.
+ *   httpGetFd()               - Get the file descriptor associated with a
+ *                               connection.
+ *   httpGetField()            - Get a field value from a request/response.
+ *   httpGetLength()           - Get the amount of data remaining from the
+ *                               content-length or transfer-encoding fields.
+ *   httpGetLength2()          - Get the amount of data remaining from the
+ *                               content-length or transfer-encoding fields.
+ *   httpGetStatus()           - Get the status of the last HTTP request.
+ *   httpGetSubField()         - Get a sub-field value.
+ *   httpGetSubField2()        - Get a sub-field value.
+ *   httpGets()                - Get a line of text from a HTTP connection.
+ *   httpHead()                - Send a HEAD request to the server.
+ *   httpInitialize()          - Initialize the HTTP interface library and set
+ *                               the default HTTP proxy (if any).
+ *   httpOptions()             - Send an OPTIONS request to the server.
+ *   _httpPeek()               - Peek at data from a HTTP connection.
+ *   httpPost()                - Send a POST request to the server.
+ *   httpPrintf()              - Print a formatted string to a HTTP connection.
+ *   httpPut()                 - Send a PUT request to the server.
+ *   httpRead()                - Read data from a HTTP connection.
+ *   httpRead2()               - Read data from a HTTP connection.
+ *   _httpReadCDSA()           - Read function for the CDSA library.
+ *   _httpReadGNUTLS()         - Read function for the GNU TLS library.
+ *   httpReconnect()           - Reconnect to a HTTP server.
+ *   httpSetAuthString()       - Set the current authorization string.
+ *   httpSetCredentials()      - Set the credentials associated with an
+ *                               encrypted connection.
+ *   httpSetCookie()           - Set the cookie value(s).
+ *   httpSetExpect()           - Set the Expect: header in a request.
+ *   httpSetField()            - Set the value of an HTTP header.
+ *   httpSetLength()           - Set the content-length and content-encoding.
+ *   httpSetTimeout()          - Set read/write timeouts and an optional
+ *                               callback.
+ *   httpTrace()               - Send an TRACE request to the server.
+ *   _httpUpdate()             - Update the current HTTP status for incoming
+ *                               data.
+ *   httpUpdate()              - Update the current HTTP state for incoming
+ *                               data.
+ *   _httpWait()               - Wait for data available on a connection (no
+ *                               flush).
+ *   httpWait()                - Wait for data available on a connection.
+ *   httpWrite()               - Write data to a HTTP connection.
+ *   httpWrite2()              - Write data to a HTTP connection.
+ *   _httpWriteCDSA()          - Write function for the CDSA library.
+ *   _httpWriteGNUTLS()        - Write function for the GNU TLS library.
+ *   http_bio_ctrl()           - Control the HTTP connection.
+ *   http_bio_free()           - Free OpenSSL data.
+ *   http_bio_new()            - Initialize an OpenSSL BIO structure.
+ *   http_bio_puts()           - Send a string for OpenSSL.
+ *   http_bio_read()           - Read data for OpenSSL.
+ *   http_bio_write()          - Write data for OpenSSL.
+ *   http_debug_hex()          - Do a hex dump of a buffer.
+ *   http_field()              - Return the field index for a field name.
+ *   http_read_ssl()           - Read from a SSL/TLS connection.
+ *   http_locking_cb()         - Lock/unlock a thread's mutex.
+ *   http_send()               - Send a request with all fields and the trailing
+ *                               blank line.
+ *   http_set_credentials()    - Set the SSL/TLS credentials.
+ *   http_set_timeout()        - Set the socket timeout values.
+ *   http_set_wait()           - Set the default wait value for reads.
+ *   http_setup_ssl()          - Set up SSL/TLS support on a connection.
+ *   http_shutdown_ssl()       - Shut down SSL/TLS on a connection.
+ *   http_threadid_cb()        - Return the current thread ID.
+ *   http_upgrade()            - Force upgrade to TLS encryption.
+ *   http_write()              - Write a buffer to a HTTP connection.
+ *   http_write_chunk()        - Write a chunked buffer.
+ *   http_write_ssl()          - Write to a SSL/TLS connection.
  */
 
 /*
@@ -135,10 +133,20 @@
 #  include <sys/resource.h>
 #endif /* WIN32 */
 #ifdef HAVE_POLL
-#  include <poll.h>
+#  include <sys/poll.h>
 #endif /* HAVE_POLL */
 
 
+/*
+ * Some operating systems have done away with the Fxxxx constants for
+ * the fcntl() call; this works around that "feature"...
+ */
+
+#ifndef FNONBLK
+#  define FNONBLK O_NONBLOCK
+#endif /* !FNONBLK */
+
+
 /*
  * Local functions...
  */
@@ -598,7 +606,6 @@ _httpCreate(
 
   if ((http = calloc(sizeof(http_t), 1)) == NULL)
   {
-    _cupsSetError(IPP_INTERNAL_ERROR, strerror(errno), 0);
     httpAddrFreeList(addrlist);
     return (NULL);
   }
@@ -1109,6 +1116,167 @@ httpGetLength2(http_t *http)		/* I - Connection to server */
 }
 
 
+/*
+ * 'httpGetStatus()' - Get the status of the last HTTP request.
+ *
+ * @since CUPS 1.2/Mac OS X 10.5@
+ */
+
+http_status_t				/* O - HTTP status */
+httpGetStatus(http_t *http)		/* I - Connection to server */
+{
+  return (http ? http->status : HTTP_ERROR);
+}
+
+
+/*
+ * 'httpGetSubField()' - Get a sub-field value.
+ *
+ * @deprecated@
+ */
+
+char *					/* O - Value or NULL */
+httpGetSubField(http_t       *http,	/* I - Connection to server */
+                http_field_t field,	/* I - Field index */
+                const char   *name,	/* I - Name of sub-field */
+		char         *value)	/* O - Value string */
+{
+  return (httpGetSubField2(http, field, name, value, HTTP_MAX_VALUE));
+}
+
+
+/*
+ * 'httpGetSubField2()' - Get a sub-field value.
+ *
+ * @since CUPS 1.2/Mac OS X 10.5@
+ */
+
+char *					/* O - Value or NULL */
+httpGetSubField2(http_t       *http,	/* I - Connection to server */
+                 http_field_t field,	/* I - Field index */
+                 const char   *name,	/* I - Name of sub-field */
+		 char         *value,	/* O - Value string */
+		 int          valuelen)	/* I - Size of value buffer */
+{
+  const char	*fptr;			/* Pointer into field */
+  char		temp[HTTP_MAX_VALUE],	/* Temporary buffer for name */
+		*ptr,			/* Pointer into string buffer */
+		*end;			/* End of value buffer */
+
+  DEBUG_printf(("2httpGetSubField2(http=%p, field=%d, name=\"%s\", value=%p, "
+                "valuelen=%d)", http, field, name, value, valuelen));
+
+  if (!http || !name || !value || valuelen < 2 ||
+      field <= HTTP_FIELD_UNKNOWN || field >= HTTP_FIELD_MAX)
+    return (NULL);
+
+  end = value + valuelen - 1;
+
+  for (fptr = http->fields[field]; *fptr;)
+  {
+   /*
+    * Skip leading whitespace...
+    */
+
+    while (_cups_isspace(*fptr))
+      fptr ++;
+
+    if (*fptr == ',')
+    {
+      fptr ++;
+      continue;
+    }
+
+   /*
+    * Get the sub-field name...
+    */
+
+    for (ptr = temp;
+         *fptr && *fptr != '=' && !_cups_isspace(*fptr) &&
+	     ptr < (temp + sizeof(temp) - 1);
+         *ptr++ = *fptr++);
+
+    *ptr = '\0';
+
+    DEBUG_printf(("4httpGetSubField2: name=\"%s\"", temp));
+
+   /*
+    * Skip trailing chars up to the '='...
+    */
+
+    while (_cups_isspace(*fptr))
+      fptr ++;
+
+    if (!*fptr)
+      break;
+
+    if (*fptr != '=')
+      continue;
+
+   /*
+    * Skip = and leading whitespace...
+    */
+
+    fptr ++;
+
+    while (_cups_isspace(*fptr))
+      fptr ++;
+
+    if (*fptr == '\"')
+    {
+     /*
+      * Read quoted string...
+      */
+
+      for (ptr = value, fptr ++;
+           *fptr && *fptr != '\"' && ptr < end;
+	   *ptr++ = *fptr++);
+
+      *ptr = '\0';
+
+      while (*fptr && *fptr != '\"')
+        fptr ++;
+
+      if (*fptr)
+        fptr ++;
+    }
+    else
+    {
+     /*
+      * Read unquoted string...
+      */
+
+      for (ptr = value;
+           *fptr && !_cups_isspace(*fptr) && *fptr != ',' && ptr < end;
+	   *ptr++ = *fptr++);
+
+      *ptr = '\0';
+
+      while (*fptr && !_cups_isspace(*fptr) && *fptr != ',')
+        fptr ++;
+    }
+
+    DEBUG_printf(("4httpGetSubField2: value=\"%s\"", value));
+
+   /*
+    * See if this is the one...
+    */
+
+    if (!strcmp(name, temp))
+    {
+      DEBUG_printf(("3httpGetSubField2: Returning \"%s\"", value));
+      return (value);
+    }
+  }
+
+  value[0] = '\0';
+
+  DEBUG_puts("3httpGetSubField2: Returning NULL");
+
+  return (NULL);
+}
+
+
 /*
  * 'httpGets()' - Get a line of text from a HTTP connection.
  */
@@ -1289,189 +1457,6 @@ httpGets(char   *line,			/* I - Line to read into */
 }
 
 
-/*
- * 'httpGetState()' - Get the current state of the HTTP request.
- */
-
-http_state_t				/* O - HTTP state */
-httpGetState(http_t *http)		/* I - Connection to server */
-{
-  return (http ? http->state : HTTP_ERROR);
-}
-
-
-/*
- * 'httpGetStatus()' - Get the status of the last HTTP request.
- *
- * @since CUPS 1.2/Mac OS X 10.5@
- */
-
-http_status_t				/* O - HTTP status */
-httpGetStatus(http_t *http)		/* I - Connection to server */
-{
-  return (http ? http->status : HTTP_ERROR);
-}
-
-
-/*
- * 'httpGetSubField()' - Get a sub-field value.
- *
- * @deprecated@
- */
-
-char *					/* O - Value or NULL */
-httpGetSubField(http_t       *http,	/* I - Connection to server */
-                http_field_t field,	/* I - Field index */
-                const char   *name,	/* I - Name of sub-field */
-		char         *value)	/* O - Value string */
-{
-  return (httpGetSubField2(http, field, name, value, HTTP_MAX_VALUE));
-}
-
-
-/*
- * 'httpGetSubField2()' - Get a sub-field value.
- *
- * @since CUPS 1.2/Mac OS X 10.5@
- */
-
-char *					/* O - Value or NULL */
-httpGetSubField2(http_t       *http,	/* I - Connection to server */
-                 http_field_t field,	/* I - Field index */
-                 const char   *name,	/* I - Name of sub-field */
-		 char         *value,	/* O - Value string */
-		 int          valuelen)	/* I - Size of value buffer */
-{
-  const char	*fptr;			/* Pointer into field */
-  char		temp[HTTP_MAX_VALUE],	/* Temporary buffer for name */
-		*ptr,			/* Pointer into string buffer */
-		*end;			/* End of value buffer */
-
-  DEBUG_printf(("2httpGetSubField2(http=%p, field=%d, name=\"%s\", value=%p, "
-                "valuelen=%d)", http, field, name, value, valuelen));
-
-  if (!http || !name || !value || valuelen < 2 ||
-      field <= HTTP_FIELD_UNKNOWN || field >= HTTP_FIELD_MAX)
-    return (NULL);
-
-  end = value + valuelen - 1;
-
-  for (fptr = http->fields[field]; *fptr;)
-  {
-   /*
-    * Skip leading whitespace...
-    */
-
-    while (_cups_isspace(*fptr))
-      fptr ++;
-
-    if (*fptr == ',')
-    {
-      fptr ++;
-      continue;
-    }
-
-   /*
-    * Get the sub-field name...
-    */
-
-    for (ptr = temp;
-         *fptr && *fptr != '=' && !_cups_isspace(*fptr) &&
-	     ptr < (temp + sizeof(temp) - 1);
-         *ptr++ = *fptr++);
-
-    *ptr = '\0';
-
-    DEBUG_printf(("4httpGetSubField2: name=\"%s\"", temp));
-
-   /*
-    * Skip trailing chars up to the '='...
-    */
-
-    while (_cups_isspace(*fptr))
-      fptr ++;
-
-    if (!*fptr)
-      break;
-
-    if (*fptr != '=')
-      continue;
-
-   /*
-    * Skip = and leading whitespace...
-    */
-
-    fptr ++;
-
-    while (_cups_isspace(*fptr))
-      fptr ++;
-
-    if (*fptr == '\"')
-    {
-     /*
-      * Read quoted string...
-      */
-
-      for (ptr = value, fptr ++;
-           *fptr && *fptr != '\"' && ptr < end;
-	   *ptr++ = *fptr++);
-
-      *ptr = '\0';
-
-      while (*fptr && *fptr != '\"')
-        fptr ++;
-
-      if (*fptr)
-        fptr ++;
-    }
-    else
-    {
-     /*
-      * Read unquoted string...
-      */
-
-      for (ptr = value;
-           *fptr && !_cups_isspace(*fptr) && *fptr != ',' && ptr < end;
-	   *ptr++ = *fptr++);
-
-      *ptr = '\0';
-
-      while (*fptr && !_cups_isspace(*fptr) && *fptr != ',')
-        fptr ++;
-    }
-
-    DEBUG_printf(("4httpGetSubField2: value=\"%s\"", value));
-
-   /*
-    * See if this is the one...
-    */
-
-    if (!strcmp(name, temp))
-    {
-      DEBUG_printf(("3httpGetSubField2: Returning \"%s\"", value));
-      return (value);
-    }
-  }
-
-  value[0] = '\0';
-
-  DEBUG_puts("3httpGetSubField2: Returning NULL");
-
-  return (NULL);
-}
-
-
-/*
- * 'httpGetVersion()' - Get the HTTP version at the other end.
- */
-
-http_version_t				/* O - Version number */
-httpGetVersion(http_t *http)		/* I - Connection to server */
-{
-  return (http ? http->version : HTTP_1_0);
-}
-
-
 /*
  * 'httpHead()' - Send a HEAD request to the server.
  */
@@ -2136,14 +2121,10 @@ httpRead2(http_t *http,			/* I - Connection to server */
   {
     if (http->data_encoding == HTTP_ENCODE_CHUNKED)
       httpGets(len, sizeof(len), http);
-
-    if (http->data_encoding != HTTP_ENCODE_CHUNKED)
-    {
-      if (http->state == HTTP_POST_RECV)
-	http->state ++;
-      else
-	http->state = HTTP_WAITING;
-    }
+    else if (http->state == HTTP_POST_RECV)
+      http->state ++;
+    else
+      http->state = HTTP_WAITING;
   }
 
 #ifdef DEBUG
@@ -2268,22 +2249,6 @@ _httpReadGNUTLS(
 
 int					/* O - 0 on success, non-zero on failure */
 httpReconnect(http_t *http)		/* I - Connection to server */
-{
-  DEBUG_printf(("httpReconnect(http=%p)", http));
-
-  return (httpReconnect2(http, 30000, NULL));
-}
-
-
-/*
- * 'httpReconnect2()' - Reconnect to a HTTP server with timeout and optional
- *                      cancel.
- */
-
-int					/* O - 0 on success, non-zero on failure */
-httpReconnect2(http_t *http,		/* I - Connection to server */
-	       int    msec,		/* I - Timeout in milliseconds */
-	       int    *cancel)		/* I - Pointer to "cancel" variable */
 {
   http_addrlist_t	*addr;		/* Connected address */
 #ifdef DEBUG
@@ -2292,19 +2257,15 @@ httpReconnect2(http_t *http,		/* I - Connection to server */
 #endif /* DEBUG */
 
 
-  DEBUG_printf(("httpReconnect2(http=%p, msec=%d, cancel=%p)", http, msec,
-                cancel));
+  DEBUG_printf(("httpReconnect(http=%p)", http));
 
   if (!http)
-  {
-    _cupsSetError(IPP_INTERNAL_ERROR, strerror(EINVAL), 0);
     return (-1);
-  }
 
 #ifdef HAVE_SSL
   if (http->tls)
   {
-    DEBUG_puts("2httpReconnect2: Shutting down SSL/TLS...");
+    DEBUG_puts("2httpReconnect: Shutting down SSL/TLS...");
     http_shutdown_ssl(http);
   }
 #endif /* HAVE_SSL */
@@ -2315,7 +2276,7 @@ httpReconnect2(http_t *http,		/* I - Connection to server */
 
   if (http->fd >= 0)
   {
-    DEBUG_printf(("2httpReconnect2: Closing socket %d...", http->fd));
+    DEBUG_printf(("2httpReconnect: Closing socket %d...", http->fd));
 
 #ifdef WIN32
     closesocket(http->fd);
@@ -2326,19 +2287,35 @@ httpReconnect2(http_t *http,		/* I - Connection to server */
     http->fd = -1;
   }
 
+ /*
+  * Reset all state (except fields, which may be reused)...
+  */
+
+  http->state           = HTTP_WAITING;
+  http->status          = HTTP_CONTINUE;
+  http->version         = HTTP_1_1;
+  http->keep_alive      = HTTP_KEEPALIVE_OFF;
+  memset(&http->_hostaddr, 0, sizeof(http->_hostaddr));
+  http->data_encoding   = HTTP_ENCODE_LENGTH;
+  http->_data_remaining = 0;
+  http->used            = 0;
+  http->expect          = 0;
+  http->data_remaining  = 0;
+  http->hostaddr        = NULL;
+  http->wused           = 0;
+
  /*
   * Connect to the server...
   */
 
 #ifdef DEBUG
   for (current = http->addrlist; current; current = current->next)
-    DEBUG_printf(("2httpReconnect2: Address %s:%d",
+    DEBUG_printf(("2httpReconnect: Address %s:%d",
                   httpAddrString(&(current->addr), temp, sizeof(temp)),
                   _httpAddrPort(&(current->addr))));
 #endif /* DEBUG */
 
-  if ((addr = httpAddrConnect2(http->addrlist, &(http->fd), msec,
-                               cancel)) == NULL)
+  if ((addr = httpAddrConnect(http->addrlist, &(http->fd))) == NULL)
   {
    /*
     * Unable to connect...
@@ -2351,21 +2328,19 @@ httpReconnect2(http_t *http,		/* I - Connection to server */
 #endif /* WIN32 */
     http->status = HTTP_ERROR;
 
-    DEBUG_printf(("1httpReconnect2: httpAddrConnect failed: %s",
+    DEBUG_printf(("1httpReconnect: httpAddrConnect failed: %s",
                   strerror(http->error)));
 
     return (-1);
   }
 
-  DEBUG_printf(("2httpReconnect2: New socket=%d", http->fd));
+  DEBUG_printf(("2httpReconnect: New socket=%d", http->fd));
 
   if (http->timeout_value > 0)
     http_set_timeout(http->fd, http->timeout_value);
 
   http->hostaddr = &(addr->addr);
   http->error    = 0;
-  http->status   = HTTP_CONTINUE;
-  http->state    = HTTP_WAITING;
 
 #ifdef HAVE_SSL
   if (http->encryption == HTTP_ENCRYPT_ALWAYS)
@@ -2389,7 +2364,7 @@ httpReconnect2(http_t *http,		/* I - Connection to server */
     return (http_upgrade(http));
 #endif /* HAVE_SSL */
 
-  DEBUG_printf(("1httpReconnect2: Connected to %s:%d...",
+  DEBUG_printf(("1httpReconnect: Connected to %s:%d...",
 		httpAddrString(http->hostaddr, temp, sizeof(temp)),
 		_httpAddrPort(http->hostaddr)));
 
@@ -3938,7 +3913,9 @@ http_setup_ssl(http_t *http)		/* I - Connection to server */
   http->tls = SSL_new(context);
   SSL_set_bio(http->tls, bio, bio);
 
+#   ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
   SSL_set_tlsext_host_name(http->tls, hostname);
+#   endif /* HAVE_SSL_SET_TLSEXT_HOST_NAME */
 
   if (SSL_connect(http->tls) != 1)
   {
@@ -4059,15 +4036,6 @@ http_setup_ssl(http_t *http)		/* I - Connection to server */
                   cg->expired_root, (int)error));
   }
 
-#    ifdef HAVE_SSLSETPROTOCOLVERSIONMAX
-  if (!error)
-  {
-    error = SSLSetProtocolVersionMax(http->tls, kTLSProtocol1);
-    DEBUG_printf(("4http_setup_ssl: SSLSetProtocolVersionMax(kTLSProtocol1), "
-                  "error=%d", (int)error));
-  }
-#    endif /* HAVE_SSLSETPROTOCOLVERSIONMAX */
-
  /*
   * In general, don't verify certificates since things like the common name
   * often do not match...
@@ -4142,7 +4110,8 @@ http_setup_ssl(http_t *http)		/* I - Connection to server */
 	    break;
 
 	case errSSLWouldBlock :
-	    usleep(1000);
+	    error = noErr;		/* Force a retry */
+	    usleep(1000);		/* in 1 millisecond */
 	    break;
 
 #    ifdef HAVE_SECCERTIFICATECOPYDATA
@@ -4178,7 +4147,7 @@ http_setup_ssl(http_t *http)		/* I - Connection to server */
 		  {
 		    data = (CFDataRef)CFArrayGetValueAtIndex(dn_array, i);
 
-		    if ((credential = malloc(sizeof(*credential))))
+		    if ((credential = malloc(sizeof(*credential))) != NULL)
 		    {
 		      credential->datalen = CFDataGetLength(data);
 		      if ((credential->data = malloc(credential->datalen)))
@@ -4497,7 +4466,8 @@ http_write(http_t     *http,		/* I - Connection to server */
 	pfd.events = POLLOUT;
 
 	while ((nfds = poll(&pfd, 1, http->wait_value)) < 0 &&
-	       (errno == EINTR || errno == EAGAIN));
+	       (errno == EINTR || errno == EAGAIN))
+	  /* do nothing */;
 
 #else
 	do

cups/http.h

@@ -3,7 +3,7 @@
  *
  *   Hyper-Text Transport Protocol definitions for CUPS.
  *
- *   Copyright 2007-2012 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
@@ -357,7 +357,10 @@ extern void		httpInitialize(void);
 extern int		httpOptions(http_t *http, const char *uri);
 extern int		httpPost(http_t *http, const char *uri);
 extern int		httpPrintf(http_t *http, const char *format, ...)
-			__attribute__ ((__format__ (__printf__, 2, 3)));
+#  ifdef __GNUC__
+__attribute__ ((__format__ (__printf__, 2, 3)))
+#  endif /* __GNUC__ */
+;
 extern int		httpPut(http_t *http, const char *uri);
 extern int		httpRead(http_t *http, char *buffer, int length) _CUPS_DEPRECATED;
 extern int		httpReconnect(http_t *http);
@@ -459,17 +462,7 @@ extern void		httpFreeCredentials(cups_array_t *certs) _CUPS_API_1_5;
 extern int		httpSetCredentials(http_t *http, cups_array_t *certs)
 					   _CUPS_API_1_5;
 extern void		httpSetTimeout(http_t *http, double timeout,
-			               http_timeout_cb_t cb, void *user_data)
-			               _CUPS_API_1_5;
-
-/**** New in CUPS 1.6 ****/
-extern http_addrlist_t	*httpAddrConnect2(http_addrlist_t *addrlist, int *sock,
-			                  int msec, int *cancel)
-			                  _CUPS_API_1_6;
-extern http_state_t	httpGetState(http_t *http) _CUPS_API_1_6;
-extern http_version_t	httpGetVersion(http_t *http) _CUPS_API_1_6;
-extern int		httpReconnect2(http_t *http, int msec, int *cancel)
-			               _CUPS_API_1_6;
+			               http_timeout_cb_t cb, void *user_data);
 
 
 /*

cups/ipp-private.h

@@ -3,7 +3,7 @@
  *
  *   Private IPP definitions for CUPS.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -46,102 +46,12 @@ extern "C" {
  * Structures...
  */
 
-typedef union _ipp_request_u		/**** Request Header ****/
+typedef struct _ipp_buffer_s		/**** Read/write buffer ****/
 {
-  struct				/* Any Header */
-  {
-    ipp_uchar_t	version[2];		/* Protocol version number */
-    int		op_status;		/* Operation ID or status code*/
-    int		request_id;		/* Request ID */
-  }		any;
-
-  struct				/* Operation Header */
-  {
-    ipp_uchar_t	version[2];		/* Protocol version number */
-    ipp_op_t	operation_id;		/* Operation ID */
-    int		request_id;		/* Request ID */
-  }		op;
-
-  struct				/* Status Header */
-  {
-    ipp_uchar_t	version[2];		/* Protocol version number */
-    ipp_status_t status_code;		/* Status code */
-    int		request_id;		/* Request ID */
-  }		status;
-
-  /**** New in CUPS 1.1.19 ****/
-  struct				/* Event Header @since CUPS 1.1.19/Mac OS X 10.3@ */
-  {
-    ipp_uchar_t	version[2];		/* Protocol version number */
-    ipp_status_t status_code;		/* Status code */
-    int		request_id;		/* Request ID */
-  }		event;
-} _ipp_request_t;
-
-/**** New in CUPS 1.1.19 ****/
-
-typedef union _ipp_value_u		/**** Attribute Value ****/
-{
-  int		integer;		/* Integer/enumerated value */
-
-  char		boolean;		/* Boolean value */
-
-  ipp_uchar_t	date[11];		/* Date/time value */
-
-  struct
-  {
-    int		xres,			/* Horizontal resolution */
-		yres;			/* Vertical resolution */
-    ipp_res_t	units;			/* Resolution units */
-  }		resolution;		/* Resolution value */
-
-  struct
-  {
-    int		lower,			/* Lower value */
-		upper;			/* Upper value */
-  }		range;			/* Range of integers value */
-
-  struct
-  {
-    char	*language;		/* Language code */
-    char	*text;			/* String */
-  }		string;			/* String with language value */
-
-  struct
-  {
-    int		length;			/* Length of attribute */
-    void	*data;			/* Data in attribute */
-  }		unknown;		/* Unknown attribute type */
-
-/**** New in CUPS 1.1.19 ****/
-  ipp_t		*collection;		/* Collection value @since CUPS 1.1.19/Mac OS X 10.3@ */
-} _ipp_value_t;
-
-struct _ipp_attribute_s		/**** Attribute ****/
-{
-  ipp_attribute_t *next;		/* Next attribute in list */
-  ipp_tag_t	group_tag,		/* Job/Printer/Operation group tag */
-		value_tag;		/* What type of value is it? */
-  char		*name;			/* Name of attribute */
-  int		num_values;		/* Number of values */
-  _ipp_value_t	values[1];		/* Values */
-};
-
-struct _ipp_s				/**** IPP Request/Response/Notification ****/
-{
-  ipp_state_t		state;		/* State of request */
-  _ipp_request_t	request;	/* Request header */
-  ipp_attribute_t	*attrs;		/* Attributes */
-  ipp_attribute_t	*last;		/* Last attribute in list */
-  ipp_attribute_t	*current;	/* Current attribute (for read/write) */
-  ipp_tag_t		curtag;		/* Current attribute group tag */
-
-/**** New in CUPS 1.2 ****/
-  ipp_attribute_t	*prev;		/* Previous attribute (for read) @since CUPS 1.2/Mac OS X 10.5@ */
-
-/**** New in CUPS 1.4.4 ****/
-  int			use;		/* Use count @since CUPS 1.4.4/Mac OS X 10.6.?@ */
-};
+  unsigned char		d[IPP_BUF_SIZE];/* Data buffer */
+  struct _ipp_buffer_s	*next;		/* Next buffer in list */
+  int			used;		/* Is this buffer used? */
+} _ipp_buffer_t;
 
 typedef struct				/**** Attribute mapping data ****/
 {
@@ -149,8 +59,6 @@ typedef struct				/**** Attribute mapping data ****/
   const char	*name;			/* Option/attribute name */
   ipp_tag_t	value_tag;		/* Value tag for this attribute */
   ipp_tag_t	group_tag;		/* Group tag for this attribute */
-  ipp_tag_t	alt_group_tag;		/* Alternate group tag for this
-					 * attribute */
 } _ipp_option_t;
 
 
@@ -158,7 +66,11 @@ typedef struct				/**** Attribute mapping data ****/
  * Prototypes for private functions...
  */
 
+extern ipp_attribute_t	*_ippAddAttr(ipp_t *ipp, int num_values);
+extern size_t		_ippAttrString(ipp_attribute_t *attr, char *buffer,
+			               size_t bufsize);
 extern _ipp_option_t	*_ippFindOption(const char *name);
+extern void		_ippFreeAttr(ipp_attribute_t *attr);
 
 
 /*

cups/ipp-support.c

@@ -16,19 +16,16 @@
  *
  * Contents:
  *
- *   ippAttributeString() - Convert the attribute's value to a string.
- *   ippEnumString()	  - Return a string corresponding to the enum value.
- *   ippEnumValue()	  - Return the value associated with a given enum
- *			    string.
- *   ippErrorString()	  - Return a name for the given status code.
- *   ippErrorValue()	  - Return a status code for the given name.
- *   ippOpString()	  - Return a name for the given operation id.
- *   ippOpValue()	  - Return an operation id for the given name.
- *   ippPort()		  - Return the default IPP port number.
- *   ippSetPort()	  - Set the default port number.
- *   ippTagString()	  - Return the tag name corresponding to a tag value.
- *   ippTagValue()	  - Return the tag value corresponding to a tag name.
- *   ipp_col_string()	  - Convert a collection to a string.
+ *   _ippAttrString() - Convert the attribute's value to a string.
+ *   ippErrorString() - Return a name for the given status code.
+ *   ippErrorValue()  - Return a status code for the given name.
+ *   ippOpString()    - Return a name for the given operation id.
+ *   ippOpValue()     - Return an operation id for the given name.
+ *   ippPort()        - Return the default IPP port number.
+ *   ippSetPort()     - Set the default port number.
+ *   ippTagString()   - Return the tag name corresponding to a tag value.
+ *   ippTagValue()    - Return the tag value corresponding to a tag name.
+ *   ipp_col_string() - Convert a collection to a string.
  */
 
 /*
@@ -43,18 +40,18 @@
  */
 
 static const char * const ipp_status_oks[] =	/* "OK" status codes */
-		{				/* (name) = abandoned standard value */
+		{
 		  "successful-ok",
 		  "successful-ok-ignored-or-substituted-attributes",
 		  "successful-ok-conflicting-attributes",
 		  "successful-ok-ignored-subscriptions",
-		  "(successful-ok-ignored-notifications)",
+		  "successful-ok-ignored-notifications",
 		  "successful-ok-too-many-events",
-		  "(successful-ok-but-cancel-subscription)",
+		  "successful-ok-but-cancel-subscription",
 		  "successful-ok-events-complete"
 		},
 		* const ipp_status_400s[] =	/* Client errors */
-		{				/* (name) = abandoned standard value */
+		{
 		  "client-error-bad-request",
 		  "client-error-forbidden",
 		  "client-error-not-authenticated",
@@ -77,8 +74,8 @@ static const char * const ipp_status_oks[] =	/* "OK" status codes */
 		  "client-error-attributes-not-settable",
 		  "client-error-ignored-all-subscriptions",
 		  "client-error-too-many-subscriptions",
-		  "(client-error-ignored-all-notifications)",
-		  "(client-error-client-print-support-file-not-found)"
+		  "client-error-ignored-all-notifications",
+		  "client-error-print-support-file-not-found"
 		},
 		* const ipp_status_500s[] =		/* Server errors */
 		{
@@ -102,7 +99,7 @@ static const char * const ipp_status_oks[] =	/* "OK" status codes */
 		  "cups-pki-error",
 		  "cups-upgrade-required"
 		};
-static const char * const ipp_std_ops[] =
+static char	* const ipp_std_ops[] =
 		{
 		  /* 0x0000 - 0x000f */
 		  "0x00",
@@ -136,13 +133,13 @@ static const char * const ipp_std_ops[] =
 		  "Renew-Subscription",
 		  "Cancel-Subscription",
 		  "Get-Notifications",
-		  "(Send-Notifications)",
-		  "(Get-Resource-Attributes)",
-		  "(Get-Resource-Data)",
+		  "Send-Notifications",
+		  "0x1e",
+		  "0x1f",
 
 		  /* 0x0020 - 0x002f */
-		  "(Get-Resources)",
-		  "(Get-Printer-Support-Files)",
+		  "0x20",
+		  "Get-Printer-Support-Files",
 		  "Enable-Printer",
 		  "Disable-Printer",
 		  "Pause-Printer-After-Current-Job",
@@ -211,8 +208,7 @@ static const char * const ipp_std_ops[] =
 					/* 0x06 */
 		  "event-notification-attributes-tag",
 					/* 0x07 */
-		  "(resource-attributes-tag)",
-		  			/* 0x08 */
+		  "0x08",		/* 0x08 */
 		  "document-attributes-tag",
 					/* 0x09 */
 		  "0x0a",		/* 0x0a */
@@ -281,115 +277,22 @@ static const char * const ipp_std_ops[] =
 		  "mimeMediaType",	/* 0x49 */
 		  "memberAttrName"	/* 0x4a */
 		};
-static const char * const ipp_document_states[] =
-		{			/* document-state-enums */
-		  "pending",
-		  "4",
-		  "processing",
-		  "6",
-		  "canceled",
-		  "aborted",
-		  "completed"
-		},
-		* const ipp_finishings[] =
-		{			/* finishings enums */
-		  "none",
-		  "staple",
-		  "punch",
-		  "cover",
-		  "bind",
-		  "saddle-stitch",
-		  "edge-stitch",
-		  "fold",
-		  "trim",
-		  "bale",
-		  "booklet-maker",
-		  "jog-offset",
-		  "15",
-		  "16",
-		  "17",
-		  "18",
-		  "19",
-		  "staple-top-left",
-		  "staple-bottom-left",
-		  "staple-top-right",
-		  "staple-bottom-right",
-		  "edge-stitch-left",
-		  "edge-stitch-top",
-		  "edge-stitch-right",
-		  "edge-stitch-bottom",
-		  "staple-dual-left",
-		  "staple-dual-top",
-		  "staple-dual-right",
-		  "staple-dual-bottom",
-		  "32",
-		  "33",
-		  "34",
-		  "35",
-		  "36",
-		  "37",
-		  "38",
-		  "39",
-		  "40",
-		  "41",
-		  "42",
-		  "43",
-		  "44",
-		  "45",
-		  "46",
-		  "47",
-		  "48",
-		  "49",
-		  "bind-left",
-		  "bind-top",
-		  "bind-right",
-		  "bind-bottom",
-		  "54",
-		  "55",
-		  "56",
-		  "57",
-		  "58",
-		  "59",
-		  "trim-after-pages",
-		  "trim-after-documents",
-		  "trim-after-copies",
-		  "trim-after-job"
-		},
-		* const ipp_job_collation_types[] =
-		{			/* job-collation-type enums */
-		  "uncollated-sheets",
-		  "collated-documents",
-		  "uncollated-documents"
-		},
-		* const ipp_job_states[] =
-		{			/* job-state enums */
-		  "pending",
-		  "pending-held",
-		  "processing",
-		  "processing-stopped",
-		  "canceled",
-		  "aborted",
-		  "completed"
-		},
-		* const ipp_orientation_requesteds[] =
-		{			/* orientation-requested enums */
-		  "portrait",
-		  "landscape",
-		  "reverse-landscape",
-		  "reverse-portrait"
-		},
-		* const ipp_print_qualities[] =
-		{			/* print-quality enums */
-		  "draft",
-		  "normal",
-		  "high"
-		},
-		* const ipp_printer_states[] =
-		{			/* printer-state enums */
-		  "idle",
-		  "processing",
-		  "stopped",
-		};
+static const char * const job_states[] =
+{					/* job-state enums */
+  "pending",
+  "pending-held",
+  "processing",
+  "processing-stopped",
+  "canceled",
+  "aborted",
+  "completed"
+};
+static const char * const printer_states[] =
+{					/* printer-state enums */
+  "idle",
+  "processing",
+  "stopped",
+};
 
 
 /*
@@ -400,27 +303,24 @@ static size_t	ipp_col_string(ipp_t *col, char *buffer, size_t bufsize);
 
 
 /*
- * 'ippAttributeString()' - Convert the attribute's value to a string.
+ * '_ippAttrString()' - Convert the attribute's value to a string.
  *
  * Returns the number of bytes that would be written, not including the
  * trailing nul. The buffer pointer can be NULL to get the required length,
  * just like (v)snprintf.
- *
- * @since CUPS 1.6@
  */
 
 size_t					/* O - Number of bytes less nul */
-ippAttributeString(
-    ipp_attribute_t *attr,		/* I - Attribute */
-    char            *buffer,		/* I - String buffer or NULL */
-    size_t          bufsize)		/* I - Size of string buffer */
+_ippAttrString(ipp_attribute_t *attr,	/* I - Attribute */
+               char            *buffer,	/* I - String buffer or NULL */
+               size_t          bufsize)	/* I - Size of string buffer */
 {
   int		i;			/* Looping var */
   char		*bufptr,		/* Pointer into buffer */
 		*bufend,		/* End of buffer */
 		temp[256];		/* Temporary string */
   const char	*ptr;			/* Pointer into string */
-  _ipp_value_t	*val;			/* Current value */
+  ipp_value_t	*val;			/* Current value */
 
 
   if (!attr || !attr->name)
@@ -450,13 +350,40 @@ ippAttributeString(
     switch (attr->value_tag & ~IPP_TAG_COPY)
     {
       case IPP_TAG_ENUM :
-          ptr = ippEnumString(attr->name, val->integer);
+          if (!strcmp(attr->name, "printer-state") &&
+              val->integer >= IPP_PRINTER_IDLE &&
+              val->integer <= IPP_PRINTER_STOPPED)
+          {
+            ptr = printer_states[val->integer - IPP_PRINTER_IDLE];
 
-          if (buffer && bufptr < bufend)
-            strlcpy(bufptr, ptr, bufend - bufptr + 1);
+            if (buffer && bufptr < bufend)
+              strlcpy(bufptr, ptr, bufend - bufptr + 1);
 
-          bufptr += strlen(ptr);
-          break;
+            bufptr += strlen(ptr);
+            break;
+          }
+          else if (!strcmp(attr->name, "job-state") &&
+		   val->integer >= IPP_JOB_PENDING &&
+		   val->integer <= IPP_JOB_COMPLETED)
+          {
+            ptr = job_states[val->integer - IPP_JOB_PENDING];
+
+            if (buffer && bufptr < bufend)
+              strlcpy(bufptr, ptr, bufend - bufptr + 1);
+
+            bufptr += strlen(ptr);
+            break;
+          }
+          else if (!strcmp(attr->name, "operations-supported"))
+          {
+            ptr = ippOpString(val->integer);
+
+            if (buffer && bufptr < bufend)
+              strlcpy(bufptr, ptr, bufend - bufptr + 1);
+
+            bufptr += strlen(ptr);
+            break;
+          }
 
       case IPP_TAG_INTEGER :
           if (buffer && bufptr < bufend)
@@ -534,7 +461,7 @@ ippAttributeString(
 
           for (ptr = val->string.text; *ptr; ptr ++)
           {
-            if (*ptr == '\\' || *ptr == '\"' || *ptr == '[')
+            if (*ptr == '\\' || *ptr == '\"')
             {
               if (buffer && bufptr < bufend)
                 *bufptr = '\\';
@@ -545,25 +472,6 @@ ippAttributeString(
               *bufptr = *ptr;
             bufptr ++;
           }
-
-          if (val->string.language)
-          {
-           /*
-            * Add "[language]" to end of string...
-            */
-
-            if (buffer && bufptr < bufend)
-              *bufptr = '[';
-            bufptr ++;
-
-            if (buffer && bufptr < bufend)
-              strlcpy(bufptr, val->string.language, bufend - bufptr);
-            bufptr += strlen(val->string.language);
-
-            if (buffer && bufptr < bufend)
-              *bufptr = ']';
-            bufptr ++;
-          }
           break;
 
       case IPP_TAG_BEGIN_COLLECTION :
@@ -623,159 +531,6 @@ ippAttributeString(
 }
 
 
-/*
- * 'ippEnumString()' - Return a string corresponding to the enum value.
- */
-
-const char *				/* O - Enum string */
-ippEnumString(const char *attrname,	/* I - Attribute name */
-              int        enumvalue)	/* I - Enum value */
-{
-  _cups_globals_t *cg = _cupsGlobals();	/* Pointer to library globals */
-
-
- /*
-  * Check for standard enum values...
-  */
-
-  if (!strcmp(attrname, "document-state") &&
-      enumvalue >= 3 &&
-      enumvalue <= (3 + (int)(sizeof(ipp_document_states) /
-                              sizeof(ipp_document_states[0]))))
-    return (ipp_document_states[enumvalue - 3]);
-  else if ((!strcmp(attrname, "finishings") ||
-            !strcmp(attrname, "finishings-actual") ||
-            !strcmp(attrname, "finishings-default") ||
-            !strcmp(attrname, "finishings-ready") ||
-            !strcmp(attrname, "finishings-supported")) &&
-           enumvalue >= 3 &&
-           enumvalue <= (3 + (int)(sizeof(ipp_finishings) / sizeof(ipp_finishings[0]))))
-    return (ipp_finishings[enumvalue - 3]);
-  else if ((!strcmp(attrname, "job-collation-type") ||
-            !strcmp(attrname, "job-collation-type-actual")) &&
-           enumvalue >= 3 &&
-           enumvalue <= (3 + (int)(sizeof(ipp_job_collation_types) /
-                                   sizeof(ipp_job_collation_types[0]))))
-    return (ipp_job_collation_types[enumvalue - 3]);
-  else if (!strcmp(attrname, "job-state") &&
-	   enumvalue >= IPP_JOB_PENDING && enumvalue <= IPP_JOB_COMPLETED)
-    return (ipp_job_states[enumvalue - IPP_JOB_PENDING]);
-  else if (!strcmp(attrname, "operations-supported"))
-    return (ippOpString((ipp_op_t)enumvalue));
-  else if ((!strcmp(attrname, "orientation-requested") ||
-            !strcmp(attrname, "orientation-requested-actual") ||
-            !strcmp(attrname, "orientation-requested-default") ||
-            !strcmp(attrname, "orientation-requested-supported")) &&
-           enumvalue >= 3 &&
-           enumvalue <= (3 + (int)(sizeof(ipp_orientation_requesteds) /
-                                   sizeof(ipp_orientation_requesteds[0]))))
-    return (ipp_orientation_requesteds[enumvalue - 3]);
-  else if ((!strcmp(attrname, "print-quality") ||
-            !strcmp(attrname, "print-quality-actual") ||
-            !strcmp(attrname, "print-quality-default") ||
-            !strcmp(attrname, "print-quality-supported")) &&
-           enumvalue >= 3 &&
-           enumvalue <= (3 + (int)(sizeof(ipp_print_qualities) /
-                                   sizeof(ipp_print_qualities[0]))))
-    return (ipp_print_qualities[enumvalue - 3]);
-  else if (!strcmp(attrname, "printer-state") &&
-           enumvalue >= IPP_PRINTER_IDLE && enumvalue <= IPP_PRINTER_STOPPED)
-    return (ipp_printer_states[enumvalue - IPP_PRINTER_IDLE]);
-
- /*
-  * Not a standard enum value, just return the decimal equivalent...
-  */
-
-  snprintf(cg->ipp_unknown, sizeof(cg->ipp_unknown), "%d", enumvalue);
-  return (cg->ipp_unknown);
-}
-
-
-/*
- * 'ippEnumValue()' - Return the value associated with a given enum string.
- */
-
-int					/* O - Enum value or -1 if unknown */
-ippEnumValue(const char *attrname,	/* I - Attribute name */
-             const char *enumstring)	/* I - Enum string */
-{
-  int		i,			/* Looping var */
-		num_strings;		/* Number of strings to compare */
-  const char * const *strings;		/* Strings to compare */
-
-
- /*
-  * If the string is just a number, return it...
-  */
-
-  if (isdigit(*enumstring & 255))
-    return (strtol(enumstring, NULL, 0));
-
- /*
-  * Otherwise look up the string...
-  */
-
-  if (!strcmp(attrname, "document-state"))
-  {
-    num_strings = (int)(sizeof(ipp_document_states) / sizeof(ipp_document_states[0]));
-    strings     = ipp_document_states;
-  }
-  else if (!strcmp(attrname, "finishings") ||
-	   !strcmp(attrname, "finishings-actual") ||
-	   !strcmp(attrname, "finishings-default") ||
-	   !strcmp(attrname, "finishings-ready") ||
-	   !strcmp(attrname, "finishings-supported"))
-  {
-    num_strings = (int)(sizeof(ipp_finishings) / sizeof(ipp_finishings[0]));
-    strings     = ipp_finishings;
-  }
-  else if (!strcmp(attrname, "job-collation-type") ||
-           !strcmp(attrname, "job-collation-type-actual"))
-  {
-    num_strings = (int)(sizeof(ipp_job_collation_types) /
-                        sizeof(ipp_job_collation_types[0]));
-    strings     = ipp_job_collation_types;
-  }
-  else if (!strcmp(attrname, "job-state"))
-  {
-    num_strings = (int)(sizeof(ipp_job_states) / sizeof(ipp_job_states[0]));
-    strings     = ipp_job_states;
-  }
-  else if (!strcmp(attrname, "operations-supported"))
-    return (ippOpValue(enumstring));
-  else if (!strcmp(attrname, "orientation-requested") ||
-           !strcmp(attrname, "orientation-requested-actual") ||
-           !strcmp(attrname, "orientation-requested-default") ||
-           !strcmp(attrname, "orientation-requested-supported"))
-  {
-    num_strings = (int)(sizeof(ipp_orientation_requesteds) /
-                        sizeof(ipp_orientation_requesteds[0]));
-    strings     = ipp_orientation_requesteds;
-  }
-  else if (!strcmp(attrname, "print-quality") ||
-           !strcmp(attrname, "print-quality-actual") ||
-           !strcmp(attrname, "print-quality-default") ||
-           !strcmp(attrname, "print-quality-supported"))
-  {
-    num_strings = (int)(sizeof(ipp_print_qualities) / sizeof(ipp_print_qualities[0]));
-    strings     = ipp_print_qualities;
-  }
-  else if (!strcmp(attrname, "printer-state"))
-  {
-    num_strings = (int)(sizeof(ipp_printer_states) / sizeof(ipp_printer_states[0]));
-    strings     = ipp_printer_states;
-  }
-  else
-    return (-1);
-
-  for (i = 0; i < num_strings; i ++)
-    if (!strcmp(enumstring, strings[i]))
-      return (i + 3);
-
-  return (-1);
-}
-
-
 /*
  * 'ippErrorString()' - Return a name for the given status code.
  */
@@ -1036,7 +791,6 @@ ipp_col_string(ipp_t  *col,		/* I - Collection attribute */
 {
   char			*bufptr,	/* Position in buffer */
 			*bufend,	/* End of buffer */
-			prefix = '{',	/* Prefix character */
 			temp[256];	/* Temporary string */
   ipp_attribute_t	*attr;		/* Current member attribute */
 
@@ -1044,32 +798,24 @@ ipp_col_string(ipp_t  *col,		/* I - Collection attribute */
   bufptr = buffer;
   bufend = buffer + bufsize - 1;
 
+  if (buffer && bufptr < bufend)
+    *bufptr = '{';
+  bufptr ++;
+
   for (attr = col->attrs; attr; attr = attr->next)
   {
     if (!attr->name)
       continue;
 
-    if (buffer && bufptr < bufend)
-      *bufptr = prefix;
-    bufptr ++;
-    prefix = ' ';
-
     if (buffer && bufptr < bufend)
       bufptr += snprintf(bufptr, bufend - bufptr + 1, "%s=", attr->name);
     else
       bufptr += strlen(attr->name) + 1;
 
     if (buffer && bufptr < bufend)
-      bufptr += ippAttributeString(attr, bufptr, bufend - bufptr + 1);
+      bufptr += _ippAttrString(attr, bufptr, bufend - bufptr + 1);
     else
-      bufptr += ippAttributeString(attr, temp, sizeof(temp));
-  }
-
-  if (prefix == '{')
-  {
-    if (buffer && bufptr < bufend)
-      *bufptr = prefix;
-    bufptr ++;
+      bufptr += _ippAttrString(attr, temp, sizeof(temp));
   }
 
   if (buffer && bufptr < bufend)

cups/ipp.h

@@ -63,14 +63,54 @@ extern "C" {
  * Types and structures...
  */
 
-typedef enum ipp_dstate_e		/**** Document states ****/
+typedef enum ipp_tag_e			/**** Format tags for attributes ****/
 {
-  IPP_DOCUMENT_PENDING = 3,
-  IPP_DOCUMENT_PROCESSING = 5,
-  IPP_DOCUMENT_CANCELED = 7,
-  IPP_DOCUMENT_ABORTED,
-  IPP_DOCUMENT_COMPLETED
-} ipp_dstate_t;
+  IPP_TAG_ZERO = 0x00,			/* Zero tag - used for separators */
+  IPP_TAG_OPERATION,			/* Operation group */
+  IPP_TAG_JOB,				/* Job group */
+  IPP_TAG_END,				/* End-of-attributes */
+  IPP_TAG_PRINTER,			/* Printer group */
+  IPP_TAG_UNSUPPORTED_GROUP,		/* Unsupported attributes group */
+  IPP_TAG_SUBSCRIPTION,			/* Subscription group */
+  IPP_TAG_EVENT_NOTIFICATION,		/* Event group */
+  IPP_TAG_DOCUMENT = 0x09,		/* Document group */
+  IPP_TAG_UNSUPPORTED_VALUE = 0x10,	/* Unsupported value */
+  IPP_TAG_DEFAULT,			/* Default value */
+  IPP_TAG_UNKNOWN,			/* Unknown value */
+  IPP_TAG_NOVALUE,			/* No-value value */
+  IPP_TAG_NOTSETTABLE = 0x15,		/* Not-settable value */
+  IPP_TAG_DELETEATTR,			/* Delete-attribute value */
+  IPP_TAG_ADMINDEFINE,			/* Admin-defined value */
+  IPP_TAG_INTEGER = 0x21,		/* Integer value */
+  IPP_TAG_BOOLEAN,			/* Boolean value */
+  IPP_TAG_ENUM,				/* Enumeration value */
+  IPP_TAG_STRING = 0x30,		/* Octet string value */
+  IPP_TAG_DATE,				/* Date/time value */
+  IPP_TAG_RESOLUTION,			/* Resolution value */
+  IPP_TAG_RANGE,			/* Range value */
+  IPP_TAG_BEGIN_COLLECTION,		/* Beginning of collection value */
+  IPP_TAG_TEXTLANG,			/* Text-with-language value */
+  IPP_TAG_NAMELANG,			/* Name-with-language value */
+  IPP_TAG_END_COLLECTION,		/* End of collection value */
+  IPP_TAG_TEXT = 0x41,			/* Text value */
+  IPP_TAG_NAME,				/* Name value */
+  IPP_TAG_RESERVED_STRING,		/* Reserved for future string value @private@ */
+  IPP_TAG_KEYWORD,			/* Keyword value */
+  IPP_TAG_URI,				/* URI value */
+  IPP_TAG_URISCHEME,			/* URI scheme value */
+  IPP_TAG_CHARSET,			/* Character set value */
+  IPP_TAG_LANGUAGE,			/* Language value */
+  IPP_TAG_MIMETYPE,			/* MIME media type value */
+  IPP_TAG_MEMBERNAME,			/* Collection member name value */
+  IPP_TAG_MASK = 0x7fffffff,		/* Mask for copied attribute values */
+  IPP_TAG_COPY = -0x7fffffff-1		/* Bitflag for copied attribute values */
+} ipp_tag_t;
+
+typedef enum ipp_res_e			/**** Resolution units ****/
+{
+  IPP_RES_PER_INCH = 3,			/* Pixels per inch */
+  IPP_RES_PER_CM			/* Pixels per centimeter */
+} ipp_res_t;
 
 typedef enum ipp_finish_e		/**** Finishings ****/
 {
@@ -101,19 +141,23 @@ typedef enum ipp_finish_e		/**** Finishings ****/
   IPP_FINISHINGS_BIND_LEFT = 50,	/* Bind on left */
   IPP_FINISHINGS_BIND_TOP,		/* Bind on top */
   IPP_FINISHINGS_BIND_RIGHT,		/* Bind on right */
-  IPP_FINISHINGS_BIND_BOTTOM,		/* Bind on bottom */
-  IPP_FINISHINGS_TRIM_AFTER_PAGES = 60,	/* Trim output after each page */
-  IPP_FINISHINGS_TRIM_AFTER_DOCUMENTS,	/* Trim output after each document */
-  IPP_FINISHINGS_TRIM_AFTER_COPIES,	/* Trim output after each copy */
-  IPP_FINISHINGS_TRIM_AFTER_JOB		/* Trim output after job */
+  IPP_FINISHINGS_BIND_BOTTOM		/* Bind on bottom */
 } ipp_finish_t;
 
-typedef enum ipp_jcollate_e		/**** Job collation types ****/
+typedef enum ipp_orient_e		/**** Orientation values ****/
 {
-  IPP_JOB_UNCOLLATED_SHEETS = 3,
-  IPP_JOB_COLLATED_DOCUMENTS,
-  IPP_JOB_UNCOLLATED_DOCUMENTS
-} ipp_jcollate_t;
+  IPP_PORTRAIT = 3,			/* No rotation */
+  IPP_LANDSCAPE,			/* 90 degrees counter-clockwise */
+  IPP_REVERSE_LANDSCAPE,		/* 90 degrees clockwise */
+  IPP_REVERSE_PORTRAIT			/* 180 degrees */
+} ipp_orient_t;
+
+typedef enum ipp_quality_e		/**** Qualities ****/
+{
+  IPP_QUALITY_DRAFT = 3,		/* Draft quality */
+  IPP_QUALITY_NORMAL,			/* Normal quality */
+  IPP_QUALITY_HIGH			/* High quality */
+} ipp_quality_t;
 
 typedef enum ipp_jstate_e		/**** Job states ****/
 {
@@ -124,13 +168,27 @@ typedef enum ipp_jstate_e		/**** Job states ****/
   IPP_JOB_CANCELED,			/* Job has been canceled */
   IPP_JOB_ABORTED,			/* Job has aborted due to error */
   IPP_JOB_COMPLETED			/* Job has completed successfully */
-  /* Legacy name for canceled state */
-#define IPP_JOB_CANCELLED IPP_JOB_CANCELED
 } ipp_jstate_t;
+#define IPP_JOB_CANCELLED IPP_JOB_CANCELED
+
+typedef enum ipp_pstate_e		/**** Printer states ****/
+{
+  IPP_PRINTER_IDLE = 3,			/* Printer is idle */
+  IPP_PRINTER_PROCESSING,		/* Printer is working */
+  IPP_PRINTER_STOPPED			/* Printer is stopped */
+} ipp_pstate_t;
+
+typedef enum ipp_state_e		/**** IPP states ****/
+{
+  IPP_ERROR = -1,			/* An error occurred */
+  IPP_IDLE,				/* Nothing is happening/request completed */
+  IPP_HEADER,				/* The request header needs to be sent/received */
+  IPP_ATTRIBUTE,			/* One or more attributes need to be sent/received */
+  IPP_DATA				/* IPP request data needs to be sent/received */
+} ipp_state_t;
 
 typedef enum ipp_op_e			/**** IPP operations ****/
 {
-  IPP_OP_CUPS_INVALID = -1,		/* Invalid operation name for @link ippOpValue@ */
   IPP_PRINT_JOB = 0x0002,		/* Print a single file */
   IPP_PRINT_URI,			/* Print a single URL @private@ */
   IPP_VALIDATE_JOB,			/* Validate job options */
@@ -158,10 +216,7 @@ typedef enum ipp_op_e			/**** IPP operations ****/
   IPP_CANCEL_SUBSCRIPTION,		/* Cancel a subscription @since CUPS 1.2/Mac OS X 10.5@ */
   IPP_GET_NOTIFICATIONS,		/* Get notification events @since CUPS 1.2/Mac OS X 10.5@ */
   IPP_SEND_NOTIFICATIONS,		/* Send notification events @private@ */
-  IPP_GET_RESOURCE_ATTRIBUTES,		/* Get resource attributes @private@ */
-  IPP_GET_RESOURCE_DATA,		/* Get resource data @private@ */
-  IPP_GET_RESOURCES,			/* Get list of resources @private@ */
-  IPP_GET_PRINT_SUPPORT_FILES,		/* Get printer support files @private@ */
+  IPP_GET_PRINT_SUPPORT_FILES = 0x0021,	/* Get printer support files @private@ */
   IPP_ENABLE_PRINTER,			/* Start a printer */
   IPP_DISABLE_PRINTER,			/* Stop a printer */
   IPP_PAUSE_PRINTER_AFTER_CURRENT_JOB,	/* Stop printer after the current job @private@ */
@@ -205,59 +260,21 @@ typedef enum ipp_op_e			/**** IPP operations ****/
   CUPS_AUTHENTICATE_JOB,		/* Authenticate a job @since CUPS 1.2/Mac OS X 10.5@ */
   CUPS_GET_PPD,				/* Get a PPD file @since CUPS 1.3/Mac OS X 10.5@ */
   CUPS_GET_DOCUMENT = 0x4027		/* Get a document file @since CUPS 1.4/Mac OS X 10.6@ */
-
-  /* Legacy names for the add operations */
-#define CUPS_ADD_PRINTER	CUPS_ADD_MODIFY_PRINTER
-#define CUPS_ADD_CLASS		CUPS_ADD_MODIFY_CLASS
 } ipp_op_t;
 
-typedef enum ipp_orient_e		/**** Orientation values ****/
-{
-  IPP_PORTRAIT = 3,			/* No rotation */
-  IPP_LANDSCAPE,			/* 90 degrees counter-clockwise */
-  IPP_REVERSE_LANDSCAPE,		/* 90 degrees clockwise */
-  IPP_REVERSE_PORTRAIT			/* 180 degrees */
-} ipp_orient_t;
-
-typedef enum ipp_pstate_e		/**** Printer states ****/
-{
-  IPP_PRINTER_IDLE = 3,			/* Printer is idle */
-  IPP_PRINTER_PROCESSING,		/* Printer is working */
-  IPP_PRINTER_STOPPED			/* Printer is stopped */
-} ipp_pstate_t;
-
-typedef enum ipp_quality_e		/**** Qualities ****/
-{
-  IPP_QUALITY_DRAFT = 3,		/* Draft quality */
-  IPP_QUALITY_NORMAL,			/* Normal quality */
-  IPP_QUALITY_HIGH			/* High quality */
-} ipp_quality_t;
-
-typedef enum ipp_res_e			/**** Resolution units ****/
-{
-  IPP_RES_PER_INCH = 3,			/* Pixels per inch */
-  IPP_RES_PER_CM			/* Pixels per centimeter */
-} ipp_res_t;
-
-typedef enum ipp_state_e		/**** IPP states ****/
-{
-  IPP_ERROR = -1,			/* An error occurred */
-  IPP_IDLE,				/* Nothing is happening/request completed */
-  IPP_HEADER,				/* The request header needs to be sent/received */
-  IPP_ATTRIBUTE,			/* One or more attributes need to be sent/received */
-  IPP_DATA				/* IPP request data needs to be sent/received */
-} ipp_state_t;
+/* Old names for the operations */
+#define CUPS_ADD_PRINTER	CUPS_ADD_MODIFY_PRINTER
+#define CUPS_ADD_CLASS		CUPS_ADD_MODIFY_CLASS
 
 typedef enum ipp_status_e		/**** IPP status codes ****/
 {
-  IPP_STATUS_CUPS_INVALID = -1,		/* Invalid status name for @link ippErrorValue@ */
   IPP_OK = 0x0000,			/* successful-ok */
   IPP_OK_SUBST,				/* successful-ok-ignored-or-substituted-attributes */
   IPP_OK_CONFLICT,			/* successful-ok-conflicting-attributes */
   IPP_OK_IGNORED_SUBSCRIPTIONS,		/* successful-ok-ignored-subscriptions */
-  IPP_OK_IGNORED_NOTIFICATIONS,		/* successful-ok-ignored-notifications @private@ */
+  IPP_OK_IGNORED_NOTIFICATIONS,		/* successful-ok-ignored-notifications */
   IPP_OK_TOO_MANY_EVENTS,		/* successful-ok-too-many-events */
-  IPP_OK_BUT_CANCEL_SUBSCRIPTION,	/* successful-ok-but-cancel-subscription @private@ */
+  IPP_OK_BUT_CANCEL_SUBSCRIPTION,	/* successful-ok-but-cancel-subscription */
   IPP_OK_EVENTS_COMPLETE,		/* successful-ok-events-complete */
   IPP_REDIRECTION_OTHER_SITE = 0x200,	/* redirection-other-site @private@ */
   CUPS_SEE_OTHER = 0x280,		/* cups-see-other */
@@ -283,12 +300,8 @@ typedef enum ipp_status_e		/**** IPP status codes ****/
   IPP_ATTRIBUTES_NOT_SETTABLE,		/* client-error-attributes-not-settable */
   IPP_IGNORED_ALL_SUBSCRIPTIONS,	/* client-error-ignored-all-subscriptions */
   IPP_TOO_MANY_SUBSCRIPTIONS,		/* client-error-too-many-subscriptions */
-  IPP_IGNORED_ALL_NOTIFICATIONS,	/* client-error-ignored-all-notifications @private@ */
-  IPP_PRINT_SUPPORT_FILE_NOT_FOUND,	/* client-error-print-support-file-not-found @private@ */
-  IPP_DOCUMENT_PASSWORD_ERROR,		/* client-error-document-password-error */
-  IPP_DOCUMENT_PERMISSION_ERROR,	/* client-error-document-permission-error */
-  IPP_DOCUMENT_SECURITY_ERROR,		/* client-error-document-security-error */
-  IPP_DOCUMENT_UNPRINTABLE_ERROR,	/* client-error-document-unprintable-error */
+  IPP_IGNORED_ALL_NOTIFICATIONS,	/* client-error-ignored-all-notifications */
+  IPP_PRINT_SUPPORT_FILE_NOT_FOUND,	/* client-error-print-support-file-not-found */
 
   IPP_INTERNAL_ERROR = 0x0500,		/* server-error-internal-error */
   IPP_OPERATION_NOT_SUPPORTED,		/* server-error-operation-not-supported */
@@ -307,70 +320,112 @@ typedef enum ipp_status_e		/**** IPP status codes ****/
   IPP_AUTHENTICATION_CANCELED = 0x1000,	/* Authentication canceled by user @since CUPS 1.5/Mac OS X 10.7@ */
   IPP_PKI_ERROR,			/* Error negotiating a secure connection @since CUPS 1.5/Mac OS X 10.7@ */
   IPP_UPGRADE_REQUIRED			/* TLS upgrade required */
-
-  /* Legacy name for canceled status */
+} ipp_status_t;
 #define IPP_ERROR_JOB_CANCELLED IPP_ERROR_JOB_CANCELED
 
-} ipp_status_t;
-
-typedef enum ipp_tag_e			/**** Format tags for attributes ****/
-{
-  IPP_TAG_CUPS_INVALID = -1,		/* Invalid tag name for @link ippTagValue@ */
-  IPP_TAG_ZERO = 0x00,			/* Zero tag - used for separators */
-  IPP_TAG_OPERATION,			/* Operation group */
-  IPP_TAG_JOB,				/* Job group */
-  IPP_TAG_END,				/* End-of-attributes */
-  IPP_TAG_PRINTER,			/* Printer group */
-  IPP_TAG_UNSUPPORTED_GROUP,		/* Unsupported attributes group */
-  IPP_TAG_SUBSCRIPTION,			/* Subscription group */
-  IPP_TAG_EVENT_NOTIFICATION,		/* Event group */
-  IPP_TAG_RESOURCE,			/* Resource group @private@ */
-  IPP_TAG_DOCUMENT,			/* Document group */
-  IPP_TAG_UNSUPPORTED_VALUE = 0x10,	/* Unsupported value */
-  IPP_TAG_DEFAULT,			/* Default value */
-  IPP_TAG_UNKNOWN,			/* Unknown value */
-  IPP_TAG_NOVALUE,			/* No-value value */
-  IPP_TAG_NOTSETTABLE = 0x15,		/* Not-settable value */
-  IPP_TAG_DELETEATTR,			/* Delete-attribute value */
-  IPP_TAG_ADMINDEFINE,			/* Admin-defined value */
-  IPP_TAG_INTEGER = 0x21,		/* Integer value */
-  IPP_TAG_BOOLEAN,			/* Boolean value */
-  IPP_TAG_ENUM,				/* Enumeration value */
-  IPP_TAG_STRING = 0x30,		/* Octet string value */
-  IPP_TAG_DATE,				/* Date/time value */
-  IPP_TAG_RESOLUTION,			/* Resolution value */
-  IPP_TAG_RANGE,			/* Range value */
-  IPP_TAG_BEGIN_COLLECTION,		/* Beginning of collection value */
-  IPP_TAG_TEXTLANG,			/* Text-with-language value */
-  IPP_TAG_NAMELANG,			/* Name-with-language value */
-  IPP_TAG_END_COLLECTION,		/* End of collection value */
-  IPP_TAG_TEXT = 0x41,			/* Text value */
-  IPP_TAG_NAME,				/* Name value */
-  IPP_TAG_RESERVED_STRING,		/* Reserved for future string value @private@ */
-  IPP_TAG_KEYWORD,			/* Keyword value */
-  IPP_TAG_URI,				/* URI value */
-  IPP_TAG_URISCHEME,			/* URI scheme value */
-  IPP_TAG_CHARSET,			/* Character set value */
-  IPP_TAG_LANGUAGE,			/* Language value */
-  IPP_TAG_MIMETYPE,			/* MIME media type value */
-  IPP_TAG_MEMBERNAME,			/* Collection member name value */
-  IPP_TAG_EXTENSION = 0x7f,		/* Extension point for 32-bit tags */
-  IPP_TAG_MASK = 0x7fffffff,		/* Mask for copied attribute values @private@ */
-  /* The following expression is used to avoid compiler warnings with +/-0x80000000 */
-  IPP_TAG_COPY = -0x7fffffff-1		/* Bitflag for copied attribute values @private@ */
-} ipp_tag_t;
-
 typedef unsigned char ipp_uchar_t;	/**** Unsigned 8-bit integer/character ****/
-typedef struct _ipp_s ipp_t;		/**** IPP request/response data ****/
-typedef struct _ipp_attribute_s ipp_attribute_t;
-					/**** IPP attribute ****/
 
 /**** New in CUPS 1.2 ****/
-typedef ssize_t	(*ipp_iocb_t)(void *context, ipp_uchar_t *buffer, size_t bytes);
+typedef ssize_t	(*ipp_iocb_t)(void *, ipp_uchar_t *, size_t);
 					/**** IPP IO Callback Function @since CUPS 1.2/Mac OS X 10.5@ ****/
 
-/**** New in CUPS 1.6 ****/
-typedef int (*ipp_copycb_t)(void *context, ipp_t *dst, ipp_attribute_t *attr);
+typedef union ipp_request_u		/**** Request Header ****/
+{
+  struct				/* Any Header */
+  {
+    ipp_uchar_t	version[2];		/* Protocol version number */
+    int		op_status;		/* Operation ID or status code*/
+    int		request_id;		/* Request ID */
+  }		any;
+
+  struct				/* Operation Header */
+  {
+    ipp_uchar_t	version[2];		/* Protocol version number */
+    ipp_op_t	operation_id;		/* Operation ID */
+    int		request_id;		/* Request ID */
+  }		op;
+
+  struct				/* Status Header */
+  {
+    ipp_uchar_t	version[2];		/* Protocol version number */
+    ipp_status_t status_code;		/* Status code */
+    int		request_id;		/* Request ID */
+  }		status;
+
+  /**** New in CUPS 1.1.19 ****/
+  struct				/* Event Header @since CUPS 1.1.19/Mac OS X 10.3@ */
+  {
+    ipp_uchar_t	version[2];		/* Protocol version number */
+    ipp_status_t status_code;		/* Status code */
+    int		request_id;		/* Request ID */
+  }		event;
+} ipp_request_t;
+
+/**** New in CUPS 1.1.19 ****/
+typedef struct ipp_s ipp_t;
+
+typedef union ipp_value_u		/**** Attribute Value ****/
+{
+  int		integer;		/* Integer/enumerated value */
+
+  char		boolean;		/* Boolean value */
+
+  ipp_uchar_t	date[11];		/* Date/time value */
+
+  struct
+  {
+    int		xres,			/* Horizontal resolution */
+		yres;			/* Vertical resolution */
+    ipp_res_t	units;			/* Resolution units */
+  }		resolution;		/* Resolution value */
+
+  struct
+  {
+    int		lower,			/* Lower value */
+		upper;			/* Upper value */
+  }		range;			/* Range of integers value */
+
+  struct
+  {
+    char	*charset;		/* Character set */
+    char	*text;			/* String */
+  }		string;			/* String with language value */
+
+  struct
+  {
+    int		length;			/* Length of attribute */
+    void	*data;			/* Data in attribute */
+  }		unknown;		/* Unknown attribute type */
+
+/**** New in CUPS 1.1.19 ****/
+  ipp_t		*collection;		/* Collection value @since CUPS 1.1.19/Mac OS X 10.3@ */
+} ipp_value_t;
+
+typedef struct ipp_attribute_s		/**** Attribute ****/
+{
+  struct ipp_attribute_s *next;		/* Next attribute in list */
+  ipp_tag_t	group_tag,		/* Job/Printer/Operation group tag */
+		value_tag;		/* What type of value is it? */
+  char		*name;			/* Name of attribute */
+  int		num_values;		/* Number of values */
+  ipp_value_t	values[1];		/* Values */
+} ipp_attribute_t;
+
+struct ipp_s				/**** IPP Request/Response/Notification ****/
+{
+  ipp_state_t	state;			/* State of request */
+  ipp_request_t	request;		/* Request header */
+  ipp_attribute_t *attrs;		/* Attributes */
+  ipp_attribute_t *last;		/* Last attribute in list */
+  ipp_attribute_t *current;		/* Current attribute (for read/write) */
+  ipp_tag_t	curtag;			/* Current attribute group tag */
+
+/**** New in CUPS 1.2 ****/
+  ipp_attribute_t *prev;		/* Previous attribute (for read) @since CUPS 1.2/Mac OS X 10.5@ */
+
+/**** New in CUPS 1.4.4 ****/
+  int		use;			/* Use count @since CUPS 1.4.4/Mac OS X 10.6.?@ */
+};
 
 
 /*
@@ -385,10 +440,10 @@ extern ipp_attribute_t	*ippAddBooleans(ipp_t *ipp, ipp_tag_t group,
 extern ipp_attribute_t	*ippAddDate(ipp_t *ipp, ipp_tag_t group,
 			            const char *name, const ipp_uchar_t *value);
 extern ipp_attribute_t	*ippAddInteger(ipp_t *ipp, ipp_tag_t group,
-			               ipp_tag_t value_tag, const char *name,
+			               ipp_tag_t type, const char *name,
 				       int value);
 extern ipp_attribute_t	*ippAddIntegers(ipp_t *ipp, ipp_tag_t group,
-			                ipp_tag_t value_tag, const char *name,
+			                ipp_tag_t type, const char *name,
 					int num_values, const int *values);
 extern ipp_attribute_t	*ippAddRange(ipp_t *ipp, ipp_tag_t group,
 			             const char *name, int lower, int upper);
@@ -404,19 +459,19 @@ extern ipp_attribute_t	*ippAddResolutions(ipp_t *ipp, ipp_tag_t group,
 					   const int *yres);
 extern ipp_attribute_t	*ippAddSeparator(ipp_t *ipp);
 extern ipp_attribute_t	*ippAddString(ipp_t *ipp, ipp_tag_t group,
-			              ipp_tag_t value_tag, const char *name,
-				      const char *language, const char *value);
+			              ipp_tag_t type, const char *name,
+				      const char *charset, const char *value);
 extern ipp_attribute_t	*ippAddStrings(ipp_t *ipp, ipp_tag_t group,
-			               ipp_tag_t value_tag, const char *name,
-				       int num_values, const char *language,
+			               ipp_tag_t type, const char *name,
+				       int num_values, const char *charset,
 				       const char * const *values);
 extern time_t		ippDateToTime(const ipp_uchar_t *date);
 extern void		ippDelete(ipp_t *ipp);
 extern const char	*ippErrorString(ipp_status_t error);
 extern ipp_attribute_t	*ippFindAttribute(ipp_t *ipp, const char *name,
-			                  ipp_tag_t value_tag);
+			                  ipp_tag_t type);
 extern ipp_attribute_t	*ippFindNextAttribute(ipp_t *ipp, const char *name,
-			                      ipp_tag_t value_tag);
+			                      ipp_tag_t type);
 extern size_t		ippLength(ipp_t *ipp);
 extern ipp_t		*ippNew(void);
 extern ipp_state_t	ippRead(http_t *http, ipp_t *ipp);
@@ -435,7 +490,7 @@ extern void		ippDeleteAttribute(ipp_t *ipp, ipp_attribute_t *attr) _CUPS_API_1_1
 extern ipp_state_t	ippReadFile(int fd, ipp_t *ipp) _CUPS_API_1_1_19;
 extern ipp_state_t	ippWriteFile(int fd, ipp_t *ipp) _CUPS_API_1_1_19;
 
-/**** New in CUPS 1.2/Mac OS X 10.5 ****/
+/**** New in CUPS 1.2 ****/
 extern ipp_attribute_t	*ippAddOctetString(ipp_t *ipp, ipp_tag_t group,
 			                   const char *name,
 					   const void *data, int datalen) _CUPS_API_1_2;
@@ -448,89 +503,10 @@ extern ipp_state_t	ippReadIO(void *src, ipp_iocb_t cb, int blocking,
 extern ipp_state_t	ippWriteIO(void *dst, ipp_iocb_t cb, int blocking,
 			           ipp_t *parent, ipp_t *ipp) _CUPS_API_1_2;
 
-/**** New in CUPS 1.4/Mac OS X 10.6 ****/
+/**** New in CUPS 1.4 ****/
 extern const char	*ippTagString(ipp_tag_t tag) _CUPS_API_1_4;
 extern ipp_tag_t	ippTagValue(const char *name) _CUPS_API_1_4;
 
-/**** New in CUPS 1.6 ****/
-extern ipp_attribute_t	*ippAddOutOfBand(ipp_t *ipp, ipp_tag_t group,
-			                 ipp_tag_t value_tag, const char *name)
-			                 _CUPS_API_1_6;
-extern size_t		ippAttributeString(ipp_attribute_t *attr, char *buffer,
-			                   size_t bufsize) _CUPS_API_1_6;
-extern ipp_attribute_t	*ippCopyAttribute(ipp_t *dst, ipp_attribute_t *attr,
-			                 int quickcopy) _CUPS_API_1_6;
-extern int		ippCopyAttributes(ipp_t *dst, ipp_t *src,
-			                  int quickcopy, ipp_copycb_t cb,
-			                  void *context) _CUPS_API_1_6;
-extern int		ippDeleteValues(ipp_t *ipp, ipp_attribute_t **attr,
-			                int element, int count) _CUPS_API_1_6;
-extern const char	*ippEnumString(const char *attrname, int enumvalue)
-			               _CUPS_API_1_6;
-extern int		ippEnumValue(const char *attrname,
-			             const char *enumstring) _CUPS_API_1_6;
-extern ipp_attribute_t	*ippFirstAttribute(ipp_t *ipp) _CUPS_API_1_6;
-extern int		ippGetBoolean(ipp_attribute_t *attr, int element)
-			              _CUPS_API_1_6;
-extern ipp_t		*ippGetCollection(ipp_attribute_t *attr,
-			                  int element) _CUPS_API_1_6;
-extern int		ippGetCount(ipp_attribute_t *attr) _CUPS_API_1_6;
-extern const ipp_uchar_t *ippGetDate(ipp_attribute_t *attr, int element)
-			             _CUPS_API_1_6;
-extern ipp_tag_t	ippGetGroupTag(ipp_attribute_t *attr) _CUPS_API_1_6;
-extern int		ippGetInteger(ipp_attribute_t *attr, int element)
-			              _CUPS_API_1_6;
-extern const char	*ippGetName(ipp_attribute_t *attr) _CUPS_API_1_6;
-extern ipp_op_t		ippGetOperation(ipp_t *ipp) _CUPS_API_1_6;
-extern int		ippGetRange(ipp_attribute_t *attr, int element,
-			            int *upper) _CUPS_API_1_6;
-extern int		ippGetRequestId(ipp_t *ipp) _CUPS_API_1_6;
-extern int		ippGetResolution(ipp_attribute_t *attr, int element,
-			                 int *yres, ipp_res_t *units)
-			                 _CUPS_API_1_6;
-extern ipp_state_t	ippGetState(ipp_t *ipp) _CUPS_API_1_6;
-extern ipp_status_t	ippGetStatusCode(ipp_t *ipp) _CUPS_API_1_6;
-extern const char	*ippGetString(ipp_attribute_t *attr, int element,
-				      const char **language) _CUPS_API_1_6;
-extern ipp_tag_t	ippGetValueTag(ipp_attribute_t *attr) _CUPS_API_1_6;
-extern int		ippGetVersion(ipp_t *ipp, int *minor) _CUPS_API_1_6;
-extern ipp_attribute_t	*ippNextAttribute(ipp_t *ipp) _CUPS_API_1_6;
-extern int		ippSetBoolean(ipp_t *ipp, ipp_attribute_t **attr,
-			              int element, int boolvalue) _CUPS_API_1_6;
-extern int		ippSetCollection(ipp_t *ipp, ipp_attribute_t **attr,
-			                 int element, ipp_t *colvalue)
-			                 _CUPS_API_1_6;
-extern int		ippSetDate(ipp_t *ipp, ipp_attribute_t **attr,
-			            int element, const ipp_uchar_t *datevalue)
-				    _CUPS_API_1_6;
-extern int		ippSetGroupTag(ipp_t *ipp, ipp_attribute_t **attr,
-			               ipp_tag_t group_tag) _CUPS_API_1_6;
-extern int		ippSetInteger(ipp_t *ipp, ipp_attribute_t **attr,
-			              int element, int intvalue) _CUPS_API_1_6;
-extern int		ippSetName(ipp_t *ipp, ipp_attribute_t **attr,
-			            const char *name) _CUPS_API_1_6;
-extern int		ippSetOperation(ipp_t *ipp, ipp_op_t op) _CUPS_API_1_6;
-extern int		ippSetRange(ipp_t *ipp, ipp_attribute_t **attr,
-			            int element, int lowervalue, int uppervalue)
-			            _CUPS_API_1_6;
-extern int		ippSetRequestId(ipp_t *ipp, int request_id)
-			                _CUPS_API_1_6;
-extern int		ippSetResolution(ipp_t *ipp, ipp_attribute_t **attr,
-			                 int element, ipp_res_t unitsvalue,
-			                 int xresvalue, int yresvalue)
-			                 _CUPS_API_1_6;
-extern int		ippSetState(ipp_t *ipp, ipp_state_t state)
-			            _CUPS_API_1_6;
-extern int		ippSetStatusCode(ipp_t *ipp, ipp_status_t status)
-			                 _CUPS_API_1_6;
-extern int		ippSetString(ipp_t *ipp, ipp_attribute_t **attr,
-			             int element, const char *strvalue)
-			             _CUPS_API_1_6;
-extern int		ippSetValueTag(ipp_t *ipp, ipp_attribute_t **attr,
-			               ipp_tag_t value_tag) _CUPS_API_1_6;
-extern int		ippSetVersion(ipp_t *ipp, int major, int minor)
-			              _CUPS_API_1_6;
-
 
 /*
  * C++ magic...

cups/language-private.h

@@ -62,9 +62,15 @@ extern void		_cupsLangPrintError(const char *prefix,
 			                    const char *message);
 extern int		_cupsLangPrintFilter(FILE *fp, const char *prefix,
 			                     const char *message, ...)
-			__attribute__ ((__format__ (__printf__, 3, 4)));
+#  ifdef __GNUC__
+__attribute__ ((__format__ (__printf__, 3, 4)))
+#  endif /* __GNUC__ */
+;
 extern int		_cupsLangPrintf(FILE *fp, const char *message, ...)
-			__attribute__ ((__format__ (__printf__, 2, 3)));
+#  ifdef __GNUC__
+__attribute__ ((__format__ (__printf__, 2, 3)))
+#  endif /* __GNUC__ */
+;
 extern int		_cupsLangPuts(FILE *fp, const char *message);
 extern const char	*_cupsLangString(cups_lang_t *lang,
 			                 const char *message);

cups/language.c

@@ -3,7 +3,7 @@
  *
  *   I18N/language support for CUPS.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -35,7 +35,6 @@
  *   cups_cache_lookup()    - Lookup a language in the cache...
  *   cups_message_compare() - Compare two messages.
  *   cups_message_free()    - Free a message.
- *   cups_message_load()    - Load the message catalog for a language.
  *   cups_unquote()         - Unquote characters in strings...
  */
 
@@ -177,7 +176,6 @@ static cups_lang_t	*cups_cache_lookup(const char *name,
 static int		cups_message_compare(_cups_message_t *m1,
 			                     _cups_message_t *m2);
 static void		cups_message_free(_cups_message_t *m);
-static void		cups_message_load(cups_lang_t *lang);
 static void		cups_unquote(char *d, const char *s);
 
 
@@ -395,6 +393,11 @@ cupsLangGet(const char *language)	/* I - Language or locale */
 			real[48];	/* Real language name */
   cups_encoding_t	encoding;	/* Encoding to use */
   cups_lang_t		*lang;		/* Current language... */
+#if !defined(__APPLE__) || !defined(CUPS_BUNDLEDIR)
+  char			filename[1024];	/* Filename for language locale file */
+  _cups_globals_t	*cg = _cupsGlobals();
+  					/* Pointer to library globals */
+#endif /* !__APPLE__ || !CUPS_BUNDLEDIR */
   static const char * const locale_encodings[] =
 		{			/* Locale charset names */
 		  "ASCII",	"ISO88591",	"ISO88592",	"ISO88593",
@@ -698,9 +701,21 @@ cupsLangGet(const char *language)	/* I - Language or locale */
   */
 
   if (country[0])
+  {
     snprintf(real, sizeof(real), "%s_%s", langname, country);
+
+#if !defined(__APPLE__) || !defined(CUPS_BUNDLEDIR)
+    snprintf(filename, sizeof(filename), "%s/%s/cups_%s.po", cg->localedir,
+             real, real);
+#endif /* !__APPLE__ || !CUPS_BUNDLEDIR */
+  }
   else
+  {
     strcpy(real, langname);
+#if !defined(__APPLE__) || !defined(CUPS_BUNDLEDIR)
+    filename[0] = '\0';			/* anti-compiler-warning-code */
+#endif /* !__APPLE__ || !CUPS_BUNDLEDIR */
+  }
 
   _cupsMutexLock(&lang_mutex);
 
@@ -713,6 +728,30 @@ cupsLangGet(const char *language)	/* I - Language or locale */
     return (lang);
   }
 
+#if !defined(__APPLE__) || !defined(CUPS_BUNDLEDIR)
+  if (!country[0] || access(filename, 0))
+  {
+   /*
+    * Country localization not available, look for generic localization...
+    */
+
+    snprintf(filename, sizeof(filename), "%s/%s/cups_%s.po", cg->localedir,
+             langname, langname);
+
+    if (access(filename, 0))
+    {
+     /*
+      * No generic localization, so use POSIX...
+      */
+
+      DEBUG_printf(("4cupsLangGet: access(\"%s\", 0): %s", filename,
+                    strerror(errno)));
+
+      snprintf(filename, sizeof(filename), "%s/C/cups_C.po", cg->localedir);
+    }
+  }
+#endif /* !__APPLE__ || !CUPS_BUNDLEDIR */
+
  /*
   * See if there is a free language available; if so, use that
   * record...
@@ -745,7 +784,6 @@ cupsLangGet(const char *language)	/* I - Language or locale */
     */
 
     _cupsMessageFree(lang->strings);
-    lang->strings = NULL;
   }
 
  /*
@@ -760,6 +798,16 @@ cupsLangGet(const char *language)	/* I - Language or locale */
   else
     lang->encoding = CUPS_UTF8;
 
+ /*
+  * Read the strings from the file...
+  */
+
+#if defined(__APPLE__) && defined(CUPS_BUNDLEDIR)
+  lang->strings = appleMessageLoad(lang->language);
+#else
+  lang->strings = _cupsMessageLoad(filename, 1);
+#endif /* __APPLE__ && CUPS_BUNDLEDIR */
+
  /*
   * Return...
   */
@@ -787,18 +835,11 @@ _cupsLangString(cups_lang_t *lang,	/* I - Language */
   * Range check input...
   */
 
-  if (!lang || !message)
+  if (!lang || !message || !*message)
     return (message);
 
   _cupsMutexLock(&lang_mutex);
 
- /*
-  * Load the message catalog if needed...
-  */
-
-  if (!lang->strings)
-    cups_message_load(lang);
-
   s = _cupsMessageLookup(lang->strings, message);
 
   _cupsMutexUnlock(&lang_mutex);
@@ -938,7 +979,23 @@ _cupsMessageLoad(const char *filename,	/* I - Message catalog to load */
       */
 
       if (m)
-        cupsArrayAdd(a, m);
+      {
+        if (m->str && m->str[0])
+        {
+          cupsArrayAdd(a, m);
+        }
+        else
+        {
+         /*
+          * Translation is empty, don't add it... (STR #4033)
+          */
+
+          free(m->id);
+          if (m->str)
+            free(m->str);
+          free(m);
+        }
+      }
 
      /*
       * Create a new message with the given msgid string...
@@ -968,6 +1025,11 @@ _cupsMessageLoad(const char *filename,	/* I - Message catalog to load */
       if ((temp = realloc(m->str ? m->str : m->id,
                           length + strlen(ptr) + 1)) == NULL)
       {
+        if (m->str)
+	  free(m->str);
+	free(m->id);
+        free(m);
+
 	cupsFileClose(fp);
 	return (a);
       }
@@ -1005,6 +1067,9 @@ _cupsMessageLoad(const char *filename,	/* I - Message catalog to load */
 
       if ((m->str = strdup(ptr)) == NULL)
       {
+	free(m->id);
+        free(m);
+
         cupsFileClose(fp);
 	return (a);
       }
@@ -1016,7 +1081,23 @@ _cupsMessageLoad(const char *filename,	/* I - Message catalog to load */
   */
 
   if (m)
-    cupsArrayAdd(a, m);
+  {
+    if (m->str && m->str[0])
+    {
+      cupsArrayAdd(a, m);
+    }
+    else
+    {
+     /*
+      * Translation is empty, don't add it... (STR #4033)
+      */
+
+      free(m->id);
+      if (m->str)
+	free(m->str);
+      free(m);
+    }
+  }
 
  /*
   * Close the message catalog file and return the new array...
@@ -1416,56 +1497,6 @@ cups_message_free(_cups_message_t *m)	/* I - Message */
 }
 
 
-/*
- * 'cups_message_load()' - Load the message catalog for a language.
- */
-
-static void
-cups_message_load(cups_lang_t *lang)	/* I - Language */
-{
-#if defined(__APPLE__) && defined(CUPS_BUNDLEDIR)
-  lang->strings = appleMessageLoad(lang->language);
-
-#else
-  char			filename[1024];	/* Filename for language locale file */
-  _cups_globals_t	*cg = _cupsGlobals();
-  					/* Pointer to library globals */
-
-
-  snprintf(filename, sizeof(filename), "%s/%s/cups_%s.po", cg->localedir,
-	   lang->language, lang->language);
-
-  if (strchr(lang->language, '_') && access(filename, 0))
-  {
-   /*
-    * Country localization not available, look for generic localization...
-    */
-
-    snprintf(filename, sizeof(filename), "%s/%.2s/cups_%.2s.po", cg->localedir,
-             lang->language, lang->language);
-
-    if (access(filename, 0))
-    {
-     /*
-      * No generic localization, so use POSIX...
-      */
-
-      DEBUG_printf(("4cups_message_load: access(\"%s\", 0): %s", filename,
-                    strerror(errno)));
-
-      snprintf(filename, sizeof(filename), "%s/C/cups_C.po", cg->localedir);
-    }
-  }
-
- /*
-  * Read the strings from the file...
-  */
-
-  lang->strings = _cupsMessageLoad(filename, 1);
-#endif /* __APPLE__ && CUPS_BUNDLEDIR */
-}
-
-
 /*
  * 'cups_unquote()' - Unquote characters in strings...
  */

cups/libcups2.def

@@ -1,8 +1,6 @@
 LIBRARY libcups2
 VERSION 2.9
 EXPORTS
-_cupsBufferGet
-_cupsBufferRelease
 _cupsGet1284Values
 _cupsGetDests
 _cupsGetPassword
@@ -17,8 +15,6 @@ _cupsMD5Init
 _cupsMessageFree
 _cupsMessageLoad
 _cupsMessageLookup
-_cupsMutexLock
-_cupsMutexUnlock
 _cupsNextDelay
 _cupsSetError
 _cupsSetLocale
@@ -42,7 +38,10 @@ _httpEncodeURI
 _httpPeek
 _httpResolveURI
 _httpWait
+_ippAddAttr
+_ippAttrString
 _ippFindOption
+_ippFreeAttr
 _ppdCacheCreateWithFile
 _ppdCacheCreateWithPPD
 _ppdCacheDestroy
@@ -61,8 +60,6 @@ _ppdGetLanguages
 _ppdHashName
 _ppdLocalizedAttr
 _ppdNormalizeMakeAndModel
-_ppdOpen
-_ppdOpenFile
 _ppdParseOptions
 _pwgGenerateSize
 _pwgInitSize
@@ -275,7 +272,6 @@ ippAddDate
 ippAddInteger
 ippAddIntegers
 ippAddOctetString
-ippAddOutOfBand
 ippAddRange
 ippAddRanges
 ippAddResolution
@@ -283,40 +279,16 @@ ippAddResolutions
 ippAddSeparator
 ippAddString
 ippAddStrings
-ippAttributeString
-ippCopyAttribute
-ippCopyAttributes
 ippDateToTime
 ippDelete
 ippDeleteAttribute
-ippDeleteValues
-ippEnumString
-ippEnumValue
 ippErrorString
 ippErrorValue
 ippFindAttribute
 ippFindNextAttribute
-ippFirstAttribute
-ippGetBoolean
-ippGetCollection
-ippGetCount
-ippGetDate
-ippGetGroupTag
-ippGetInteger
-ippGetName
-ippGetOperation
-ippGetRange
-ippGetRequestId
-ippGetResolution
-ippGetState
-ippGetStatusCode
-ippGetString
-ippGetValueTag
-ippGetVersion
 ippLength
 ippNew
 ippNewRequest
-ippNextAttribute
 ippOpString
 ippOpValue
 ippPort
@@ -324,21 +296,6 @@ ippRead
 ippReadFile
 ippReadIO
 ippSetPort
-ippSetBoolean
-ippSetCollection
-ippSetDate
-ippSetGroupTag
-ippSetInteger
-ippSetName
-ippSetOperation
-ippSetRange
-ippSetRequestId
-ippSetResolution
-ippSetState
-ippSetStatusCode
-ippSetString
-ippSetValueTag
-ippSetVersion
 ippTagString
 ippTagValue
 ippTimeToDate

cups/libcups2.rc

@@ -0,0 +1,75 @@
+// Microsoft Visual C++ generated resource script.
+//
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+#include "WinVersRes.h"
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION MASTER_PROD_VERS
+ PRODUCTVERSION MASTER_PROD_VERS
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", MASTER_COMPANY_NAME
+            VALUE "FileDescription", "CUPS Library"
+            VALUE "FileVersion", MASTER_PROD_VERS_STR
+            VALUE "InternalName", "libcups2.dll"
+            VALUE "LegalCopyright", MASTER_LEGAL_COPYRIGHT
+            VALUE "OriginalFilename", "libcups2.dll"
+            VALUE "ProductName", MASTER_PROD_NAME
+            VALUE "ProductVersion", MASTER_PROD_VERS_STR
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

cups/libcups_s.exp

@@ -1,6 +1,4 @@
 _cups_debug_fd
-_cupsBufferGet
-_cupsBufferRelease
 _cupsGet1284Values
 _cupsGetDests
 _cupsGetPassword
@@ -52,15 +50,15 @@ _httpPeek
 _httpResolveURI
 _httpSetTimeout
 _httpWait
+_ippAddAttr
 _ippFindOption
+_ippFreeAttr
 _ppdFreeLanguages
 _ppdGetEncoding
 _ppdGetLanguages
 _ppdHashName
 _ppdLocalizedAttr
 _ppdNormalizeMakeAndModel
-_ppdOpen
-_ppdOpenFile
 _ppdParseOptions
 _pwgCreateWithFile
 _pwgDestroy

cups/localize.c

@@ -3,7 +3,7 @@
  *
  *   PPD localization routines for CUPS.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -310,9 +310,9 @@ ppdLocalizeIPPReason(
 		       !strncmp(reason, "shutdown", 8))
 	message = _("The printer is not connected.");
       else if (!strncmp(reason, "toner-low", 9))
-	message = _("The printer is low on toner.");
+	message = _("The printer is running low on toner.");
       else if (!strncmp(reason, "toner-empty", 11))
-	message = _("The printer is out of toner.");
+	message = _("The printer may be out of toner.");
       else if (!strncmp(reason, "cover-open", 10))
 	message = _("The printer's cover is open.");
       else if (!strncmp(reason, "interlock-open", 14))
@@ -332,9 +332,9 @@ ppdLocalizeIPPReason(
       else if (!strncmp(reason, "output-area-full", 16))
 	message = _("The output bin is full.");
       else if (!strncmp(reason, "marker-supply-low", 17))
-	message = _("The printer is low on ink.");		
+	message = _("The printer is running low on ink.");		
       else if (!strncmp(reason, "marker-supply-empty", 19))
-	message = _("The printer may be out of ink.");
+	message = _("The printer is out of ink.");
       else if (!strncmp(reason, "marker-waste-almost-full", 24))
 	message = _("The printer's waste bin is almost full.");
       else if (!strncmp(reason, "marker-waste-full", 17))

cups/ppd-cache.c

@@ -3,7 +3,7 @@
  *
  *   PPD cache implementation for CUPS.
  *
- *   Copyright 2010-2011 by Apple Inc.
+ *   Copyright 2010-2012 by Apple Inc.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Apple Inc. and are protected by Federal copyright
@@ -749,12 +749,15 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd)	/* I - PPD file */
     }
 
    /*
-    * If we have a similar paper with non-zero margins then we only
-    * want to keep it if it has a larger imageable area length.
+    * If we have a similar paper with non-zero margins then we only want to
+    * keep it if it has a larger imageable area length.  The NULL check is for
+    * dimensions that are <= 0...
     */
 
-    pwg_media      = _pwgMediaForSize(_PWG_FROMPTS(ppd_size->width),
-                                      _PWG_FROMPTS(ppd_size->length));
+    if ((pwg_media = _pwgMediaForSize(_PWG_FROMPTS(ppd_size->width),
+                                      _PWG_FROMPTS(ppd_size->length))) == NULL)
+      continue;
+
     new_width      = pwg_media->width;
     new_length     = pwg_media->length;
     new_left       = _PWG_FROMPTS(ppd_size->left);
@@ -1519,11 +1522,9 @@ _ppdCacheGetFinishingOptions(
 
   if (job && (attr = ippFindAttribute(job, "finishings", IPP_TAG_ENUM)) != NULL)
   {
-    int	num_values = ippGetCount(attr);	/* Number of values */
-
-    for (i = 0; i < num_values; i ++)
+    for (i = 0; i < attr->num_values; i ++)
     {
-      key.value = ippGetInteger(attr, i);
+      key.value = attr->values[i].integer;
 
       if ((f = cupsArrayFind(pc->finishings, &key)) != NULL)
       {
@@ -1637,7 +1638,7 @@ _ppdCacheGetInputSlot(
 
     media_col = ippFindAttribute(job, "media-col", IPP_TAG_BEGIN_COLLECTION);
     if (media_col &&
-        (media_source = ippFindAttribute(ippGetCollection(media_col, 0),
+        (media_source = ippFindAttribute(media_col->values[0].collection,
                                          "media-source",
 	                                 IPP_TAG_KEYWORD)) != NULL)
     {
@@ -1645,7 +1646,7 @@ _ppdCacheGetInputSlot(
       * Use the media-source value from media-col...
       */
 
-      keyword = ippGetString(media_source, 0, NULL);
+      keyword = media_source->values[0].string.text;
     }
     else if (_pwgInitSize(&size, job, &margins_set))
     {

cups/ppd-private.h

@@ -56,14 +56,6 @@ extern "C" {
  * Types and structures...
  */
 
-typedef enum _ppd_localization_e	/**** Selector for _ppdOpen ****/
-{
-  _PPD_LOCALIZATION_DEFAULT,		/* Load only the default localization */
-  _PPD_LOCALIZATION_ICC_PROFILES,	/* Load only the color profile localization */
-  _PPD_LOCALIZATION_NONE,		/* Load no localizations */
-  _PPD_LOCALIZATION_ALL			/* Load all localizations */
-} _ppd_localization_t;
-
 typedef enum _ppd_parse_e		/**** Selector for _ppdParseOptions ****/
 {
   _PPD_PARSE_OPTIONS,			/* Parse only the options */
@@ -185,10 +177,6 @@ extern ppd_attr_t	*_ppdLocalizedAttr(ppd_file_t *ppd, const char *keyword,
 extern char		*_ppdNormalizeMakeAndModel(const char *make_and_model,
 			                           char *buffer,
 						   size_t bufsize);
-extern ppd_file_t	*_ppdOpen(cups_file_t *fp,
-				  _ppd_localization_t localization);
-extern ppd_file_t	*_ppdOpenFile(const char *filename,
-				      _ppd_localization_t localization);
 extern int		_ppdParseOptions(const char *s, int num_options,
 			                 cups_option_t **options,
 					 _ppd_parse_t which);

cups/ppd.c

@@ -31,10 +31,8 @@
  *                            LanguageEncoding.
  *   ppdLastError()         - Return the status from the last ppdOpen*().
  *   ppdOpen()              - Read a PPD file into memory.
- *   _ppdOpen()             - Read a PPD file into memory.
  *   ppdOpen2()             - Read a PPD file into memory.
  *   ppdOpenFd()            - Read a PPD file into memory.
- *   _ppdOpenFile()         - Read a PPD file into memory.
  *   ppdOpenFile()          - Read a PPD file into memory.
  *   ppdSetConformance()    - Set the conformance level for PPD files.
  *   ppd_add_attr()         - Add an attribute to the PPD data.
@@ -415,15 +413,47 @@ ppdLastError(int *line)			/* O - Line number */
 
 
 /*
- * '_ppdOpen()' - Read a PPD file into memory.
+ * 'ppdOpen()' - Read a PPD file into memory.
+ */
+
+ppd_file_t *				/* O - PPD file record */
+ppdOpen(FILE *fp)			/* I - File to read from */
+{
+  ppd_file_t	*ppd;			/* PPD file record */
+  cups_file_t	*cf;			/* CUPS file */
+
+
+ /*
+  * Reopen the stdio file as a CUPS file...
+  */
+
+  if ((cf = cupsFileOpenFd(fileno(fp), "r")) == NULL)
+    return (NULL);
+
+ /*
+  * Load the PPD file using the newer API...
+  */
+
+  ppd = ppdOpen2(cf);
+
+ /*
+  * Close the CUPS file and return the PPD...
+  */
+
+  cupsFileClose(cf);
+
+  return (ppd);
+}
+
+
+/*
+ * 'ppdOpen2()' - Read a PPD file into memory.
  *
  * @since CUPS 1.2/Mac OS X 10.5@
  */
 
 ppd_file_t *				/* O - PPD file record or @code NULL@ if the PPD file could not be opened. */
-_ppdOpen(
-    cups_file_t		*fp,		/* I - File to read from */
-    _ppd_localization_t	localization)	/* I - Localization to load */
+ppdOpen2(cups_file_t *fp)		/* I - File to read from */
 {
   int			i, j, k;	/* Looping vars */
   int			count;		/* Temporary count */
@@ -453,17 +483,12 @@ _ppdOpen(
   char			**filter;	/* Pointer to filter */
   struct lconv		*loc;		/* Locale data */
   int			ui_keyword;	/* Is this line a UI keyword? */
-  cups_lang_t		*lang;		/* Language data */
   cups_encoding_t	encoding;	/* Encoding of PPD file */
   _cups_globals_t	*cg = _cupsGlobals();
 					/* Global data */
   char			custom_name[PPD_MAX_NAME];
 					/* CustomFoo attribute name */
   ppd_attr_t		*custom_attr;	/* CustomFoo attribute */
-  char			ll[4],		/* Language + '.' */
-			ll_CC[7];	/* Language + country + '.' */
-  size_t		ll_len,		/* Language length */
-			ll_CC_len;	/* Language + country length */
   static const char * const ui_keywords[] =
 			{
 #ifdef CUPS_USE_FULL_UI_KEYWORDS_LIST
@@ -525,14 +550,9 @@ _ppdOpen(
 			  "PageSize"
 #endif /* CUPS_USE_FULL_UI_KEYWORDS_LIST */
 			};
-  static const char * const color_keywords[] =	/* Keywords associated with color profiles */
-			{
-			  ".cupsICCProfile",
-			  ".ColorModel",
-			};
 
 
-  DEBUG_printf(("_ppdOpen(fp=%p)", fp));
+  DEBUG_printf(("ppdOpen2(fp=%p)", fp));
 
  /*
   * Default to "OK" status...
@@ -551,25 +571,6 @@ _ppdOpen(
     return (NULL);
   }
 
- /*
-  * If only loading a single localization set up the strings to match...
-  */
-
-  if (localization == _PPD_LOCALIZATION_DEFAULT)
-  {
-    if ((lang = cupsLangDefault()) == NULL)
-      return (NULL);
-
-    snprintf(ll_CC, sizeof(ll_CC), "%s.", lang->language);
-    snprintf(ll, sizeof(ll), "%2.2s.", lang->language);
-
-    ll_CC_len = strlen(ll_CC);
-    ll_len    = strlen(ll);
-
-    DEBUG_printf(("2_ppdOpen: Loading localizations matching \"%s\" and \"%s\"",
-                  ll_CC, ll));
-  }
-
  /*
   * Grab the first line and make sure it reads '*PPD-Adobe: "major.minor"'...
   */
@@ -579,7 +580,7 @@ _ppdOpen(
 
   mask = ppd_read(fp, &line, keyword, name, text, &string, 0, cg);
 
-  DEBUG_printf(("2_ppdOpen: mask=%x, keyword=\"%s\"...", mask, keyword));
+  DEBUG_printf(("2ppdOpen2: mask=%x, keyword=\"%s\"...", mask, keyword));
 
   if (mask == 0 ||
       strcmp(keyword, "PPD-Adobe") ||
@@ -598,7 +599,7 @@ _ppdOpen(
     return (NULL);
   }
 
-  DEBUG_printf(("2_ppdOpen: keyword=%s, string=%p", keyword, string));
+  DEBUG_printf(("2ppdOpen2: keyword=%s, string=%p", keyword, string));
 
   _cupsStrFree(string);
 
@@ -637,7 +638,7 @@ _ppdOpen(
 
   while ((mask = ppd_read(fp, &line, keyword, name, text, &string, 1, cg)) != 0)
   {
-    DEBUG_printf(("2_ppdOpen: mask=%x, keyword=\"%s\", name=\"%s\", "
+    DEBUG_printf(("2ppdOpen2: mask=%x, keyword=\"%s\", name=\"%s\", "
                   "text=\"%s\", string=%d chars...", mask, keyword, name, text,
 		  string ? (int)strlen(string) : 0));
 
@@ -674,50 +675,6 @@ _ppdOpen(
       ui_keyword = 0;
     }
 
-   /*
-    * If we are filtering out keyword localizations, see if this line needs to
-    * be used...
-    */
-
-    if (localization != _PPD_LOCALIZATION_ALL &&
-        (temp = strchr(keyword, '.')) != NULL &&
-        ((temp - keyword) == 2 || (temp - keyword) == 5) &&
-        _cups_isalpha(keyword[0]) &&
-        _cups_isalpha(keyword[1]) &&
-        (keyword[2] == '.' ||
-         (keyword[2] == '_' && _cups_isalpha(keyword[3]) &&
-          _cups_isalpha(keyword[4]) && keyword[5] == '.')))
-    {
-      if (localization == _PPD_LOCALIZATION_NONE ||
-	  (localization == _PPD_LOCALIZATION_DEFAULT &&
-	   strncmp(ll_CC, keyword, ll_CC_len) &&
-	   strncmp(ll, keyword, ll_len)))
-      {
-	DEBUG_printf(("2_ppdOpen: Ignoring localization: \"%s\"\n", keyword));
-	continue;
-      }
-      else if (localization == _PPD_LOCALIZATION_ICC_PROFILES)
-      {
-       /*
-        * Only load localizations for the color profile related keywords...
-        */
-
-	for (i = 0;
-	     i < (int)(sizeof(color_keywords) / sizeof(color_keywords[0]));
-	     i ++)
-	{
-	  if (!_cups_strcasecmp(temp, color_keywords[i]))
-	    break;
-	}
-
-	if (i >= (int)(sizeof(color_keywords) / sizeof(color_keywords[0])))
-	{
-	  DEBUG_printf(("2_ppdOpen: Ignoring localization: \"%s\"\n", keyword));
-	  continue;
-	}
-      }
-    }
-
     if (option == NULL &&
         (mask & (PPD_KEYWORD | PPD_OPTION | PPD_STRING)) ==
 	    (PPD_KEYWORD | PPD_OPTION | PPD_STRING))
@@ -734,7 +691,7 @@ _ppdOpen(
 
         ui_keyword = 1;
 
-        DEBUG_printf(("2_ppdOpen: FOUND ADOBE UI KEYWORD %s WITHOUT OPENUI!",
+        DEBUG_printf(("2ppdOpen2: FOUND ADOBE UI KEYWORD %s WITHOUT OPENUI!",
 	              keyword));
 
         if (!group)
@@ -743,7 +700,7 @@ _ppdOpen(
 	                             encoding)) == NULL)
 	    goto error;
 
-          DEBUG_printf(("2_ppdOpen: Adding to group %s...", group->text));
+          DEBUG_printf(("2ppdOpen2: Adding to group %s...", group->text));
           option = ppd_get_option(group, keyword);
 	  group  = NULL;
 	}
@@ -778,7 +735,7 @@ _ppdOpen(
 	      !strcmp(ppd->attrs[j]->name + 7, keyword) &&
 	      ppd->attrs[j]->value)
 	  {
-	    DEBUG_printf(("2_ppdOpen: Setting Default%s to %s via attribute...",
+	    DEBUG_printf(("2ppdOpen2: Setting Default%s to %s via attribute...",
 	                  option->keyword, ppd->attrs[j]->value));
 	    strlcpy(option->defchoice, ppd->attrs[j]->value,
 	            sizeof(option->defchoice));
@@ -1076,7 +1033,7 @@ _ppdOpen(
     {
       ppd_option_t	*custom_option;	/* Custom option */
 
-      DEBUG_puts("2_ppdOpen: Processing Custom option...");
+      DEBUG_puts("2ppdOpen2: Processing Custom option...");
 
      /*
       * Get the option and custom option...
@@ -1103,7 +1060,7 @@ _ppdOpen(
         if ((choice = ppdFindChoice(custom_option, "Custom")) == NULL)
 	  if ((choice = ppd_add_choice(custom_option, "Custom")) == NULL)
 	  {
-	    DEBUG_puts("1_ppdOpen: Unable to add Custom choice!");
+	    DEBUG_puts("1ppdOpen2: Unable to add Custom choice!");
 
 	    cg->ppd_status = PPD_ALLOC_ERROR;
 
@@ -1143,7 +1100,7 @@ _ppdOpen(
 	  if ((choice = ppdFindChoice(custom_option, "Custom")) == NULL)
 	    if ((choice = ppd_add_choice(custom_option, "Custom")) == NULL)
 	    {
-	      DEBUG_puts("1_ppdOpen: Unable to add Custom choice!");
+	      DEBUG_puts("1ppdOpen2: Unable to add Custom choice!");
 
 	      cg->ppd_status = PPD_ALLOC_ERROR;
 
@@ -1284,7 +1241,7 @@ _ppdOpen(
       * Add an option record to the current sub-group, group, or file...
       */
 
-      DEBUG_printf(("2_ppdOpen: name=\"%s\" (%d)", name, (int)strlen(name)));
+      DEBUG_printf(("2ppdOpen2: name=\"%s\" (%d)", name, (int)strlen(name)));
 
       if (name[0] == '*')
         _cups_strcpy(name, name + 1); /* Eliminate leading asterisk */
@@ -1292,7 +1249,7 @@ _ppdOpen(
       for (i = (int)strlen(name) - 1; i > 0 && _cups_isspace(name[i]); i --)
         name[i] = '\0'; /* Eliminate trailing spaces */
 
-      DEBUG_printf(("2_ppdOpen: OpenUI of %s in group %s...", name,
+      DEBUG_printf(("2ppdOpen2: OpenUI of %s in group %s...", name,
                     group ? group->text : "(null)"));
 
       if (subgroup != NULL)
@@ -1303,7 +1260,7 @@ _ppdOpen(
 	                           encoding)) == NULL)
 	  goto error;
 
-        DEBUG_printf(("2_ppdOpen: Adding to group %s...", group->text));
+        DEBUG_printf(("2ppdOpen2: Adding to group %s...", group->text));
         option = ppd_get_option(group, name);
 	group  = NULL;
       }
@@ -1341,7 +1298,7 @@ _ppdOpen(
 	    !strcmp(ppd->attrs[j]->name + 7, name) &&
 	    ppd->attrs[j]->value)
 	{
-	  DEBUG_printf(("2_ppdOpen: Setting Default%s to %s via attribute...",
+	  DEBUG_printf(("2ppdOpen2: Setting Default%s to %s via attribute...",
 	                option->keyword, ppd->attrs[j]->value));
 	  strlcpy(option->defchoice, ppd->attrs[j]->value,
 	          sizeof(option->defchoice));
@@ -1387,7 +1344,7 @@ _ppdOpen(
         if ((choice = ppdFindChoice(option, "Custom")) == NULL)
 	  if ((choice = ppd_add_choice(option, "Custom")) == NULL)
 	  {
-	    DEBUG_puts("1_ppdOpen: Unable to add Custom choice!");
+	    DEBUG_puts("1ppdOpen2: Unable to add Custom choice!");
 
 	    cg->ppd_status = PPD_ALLOC_ERROR;
 
@@ -1460,7 +1417,7 @@ _ppdOpen(
 	    !strcmp(ppd->attrs[j]->name + 7, name) &&
 	    ppd->attrs[j]->value)
 	{
-	  DEBUG_printf(("2_ppdOpen: Setting Default%s to %s via attribute...",
+	  DEBUG_printf(("2ppdOpen2: Setting Default%s to %s via attribute...",
 	                option->keyword, ppd->attrs[j]->value));
 	  strlcpy(option->defchoice, ppd->attrs[j]->value,
 	          sizeof(option->defchoice));
@@ -1490,7 +1447,7 @@ _ppdOpen(
       {
 	if ((choice = ppd_add_choice(option, "Custom")) == NULL)
 	{
-	  DEBUG_puts("1_ppdOpen: Unable to add Custom choice!");
+	  DEBUG_puts("1ppdOpen2: Unable to add Custom choice!");
 
 	  cg->ppd_status = PPD_ALLOC_ERROR;
 
@@ -1663,11 +1620,11 @@ _ppdOpen(
         * Set the default as part of the current option...
 	*/
 
-        DEBUG_printf(("2_ppdOpen: Setting %s to %s...", keyword, string));
+        DEBUG_printf(("2ppdOpen2: Setting %s to %s...", keyword, string));
 
         strlcpy(option->defchoice, string, sizeof(option->defchoice));
 
-        DEBUG_printf(("2_ppdOpen: %s is now %s...", keyword, option->defchoice));
+        DEBUG_printf(("2ppdOpen2: %s is now %s...", keyword, option->defchoice));
       }
       else
       {
@@ -1680,7 +1637,7 @@ _ppdOpen(
 
         if ((toption = ppdFindOption(ppd, keyword + 7)) != NULL)
 	{
-	  DEBUG_printf(("2_ppdOpen: Setting %s to %s...", keyword, string));
+	  DEBUG_printf(("2ppdOpen2: Setting %s to %s...", keyword, string));
 	  strlcpy(toption->defchoice, string, sizeof(toption->defchoice));
 	}
       }
@@ -1917,7 +1874,7 @@ _ppdOpen(
 	         (PPD_KEYWORD | PPD_OPTION | PPD_STRING) &&
 	     !strcmp(keyword, option->keyword))
     {
-      DEBUG_printf(("2_ppdOpen: group=%p, subgroup=%p", group, subgroup));
+      DEBUG_printf(("2ppdOpen2: group=%p, subgroup=%p", group, subgroup));
 
       if (!strcmp(keyword, "PageSize"))
       {
@@ -1986,7 +1943,7 @@ _ppdOpen(
 
 #ifdef DEBUG
   if (!cupsFileEOF(fp))
-    DEBUG_printf(("1_ppdOpen: Premature EOF at %lu...\n",
+    DEBUG_printf(("1ppdOpen2: Premature EOF at %lu...\n",
                   (unsigned long)cupsFileTell(fp)));
 #endif /* DEBUG */
 
@@ -2069,53 +2026,6 @@ _ppdOpen(
 }
 
 
-/*
- * 'ppdOpen()' - Read a PPD file into memory.
- */
-
-ppd_file_t *				/* O - PPD file record */
-ppdOpen(FILE *fp)			/* I - File to read from */
-{
-  ppd_file_t	*ppd;			/* PPD file record */
-  cups_file_t	*cf;			/* CUPS file */
-
-
- /*
-  * Reopen the stdio file as a CUPS file...
-  */
-
-  if ((cf = cupsFileOpenFd(fileno(fp), "r")) == NULL)
-    return (NULL);
-
- /*
-  * Load the PPD file using the newer API...
-  */
-
-  ppd = _ppdOpen(cf, _PPD_LOCALIZATION_DEFAULT);
-
- /*
-  * Close the CUPS file and return the PPD...
-  */
-
-  cupsFileClose(cf);
-
-  return (ppd);
-}
-
-
-/*
- * 'ppdOpen2()' - Read a PPD file into memory.
- *
- * @since CUPS 1.2/Mac OS X 10.5@
- */
-
-ppd_file_t *				/* O - PPD file record or @code NULL@ if the PPD file could not be opened. */
-ppdOpen2(cups_file_t *fp)		/* I - File to read from */
-{
-  return _ppdOpen(fp, _PPD_LOCALIZATION_DEFAULT);
-}
-
-
 /*
  * 'ppdOpenFd()' - Read a PPD file into memory.
  */
@@ -2167,12 +2077,11 @@ ppdOpenFd(int fd)			/* I - File to read from */
 
 
 /*
- * '_ppdOpenFile()' - Read a PPD file into memory.
+ * 'ppdOpenFile()' - Read a PPD file into memory.
  */
 
 ppd_file_t *				/* O - PPD file record or @code NULL@ if the PPD file could not be opened. */
-_ppdOpenFile(const char		  *filename,	/* I - File to read from */
-	     _ppd_localization_t  localization)	/* I - Localization to load */
+ppdOpenFile(const char *filename)	/* I - File to read from */
 {
   cups_file_t		*fp;		/* File pointer */
   ppd_file_t		*ppd;		/* PPD file record */
@@ -2203,7 +2112,7 @@ _ppdOpenFile(const char		  *filename,	/* I - File to read from */
 
   if ((fp = cupsFileOpen(filename, "r")) != NULL)
   {
-    ppd = _ppdOpen(fp, localization);
+    ppd = ppdOpen2(fp);
 
     cupsFileClose(fp);
   }
@@ -2217,17 +2126,6 @@ _ppdOpenFile(const char		  *filename,	/* I - File to read from */
 }
 
 
-/*
- * 'ppdOpenFile()' - Read a PPD file into memory.
- */
-
-ppd_file_t *				/* O - PPD file record or @code NULL@ if the PPD file could not be opened. */
-ppdOpenFile(const char *filename)	/* I - File to read from */
-{
-  return _ppdOpenFile(filename, _PPD_LOCALIZATION_DEFAULT);
-}
-
-
 /*
  * 'ppdSetConformance()' - Set the conformance level for PPD files.
  *

cups/ppd.h

@@ -3,10 +3,6 @@
  *
  *   PostScript Printer Description definitions for CUPS.
  *
- *   THESE APIS ARE DEPRECATED. TO COMPILE WITHOUT WARNINGS ADD
- *   -D_PPD_DEPRECATED="" TO YOUR COMPILE OPTIONS.  THIS HEADER AND THESE
- *   FUNCTIONS WILL BE REMOVED IN A FUTURE RELEASE OF CUPS.
- *
  *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
@@ -50,16 +46,6 @@ extern "C" {
 #  endif /* __cplusplus */
 
 
-/*
- * Define _PPD_DEPRECATED to silence the warnings about PPD functions being
- * deprecated...
- */
-
-#  ifndef _PPD_DEPRECATED
-#    define _PPD_DEPRECATED _CUPS_DEPRECATED
-#  endif /* !_PPD_DEPRECATED */
-
-
 /*
  * PPD version...
  */
@@ -375,8 +361,7 @@ extern int		ppdEmitFd(ppd_file_t *ppd, int fd,
 extern int		ppdEmitJCL(ppd_file_t *ppd, FILE *fp, int job_id,
 			           const char *user, const char *title);
 extern ppd_choice_t	*ppdFindChoice(ppd_option_t *o, const char *option);
-extern ppd_choice_t	*ppdFindMarkedChoice(ppd_file_t *ppd,
-			                     const char *keyword);
+extern ppd_choice_t	*ppdFindMarkedChoice(ppd_file_t *ppd, const char *keyword);
 extern ppd_option_t	*ppdFindOption(ppd_file_t *ppd, const char *keyword);
 extern int		ppdIsMarked(ppd_file_t *ppd, const char *keyword,
 			            const char *option);
@@ -391,67 +376,64 @@ extern ppd_size_t	*ppdPageSize(ppd_file_t *ppd, const char *name);
 extern float		ppdPageWidth(ppd_file_t *ppd, const char *name);
 
 /**** New in CUPS 1.1.19 ****/
-extern const char	*ppdErrorString(ppd_status_t status) _PPD_DEPRECATED;
+extern const char	*ppdErrorString(ppd_status_t status) _CUPS_API_1_1_19;
 extern ppd_attr_t	*ppdFindAttr(ppd_file_t *ppd, const char *name,
-			             const char *spec) _PPD_DEPRECATED;
+			             const char *spec) _CUPS_API_1_1_19;
 extern ppd_attr_t	*ppdFindNextAttr(ppd_file_t *ppd, const char *name,
-			                 const char *spec) _PPD_DEPRECATED;
-extern ppd_status_t	ppdLastError(int *line) _PPD_DEPRECATED;
+			                 const char *spec) _CUPS_API_1_1_19;
+extern ppd_status_t	ppdLastError(int *line) _CUPS_API_1_1_19;
 
 /**** New in CUPS 1.1.20 ****/
-extern void		ppdSetConformance(ppd_conform_t c) _PPD_DEPRECATED;
+extern void		ppdSetConformance(ppd_conform_t c) _CUPS_API_1_1_20;
 
 /**** New in CUPS 1.2 ****/
 extern int		ppdCollect2(ppd_file_t *ppd, ppd_section_t section,
-			            float min_order, ppd_choice_t  ***choices)
-			            _PPD_DEPRECATED;
+			            float min_order, ppd_choice_t  ***choices) _CUPS_API_1_2;
 extern int		ppdEmitAfterOrder(ppd_file_t *ppd, FILE *fp,
 			                  ppd_section_t section, int limit,
-					  float min_order) _PPD_DEPRECATED;
-extern int		ppdEmitJCLEnd(ppd_file_t *ppd, FILE *fp) _PPD_DEPRECATED;
+					  float min_order) _CUPS_API_1_2;
+extern int		ppdEmitJCLEnd(ppd_file_t *ppd, FILE *fp) _CUPS_API_1_2;
 extern char		*ppdEmitString(ppd_file_t *ppd, ppd_section_t section,
-			               float min_order) _PPD_DEPRECATED;
+			               float min_order) _CUPS_API_1_2;
 extern ppd_coption_t	*ppdFindCustomOption(ppd_file_t *ppd,
-			                     const char *keyword) _PPD_DEPRECATED;
+			                     const char *keyword) _CUPS_API_1_2;
 extern ppd_cparam_t	*ppdFindCustomParam(ppd_coption_t *opt,
-			                    const char *name) _PPD_DEPRECATED;
-extern ppd_cparam_t	*ppdFirstCustomParam(ppd_coption_t *opt) _PPD_DEPRECATED;
-extern ppd_option_t	*ppdFirstOption(ppd_file_t *ppd) _PPD_DEPRECATED;
-extern ppd_cparam_t	*ppdNextCustomParam(ppd_coption_t *opt) _PPD_DEPRECATED;
-extern ppd_option_t	*ppdNextOption(ppd_file_t *ppd) _PPD_DEPRECATED;
-extern int		ppdLocalize(ppd_file_t *ppd) _PPD_DEPRECATED;
-extern ppd_file_t	*ppdOpen2(cups_file_t *fp) _PPD_DEPRECATED;
+			                    const char *name) _CUPS_API_1_2;
+extern ppd_cparam_t	*ppdFirstCustomParam(ppd_coption_t *opt) _CUPS_API_1_2;
+extern ppd_option_t	*ppdFirstOption(ppd_file_t *ppd) _CUPS_API_1_2;
+extern ppd_cparam_t	*ppdNextCustomParam(ppd_coption_t *opt) _CUPS_API_1_2;
+extern ppd_option_t	*ppdNextOption(ppd_file_t *ppd) _CUPS_API_1_2;
+extern int		ppdLocalize(ppd_file_t *ppd) _CUPS_API_1_2;
+extern ppd_file_t	*ppdOpen2(cups_file_t *fp) _CUPS_API_1_2;
 
 /**** New in CUPS 1.3/Mac OS X 10.5 ****/
 extern const char	*ppdLocalizeIPPReason(ppd_file_t *ppd,
 			                      const char *reason,
 					      const char *scheme,
 					      char *buffer,
-					      size_t bufsize) _PPD_DEPRECATED;
+					      size_t bufsize) _CUPS_API_1_3;
 
 /**** New in CUPS 1.4/Mac OS X 10.6 ****/
 extern int		cupsGetConflicts(ppd_file_t *ppd, const char *option,
 					 const char *choice,
 					 cups_option_t **options)
-					     _PPD_DEPRECATED;
-extern int		cupsResolveConflicts(ppd_file_t *ppd,
-			                     const char *option,
+					     _CUPS_API_1_4;
+extern int		cupsResolveConflicts(ppd_file_t *ppd, const char *option,
 			                     const char *choice,
 					     int *num_options,
 					     cups_option_t **options)
-					     _PPD_DEPRECATED;
+					     _CUPS_API_1_4;
 extern int		ppdInstallableConflict(ppd_file_t *ppd,
 			                       const char *option,
 					       const char *choice)
-					           _PPD_DEPRECATED;
+					           _CUPS_API_1_4;
 extern ppd_attr_t	*ppdLocalizeAttr(ppd_file_t *ppd, const char *keyword,
-			                 const char *spec) _PPD_DEPRECATED;
+			                 const char *spec) _CUPS_API_1_4;
 extern const char	*ppdLocalizeMarkerName(ppd_file_t *ppd,
-			                       const char *name)
-			                       _PPD_DEPRECATED;
+			                       const char *name) _CUPS_API_1_4;
 extern int		ppdPageSizeLimits(ppd_file_t *ppd,
 			                  ppd_size_t *minimum,
-					  ppd_size_t *maximum) _PPD_DEPRECATED;
+					  ppd_size_t *maximum) _CUPS_API_1_4;
 
 
 /*

cups/pwg-media.c

@@ -3,7 +3,7 @@
  *
  *   PWG media name API implementation for CUPS.
  *
- *   Copyright 2009-2011 by Apple Inc.
+ *   Copyright 2009-2012 by Apple Inc.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Apple Inc. and are protected by Federal copyright
@@ -66,7 +66,7 @@ static _pwg_media_t const cups_pwg_media[] =
   _PWG_MEDIA_IN("na_number-9_3.875x8.875in", "na-number-9-envelope", "Env9", 3.875, 8.875),
   _PWG_MEDIA_IN("na_index-4x6_4x6in", NULL, "4x6", 4, 6),
   _PWG_MEDIA_IN("na_number-10_4.125x9.5in", "na-number-10-envelope", "Env10", 4.125, 9.5),
-  _PWG_MEDIA_IN("na_a2_4.375x5.75in", NULL, "EnvA2", 4.375, 5.75),
+  _PWG_MEDIA_IN("na_a2_4.375x5.75in", NULL, NULL, 4.375, 5.75),
   _PWG_MEDIA_IN("na_number-11_4.5x10.375in", NULL, "Env11", 4.5, 10.375),
   _PWG_MEDIA_IN("na_number-12_4.75x11in", NULL, "Env12", 4.75, 11),
   _PWG_MEDIA_IN("na_5x7_5x7in", NULL, "5x7", 5, 7),
@@ -117,7 +117,7 @@ static _pwg_media_t const cups_pwg_media[] =
 
   /* Chinese Standard Sheet Media Inch Sizes */
   _PWG_MEDIA_IN("roc_16k_7.75x10.75in", NULL, "roc16k", 7.75, 10.75),
-  _PWG_MEDIA_IN("roc_8k_10.75x15.5in", NULL, NULL, 10.75, 15.5),
+  _PWG_MEDIA_IN("roc_8k_10.75x15.5in", NULL, "roc8k", 10.75, 15.5),
 
   /* ISO Standard Sheet Media Sizes */
   _PWG_MEDIA_MM("iso_a10_26x37mm", "iso-a10", "A10", 26, 37),
@@ -128,7 +128,7 @@ static _pwg_media_t const cups_pwg_media[] =
   _PWG_MEDIA_MM("iso_a5_148x210mm", "iso-a5", "A5", 148, 210),
   _PWG_MEDIA_MM("iso_a5-extra_174x235mm", NULL, "A5Extra", 174, 235),
   _PWG_MEDIA_MM("iso_a4_210x297mm", "iso-a4", "A4", 210, 297),
-  _PWG_MEDIA_MM("iso_a4-tab_225x297mm", NULL, NULL, 225, 297),
+  _PWG_MEDIA_MM("iso_a4-tab_225x297mm", NULL, "A4Tab", 225, 297),
   _PWG_MEDIA_MM("iso_a4-extra_235.5x322.3mm", NULL, "A4Extra", 235.5, 322.3),
   _PWG_MEDIA_MM("iso_a3_297x420mm", "iso-a3", "A3", 297, 420),
   _PWG_MEDIA_MM("iso_a4x3_297x630mm", "iso-a4x3", NULL, 297, 630),
@@ -230,12 +230,12 @@ static _pwg_media_t const cups_pwg_media[] =
   _PWG_MEDIA_IN("oe_photo-l_3.5x5in", NULL, "3.5x5", 3.5, 5),
 
   /* Other Metric Standard Sheet Media Sizes */
-  _PWG_MEDIA_MM("om_small-photo_100x150mm", NULL, "om_small-photo", 100, 150),
+  _PWG_MEDIA_MM("om_small-photo_100x150mm", NULL, NULL, 100, 150),
   _PWG_MEDIA_MM("om_italian_110x230mm", NULL, "EnvItalian", 110, 230),
   _PWG_MEDIA_MM("om_postfix_114x229mm", NULL, NULL, 114, 229),
-  _PWG_MEDIA_MM("om_large-photo_200x300", NULL, NULL, 200, 300),
+  _PWG_MEDIA_MM("om_large-photo_200x300", NULL, "om_large-photo", 200, 300),
   _PWG_MEDIA_MM("om_folio_210x330mm", "folio", "Folio", 210, 330),
-  _PWG_MEDIA_MM("om_folio-sp_215x315mm", NULL, NULL, 215, 315),
+  _PWG_MEDIA_MM("om_folio-sp_215x315mm", NULL, "FolioSP", 215, 315),
   _PWG_MEDIA_MM("om_invite_220x220mm", NULL, "EnvInvite", 220, 220)
 };
 

cups/pwg-private.h

@@ -3,7 +3,7 @@
  *
  *   Private PWG media API definitions for CUPS.
  *
- *   Copyright 2009-2012 by Apple Inc.
+ *   Copyright 2009-2010 by Apple Inc.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Apple Inc. and are protected by Federal copyright

cups/raster-private.h

@@ -1,69 +0,0 @@
-/*
- * "$Id$"
- *
- *   Private image library definitions for CUPS.
- *
- *   Copyright 2007-2011 by Apple Inc.
- *   Copyright 1993-2006 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- */
-
-#ifndef _CUPS_RASTER_PRIVATE_H_
-#  define _CUPS_RASTER_PRIVATE_H_
-
-/*
- * Include necessary headers...
- */
-
-#  include "raster.h"
-#  include <cups/cups.h>
-#  include <cups/debug-private.h>
-#  include <cups/string-private.h>
-#  ifdef WIN32
-#    include <io.h>
-#    include <winsock2.h>		/* for htonl() definition */
-#  else
-#    include <unistd.h>
-#    include <fcntl.h>
-#  endif /* WIN32 */
-
-
-/*
- * min/max/abs macros...
- */
-
-#  ifndef max
-#    define 	max(a,b)	((a) > (b) ? (a) : (b))
-#  endif /* !max */
-#  ifndef min
-#    define 	min(a,b)	((a) < (b) ? (a) : (b))
-#  endif /* !min */
-#  ifndef abs
-#    define	abs(a)		((a) < 0 ? -(a) : (a))
-#  endif /* !abs */
-
-
-/*
- * Prototypes...
- */
-
-extern int		_cupsRasterExecPS(cups_page_header2_t *h,
-			                  int *preferred_bits,
-			                  const char *code)
-			                  __attribute__((nonnull(3)));
-extern void		_cupsRasterAddError(const char *f, ...)
-			__attribute__((__format__(__printf__, 1, 2)));
-extern void		_cupsRasterClearError(void);
-
-#endif /* !_CUPS_RASTER_PRIVATE_H_ */
-
-/*
- * End of "$Id$".
- */

cups/sidechannel.c

@@ -29,7 +29,8 @@
  */
 
 #include "sidechannel.h"
-#include "cups-private.h"
+#include "string-private.h"
+#include "debug-private.h"
 #ifdef WIN32
 #  include <io.h>
 #else
@@ -44,18 +45,10 @@
 #  include <sys/time.h>
 #endif /* !WIN32 */
 #ifdef HAVE_POLL
-#  include <poll.h>
+#  include <sys/poll.h>
 #endif /* HAVE_POLL */
 
 
-/*
- * Buffer size for side-channel requests...
- */
-
-#define _CUPS_SC_MAX_DATA	65535
-#define _CUPS_SC_MAX_BUFFER	65540
-
-
 /*
  * 'cupsSideChannelDoRequest()' - Send a side-channel command to a backend and wait for a response.
  *
@@ -119,7 +112,7 @@ cupsSideChannelRead(
     int               *datalen,		/* IO - Size of data buffer on entry, number of bytes in buffer on return */
     double            timeout)		/* I  - Timeout in seconds */
 {
-  char		*buffer;		/* Message buffer */
+  char		buffer[16388];		/* Message buffer */
   int		bytes;			/* Bytes read */
   int		templen;		/* Data length from message */
   int		nfds;			/* Number of file descriptors */
@@ -171,8 +164,7 @@ cupsSideChannelRead(
 
   if  (nfds < 1)
   {
-    *command = CUPS_SC_CMD_NONE;
-    *status  = nfds==0 ? CUPS_SC_STATUS_TIMEOUT : CUPS_SC_STATUS_IO_ERROR;
+    *status = nfds==0 ? CUPS_SC_STATUS_TIMEOUT : CUPS_SC_STATUS_IO_ERROR;
     return (-1);
   }
 
@@ -183,28 +175,16 @@ cupsSideChannelRead(
   * -------  -------------------------------------------
   * 0        Command code
   * 1        Status code
-  * 2-3      Data length (network byte order)
+  * 2-3      Data length (network byte order) <= 16384
   * 4-N      Data
   */
 
-  if ((buffer = _cupsBufferGet(_CUPS_SC_MAX_BUFFER)) == NULL)
-  {
-    *command = CUPS_SC_CMD_NONE;
-    *status  = CUPS_SC_STATUS_TOO_BIG;
-
-    return (-1);
-  }
-
-  while ((bytes = read(CUPS_SC_FD, buffer, _CUPS_SC_MAX_BUFFER)) < 0)
+  while ((bytes = read(CUPS_SC_FD, buffer, sizeof(buffer))) < 0)
     if (errno != EINTR && errno != EAGAIN)
     {
       DEBUG_printf(("1cupsSideChannelRead: Read error: %s", strerror(errno)));
-
-      _cupsBufferRelease(buffer);
-
       *command = CUPS_SC_CMD_NONE;
       *status  = CUPS_SC_STATUS_IO_ERROR;
-
       return (-1);
     }
 
@@ -215,12 +195,8 @@ cupsSideChannelRead(
   if (bytes < 4)
   {
     DEBUG_printf(("1cupsSideChannelRead: Short read of %d bytes", bytes));
-
-    _cupsBufferRelease(buffer);
-
     *command = CUPS_SC_CMD_NONE;
     *status  = CUPS_SC_STATUS_BAD_MESSAGE;
-
     return (-1);
   }
 
@@ -232,12 +208,8 @@ cupsSideChannelRead(
       buffer[0] >= CUPS_SC_CMD_MAX)
   {
     DEBUG_printf(("1cupsSideChannelRead: Bad command %d!", buffer[0]));
-
-    _cupsBufferRelease(buffer);
-
     *command = CUPS_SC_CMD_NONE;
     *status  = CUPS_SC_STATUS_BAD_MESSAGE;
-
     return (-1);
   }
 
@@ -280,8 +252,6 @@ cupsSideChannelRead(
     memcpy(data, buffer + 4, templen);
   }
 
-  _cupsBufferRelease(buffer);
-
   DEBUG_printf(("1cupsSideChannelRead: Returning status=%d", *status));
 
   return (0);
@@ -320,7 +290,7 @@ cupsSideChannelSNMPGet(
 {
   cups_sc_status_t	status;		/* Status of command */
   cups_sc_command_t	rcommand;	/* Response command */
-  char			*real_data;	/* Real data buffer for response */
+  char			real_data[2048];/* Real data buffer for response */
   int			real_datalen,	/* Real length of data buffer */
 			real_oidlen;	/* Length of returned OID string */
 
@@ -346,21 +316,12 @@ cupsSideChannelSNMPGet(
                            (int)strlen(oid) + 1, timeout))
     return (CUPS_SC_STATUS_TIMEOUT);
 
-  if ((real_data = _cupsBufferGet(_CUPS_SC_MAX_BUFFER)) == NULL)
-    return (CUPS_SC_STATUS_TOO_BIG);
-
-  real_datalen = _CUPS_SC_MAX_BUFFER;
+  real_datalen = sizeof(real_data);
   if (cupsSideChannelRead(&rcommand, &status, real_data, &real_datalen, timeout))
-  {
-    _cupsBufferRelease(real_data);
     return (CUPS_SC_STATUS_TIMEOUT);
-  }
 
   if (rcommand != CUPS_SC_CMD_SNMP_GET)
-  {
-    _cupsBufferRelease(real_data);
     return (CUPS_SC_STATUS_BAD_MESSAGE);
-  }
 
   if (status == CUPS_SC_STATUS_OK)
   {
@@ -372,10 +333,7 @@ cupsSideChannelSNMPGet(
     real_datalen -= real_oidlen;
 
     if ((real_datalen + 1) > *datalen)
-    {
-      _cupsBufferRelease(real_data);
       return (CUPS_SC_STATUS_TOO_BIG);
-    }
 
     memcpy(data, real_data + real_oidlen, real_datalen);
     data[real_datalen] = '\0';
@@ -383,8 +341,6 @@ cupsSideChannelSNMPGet(
     *datalen = real_datalen;
   }
 
-  _cupsBufferRelease(real_data);
-
   return (status);
 }
 
@@ -426,7 +382,7 @@ cupsSideChannelSNMPWalk(
 {
   cups_sc_status_t	status;		/* Status of command */
   cups_sc_command_t	rcommand;	/* Response command */
-  char			*real_data;	/* Real data buffer for response */
+  char			real_data[2048];/* Real data buffer for response */
   int			real_datalen,	/* Real length of data buffer */
 			real_oidlen,	/* Length of returned OID string */
 			oidlen;		/* Length of first OID */
@@ -444,9 +400,6 @@ cupsSideChannelSNMPWalk(
   if (!oid || !*oid || !cb)
     return (CUPS_SC_STATUS_BAD_MESSAGE);
 
-  if ((real_data = _cupsBufferGet(_CUPS_SC_MAX_BUFFER)) == NULL)
-    return (CUPS_SC_STATUS_TOO_BIG);
-
  /*
   * Loop until the OIDs don't match...
   */
@@ -463,24 +416,15 @@ cupsSideChannelSNMPWalk(
 
     if (cupsSideChannelWrite(CUPS_SC_CMD_SNMP_GET_NEXT, CUPS_SC_STATUS_NONE,
                              current_oid, (int)strlen(current_oid) + 1, timeout))
-    {
-      _cupsBufferRelease(real_data);
       return (CUPS_SC_STATUS_TIMEOUT);
-    }
 
-    real_datalen = _CUPS_SC_MAX_BUFFER;
+    real_datalen = sizeof(real_data);
     if (cupsSideChannelRead(&rcommand, &status, real_data, &real_datalen,
                             timeout))
-    {
-      _cupsBufferRelease(real_data);
       return (CUPS_SC_STATUS_TIMEOUT);
-    }
 
     if (rcommand != CUPS_SC_CMD_SNMP_GET_NEXT)
-    {
-      _cupsBufferRelease(real_data);
       return (CUPS_SC_STATUS_BAD_MESSAGE);
-    }
 
     if (status == CUPS_SC_STATUS_OK)
     {
@@ -495,7 +439,6 @@ cupsSideChannelSNMPWalk(
         * Done with this set of OIDs...
 	*/
 
-	_cupsBufferRelease(real_data);
         return (CUPS_SC_STATUS_OK);
       }
 
@@ -521,8 +464,6 @@ cupsSideChannelSNMPWalk(
   }
   while (status == CUPS_SC_STATUS_OK);
 
-  _cupsBufferRelease(real_data);
-
   return (status);
 }
 
@@ -544,7 +485,7 @@ cupsSideChannelWrite(
     int               datalen,		/* I - Number of bytes of data */
     double            timeout)		/* I - Timeout in seconds */
 {
-  char		*buffer;		/* Message buffer */
+  char		buffer[16388];		/* Message buffer */
   int		bytes;			/* Bytes written */
 #ifdef HAVE_POLL
   struct pollfd	pfd;			/* Poll structure for poll() */
@@ -559,7 +500,7 @@ cupsSideChannelWrite(
   */
 
   if (command < CUPS_SC_CMD_SOFT_RESET || command >= CUPS_SC_CMD_MAX ||
-      datalen < 0 || datalen > _CUPS_SC_MAX_DATA || (datalen > 0 && !data))
+      datalen < 0 || datalen > 16384 || (datalen > 0 && !data))
     return (-1);
 
  /*
@@ -608,9 +549,6 @@ cupsSideChannelWrite(
   * 4-N      Data
   */
 
-  if ((buffer = _cupsBufferGet(datalen + 4)) == NULL)
-    return (-1);
-
   buffer[0] = command;
   buffer[1] = status;
   buffer[2] = datalen >> 8;
@@ -626,12 +564,7 @@ cupsSideChannelWrite(
 
   while (write(CUPS_SC_FD, buffer, bytes) < 0)
     if (errno != EINTR && errno != EAGAIN)
-    {
-      _cupsBufferRelease(buffer);
       return (-1);
-    }
-
-  _cupsBufferRelease(buffer);
 
   return (0);
 }

cups/snmp.c

@@ -61,7 +61,7 @@
 #include "cups-private.h"
 #include "snmp-private.h"
 #ifdef HAVE_POLL
-#  include <poll.h>
+#  include <sys/poll.h>
 #endif /* HAVE_POLL */
 
 

cups/string-private.h

@@ -155,7 +155,10 @@ extern size_t _cups_strlcpy(char *, const char *, size_t);
 
 #  ifndef HAVE_SNPRINTF
 extern int	_cups_snprintf(char *, size_t, const char *, ...)
-		__attribute__ ((__format__ (__printf__, 3, 4)));
+#    ifdef __GNUC__
+__attribute__ ((__format__ (__printf__, 3, 4)))
+#    endif /* __GNUC__ */
+;
 #    define snprintf _cups_snprintf
 #  endif /* !HAVE_SNPRINTF */
 

cups/testconflicts.c

@@ -3,7 +3,7 @@
  *
  *   PPD constraint test program for CUPS.
  *
- *   Copyright 2008-2011 by Apple Inc.
+ *   Copyright 2008-2012 by Apple Inc.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Apple Inc. and are protected by Federal copyright
@@ -91,7 +91,13 @@ main(int  argc,				/* I - Number of command-line arguments */
     if (option)
     {
       free(option);
+      option = NULL;
+    }
+
+    if (choice)
+    {
       free(choice);
+      choice = NULL;
     }
 
     printf("\nNew Option(s): ");
@@ -118,6 +124,11 @@ main(int  argc,				/* I - Number of command-line arguments */
     cupsFreeOptions(num_options, options);
   }
 
+  if (option)
+    free(option);
+  if (choice)
+    free(choice);
+
   return (0);
 }
 

cups/testcups.c

@@ -3,7 +3,7 @@
  *
  *   CUPS API test program for CUPS.
  *
- *   Copyright 2007-2012 by Apple Inc.
+ *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -35,7 +35,6 @@
  */
 
 static int	dests_equal(cups_dest_t *a, cups_dest_t *b);
-static int	enum_cb(void *user_data, unsigned flags, cups_dest_t *dest);
 static void	show_diffs(cups_dest_t *a, cups_dest_t *b);
 
 
@@ -58,106 +57,69 @@ main(int  argc,				/* I - Number of command-line arguments */
   int		num_jobs;		/* Number of jobs for queue */
   cups_job_t	*jobs;			/* Jobs for queue */
 
+
   if (argc > 1)
   {
-    if (!strcmp(argv[1], "enum"))
+   /*
+    * ./testcups printer file interval
+    */
+
+    int		interval,		/* Interval between writes */
+		job_id;			/* Job ID */
+    cups_file_t	*fp;			/* Print file */
+    char	buffer[16384];		/* Read/write buffer */
+    ssize_t	bytes;			/* Bytes read/written */
+
+
+    if (argc != 4)
     {
-      int	msec;			/* Timeout in milliseconds */
-
-      if (argc >= 3)
-        msec = atoi(argv[2]) * 1000;
-      else
-        msec = 0;
-
-      cupsEnumDests(CUPS_DEST_FLAGS_NONE, msec, NULL, 0, 0, enum_cb, NULL);
+      puts("Usage: ./testcups");
+      puts("       ./testcups printer file interval");
+      return (1);
     }
-    else if (!strcmp(argv[1], "password"))
-    {
-      const char *pass = cupsGetPassword("Password:");
-					  /* Password string */
 
-      if (pass)
-	printf("Password entered: %s\n", pass);
-      else
-	puts("No password entered.");
+    if ((fp = cupsFileOpen(argv[2], "r")) == NULL)
+    {
+      printf("Unable to open \"%s\": %s\n", argv[2], strerror(errno));
+      return (1);
     }
-    else if (!strcmp(argv[1], "print") && argc == 5)
+
+    if ((job_id = cupsCreateJob(CUPS_HTTP_DEFAULT, argv[1], "testcups", 0,
+                                NULL)) <= 0)
     {
-     /*
-      * ./testcups printer file interval
-      */
-
-      int		interval,	/* Interval between writes */
-			job_id;		/* Job ID */
-      cups_file_t	*fp;		/* Print file */
-      char		buffer[16384];	/* Read/write buffer */
-      ssize_t		bytes;		/* Bytes read/written */
-
-      if ((fp = cupsFileOpen(argv[3], "r")) == NULL)
-      {
-	printf("Unable to open \"%s\": %s\n", argv[2], strerror(errno));
-	return (1);
-      }
-
-      if ((job_id = cupsCreateJob(CUPS_HTTP_DEFAULT, argv[2], "testcups", 0,
-				  NULL)) <= 0)
-      {
-	printf("Unable to create print job on %s: %s\n", argv[1],
-	       cupsLastErrorString());
-	return (1);
-      }
-
-      interval = atoi(argv[4]);
-
-      if (cupsStartDocument(CUPS_HTTP_DEFAULT, argv[1], job_id, argv[2],
-			    CUPS_FORMAT_AUTO, 1) != HTTP_CONTINUE)
-      {
-	puts("Unable to start document!");
-	return (1);
-      }
-
-      while ((bytes = cupsFileRead(fp, buffer, sizeof(buffer))) > 0)
-      {
-	printf("Writing %d bytes...\n", (int)bytes);
-
-	if (cupsWriteRequestData(CUPS_HTTP_DEFAULT, buffer,
-				 bytes) != HTTP_CONTINUE)
-	{
-	  puts("Unable to write bytes!");
-	  return (1);
-	}
-
-        if (interval > 0)
-	  sleep(interval);
-      }
-
-      cupsFileClose(fp);
-
-      if (cupsFinishDocument(CUPS_HTTP_DEFAULT, argv[1]) > IPP_OK_SUBST)
-      {
-	puts("Unable to finish document!");
-	return (1);
-      }
+      printf("Unable to create print job on %s: %s\n", argv[1],
+             cupsLastErrorString());
+      return (1);
     }
-    else
+
+    interval = atoi(argv[3]);
+
+    if (cupsStartDocument(CUPS_HTTP_DEFAULT, argv[1], job_id, argv[2],
+                          CUPS_FORMAT_AUTO, 1) != HTTP_CONTINUE)
     {
-      puts("Usage:");
-      puts("");
-      puts("Run basic unit tests:");
-      puts("");
-      puts("    ./testcups");
-      puts("");
-      puts("Enumerate printers (for N seconds, -1 for indefinitely):");
-      puts("");
-      puts("    ./testcups enum [seconds]");
-      puts("");
-      puts("Ask for a password:");
-      puts("");
-      puts("    ./testcups password");
-      puts("");
-      puts("Print a file (interval controls delay between buffers in seconds):");
-      puts("");
-      puts("    ./testcups print printer file interval");
+      puts("Unable to start document!");
+      return (1);
+    }
+
+    while ((bytes = cupsFileRead(fp, buffer, sizeof(buffer))) > 0)
+    {
+      printf("Writing %d bytes...\n", (int)bytes);
+
+      if (cupsWriteRequestData(CUPS_HTTP_DEFAULT, buffer,
+			       bytes) != HTTP_CONTINUE)
+      {
+        puts("Unable to write bytes!");
+	return (1);
+      }
+
+      sleep(interval);
+    }
+
+    cupsFileClose(fp);
+
+    if (cupsFinishDocument(CUPS_HTTP_DEFAULT, argv[1]) > IPP_OK_SUBST)
+    {
+      puts("Unable to finish document!");
       return (1);
     }
 
@@ -407,24 +369,6 @@ dests_equal(cups_dest_t *a,		/* I - First destination */
 }
 
 
-/*
- * 'enum_cb()' - Report additions and removals.
- */
-
-static int				/* O - 1 to continue, 0 to stop */
-enum_cb(void        *user_data,		/* I - User data (unused) */
-        unsigned    flags,		/* I - Destination flags */
-        cups_dest_t *dest)		/* I - Destination */
-{
-  if (flags & CUPS_DEST_FLAGS_REMOVED)
-    printf("Removed '%s'.\n", dest->name);
-  else
-    printf("Added '%s'.\n", dest->name);
-
-  return (1);
-}
-
-
 /*
  * 'show_diffs()' - Show differences between two destinations.
  */

cups/testfile.c

@@ -133,9 +133,9 @@ main(int  argc,				/* I - Number of command-line arguments */
     * Count lines in psglyphs, rewind, then count again.
     */
 
-    fputs("\ncupsFileOpen(\"../data/media.defs\", \"r\"): ", stdout);
+    fputs("\ncupsFileOpen(\"../data/psglyphs\", \"r\"): ", stdout);
 
-    if ((fp = cupsFileOpen("../data/media.defs", "r")) == NULL)
+    if ((fp = cupsFileOpen("../data/psglyphs", "r")) == NULL)
     {
       puts("FAIL");
       status ++;
@@ -145,9 +145,9 @@ main(int  argc,				/* I - Number of command-line arguments */
       puts("PASS");
       fputs("cupsFileGets: ", stdout);
 
-      if ((count = count_lines(fp)) != 208)
+      if ((count = count_lines(fp)) != 1051)
       {
-        printf("FAIL (got %d lines, expected 208)\n", count);
+        printf("FAIL (got %d lines, expected 1051)\n", count);
 	status ++;
       }
       else
@@ -165,9 +165,9 @@ main(int  argc,				/* I - Number of command-line arguments */
 	  puts("PASS");
 	  fputs("cupsFileGets: ", stdout);
 
-	  if ((count = count_lines(fp)) != 208)
+	  if ((count = count_lines(fp)) != 1051)
 	  {
-	    printf("FAIL (got %d lines, expected 208)\n", count);
+	    printf("FAIL (got %d lines, expected 1051)\n", count);
 	    status ++;
 	  }
 	  else

cups/testipp.c

@@ -758,7 +758,7 @@ print_attributes(ipp_t *ipp,		/* I - IPP request */
   int			i;		/* Looping var */
   ipp_tag_t		group;		/* Current group */
   ipp_attribute_t	*attr;		/* Current attribute */
-  _ipp_value_t		*val;		/* Current value */
+  ipp_value_t		*val;		/* Current value */
   static const char * const tags[] =	/* Value/group tag strings */
 			{
 			  "reserved-00",

cups/testppd.c

@@ -178,7 +178,7 @@ main(int  argc,				/* I - Number of command-line arguments */
 
     fputs("ppdOpenFile(test.ppd): ", stdout);
 
-    if ((ppd = _ppdOpenFile("test.ppd", _PPD_LOCALIZATION_ALL)) != NULL)
+    if ((ppd = ppdOpenFile("test.ppd")) != NULL)
       puts("PASS");
     else
     {
@@ -470,26 +470,6 @@ main(int  argc,				/* I - Number of command-line arguments */
     else
       puts("PASS");
 
-   /*
-    * Custom sizes...
-    */
-
-    fputs("cupsMarkOptions(media=Custom.8x10in): ", stdout);
-    num_options = cupsAddOption("media", "Custom.8x10in", 0, &options);
-    cupsMarkOptions(ppd, num_options, options);
-    cupsFreeOptions(num_options, options);
-
-    size = ppdPageSize(ppd, NULL);
-    if (!size || strcmp(size->name, "Custom") ||
-        size->width != 576 || size->length != 720)
-    {
-      printf("FAIL (%s - %gx%g)\n", size ? size->name : "unknown",
-             size ? size->width : 0.0, size ? size->length : 0.0);
-      status ++;
-    }
-    else
-      puts("PASS");
-
    /*
     * Test localization...
     */

cups/testsnmp.c

@@ -36,7 +36,7 @@
 static void	print_packet(cups_snmp_t *packet, void *data);
 static int	show_oid(int fd, const char *community,
 		         http_addr_t *addr, const char *s, int walk);
-static void	usage(void) __attribute__((noreturn));
+static void	usage(void);
 
 
 /*
@@ -119,7 +119,7 @@ main(int  argc,				/* I - Number of command-line args */
 		         ".1.3.6.1.2.1.43.10.2.1.4.1.1", walk))
       return (1);
   }
-
+  
   return (0);
 }
 

cups/thread-private.h

@@ -3,7 +3,7 @@
  *
  *   Private threading definitions for CUPS.
  *
- *   Copyright 2009-2010 by Apple Inc.
+ *   Copyright 2009-2012 by Apple Inc.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Apple Inc. and are protected by Federal copyright
@@ -49,7 +49,7 @@ typedef pthread_key_t	_cups_threadkey_t;
 typedef void *(__stdcall *_cups_thread_func_t)(void *arg);
 typedef struct _cups_mutex_s
 {
-  int			m_init;		/* Flag for on-demand initialization */		
+  int			m_init;		/* Flag for on-demand initialization */
   CRITICAL_SECTION	m_criticalSection;
 					/* Win32 Critical Section */
 } _cups_mutex_t;
@@ -62,6 +62,7 @@ typedef DWORD	_cups_threadkey_t;
 #    define _cupsThreadSetData(k,p) TlsSetValue(k,p)
 
 #  else
+typedef void	*(*_cups_thread_func_t)(void *arg);
 typedef char	_cups_mutex_t;
 typedef char	_cups_rwlock_t;
 typedef void	*_cups_threadkey_t;

cups/thread.c

@@ -3,7 +3,7 @@
  *
  *   Threading primitives for CUPS.
  *
- *   Copyright 2009-2010 by Apple Inc.
+ *   Copyright 2009-2012 by Apple Inc.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Apple Inc. and are protected by Federal copyright
@@ -113,7 +113,7 @@ _cupsRWUnlock(_cups_rwlock_t *rwlock)	/* I - Reader/writer lock */
  * '_cupsThreadCreate()' - Create a thread.
  */
 
-int					/* O - 0 on failure, 1 on success */	
+int					/* O - 0 on failure, 1 on success */
 _cupsThreadCreate(
     _cups_thread_func_t func,		/* I - Entry point */
     void                *arg)		/* I - Entry point context */
@@ -223,7 +223,7 @@ _cupsRWUnlock(_cups_rwlock_t *rwlock)	/* I - Reader/writer lock */
  * '_cupsThreadCreate()' - Create a thread.
  */
 
-int					/* O - 0 on failure, 1 on success */	
+int					/* O - 0 on failure, 1 on success */
 _cupsThreadCreate(
     _cups_thread_func_t func,		/* I - Entry point */
     void                *arg)		/* I - Entry point context */
@@ -309,6 +309,25 @@ _cupsRWUnlock(_cups_rwlock_t *rwlock)	/* I - Reader/writer lock */
 {
   (void)rwlock;
 }
+
+
+/*
+ * '_cupsThreadCreate()' - Create a thread.
+ */
+
+int					/* O - 0 on failure, 1 on success */
+_cupsThreadCreate(
+    _cups_thread_func_t func,		/* I - Entry point */
+    void                *arg)		/* I - Entry point context */
+{
+  fputs("DEBUG: CUPS was compiled without threading support, no thread "
+        "created.\n", stderr);
+
+  (void)func;
+  (void)arg;
+
+  return (0);
+}
 #endif /* HAVE_PTHREAD_H */