Import cups.org releases

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-1.4.7@4306 a1ca3aef-8c08-0410-bb20-df032aa958be
2013-05-10 18:56:23 +00:00
@@ -1,33 +0,0 @@
-config.cache
-config.h
-config.log
-config.status
-configure
-cups-config
-cups.list
-cups.sh
-make.log
-printpro.common
-printpro.version
-Makedefs
-aix-4.3-powerpc
-darwin-5.2-powerpc
-darwin-5.3-powerpc
-darwin-6.0-powerpc
-freebsd-4.5-intel
-hpux-10.20-hppa
-hpux-11.00-hppa
-irix-5.3-mips
-irix-6.5-mips
-linux-2.0-intel
-linux-2.2-intel
-linux-2.4-intel
-solaris-2.5-intel
-solaris-2.5-sparc
-solaris-2.7-intel
-solaris-2.7-sparc
-solaris-2.8-intel
-solaris-2.8-sparc
-solaris-2.9-intel
-solaris-2.9-sparc
-tru64-4.0-alpha
@@ -1,81 +0,0 @@
-CGI - CUPS v1.1.19 - 05/27/2003
-------------------------------
-
-This file describes the experimental scripting/CGI support
-provided by CUPS starting with CUPS 1.1.19.
-
-WARNING: CGI support is not complete; you may run into problems
-and limitations in the implementation of CGI in CUPS that are
-not present in full-featured web servers like Apache.
-
-
-OVERVIEW OF CGI SUPPORT IN CUPS
-
-CUPS has traditionally provided a dynamic web interface through
-four CGI programs that are executed when users open special
-directories on the CUPS server.  Each CGI performs
-administration, class, job, and printer functions as directed by
-the user, but the actual programs that are run and functions
-that are available are limited to those that were originally
-designed into the scheduler.
-
-Starting with CUPS 1.1.19, support is now available for CGI
-programs and specific scripting languages, currently Java, Perl,
-PHP, and Python.  The interpreters for these languages are
-currently configured at compile time.  Future versions may
-expand the interface to allow for generic support of scripting
-languages similar to the Apache "AddHandler" directive, but with
-external programs instead of modules.
-
-The following MIME types are reserved for the CGI support in
-CUPS (the names have been chosen to mirror those used by
-Apache):
-
-    application/x-http-cgi      CGI script/program
-    application/x-http-java     Java program
-    application/x-http-perl     Perl script
-    application/x-http-php      PHP script
-    application/x-http-python   Python script
-
-In order to enable the corresponding type, you must create a new
-/etc/cups/cgi.types file which maps the filename extensions to
-the appropriate MIME type, for example:
-
-    application/x-http-cgi cgi
-    application/x-http-php php
-
-CGI scripts/programs (application/x-http-cgi) also must have
-execution permissions to be treated as a CGI script or program.
-
-
-LIMITATIONS
-
-CUPS implements most of the CGI/1.1 specification, with the
-following limitations:
-
-    - No Location: redirection support.
-    - No PATH_INFO or PATH_TRANSLATED support.
-    - Limited HTTP field support; only the Content-Length
-      (CONTENT_LENGTH), Cookie (HTTP_COOKIE), and User-Agent
-      (HTTP_USER_AGENT) fields are placed in environment
-      variables at this time.
-
-
-REPORTING PROBLEMS
-
-If you have problems, READ THE DOCUMENTATION FIRST!  If the
-documentation does not solve your problems please send an email
-to "cups-support@cups.org".  Include your operating system and
-version, compiler and version, and any errors or problems you've
-run into. The "/var/log/cups/error_log" file should also be sent,
-as it often helps to determine the cause of your problem.
-
-If you are running a version of Linux, be sure to provide the
-Linux distribution you have, too.
-
-Please note that the "cups-support@cups.org" email address goes
-to the CUPS developers; they are busy people, so your email may
-go unanswered for days or weeks.  In general, only general build
-or distribution problems will actually get answered - for
-end-user support see the "README.txt" for a summary of the
-resources available.
@@ -0,0 +1,217 @@
+CHANGES-1.0.txt
+---------------
+
+CHANGES IN CUPS v1.0.5
+
+	- The HP-GL/2 filter did not correctly set the pen color
+          for pens other than #1.
+	- The scheduler would only accept 26 simultaneous jobs
+          under some OS releases (mkstemp() limitation.)  It now
+          handles up to 2^32 simultaneous jobs.
+	- The PostScript filter loaded the printer's PPD file
+          twice.
+	- The PAM authentication code now uses pam_strerror() to
+          provide a textual error message in the error_log file.
+	- The scheduler now copies PPD and interface script
+          files instead of moving them; this fixes installations
+          with a separate requests directory.
+	- The PostScript RIP did not generate correct 6-color
+          output.
+	- Several filters were marking PPD options twice when
+          they didn't need to.
+	- The scheduler did not save the printer or class state
+          after an accept-jobs or reject-jobs operation.
+	- The cupsGetDefault() function now ignores the PRINTER
+          environment variable if it is set to "lp".
+	- New ippErrorString() function to get textual error
+          messages.
+	- Better error reporting in the System V commands.
+	- The lpadmin and lpstat commands always tried to
+          connect to the default server.
+	- The text filter didn't load the charset files from the
+          correct location.
+	- Wasn't sending a WWW-Authenticate: field to HTTP
+          clients when authentication was required.
+	- httpSeparate() didn't always set the default port
+          number for known methods.
+	- The HP-GL/2 filter now looks for "PSwidth,length"
+          instead of (the correct) "PSlength,width" as
+          documented by HP.  It appears that many major CAD
+          applications are broken and this change allows the
+          auto-rotation to work with them.
+	- The IPP "printer-resolution" option was not being
+          translated.
+	- The charset files did not include the Microsoft
+          "standard" characters from 128 to 159 (unused by the
+          ISO-8859-x charsets)
+	- The scheduler was chunking the Content-Type field from
+          CGI programs; this problem was most noticeable with
+          Microsoft Internet Explorer 5.
+	- By popular demand, the printers, jobs, and classes
+          CGIs no longer force a reload of the page every 10/30
+          seconds.
+	- The scheduler incorrectly required that the IPP client
+          provide a document-format attribute for the
+          validate-job operation.
+	- Clients that sent bad IPP requests without the
+          required attributes-natural-language and
+          attributes-charset attributes would crash the
+          scheduler.
+
+
+CHANGES IN CUPS v1.0.4
+
+	- Documentation updates.
+	- Jobs would get stuck in the queue and wouldn't print
+	  until you enabled the queue.
+	- The lp and lpr commands now catch SIGHUP and SIGINTR.
+	- The lp and lpr commands now use sigaction or sigset
+	  when available.
+	- CUPS library updates for WIN32/OS-2
+
+
+CHANGES IN CUPS v1.0.3
+
+	- Documentation updates.
+	- The lpq man page was missing.
+	- The configure script was not properly detecting the
+	  image libraries.
+	- The top-level makefile was calling "make" instead of
+	  "$(MAKE)".
+	- PostScript filter fixes for number-up, OutputOrder,
+	  and %Trailer.
+	- The imagetops filter didn't end the base-85 encoding
+	  properly if the image data was not a multiple of 4
+	  bytes in length.
+	- The imagetoraster filter didn't generate good banded
+	  RGB or CMY data (was dividing the line width by 4
+	  instead of 3...)
+	- The imagetoraster filter now records the bounding
+	  box of the image on the page.
+	- The CUPS image library cache code wasn't working as
+	  designed; images larger than the maximum RIP cache
+	  would eventually thrash using the same cache tile.
+	- The CUPS image library TIFF loading code didn't
+	  handle unknown resolution units properly; the fixed
+	  code uses a default resolution of 128 PPI.
+	- cupsGetClasses() and cupsGetPrinters() did not free
+	  existing strings if they ran out of memory.
+	- The scheduler logs incorrectly contained 3 digits for
+	  the timezone offset instead of 4.
+	- The scheduler now does a lookup for the default user
+	  and group ID; the previous hardcoded values caused
+	  problems with the LPD backend.
+	- The cancel-job operation now allows any user in the
+	  system group to cancel any job.
+	- The cancel-job operation stopped the print queue if
+	  the job was being printed.
+	- Now only stop printers if the backend fails. If the
+	  filter fails then the failure is noted in the
+	  error_log and printing continues with the next file in
+	  the queue.
+	- Now log whether a filter fails because of a signal
+	  or because it returned a non-zero exit status.
+	- The root user now always passes the system group test.
+	- Printers with an interface script and remote printers
+	  and classes didn't have a printer-make-and-model
+	  attribute.
+	- Added logging of lost/timed-out remote printers.
+	- The HP-GL/2 filter was scaling the pen width twice.
+	- Updated the HP-GL/2 filter to use a single SP (Set
+	  Pen) procedure.  This makes the output smaller and is
+	  more appropriate since the filter keeps track of the
+	  pen states already.
+	- The scheduler didn't handle passwords with spaces.
+	- The IPP backend now does multiple copies and retries
+	  if the destination server requires it (e.g. HP
+	  JetDirect.)
+	- The disable command didn't implement the "-c" option
+	  (cancel all jobs.)
+	- Changed the CMYK generation function for the image file
+	  and PostScript RIPs.
+	- The lp command didn't support the "-h" option as
+	  documented.
+	- The AppSocket, IPP, and LPD backends now retry on all
+	  network errors.  This should prevent stopped queues
+	  caused by a printer being disconnected from the
+	  network or powered off.
+	- The scheduler now restarts a job if the corresponding
+	  printer is modified.
+	- The image RIPs now rotate the image if needed to fit
+	  on the page.
+
+
+CHANGES IN CUPS v1.0.2
+
+	- The HP-GL/2 filter didn't always scale the output
+	  correctly.
+	- The HP-GL/2 filter now supports changing the page size
+	  automatically when the "fitplot" option is not used.
+	- The cancel-job operation was expecting a resource name
+	  of the form "/job/#" instead of "/jobs/#"; this
+	  prevented the cancel and lprm commands from working.
+	- The backends didn't log pages when files were printed
+	  using the "-oraw" option.
+	- The authorization code did not work with the Slackware
+	  long shadow password package because its crypt() can
+	  return NULL.
+	- The chunking code didn't work for reading the response
+	  of a POST request.
+	- cupsGetPPD() now does authentication as needed.
+	- The N-up code in the PostScript filter didn't work
+	  with some printers (grestoreall would restore the
+	  default blank page and device settings).
+	- The N-up code in the PostScript filter didn't scale
+	  the pages to fit within the imageable area of the
+	  page.
+	- Wasn't doing an fchown() on the request files.  This
+	  caused problems when the default root account group
+	  and CUPS group were not the same.
+
+
+CHANGES IN CUPS v1.0.1
+
+	- Documentation updates.
+	- Fixed a bunch of possible buffer-overflow conditions.
+	- The scheduler now supports authentication using PAM.
+	- Updated the Italian message file.
+	- httpEncode64() didn't add an extra "=" if there was
+	  only one byte in the last three-byte group.
+	- Now drop any trailing character set from the locale
+	  string (e.g. "en_US.ISO_8859-1" becomes "en_US")
+	- Fixed "timezone" vs "tm_gmtoff" usage for BSD-based
+	  operating systems.
+	- Updated IPP security so that "get" operations can be
+	  done from any resource name; this allows the CGIs to
+	  work with printer authentication enabled so long as
+	  authentication isn't turned on for the whole "site".
+	- The IPP code didn't properly handle the "unsupported"
+	  group; this caused problems with the HP JetDirect since
+	  it doesn't seem to support the "copies" attribute.
+	- The HTTP chunking code was missing a CR LF pair at the
+	  end of a 0-length chunk.
+	- The httpSeparate() function didn't handle embedded
+	  usernames and passwords in the URI properly.
+	- Doing "lpadmin -p printer -E" didn't restart printing
+	  if there were pending jobs.
+	- The cancel-job operation now requires either a
+	  requesting-user-name attribute or an authenticated
+	  username.
+	- The add-printer code did not report errors if the
+	  interface script or PPD file could not be renamed.
+	- Request files are now created without world read
+	  permissions.
+	- Added a cupsLastError() function to the CUPS API to
+	  retrieve the IPP error code from the last request.
+	- Options are now case-insensitive.
+	- The lpq command now provides 10 characters for the
+	  username instead of the original (Berkeley standard)
+	  7.
+	- The cancel command needed a local CUPS server to work
+	  (or the appropriate ServerName in cupsd.conf)
+	- The cancel and lprm commands didn't report the IPP
+	  error if the job could not be cancelled.
+	- The lp and lpr commands didn't intercept SIGTERM to
+	  remove temporary files when printing from stdin.
+	- The lp and lpr commands didn't report the IPP error if
+	  the job could not be printed.
@@ -0,0 +1,856 @@
+CHANGES-1.3.txt
+---------------
+
+CHANGES IN CUPS V1.3.11
+
+	- The scheduler did not prevent nested classes (STR #3211)
+	- The scheduler did not reprint processing jobs that were moved to
+	  another destination (STR #3222)
+	- The scheduler did not reset the current job file when stopping a
+	  printer (STR #3226)
+	- The scheduler did not handle POSTs to custom CGIs properly (STR #3221)
+	- The pdftops filter did not print landscape PDF pages properly
+	  (STR #2881)
+	- The scheduler did not handle partial header lines properly from CGI
+	  programs (STR #3194)
+	- The web interface could hang on OpenBSD (STR #3176, STR #3196)
+	- The scheduler and cupsfilter utility did not handle rules starting
+	  with a negation operator properly (STR #3160)
+	- The scheduler and cupsfilter utility would crash with certain MIME
+	  .types rules (STR #3159)
+	- httpSetField wasn't bracketing IPv6 numeric addresses for the Host:
+	  field (STR #3164)
+	- The ServerName, if specified, was not treated as a valid alias for the
+	  local system (STR #3167)
+	- "make epm" did not work (STR #3166)
+	- "lpstat -h server" showed non-shared printers (STR #3147)
+	- "make check" did not work on Linux (STR #3161)
+
+
+CHANGES IN CUPS V1.3.10
+
+	- Documentation fixes (STR #2994, STR #2995, STR #3008, STR #3056,
+	  STR #3057)
+	- SECURITY: The scheduler now protects against DNS rebinding attacks
+	  (STR #3118)
+	- SECURITY: Fixed TIFF integer overflow in image filters (STR #3031)
+	- The scheduler did not support the job-hold-until attribute with the
+	  Restart-Job operation (STR #3130)
+	- SECURITY: The PNG image reading code did not validate the
+	  image size properly, leading to a potential buffer overflow
+	  (STR #2974)
+	- The rastertohp driver did not set the 1-sided printing mode when
+	  needed (STR #3131)
+	- Now use a wrapper program instead of our fork of the Xpdf code to
+	  support printing of PDF files. The new wrapper supports using Xpdf,
+	  poppler, or Ghostscript to convert PDF files to PostScript (STR #3129)
+	- Long job names caused problems with some PJL printers (STR #3125)
+	- The lpq command did not work when showing all destinations (STR #3117)
+	- The scheduler used a codeset name of UTF8 which is not supported on
+	  Solaris (STR #3113)
+	- cupsGetJobs() did not work with a NULL destination (STR #3107)
+	- Fixed a localization problem for option choices (incorrectly) named
+	  "Custom" (STR #3106)
+	- The fallback OpenSSL random number seeding would not work (STR #3079)
+	- The scheduler might miss a child signal, causing high CPU usage.
+	- The scheduler did not enforce quotas after the job history was
+	  unloaded (STR #3078)
+	- The job-k-limit, job-page-limit, and job-quota-period attributes
+	  could not be set using the lpadmin command (STR #3077)
+	- httpSeparateURI() did not error out on URIs with a missing port
+	  number after a colon.
+	- Fixed a Valgrind-detected initialization error when creating a
+	  missing directory on startup.
+	- The scheduler did not always read all of the HTTP headers from a
+	  CGI script/program.
+        - The scheduler did not always set the "air" property in Bonjour/DNS-SD
+          registrations.
+	- The scheduler incorrectly compared Mac OS X UUIDs for access
+	  control, preventing access in certain configurations.
+        - The IPP backend incorrectly reset the required authentication
+	  to Kerberos when authentication failed.
+	- The scheduler no longer looks up the local hostname by default;
+	  turn on hostname lookups to restore the previous behavior.
+	- The scheduler did not always load MIME type rules correctly
+	  (STR #3059)
+	- The test page did not format correctly on A4 paper (STR #3060)
+	- The web interface sometimes incorrectly redirected users to
+	  127.0.0.1 (STR #3022)
+	- cupsPrintFile*() did not send the document filename for single
+	  file submissions (STR #3055)
+	- The scheduler did not update the member-names attribute when
+	  removing the last printer from a class.
+	- The scheduler did not report PPD Products with parenthesis
+	  in them properly (STR #3046)
+	- The wrong italic fonts were listed in the UTF-8 charset file
+	  for the text filter.
+	- The backends did not return an OK status for the
+	  CUPS_SC_CMD_GET_BIDI side-channel command (STR #3029)
+	- The scheduler did not purge jobs that were missing a
+	  time-at-creation attribute, indicating a bad job control file
+	  (STR #3030)
+	- The "-o job-hold-until=week-end" option did not work properly
+	  (STR #3025)
+	- The Solaris USB printer device does not support select or poll
+	  (STR #3028)
+	- The scheduler would crash if you exceeded the MaxSubscriptions
+	  limit.
+	- The lp "-H immediate" option did not specify that the job
+	  should not be held (STR #3013)
+	- The scheduler did not support the "Connection: close"
+	  HTTP header (STR #3010)
+	- The mailto notifier didn't terminate messages properly
+	  (STR #3011)
+	- Backends could spin trying to read back-channel data
+	  (STR #3001)
+	- The HP-GL/2 filter was using the wrong default colors
+	  (STR #2966)
+	- The scheduler incorrectly allowed Get-Jobs operations without a
+	  printer-uri (STR #2996)
+	- The compression option was not being encoded properly
+	  (STR #2997)
+	- Added a missing character map for JIS-X0213/ShiftJIS.
+	- The scheduler now rejects ATTR: messages with empty values.
+	- The scheduler could consume all CPU handling closed connections
+	  (STR #2988)
+	- Fixed some configure script bugs with rc/xinetd directories
+	  (STR #2970)
+	- The Epson sample driver PPDs contained errors (STR #2979)
+
+
+CHANGES IN CUPS V1.3.9
+
+	- SECURITY: The HP-GL/2 filter did not range check pen numbers
+	  (STR #2911)
+	- SECURITY: The SGI image file reader did not range check
+	  16-bit run lengths (STR #2918)
+	- SECURITY: The text filter did not range check cpi, lpi, or
+	  column values (STR #2919)
+	- Documentation updates (STR #2904, STR #2944)
+	- The French web admin page was never updated (STR #2963)
+	- The IPP backend did not retry print jobs when the printer
+	  reported itself as busy or unavailable (STR #2951)
+	- The "Set Allowed Users" web interface did not handle trailing
+	  whitespace correctly (STR #2956)
+	- The PostScript filter did not work with Adobe applications
+	  using custom page sizes (STR #2968)
+	- The Mac OS X USB backend did not work with some printers
+	  that reported a bad 1284 device ID.
+	- The scheduler incorrectly resolved the client connection
+	  address when HostNameLookups was set to Off (STR #2946)
+	- The IPP backend incorrectly stopped the local queue if
+	  the remote server reported the "paused" state.
+	- The cupsGetDests() function did not catch all types of
+	  request errors.
+	- The scheduler did not always log "job queued" messages
+	  (STR #2943)
+	- The scheduler did not support destination filtering using
+	  the printer-location attribute properly (STR #2945)
+	- The scheduler did not send the server-started,
+	  server-restarted, or server-stopped events (STR #2927)
+	- The scheduler no longer enforces configuration file
+	  permissions on symlinked files (STR #2937)
+	- CUPS now reinitializes the DNS resolver on failures
+	  (STR #2920)
+	- The CUPS desktop menu item was broken (STR #2924)
+	- The PPD parser was too strict about missing keyword
+	  values in "relaxed" mode.
+	- The PostScript filter incorrectly mirrored landscape
+	  documents.
+	- The scheduler did not correctly update the
+	  auth-info-required value(s) if the AuthType was Default.
+	- The scheduler required Kerberos authentication for
+	  all operations on remote Kerberized printers instead
+	  of just for the operations that needed it.
+	- The socket backend could wait indefinitely for back-
+	  channel data with some devices.
+	- PJL panel messages were not reset correctly on older
+	  printers (STR #2909)
+	- cupsfilter used the wrong default path (STR #2908)
+	- Fixed address matching for "BrowseAddress @IF(name)"
+	  (STR #2910)
+	- Fixed compiles on AIX.
+	- Firefox 3 did not work with the CUPS web interface in SSL
+	  mode (STR #2892)
+	- Custom options with multiple parameters were not emitted
+	  correctly.
+	- Refined the cupstestppd utility.
+	- ppdEmit*() did not support custom JCL options (STR #2889)
+	- The cupstestppd utility incorrectly reported missing
+	  "en" base translations (STR #2887)
+
+
+CHANGES IN CUPS V1.3.8
+
+	- Documentation updates (STR #2785, STR #2861, STR #2862)
+	- The scheduler did not add the ending job sheet when the
+	  job was released.
+	- The IPP backend did not relay marker-* attributes.
+	- The CUPS GNOME/KDE menu item was not localized for
+	  Chinese (STR #2880)
+	- The CUPS GNOME/KDE menu item was not localized for
+	  Japanese (STR #2876)
+	- The cupstestppd utility reported mixed line endings for
+	  Mac OS and Windows PPD files (STR #2874)
+	- The pdftops filter did not print landscape orientation PDF
+	  pages correctly on all printers (STR #2850)
+	- The scheduler did not handle expiring of implicit classes
+	  or their members properly, leading to a configuration where
+	  one of the members would have a short name (STR #2766)
+	- The scheduler and cupstestppd utilities did not support
+	  cupsFilter and cupsPreFilter programs with spaces in their
+	  names (STR #2866)
+	- Removed unused variables and assignments found by the
+	  LLVM "clang" tool.
+	- Added NULL checks recommended by the LLVM "clang" tool.
+	- The scheduler would crash if you started a printer that
+	  pointed to a backend that did not exist (STR #2865)
+	- The ppdLocalize functions incorrectly mapped all generic
+	  locales to country-specific locales.
+	- The cups-driverd program did not support Simplified Chinese
+	  or Traditional Chinese language version strings (STR #2851)
+	- Added an Indonesian translation (STR #2792)
+	- Fixed a timing issue in the backends that could cause data
+	  corruption with the CUPS_SC_CMD_DRAIN_OUTPUT side-channel
+	  command (STR #2858)
+	- The scheduler did not support "HostNameLookups" with all of
+	  the boolean names (STR #2861)
+	- Fixed a compile problem with glibc 2.8 (STR #2860)
+	- The scheduler incorrectly filtered out queues with ACLs and
+	  authentication.
+	- The PostScript filter did not support %%IncludeFeature lines
+	  in the page setup section of each page (STR #2831)
+	- The scheduler did not generate printer-state events when the
+	  default printer was changed (STR #2764)
+	- cupstestppd incorrectly reported a warning about the PPD format
+	  version in some locales (STR #2854)
+	- cupsGetPPD() and friends incorrectly returned a PPD file for
+	  a class with no printers.
+	- The member-uris values for local printers in a class returned
+	  by the scheduler did not reflect the connected hostname or
+	  port.
+	- The CUPS PHP extension was not thread-safe (STR #2828)
+	- The scheduler incorrectly added the document-format-default
+	  attribute to the list of "common" printer attributes, which
+	  over time would slow down the printing system (STR #2755,
+	  STR #2836)
+	- The cups-deviced and cups-driverd helper programs did not set
+	  the CFProcessPath environment variable on Mac OS X (STR #2837)
+	- "lpstat -p" could report the wrong job as printing (STR #2845)
+	- The scheduler would crash when some cupsd.conf directives
+	  were missing values (STR #2849)
+	- The web interface "move jobs" operation redirected users to
+	  the wrong URL (STR #2815)
+	- The Polish web interface translation contained errors
+	  (STR #2815)
+	- The scheduler did not report PostScript printer PPDs with
+	  filters as PostScript devices.
+	- The scheduler did not set the job document-format attribute
+	  for jobs submitted using Create-Job and Send-Document.
+	- cupsFileTell() did not work for log files opened in append
+	  mode (STR #2810)
+	- The scheduler did not set QUERY_STRING all of the time
+	  for CGI scripts (STR #2781, STR #2816)
+	- The scheduler now returns an error for bad job-sheets
+	  values (STR #2775)
+	- Authenticated remote printing did not work over domain
+	  sockets (STR #2750)
+	- The scheduler incorrectly logged errors for print filters
+	  when a job was canceled (STR #2806, #2808)
+	- The scheduler no longer allows multiple RSS subscriptions
+	  with the same URI (STR #2789)
+	- The scheduler now supports Kerberized printing with
+	  multiple server names (STR #2783)
+	- "Satisfy any" did not work in IPP policies (STR #2782)
+	- The CUPS imaging library would crash with very large
+	  images - more than 16Mx16M pixels (STR #2805)
+	- The PNG image loading code would crash with large images
+	  (STR #2790)
+	- The scheduler did not limit the total number of filters.
+	- The scheduler now ensures that the RSS directory has
+	  the correct permissions.
+	- The RSS notifier did not quote the feed URL in the RSS
+	  file it created (STR #2801)
+	- The web interface allowed the creation and cancellation
+	  of RSS subscriptions without a username (STR #2774)
+	- Increased the default MaxCopies value on Mac OS X to
+	  9999 to match the limit imposed by the print dialog.
+	- The scheduler did not reject requests with an empty
+	  Content-Length field (STR #2787)
+	- The scheduler did not log the current date and time and
+	  did not escape special characters in request URIs when
+	  logging bad requests to the access_log file (STR #2788)
+
+
+CHANGES IN CUPS V1.3.7
+
+	- CVE-2008-0047: cgiCompileSearch buffer overflow (STR #2729)
+	- CVE-2008-1373: CUPS GIF image filter overflow (STR #2765)
+	- Updated the "make check" tests to do a more thorough
+	  automated test.
+	- cups-driverd complained about missing directories (STR
+	  #2777)
+	- cupsaddsmb would leave the Samba username and password on
+	  disk if no Windows drivers were installed (STR #2779)
+	- The Linux USB backend used 100% CPU when a printer was
+	  disconnected (STR #2769)
+	- The sample raster drivers did not properly handle SIGTERM
+	  (STR #2770)
+	- The scheduler sent notify_post() messages too often on
+	  Mac OS X.
+	- Kerberos access to the web interface did not work
+	  (STR #2748)
+	- The scheduler did not support "AuthType Default" in IPP
+	  policies (STR #2749)
+	- The scheduler did not support the "HideImplicitMembers"
+	  directive as documented (STR #2760)
+	- "make check" didn't return a non-zero exit code on
+	  error (STR #2758)
+	- The scheduler incorrectly logged AUTH_foo environment
+	  variables in debug mode (STR #2751)
+	- The image filters inverted PBM files (STR #2746)
+	- cupsctl would crash if the scheduler was not running
+	  (STR #2741)
+	- The scheduler could crash when printing using a port
+	  monitor (STR #2742)
+	- The scheduler would crash if PAM was broken (STR #2734)
+	- The image filters did not work with some CMYK JPEG files
+	  produced by Adobe applications (STR #2727)
+	- The Mac OS X USB backend did not work with printers that
+	  did not report a make or model.
+	- The job-sheets option was not encoded properly (STR #2715)
+	- The scheduler incorrectly complained about missing LSB
+	  PPD directories.
+
+
+CHANGES IN CUPS V1.3.6
+
+	- Documentation updates (STR #2646, STR #2647, STR #2649)
+	- Fixed a problem with the web interface "Use Kerberos
+	  Authentication" check box (STR #2703)
+	- The scheduler unconditionally overwrote the printer-state-
+	  message with "process-name failed" when a filter or backend
+	  failed, preventing a useful error message from being shown
+	  to the user.
+	- Policies on CUPS-Move-Job didn't work as expected (STR
+	  #2699)
+	- The configure script only supported D-BUS on Linux
+	  (STR #2702)
+	- The scheduler did not support </LimitExcept> (STR #2701)
+	- The scheduler did not reset the job-hold-until attribute
+	  after a job's hold time was reached.
+	- The scheduler did not support printer supply attributes
+	  (STR #1307)
+	- The Kerberos credentials provided by some Windows KDCs
+	  were still too large - now use a dynamic buffer to
+	  support credentials up to 64k in size (STR #2695)
+	- Printing a test page from the web interface incorrectly
+	  defaulted to the "guest" user (STR #2688)
+	- The cupsEncodeOptions2() function did not parse multiple-
+	  value attribute values properly (STR #2690)
+	- The scheduler incorrectly sent printer-stopped events for
+	  status updates from the print filters (STR #2680)
+	- The IPP backend could crash when handling printer errors
+	  (STR #2667)
+	- Multi-file jobs did not print to remote CUPS servers
+	  (STR #2673)
+	- The scheduler did not provide the Apple language ID to
+	  job filters.
+	- Kerberos authentication did not work with the web
+	  interface (STR #2606, STR #2669)
+	- The requesing-user-name-allowed and -denied functionality
+	  did not work for Kerberos-authenticated usernames (STR
+	  #2670)
+	- CUPS didn't compile on HP-UX 11i (STR #2679)
+	- cupsEncodeOptions2() did not handle option values like
+	  "What's up, doc?" properly.
+	- Added lots of memory allocation checks (Fortify)
+	- The scheduler would crash if it was unable to add a job
+	  file (Fortify)
+	- ppdOpen*() did not check all memory allocations (Coverity)
+	- ippReadIO() did not check all memory allocations (Coverity)
+	- The PostScript filter did not detect read errors (Coverity)
+	- The scheduler did not check for a missing job-sheets-completed
+	  attribute when sending an event notification (Coverity)
+	- "Set Printer Options" might not work with raw queues (Coverity)
+	- cupsRasterInterpretPPD() could crash on certain PostScript
+	  errors (Coverity)
+	- The USB backend did not check for back-channel support
+	  properly on all systems (Coverity)
+	- Fixed memory leaks in the GIF and PNM image loading code
+	  (Coverity)
+	- Removed some dead code in the CUPS API and scheduler (Coverity)
+	- Fixed two overflow bugs in the HP-GL/2 filter (Coverity)
+	- Fixed another ASN1 string parsing bug (STR #2665)
+	- The RSS notifier directory was not installed with the
+	  correct permissions.
+	- The standard CUPS backends could use 100% CPU while waiting
+	  for print data (STR #2664)
+	- Filename-based MIME rules did not work (STR #2659)
+	- The cups-polld program did not exit if the scheduler crashed
+	  (STR #2640)
+	- The scheduler would crash if you tried to set the port-monitor
+	  on a raw queue (STR #2639)
+	- The scheduler could crash if a polled remote printer was
+	  converted to a class (STR #2656)
+	- The web interface and cupsctl did not correctly reflect
+	  the "allow printing from the Internet" state (STR #2650)
+	- The scheduler incorrectly treated MIME types as case-
+	  sensitive (STR #2657)
+	- The Java support classes did not send UTF-8 strings to
+	  the scheduler (STR #2651)
+	- The CGI code did not handle interrupted POST requests
+	  properly (STR #2652)
+	- The PostScript filter incorrectly handled number-up when
+	  the number of pages was evenly divisible by the number-up
+	  value.
+	- The PDF filter incorrectly filtered pages when page-ranges
+	  and number-up were both specified (STR #2643)
+	- The IPP backend did not handle printing of pictwps files
+	  to a non-Mac CUPS server properly.
+	- The scheduler did not detect network interface changes
+	  on operating systems other than Mac OS X (STR #2631)
+	- The scheduler now logs the UNIX error message when it
+	  is unable to create a request file such as a print job.
+	- Added support for --enable-pie on Mac OS X.
+
+
+CHANGES IN CUPS V1.3.5
+
+	- The SNMP backend did not check for negative string
+	  lengths (STR #2589)
+	- The scheduler incorrectly removed auth-info attributes,
+	  potentially leading to a loss of all options for a job.
+	- The scheduler stopped sending CUPS browse packets on a
+	  restart when using fixed addresses (STR #2618)
+	- Fixed PDF filter security issues (CVE-2007-4352
+	  CVE-2007-5392 CVE-2007-5393)
+	- Changing settings would always change the DefaultAuthType
+	  and Allow lines (STR #2580)
+	- The scheduler would crash when submitting an undefined
+	  format file from Samba with LogLevel debug2 (STR #2600)
+	- The scheduler did not use poll() when epoll() was not
+	  supported by the running kernel (STR #2582)
+	- Fixed a compile problem with Heimdal Kerberos (STR #2592)
+	- The USB backend now retries connections to a printer
+	  indefinitely rather than stopping the queue.
+	- Printers with untranslated JCL options were not exported
+	  to Samba correctly (STR #2570)
+	- The USB backend did not work with some Minolta USB
+	  printers (STR #2604)
+	- The strcasecmp() emulation code did not compile (STR
+	  #2612)
+	- The scheduler would crash if a job was sent to an empty
+	  class (STR #2605)
+	- The lpc command did not work in non-UTF-8 locales (STR
+	  #2595)
+	- Subscriptions for printer-stopped events also received
+	  other state changes (STR #2572)
+	- cupstestppd incorrectly reported translation errors for
+	  the "en" locale.
+	- ppdOpen() did not handle custom options properly when the
+	  Custom attribute appeared before the OpenUI for that
+	  option.
+	- The scheduler could crash when deleting a printer or
+	  listing old jobs.
+	- The Mac OS X USB backend did not allow for requeuing of
+	  jobs submitted to a class.
+	- lpmove didn't accept a job ID by itself.
+	- The scheduler incorrectly removed job history information
+	  for remote print jobs.
+	- The scheduler incorrectly sent the
+	  "com.apple.printerListChanged" message for printer state
+	  changes.
+	- The PostScript filter drew the page borders (when enabled)
+	  outside the imageable area.
+	- The LPD and IPP backends did not default to the correct
+	  port numbers when using alternate scheme names.
+	- The scheduler incorrectly deleted hardwired remote
+	  printers on system sleep.
+	- The scheduler would abort if a bad browse protocol name
+	  was listed in the cupsd.conf file.
+	- The online cupsd.conf help file incorrectly showed
+	  "dns-sd" instead of "dnssd" for Bonjour sharing.
+	- The scheduler could crash changing the port-monitor value.
+	- The scheduler generated CoreFoundation errors when run as
+	  a background process.
+	- When printing with number-up > 1, it was possible to get
+	  an extra blank page.
+
+
+CHANGES IN CUPS V1.3.4
+
+	- Documentation updates (STR #2560, STR #2563, STR #2569)
+	- CUPS now maps the "nb" locale to "no" on all platforms
+	  (STR #2575)
+	- CUPS did not work with a Windows 2003 R2 KDC (STR #2568)
+	- ippReadIO() could read past the end of a buffer (STR
+	  #2561)
+	- The scheduler would crash on shutdown if it was unable
+	  to create a Kerberos context.
+	- Multiple AuthTypes in cupsd.conf did not work (STR
+	  #2545)
+	- The snmp.conf file referenced the wrong man page (STR
+	  #2564)
+	- The cupsaddsmb program didn't handle domain sockets
+	  properly (STR #2556)
+	- The scheduler now validates device URIs when adding
+	  printers.
+	- Updated httpSeparateURI() to support hostnames with
+	  the backslash character.
+	- Updated the Japanese localization (STR #2546)
+	- The parallel backend now gets the current IEEE-1284
+	  device ID string on Linux (STR #2553)
+	- The IPP backend now checks the job status at
+	  variable intervals (from 1 to 10 seconds) instead
+	  of every 10 seconds for faster remote printing
+	  (STR #2548)
+	- "lpr -p" and "lpr -l" did not work (STR #2544)
+	- Compilation failed when a previous version of CUPS
+	  was installed and was included in the SSL include
+	  path (STR #2538)
+	- The scheduler did not reject requests with charsets
+	  other than US-ASCII or UTF-8, and the CUPS API
+	  incorrectly passed the locale charset to the scheduler
+	  instead of UTF-8 (STR #2537)
+	- cups-deviced did not filter out duplicate devices.
+	- The AppleTalk backend incorrectly added a scheme
+	  listing when AppleTalk was disabled or no printers
+	  were found.
+	- The PostScript filter generated N^2 copies when the
+	  printer supported collated copies and user requested
+	  reverse-order output.
+	- The scheduler did not reprint all of the files in a
+	  job that was held.
+	- The scheduler did not update the printcap file after
+	  removing stale remote queues.
+	- The cupsd.conf man page incorrectly referenced
+	  "AuthType Kerberos" instead of "AuthType Negotiate".
+
+
+CHANGES IN CUPS V1.3.3
+
+	- The scheduler did not use the attributes-natural-language
+	  attribute when passing the LANG environment variable to
+	  cups-deviced or cups-driverd.
+	- The scheduler did not use the printer-op-policy when
+	  modifying classes or printers (STR #2525)
+	- The auth-info-required attribute was not always updated
+	  for remote queues that required authentication.
+	- The German web interface localization contained errors
+	  (STR #2523)
+	- The Swedish localization contained errors (STR #2522)
+
+
+CHANGES IN CUPS V1.3.2
+
+	- The 1.3.1 release was incorrectly created from the
+	  1.4.x source tree (STR #2519)
+	- Added support for 32/64-bit libraries on HP-UX
+	  (STR #2520)
+	- The scheduler incorrectly used portrait as the default
+	  orientation (STR #2513)
+	- The scheduler no longer writes the printcap file for
+	  every remote printer update (STR #2512)
+	- Remote raw printing with multiple copies did not work
+	  (STR #2518)
+	- Updated the configure script to require at least autoconf
+	  2.60 (STR #2515)
+	- Some gzip'd PPD files were not read in their entirety
+	  (STR #2510)
+
+
+CHANGES IN CUPS V1.3.1
+
+	- Documentation updates.
+	- The USB backend on Mac OS X could hang if the driver and
+          printer did not match.
+	- Delegated Kerberos credentials were not working.
+	- "make distclean" incorrectly removed the edit-config.tmpl
+	  files (STR #2508)
+	- Fix compile problem on HP-UX (STR #2501)
+	- The cupstestppd utility now tests for resolutions greater
+	  than 99999 DPI to detect a missing  "x" between the X and Y
+	  resolutions.
+	- Fixed many problems in the various translations and added
+	  a new "checkpo" utility to validate them.
+	- The cupstestppd utility now tests the custom page size code
+	  for CUPS raster drivers.
+	- cupsLangDefault() did not attempt to return a language that
+	  was supported by the calling application.
+	- If a remote printer stopped while a job was being sent, the
+	  local queue would also get stopped and the job re-queued,
+	  resulting in duplicate prints in some cases.
+	- A few Apple-specific job options needed to be omitted when
+	  printing a banner page.
+	- The new peer credential support did not compile on FreeBSD
+	  (STR #2495)
+	- Direct links to help files did not set the current section
+	  so the table-of-contents was not shown.
+	- The configure script did not support --localedir=foo (STR #2488)
+	- The backends were not displaying their localized messages.
+	- CUPS-Authenticate-Job did not require Kerberos authentication
+	  on queues protected by Kerberos.
+	- The Zebra ZPL driver did not work with Brady label printers
+	  (STR #2487)
+	- Norwegian wasn't localized on Mac OS X.
+	- getnameinfo() returns an error on some systems when DNS is
+	  not available, leading to numerous problems (STR #2486)
+	- The cupsfilter command did not work properly on Mac OS X.
+	- The scheduler makefile contained a typo (STR #2483)
+	- The TBCP and BCP port monitors did not handle the trailing
+	  CTRL-D in some PostScript output properly.
+	- Fixed the localization instructions and German template for
+	  the "Find New Printers" button (STR #2478)
+	- The web interface did not work with the Chinese localization
+	  (STR #2477)
+	- The web interface home page did not work for languages that
+	  were only partially localized (STR #2472)
+	- Updated the Spanish web interface localization (STR #2473)
+	- ppdLocalize() did not work for country-specific localizations.
+
+
+CHANGES IN CUPS V1.3.0
+
+	- The scheduler did not handle out-of-file conditions
+	  gracefully when accepting new connections, leading to
+	  heavy CPU usage.
+	- The scheduler did not detect ServerBin misconfigurations
+	  (STR #2470)
+	- "AuthType Default" did not work as expected when the
+	  "DefaultAuthType foo" line appeared after it in the
+	  cupsd.conf file.
+	- The on-line help did not describe many common printing
+	  options (STR #1846)
+	- The IPP backend did not return the "auth required" status
+	  when printing to a Kerberos-protected queue.
+	- The scheduler was not looking in the correct directories
+	  for LSB PPD files (STR #2464)
+	- Changed references to ESP Ghostscript to GPL Ghostscript
+	  (STR #2463)
+	- The PostScript filter did not cleanly terminate when
+	  the job was canceled or stopped.
+	- Fixed generation of Kerberos credentials for remote
+	  printing.  Note that this requires a recent version of
+	  MIT Kerberos with a working krb5_cc_new_unique()
+	  function or Heimdal Kerberos.
+	- Added Portuguese and updated Italian message catalogs.
+
+
+CHANGES IN CUPS V1.3rc2
+
+	- Added more range checking to the pdftops filter. 
+	- The scheduler would crash if a remote IPP queue was stopped
+	  (STR #2460)
+	- The scheduler did not allow "DefaultAuthType None".
+
+
+CHANGES IN CUPS V1.3rc1
+
+	- Updated the German localization (STR #2443)
+	- cupsAdminGetServerSettings() did not handle </Foo> properly.
+	- When lprm and cancel are run with no job ID, they now will
+	  cancel the first stopped job if no pending or processing
+	  jobs are left in the queue.
+	- The scheduler now logs successful print jobs, filter
+	  failures, and the job file types at the default log
+	  level (STR #2458)
+	- The scheduler now logs the usernames it is using for
+	  authorization at LogLevel debug instead of debug2 (STR #2448)
+	- Added Intellitech Intellibar and Zebra CPCL PPDs to the list
+	  of installed PPDs.
+	- Added 6" and 8" wide label sizes for the Zebra ZPL Label
+	  Printer driver (STR #2442)
+	- The cupsaddsmb program and web interface now support
+	  exporting of 64-bit Windows drivers, when available
+	  (STR #2439)
+	- Moving a job that was printing did not stop the job on the
+	  original printer (STR #2262)
+	- The cups-lpd mini-daemon did not work on Mac OS X server.
+	- Added httpGetAuthString() and httpSetAuthString() APIs to get
+	  and set the current (cached) authorization string to use for
+	  HTTP requests.
+	- Updated the default cupsd.conf policy to list the
+	  "administrative" operations separately from the "printer
+	  control" operations so that it is easier to define a
+	  group of users that are "printer operators".
+	- The web interface now pulls the default cupsd.conf file
+	  from cupsd.conf.default in the CUPS config directory.
+	- Added a help file for using Kerberos with CUPS.
+	- The scheduler now strips the "@KDC" portion of Kerberos
+	  usernames since those usernames typically do not appear in
+	  the group membership lists used by CUPS.
+	- cupsMarkOptions() could (incorrectly) leave multiple option
+	  choices marked.
+	- Backends could (incorrectly) run as root during discovery
+	  (STR #2454)
+	- Avahi is now supported for DNS-SD (Bonjour) printer sharing
+	  (STR #2455)
+	- The default cupsd.conf file had typos and old operation names
+	  (STR #2450)
+	- The scheduler now erases authentication cache files using the
+	  7-pass US DoD algorithm.
+	- Delegated Kerberos credentials (proxy authentication) did not
+	  work.
+	- The filter makefile did not optimize the libcupsimage.2.dylib
+	  with a sectorder file.
+	- The IPP backend incorrectly wrote an empty printer message
+	  when processing the "none" state reason.
+	- The USB backend could deadlock on Mac OS X while performing
+	  a side-channel command.
+	- The scheduler did not prevent remote queues from being
+	  shared/published.
+	- The scheduler did not remove the temporary request file on
+	  authentication errors.
+	- ppdLocalizeIPPReason() did not handle "scheme:" schemes or
+	  "file" URLs.
+	- ppdLocalizeIPPReason() was not exported on Mac OS X.
+
+
+CHANGES IN CUPS V1.3b1
+
+	- Copyright updates - CUPS is now owned by Apple Inc.
+	- Documentation updates (STR #1775, STR #2027, STR #2130,
+	  STR #2131, STR #2263, STR #2356, STR #2397)
+	- Added new cupsfilter utility (STR #1734)
+	- Added new job-printer-state-message and
+	  job-printer-state-reasons attributes to jobs (STR #2418)
+	- Added LDAP+SSL support (STR #1967)
+	- CUPS now supports authentication via peer credentials
+	  over domain sockets (STR #2242, STR #2277)
+	- The CUPS sample driver PPDs are now generated by the PPD
+	  compiler and include all of the localized languages by
+	  default (STR #2164)
+	- You can now specify "AuthType Default" in the cupsd.conf
+	  file to use the default authentication defined by the
+	  DefaultAuthType directive.
+	- The SNMP backend no longer adds a default Address line
+	  when none is specified in the snmp.conf file; this allows
+	  the backend to be easily disabled as needed (STR #2434)
+	- Added a new cupsctl command for doing basic changes to
+	  the cupsd.conf file (STR #1777)
+	- Added a new ppdLocalizeIPPReason() function to get the
+	  localized text/URI for a given IPP reason keyword for a
+	  driver.
+	- Removed the deskjet2.ppd driver, as it only worked with
+	  a very small subset of HP DeskJet printers and was
+	  confusing to users.  The rastertohp driver still
+	  supports the deskjet2.ppd options for existing queues.
+	- The scheduler did not add a trailing banner page if a
+	  client did not specify the last document in a job (STR
+	  #1711)
+	- The scheduler did not report Bonjour shared printers as
+	  remote printers (STR #2384)
+	- Added new -R and -W options to the cupstestppd program
+	  for greater control over the testing of PPDs.
+	- Added a new cupsGetServerPPD() function for getting
+	  an available PPD from the server (STR #2334)
+	- Added a new cupsDoIORequest() function for reading
+	  and writing files via IPP requests (STR #2334)
+	- Added a new CUPS_GET_PPD operation for getting an
+	  available PPD file on the server (STR #2334) 
+	- CUPS_GET_PPDS now reports multiple ppd-product values
+	  based on the PPD ModelName and Product strings (STR
+	  #2334, STR #2383)
+	- CUPS_GET_PPDS now reports the PSVersion attributes
+	  from a PPD file in the ppd-psversion attribute
+	  (STR #2334)
+	- CUPS_GET_PPDS now reports the cupsModelNumber attribute
+	  from a PPD file in the ppd-model-number attribute (STR
+	  #2383)
+	- CUPS_GET_PPDS now reports a driver type string in the
+	  ppd-type attribute based on the cupsFax and cupsFilter
+	  attributes in a PPD file (STR #2383)
+	- Added a new printer attribute called "cups-version"
+	  which reports the version of CUPS that is running
+	  (STR #2240)
+	- backendRunLoop() now aborts immediately on SIGTERM
+	  if no data has been written yet (STR #2103)
+	- Due to poor IPP support from the vendors, the SNMP
+	  backend no longer tries IPP connections; instead,
+	  it now uses a lookup file with fallback to port 9100
+	  (socket://address) and 515 (lpd://address) printing
+	  (STR #2035, STR #2354) 
+	- The scheduler now recreates the CUPS log directory as
+	  needed (STR #2353)
+	- cupsLangDefault() now maps new-style Apple locale names
+	  to the traditional ll_CC form (STR #2357)
+        - Add new cupsArrayNew2() API to support hashed lookups
+          of array elements (STR #2358)
+        - ppdConflicts() optimizations (STR #2358)
+	- The cupstestppd program now tests for existing filters,
+	  icons, profiles, and dialog extensions (STR #2326)
+	- The web interface no longer lists new printers on the
+	  main administration page.  Instead, a new "List Available
+	  Printers" button is provided that shows a separate page
+	  with the list of printers.
+	- The web interface now supports setting the banner and
+	  policy options on raw printers and classes (STR #2238)
+	- The socket backend now reads any pending back-channel
+	  data before shutting down the socket (STR #2325)
+	- Added a new ErrorPolicy directive in the cupsd.conf
+	  file (STR #1871)
+	- Printers that use JCL options are now exported to Samba
+	  correctly (STR #1985)
+	- The IPP backend now relays printer-state-message values
+	  from the server to the client (STR #2109)
+	- Added support for the PWG printer-alert and
+	  printer-alert-description attributes (STR #2088)
+	- Added support for LPD "stream" mode (STR #2036)
+	- The scheduler now reports the PostScript product string
+	  from PPD files in CUPS-Get-PPDs responses (STR #1900)
+	- Raw printing with queues pointing to the file pseudo-
+	  device and multiple files and/or banners now works (STR
+	  #1933)
+	- Added new public cupsAdminGetServerSettings() and
+	  cupsAdminSetServerSettings() APIs.
+	- Added new "makebuttons" script in the "tools" directory
+	  for creating web interface buttons (STR #2231)
+	- Added support for DNS-SD (aka "Bonjour") printer sharing
+	  (STR #1171)
+	- Job operations (cancel, hold, release, etc.) from the
+	  web interface now return back to the original page (STR
+	  #2239)
+	- The classes or printers list is now shown after a
+	  successful deletion from the web interface (STR #1999)
+	- The default configuration now allows browse packets from
+	  any address (STR #2008)
+	- The web interface now provides an "allow printing from the
+	  Internet" check box (STR #1897)
+	- The notify-events-default and
+	  notify-lease-duration-default attributes can now be set
+	  (STR #1671)
+	- Server-side default options are now sent to clients when
+	  the "printer-defaults" attribute group is requested (STR
+	  #1923)
+	- Added support for Linux "relro" linker option (STR #1614)
+	- CUPS now validates the number-up option value (STR #1329)
+	- The on-line help now provides better search capabilities
+	  (STR #1701)
+	- The web interface "Add This Printer" button now allows you
+	  to change the printer name, description,  and location
+	  (STR #1646)
+	- Added support for Mac OS X authorization services
+	  (STR #2206)
+	- Added support for driver-specific pre-filters (STR #2108)
+	- Added a new side-channel API for drivers and backends
+	  for basic device control and information queries (STR
+	  #1898)
+	- The scheduler now uses poll(), epoll(), or /dev/kqueue
+	  instead of select() when possible (STR #1261)
+	- Added new cupsArrayGetIndex() and cupsArrayGetInsert()
+	  functions to get the current index and insertion
+	  positions of an array.
+	- Added a new --with-max-copies configure option (STR
+	  #2090)
+	- Added new cupsRemoveDest() and cupsSetDefaultDest()
+	  functions.
+	- Added support for cupsPJLCharset attribute in PPD files
+	  which specifies the character set that is used in PJL
+	  strings (STR #1969)
+	- Moved the definition of the (private) _http_s structure
+	  to http-private.h; code that directly accesses the
+	  http_t members will no longer compile!
+	- Added support for setting the document-format-default
+	  attribute on a per-printer basis.
+	- Added support for IntelliBar label printers.
@@ -1,33 +1,49 @@
-CREDITS.txt - 04/26/2003
+CREDITS.txt - 2010-03-13
 ------------------------

 Few projects are completed by one person, and CUPS is no exception.  We'd
 like to thank the following individuals for their contributions:

-    Nathaniel Barbour   - Lots of testing and feedback.
-    N. Becker           - setsid().
-    Jean-Eric Cuendet   - GhostScript filters for CUPS.
-    Van Dang            - HTTP and IPP policeman.
-    L. Peter Deutsch    - MD5 code.
-    Dr. ZP Han          - setgid()/setuid().
-    Guy Harris          - *BSD shared libraries and lots of other fixes.
-    Bjoern Jacke        - I18N stuff.
-    Wang Jian           - CUPS RPM corrections.
-    Roderick Johnstone  - Beta tester of the millenium.
-    Till Kamppeter      - Bug fixes, beta testing, evangelism.
-    Kiko                - Bug fixes.
-    Sergey V. Kovalyov  - ESP Print Pro and CUPS beta tester.
-    Mark Lawrence       - Microsoft interoperability testing.
-    Jeff Licquia        - Bug fixes, beta testing, evangelism.
-    Jason McMullan      - Original CUPS RPM distributions.
-    Wes Morgan          - *BSD fixes.
-    Ulrich Oldendorf    - German locale.
-    Giulio Orsero       - Bug fixes and testing.
-    Kurt Pfeifle        - Bug fixes, beta testing, evangelism.
-    Gilles QUERRET      - French man pages.
-    Petter Reinholdtsen - HP-UX compiler stuff.
-    Stuart Stevens      - HP JetDirect IPP information.
-    Andrea Suatoni      - IRIX desktop integration and testing.
+    Nathaniel Barbour              - Lots of testing and feedback.
+    N. Becker                      - setsid().
+    Philippe Combes                - French localization and buttons script.
+    Jean-Eric Cuendet              - GhostScript filters for CUPS.
+    Van Dang                       - HTTP and IPP policeman.
+    L. Peter Deutsch               - MD5 code.
+    Dr. ZP Han                     - setgid()/setuid().
+    Guy Harris                     - *BSD shared libraries and lots of other
+                                     fixes.
+    Bjoern Jacke                   - I18N stuff.
+    Wang Jian                      - CUPS RPM corrections.
+    Roderick Johnstone             - Beta tester of the millenium.
+    Till Kamppeter                 - Bug fixes, beta testing, evangelism.
+    I–aki Larra–aga                - Basque localization.
+    Kenshi Muto                    - Japanese localization, patches, and
+                                     testing.
+    Tomohiro Kato                  - Japanese localization.
+    Kiko                           - Bug fixes.
+    Sergey V. Kovalyov             - ESP Print Pro and CUPS beta tester.
+    Marek Laane                    - Estonian translation.
+    Mark Lawrence                  - Microsoft interoperability testing.
+    Jeff Licquia                   - Bug fixes, beta testing, evangelism.
+    Jason McMullan                 - Original CUPS RPM distributions.
+    Wes Morgan                     - *BSD fixes.
+    Daniel Nylander                - Swedish localization.
+    Niklas 'Nille' �kerstršm       - Swedish localization.
+    Giulio Orsero                  - Bug fixes and testing.
+    Michal Osowiecki               - Polish localization.
+    Citra Paska                    - Indonesian localization.
+    Kurt Pfeifle                   - Bug fixes, beta testing, evangelism.
+    Vincenzo Reale                 - Italian localization.
+    Petter Reinholdtsen            - HP-UX compiler stuff.
+    Juan Pablo Gonz‡lez Riopedre   - Spanish localization.
+    Opher Shachar                  - Hebrew localization.
+    Stuart Stevens                 - HP JetDirect IPP information.
+    Andrea Suatoni                 - IRIX desktop integration and testing.
+    Teppo Turliainen               - Finnish localization.
+    Tim Waugh                      - Lots of patches, testing, and Linux
+                                     integration.
+    Yugami                         - LDAP browsing support.

 If I've missed someone, please let me know by sending an email to
-"mike@easysw.com".
+"msweet@apple.com".
@@ -1,142 +0,0 @@
-ENCRYPTION - CUPS v1.1.19 - 05/27/2003
--------------------------------------
-
-This file describes the encryption support provided by CUPS.
-
-WARNING: CLIENTS CURRENTLY TRUST ALL CERTIFICATES FROM SERVERS. 
-This makes the CUPS client applications vulnerable to "man in
-the middle" attacks, so we don't recommend using this to do
-remote administration over WANs at this time.
-
-Future versions of CUPS will keep track of server certificates
-and provide a callback/confirmation interface for accepting new
-certificates and warning when a certificate has changed.
-
-
-LEGAL STUFF
-
-BEFORE USING THE ENCRYPTION SUPPORT, PLEASE VERIFY THAT IT IS
-LEGAL TO DO SO IN YOUR COUNTRY.  CUPS by itself doesn't include
-any encryption code, but it can link against the OpenSSL, GNU
-TLS, or CDSA libraries which do.
-
-
-OVERVIEW OF ENCRYPTION SUPPORT IN CUPS
-
-CUPS supports SSL/2.0, SSL/3.0, and TLS/1.0 encryption using
-keys as large as 128-bits.  Encryption support is provided via
-the OpenSSL, GNU TLS, or CDSA libraries and some new hooks in
-the CUPS code.
-
-CUPS provides support for dedicated (https) and "upgrade" (TLS)
-encryption of sessions.  The "HTTP Upgrade" method is described
-in RFC 2817; basically, the client can be secure or unsecure,
-and the client or server initiates an upgrade to a secure
-connection via some new HTTP fields and status codes.  The HTTP
-Upgrade method is new and no browsers we know of support it yet.
-Stick with "https" for web browsers.
-
-The current implementation is very basic.  The CUPS client
-software (lp, lpr, etc.) uses encryption as requested by the
-user or server.
-
-The user can specify the "-E" option with the printing commands
-to force encryption of the connection.  Encryption can also be
-specified using the Encryption directive in the client.conf file
-or in the CUPS_ENCRYPTION environment variable:
-
-    Never
-
-        Never do encryption.
-
-    Always
-
-        Always do SSL/TLS encryption using the https scheme.
-
-    IfRequested
-
-	Upgrade to TLS encryption if the server asks for it.
-	This is the default setting.
-
-    Required
-
-	Always upgrade to TLS encryption as soon as the
-	connection is made.  This is different than the "Always"
-	mode above since the connection is initially unsecure
-	and the client initiates the upgrade to TLS encryption.
-	(same as using the "-E" option)
-
-These keywords are also used in the cupsd.conf file to secure
-particular locations.  To secure all traffic on the server, listen
-on port 443 (https port) instead of port 631 and change the "ipp"
-service listing (or add it if you don't have one) in /etc/services
-to 443.  To provide both secure and normal methods, add a line
-reading:
-
-    SSLPort 443
-
-to /etc/cups/cupsd.conf.
-
-
-BEFORE YOU BEGIN
-
-You'll need the OpenSSL, GNU TLS, or CDSA libraries from:
-
-    http://www.openssl.org/
-    http://www.gnutls.org/
-    http://www.intel.com/labs/archive/cdsa.htm
-
-
-CONFIGURING WITH ENCRYPTION SUPPORT
-
-Once you have the OpenSSL, GNU TLS, or CDSA libraries installed,
-you'll need to configure CUPS to use it with the "--enable-ssl"
-option:
-
-    ./configure --enable-ssl
-
-If the library stuff is not in a standard location, make sure to
-define the CFLAGS, CXXFLAGS, and LDFLAGS environment variables
-with the appropriate compiler and linker options first.
-
-
-GENERATING A SERVER CERTIFICATE AND KEY
-
-The following OpenSSL command will generate a server certificate
-and key that you can play with.  Since the certificate is not
-properly signed it will generate all kinds of warnings in
-Netscape and MSIE:
-
-    openssl req -new -x509 -keyout /etc/cups/ssl/server.key \
-        -out /etc/cups/ssl/server.crt -days 365 -nodes
-
-    chmod 600 /etc/cups/ssl/server.*
-
-The "-nodes" option prevents the certificate and key from being
-encrypted.  The cupsd process runs in the background, detached
-from any input source; if you encrypt these files then cupsd
-will not be able to load them!
-
-Send all rants about non-encrypted certificate and key files to
-/dev/null.  It makes sense to encrypt user files, but not for
-files used by system processes/daemons...
-
-
-REPORTING PROBLEMS
-
-If you have problems, READ THE DOCUMENTATION FIRST!  If the
-documentation does not solve your problems please send an email
-to "cups-support@cups.org".  Include your operating system and
-version, compiler and version, and any errors or problems you've
-run into. The "/var/log/cups/error_log" file should also be sent,
-as it often helps to determine the cause of your problem.
-
-If you are running a version of Linux, be sure to provide the
-Linux distribution you have, too.
-
-Please note that the "cups-support@cups.org" email address goes
-to the CUPS developers; they are busy people, so your email may
-go unanswered for days or weeks.  In general, only general build
-or distribution problems will actually get answered - for
-end-user support see the "README.txt" for a summary of the
-resources available.
@@ -1,190 +1,207 @@
-INSTALL - CUPS v1.1.19 - 05/27/2003
-----------------------------------
+INSTALL - CUPS v1.4.7 - 2011-01-06
+----------------------------------

-This file describes how to compile and install CUPS from source
-code. For more information on CUPS see the file called
-"README.txt".  A complete change log can be found in
-"CHANGES.txt".
+This file describes how to compile and install CUPS from source code. For more
+information on CUPS see the file called "README.txt".  A complete change log can
+be found in "CHANGES.txt".

-**** IF YOU HAVE A NON-POSTSCRIPT PRINTER, YOU WILL ALSO  ****
-**** NEED TO INSTALL ESP GHOSTSCRIPT OR A PATCHED VERSION ****
-**** OF THE STANDARD GHOSTSCRIPT RELEASES.                ****
+**** IF YOU HAVE A NON-POSTSCRIPT PRINTER AND ARE NOT RUNNING MAC OS X,     ****
+**** YOU WILL ALSO NEED TO INSTALL GPL GHOSTSCRIPT WITH THE "cups" DRIVER   ****
+**** AFTER YOU INSTALL CUPS.                                                ****


 BEFORE YOU BEGIN

-You'll need ANSI-compliant C and C++ compilers, plus a make
-program and Bourne shell.  The GNU compiler tools work well -
-we've tested the current CUPS code against GCC 2.95.x with
-excellent results.
+    You'll need ANSI-compliant C and C++ compilers, plus a make program and
+    POSIX-compliant shell (/bin/sh).  The GNU compiler tools and Bash work well
+    and we have tested the current CUPS code against several versions of GCC
+    with excellent results.

-The makefiles used by the project should work with all versions
-of make.  We've tested them with GNU make as well as the make
-programs shipped by Compaq, HP, SGI, and Sun.  FreeBSD users
-should use GNU make (gmake).
+    The makefiles used by the project should work with most versions of make.
+    We've tested them with GNU make as well as the make programs shipped by
+    Compaq, HP, SGI, and Sun.  BSD users should use GNU make (gmake) since BSD
+    make does not support "include".

-Besides these tools you'll want the following libraries:
+    Besides these tools you'll want the JPEG, PNG, TIFF, and ZLIB libraries for
+    image support, the CDSA, GNU TLS, or OpenSSL libraries for encryption
+    support, the OpenLDAP and OpenSLP libraries for directory services support,
+    and either MIT (1.6.3 or higher) or Heimdal Kerberos for Kerberos support.
+    CUPS will compile and run without these, however you'll miss out on many of
+    the features provided by CUPS.

-    - JPEG 6b or higher
-    - PNG 1.0.6 or higher
-    - TIFF 3.4 or higher
-    - ZLIB 1.1.3 or higher
-
-CUPS will compile and run without these, however you'll miss out on
-many of the features provided by CUPS.
-
-Also, please note that CUPS no longer includes the Ghostscript-
-based pstoraster filter.  You *must* download Ghostscript
-separately and patch it using the files in the pstoraster
-subdirectory, or download the ESP Ghostscript distribution from
-the CUPS web site. For more information see the README file in
-the pstoraster subdirectory.
+    Also, please note that CUPS does not include the Ghostscript-based
+    PostScript filter needed by non-PostScript printers.  You *must* download
+    GPL Ghostscript separately from the CUPS web site if you want to print
+    PostScript files to non-PostScript printers on operating systems other than
+    Mac OS X.


-COMPILING FROM CVS
+COMPILING THE SUBVERSION REPOSITORY CODE

-The CUPS CVS repository doesn't hold a copy of the pre-built
-configure script.  You'll need to run the GNU autoconf software
-(2.52 or higher) before compiling the software from CVS:
+    The CUPS Subversion repository doesn't hold a copy of the pre-built
+    configure script.  You'll need to run the GNU autoconf software (2.60 or
+    higher) to create it:

-    autoconf ENTER
+	autoconf


 CONFIGURATION

-CUPS uses GNU autoconf, so you should find the usual "configure"
-script in the main CUPS source directory.  To configure CUPS for
-your system, type:
+    CUPS uses GNU autoconf, so you should find the usual "configure" script in
+    the main CUPS source directory.  To configure CUPS for your system, type:

-    ./configure ENTER
+	./configure

-The default installation will put the CUPS software in the
-"/etc", "/usr", and "/var" directories on your system, which
-will overwrite any existing printing commands on your system.
-Use the "--prefix" option to install the CUPS software in
-another location:
+    The default installation will put the CUPS software in the "/etc", "/usr",
+    and "/var" directories on your system, which will overwrite any existing
+    printing commands on your system.  Use the "--prefix" option to install the
+    CUPS software in another location:

-    ./configure --prefix=/some/directory ENTER
+	./configure --prefix=/some/directory

-If the PNG, JPEG, TIFF, and ZLIB libraries are not installed in
-a system default location (typically "/usr/include" and
-"/usr/lib") you'll need to set the CFLAGS, CXXFLAGS, DSOFLAGS,
-and LDFLAGS environment variables prior to running configure:
+    To see a complete list of configuration options, use the --help option:

-    setenv CFLAGS "-I/some/directory" ENTER
-    setenv CXXFLAGS "-I/some/directory" ENTER
-    setenv DSOFLAGS "-L/some/directory" ENTER
-    setenv LDFLAGS "-L/some/directory" ENTER
-    ./configure ... ENTER
+        ./configure --help

-or:
+    If any of the dependent libraries are not installed in a system default
+    location (typically "/usr/include" and "/usr/lib") you'll need to set the
+    CFLAGS, CPPFLAGS, CXXFLAGS, DSOFLAGS, and LDFLAGS environment variables
+    prior to running configure:

-    CFLAGS="-I/some/directory"; export CFLAGS ENTER
-    CXXFLAGS="-I/some/directory"; export CXXFLAGS ENTER
-    DSOFLAGS="-L/some/directory"; export DSOFLAGS ENTER
-    LDFLAGS="-L/some/directory"; export LDFLAGS ENTER
-    ./configure ... ENTER
+	setenv CFLAGS "-I/some/directory"
+	setenv CPPFLAGS "-I/some/directory"
+	setenv CXXFLAGS "-I/some/directory"
+	setenv DSOFLAGS "-L/some/directory"
+	setenv LDFLAGS "-L/some/directory"
+	./configure ...

-To enable support for encryption, you'll also want to add the
-"--enable-ssl" option:
+    or:

-    ./configure --enable-ssl
+	CFLAGS="-I/some/directory" \
+	CPPFLAGS="-I/some/directory" \
+	CXXFLAGS="-I/some/directory" \
+	DSOFLAGS="-L/some/directory" \
+	LDFLAGS="-L/some/directory" \
+	./configure ...

-SSL and TLS support require the OpenSSL library, available at:
+    The "--enable-debug" option compiles CUPS with debugging information
+    enabled.  Additional debug logging support can be enabled using the
+    "--enable-debug-printfs" option - these debug messages are enabled using the
+    CUPS_DEBUG_LOG environment variable at run-time.

-    http://www.openssl.org
+    CUPS also includes an extensive set of unit tests that can be used to find
+    and diagnose a variety of common problems - use the "--enable-unit-tests"
+    configure option to run them at build time.

-If the OpenSSL header files and libraries are not in a standard
-location, specify the locations of these files using the
--with-openssl-includes and --with-openssl-libs directives:
+    Once you have configured things, just type:

-    ./configure --enable-ssl \
-        --with-openssl-includes=/foo/bar/include \
-        --with-openssl-libs=/foo/bar/lib
+	make ENTER

-See the file "ENCRYPTION.txt" for information on using the
-encryption support in CUPS.
+    or if you have FreeBSD, NetBSD, or OpenBSD type:

-Once you have configured things, just type:
+	gmake ENTER

-    make ENTER
+    to build the software.

-or if you have FreeBSD, NetBSD, or OpenBSD type:

-    gmake ENTER
+TESTING THE SOFTWARE

-to build the software.
+    Aside from the built-in unit tests, CUPS includes an automated test
+    framework for testing the entire printing system.  To run the tests, just
+    type:
+
+	make check ENTER
+
+    or if you have FreeBSD, NetBSD, or OpenBSD type:
+
+	gmake check ENTER
+
+    The test framework runs a copy of the CUPS scheduler (cupsd) on port 8631
+    in /tmp/cups-$USER and produces a nice HTML report of the results.


 INSTALLING THE SOFTWARE

-Once you have built the software you need to install it.  The
-"install" target provides a quick way to install the software on
-your local system:
+    Once you have built the software you need to install it.  The "install"
+    target provides a quick way to install the software on your local system:

-    make install ENTER
+	make install ENTER

-or for FreeBSD, NetBSD, or OpenBSD:
+    or for FreeBSD, NetBSD, or OpenBSD:

-    gmake install ENTER
+	gmake install ENTER

-You can also build binary packages that can be installed on other
-machines using the RPM spec file ("cups.spec") or EPM list file
-("cups.list").  The latter also supports building of binary RPMs,
-so it may be more convenient to use - we use EPM to build all of
-our binary distributions.
+    You can also build binary packages that can be installed on other machines
+    using the RPM spec file ("packaging/cups.spec") or EPM list file
+    ("packaging/cups.list").  The latter also supports building of binary RPMs,
+    so it may be more convenient to use.

-You can find the RPM software at:
+    You can find the RPM software at:

-    http://www.rpm.org
+	http://www.rpm.org/

-The EPM software is at:
+    The EPM software is available at:

-    http://www.easysw.com/epm/
+	http://www.epmhome.org/


 CREATING BINARY DISTRIBUTIONS WITH EPM

-The top level makefile supports generation of many types of binary
-distributions using EPM.  To build a binary distribution type:
+    The top level makefile supports generation of many types of binary
+    distributions using EPM.  To build a binary distribution type:

-    make <format> ENTER
+	make <format> ENTER

-or
+    or

-    gmake <format> ENTER
+	gmake <format> ENTER

-for FreeBSD, NetBSD, and OpenBSD.  The <format> target is one of
-the following:
+    for FreeBSD, NetBSD, and OpenBSD.  The <format> target is one of the
+    following:

-    epm      - Builds a portable shell script and tar file based
-               distribution.  This format will also backup your
-	       existing printing system if you decide to remove
-	       CUPS at some future time.
-    aix      - Builds an AIX binary distribution.
-    bsd      - Builds a *BSD binary distribution.
-    deb      - Builds a Debian binary distribution.
-    depot    - Builds a HP-UX binary distribution.
-    pkg      - Builds a Solaris binary distribution.
-    rpm      - Builds a RPM binary distribution.
-    tardist  - Builds an IRIX binary distribution.
+	epm       - Builds a script + tarfile package
+	aix       - Builds an AIX package
+	bsd       - Builds a *BSD package
+	deb       - Builds a Debian package
+	depot     - Builds a HP-UX package (also swinstall)
+	inst      - Builds an IRIX package (also tardist)
+	osx       - Builds a MacOS X package
+	pkg       - Builds a Solaris package
+	rpm       - Builds a RPM package
+	setld     - Build a Tru64 UNIX package
+	slackware - Build a Slackware package
+	swinstall - Build a HP-UX package (also depot)
+	tardist   - Builds an IRIX package (also inst)
+
+
+GETTING DEBUG LOGGING FROM CUPS
+
+    When configured with the "--enable-debug-printfs" option, CUPS compiles in
+    additional debug logging support in the scheduler, CUPS API, and CUPS
+    Imaging API.  The following environment variables are used to enable and
+    control debug logging:
+
+        CUPS_DEBUG_FILTER  Specifies a POSIX regular expression to control
+	                   which messages are logged.
+	CUPS_DEBUG_LEVEL   Specifies a number from 0 to 9 to control the
+	                   verbosity of the logging. The default level is 1.
+        CUPS_DEBUG_LOG     Specifies a log file to use.  Specify the name "-"
+	                   to send the messages to stderr.  Prefix a filename
+			   with "+" to append to an existing file.


 REPORTING PROBLEMS

-If you have problems, READ THE DOCUMENTATION FIRST!  If the
-documentation does not solve your problems please send an email
-to "cups-support@cups.org".  Include your operating system and
-version, compiler and version, and any errors or problems you've
-run into. The "/var/log/cups/error_log" file should also be sent,
-as it often helps to determine the cause of your problem.
+    If you have problems, READ THE DOCUMENTATION FIRST!  If the documentation
+    does not solve your problems, please post a message on the "cups.general"
+    forum at:

-If you are running a version of Linux, be sure to provide the
-Linux distribution you have, too.
+        http://www.cups.org/newsgroups.php

-Please note that the "cups-support@cups.org" email address goes
-to the CUPS developers; they are busy people, so your email may
-go unanswered for days or weeks.  In general, only general build
-or distribution problems will actually get answered - for
-end-user support see the "README.txt" for a summary of the
-resources available.
+    Include your operating system and version, compiler and version, and any
+    errors or problems you've run into.  The "config.log" file and the output
+    from the configure script and make should also be sent, as it often helps to
+    determine the cause of your problem.
+
+    If you are running a version of Linux, be sure to provide the Linux
+    distribution you have, too.
@@ -1,19 +0,0 @@
-INSTALL_fr - CUPS v1.1.19 - 04/08/2003
--------------------------------------
-
-Vous cherchez des instructions d'installation ? Lisez le fichier
-INSTALL.txt (anglais) et/ou reportez vous au "Manuel de
-l'administrateur" (en français) situé dans le sous-répertoire
-"doc/fr"
-
-Vous trouverez deux autres manuels en français dans ce
-sous-répertoire :
-
-	- Aperçu de CUPS
-	- Manuel de l'utilisateur
-
-Une fois CUPS installé, si vous configurez votre navigateur
-"web" pour que  la langue de base soit le français, vous
-disposerez également d'une interface "web" en français pour
-l'administration et d'utilistation de CUPS.
-
@@ -1,28 +1,25 @@
-                Common UNIX Printing System License Agreement
+                          CUPS License Agreement

-                Copyright 1997-2003 by Easy Software Products
-                        44141 AIRPORT VIEW DR STE 204
-                     HOLLYWOOD, MARYLAND 20636-3111 USA
+		      Copyright 2007-2009 by Apple Inc.
+			     1 Infinite Loop
+			  Cupertino, CA 95014 USA

-                           Voice: +1.301.373.9600
-                          Email: cups-info@cups.org
-                          WWW: http://www.cups.org
+                         WWW: http://www.cups.org/


 INTRODUCTION

-The Common UNIX Printing System(tm), ("CUPS(tm)"), is provided
-under the GNU General Public License ("GPL") and GNU Library
-General Public License ("LGPL"), Version 2, with exceptions for
-Apple operating systems and the OpenSSL toolkit. A copy of the
-exceptions and licenses follow this introduction.
+CUPS(tm) is provided under the GNU General Public License ("GPL")
+and GNU Library General Public License ("LGPL"), Version 2, with
+exceptions for Apple operating systems and the OpenSSL toolkit. A
+copy of the exceptions and licenses follow this introduction.

-The GNU LGPL applies to the CUPS API library, located in the
-"cups" subdirectory of the CUPS source distribution and in the
-"cups" include directory and library files in the binary
-distributions. The GNU GPL applies to the remainder of the CUPS
-distribution, including the "pdftops" filter which is based upon
-Xpdf and the CUPS imaging library.
+The GNU LGPL applies to the CUPS and CUPS Imaging libraries
+located in the "cups" and "filter" subdirectories of the CUPS
+source distribution and in the "cups" include directory and
+library files in the binary distributions. The GNU GPL applies to
+the remainder of the CUPS distribution, including the "pdftops"
+filter which is based upon Xpdf.

 For those not familiar with the GNU GPL, the license basically
 allows you to:
@@ -32,28 +29,25 @@ allows you to:
     binary form.
   - Sell verbatim copies of the software for a media fee, or
     sell support for the software.
-   - Distribute or sell printer drivers and filters that use
-     CUPS so long as source code is made available under the
-     GPL.

 What this license *does not* allow you to do is make changes or
 add features to CUPS and then sell a binary distribution without
-source code. You must provide source for any new drivers,
-changes, or additions to the software, and all code must be
-provided under the GPL or LGPL as appropriate. The only
-exceptions to this are the portions of the CUPS software covered
-by the Apple operating system license exceptions outlined later
-in this license agreement.
+source code. You must provide source for any changes or additions
+to the software, and all code must be provided under the GPL or
+LGPL as appropriate. The only exceptions to this are the portions
+of the CUPS software covered by the Apple operating system
+license exceptions outlined later in this license agreement.

 The GNU LGPL relaxes the "link-to" restriction, allowing you to
-develop applications that use the CUPS API library under other
-licenses and/or conditions as appropriate for your application.
+develop applications that use the CUPS and CUPS Imaging libraries
+under other licenses and/or conditions as appropriate for your
+application, driver, or filter.


 LICENSE EXCEPTIONS

-In addition, as the copyright holder of CUPS, Easy Software
-Products grants the following special exceptions:
+In addition, as the copyright holder of CUPS, Apple Inc. grants
+the following special exceptions:

     1. Apple Operating System Development License Exception;

@@ -96,49 +90,64 @@ Products grants the following special exceptions:

     2. OpenSSL Toolkit License Exception;

-	a. Easy Software Products explicitly allows the
-	   compilation and distribution of the CUPS software
-	   with the OpenSSL Toolkit.
+	a. Apple Inc. explicitly allows the compilation and
+	   distribution of the CUPS software with the OpenSSL
+	   Toolkit.

 No developer is required to provide these exceptions in a
 derived work.


+KERBEROS SUPPORT CODE
+
+The Kerberos support code ("KSC") is copyright 2006 by Jelmer
+Vernooij and is provided 'as-is', without any express or implied
+warranty.  In no event will the author or Apple Inc. be held
+liable for any damages arising from the use of the KSC.
+
+Sources files containing KSC have the following text at the top
+of each source file:
+
+     This file contains Kerberos support code, copyright 2006 by
+     Jelmer Vernooij.
+
+The KSC copyright and license apply only to Kerberos-related
+feature code in CUPS.  Such code is typically conditionally
+compiled based on the present of the HAVE_GSSAPI preprocessor
+definition.
+
+Permission is granted to anyone to use the KSC for any purpose,
+including commercial applications, and to alter it and
+redistribute it freely, subject to the following restrictions:
+
+     1. The origin of the KSC must not be misrepresented; you
+	must not claim that you wrote the original software. If
+	you use the KSC in a product, an acknowledgment in the
+	product documentation would be appreciated but is not
+	required.
+
+     2. Altered source versions must be plainly marked as such,
+	and must not be misrepresented as being the original
+	software.
+
+     3. This notice may not be removed or altered from any source
+	distribution. 
+
+
 TRADEMARKS

-Easy Software Products has trademarked the Common UNIX Printing
-System, CUPS, and CUPS logo. These names and logos may be used
-freely in any direct port or binary distribution of CUPS. Please
-contract Easy Software Products for written permission to use
-them in derivative products. Our intention is to protect the
-value of these trademarks and ensure that any derivative product
-meets the same high-quality standards as the original.
-
-
-BINARY DISTRIBUTION RIGHTS
-
-Easy Software Products also sells rights to the CUPS source code
-under a binary distribution license for vendors that are unable
-to release source code for their drivers, additions, and
-modifications to CUPS under the GNU GPL and LGPL. For
-information please contact us at the address shown above.
-
-The Common UNIX Printing System provides a "pdftops" filter that
-is based on the Xpdf software. For binary distribution licensing
-of this software, please contact:
-
-     Derek B. Noonburg
-     Email: derekn@foolabs.com
-     WWW: http://www.foolabs.com/xpdf/
-
-
-SUPPORT
-
-Easy Software Products sells software support for CUPS as well
-as a commercial printing product based on CUPS called ESP Print
-Pro. You can find out more at our web site:
-
-     http://www.easysw.com/
+CUPS and the CUPS logo (the "CUPS Marks") are trademarks of Apple
+Inc. Apple grants you a non-exclusive and non-transferable right
+to use the CUPS Marks in any direct port or binary distribution
+incorporating CUPS software and in any promotional material
+therefor.  You agree that your products will meet the highest
+levels of quality and integrity for similar goods, not be unlawful,
+and be developed, manufactured, and distributed in compliance with
+this license.  You will not interfere with Apple's rights in the
+CUPS Marks, and all use of the CUPS Marks shall inure to the
+benefit of Apple.  This license does not apply to use of the CUPS
+Marks in a derivative products, which requires prior written
+permission from Apple Inc.

 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
@@ -420,6 +429,65 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.

 		     END OF TERMS AND CONDITIONS
+
+	Appendix: How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

 		  GNU LIBRARY GENERAL PUBLIC LICENSE
 			 Version 2, June 1991
@@ -859,3 +927,47 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.

 		     END OF TERMS AND CONDITIONS
+
+     Appendix: How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the Free
+    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
@@ -1,25 +1,16 @@
 #
 # "$Id$"
 #
-#   Common makefile definitions for the Common UNIX Printing System (CUPS).
+#   Common makefile definitions for CUPS.
 #
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+#   Copyright 2007-2010 by Apple Inc.
+#   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
-#
-#       Voice: (301) 373-9603
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   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/".
 #

 #
@@ -29,79 +20,165 @@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL@ @CC@
+CHMOD		=	@CHMOD@
 CXX		=	@LIBTOOL@ @CXX@
 DSO		=	@DSO@
+DSOXX		=	@DSOXX@
 HTMLDOC		=	@HTMLDOC@
 INSTALL		=	@INSTALL@
+LD		=	@LD@
 LIBTOOL		=	@LIBTOOL@
 LN		=	@LN@ -sf
 MV		=	@MV@
-NROFF		=	@NROFF@
+PHPCONFIG	=	@PHPCONFIG@
 RANLIB		=	@RANLIB@
 RM		=	@RM@ -f
+RMDIR		=	@RMDIR@
 SED		=	@SED@
 SHELL		=	/bin/sh
-STRIP		=	@STRIP@

 #
 # Installation programs...
 #

-INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -m 755 -s
-INSTALL_DATA	=	$(INSTALL) -m 644
+INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
+INSTALL_DATA	=	$(INSTALL) -c -m 444
 INSTALL_DIR	=	$(INSTALL) -d
-INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -m 755
-INSTALL_MAN	=	$(INSTALL) -m 644
-INSTALL_SCRIPT	=	$(INSTALL) -m 755
+INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+INSTALL_MAN	=	$(INSTALL) -c -m 444
+INSTALL_SCRIPT	=	$(INSTALL) -c -m 555

 #
-# Default user and group for the scheduler...
+# Default user, group, and system groups for the scheduler...
 #

 CUPS_USER	=	@CUPS_USER@
 CUPS_GROUP	=	@CUPS_GROUP@
+CUPS_SYSTEM_GROUPS =	@CUPS_SYSTEM_GROUPS@
+CUPS_PRIMARY_SYSTEM_GROUP =	@CUPS_PRIMARY_SYSTEM_GROUP@
+
+#
+# Default permissions...
+#
+
+CUPS_CONFIG_FILE_PERM = @CUPS_CONFIG_FILE_PERM@
+CUPS_LOG_FILE_PERM = @CUPS_LOG_FILE_PERM@
+
+#
+# Languages to install...
+#
+
+LANGUAGES	=	@LANGUAGES@
+INSTALL_LANGUAGES =	@INSTALL_LANGUAGES@
+UNINSTALL_LANGUAGES =	@UNINSTALL_LANGUAGES@

 #
 # Libraries...
 #

 LIBCUPS		=	@LIBCUPS@
+LIBCUPSCGI	=	@LIBCUPSCGI@
+LIBCUPSDRIVER	=	@LIBCUPSDRIVER@
 LIBCUPSIMAGE	=	@LIBCUPSIMAGE@
+LIBCUPSMIME	=	@LIBCUPSMIME@
+LIBCUPSPPDC	=	@LIBCUPSPPDC@
 LIBJPEG		=	@LIBJPEG@
+LIBLDAP		=	@LIBLDAP@
 LIBMALLOC	=	@LIBMALLOC@
 LIBPAPER	=	@LIBPAPER@
 LIBPNG		=	@LIBPNG@
 LIBSLP		=	@LIBSLP@
+LIBGSSAPI	=	@LIBGSSAPI@
 LIBTIFF		=	@LIBTIFF@
+LIBUSB		=	@LIBUSB@
+LIBWRAP		=	@LIBWRAP@
 LIBZ		=	@LIBZ@

+#
+# Install static libraries?
+#
+
+INSTALLSTATIC	=	@INSTALLSTATIC@
+
 #
 # Program options...
 #
-# OPTIM   defines the common compiler optimization/debugging options.
-# OPTIONS defines other compile-time options (currently only -dDEBUG for
-#         extra debug info)
+# 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
+#               for extra debug info)
 #

+ALL_CFLAGS	=	-I.. -D_CUPS_SOURCE $(CFLAGS) $(SSLFLAGS) \
+			@LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
+ALL_CXXFLAGS	=	-I.. -D_CUPS_SOURCE $(CXXFLAGS) $(SSLFLAGS) \
+			@LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
+ARCHFLAGS	=	@ARCHFLAGS@
 ARFLAGS		=	@ARFLAGS@
 BACKLIBS	=	@BACKLIBS@
-CFLAGS		=	$(RC_CFLAGS) $(SSLFLAGS) @CPPFLAGS@ @CFLAGS@ -I.. $(OPTIONS)
-COMMONLIBS	=	@COMMONLIBS@
-CXXFLAGS	=	$(RC_CFLAGS) @CPPFLAGS@ @CXXFLAGS@ -I.. $(OPTIONS)
+BANNERTOPS	=	@BANNERTOPS@
+CFLAGS		=	@CPPFLAGS@ @CFLAGS@
+COMMONLIBS	=	@LIBS@
+CUPSDLIBS	=	@CUPSDLIBS@
+CXXFLAGS	=	@CPPFLAGS@ @CXXFLAGS@
 CXXLIBS		=	@CXXLIBS@
-DSOFLAGS	=	@DSOFLAGS@
+DBUS_NOTIFIER	=	@DBUS_NOTIFIER@
+DBUS_NOTIFIERLIBS =	@DBUS_NOTIFIERLIBS@
+DNSSD_BACKEND	=	@DNSSD_BACKEND@
+DSOFLAGS	=	-L../cups @DSOFLAGS@
 DSOLIBS		=	@DSOLIBS@ $(COMMONLIBS)
-IMGLIBS		=	@IMGLIBS@ -lm
-LDFLAGS		=	-L../cups -L../filter $(RC_CFLAGS) @LDFLAGS@ $(OPTIM)
-LINKCUPS	=	@LINKCUPS@
+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@
+LIBCUPSORDER	=	@LIBCUPSORDER@
+LIBCUPSIMAGEORDER =	@LIBCUPSIMAGEORDER@
+LINKCUPS	=	@LINKCUPS@ $(SSLLIBS) $(DNSSDLIBS)
 LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
-LIBS		=	$(LINKCUPS) $(NETLIBS) @LIBS@ $(COMMONLIBS)
-NETLIBS		=	@NETLIBS@
+LIBS		=	$(LINKCUPS) $(COMMONLIBS)
 OPTIM		=	@OPTIM@
 OPTIONS		=
 PAMLIBS		=	@PAMLIBS@
+PAP		=	@PAP@
+PDFTOPS		=	@PDFTOPS@
+PHPDIR		=	@PHPDIR@
+PHPOPTIONS	=	@PHPOPTIONS@ -I../.. `$(PHPCONFIG) --includes`
 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...
@@ -111,12 +188,16 @@ SSLLIBS		=	@SSLLIBS@
 # We have to define these first because autoconf uses ${prefix}
 # and ${exec_prefix} for most of the other directories...
 #
+# The "datarootdir" variable may not get defined if you are using
+# a version of autoconf prior to 2.60.
+#
 # This is immediately followed by definition in ALL CAPS for the
 # needed directories...
 #

 bindir		=	@bindir@
 datadir		=	@datadir@
+datarootdir	=	@datarootdir@
 exec_prefix	=	@exec_prefix@
 includedir	=	@includedir@
 infodir		=	@infodir@
@@ -136,8 +217,10 @@ BUILDROOT	=	$(DSTROOT)

 AMANDIR		=	$(BUILDROOT)@AMANDIR@
 BINDIR		=	$(BUILDROOT)@bindir@
+CACHEDIR	=	$(BUILDROOT)@CUPS_CACHEDIR@
 DATADIR		=	$(BUILDROOT)@CUPS_DATADIR@
 DOCDIR		=	$(BUILDROOT)@CUPS_DOCROOT@
+ICONDIR		=	@ICONDIR@
 INCLUDEDIR	=	$(BUILDROOT)$(includedir)
 INITDIR		=	@INITDIR@
 INITDDIR	=	@INITDDIR@
@@ -145,42 +228,64 @@ LIBDIR		=	$(BUILDROOT)$(libdir)
 LOCALEDIR	= 	$(BUILDROOT)@CUPS_LOCALEDIR@
 LOGDIR		= 	$(BUILDROOT)@CUPS_LOGDIR@
 MANDIR		=	$(BUILDROOT)@mandir@
-PAMDIR		=	$(BUILDROOT)@PAMDIR@
+MENUDIR		=	@MENUDIR@
 PMANDIR		=	$(BUILDROOT)@PMANDIR@
+RCLEVELS	=	@RCLEVELS@
+RCSTART		=	@RCSTART@
+RCSTOP		=	@RCSTOP@
 REQUESTS	= 	$(BUILDROOT)@CUPS_REQUESTS@
 SBINDIR		=	$(BUILDROOT)@sbindir@
 SERVERBIN	= 	$(BUILDROOT)@CUPS_SERVERBIN@
 SERVERROOT	= 	$(BUILDROOT)@CUPS_SERVERROOT@
+SMFMANIFESTDIR	= 	@SMFMANIFESTDIR@
+STATEDIR	=	$(BUILDROOT)@CUPS_STATEDIR@
+XINETD		=	@XINETD@

-CAT1EXT		=	@CAT1EXT@
-CAT3EXT		=	@CAT3EXT@
-CAT5EXT		=	@CAT5EXT@
-CAT8EXT		=	@CAT8EXT@
+MAN1EXT		=	@MAN1EXT@
+MAN5EXT		=	@MAN5EXT@
+MAN7EXT		=	@MAN7EXT@
 MAN8EXT		=	@MAN8EXT@
 MAN8DIR		=	@MAN8DIR@

+PAMDIR		=	@PAMDIR@
+PAMFILE		=	@PAMFILE@
+
+DEFAULT_LAUNCHD_CONF =	@DEFAULT_LAUNCHD_CONF@
+DBUSDIR		=	@DBUSDIR@
+
+
 #
 # Rules...
 #

 .SILENT:
-.SUFFIXES:	.a .c .cxx .h .man .o .0 .1 .1m .3 .5 .8 .z
+.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) $(OPTIM) $(CFLAGS) -c $<
+	$(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) $(OPTIM) $(CXXFLAGS) -c $<
-.man.0 .man.1 .man.1m .man.3 .man.5 .man.8:
-	echo Formatting $<...
+	$(CXX) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c -o $@ $<
+
+.man.1 .man.1m .man.3 .man.5 .man.7 .man.8:
+	echo Linking $<...
 	$(RM) $@
-	-$(NROFF) -man $< >$@
-.man.z:
-	echo Formatting $<...
-	$(RM) $@ $@.tmp $@.tmp.z
-	-$(NROFF) -man $< >$@.tmp
-	pack -f $@.tmp
-	$(MV) $@.tmp.z $@
+	$(LN) $< $@
+
+.man.1.gz .man.1m.gz .man.3.gz .man.5.gz .man.7.gz .man.8.gz .man.gz:
+	echo -n Compressing $<...
+	$(RM) $@
+	gzip -v9 <$< >$@


 #
@@ -1,35 +1,30 @@
 #
 # "$Id$"
 #
-#   Top-level Makefile for the Common UNIX Printing System (CUPS).
+#   Top-level Makefile for CUPS.
 #
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+#   Copyright 2007-2010 by Apple Inc.
+#   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
-#
-#       Voice: (301) 373-9603
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   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/".
 #

 include Makedefs

+
 #
 # Directories to make...
 #

-DIRS	=	cups backend berkeley cgi-bin filter man pdftops \
-		scheduler systemv
+DIRS	=	cups filter backend berkeley cgi-bin driver locale man monitor \
+		notifier ppdc scheduler systemv test \
+		$(PHPDIR) \
+		conf data doc examples $(FONTS) templates
+

 #
 # Make all targets...
@@ -37,11 +32,58 @@ DIRS	=	cups backend berkeley cgi-bin filter man pdftops \

 all:
 	chmod +x cups-config
+	echo Using ARCHFLAGS="$(ARCHFLAGS)"
+	echo Using ALL_CFLAGS="$(ALL_CFLAGS)"
+	echo Using ALL_CXXFLAGS="$(ALL_CXXFLAGS)"
+	echo Using CC="$(CC)"
+	echo Using CXX="$(CC)"
+	echo Using DSOFLAGS="$(DSOFLAGS)"
+	echo Using LDFLAGS="$(LDFLAGS)"
+	echo Using LIBS="$(LIBS)"
 	for dir in $(DIRS); do\
 		echo Making all in $$dir... ;\
-		(cd $$dir ; $(MAKE) $(MFLAGS)) || exit 1;\
+		(cd $$dir ; $(MAKE) $(MFLAGS) all $(UNITTESTS)) || exit 1;\
 	done

+
+#
+# Make library targets...
+#
+
+libs:
+	echo Using ARCHFLAGS="$(ARCHFLAGS)"
+	echo Using ALL_CFLAGS="$(ALL_CFLAGS)"
+	echo Using ALL_CXXFLAGS="$(ALL_CXXFLAGS)"
+	echo Using CC="$(CC)"
+	echo Using CXX="$(CC)"
+	echo Using DSOFLAGS="$(DSOFLAGS)"
+	echo Using LDFLAGS="$(LDFLAGS)"
+	echo Using LIBS="$(LIBS)"
+	for dir in $(DIRS); do\
+		echo Making libraries in $$dir... ;\
+		(cd $$dir ; $(MAKE) $(MFLAGS) libs) || exit 1;\
+	done
+
+
+#
+# Make unit test targets...
+#
+
+unittests:
+	echo Using ARCHFLAGS="$(ARCHFLAGS)"
+	echo Using ALL_CFLAGS="$(ALL_CFLAGS)"
+	echo Using ALL_CXXFLAGS="$(ALL_CXXFLAGS)"
+	echo Using CC="$(CC)"
+	echo Using CXX="$(CC)"
+	echo Using DSOFLAGS="$(DSOFLAGS)"
+	echo Using LDFLAGS="$(LDFLAGS)"
+	echo Using LIBS="$(LIBS)"
+	for dir in $(DIRS); do\
+		echo Making all in $$dir... ;\
+		(cd $$dir ; $(MAKE) $(MFLAGS) unittests) || exit 1;\
+	done
+
+
 #
 # Remove object and target files...
 #
@@ -52,6 +94,31 @@ clean:
 		(cd $$dir; $(MAKE) $(MFLAGS) clean) || exit 1;\
 	done

+
+#
+# Remove all non-distribution files...
+#
+
+distclean:	clean
+	$(RM) Makedefs config.h config.log config.status
+	$(RM) cups-config
+	$(RM) conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf
+	$(RM) doc/help/ref-cupsd-conf.html doc/help/standard.html doc/index.html
+	$(RM) init/cups.sh init/cups-lpd init/org.cups.cups-lpd.plist
+	$(RM) man/client.conf.man
+	$(RM) man/cups-deviced.man man/cups-driverd.man
+	$(RM) man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man
+	$(RM) man/cupsd.conf.man man/drv.man man/lpoptions.man
+	$(RM) packaging/cups.list
+	$(RM) packaging/cups-desc.plist packaging/cups-info.plist
+	$(RM) templates/header.tmpl
+	$(RM) desktop/cups.desktop
+	$(RM) init/cups.xml
+	-$(RM) doc/*/index.html
+	-$(RM) templates/*/header.tmpl
+	-$(RM) -r autom4te*.cache clang cups/charmaps cups/locale driver/test
+
+
 #
 # Make dependencies
 #
@@ -64,106 +131,306 @@ depend:


 #
-# Install object and target files...
+# Run the clang.llvm.org static code analysis tool on the C sources.
+# (at least checker-231 is required for scan-build to work this way)
 #

-install:	installhdrs
+.PHONY: clang clang-changes
+clang:
+	$(RM) -r clang
+	scan-build -V -k -o `pwd`/clang $(MAKE) $(MFLAGS) clean all
+clang-changes:
+	scan-build -V -k -o `pwd`/clang $(MAKE) $(MFLAGS) all
+
+
+#
+# Generate a ctags file...
+#
+
+ctags:
+	ctags -R .
+
+
+#
+# Install everything...
+#
+
+install:	install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
 	for dir in $(DIRS); do\
-		echo Installing in $$dir... ;\
-		(cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\
+		echo Installing data files in $$dir... ;\
+		(cd $$dir; $(MAKE) $(MFLAGS) install-data) || exit 1;\
 	done
-	echo Installing in conf...
-	(cd conf; $(MAKE) $(MFLAGS) install)
-	echo Installing in data...
-	(cd data; $(MAKE) $(MFLAGS) install)
-	echo Installing in doc...
-	(cd doc; $(MAKE) $(MFLAGS) install)
-	echo Installing in fonts...
-	(cd fonts; $(MAKE) $(MFLAGS) install)
-	echo Installing in locale...
-	(cd locale; $(MAKE) $(MFLAGS) install)
-	echo Installing in ppd...
-	(cd ppd; $(MAKE) $(MFLAGS) install)
-	echo Installing in templates...
-	(cd templates; $(MAKE) $(MFLAGS) install)
 	echo Installing cups-config script...
-	$(INSTALL_DIR) $(BINDIR)
+	$(INSTALL_DIR) -m 755 $(BINDIR)
 	$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
-	echo Installing startup script...
-	if test "x$(INITDIR)" != "x"; then \
-		$(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/init.d; \
-		$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
-		$(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc0.d; \
-		$(INSTALL_SCRIPT) cups.sh  $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
-		$(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc2.d; \
-		$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
-		$(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc3.d; \
-		$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
-		$(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc5.d; \
-		$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
+	if test "x$(INITDIR)" != x; then \
+		echo Installing init scripts...; \
+		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
+		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
+		for level in $(RCLEVELS); do \
+			$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \
+			$(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \
+			if test `uname` = HP-UX; then \
+				level=`expr $$level - 1`; \
+				$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \
+			fi; \
+			$(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \
+		done; \
+		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
+		$(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \
 	fi
-	if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
+	if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
 		$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
-		if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
-			$(INSTALL_SCRIPT) cups.osx $(BUILDROOT)$(INITDDIR)/PrintingServices; \
-			$(INSTALL_DATA) cups.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
-			$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
-			$(INSTALL_DATA) cups.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
+		if test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
+			echo Installing LaunchDaemons configuration files...; \
+			$(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
+			$(INSTALL_DATA) init/org.cups.cups-lpd.plist $(BUILDROOT)/System/Library/LaunchDaemons; \
+			case `uname -r` in \
+				8.*) \
+				$(INSTALL_DIR) $(BUILDROOT)/System/Library/StartupItems/PrintingServices; \
+				$(INSTALL_SCRIPT) init/PrintingServices.launchd $(BUILDROOT)/System/Library/StartupItems/PrintingServices/PrintingServices; \
+				$(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)/System/Library/StartupItems/PrintingServices/StartupParameters.plist; \
+				$(INSTALL_DIR) $(BUILDROOT)/System/Library/StartupItems/PrintingServices/Resources/English.lproj; \
+				$(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)/System/Library/StartupItems/PrintingServices/Resources/English.lproj/Localizable.strings; \
+				;; \
+			esac \
 		else \
-			$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
+			echo Installing RC script...; \
+			$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
 		fi \
 	fi
+	if test "x$(SMFMANIFESTDIR)" != x; then \
+		echo Installing SMF manifest in $(SMFMANIFESTDIR)...;\
+		$(INSTALL_DIR) $(BUILDROOT)/$(SMFMANIFESTDIR); \
+		$(INSTALL_SCRIPT) init/cups.xml $(BUILDROOT)$(SMFMANIFESTDIR)/cups.xml; \
+	fi
+	if test "x$(DBUSDIR)" != x; then \
+		echo Installing cups.conf in $(DBUSDIR)...;\
+		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(DBUSDIR)/system.d; \
+		$(INSTALL_DATA) packaging/cups-dbus.conf $(BUILDROOT)$(DBUSDIR)/system.d/cups.conf; \
+	fi
+	if test "x$(XINETD)" != x; then \
+		echo Installing xinetd configuration file for cups-lpd...; \
+		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(XINETD); \
+		$(INSTALL_DATA) init/cups-lpd $(BUILDROOT)$(XINETD)/cups-lpd; \
+	fi
+	if test "x$(MENUDIR)" != x; then \
+		echo Installing desktop menu...; \
+		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(MENUDIR); \
+		$(INSTALL_DATA) desktop/cups.desktop $(BUILDROOT)$(MENUDIR); \
+	fi
+	if test "x$(ICONDIR)" != x; then \
+		echo Installing desktop icons...; \
+		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(ICONDIR)/hicolor/16x16/apps; \
+		$(INSTALL_DATA) desktop/cups-16.png $(BUILDROOT)$(ICONDIR)/hicolor/16x16/apps/cups.png; \
+		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(ICONDIR)/hicolor/32x32/apps; \
+		$(INSTALL_DATA) desktop/cups-32.png $(BUILDROOT)$(ICONDIR)/hicolor/32x32/apps/cups.png; \
+		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(ICONDIR)/hicolor/64x64/apps; \
+		$(INSTALL_DATA) desktop/cups-64.png $(BUILDROOT)$(ICONDIR)/hicolor/64x64/apps/cups.png; \
+		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(ICONDIR)/hicolor/128x128/apps; \
+		$(INSTALL_DATA) desktop/cups-128.png $(BUILDROOT)$(ICONDIR)/hicolor/128x128/apps/cups.png; \
+	fi

 #
-# Install source and header files...
+# Install header files...
 #

-installsrc:
-	gnutar --dereference --exclude=CVS -cf - . | gnutar -C $(SRCROOT) -xf -
+install-headers:
+	for dir in $(DIRS); do\
+		echo Installing header files in $$dir... ;\
+		(cd $$dir; $(MAKE) $(MFLAGS) install-headers) || exit 1;\
+	done

-installhdrs:
-	(cd cups ; $(MAKE) $(MFLAGS) installhdrs) || exit 1;\
-	(cd filter ; $(MAKE) $(MFLAGS) installhdrs) || exit 1;
+
+#
+# Install programs...
+#
+
+install-exec:	all
+	for dir in $(DIRS); do\
+		echo Installing programs in $$dir... ;\
+		(cd $$dir; $(MAKE) $(MFLAGS) install-exec) || exit 1;\
+	done
+
+
+#
+# Install libraries...
+#
+
+install-libs:	libs
+	for dir in $(DIRS); do\
+		echo Installing libraries in $$dir... ;\
+		(cd $$dir; $(MAKE) $(MFLAGS) install-libs) || exit 1;\
+	done
+
+
+#
+# Uninstall object and target files...
+#
+
+uninstall:
+	for dir in $(DIRS); do\
+		echo Uninstalling in $$dir... ;\
+		(cd $$dir; $(MAKE) $(MFLAGS) uninstall) || exit 1;\
+	done
+	echo Uninstalling cups-config script...
+	$(RM) $(BINDIR)/cups-config
+	-$(RMDIR) $(BINDIR)
+	echo Uninstalling startup script...
+	if test "x$(INITDIR)" != x; then \
+		$(RM) $(BUILDROOT)$(INITDIR)/init.d/cups; \
+		$(RMDIR) $(BUILDROOT)$(INITDIR)/init.d; \
+		$(RM)  $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
+		$(RMDIR) $(BUILDROOT)$(INITDIR)/rc0.d; \
+		$(RM) $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
+		$(RMDIR) $(BUILDROOT)$(INITDIR)/rc2.d; \
+		$(RM) $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
+		$(RMDIR) $(BUILDROOT)$(INITDIR)/rc3.d; \
+		$(RM) $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
+		$(RMDIR) $(BUILDROOT)$(INITDIR)/rc5.d; \
+	fi
+	if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
+		if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
+			$(RM) $(BUILDROOT)$(INITDDIR)/PrintingServices; \
+			$(RM) $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
+			$(RM) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
+			$(RMDIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
+		elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
+			$(RM) $(BUILDROOT)$(INITDDIR)/org.cups.cupsd.plist; \
+			$(RM) $(BUILDROOT)$(INITDDIR)/org.cups.cups-lpd.plist; \
+			$(RMDIR) $(BUILDROOT)/System/Library/StartupItems/PrintingServices; \
+		else \
+			$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
+		fi \
+		$(RMDIR) $(BUILDROOT)$(INITDDIR); \
+	fi
+	if test "x$(SMFMANIFESTDIR)" != x; then \
+		echo Uninstalling SMF manifest in $(SMFMANIFESTDIR)...;\
+		$(RM) $(BUILDROOT)$(SMFMANIFESTDIR)/cups.xml; \
+	fi
+	if test "x$(DBUSDIR)" != x; then \
+		echo Uninstalling cups.conf in $(DBUSDIR)...;\
+		$(RM) $(BUILDROOT)$(DBUSDIR)/cups.conf; \
+		$(RMDIR) $(BUILDROOT)$(DBUSDIR); \
+	fi
+	if test "x$(XINETD)" != x; then \
+		echo Uninstalling xinetd configuration file for cups-lpd...; \
+		$(RM) $(BUILDROOT)$(XINETD)/cups-lpd; \
+	fi
+	if test "x$(MENUDIR)" != x; then \
+		echo Uninstalling desktop menu...; \
+		$(RM) $(BUILDROOT)$(MENUDIR)/cups.desktop; \
+	fi
+	if test "x$(ICONDIR)" != x; then \
+		echo Uninstalling desktop icons...; \
+		$(RM) $(BUILDROOT)$(ICONDIR)/hicolor/16x16/apps/cups.png; \
+		$(RM) $(BUILDROOT)$(ICONDIR)/hicolor/32x32/apps/cups.png; \
+		$(RM) $(BUILDROOT)$(ICONDIR)/hicolor/64x64/apps/cups.png; \
+		$(RM) $(BUILDROOT)$(ICONDIR)/hicolor/128x128/apps/cups.png; \
+	fi


 #
 # Run the test suite...
 #

-check test:	all
+test:	all unittests
 	echo Running CUPS test suite...
 	cd test; ./run-stp-tests.sh


+check:	all unittests
+	echo Running CUPS test suite with defaults...
+	cd test; ./run-stp-tests.sh 1 0 n
+
+
 #
-# Make software distributions using EPM (http://www.easysw.com/epm)...
+# Create HTML documentation...
 #

-EPMFLAGS	=	-v
+apihelp:
+	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

-aix:
-	epm $(EPMFLAGS) -f aix cups
+framedhelp:
+	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

-bsd:
-	epm $(EPMFLAGS) -f bsd cups
+
+#
+# Create an Xcode docset...
+#
+
+docset:	apihelp
+	echo Generating docset directory tree...
+	$(RM) -r org.cups.docset
+	mkdir -p org.cups.docset/Contents/Resources/Documentation/help
+	mkdir -p org.cups.docset/Contents/Resources/Documentation/images
+	cd man; $(MAKE) $(MFLAGS) html
+	cd doc; $(MAKE) $(MFLAGS) docset
+	cd cgi-bin; $(MAKE) $(MFLAGS) makedocset
+	cgi-bin/makedocset org.cups.docset \
+		`svnversion . | sed -e '1,$$s/[a-zA-Z]//g'` \
+		doc/help/api-*.tokens
+	$(RM) doc/help/api-*.tokens
+	echo Indexing docset...
+	/Developer/usr/bin/docsetutil index org.cups.docset
+	echo Generating docset archive and feed...
+	$(RM) org.cups.docset.atom
+	/Developer/usr/bin/docsetutil package --output org.cups.docset.xar \
+		--atom org.cups.docset.atom \
+		--download-url http://www.cups.org/org.cups.docset.xar \
+		org.cups.docset
+
+
+#
+# Make software distributions using EPM (http://www.epmhome.org/)...
+#
+
+EPMFLAGS	=	-v --output-dir dist $(EPMARCH)
+
+aix bsd deb depot inst pkg setld slackware swinstall tardist:
+	epm $(EPMFLAGS) -f $@ cups packaging/cups.list

 epm:
-	epm $(EPMFLAGS) cups
+	epm $(EPMFLAGS) -s packaging/installer.gif cups packaging/cups.list
+
+osx:
+	epm $(EPMFLAGS) -f osx -s packaging/installer.tif cups packaging/cups.list

 rpm:
-	epm $(EPMFLAGS) -f rpm cups
+	epm $(EPMFLAGS) -f rpm -s packaging/installer.gif cups packaging/cups.list

-deb:
-	epm $(EPMFLAGS) -f deb cups
+.PHONEY:	dist
+dist:	all
+	$(RM) -r dist
+	$(MAKE) $(MFLAGS) epm
+	case `uname` in \
+		*BSD*) $(MAKE) $(MFLAGS) bsd;; \
+		Darwin*) $(MAKE) $(MFLAGS) osx;; \
+		IRIX*) $(MAKE) $(MFLAGS) tardist;; \
+		Linux*) test ! -x /usr/bin/rpm || $(MAKE) $(MFLAGS) rpm;; \
+		SunOS*) $(MAKE) $(MFLAGS) pkg;; \
+	esac

-depot:
-	epm $(EPMFLAGS) -f depot cups

-pkg:
-	epm $(EPMFLAGS) -f pkg cups
+#
+# Don't run top-level build targets in parallel...
+#
+
+.NOTPARALLEL:

-tardist:
-	epm $(EPMFLAGS) -f tardist cups

 #
 # End of "$Id$".
@@ -1,283 +1,164 @@
-README - CUPS v1.1.19 - 05/27/2003
----------------------------------
+README - CUPS v1.4.7 - 2011-01-06
+---------------------------------

 Looking for compile instructions?  Read the file "INSTALL.txt"
 instead...

-**** IF YOU HAVE A NON-POSTSCRIPT PRINTER, YOU WILL ALSO  ****
-**** NEED TO INSTALL ESP GHOSTSCRIPT OR A PATCHED VERSION ****
-**** OF THE STANDARD GHOSTSCRIPT RELEASES.                ****
-

 INTRODUCTION

-CUPS provides a portable printing layer for UNIX(r)-based
-operating systems.  It has been developed by Easy Software
-Products to promote a standard printing solution for all UNIX
-vendors and users.  CUPS provides the System V and Berkeley
-command-line interfaces.
+    CUPS is a standards-based, open source printing system developed by Apple
+    Inc. for Mac OS® X and other UNIX®-like operating systems.  CUPS uses the
+    Internet Printing Protocol ("IPP") and provides System V and Berkeley
+    command-line interfaces, a web interface, and a C API to manage printers and
+    print jobs.  It supports printing to both local (parallel, serial, USB) and
+    networked printers, and printers can be shared from one computer to another,
+    even over the Internet!

-CUPS uses the Internet Printing Protocol ("IPP") as the basis
-for managing print jobs and queues.  The Line Printer Daemon
-("LPD") Server Message Block ("SMB"), and AppSocket (a.k.a.
-JetDirect) protocols are also supported with reduced
-functionality.  CUPS adds network printer browsing and
-PostScript Printer Description ("PPD") based printing options to
-support real-world printing under UNIX.
+    Internally, CUPS uses PostScript Printer Description ("PPD") files to
+    describe printer capabilities and features and a wide variety of generic
+    and device-specific programs to convert and print many types of files.
+    Sample drivers are included with CUPS to support many Dymo, EPSON, HP,
+    Intellitech, OKIDATA, and Zebra printers.  Many more drivers are available
+    online and (in some cases) on the driver CD-ROM that came with your printer.

-CUPS includes an image file RIP that supports printing of image
-files to non-PostScript printers.  A customized version of GNU
-Ghostscript 7.05 for CUPS called ESP Ghostscript is available
-separately to support printing of PostScript files within the
-CUPS driver framework.  Sample drivers for Dymo, EPSON, HP, and
-OKIDATA printers are included that use these filters.
-
-Drivers for thousands of printers are provided with our ESP
-Print Pro software, available at:
-
-	http://www.easysw.com/printpro
-
-CUPS is licensed under the GNU General Public License and GNU
-Library General Public License.  Please contact Easy Software
-Products for commercial support and "binary distribution"
-rights.
-
-
-SYSTEM REQUIREMENTS
-
-Binary distributions require a minimum of 10MB of free disk
-space. We do not recommend using CUPS on a workstation with less
-than 32MB of RAM or a PC with less than 16MB of RAM.
-
-If you are installing from source you'll need ANSI-compliant C
-and C++ compilers and optionally one or more image file support
-libraries.  Complete source installation instructions can be
-found in the file "INSTALL.txt".
-
-
-SOFTWARE REQUIREMENTS
-
-The following operating system software is required to install
-one of the binary distributions from Easy Software Products:
-
-    - AIX 4.3 or higher
-    - Compaq Tru64 UNIX (aka OSF1 aka Digital UNIX) 4.0 or higher
-    - HP-UX 10.20 or higher
-    - IRIX 5.3 or higher
-    - Linux 2.0 with glibc2 or higher
-    - Solaris 2.5 or higher (SPARC or Intel)
-
-
-INSTALLING "PORTABLE" CUPS DISTRIBUTIONS
-
-We are currently distributing "portable" CUPS binary
-distributions in TAR format with installation and removal
-scripts generated by our ESP Package Manager (EPM) software,
-which is available from:
-
-    http://www.easysw.com/epm
-
-WARNING: Installing CUPS will overwrite your existing printing
-system. Backup files are made by the installation script and
-restored by the removal script, so if you experience problems
-you should be able to remove the CUPS software to restore your
-previous configuration.  However, Easy Software Products makes
-no warranty for this and will not be liable for any lost
-revenues, etc.
-
-To install the CUPS software you will need to be logged in as
-root (doing an "su" is good enough).  Once you are the root
-user, run the installation script with:
-
-    ./cups.install ENTER
-
-After asking you a few yes/no questions the CUPS software will
-be installed and the scheduler will be started automatically.
-
-
-INSTALLING HOST-SPECIFIC (RPM, DEBIAN, ETC.) DISTRIBUTIONS
-
-The host-specific distributions use the operating system
-software installation tools.  To install a host-specific
-distribution please consult the CUPS Software Administrators
-Manual or your operating system documentation.
+    CUPS is licensed under the GNU General Public License and GNU Library
+    General Public License versions 2.  See the file "LICENSE.txt" for more
+    information.


 READING THE DOCUMENTATION

-Once you have installed the software you can access the
-documentation (and a bunch of other stuff) on-line at:
+    Once you have installed the software you can access the documentation (and
+    a bunch of other stuff) online at:

-    http://localhost:631
+	http://localhost:631/

-If you're having trouble getting that far, the documentation is
-located in the "/usr/share/doc/cups" directory in the binary
-distributions, and under the "doc" directory in the source
-archives.
+    If you're having trouble getting that far, the documentation is located
+    under the "doc/help" directory.

-Please read the documentation before asking questions.
+    Please read the documentation before asking questions.


 GETTING SUPPORT AND OTHER RESOURCES

-If you have problems, READ THE DOCUMENTATION FIRST!
+    If you have problems, READ THE DOCUMENTATION FIRST!  We also provide many
+    discussion forums which are available at:

-You can subscribe to the CUPS mailing list by sending a message
-containing "subscribe cups" to majordomo@cups.org.  This list is
-provided to discuss problems, questions, and improvements to the
-CUPS software.  New releases of CUPS are announced to this list
-as well.
+	http://www.cups.org/newsgroups.php

-Commercial support (with a guaranteed response time) is
-available from Easy Software Products.  For more information
-see:
-
-    http://www.easysw.com/cups
-
-See the CUPS web site at "http://www.cups.org" for other site
-links.
+    See the CUPS web site at "http://www.cups.org/" for other resources.


 SETTING UP PRINTER QUEUES USING YOUR WEB BROWSER

-CUPS 1.1 includes a new web-based administration tool that
-allows you to manage printers, classes, and jobs on your
-server.  To access the printer administration tools open the
-following URL in your browser:
+    CUPS includes a web-based administration tool that allows you to manage
+    printers, classes, and jobs on your server.  Open the following URL in your
+    browser to access the printer administration tools:

-    http://localhost:631/admin
+	http://localhost:631/admin/

-You will be asked for the administration password (root or any
-other user in the sys/system/root group on your system) and then
-shown a menu of available functions.
+    DO NOT use the hostname for your machine - it will not work with the default
+    CUPS configuration.  To enable administration access on other addresses,
+    check the "Allow Remote Administration" box and click on the "Change
+    Settings" button.

-DO NOT use the hostname for your machine - it will not work with
-the default CUPS configuration.  To enable administration access
-on other addresses, consult the CUPS Software Administrators
-Manual.
+    You will be asked for the administration password (root or any other user in
+    the sys/system/root/admin/lpadmin group on your system) when performing any
+    administrative function.


 SETTING UP PRINTER QUEUES FROM THE COMMAND-LINE

-CUPS works best with PPD (PostScript Printer Description)
-files.  In a pinch you can also use System V style printer
-interface scripts.
+    CUPS works best with PPD (PostScript Printer Description) files.  In a pinch
+    you can also use System V style printer interface scripts.

-Six sample PPD files are provided with this distribution that
-utilize the PostScript and image file RIPs and the sample EPSON
-and HP printer drivers.  To add the sample DeskJet driver to the
-system for a printer connected to the parallel port, use one of
-the following commands:
+    CUPS includes several sample PPD files you can use:

-    Digital UNIX:
+	Driver                         PPD Name
+	-----------------------------  ------------------------------
+	Dymo Label Printers            drv:///sample.drv/dymo.ppd
+	Intellitech Intellibar         drv:///sample.drv/intelbar.ppd
+	EPSON Stylus Color Series      drv:///sample.drv/stcolor.ppd
+	EPSON Stylus Photo Series      drv:///sample.drv/stphoto.ppd
+	EPSON Stylus New Color Series  drv:///sample.drv/stcolor2.ppd
+	EPSON Stylus New Photo Series  drv:///sample.drv/stphoto2.ppd
+	EPSON 9-pin Series             drv:///sample.drv/epson9.ppd
+	EPSON 24-pin Series            drv:///sample.drv/epson24.ppd
+	Generic PCL Laser Printer      drv:///sample.drv/generpcl.ppd
+	Generic PostScript Printer     drv:///sample.drv/generic.ppd
+	HP DeskJet Series              drv:///sample.drv/deskjet.ppd
+	HP LaserJet Series             drv:///sample.drv/laserjet.ppd
+	OKIDATA 9-Pin Series           drv:///sample.drv/okidata9.ppd
+	OKIDATA 24-Pin Series          drv:///sample.drv/okidat24.ppd
+	Zebra CPCL Label Printer       drv:///sample.drv/zebracpl.ppd
+	Zebra EPL1 Label Printer       drv:///sample.drv/zebraep1.ppd
+	Zebra EPL2 Label Printer       drv:///sample.drv/zebraep2.ppd
+	Zebra ZPL Label Printer        drv:///sample.drv/zebra.ppd

-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/lp0 -E
+    Run the "lpinfo -m" command to list the available drivers:

-    HP-UX:
+        lpinfo -m

-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/c2t0d0_lp -E
+    Run the "lpinfo -v" command to list the available printers:

-    IRIX:
+        lpinfo -v

-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/plp -E
+    Then use the correct URI to add the printer using the "lpadmin" command:

-    Linux:
+        lpadmin -p printername -E -v device-uri -m ppd-name

-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/lp0 -E
-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/lp1 -E
-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/lp2 -E
+    Network printers typically use "socket" or "lpd" URIs:

-    Solaris:
+        lpadmin -p printername -E -v socket://11.22.33.44 -m ppd-name
+        lpadmin -p printername -E -v lpd://11.22.33.44/ -m ppd-name

-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/bpp0 -E
-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/ecpp0 -E
+    The sample drivers provide basic printing capabilities, but generally do not
+    exercise the full potential of the printers or CUPS.  The CUPS web site
+    provides links and drivers:

-Similarly, for the other sample drivers you can use:
-
-    Driver                         PPD File
-    -----------------------------  ------------
-    Dymo Label Printers            dymo.ppd
-    EPSON Stylus Color Series      stcolor.ppd
-    EPSON Stylus Photo Series      stphoto.ppd
-    EPSON Stylus New Color Series  stcolor2.ppd
-    EPSON Stylus New Photo Series  stphoto2.ppd
-    EPSON 9-pin Series             epson9.ppd
-    EPSON 24-pin Series            epson24.ppd
-    HP DeskJet Series              deskjet.ppd
-    HP New DeskJet Series          deskjet2.ppd
-    HP LaserJet Series             laserjet.ppd
-    OKIDATA 9-Pin Series           okidata9.ppd
-    OKIDATA 24-Pin Series          okidat24.ppd
-
-These sample drivers provide basic printing capabilities, but
-generally do not exercise the full potential of the printers or
-CUPS.  For commercial printer drivers check out our ESP Print
-Pro software at:
-
-    http://www.easysw.com/printpro
+        http://www.cups.org/ppd.php      PPD files
+	http://www.cups.org/links.php    Links to other drivers


 PRINTING FILES

-CUPS provides both the System V "lp" and Berkeley "lpr" commands
-for printing:
+    CUPS provides both the System V "lp" and Berkeley "lpr" commands for
+    printing:

-    lp filename
-    lpr filename
+	lp filename
+	lpr filename

-Both the "lp" and "lpr" commands support printing options for
-the driver:
+    Both the "lp" and "lpr" commands support printing options for the driver:

-    lp -omedia=A4 -oresolution=600dpi filename
-    lpr -omedia=A4 -oresolution=600dpi filename
+	lp -o media=A4 -o resolution=600dpi filename
+	lpr -o media=A4 -o resolution=600dpi filename

-CUPS recognizes many types of images files as well as PDF,
-PostScript, HP-GL/2, and text files, so you can print those
-files directly rather than through an application.
+    CUPS recognizes many types of images files as well as PDF, PostScript,
+    HP-GL/2, and text files, so you can print those files directly rather than
+    through an application.

-If you have an application that generates output specifically
-for your printer then you need to use the "-oraw" or "-l"
-options:
+    If you have an application that generates output specifically for your
+    printer then you need to use the "-oraw" or "-l" options:

-    lp -oraw filename
-    lpr -l filename
+	lp -o raw filename
+	lpr -l filename

-This will prevent the filters from misinterpreting your print
-file.
+    This will prevent the filters from misinterpreting your print
+    file.


 LEGAL STUFF

-CUPS is Copyright 1993-2003 by Easy Software Products.  CUPS,
-the CUPS logo, and the Common UNIX Printing System are the
-trademark property of Easy Software Products.
+    CUPS is Copyright 2007-2011 by Apple Inc.  CUPS and the CUPS logo are
+    trademarks of Apple Inc.

-The MD5 Digest code is Copyright 1999 Aladdin Enterprises.
+    The MD5 Digest code is Copyright 1999 Aladdin Enterprises.

-The PDF filter (pdftops) is based on the Xpdf software,
-Copyright 1996-2002 by Derek B. Noonburg.
+    This software is based in part on the work of the Independent JPEG Group.

-This software is based in part on the work of the Independent
-JPEG Group.
-
-CUPS is provided under the terms 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 the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE.  See the "LICENSE.html",
-"LICENSE.txt", or "cups.license" files for more information.
-
-For commercial licensing information, please contact:
-
-    Attn: CUPS Licensing Information
-    Easy Software Products
-    44141 Airport View Drive, Suite 204
-    Hollywood, Maryland 20636-3111 USA
-
-    Voice: +1.301.373.9600
-    Email: cups-info@cups.org
-    WWW: http://www.cups.org
-
-Note that commercial licensors may also require a license from
-Derek B. Noonburg who developed the Xpdf software used to print
-PDF files.
+    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
+    the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+    See the "doc/help/license.html" or "LICENSE.txt" files for more information.
@@ -1,19 +0,0 @@
-README_fr - CUPS v1.1.19 - 04/08/2003
-------------------------------------
-
-Vous cherchez des instructions d'installation ? Lisez le fichier
-INSTALL.txt (anglais) et/ou reportez vous au "Manuel de
-l'administrateur" (en français) situé dans le sous-répertoire
-"doc/fr"
-
-Vous trouverez deux autres manuels en français dans ce
-sous-répertoire :
-
-	- Aperçu de CUPS
-	- Manuel de l'utilisateur
-
-Une fois CUPS installé, si vous configurez votre navigateur
-"web" pour que  la langue de base soit le français, vous
-disposerez également d'une interface "web" en français pour
-l'administration et d'utilistation de CUPS.
-
@@ -1,8 +0,0 @@
-betest
-ipp
-lpd
-parallel
-scsi
-serial
-socket
-usb
@@ -1,17 +1,76 @@
-# DO NOT DELETE
+# DO NOT DELETE THIS LINE -- make depend depends on it.

-betest.o: ../cups/string.h ../config.h
-ipp.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-ipp.o: ../cups/ppd.h ../cups/language.h ../cups/string.h ../config.h
-lpd.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-lpd.o: ../cups/ppd.h ../cups/string.h ../config.h
-parallel.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-parallel.o: ../cups/ppd.h ../cups/string.h ../config.h
-scsi.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-scsi.o: ../cups/ppd.h ../cups/string.h ../config.h
-serial.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-serial.o: ../cups/ppd.h ../cups/string.h ../config.h
-socket.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-socket.o: ../cups/ppd.h ../cups/string.h ../config.h
-usb.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-usb.o: ../cups/ppd.h ../cups/string.h ../config.h
+ipp.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/versioning.h
+ipp.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h backend-private.h
+ipp.o: ../cups/backend.h ../cups/sidechannel.h ../cups/ppd-private.h
+ipp.o: ../cups/cups.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+ipp.o: ../cups/language.h ../cups/debug.h ../cups/i18n.h ../cups/transcode.h
+ipp.o: ../cups/snmp-private.h ../cups/string.h
+lpd.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/versioning.h
+lpd.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h backend-private.h
+lpd.o: ../cups/backend.h ../cups/sidechannel.h ../cups/ppd-private.h
+lpd.o: ../cups/cups.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+lpd.o: ../cups/language.h ../cups/debug.h ../cups/i18n.h ../cups/transcode.h
+lpd.o: ../cups/snmp-private.h ../cups/string.h
+dnssd.o: backend-private.h ../cups/backend.h ../cups/versioning.h
+dnssd.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
+dnssd.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
+dnssd.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/i18n.h
+dnssd.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/string.h
+dnssd.o: ../config.h ../cups/array.h
+pap.o: ../config.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+pap.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+pap.o: ../cups/language.h ../cups/backend.h ../cups/sidechannel.h
+pap.o: ../cups/i18n.h ../cups/transcode.h
+parallel.o: backend-private.h ../cups/backend.h ../cups/versioning.h
+parallel.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
+parallel.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
+parallel.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/i18n.h
+parallel.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/string.h
+parallel.o: ../config.h
+scsi.o: ../cups/backend.h ../cups/versioning.h ../cups/cups.h ../cups/ipp.h
+scsi.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+scsi.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h
+scsi.o: ../cups/string.h ../config.h
+serial.o: backend-private.h ../cups/backend.h ../cups/versioning.h
+serial.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
+serial.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
+serial.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/i18n.h
+serial.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/string.h
+serial.o: ../config.h
+snmp.o: backend-private.h ../cups/backend.h ../cups/versioning.h
+snmp.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
+snmp.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
+snmp.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/i18n.h
+snmp.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/string.h
+snmp.o: ../config.h ../cups/array.h ../cups/file.h ../cups/http-private.h
+snmp.o: ../cups/md5.h ../cups/ipp-private.h
+socket.o: ../cups/http-private.h ../config.h ../cups/http.h
+socket.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+socket.o: ../cups/ipp.h backend-private.h ../cups/backend.h
+socket.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
+socket.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+socket.o: ../cups/debug.h ../cups/i18n.h ../cups/transcode.h
+socket.o: ../cups/snmp-private.h ../cups/string.h
+test1284.o: ../cups/string.h ../config.h ieee1284.c backend-private.h
+test1284.o: ../cups/backend.h ../cups/versioning.h ../cups/sidechannel.h
+test1284.o: ../cups/ppd-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+test1284.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+test1284.o: ../cups/debug.h ../cups/i18n.h ../cups/transcode.h
+test1284.o: ../cups/snmp-private.h
+testbackend.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
+testbackend.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h
+testbackend.o: ../cups/array.h ../cups/file.h ../cups/language.h
+testbackend.o: ../cups/sidechannel.h
+testsupplies.o: backend-private.h ../cups/backend.h ../cups/versioning.h
+testsupplies.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
+testsupplies.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
+testsupplies.o: ../cups/file.h ../cups/language.h ../cups/debug.h
+testsupplies.o: ../cups/i18n.h ../cups/transcode.h ../cups/snmp-private.h
+testsupplies.o: ../cups/string.h ../config.h
+usb.o: backend-private.h ../cups/backend.h ../cups/versioning.h
+usb.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
+usb.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
+usb.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/i18n.h
+usb.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/string.h
+usb.o: ../config.h
@@ -3,32 +3,27 @@
 #
 #   Backend makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+#   Copyright 2007-2009 by Apple Inc.
+#   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
-#
-#       Voice: (301) 373-9603
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   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.
 #

 include ../Makedefs

-BACKENDS =	ipp lpd parallel scsi serial socket usb
-TARGETS	=	betest $(BACKENDS)
-OBJS	=	betest.o ipp.o lpd.o parallel.o scsi.o serial.o socket.o usb.o
+RBACKENDS =	ipp lpd $(DNSSD_BACKEND)
+UBACKENDS =	$(PAP) $(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 pap.o parallel.o scsi.o serial.o snmp.o \
+		socket.o test1284.o testbackend.o testsupplies.o usb.o


 #
@@ -38,12 +33,26 @@ OBJS	=	betest.o ipp.o lpd.o parallel.o scsi.o serial.o socket.o usb.o
 all:	$(TARGETS)


+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:	$(UNITTESTS)
+
+
 #
 # Clean all object files...
 #

 clean:
-	$(RM) $(OBJS) $(TARGETS) http
+	$(RM) $(OBJS) $(TARGETS) $(UNITTESTS) $(LIBOBJS) http mdns


 #
@@ -58,31 +67,129 @@ depend:
 # Install all targets...
 #

-install:	all
-	$(INSTALL_DIR) $(SERVERBIN)/backend
-	for file in $(BACKENDS); do \
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
+
+
+#
+# Install programs...
+#
+
+install-exec:
+	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
+	for file in $(RBACKENDS); do \
+		$(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
+	done
+	for file in $(UBACKENDS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
 	done
 	$(RM) $(SERVERBIN)/backend/http
 	$(LN) ipp $(SERVERBIN)/backend/http
+	if test "x$(DNSSD_BACKEND)" != x; then \
+		$(RM) $(SERVERBIN)/backend/mdns; \
+		$(LN) $(DNSSD_BACKEND) $(SERVERBIN)/backend/mdns; \
+	fi
+	if test "x$(SYMROOT)" != "x"; then \
+		$(INSTALL_DIR) $(SYMROOT); \
+		for file in $(TARGETS); do \
+			cp $$file $(SYMROOT); \
+		done \
+	fi


 #
-# betest
+# Install headers...
 #

-betest:	betest.o ../cups/$(LIBCUPS)
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall all targets...
+#
+
+uninstall:
+	for file in $(RBACKENDS) $(UBACKENDS); do \
+		$(RM) $(SERVERBIN)/backend/$$file; \
+	done
+	$(RM) $(SERVERBIN)/backend/http
+	-$(RMDIR) $(SERVERBIN)/backend
+	-$(RMDIR) $(SERVERBIN)
+
+
+#
+# test1284
+#
+
+test1284:	test1284.o ../cups/libcups.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o betest betest.o $(LIBS)
+	$(CC) $(LDFLAGS) -o test1284 test1284.o ../cups/libcups.a \
+		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+
+
+#
+# testbackend
+#
+
+testbackend:	testbackend.o ../cups/libcups.a
+	echo Linking $@...
+	$(CC) $(LDFLAGS) -o testbackend testbackend.o ../cups/libcups.a \
+		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+
+
+#
+# testsupplies
+#
+
+testsupplies:	testsupplies.o libbackend.a ../cups/libcups.a
+	echo Linking $@...
+	$(CC) $(LDFLAGS) -o testsupplies testsupplies.o libbackend.a \
+		../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
+		$(COMMONLIBS) $(LIBZ)
+
+
+#
+# libbackend.a
+#
+
+libbackend.a:	$(LIBOBJS)
+	echo Archiving $@...
+	$(RM) $@
+	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
+	$(RANLIB) $@
+
+
+#
+# dnssd
+#
+
+dnssd:	dnssd.o ../cups/$(LIBCUPS) libbackend.a
+	echo Linking $@...
+	$(CC) $(LDFLAGS) -o dnssd dnssd.o libbackend.a $(LIBS)
+	$(RM) mdns
+	$(LN) dnssd mdns


 #
 # ipp
 #

-ipp:	ipp.o ../cups/$(LIBCUPS)
+ipp:	ipp.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o ipp ipp.o $(LIBS)
+	$(CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS)
 	$(RM) http
 	$(LN) ipp http

@@ -91,18 +198,27 @@ ipp:	ipp.o ../cups/$(LIBCUPS)
 # lpd
 #

-lpd:	lpd.o ../cups/$(LIBCUPS)
+lpd:	lpd.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o lpd lpd.o $(LIBS)
+	$(CC) $(LDFLAGS) -o lpd lpd.o libbackend.a $(LIBS)
+
+
+#
+# pap
+#
+
+pap:	pap.o ../cups/$(LIBCUPS)
+	echo Linking $@...
+	$(CC) $(LDFLAGS) -o pap pap.o $(BACKLIBS) $(LIBS) -framework AppleTalk


 #
 # parallel
 #

-parallel:	parallel.o ../cups/$(LIBCUPS)
+parallel:	parallel.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o parallel parallel.o $(LIBS)
+	$(CC) $(LDFLAGS) -o parallel parallel.o libbackend.a $(LIBS)


 #
@@ -120,27 +236,38 @@ scsi.o:	scsi.c scsi-irix.c scsi-linux.c
 # serial
 #

-serial:	serial.o ../cups/$(LIBCUPS)
+serial:	serial.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o serial serial.o $(BACKLIBS) $(LIBS)
+	$(CC) $(LDFLAGS) -o serial serial.o libbackend.a $(BACKLIBS) $(LIBS)
+
+
+#
+# snmp
+#
+
+snmp:	snmp.o ../cups/$(LIBCUPS) libbackend.a
+	echo Linking $@...
+	$(CC) $(LDFLAGS) -o snmp snmp.o libbackend.a $(LIBS)


 #
 # socket
 #

-socket:	socket.o ../cups/$(LIBCUPS)
+socket:	socket.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o socket socket.o $(LIBS)
+	$(CC) $(LDFLAGS) -o socket socket.o libbackend.a $(LIBS)


 #
 # usb
 #

-usb:	usb.o ../cups/$(LIBCUPS)
+usb:	usb.o ../cups/$(LIBCUPS) libbackend.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o usb usb.o $(BACKLIBS) $(LIBS)
+	$(CC) $(LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB) \
+		$(BACKLIBS) $(LIBS)
+usb.o:	usb.c usb-darwin.c usb-libusb.c usb-unix.c


 #
@@ -0,0 +1,322 @@
+/*
+ * "$Id$"
+ *
+ *   Backend support definitions for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 2007-2009 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.
+ */
+
+#ifndef _CUPS_BACKEND_PRIVATE_H_
+#  define _CUPS_BACKEND_PRIVATE_H_
+
+
+/*
+ * Include necessary headers.
+ */
+
+#  include <cups/backend.h>
+#  include <cups/sidechannel.h>
+#  include <cups/ppd-private.h>
+#  include <cups/debug.h>
+#  include <cups/i18n.h>
+#  include <cups/snmp-private.h>
+#  include <stdlib.h>
+#  include <errno.h>
+#  include <cups/string.h>
+#  include <signal.h>
+
+#  ifdef __linux
+#    include <sys/ioctl.h>
+#    include <linux/lp.h>
+#    define IOCNR_GET_DEVICE_ID		1
+#    define LPIOC_GET_DEVICE_ID(len)	_IOC(_IOC_READ, 'P', IOCNR_GET_DEVICE_ID, len)
+#    include <linux/parport.h>
+#    include <linux/ppdev.h>
+#    include <unistd.h>
+#    include <fcntl.h>
+#  endif /* __linux */
+
+#  ifdef __sun
+#    ifdef __sparc
+#      include <sys/ecppio.h>
+#    else
+#      include <sys/ioccom.h>
+#      include <sys/ecppsys.h>
+#    endif /* __sparc */
+#  endif /* __sun */
+
+
+/*
+ * C++ magic...
+ */
+
+#  ifdef __cplusplus
+extern "C" {
+#  endif /* __cplusplus */
+
+
+/*
+ * OID constants...
+ */
+
+/* Host MIB */
+#define CUPS_OID_mib2				1,3,6,1,2,1
+
+#define CUPS_OID_system				CUPS_OID_mib2,1
+#define CUPS_OID_sysLocation			CUPS_OID_system,6
+
+#define CUPS_OID_host				CUPS_OID_mib2,25
+
+#define CUPS_OID_hrSystem			CUPS_OID_host,1
+
+#define CUPS_OID_hrStorage			CUPS_OID_host,2
+
+#define CUPS_OID_hrDevice			CUPS_OID_host,3
+#define CUPS_OID_hrDeviceTable			CUPS_OID_hrDevice,2
+#define CUPS_OID_hrDeviceEntry			CUPS_OID_hrDeviceTable,1
+#define CUPS_OID_hrDeviceIndex			CUPS_OID_hrDeviceEntry,1
+#define CUPS_OID_hrDeviceType			CUPS_OID_hrDeviceEntry,2
+#define CUPS_OID_hrDeviceDescr			CUPS_OID_hrDeviceEntry,3
+
+#define CUPS_OID_hrPrinterTable			CUPS_OID_hrDevice,5
+#define CUPS_OID_hrPrinterEntry			CUPS_OID_hrPrinterTable,1
+#define CUPS_OID_hrPrinterStatus		CUPS_OID_hrPrinterEntry,1
+#define CUPS_OID_hrPrinterDetectedErrorState	CUPS_OID_hrPrinterEntry,2
+
+/* Printer MIB */
+#define CUPS_OID_printmib			CUPS_OID_mib2,43
+
+#define CUPS_OID_prtGeneral			CUPS_OID_printmib,5
+#define CUPS_OID_prtGeneralTable		CUPS_OID_prtGeneral,1
+#define CUPS_OID_prtGeneralEntry		CUPS_OID_prtGeneralTable,1
+#define CUPS_OID_prtGeneralCurrentLocalization	CUPS_OID_prtGeneralEntry,2
+#define CUPS_OID_prtGeneralPrinterName		CUPS_OID_prtGeneralEntry,16
+#define CUPS_OID_prtGeneralSerialNumber		CUPS_OID_prtGeneralEntry,17
+
+#define CUPS_OID_prtCover			CUPS_OID_printmib,6
+#define CUPS_OID_prtCoverTable			CUPS_OID_prtCover,1
+#define CUPS_OID_prtCoverEntry			CUPS_OID_prtCoverTable,1
+#define CUPS_OID_prtCoverDescription		CUPS_OID_prtCoverEntry,2
+#define CUPS_OID_prtCoverStatus			CUPS_OID_prtCoverEntry,3
+
+#define CUPS_OID_prtLocalization		CUPS_OID_printmib,7
+#define CUPS_OID_prtLocalizationTable		CUPS_OID_prtLocalization,1
+#define CUPS_OID_prtLocalizationEntry		CUPS_OID_prtLocalizationTable,1
+#define CUPS_OID_prtLocalizationCharacterSet	CUPS_OID_prtLocalizationEntry,4
+
+#define CUPS_OID_prtMarker			CUPS_OID_printmib,10
+#define CUPS_OID_prtMarkerTable			CUPS_OID_prtMarker,2
+#define CUPS_OID_prtMarkerEntry			CUPS_OID_prtMarkerTable,1
+#define CUPS_OID_prtMarkerLifeCount		CUPS_OID_prtMarkerEntry,4
+
+#define CUPS_OID_prtMarkerSupplies		CUPS_OID_printmib,11
+#define CUPS_OID_prtMarkerSuppliesTable		CUPS_OID_prtMarkerSupplies,1
+#define CUPS_OID_prtMarkerSuppliesEntry		CUPS_OID_prtMarkerSuppliesTable,1
+#define CUPS_OID_prtMarkerSuppliesIndex		CUPS_OID_prtMarkerSuppliesEntry,1
+#define CUPS_OID_prtMarkerSuppliesMarkerIndex	CUPS_OID_prtMarkerSuppliesEntry,2
+#define CUPS_OID_prtMarkerSuppliesColorantIndex	CUPS_OID_prtMarkerSuppliesEntry,3
+#define CUPS_OID_prtMarkerSuppliesClass		CUPS_OID_prtMarkerSuppliesEntry,4
+#define CUPS_OID_prtMarkerSuppliesType		CUPS_OID_prtMarkerSuppliesEntry,5
+#define CUPS_OID_prtMarkerSuppliesDescription	CUPS_OID_prtMarkerSuppliesEntry,6
+#define CUPS_OID_prtMarkerSuppliesSupplyUnit	CUPS_OID_prtMarkerSuppliesEntry,7
+#define CUPS_OID_prtMarkerSuppliesMaxCapacity	CUPS_OID_prtMarkerSuppliesEntry,8
+#define CUPS_OID_prtMarkerSuppliesLevel		CUPS_OID_prtMarkerSuppliesEntry,9
+
+#define CUPS_OID_prtMarkerColorant		CUPS_OID_printmib,12
+#define CUPS_OID_prtMarkerColorantTable		CUPS_OID_prtMarkerColorant,1
+#define CUPS_OID_prtMarkerColorantEntry		CUPS_OID_prtMarkerColorantTable,1
+#define CUPS_OID_prtMarkerColorantIndex		CUPS_OID_prtMarkerColorantEntry,1
+#define CUPS_OID_prtMarkerColorantMarkerIndex	CUPS_OID_prtMarkerColorantEntry,2
+#define CUPS_OID_prtMarkerColorantRole		CUPS_OID_prtMarkerColorantEntry,3
+#define CUPS_OID_prtMarkerColorantValue		CUPS_OID_prtMarkerColorantEntry,4
+#define CUPS_OID_prtMarkerColorantTonality	CUPS_OID_prtMarkerColorantEntry,5
+
+#define CUPS_OID_prtInterpreter			CUPS_OID_printmib,15
+#define CUPS_OID_prtInterpreterTable		CUPS_OID_prtInterpreter,1
+#define CUPS_OID_prtInterpreterEntry		CUPS_OID_prtInterpreterTable,1
+#define CUPS_OID_prtInterpreterLangFamily	CUPS_OID_prtInterpreterEntry,2
+#define CUPS_OID_prtInterpreterLangLevel	CUPS_OID_prtInterpreterEntry,3
+
+/* Printer Port Monitor MIB */
+#define CUPS_OID_enterprises			1,3,6,1,4,1
+#define CUPS_OID_pwg				CUPS_OID_enterprises,2699,1
+#define CUPS_OID_ppmMIB				CUPS_OID_pwg,2
+#define CUPS_OID_ppmMIBObjects			CUPS_OID_ppmMIB,1
+
+#define CUPS_OID_ppmGeneral			CUPS_OID_ppmMIBObjects,1
+
+#define CUPS_OID_ppmPrinter			CUPS_OID_ppmMIBObjects,2
+#define CUPS_OID_ppmPrinterTable		CUPS_OID_ppmPrinter,1
+#define CUPS_OID_ppmPrinterEntry		CUPS_OID_ppmPrinterTable,1
+#define CUPS_OID_ppmPrinterIndex		CUPS_OID_ppmPrinterEntry,1
+#define CUPS_OID_ppmPrinterName			CUPS_OID_ppmPrinterEntry,2
+#define CUPS_OID_ppmPrinterIEEE1284DeviceId	CUPS_OID_ppmPrinterEntry,3
+#define CUPS_OID_ppmPrinterNumberOfPorts	CUPS_OID_ppmPrinterEntry,4
+#define CUPS_OID_ppmPrinterPreferredPortIndex	CUPS_OID_ppmPrinterEntry,5
+#define CUPS_OID_ppmPrinterHrDeviceIndex	CUPS_OID_ppmPrinterEntry,6
+#define CUPS_OID_ppmPrinterSnmpCommunityName	CUPS_OID_ppmPrinterEntry,7
+#define CUPS_OID_ppmPrinterSnmpQueryEnabled	CUPS_OID_ppmPrinterEntry,8
+
+#define CUPS_OID_ppmPort			CUPS_OID_ppmMIBObjects,3
+#define CUPS_OID_ppmPortTable			CUPS_OID_ppmPort,1
+#define CUPS_OID_ppmPortEntry			CUPS_OID_ppmPortTable,1
+#define CUPS_OID_ppmPortIndex			CUPS_OID_ppmPortEntry,1
+#define CUPS_OID_ppmPortEnabled			CUPS_OID_ppmPortEntry,2
+#define CUPS_OID_ppmPortName			CUPS_OID_ppmPortEntry,3
+#define CUPS_OID_ppmPortServiceNameOrURI	CUPS_OID_ppmPortEntry,4
+#define CUPS_OID_ppmPortProtocolType		CUPS_OID_ppmPortEntry,5
+#define CUPS_OID_ppmPortProtocolTargetPort	CUPS_OID_ppmPortEntry,6
+#define CUPS_OID_ppmPortProtocolAltSourceEnabled CUPS_OID_ppmPortEntry,7
+#define CUPS_OID_ppmPortPrtChannelIndex		CUPS_OID_ppmPortEntry,8
+#define CUPS_OID_ppmPortLprByteCountEnabled	CUPS_OID_ppmPortEntry,9
+
+
+/*
+ * State constants...
+ */
+
+#define CUPS_TC_other				1
+#define CUPS_TC_unknown				2
+
+#define CUPS_TC_idle				3
+#define CUPS_TC_printing			4
+#define CUPS_TC_warmup				5
+
+/* These come from the hrPrinterDetectedErrorState OCTET-STRING */
+#define CUPS_TC_lowPaper			0x8000
+#define CUPS_TC_noPaper				0x4000
+#define CUPS_TC_lowToner			0x2000
+#define CUPS_TC_noToner				0x1000
+#define CUPS_TC_doorOpen			0x0800
+#define CUPS_TC_jammed				0x0400
+#define CUPS_TC_offline				0x0200
+#define CUPS_TC_serviceRequested		0x0100
+#define CUPS_TC_inputTrayMissing		0x0080
+#define CUPS_TC_outputTrayMissing		0x0040
+#define CUPS_TC_markerSupplyMissing		0x0020
+#define CUPS_TC_outputNearFull			0x0010
+#define CUPS_TC_outputFull			0x0008
+#define CUPS_TC_inputTrayEmpty			0x0004
+#define CUPS_TC_overduePreventMaint		0x0002
+
+#define CUPS_TC_prtCoverStatus_coverOpen	3
+#define CUPS_TC_prtCoverStatus_coverClosed	4
+#define CUPS_TC_prtCoverStatus_interlockOpen	5
+#define CUPS_TC_prtCoverStatus_interlockClosed	6
+
+#define CUPS_TC_langPCL				3
+#define CUPS_TC_langHPGL			4
+#define CUPS_TC_langPJL				5
+#define CUPS_TC_langPS				6
+#define CUPS_TC_langEscapeP			9
+#define CUPS_TC_langCCITT			26
+#define CUPS_TC_langLIPS			39
+#define CUPS_TC_langTIFF			40
+#define CUPS_TC_langPCLXL			47
+#define CUPS_TC_langPDF				54
+#define CUPS_TC_langJPEG			61
+
+#define CUPS_TC_supplyThatIsConsumed		3
+#define CUPS_TC_receptacleThatIsFilled		4
+
+#define CUPS_TC_process				3
+#define CUPS_TC_spot				4
+
+#define CUPS_TC_toner				3
+#define CUPS_TC_wasteToner			4
+#define CUPS_TC_ink				5
+#define CUPS_TC_inkCartridge			6
+#define CUPS_TC_inkRibbon			7
+#define CUPS_TC_wasteInk			8
+#define CUPS_TC_opc				9
+#define CUPS_TC_developer			10
+#define CUPS_TC_fuserOil			11
+#define CUPS_TC_solidWax			12
+#define CUPS_TC_ribbonWax			13
+#define CUPS_TC_wasteWax			14
+#define CUPS_TC_fuser				15
+#define CUPS_TC_coronaWire			16
+#define CUPS_TC_fuserOilWick			17
+#define CUPS_TC_cleanerUnit			18
+#define CUPS_TC_fuserCleaningPad		19
+#define CUPS_TC_transferUnit			20
+#define CUPS_TC_tonerCartridge			21
+#define CUPS_TC_fuserOiler			22
+#define CUPS_TC_water				23
+#define CUPS_TC_wasteWater			24
+#define CUPS_TC_glueWaterAdditive		25
+#define CUPS_TC_wastePaper			26
+#define CUPS_TC_bindingSupply			27
+#define CUPS_TC_bandingSupply			28
+#define CUPS_TC_stitchingWire			29
+#define CUPS_TC_shrinkWrap			30
+#define CUPS_TC_paperWrap			31
+#define CUPS_TC_staples				32
+#define CUPS_TC_inserts				33
+#define CUPS_TC_covers				34
+
+/* These come from RFC 3808 to define character sets we support */
+/* Also see http://www.iana.org/assignments/character-sets */
+#define CUPS_TC_csASCII				3
+#define CUPS_TC_csISOLatin1			4
+#define CUPS_TC_csShiftJIS			17
+#define CUPS_TC_csUTF8				106
+#define CUPS_TC_csUnicode			1000 /* UCS2 BE */
+#define CUPS_TC_csUCS4				1001 /* UCS4 BE */
+#define CUPS_TC_csUnicodeASCII			1002
+#define CUPS_TC_csUnicodeLatin1			1003
+#define CUPS_TC_csUTF16BE			1013
+#define CUPS_TC_csUTF16LE			1014
+#define CUPS_TC_csUTF32				1017
+#define CUPS_TC_csUTF32BE			1018
+#define CUPS_TC_csUTF32LE			1019
+
+
+/*
+ * Prototypes...
+ */
+
+extern void		backendCheckSideChannel(int snmp_fd, http_addr_t *addr);
+extern int		backendDrainOutput(int print_fd, int device_fd);
+extern int		backendGetDeviceID(int fd, char *device_id,
+			                   int device_id_size,
+			                   char *make_model,
+					   int make_model_size,
+					   const char *scheme, char *uri,
+					   int uri_size);
+extern int		backendGetMakeModel(const char *device_id,
+			                    char *make_model,
+				            int make_model_size);
+extern int		backendNetworkSideCB(int print_fd, int device_fd,
+			                     int snmp_fd, http_addr_t *addr,
+					     int use_bc);
+extern ssize_t		backendRunLoop(int print_fd, int device_fd, int snmp_fd,
+			               http_addr_t *addr, int use_bc, 
+			               int update_state, 
+				       int (*side_cb)(int print_fd,
+				                      int device_fd,
+						      int snmp_fd,
+						      http_addr_t *addr,
+						      int use_bc));
+extern int		backendSNMPSupplies(int snmp_fd, http_addr_t *addr,
+			                    int *page_count,
+					    int *printer_state);
+
+#  ifdef __cplusplus
+}
+#  endif /* __cplusplus */
+#endif /* !_CUPS_BACKEND_PRIVATE_H_ */
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,87 +0,0 @@
-/*
- * "$Id$"
- *
- *   Backend test program for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 1997-2003 by Easy Software Products, all rights reserved.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   main() - Run the named backend.
- */
-
-/*
- * Include necessary headers.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <cups/string.h>
-#include <unistd.h>
-
-
-/*
- * 'main()' - Run the named backend.
- *
- * Usage:
- *
- *    betest device-uri job-id user title copies options [file]
- */
-
-int			/* O - Exit status */
-main(int  argc,		/* I - Number of command-line arguments (7 or 8) */
-     char *argv[])	/* I - Command-line arguments */
-{
-  char		backend[255];	/* Method in URI */
-
-
-  if (argc < 7 || argc > 8)
-  {
-    fputs("Usage: betest device-uri job-id user title copies options [file]\n",
-          stderr);
-    return (1);
-  }
-
- /*
-  * Extract the method from the device-uri - that's the program we want to
-  * execute.
-  */
-
-  if (sscanf(argv[1], "%254[^:]", backend) != 1)
-  {
-    fputs("betest: Bad device-uri - no colon!\n", stderr);
-    return (1);
-  }
-
- /*
-  * Execute and return
-  */
-
-  execl(backend, argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7],
-        NULL);
-
-  return (1);
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -0,0 +1,912 @@
+/*
+ * "$Id$"
+ *
+ *   DNS-SD discovery backend for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 2008-2009 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"
+ *   "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()                  - Browse for printers.
+ *   browse_callback()       - Browse devices.
+ *   browse_local_callback() - Browse local devices.
+ *   compare_devices()       - Compare two devices.
+ *   exec_backend()          - Execute the backend that corresponds to the
+ *                             resolved service name.
+ *   get_device()            - Create or update a device.
+ *   query_callback()        - Process query data.
+ *   sigterm_handler()       - Handle termination signals...
+ *   unquote()               - Unquote a name string.
+ */
+
+/*
+ * Include necessary headers.
+ */
+
+#include "backend-private.h"
+#include <cups/array.h>
+#include <dns_sd.h>
+
+
+/*
+ * Device structure...
+ */
+
+typedef enum
+{
+  CUPS_DEVICE_PRINTER = 0,		/* lpd://... */
+  CUPS_DEVICE_IPP,			/* ipp://... */
+  CUPS_DEVICE_FAX_IPP,			/* ipp://... */
+  CUPS_DEVICE_PDL_DATASTREAM,		/* socket://... */
+  CUPS_DEVICE_RIOUSBPRINT		/* riousbprint://... */
+} cups_devtype_t;
+
+
+typedef struct
+{
+  DNSServiceRef	ref;			/* Service reference for resolve */
+  char		*name,			/* Service name */
+		*domain,		/* Domain name */
+		*fullName,		/* Full name */
+		*make_and_model,	/* Make and model from TXT record */
+		*device_id;		/* 1284 device ID from TXT record */
+  cups_devtype_t type;			/* Device registration type */
+  int		priority,		/* Priority associated with type */
+		cups_shared,		/* CUPS shared printer? */
+		sent;			/* Did we list the device? */
+} cups_device_t;
+
+
+/*
+ * Local globals...
+ */
+
+static int		job_canceled = 0;
+					/* Set to 1 on SIGTERM */
+
+
+/*
+ * Local functions...
+ */
+
+static void		browse_callback(DNSServiceRef sdRef,
+			                DNSServiceFlags flags,
+				        uint32_t interfaceIndex,
+				        DNSServiceErrorType errorCode,
+				        const char *serviceName,
+				        const char *regtype,
+				        const char *replyDomain, void *context);
+static void		browse_local_callback(DNSServiceRef sdRef,
+					      DNSServiceFlags flags,
+					      uint32_t interfaceIndex,
+					      DNSServiceErrorType errorCode,
+					      const char *serviceName,
+					      const char *regtype,
+					      const char *replyDomain,
+					      void *context);
+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);
+static void		query_callback(DNSServiceRef sdRef,
+			               DNSServiceFlags flags,
+				       uint32_t interfaceIndex,
+				       DNSServiceErrorType errorCode,
+				       const char *fullName, uint16_t rrtype,
+				       uint16_t rrclass, uint16_t rdlen,
+				       const void *rdata, uint32_t ttl,
+				       void *context);
+static void		sigterm_handler(int sig);
+static void		unquote(char *dst, const char *src, size_t dstsize);
+
+
+/*
+ * 'main()' - Browse for printers.
+ */
+
+int					/* O - Exit status */
+main(int  argc,				/* I - Number of command-line args */
+     char *argv[])			/* I - Command-line arguments */
+{
+  const char	*name;			/* Backend name */
+  DNSServiceRef	main_ref,		/* Main service reference */
+		fax_ipp_ref,		/* IPP fax service reference */
+		ipp_ref,		/* IPP service reference */
+		ipp_tls_ref,		/* IPP w/TLS service reference */
+		local_fax_ipp_ref,	/* Local IPP fax service reference */
+		local_ipp_ref,		/* Local IPP service reference */
+		local_ipp_tls_ref,	/* Local IPP w/TLS service reference */
+		local_printer_ref,	/* Local LPD service reference */
+		pdl_datastream_ref,	/* AppSocket service reference */
+		printer_ref,		/* LPD service reference */
+		riousbprint_ref;	/* Remote IO service reference */
+  int		fd;			/* Main file descriptor */
+  fd_set	input;			/* Input set for select() */
+  struct timeval timeout;		/* Timeout for select() */
+  cups_array_t	*devices;		/* Device array */
+  cups_device_t	*device;		/* Current device */
+  char		uriName[1024];		/* Unquoted fullName for URI */
+#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
+  struct sigaction action;		/* Actions for POSIX signals */
+#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
+
+
+ /*
+  * Don't buffer stderr, and catch SIGTERM...
+  */
+
+  setbuf(stderr, NULL);
+
+#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
+  sigset(SIGTERM, sigterm_handler);
+#elif defined(HAVE_SIGACTION)
+  memset(&action, 0, sizeof(action));
+
+  sigemptyset(&action.sa_mask);
+  action.sa_handler = sigterm_handler;
+  sigaction(SIGTERM, &action, NULL);
+#else
+  signal(SIGTERM, sigterm_handler);
+#endif /* HAVE_SIGSET */
+
+ /*
+  * Check command-line...
+  */
+
+  if (argc >= 6)
+    exec_backend(argv);
+  else if (argc != 1)
+  {
+    fprintf(stderr, "Usage: %s job user title copies options [filename(s)]\n",
+            argv[0]);
+    return (1);
+  }
+
+ /*
+  * Only do discovery when run as "dnssd"...
+  */
+
+  if ((name = strrchr(argv[0], '/')) != NULL)
+    name ++;
+  else
+    name = argv[0];
+
+  if (strcmp(name, "dnssd"))
+    return (0);
+
+ /*
+  * Create an array to track devices...
+  */
+
+  devices = cupsArrayNew((cups_array_func_t)compare_devices, NULL);
+
+ /*
+  * Browse for different kinds of printers...
+  */
+
+  if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError)
+  {
+    perror("ERROR: Unable to create service connection");
+    return (1);
+  }
+
+  fd = DNSServiceRefSockFD(main_ref);
+
+  fax_ipp_ref = main_ref;
+  DNSServiceBrowse(&fax_ipp_ref, kDNSServiceFlagsShareConnection, 0,
+                   "_fax-ipp._tcp", NULL, browse_callback, devices);
+
+  ipp_ref = main_ref;
+  DNSServiceBrowse(&ipp_ref, kDNSServiceFlagsShareConnection, 0,
+                   "_ipp._tcp", NULL, browse_callback, devices);
+
+  ipp_tls_ref = main_ref;
+  DNSServiceBrowse(&ipp_tls_ref, kDNSServiceFlagsShareConnection, 0,
+                   "_ipp-tls._tcp", NULL, browse_callback, devices);
+
+  local_fax_ipp_ref = main_ref;
+  DNSServiceBrowse(&local_fax_ipp_ref, kDNSServiceFlagsShareConnection,
+                   kDNSServiceInterfaceIndexLocalOnly,
+		   "_fax-ipp._tcp", NULL, browse_local_callback, devices);
+
+  local_ipp_ref = main_ref;
+  DNSServiceBrowse(&local_ipp_ref, kDNSServiceFlagsShareConnection,
+                   kDNSServiceInterfaceIndexLocalOnly,
+		   "_ipp._tcp", NULL, browse_local_callback, devices);
+
+  local_ipp_tls_ref = main_ref;
+  DNSServiceBrowse(&local_ipp_tls_ref, kDNSServiceFlagsShareConnection,
+                   kDNSServiceInterfaceIndexLocalOnly,
+                   "_ipp-tls._tcp", NULL, browse_local_callback, devices);
+
+  local_printer_ref = main_ref;
+  DNSServiceBrowse(&local_printer_ref, kDNSServiceFlagsShareConnection,
+                   kDNSServiceInterfaceIndexLocalOnly,
+                   "_printer._tcp", NULL, browse_local_callback, devices);
+
+  pdl_datastream_ref = main_ref;  
+  DNSServiceBrowse(&pdl_datastream_ref, kDNSServiceFlagsShareConnection, 0,
+                   "_pdl-datastream._tcp", NULL, browse_callback, devices);
+
+  printer_ref = main_ref;
+  DNSServiceBrowse(&printer_ref, kDNSServiceFlagsShareConnection, 0,
+                   "_printer._tcp", NULL, browse_callback, devices);
+
+  riousbprint_ref = main_ref;
+  DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0,
+                   "_riousbprint._tcp", NULL, browse_callback, devices);
+
+ /*
+  * Loop until we are killed...
+  */
+
+  while (!job_canceled)
+  {
+    FD_ZERO(&input);
+    FD_SET(fd, &input);
+
+    timeout.tv_sec  = 1;
+    timeout.tv_usec = 0;
+
+    if (select(fd + 1, &input, NULL, NULL, &timeout) < 0)
+      continue;
+
+    if (FD_ISSET(fd, &input))
+    {
+     /*
+      * Process results of our browsing...
+      */
+
+      DNSServiceProcessResult(main_ref);
+    }
+    else
+    {
+     /*
+      * Announce any devices we've found...
+      */
+
+      DNSServiceErrorType status;	/* DNS query status */
+      cups_device_t *best;		/* Best matching device */
+      char	device_uri[1024];	/* Device URI */
+      int	count;			/* Number of queries */
+
+
+      for (device = (cups_device_t *)cupsArrayFirst(devices),
+               best = NULL, count = 0;
+           device;
+	   device = (cups_device_t *)cupsArrayNext(devices))
+        if (!device->ref && !device->sent)
+	{
+	 /*
+	  * Found the device, now get the TXT record(s) for it...
+	  */
+
+          if (count < 10)
+	  {
+	    device->ref = main_ref;
+
+	    fprintf(stderr, "DEBUG: Querying \"%s\"...\n", device->fullName);
+
+	    status = DNSServiceQueryRecord(&(device->ref),
+				           kDNSServiceFlagsShareConnection,
+				           0, device->fullName,
+					   kDNSServiceType_TXT,
+				           kDNSServiceClass_IN, query_callback,
+				           devices);
+            if (status != kDNSServiceErr_NoError)
+	    {
+	      fputs("ERROR: Unable to query for TXT records!\n", stderr);
+	      fprintf(stderr, "DEBUG: DNSServiceQueryRecord returned %d\n",
+	              status);
+            }
+	    else
+	      count ++;
+          }
+	}
+	else if (!device->sent)
+	{
+	 /*
+	  * Got the TXT records, now report the device...
+	  */
+
+	  DNSServiceRefDeallocate(device->ref);
+	  device->ref = 0;
+
+          if (!best)
+	    best = device;
+	  else if (strcasecmp(best->name, device->name) ||
+	           strcasecmp(best->domain, device->domain))
+          {
+	    unquote(uriName, best->fullName, sizeof(uriName));
+
+	    httpAssembleURI(HTTP_URI_CODING_ALL, device_uri, sizeof(device_uri),
+			    "dnssd", NULL, uriName, 0,
+			    best->cups_shared ? "/cups" : "/");
+
+	    cupsBackendReport("network", device_uri, best->make_and_model,
+	                      best->name, best->device_id, NULL);
+	    best->sent = 1;
+	    best       = device;
+	  }
+	  else if (best->priority > device->priority ||
+	           (best->priority == device->priority &&
+		    best->type < device->type))
+          {
+	    best->sent = 1;
+	    best       = device;
+	  }
+	  else
+	    device->sent = 1;
+        }
+
+      if (best)
+      {
+	unquote(uriName, best->fullName, sizeof(uriName));
+
+	httpAssembleURI(HTTP_URI_CODING_ALL, device_uri, sizeof(device_uri),
+			"dnssd", NULL, uriName, 0,
+			best->cups_shared ? "/cups" : "/");
+
+	cupsBackendReport("network", device_uri, best->make_and_model,
+			  best->name, best->device_id, NULL);
+	best->sent = 1;
+      }
+    }
+  }
+
+  return (CUPS_BACKEND_OK);
+}
+
+
+/*
+ * 'browse_callback()' - Browse devices.
+ */
+
+static void
+browse_callback(
+    DNSServiceRef       sdRef,		/* I - Service reference */
+    DNSServiceFlags     flags,		/* I - Option flags */
+    uint32_t            interfaceIndex,	/* I - Interface number */
+    DNSServiceErrorType errorCode,	/* I - Error, if any */
+    const char          *serviceName,	/* I - Name of service/device */
+    const char          *regtype,	/* I - Type of service */
+    const char          *replyDomain,	/* I - Service domain */
+    void                *context)	/* I - Devices array */
+{
+  fprintf(stderr, "DEBUG2: browse_callback(sdRef=%p, flags=%x, "
+                  "interfaceIndex=%d, errorCode=%d, serviceName=\"%s\", "
+		  "regtype=\"%s\", replyDomain=\"%s\", context=%p)\n",
+          sdRef, flags, interfaceIndex, errorCode,
+	  serviceName ? serviceName : "(null)",
+	  regtype ? regtype : "(null)",
+	  replyDomain ? replyDomain : "(null)",
+	  context);
+
+ /*
+  * Only process "add" data...
+  */
+
+  if (errorCode != kDNSServiceErr_NoError || !(flags & kDNSServiceFlagsAdd))
+    return;
+
+ /*
+  * Get the device...
+  */
+
+  get_device((cups_array_t *)context, serviceName, regtype, replyDomain);
+}
+
+
+/*
+ * 'browse_local_callback()' - Browse local devices.
+ */
+
+static void
+browse_local_callback(
+    DNSServiceRef       sdRef,		/* I - Service reference */
+    DNSServiceFlags     flags,		/* I - Option flags */
+    uint32_t            interfaceIndex,	/* I - Interface number */
+    DNSServiceErrorType errorCode,	/* I - Error, if any */
+    const char          *serviceName,	/* I - Name of service/device */
+    const char          *regtype,	/* I - Type of service */
+    const char          *replyDomain,	/* I - Service domain */
+    void                *context)	/* I - Devices array */
+{
+  cups_device_t	*device;		/* Device */
+
+
+  fprintf(stderr, "DEBUG2: browse_local_callback(sdRef=%p, flags=%x, "
+                  "interfaceIndex=%d, errorCode=%d, serviceName=\"%s\", "
+		  "regtype=\"%s\", replyDomain=\"%s\", context=%p)\n",
+          sdRef, flags, interfaceIndex, errorCode,
+	  serviceName ? serviceName : "(null)",
+	  regtype ? regtype : "(null)",
+	  replyDomain ? replyDomain : "(null)",
+	  context);
+
+ /*
+  * Only process "add" data...
+  */
+
+  if (errorCode != kDNSServiceErr_NoError || !(flags & kDNSServiceFlagsAdd))
+    return;
+
+ /*
+  * Get the device...
+  */
+
+  device = get_device((cups_array_t *)context, serviceName, regtype,
+                      replyDomain);
+
+ /*
+  * Hide locally-registered devices...
+  */
+
+  fprintf(stderr, "DEBUG: Hiding local printer \"%s\"...\n",
+	  device->fullName);
+  device->sent = 1;
+}
+
+
+/*
+ * 'compare_devices()' - Compare two devices.
+ */
+
+static int				/* O - Result of comparison */
+compare_devices(cups_device_t *a,	/* I - First device */
+                cups_device_t *b)	/* I - Second device */
+{
+  return (strcmp(a->name, b->name));
+}
+
+
+/*
+ * 'exec_backend()' - Execute the backend that corresponds to the
+ *                    resolved service name.
+ */
+
+static void
+exec_backend(char **argv)		/* I - Command-line arguments */
+{
+  const char	*resolved_uri,		/* Resolved device URI */
+		*cups_serverbin;	/* Location of programs */
+  char		scheme[1024],		/* Scheme from URI */
+		*ptr,			/* Pointer into scheme */
+		filename[1024];		/* Backend filename */
+
+
+ /*
+  * Resolve the device URI...
+  */
+
+  job_canceled = -1;
+
+  if ((resolved_uri = cupsBackendDeviceURI(argv)) == NULL)
+    exit(CUPS_BACKEND_FAILED);
+
+ /*
+  * Extract the scheme from the URI...
+  */
+
+  strlcpy(scheme, resolved_uri, sizeof(scheme));
+  if ((ptr = strchr(scheme, ':')) != NULL)
+    *ptr = '\0';
+
+ /*
+  * Get the filename of the backend...
+  */
+
+  if ((cups_serverbin = getenv("CUPS_SERVERBIN")) == NULL)
+    cups_serverbin = CUPS_SERVERBIN;
+
+  snprintf(filename, sizeof(filename), "%s/backend/%s", cups_serverbin, scheme);
+
+ /*
+  * Overwrite the device URI and run the new backend...
+  */
+
+  setenv("DEVICE_URI", resolved_uri, 1);
+
+  argv[0] = (char *)resolved_uri;
+
+  fprintf(stderr, "DEBUG: Executing backend \"%s\"...\n", filename);
+
+  execv(filename, argv);
+
+  fprintf(stderr, "ERROR: Unable to execute backend \"%s\": %s\n", filename,
+          strerror(errno));
+  exit(CUPS_BACKEND_STOP);
+}
+
+
+/*
+ * 'get_device()' - Create or update a device.
+ */
+
+static cups_device_t *			/* O - Device */
+get_device(cups_array_t *devices,	/* I - Device array */
+           const char   *serviceName,	/* I - Name of service/device */
+           const char   *regtype,	/* I - Type of service */
+           const char   *replyDomain)	/* I - Service domain */
+{
+  cups_device_t	key,			/* Search key */
+		*device;		/* Device */
+  char		fullName[kDNSServiceMaxDomainName];
+					/* Full name for query */
+
+
+ /*
+  * See if this is a new device...
+  */
+
+  key.name = (char *)serviceName;
+
+  if (!strcmp(regtype, "_ipp._tcp.") ||
+      !strcmp(regtype, "_ipp-tls._tcp."))
+    key.type = CUPS_DEVICE_IPP;
+  else if (!strcmp(regtype, "_fax-ipp._tcp."))
+    key.type = CUPS_DEVICE_FAX_IPP;
+  else if (!strcmp(regtype, "_printer._tcp."))
+    key.type = CUPS_DEVICE_PRINTER;
+  else if (!strcmp(regtype, "_pdl-datastream._tcp."))
+    key.type = CUPS_DEVICE_PDL_DATASTREAM;
+  else
+    key.type = CUPS_DEVICE_RIOUSBPRINT;
+
+  for (device = cupsArrayFind(devices, &key);
+       device;
+       device = cupsArrayNext(devices))
+    if (strcasecmp(device->name, key.name))
+      break;
+    else if (device->type == key.type)
+    {
+      if (!strcasecmp(device->domain, "local.") &&
+          strcasecmp(device->domain, replyDomain))
+      {
+       /*
+        * Update the .local listing to use the "global" domain name instead.
+	* The backend will try local lookups first, then the global domain name.
+	*/
+
+        free(device->domain);
+	device->domain = strdup(replyDomain);
+
+	DNSServiceConstructFullName(fullName, device->name, regtype,
+	                            replyDomain);
+	free(device->fullName);
+	device->fullName = strdup(fullName);
+      }
+
+      return (device);
+    }
+
+ /*
+  * Yes, add the device...
+  */
+
+  fprintf(stderr, "DEBUG: Found \"%s.%s%s\"...\n", serviceName, regtype,
+	  replyDomain);
+
+  device           = calloc(sizeof(cups_device_t), 1);
+  device->name     = strdup(serviceName);
+  device->domain   = strdup(replyDomain);
+  device->type     = key.type;
+  device->priority = 50;
+
+  cupsArrayAdd(devices, device);
+
+ /*
+  * Set the "full name" of this service, which is used for queries...
+  */
+
+  DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain);
+  device->fullName = strdup(fullName);
+
+  return (device);
+}
+
+
+/*
+ * 'query_callback()' - Process query data.
+ */
+
+static void
+query_callback(
+    DNSServiceRef       sdRef,		/* I - Service reference */
+    DNSServiceFlags     flags,		/* I - Data flags */
+    uint32_t            interfaceIndex,	/* I - Interface */
+    DNSServiceErrorType errorCode,	/* I - Error, if any */
+    const char          *fullName,	/* I - Full service name */
+    uint16_t            rrtype,		/* I - Record type */
+    uint16_t            rrclass,	/* I - Record class */
+    uint16_t            rdlen,		/* I - Length of record data */
+    const void          *rdata,		/* I - Record data */
+    uint32_t            ttl,		/* I - Time-to-live */
+    void                *context)	/* I - Devices array */
+{
+  cups_array_t	*devices;		/* Device array */
+  char		name[1024],		/* Service name */
+		*ptr;			/* Pointer into string */
+  cups_device_t	dkey,			/* Search key */
+		*device;		/* Device */
+
+
+  fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, "
+                  "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", "
+		  "rrtype=%u, rrclass=%u, rdlen=%u, rdata=%p, ttl=%u, "
+		  "context=%p)\n",
+          sdRef, flags, interfaceIndex, errorCode,
+	  fullName ? fullName : "(null)", rrtype, rrclass, rdlen, rdata, ttl,
+	  context);
+
+ /*
+  * Only process "add" data...
+  */
+
+  if (errorCode != kDNSServiceErr_NoError || !(flags & kDNSServiceFlagsAdd))
+    return;
+
+ /*
+  * Lookup the service in the devices array.
+  */
+
+  devices   = (cups_array_t *)context;
+  dkey.name = name;
+
+  unquote(name, fullName, sizeof(name));
+
+  if ((dkey.domain = strstr(name, "._tcp.")) != NULL)
+    dkey.domain += 6;
+  else
+    dkey.domain = (char *)"local.";
+
+  if ((ptr = strstr(name, "._")) != NULL)
+    *ptr = '\0';
+
+  if (strstr(fullName, "_ipp._tcp.") ||
+      strstr(fullName, "_ipp-tls._tcp."))
+    dkey.type = CUPS_DEVICE_IPP;
+  else if (strstr(fullName, "_fax-ipp._tcp."))
+    dkey.type = CUPS_DEVICE_FAX_IPP;
+  else if (strstr(fullName, "_printer._tcp."))
+    dkey.type = CUPS_DEVICE_PRINTER;
+  else if (strstr(fullName, "_pdl-datastream._tcp."))
+    dkey.type = CUPS_DEVICE_PDL_DATASTREAM;
+  else
+    dkey.type = CUPS_DEVICE_RIOUSBPRINT;
+
+  for (device = cupsArrayFind(devices, &dkey);
+       device;
+       device = cupsArrayNext(devices))
+  {
+    if (strcasecmp(device->name, dkey.name) ||
+        strcasecmp(device->domain, dkey.domain))
+    {
+      device = NULL;
+      break;
+    }
+    else if (device->type == dkey.type)
+    {
+     /*
+      * Found it, pull out the priority and make and model from the TXT
+      * record and save it...
+      */
+
+      const uint8_t	*data,		/* Pointer into data */
+			*datanext,	/* Next key/value pair */
+			*dataend;	/* End of entire TXT record */
+      uint8_t		datalen;	/* Length of current key/value pair */
+      char		key[256],	/* Key string */
+			value[256],	/* Value string */
+			make_and_model[512],
+				      	/* Manufacturer and model */
+			model[256],	/* Model */
+			device_id[2048];/* 1284 device ID */
+
+
+      device_id[0]      = '\0';
+      make_and_model[0] = '\0';
+
+      strcpy(model, "Unknown");
+
+      for (data = rdata, dataend = data + rdlen;
+           data < dataend;
+           data = datanext)
+      {
+       /*
+        * Read a key/value pair starting with an 8-bit length.  Since the
+	* length is 8 bits and the size of the key/value buffers is 256, we
+	* don't need to check for overflow...
+	*/
+
+        datalen = *data++;
+
+        if (!datalen || (data + datalen) >= dataend)
+	  break;
+
+        datanext = data + datalen;
+
+        for (ptr = key; data < datanext && *data != '='; data ++)
+	  *ptr++ = *data;
+	*ptr = '\0';
+
+	if (data < datanext && *data == '=')
+	{
+	  data ++;
+
+	  if (data < datanext)
+	    memcpy(value, data, datanext - data);
+	  value[datanext - data] = '\0';
+	}
+	else
+	  continue;
+
+        if (!strncasecmp(key, "usb_", 4))
+	{
+	 /*
+	  * Add USB device ID information...
+	  */
+
+	  ptr = device_id + strlen(device_id);
+	  snprintf(ptr, sizeof(device_id) - (ptr - device_id), "%s:%s;",
+	           key + 4, value);
+        }
+
+        if (!strcasecmp(key, "usb_MFG") || !strcasecmp(key, "usb_MANU") ||
+	    !strcasecmp(key, "usb_MANUFACTURER"))
+	  strcpy(make_and_model, value);
+        else if (!strcasecmp(key, "usb_MDL") || !strcasecmp(key, "usb_MODEL"))
+	  strcpy(model, value);
+	else if (!strcasecmp(key, "product") && !strstr(value, "Ghostscript"))
+	{
+	  if (value[0] == '(')
+	  {
+	   /*
+	    * Strip parenthesis...
+	    */
+
+            if ((ptr = value + strlen(value) - 1) > value && *ptr == ')')
+	      *ptr = '\0';
+
+	    strcpy(model, value + 1);
+	  }
+	  else
+	    strcpy(model, value);
+        }
+	else if (!strcasecmp(key, "ty"))
+	{
+          strcpy(model, value);
+
+	  if ((ptr = strchr(model, ',')) != NULL)
+	    *ptr = '\0';
+	}
+	else if (!strcasecmp(key, "priority"))
+	  device->priority = atoi(value);
+	else if ((device->type == CUPS_DEVICE_IPP ||
+	          device->type == CUPS_DEVICE_PRINTER) &&
+		 !strcasecmp(key, "printer-type"))
+	{
+	 /*
+	  * This is a CUPS printer!
+	  */
+
+	  device->cups_shared = 1;
+
+	  if (device->type == CUPS_DEVICE_PRINTER)
+	    device->sent = 1;
+	}
+      }
+
+      if (device->device_id)
+        free(device->device_id);
+
+      if (!device_id[0] && strcmp(model, "Unknown"))
+      {
+        if (make_and_model[0])
+	  snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;",
+	           make_and_model, model);
+        else if (!strncasecmp(model, "designjet ", 10))
+	  snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s", model + 10);
+        else if (!strncasecmp(model, "stylus ", 7))
+	  snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s", model + 7);
+        else if ((ptr = strchr(model, ' ')) != NULL)
+	{
+	 /*
+	  * Assume the first word is the make...
+	  */
+
+          memcpy(make_and_model, model, ptr - model);
+	  make_and_model[ptr - model] = '\0';
+
+	  snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s",
+		   make_and_model, ptr + 1);
+        }
+      }
+
+      if (device_id[0])
+        device->device_id = strdup(device_id);
+      else
+        device->device_id = NULL;
+
+      if (device->make_and_model)
+	free(device->make_and_model);
+
+      if (make_and_model[0])
+      {
+	strlcat(make_and_model, " ", sizeof(make_and_model));
+	strlcat(make_and_model, model, sizeof(make_and_model));
+
+	device->make_and_model = strdup(make_and_model);
+      }
+      else
+	device->make_and_model = strdup(model);
+      break;
+    }
+  }
+
+  if (!device)
+    fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName);
+}
+
+
+/*
+ * 'sigterm_handler()' - Handle termination signals...
+ */
+
+static void
+sigterm_handler(int sig)		/* I - Signal number (unused) */
+{
+  if (job_canceled)
+    exit(CUPS_BACKEND_OK);
+  else
+    job_canceled = 1;
+}
+
+
+/*
+ * 'unquote()' - Unquote a name string.
+ */
+
+static void
+unquote(char       *dst,		/* I - Destination buffer */
+        const char *src,		/* I - Source string */
+	size_t     dstsize)		/* I - Size of destination buffer */
+{
+  char	*dstend = dst + dstsize - 1;	/* End of destination buffer */
+
+
+  while (*src && dst < dstend)
+  {
+    if (*src == '\\')
+    {
+      src ++;
+      if (isdigit(src[0] & 255) && isdigit(src[1] & 255) &&
+          isdigit(src[2] & 255))
+      {
+        *dst++ = ((((src[0] - '0') * 10) + src[1] - '0') * 10) + src[2] - '0';
+	src += 3;
+      }
+      else
+        *dst++ = *src++;
+    }
+    else
+      *dst++ = *src ++;
+  }
+
+  *dst = '\0';
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,71 @@
+Preliminary Design for CUPS Firewire Printer Backend - 03/19/2002
+-----------------------------------------------------------------
+
+OVERVIEW
+
+    Easy Software Products will develop an IEEE-1394, a.k.a.
+    Firewire, printing interface for its Common UNIX Printing
+    System ("CUPS") for initial use under the Linux operating
+    system.  A follow-on implementation for MacOS X is
+    anticipated as well.
+
+    The operating system interfaces for IEEE-1394 ports vary
+    widely; the CUPS printing interface will abstract the OS
+    layer to a simpler interface geared towards discovering,
+    opening, reading from, writing to, and closing IEEE-1394
+    printers.
+
+    The initial development of the CUPS backend will be targeted
+    at the EPSON Stylus Pro 10000 large format printer, which
+    requires the bandwidth provided by Firewire in order to
+    print at full speed.  This printer supports printing via
+    Serial Bus Protocol 2 (SBP-2) using the SCSI and PWG command
+    sets. The CUPS backend will implement the PWG command set on
+    LUN 0 only.
+
+
+OS ABSTRACTION LAYER
+
+    The OS abstraction layer will be a thin client library that
+    implements the following functions:
+
+        ieee1394_list
+	ieee1394_open
+	ieee1394_close
+	ieee1394_read
+	ieee1394_write
+	ieee1394_error
+
+    The "ieee1394_list" function will list all of the available
+    printer devices on the bus.  The device information will
+    consist of the device URI (ieee1394:/something) used to
+    access the device and the make and model information, if
+    available, for the device ("EPSON Stylus Printer").
+
+    The "ieee1394_open" and "ieee1394_close" functions will open
+    and close a connection to the printer, respectively.
+
+    The "ieee1394_read" and "ieee1394_write" functions will read
+    and write data to and from the printer, respectively.  The
+    read function will be non-blocking, returning data only if
+    there is data coming back from the printer.
+
+    The "ieee1394_error" function will return a string
+    describing the last error or NULL if no error occurred.
+
+    The library will be responsible for creating any background
+    threads that are needed to monitor the connection to the
+    printer.
+
+
+CUPS BACKEND
+
+    The CUPS backend will use the OS abstraction layer to list
+    and access the Firewire printers.  The "main" function will
+    read and write printer data, while the "list_devices"
+    function will be called as necessary to identify the
+    available devices.
+
+    The CUPS 1.1 backend will record any status information in
+    the error log file, while the 1.2 backend will supply it to
+    the printer driver process.
@@ -0,0 +1,35 @@
+Easy Software Products
+44141 Airport View Drive
+Suite 204
+Hollywood, Maryland 20636
+1.301.373.9600
+March 8, 2002
+
+
+Subject: EPSON Firewire Printer Driver for Linux
+
+Currently, no Firewire printer support exists for Linux.  Since
+the latest EPSON printer products depend on the Firewire
+interface to print at full speed, a solution is needed to
+support customers using Linux as their server platform.
+
+The Linux Firewire subsystem provides a user-mode driver
+interface that allows driver programs to access Firewire
+devices.  Easy Software Products will utilize this interface to
+develop a "backend" program for the Common UNIX Printing System
+that will allow users to print to EPSON printers using the
+Firewire interface.
+
+After examining the Linux interface, we estimate that it will
+require approximately 30 hours of development time to write,
+test, and document the Firewire backend, for a total cost of
+$3,000. The new backend will become a standard part of the CUPS
+software distribution and will be included with at least the
+following Linux distributions:
+
+    - Caldera Linux
+    - Mandrake Linux
+    - Red Hat Linux
+    - SuSE Linux
+
+ESP will provide EPSON with binaries for Red Hat Linux 7.2.
@@ -0,0 +1,466 @@
+/*
+ * "$Id$"
+ *
+ *   IEEE-1284 support functions for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 2007-2009 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:
+ *
+ *   backendGetDeviceID()  - Get the IEEE-1284 device ID string and
+ *                           corresponding URI.
+ *   backendGetMakeModel() - Get the make and model string from the device ID.
+ */
+
+/*
+ * Include necessary headers.
+ */
+
+#include "backend-private.h"
+
+
+/*
+ * 'backendGetDeviceID()' - Get the IEEE-1284 device ID string and
+ *                          corresponding URI.
+ */
+
+int					/* O - 0 on success, -1 on failure */
+backendGetDeviceID(
+    int        fd,			/* I - File descriptor */
+    char       *device_id,		/* O - 1284 device ID */
+    int        device_id_size,		/* I - Size of buffer */
+    char       *make_model,		/* O - Make/model */
+    int        make_model_size,		/* I - Size of buffer */
+    const char *scheme,			/* I - URI scheme */
+    char       *uri,			/* O - Device URI */
+    int        uri_size)		/* I - Size of buffer */
+{
+#ifdef __APPLE__ /* This function is a no-op */
+  return (-1);
+
+#else /* Get the device ID from the specified file descriptor... */
+#  ifdef __linux
+  int	length;				/* Length of device ID info */
+  int   got_id = 0;
+#  endif /* __linux */
+#  if defined(__sun) && defined(ECPPIOC_GETDEVID)
+  struct ecpp_device_id did;		/* Device ID buffer */
+#  endif /* __sun && ECPPIOC_GETDEVID */
+
+
+  DEBUG_printf(("backendGetDeviceID(fd=%d, device_id=%p, device_id_size=%d, "
+                "make_model=%p, make_model_size=%d, scheme=\"%s\", "
+		"uri=%p, uri_size=%d)\n", fd, device_id, device_id_size,
+		make_model, make_model_size, scheme ? scheme : "(null)",
+		uri, uri_size));
+
+ /*
+  * Range check input...
+  */
+
+  if (!device_id || device_id_size < 32)
+  {
+    DEBUG_puts("backendGetDeviceID: Bad args!");
+    return (-1);
+  }
+
+  if (make_model)
+    *make_model = '\0';
+
+  if (fd >= 0)
+  {
+   /*
+    * Get the device ID string...
+    */
+
+    *device_id = '\0';
+
+#  ifdef __linux
+    if (ioctl(fd, LPIOC_GET_DEVICE_ID(device_id_size), device_id))
+    {
+     /*
+      * Linux has to implement things differently for every device it seems.
+      * Since the standard parallel port driver does not provide a simple
+      * ioctl() to get the 1284 device ID, we have to open the "raw" parallel
+      * device corresponding to this port and do some negotiation trickery
+      * to get the current device ID.
+      */
+
+      if (uri && !strncmp(uri, "parallel:/dev/", 14))
+      {
+	char	devparport[16];		/* /dev/parportN */
+	int	devparportfd,		/* File descriptor for raw device */
+		  mode;			/* Port mode */
+
+
+       /*
+	* Since the Linux parallel backend only supports 4 parallel port
+	* devices, just grab the trailing digit and use it to construct a
+	* /dev/parportN filename...
+	*/
+
+	snprintf(devparport, sizeof(devparport), "/dev/parport%s",
+		 uri + strlen(uri) - 1);
+
+	if ((devparportfd = open(devparport, O_RDWR | O_NOCTTY)) != -1)
+	{
+	 /*
+	  * Claim the device...
+	  */
+
+	  if (!ioctl(devparportfd, PPCLAIM))
+	  {
+	    fcntl(devparportfd, F_SETFL, fcntl(devparportfd, F_GETFL) | O_NONBLOCK);
+
+	    mode = IEEE1284_MODE_COMPAT;
+
+	    if (!ioctl(devparportfd, PPNEGOT, &mode))
+	    {
+	     /*
+	      * Put the device into Device ID mode...
+	      */
+
+	      mode = IEEE1284_MODE_NIBBLE | IEEE1284_DEVICEID;
+
+	      if (!ioctl(devparportfd, PPNEGOT, &mode))
+	      {
+	       /*
+		* Read the 1284 device ID...
+		*/
+
+		if ((length = read(devparportfd, device_id,
+				   device_id_size - 1)) >= 2)
+		{
+		  device_id[length] = '\0';
+		  got_id = 1;
+		}
+	      }
+	    }
+
+	   /*
+	    * Release the device...
+	    */
+
+	    ioctl(devparportfd, PPRELEASE);
+	  }
+
+	  close(devparportfd);
+	}
+      }
+    }
+    else
+      got_id = 1;
+
+    if (got_id)
+    {
+     /*
+      * Extract the length of the device ID string from the first two
+      * bytes.  The 1284 spec says the length is stored MSB first...
+      */
+
+      length = (((unsigned)device_id[0] & 255) << 8) +
+	       ((unsigned)device_id[1] & 255);
+
+     /*
+      * Check to see if the length is larger than our buffer; first
+      * assume that the vendor incorrectly implemented the 1284 spec,
+      * and then limit the length to the size of our buffer...
+      */
+
+      if (length > device_id_size)
+	length = (((unsigned)device_id[1] & 255) << 8) +
+		 ((unsigned)device_id[0] & 255);
+
+      if (length > device_id_size)
+	length = device_id_size;
+
+     /*
+      * The length field counts the number of bytes in the string
+      * including the length field itself (2 bytes).  The minimum
+      * length for a valid/usable device ID is 14 bytes:
+      *
+      *     <LENGTH> MFG: <MFG> ;MDL: <MDL> ;
+      *        2  +   4  +  1  +  5 +  1 +  1
+      */
+
+      if (length < 14)
+      {
+       /*
+	* Can't use this device ID, so don't try to copy it...
+	*/
+
+	device_id[0] = '\0';
+	got_id       = 0;
+      }
+      else
+      {
+       /*
+	* Copy the device ID text to the beginning of the buffer and
+	* nul-terminate.
+	*/
+
+	length -= 2;
+
+	memmove(device_id, device_id + 2, length);
+	device_id[length] = '\0';
+      }
+    }
+#    ifdef DEBUG
+    else
+      DEBUG_printf(("backendGetDeviceID: ioctl failed - %s\n",
+                    strerror(errno)));
+#    endif /* DEBUG */
+#  endif /* __linux */
+
+#   if defined(__sun) && defined(ECPPIOC_GETDEVID)
+    did.mode = ECPP_CENTRONICS;
+    did.len  = device_id_size - 1;
+    did.rlen = 0;
+    did.addr = device_id;
+
+    if (!ioctl(fd, ECPPIOC_GETDEVID, &did))
+    {
+     /*
+      * Nul-terminate the device ID text.
+      */
+
+      if (did.rlen < (device_id_size - 1))
+	device_id[did.rlen] = '\0';
+      else
+	device_id[device_id_size - 1] = '\0';
+    }
+#    ifdef DEBUG
+    else
+      DEBUG_printf(("backendGetDeviceID: ioctl failed - %s\n",
+                    strerror(errno)));
+#    endif /* DEBUG */
+#  endif /* __sun && ECPPIOC_GETDEVID */
+  }
+
+  DEBUG_printf(("backendGetDeviceID: device_id=\"%s\"\n", device_id));
+
+  if (scheme && uri)
+    *uri = '\0';
+
+  if (!*device_id)
+    return (-1);
+
+ /*
+  * Get the make and model...
+  */
+
+  if (make_model)
+    backendGetMakeModel(device_id, make_model, make_model_size);
+
+ /*
+  * Then generate a device URI...
+  */
+
+  if (scheme && uri && uri_size > 32)
+  {
+    int			num_values;	/* Number of keys and values */
+    cups_option_t	*values;	/* Keys and values in device ID */
+    const char		*mfg,		/* Manufacturer */
+			*mdl,		/* Model */
+			*sern;		/* Serial number */
+    char		temp[256],	/* Temporary manufacturer string */
+			*tempptr;	/* Pointer into temp string */
+
+
+   /*
+    * Get the make, model, and serial numbers...
+    */
+
+    num_values = _ppdGet1284Values(device_id, &values);
+
+    if ((sern = cupsGetOption("SERIALNUMBER", num_values, values)) == NULL)
+      if ((sern = cupsGetOption("SERN", num_values, values)) == NULL)
+        sern = cupsGetOption("SN", num_values, values);
+
+    if ((mfg = cupsGetOption("MANUFACTURER", num_values, values)) == NULL)
+      mfg = cupsGetOption("MFG", num_values, values);
+
+    if ((mdl = cupsGetOption("MODEL", num_values, values)) == NULL)
+      mdl = cupsGetOption("MDL", num_values, values);
+
+    if (mfg)
+    {
+      if (!strcasecmp(mfg, "Hewlett-Packard"))
+        mfg = "HP";
+      else if (!strcasecmp(mfg, "Lexmark International"))
+        mfg = "Lexmark";
+    }
+    else
+    {
+      strlcpy(temp, make_model, sizeof(temp));
+
+      if ((tempptr = strchr(temp, ' ')) != NULL)
+        *tempptr = '\0';
+
+      mfg = temp;
+    }
+
+    if (!mdl)
+      mdl = "";
+
+    if (!strncasecmp(mdl, mfg, strlen(mfg)))
+    {
+      mdl += strlen(mfg);
+
+      while (isspace(*mdl & 255))
+        mdl ++;
+    }
+
+   /*
+    * Generate the device URI from the manufacturer, make_model, and
+    * serial number strings.
+    */
+
+    httpAssembleURIf(HTTP_URI_CODING_ALL, uri, uri_size, scheme, NULL, mfg, 0,
+                     "/%s%s%s", mdl, sern ? "?serial=" : "", sern ? sern : "");
+
+    cupsFreeOptions(num_values, values);
+  }
+
+  return (0);
+#endif /* __APPLE__ */
+}
+
+
+/*
+ * 'backendGetMakeModel()' - Get the make and model string from the device ID.
+ */
+
+int					/* O - 0 on success, -1 on failure */
+backendGetMakeModel(
+    const char *device_id,		/* O - 1284 device ID */
+    char       *make_model,		/* O - Make/model */
+    int        make_model_size)		/* I - Size of buffer */
+{
+  int		num_values;		/* Number of keys and values */
+  cups_option_t	*values;		/* Keys and values */
+  const char	*mfg,			/* Manufacturer string */
+		*mdl,			/* Model string */
+		*des;			/* Description string */
+
+
+  DEBUG_printf(("backendGetMakeModel(device_id=\"%s\", "
+                "make_model=%p, make_model_size=%d)\n", device_id,
+		make_model, make_model_size));
+
+ /*
+  * Range check input...
+  */
+
+  if (!device_id || !*device_id || !make_model || make_model_size < 32)
+  {
+    DEBUG_puts("backendGetMakeModel: Bad args!");
+    return (-1);
+  }
+
+  *make_model = '\0';
+
+ /*
+  * Look for the description field...
+  */
+
+  num_values = _ppdGet1284Values(device_id, &values);
+
+  if ((mdl = cupsGetOption("MODEL", num_values, values)) == NULL)
+    mdl = cupsGetOption("MDL", num_values, values);
+
+  if (mdl)
+  {
+   /*
+    * Build a make-model string from the manufacturer and model attributes...
+    */
+
+    if ((mfg = cupsGetOption("MANUFACTURER", num_values, values)) == NULL)
+      mfg = cupsGetOption("MFG", num_values, values);
+
+    if (!mfg || !strncasecmp(mdl, mfg, strlen(mfg)))
+    {
+     /*
+      * Just copy the model string, since it has the manufacturer...
+      */
+
+      _ppdNormalizeMakeAndModel(mdl, make_model, make_model_size);
+    }
+    else
+    {
+     /*
+      * Concatenate the make and model...
+      */
+
+      char	temp[1024];		/* Temporary make and model */
+
+      if (mfg)
+	snprintf(temp, sizeof(temp), "%s %s", mfg, mdl);
+      else
+	snprintf(temp, sizeof(temp), "%s", mdl);
+
+      _ppdNormalizeMakeAndModel(temp, make_model, make_model_size);
+    }
+  }
+  else if ((des = cupsGetOption("DESCRIPTION", num_values, values)) != NULL ||
+           (des = cupsGetOption("DES", num_values, values)) != NULL)
+  {
+   /*
+    * Make sure the description contains something useful, since some
+    * printer manufacturers (HP) apparently don't follow the standards
+    * they helped to define...
+    *
+    * Here we require the description to be 8 or more characters in length,
+    * containing at least one space and one letter.
+    */
+
+    if (strlen(des) >= 8)
+    {
+      const char	*ptr;		/* Pointer into description */
+      int		letters,	/* Number of letters seen */
+			spaces;		/* Number of spaces seen */
+
+
+      for (ptr = des, letters = 0, spaces = 0; *ptr; ptr ++)
+      {
+	if (isspace(*ptr & 255))
+	  spaces ++;
+	else if (isalpha(*ptr & 255))
+	  letters ++;
+
+	if (spaces && letters)
+	  break;
+      }
+
+      if (spaces && letters)
+        _ppdNormalizeMakeAndModel(des, make_model, make_model_size);
+    }
+  }
+
+  if (!make_model[0])
+  {
+   /*
+    * Use "Unknown" as the printer make and model...
+    */
+
+    strlcpy(make_model, "Unknown", make_model_size);
+  }
+
+  cupsFreeOptions(num_values, values);
+
+  return (0);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,294 @@
+/*
+ * "$Id$"
+ *
+ *   Common network APIs for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2006-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:
+ *
+ *   backendCheckSideChannel() - Check the side-channel for pending requests.
+ *   backendNetworkSideCB()    - Handle common network side-channel commands.
+ */
+
+/*
+ * Include necessary headers.
+ */
+
+#include "backend-private.h"
+#include <limits.h>
+#ifdef __hpux
+#  include <sys/time.h>
+#else
+#  include <sys/select.h>
+#endif /* __hpux */
+
+
+/*
+ * 'backendCheckSideChannel()' - Check the side-channel for pending requests.
+ */
+
+
+void
+backendCheckSideChannel(
+    int         snmp_fd,		/* I - SNMP socket */
+    http_addr_t *addr)			/* I - Address of device */
+{
+  fd_set	input;			/* Select input set */
+  struct timeval timeout;		/* Select timeout */
+
+
+  FD_ZERO(&input);
+  FD_SET(CUPS_SC_FD, &input);
+
+  timeout.tv_sec = timeout.tv_usec = 0;
+
+  if (select(CUPS_SC_FD + 1, &input, NULL, NULL, &timeout) > 0)
+    backendNetworkSideCB(-1, -1, snmp_fd, addr, 0);
+}
+
+
+/*
+ * 'backendNetworkSideCB()' - Handle common network side-channel commands.
+ */
+
+int					/* O - -1 on error, 0 on success */
+backendNetworkSideCB(
+    int         print_fd,		/* I - Print file or -1 */
+    int         device_fd,		/* I - Device file or -1 */
+    int         snmp_fd,		/* I - SNMP socket */
+    http_addr_t *addr,			/* I - Address of device */
+    int         use_bc)			/* I - Use back-channel data? */
+{
+  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 */
+  const char		*device_id;	/* 1284DEVICEID env var */
+
+
+  datalen = sizeof(data);
+
+  if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0))
+    return (-1);
+
+  switch (command)
+  {
+    case CUPS_SC_CMD_DRAIN_OUTPUT :
+       /*
+        * Our sockets disable the Nagle algorithm and data is sent immediately.
+	*/
+
+        if (device_fd < 0)
+	  status = CUPS_SC_STATUS_NOT_IMPLEMENTED;
+	else if (backendDrainOutput(print_fd, 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_SNMP_GET :
+    case CUPS_SC_CMD_SNMP_GET_NEXT :
+        fprintf(stderr, "DEBUG: CUPS_SC_CMD_SNMP_%s: %d (%s)\n",
+	        command == CUPS_SC_CMD_SNMP_GET ? "GET" : "GET_NEXT", datalen,
+		data);
+
+        if (datalen < 2)
+	{
+	  status  = CUPS_SC_STATUS_BAD_MESSAGE;
+	  datalen = 0;
+	  break;
+	}
+
+        if (snmp_fd >= 0)
+	{
+	  cups_snmp_t	packet;		/* Packet from printer */
+
+
+          if (!_cupsSNMPStringToOID(data, packet.object_name, CUPS_SNMP_MAX_OID))
+	  {
+	    status  = CUPS_SC_STATUS_BAD_MESSAGE;
+	    datalen = 0;
+	    break;
+	  }
+
+          status  = CUPS_SC_STATUS_IO_ERROR;
+	  datalen = 0;
+
+          if (_cupsSNMPWrite(snmp_fd, addr, CUPS_SNMP_VERSION_1,
+	                     _cupsSNMPDefaultCommunity(),
+	                     command == CUPS_SC_CMD_SNMP_GET ?
+			         CUPS_ASN1_GET_REQUEST :
+				 CUPS_ASN1_GET_NEXT_REQUEST, 1,
+			     packet.object_name))
+          {
+	    if (_cupsSNMPRead(snmp_fd, &packet, 1.0))
+	    {
+	      char	*dataptr;	/* Pointer into data */
+	      int	i;		/* Looping var */
+
+
+              if (!_cupsSNMPOIDToString(packet.object_name, data, sizeof(data)))
+	      {
+	        fputs("DEBUG: Bad OID returned!\n", stderr);
+	        break;
+	      }
+
+	      datalen = (int)strlen(data) + 1;
+              dataptr = data + datalen;
+
+	      switch (packet.object_type)
+	      {
+	        case CUPS_ASN1_BOOLEAN :
+		    snprintf(dataptr, sizeof(data) - (dataptr - data), "%d",
+		             packet.object_value.boolean);
+	            datalen += (int)strlen(dataptr);
+		    break;
+
+	        case CUPS_ASN1_INTEGER :
+		    snprintf(dataptr, sizeof(data) - (dataptr - data), "%d",
+		             packet.object_value.integer);
+	            datalen += (int)strlen(dataptr);
+		    break;
+
+	        case CUPS_ASN1_BIT_STRING :
+	        case CUPS_ASN1_OCTET_STRING :
+		    if (packet.object_value.string.num_bytes < 0)
+		      i = 0;
+		    else if (packet.object_value.string.num_bytes < 
+			     (sizeof(data) - (dataptr - data)))
+		      i = packet.object_value.string.num_bytes;
+		    else
+		      i = (int)(sizeof(data) - (dataptr - data));
+
+		    memcpy(dataptr, packet.object_value.string.bytes, i);
+
+                    datalen += i;
+		    break;
+
+	        case CUPS_ASN1_OID :
+		    _cupsSNMPOIDToString(packet.object_value.oid, dataptr,
+		                         sizeof(data) - (dataptr - data));
+	            datalen += (int)strlen(dataptr);
+		    break;
+
+                case CUPS_ASN1_HEX_STRING :
+		    for (i = 0;
+		         i < packet.object_value.string.num_bytes &&
+			     dataptr < (data + sizeof(data) - 3);
+			 i ++, dataptr += 2)
+		      sprintf(dataptr, "%02X",
+		              packet.object_value.string.bytes[i]);
+	            datalen += (int)strlen(dataptr);
+		    break;
+
+                case CUPS_ASN1_COUNTER :
+		    snprintf(dataptr, sizeof(data) - (dataptr - data), "%d",
+		             packet.object_value.counter);
+	            datalen += (int)strlen(dataptr);
+		    break;
+
+                case CUPS_ASN1_GAUGE :
+		    snprintf(dataptr, sizeof(data) - (dataptr - data), "%u",
+		             packet.object_value.gauge);
+	            datalen += (int)strlen(dataptr);
+		    break;
+
+                case CUPS_ASN1_TIMETICKS :
+		    snprintf(dataptr, sizeof(data) - (dataptr - data), "%u",
+		             packet.object_value.timeticks);
+	            datalen += (int)strlen(dataptr);
+		    break;
+
+                default :
+	            fprintf(stderr, "DEBUG: Unknown OID value type %02X!\n",
+		            packet.object_type);
+
+		case CUPS_ASN1_NULL_VALUE :
+		    dataptr[0] = '\0';
+		    break;
+              }
+
+	      fprintf(stderr, "DEBUG: Returning %s %s\n", data, data + datalen);
+
+	      status = CUPS_SC_STATUS_OK;
+	    }
+	    else
+	      fputs("DEBUG: SNMP read error...\n", stderr);
+	  }
+	  else
+	    fputs("DEBUG: SNMP write error...\n", stderr);
+	  break;
+        }
+
+        status  = CUPS_SC_STATUS_NOT_IMPLEMENTED;
+	datalen = 0;
+	break;
+
+    case CUPS_SC_CMD_GET_DEVICE_ID :
+        if (snmp_fd >= 0)
+	{
+	  cups_snmp_t	packet;		/* Packet from printer */
+	  static const int ppmPrinterIEEE1284DeviceId[] =
+	  		{ CUPS_OID_ppmPrinterIEEE1284DeviceId,1,-1 };
+
+
+          status  = CUPS_SC_STATUS_IO_ERROR;
+	  datalen = 0;
+
+          if (_cupsSNMPWrite(snmp_fd, addr, CUPS_SNMP_VERSION_1,
+	                     _cupsSNMPDefaultCommunity(),
+	                     CUPS_ASN1_GET_REQUEST, 1,
+			     ppmPrinterIEEE1284DeviceId))
+          {
+	    if (_cupsSNMPRead(snmp_fd, &packet, 1.0) &&
+	        packet.object_type == CUPS_ASN1_OCTET_STRING)
+	    {
+	      strlcpy(data, (char *)packet.object_value.string.bytes,
+	              sizeof(data));
+	      datalen = (int)strlen(data);
+	      status  = CUPS_SC_STATUS_OK;
+	    }
+	  }
+
+	  break;
+        }
+
+	if ((device_id = getenv("1284DEVICEID")) != NULL)
+	{
+	  strlcpy(data, device_id, sizeof(data));
+	  datalen = (int)strlen(data);
+	  status  = CUPS_SC_STATUS_OK;
+	  break;
+	}
+
+    default :
+        status  = CUPS_SC_STATUS_NOT_IMPLEMENTED;
+	datalen = 0;
+	break;
+  }
+
+  return (cupsSideChannelWrite(command, status, data, datalen, 1.0));
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -3,23 +3,14 @@
 *
 *   Parallel port backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+ *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   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 please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
 *
 *   This file is subject to the Apple OS-Developed Software exception.
 *
@@ -27,18 +18,20 @@
 *
 *   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 <cups/cups.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <cups/string.h>
-#include <signal.h>
+#include "backend-private.h"
+
+#ifdef __hpux
+#  include <sys/time.h>
+#else
+#  include <sys/select.h>
+#endif /* __hpux */

 #ifdef WIN32
 #  include <io.h>
@@ -46,6 +39,7 @@
 #  include <unistd.h>
 #  include <fcntl.h>
 #  include <termios.h>
+#  include <sys/socket.h>
 #endif /* WIN32 */

 #ifdef __sgi
@@ -64,7 +58,9 @@
 * Local functions...
 */

-void	list_devices(void);
+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);


 /*
@@ -75,27 +71,24 @@ void	list_devices(void);
 *    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 */
+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		fp;		/* Print file */
-  int		copies;		/* Number of copies to print */
-  int		fd;		/* Parallel device */
-  int		wbytes;		/* Number of bytes written */
-  size_t	nbytes,		/* Number of bytes read */
-		tbytes;		/* Total number of bytes written */
-  char		buffer[8192],	/* Output buffer */
-		*bufptr;	/* Pointer into buffer */
-  struct termios opts;		/* Parallel port options */
+  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 */
+  size_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 */
+  struct sigaction action;		/* Actions for POSIX signals */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */


@@ -126,12 +119,14 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  if (argc == 1)
  {
    list_devices();
-    return (0);
+    return (CUPS_BACKEND_OK);
  }
  else if (argc < 6 || argc > 7)
  {
-    fputs("Usage: parallel job-id user title copies options [file]\n", stderr);
-    return (1);
+    _cupsLangPrintf(stderr,
+		    _("Usage: %s job-id user title copies options [file]\n"),
+		    argv[0]);
+    return (CUPS_BACKEND_FAILED);
  }

 /*
@@ -141,8 +136,8 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

  if (argc == 6)
  {
-    fp     = 0;
-    copies = 1;
+    print_fd = 0;
+    copies   = 1;
  }
  else
  {
@@ -150,10 +145,12 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
    * Try to open the print file...
    */

-    if ((fp = open(argv[6], O_RDONLY)) < 0)
+    if ((print_fd = open(argv[6], O_RDONLY)) < 0)
    {
-      perror("ERROR: unable to open print file");
-      return (1);
+      _cupsLangPrintf(stderr,
+                      _("ERROR: Unable to open print file \"%s\": %s\n"),
+		      argv[6], strerror(errno));
+      return (CUPS_BACKEND_FAILED);
    }

    copies = atoi(argv[4]);
@@ -163,7 +160,10 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  * Extract the device name and options from the URI...
  */

-  httpSeparate(argv[0], method, username, hostname, &port, resource);
+  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...
@@ -183,124 +183,129 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  * Open the parallel port device...
  */

+  fputs("STATE: +connecting-to-device\n", stderr);
+
  do
  {
-    if ((fd = open(resource, O_WRONLY | O_EXCL)) == -1)
+#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.
+	*/
+
+        _cupsLangPuts(stderr,
+	              _("INFO: Unable to contact printer, queuing on next "
+			"printer in class...\n"));
+
+       /*
+        * Sleep 5 seconds to keep the job from requeuing too rapidly...
+	*/
+
+	sleep(5);
+
+        return (CUPS_BACKEND_FAILED);
+      }
+
      if (errno == EBUSY)
      {
-        fputs("INFO: Parallel port busy; will retry in 30 seconds...\n", stderr);
+        _cupsLangPuts(stderr,
+	              _("INFO: Printer busy; will retry in 30 seconds...\n"));
 	sleep(30);
      }
      else if (errno == ENXIO || errno == EIO || errno == ENOENT)
      {
-        fputs("INFO: Printer not connected; will retry in 30 seconds...\n", stderr);
+        _cupsLangPuts(stderr,
+	              _("INFO: Printer not connected; will retry in 30 "
+		        "seconds...\n"));
 	sleep(30);
      }
      else
      {
-	fprintf(stderr, "ERROR: Unable to open parallel port device file \"%s\": %s\n",
-	        resource, strerror(errno));
-	return (1);
+	_cupsLangPrintf(stderr,
+		        _("ERROR: Unable to open device file \"%s\": %s\n"),
+			resource, strerror(errno));
+	return (CUPS_BACKEND_FAILED);
      }
    }
  }
-  while (fd < 0);
+  while (device_fd < 0);
+
+  fputs("STATE: -connecting-to-device\n", stderr);

 /*
  * Set any options provided...
  */

-  tcgetattr(fd, &opts);
+  tcgetattr(device_fd, &opts);

  opts.c_lflag &= ~(ICANON | ECHO | ISIG);	/* Raw mode */

  /**** No options supported yet ****/

-  tcsetattr(fd, TCSANOW, &opts);
-
- /*
-  * Now that we are "connected" to the port, ignore SIGTERM so that we
-  * can finish out any page data the driver sends (e.g. to eject the
-  * current page...  Only ignore SIGTERM if we are printing data from
-  * stdin (otherwise you can't cancel raw jobs...)
-  */
-
-  if (argc < 7)
-  {
-#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-    sigset(SIGTERM, SIG_IGN);
-#elif defined(HAVE_SIGACTION)
-    memset(&action, 0, sizeof(action));
-
-    sigemptyset(&action.sa_mask);
-    action.sa_handler = SIG_IGN;
-    sigaction(SIGTERM, &action, NULL);
-#else
-    signal(SIGTERM, SIG_IGN);
-#endif /* HAVE_SIGSET */
-  }
+  tcsetattr(device_fd, TCSANOW, &opts);

 /*
  * Finally, send the print file...
  */

-  while (copies > 0)
+  tbytes = 0;
+
+  while (copies > 0 && tbytes >= 0)
  {
    copies --;

-    if (fp != 0)
+    if (print_fd != 0)
    {
      fputs("PAGE: 1 1\n", stderr);
-      lseek(fp, 0, SEEK_SET);
+      lseek(print_fd, 0, SEEK_SET);
    }

-    tbytes = 0;
-    while ((nbytes = read(fp, buffer, sizeof(buffer))) > 0)
-    {
-     /*
-      * Write the print data to the printer...
-      */
+    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, side_cb);

-      tbytes += nbytes;
-      bufptr = buffer;
-
-      while (nbytes > 0)
-      {
-	if ((wbytes = write(fd, bufptr, nbytes)) < 0)
-	  if (errno == ENOTTY)
-	    wbytes = write(fd, bufptr, nbytes);
-
-	if (wbytes < 0)
-	{
-	  perror("ERROR: Unable to send print file to printer");
-	  break;
-	}
-
-	nbytes -= wbytes;
-	bufptr += wbytes;
-      }
-
-      if (wbytes < 0)
-        break;
-
-      if (argc > 6)
-	fprintf(stderr, "INFO: Sending print file, %lu bytes...\n",
-	        (unsigned long)tbytes);
-    }
+    if (print_fd != 0 && tbytes >= 0)
+      _cupsLangPrintf(stderr,
+#ifdef HAVE_LONG_LONG
+		      _("INFO: Sent print file, %lld bytes...\n"),
+#else
+		      _("INFO: Sent print file, %ld bytes...\n"),
+#endif /* HAVE_LONG_LONG */
+		      CUPS_LLCAST tbytes);
  }

 /*
  * Close the socket connection and input file and return...
  */

-  close(fd);
-  if (fp != 0)
-    close(fp);
+  close(device_fd);

-  fputs("INFO: Ready to print.\n", stderr);
+  if (print_fd != 0)
+    close(print_fd);

-  return (0);
+  return (tbytes < 0 ? CUPS_BACKEND_FAILED : CUPS_BACKEND_OK);
 }


@@ -308,7 +313,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 * 'list_devices()' - List all parallel devices.
 */

-void
+static void
 list_devices(void)
 {
 #if defined(__hpux) || defined(__sgi) || defined(__sun)
@@ -320,120 +325,52 @@ list_devices(void)
  int	i;			/* Looping var */
  int	fd;			/* File descriptor */
  char	device[255],		/* Device filename */
-	probefile[255],		/* Probe filename */
-	basedevice[255];	/* Base device filename for ports */
-  FILE	*probe;			/* /proc/parport/n/autoprobe file */
-  char	line[1024],		/* Line from file */
-	*delim,			/* Delimiter in file */
-	make[IPP_MAX_NAME],	/* Make from file */
-	model[IPP_MAX_NAME];	/* Model from file */
+	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 ++)
  {
   /*
-    * First open the device to make sure the driver module is loaded...
+    * Open the port, if available...
    */

-    if ((fd = open("/dev/parallel/0", O_WRONLY)) >= 0)
+    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);
-      strcpy(basedevice, "/dev/parallel/");
-    }
-    else
-    {
-      sprintf(device, "/dev/lp%d", i);
-      if ((fd = open(device, O_WRONLY)) >= 0)
-      {
-	close(fd);
-	strcpy(basedevice, "/dev/lp");
-      }
-      else
-      {
-	sprintf(device, "/dev/par%d", i);
-	if ((fd = open(device, O_WRONLY)) >= 0)
-	{
-	  close(fd);
-	  strcpy(basedevice, "/dev/par");
-	}
-	else
-	{
-	  sprintf(device, "/dev/printers/%d", i);
-	  if ((fd = open(device, O_WRONLY)) >= 0)
-	  {
-	    close(fd);
-	    strcpy(basedevice, "/dev/printers/");
-	  }
-	  else
-	    strcpy(basedevice, "/dev/unknown-parallel");
-	}
-      }
-    }
-
-   /*
-    * Then try looking at the probe file...
-    */
-
-    sprintf(probefile, "/proc/parport/%d/autoprobe", i);
-    if ((probe = fopen(probefile, "r")) == NULL)
-    {
-     /*
-      * Linux 2.4 kernel has different path...
-      */
-
-      sprintf(probefile, "/proc/sys/dev/parport/parport%d/autoprobe", i);
-      probe = fopen(probefile, "r");
-    }
-
-    if (probe != NULL)
-    {
-     /*
-      * Found a probe file!
-      */
-
-      memset(make, 0, sizeof(make));
-      memset(model, 0, sizeof(model));
-      strcpy(model, "Unknown");
-
-      while (fgets(line, sizeof(line), probe) != NULL)
-      {
-       /*
-        * Strip trailing ; and/or newline.
-	*/
-
-        if ((delim = strrchr(line, ';')) != NULL)
-	  *delim = '\0';
-	else if ((delim = strrchr(line, '\n')) != NULL)
-	  *delim = '\0';
-
-       /*
-        * Look for MODEL and MANUFACTURER lines...
-	*/
-
-        if (strncmp(line, "MODEL:", 6) == 0 &&
-	    strncmp(line, "MODEL:Unknown", 13) != 0)
-	  strlcpy(model, line + 6, sizeof(model));
-	else if (strncmp(line, "MANUFACTURER:", 13) == 0 &&
-	         strncmp(line, "MANUFACTURER:Unknown", 20) != 0)
-	  strlcpy(make, line + 13, sizeof(make));
-      }
-
-      fclose(probe);
-
-      if (make[0])
-	printf("direct parallel:%s%d \"%s %s\" \"Parallel Port #%d\"\n",
-	       basedevice, i, make, model, i + 1);
-      else
-	printf("direct parallel:%s%d \"%s\" \"Parallel Port #%d\"\n",
-	       basedevice, i, model, i + 1);
-    }
-    else if (fd >= 0)
-    {
-     /*
-      * No probe file, but we know the port is there...
-      */
-
-      printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
    }
  }
 #elif defined(__sgi)
@@ -633,7 +570,7 @@ list_devices(void)
      printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
    }
  }
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#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 */
@@ -674,6 +611,76 @@ list_devices(void)
 }


+/*
+ * '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$".
 */
@@ -0,0 +1,426 @@
+/*
+ * "$Id$"
+ *
+ *   Common run loop APIs for CUPS.
+ *
+ *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2006-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:
+ *
+ *   backendDrainOutput() - Drain pending print data to the device.
+ *   backendRunLoop()     - Read and write print and back-channel data.
+ */
+
+/*
+ * Include necessary headers.
+ */
+
+#include "backend-private.h"
+#include <limits.h>
+#ifdef __hpux
+#  include <sys/time.h>
+#else
+#  include <sys/select.h>
+#endif /* __hpux */
+
+
+/*
+ * 'backendDrainOutput()' - Drain pending print data to the device.
+ */
+
+int					/* O - 0 on success, -1 on error */
+backendDrainOutput(int print_fd,	/* I - Print file descriptor */
+                   int device_fd)	/* I - Device file descriptor */
+{
+  int		nfds;			/* Maximum file descriptor value + 1 */
+  fd_set	input;			/* Input set for reading */
+  ssize_t	print_bytes,		/* Print bytes read */
+		bytes;			/* Bytes written */
+  char		print_buffer[8192],	/* Print data buffer */
+		*print_ptr;		/* Pointer into print data buffer */
+  struct timeval timeout;		/* Timeout for read... */
+
+
+  fprintf(stderr, "DEBUG: backendDrainOutput(print_fd=%d, device_fd=%d)\n",
+          print_fd, device_fd);
+
+ /*
+  * Figure out the maximum file descriptor value to use with select()...
+  */
+
+  nfds = (print_fd > device_fd ? print_fd : device_fd) + 1;
+
+ /*
+  * Now loop until we are out of data from print_fd...
+  */
+
+  for (;;)
+  {
+   /*
+    * Use select() to determine whether we have data to copy around...
+    */
+
+    FD_ZERO(&input);
+    FD_SET(print_fd, &input);
+
+    timeout.tv_sec  = 0;
+    timeout.tv_usec = 0;
+
+    if (select(nfds, &input, NULL, NULL, &timeout) < 0)
+      return (-1);
+
+    if (!FD_ISSET(print_fd, &input))
+      return (0);
+
+    if ((print_bytes = read(print_fd, print_buffer,
+			    sizeof(print_buffer))) < 0)
+    {
+     /*
+      * Read error - bail if we don't see EAGAIN or EINTR...
+      */
+
+      if (errno != EAGAIN || errno != EINTR)
+      {
+	perror("ERROR: Unable to read print data");
+	return (-1);
+      }
+
+      print_bytes = 0;
+    }
+    else if (print_bytes == 0)
+    {
+     /*
+      * End of file, return...
+      */
+
+      return (0);
+    }
+
+    fprintf(stderr, "DEBUG: Read %d bytes of print data...\n",
+	    (int)print_bytes);
+
+    for (print_ptr = print_buffer; print_bytes > 0;)
+    {
+      if ((bytes = write(device_fd, print_ptr, print_bytes)) < 0)
+      {
+       /*
+        * Write error - bail if we don't see an error we can retry...
+	*/
+
+        if (errno != ENOSPC && errno != ENXIO && errno != EAGAIN &&
+	    errno != EINTR && errno != ENOTTY)
+	{
+	  _cupsLangPrintf(stderr, _("ERROR: Unable to write print data: %s\n"),
+			  strerror(errno));
+	  return (-1);
+	}
+      }
+      else
+      {
+        fprintf(stderr, "DEBUG: Wrote %d bytes of print data...\n", (int)bytes);
+
+        print_bytes -= bytes;
+	print_ptr   += bytes;
+      }
+    }
+  }
+}
+
+
+/*
+ * 'backendRunLoop()' - Read and write print and back-channel data.
+ */
+
+ssize_t					/* O - Total bytes on success, -1 on error */
+backendRunLoop(
+    int         print_fd,		/* I - Print file descriptor */
+    int         device_fd,		/* I - Device file descriptor */
+    int         snmp_fd,		/* I - SNMP socket or -1 if none */
+    http_addr_t *addr,			/* I - Address of device */
+    int         use_bc,			/* I - Use back-channel? */
+    int         update_state,		/* I - Update printer-state-reasons? */
+    int         (*side_cb)(int, int, int, http_addr_t *, int))
+					/* I - Side-channel callback */
+{
+  int		nfds;			/* Maximum file descriptor value + 1 */
+  fd_set	input,			/* Input set for reading */
+		output;			/* Output set for writing */
+  ssize_t	print_bytes,		/* Print bytes read */
+		bc_bytes,		/* Backchannel bytes read */
+		total_bytes,		/* Total bytes written */
+		bytes;			/* Bytes written */
+  int		paperout;		/* "Paper out" status */
+  int		offline;		/* "Off-line" status */
+  char		print_buffer[8192],	/* Print data buffer */
+		*print_ptr,		/* Pointer into print data buffer */
+		bc_buffer[1024];	/* Back-channel data buffer */
+  struct timeval timeout;		/* Timeout for select() */
+  time_t	curtime,		/* Current time */
+		snmp_update = 0;
+#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
+  struct sigaction action;		/* Actions for POSIX signals */
+#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
+
+
+  fprintf(stderr,
+          "DEBUG: backendRunLoop(print_fd=%d, device_fd=%d, snmp_fd=%d, "
+	  "addr=%p, use_bc=%d, side_cb=%p)\n",
+          print_fd, device_fd, snmp_fd, addr, use_bc, side_cb);
+
+ /*
+  * If we are printing data from a print driver on stdin, ignore SIGTERM
+  * so that the driver can finish out any page data, e.g. to eject the
+  * current page.  We only do this for stdin printing as otherwise there
+  * is no way to cancel a raw print job...
+  */
+
+  if (!print_fd)
+  {
+#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
+    sigset(SIGTERM, SIG_IGN);
+#elif defined(HAVE_SIGACTION)
+    memset(&action, 0, sizeof(action));
+
+    sigemptyset(&action.sa_mask);
+    action.sa_handler = SIG_IGN;
+    sigaction(SIGTERM, &action, NULL);
+#else
+    signal(SIGTERM, SIG_IGN);
+#endif /* HAVE_SIGSET */
+  }
+  else if (print_fd < 0)
+  {
+   /*
+    * Copy print data from stdin, but don't mess with the signal handlers...
+    */
+
+    print_fd = 0;
+  }
+
+ /*
+  * Figure out the maximum file descriptor value to use with select()...
+  */
+
+  nfds = (print_fd > device_fd ? print_fd : device_fd) + 1;
+
+ /*
+  * Now loop until we are out of data from print_fd...
+  */
+
+  for (print_bytes = 0, print_ptr = print_buffer, offline = -1,
+           paperout = -1, total_bytes = 0;;)
+  {
+   /*
+    * Use select() to determine whether we have data to copy around...
+    */
+
+    FD_ZERO(&input);
+    if (!print_bytes)
+      FD_SET(print_fd, &input);
+    if (use_bc)
+      FD_SET(device_fd, &input);
+    if (!print_bytes && side_cb)
+      FD_SET(CUPS_SC_FD, &input);
+
+    FD_ZERO(&output);
+    if (print_bytes || (!use_bc && !side_cb))
+      FD_SET(device_fd, &output);
+
+    if (use_bc || side_cb)
+    {
+      timeout.tv_sec  = 5;
+      timeout.tv_usec = 0;
+
+      if (select(nfds, &input, &output, NULL, &timeout) < 0)
+      {
+       /*
+	* Pause printing to clear any pending errors...
+	*/
+
+	if (errno == ENXIO && offline != 1 && update_state)
+	{
+	  fputs("STATE: +offline-report\n", stderr);
+	  _cupsLangPuts(stderr, _("INFO: Printer is currently offline.\n"));
+	  offline = 1;
+	}
+	else if (errno == EINTR && total_bytes == 0)
+	{
+	  fputs("DEBUG: Received an interrupt before any bytes were "
+	        "written, aborting!\n", stderr);
+          return (0);
+	}
+
+	sleep(1);
+	continue;
+      }
+    }
+
+   /*
+    * Check if we have a side-channel request ready...
+    */
+
+    if (side_cb && FD_ISSET(CUPS_SC_FD, &input))
+    {
+     /*
+      * Do the side-channel request, then start back over in the select
+      * loop since it may have read from print_fd...
+      */
+
+      if ((*side_cb)(print_fd, device_fd, snmp_fd, addr, use_bc))
+        side_cb = NULL;
+      continue;
+    }
+
+   /*
+    * Check if we have back-channel data ready...
+    */
+
+    if (FD_ISSET(device_fd, &input))
+    {
+      if ((bc_bytes = read(device_fd, bc_buffer, sizeof(bc_buffer))) > 0)
+      {
+	fprintf(stderr,
+	        "DEBUG: Received " CUPS_LLFMT " bytes of back-channel data!\n",
+	        CUPS_LLCAST bc_bytes);
+        cupsBackChannelWrite(bc_buffer, bc_bytes, 1.0);
+      }
+      else if (bc_bytes < 0 && errno != EAGAIN && errno != EINTR)
+      {
+        fprintf(stderr, "DEBUG: Error reading back-channel data: %s\n",
+	        strerror(errno));
+	use_bc = 0;
+      }
+      else if (bc_bytes == 0)
+        use_bc = 0;
+    }
+
+   /*
+    * Check if we have print data ready...
+    */
+
+    if (FD_ISSET(print_fd, &input))
+    {
+      if ((print_bytes = read(print_fd, print_buffer,
+                              sizeof(print_buffer))) < 0)
+      {
+       /*
+        * Read error - bail if we don't see EAGAIN or EINTR...
+	*/
+
+	if (errno != EAGAIN || errno != EINTR)
+	{
+	  perror("ERROR: Unable to read print data");
+	  return (-1);
+	}
+
+        print_bytes = 0;
+      }
+      else if (print_bytes == 0)
+      {
+       /*
+        * End of file, break out of the loop...
+	*/
+
+        break;
+      }
+
+      print_ptr = print_buffer;
+
+      fprintf(stderr, "DEBUG: Read %d bytes of print data...\n",
+              (int)print_bytes);
+    }
+
+   /*
+    * Check if the device is ready to receive data and we have data to
+    * send...
+    */
+
+    if (print_bytes && FD_ISSET(device_fd, &output))
+    {
+      if ((bytes = write(device_fd, print_ptr, print_bytes)) < 0)
+      {
+       /*
+        * Write error - bail if we don't see an error we can retry...
+	*/
+
+        if (errno == ENOSPC)
+	{
+	  if (paperout != 1 && update_state)
+	  {
+	    fputs("STATE: +media-empty-warning\n", stderr);
+	    _cupsLangPuts(stderr, _("ERROR: Out of paper!\n"));
+	    paperout = 1;
+	  }
+        }
+	else if (errno == ENXIO)
+	{
+	  if (offline != 1 && update_state)
+	  {
+	    fputs("STATE: +offline-report\n", stderr);
+	    _cupsLangPuts(stderr, _("INFO: Printer is currently off-line.\n"));
+	    offline = 1;
+	  }
+	}
+	else if (errno != EAGAIN && errno != EINTR && errno != ENOTTY)
+	{
+	  fprintf(stderr, _("ERROR: Unable to write print data: %s\n"),
+	          strerror(errno));
+	  return (-1);
+	}
+      }
+      else
+      {
+        if (paperout && update_state)
+	{
+	  fputs("STATE: -media-empty-warning\n", stderr);
+	  paperout = 0;
+	}
+
+	if (offline && update_state)
+	{
+	  fputs("STATE: -offline-report\n", stderr);
+	  _cupsLangPuts(stderr, _("INFO: Printer is now online.\n"));
+	  offline = 0;
+	}
+
+        fprintf(stderr, "DEBUG: Wrote %d bytes of print data...\n", (int)bytes);
+
+        print_bytes -= bytes;
+	print_ptr   += bytes;
+	total_bytes += bytes;
+      }
+    }
+
+   /*
+    * Do SNMP updates periodically...
+    */
+
+    if (snmp_fd >= 0 && time(&curtime) >= snmp_update)
+    {
+      if (backendSNMPSupplies(snmp_fd, addr, NULL, NULL))
+        snmp_update = INT_MAX;
+      else
+        snmp_update = curtime + 5;
+    }
+  }
+
+ /*
+  * Return with success...
+  */
+
+  return (total_bytes);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -3,7 +3,8 @@
 *
 *   IRIX SCSI printer support for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2003 by Easy Software Products, all rights reserved.
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 2003-2005 by Easy Software Products, all rights reserved.
 *
 *   Redistribution and use in source and binary forms, with or
 *   without modification, are permitted provided that the
@@ -65,7 +66,8 @@
 void
 list_devices(void)
 {
-  puts("direct scsi \"Unknown\" \"SCSI Printer\"");
+  printf("direct scsi \"Unknown\" \"%s\"\n",
+         _cupsLangString(cupsLangDefault(), _("SCSI Printer")));
 }


@@ -95,34 +97,62 @@ print_device(const char *resource,	/* I - SCSI device */

  if (strncmp(resource, "/dev/scsi/", 10) != 0)
  {
-    fprintf(stderr, "ERROR: Bad SCSI device file \"%s\"!\n", resource);
-    return (1);
+    _cupsLangPrintf(stderr, _("ERROR: Bad SCSI device file \"%s\"!\n"),
+                    resource);
+    return (CUPS_BACKEND_STOP);
  }

 /*
  * Open the SCSI device file...
  */

+  fputs("STATE: +connecting-to-device\n", stderr);
+
  do
  {
    if ((scsi_fd = open(resource, O_RDWR | O_EXCL)) == -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.
+	*/
+
+        _cupsLangPuts(stderr,
+	              _("INFO: Unable to contact printer, queuing on next "
+			"printer in class...\n"));
+
+       /*
+        * Sleep 5 seconds to keep the job from requeuing too rapidly...
+	*/
+
+	sleep(5);
+
+        return (1);
+      }
+
      if (errno != EAGAIN && errno != EBUSY)
      {
-	fprintf(stderr, "ERROR: Unable to open SCSI device \"%s\" - %s\n",
-        	resource, strerror(errno));
-	return (1);
+	_cupsLangPrintf(stderr,
+	                _("ERROR: Unable to open device file \"%s\": %s\n"),
+			resource, strerror(errno));
+	return (CUPS_BACKEND_FAILED);
      }
      else
      {
-        fprintf(stderr, "INFO: SCSI device \"%s\" busy; retrying...\n",
-	        resource);
+        _cupsLangPuts(stderr,
+	              _("INFO: Printer busy; will retry in 30 seconds...\n"));
        sleep(30);
      }
    }
  }
  while (scsi_fd == -1);

+  fputs("STATE: -connecting-to-device\n", stderr);
+
 /*
  * Now that we are "connected" to the port, ignore SIGTERM so that we
  * can finish out any page data the driver sends (e.g. to eject the
@@ -176,8 +206,9 @@ print_device(const char *resource,	/* I - SCSI device */
 	if (ioctl(scsi_fd, DS_ENTER, &scsi_req) < 0 ||
            scsi_req.ds_status != 0)
        {
-	  fprintf(stderr, "WARNING: SCSI command timed out (%d); retrying...\n",
-	          scsi_req.ds_status);
+	  _cupsLangPrintf(stderr,
+			  _("WARNING: SCSI command timed out (%d); "
+			    "retrying...\n"), scsi_req.ds_status);
          sleep(try + 1);
 	}
 	else
@@ -185,10 +216,10 @@ print_device(const char *resource,	/* I - SCSI device */

      if (try >= 10)
      {
-	fprintf(stderr, "ERROR: Unable to send print data (%d)\n",
-	        scsi_req.ds_status);
+	_cupsLangPrintf(stderr, _("ERROR: Unable to send print data (%d)\n"),
+			scsi_req.ds_status);
        close(scsi_fd);
-	return (1);
+	return (CUPS_BACKEND_FAILED);
      }
    }

@@ -201,7 +232,7 @@ print_device(const char *resource,	/* I - SCSI device */

  close(fd);

-  return (0);
+  return (CUPS_BACKEND_OK);
 }


@@ -3,7 +3,8 @@
 *
 *   Linux SCSI printer support for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2003 by Easy Software Products, all rights reserved.
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 2003-2005 by Easy Software Products, all rights reserved.
 *
 *   Redistribution and use in source and binary forms, with or
 *   without modification, are permitted provided that the
@@ -55,6 +56,7 @@
 */

 #include <scsi/sg.h>
+#include <cups/i18n.h>


 /*
@@ -77,7 +79,8 @@ int	print_device(const char *resource, int fd, int copies) { return (1); }
 void
 list_devices(void)
 {
-  puts("direct scsi \"Unknown\" \"SCSI Printer\"");
+  printf("direct scsi \"Unknown\" \"%s\"\n",
+         _cupsLangString(cupsLangDefault(), _("SCSI Printer")));
 }


@@ -95,7 +98,7 @@ print_device(const char *resource,	/* I - SCSI device */
  int		bytes;			/* Number of bytes */
  int		try;			/* Current try */
  sg_io_hdr_t	scsi_req;		/* SCSI request */
-  char		scsi_cmd[6],		/* SCSI command data */
+  unsigned char	scsi_cmd[6],		/* SCSI command data */
 		scsi_sense[32];		/* SCSI sense data */
 #  if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
  struct sigaction action;		/* Actions for POSIX signals */
@@ -108,34 +111,62 @@ print_device(const char *resource,	/* I - SCSI device */

  if (strncmp(resource, "/dev/sg", 7) != 0)
  {
-    fprintf(stderr, "ERROR: Bad SCSI device file \"%s\"!\n", resource);
-    return (1);
+    _cupsLangPrintf(stderr, _("ERROR: Bad SCSI device file \"%s\"!\n"),
+                    resource);
+    return (CUPS_BACKEND_STOP);
  }

 /*
  * Open the SCSI device file...
  */

+  fputs("STATE: +connecting-to-device\n", stderr);
+
  do
  {
    if ((scsi_fd = open(resource, O_RDWR | O_EXCL)) == -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.
+	*/
+
+        _cupsLangPuts(stderr,
+	              _("INFO: Unable to contact printer, queuing on next "
+		        "printer in class...\n"));
+
+       /*
+        * Sleep 5 seconds to keep the job from requeuing too rapidly...
+	*/
+
+	sleep(5);
+
+        return (CUPS_BACKEND_FAILED);
+      }
+
      if (errno != EAGAIN && errno != EBUSY)
      {
-	fprintf(stderr, "ERROR: Unable to open SCSI device \"%s\" - %s\n",
-        	resource, strerror(errno));
-	return (1);
+	_cupsLangPrintf(stderr,
+	                _("ERROR: Unable to open device file \"%s\": %s\n"),
+			resource, strerror(errno));
+	return (CUPS_BACKEND_FAILED);
      }
      else
      {
-        fprintf(stderr, "INFO: SCSI device \"%s\" busy; retrying...\n",
-	        resource);
+        _cupsLangPuts(stderr,
+	              _("INFO: Printer busy; will retry in 30 seconds...\n"));
        sleep(30);
      }
    }
  }
  while (scsi_fd == -1);

+  fputs("STATE: -connecting-to-device\n", stderr);
+
 /*
  * Now that we are "connected" to the port, ignore SIGTERM so that we
  * can finish out any page data the driver sends (e.g. to eject the
@@ -193,8 +224,9 @@ print_device(const char *resource,	/* I - SCSI device */
 	if (ioctl(scsi_fd, SG_IO, &scsi_req) < 0 ||
            scsi_req.status != 0)
        {
-	  fprintf(stderr, "WARNING: SCSI command timed out (%d); retrying...\n",
-	          scsi_req.status);
+	  _cupsLangPrintf(stderr,
+			  _("WARNING: SCSI command timed out (%d); "
+			    "retrying...\n"), scsi_req.status);
          sleep(try + 1);
 	}
 	else
@@ -202,10 +234,10 @@ print_device(const char *resource,	/* I - SCSI device */

      if (try >= 10)
      {
-	fprintf(stderr, "ERROR: Unable to send print data (%d)\n",
-	        scsi_req.status);
+	_cupsLangPrintf(stderr, _("ERROR: Unable to send print data (%d)\n"),
+			scsi_req.status);
        close(scsi_fd);
-	return (1);
+	return (CUPS_BACKEND_FAILED);
      }
    }

@@ -218,7 +250,7 @@ print_device(const char *resource,	/* I - SCSI device */

  close(fd);

-  return (0);
+  return (CUPS_BACKEND_OK);
 }
 #endif /* !SG_DXFER_TO_DEV */

@@ -3,7 +3,8 @@
 *
 *   SCSI printer backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2003 by Easy Software Products, all rights reserved.
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 2003-2006 by Easy Software Products, all rights reserved.
 *
 *   Redistribution and use in source and binary forms, with or
 *   without modification, are permitted provided that the
@@ -53,11 +54,14 @@
 * Include necessary headers.
 */

+#include <cups/backend.h>
 #include <cups/cups.h>
+#include <cups/i18n.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <cups/string.h>
+#include <cups/i18n.h>
 #include <signal.h>

 #ifdef WIN32
@@ -79,7 +83,7 @@ void	list_devices(void);
 int	print_device(const char *resource, int fd, int copies);


-#ifdef __linux__
+#if defined(__linux__) && defined(HAVE_SCSI_SG_H)
 #  include "scsi-linux.c"
 #elif defined(__sgi)
 #  include "scsi-irix.c"
@@ -88,8 +92,8 @@ int	print_device(const char *resource, int fd, int copies);
 * Dummy functions that do nothing on unsupported platforms...
 */
 void	list_devices(void) {}
-int	print_device(const char *resource, int fd, int copies) { return (1); }
-#endif /* __linux */
+int	print_device(const char *resource, int fd, int copies) { return (CUPS_BACKEND_FAILED); }
+#endif /* __linux && HAVE_SCSI_SG_H */


 /*
@@ -145,12 +149,14 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  if (argc == 1)
  {
    list_devices();
-    return (0);
+    return (CUPS_BACKEND_OK);
  }
  else if (argc < 6 || argc > 7)
  {
-    fputs("Usage: scsi:/dev/file job-id user title copies options [file]\n", stderr);
-    return (1);
+    _cupsLangPrintf(stderr,
+                    _("Usage: %s job-id user title copies options [file]\n"),
+		    argv[0]);
+    return (CUPS_BACKEND_FAILED);
  }

 /*
@@ -171,8 +177,10 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

    if ((fp = open(argv[6], O_RDONLY)) < 0)
    {
-      perror("ERROR: unable to open print file");
-      return (1);
+      _cupsLangPrintf(stderr,
+                      _("ERROR: Unable to open print file \"%s\": %s\n"),
+		      argv[6], strerror(errno));
+      return (CUPS_BACKEND_FAILED);
    }

    copies = atoi(argv[4]);
@@ -182,7 +190,10 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  * Extract the device name and options from the URI...
  */

-  httpSeparate(argv[0], method, username, hostname, &port, resource);
+  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...
@@ -211,9 +222,6 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  if (fp != 0)
    close(fp);

-  if (!status)
-    fputs("INFO: Ready to print.\n", stderr);
-
  return (status);
 }

@@ -0,0 +1,990 @@
+/*
+ * "$Id$"
+ *
+ *   SNMP supplies functions for CUPS.
+ *
+ *   Copyright 2008-2011 by Apple Inc.
+ *
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   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:
+ *
+ *   backendSNMPSupplies()   - Get the current supplies for a device.
+ *   backend_init_supplies() - Initialize the supplies list.
+ *   backend_walk_cb()       - Interpret the supply value responses.
+ *   utf16_to_utf8()         - Convert UTF-16 text to UTF-8.
+ */
+
+/*
+ * Include necessary headers.
+ */
+
+#include "backend-private.h"
+#include <cups/array.h>
+
+
+/*
+ * Local constants...
+ */
+
+#define CUPS_MAX_SUPPLIES	32	/* Maximum number of supplies for a printer */
+#define CUPS_SUPPLY_TIMEOUT	2.0	/* Timeout for SNMP lookups */
+
+#define CUPS_DEVELOPER_LOW		1
+#define CUPS_DEVELOPER_EMPTY		2
+#define CUPS_MARKER_SUPPLY_LOW		4
+#define CUPS_MARKER_SUPPLY_EMPTY	8
+#define CUPS_MARKER_WASTE_ALMOST_FULL	16
+#define CUPS_MARKER_WASTE_FULL		32
+#define CUPS_OPC_NEAR_EOL		64
+#define CUPS_OPC_LIFE_OVER		128
+#define CUPS_TONER_LOW			256
+#define CUPS_TONER_EMPTY		512
+
+
+/*
+ * Local structures...
+ */
+
+typedef struct				/**** Printer supply data ****/
+{
+  char	name[CUPS_SNMP_MAX_STRING],	/* Name of supply */
+	color[8];			/* Color: "#RRGGBB" or "none" */
+  int	colorant,			/* Colorant index */
+	type,				/* Supply type */
+	max_capacity,			/* Maximum capacity */
+	level;				/* Current level value */
+} backend_supplies_t;
+
+typedef struct				/**** Printer state table ****/
+{
+  int		bit;			/* State bit */
+  const char	*keyword;		/* IPP printer-state-reasons keyword */
+} backend_state_t;
+
+
+/*
+ * Local globals...
+ */
+
+static http_addr_t	current_addr;	/* Current address */
+static int		current_state = -1;
+					/* Current device state bits */
+static int		charset = -1;	/* Character set for supply names */
+static int		num_supplies = 0;
+					/* Number of supplies found */
+static backend_supplies_t supplies[CUPS_MAX_SUPPLIES];
+					/* Supply information */
+static int		supply_state = -1;
+					/* Supply state info */
+
+static const int	hrDeviceDescr[] =
+			{ CUPS_OID_hrDeviceDescr, 1, -1 };
+					/* Device description OID */
+static const int	hrPrinterStatus[] =
+			{ CUPS_OID_hrPrinterStatus, 1, -1 };
+					/* Current state OID */
+static const int	hrPrinterDetectedErrorState[] =
+			{ CUPS_OID_hrPrinterDetectedErrorState, 1, -1 };
+					/* Current printer state bits OID */
+static const int	prtGeneralCurrentLocalization[] =
+			{ CUPS_OID_prtGeneralCurrentLocalization, 1, -1 };
+static const int	prtLocalizationCharacterSet[] =
+			{ CUPS_OID_prtLocalizationCharacterSet, 1, 1, -1 },
+			prtLocalizationCharacterSetOffset =
+			(sizeof(prtLocalizationCharacterSet) /
+			 sizeof(prtLocalizationCharacterSet[0]));
+static const int	prtMarkerColorantValue[] =
+			{ CUPS_OID_prtMarkerColorantValue, -1 },
+					/* Colorant OID */
+			prtMarkerColorantValueOffset =
+			(sizeof(prtMarkerColorantValue) /
+			 sizeof(prtMarkerColorantValue[0]));
+					/* Offset to colorant index */
+static const int	prtMarkerLifeCount[] =
+			{ CUPS_OID_prtMarkerLifeCount, 1, 1, -1 };
+					/* Page counter OID */
+static const int	prtMarkerSuppliesEntry[] =
+			{ CUPS_OID_prtMarkerSuppliesEntry, -1 };
+					/* Supplies OID */
+static const int	prtMarkerSuppliesColorantIndex[] =
+			{ CUPS_OID_prtMarkerSuppliesColorantIndex, -1 },
+					/* Colorant index OID */
+			prtMarkerSuppliesColorantIndexOffset =
+			(sizeof(prtMarkerSuppliesColorantIndex) /
+			 sizeof(prtMarkerSuppliesColorantIndex[0]));
+			 		/* Offset to supply index */
+static const int	prtMarkerSuppliesDescription[] =
+			{ CUPS_OID_prtMarkerSuppliesDescription, -1 },
+					/* Description OID */
+			prtMarkerSuppliesDescriptionOffset =
+			(sizeof(prtMarkerSuppliesDescription) /
+			 sizeof(prtMarkerSuppliesDescription[0]));
+			 		/* Offset to supply index */
+static const int	prtMarkerSuppliesLevel[] =
+			{ CUPS_OID_prtMarkerSuppliesLevel, -1 },
+					/* Level OID */
+			prtMarkerSuppliesLevelOffset =
+			(sizeof(prtMarkerSuppliesLevel) /
+			 sizeof(prtMarkerSuppliesLevel[0]));
+			 		/* Offset to supply index */
+static const int	prtMarkerSuppliesMaxCapacity[] =
+			{ CUPS_OID_prtMarkerSuppliesMaxCapacity, -1 },
+					/* Max capacity OID */
+			prtMarkerSuppliesMaxCapacityOffset =
+			(sizeof(prtMarkerSuppliesMaxCapacity) /
+			 sizeof(prtMarkerSuppliesMaxCapacity[0]));
+			 		/* Offset to supply index */
+static const int	prtMarkerSuppliesType[] =
+			{ CUPS_OID_prtMarkerSuppliesType, -1 },
+					/* Type OID */
+			prtMarkerSuppliesTypeOffset =
+			(sizeof(prtMarkerSuppliesType) /
+			 sizeof(prtMarkerSuppliesType[0]));
+			 		/* Offset to supply index */
+
+static const backend_state_t const printer_states[] =
+			{
+			  { CUPS_TC_lowPaper, "media-low-report" },
+			  { CUPS_TC_noPaper | CUPS_TC_inputTrayEmpty, "media-empty-warning" },
+			  /* { CUPS_TC_lowToner, "toner-low-report" }, */ /* now use prtMarkerSupplies */
+			  /* { CUPS_TC_noToner, "toner-empty-warning" }, */ /* now use prtMarkerSupplies */
+			  { CUPS_TC_doorOpen, "door-open-report" },
+			  { CUPS_TC_jammed, "media-jam-warning" },
+			  /* { CUPS_TC_offline, "offline-report" }, */ /* unreliable */
+			  /* { CUPS_TC_serviceRequested | CUPS_TC_overduePreventMaint, "service-needed-warning" }, */ /* unreliable */
+			  { CUPS_TC_inputTrayMissing, "input-tray-missing-warning" },
+			  { CUPS_TC_outputTrayMissing, "output-tray-missing-warning" },
+			  { CUPS_TC_markerSupplyMissing, "marker-supply-missing-warning" },
+			  { CUPS_TC_outputNearFull, "output-area-almost-full-report" },
+			  { CUPS_TC_outputFull, "output-area-full-warning" }
+			};
+
+static const backend_state_t const supply_states[] =
+			{
+			  { CUPS_DEVELOPER_LOW, "developer-low-report" },
+			  { CUPS_DEVELOPER_EMPTY, "developer-empty-warning" },
+			  { CUPS_MARKER_SUPPLY_LOW, "marker-supply-low-report" },
+			  { CUPS_MARKER_SUPPLY_EMPTY, "marker-supply-empty-warning" },
+			  { CUPS_MARKER_WASTE_ALMOST_FULL, "marker-waste-almost-full-report" },
+			  { CUPS_MARKER_WASTE_FULL, "marker-waste-full-warning" },
+			  { CUPS_OPC_NEAR_EOL, "opc-near-eol-report" },
+			  { CUPS_OPC_LIFE_OVER, "opc-life-over-warning" },
+			  { CUPS_TONER_LOW, "toner-low-report" },
+			  { CUPS_TONER_EMPTY, "toner-empty-warning" }
+			};
+
+
+/*
+ * Local functions...
+ */
+
+static void	backend_init_supplies(int snmp_fd, http_addr_t *addr);
+static void	backend_walk_cb(cups_snmp_t *packet, void *data);
+static void	utf16_to_utf8(cups_utf8_t *dst, const unsigned char *src,
+			      size_t srcsize, size_t dstsize, int le);
+
+
+/*
+ * 'backendSNMPSupplies()' - Get the current supplies for a device.
+ */
+
+int					/* O - 0 on success, -1 on error */
+backendSNMPSupplies(
+    int         snmp_fd,		/* I - SNMP socket */
+    http_addr_t *addr,			/* I - Printer address */
+    int         *page_count,		/* O - Page count */
+    int         *printer_state)		/* O - Printer state */
+{
+  if (!httpAddrEqual(addr, &current_addr))
+    backend_init_supplies(snmp_fd, addr);
+  else if (num_supplies > 0)
+    _cupsSNMPWalk(snmp_fd, &current_addr, CUPS_SNMP_VERSION_1,
+		  _cupsSNMPDefaultCommunity(), prtMarkerSuppliesLevel,
+		  CUPS_SUPPLY_TIMEOUT, backend_walk_cb, NULL);
+
+  if (page_count)
+    *page_count = -1;
+
+  if (printer_state)
+    *printer_state = -1;
+
+  if (num_supplies > 0)
+  {
+    int		i,			/* Looping var */
+		percent,		/* Percent full */
+		new_state,		/* New state value */
+		change_state,		/* State change */
+		new_supply_state = 0;	/* Supply state */
+    char	value[CUPS_MAX_SUPPLIES * 4],
+					/* marker-levels value string */
+		*ptr;			/* Pointer into value string */
+    cups_snmp_t	packet;			/* SNMP response packet */
+
+   /*
+    * Generate the marker-levels value string...
+    */
+
+    for (i = 0, ptr = value; i < num_supplies; i ++, ptr += strlen(ptr))
+    {
+      percent = 100 * supplies[i].level / supplies[i].max_capacity;
+
+      if (percent <= 10)
+      {
+        switch (supplies[i].type)
+        {
+          case CUPS_TC_toner :
+          case CUPS_TC_tonerCartridge :
+              if (percent <= 1)
+                new_supply_state |= CUPS_TONER_EMPTY;
+              else
+                new_supply_state |= CUPS_TONER_LOW;
+              break;
+          case CUPS_TC_wasteToner :
+          case CUPS_TC_wasteInk :
+              if (percent <= 1)
+                new_supply_state |= CUPS_MARKER_WASTE_FULL;
+              else
+                new_supply_state |= CUPS_MARKER_WASTE_ALMOST_FULL;
+              break;
+          case CUPS_TC_ink :
+          case CUPS_TC_inkCartridge :
+          case CUPS_TC_inkRibbon :
+          case CUPS_TC_solidWax :
+          case CUPS_TC_ribbonWax :
+              if (percent <= 1)
+                new_supply_state |= CUPS_MARKER_SUPPLY_EMPTY;
+              else
+                new_supply_state |= CUPS_MARKER_SUPPLY_LOW;
+              break;
+          case CUPS_TC_developer :
+              if (percent <= 1)
+                new_supply_state |= CUPS_DEVELOPER_EMPTY;
+              else
+                new_supply_state |= CUPS_DEVELOPER_LOW;
+              break;
+          case CUPS_TC_coronaWire :
+          case CUPS_TC_fuser :
+          case CUPS_TC_opc :
+          case CUPS_TC_transferUnit :
+              if (percent <= 1)
+                new_supply_state |= CUPS_OPC_LIFE_OVER;
+              else
+                new_supply_state |= CUPS_OPC_NEAR_EOL;
+              break;
+        }
+      }
+
+      if (i)
+        *ptr++ = ',';
+
+      if (supplies[i].max_capacity > 0)
+        sprintf(ptr, "%d", percent);
+      else
+        strcpy(ptr, "-1");
+    }
+
+    fprintf(stderr, "ATTR: marker-levels=%s\n", value);
+
+    if (supply_state < 0)
+      change_state = 0xffff;
+    else
+      change_state = supply_state ^ new_supply_state;
+
+    fprintf(stderr, "DEBUG: new_supply_state=%x, change_state=%x\n",
+            new_supply_state, change_state);
+
+    for (i = 0;
+         i < (int)(sizeof(supply_states) / sizeof(supply_states[0]));
+         i ++)
+      if (change_state & supply_states[i].bit)
+      {
+	fprintf(stderr, "STATE: %c%s\n",
+		(new_supply_state & supply_states[i].bit) ? '+' : '-',
+		supply_states[i].keyword);
+      }
+
+    supply_state = new_supply_state;
+
+   /*
+    * Get the current printer status bits...
+    */
+
+    if (!_cupsSNMPWrite(snmp_fd, addr, CUPS_SNMP_VERSION_1,
+                       _cupsSNMPDefaultCommunity(), CUPS_ASN1_GET_REQUEST, 1,
+                       hrPrinterDetectedErrorState))
+      return (-1);
+
+    if (!_cupsSNMPRead(snmp_fd, &packet, CUPS_SUPPLY_TIMEOUT) ||
+        packet.object_type != CUPS_ASN1_OCTET_STRING)
+      return (-1);
+
+    if (packet.object_value.string.num_bytes == 2)
+      new_state = (packet.object_value.string.bytes[0] << 8) |
+		  packet.object_value.string.bytes[1];
+    else if (packet.object_value.string.num_bytes == 1)
+      new_state = (packet.object_value.string.bytes[0] << 8);
+    else
+      new_state = 0;
+
+    if (current_state < 0)
+      change_state = 0xffff;
+    else
+      change_state = current_state ^ new_state;
+
+    fprintf(stderr, "DEBUG: new_state=%x, change_state=%x\n", new_state,
+            change_state);
+
+    for (i = 0;
+         i < (int)(sizeof(printer_states) / sizeof(printer_states[0]));
+         i ++)
+      if (change_state & printer_states[i].bit)
+      {
+	fprintf(stderr, "STATE: %c%s\n",
+		(new_state & printer_states[i].bit) ? '+' : '-',
+		printer_states[i].keyword);
+      }
+
+    current_state = new_state;
+
+   /*
+    * Get the current printer state...
+    */
+
+    if (printer_state)
+    {
+      if (!_cupsSNMPWrite(snmp_fd, addr, CUPS_SNMP_VERSION_1,
+			 _cupsSNMPDefaultCommunity(), CUPS_ASN1_GET_REQUEST, 1,
+			 hrPrinterStatus))
+	return (-1);
+
+      if (!_cupsSNMPRead(snmp_fd, &packet, CUPS_SUPPLY_TIMEOUT) ||
+	  packet.object_type != CUPS_ASN1_INTEGER)
+	return (-1);
+
+      *printer_state = packet.object_value.integer;
+    }
+
+   /*
+    * Get the current page count...
+    */
+
+    if (page_count)
+    {
+      if (!_cupsSNMPWrite(snmp_fd, addr, CUPS_SNMP_VERSION_1,
+			 _cupsSNMPDefaultCommunity(), CUPS_ASN1_GET_REQUEST, 1,
+			 prtMarkerLifeCount))
+	return (-1);
+
+      if (!_cupsSNMPRead(snmp_fd, &packet, CUPS_SUPPLY_TIMEOUT) ||
+	  packet.object_type != CUPS_ASN1_COUNTER)
+	return (-1);
+
+      *page_count = packet.object_value.counter;
+    }
+
+    return (0);
+  }
+  else
+    return (-1);
+}
+
+
+/*
+ * 'backend_init_supplies()' - Initialize the supplies list.
+ */
+
+static void
+backend_init_supplies(
+    int         snmp_fd,		/* I - SNMP socket */
+    http_addr_t *addr)			/* I - Printer address */
+{
+  int		i,			/* Looping var */
+		type;			/* Current marker type */
+  cups_file_t	*cachefile;		/* Cache file */
+  const char	*cachedir;		/* CUPS_CACHEDIR value */
+  char		addrstr[1024],		/* Address string */
+		cachefilename[1024],	/* Cache filename */
+		description[CUPS_SNMP_MAX_STRING],
+					/* Device description string */
+		value[CUPS_MAX_SUPPLIES * (CUPS_SNMP_MAX_STRING * 2 + 3)],
+					/* Value string */
+		*ptr,			/* Pointer into value string */
+		*name_ptr;		/* Pointer into name string */
+  cups_snmp_t	packet;			/* SNMP response packet */
+  ppd_file_t	*ppd;			/* PPD file for this queue */
+  ppd_attr_t	*ppdattr;		/* cupsSNMPSupplies attribute */
+  static const char * const types[] =	/* Supply types */
+		{
+		  "other",
+		  "unknown",
+		  "toner",
+		  "wasteToner",
+		  "ink",
+		  "inkCartridge",
+		  "inkRibbon",
+		  "wasteInk",
+		  "opc",
+		  "developer",
+		  "fuserOil",
+		  "solidWax",
+		  "ribbonWax",
+		  "wasteWax",
+		  "fuser",
+		  "coronaWire",
+		  "fuserOilWick",
+		  "cleanerUnit",
+		  "fuserCleaningPad",
+		  "transferUnit",
+		  "tonerCartridge",
+		  "fuserOiler",
+		  "water",
+		  "wasteWater",
+		  "glueWaterAdditive",
+		  "wastePaper",
+		  "bindingSupply",
+		  "bandingSupply",
+		  "stitchingWire",
+		  "shrinkWrap",
+		  "paperWrap",
+		  "staples",
+		  "inserts",
+		  "covers"
+		};
+
+
+ /*
+  * Reset state information...
+  */
+
+  current_addr  = *addr;
+  current_state = -1;
+  num_supplies  = -1;
+  charset       = -1;
+
+  memset(supplies, 0, sizeof(supplies));
+
+ /*
+  * See if we should be getting supply levels via SNMP...
+  */
+
+  if ((ppd = ppdOpenFile(getenv("PPD"))) == NULL ||
+      ((ppdattr = ppdFindAttr(ppd, "cupsSNMPSupplies", NULL)) != NULL &&
+       ppdattr->value && strcasecmp(ppdattr->value, "true")))
+  {
+    ppdClose(ppd);
+    return;
+  }
+
+  ppdClose(ppd);
+
+ /*
+  * Get the device description...
+  */
+
+  if (!_cupsSNMPWrite(snmp_fd, addr, CUPS_SNMP_VERSION_1,
+		     _cupsSNMPDefaultCommunity(), CUPS_ASN1_GET_REQUEST, 1,
+		     hrDeviceDescr))
+    return;
+
+  if (!_cupsSNMPRead(snmp_fd, &packet, CUPS_SUPPLY_TIMEOUT) ||
+      packet.object_type != CUPS_ASN1_OCTET_STRING)
+  {
+    strlcpy(description, "Unknown", sizeof(description));
+    num_supplies = 0;
+  }
+  else
+    strlcpy(description, (char *)packet.object_value.string.bytes,
+            sizeof(description));
+
+  fprintf(stderr, "DEBUG2: hrDeviceDesc=\"%s\"\n", description);
+
+ /*
+  * See if we have already queried this device...
+  */
+
+  httpAddrString(addr, addrstr, sizeof(addrstr));
+
+  if ((cachedir = getenv("CUPS_CACHEDIR")) == NULL)
+    cachedir = CUPS_CACHEDIR;
+
+  snprintf(cachefilename, sizeof(cachefilename), "%s/%s.snmp", cachedir,
+           addrstr);
+
+  if ((cachefile = cupsFileOpen(cachefilename, "r")) != NULL)
+  {
+   /*
+    * Yes, read the cache file:
+    *
+    *     2 num_supplies charset
+    *     device description
+    *     supply structures...
+    */
+
+    if (cupsFileGets(cachefile, value, sizeof(value)))
+    {
+      if (sscanf(value, "2 %d%d", &num_supplies, &charset) == 2 &&
+          num_supplies <= CUPS_MAX_SUPPLIES &&
+          cupsFileGets(cachefile, value, sizeof(value)))
+      {
+        if (!strcmp(description, value))
+	  cupsFileRead(cachefile, (char *)supplies,
+	               num_supplies * sizeof(backend_supplies_t));
+        else
+	{
+	  num_supplies = -1;
+	  charset      = -1;
+	}
+      }
+      else
+      {
+        num_supplies = -1;
+	charset      = -1;
+      }
+    }
+
+    cupsFileClose(cachefile);
+  }
+
+ /*
+  * If the cache information isn't correct, scan for supplies...
+  */
+
+  if (charset < 0)
+  {
+   /*
+    * Get the configured character set...
+    */
+
+    int	oid[CUPS_SNMP_MAX_OID];		/* OID for character set */
+
+
+    if (!_cupsSNMPWrite(snmp_fd, &current_addr, CUPS_SNMP_VERSION_1,
+			_cupsSNMPDefaultCommunity(), CUPS_ASN1_GET_REQUEST, 1,
+			prtGeneralCurrentLocalization))
+      return;
+
+    if (!_cupsSNMPRead(snmp_fd, &packet, CUPS_SUPPLY_TIMEOUT) ||
+	packet.object_type != CUPS_ASN1_INTEGER)
+    {
+      fprintf(stderr,
+              "DEBUG: prtGeneralCurrentLocalization type is %x, expected %x!\n",
+	      packet.object_type, CUPS_ASN1_INTEGER);
+      return;
+    }
+
+    fprintf(stderr, "DEBUG2: prtGeneralCurrentLocalization=%d\n",
+            packet.object_value.integer);
+
+    _cupsSNMPCopyOID(oid, prtLocalizationCharacterSet, CUPS_SNMP_MAX_OID);
+    oid[prtLocalizationCharacterSetOffset - 2] = packet.object_value.integer;
+
+
+    if (!_cupsSNMPWrite(snmp_fd, &current_addr, CUPS_SNMP_VERSION_1,
+			_cupsSNMPDefaultCommunity(), CUPS_ASN1_GET_REQUEST, 1,
+			oid))
+      return;
+
+    if (!_cupsSNMPRead(snmp_fd, &packet, CUPS_SUPPLY_TIMEOUT) ||
+	packet.object_type != CUPS_ASN1_INTEGER)
+    {
+      fprintf(stderr,
+              "DEBUG: prtLocalizationCharacterSet type is %x, expected %x!\n",
+	      packet.object_type, CUPS_ASN1_INTEGER);
+      return;
+    }
+
+    fprintf(stderr, "DEBUG2: prtLocalizationCharacterSet=%d\n",
+	    packet.object_value.integer);
+    charset = packet.object_value.integer;
+  }
+
+  if (num_supplies < 0)
+  {
+   /*
+    * Walk the printer configuration information...
+    */
+
+    _cupsSNMPWalk(snmp_fd, &current_addr, CUPS_SNMP_VERSION_1,
+		  _cupsSNMPDefaultCommunity(), prtMarkerSuppliesEntry,
+		  CUPS_SUPPLY_TIMEOUT, backend_walk_cb, NULL);
+  }
+
+ /*
+  * Save the cached information...
+  */
+
+  if (num_supplies < 0)
+    num_supplies = 0;
+
+  if ((cachefile = cupsFileOpen(cachefilename, "w")) != NULL)
+  {
+    cupsFilePrintf(cachefile, "2 %d %d\n", num_supplies, charset);
+    cupsFilePrintf(cachefile, "%s\n", description);
+
+    if (num_supplies > 0)
+      cupsFileWrite(cachefile, (char *)supplies,
+                    num_supplies * sizeof(backend_supplies_t));
+
+    cupsFileClose(cachefile);
+  }
+
+  if (num_supplies <= 0)
+    return;
+
+ /*
+  * Get the colors...
+  */
+
+  for (i = 0; i < num_supplies; i ++)
+    strcpy(supplies[i].color, "none");
+
+  _cupsSNMPWalk(snmp_fd, &current_addr, CUPS_SNMP_VERSION_1,
+                _cupsSNMPDefaultCommunity(), prtMarkerColorantValue,
+	        CUPS_SUPPLY_TIMEOUT, backend_walk_cb, NULL);
+
+ /*
+  * Output the marker-colors attribute...
+  */
+
+  for (i = 0, ptr = value; i < num_supplies; i ++, ptr += strlen(ptr))
+  {
+    if (i)
+      *ptr++ = ',';
+
+    strcpy(ptr, supplies[i].color);
+  }
+
+  fprintf(stderr, "ATTR: marker-colors=%s\n", value);
+
+ /*
+  * Output the marker-names attribute...
+  */
+
+  for (i = 0, ptr = value; i < num_supplies; i ++)
+  {
+    if (i)
+      *ptr++ = ',';
+
+    *ptr++ = '\"';
+    for (name_ptr = supplies[i].name; *name_ptr;)
+    {
+      if (*name_ptr == '\\' || *name_ptr == '\"')
+        *ptr++ = '\\';
+
+      *ptr++ = *name_ptr++;
+    }
+    *ptr++ = '\"';
+  }
+
+  *ptr = '\0';
+
+  fprintf(stderr, "ATTR: marker-names=%s\n", value);
+
+ /*
+  * Output the marker-types attribute...
+  */
+
+  for (i = 0, ptr = value; i < num_supplies; i ++, ptr += strlen(ptr))
+  {
+    if (i)
+      *ptr++ = ',';
+
+    type = supplies[i].type;
+
+    if (type < CUPS_TC_other || type > CUPS_TC_covers)
+      strcpy(ptr, "unknown");
+    else
+      strcpy(ptr, types[type - CUPS_TC_other]);
+  }
+
+  fprintf(stderr, "ATTR: marker-types=%s\n", value);
+}
+
+
+/*
+ * 'backend_walk_cb()' - Interpret the supply value responses.
+ */
+
+static void
+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] =
+  {					/* Standard color names */
+    { "black",   "#000000" },
+    { "blue",    "#0000FF" },
+    { "cyan",    "#00FFFF" },
+    { "green",   "#00FF00" },
+    { "magenta", "#FF00FF" },
+    { "red",     "#FF0000" },
+    { "white",   "#FFFFFF" },
+    { "yellow",  "#FFFF00" }
+  };
+
+
+  (void)data;
+
+  if (_cupsSNMPIsOIDPrefixed(packet, prtMarkerColorantValue) &&
+      packet->object_type == CUPS_ASN1_OCTET_STRING)
+  {
+   /*
+    * Get colorant...
+    */
+
+    i = packet->object_name[prtMarkerColorantValueOffset];
+
+    fprintf(stderr, "DEBUG2: prtMarkerColorantValue.1.%d = \"%s\"\n", i,
+            (char *)packet->object_value.string.bytes);
+
+    for (j = 0; j < num_supplies; j ++)
+      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))
+	  {
+	    strcpy(supplies[j].color, colors[k][1]);
+	    break;
+	  }
+      }
+  }
+  else if (_cupsSNMPIsOIDPrefixed(packet, prtMarkerSuppliesColorantIndex))
+  {
+   /*
+    * Get colorant index...
+    */
+
+    i = packet->object_name[prtMarkerSuppliesColorantIndexOffset];
+    if (i < 1 || i > CUPS_MAX_SUPPLIES ||
+        packet->object_type != CUPS_ASN1_INTEGER)
+      return;
+
+    fprintf(stderr, "DEBUG2: prtMarkerSuppliesColorantIndex.1.%d = %d\n", i,
+            packet->object_value.integer);
+
+    if (i > num_supplies)
+      num_supplies = i;
+
+    supplies[i - 1].colorant = packet->object_value.integer;
+  }
+  else if (_cupsSNMPIsOIDPrefixed(packet, prtMarkerSuppliesDescription))
+  {
+   /*
+    * Get supply name/description...
+    */
+
+    i = packet->object_name[prtMarkerSuppliesDescriptionOffset];
+    if (i < 1 || i > CUPS_MAX_SUPPLIES ||
+        packet->object_type != CUPS_ASN1_OCTET_STRING)
+      return;
+
+    if (i > num_supplies)
+      num_supplies = i;
+
+    switch (charset)
+    {
+      case CUPS_TC_csASCII :
+      case CUPS_TC_csUTF8 :
+      case CUPS_TC_csUnicodeASCII :
+	  strlcpy(supplies[i - 1].name,
+	          (char *)packet->object_value.string.bytes,
+		  sizeof(supplies[0].name));
+          break;
+
+      case CUPS_TC_csISOLatin1 :
+      case CUPS_TC_csUnicodeLatin1 :
+	  cupsCharsetToUTF8((cups_utf8_t *)supplies[i - 1].name,
+	                    (char *)packet->object_value.string.bytes,
+		            sizeof(supplies[0].name), CUPS_ISO8859_1);
+          break;
+
+      case CUPS_TC_csShiftJIS :
+	  cupsCharsetToUTF8((cups_utf8_t *)supplies[i - 1].name,
+	                    (char *)packet->object_value.string.bytes,
+		            sizeof(supplies[0].name), CUPS_JIS_X0213);
+          break;
+
+      case CUPS_TC_csUCS4 :
+      case CUPS_TC_csUTF32 :
+      case CUPS_TC_csUTF32BE :
+      case CUPS_TC_csUTF32LE :
+	  cupsUTF32ToUTF8((cups_utf8_t *)supplies[i - 1].name,
+	                  (cups_utf32_t *)packet->object_value.string.bytes,
+			  sizeof(supplies[0].name));
+          break;
+
+      case CUPS_TC_csUnicode :
+      case CUPS_TC_csUTF16BE :
+      case CUPS_TC_csUTF16LE :
+	  utf16_to_utf8((cups_utf8_t *)supplies[i - 1].name,
+	                packet->object_value.string.bytes,
+			packet->object_value.string.num_bytes,
+			sizeof(supplies[0].name), charset == CUPS_TC_csUTF16LE);
+          break;
+
+      default :
+	 /*
+	  * If we get here, the printer is using an unknown character set and
+	  * we just want to copy characters that look like ASCII...
+	  */
+
+          {
+	    char	*src, *dst;	/* Pointers into strings */
+
+
+           /*
+	    * Loop safe because both the object_value and supplies char arrays
+	    * are CUPS_SNMP_MAX_STRING elements long.
+	    */
+
+            for (src = (char *)packet->object_value.string.bytes,
+	             dst = supplies[i - 1].name;
+		 *src;
+		 src ++)
+	    {
+	      if ((*src & 0x80) || *src < ' ' || *src == 0x7f)
+	        *dst++ = '?';
+	      else
+	        *dst++ = *src;
+	    }
+
+	    *dst = '\0';
+	  }
+	  break;
+    }
+
+    fprintf(stderr, "DEBUG2: prtMarkerSuppliesDescription.1.%d = \"%s\"\n", i,
+            supplies[i - 1].name);
+
+  }
+  else if (_cupsSNMPIsOIDPrefixed(packet, prtMarkerSuppliesLevel))
+  {
+   /*
+    * Get level...
+    */
+
+    i = packet->object_name[prtMarkerSuppliesLevelOffset];
+    if (i < 1 || i > CUPS_MAX_SUPPLIES ||
+        packet->object_type != CUPS_ASN1_INTEGER)
+      return;
+
+    fprintf(stderr, "DEBUG2: prtMarkerSuppliesLevel.1.%d = %d\n", i,
+            packet->object_value.integer);
+
+    if (i > num_supplies)
+      num_supplies = i;
+
+    supplies[i - 1].level = packet->object_value.integer;
+  }
+  else if (_cupsSNMPIsOIDPrefixed(packet, prtMarkerSuppliesMaxCapacity))
+  {
+   /*
+    * Get max capacity...
+    */
+
+    i = packet->object_name[prtMarkerSuppliesMaxCapacityOffset];
+    if (i < 1 || i > CUPS_MAX_SUPPLIES ||
+        packet->object_type != CUPS_ASN1_INTEGER)
+      return;
+
+    fprintf(stderr, "DEBUG2: prtMarkerSuppliesMaxCapacity.1.%d = %d\n", i,
+            packet->object_value.integer);
+
+    if (i > num_supplies)
+      num_supplies = i;
+
+    supplies[i - 1].max_capacity = packet->object_value.integer;
+  }
+  else if (_cupsSNMPIsOIDPrefixed(packet, prtMarkerSuppliesType))
+  {
+   /*
+    * Get marker type...
+    */
+
+    i = packet->object_name[prtMarkerSuppliesTypeOffset];
+    if (i < 1 || i > CUPS_MAX_SUPPLIES ||
+        packet->object_type != CUPS_ASN1_INTEGER)
+      return;
+
+    fprintf(stderr, "DEBUG2: prtMarkerSuppliesType.1.%d = %d\n", i,
+            packet->object_value.integer);
+
+    if (i > num_supplies)
+      num_supplies = i;
+
+    supplies[i - 1].type = packet->object_value.integer;
+  }
+}
+
+
+/*
+ * 'utf16_to_utf8()' - Convert UTF-16 text to UTF-8.
+ */
+
+static void
+utf16_to_utf8(
+    cups_utf8_t         *dst,		/* I - Destination buffer */
+    const unsigned char *src,		/* I - Source string */
+    size_t		srcsize,	/* I - Size of source string */
+    size_t              dstsize,	/* I - Size of destination buffer */
+    int                 le)		/* I - Source is little-endian? */
+{
+  cups_utf32_t	ch,			/* Current character */
+		temp[CUPS_SNMP_MAX_STRING],
+					/* UTF-32 string */
+		*ptr;			/* Pointer into UTF-32 string */
+
+
+  for (ptr = temp; srcsize >= 2;)
+  {
+    if (le)
+      ch = src[0] | (src[1] << 8);
+    else
+      ch = (src[0] << 8) | src[1];
+
+    src += 2;
+    srcsize -= 2;
+
+    if (ch >= 0xd800 && ch <= 0xdbff && srcsize >= 2)
+    {
+     /*
+      * Multi-word UTF-16 char...
+      */
+
+      int lch;			/* Lower word */
+
+
+      if (le)
+	lch = src[0] | (src[1] << 8);
+      else
+	lch = (src[0] << 8) | src[1];
+
+      if (lch >= 0xdc00 && lch <= 0xdfff)
+      {
+	src += 2;
+	srcsize -= 2;
+
+	ch = (((ch & 0x3ff) << 10) | (lch & 0x3ff)) + 0x10000;
+      }
+    }
+
+    if (ptr < (temp + CUPS_SNMP_MAX_STRING - 1))
+      *ptr++ = ch;
+  }
+
+  *ptr = '\0';
+
+  cupsUTF32ToUTF8(dst, temp, dstsize);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,172 @@
+snmp.txt - 2006-04-19
+---------------------
+
+This file lists the "interesting" bits from the command:
+
+    snmpwalk -v 1 -c public HOST .1
+
+for many network print servers and internal cards.  It is mainly here
+for SNMP documentation and development purposes.
+
+
+AXIS 5600
+
+SNMPv2-MIB::sysDescr.0 = STRING: HP ETHERNET MULTI-ENVIRONMENT,ROM J.sp.00,JETDIRECT EX,JD28,EEPROM 6.16.5
+SNMPv2-MIB::sysName.0 = STRING:
+HOST-RESOURCES-MIB::hrDeviceType.1 = OID: HOST-RESOURCES-TYPES::hrDevicePrinter
+HOST-RESOURCES-MIB::hrDeviceType.2 = OID: HOST-RESOURCES-TYPES::hrDevicePrinter
+HOST-RESOURCES-MIB::hrDeviceType.3 = OID: HOST-RESOURCES-TYPES::hrDevicePrinter
+HOST-RESOURCES-MIB::hrDeviceDescr.1 = STRING: Hewlett-Packard hp LaserJet 3380
+HOST-RESOURCES-MIB::hrDeviceDescr.2 = STRING: Axis AXIS 5600
+HOST-RESOURCES-MIB::hrDeviceDescr.3 = STRING: Axis AXIS 5600
+HOST-RESOURCES-MIB::hrDeviceID.1 = OID: SNMPv2-SMI::zeroDotZero
+HOST-RESOURCES-MIB::hrDeviceID.2 = OID: SNMPv2-SMI::zeroDotZero
+HOST-RESOURCES-MIB::hrDeviceID.3 = OID: SNMPv2-SMI::zeroDotZero
+SNMPv2-SMI::enterprises.11.2.4.3.10.8.0 = STRING: "AXIS433AE8"
+SNMPv2-SMI::enterprises.368.2.3.2.601.0 = INTEGER: 9100
+SNMPv2-SMI::enterprises.368.2.3.2.602.0 = INTEGER: 9101
+SNMPv2-SMI::enterprises.368.2.3.2.603.0 = INTEGER: 9102
+SNMPv2-SMI::enterprises.368.2.3.10.901.0 = STRING: "AXIS433AE8"
+
+
+AXIS OfficeBasic
+
+SNMPv2-MIB::sysDescr.0 = STRING: AXIS OfficeBasic Parallel Network Print Server V6.43 Sep  4 2003
+HOST-RESOURCES-MIB::hrDeviceType.1 = OID: HOST-RESOURCES-TYPES::hrDevicePrinter
+HOST-RESOURCES-MIB::hrDeviceDescr.1 = STRING: EPSON Stylus Photo 870
+HOST-RESOURCES-MIB::hrDeviceID.1 = OID: SNMPv2-SMI::zeroDotZero
+
+
+DLink DP-301P+
+
+SNMPv2-MIB::sysDescr.0 = STRING: D-Link DP-301P+ Print Server
+
+
+Genicom ML280
+
+SNMPv2-MIB::sysDescr.0 = STRING: GENICOM microLaser 280
+SNMPv2-MIB::sysName.0 = STRING: PRQ_004F75
+HOST-RESOURCES-MIB::hrDeviceType.1 = OID: HOST-RESOURCES-TYPES::hrDevicePrinter
+HOST-RESOURCES-MIB::hrDeviceDescr.1 = STRING: MANUFACTURER:GENICOM;MODEL:microLaser 280;
+HOST-RESOURCES-MIB::hrDeviceID.1 = OID: SNMPv2-SMI::enterprises.3369.1.1.2.4
+
+
+EPSON Type-B Network Card
+
+SNMPv2-MIB::sysDescr.0 = STRING: EPSON Type-B 10Base-T/100Base-TX Print Server
+SNMPv2-MIB::sysName.0 = STRING: StylusPro7600-BB87A8
+HOST-RESOURCES-MIB::hrDeviceType.1 = OID: HOST-RESOURCES-TYPES::hrDevicePrinter
+HOST-RESOURCES-MIB::hrDeviceDescr.1 = STRING: EPSON Stylus Pro 7600
+HOST-RESOURCES-MIB::hrDeviceID.1 = OID: SNMPv2-SMI::enterprises.1248.1.2.1.22.69.109.117.108.97.116.101.83.116.121.108.117.115.32.80.114.111.32.55.54.48.48
+SNMPv2-SMI::enterprises.11.2.3.9.1.1.7.0 = STRING: "MFG:EPSON;CMD:ESCPL2,BDC;MDL:Stylus Pro 7600;CLS:PRINTER;DES:EPSON Stylus Pro 7600;"
+SNMPv2-SMI::enterprises.1248.1.2.2.1.1.1.1.1 = STRING: "MFG:EPSON;CMD:ESCPL2,BDC;MDL:Stylus Pro 7600;CLS:PRINTER;DES:EPSON Stylus Pro 7600;"
+
+
+EPSON Wireless 802.11b Print Server
+
+SNMPv2-MIB::sysDescr.0 = STRING: EPSON Wireless LAN Print Interface compatible with an HP JETDIRECT EX
+SNMPv2-MIB::sysName.0 = STRING: EAI_0F550B
+HOST-RESOURCES-MIB::hrDeviceType.1 = OID: HOST-RESOURCES-TYPES::hrDevicePrinter
+HOST-RESOURCES-MIB::hrDeviceDescr.1 = STRING:
+HOST-RESOURCES-MIB::hrDeviceID.1 = OID: SNMPv2-SMI::zeroDotZero
+
+
+HP JetDirect EX3plus
+
+SNMPv2-MIB::sysDescr.0 = STRING: HP ETHERNET MULTI-ENVIRONMENT,ROM D.04.03,JETDIRECT EX,JD26,EEPROM D.05.22
+SNMPv2-MIB::sysName.0 = STRING: NPID1EC0F
+
+
+HP LJ4000
+
+SNMPv2-MIB::sysDescr.0 = STRING: HP ETHERNET MULTI-ENVIRONMENT,ROM G.05.34,JETDIRECT,JD30,EEPROM G.08.32
+SNMPv2-MIB::sysName.0 = STRING:
+HOST-RESOURCES-MIB::hrDeviceType.1 = OID: HOST-RESOURCES-TYPES::hrDevicePrinter
+HOST-RESOURCES-MIB::hrDeviceDescr.1 = STRING: HP LaserJet 4000 Series
+HOST-RESOURCES-MIB::hrDeviceID.1 = OID: SNMPv2-SMI::enterprises.11.2.3.9.1.2.5
+
+
+HP CLJ4550
+
+SNMPv2-MIB::sysDescr.0 = STRING: HP ETHERNET MULTI-ENVIRONMENT,ROM L.20.07,JETDIRECT,JD84,EEPROM L.21.22,CIDATE 07/06/2001
+SNMPv2-MIB::sysName.0 = STRING: NPI02FDE7
+HOST-RESOURCES-MIB::hrDeviceDescr.1 = STRING: HP Color LaserJet 4550
+HOST-RESOURCES-MIB::hrDeviceDescr.2 = STRING: Hewlett-Packard Dynamic RAM Disk
+HOST-RESOURCES-MIB::hrDeviceID.1 = OID: SNMPv2-SMI::enterprises.11.2.3.9.1.2.14
+
+
+Lexmark C522
+
+SNMPv2-MIB::sysDescr.0 = STRING: Lexmark C522 version NS.NP.N212 kernel 2.6.6 All-N-1
+SNMPv2-MIB::sysName.0 = STRING: ET0004000D0CCA
+HOST-RESOURCES-MIB::hrDeviceType.1 = OID: HOST-RESOURCES-TYPES::hrDevicePrinter
+HOST-RESOURCES-MIB::hrDeviceType.2 = OID: HOST-RESOURCES-TYPES::hrDeviceNonVolatileMemory
+HOST-RESOURCES-MIB::hrDeviceType.3 = OID: HOST-RESOURCES-TYPES::hrDeviceProcessor
+HOST-RESOURCES-MIB::hrDeviceType.4 = OID: HOST-RESOURCES-TYPES::hrDeviceSerialPort
+HOST-RESOURCES-MIB::hrDeviceType.5 = OID: HOST-RESOURCES-TYPES::hrDeviceNetwork
+HOST-RESOURCES-MIB::hrDeviceDescr.1 = STRING: Lexmark C522 9421TTV LS.FA.P129
+HOST-RESOURCES-MIB::hrDeviceDescr.2 = STRING: Nonvolatile RAM
+HOST-RESOURCES-MIB::hrDeviceDescr.3 = STRING: IBM 750 Rev CXr
+HOST-RESOURCES-MIB::hrDeviceDescr.4 = STRING: USB Interface
+HOST-RESOURCES-MIB::hrDeviceDescr.5 = STRING: Network Interface
+HOST-RESOURCES-MIB::hrDeviceID.1 = OID: SNMPv2-SMI::zeroDotZero
+HOST-RESOURCES-MIB::hrDeviceID.2 = OID: SNMPv2-SMI::zeroDotZero
+HOST-RESOURCES-MIB::hrDeviceID.3 = OID: SNMPv2-SMI::zeroDotZero
+HOST-RESOURCES-MIB::hrDeviceID.4 = OID: SNMPv2-SMI::zeroDotZero
+HOST-RESOURCES-MIB::hrDeviceID.5 = OID: SNMPv2-SMI::enterprises.641.1
+SNMPv2-SMI::enterprises.641.2.1.2.1.2.1 = STRING: "Lexmark C522"
+SNMPv2-SMI::enterprises.641.2.1.2.1.3.1 = STRING: "MANUFACTURER:Lexmark International;COMMAND SET:;MODEL:Lexmark C522"
+
+
+Linksys EPSX3
+
+SNMPv2-MIB::sysDescr.0 = STRING: ETHERNET MULTI-ENVIRONMENT.ROM, JETDIRECT EX, EEPROM 6016
+
+
+NetGear PS113
+
+SNMPv2-MIB::sysDescr.0 = STRING: A SNMP proxy agent.
+
+
+Okidata C7200
+
+SNMPv2-MIB::sysDescr.0 = STRING: OkiLAN 6200e
+SNMPv2-MIB::sysName.0 = STRING: OKI7009715
+HOST-RESOURCES-MIB::hrDeviceType.1 = OID: HOST-RESOURCES-TYPES::hrDevicePrinter
+HOST-RESOURCES-MIB::hrDeviceType.2 = OID: HOST-RESOURCES-TYPES::hrDeviceNonVolat
+ileMemory
+HOST-RESOURCES-MIB::hrDeviceDescr.1 = STRING: C7200
+HOST-RESOURCES-MIB::hrDeviceDescr.2 = STRING: FLASH0
+HOST-RESOURCES-MIB::hrDeviceID.1 = OID: SNMPv2-SMI::enterprises.2001.1.1.1.1
+HOST-RESOURCES-MIB::hrDeviceID.2 = OID: SNMPv2-SMI::zeroDotZero
+SNMPv2-SMI::mib-2.43.14.1.1.3.1.1 = STRING: "IEEE 1284"
+SNMPv2-SMI::mib-2.43.14.1.1.3.1.2 = STRING: "EtherTalk Phase 2"
+SNMPv2-SMI::mib-2.43.14.1.1.3.1.3 = STRING: "LPD"
+SNMPv2-SMI::mib-2.43.14.1.1.3.1.4 = STRING: "Netware Rprinter"
+SNMPv2-SMI::mib-2.43.14.1.1.3.1.5 = STRING: "Netware Bindery or NDS Pserver"
+SNMPv2-SMI::mib-2.43.14.1.1.3.1.6 = STRING: "Raw TCP Port 9100"
+SNMPv2-SMI::mib-2.43.14.1.1.3.1.7 = STRING: "FTP"
+SNMPv2-SMI::mib-2.43.14.1.1.3.1.8 = STRING: "DLC/LLC"
+SNMPv2-SMI::enterprises.2001.1.1.1.1.1.3530.0 = STRING: "C7200"
+
+
+Xerox N2025
+
+SNMPv2-MIB::sysDescr.0 = STRING: Xerox DocuPrint N2025 Network Laser Printer - 2.12-02 
+SNMPv2-MIB::sysName.0 = STRING:
+HOST-RESOURCES-MIB::hrDeviceType.1 = OID: HOST-RESOURCES-TYPES::hrDevicePrinter
+HOST-RESOURCES-MIB::hrDeviceType.2 = OID: HOST-RESOURCES-TYPES::hrDeviceParallelPort
+HOST-RESOURCES-MIB::hrDeviceType.3 = OID: HOST-RESOURCES-TYPES::hrDeviceNetwork
+HOST-RESOURCES-MIB::hrDeviceType.6 = OID: HOST-RESOURCES-TYPES::hrDeviceProcessor
+HOST-RESOURCES-MIB::hrDeviceType.7 = OID: HOST-RESOURCES-TYPES::hrDeviceOther
+HOST-RESOURCES-MIB::hrDeviceType.9 = OID: HOST-RESOURCES-TYPES::hrDeviceVolatileMemory
+HOST-RESOURCES-MIB::hrDeviceType.10 = OID: HOST-RESOURCES-TYPES::hrDeviceNonVolatileMemory
+HOST-RESOURCES-MIB::hrDeviceDescr.1 = STRING: Xerox DocuPrint N2025 Network Laser Printer - 2.12-02 
+HOST-RESOURCES-MIB::hrDeviceDescr.2 = STRING: IEEE 1284 port
+HOST-RESOURCES-MIB::hrDeviceDescr.3 = STRING: Ethernet port
+HOST-RESOURCES-MIB::hrDeviceDescr.6 = STRING: Motorola Power PC
+HOST-RESOURCES-MIB::hrDeviceDescr.7 = STRING: USB Port
+HOST-RESOURCES-MIB::hrDeviceDescr.9 = STRING: RAM Memory
+HOST-RESOURCES-MIB::hrDeviceDescr.10 = STRING: ROM Memory
+HOST-RESOURCES-MIB::hrDeviceID.1 = OID: SNMPv2-SMI::enterprises.253.8.62.1.3.2.17.1
+
@@ -3,44 +3,32 @@
 *
 *   AppSocket backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+ *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   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 please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   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 printer or server.
+ *   main()    - Send a file to the printer or server.
+ *   wait_bc() - Wait for back-channel data...
 */

 /*
 * Include necessary headers.
 */

-#include <cups/cups.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cups/http-private.h>
+#include "backend-private.h"
 #include <stdarg.h>
-#include <cups/string.h>
-#include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <signal.h>

 #ifdef WIN32
 #  include <winsock.h>
@@ -54,44 +42,11 @@
 #endif /* WIN32 */


-/*
- * Some OS's don't have hstrerror(), most notably Solaris...
- */
-
-#ifndef HAVE_HSTRERROR
-#  define hstrerror cups_hstrerror
-
-const char *					/* O - Error string */
-cups_hstrerror(int error)			/* I - Error number */
-{
-  static const char * const errors[] =
-		{
-		  "OK",
-		  "Host not found.",
-		  "Try again.",
-		  "Unrecoverable lookup error.",
-		  "No data associated with name."
-		};
-
-
-  if (error < 0 || error > 4)
-    return ("Unknown hostname lookup error.");
-  else
-    return (errors[error]);
-}
-#elif defined(_AIX)
-/*
- * AIX doesn't provide a prototype but does provide the function...
- */
-extern const char *hstrerror(int);
-#endif /* !HAVE_HSTRERROR */
-
-
 /*
 * Local functions...
 */

-void	print_backchannel(const unsigned char *buffer, int nbytes);
+static int	wait_bc(int device_fd, int secs);


 /*
@@ -102,31 +57,44 @@ void	print_backchannel(const unsigned char *buffer, int nbytes);
 *    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 */
+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 (not used) */
-  int		fp;		/* Print file */
-  int		copies;		/* Number of copies to print */
-  int		port;		/* Port number */
-  int		delay;		/* Delay for retries... */
-  int		fd;		/* AppSocket */
-  int		error;		/* Error code (if any) */
-  struct sockaddr_in addr;	/* Socket address */
-  struct hostent *hostaddr;	/* Host address */
-  int		wbytes;		/* Number of bytes written */
-  int		nbytes;		/* Number of bytes read */
-  size_t	tbytes;		/* Total number of bytes written */
-  char		buffer[8192],	/* Output buffer */
-		*bufptr;	/* Pointer into buffer */
-  struct timeval timeout;	/* Timeout for select() */
-  fd_set	input;		/* Input set for select() */
+  const char	*device_uri;		/* Device URI */
+  char		scheme[255],		/* Scheme in URI */
+		hostname[1024],		/* Hostname */
+		username[255],		/* Username info (not used) */
+		resource[1024],		/* Resource info (not used) */
+		*options,		/* Pointer to options */
+		*name,			/* Name of option */
+		*value,			/* Value of option */
+		sep;			/* Option separator */
+  int		print_fd;		/* Print file */
+  int		copies;			/* Number of copies to print */
+  time_t	start_time;		/* Time of first connect */
+#ifdef __APPLE__
+  time_t	current_time,		/* Current time */
+		wait_time;		/* Time to wait before shutting down socket */
+#endif /* __APPLE__ */
+  int		recoverable;		/* Recoverable error shown? */
+  int		contimeout;		/* Connection timeout */
+  int		waiteof;		/* Wait for end-of-file? */
+  int		port;			/* Port number */
+  char		portname[255];		/* Port name */
+  int		delay;			/* Delay for retries... */
+  int		device_fd;		/* AppSocket */
+  int		error;			/* Error code (if any) */
+  http_addrlist_t *addrlist,		/* Address list */
+		*addr;			/* Connected address */
+  char		addrname[256];		/* Address name */
+  int		snmp_fd,		/* SNMP socket */
+		start_count,		/* Page count via SNMP at start */
+		page_count,		/* Page count via SNMP */
+		have_supplies;		/* Printer supports supply levels? */
+  ssize_t	tbytes;			/* Total number of bytes written */
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  struct sigaction action;	/* Actions for POSIX signals */
+  struct sigaction action;		/* Actions for POSIX signals */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */


@@ -156,14 +124,16 @@ main(int  argc,			/* I - Number of command-line arguments (6 or 7) */

  if (argc == 1)
  {
-    puts("network socket \"Unknown\" \"AppSocket/HP JetDirect\"");
-    return (0);
+    printf("network socket \"Unknown\" \"%s\"\n",
+           _cupsLangString(cupsLangDefault(), _("AppSocket/HP JetDirect")));
+    return (CUPS_BACKEND_OK);
  }
  else if (argc < 6 || argc > 7)
  {
-    fprintf(stderr, "Usage: %s job-id user title copies options [file]\n",
-            argv[0]);
-    return (1);
+    _cupsLangPrintf(stderr,
+                    _("Usage: %s job-id user title copies options [file]\n"),
+                    argv[0]);
+    return (CUPS_BACKEND_FAILED);
  }

 /*
@@ -173,8 +143,8 @@ main(int  argc,			/* I - Number of command-line arguments (6 or 7) */

  if (argc == 6)
  {
-    fp     = 0;
-    copies = 1;
+    print_fd = 0;
+    copies   = 1;
  }
  else
  {
@@ -182,10 +152,12 @@ main(int  argc,			/* I - Number of command-line arguments (6 or 7) */
    * Try to open the print file...
    */

-    if ((fp = open(argv[6], O_RDONLY)) < 0)
+    if ((print_fd = open(argv[6], O_RDONLY)) < 0)
    {
-      perror("ERROR: unable to open print file");
-      return (1);
+      _cupsLangPrintf(stderr,
+                      _("ERROR: Unable to open print file \"%s\": %s\n"),
+                      argv[6], strerror(errno));
+      return (CUPS_BACKEND_FAILED);
    }

    copies = atoi(argv[4]);
@@ -195,253 +167,344 @@ main(int  argc,			/* I - Number of command-line arguments (6 or 7) */
  * Extract the hostname and port number from the URI...
  */

-  httpSeparate(argv[0], method, username, hostname, &port, resource);
+  if ((device_uri = cupsBackendDeviceURI(argv)) == NULL)
+    return (CUPS_BACKEND_FAILED);
+
+  httpSeparateURI(HTTP_URI_CODING_ALL, device_uri, scheme, sizeof(scheme),
+                  username, sizeof(username), hostname, sizeof(hostname), &port,
+		  resource, sizeof(resource));

  if (port == 0)
    port = 9100;	/* Default to HP JetDirect/Tektronix PhaserShare */

+ /*
+  * Get options, if any...
+  */
+
+  waiteof    = 1;
+  contimeout = 7 * 24 * 60 * 60;
+
+  if ((options = strchr(resource, '?')) != NULL)
+  {
+   /*
+    * Yup, terminate the device name string and move to the first
+    * character of the options...
+    */
+
+    *options++ = '\0';
+
+   /*
+    * Parse options...
+    */
+
+    while (*options)
+    {
+     /*
+      * Get the name...
+      */
+
+      name = options;
+
+      while (*options && *options != '=' && *options != '+' && *options != '&')
+        options ++;
+
+      if ((sep = *options) != '\0')
+        *options++ = '\0';
+
+      if (sep == '=')
+      {
+       /*
+        * Get the value...
+	*/
+
+        value = options;
+
+	while (*options && *options != '+' && *options != '&')
+	  options ++;
+
+        if (*options)
+	  *options++ = '\0';
+      }
+      else
+        value = (char *)"";
+
+     /*
+      * Process the option...
+      */
+
+      if (!strcasecmp(name, "waiteof"))
+      {
+       /*
+        * Set the wait-for-eof value...
+	*/
+
+        waiteof = !value[0] || !strcasecmp(value, "on") ||
+		  !strcasecmp(value, "yes") || !strcasecmp(value, "true");
+      }
+      else if (!strcasecmp(name, "contimeout"))
+      {
+       /*
+        * Set the connection timeout...
+	*/
+
+	if (atoi(value) > 0)
+	  contimeout = atoi(value);
+      }
+    }
+  }
+
 /*
  * Then try to connect to the remote host...
  */

-  if ((hostaddr = httpGetHostByName(hostname)) == NULL)
+  recoverable = 0;
+  start_time  = time(NULL);
+
+  sprintf(portname, "%d", port);
+
+  fputs("STATE: +connecting-to-device\n", stderr);
+  fprintf(stderr, "DEBUG: Looking up \"%s\"...\n", hostname);
+
+  if ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, portname)) == NULL)
  {
-    fprintf(stderr, "ERROR: Unable to locate printer \'%s\' - %s\n",
-            hostname, hstrerror(h_errno));
-    return (1);
+    _cupsLangPrintf(stderr, _("ERROR: Unable to locate printer \'%s\'!\n"),
+                    hostname);
+    return (CUPS_BACKEND_STOP);
  }

-  fprintf(stderr, "INFO: Attempting to connect to host %s on port %d\n",
-          hostname, port);
+  fprintf(stderr, "DEBUG: Connecting to %s:%d\n", hostname, port);
+  _cupsLangPuts(stderr, _("INFO: Connecting to printer...\n"));

-  memset(&addr, 0, sizeof(addr));
-  memcpy(&(addr.sin_addr), hostaddr->h_addr, hostaddr->h_length);
-  addr.sin_family = hostaddr->h_addrtype;
-  addr.sin_port   = htons(port);
-
-  while (copies > 0)
+  for (delay = 5;;)
  {
-    for (delay = 5;;)
+    if ((addr = httpAddrConnect(addrlist, &device_fd)) == NULL)
    {
-      if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-      {
-	perror("ERROR: Unable to create socket");
-	return (1);
-      }
+      error     = errno;
+      device_fd = -1;

-      if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0)
-      {
-	error = errno;
-	close(fd);
-	fd = -1;
-
-	if (error == ECONNREFUSED || error == EHOSTDOWN ||
-            error == EHOSTUNREACH)
-	{
-	  fprintf(stderr, "INFO: Network host \'%s\' is busy; will retry in %d seconds...\n",
-                  hostname, delay);
-	  sleep(delay);
-
-	  if (delay < 30)
-	    delay += 5;
-	}
-	else
-	{
-	  perror("ERROR: Unable to connect to printer (retrying in 30 seconds)");
-	  sleep(30);
-	}
-      }
-      else
-	break;
-    }
-
-   /*
-    * Now that we are "connected" to the port, ignore SIGTERM so that we
-    * can finish out any page data the driver sends (e.g. to eject the
-    * current page...  Only ignore SIGTERM if we are printing data from
-    * stdin (otherwise you can't cancel raw jobs...)
-    */
-
-    if (argc < 7)
-    {
-#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-      sigset(SIGTERM, SIG_IGN);
-#elif defined(HAVE_SIGACTION)
-      memset(&action, 0, sizeof(action));
-
-      sigemptyset(&action.sa_mask);
-      action.sa_handler = SIG_IGN;
-      sigaction(SIGTERM, &action, NULL);
-#else
-      signal(SIGTERM, SIG_IGN);
-#endif /* HAVE_SIGSET */
-    }
-
-   /*
-    * Finally, send the print file...
-    */
-
-    copies --;
-
-    if (fp != 0)
-    {
-      fputs("PAGE: 1 1\n", stderr);
-      lseek(fp, 0, SEEK_SET);
-    }
-
-    fputs("INFO: Connected to host, sending print job...\n", stderr);
-
-    tbytes = 0;
-    while ((nbytes = read(fp, buffer, sizeof(buffer))) > 0)
-    {
-     /*
-      * Write the print data to the printer...
-      */
-
-      tbytes += nbytes;
-      bufptr = buffer;
-
-      while (nbytes > 0)
-      {
-	if ((wbytes = send(fd, bufptr, nbytes, 0)) < 0)
-	{
-	  perror("ERROR: Unable to send print file to printer");
-	  break;
-	}
-
-	nbytes -= wbytes;
-	bufptr += wbytes;
-      }
-
-      if (wbytes < 0)
-        break;
-
-     /*
-      * Check for possible data coming back from the printer...
-      */
-
-      timeout.tv_sec  = 0;
-      timeout.tv_usec = 0;
-
-      FD_ZERO(&input);
-      FD_SET(fd, &input);
-      if (select(fd + 1, &input, NULL, NULL, &timeout) > 0)
+      if (getenv("CLASS") != NULL)
      {
       /*
-	* Grab the data coming back and spit it out to stderr...
+        * 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.
 	*/

-	if ((nbytes = recv(fd, buffer, sizeof(buffer), 0)) > 0)
-	{
-	  fprintf(stderr, "INFO: Received %d bytes of back-channel data!\n",
-	          nbytes);
-          print_backchannel((unsigned char *)buffer, nbytes);
-        }
+        _cupsLangPuts(stderr,
+	              _("INFO: Unable to contact printer, queuing on next "
+			"printer in class...\n"));
+
+       /*
+        * Sleep 5 seconds to keep the job from requeuing too rapidly...
+	*/
+
+	sleep(5);
+
+        return (CUPS_BACKEND_FAILED);
      }
-      else if (argc > 6)
-	fprintf(stderr, "INFO: Sending print file, %lu bytes...\n",
-	        (unsigned long)tbytes);
+
+      if (error == ECONNREFUSED || error == EHOSTDOWN ||
+          error == EHOSTUNREACH)
+      {
+        if (contimeout && (time(NULL) - start_time) > contimeout)
+	{
+	  _cupsLangPuts(stderr, _("ERROR: Printer not responding!\n"));
+	  return (CUPS_BACKEND_FAILED);
+	}
+
+        recoverable = 1;
+
+	_cupsLangPrintf(stderr,
+			_("WARNING: recoverable: Network host \'%s\' is busy; "
+			  "will retry in %d seconds...\n"),
+			hostname, delay);
+
+	sleep(delay);
+
+	if (delay < 30)
+	  delay += 5;
+      }
+      else
+      {
+        recoverable = 1;
+
+        _cupsLangPrintf(stderr, "DEBUG: Connection error: %s\n",
+	                strerror(errno));
+	_cupsLangPuts(stderr,
+	              _("ERROR: recoverable: Unable to connect to printer; "
+		        "will retry in 30 seconds...\n"));
+	sleep(30);
+      }
+    }
+    else
+      break;
+  }
+
+  if (recoverable)
+  {
+   /*
+    * If we've shown a recoverable error make sure the printer proxies have a
+    * chance to see the recovered message. Not pretty but necessary for now...
+    */
+
+    fputs("INFO: recovered: \n", stderr);
+    sleep(5);
+  }
+
+  fputs("STATE: -connecting-to-device\n", stderr);
+  _cupsLangPuts(stderr, _("INFO: Connected to printer...\n"));
+
+#ifdef AF_INET6
+  if (addr->addr.addr.sa_family == AF_INET6)
+    fprintf(stderr, "DEBUG: Connected to [%s]:%d (IPv6)...\n", 
+	    httpAddrString(&addr->addr, addrname, sizeof(addrname)),
+	    ntohs(addr->addr.ipv6.sin6_port));
+  else
+#endif /* AF_INET6 */
+    if (addr->addr.addr.sa_family == AF_INET)
+      fprintf(stderr, "DEBUG: Connected to %s:%d (IPv4)...\n",
+	      httpAddrString(&addr->addr, addrname, sizeof(addrname)),
+	      ntohs(addr->addr.ipv4.sin_port));
+
+ /*
+  * See if the printer supports SNMP...
+  */
+
+  if ((snmp_fd = _cupsSNMPOpen(addr->addr.addr.sa_family)) >= 0)
+  {
+    have_supplies = !backendSNMPSupplies(snmp_fd, &(addr->addr), &start_count,
+                                         NULL);
+  }
+  else
+    have_supplies = start_count = 0;
+
+ /*
+  * Print everything...
+  */
+
+  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, snmp_fd, &(addr->addr), 1, 0, 
+                            backendNetworkSideCB);
+
+    if (print_fd != 0 && tbytes >= 0)
+      _cupsLangPrintf(stderr,
+#ifdef HAVE_LONG_LONG
+		      _("INFO: Sent print file, %lld bytes...\n"),
+#else
+		      _("INFO: Sent print file, %ld bytes...\n"),
+#endif /* HAVE_LONG_LONG */
+		      CUPS_LLCAST tbytes);
+  }
+
+#ifdef __APPLE__
+ /*
+  * Wait up to 5 seconds to get any pending back-channel data...
+  */
+
+  wait_time = time(NULL) + 5;
+  while (wait_time >= time(&current_time))
+    if (wait_bc(device_fd, wait_time - current_time) <= 0)
+      break;
+#endif /* __APPLE__ */
+
+  if (waiteof)
+  {
   /*
    * Shutdown the socket and wait for the other end to finish...
    */

-    fputs("INFO: Print file sent, waiting for printer to finish...\n", stderr);
+    _cupsLangPuts(stderr,
+                  _("INFO: Print file sent, waiting for printer to finish...\n"));

-    shutdown(fd, 1);
+    shutdown(device_fd, 1);

-    for (;;)
-    {
-     /*
-      * Wait a maximum of 90 seconds for backchannel data or a closed
-      * connection...
-      */
-
-      timeout.tv_sec  = 90;
-      timeout.tv_usec = 0;
-
-      FD_ZERO(&input);
-      FD_SET(fd, &input);
-
-#ifdef __hpux
-      if (select(fd + 1, (int *)&input, NULL, NULL, &timeout) > 0)
-#else
-      if (select(fd + 1, &input, NULL, NULL, &timeout) > 0)
-#endif /* __hpux */
-      {
-       /*
-	* Grab the data coming back and spit it out to stderr...
-	*/
-
-	if ((nbytes = recv(fd, buffer, sizeof(buffer), 0)) > 0)
-	{
-	  fprintf(stderr, "INFO: Received %d bytes of back-channel data!\n",
-	          nbytes);
-          print_backchannel((unsigned char *)buffer, nbytes);
-        }
-	else
-	  break;
-      }
-      else
-        break;
-    }
-
-   /*
-    * Close the socket connection...
-    */
-
-    close(fd);
+    while (wait_bc(device_fd, 90) > 0);
  }

+ /*
+  * Collect the final page count as needed...
+  */
+
+  if (have_supplies && 
+      !backendSNMPSupplies(snmp_fd, &(addr->addr), &page_count, NULL) &&
+      page_count > start_count)
+    fprintf(stderr, "PAGE: total %d\n", page_count - start_count);
+
+ /*
+  * Close the socket connection...
+  */
+
+  close(device_fd);
+
+  httpAddrFreeList(addrlist);
+
 /*
  * Close the input file and return...
  */

-  if (fp != 0)
-    close(fp);
+  if (print_fd != 0)
+    close(print_fd);

-  fputs("INFO: Ready to print.\n", stderr);
+  if (tbytes >= 0)
+    _cupsLangPuts(stderr, _("INFO: Ready to print.\n"));

-  return (0);
+  return (tbytes < 0 ? CUPS_BACKEND_FAILED : CUPS_BACKEND_OK);
 }


 /*
- * 'print_backchannel()' - Print the contents of a back-channel buffer.
+ * 'wait_bc()' - Wait for back-channel data...
 */

-void
-print_backchannel(const unsigned char *buffer,	/* I - Data buffer */
-                  int                 nbytes)	/* I - Number of bytes */
+static int				/* O - # bytes read or -1 on error */
+wait_bc(int device_fd,			/* I - Socket */
+        int secs)			/* I - Seconds to wait */
 {
-  char	line[255],				/* Formatted line */
-	*lineptr;				/* Pointer into line */
+  struct timeval timeout;		/* Timeout for select() */
+  fd_set	input;			/* Input set for select() */
+  ssize_t	bytes;			/* Number of back-channel bytes read */
+  char		buffer[1024];		/* Back-channel buffer */


-  for (lineptr = line; nbytes > 0; buffer ++, nbytes --)
+ /*
+  * Wait up to "secs" seconds for backchannel data...
+  */
+
+  timeout.tv_sec  = secs;
+  timeout.tv_usec = 0;
+
+  FD_ZERO(&input);
+  FD_SET(device_fd, &input);
+
+  if (select(device_fd + 1, &input, NULL, NULL, &timeout) > 0)
  {
-    if (*buffer < 0x20 || *buffer >= 0x7f)
-    {
-      snprintf(lineptr, sizeof(line) - (lineptr - line), "<%02X>", *buffer);
-      lineptr += strlen(lineptr);
-    }
-    else
-      *lineptr++ = *buffer;
+   /*
+    * Grab the data coming back and spit it out to stderr...
+    */

-    if ((lineptr - line) > 72)
+    if ((bytes = read(device_fd, buffer, sizeof(buffer))) > 0)
    {
-      *lineptr = '\0';
-      fprintf(stderr, "DEBUG: DATA: %s\n", line);
-      lineptr = line;
+      fprintf(stderr, "DEBUG: Received %d bytes of back-channel data!\n",
+	      (int)bytes);
+      cupsBackChannelWrite(buffer, bytes, 1.0);
    }
-  }

-  if (lineptr > line)
-  {
-    *lineptr = '\0';
-    fprintf(stderr, "DEBUG: DATA: %s\n", line);
+    return (bytes);
  }
+  else
+    return (-1);
 }


@@ -0,0 +1,87 @@
+/*
+ * "$Id$"
+ *
+ *   IEEE-1284 support functions test program for the Common UNIX Printing
+ *   System (CUPS).
+ *
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 1997-2006 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() - Test the device-ID functions.
+ */
+
+/*
+ * Include necessary headers.
+ */
+
+#include <cups/string.h>
+#include <stdlib.h>
+#include <errno.h>
+#ifdef WIN32
+#  include <io.h>
+#else
+#  include <unistd.h>
+#  include <fcntl.h>
+#endif /* WIN32 */
+
+#include "ieee1284.c"
+
+
+/*
+ * 'main()' - Test the device-ID functions.
+ */
+
+int					/* O - Exit status */
+main(int  argc,				/* I - Number of command-line args */
+     char *argv[])			/* I - Command-line arguments */
+{
+  int	i,				/* Looping var */
+	fd;				/* File descriptor */
+  char	device_id[1024],		/* 1284 device ID string */
+	make_model[1024],		/* make-and-model string */
+	uri[1024];			/* URI string */
+
+
+  if (argc < 2)
+  {
+    puts("Usage: test1284 device-file [... device-file-N]");
+    exit(1);
+  }
+
+  for (i = 1; i < argc; i ++)
+  {
+    if ((fd = open(argv[i], O_RDWR)) < 0)
+    {
+      perror(argv[i]);
+      return (errno);
+    }
+
+    printf("%s:\n", argv[i]);
+
+    backendGetDeviceID(fd, device_id, sizeof(device_id), make_model,
+                       sizeof(make_model), "test", uri, sizeof(uri));
+
+    printf("    device_id=\"%s\"\n", device_id);
+    printf("    make_model=\"%s\"\n", make_model);
+    printf("    uri=\"%s\"\n", uri);
+
+    close(fd);
+  }
+
+  return (0);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,654 @@
+/*
+ * "$Id$"
+ *
+ *   Backend test program for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 1997-2005 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()            - Run the named backend.
+ *   sigterm_handler() - Flag when we get SIGTERM.
+ *   usage()           - Show usage information.
+ *   walk_cb()         - Show results of cupsSideChannelSNMPWalk...
+ */
+
+/*
+ * Include necessary headers.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <cups/string.h>
+#include <cups/cups.h>
+#include <cups/sidechannel.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <sys/wait.h>
+#include <signal.h>
+
+
+/*
+ * Local globals...
+ */
+
+static int	job_canceled = 0;
+
+
+/*
+ * Local functions...
+ */
+
+static void	sigterm_handler(int sig);
+static void	usage(void);
+static void	walk_cb(const char *oid, const char *data, int datalen,
+		        void *context);
+
+
+/*
+ * 'main()' - Run the named backend.
+ *
+ * Usage:
+ *
+ *    betest [-s] [-t] device-uri job-id user title copies options [file]
+ */
+
+int					/* O - Exit status */
+main(int  argc,				/* I - Number of command-line args */
+     char *argv[])			/* I - Command-line arguments */
+{
+  int		first_arg,		/* First argument for backend */
+		do_cancel = 0,		/* Simulate a cancel-job via SIGTERM */
+		do_ps = 0,		/* Do PostScript query+test? */
+		do_pcl = 0,		/* Do PCL query+test? */
+		do_side_tests = 0,	/* Test side-channel ops? */
+		do_trickle = 0,		/* Trickle data to backend */
+		do_walk = 0,		/* Do OID lookup (0) or walking (1) */
+		show_log = 0;		/* Show log messages from backends? */
+  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 */
+  const char	*serverbin;		/* CUPS_SERVERBIN environment variable */
+  int		fd,			/* Temporary file descriptor */
+		back_fds[2],		/* Back-channel pipe */
+		side_fds[2],		/* Side-channel socket */
+		data_fds[2],		/* Data pipe */
+		back_pid = -1,		/* Backend process ID */
+		data_pid = -1,		/* Trickle process ID */
+		pid,			/* Process ID */
+		status;			/* Exit status */
+
+
+ /*
+  * See if we have side-channel tests to do...
+  */
+
+  for (first_arg = 1;
+       argv[first_arg] && argv[first_arg][0] == '-';
+       first_arg ++)
+    if (!strcmp(argv[first_arg], "-d"))
+      show_log = 1;
+    else if (!strcmp(argv[first_arg], "-cancel"))
+      do_cancel = 1;
+    else if (!strcmp(argv[first_arg], "-pcl"))
+      do_pcl = 1;
+    else if (!strcmp(argv[first_arg], "-ps"))
+      do_ps = 1;
+    else if (!strcmp(argv[first_arg], "-s"))
+      do_side_tests = 1;
+    else if (!strcmp(argv[first_arg], "-t"))
+      do_trickle = 1;
+    else if (!strcmp(argv[first_arg], "-get") && (first_arg + 1) < argc)
+    {
+      first_arg ++;
+
+      do_side_tests = 1;
+      oid           = argv[first_arg];
+    }
+    else if (!strcmp(argv[first_arg], "-walk") && (first_arg + 1) < argc)
+    {
+      first_arg ++;
+
+      do_side_tests = 1;
+      do_walk       = 1;
+      oid           = argv[first_arg];
+    }
+    else
+      usage();
+
+  argc -= first_arg;
+  if (argc < 6 || argc > 7 || (argc == 7 && do_trickle))
+    usage();
+
+ /*
+  * Extract the scheme from the device-uri - that's the program we want to
+  * execute.
+  */
+
+  if (sscanf(argv[first_arg], "%254[^:]", scheme) != 1)
+  {
+    fputs("testbackend: Bad device-uri - no colon!\n", stderr);
+    return (1);
+  }
+
+  if (!access(scheme, X_OK))
+    strlcpy(backend, scheme, sizeof(backend));
+  else
+  {
+    if ((serverbin = getenv("CUPS_SERVERBIN")) == NULL)
+      serverbin = CUPS_SERVERBIN;
+
+    snprintf(backend, sizeof(backend), "%s/backend/%s", serverbin, scheme);
+    if (access(backend, X_OK))
+    {
+      fprintf(stderr, "testbackend: Unknown device scheme \"%s\"!\n", scheme);
+      return (1);
+    }
+  }
+
+ /*
+  * Create the back-channel pipe and side-channel socket...
+  */
+
+  open("/dev/null", O_WRONLY);		/* Make sure fd 3 and 4 are used */
+  open("/dev/null", O_WRONLY);
+
+  pipe(back_fds);
+  fcntl(back_fds[0], F_SETFL, fcntl(back_fds[0], F_GETFL) | O_NONBLOCK);
+  fcntl(back_fds[1], F_SETFL, fcntl(back_fds[1], F_GETFL) | O_NONBLOCK);
+
+  socketpair(AF_LOCAL, SOCK_STREAM, 0, side_fds);
+  fcntl(side_fds[0], F_SETFL, fcntl(side_fds[0], F_GETFL) | O_NONBLOCK);
+  fcntl(side_fds[1], F_SETFL, fcntl(side_fds[1], F_GETFL) | O_NONBLOCK);
+
+ /*
+  * Execute the trickle process as needed...
+  */
+
+  if (do_trickle || do_pcl || do_ps || do_cancel)
+  {
+    pipe(data_fds);
+
+    signal(SIGTERM, sigterm_handler);
+
+    if ((data_pid = fork()) == 0)
+    {
+     /*
+      * Trickle/query child comes here.  Rearrange file descriptors so that
+      * FD 1, 3, and 4 point to the backend...
+      */
+
+      if ((fd = open("/dev/null", O_RDONLY)) != 0)
+      {
+        dup2(fd, 0);
+	close(fd);
+      }
+
+      if (data_fds[1] != 1)
+      {
+        dup2(data_fds[1], 1);
+	close(data_fds[1]);
+      }
+      close(data_fds[0]);
+
+      if (back_fds[0] != 3)
+      {
+        dup2(back_fds[0], 3);
+        close(back_fds[0]);
+      }
+      close(back_fds[1]);
+
+      if (side_fds[0] != 4)
+      {
+        dup2(side_fds[0], 4);
+        close(side_fds[0]);
+      }
+      close(side_fds[1]);
+
+      if (do_trickle)
+      {
+       /*
+	* Write 10 spaces, 1 per second...
+	*/
+
+	int i;				/* Looping var */
+
+	for (i = 0; i < 10; i ++)
+	{
+	  write(1, " ", 1);
+	  sleep(1);
+	}
+      }
+      else if (do_cancel)
+      {
+       /*
+        * Write PS or PCL lines until we see SIGTERM...
+	*/
+
+        int	line = 0, page = 0;	/* Current line and page */
+	ssize_t	bytes;			/* Number of bytes of response data */
+	char	buffer[1024];		/* Output buffer */
+
+
+        if (do_pcl)
+	  write(1, "\033E", 2);
+	else
+	  write(1, "%!\n/Courier findfont 12 scalefont setfont 0 setgray\n", 52);
+
+        while (!job_canceled)
+	{
+	  if (line == 0)
+	  {
+	    page ++;
+
+	    if (do_pcl)
+	      snprintf(buffer, sizeof(buffer), "PCL Page %d\r\n\r\n", page);
+	    else
+	      snprintf(buffer, sizeof(buffer),
+	               "18 732 moveto (PS Page %d) show\n", page);
+
+	    write(1, buffer, strlen(buffer));
+	  }
+
+          line ++;
+
+	  if (do_pcl)
+	    snprintf(buffer, sizeof(buffer), "Line %d\r\n", line);
+	  else
+	    snprintf(buffer, sizeof(buffer), "18 %d moveto (Line %d) show\n",
+		     720 - line * 12, line);
+
+	  write(1, buffer, strlen(buffer));
+
+          if (line >= 55)
+	  {
+	   /*
+	    * Eject after 55 lines...
+	    */
+
+	    line = 0;
+	    if (do_pcl)
+	      write(1, "\014", 1);
+	    else
+	      write(1, "showpage\n", 9);
+	  }
+
+	 /*
+	  * Check for back-channel data...
+	  */
+
+	  if ((bytes = cupsBackChannelRead(buffer, sizeof(buffer), 0)) > 0)
+	    write(2, buffer, bytes);
+
+	 /*
+	  * Throttle output to ~100hz...
+	  */
+
+	  usleep(10000);
+	}
+
+       /*
+        * Eject current page with info...
+	*/
+
+        if (do_pcl)
+	  snprintf(buffer, sizeof(buffer),
+		   "Canceled on line %d of page %d\r\n\014\033E", line, page);
+	else
+	  snprintf(buffer, sizeof(buffer),
+	           "\n18 %d moveto (Canceled on line %d of page %d)\nshowpage\n",
+		   720 - line * 12, line, page);
+
+	write(1, buffer, strlen(buffer));
+
+       /*
+        * See if we get any back-channel data...
+	*/
+
+        while ((bytes = cupsBackChannelRead(buffer, sizeof(buffer), 5.0)) > 0)
+	  write(2, buffer, bytes);
+
+	exit(0);
+      }
+      else
+      {
+       /*
+        * Do PS or PCL query + test pages.
+	*/
+
+        char		buffer[1024];	/* Buffer for response data */
+	ssize_t		bytes;		/* Number of bytes of response data */
+	double		timeout;	/* Timeout */
+	const char	*data;		/* Data to send */
+        static const char *pcl_data =	/* PCL data */
+		"\033%-12345X@PJL\r\n"
+		"@PJL JOB NAME = \"Hello, World!\"\r\n"
+		"@PJL INFO USTATUS\r\n"
+		"@PJL ENTER LANGUAGE = PCL\r\n"
+		"\033E"
+		"Hello, World!\n"
+		"\014"
+		"\033%-12345X@PJL\r\n"
+		"@PJL EOJ NAME=\"Hello, World!\"\r\n"
+		"\033%-12345X";
+        static const char *ps_data =	/* PostScript data */
+		"%!\n"
+		"save\n"
+		"product = flush\n"
+		"currentpagedevice /PageSize get aload pop\n"
+		"2 copy gt {exch} if\n"
+		"(Unknown)\n"
+		"19 dict\n"
+		"dup [612 792] (Letter) put\n"
+		"dup [612 1008] (Legal) put\n"
+		"dup [612 935] (w612h935) put\n"
+		"dup [522 756] (Executive) put\n"
+		"dup [595 842] (A4) put\n"
+		"dup [420 595] (A5) put\n"
+		"dup [499 709] (ISOB5) put\n"
+		"dup [516 728] (B5) put\n"
+		"dup [612 936] (w612h936) put\n"
+		"dup [284 419] (Postcard) put\n"
+		"dup [419.5 567] (DoublePostcard) put\n"
+		"dup [558 774] (w558h774) put\n"
+		"dup [553 765] (w553h765) put\n"
+		"dup [522 737] (w522h737) put\n"
+		"dup [499 709] (EnvISOB5) put\n"
+		"dup [297 684] (Env10) put\n"
+		"dup [459 649] (EnvC5) put\n"
+		"dup [312 624] (EnvDL) put\n"
+		"dup [279 540] (EnvMonarch) put\n"
+		"{ exch aload pop 4 index sub abs 5 le exch\n"
+		"  5 index sub abs 5 le and\n"
+		"  {exch pop exit} {pop} ifelse\n"
+		"} bind forall\n"
+		"= flush pop pop\n"
+		"/Courier findfont 12 scalefont setfont\n"
+		"0 setgray 36 720 moveto (Hello, ) show product show (!) show\n"
+		"showpage\n"
+		"restore\n"
+		"\004";
+
+
+	if (do_pcl)
+	  data = pcl_data;
+	else
+	  data = ps_data;
+
+        write(1, data, strlen(data));
+	write(2, "DEBUG: START\n", 13);
+	timeout = 60.0;
+        while ((bytes = cupsBackChannelRead(buffer, sizeof(buffer),
+	                                    timeout)) > 0)
+	{
+	  write(2, buffer, bytes);
+	  timeout = 5.0;
+	}
+	write(2, "\nDEBUG: END\n", 12);
+      }
+
+      exit(0);
+    }
+    else if (data_pid < 0)
+    {
+      perror("testbackend: Unable to fork");
+      return (1);
+    }
+  }
+  else
+    data_fds[0] = data_fds[1] = -1;
+
+ /*
+  * Execute the backend...
+  */
+
+  if ((back_pid = fork()) == 0)
+  {
+   /*
+    * Child comes here...
+    */
+
+    if (do_trickle || do_ps || do_pcl || do_cancel)
+    {
+      if (data_fds[0] != 0)
+      {
+        dup2(data_fds[0], 0);
+        close(data_fds[0]);
+      }
+      close(data_fds[1]);
+    }
+
+    if (!show_log)
+    {
+      if ((fd = open("/dev/null", O_WRONLY)) != 2)
+      {
+        dup2(fd, 2);
+	close(fd);
+      }
+    }
+
+    if (back_fds[1] != 3)
+    {
+      dup2(back_fds[1], 3);
+      close(back_fds[0]);
+    }
+    close(back_fds[1]);
+
+    if (side_fds[1] != 4)
+    {
+      dup2(side_fds[1], 4);
+      close(side_fds[0]);
+    }
+    close(side_fds[1]);
+
+    execv(backend, argv + first_arg);
+    fprintf(stderr, "testbackend: Unable to execute \"%s\": %s\n", backend,
+            strerror(errno));
+    return (errno);
+  }
+  else if (back_pid < 0)
+  {
+    perror("testbackend: Unable to fork");
+    return (1);
+  }
+
+ /*
+  * Parent comes here, setup back and side channel file descriptors...
+  */
+
+  if (do_trickle || do_ps || do_pcl || do_cancel)
+  {
+    close(data_fds[0]);
+    close(data_fds[1]);
+  }
+
+  if (back_fds[0] != 3)
+  {
+    dup2(back_fds[0], 3);
+    close(back_fds[0]);
+  }
+  close(back_fds[1]);
+
+  if (side_fds[0] != 4)
+  {
+    dup2(side_fds[0], 4);
+    close(side_fds[0]);
+  }
+  close(side_fds[1]);
+
+ /*
+  * Do side-channel tests as needed, then wait for the backend...
+  */
+
+  if (do_side_tests)
+  {
+    int			length;		/* Length of buffer */
+    char		buffer[2049];	/* Buffer for reponse */
+    cups_sc_status_t	scstatus;	/* Status of side-channel command */
+    static const char * const statuses[] =
+    {
+      "CUPS_SC_STATUS_NONE",		/* No status */
+      "CUPS_SC_STATUS_OK",		/* Operation succeeded */
+      "CUPS_SC_STATUS_IO_ERROR",	/* An I/O error occurred */
+      "CUPS_SC_STATUS_TIMEOUT",		/* The backend did not respond */
+      "CUPS_SC_STATUS_NO_RESPONSE",	/* The device did not respond */
+      "CUPS_SC_STATUS_BAD_MESSAGE",	/* The command/response message was invalid */
+      "CUPS_SC_STATUS_TOO_BIG",		/* Response too big */
+      "CUPS_SC_STATUS_NOT_IMPLEMENTED"	/* Command not implemented */
+    };
+
+
+    sleep(2);
+
+    length   = 0;
+    scstatus = cupsSideChannelDoRequest(CUPS_SC_CMD_DRAIN_OUTPUT, buffer,
+                                        &length, 60.0);
+    printf("CUPS_SC_CMD_DRAIN_OUTPUT returned %s\n", statuses[scstatus]);
+
+    length   = 1;
+    scstatus = cupsSideChannelDoRequest(CUPS_SC_CMD_GET_BIDI, buffer,
+                                        &length, 5.0);
+    printf("CUPS_SC_CMD_GET_BIDI returned %s, %d\n", statuses[scstatus], buffer[0]);
+
+    length   = sizeof(buffer) - 1;
+    scstatus = cupsSideChannelDoRequest(CUPS_SC_CMD_GET_DEVICE_ID, buffer,
+                                        &length, 5.0);
+    buffer[length] = '\0';
+    printf("CUPS_SC_CMD_GET_DEVICE_ID returned %s, \"%s\"\n",
+           statuses[scstatus], buffer);
+
+    length   = 1;
+    scstatus = cupsSideChannelDoRequest(CUPS_SC_CMD_GET_STATE, buffer,
+                                        &length, 5.0);
+    printf("CUPS_SC_CMD_GET_STATE returned %s, %02X\n", statuses[scstatus],
+           buffer[0] & 255);
+
+    if (do_walk)
+    {
+     /*
+      * Walk the OID tree...
+      */
+
+      scstatus = cupsSideChannelSNMPWalk(oid, 5.0, walk_cb, NULL);
+      printf("CUPS_SC_CMD_SNMP_WALK returned %s\n", statuses[scstatus]);
+    }
+    else
+    {
+     /*
+      * Lookup the same OID twice...
+      */
+
+      length   = sizeof(buffer);
+      scstatus = cupsSideChannelSNMPGet(oid, buffer, &length, 5.0);
+      printf("CUPS_SC_CMD_SNMP_GET %s returned %s, %s\n", oid,
+	     statuses[scstatus], buffer);
+
+      length   = sizeof(buffer);
+      scstatus = cupsSideChannelSNMPGet(oid, buffer, &length, 5.0);
+      printf("CUPS_SC_CMD_SNMP_GET %s returned %s, %s\n", oid,
+	     statuses[scstatus], buffer);
+    }
+
+    length   = 0;
+    scstatus = cupsSideChannelDoRequest(CUPS_SC_CMD_SOFT_RESET, buffer,
+                                        &length, 5.0);
+    printf("CUPS_SC_CMD_SOFT_RESET returned %s\n", statuses[scstatus]);
+  }
+
+  if (do_cancel)
+  {
+    sleep(1);
+    kill(data_pid, SIGTERM);
+    kill(back_pid, SIGTERM);
+  }
+  
+  while ((pid = wait(&status)) > 0)
+  {
+    if (status)
+    {
+      if (WIFEXITED(status))
+	printf("%s exited with status %d!\n",
+	       pid == back_pid ? backend : "test",
+	       WEXITSTATUS(status));
+      else
+	printf("%s crashed with signal %d!\n",
+	       pid == back_pid ? backend : "test",
+	       WTERMSIG(status));
+    }
+  }
+
+ /*
+  * Exit accordingly...
+  */
+
+  return (status != 0);
+}
+
+
+/*
+ * 'sigterm_handler()' - Flag when we get SIGTERM.
+ */
+
+static void
+sigterm_handler(int sig)		/* I - Signal */
+{
+  (void)sig;
+
+  job_canceled = 1;
+}
+
+
+/*
+ * 'usage()' - Show usage information.
+ */
+
+static void
+usage(void)
+{
+  puts("Usage: testbackend [-cancel] [-d] [-ps | -pcl] [-s [-oid OID] "
+       "[-walk OID]] [-t] device-uri job-id user title copies options [file]");
+  puts("");
+  puts("Options:");
+  puts("  -cancel     Simulate a canceled print job after 2 seconds.");
+  puts("  -d          Show log messages from backend.");
+  puts("  -oid OID    Lookup the specified SNMP OID.");
+  puts("              (.1.3.6.1.2.1.43.10.2.1.4.1.1 is a good one for printers)");
+  puts("  -pcl        Send PCL+PJL query and test page to backend.");
+  puts("  -ps         Send PostScript query and test page to backend.");
+  puts("  -s          Do side-channel + SNMP tests.");
+  puts("  -t          Send spaces slowly to backend ('trickle').");
+  puts("  -walk OID   Walk the specified SNMP OID.");
+  puts("              (.1.3.6.1.2.1.43 is a good one for printers)");
+
+  exit(1);
+}
+
+
+/*
+ * 'walk_cb()' - Show results of cupsSideChannelSNMPWalk...
+ */
+
+static void
+walk_cb(const char *oid,		/* I - OID */
+        const char *data,		/* I - Data */
+	int        datalen,		/* I - Length of data */
+	void       *context)		/* I - Context (unused) */
+{
+  printf("CUPS_SC_CMD_SNMP_WALK %s=%s (%d bytes)\n", oid, data, datalen);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,83 @@
+/*
+ * "$Id$"
+ *
+ *   SNMP supplies test program for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 2008 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"
+ *   "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() - Show the supplies state of a printer.
+ */
+
+/*
+ * Include necessary headers.
+ */
+
+#include "backend-private.h"
+
+
+/*
+ * 'main()' - Show the supplies state of a printer.
+ */
+
+int					/* O - Exit status */
+main(int  argc,				/* I - Number of command-line args */
+     char *argv[])			/* I - Command-line arguments */
+{
+  http_addrlist_t	*host;		/* Host addresses */
+  int			snmp_fd;	/* SNMP socket */
+  int			page_count,	/* Current page count */
+			printer_state;	/* Current printer state */
+
+
+  if (argc != 2)
+  {
+    puts("Usage: testsupplies ip-or-hostname");
+    return (1);
+  }
+
+  if ((host = httpAddrGetList(argv[1], AF_UNSPEC, "9100")) == NULL)
+  {
+    perror(argv[1]);
+    return (1);
+  }
+
+  if ((snmp_fd = _cupsSNMPOpen(host->addr.addr.sa_family)) < 0)
+  {
+    perror(argv[1]);
+    return (1);
+  }
+
+  for (;;)
+  {
+    fputs("backendSNMPSupplies: ", stdout);
+
+    if (backendSNMPSupplies(snmp_fd, &(host->addr), &page_count,
+                            &printer_state))
+    {
+      puts("FAIL");
+      return (1);
+    }
+
+    printf("backendSNMPSupplies: %s (page_count=%d, printer_state=%d)\n",
+	   page_count < 0 || printer_state < CUPS_TC_other ||
+	       printer_state > CUPS_TC_warmup ? "FAIL" : "PASS",
+	   page_count, printer_state);
+
+    sleep(5);
+  }
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,835 @@
+/*
+ * "$Id$"
+ *
+ *   Libusb interface code for CUPS.
+ *
+ *   Copyright 2007-2011 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/".
+ *
+ * Contents:
+ *
+ *   list_devices()    - List the available printers.
+ *   print_device()    - Print a file to a USB device.
+ *   close_device()    - Close the connection to the USB printer.
+ *   find_device()     - Find or enumerate USB printers.
+ *   get_device_id()   - Get the IEEE-1284 device ID for the printer.
+ *   list_cb()         - List USB printers for discovery.
+ *   make_device_uri() - Create a device URI for a USB printer.
+ *   open_device()     - Open a connection to the USB printer.
+ *   print_cb()        - Find a USB printer for printing.
+ *   side_cb()         - Handle side-channel requests.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include <usb.h>
+#include <poll.h>
+
+
+/*
+ * Local types...
+ */
+
+typedef struct usb_printer_s		/**** USB Printer Data ****/
+{
+  struct usb_device	*device;	/* Device info */
+  int			conf,		/* Configuration */
+			iface,		/* Interface */
+			altset,		/* Alternate setting */
+			write_endp,	/* Write endpoint */
+			read_endp;	/* Read endpoint */
+  struct usb_dev_handle	*handle;	/* Open handle to device */
+} usb_printer_t;
+
+typedef int (*usb_cb_t)(usb_printer_t *, const char *, const char *,
+                        const void *);
+
+
+/*
+ * Local functions...
+ */
+
+static int		close_device(usb_printer_t *printer);
+static usb_printer_t	*find_device(usb_cb_t cb, const void *data);
+static int		get_device_id(usb_printer_t *printer, char *buffer,
+			              size_t bufsize);
+static int		list_cb(usb_printer_t *printer, const char *device_uri,
+			        const char *device_id, const void *data);
+static char		*make_device_uri(usb_printer_t *printer,
+			                 const char *device_id,
+					 char *uri, size_t uri_size);
+static int		open_device(usb_printer_t *printer, int verbose);
+static int		print_cb(usb_printer_t *printer, const char *device_uri,
+			         const char *device_id, const void *data);
+static ssize_t		side_cb(usb_printer_t *printer, int print_fd);
+
+
+/*
+ * 'list_devices()' - List the available printers.
+ */
+
+void
+list_devices(void)
+{
+  fputs("DEBUG: list_devices\n", stderr);
+  find_device(list_cb, NULL);
+}
+
+
+/*
+ * 'print_device()' - Print a file to a USB device.
+ */
+
+int					/* O - Exit status */
+print_device(const char *uri,		/* I - Device URI */
+             const char *hostname,	/* I - Hostname/manufacturer */
+             const char *resource,	/* I - Resource/modelname */
+	     char       *options,	/* I - Device options/serial number */
+	     int        print_fd,	/* I - File descriptor to print */
+	     int        copies,		/* I - Copies to print */
+	     int	argc,		/* I - Number of command-line arguments (6 or 7) */
+	     char	*argv[])	/* I - Command-line arguments */
+{
+  usb_printer_t	*printer;		/* Printer */
+  ssize_t	bytes,			/* Bytes read/written */
+		tbytes;			/* Total bytes written */
+  char		buffer[512];		/* Print data buffer */
+  struct sigaction action;		/* Actions for POSIX signals */
+  struct pollfd	pfds[2];		/* Poll descriptors */
+
+
+  fputs("DEBUG: print_device\n", stderr);
+
+ /*
+  * Connect to the printer...
+  */
+
+  while ((printer = find_device(print_cb, uri)) == NULL)
+  {
+    _cupsLangPuts(stderr,
+		  _("INFO: Waiting for printer to become available...\n"));
+    sleep(5);
+  }
+
+
+ /*
+  * If we are printing data from a print driver on stdin, ignore SIGTERM
+  * so that the driver can finish out any page data, e.g. to eject the
+  * current page.  We only do this for stdin printing as otherwise there
+  * is no way to cancel a raw print job...
+  */
+
+  if (!print_fd)
+  {
+    memset(&action, 0, sizeof(action));
+
+    sigemptyset(&action.sa_mask);
+    action.sa_handler = SIG_IGN;
+    sigaction(SIGTERM, &action, NULL);
+  }
+
+  tbytes = 0;
+
+  pfds[0].fd     = print_fd;
+  pfds[0].events = POLLIN;
+  pfds[1].fd     = CUPS_SC_FD;
+  pfds[1].events = POLLIN;
+
+  while (copies > 0 && tbytes >= 0)
+  {
+    copies --;
+
+    if (print_fd != 0)
+    {
+      fputs("PAGE: 1 1\n", stderr);
+      lseek(print_fd, 0, SEEK_SET);
+    }
+
+   /*
+    * TODO: Add back-channel support, along with better write error handling.
+    */
+
+    while (poll(pfds, 2, -1) > 0)
+    {
+     /*
+      * CUPS STR #3318: USB process hangs on end-of-file, making further
+      *                 printing impossible
+      *
+      * From a strict interpretation of POSIX poll(), POLLHUP should never be
+      * set without POLLIN, since POLLIN is the event you request.  That said,
+      * it appears that some versions of Linux break this.
+      */
+
+      if (pfds[0].revents & (POLLIN | POLLHUP))
+      {
+	if ((bytes = read(print_fd, buffer, sizeof(buffer))) > 0)
+	{
+	  if (usb_bulk_write(printer->handle, printer->write_endp, buffer,
+	                        bytes, 3600000) < 0)
+	  {
+	    _cupsLangPrintf(stderr,
+			    _("ERROR: Unable to write %d bytes to printer!\n"),
+			    (int)bytes);
+	    tbytes = -1;
+	    break;
+	  }
+
+	  tbytes += bytes;
+	}
+	else if (bytes == 0 || (bytes < 0 && errno != EAGAIN && errno != EINTR))
+	  break;
+      }
+
+      if (pfds[1].revents & (POLLIN | POLLHUP))
+      {
+        if ((bytes = side_cb(printer, print_fd)) < 0)
+	  pfds[1].events = 0;		/* Filter has gone away... */
+	else
+          tbytes += bytes;
+      }
+    }
+  }
+
+ /*
+  * Close our connection and return...
+  */
+
+  close_device(printer);
+
+  return (CUPS_BACKEND_OK);
+}
+
+
+/*
+ * 'close_device()' - Close the connection to the USB printer.
+ */
+
+static int				/* I - 0 on success, -1 on failure */
+close_device(usb_printer_t *printer)	/* I - Printer */
+{
+  if (printer->handle)
+  {
+   /*
+    * Release interfaces before closing so that we know all data is written
+    * to the device...
+    */
+
+    int number = printer->device->config[printer->conf].
+                     interface[printer->iface].
+		     altsetting[printer->altset].bInterfaceNumber;
+    usb_release_interface(printer->handle, number);
+
+    if (number != 0)
+      usb_release_interface(printer->handle, 0);
+
+   /*
+    * Close the interface and return...
+    */
+
+    usb_close(printer->handle);
+    printer->handle = NULL;
+  }
+
+  return (0);
+}
+
+
+/*
+ * 'find_device()' - Find or enumerate USB printers.
+ */
+
+static usb_printer_t *			/* O - Found printer */
+find_device(usb_cb_t   cb,		/* I - Callback function */
+            const void *data)		/* I - User data for callback */
+{
+  struct usb_bus	*bus;		/* Current bus */
+  struct usb_device	*device;	/* Current device */
+  struct usb_config_descriptor *confptr;/* Pointer to current configuration */
+  struct usb_interface	*ifaceptr;	/* Pointer to current interface */
+  struct usb_interface_descriptor *altptr;
+					/* Pointer to current alternate setting */
+  struct usb_endpoint_descriptor *endpptr;
+					/* Pointer to current endpoint */
+  int			conf,		/* Current configuration */
+			iface,		/* Current interface */
+			altset,		/* Current alternate setting */
+			protocol,	/* Current protocol */
+			endp,		/* Current endpoint */
+			read_endp,	/* Current read endpoint */
+			write_endp;	/* Current write endpoint */
+  char			device_id[1024],/* IEEE-1284 device ID */
+			device_uri[1024];
+					/* Device URI */
+  static usb_printer_t	printer;	/* Current printer */
+
+
+ /*
+  * Initialize libusb...
+  */
+
+  usb_init();
+  fprintf(stderr, "DEBUG: usb_find_busses=%d\n", usb_find_busses());
+  fprintf(stderr, "DEBUG: usb_find_devices=%d\n", usb_find_devices());
+
+ /*
+  * Then loop through the devices it found...
+  */
+
+  for (bus = usb_get_busses(); bus; bus = bus->next)
+    for (device = bus->devices; device; device = device->next)
+    {
+     /*
+      * Ignore devices with no configuration data and anything that is not
+      * a printer...
+      */
+
+      if (!device->config || !device->descriptor.idVendor ||
+          !device->descriptor.idProduct)
+	continue;
+
+      for (conf = 0, confptr = device->config;
+           conf < device->descriptor.bNumConfigurations;
+	   conf ++, confptr ++)
+        for (iface = 0, ifaceptr = confptr->interface;
+	     iface < confptr->bNumInterfaces;
+	     iface ++, ifaceptr ++)
+        {
+	 /*
+	  * Some printers offer multiple interfaces...
+	  */
+
+          protocol   = 0;
+
+	  for (altset = 0, altptr = ifaceptr->altsetting;
+	       altset < ifaceptr->num_altsetting;
+	       altset ++, altptr ++)
+          {
+	   /*
+	    * Currently we only support unidirectional and bidirectional
+	    * printers.  Future versions of this code will support the
+	    * 1284.4 (packet mode) protocol as well.
+	    */
+
+	    if (altptr->bInterfaceClass != USB_CLASS_PRINTER ||
+	        altptr->bInterfaceSubClass != 1 ||
+		(altptr->bInterfaceProtocol != 1 &&	/* Unidirectional */
+		 altptr->bInterfaceProtocol != 2) ||	/* Bidirectional */
+		altptr->bInterfaceProtocol < protocol)
+	      continue;
+
+	    read_endp  = -1;
+	    write_endp = -1;
+
+	    for (endp = 0, endpptr = altptr->endpoint;
+	         endp < altptr->bNumEndpoints;
+		 endp ++, endpptr ++)
+              if ((endpptr->bmAttributes & USB_ENDPOINT_TYPE_MASK) ==
+	              USB_ENDPOINT_TYPE_BULK)
+	      {
+	        if (endpptr->bEndpointAddress & USB_ENDPOINT_DIR_MASK)
+		  read_endp = endp;
+		else
+		  write_endp = endp;
+	      }
+
+            if (write_endp >= 0)
+	    {
+	     /*
+	      * Save the best match so far...
+	      */
+
+              protocol           = altptr->bInterfaceProtocol;
+	      printer.altset     = altset;
+	      printer.write_endp = write_endp;
+	      printer.read_endp  = read_endp;
+	    }
+	  }
+
+	  if (protocol > 0)
+	  {
+	    printer.device = device;
+	    printer.conf   = conf;
+	    printer.iface  = iface;
+	    printer.handle = NULL;
+
+            if (!open_device(&printer, data != NULL))
+	    {
+	      if (!get_device_id(&printer, device_id, sizeof(device_id)))
+	      {
+                make_device_uri(&printer, device_id, device_uri,
+		                sizeof(device_uri));
+
+	        if ((*cb)(&printer, device_uri, device_id, data))
+		{
+		  printer.read_endp  = printer.device->config[printer.conf].
+				           interface[printer.iface].
+					   altsetting[printer.altset].
+					   endpoint[printer.read_endp].
+					   bEndpointAddress;
+		  printer.write_endp = printer.device->config[printer.conf].
+					   interface[printer.iface].
+					   altsetting[printer.altset].
+					   endpoint[printer.write_endp].
+					   bEndpointAddress;
+		  return (&printer);
+		}
+              }
+
+              close_device(&printer);
+	    }
+	  }
+	}
+    }
+
+ /*
+  * If we get this far without returning, then we haven't found a printer
+  * to print to...
+  */
+
+  return (NULL);
+}
+
+
+/*
+ * 'get_device_id()' - Get the IEEE-1284 device ID for the printer.
+ */
+
+static int				/* O - 0 on success, -1 on error */
+get_device_id(usb_printer_t *printer,	/* I - Printer */
+              char          *buffer,	/* I - String buffer */
+              size_t        bufsize)	/* I - Number of bytes in buffer */
+{
+  int	length;				/* Length of device ID */
+
+
+  if (usb_control_msg(printer->handle,
+                      USB_TYPE_CLASS | USB_ENDPOINT_IN | USB_RECIP_INTERFACE,
+		      0, printer->conf, (printer->iface << 8) | printer->altset,
+		      buffer, bufsize, 5000) < 0)
+  {
+    *buffer = '\0';
+    return (-1);
+  }
+
+ /*
+  * Extract the length of the device ID string from the first two
+  * bytes.  The 1284 spec says the length is stored MSB first...
+  */
+
+  length = (((unsigned)buffer[0] & 255) << 8) +
+	   ((unsigned)buffer[1] & 255);
+
+ /*
+  * Check to see if the length is larger than our buffer; first
+  * assume that the vendor incorrectly implemented the 1284 spec,
+  * and then limit the length to the size of our buffer...
+  */
+
+  if (length > bufsize)
+    length = (((unsigned)buffer[1] & 255) << 8) +
+	     ((unsigned)buffer[0] & 255);
+
+  if (length > bufsize)
+    length = bufsize;
+
+  length -= 2;
+
+ /*
+  * Copy the device ID text to the beginning of the buffer and
+  * nul-terminate.
+  */
+
+  memmove(buffer, buffer + 2, length);
+  buffer[length] = '\0';
+
+  return (0);
+}
+
+
+/*
+ * 'list_cb()' - List USB printers for discovery.
+ */
+
+static int				/* O - 0 to continue, 1 to stop */
+list_cb(usb_printer_t *printer,		/* I - Printer */
+        const char    *device_uri,	/* I - Device URI */
+        const char    *device_id,	/* I - IEEE-1284 device ID */
+        const void    *data)		/* I - User data (not used) */
+{
+  char	make_model[1024];		/* Make and model */
+
+
+ /*
+  * Get the device URI and make/model strings...
+  */
+
+  backendGetMakeModel(device_id, make_model, sizeof(make_model));
+
+ /*
+  * Report the printer...
+  */
+
+  cupsBackendReport("direct", device_uri, make_model, make_model, device_id,
+                    NULL);
+
+ /*
+  * Keep going...
+  */
+
+  return (0);
+}
+
+
+/*
+ * 'make_device_uri()' - Create a device URI for a USB printer.
+ */
+
+static char *				/* O - Device URI */
+make_device_uri(
+    usb_printer_t *printer,		/* I - Printer */
+    const char    *device_id,		/* I - IEEE-1284 device ID */
+    char          *uri,			/* I - Device URI buffer */
+    size_t        uri_size)		/* I - Size of device URI buffer */
+{
+  char		options[1024];		/* Device URI options */
+  int		num_values;		/* Number of 1284 parameters */
+  cups_option_t	*values;		/* 1284 parameters */
+  const char	*mfg,			/* Manufacturer */
+		*mdl,			/* Model */
+		*des,			/* Description */
+		*sern;			/* Serial number */
+  char		tempmfg[256],		/* Temporary manufacturer string */
+		tempsern[256],		/* Temporary serial number string */
+		*tempptr;		/* Pointer into temp string */
+
+
+ /*
+  * Get the make, model, and serial numbers...
+  */
+
+  num_values = _ppdGet1284Values(device_id, &values);
+
+  if ((sern = cupsGetOption("SERIALNUMBER", num_values, values)) == NULL)
+    if ((sern = cupsGetOption("SERN", num_values, values)) == NULL)
+      if ((sern = cupsGetOption("SN", num_values, values)) == NULL &&
+          printer->device->descriptor.iSerialNumber)
+      {
+       /*
+        * Try getting the serial number from the device itself...
+	*/
+
+        int length = usb_get_string_simple(printer->handle,
+	                                   printer->device->descriptor.
+					       iSerialNumber,
+				           tempsern, sizeof(tempsern) - 1);
+        if (length > 0)
+	{
+	  tempsern[length] = '\0';
+	  sern             = tempsern;
+	}
+      }
+
+  if ((mfg = cupsGetOption("MANUFACTURER", num_values, values)) == NULL)
+    mfg = cupsGetOption("MFG", num_values, values);
+
+  if ((mdl = cupsGetOption("MODEL", num_values, values)) == NULL)
+    mdl = cupsGetOption("MDL", num_values, values);
+
+#ifdef __APPLE__
+ /*
+  * To maintain compatibility with the original IOKit-based backend on Mac OS X,
+  * don't map manufacturer names...
+  */
+
+  if (!mfg)
+
+#else
+ /*
+  * To maintain compatibility with the original character device backend on
+  * Linux and *BSD, map manufacturer names...
+  */
+
+  if (mfg)
+  {
+    if (!strcasecmp(mfg, "Hewlett-Packard"))
+      mfg = "HP";
+    else if (!strcasecmp(mfg, "Lexmark International"))
+      mfg = "Lexmark";
+  }
+  else
+#endif /* __APPLE__ */
+  {
+   /*
+    * No manufacturer?  Use the model string or description...
+    */
+
+    if (mdl)
+      _ppdNormalizeMakeAndModel(mdl, tempmfg, sizeof(tempmfg));
+    else if ((des = cupsGetOption("DESCRIPTION", num_values, values)) != NULL ||
+             (des = cupsGetOption("DES", num_values, values)) != NULL)
+      _ppdNormalizeMakeAndModel(des, tempmfg, sizeof(tempmfg));
+    else
+      strlcpy(tempmfg, "Unknown", sizeof(tempmfg));
+
+    if ((tempptr = strchr(tempmfg, ' ')) != NULL)
+      *tempptr = '\0';
+
+    mfg = tempmfg;
+  }
+
+ /*
+  * Generate the device URI from the manufacturer, model, serial number,
+  * and interface number...
+  */
+
+  if (sern)
+  {
+    if (printer->iface > 0)
+      snprintf(options, sizeof(options), "?serial=%s&interface=%d", sern,
+               printer->iface);
+    else
+      snprintf(options, sizeof(options), "?serial=%s", sern);
+  }
+  else if (printer->iface > 0)
+    snprintf(options, sizeof(options), "?interface=%d", printer->iface);
+  else
+    options[0] = '\0';
+
+  httpAssembleURIf(HTTP_URI_CODING_ALL, uri, uri_size, "usb", NULL, mfg, 0,
+		   "/%s%s", mdl, options);
+
+  cupsFreeOptions(num_values, values);
+
+  return (uri);
+}
+
+
+/*
+ * 'open_device()' - Open a connection to the USB printer.
+ */
+
+static int				/* O - 0 on success, -1 on error */
+open_device(usb_printer_t *printer,	/* I - Printer */
+            int           verbose)	/* I - Update connecting-to-device state? */
+{
+  int	number;				/* Configuration/interface/altset numbers */
+
+
+ /*
+  * Return immediately if we are already connected...
+  */
+
+  if (printer->handle)
+    return (0);
+
+ /*
+  * Try opening the printer...
+  */
+
+  if ((printer->handle = usb_open(printer->device)) == NULL)
+    return (-1);
+
+ /*
+  * Then set the desired configuration...
+  */
+
+  if (verbose)
+    fputs("STATE: +connecting-to-device\n", stderr);
+
+  number = printer->device->config[printer->conf].bConfigurationValue;
+
+  if (usb_set_configuration(printer->handle, number) < 0)
+  {
+   /*
+    * If the set fails, chances are that the printer only supports a
+    * single configuration.  Technically these printers don't conform to
+    * the USB printer specification, but otherwise they'll work...
+    */
+
+    if (errno != EBUSY)
+      fprintf(stderr, "DEBUG: Failed to set configuration %d for %04x:%04x\n",
+              number, printer->device->descriptor.idVendor,
+	      printer->device->descriptor.idProduct);
+  }
+
+ /*
+  * Claim interfaces as needed...
+  */
+
+  number = printer->device->config[printer->conf].interface[printer->iface].
+               altsetting[printer->altset].bInterfaceNumber;
+  while (usb_claim_interface(printer->handle, number) < 0)
+  {
+    if (errno != EBUSY)
+      fprintf(stderr, "DEBUG: Failed to claim interface %d for %04x:%04x: %s\n",
+              number, printer->device->descriptor.idVendor,
+	      printer->device->descriptor.idProduct, strerror(errno));
+
+    goto error;
+  }
+
+#if 0 /* STR #3801: Claiming interface 0 causes problems with some printers */
+  if (number != 0)
+    while (usb_claim_interface(printer->handle, 0) < 0)
+    {
+      if (errno != EBUSY)
+	fprintf(stderr, "DEBUG: Failed to claim interface 0 for %04x:%04x: %s\n",
+		printer->device->descriptor.idVendor,
+		printer->device->descriptor.idProduct, strerror(errno));
+
+      goto error;
+    }
+#endif /* 0 */
+
+ /*
+  * Set alternate setting...
+  */
+
+  number = printer->device->config[printer->conf].interface[printer->iface].
+               altsetting[printer->altset].bAlternateSetting;
+  while (usb_set_altinterface(printer->handle, number) < 0)
+  {
+    if (errno != EBUSY)
+      fprintf(stderr,
+              "DEBUG: Failed to set alternate interface %d for %04x:%04x: %s\n",
+              number, printer->device->descriptor.idVendor,
+	      printer->device->descriptor.idProduct, strerror(errno));
+
+    goto error;
+  }
+
+  if (verbose)
+    fputs("STATE: -connecting-to-device\n", stderr);
+
+  return (0);
+
+ /*
+  * If we get here, there was a hard error...
+  */
+
+  error:
+
+  if (verbose)
+    fputs("STATE: -connecting-to-device\n", stderr);
+
+  usb_close(printer->handle);
+  printer->handle = NULL;
+
+  return (-1);
+}
+
+
+/*
+ * 'print_cb()' - Find a USB printer for printing.
+ */
+
+static int				/* O - 0 to continue, 1 to stop (found) */
+print_cb(usb_printer_t *printer,	/* I - Printer */
+         const char    *device_uri,	/* I - Device URI */
+         const char    *device_id,	/* I - IEEE-1284 device ID */
+         const void    *data)		/* I - User data (make, model, S/N) */
+{
+  return (!strcmp((char *)data, device_uri));
+}
+
+
+/*
+ * 'side_cb()' - Handle side-channel requests.
+ */
+
+static ssize_t				/* O - Number of bytes written */
+side_cb(usb_printer_t *printer,		/* I - Printer */
+        int           print_fd)		/* I - File to print */
+{
+  ssize_t		bytes,		/* Bytes read/written */
+			tbytes;		/* Total bytes written */
+  char			buffer[512];	/* Print data buffer */
+  struct pollfd		pfd;		/* Poll descriptor */
+  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 */
+
+
+  tbytes  = 0;
+  datalen = sizeof(data);
+
+  if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0))
+    return (-1);
+
+  switch (command)
+  {
+    case CUPS_SC_CMD_DRAIN_OUTPUT :
+	pfd.fd     = print_fd;
+	pfd.events = POLLIN;
+
+	while (poll(&pfd, 1, 1000) > 0)
+	{
+	  if ((bytes = read(print_fd, buffer, sizeof(buffer))) > 0)
+	  {
+	    while (usb_bulk_write(printer->handle, printer->write_endp, buffer,
+				  bytes, 5000) < 0)
+	    {
+	      _cupsLangPrintf(stderr,
+			      _("ERROR: Unable to write %d bytes to printer!\n"),
+			      (int)bytes);
+	      tbytes = -1;
+	      break;
+	    }
+
+	    tbytes += bytes;
+	  }
+	  else if (bytes < 0 && errno != EAGAIN && errno != EINTR)
+	    break;
+        }
+
+        if (tbytes < 0)
+	  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] = 0;			/* TODO: Change to 1 when read supported */
+        datalen = 1;
+        break;
+
+    case CUPS_SC_CMD_GET_DEVICE_ID :
+	if (get_device_id(printer, data, sizeof(data)))
+        {
+	  status  = CUPS_SC_STATUS_IO_ERROR;
+	  datalen = 0;
+	}
+	else
+        {
+	  status  = CUPS_SC_STATUS_OK;
+	  datalen = strlen(data);
+	}
+        break;
+
+    default :
+        status  = CUPS_SC_STATUS_NOT_IMPLEMENTED;
+	datalen = 0;
+	break;
+  }
+
+  cupsSideChannelWrite(command, status, data, datalen, 1.0);
+
+  return (tbytes);
+}
+
+
+/*
+ * End of "$Id$".
+ */
+
@@ -0,0 +1,631 @@
+/*
+ * "$Id$"
+ *
+ *   USB port backend for the Common UNIX Printing System (CUPS).
+ *
+ *   This file is included from "usb.c" when compiled on UNIX/Linux.
+ *
+ *   Copyright 2007-2009 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:
+ *
+ *   print_device() - Print a file to a USB device.
+ *   list_devices() - List all USB devices.
+ *   open_device()  - Open a USB device...
+ *   side_cb()      - Handle side-channel requests...
+ */
+
+/*
+ * Include necessary headers.
+ */
+
+#include <sys/select.h>
+
+
+/*
+ * Local functions...
+ */
+
+static int	open_device(const char *uri, int *use_bc);
+static int	side_cb(int print_fd, int device_fd, int snmp_fd,
+		        http_addr_t *addr, int use_bc);
+
+
+/*
+ * 'print_device()' - Print a file to a USB device.
+ */
+
+int					/* O - Exit status */
+print_device(const char *uri,		/* I - Device URI */
+             const char *hostname,	/* I - Hostname/manufacturer */
+             const char *resource,	/* I - Resource/modelname */
+	     char       *options,	/* I - Device options/serial number */
+	     int        print_fd,	/* I - File descriptor to print */
+	     int        copies,		/* I - Copies to print */
+	     int	argc,		/* I - Number of command-line arguments (6 or 7) */
+	     char	*argv[])	/* I - Command-line arguments */
+{
+  int		use_bc;			/* Use backchannel path? */
+  int		device_fd;		/* USB device */
+  size_t	tbytes;			/* Total number of bytes written */
+  struct termios opts;			/* Parallel port options */
+
+
+  (void)argc;
+  (void)argv;
+
+ /*
+  * Open the USB port device...
+  */
+
+  fputs("STATE: +connecting-to-device\n", stderr);
+
+  do
+  {
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+   /*
+    * *BSD's ulpt driver currently does not support the
+    * back-channel, incorrectly returns data ready on a select(),
+    * and locks up on read()...
+    */
+
+    use_bc = 0;
+
+#elif defined(__sun)
+   /*
+    * CUPS STR #3028: Solaris' usbprn driver apparently does not support
+    * select() or poll(), so we can't support backchannel...
+    */
+
+    use_bc = 0;
+
+#else
+   /*
+    * Disable backchannel data when printing to Brother, Canon, or
+    * Minolta USB printers - apparently these printers will return
+    * the IEEE-1284 device ID over and over and over when they get
+    * a read request...
+    */
+
+    use_bc = strcasecmp(hostname, "Brother") &&
+             strcasecmp(hostname, "Canon") &&
+             strncasecmp(hostname, "Konica", 6) &&
+             strncasecmp(hostname, "Minolta", 7);
+#endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */
+
+    if ((device_fd = open_device(uri, &use_bc)) == -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.
+	*/
+
+        _cupsLangPuts(stderr,
+	              _("INFO: Unable to contact printer, queuing on next "
+			"printer in class...\n"));
+
+       /*
+        * Sleep 5 seconds to keep the job from requeuing too rapidly...
+	*/
+
+	sleep(5);
+
+        return (CUPS_BACKEND_FAILED);
+      }
+
+      if (errno == EBUSY)
+      {
+        _cupsLangPuts(stderr,
+	              _("INFO: Printer busy; will retry in 10 seconds...\n"));
+	sleep(10);
+      }
+      else if (errno == ENXIO || errno == EIO || errno == ENOENT ||
+               errno == ENODEV)
+      {
+        _cupsLangPuts(stderr,
+	              _("INFO: Printer not connected; will retry in 30 "
+		        "seconds...\n"));
+	sleep(30);
+      }
+      else
+      {
+	_cupsLangPrintf(stderr,
+	                _("ERROR: Unable to open device file \"%s\": %s\n"),
+			resource, strerror(errno));
+	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);
+    }
+
+#ifdef __sun
+   /*
+    * CUPS STR #3028: Solaris' usbprn driver apparently does not support
+    * select() or poll(), so we can't support the sidechannel either...
+    */
+
+    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, NULL);
+
+#else
+    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, side_cb);
+#endif /* __sun */
+
+    if (print_fd != 0 && tbytes >= 0)
+      _cupsLangPrintf(stderr,
+#ifdef HAVE_LONG_LONG
+		      _("INFO: Sent print file, %lld bytes...\n"),
+#else
+		      _("INFO: Sent print file, %ld bytes...\n"),
+#endif /* HAVE_LONG_LONG */
+		      CUPS_LLCAST tbytes);
+  }
+
+ /*
+  * Close the USB port and return...
+  */
+
+  close(device_fd);
+
+  return (tbytes < 0 ? CUPS_BACKEND_FAILED : CUPS_BACKEND_OK);
+}
+
+
+/*
+ * 'list_devices()' - List all USB devices.
+ */
+
+void
+list_devices(void)
+{
+#ifdef __linux
+  int	i;				/* Looping var */
+  int	fd;				/* File descriptor */
+  char	device[255],			/* Device filename */
+	device_id[1024],		/* Device ID string */
+	device_uri[1024],		/* Device URI string */
+	make_model[1024];		/* Make and model */
+
+
+ /*
+  * Try to open each USB device...
+  */
+
+  for (i = 0; i < 16; i ++)
+  {
+   /*
+    * Linux has a long history of changing the standard filenames used
+    * for USB printer devices.  We get the honor of trying them all...
+    */
+
+    sprintf(device, "/dev/usblp%d", i);
+
+    if ((fd = open(device, O_RDWR | O_EXCL)) < 0)
+    {
+      if (errno != ENOENT)
+	continue;
+
+      sprintf(device, "/dev/usb/lp%d", i);
+
+      if ((fd = open(device, O_RDWR | O_EXCL)) < 0)
+      {
+	if (errno != ENOENT)
+	  continue;
+
+	sprintf(device, "/dev/usb/usblp%d", i);
+
+    	if ((fd = open(device, O_RDWR | O_EXCL)) < 0)
+	  continue;
+      }
+    }
+
+    if (!backendGetDeviceID(fd, device_id, sizeof(device_id),
+                            make_model, sizeof(make_model),
+			    "usb", device_uri, sizeof(device_uri)))
+      cupsBackendReport("direct", device_uri, make_model, make_model,
+                        device_id, NULL);
+
+    close(fd);
+  }
+#elif defined(__sgi)
+#elif defined(__sun) && defined(ECPPIOC_GETDEVID)
+  int	i;			/* Looping var */
+  int	fd;			/* File descriptor */
+  char	device[255],		/* Device filename */
+	device_id[1024],	/* Device ID string */
+	device_uri[1024],	/* Device URI string */
+	make_model[1024];	/* Make and model */
+
+
+ /*
+  * Open each USB device...
+  */
+
+  for (i = 0; i < 8; i ++)
+  {
+    sprintf(device, "/dev/usb/printer%d", i);
+
+    if ((fd = open(device, O_WRONLY | O_EXCL)) >= 0)
+    {
+      if (!backendGetDeviceID(fd, device_id, sizeof(device_id),
+                              make_model, sizeof(make_model),
+			      "usb", device_uri, sizeof(device_uri)))
+	cupsBackendReport("direct", device_uri, make_model, make_model,
+			  device_id, NULL);
+
+      close(fd);
+    }
+  }
+#elif defined(__hpux)
+#elif defined(__osf)
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+  int   i;                      /* Looping var */
+  char  device[255];            /* Device filename */
+
+
+  for (i = 0; i < 8; i ++)
+  {
+    sprintf(device, "/dev/ulpt%d", i);
+    if (!access(device, 0))
+      printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
+
+    sprintf(device, "/dev/unlpt%d", i);
+    if (!access(device, 0))
+      printf("direct usb:%s \"Unknown\" \"USB Printer #%d (no reset)\"\n", device, i + 1);
+  }
+#endif
+}
+
+
+/*
+ * 'open_device()' - Open a USB device...
+ */
+
+static int				/* O - File descriptor or -1 on error */
+open_device(const char *uri,		/* I - Device URI */
+            int        *use_bc)		/* O - Set to 0 for unidirectional */
+{
+  int	fd;				/* File descriptor */
+
+
+ /*
+  * The generic implementation just treats the URI as a device filename...
+  * Specific operating systems may also support using the device serial
+  * number and/or make/model.
+  */
+
+  if (!strncmp(uri, "usb:/dev/", 9))
+#ifdef __linux
+  {
+   /*
+    * Do not allow direct devices anymore...
+    */
+
+    errno = ENODEV;
+    return (-1);
+  }
+  else if (!strncmp(uri, "usb://", 6))
+  {
+   /*
+    * For Linux, try looking up the device serial number or model...
+    */
+
+    int		i;			/* Looping var */
+    int		busy;			/* Are any ports busy? */
+    char	device[255],		/* Device filename */
+		device_id[1024],	/* Device ID string */
+		make_model[1024],	/* Make and model */
+		device_uri[1024];	/* Device URI string */
+
+
+   /*
+    * Find the correct USB device...
+    */
+
+    for (;;)
+    {
+      for (busy = 0, i = 0; i < 16; i ++)
+      {
+       /*
+	* Linux has a long history of changing the standard filenames used
+	* for USB printer devices.  We get the honor of trying them all...
+	*/
+
+	sprintf(device, "/dev/usblp%d", i);
+
+	if ((fd = open(device, O_RDWR | O_EXCL)) < 0 && errno == ENOENT)
+	{
+	  sprintf(device, "/dev/usb/lp%d", i);
+
+	  if ((fd = open(device, O_RDWR | O_EXCL)) < 0 && errno == ENOENT)
+	  {
+	    sprintf(device, "/dev/usb/usblp%d", i);
+
+    	    if ((fd = open(device, O_RDWR | O_EXCL)) < 0 && errno == ENOENT)
+	      continue;
+	  }
+	}
+
+	if (fd >= 0)
+	{
+	  backendGetDeviceID(fd, device_id, sizeof(device_id),
+                             make_model, sizeof(make_model),
+			     "usb", device_uri, sizeof(device_uri));
+	}
+	else
+	{
+	 /*
+	  * If the open failed because it was busy, flag it so we retry
+	  * as needed...
+	  */
+
+	  if (errno == EBUSY)
+	    busy = 1;
+
+	  device_uri[0] = '\0';
+        }
+
+        if (!strcmp(uri, device_uri))
+	{
+	 /*
+	  * Yes, return this file descriptor...
+	  */
+
+	  fprintf(stderr, "DEBUG: Printer using device file \"%s\"...\n",
+		  device);
+
+	  return (fd);
+	}
+
+       /*
+	* This wasn't the one...
+	*/
+
+        if (fd >= 0)
+	  close(fd);
+      }
+
+     /*
+      * If we get here and at least one of the printer ports showed up
+      * as "busy", then sleep for a bit and retry...
+      */
+
+      if (busy)
+	_cupsLangPuts(stderr,
+	              _("INFO: Printer busy; will retry in 5 seconds...\n"));
+
+      sleep(5);
+    }
+  }
+#elif defined(__sun) && defined(ECPPIOC_GETDEVID)
+  {
+   /*
+    * Do not allow direct devices anymore...
+    */
+
+    errno = ENODEV;
+    return (-1);
+  }
+  else if (!strncmp(uri, "usb://", 6))
+  {
+   /*
+    * For Solaris, try looking up the device serial number or model...
+    */
+
+    int		i;			/* Looping var */
+    int		busy;			/* Are any ports busy? */
+    char	device[255],		/* Device filename */
+		device_id[1024],	/* Device ID string */
+		make_model[1024],	/* Make and model */
+		device_uri[1024];	/* Device URI string */
+
+
+   /*
+    * Find the correct USB device...
+    */
+
+    do
+    {
+      for (i = 0, busy = 0; i < 8; i ++)
+      {
+	sprintf(device, "/dev/usb/printer%d", i);
+
+	if ((fd = open(device, O_WRONLY | O_EXCL)) >= 0)
+	  backendGetDeviceID(fd, device_id, sizeof(device_id),
+                             make_model, sizeof(make_model),
+			     "usb", device_uri, sizeof(device_uri));
+	else
+	{
+	 /*
+	  * If the open failed because it was busy, flag it so we retry
+	  * as needed...
+	  */
+
+	  if (errno == EBUSY)
+	    busy = 1;
+
+	  device_uri[0] = '\0';
+        }
+
+        if (!strcmp(uri, device_uri))
+	{
+	 /*
+	  * Yes, return this file descriptor...
+	  */
+
+          fputs("DEBUG: Setting use_bc to 0!\n", stderr);
+
+          *use_bc = 0;
+
+	  return (fd);
+	}
+
+       /*
+	* This wasn't the one...
+	*/
+
+        if (fd >= 0)
+	  close(fd);
+      }
+
+     /*
+      * If we get here and at least one of the printer ports showed up
+      * as "busy", then sleep for a bit and retry...
+      */
+
+      if (busy)
+      {
+	_cupsLangPuts(stderr,
+	              _("INFO: Printer is busy; will retry in 5 seconds...\n"));
+	sleep(5);
+      }
+    }
+    while (busy);
+
+   /*
+    * Couldn't find the printer, return "no such device or address"...
+    */
+
+    errno = ENODEV;
+
+    return (-1);
+  }
+#else
+  {
+    if (*use_bc)
+      fd = open(uri + 4, O_RDWR | O_EXCL);
+    else
+      fd = -1;
+
+    if (fd < 0)
+    {
+      fd      = open(uri + 4, O_WRONLY | O_EXCL);
+      *use_bc = 0;
+    }
+
+    return (fd);
+  }
+#endif /* __linux */
+  else
+  {
+    errno = ENODEV;
+    return (-1);
+  }
+}
+
+
+/*
+ * '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$".
+ */
@@ -3,42 +3,34 @@
 *
 *   USB port backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+ *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   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 please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   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:
 *
+ *   list_devices() - List all available USB devices to stdout.
+ *   print_device() - Print a file to a USB device.
 *   main()         - Send a file to the specified USB port.
- *   list_devices() - List all USB devices.
 */

 /*
 * Include necessary headers.
 */

-#include <cups/cups.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <cups/string.h>
-#include <signal.h>
+#ifdef __APPLE__
+   /* A header order dependency requires this be first */
+#  include <ApplicationServices/ApplicationServices.h>
+#endif /* __APPLE__ */
+
+#include "backend-private.h"

 #ifdef WIN32
 #  include <io.h>
@@ -48,35 +40,85 @@
 #  include <termios.h>
 #endif /* WIN32 */

-#ifdef __linux
-#  include <sys/ioctl.h>
-#  include <linux/lp.h>
-#  define IOCNR_GET_DEVICE_ID		1
-
-/*
- * Get device_id string
- */
-#  define LPIOC_GET_DEVICE_ID(len)	_IOC(_IOC_READ, 'P', IOCNR_GET_DEVICE_ID, len)
-#endif /* __linux */
-
-#ifdef __sun
-#  ifdef __sparc
-#    include <sys/ecppio.h>
-#  else
-#    include <sys/ecppsys.h>
-#  endif /* __sparc */
-#endif /* __sun */
-

 /*
 * Local functions...
 */

-void	decode_device_id(int port, const char *device_id,
-	                 char *make_model, int mmsize,
-			 char *uri, int urisize);
 void	list_devices(void);
-int	open_device(const char *uri);
+int	print_device(const char *uri, const char *hostname,
+	             const char *resource, char *options,
+		     int print_fd, int copies, int argc, char *argv[]);
+
+
+/*
+ * Include the vendor-specific USB implementation...
+ */
+
+#ifdef HAVE_USB_H
+#  include "usb-libusb.c"
+#elif defined(__APPLE__)
+#  include "usb-darwin.c"
+#elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+#  include "usb-unix.c"
+#else
+/*
+ * Use dummy functions that do nothing on unsupported platforms...
+ * These can be used as templates for implementing USB printing on new
+ * platforms...
+ */
+
+/*
+ * 'list_devices()' - List all available USB devices to stdout.
+ */
+
+void
+list_devices(void)
+{
+ /*
+  * Don't have any devices to list... Use output of the form:
+  *
+  *     direct usb:/make/model?serial=foo "Make Model" "USB Printer"
+  *
+  * Note that "Hewlett Packard" or any other variation MUST be mapped to
+  * "HP" for compatibility with the PPD and ICC specs.
+  */
+}
+
+
+/*
+ * 'print_device()' - Print a file to a USB device.
+ */
+
+int					/* O - Exit status */
+print_device(const char *uri,		/* I - Device URI */
+             const char *hostname,	/* I - Hostname/manufacturer */
+             const char *resource,	/* I - Resource/modelname */
+	     char       *options,	/* I - Device options/serial number */
+	     int        print_fd,	/* I - File descriptor to print */
+	     int        copies,		/* I - Copies to print */
+	     int	argc,		/* I - Number of command-line arguments (6 or 7) */
+	     char	*argv[])	/* I - Command-line arguments */
+{
+ /*
+  * Can't print, so just reference the arguments to eliminate compiler
+  * warnings and return and exit status of 1.  Normally you would use the
+  * arguments to send a file to the printer and return 0 if everything
+  * worked OK and non-zero if there was an error.
+  */
+
+  (void)uri;
+  (void)hostname;
+  (void)resource;
+  (void)options;
+  (void)print_fd;
+  (void)copies;
+  (void)argc;
+  (void)argv;
+
+  return (CUPS_BACKEND_FAILED);
+}
+#endif /* __APPLE__ */


 /*
@@ -87,25 +129,23 @@ int	open_device(const char *uri);
 *    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 */
+int					/* O - Exit status */
+main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
+     char *argv[])			/* I - Command-line arguments */
 {
-  int		fp;		/* Print file */
-  int		copies;		/* Number of copies to print */
-  int		fd;		/* Parallel device */
-  int		wbytes;		/* Number of bytes written */
-  size_t	nbytes,		/* Number of bytes read */
-		tbytes;		/* Total number of bytes written */
-  char		buffer[8192],	/* Output buffer */
-		*bufptr;	/* Pointer into buffer */
-  struct termios opts;		/* Parallel port options */
+  int		print_fd;		/* Print file */
+  int		copies;			/* Number of copies to print */
+  int		status;			/* Exit status */
+  int		port;			/* Port number (not used) */
+  const char	*uri;			/* Device URI */
+  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 */
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  struct sigaction action;	/* Actions for POSIX signals */
+  struct sigaction action;		/* Actions for POSIX signals */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-#ifdef __linux
-  unsigned char	status;		/* Port status (off-line, out-of-paper, etc.) */
-#endif /* __linux */


 /*
@@ -135,14 +175,47 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  if (argc == 1)
  {
    list_devices();
-    return (0);
+    return (CUPS_BACKEND_OK);
  }
  else if (argc < 6 || argc > 7)
  {
-    fputs("Usage: USB job-id user title copies options [file]\n", stderr);
+    _cupsLangPrintf(stderr,
+                    _("Usage: %s job-id user title copies options [file]\n"),
+                    argv[0]);
+    return (CUPS_BACKEND_FAILED);
+  }
+
+ /*
+  * Extract the device name and options from the URI...
+  */
+
+  uri = cupsBackendDeviceURI(argv);
+
+  if (httpSeparateURI(HTTP_URI_CODING_ALL, uri,
+                      method, sizeof(method), username, sizeof(username),
+		      hostname, sizeof(hostname), &port,
+		      resource, sizeof(resource)) < HTTP_URI_OK)
+  {
+    _cupsLangPuts(stderr,
+                  _("ERROR: No device URI found in argv[0] or in DEVICE_URI "
+	            "environment variable!\n"));
    return (1);
  }

+ /*
+  * 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';
+  }
+
 /*
  * If we have 7 arguments, print the file named on the command-line.
  * Otherwise, send stdin instead...
@@ -150,8 +223,8 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

  if (argc == 6)
  {
-    fp     = 0;
-    copies = 1;
+    print_fd = 0;
+    copies   = 1;
  }
  else
  {
@@ -159,645 +232,31 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
    * Try to open the print file...
    */

-    if ((fp = open(argv[6], O_RDONLY)) < 0)
+    if ((print_fd = open(argv[6], O_RDONLY)) < 0)
    {
-      perror("ERROR: unable to open print file");
-      return (1);
+      _cupsLangPrintf(stderr, _("ERROR: Unable to open print file %s - %s\n"),
+                      argv[6], strerror(errno));
+      return (CUPS_BACKEND_FAILED);
    }

    copies = atoi(argv[4]);
  }

- /*
-  * Open the USB port device...
-  */
-
-  do
-  {
-    if ((fd = open_device(argv[0])) == -1)
-    {
-      if (errno == EBUSY)
-      {
-        fputs("INFO: USB port busy; will retry in 30 seconds...\n", stderr);
-	sleep(30);
-      }
-      else if (errno == ENXIO || errno == EIO || errno == ENOENT)
-      {
-        fputs("INFO: Printer not connected; will retry in 30 seconds...\n", stderr);
-	sleep(30);
-      }
-      else
-      {
-	fprintf(stderr, "ERROR: Unable to open USB device \"%s\": %s\n",
-	        argv[0], strerror(errno));
-	return (1);
-      }
-    }
-  }
-  while (fd < 0);
-
- /*
-  * Set any options provided...
-  */
-
-  tcgetattr(fd, &opts);
-
-  opts.c_lflag &= ~(ICANON | ECHO | ISIG);	/* Raw mode */
-
-  /**** No options supported yet ****/
-
-  tcsetattr(fd, TCSANOW, &opts);
-
- /*
-  * Now that we are "connected" to the port, ignore SIGTERM so that we
-  * can finish out any page data the driver sends (e.g. to eject the
-  * current page...  Only ignore SIGTERM if we are printing data from
-  * stdin (otherwise you can't cancel raw jobs...)
-  */
-
-  if (argc < 7)
-  {
-#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-    sigset(SIGTERM, SIG_IGN);
-#elif defined(HAVE_SIGACTION)
-    memset(&action, 0, sizeof(action));
-
-    sigemptyset(&action.sa_mask);
-    action.sa_handler = SIG_IGN;
-    sigaction(SIGTERM, &action, NULL);
-#else
-    signal(SIGTERM, SIG_IGN);
-#endif /* HAVE_SIGSET */
-  }
-
-#if defined(__linux) && defined(LP_POUTPA)
- /*
-  * Show the printer status before we send the file; normally, we'd
-  * do this while we write data to the printer, however at least some
-  * Linux kernels have buggy USB drivers which don't like to be
-  * queried while sending data to the printer...
-  *
-  * Also, we're using the 8255 constants instead of the ones that are
-  * supposed to be used, as it appears that the USB driver also doesn't
-  * follow standards...
-  */
-
-  if (ioctl(fd, LPGETSTATUS, &status) == 0)
-  {
-    fprintf(stderr, "DEBUG: LPGETSTATUS returned a port status of %02X...\n", status);
-
-    if (!(status & LP_POUTPA))
-      fputs("WARNING: Media tray empty!\n", stderr);
-    else if (!(status & LP_PERRORP))
-      fputs("WARNING: Printer fault!\n", stderr);
-    else if (!(status & LP_PSELECD))
-      fputs("WARNING: Printer off-line.\n", stderr);
-  }
-#endif /* __linux && LP_POUTPA */
-
 /*
  * Finally, send the print file...
  */

-  while (copies > 0)
-  {
-    copies --;
-
-    if (fp != 0)
-    {
-      fputs("PAGE: 1 1\n", stderr);
-      lseek(fp, 0, SEEK_SET);
-    }
-
-    tbytes = 0;
-    while ((nbytes = read(fp, buffer, sizeof(buffer))) > 0)
-    {
-     /*
-      * Write the print data to the printer...
-      */
-
-      tbytes += nbytes;
-      bufptr = buffer;
-
-      while (nbytes > 0)
-      {
-
-	if ((wbytes = write(fd, bufptr, nbytes)) < 0)
-	  if (errno == ENOTTY)
-	    wbytes = write(fd, bufptr, nbytes);
-
-	if (wbytes < 0)
-	{
-	  perror("ERROR: Unable to send print file to printer");
-	  break;
-	}
-
-	nbytes -= wbytes;
-	bufptr += wbytes;
-      }
-
-      if (wbytes < 0)
-        break;
-
-      if (argc > 6)
-	fprintf(stderr, "INFO: Sending print file, %lu bytes...\n",
-	        (unsigned long)tbytes);
-    }
-  }
+  status = print_device(uri, hostname, resource, options, print_fd, copies,
+                        argc, argv);

 /*
-  * Close the socket connection and input file and return...
+  * Close the input file and return...
  */

-  close(fd);
-  if (fp != 0)
-    close(fp);
+  if (print_fd != 0)
+    close(print_fd);

-  fputs("INFO: Ready to print.\n", stderr);
-
-  return (0);
-}
-
-
-/*
- * 'decode_device_id()' - Decode the IEEE-1284 device ID string.
- */
-
-void
-decode_device_id(int        port,		/* I - Port number */
-                 const char *device_id,		/* I - 1284 device ID string */
-                 char       *make_model,	/* O - Make/model */
-		 int        mmsize,		/* I - Size of buffer */
-		 char       *uri,		/* O - Device URI */
-		 int        urisize)		/* I - Size of buffer */
-{
-  char	*attr,					/* 1284 attribute */
-  	*delim,					/* 1284 delimiter */
-	*uriptr,				/* Pointer into URI */
-	*mfg,					/* Manufacturer string */
-	*mdl,					/* Model string */
-	serial_number[1024];			/* Serial number string */
-
-
- /*
-  * Look for the description field...
-  */
-
-  if ((attr = strstr(device_id, "DES:")) != NULL)
-    attr += 4;
-  else if ((attr = strstr(device_id, "DESCRIPTION:")) != NULL)
-    attr += 12;
-
-  if ((mfg = strstr(device_id, "MANUFACTURER:")) != NULL)
-    mfg += 13;
-  else if ((mfg = strstr(device_id, "MFG:")) != NULL)
-    mfg += 4;
-
-  if ((mdl = strstr(device_id, "MODEL:")) != NULL)
-    mdl += 6;
-  else if ((mdl = strstr(device_id, "MDL:")) != NULL)
-    mdl += 4;
-
-  if (attr)
-  {
-    if (strncasecmp(attr, "Hewlett-Packard ", 16) == 0)
-    {
-      strlcpy(make_model, "HP ", mmsize);
-      strlcpy(make_model + 3, attr + 16, mmsize - 3);
-    }
-    else
-    {
-      strlcpy(make_model, attr, mmsize);
-    }
-
-    if ((delim = strchr(make_model, ';')) != NULL)
-      *delim = '\0';
-  }
-  else if (mfg && mdl)
-  {
-   /*
-    * Build a make-model string from the manufacturer and model attributes...
-    */
-
-    strlcpy(make_model, mfg, mmsize);
-
-    if ((delim = strchr(make_model, ';')) != NULL)
-      *delim = '\0';
-
-    strlcat(make_model, " ", mmsize);
-    strlcat(make_model, mdl, mmsize);
-
-    if ((delim = strchr(make_model, ';')) != NULL)
-      *delim = '\0';
-  }
-  else
-  {
-   /*
-    * Use "Unknown" as the printer make and model...
-    */
-
-    strlcpy(make_model, "Unknown", mmsize);
-  }
-
- /*
-  * Look for the serial number field...
-  */
-
-  if ((attr = strstr(device_id, "SERN:")) != NULL)
-    attr += 5;
-  else if ((attr = strstr(device_id, "SERIALNUMBER:")) != NULL)
-    attr += 13;
-
-  if (attr)
-  {
-    strlcpy(serial_number, attr, sizeof(serial_number));
-
-    if ((delim = strchr(serial_number, ';')) != NULL)
-      *delim = '\0';
-  }
-  else
-    serial_number[0] = '\0';
-
- /*
-  * Generate the device URI from the make_model and serial number strings.
-  */
-
-  strlcpy(uri, "usb://", urisize);
-  for (uriptr = uri + 6, delim = make_model;
-       *delim && uriptr < (uri + urisize - 1);
-       delim ++)
-    if (*delim == ' ')
-    {
-      delim ++;
-      *uriptr++ = '/';
-      break;
-    }
-    else
-      *uriptr++ = *delim;
-
-  for (; *delim && uriptr < (uri + urisize - 3); delim ++)
-    if (*delim == ' ')
-    {
-      *uriptr++ = '%';
-      *uriptr++ = '2';
-      *uriptr++ = '0';
-    }
-    else
-      *uriptr++ = *delim;
-
-  *uriptr = '\0';
-
-  if (serial_number[0])
-  {
-   /*
-    * Add the serial number to the URI...
-    */
-
-    strlcat(uri, "?serial=", urisize);
-    strlcat(uri, serial_number, urisize);
-  }
-}
-
-
-/*
- * 'list_devices()' - List all USB devices.
- */
-
-void
-list_devices(void)
-{
-#ifdef __linux
-  int	i;			/* Looping var */
-  int	length;			/* Length of device ID info */
-  int	fd;			/* File descriptor */
-  char	format[255],		/* Format for device filename */
-	device[255],		/* Device filename */
-	device_id[1024],	/* Device ID string */
-	device_uri[1024],	/* Device URI string */
-	make_model[1024];	/* Make and model */
-
-
- /*
-  * First figure out which USB printer filename to use...
-  */
-
-  if (access("/dev/usb/lp0", 0) == 0)
-    strcpy(format, "/dev/usb/lp%d");
-  else if (access("/dev/usb/usblp0", 0) == 0)
-    strcpy(format, "/dev/usb/usblp%d");
-  else
-    strcpy(format, "/dev/usblp%d");
-
- /*
-  * Then open each USB device...
-  */
-
-  for (i = 0; i < 16; i ++)
-  {
-    sprintf(device, format, i);
-
-    if ((fd = open(device, O_RDWR | O_EXCL)) >= 0)
-    {
-      if (ioctl(fd, LPIOC_GET_DEVICE_ID(sizeof(device_id)), device_id) == 0)
-      {
-	length = (((unsigned)device_id[0] & 255) << 8) +
-	         ((unsigned)device_id[1] & 255);
-
-       /*
-        * Check to see if the length is larger than our buffer; first
-	* assume that the vendor incorrectly implemented the 1284 spec,
-	* and then limit the length to the size of our buffer...
-	*/
-
-        if (length > (sizeof(device_id) - 2))
-	  length = (((unsigned)device_id[1] & 255) << 8) +
-	           ((unsigned)device_id[0] & 255);
-
-        if (length > (sizeof(device_id) - 2))
-	  length = sizeof(device_id) - 2;
-
-	memmove(device_id, device_id + 2, length);
-	device_id[length] = '\0';
-      }
-      else
-        device_id[0] = '\0';
-
-      close(fd);
-    }
-    else
-      device_id[0] = '\0';
-
-    if (device_id[0])
-    {
-      decode_device_id(i, device_id, make_model, sizeof(make_model),
-		       device_uri, sizeof(device_uri));
-
-      printf("direct %s \"%s\" \"USB Printer #%d\"\n", device_uri,
-	     make_model, i + 1);
-    }
-    else
-      printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
-  }
-#elif defined(__sgi)
-#elif defined(__sun)
-  int	i;			/* Looping var */
-  int	fd;			/* File descriptor */
-  char	device[255],		/* Device filename */
-	device_id[1024],	/* Device ID string */
-	device_uri[1024],	/* Device URI string */
-	make_model[1024];	/* Make and model */
-#  ifdef ECPPIOC_GETDEVID
-  struct ecpp_device_id did;	/* Device ID buffer */
-#  endif /* ECPPIOC_GETDEVID */
-
-
- /*
-  * Open each USB device...
-  */
-
-  for (i = 0; i < 8; i ++)
-  {
-    sprintf(device, "/dev/usb/printer%d", i);
-
-#  ifndef ECPPIOC_GETDEVID
-    if (!access(device, 0))
-      printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
-#  else
-    if ((fd = open(device, O_RDWR | O_EXCL)) >= 0)
-    {
-      did.mode = ECPP_CENTRONICS;
-      did.len  = sizeof(device_id);
-      did.rlen = 0;
-      did.addr = device_id;
-
-      if (ioctl(fd, ECPPIOC_GETDEVID, &did) == 0)
-      {
-        if (did.rlen < (sizeof(device_id) - 1))
-	  device_id[did.rlen] = '\0';
-        else
-	  device_id[sizeof(device_id) - 1] = '\0';
-      }
-      else
-        device_id[0] = '\0';
-
-      close(fd);
-    }
-    else
-      device_id[0] = '\0';
-
-    if (device_id[0])
-    {
-      decode_device_id(i, device_id, make_model, sizeof(make_model),
-		       device_uri, sizeof(device_uri));
-
-      printf("direct %s \"%s\" \"USB Printer #%d\"\n", device_uri,
-	     make_model, i + 1);
-    }
-    else
-      printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
-#  endif /* !ECPPIOC_GETDEVID */
-  }
-#elif defined(__hpux)
-#elif defined(__osf)
-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-  int   i;                      /* Looping var */
-  char  device[255];            /* Device filename */
-
-
-  for (i = 0; i < 8; i ++)
-  {
-    sprintf(device, "/dev/ulpt%d", i);
-    if (!access(device, 0))
-      printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
-
-    sprintf(device, "/dev/unlpt%d", i);
-    if (!access(device, 0))
-      printf("direct usb:%s \"Unknown\" \"USB Printer #%d (no reset)\"\n", device, i + 1);
-  }
-#endif
-}
-
-
-/*
- * 'open_device()' - Open a USB device...
- */
-
-int					/* O - File descriptor or -1 on error */
-open_device(const char *uri)		/* I - Device URI */
-{
- /*
-  * The generic implementation just treats the URI as a device filename...
-  * Specific operating systems may also support using the device serial
-  * number and/or make/model.
-  */
-
-  if (strncmp(uri, "usb:/dev/", 9) == 0)
-    return (open(uri + 4, O_RDWR | O_EXCL));
-#ifdef __linux
-  else if (strncmp(uri, "usb://", 6) == 0)
-  {
-   /*
-    * For Linux, try looking up the device serial number or model...
-    */
-
-    int		i;			/* Looping var */
-    int		length;			/* Length of device ID info */
-    int		fd;			/* File descriptor */
-    char	format[255],		/* Format for device filename */
-		device[255],		/* Device filename */
-		device_id[1024],	/* Device ID string */
-		make_model[1024],	/* Make and model */
-		device_uri[1024];	/* Device URI string */
-
-
-   /*
-    * First figure out which USB printer filename to use...
-    */
-
-    if (access("/dev/usb/lp0", 0) == 0)
-      strcpy(format, "/dev/usb/lp%d");
-    else if (access("/dev/usb/usblp0", 0) == 0)
-      strcpy(format, "/dev/usb/usblp%d");
-    else
-      strcpy(format, "/dev/usblp%d");
-
-   /*
-    * Then find the correct USB device...
-    */
-
-    for (i = 0; i < 16; i ++)
-    {
-      sprintf(device, format, i);
-
-      if ((fd = open(device, O_RDWR | O_EXCL)) >= 0)
-      {
-	if (ioctl(fd, LPIOC_GET_DEVICE_ID(sizeof(device_id)), device_id) == 0)
-	{
-	  length = (((unsigned)device_id[0] & 255) << 8) +
-	           ((unsigned)device_id[1] & 255);
-	  memmove(device_id, device_id + 2, length);
-	  device_id[length] = '\0';
-	}
-	else
-          device_id[0] = '\0';
-      }
-      else
-	device_id[0] = '\0';
-
-      if (device_id[0])
-      {
-       /*
-        * Got the device ID - is this the one?
-	*/
-
-	decode_device_id(i, device_id, make_model, sizeof(make_model),
-                	 device_uri, sizeof(device_uri));
-
-        if (strcmp(uri, device_uri) == 0)
-	{
-	 /*
-	  * Yes, return this file descriptor...
-	  */
-
-	  fprintf(stderr, "DEBUG: Printer using device file \"%s\"...\n", device);
-
-	  return (fd);
-	}
-      }
-
-     /*
-      * This wasn't the one...
-      */
-
-      close(fd);
-    }
-
-   /*
-    * Couldn't find the printer, return "no such device or address"...
-    */
-
-    errno = ENODEV;
-
-    return (-1);
-  }
-#elif defined(__sun) && defined(ECPPIOC_GETDEVID)
-  else if (strncmp(uri, "usb://", 6) == 0)
-  {
-   /*
-    * For Solaris, try looking up the device serial number or model...
-    */
-
-    int		i;			/* Looping var */
-    int		fd;			/* File descriptor */
-    char	device[255],		/* Device filename */
-		device_id[1024],	/* Device ID string */
-		make_model[1024],	/* Make and model */
-		device_uri[1024];	/* Device URI string */
-    struct ecpp_device_id did;		/* Device ID buffer */
-
-
-   /*
-    * Find the correct USB device...
-    */
-
-    for (i = 0; i < 8; i ++)
-    {
-      sprintf(device, "/dev/usb/printer%d", i);
-
-      if ((fd = open(device, O_RDWR | O_EXCL)) >= 0)
-      {
-	did.mode = ECPP_CENTRONICS;
-	did.len  = sizeof(device_id);
-	did.rlen = 0;
-	did.addr = device_id;
-
-	if (ioctl(fd, ECPPIOC_GETDEVID, &did) == 0)
-	{
-          if (did.rlen < (sizeof(device_id) - 1))
-	    device_id[did.rlen] = '\0';
-          else
-	    device_id[sizeof(device_id) - 1] = '\0';
-	}
-	else
-          device_id[0] = '\0';
-      }
-      else
-	device_id[0] = '\0';
-
-      if (device_id[0])
-      {
-       /*
-        * Got the device ID - is this the one?
-	*/
-
-	decode_device_id(i, device_id, make_model, sizeof(make_model),
-                	 device_uri, sizeof(device_uri));
-
-        if (strcmp(uri, device_uri) == 0)
-	  return (fd);	/* Yes, return this file descriptor... */
-      }
-
-     /*
-      * This wasn't the one...
-      */
-
-      close(fd);
-    }
-
-   /*
-    * Couldn't find the printer, return "no such device or address"...
-    */
-
-    errno = ENODEV;
-
-    return (-1);
-  }
-#endif /* __linux */
-  else
-  {
-    errno = ENODEV;
-    return (-1);
-  }
+  return (status);
 }


@@ -1,4 +0,0 @@
-lpc
-lpq
-lpr
-lprm
@@ -1,12 +1,16 @@
-# DO NOT DELETE
+# DO NOT DELETE THIS LINE -- make depend depends on it.

-lpc.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-lpc.o: ../cups/ppd.h ../cups/language.h ../cups/debug.h ../cups/string.h
+lpc.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
+lpc.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+lpc.o: ../cups/i18n.h ../cups/transcode.h ../cups/debug.h ../cups/string.h
 lpc.o: ../config.h
 lpq.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-lpq.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/language.h
+lpq.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+lpq.o: ../cups/file.h ../cups/language.h ../cups/i18n.h ../cups/transcode.h
 lpq.o: ../cups/debug.h
 lpr.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-lpr.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h
-lprm.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-lprm.o: ../cups/ppd.h ../cups/language.h ../cups/string.h ../config.h
+lpr.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+lpr.o: ../cups/file.h ../cups/language.h ../cups/i18n.h ../cups/transcode.h
+lprm.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
+lprm.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+lprm.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
@@ -3,27 +3,19 @@
 #
 #   Berkeley commands makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+#   Copyright 2007-2009 by Apple Inc.
+#   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
-#
-#       Voice: (301) 373-9603
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   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/".
 #

 include ../Makedefs

+
 TARGETS	=	lpc lpq lpr lprm
 OBJS	=	lpc.o lpq.o lpr.o lprm.o

@@ -35,6 +27,20 @@ OBJS	=	lpc.o lpq.o lpr.o lprm.o
 all:	$(TARGETS)


+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
 #
 # Clean all object files...
 #
@@ -55,13 +61,62 @@ depend:
 # Install all targets...
 #

-install:	all
-	$(INSTALL_DIR) $(BINDIR)
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
+
+
+#
+# Install programs...
+#
+
+install-exec:
+	echo Installing Berkeley user printing commands in $(BINDIR)...
+	$(INSTALL_DIR) -m 755 $(BINDIR)
 	$(INSTALL_BIN) lpq $(BINDIR)
 	$(INSTALL_BIN) lpr $(BINDIR)
 	$(INSTALL_BIN) lprm $(BINDIR)
-	$(INSTALL_DIR) $(SBINDIR)
+	echo Installing Berkeley admin printing commands in $(BINDIR)...
+	$(INSTALL_DIR) -m 755 $(SBINDIR)
 	$(INSTALL_BIN) lpc $(SBINDIR)
+	if test "x$(SYMROOT)" != "x"; then \
+		$(INSTALL_DIR) $(SYMROOT); \
+		for file in $(TARGETS); do \
+			cp $$file $(SYMROOT); \
+		done \
+	fi
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall all targets...
+#
+
+uninstall:
+	$(RM) $(BINDIR)/lpq
+	$(RM) $(BINDIR)/lpr
+	$(RM) $(BINDIR)/lprm
+	$(RM) $(SBINDIR)/lpc
+	-$(RMDIR) $(SBINDIR)
+	-$(RMDIR) $(BINDIR)


 #
@@ -3,23 +3,14 @@
 *
 *   "lpc" command for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   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/".
 *
 * Contents:
 *
@@ -36,9 +27,8 @@

 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
 #include <cups/cups.h>
-#include <cups/language.h>
+#include <cups/i18n.h>
 #include <cups/debug.h>
 #include <cups/string.h>

@@ -47,10 +37,10 @@
 * Local functions...
 */

-static int	compare_strings(char *, char *, int);
-static void	do_command(http_t *, char *, char *);
-static void	show_help(char *);
-static void	show_status(http_t *, char *);
+static int	compare_strings(const char *, const char *, int);
+static void	do_command(http_t *, const char *, const char *);
+static void	show_help(const char *);
+static void	show_status(http_t *, const char *);


 /*
@@ -58,14 +48,16 @@ static void	show_status(http_t *, char *);
 */

 int
-main(int  argc,		/* I - Number of command-line arguments */
-     char *argv[])	/* I - Command-line arguments */
+main(int  argc,				/* I - Number of command-line arguments */
+     char *argv[])			/* I - Command-line arguments */
 {
-  http_t	*http;		/* Connection to server */
-  char		line[1024],	/* Input line from user */
-		*params;	/* Pointer to parameters */
+  http_t	*http;			/* Connection to server */
+  char		line[1024],		/* Input line from user */
+		*params;		/* Pointer to parameters */


+  _cupsSetLocale(argv);
+
 /*
  * Connect to the scheduler...
  */
@@ -86,39 +78,59 @@ main(int  argc,		/* I - Number of command-line arguments */
    * Do the command prompt thing...
    */

-    printf("lpc> ");
+    _cupsLangPuts(stdout, _("lpc> "));
    while (fgets(line, sizeof(line), stdin) != NULL)
    {
     /*
-      * Strip the trailing newline...
+      * Strip trailing whitespace...
      */

-      line[strlen(line) - 1] = '\0';
+      for (params = line + strlen(line) - 1; params >= line;)
+        if (!isspace(*params & 255))
+	  break;
+	else
+	  *params-- = '\0';
+
+     /*
+      * Strip leading whitespace...
+      */
+
+      for (params = line; isspace(*params & 255); params ++);
+
+      if (params > line)
+        _cups_strcpy(line, params);
+
+      if (!line[0])
+      {
+       /*
+        * Nothing left, just show a prompt...
+	*/
+
+	_cupsLangPuts(stdout, _("lpc> "));
+	continue;
+      }

     /*
      * Find any options in the string...
      */

-      while (isspace(line[0]))
-        cups_strcpy(line, line + 1);
-
      for (params = line; *params != '\0'; params ++)
-        if (isspace(*params))
+        if (isspace(*params & 255))
 	  break;

     /*
      * Remove whitespace between the command and parameters...
      */

-      while (isspace(*params))
+      while (isspace(*params & 255))
        *params++ = '\0';

     /*
      * The "quit" and "exit" commands exit; otherwise, process as needed...
      */

-      if (compare_strings(line, "quit", 1) == 0 ||
-          compare_strings(line, "exit", 2) == 0)
+      if (!compare_strings(line, "quit", 1) ||
+          !compare_strings(line, "exit", 2))
        break;

      if (*params == '\0')
@@ -130,7 +142,7 @@ main(int  argc,		/* I - Number of command-line arguments */
      * Put another prompt out to the user...
      */

-      printf("lpc> ");
+      _cupsLangPuts(stdout, _("lpc> "));
    }
  }

@@ -148,12 +160,12 @@ main(int  argc,		/* I - Number of command-line arguments */
 * 'compare_strings()' - Compare two command-line strings.
 */

-static int			/* O - -1 or 1 = no match, 0 = match */
-compare_strings(char *s,	/* I - Command-line string */
-                char *t,	/* I - Option string */
-                int  tmin)	/* I - Minimum number of unique chars in option */
+static int				/* O - -1 or 1 = no match, 0 = match */
+compare_strings(const char *s,		/* I - Command-line string */
+                const char *t,		/* I - Option string */
+                int        tmin)	/* I - Minimum number of unique chars in option */
 {
-  int	slen;			/* Length of command-line string */
+  int	slen;				/* Length of command-line string */


  slen = strlen(s);
@@ -169,17 +181,18 @@ compare_strings(char *s,	/* I - Command-line string */
 */

 static void
-do_command(http_t *http,	/* I - HTTP connection to server */
-           char   *command,	/* I - Command string */
-	   char   *params)	/* I - Parameters for command */
+do_command(http_t     *http,		/* I - HTTP connection to server */
+           const char *command,		/* I - Command string */
+	   const char *params)		/* I - Parameters for command */
 {
-  if (compare_strings(command, "status", 4) == 0)
+  if (!compare_strings(command, "status", 4))
    show_status(http, params);
-  else if (compare_strings(command, "help", 1) == 0 ||
-           strcmp(command, "?") == 0)
+  else if (!compare_strings(command, "help", 1) || !strcmp(command, "?"))
    show_help(params);
  else
-    printf("%s is not implemented by the CUPS version of lpc.\n", command);
+    _cupsLangPrintf(stdout,
+                    _("%s is not implemented by the CUPS version of lpc.\n"),
+		    command);
 }


@@ -188,21 +201,21 @@ do_command(http_t *http,	/* I - HTTP connection to server */
 */

 static void
-show_help(char *command)	/* I - Command to describe or NULL */
+show_help(const char *command)		/* I - Command to describe or NULL */
 {
-  if (command == NULL)
+  if (!command)
  {
-    puts("Commands may be abbreviated.  Commands are:");
-    puts("");
-    puts("exit    help    quit    status  ?");
+    _cupsLangPrintf(stdout,
+                    _("Commands may be abbreviated.  Commands are:\n"
+		      "\n"
+		      "exit    help    quit    status  ?\n"));
  }
-  else if (compare_strings(command, "help", 1) == 0 ||
-           strcmp(command, "?") == 0)
-    puts("help\t\tget help on commands");
-  else if (compare_strings(command, "status", 4) == 0)
-    puts("status\t\tshow status of daemon and queue");
+  else if (!compare_strings(command, "help", 1) || !strcmp(command, "?"))
+    _cupsLangPrintf(stdout, _("help\t\tget help on commands\n"));
+  else if (!compare_strings(command, "status", 4))
+    _cupsLangPrintf(stdout, _("status\t\tshow status of daemon and queue\n"));
  else
-    puts("?Invalid help command unknown");
+    _cupsLangPrintf(stdout, _("?Invalid help command unknown\n"));
 }


@@ -211,35 +224,32 @@ show_help(char *command)	/* I - Command to describe or NULL */
 */

 static void
-show_status(http_t *http,	/* I - HTTP connection to server */
-            char   *dests)	/* I - Destinations */
+show_status(http_t     *http,		/* I - HTTP connection to server */
+            const char *dests)		/* I - Destinations */
 {
-  ipp_t		*request,	/* IPP Request */
-		*response,	/* IPP Response */
-		*jobs;		/* IPP Get Jobs response */
-  ipp_attribute_t *attr,	/* Current attribute */
-		*jattr;		/* Current job attribute */
-  cups_lang_t	*language;	/* Default language */
-  char		*printer,	/* Printer name */
-		*device;	/* Device URI */
-  ipp_pstate_t	pstate;		/* Printer state */
-  int		accepting;	/* Is printer accepting jobs? */
-  int		jobcount;	/* Count of current jobs */
-  char		*dptr,		/* Pointer into destination list */
-		*ptr;		/* Pointer into printer name */
-  int		match;		/* Non-zero if this job matches */
-  char		printer_uri[HTTP_MAX_URI];
-				/* Printer URI */
-  static const char *requested[] =
-		{		/* Requested attributes */
-		  "printer-name",
+  ipp_t		*request,		/* IPP Request */
+		*response;		/* IPP Response */
+  ipp_attribute_t *attr;		/* Current attribute */
+  char		*printer,		/* Printer name */
+		*device,		/* Device URI */
+                *delimiter;		/* Char search result */
+  ipp_pstate_t	pstate;			/* Printer state */
+  int		accepting;		/* Is printer accepting jobs? */
+  int		jobcount;		/* Count of current jobs */
+  const char	*dptr,			/* Pointer into destination list */
+		*ptr;			/* Pointer into printer name */
+  int		match;			/* Non-zero if this job matches */
+  static const char *requested[] =	/* Requested attributes */
+		{
 		  "device-uri",
+		  "printer-is-accepting-jobs",
+		  "printer-name",
 		  "printer-state",
-		  "printer-is-accepting-jobs"
+		  "queued-job-count"
 		};


-  DEBUG_printf(("show_status(%08x, %08x)\n", http, dests));
+  DEBUG_printf(("show_status(http=%p, dests=\"%s\")\n", http, dests));

  if (http == NULL)
    return;
@@ -252,18 +262,7 @@ show_status(http_t *http,	/* I - HTTP connection to server */
  *    attributes-natural-language
  */

-  request = ippNew();
-
-  request->request.op.operation_id = CUPS_GET_PRINTERS;
-  request->request.op.request_id   = 1;
-
-  language = cupsLangDefault();
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-               "attributes-charset", NULL, cupsLangEncoding(language));
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-               "attributes-natural-language", NULL, language->language);
+  request = ippNewRequest(CUPS_GET_PRINTERS);

  ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                "requested-attributes", sizeof(requested) / sizeof(requested[0]),
@@ -273,7 +272,7 @@ show_status(http_t *http,	/* I - HTTP connection to server */
  * Do the request and get back a response...
  */

-  if ((response = cupsDoRequest(http, request, "/printers/")) != NULL)
+  if ((response = cupsDoRequest(http, request, "/")) != NULL)
  {
    DEBUG_puts("show_status: request succeeded...");

@@ -306,21 +305,21 @@ show_status(http_t *http,	/* I - HTTP connection to server */

      while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER)
      {
-        if (strcmp(attr->name, "printer-name") == 0 &&
-	    attr->value_tag == IPP_TAG_NAME)
-	  printer = attr->values[0].string.text;
-
-        if (strcmp(attr->name, "device-uri") == 0 &&
+        if (!strcmp(attr->name, "device-uri") &&
 	    attr->value_tag == IPP_TAG_URI)
 	  device = attr->values[0].string.text;
-
-        if (strcmp(attr->name, "printer-state") == 0 &&
-	    attr->value_tag == IPP_TAG_ENUM)
-	  pstate = (ipp_pstate_t)attr->values[0].integer;
-
-        if (strcmp(attr->name, "printer-is-accepting-jobs") == 0 &&
-	    attr->value_tag == IPP_TAG_BOOLEAN)
+        else if (!strcmp(attr->name, "printer-is-accepting-jobs") &&
+	         attr->value_tag == IPP_TAG_BOOLEAN)
 	  accepting = attr->values[0].boolean;
+        else if (!strcmp(attr->name, "printer-name") &&
+	         attr->value_tag == IPP_TAG_NAME)
+	  printer = attr->values[0].string.text;
+        else if (!strcmp(attr->name, "printer-state") &&
+	         attr->value_tag == IPP_TAG_ENUM)
+	  pstate = (ipp_pstate_t)attr->values[0].integer;
+        else if (!strcmp(attr->name, "queued-job-count") &&
+	         attr->value_tag == IPP_TAG_INTEGER)
+	  jobcount = attr->values[0].integer;

        attr = attr->next;
      }
@@ -337,6 +336,13 @@ show_status(http_t *http,	/* I - HTTP connection to server */
          continue;
      }

+     /*
+      * A single 'all' printer name is special, meaning all printers.
+      */
+
+      if (dests != NULL && !strcmp(dests, "all"))
+        dests = NULL;
+
     /*
      * See if this is a printer we're interested in...
      */
@@ -351,7 +357,7 @@ show_status(http_t *http,	/* I - HTTP connection to server */
 	  * Skip leading whitespace and commas...
 	  */

-	  while (isspace(*dptr) || *dptr == ',')
+	  while (isspace(*dptr & 255) || *dptr == ',')
 	    dptr ++;

 	  if (*dptr == '\0')
@@ -365,7 +371,8 @@ show_status(http_t *http,	/* I - HTTP connection to server */
 	       *ptr != '\0' && *dptr != '\0' && *ptr == *dptr;
 	       ptr ++, dptr ++);

-          if (*ptr == '\0' && (*dptr == '\0' || *dptr == ',' || isspace(*dptr)))
+          if (*ptr == '\0' && (*dptr == '\0' || *dptr == ',' ||
+	                       isspace(*dptr & 255)))
 	  {
 	    match = 1;
 	    break;
@@ -375,9 +382,9 @@ show_status(http_t *http,	/* I - HTTP connection to server */
 	  * Skip trailing junk...
 	  */

-          while (!isspace(*dptr) && *dptr != '\0')
+          while (!isspace(*dptr & 255) && *dptr != '\0')
 	    dptr ++;
-	  while (isspace(*dptr) || *dptr == ',')
+	  while (isspace(*dptr & 255) || *dptr == ',')
 	    dptr ++;

 	  if (*dptr == '\0')
@@ -391,81 +398,46 @@ show_status(http_t *http,	/* I - HTTP connection to server */

      if (match)
      {
-       /*
-        * If the printer state is "IPP_PRINTER_PROCESSING", then grab the
-	* current job for the printer.
-	*/
-
-        if (pstate == IPP_PRINTER_PROCESSING)
-	{
-	 /*
-	  * Build an IPP_GET_JOBS request, which requires the following
-	  * attributes:
-	  *
-	  *    attributes-charset
-	  *    attributes-natural-language
-	  *    printer-uri
-	  *    limit
-	  */
-
-	  request = ippNew();
-
-	  request->request.op.operation_id = IPP_GET_JOBS;
-	  request->request.op.request_id   = 1;
-
-	  language = cupsLangDefault();
-
-	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-                       "attributes-charset", NULL,
-		       cupsLangEncoding(language));
-
-	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-                       "attributes-natural-language", NULL,
-		       language->language);
-
-          snprintf(printer_uri, sizeof(printer_uri),
-                   "ipp://localhost/printers/%s", printer);
-	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
-	               "printer-uri", NULL, printer_uri);
-
-	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-	               "requested-attributes", NULL, "job-id");
-
-          if ((jobs = cupsDoRequest(http, request, "/jobs/")) != NULL)
-	  {
-	    for (jattr = jobs->attrs; jattr != NULL; jattr = jattr->next)
-	      if (jattr->name && strcmp(jattr->name, "job-id") == 0)
-	        jobcount ++;
-
-            ippDelete(jobs);
-	  }
-        }
-
       /*
        * Display it...
 	*/

        printf("%s:\n", printer);
-	if (strncmp(device, "file:", 5) == 0)
-	  printf("\tprinter is on device \'%s\' speed -1\n", device + 5);
+	if (!strncmp(device, "file:", 5))
+	  _cupsLangPrintf(stdout,
+	                  _("\tprinter is on device \'%s\' speed -1\n"),
+			  device + 5);
 	else
 	{
 	 /*
-	  * Just show the method...
+	  * Just show the scheme...
 	  */

-	  *strchr(device, ':') = '\0';
-	  printf("\tprinter is on device \'%s\' speed -1\n", device);
+	  if ((delimiter = strchr(device, ':')) != NULL )
+	  {
+	    *delimiter = '\0';
+	    _cupsLangPrintf(stdout,
+	                    _("\tprinter is on device \'%s\' speed -1\n"),
+			    device);
+	  }
 	}

-	printf("\tqueuing is %sabled\n", accepting ? "en" : "dis");
-	printf("\tprinting is %sabled\n",
-	       pstate == IPP_PRINTER_STOPPED ? "dis" : "en");
-	if (jobcount == 0)
-	  puts("\tno entries");
+        if (accepting)
+	  _cupsLangPuts(stdout, _("\tqueuing is enabled\n"));
 	else
-	  printf("\t%d entries\n", jobcount);
-	puts("\tdaemon present");
+	  _cupsLangPuts(stdout, _("\tqueuing is disabled\n"));
+
+        if (pstate != IPP_PRINTER_STOPPED)
+	  _cupsLangPuts(stdout, _("\tprinting is enabled\n"));
+	else
+	  _cupsLangPuts(stdout, _("\tprinting is disabled\n"));
+
+	if (jobcount == 0)
+	  _cupsLangPuts(stdout, _("\tno entries\n"));
+	else
+	  _cupsLangPrintf(stdout, _("\t%d entries\n"), jobcount);
+
+	_cupsLangPuts(stdout, _("\tdaemon present\n"));
      }

      if (attr == NULL)
@@ -3,23 +3,14 @@
 *
 *   "lpq" command for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   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/".
 *
 * Contents:
 *
@@ -41,7 +32,7 @@
 #include <stdlib.h>
 #include <cups/string.h>
 #include <cups/cups.h>
-#include <cups/language.h>
+#include <cups/i18n.h>
 #include <cups/debug.h>


@@ -49,9 +40,10 @@
 * Local functions...
 */

-static int	show_jobs(http_t *, const char *, const char *, const int,
-		          const int);
-static void	show_printer(http_t *, const char *);
+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);


@@ -60,50 +52,38 @@ static void	usage(void);
 */

 int
-main(int  argc,		/* I - Number of command-line arguments */
-     char *argv[])	/* I - Command-line arguments */
+main(int  argc,				/* I - Number of command-line arguments */
+     char *argv[])			/* I - Command-line arguments */
 {
-  int		i;		/* Looping var */
-  http_t	*http;		/* Connection to server */
-  const char	*dest,		/* Desired printer */
-		*user;		/* Desired user */
-  char		*instance;	/* Printer instance */
-  int		id,		/* Desired job ID */
-		interval,	/* Reporting interval */
-		longstatus;	/* Show file details */
-  int		num_dests;	/* Number of destinations */
-  cups_dest_t	*dests;		/* Destinations */
-#ifdef HAVE_SSL
-  http_encryption_t encryption;	/* Encryption? */
-#endif /* HAVE_SSL */
+  int		i;			/* Looping var */
+  http_t	*http;			/* Connection to server */
+  const char	*dest,			/* Desired printer */
+		*user,			/* Desired user */
+		*val;			/* Environment variable name */
+  char		*instance;		/* Printer instance */
+  int		id,			/* Desired job ID */
+		all,			/* All printers */
+		interval,		/* Reporting interval */
+		longstatus;		/* Show file details */
+  int		num_dests;		/* Number of destinations */
+  cups_dest_t	*dests;			/* Destinations */


- /*
-  * Connect to the scheduler...
-  */
-
-  if ((http = httpConnectEncrypt(cupsServer(), ippPort(),
-                                 cupsEncryption())) == NULL)
-  {
-    fputs("lpq: Unable to contact server!\n", stderr);
-    return (1);
-  }
+  _cupsSetLocale(argv);

 /*
  * Check for command-line options...
  */

+  http       = NULL;
  dest       = NULL;
  user       = NULL;
  id         = 0;
  interval   = 0;
  longstatus = 0;
-
-  num_dests = cupsGetDests(&dests);
-
-  for (i = 0; i < num_dests; i ++)
-    if (dests[i].is_default)
-      dest = dests[i].name;
+  all        = 0;
+  num_dests  = 0;
+  dests      = NULL;

  for (i = 1; i < argc; i ++)
    if (argv[i][0] == '+')
@@ -114,16 +94,36 @@ main(int  argc,		/* I - Number of command-line arguments */
      {
        case 'E' : /* Encrypt */
 #ifdef HAVE_SSL
-	    encryption = HTTP_ENCRYPT_REQUIRED;
+	    cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);

 	    if (http)
-	      httpEncryption(http, encryption);
+	      httpEncryption(http, HTTP_ENCRYPT_REQUIRED);
 #else
-            fprintf(stderr, "%s: Sorry, no encryption support compiled in!\n",
-	            argv[0]);
+            _cupsLangPrintf(stderr,
+	                    _("%s: Sorry, no encryption support compiled in!\n"),
+	                    argv[0]);
 #endif /* HAVE_SSL */
 	    break;

+        case 'U' : /* Username */
+	    if (argv[i][2] != '\0')
+	      cupsSetUser(argv[i] + 2);
+	    else
+	    {
+	      i ++;
+	      if (i >= argc)
+	      {
+	        _cupsLangPrintf(stderr,
+		                _("%s: Error - expected username after "
+				  "\'-U\' option!\n"),
+		        	argv[0]);
+	        return (1);
+	      }
+
+              cupsSetUser(argv[i]);
+	    }
+	    break;
+	    
        case 'P' : /* Printer */
 	    if (argv[i][2])
 	      dest = argv[i] + 2;
@@ -145,20 +145,54 @@ main(int  argc,		/* I - Number of command-line arguments */
 	    if ((instance = strchr(dest, '/')) != NULL)
 	      *instance++ = '\0';

+            http = connect_server(argv[0], http);
+
+            if (num_dests == 0)
+              num_dests = cupsGetDests2(http, &dests);
+
            if (cupsGetDest(dest, instance, num_dests, dests) == NULL)
 	    {
 	      if (instance)
-		fprintf(stderr, "lpq: Unknown destination \"%s/%s\"!\n",
-		        dest, instance);
+		_cupsLangPrintf(stderr,
+		                _("%s: Error - unknown destination \"%s/%s\"!\n"),
+		        	argv[0], dest, instance);
              else
-		fprintf(stderr, "lpq: Unknown destination \"%s\"!\n", dest);
+		_cupsLangPrintf(stderr,
+		                _("%s: Unknown destination \"%s\"!\n"),
+				argv[0], dest);

 	      return (1);
 	    }
 	    break;

 	case 'a' : /* All printers */
-	    dest = NULL;
+	    all = 1;
+	    break;
+
+        case 'h' : /* Connect to host */
+	    if (http)
+	    {
+	      httpClose(http);
+	      http = NULL;
+	    }
+
+	    if (argv[i][2] != '\0')
+              cupsSetServer(argv[i] + 2);
+	    else
+	    {
+	      i ++;
+
+	      if (i >= argc)
+	      {
+	        _cupsLangPrintf(stderr,
+		        	_("%s: Error - expected hostname after "
+			          "\'-h\' option!\n"),
+				argv[0]);
+		return (1);
+              }
+	      else
+                cupsSetServer(argv[i]);
+	    }
 	    break;

 	case 'l' : /* Long status */
@@ -173,11 +207,54 @@ main(int  argc,		/* I - Number of command-line arguments */
 	    break;
      }
    }
-    else if (isdigit(argv[i][0]))
+    else if (isdigit(argv[i][0] & 255))
      id = atoi(argv[i]);
    else
      user = argv[i];

+  http = connect_server(argv[0], http);
+
+  if (dest == NULL && !all)
+  {
+    if (num_dests == 0)
+      num_dests = cupsGetDests2(http, &dests);
+
+    for (i = 0; i < num_dests; i ++)
+      if (dests[i].is_default)
+	dest = dests[i].name;
+
+    if (dest == NULL)
+    {
+      val = NULL;
+
+      if ((dest = getenv("LPDEST")) == NULL)
+      {
+	if ((dest = getenv("PRINTER")) != NULL)
+	{
+          if (!strcmp(dest, "lp"))
+            dest = NULL;
+	  else
+	    val = "PRINTER";
+	}
+      }
+      else
+	val = "LPDEST";
+
+      if (dest && !cupsGetDest(dest, NULL, num_dests, dests))
+	_cupsLangPrintf(stderr,
+	                _("%s: error - %s environment variable names "
+			  "non-existent destination \"%s\"!\n"),
+        	        argv[0], val, dest);
+      else
+	_cupsLangPrintf(stderr,
+	                _("%s: error - no default destination available.\n"),
+			argv[0]);
+      httpClose(http);
+      cupsFreeDests(num_dests, dests);
+      return (1);
+    }
+  }
+
 /*
  * Show the status in a loop...
  */
@@ -185,9 +262,9 @@ main(int  argc,		/* I - Number of command-line arguments */
  for (;;)
  {
    if (dest)
-      show_printer(http, dest);
+      show_printer(argv[0], http, dest);

-    i = show_jobs(http, dest, user, id, longstatus);
+    i = show_jobs(argv[0], http, dest, user, id, longstatus);

    if (i && interval)
    {
@@ -209,37 +286,72 @@ main(int  argc,		/* I - Number of command-line arguments */
 }


+/*
+ * 'connect_server()' - Connect to the server as necessary...
+ */
+
+static http_t *				/* O - New HTTP connection */
+connect_server(const char *command,	/* I - Command name */
+               http_t     *http)	/* I - Current HTTP connection */
+{
+  if (!http)
+  {
+    http = httpConnectEncrypt(cupsServer(), ippPort(),
+	                      cupsEncryption());
+
+    if (http == NULL)
+    {
+      _cupsLangPrintf(stderr, _("%s: Unable to connect to server\n"), command);
+      exit(1);
+    }
+  }
+
+  return (http);
+}
+
+
 /*
 * 'show_jobs()' - Show jobs.
 */

-static int			/* O - Number of jobs in queue */
-show_jobs(http_t     *http,	/* I - HTTP connection to server */
-          const char *dest,	/* I - Destination */
-	  const char *user,	/* I - User */
-	  const int  id,	/* I - Job ID */
-	  const int  longstatus)/* I - 1 if long report desired */
+static int				/* O - Number of jobs in queue */
+show_jobs(const char *command,		/* I - Command name */
+          http_t     *http,		/* I - HTTP connection to server */
+          const char *dest,		/* I - Destination */
+	  const char *user,		/* I - User */
+	  const int  id,		/* I - Job ID */
+	  const int  longstatus)	/* I - 1 if long report desired */
 {
-  ipp_t		*request,	/* IPP Request */
-		*response;	/* IPP Response */
-  ipp_attribute_t *attr;	/* Current attribute */
-  cups_lang_t	*language;	/* Default language */
-  const char	*jobdest,	/* Pointer into job-printer-uri */
-		*jobuser,	/* Pointer to job-originating-user-name */
-		*jobname;	/* Pointer to job-name */
-  ipp_jstate_t	jobstate;	/* job-state */
-  int		jobid,		/* job-id */
-		jobsize,	/* job-k-octets */
+  ipp_t		*request,		/* IPP Request */
+		*response;		/* IPP Response */
+  ipp_attribute_t *attr;		/* Current attribute */
+  const char	*jobdest,		/* Pointer into job-printer-uri */
+		*jobuser,		/* Pointer to job-originating-user-name */
+		*jobname;		/* Pointer to job-name */
+  ipp_jstate_t	jobstate;		/* job-state */
+  int		jobid,			/* job-id */
+		jobsize,		/* job-k-octets */
 #ifdef __osf__
-		jobpriority,	/* job-priority */
+		jobpriority,		/* job-priority */
 #endif /* __osf__ */
-		jobcount,	/* Number of jobs */
-		jobcopies,	/* Number of copies */
-		rank;		/* Rank of job */
-  char		resource[1024];	/* Resource string */
-  char		rankstr[255];	/* Rank string */
-  char		namestr[1024];	/* Job name string */
-  static const char *ranks[10] =/* Ranking strings */
+		jobcount,		/* Number of jobs */
+		jobcopies,		/* Number of copies */
+		rank;			/* Rank of job */
+  char		resource[1024];		/* Resource string */
+  char		rankstr[255];		/* Rank string */
+  char		namestr[1024];		/* Job name string */
+  static const char * const jobattrs[] =/* Job attributes we want to see */
+		{
+		  "copies",
+		  "job-id",
+		  "job-k-octets",
+		  "job-name",
+		  "job-originating-user-name",
+		  "job-printer-uri",
+		  "job-priority",
+		  "job-state"
+		};
+  static const char * const ranks[10] =	/* Ranking strings */
 		{
 		  "th",
 		  "st",
@@ -254,8 +366,8 @@ show_jobs(http_t     *http,	/* I - HTTP connection to server */
 		};


-  DEBUG_printf(("show_jobs(%08x, %08x, %08x, %d, %d)\n", http, dest, user, id,
-                longstatus));
+  DEBUG_printf(("show_jobs(http=%p, dest=%p, user=%p, id=%d, longstatus%d)\n",
+                http, dest, user, id, longstatus));

  if (http == NULL)
    return (0);
@@ -267,38 +379,28 @@ show_jobs(http_t     *http,	/* I - HTTP connection to server */
  *    attributes-charset
  *    attributes-natural-language
  *    job-uri or printer-uri
+  *    requested-attributes
  */

-  request = ippNew();
+  request = ippNewRequest(id ? IPP_GET_JOB_ATTRIBUTES : IPP_GET_JOBS);

-  request->request.op.operation_id = id ? IPP_GET_JOB_ATTRIBUTES : IPP_GET_JOBS;
-  request->request.op.request_id   = 1;
-
-  language = cupsLangDefault();
-
-  attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-                      "attributes-charset", NULL, cupsLangEncoding(language));
-
-  attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-                      "attributes-natural-language", NULL, language->language);
-
-  if (dest == NULL)
+  if (id)
  {
-    if (id)
-      sprintf(resource, "ipp://localhost/jobs/%d", id);
-    else
-      strcpy(resource, "ipp://localhost/jobs");
-
+    snprintf(resource, sizeof(resource), "ipp://localhost/jobs/%d", id);
    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri",
                 NULL, resource);
  }
-  else
+  else if (dest)
  {
-    snprintf(resource, sizeof(resource), "ipp://localhost/printers/%s", dest);
+    httpAssembleURIf(HTTP_URI_CODING_ALL, resource, sizeof(resource), "ipp",
+                     NULL, "localhost", 0, "/printers/%s", dest);

    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                 NULL, resource);
  }
+  else
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
+                 NULL, "ipp://localhost/");

  if (user)
  {
@@ -307,6 +409,10 @@ show_jobs(http_t     *http,	/* I - HTTP connection to server */
    ippAddBoolean(request, IPP_TAG_OPERATION, "my-jobs", 1);
  }

+  ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
+                "requested-attributes",
+                (int)(sizeof(jobattrs) / sizeof(jobattrs[0])), NULL, jobattrs);
+
 /*
  * Do the request and get back a response...
  */
@@ -317,8 +423,7 @@ show_jobs(http_t     *http,	/* I - HTTP connection to server */
  {
    if (response->request.status.status_code > IPP_OK_CONFLICT)
    {
-      fprintf(stderr, "lpq: get-jobs failed: %s\n",
-              ippErrorString(response->request.status.status_code));
+      _cupsLangPrintf(stderr, "%s: %s\n", command, cupsLastErrorString());
      ippDelete(response);
      return (0);
    }
@@ -358,38 +463,38 @@ show_jobs(http_t     *http,	/* I - HTTP connection to server */

      while (attr != NULL && attr->group_tag == IPP_TAG_JOB)
      {
-        if (strcmp(attr->name, "job-id") == 0 &&
+        if (!strcmp(attr->name, "job-id") &&
 	    attr->value_tag == IPP_TAG_INTEGER)
 	  jobid = attr->values[0].integer;

-        if (strcmp(attr->name, "job-k-octets") == 0 &&
+        if (!strcmp(attr->name, "job-k-octets") &&
 	    attr->value_tag == IPP_TAG_INTEGER)
-	  jobsize = attr->values[0].integer * 1024;
+	  jobsize = attr->values[0].integer;

 #ifdef __osf__
-        if (strcmp(attr->name, "job-priority") == 0 &&
+        if (!strcmp(attr->name, "job-priority") &&
 	    attr->value_tag == IPP_TAG_INTEGER)
 	  jobpriority = attr->values[0].integer;
 #endif /* __osf__ */

-        if (strcmp(attr->name, "job-state") == 0 &&
+        if (!strcmp(attr->name, "job-state") &&
 	    attr->value_tag == IPP_TAG_ENUM)
 	  jobstate = (ipp_jstate_t)attr->values[0].integer;

-        if (strcmp(attr->name, "job-printer-uri") == 0 &&
+        if (!strcmp(attr->name, "job-printer-uri") &&
 	    attr->value_tag == IPP_TAG_URI)
 	  if ((jobdest = strrchr(attr->values[0].string.text, '/')) != NULL)
 	    jobdest ++;

-        if (strcmp(attr->name, "job-originating-user-name") == 0 &&
+        if (!strcmp(attr->name, "job-originating-user-name") &&
 	    attr->value_tag == IPP_TAG_NAME)
 	  jobuser = attr->values[0].string.text;

-        if (strcmp(attr->name, "job-name") == 0 &&
+        if (!strcmp(attr->name, "job-name") &&
 	    attr->value_tag == IPP_TAG_NAME)
 	  jobname = attr->values[0].string.text;

-        if (strcmp(attr->name, "copies") == 0 &&
+        if (!strcmp(attr->name, "copies") &&
 	    attr->value_tag == IPP_TAG_INTEGER)
 	  jobcopies = attr->values[0].integer;

@@ -410,9 +515,13 @@ show_jobs(http_t     *http,	/* I - HTTP connection to server */

      if (!longstatus && jobcount == 0)
 #ifdef __osf__
-	puts("Rank   Owner      Pri  Job        Files                       Total Size");
+	_cupsLangPuts(stdout,
+	              _("Rank   Owner      Pri  Job        Files"
+		        "                       Total Size\n"));
 #else
-	puts("Rank    Owner   Job     File(s)                         Total Size");
+	_cupsLangPuts(stdout,
+	              _("Rank    Owner   Job     File(s)"
+		        "                         Total Size\n"));
 #endif /* __osf__ */

      jobcount ++;
@@ -425,13 +534,22 @@ show_jobs(http_t     *http,	/* I - HTTP connection to server */
 	strcpy(rankstr, "active");
      else
      {
-	snprintf(rankstr, sizeof(rankstr), "%d%s", rank, ranks[rank % 10]);
+       /*
+        * Make the rank show the "correct" suffix for each number
+	* (11-13 are the only special cases, for English anyways...)
+	*/
+
+	if ((rank % 100) >= 11 && (rank % 100) <= 13)
+	  snprintf(rankstr, sizeof(rankstr), "%dth", rank);
+	else
+	  snprintf(rankstr, sizeof(rankstr), "%d%s", rank, ranks[rank % 10]);
+
 	rank ++;
      }

      if (longstatus)
      {
-        puts("");
+        _cupsLangPuts(stdout, "\n");

        if (jobcopies > 1)
 	  snprintf(namestr, sizeof(namestr), "%d copies of %s", jobcopies,
@@ -439,16 +557,21 @@ show_jobs(http_t     *http,	/* I - HTTP connection to server */
 	else
 	  strlcpy(namestr, jobname, sizeof(namestr));

-        printf("%s: %-33.33s [job %d localhost]\n", jobuser, rankstr, jobid);
-        printf("        %-39.39s %d bytes\n", namestr, jobsize);
+        _cupsLangPrintf(stdout, _("%s: %-33.33s [job %d localhost]\n"),
+	                jobuser, rankstr, jobid);
+        _cupsLangPrintf(stdout, _("        %-39.39s %.0f bytes\n"),
+	                namestr, 1024.0 * jobsize);
      }
      else
 #ifdef __osf__
-        printf("%-6s %-10.10s %-4d %-10d %-27.27s %d bytes\n", rankstr, jobuser,
-	       jobpriority, jobid, jobname, jobsize);
+        _cupsLangPrintf(stdout,
+	                _("%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes\n"),
+			rankstr, jobuser, jobpriority, jobid, jobname,
+			1024.0 * jobsize);
 #else
-        printf("%-7s %-7.7s %-7d %-31.31s %d bytes\n", rankstr, jobuser,
-	       jobid, jobname, jobsize);
+        _cupsLangPrintf(stdout,
+	                _("%-7s %-7.7s %-7d %-31.31s %.0f bytes\n"),
+			rankstr, jobuser, jobid, jobname, 1024.0 * jobsize);
 #endif /* __osf */

      if (attr == NULL)
@@ -459,12 +582,12 @@ show_jobs(http_t     *http,	/* I - HTTP connection to server */
  }
  else
  {
-    fprintf(stderr, "lpq: get-jobs failed: %s\n", ippErrorString(cupsLastError()));
+    _cupsLangPrintf(stderr, "%s: %s\n", command, cupsLastErrorString());
    return (0);
  }

  if (jobcount == 0)
-    puts("no entries");
+    _cupsLangPuts(stdout, _("no entries\n"));

  return (jobcount);
 }
@@ -475,16 +598,15 @@ show_jobs(http_t     *http,	/* I - HTTP connection to server */
 */

 static void
-show_printer(http_t     *http,	/* I - HTTP connection to server */
-             const char *dest)	/* I - Destination */
+show_printer(const char *command,	/* I - Command name */
+             http_t     *http,		/* I - HTTP connection to server */
+             const char *dest)		/* I - Destination */
 {
-  ipp_t		*request,	/* IPP Request */
-		*response;	/* IPP Response */
-  ipp_attribute_t *attr;	/* Current attribute */
-  cups_lang_t	*language;	/* Default language */
-  ipp_pstate_t	state;		/* Printer state */
-  char		uri[HTTP_MAX_URI];
-				/* Printer URI */
+  ipp_t		*request,		/* IPP Request */
+		*response;		/* IPP Response */
+  ipp_attribute_t *attr;		/* Current attribute */
+  ipp_pstate_t	state;			/* Printer state */
+  char		uri[HTTP_MAX_URI];	/* Printer URI */


  if (http == NULL)
@@ -499,20 +621,10 @@ show_printer(http_t     *http,	/* I - HTTP connection to server */
  *    printer-uri
  */

-  request = ippNew();
+  request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);

-  request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
-  request->request.op.request_id   = 1;
-
-  language = cupsLangDefault();
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-               "attributes-charset", NULL, cupsLangEncoding(language));
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-               "attributes-natural-language", NULL, language->language);
-
-  snprintf(uri, sizeof(uri), "ipp://localhost/printers/%s", dest);
+  httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
+                   "localhost", 0, "/printers/%s", dest);
  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
               "printer-uri", NULL, uri);

@@ -524,8 +636,7 @@ show_printer(http_t     *http,	/* I - HTTP connection to server */
  {
    if (response->request.status.status_code > IPP_OK_CONFLICT)
    {
-      fprintf(stderr, "lpq: get-printer-attributes failed: %s\n",
-              ippErrorString(response->request.status.status_code));
+      _cupsLangPrintf(stderr, "%s: %s\n", command, cupsLastErrorString());
      ippDelete(response);
      return;
    }
@@ -538,21 +649,21 @@ show_printer(http_t     *http,	/* I - HTTP connection to server */
    switch (state)
    {
      case IPP_PRINTER_IDLE :
-          printf("%s is ready\n", dest);
+          _cupsLangPrintf(stdout, _("%s is ready\n"), dest);
 	  break;
      case IPP_PRINTER_PROCESSING :
-          printf("%s is ready and printing\n", dest);
+          _cupsLangPrintf(stdout, _("%s is ready and printing\n"),
+	                  dest);
 	  break;
      case IPP_PRINTER_STOPPED :
-          printf("%s is not ready\n", dest);
+          _cupsLangPrintf(stdout, _("%s is not ready\n"), dest);
 	  break;
    }

    ippDelete(response);
  }
  else
-    fprintf(stderr, "lpq: get-printer-attributes failed: %s\n",
-            ippErrorString(cupsLastError()));
+    _cupsLangPrintf(stderr, "%s: %s\n", command, cupsLastErrorString());
 }


@@ -563,7 +674,9 @@ show_printer(http_t     *http,	/* I - HTTP connection to server */
 static void
 usage(void)
 {
-  fputs("Usage: lpq [-P dest] [-l] [+interval]\n", stderr);
+  _cupsLangPuts(stderr,
+                _("Usage: lpq [-P dest] [-U username] [-h hostname[:port]] "
+		  "[-l] [+interval]\n"));
  exit(1);
 }

@@ -3,28 +3,18 @@
 *
 *   "lpr" command for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   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/".
 *
 * Contents:
 *
- *   main()       - Parse options and send files for printing.
- *   sighandler() - Signal catcher for when we print from stdin...
+ *   main() - Parse options and send files for printing.
 */

 /*
@@ -37,26 +27,7 @@

 #include <cups/string.h>
 #include <cups/cups.h>
-
-
-#ifndef WIN32
-#  include <unistd.h>
-#  include <signal.h>
-
-
-/*
- * Local functions.
- */
-
-void	sighandler(int);
-#endif /* !WIN32 */
-
-
-/*
- * Globals...
- */
-
-char	tempfile[1024];		/* Temporary file for printing from stdin */
+#include <cups/i18n.h>


 /*
@@ -64,36 +35,31 @@ char	tempfile[1024];		/* Temporary file for printing from stdin */
 */

 int
-main(int  argc,		/* I - Number of command-line arguments */
-     char *argv[])	/* I - Command-line arguments */
+main(int  argc,				/* I - Number of command-line arguments */
+     char *argv[])			/* I - Command-line arguments */
 {
-  int		i, j;		/* Looping var */
-  int		job_id;		/* Job ID */
-  char		ch;		/* Option character */
-  char		*printer,	/* Destination printer or class */
-		*instance;	/* Instance */
-  const char	*title;		/* Job title */
-  int		num_copies;	/* Number of copies per file */
-  int		num_files;	/* Number of files to print */
-  const char	*files[1000];	/* Files to print */
-  int		num_dests;	/* Number of destinations */
-  cups_dest_t	*dests,		/* Destinations */
-		*dest;		/* Selected destination */
-  int		num_options;	/* Number of options */
-  cups_option_t	*options;	/* Options */
-  int		deletefile;	/* Delete file after print? */
-  char		buffer[8192];	/* Copy buffer */
-  int		temp;		/* Temporary file descriptor */
-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  struct sigaction action;	/* Signal action */
-  struct sigaction oldaction;	/* Old signal action */
-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
+  int		i, j;			/* Looping var */
+  int		job_id;			/* Job ID */
+  char		ch;			/* Option character */
+  char		*printer,		/* Destination printer or class */
+		*instance;		/* Instance */
+  const char	*title,			/* Job title */
+		*val;			/* Environment variable name */
+  int		num_copies;		/* Number of copies per file */
+  int		num_files;		/* Number of files to print */
+  const char	*files[1000];		/* Files to print */
+  cups_dest_t	*dest;			/* Selected destination */
+  int		num_options;		/* Number of options */
+  cups_option_t	*options;		/* Options */
+  int		deletefile;		/* Delete file after print? */
+  char		buffer[8192];		/* Copy buffer */


+  _cupsSetLocale(argv);
+
  deletefile  = 0;
  printer     = NULL;
-  num_dests   = 0;
-  dests       = NULL;
+  dest        = NULL;
  num_options = 0;
  options     = NULL;
  num_files   = 0;
@@ -107,11 +73,51 @@ main(int  argc,		/* I - Number of command-line arguments */
 #ifdef HAVE_SSL
 	    cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);
 #else
-            fprintf(stderr, "%s: Sorry, no encryption support compiled in!\n",
-	            argv[0]);
+            _cupsLangPrintf(stderr,
+	                    _("%s: Sorry, no encryption support compiled in!\n"),
+	                    argv[0]);
 #endif /* HAVE_SSL */
 	    break;

+        case 'U' : /* Username */
+	    if (argv[i][2] != '\0')
+	      cupsSetUser(argv[i] + 2);
+	    else
+	    {
+	      i ++;
+	      if (i >= argc)
+	      {
+	        _cupsLangPrintf(stderr,
+		                _("%s: Error - expected username after "
+				  "\'-U\' option!\n"),
+		        	argv[0]);
+	        return (1);
+	      }
+
+              cupsSetUser(argv[i]);
+	    }
+	    break;
+	    
+        case 'H' : /* Connect to host */
+	    if (argv[i][2] != '\0')
+              cupsSetServer(argv[i] + 2);
+	    else
+	    {
+	      i ++;
+
+	      if (i >= argc)
+	      {
+	        _cupsLangPrintf(stderr,
+		        	_("%s: Error - expected hostname after "
+			          "\'-H\' option!\n"),
+				argv[0]);
+		return (1);
+              }
+	      else
+                cupsSetServer(argv[i]);
+	    }
+	    break;
+
 	case '1' : /* TROFF font set 1 */
 	case '2' : /* TROFF font set 2 */
 	case '3' : /* TROFF font set 3 */
@@ -124,7 +130,9 @@ main(int  argc,		/* I - Number of command-line arguments */

 	      if (i >= argc)
 	      {
-		fprintf(stderr, "lpr: Expected value after -%c option!\n", ch);
+		_cupsLangPrintf(stderr,
+		                _("%s: Error - expected value after \'-%c\' "
+				  "option!\n"), argv[0], ch);
 		return (1);
 	      }
 	    }
@@ -136,8 +144,10 @@ main(int  argc,		/* I - Number of command-line arguments */
 	case 'n' : /* Ditroff */
 	case 't' : /* Troff */
 	case 'v' : /* Raster image */
-	    fprintf(stderr, "Warning: \'%c\' format modifier not supported - output may not be correct!\n",
-	            ch);
+	    _cupsLangPrintf(stderr,
+	                    _("%s: Warning - \'%c\' format modifier not "
+			      "supported - output may not be correct!\n"),
+			    argv[0], ch);
 	    break;

 	case 'o' : /* Option */
@@ -148,7 +158,10 @@ main(int  argc,		/* I - Number of command-line arguments */
 	      i ++;
 	      if (i >= argc)
 	      {
-	        fputs("lpr: Expected option=value after -o option!\n", stderr);
+	        _cupsLangPrintf(stderr,
+		                _("%s: error - expected option=value after "
+			          "\'-o\' option!\n"),
+				argv[0]);
 		return (1);
 	      }

@@ -157,22 +170,32 @@ main(int  argc,		/* I - Number of command-line arguments */
 	    break;

 	case 'l' : /* Literal/raw */
-            num_options = cupsAddOption("raw", "", num_options, &options);
+            num_options = cupsAddOption("raw", "true", num_options, &options);
 	    break;

 	case 'p' : /* Prettyprint */
-            num_options = cupsAddOption("prettyprint", "", num_options, &options);
+            num_options = cupsAddOption("prettyprint", "true", num_options,
+	                                &options);
 	    break;

 	case 'h' : /* Suppress burst page */
-            num_options = cupsAddOption("job-sheets", "none", num_options, &options);
+            num_options = cupsAddOption("job-sheets", "none", num_options,
+	                                &options);
 	    break;

 	case 's' : /* Don't use symlinks */
 	    break;

 	case 'm' : /* Mail on completion */
-	    fputs("Warning: email notification is not supported!\n", stderr);
+	    {
+	      char	email[1024];	/* EMail address */
+
+
+	      snprintf(email, sizeof(email), "mailto:%s@%s", cupsUser(),
+	               httpGetHostname(NULL, buffer, sizeof(buffer)));
+	      num_options = cupsAddOption("notify-recipient-uri", email,
+	                                  num_options, &options);
+	    }
 	    break;

 	case 'q' : /* Queue file but don't print */
@@ -192,7 +215,10 @@ main(int  argc,		/* I - Number of command-line arguments */
 	      i ++;
 	      if (i >= argc)
 	      {
-	        fputs("lpr: Expected destination after -P option!\n", stderr);
+	        _cupsLangPrintf(stderr,
+		        	_("%s: Error - expected destination after "
+			          "\'-P\' option!\n"),
+				argv[0]);
 		return (1);
 	      }

@@ -202,13 +228,11 @@ main(int  argc,		/* I - Number of command-line arguments */
            if ((instance = strrchr(printer, '/')) != NULL)
 	      *instance++ = '\0';

-	    if (num_dests == 0)
-	      num_dests = cupsGetDests(&dests);
-
-            if ((dest = cupsGetDest(printer, instance, num_dests, dests)) != NULL)
+            if ((dest = cupsGetNamedDest(NULL, printer, instance)) != NULL)
 	    {
 	      for (j = 0; j < dest->num_options; j ++)
-	        if (cupsGetOption(dest->options[j].name, num_options, options) == NULL)
+	        if (cupsGetOption(dest->options[j].name, num_options,
+		                  options) == NULL)
 	          num_options = cupsAddOption(dest->options[j].name,
 		                              dest->options[j].value,
 					      num_options, &options);
@@ -223,7 +247,10 @@ main(int  argc,		/* I - Number of command-line arguments */
 	      i ++;
 	      if (i >= argc)
 	      {
-	        fputs("lpr: Expected copy count after -# option!\n", stderr);
+	        _cupsLangPrintf(stderr,
+		        	_("%s: Error - expected copy count after "
+			          "\'-#\' option!\n"),
+				argv[0]);
 		return (1);
 	      }

@@ -244,7 +271,9 @@ main(int  argc,		/* I - Number of command-line arguments */
 	      i ++;
 	      if (i >= argc)
 	      {
-		fprintf(stderr, "lpr: Expected name after -%c option!\n", ch);
+		_cupsLangPrintf(stderr,
+		                _("%s: Error - expected name after \'-%c\' "
+				  "option!\n"), argv[0], ch);
 		return (1);
 	      }

@@ -252,24 +281,10 @@ main(int  argc,		/* I - Number of command-line arguments */
 	    }
 	    break;

-	case 'U' : /* User */
-	    if (argv[i][2] != '\0')
-	      cupsSetUser(argv[i] + 2);
-	    else
-	    {
-	      i ++;
-	      if (i >= argc)
-	      {
-	        fputs("lpr: Expected username after -U option!\n", stderr);
-		return (1);
-	      }
-
-	      cupsSetUser(argv[i]);
-	    }
-	    break;
-
 	default :
-	    fprintf(stderr, "lpr: Unknown option \'%c\'!\n", argv[i][1]);
+	    _cupsLangPrintf(stderr,
+	                    _("%s: Error - unknown option \'%c\'!\n"),
+			    argv[0], argv[i][1]);
 	    return (1);
      }
    else if (num_files < 1000)
@@ -280,8 +295,9 @@ main(int  argc,		/* I - Number of command-line arguments */

      if (access(argv[i], R_OK) != 0)
      {
-        fprintf(stderr, "lpr: Unable to access \"%s\" - %s\n", argv[i],
-	        strerror(errno));
+        _cupsLangPrintf(stderr,
+	                _("%s: Error - unable to access \"%s\" - %s\n"),
+		        argv[0], argv[i], strerror(errno));
        return (1);
      }

@@ -297,17 +313,16 @@ main(int  argc,		/* I - Number of command-line arguments */
      }
    }
    else
-      fprintf(stderr, "lpr: Too many files - \"%s\"\n", argv[i]);
+      _cupsLangPrintf(stderr,
+                      _("%s: Error - too many files - \"%s\"\n"),
+		      argv[0], argv[i]);
 /*
  * See if we have any files to print; if not, print from stdin...
  */

  if (printer == NULL)
  {
-    if (num_dests == 0)
-      num_dests = cupsGetDests(&dests);
-
-    if ((dest = cupsGetDest(NULL, NULL, num_dests, dests)) != NULL)
+    if ((dest = cupsGetNamedDest(NULL, NULL, NULL)) != NULL)
    {
      printer = dest->name;

@@ -321,10 +336,34 @@ main(int  argc,		/* I - Number of command-line arguments */

  if (printer == NULL)
  {
-    if (cupsLastError() >= IPP_BAD_REQUEST)
-      fputs("lpr: error - scheduler not responding!\n", stderr);
+    val = NULL;
+
+    if ((printer = getenv("LPDEST")) == NULL)
+    {
+      if ((printer = getenv("PRINTER")) != NULL)
+      {
+        if (!strcmp(printer, "lp"))
+          printer = NULL;
+	else
+	  val = "PRINTER";
+      }
+    }
    else
-      fputs("lpr: error - no default destination available.\n", stderr);
+      val = "LPDEST";
+
+    if (printer && !cupsGetNamedDest(NULL, printer, NULL))
+      _cupsLangPrintf(stderr,
+                      _("%s: Error - %s environment variable names "
+		        "non-existent destination \"%s\"!\n"),
+        	      argv[0], val, printer);
+    else if (cupsLastError() == IPP_NOT_FOUND)
+      _cupsLangPrintf(stderr,
+                      _("%s: Error - no default destination available.\n"),
+		      argv[0]);
+    else
+      _cupsLangPrintf(stderr,
+                      _("%s: Error - scheduler not responding!\n"),
+		      argv[0]);

    return (1);
  }
@@ -333,7 +372,7 @@ main(int  argc,		/* I - Number of command-line arguments */
  {
    job_id = cupsPrintFiles(printer, num_files, files, title, num_options, options);

-    if (deletefile)
+    if (deletefile && job_id > 0)
    {
     /*
      * Delete print files after printing...
@@ -343,63 +382,43 @@ main(int  argc,		/* I - Number of command-line arguments */
        unlink(files[i]);
    }
  }
-  else
+  else if ((job_id = cupsCreateJob(CUPS_HTTP_DEFAULT, printer,
+                                   title ? title : "(stdin)",
+                                   num_options, options)) > 0)
  {
-    num_files = 1;
+    http_status_t	status;		/* Write status */
+    const char		*format;	/* Document format */
+    ssize_t		bytes;		/* Bytes read */

-#ifndef WIN32
-#  if defined(HAVE_SIGSET)
-    sigset(SIGHUP, sighandler);
-    if (sigset(SIGINT, sighandler) == SIG_IGN)
-      sigset(SIGINT, SIG_IGN);
-    sigset(SIGTERM, sighandler);
-#  elif defined(HAVE_SIGACTION)
-    memset(&action, 0, sizeof(action));
-    action.sa_handler = sighandler;

-    sigaction(SIGHUP, &action, NULL);
-    sigaction(SIGINT, NULL, &oldaction);
-    if (oldaction.sa_handler != SIG_IGN)
-      sigaction(SIGINT, &action, NULL);
-    sigaction(SIGTERM, &action, NULL);
-#  else
-    signal(SIGHUP, sighandler);
-    if (signal(SIGINT, sighandler) == SIG_IGN)
-      signal(SIGINT, SIG_IGN);
-    signal(SIGTERM, sighandler);
-#  endif
-#endif /* !WIN32 */
+    if (cupsGetOption("raw", num_options, options))
+      format = CUPS_FORMAT_RAW;
+    else if ((format = cupsGetOption("document-format", num_options,
+                                     options)) == NULL)
+      format = CUPS_FORMAT_AUTO;

-    if ((temp = cupsTempFd(tempfile, sizeof(tempfile))) < 0)
+    status = cupsStartDocument(CUPS_HTTP_DEFAULT, printer, job_id, NULL,
+                               format, 1);
+
+    while (status == HTTP_CONTINUE &&
+           (bytes = read(0, buffer, sizeof(buffer))) > 0)
+      status = cupsWriteRequestData(CUPS_HTTP_DEFAULT, buffer, bytes);
+
+    if (status != HTTP_CONTINUE)
    {
-      fputs("lpr: unable to create temporary file.\n", stderr);
+      _cupsLangPrintf(stderr,
+		      _("%s: Error - unable to queue from stdin - %s\n"),
+		      argv[0], httpStatus(status));
      return (1);
    }

-    while ((i = read(0, buffer, sizeof(buffer))) > 0)
-      write(temp, buffer, i);
-
-    i = lseek(temp, 0, SEEK_CUR);
-    close(temp);
-
-    if (i == 0)
-    {
-      fputs("lpr: stdin is empty, so no job has been sent.\n", stderr);
-      return (1);
-    }
-
-    if (title)
-      job_id = cupsPrintFile(printer, tempfile, title, num_options, options);
-    else
-      job_id = cupsPrintFile(printer, tempfile, "(stdin)", num_options, options);
-
-    unlink(tempfile);
+    if (cupsFinishDocument(CUPS_HTTP_DEFAULT, printer) != IPP_OK)
+      job_id = 0;
  }

  if (job_id < 1)
  {
-    fprintf(stderr, "lpr: unable to print file: %s\n",
-	    ippErrorString(cupsLastError()));
+    _cupsLangPrintf(stderr, "%s: %s\n", argv[0], cupsLastErrorString());
    return (1);
  }

@@ -407,29 +426,6 @@ main(int  argc,		/* I - Number of command-line arguments */
 }


-#ifndef WIN32
-/*
- * 'sighandler()' - Signal catcher for when we print from stdin...
- */
-
-void
-sighandler(int s)	/* I - Signal number */
-{
- /*
-  * Remove the temporary file we're using to print from stdin...
-  */
-
-  unlink(tempfile);
-
- /*
-  * Exit...
-  */
-
-  exit(s);
-}
-#endif /* !WIN32 */
-
-
 /*
 * End of "$Id$".
 */
@@ -3,23 +3,14 @@
 *
 *   "lprm" command for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   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/".
 *
 * Contents:
 *
@@ -34,7 +25,7 @@
 #include <stdlib.h>

 #include <cups/cups.h>
-#include <cups/language.h>
+#include <cups/i18n.h>
 #include <cups/string.h>


@@ -46,48 +37,24 @@ int				/* O - Exit status */
 main(int  argc,			/* I - Number of command-line arguments */
     char *argv[])		/* I - Command-line arguments */
 {
-  http_t	*http;		/* HTTP connection to server */
  int		i;		/* Looping var */
  int		job_id;		/* Job ID */
-  const char	*dest;		/* Destination printer */
+  const char	*name;		/* Destination printer */
  char		*instance;	/* Pointer to instance name */
-  char		uri[1024];	/* Printer or job URI */
-  ipp_t		*request;	/* IPP request */
-  ipp_t		*response;	/* IPP response */
-  ipp_op_t	op;		/* Operation */
-  cups_lang_t	*language;	/* Language */
-  int		num_dests;	/* Number of destinations */
-  cups_dest_t	*dests;		/* Destinations */
-  http_encryption_t encryption;	/* Encryption? */
+  cups_dest_t	*dest,		/* Destination */
+		*defdest;	/* Default destination */
+  int		did_cancel;	/* Did we cancel something? */


+  _cupsSetLocale(argv);
+
 /*
  * Setup to cancel individual print jobs...
  */

-  op         = IPP_CANCEL_JOB;
-  job_id     = 0;
-  dest       = NULL;
-  response   = NULL;
-  http       = NULL;
-  encryption = cupsEncryption();
-
-  num_dests = cupsGetDests(&dests);
-
-  for (i = 0; i < num_dests; i ++)
-    if (dests[i].is_default)
-      dest = dests[i].name;
-
- /*
-  * Open a connection to the server...
-  */
-
-  if ((http = httpConnectEncrypt(cupsServer(), ippPort(), encryption)) == NULL)
-  {
-    fputs("lprm: Unable to contact server!\n", stderr);
-    cupsFreeDests(num_dests, dests);
-    return (1);
-  }
+  did_cancel = 0;
+  defdest    = cupsGetNamedDest(CUPS_HTTP_DEFAULT, NULL, NULL);
+  name       = defdest ? defdest->name : NULL;

 /*
  * Process command-line arguments...
@@ -99,41 +66,88 @@ main(int  argc,			/* I - Number of command-line arguments */
      {
        case 'E' : /* Encrypt */
 #ifdef HAVE_SSL
-	    encryption = HTTP_ENCRYPT_REQUIRED;
-
-	    httpEncryption(http, encryption);
+	    cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);
 #else
-            fprintf(stderr, "%s: Sorry, no encryption support compiled in!\n",
-	            argv[0]);
+            _cupsLangPrintf(stderr,
+	                    _("%s: Sorry, no encryption support compiled in!\n"),
+	                    argv[0]);
 #endif /* HAVE_SSL */
 	    break;

        case 'P' : /* Cancel jobs on a printer */
 	    if (argv[i][2])
-	      dest = argv[i] + 2;
+	      name = argv[i] + 2;
 	    else
 	    {
 	      i ++;
-	      dest = argv[i];
+	      name = argv[i];
 	    }

-	    if ((instance = strchr(dest, '/')) != NULL)
+	    if ((instance = strchr(name, '/')) != NULL)
 	      *instance = '\0';

-	    if (cupsGetDest(dest, NULL, num_dests, dests) == NULL)
+	    if ((dest = cupsGetNamedDest(CUPS_HTTP_DEFAULT, name,
+	                                 NULL)) == NULL)
 	    {
-	      fprintf(stderr, "lprm: Unknown destination \"%s\"!\n", dest);
-              cupsFreeDests(num_dests, dests);
-	      httpClose(http);
-	      return(1);
+	      _cupsLangPrintf(stderr,
+	                      _("%s: Error - unknown destination \"%s\"!\n"),
+			      argv[0], name);
+              goto error;
 	    }
+
+	    cupsFreeDests(1, dest);
+	    break;
+
+        case 'U' : /* Username */
+	    if (argv[i][2] != '\0')
+	      cupsSetUser(argv[i] + 2);
+	    else
+	    {
+	      i ++;
+	      if (i >= argc)
+	      {
+	        _cupsLangPrintf(stderr,
+		                _("%s: Error - expected username after "
+				  "\'-U\' option!\n"),
+		        	argv[0]);
+	        goto error;
+	      }
+
+              cupsSetUser(argv[i]);
+	    }
+	    break;
+	    
+        case 'h' : /* Connect to host */
+	    if (argv[i][2] != '\0')
+              cupsSetServer(argv[i] + 2);
+	    else
+	    {
+	      i ++;
+
+	      if (i >= argc)
+	      {
+	        _cupsLangPrintf(stderr,
+		        	_("%s: Error - expected hostname after "
+			          "\'-h\' option!\n"),
+				argv[0]);
+		goto error;
+              }
+	      else
+                cupsSetServer(argv[i]);
+	    }
+
+            if (defdest)
+	      cupsFreeDests(1, defdest);
+
+	    defdest = cupsGetNamedDest(CUPS_HTTP_DEFAULT, NULL, NULL);
+	    name    = defdest ? defdest->name : NULL;
 	    break;

 	default :
-	    fprintf(stderr, "lprm: Unknown option \'%c\'!\n", argv[i][1]);
-            cupsFreeDests(num_dests, dests);
-	    httpClose(http);
-	    return (1);
+	    _cupsLangPrintf(stderr,
+	                    _("%s: Error - unknown option \'%c\'!\n"),
+			    argv[0], argv[i][1]);
+            goto error;
      }
    else
    {
@@ -141,132 +155,70 @@ main(int  argc,			/* I - Number of command-line arguments */
      * Cancel a job or printer...
      */

-      if (isdigit(argv[i][0]) && cupsGetDest(argv[i], NULL, num_dests, dests) == NULL)
+      if ((dest = cupsGetNamedDest(CUPS_HTTP_DEFAULT, argv[i], NULL)) != NULL)
+        cupsFreeDests(1, dest);
+
+      if (dest)
      {
-        dest   = NULL;
-	op     = IPP_CANCEL_JOB;
+        name   = argv[i];
+        job_id = 0;
+      }
+      else if (isdigit(argv[i][0] & 255))
+      {
+        name   = NULL;
        job_id = atoi(argv[i]);
      }
-      else if (strcmp(argv[i], "-") == 0)
+      else if (!strcmp(argv[i], "-"))
      {
       /*
        * Cancel all jobs
        */

-        op = IPP_PURGE_JOBS;
+        job_id = -1;
      }
      else
      {
-        dest   = argv[i];
-        job_id = 0;
+	_cupsLangPrintf(stderr,
+			_("%s: Error - unknown destination \"%s\"!\n"),
+			argv[0], argv[i]);
+	goto error;
      }

-     /*
-      * Build an IPP request, which requires the following
-      * attributes:
-      *
-      *    attributes-charset
-      *    attributes-natural-language
-      *    printer-uri + job-id *or* job-uri
-      *    [requesting-user-name]
-      */
-
-      request = ippNew();
-
-      request->request.op.operation_id = op;
-      request->request.op.request_id   = 1;
-
-      language = cupsLangDefault();
-
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-              	   "attributes-charset", NULL, cupsLangEncoding(language));
-
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-                   "attributes-natural-language", NULL, language->language);
-
-      if (dest)
+      if (cupsCancelJob2(CUPS_HTTP_DEFAULT, name, job_id, 0) != IPP_OK)
      {
-        snprintf(uri, sizeof(uri), "ipp://localhost/printers/%s", dest);
-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
-	             "printer-uri", NULL, uri);
-	ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "job-id",
-	              job_id);
-      }
-      else
-      {
-        sprintf(uri, "ipp://localhost/jobs/%d", job_id);
-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri", NULL,
-	             uri);
+        _cupsLangPrintf(stderr, "%s: %s\n", argv[0], cupsLastErrorString());
+	goto error;
      }

-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-                   "requesting-user-name", NULL, cupsUser());
-
-     /*
-      * Do the request and get back a response...
-      */
-
-      if (op == IPP_PURGE_JOBS)
-        response = cupsDoRequest(http, request, "/admin/");
-      else
-        response = cupsDoRequest(http, request, "/jobs/");
-
-      if (response != NULL)
-      {
-        switch (response->request.status.status_code)
-	{
-	  case IPP_NOT_FOUND :
-              fputs("lprm: Job or printer not found!\n", stderr);
-	      break;
-	  case IPP_NOT_AUTHORIZED :
-              fputs("lprm: Not authorized to lprm job(s)!\n", stderr);
-	      break;
-	  case IPP_FORBIDDEN :
-              fprintf(stderr, "lprm: You don't own job ID %d!\n", job_id);
-	      break;
-	  default :
-              if (response->request.status.status_code > IPP_OK_CONFLICT)
-                fputs("lprm: Unable to lprm job(s)!\n", stderr);
-	      break;
-	}
-
-        if (response->request.status.status_code > IPP_OK_CONFLICT)
-	{
-          ippDelete(response);
-          cupsFreeDests(num_dests, dests);
-          httpClose(http);
-	  return (1);
-	}
-
-        ippDelete(response);
-      }
-      else
-      {
-        fputs("lprm: Unable to cancel job(s)!\n", stderr);
-        cupsFreeDests(num_dests, dests);
-        httpClose(http);
-	return (1);
-      }
+      did_cancel = 1;
    }

 /*
-  * If nothing has been cancelled yet, cancel the current job on the specified
+  * If nothing has been canceled yet, cancel the current job on the specified
  * (or default) printer...
  */

-  if (response == NULL)
-    if (!cupsCancelJob(dest, 0))
+  if (!did_cancel && cupsCancelJob2(CUPS_HTTP_DEFAULT, name, 0, 0) != IPP_OK)
    {
-      fputs("lprm: Unable to cancel job(s)!\n", stderr);
-      cupsFreeDests(num_dests, dests);
-      httpClose(http);
-      return (1);
+      _cupsLangPrintf(stderr, "%s: %s\n", argv[0], cupsLastErrorString());
+      goto error;
    }

-  cupsFreeDests(num_dests, dests);
-  httpClose(http);
+  if (defdest)
+    cupsFreeDests(1, defdest);

  return (0);
+
+ /*
+  * If we get here there was an error, so clean up...
+  */
+
+  error:
+
+  if (defdest)
+    cupsFreeDests(1, defdest);
+
+  return (1);
 }


@@ -1,5 +0,0 @@
-admin.cgi
-classes.cgi
-jobs.cgi
-libcgi.a
-printers.cgi
@@ -1,20 +1,64 @@
 # DO NOT DELETE

-html.o: cgi.h ../cups/string.h ../config.h
-ipp-var.o: ipp-var.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-ipp-var.o: ../cups/md5.h ../cups/ppd.h ../cups/debug.h ../cups/language.h
-ipp-var.o: ../cups/string.h ../config.h cgi.h
-template.o: cgi.h ../cups/string.h ../config.h
-var.o: cgi.h ../cups/string.h ../config.h
-admin.o: ipp-var.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-admin.o: ../cups/ppd.h ../cups/debug.h ../cups/language.h ../cups/string.h
-admin.o: ../config.h cgi.h
-classes.o: ipp-var.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-classes.o: ../cups/md5.h ../cups/ppd.h ../cups/debug.h ../cups/language.h
-classes.o: ../cups/string.h ../config.h cgi.h
-jobs.o: ipp-var.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-jobs.o: ../cups/ppd.h ../cups/debug.h ../cups/language.h ../cups/string.h
-jobs.o: ../config.h cgi.h
-printers.o: ipp-var.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-printers.o: ../cups/md5.h ../cups/ppd.h ../cups/debug.h ../cups/language.h
-printers.o: ../cups/string.h ../config.h cgi.h
+help-index.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+help-index.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+help-index.o: ../cups/file.h ../cups/language.h ../cups/array.h help-index.h
+help-index.o: ../cups/debug.h ../cups/i18n.h ../cups/transcode.h
+help-index.o: ../cups/string.h ../config.h ../cups/dir.h
+html.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+html.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+html.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+html.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+ipp-var.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+ipp-var.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+ipp-var.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+ipp-var.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+search.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+search.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+search.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+search.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+template.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+template.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+template.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+template.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+var.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+var.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+var.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+var.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+admin.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+admin.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+admin.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+admin.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+admin.o: ../cups/adminutil.h ../cups/cups.h ../cups/file.h
+classes.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+classes.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+classes.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+classes.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+help.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+help.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+help.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+help.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+jobs.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+jobs.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+jobs.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+jobs.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+makedocset.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+makedocset.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+makedocset.o: ../cups/file.h ../cups/language.h ../cups/array.h help-index.h
+printers.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+printers.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+printers.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+printers.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+testcgi.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+testcgi.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+testcgi.o: ../cups/language.h ../cups/array.h help-index.h
+testhi.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+testhi.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+testhi.o: ../cups/language.h ../cups/array.h help-index.h
+testtemplate.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+testtemplate.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+testtemplate.o: ../cups/file.h ../cups/language.h ../cups/array.h
+testtemplate.o: help-index.h
+websearch.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+websearch.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+websearch.o: ../cups/file.h ../cups/language.h ../cups/array.h help-index.h
@@ -1,33 +1,58 @@
 #
 # "$Id$"
 #
-#   CGI makefile for the Common UNIX Printing System (CUPS).
+#   CGI makefile for CUPS.
 #
-#   Copyright 1997-2003 by Easy Software Products.
+#   Copyright 2007-2010 by Apple Inc.
+#   Copyright 1997-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
-#
-#       Voice: (301) 373-9603
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   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/".
 #

 include ../Makedefs

-CGIS	=	admin.cgi classes.cgi jobs.cgi printers.cgi
-TARGETS	=	libcgi.a $(CGIS)
-LIBOBJS	=	html.o ipp-var.o template.o var.o
-OBJS	=	$(LIBOBJS) admin.o classes.o jobs.o printers.o
+LIBOBJS	=	\
+		help-index.o \
+		html.o \
+		ipp-var.o \
+		search.o \
+		template.o \
+		var.o
+OBJS	=	\
+		$(LIBOBJS) \
+		admin.o \
+		classes.o \
+		help.o \
+		jobs.o \
+		makedocset.o \
+		printers.o \
+		testcgi.o \
+		testhi.o \
+		testtemplate.o \
+		websearch.o
+CGIS	=	\
+		admin.cgi \
+		classes.cgi \
+		help.cgi \
+		jobs.cgi \
+		printers.cgi
+LIBTARGETS =	\
+		libcupscgi.a \
+		$(LIBCUPSCGI) \
+		websearch
+
+UNITTARGETS =	\
+		testcgi \
+		testhi \
+		testtemplate
+
+TARGETS	=	\
+		$(LIBTARGETS) \
+		$(CGIS)


 #
@@ -37,12 +62,27 @@ OBJS	=	$(LIBOBJS) admin.o classes.o jobs.o printers.o
 all:	$(TARGETS)


+#
+# Make library targets...
+#
+
+libs:		$(LIBTARGETS) $(UNITTESTS)
+
+
+#
+# Make unit tests...
+#
+
+unittests:	$(UNITTARGETS)
+
+
 #
 # Clean all object files...
 #

 clean:
-	$(RM) $(OBJS) $(TARGETS)
+	$(RM) $(OBJS) $(TARGETS) $(UNITTARGETS) makedocset
+	$(RM) libcupscgi.so libcupscgi.sl libcupscgi.dylib


 #
@@ -57,18 +97,170 @@ depend:
 # Install all targets...
 #

-install:	all
-	$(INSTALL_DIR) $(SERVERBIN)/cgi-bin
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
+
+
+#
+# Install programs...
+#
+
+install-exec:
+	$(INSTALL_DIR) -m 755 $(SERVERBIN)/cgi-bin
 	for file in $(CGIS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/cgi-bin; \
 	done
+	if test "x$(SYMROOT)" != "x"; then \
+		$(INSTALL_DIR) $(SYMROOT); \
+		for file in $(CGIS); do \
+			cp $$file $(SYMROOT); \
+		done \
+	fi


 #
-# libcgi.a
+# Install headers...
 #

-libcgi.a:	$(LIBOBJS)
+install-headers:
+	echo Installing header files in $(INCLUDEDIR)/cups...
+	$(INSTALL_DIR) -m 755 $(INCLUDEDIR)/cups
+	$(INSTALL_DATA) cgi.h $(INCLUDEDIR)/cups
+	$(INSTALL_DATA) help-index.h $(INCLUDEDIR)/cups
+
+
+#
+# Install libraries...
+#
+
+install-libs: $(INSTALLSTATIC)
+	echo Installing libraries in $(LIBDIR)...
+	$(INSTALL_DIR) -m 755 $(LIBDIR)
+	$(INSTALL_LIB) $(LIBCUPSCGI) $(LIBDIR)
+	if test $(LIBCUPSCGI) = "libcupscgi.so.1" -o $(LIBCUPSCGI) = "libcupscgi.sl.1"; then \
+		$(RM) $(LIBDIR)/`basename $(LIBCUPSCGI) .1`; \
+		$(LN) $(LIBCUPSCGI) $(LIBDIR)/`basename $(LIBCUPSCGI) .1`; \
+	fi
+	if test $(LIBCUPSCGI) = "libcupscgi.1.dylib"; then \
+		$(RM) $(LIBDIR)/libcupscgi.dylib; \
+		$(LN) $(LIBCUPSCGI) $(LIBDIR)/libcupscgi.dylib; \
+	fi
+	if test "x$(SYMROOT)" != "x"; then \
+		$(INSTALL_DIR) $(SYMROOT); \
+		cp $(LIBCUPSCGI) $(SYMROOT); \
+	fi
+
+installstatic:
+	$(INSTALL_DIR) -m 755 $(LIBDIR)
+	$(INSTALL_LIB) -m 755 libcupscgi.a $(LIBDIR)
+	$(RANLIB) $(LIBDIR)/libcupscgi.a
+	$(CHMOD) 555 $(LIBDIR)/libcupscgi.a
+
+
+#
+# Uninstall all targets...
+#
+
+uninstall:
+	for file in $(CGIS); do \
+		$(RM) $(SERVERBIN)/cgi-bin/$$file; \
+	done
+	-$(RMDIR) $(SERVERBIN)/cgi-bin
+	$(RM) $(LIBDIR)/libcupscgi.1.dylib
+	$(RM) $(LIBDIR)/libcupscgi.a
+	$(RM) $(LIBDIR)/libcupscgi.dylib
+	$(RM) $(LIBDIR)/libcupscgi_s.a
+	$(RM) $(LIBDIR)/libcupscgi.sl
+	$(RM) $(LIBDIR)/libcupscgi.sl.1
+	$(RM) $(LIBDIR)/libcupscgi.so
+	$(RM) $(LIBDIR)/libcupscgi.so.1
+	-$(RMDIR) $(LIBDIR)
+	$(RM) $(INCLUDEDIR)/cups/cgi.h
+	$(RM) $(INCLUDEDIR)/cups/help-index.h
+	-$(RMDIR) $(INCLUDEDIR)/cups
+
+
+#
+# Automatic API help files...
+#
+
+apihelp:
+	mxmldoc --section "Programming" \
+		--title "CGI API" \
+		--css ../doc/cups-printable.css \
+		--header api-cgi.header --intro api-cgi.shtml \
+		cgi.h help-index.h $(LIBOBJS:.o=.c) >../doc/help/api-cgi.html
+	mxmldoc --tokens help/api-cgi.html api-cgi.xml >../doc/help/api-cgi.tokens
+	$(RM) api-cgi.xml
+
+framedhelp:
+	mxmldoc --framed api-cgi \
+		--section "Programming" \
+		--title "CGI API" \
+		--css ../doc/cups-printable.css \
+		--header api-cgi.header --intro api-cgi.shtml \
+		cgi.h help-index.h $(LIBOBJS:.o=.c)
+
+
+#
+# libcupscgi.so.1, libcupscgi.sl.1
+#
+
+libcupscgi.so.1 libcupscgi.sl.1:	$(LIBOBJS)
+	echo Linking $@...
+	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBS)
+	$(RM) `basename $@ .1`
+	$(LN) $@ `basename $@ .1`
+
+
+#
+# libcupscgi.1.dylib
+#
+
+libcupscgi.1.dylib:	$(LIBOBJS) libcupscgi.exp
+	echo Linking $@...
+	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
+		-install_name $(libdir)/$@ \
+		-current_version 1.0.0 \
+		-compatibility_version 1.0.0 \
+		-exported_symbols_list libcupscgi.exp \
+		$(LIBOBJS) $(LIBS)
+	$(RM) libcupscgi.dylib
+	$(LN) $@ libcupscgi.dylib
+
+
+#
+# libcupscgi_s.a
+#
+
+libcupscgi_s.a:	$(LIBOBJS)
+	echo Creating $@...
+	$(DSO) $(DSOFLAGS) -o libcupscgi_s.o $(LIBOBJS) $(LIBS)
+	$(RM) $@
+	$(AR) $(ARFLAGS) $@ libcupscgi_s.o
+
+
+#
+# libcupscgi.la
+#
+
+libcupscgi.la:    $(LIBOBJS)
+	echo Linking $@...
+	$(CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
+		-version-info 1:0 $(LIBS)
+
+
+#
+# libcupscgi.a
+#
+
+libcupscgi.a:	$(LIBOBJS)
 	echo Archiving $@...
 	$(RM) $@
 	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
@@ -79,36 +271,103 @@ libcgi.a:	$(LIBOBJS)
 # admin.cgi
 #

-admin.cgi:	admin.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
+admin.cgi:	admin.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ admin.o libcgi.a $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ admin.o -lcupscgi $(LIBS)


 #
 # classes.cgi
 #

-classes.cgi:	classes.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
+classes.cgi:	classes.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ classes.o libcgi.a $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ classes.o -lcupscgi $(LIBS)
+
+
+#
+# help.cgi
+#
+
+help.cgi:	help.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
+	echo Linking $@...
+	$(CC) $(LDFLAGS) -o $@ help.o -lcupscgi $(LIBS)


 #
 # jobs.cgi
 #

-jobs.cgi:	jobs.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
+jobs.cgi:	jobs.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ jobs.o libcgi.a $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ jobs.o -lcupscgi $(LIBS)
+
+
+#
+# makedocset
+#
+
+makedocset:	makedocset.o ../Makedefs libcupscgi.a ../cups/libcups.a
+	echo Linking $@...
+	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ makedocset.o libcupscgi.a \
+		../cups/libcups.a $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
+		$(LIBZ) $(LIBGSSAPI)


 #
 # printers.cgi
 #

-printers.cgi:	printers.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
+printers.cgi:	printers.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ printers.o libcgi.a $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ printers.o -L. -lcupscgi $(LIBS)
+
+
+#
+# testcgi
+#
+
+testcgi:	testcgi.o ../Makedefs libcupscgi.a ../cups/libcups.a
+	echo Linking $@...
+	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testcgi.o libcupscgi.a \
+		../cups/libcups.a $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
+		$(LIBZ) $(LIBGSSAPI)
+	echo Testing CGI API...
+	./testcgi
+
+
+#
+# testhi
+#
+
+testhi:	testhi.o ../Makedefs libcupscgi.a ../cups/libcups.a
+	echo Linking $@...
+	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhi.o libcupscgi.a \
+		../cups/libcups.a $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
+		$(LIBZ) $(LIBGSSAPI)
+	echo Testing help index API...
+	./testhi
+
+
+#
+# testtemplate
+#
+
+testtemplate:	testtemplate.o ../Makedefs libcupscgi.a ../cups/libcups.a
+	echo Linking $@...
+	$(CC) $(LDFLAGS) -o $@ testtemplate.o libcupscgi.a ../cups/libcups.a \
+		$(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) $(LIBZ) $(LIBGSSAPI)
+
+
+#
+# websearch
+#
+
+websearch:	websearch.o ../Makedefs libcupscgi.a ../cups/libcups.a
+	echo Linking $@...
+	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ websearch.o libcupscgi.a \
+		../cups/libcups.a $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
+		$(LIBZ) $(LIBGSSAPI)


 #
@@ -0,0 +1,34 @@
+<!--
+  "$Id: api-array.header 8087 2008-10-27 21:37:05Z mike $"
+
+  CGI API header for CUPS.
+
+  Copyright 2009 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/".
+-->
+
+<h1 class='title'>CGI API</h1>
+
+<div class='summary'><table summary='General Information'>
+<thead>
+<tr>
+	<th>Header</th>
+	<th>cups/cgi.h</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+	<th>Library</th>
+	<td>-lcupscgi</td>
+</tr>
+<tr>
+	<th>See Also</th>
+	<td>Programming: <a href='api-overview.html' target='_top'>Introduction to CUPS Programming</a></td>
+</tr>
+</tbody>
+</table></div>
@@ -0,0 +1,17 @@
+<!--
+  "$Id: api-array.shtml 7616 2008-05-28 00:34:13Z mike $"
+
+  CGI API introduction for CUPS.
+
+  Copyright 2009 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/".
+-->
+
+<h2 class='title'><a name='OVERVIEW'>Overview</a></h2>
+
+<p>The CGI API provides Common Gateway Interface functions for CUPS.</p>
@@ -0,0 +1,35 @@
+/*
+ * "$Id$"
+ *
+ *   Private CGI definitions for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 1997-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/".
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "cgi.h"
+#include <cups/debug.h>
+#include <cups/i18n.h>
+#include <cups/string.h>
+
+
+/*
+ * Limits...
+ */
+
+#define CUPS_PAGE_MAX	100		/* Maximum items per page */
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,85 +1,118 @@
 /*
 * "$Id$"
 *
- *   CGI support library definitions.
+ *   CGI support library definitions for CUPS.
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 1997-2006 by Easy Software Products.
 *
- *   This program is free software; you can redistribute it and/or modify it
- *   under the terms of the GNU General Public License as published by the Free
- *   Software Foundation; either version 2 of the License, or (at your option)
- *   any later version.
- *
- *   This program is distributed in the hope that it will be useful, but
- *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *   for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   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/".
 */

-#ifndef _CGI_H_
-#  define _CGI_H_
+#ifndef _CUPS_CGI_H_
+#  define _CUPS_CGI_H_

 #  include <stdio.h>
 #  include <stdlib.h>
 #  include <time.h>
-
-#  include <cups/string.h>
+#  include <sys/stat.h>

 #  ifdef WIN32
 #    include <direct.h>
 #    include <io.h>
-#    include <malloc.h>
 #  else
 #    include <unistd.h>
 #  endif /* WIN32 */

+#  include <cups/cups.h>
+#  include <cups/array.h>
+#  include "help-index.h"
+
+
+/*
+ * C++ magic...
+ */
+
+#  ifdef __cplusplus
+extern "C" {
+#  endif /* __cplusplus */
+
+/*
+ * Types...
+ */
+
+typedef struct cgi_file_s		/**** Uploaded file data ****/
+{
+  char		tempfile[1024],		/* Temporary file containing data */
+		*name,			/* Variable name */
+		*filename,		/* Original filename */
+		*mimetype;		/* MIME media type */
+  size_t	filesize;		/* Size of uploaded file */
+} cgi_file_t;
+

 /*
 * Prototypes...
 */

-extern int		cgiInitialize(void);
 extern void		cgiAbort(const char *title, const char *stylesheet,
 			         const char *format, ...);
 extern int		cgiCheckVariables(const char *names);
+extern void		cgiClearVariables(void);
+extern void		*cgiCompileSearch(const char *query);
+extern void		cgiCopyTemplateFile(FILE *out, const char *tmpl);
+extern void		cgiCopyTemplateLang(const char *tmpl);
+extern int		cgiDoSearch(void *search, const char *text);
+extern void		cgiEndHTML(void);
+extern void		cgiEndMultipart(void);
+extern char		*cgiFormEncode(char *dst, const char *src,
+			               size_t dstsize);
+extern void		cgiFreeSearch(void *search);
 extern const char	*cgiGetArray(const char *name, int element);
+extern void		cgiGetAttributes(ipp_t *request, const char *tmpl);
+extern const char	*cgiGetCookie(const char *name);
+extern const cgi_file_t	*cgiGetFile(void);
+extern cups_array_t	*cgiGetIPPObjects(ipp_t *response, void *search);
 extern int		cgiGetSize(const char *name);
-extern void		cgiSetSize(const char *name, int size);
+extern char		*cgiGetTemplateDir(void);
 extern const char	*cgiGetVariable(const char *name);
+extern int		cgiInitialize(void);
+extern int		cgiIsPOST(void);
+extern void		cgiMoveJobs(http_t *http, const char *dest, int job_id);
+extern void		cgiPrintCommand(http_t *http, const char *dest,
+			                const char *command, const char *title);
+extern void		cgiPrintTestPage(http_t *http, const char *dest);
+extern char		*cgiRewriteURL(const char *uri, char *url, int urlsize,
+			               const char *newresource);
 extern void		cgiSetArray(const char *name, int element,
 			            const char *value);
-extern void		cgiSetVariable(const char *name, const char *value);
-extern void		cgiCopyTemplateFile(FILE *out, const char *tmpl);
-extern void		cgiCopyTemplateLang(FILE *out, const char *directory,
-			                    const char *tmpl, const char *lang);
-
-extern void		cgiStartHTML(FILE *out, const char *author,
-			             const char *stylesheet,
-			             const char *keywords,
-			             const char *description,
-				     const char *title, ...);
-extern void		cgiEndHTML(FILE *out);
-
-extern FILE		*cgiEMailOpen(const char *from, const char *to,
-			              const char *cc, const char *subject,
-				      int multipart);
-extern void		cgiEMailPart(FILE *mail, const char *type,
-			             const char *charset, const char *encoding);
-extern void		cgiEMailClose(FILE *mail);
-
-extern char		*cgiGetCookie(const char *name, char *buf, int buflen);
 extern void		cgiSetCookie(const char *name, const char *value,
 			             const char *path, const char *domain,
 				     time_t expires, int secure);
+extern ipp_attribute_t	*cgiSetIPPObjectVars(ipp_attribute_t *obj,
+			                     const char *prefix, int element);
+extern int		cgiSetIPPVars(ipp_t *response, const char *filter_name,
+			              const char *filter_value,
+			              const char *prefix, int parent_el);
+extern void		cgiSetServerVersion(void);
+extern void		cgiSetSize(const char *name, int size);
+extern void		cgiSetVariable(const char *name, const char *value);
+extern void		cgiShowIPPError(const char *message);
+extern void		cgiShowJobs(http_t *http, const char *dest);
+extern void		cgiStartHTML(const char *title);
+extern void		cgiStartMultipart(void);
+extern int		cgiSupportsMultipart(void);
+extern const char	*cgiText(const char *message);

-#  define cgiGetUser()	getenv("REMOTE_USER")
-#  define cgiGetHost()	(getenv("REMOTE_HOST") == NULL ? getenv("REMOTE_ADDR") : getenv("REMOTE_HOST"))
+#  ifdef __cplusplus
+}
+#  endif /* __cplusplus */

-#endif /* !_CGI_H_ */
+#endif /* !_CUPS_CGI_H_ */

 /*
 * End of "$Id$".
@@ -1,36 +1,40 @@
 /*
 * "$Id$"
 *
- *   Class status CGI for the Common UNIX Printing System (CUPS).
+ *   Class status CGI for CUPS.
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   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/".
 *
 * Contents:
 *
- *   main() - Main entry for CGI.
+ *   main()             - Main entry for CGI.
+ *   do_class_op()      - Do a class operation.
+ *   show_all_classes() - Show all classes...
+ *   show_class()       - Show a single class.
 */

 /*
 * Include necessary headers...
 */

-#include "ipp-var.h"
+#include "cgi-private.h"
+
+
+/*
+ * Local functions...
+ */
+
+static void	do_class_op(http_t *http, const char *printer, ipp_op_t op,
+		            const char *title);
+static void	show_all_classes(http_t *http, const char *username);
+static void	show_class(http_t *http, const char *printer);


 /*
@@ -41,17 +45,14 @@ int					/* O - Exit status */
 main(int  argc,				/* I - Number of command-line arguments */
     char *argv[])			/* I - Command-line arguments */
 {
-  cups_lang_t	*language;		/* Language information */
-  char		*pclass;		/* Printer class name */
+  const char	*pclass;		/* Class name */
+  const char	*user;			/* Username */
  http_t	*http;			/* Connection to the server */
  ipp_t		*request,		/* IPP request */
 		*response;		/* IPP response */
  ipp_attribute_t *attr;		/* IPP attribute */
-  ipp_status_t	status;			/* Operation status... */
-  char		uri[HTTP_MAX_URI];	/* Printer URI */
-  const char	*which_jobs;		/* Which jobs to show */
  const char	*op;			/* Operation to perform, if any */
-  static const char	*def_attrs[] =	/* Attributes for default printer */
+  static const char *def_attrs[] =	/* Attributes for default printer */
 		{
 		  "printer-name",
 		  "printer-uri-supported"
@@ -63,59 +64,54 @@ main(int  argc,				/* I - Number of command-line arguments */
  */

  cgiInitialize();
+
  op = cgiGetVariable("OP");

 /*
-  * Get the request language...
+  * Set the web interface section...
  */

-  language = cupsLangDefault();
+  cgiSetVariable("SECTION", "classes");
+  cgiSetVariable("REFRESH_PAGE", "");
+
+ /*
+  * See if we are displaying a printer or all classes...
+  */
+
+  if ((pclass = getenv("PATH_INFO")) != NULL)
+  {
+    pclass ++;
+
+    if (!*pclass)
+      pclass = NULL;
+
+    if (pclass)
+      cgiSetVariable("PRINTER_NAME", pclass);
+  }
+
+ /*
+  * See who is logged in...
+  */
+
+  user = getenv("REMOTE_USER");

 /*
  * Connect to the HTTP server...
  */

-  http = httpConnectEncrypt("localhost", ippPort(), cupsEncryption());
+  http = httpConnectEncrypt(cupsServer(), ippPort(), cupsEncryption());

 /*
-  * Tell the client to expect HTML...
+  * Get the default printer...
  */

-  printf("Content-Type: text/html;charset=%s\n\n", cupsLangEncoding(language));
-
- /*
-  * See if we need to show a list of printers or the status of a
-  * single printer...
-  */
-
-  ippSetServerVersion();
-
-  pclass = argv[0];
-  if (strcmp(pclass, "/") == 0 || strcmp(pclass, "classes.cgi") == 0)
-  {
-    pclass = NULL;
-    cgiSetVariable("TITLE", cupsLangString(language, CUPS_MSG_CLASS));
-  }
-  else
-    cgiSetVariable("TITLE", pclass);
-
-  cgiCopyTemplateLang(stdout, TEMPLATES, "header.tmpl", getenv("LANG"));
-
-  if (op == NULL || strcasecmp(op, "print-test-page") != 0)
+  if (!op || !cgiIsPOST())
  {
   /*
    * Get the default destination...
    */

-    request = ippNew();
-    request->request.op.operation_id = CUPS_GET_DEFAULT;
-    request->request.op.request_id   = 1;
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-        	 "attributes-charset", NULL, cupsLangEncoding(language));
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-        	 "attributes-natural-language", NULL, language->language);
+    request = ippNewRequest(CUPS_GET_DEFAULT);

    ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                  "requested-attributes",
@@ -128,236 +124,84 @@ main(int  argc,				/* I - Number of command-line arguments */

      if ((attr = ippFindAttribute(response, "printer-uri-supported", IPP_TAG_URI)) != NULL)
      {
-	char	method[HTTP_MAX_URI],
-		username[HTTP_MAX_URI],
-		hostname[HTTP_MAX_URI],
-		resource[HTTP_MAX_URI],
-		uri[HTTP_MAX_URI];
-	int	port;			/* URI data */
-	const char *server;		/* Name of server */
+	char	url[HTTP_MAX_URI];	/* New URL */


-       /*
-	* Map localhost access to localhost...
-	*/
-
-        server = getenv("SERVER_NAME");
-
-	httpSeparate(attr->values[0].string.text, method, username,
-		     hostname, &port, resource);
-
-	if (strcasecmp(hostname, server) == 0 &&
-	    (strcmp(getenv("REMOTE_HOST"), "127.0.0.1") == 0 ||
-	     strcmp(getenv("REMOTE_HOST"), "localhost") == 0 ||
-	     strcmp(getenv("REMOTE_HOST"), server) == 0))
-	  strcpy(hostname, "localhost");
-
-       /*
-	* Rewrite URI with HTTP address...
-	*/
-
-	snprintf(uri, sizeof(uri), "http://%s:%d%s", hostname, port,
-		 resource);
-
-        cgiSetVariable("DEFAULT_URI", uri);
+        cgiSetVariable("DEFAULT_URI",
+	               cgiRewriteURL(attr->values[0].string.text,
+		                     url, sizeof(url), NULL));
      }

      ippDelete(response);
    }

   /*
-    * Get the class info...
+    * See if we need to show a list of classes or the status of a
+    * single printer...
    */

-    request = ippNew();
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-        	 "attributes-charset", NULL, cupsLangEncoding(language));
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-        	 "attributes-natural-language", NULL, language->language);
-
-    if (pclass == NULL)
+    if (!pclass)
+      show_all_classes(http, user);
+    else
+      show_class(http, pclass);
+  }
+  else if (pclass)
+  {
+    if (!*op)
    {
-     /*
-      * Build a CUPS_GET_CLASSES request, which requires the following
-      * attributes:
-      *
-      *    attributes-charset
-      *    attributes-natural-language
-      */
+      const char *server_port = getenv("SERVER_PORT");
+					/* Port number string */
+      int	port = atoi(server_port ? server_port : "0");
+      					/* Port number */
+      char	uri[1024];		/* URL */

-      request->request.op.operation_id = CUPS_GET_CLASSES;
-      request->request.op.request_id   = 1;
+      httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri),
+		       getenv("HTTPS") ? "https" : "http", NULL,
+		       getenv("SERVER_NAME"), port, "/classes/%s", pclass);
+
+      printf("Location: %s\n\n", uri);
    }
+    else if (!strcmp(op, "start-class"))
+      do_class_op(http, pclass, IPP_RESUME_PRINTER, cgiText(_("Resume Class")));
+    else if (!strcmp(op, "stop-class"))
+      do_class_op(http, pclass, IPP_PAUSE_PRINTER, cgiText(_("Pause Class")));
+    else if (!strcmp(op, "accept-jobs"))
+      do_class_op(http, pclass, CUPS_ACCEPT_JOBS, cgiText(_("Accept Jobs")));
+    else if (!strcmp(op, "reject-jobs"))
+      do_class_op(http, pclass, CUPS_REJECT_JOBS, cgiText(_("Reject Jobs")));
+    else if (!strcmp(op, "purge-jobs"))
+      do_class_op(http, pclass, IPP_PURGE_JOBS, cgiText(_("Purge Jobs")));
+    else if (!strcasecmp(op, "print-test-page"))
+      cgiPrintTestPage(http, pclass);
+    else if (!strcasecmp(op, "move-jobs"))
+      cgiMoveJobs(http, pclass, 0);
    else
    {
     /*
-      * Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the following
-      * attributes:
-      *
-      *    attributes-charset
-      *    attributes-natural-language
-      *    printer-uri
+      * Unknown/bad operation...
      */

-      request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
-      request->request.op.request_id   = 1;
-
-      snprintf(uri, sizeof(uri), "ipp://%s/classes/%s", getenv("SERVER_NAME"),
-               pclass);
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL,
-                   uri);
-    }
-
-    ippGetAttributes(request, TEMPLATES, "classes.tmpl", getenv("LANG"));
-
-   /*
-    * Do the request and get back a response...
-    */
-
-    if ((response = cupsDoRequest(http, request, "/")) != NULL)
-    {
-      ippSetCGIVars(response, NULL, NULL, NULL, 0);
-      ippDelete(response);
-    }
-
-   /*
-    * Write the report...
-    */
-
-    cgiCopyTemplateLang(stdout, TEMPLATES, "classes.tmpl", getenv("LANG"));
-
-   /*
-    * Get jobs for the specified class if a class has been chosen...
-    */
-
-    if (pclass != NULL)
-    {
-     /*
-      * Build an IPP_GET_JOBS request, which requires the following
-      * attributes:
-      *
-      *    attributes-charset
-      *    attributes-natural-language
-      *    printer-uri
-      */
-
-      request = ippNew();
-
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-        	   "attributes-charset", NULL, cupsLangEncoding(language));
-
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-        	   "attributes-natural-language", NULL, language->language);
-
-      request->request.op.operation_id = IPP_GET_JOBS;
-      request->request.op.request_id   = 1;
-
-      snprintf(uri, sizeof(uri), "ipp://%s/classes/%s", getenv("SERVER_NAME"),
-               pclass);
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL,
-                   uri);
-
-      if ((which_jobs = cgiGetVariable("which_jobs")) != NULL)
-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "which-jobs",
-                     NULL, which_jobs);
-
-      ippGetAttributes(request, TEMPLATES, "jobs.tmpl", getenv("LANG"));
-
-     /*
-      * Do the request and get back a response...
-      */
-
-      if ((response = cupsDoRequest(http, request, "/")) != NULL)
-      {
-	ippSetCGIVars(response, NULL, NULL, NULL, 0);
-	ippDelete(response);
-
-	cgiCopyTemplateLang(stdout, TEMPLATES, "jobs.tmpl", getenv("LANG"));
-      }
+      cgiStartHTML(pclass);
+      cgiCopyTemplateLang("error-op.tmpl");
+      cgiEndHTML();
    }
  }
  else
  {
   /*
-    * Print a test page...
+    * Unknown/bad operation...
    */

-    snprintf(uri, sizeof(uri), "ipp://localhost/classes/%s", pclass);
-
-   /*
-    * Build an IPP_PRINT_JOB request, which requires the following
-    * attributes:
-    *
-    *    attributes-charset
-    *    attributes-natural-language
-    *    printer-uri
-    *    requesting-user-name
-    *    document-format
-    */
-
-    request = ippNew();
-
-    request->request.op.operation_id = IPP_PRINT_JOB;
-    request->request.op.request_id   = 1;
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-        	 "attributes-charset", NULL, cupsLangEncoding(language));
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-        	 "attributes-natural-language", NULL, language->language);
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
-        	 NULL, uri);
-
-    if (getenv("REMOTE_USER") != NULL)
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
-                   NULL, getenv("REMOTE_USER"));
-    else
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
-                   NULL, "root");
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name",
-        	 NULL, "Test Page");
-
-    ippAddString(request, IPP_TAG_JOB, IPP_TAG_MIMETYPE, "document-format",
-        	 NULL, "application/postscript");
-
-   /*
-    * Do the request and get back a response...
-    */
-
-    if ((response = cupsDoFileRequest(http, request, uri + 15,
-                                      CUPS_DATADIR "/data/testprint.ps")) != NULL)
-    {
-      status = response->request.status.status_code;
-      ippSetCGIVars(response, NULL, NULL, NULL, 0);
-
-      ippDelete(response);
-    }
-    else
-      status = cupsLastError();
-
-    cgiSetVariable("PRINTER_NAME", pclass);
-
-    if (status > IPP_OK_CONFLICT)
-    {
-      cgiSetVariable("ERROR", ippErrorString(status));
-      cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
-    }
-    else
-      cgiCopyTemplateLang(stdout, TEMPLATES, "test-page.tmpl", getenv("LANG"));
+    cgiStartHTML(cgiText(_("Classes")));
+    cgiCopyTemplateLang("error-op.tmpl");
+    cgiEndHTML();
  }

-  cgiCopyTemplateLang(stdout, TEMPLATES, "trailer.tmpl", getenv("LANG"));
-
 /*
  * Close the HTTP server connection...
  */

  httpClose(http);
-  cupsLangFree(language);

 /*
  * Return with no errors...
@@ -367,6 +211,348 @@ main(int  argc,				/* I - Number of command-line arguments */
 }


+/*
+ * 'do_class_op()' - Do a class operation.
+ */
+
+static void
+do_class_op(http_t      *http,		/* I - HTTP connection */
+            const char	*printer,	/* I - Printer name */
+	    ipp_op_t    op,		/* I - Operation to perform */
+	    const char  *title)		/* I - Title of page */
+{
+  ipp_t		*request;		/* IPP request */
+  char		uri[HTTP_MAX_URI],	/* Printer URI */
+		resource[HTTP_MAX_URI];	/* Path for request */
+
+
+ /*
+  * Build a printer request, which requires the following
+  * attributes:
+  *
+  *    attributes-charset
+  *    attributes-natural-language
+  *    printer-uri
+  */
+
+  request = ippNewRequest(op);
+
+  httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
+                   "localhost", 0, "/classes/%s", printer);
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
+               NULL, uri);
+
+ /*
+  * Do the request and get back a response...
+  */
+
+  snprintf(resource, sizeof(resource), "/classes/%s", printer);
+  ippDelete(cupsDoRequest(http, request, resource));
+
+  if (cupsLastError() == IPP_NOT_AUTHORIZED)
+  {
+    puts("Status: 401\n");
+    exit(0);
+  }
+  else if (cupsLastError() > IPP_OK_CONFLICT)
+  {
+    cgiStartHTML(title);
+    cgiShowIPPError(_("Unable to do maintenance command:"));
+  }
+  else
+  {
+   /*
+    * Redirect successful updates back to the printer page...
+    */
+
+    char	url[1024],		/* Printer/class URL */
+		refresh[1024];		/* Refresh URL */
+
+
+    cgiRewriteURL(uri, url, sizeof(url), NULL);
+    cgiFormEncode(uri, url, sizeof(uri));
+    snprintf(refresh, sizeof(refresh), "5;URL=%s", uri);
+    cgiSetVariable("refresh_page", refresh);
+
+    cgiStartHTML(title);
+
+    cgiSetVariable("IS_CLASS", "YES");
+
+    if (op == IPP_PAUSE_PRINTER)
+      cgiCopyTemplateLang("printer-stop.tmpl");
+    else if (op == IPP_RESUME_PRINTER)
+      cgiCopyTemplateLang("printer-start.tmpl");
+    else if (op == CUPS_ACCEPT_JOBS)
+      cgiCopyTemplateLang("printer-accept.tmpl");
+    else if (op == CUPS_REJECT_JOBS)
+      cgiCopyTemplateLang("printer-reject.tmpl");
+    else if (op == IPP_PURGE_JOBS)
+      cgiCopyTemplateLang("printer-purge.tmpl");
+  }
+
+  cgiEndHTML();
+}
+
+
+/*
+ * 'show_all_classes()' - Show all classes...
+ */
+
+static void
+show_all_classes(http_t     *http,	/* I - Connection to server */
+                 const char *user)	/* I - Username */
+{
+  int			i;		/* Looping var */
+  ipp_t			*request,	/* IPP request */
+			*response;	/* IPP response */
+  cups_array_t		*classes;	/* Array of class objects */
+  ipp_attribute_t	*pclass;	/* Class object */
+  int			ascending,	/* Order of classes (0 = descending) */
+			first,		/* First class to show */
+			count;		/* Number of classes */
+  const char		*var;		/* Form variable */
+  void			*search;	/* Search data */
+  char			val[1024];	/* Form variable */
+
+
+ /*
+  * Show the standard header...
+  */
+
+  cgiStartHTML(cgiText(_("Classes")));
+
+ /*
+  * Build a CUPS_GET_CLASSES request, which requires the following
+  * attributes:
+  *
+  *    attributes-charset
+  *    attributes-natural-language
+  *    requesting-user-name
+  */
+
+  request = ippNewRequest(CUPS_GET_CLASSES);
+
+  if (user)
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+        	 "requesting-user-name", NULL, user);
+
+  cgiGetAttributes(request, "classes.tmpl");
+
+ /*
+  * Do the request and get back a response...
+  */
+
+  if ((response = cupsDoRequest(http, request, "/")) != NULL)
+  {
+   /*
+    * Get a list of matching job objects.
+    */
+
+    if ((var = cgiGetVariable("QUERY")) != NULL &&
+        !cgiGetVariable("CLEAR"))
+      search = cgiCompileSearch(var);
+    else
+      search = NULL;
+
+    classes = cgiGetIPPObjects(response, search);
+    count   = cupsArrayCount(classes);
+
+    if (search)
+      cgiFreeSearch(search);
+
+   /*
+    * Figure out which classes to display...
+    */
+
+    if ((var = cgiGetVariable("FIRST")) != NULL)
+      first = atoi(var);
+    else
+      first = 0;
+
+    if (first >= count)
+      first = count - CUPS_PAGE_MAX;
+
+    first = (first / CUPS_PAGE_MAX) * CUPS_PAGE_MAX;
+
+    if (first < 0)
+      first = 0;
+
+    sprintf(val, "%d", count);
+    cgiSetVariable("TOTAL", val);
+
+    if ((var = cgiGetVariable("ORDER")) != NULL)
+      ascending = !strcasecmp(var, "asc");
+    else
+      ascending = 1;
+
+    if (ascending)
+    {
+      for (i = 0, pclass = (ipp_attribute_t *)cupsArrayIndex(classes, first);
+	   i < CUPS_PAGE_MAX && pclass;
+	   i ++, pclass = (ipp_attribute_t *)cupsArrayNext(classes))
+        cgiSetIPPObjectVars(pclass, NULL, i);
+    }
+    else
+    {
+      for (i = 0, pclass = (ipp_attribute_t *)cupsArrayIndex(classes, count - first - 1);
+	   i < CUPS_PAGE_MAX && pclass;
+	   i ++, pclass = (ipp_attribute_t *)cupsArrayPrev(classes))
+        cgiSetIPPObjectVars(pclass, NULL, i);
+    }
+
+   /*
+    * Save navigation URLs...
+    */
+
+    cgiSetVariable("THISURL", "/classes/");
+
+    if (first > 0)
+    {
+      sprintf(val, "%d", first - CUPS_PAGE_MAX);
+      cgiSetVariable("PREV", val);
+    }
+
+    if ((first + CUPS_PAGE_MAX) < count)
+    {
+      sprintf(val, "%d", first + CUPS_PAGE_MAX);
+      cgiSetVariable("NEXT", val);
+    }
+
+   /*
+    * Then show everything...
+    */
+
+    cgiCopyTemplateLang("search.tmpl");
+
+    cgiCopyTemplateLang("classes-header.tmpl");
+
+    if (count > CUPS_PAGE_MAX)
+      cgiCopyTemplateLang("pager.tmpl");
+
+    cgiCopyTemplateLang("classes.tmpl");
+
+    if (count > CUPS_PAGE_MAX)
+      cgiCopyTemplateLang("pager.tmpl");
+
+   /*
+    * Delete the response...
+    */
+
+    cupsArrayDelete(classes);
+    ippDelete(response);
+  }
+  else
+  {
+   /*
+    * Show the error...
+    */
+
+    cgiShowIPPError(_("Unable to get class list:"));
+  }
+
+   cgiEndHTML();
+}
+
+
+/*
+ * 'show_class()' - Show a single class.
+ */
+
+static void
+show_class(http_t     *http,		/* I - Connection to server */
+           const char *pclass)		/* I - Name of class */
+{
+  ipp_t		*request,		/* IPP request */
+		*response;		/* IPP response */
+  ipp_attribute_t *attr;		/* IPP attribute */
+  char		uri[HTTP_MAX_URI];	/* Printer URI */
+  char		refresh[1024];		/* Refresh URL */
+
+
+ /*
+  * Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the following
+  * attributes:
+  *
+  *    attributes-charset
+  *    attributes-natural-language
+  *    printer-uri
+  */
+
+  request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
+
+  httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
+                   "localhost", 0, "/classes/%s", pclass);
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL,
+               uri);
+
+  cgiGetAttributes(request, "class.tmpl");
+
+ /*
+  * Do the request and get back a response...
+  */
+
+  if ((response = cupsDoRequest(http, request, "/")) != NULL)
+  {
+   /*
+    * Got the result; set the CGI variables and check the status of a
+    * single-queue request...
+    */
+
+    cgiSetIPPVars(response, NULL, NULL, NULL, 0);
+
+    if (pclass && (attr = ippFindAttribute(response, "printer-state",
+                                            IPP_TAG_ENUM)) != NULL &&
+        attr->values[0].integer == IPP_PRINTER_PROCESSING)
+    {
+     /*
+      * Class is processing - automatically refresh the page until we
+      * are done printing...
+      */
+
+      cgiFormEncode(uri, pclass, sizeof(uri));
+      snprintf(refresh, sizeof(refresh), "10;URL=/classes/%s", uri);
+      cgiSetVariable("refresh_page", refresh);
+    }
+
+   /*
+    * Delete the response...
+    */
+
+    ippDelete(response);
+
+   /*
+    * Show the standard header...
+    */
+
+    cgiStartHTML(pclass);
+
+   /*
+    * Show the class status...
+    */
+
+    cgiCopyTemplateLang("class.tmpl");
+
+   /*
+    * Show jobs for the specified class...
+    */
+
+    cgiCopyTemplateLang("class-jobs-header.tmpl");
+    cgiShowJobs(http, pclass);
+  }
+  else
+  {
+   /*
+    * Show the IPP error...
+    */
+
+    cgiStartHTML(pclass);
+    cgiShowIPPError(_("Unable to get class status:"));
+  }
+
+   cgiEndHTML();
+}
+
+
 /*
 * End of "$Id$".
 */
@@ -0,0 +1,87 @@
+/*
+ * "$Id$"
+ *
+ *   Online help index definitions for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 1997-2007 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/".
+ */
+
+#ifndef _CUPS_HELP_INDEX_H_
+#  define _CUPS_HELP_INDEX_H_
+
+/*
+ * Include necessary headers...
+ */
+
+#  include <cups/array.h>
+
+
+/*
+ * C++ magic...
+ */
+
+#  ifdef __cplusplus
+extern "C" {
+#  endif /* __cplusplus */
+
+/*
+ * Data structures...
+ */
+
+typedef struct help_word_s		/**** Help word structure... ****/
+{
+  int		count;			/* Number of occurrences */
+  char		*text;			/* Word text */
+} help_word_t;
+
+typedef struct help_node_s		/**** Help node structure... ****/
+{
+  char		*filename;		/* Filename, relative to help dir */
+  char		*section;		/* Section name (NULL if none) */
+  char		*anchor;		/* Anchor name (NULL if none) */
+  char		*text;			/* Text in anchor */
+  cups_array_t	*words;			/* Words after this node */
+  time_t	mtime;			/* Last modification time */
+  off_t		offset;			/* Offset in file */
+  size_t	length;			/* Length in bytes */
+  int		score;			/* Search score */
+} help_node_t;
+
+typedef struct help_index_s		/**** Help index structure ****/
+{
+  int		search;			/* 1 = search index, 0 = normal */
+  cups_array_t	*nodes;			/* Nodes sorted by filename */
+  cups_array_t	*sorted;		/* Nodes sorted by score + text */
+} help_index_t;
+
+
+/*
+ * Functions...
+ */
+
+extern void		helpDeleteIndex(help_index_t *hi);
+extern help_node_t	*helpFindNode(help_index_t *hi, const char *filename,
+			              const char *anchor);
+extern help_index_t	*helpLoadIndex(const char *hifile, const char *directory);
+extern int		helpSaveIndex(help_index_t *hi, const char *hifile);
+extern help_index_t	*helpSearchIndex(help_index_t *hi, const char *query,
+			                 const char *section,
+					 const char *filename);
+
+
+#  ifdef __cplusplus
+}
+#  endif /* __cplusplus */
+
+#endif /* !_CUPS_HELP_INDEX_H_ */
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,392 @@
+/*
+ * "$Id$"
+ *
+ *   Online help CGI for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 1997-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/".
+ *
+ * Contents:
+ *
+ *   main() - Main entry for CGI.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "cgi-private.h"
+
+
+/*
+ * 'main()' - Main entry for CGI.
+ */
+
+int					/* O - Exit status */
+main(int  argc,				/* I - Number of command-line arguments */
+     char *argv[])			/* I - Command-line arguments */
+{
+  help_index_t	*hi,			/* Help index */
+		*si;			/* Search index */
+  help_node_t	*n;			/* Current help node */
+  int		i;			/* Looping var */
+  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	*topic;			/* Current topic */
+  char		topic_data[1024];	/* Topic form data */
+  const char	*section;		/* Current section */
+  char		filename[1024],		/* Filename */
+		directory[1024];	/* Directory */
+  cups_file_t	*fp;			/* Help file */
+  char		line[1024];		/* Line from file */
+  int		printable;		/* Show printable version? */
+
+
+ /*
+  * Get any form variables...
+  */
+
+  cgiInitialize();
+
+  printable = cgiGetVariable("PRINTABLE") != NULL;
+
+ /*
+  * Set the web interface section...
+  */
+
+  cgiSetVariable("SECTION", "help");
+  cgiSetVariable("REFRESH_PAGE", "");
+
+ /*
+  * Load the help index...
+  */
+
+  if ((cache_dir = getenv("CUPS_CACHEDIR")) == NULL)
+    cache_dir = CUPS_CACHEDIR;
+
+  snprintf(filename, sizeof(filename), "%s/help.index", cache_dir);
+
+  if ((docroot = getenv("CUPS_DOCROOT")) == NULL)
+    docroot = CUPS_DOCROOT;
+
+  snprintf(directory, sizeof(directory), "%s/help", docroot);
+
+  fprintf(stderr, "DEBUG: helpLoadIndex(filename=\"%s\", directory=\"%s\")\n",
+          filename, directory);
+
+  hi = helpLoadIndex(filename, directory);
+  if (!hi)
+  {
+    perror(filename);
+
+    cgiStartHTML(cgiText(_("Online Help")));
+    cgiSetVariable("ERROR", "Unable to load help index!");
+    cgiCopyTemplateLang("error.tmpl");
+    cgiEndHTML();
+
+    return (1);
+  }
+
+  fprintf(stderr, "DEBUG: %d nodes in help index...\n",
+          cupsArrayCount(hi->nodes));
+
+ /*
+  * See if we are viewing a file...
+  */
+
+  for (i = 0; i < argc; i ++)
+    fprintf(stderr, "DEBUG: argv[%d]=\"%s\"\n", i, argv[i]);
+
+  if ((helpfile = getenv("PATH_INFO")) != NULL)
+  {
+    helpfile ++;
+
+    if (!*helpfile)
+      helpfile = NULL;
+  }
+
+  if (helpfile)
+  {
+   /*
+    * Verify that the help file exists and is part of the index...
+    */
+
+    snprintf(filename, sizeof(filename), "%s/help/%s", docroot, helpfile);
+
+    fprintf(stderr, "DEBUG: helpfile=\"%s\", filename=\"%s\"\n",
+            helpfile, filename);
+
+    if (access(filename, R_OK))
+    {
+      perror(filename);
+
+      cgiStartHTML(cgiText(_("Online Help")));
+      cgiSetVariable("ERROR", "Unable to access help file!");
+      cgiCopyTemplateLang("error.tmpl");
+      cgiEndHTML();
+
+      return (1);
+    }
+
+    if ((n = helpFindNode(hi, helpfile, NULL)) == NULL)
+    {
+      cgiStartHTML(cgiText(_("Online Help")));
+      cgiSetVariable("ERROR", "Help file not in index!");
+      cgiCopyTemplateLang("error.tmpl");
+      cgiEndHTML();
+
+      return (1);
+    }
+
+   /*
+    * Set the page title and save the help file...
+    */
+
+    cgiSetVariable("HELPFILE", helpfile);
+    cgiSetVariable("HELPTITLE", n->text);
+    cgiSetVariable("TOPIC", n->section);
+
+   /*
+    * Send a standard page header...
+    */
+
+    if (printable)
+      puts("Content-Type: text/html;charset=utf-8\n");
+    else
+      cgiStartHTML(n->text);
+  }
+  else
+  {
+   /*
+    * Send a standard page header...
+    */
+
+    cgiStartHTML(cgiText(_("Online Help")));
+  }
+
+ /*
+  * Do a search as needed...
+  */
+
+  if (cgiGetVariable("CLEAR"))
+    cgiSetVariable("QUERY", "");
+
+  query = cgiGetVariable("QUERY");
+  topic = cgiGetVariable("TOPIC");
+  si    = helpSearchIndex(hi, query, topic, helpfile);
+
+  cgiClearVariables();
+  if (query)
+    cgiSetVariable("QUERY", query);
+  if (topic)
+    cgiSetVariable("TOPIC", topic);
+
+  fprintf(stderr, "DEBUG: query=\"%s\", topic=\"%s\"\n",
+          query ? query : "(null)", topic ? topic : "(null)");
+
+  if (si)
+  {
+    help_node_t	*nn;			/* Parent node */
+
+
+    fprintf(stderr,
+            "DEBUG: si=%p, si->sorted=%p, cupsArrayCount(si->sorted)=%d\n", si,
+            si->sorted, cupsArrayCount(si->sorted));
+
+    for (i = 0, n = (help_node_t *)cupsArrayFirst(si->sorted);
+         n;
+	 i ++, n = (help_node_t *)cupsArrayNext(si->sorted))
+    {
+      if (helpfile && n->anchor)
+        snprintf(line, sizeof(line), "#%s", n->anchor);
+      else if (n->anchor)
+        snprintf(line, sizeof(line), "/help/%s?QUERY=%s#%s", n->filename,
+	         query ? query : "", n->anchor);
+      else
+        snprintf(line, sizeof(line), "/help/%s?QUERY=%s", n->filename,
+	         query ? query : "");
+
+      cgiSetArray("QTEXT", i, n->text);
+      cgiSetArray("QLINK", i, line);
+
+      if (!helpfile && n->anchor)
+      {
+        nn = helpFindNode(hi, n->filename, NULL);
+
+        snprintf(line, sizeof(line), "/help/%s?QUERY=%s", nn->filename,
+	         query ? query : "");
+
+        cgiSetArray("QPTEXT", i, nn->text);
+	cgiSetArray("QPLINK", i, line);
+      }
+      else
+      {
+        cgiSetArray("QPTEXT", i, "");
+	cgiSetArray("QPLINK", i, "");
+      }
+
+      fprintf(stderr, "DEBUG: [%d] = \"%s\" @ \"%s\"\n", i, n->text, line);
+    }
+
+    helpDeleteIndex(si);
+  }
+
+ /*
+  * OK, now list the bookmarks within the index...
+  */
+
+  for (i = 0, section = NULL, n = (help_node_t *)cupsArrayFirst(hi->sorted);
+       n;
+       n = (help_node_t *)cupsArrayNext(hi->sorted))
+  {
+    if (n->anchor)
+      continue;
+
+   /*
+    * Add a section link as needed...
+    */
+
+    if (n->section &&
+        (!section || strcmp(n->section, section)))
+    {
+     /*
+      * Add a link for this node...
+      */
+
+      snprintf(line, sizeof(line), "/help/?TOPIC=%s&QUERY=%s",
+               cgiFormEncode(topic_data, n->section, sizeof(topic_data)),
+	       query ? query : "");
+      cgiSetArray("BMLINK", i, line);
+      cgiSetArray("BMTEXT", i, n->section);
+      cgiSetArray("BMINDENT", i, "0");
+
+      i ++;
+      section = n->section;
+    }
+
+    if (!topic || strcmp(n->section, topic))
+      continue;
+
+   /*
+    * Add a link for this node...
+    */
+
+    snprintf(line, sizeof(line), "/help/%s?TOPIC=%s&QUERY=%s", n->filename,
+             cgiFormEncode(topic_data, n->section, sizeof(topic_data)),
+	     query ? query : "");
+    cgiSetArray("BMLINK", i, line);
+    cgiSetArray("BMTEXT", i, n->text);
+    cgiSetArray("BMINDENT", i, "1");
+
+    i ++;
+
+    if (helpfile && !strcmp(helpfile, n->filename))
+    {
+      help_node_t	*nn;		/* Pointer to sub-node */
+
+
+      cupsArraySave(hi->sorted);
+
+      for (nn = (help_node_t *)cupsArrayFirst(hi->sorted);
+           nn;
+	   nn = (help_node_t *)cupsArrayNext(hi->sorted))
+        if (nn->anchor && !strcmp(helpfile, nn->filename))
+	{
+	 /*
+	  * Add a link for this node...
+	  */
+
+	  snprintf(line, sizeof(line), "#%s", nn->anchor);
+	  cgiSetArray("BMLINK", i, line);
+	  cgiSetArray("BMTEXT", i, nn->text);
+	  cgiSetArray("BMINDENT", i, "2");
+
+	  i ++;
+	}
+
+      cupsArrayRestore(hi->sorted);
+    }
+  }
+
+ /*
+  * Show the search and bookmark content...
+  */
+
+  if (!helpfile || !printable)
+    cgiCopyTemplateLang("help-header.tmpl");
+  else
+    cgiCopyTemplateLang("help-printable.tmpl");
+
+ /*
+  * If we are viewing a file, copy it in now...
+  */
+
+  if (helpfile)
+  {
+    if ((fp = cupsFileOpen(filename, "r")) != NULL)
+    {
+      int	inbody;			/* Are we inside the body? */
+
+
+      inbody = 0;
+
+      while (cupsFileGets(fp, line, sizeof(line)))
+      {
+        if (inbody)
+	{
+	  if (!strncasecmp(line, "</BODY>", 7))
+	    break;
+
+	  printf("%s\n", line);
+        }
+	else if (!strncasecmp(line, "<BODY", 5))
+	  inbody = 1;
+      }
+
+      cupsFileClose(fp);
+    }
+    else
+    {
+      perror(filename);
+      cgiSetVariable("ERROR", "Unable to open help file.");
+      cgiCopyTemplateLang("error.tmpl");
+    }
+  }
+
+ /*
+  * Send a standard trailer...
+  */
+
+  if (!printable)
+  {
+    cgiCopyTemplateLang("help-trailer.tmpl");
+    cgiEndHTML();
+  }
+  else
+    puts("</BODY>\n</HTML>");
+
+ /*
+  * Delete the index...
+  */
+
+  helpDeleteIndex(hi);
+
+ /*
+  * Return with no errors...
+  */
+
+  return (0);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,86 +1,236 @@
 /*
 * "$Id$"
 *
- *   CGI HTML functions.
+ *   HTML support functions for CUPS.
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 1997-2006 by Easy Software Products.
 *
- *   This program is free software; you can redistribute it and/or modify it
- *   under the terms of the GNU General Public License as published by the Free
- *   Software Foundation; either version 2 of the License, or (at your option)
- *   any later version.
- *
- *   This program is distributed in the hope that it will be useful, but
- *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *   for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   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/".
 *
 * Contents:
 *
- *   cgiStartHTML() - Start an HTML document stream.
- *   cgiEndHTML()   - End an HTML document stream.
+ *   cgiEndHTML()           - End a HTML page.
+ *   cgiEndMultipart()      - End the delivery of a multipart web page.
+ *   cgiFormEncode()        - Encode a string as a form variable.
+ *   cgiStartHTML()         - Start a HTML page.
+ *   cgiStartMultipart()    - Start a multipart delivery of a web page.
+ *   cgiSupportsMultipart() - Does the browser support multi-part documents?
+ *   cgi_null_passwd()      - Return a NULL password for authentication.
 */

-#include "cgi.h"
-#include <stdarg.h>
+/*
+ * Include necessary headers...
+ */
+
+#include "cgi-private.h"


 /*
- * 'cgiStartHTML()' - Start an HTML document stream.
+ * Local globals...
+ */
+
+static const char	*cgi_multipart = NULL;
+					/* Multipart separator, if any */
+
+
+/*
+ * Local functions...
+ */
+
+static const char	*cgi_null_passwd(const char *prompt);
+
+
+/*
+ * 'cgiEndHTML()' - End a HTML page.
 */

 void
-cgiStartHTML(FILE       *out,		/* I - Output file to use */
-             const char *stylesheet,	/* I - Stylesheet to use */
-	     const char *author,	/* I - Author name */
-	     const char *keywords,	/* I - Search keywords */
-	     const char *description,	/* I - Description of document */
-             const char *title,		/* I - Title for page */
-             ...)			/* I - Any addition args for title */
+cgiEndHTML(void)
 {
-  va_list	ap;			/* Argument pointer */
+ /*
+  * Send the standard trailer...
+  */

-
-  fputs("Content-type: text/html\n\n", out);
-  fputs("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" "
-        "\"http://www.w3.org/TR/REC-html40/loose.dtd\">\n", out);
-  fputs("<HTML>\n", out);
-  fputs("<HEAD>\n", out);
-
-  fputs("\t<TITLE>\n", out);
-    va_start(ap, title);
-    vfprintf(out, title, ap);
-    va_end(ap);
-  fputs("</TITLE>\n", out);
-
-  if (stylesheet)
-    fprintf(out, "\t<LINK REL=\"STYLESHEET\" TYPE=\"text/css\" HREF=\"%s\">\n",
-            stylesheet);
-  if (author)
-    fprintf(out, "\t<META NAME=\"AUTHOR\" CONTENT=\"%s\">\n", author);
-  if (keywords)
-    fprintf(out, "\t<META NAME=\"KEYWORDS\" CONTENT=\"%s\">\n", keywords);
-  if (description)
-    fprintf(out, "\t<META NAME=\"DESCRIPTION\" CONTENT=\"%s\">\n", description);
-
-  fputs("</HEAD>\n", out);
-  fputs("<BODY>\n", out);
+  cgiCopyTemplateLang("trailer.tmpl");
 }


 /*
- * 'cgiEndHTML()' - End an HTML document stream.
+ * 'cgiEndMultipart()' - End the delivery of a multipart web page.
 */

 void
-cgiEndHTML(FILE *out)	/* I - Output file to use */
+cgiEndMultipart(void)
 {
-  fputs("</BODY>\n", out);
-  fputs("</HTML>\n", out);
+  if (cgi_multipart)
+  {
+    printf("\n%s--\n", cgi_multipart);
+    fflush(stdout);
+  }
+}
+
+
+/*
+ * 'cgiFormEncode()' - Encode a string as a form variable.
+ */
+
+char *					/* O - Destination string */
+cgiFormEncode(char       *dst,		/* I - Destination string */
+              const char *src,		/* I - Source string */
+	      size_t     dstsize)	/* I - Size of destination string */
+{
+  char			*dstptr,	/* Pointer into destination */
+			*dstend;	/* End of destination */
+  static const char	*hex =		/* Hexadecimal characters */
+			"0123456789ABCDEF";
+
+
+ /*
+  * Mark the end of the string...
+  */
+
+  dstend = dst + dstsize - 1;
+
+ /*
+  * Loop through the source string and copy...
+  */
+
+  for (dstptr = dst; *src && dstptr < dstend;)
+  {
+    switch (*src)
+    { 
+      case ' ' :
+         /*
+	  * Encode spaces with a "+"...
+	  */
+
+          *dstptr++ = '+';
+	  src ++;
+	  break;
+
+      case '&' :
+      case '%' :
+      case '+' :
+         /*
+	  * Encode special characters with %XX escape...
+	  */
+
+          if (dstptr < (dstend - 2))
+	  {
+	    *dstptr++ = '%';
+	    *dstptr++ = hex[(*src & 255) >> 4];
+	    *dstptr++ = hex[*src & 15];
+	    src ++;
+	  }
+          break;
+
+      default :
+         /*
+	  * Copy other characters literally...
+	  */
+
+          *dstptr++ = *src++;
+	  break;
+    }
+  }
+
+ /*
+  * Nul-terminate the destination string...
+  */
+
+  *dstptr = '\0';
+
+ /*
+  * Return the encoded string...
+  */
+
+  return (dst);
+}
+
+
+/*
+ * 'cgiStartHTML()' - Start a HTML page.
+ */
+
+void
+cgiStartHTML(const char *title)		/* I - Title of page */
+{
+ /*
+  * Disable any further authentication attempts...
+  */
+
+  cupsSetPasswordCB(cgi_null_passwd);
+
+ /*
+  * Tell the client to expect UTF-8 encoded HTML...
+  */
+
+  if (cgi_multipart)
+    puts(cgi_multipart);
+
+  puts("Content-Type: text/html;charset=utf-8\n");
+
+ /*
+  * Send a standard header...
+  */
+
+  cgiSetVariable("TITLE", title);
+  cgiSetServerVersion();
+
+  cgiCopyTemplateLang("header.tmpl");
+}
+
+
+/*
+ * 'cgiStartMultipart()' - Start a multipart delivery of a web page.
+ */
+
+void
+cgiStartMultipart(void)
+{
+  puts("MIME-Version: 1.0\n"
+       "Content-Type: multipart/x-mixed-replace; boundary=\"CUPS-MULTIPART\"\n");
+  fflush(stdout);
+
+  cgi_multipart = "--CUPS-MULTIPART";
+}
+
+
+/*
+ * 'cgiSupportsMultipart()' - Does the browser support multi-part documents?
+ */
+
+int					/* O - 1 if multi-part supported, 0 otherwise */
+cgiSupportsMultipart(void)
+{
+ /*
+  * Too many bug reports for browsers that don't support it, and too much pain
+  * to whitelist known-good browsers, so for now we just punt on multi-part
+  * support... :(
+  */
+
+  return (0);
+}
+
+
+/*
+ * 'cgi_null_passwd()' - Return a NULL password for authentication.
+ */
+
+static const char *			/* O - NULL */
+cgi_null_passwd(const char *prompt)	/* I - Prompt string (unused) */
+{
+  (void)prompt;
+
+  fprintf(stderr, "DEBUG: cgi_null_passwd(prompt=\"%s\") called!\n",
+          prompt ? prompt : "(null)");
+
+  return (NULL);
 }


@@ -1,57 +0,0 @@
-/*
- * "$Id$"
- *
- *   IPP variable definitions for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 1997-2003 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- */
-
-/*
- * Include necessary headers...
- */
-
-#include <cups/cups.h>
-#include <cups/debug.h>
-#include <cups/language.h>
-#include <cups/string.h>
-#include "cgi.h"
-
-
-/*
- * Definitions...
- */
-
-#define TEMPLATES	ippGetTemplateDir()
-
-
-/*
- * Prototype...
- */
-
-extern void	ippGetAttributes(ipp_t *request, const char *directory,
-		                 const char *tmpl, const char *lang);
-extern char	*ippGetTemplateDir(void);
-extern void	ippSetServerVersion(void);
-extern void	ippSetCGIVars(ipp_t *, const char *, const char *,
-		              const char *, int);
-
-
-/*
- * End of "$Id$".
- */
@@ -3,23 +3,14 @@
 *
 *   Job status CGI for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   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/".
 *
 * Contents:
 *
@@ -31,14 +22,14 @@
 * Include necessary headers...
 */

-#include "ipp-var.h"
+#include "cgi-private.h"


 /*
 * Local functions...
 */

-static void	do_job_op(http_t *http, cups_lang_t *language, ipp_op_t op);
+static void	do_job_op(http_t *http, int job_id, ipp_op_t op);


 /*
@@ -49,12 +40,10 @@ int					/* O - Exit status */
 main(int  argc,				/* I - Number of command-line arguments */
     char *argv[])			/* I - Command-line arguments */
 {
-  cups_lang_t	*language;		/* Language information */
  http_t	*http;			/* Connection to the server */
-  const char	*which_jobs;		/* Which jobs to show */
-  ipp_t		*request,		/* IPP request */
-		*response;		/* IPP response */
-   const char	*op;			/* Operation name */
+  const char	*op;			/* Operation name */
+  const char	*job_id_var;		/* Job ID form variable */
+  int		job_id;			/* Job ID */


 /*
@@ -64,104 +53,74 @@ main(int  argc,				/* I - Number of command-line arguments */
  cgiInitialize();

 /*
-  * Get the request language...
+  * Set the web interface section...
  */

-  language = cupsLangDefault();
+  cgiSetVariable("SECTION", "jobs");
+  cgiSetVariable("REFRESH_PAGE", "");

 /*
  * Connect to the HTTP server...
  */

-  http = httpConnectEncrypt("localhost", ippPort(), cupsEncryption());
+  http = httpConnectEncrypt(cupsServer(), ippPort(), cupsEncryption());

 /*
-  * Tell the client to expect HTML...
+  * Get the job ID, if any...
  */

-  printf("Content-Type: text/html;charset=%s\n\n", cupsLangEncoding(language));
+  if ((job_id_var = cgiGetVariable("JOB_ID")) != NULL)
+    job_id = atoi(job_id_var);
+  else
+    job_id = 0;

-  cgiSetVariable("TITLE", "Jobs");
+ /*
+  * Do the operation...
+  */

-  ippSetServerVersion();
-
-  cgiCopyTemplateLang(stdout, TEMPLATES, "header.tmpl", getenv("LANG"));
-
-  if ((op = cgiGetVariable("OP")) != NULL)
+  if ((op = cgiGetVariable("OP")) != NULL && job_id > 0 && cgiIsPOST())
  {
   /*
    * Do the operation...
    */

-    if (strcmp(op, "cancel-job") == 0)
-      do_job_op(http, language, IPP_CANCEL_JOB);
-    else if (strcmp(op, "hold-job") == 0)
-      do_job_op(http, language, IPP_HOLD_JOB);
-    else if (strcmp(op, "release-job") == 0)
-      do_job_op(http, language, IPP_RELEASE_JOB);
-    else if (strcmp(op, "restart-job") == 0)
-      do_job_op(http, language, IPP_RESTART_JOB);
+    if (!strcmp(op, "cancel-job"))
+      do_job_op(http, job_id, IPP_CANCEL_JOB);
+    else if (!strcmp(op, "hold-job"))
+      do_job_op(http, job_id, IPP_HOLD_JOB);
+    else if (!strcmp(op, "move-job"))
+      cgiMoveJobs(http, NULL, job_id);
+    else if (!strcmp(op, "release-job"))
+      do_job_op(http, job_id, IPP_RELEASE_JOB);
+    else if (!strcmp(op, "restart-job"))
+      do_job_op(http, job_id, IPP_RESTART_JOB);
    else
    {
     /*
      * Bad operation code...  Display an error...
      */

-      cgiCopyTemplateLang(stdout, TEMPLATES, "job-op.tmpl", getenv("LANG"));
+      cgiStartHTML(cgiText(_("Jobs")));
+      cgiCopyTemplateLang("error-op.tmpl");
+      cgiEndHTML();
    }
  }
  else
  {
   /*
-    * Build an IPP_GET_JOBS request, which requires the following
-    * attributes:
-    *
-    *    attributes-charset
-    *    attributes-natural-language
-    *    printer-uri
+    * Show a list of jobs...
    */

-    request = ippNew();
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-        	 "attributes-charset", NULL, cupsLangEncoding(language));
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-        	 "attributes-natural-language", NULL, language->language);
-
-    request->request.op.operation_id = IPP_GET_JOBS;
-    request->request.op.request_id   = 1;
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri", NULL,
-        	 "ipp://localhost/jobs");
-
-    if ((which_jobs = cgiGetVariable("which_jobs")) != NULL)
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "which-jobs",
-                   NULL, which_jobs);
-
-    ippGetAttributes(request, TEMPLATES, "jobs.tmpl", getenv("LANG"));
-
-   /*
-    * Do the request and get back a response...
-    */
-
-    if ((response = cupsDoRequest(http, request, "/")) != NULL)
-    {
-      ippSetCGIVars(response, NULL, NULL, NULL, 0);
-      ippDelete(response);
-
-      cgiCopyTemplateLang(stdout, TEMPLATES, "jobs.tmpl", getenv("LANG"));
-    }
+    cgiStartHTML(cgiText(_("Jobs")));
+    cgiShowJobs(http, NULL);
+    cgiEndHTML();
  }

-  cgiCopyTemplateLang(stdout, TEMPLATES, "trailer.tmpl", getenv("LANG"));
-
 /*
  * Close the HTTP server connection...
  */

  httpClose(http);
-  cupsLangFree(language);

 /*
  * Return with no errors...
@@ -177,25 +136,14 @@ main(int  argc,				/* I - Number of command-line arguments */

 static void
 do_job_op(http_t      *http,		/* I - HTTP connection */
-          cups_lang_t *language,	/* I - Client's language */
+          int         job_id,		/* I - Job ID */
 	  ipp_op_t    op)		/* I - Operation to perform */
 {
-  ipp_t		*request,		/* IPP request */
-		*response;		/* IPP response */
+  ipp_t		*request;		/* IPP request */
  char		uri[HTTP_MAX_URI];	/* Job URI */
-  const char	*job;			/* Job ID */
-  ipp_status_t	status;			/* Operation status... */
+  const char	*user;			/* Username */


-  if ((job = cgiGetVariable("JOB_ID")) != NULL)
-    snprintf(uri, sizeof(uri), "ipp://localhost/jobs/%s", job);
-  else
-  {
-    cgiSetVariable("ERROR", ippErrorString(IPP_NOT_FOUND));
-    cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
-    return;
-  }
-
 /*
  * Build a job request, which requires the following
  * attributes:
@@ -206,53 +154,58 @@ do_job_op(http_t      *http,		/* I - HTTP connection */
  *    requesting-user-name
  */

-  request = ippNew();
+  request = ippNewRequest(op);

-  request->request.op.operation_id = op;
-  request->request.op.request_id   = 1;
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-               "attributes-charset", NULL, cupsLangEncoding(language));
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-               "attributes-natural-language", NULL, language->language);
+  snprintf(uri, sizeof(uri), "ipp://localhost/jobs/%d", job_id);

  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri",
               NULL, uri);

-  if (getenv("REMOTE_USER") != NULL)
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
-                 NULL, getenv("REMOTE_USER"));
-  else
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
-                 NULL, "unknown");
+  if ((user = getenv("REMOTE_USER")) == NULL)
+    user = "guest";
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+               "requesting-user-name", NULL, user);

 /*
  * Do the request and get back a response...
  */

-  if ((response = cupsDoRequest(http, request, "/jobs")) != NULL)
-  {
-    status = response->request.status.status_code;
+  ippDelete(cupsDoRequest(http, request, "/jobs"));

-    ippDelete(response);
-  }
-  else
-    status = cupsLastError();
-
-  if (status > IPP_OK_CONFLICT)
+  if (cupsLastError() <= IPP_OK_CONFLICT && getenv("HTTP_REFERER"))
  {
-    cgiSetVariable("ERROR", ippErrorString(status));
-    cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
+   /*
+    * Redirect successful updates back to the parent page...
+    */
+
+    char	url[1024];		/* Encoded URL */
+
+
+    strcpy(url, "5;URL=");
+    cgiFormEncode(url + 6, getenv("HTTP_REFERER"), sizeof(url) - 6);
+    cgiSetVariable("refresh_page", url);
  }
+  else if (cupsLastError() == IPP_NOT_AUTHORIZED)
+  {
+    puts("Status: 401\n");
+    exit(0);
+  }
+
+  cgiStartHTML(cgiText(_("Jobs")));
+
+  if (cupsLastError() > IPP_OK_CONFLICT)
+    cgiShowIPPError(_("Job operation failed:"));
  else if (op == IPP_CANCEL_JOB)
-    cgiCopyTemplateLang(stdout, TEMPLATES, "job-cancel.tmpl", getenv("LANG"));
+    cgiCopyTemplateLang("job-cancel.tmpl");
  else if (op == IPP_HOLD_JOB)
-    cgiCopyTemplateLang(stdout, TEMPLATES, "job-hold.tmpl", getenv("LANG"));
+    cgiCopyTemplateLang("job-hold.tmpl");
  else if (op == IPP_RELEASE_JOB)
-    cgiCopyTemplateLang(stdout, TEMPLATES, "job-release.tmpl", getenv("LANG"));
+    cgiCopyTemplateLang("job-release.tmpl");
  else if (op == IPP_RESTART_JOB)
-    cgiCopyTemplateLang(stdout, TEMPLATES, "job-restart.tmpl", getenv("LANG"));
+    cgiCopyTemplateLang("job-restart.tmpl");
+
+  cgiEndHTML();
 }


@@ -0,0 +1,42 @@
+_cgiCheckVariables
+_cgiClearVariables
+_cgiCompileSearch
+_cgiCopyTemplateFile
+_cgiCopyTemplateLang
+_cgiDoSearch
+_cgiEndHTML
+_cgiEndMultipart
+_cgiFormEncode
+_cgiFreeSearch
+_cgiGetArray
+_cgiGetAttributes
+_cgiGetCookie
+_cgiGetFile
+_cgiGetIPPObjects
+_cgiGetSize
+_cgiGetTemplateDir
+_cgiGetVariable
+_cgiInitialize
+_cgiIsPOST
+_cgiMoveJobs
+_cgiPrintCommand
+_cgiPrintTestPage
+_cgiRewriteURL
+_cgiSetArray
+_cgiSetIPPObjectVars
+_cgiSetIPPVars
+_cgiSetCookie
+_cgiSetServerVersion
+_cgiSetSize
+_cgiSetVariable
+_cgiShowIPPError
+_cgiShowJobs
+_cgiStartHTML
+_cgiStartMultipart
+_cgiSupportsMultipart
+_cgiText
+_helpDeleteIndex
+_helpFindNode
+_helpLoadIndex
+_helpSaveIndex
+_helpSearchIndex
@@ -0,0 +1,486 @@
+/*
+ * "$Id$"
+ *
+ *   Xcode documentation set generator.
+ *
+ *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 1997-2007 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/".
+ *
+ * Usage:
+ *
+ *   makedocset directory *.tokens
+ *
+ * Contents:
+ *
+ *   main()                   - Test the help index code.
+ *   compare_html()           - Compare the titles of two HTML files.
+ *   compare_sections()       - Compare the names of two help sections.
+ *   compare_sections_files() - Compare the number of files and section names.
+ *   write_index()            - Write an index file for the CUPS help.
+ *   write_info()             - Write the Info.plist file.
+ *   write_nodes()            - Write the Nodes.xml file.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "cgi.h"
+#include <errno.h>
+
+
+/*
+ * Local structures...
+ */
+
+typedef struct _cups_html_s		/**** Help file ****/
+{
+  char		*path;			/* Path to help file */
+  char		*title;			/* Title of help file */
+} _cups_html_t;
+
+typedef struct _cups_section_s		/**** Help section ****/
+{
+  char		*name;			/* Section name */
+  cups_array_t	*files;			/* Files in this section */
+} _cups_section_t;
+
+
+/*
+ * Local functions...
+ */
+
+static int	compare_html(_cups_html_t *a, _cups_html_t *b);
+static int	compare_sections(_cups_section_t *a, _cups_section_t *b);
+static int	compare_sections_files(_cups_section_t *a, _cups_section_t *b);
+static void	write_index(const char *path, help_index_t *hi);
+static void	write_info(const char *path, const char *revision);
+static void	write_nodes(const char *path, help_index_t *hi);
+
+
+/*
+ * 'main()' - Test the help index code.
+ */
+
+int					/* O - Exit status */
+main(int  argc,				/* I - Number of command-line args */
+     char *argv[])			/* I - Command-line arguments */
+{
+  int		i;			/* Looping var */
+  char		path[1024],		/* Path to documentation */
+		line[1024];		/* Line from file */
+  help_index_t	*hi;			/* Help index */
+  cups_file_t	*tokens,		/* Tokens.xml file */
+		*fp;			/* Current file */
+
+
+  if (argc < 4)
+  {
+    puts("Usage: makedocset directory revision *.tokens");
+    return (1);
+  }
+
+ /*
+  * Index the help documents...
+  */
+
+  snprintf(path, sizeof(path), "%s/Contents/Resources/Documentation", argv[1]);
+  if ((hi = helpLoadIndex(NULL, path)) == NULL)
+  {
+    fputs("makedocset: Unable to index help files!\n", stderr);
+    return (1);
+  }
+
+  snprintf(path, sizeof(path), "%s/Contents/Resources/Documentation/index.html",
+           argv[1]);
+  write_index(path, hi);
+
+  snprintf(path, sizeof(path), "%s/Contents/Resources/Nodes.xml", argv[1]);
+  write_nodes(path, hi);
+
+ /*
+  * Write the Info.plist file...
+  */
+
+  snprintf(path, sizeof(path), "%s/Contents/Info.plist", argv[1]);
+  write_info(path, argv[2]);
+
+ /*
+  * Merge the Tokens.xml files...
+  */
+
+  snprintf(path, sizeof(path), "%s/Contents/Resources/Tokens.xml", argv[1]);
+  if ((tokens = cupsFileOpen(path, "w")) == NULL)
+  {
+    fprintf(stderr, "makedocset: Unable to create \"%s\": %s\n", path,
+	    strerror(errno));
+    return (1);
+  }
+
+  cupsFilePuts(tokens, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+  cupsFilePuts(tokens, "<Tokens version=\"1.0\">\n");
+
+  for (i = 3; i < argc; i ++)
+  {
+    if ((fp = cupsFileOpen(argv[i], "r")) == NULL)
+    {
+      fprintf(stderr, "makedocset: Unable to open \"%s\": %s\n", argv[i],
+	      strerror(errno));
+      return (1);
+    }
+
+    if (!cupsFileGets(fp, line, sizeof(line)) || strncmp(line, "<?xml ", 6) ||
+        !cupsFileGets(fp, line, sizeof(line)) || strncmp(line, "<Tokens ", 8))
+    {
+      fprintf(stderr, "makedocset: Bad Tokens.xml file \"%s\"!\n", argv[i]);
+      return (1);
+    }
+
+    while (cupsFileGets(fp, line, sizeof(line)))
+    {
+      if (strcmp(line, "</Tokens>"))
+        cupsFilePrintf(tokens, "%s\n", line);
+    }
+
+    cupsFileClose(fp);
+  }
+
+  cupsFilePuts(tokens, "</Tokens>\n");
+
+  cupsFileClose(tokens);
+
+ /*
+  * Return with no errors...
+  */
+
+  return (0);
+}
+
+
+/*
+ * 'compare_html()' - Compare the titles of two HTML files.
+ */
+
+static int				/* O - Result of comparison */
+compare_html(_cups_html_t *a,		/* I - First file */
+             _cups_html_t *b)		/* I - Second file */
+{
+  return (strcasecmp(a->title, b->title));
+}
+
+
+/*
+ * 'compare_sections()' - Compare the names of two help sections.
+ */
+
+static int				/* O - Result of comparison */
+compare_sections(_cups_section_t *a,	/* I - First section */
+                 _cups_section_t *b)	/* I - Second section */
+{
+  return (strcasecmp(a->name, b->name));
+}
+
+
+/*
+ * 'compare_sections_files()' - Compare the number of files and section names.
+ */
+
+static int				/* O - Result of comparison */
+compare_sections_files(
+    _cups_section_t *a,			/* I - First section */
+    _cups_section_t *b)			/* I - Second section */
+{
+  int	ret = cupsArrayCount(b->files) - cupsArrayCount(a->files);
+
+  if (ret)
+    return (ret);
+  else
+    return (strcasecmp(a->name, b->name));
+}
+
+
+/*
+ * 'write_index()' - Write an index file for the CUPS help.
+ */
+
+static void
+write_index(const char   *path,		/* I - File to write */
+            help_index_t *hi)		/* I - Index of files */
+{
+  cups_file_t		*fp;		/* Output file */
+  help_node_t		*node;		/* Current help node */
+  _cups_section_t	*section,	/* Current section */
+			key;		/* Section search key */
+  _cups_html_t		*html;		/* Current HTML file */
+  cups_array_t		*sections,	/* Sections in index */
+			*sections_files,/* Sections sorted by size */
+			*columns[3];	/* Columns in final HTML file */
+  int			column,		/* Current column */
+			lines[3],	/* Number of lines in each column */
+			min_column,	/* Smallest column */
+			min_lines;	/* Smallest number of lines */
+
+
+ /*
+  * Build an array of sections and their files.
+  */
+
+  sections = cupsArrayNew((cups_array_func_t)compare_sections, NULL);
+
+  for (node = (help_node_t *)cupsArrayFirst(hi->nodes);
+       node;
+       node = (help_node_t *)cupsArrayNext(hi->nodes))
+  {
+    if (node->anchor)
+      continue;
+
+    key.name = node->section ? node->section : "Miscellaneous";
+    if ((section = (_cups_section_t *)cupsArrayFind(sections, &key)) == NULL)
+    {
+      section        = (_cups_section_t *)calloc(1, sizeof(_cups_section_t));
+      section->name  = key.name;
+      section->files = cupsArrayNew((cups_array_func_t)compare_html, NULL);
+
+      cupsArrayAdd(sections, section);
+    }
+
+    html = (_cups_html_t *)calloc(1, sizeof(_cups_html_t));
+    html->path  = node->filename;
+    html->title = node->text;
+
+    cupsArrayAdd(section->files, html);
+  }
+
+ /*
+  * Build a sorted list of sections based on the number of files in each section
+  * and the section name...
+  */
+
+  sections_files = cupsArrayNew((cups_array_func_t)compare_sections_files,
+                                NULL);
+  for (section = (_cups_section_t *)cupsArrayFirst(sections);
+       section;
+       section = (_cups_section_t *)cupsArrayNext(sections))
+    cupsArrayAdd(sections_files, section);
+
+ /*
+  * Then build three columns to hold everything, trying to balance the number of
+  * lines in each column...
+  */
+
+  for (column = 0; column < 3; column ++)
+  {
+    columns[column] = cupsArrayNew((cups_array_func_t)compare_sections, NULL);
+    lines[column]   = 0;
+  }
+
+  for (section = (_cups_section_t *)cupsArrayFirst(sections_files);
+       section;
+       section = (_cups_section_t *)cupsArrayNext(sections_files))
+  {
+    for (min_column = 0, min_lines = lines[0], column = 1;
+         column < 3;
+	 column ++)
+    {
+      if (lines[column] < min_lines)
+      {
+        min_column = column;
+        min_lines  = lines[column];
+      }
+    }
+
+    cupsArrayAdd(columns[min_column], section);
+    lines[min_column] += cupsArrayCount(section->files) + 2;
+  }
+
+ /*
+  * Write the HTML file...
+  */
+
+  if ((fp = cupsFileOpen(path, "w")) == NULL)
+  {
+    fprintf(stderr, "makedocset: Unable to create %s: %s\n", path,
+            strerror(errno));
+    exit(1);
+  }
+
+  cupsFilePuts(fp, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 "
+                   "Transitional//EN\" "
+		   "\"http://www.w3.org/TR/html4/loose.dtd\">\n"
+		   "<html>\n"
+		   "<head>\n"
+		   "<title>CUPS Documentation</title>\n"
+		   "<link rel='stylesheet' type='text/css' "
+		   "href='cups-printable.css'>\n"
+		   "</head>\n"
+		   "<body>\n"
+		   "<h1 class='title'>CUPS Documentation</h1>\n"
+		   "<table width='100%' summary=''>\n"
+		   "<tr>\n");
+
+  for (column = 0; column < 3; column ++)
+  {
+    if (column)
+      cupsFilePuts(fp, "<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>\n");
+
+    cupsFilePuts(fp, "<td valign='top' width='33%'>");
+    for (section = (_cups_section_t *)cupsArrayFirst(columns[column]);
+         section;
+	 section = (_cups_section_t *)cupsArrayNext(columns[column]))
+    {
+      cupsFilePrintf(fp, "<h2 class='title'>%s</h2>\n", section->name);
+      for (html = (_cups_html_t *)cupsArrayFirst(section->files);
+           html;
+	   html = (_cups_html_t *)cupsArrayNext(section->files))
+	cupsFilePrintf(fp, "<p class='compact'><a href='%s'>%s</a></p>\n",
+	               html->path, html->title);
+    }
+    cupsFilePuts(fp, "</td>\n");
+  }
+  cupsFilePuts(fp, "</tr>\n"
+                   "</table>\n"
+		   "</body>\n"
+		   "</html>\n");
+  cupsFileClose(fp);
+}
+
+
+/*
+ * 'write_info()' - Write the Info.plist file.
+ */
+
+static void
+write_info(const char *path,		/* I - File to write */
+           const char *revision)	/* I - Subversion revision number */
+{
+  cups_file_t	*fp;			/* File */
+
+
+  if ((fp = cupsFileOpen(path, "w")) == NULL)
+  {
+    fprintf(stderr, "makedocset: Unable to create %s: %s\n", path,
+            strerror(errno));
+    exit(1);
+  }
+
+  cupsFilePrintf(fp, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+		     "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" "
+		     "\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
+		     "<plist version=\"1.0\">\n"
+		     "<dict>\n"
+		     "\t<key>CFBundleIdentifier</key>\n"
+		     "\t<string>org.cups.docset</string>\n"
+		     "\t<key>CFBundleName</key>\n"
+		     "\t<string>CUPS Documentation</string>\n"
+		     "\t<key>CFBundleVersion</key>\n"
+		     "\t<string>%d.%d.%s</string>\n"
+		     "\t<key>CFBundleShortVersionString</key>\n"
+		     "\t<string>%d.%d.%d</string>\n"
+		     "\t<key>DocSetFeedName</key>\n"
+		     "\t<string>cups.org</string>\n"
+		     "\t<key>DocSetFeedURL</key>\n"
+		     "\t<string>http://www.cups.org/org.cups.docset.atom"
+		     "</string>\n"
+		     "\t<key>DocSetPublisherIdentifier</key>\n"
+		     "\t<string>org.cups</string>\n"
+		     "\t<key>DocSetPublisherName</key>\n"
+		     "\t<string>CUPS</string>\n"
+		     "</dict>\n"
+		     "</plist>\n",
+		     CUPS_VERSION_MAJOR, CUPS_VERSION_MINOR, revision,
+		     CUPS_VERSION_MAJOR, CUPS_VERSION_MINOR, CUPS_VERSION_PATCH);
+
+  cupsFileClose(fp);
+}
+
+
+/*
+ * 'write_nodes()' - Write the Nodes.xml file.
+ */
+
+static void
+write_nodes(const char   *path,		/* I - File to write */
+            help_index_t *hi)		/* I - Index of files */
+{
+  cups_file_t	*fp;			/* Output file */
+  int		id;			/* Current node ID */
+  help_node_t	*node;			/* Current help node */
+  int		subnodes;		/* Currently in Subnodes for file? */
+  int		needclose;		/* Need to close the current node? */
+
+
+  if ((fp = cupsFileOpen(path, "w")) == NULL)
+  {
+    fprintf(stderr, "makedocset: Unable to create %s: %s\n", path,
+            strerror(errno));
+    exit(1);
+  }
+
+  cupsFilePuts(fp, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+		   "<DocSetNodes version=\"1.0\">\n"
+		   "<TOC>\n"
+		   "<Node id=\"0\">\n"
+		   "<Name>CUPS Documentation</Name>\n"
+		   "<Path>Documentation/index.html</Path>\n"
+		   "</Node>\n");
+
+  for (node = (help_node_t *)cupsArrayFirst(hi->nodes), id = 1, subnodes = 0,
+           needclose = 0;
+       node;
+       node = (help_node_t *)cupsArrayNext(hi->nodes), id ++)
+  {
+    if (node->anchor)
+    {
+      if (!subnodes)
+      {
+        cupsFilePuts(fp, "<Subnodes>\n");
+	subnodes = 1;
+      }
+	
+      cupsFilePrintf(fp, "<Node id=\"%d\">\n"
+                         "<Path>Documentation/%s</Path>\n"
+			 "<Anchor>%s</Anchor>\n"
+			 "<Name>%s</Name>\n"
+			 "</Node>\n", id, node->filename, node->anchor,
+		     node->text);
+    }
+    else
+    {
+      if (subnodes)
+      {
+        cupsFilePuts(fp, "</Subnodes>\n");
+	subnodes = 0;
+      }
+
+      if (needclose)
+        cupsFilePuts(fp, "</Node>\n");
+
+      cupsFilePrintf(fp, "<Node id=\"%d\">\n"
+                         "<Path>Documentation/%s</Path>\n"
+			 "<Name>%s</Name>\n", id, node->filename, node->text);
+      needclose = 1;
+    }
+  }
+
+  if (subnodes)
+    cupsFilePuts(fp, "</Subnodes>\n");
+
+  if (needclose)
+    cupsFilePuts(fp, "</Node>\n");
+
+  cupsFilePuts(fp, "</TOC>\n"
+		   "</DocSetNodes>\n");
+
+  cupsFileClose(fp);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,36 +1,41 @@
 /*
 * "$Id$"
 *
- *   Printer status CGI for the Common UNIX Printing System (CUPS).
+ *   Printer status CGI for CUPS.
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   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/".
 *
 * Contents:
 *
- *   main() - Main entry for CGI.
+ *   main()              - Main entry for CGI.
+ *   do_printer_op()     - Do a printer operation.
+ *   show_all_printers() - Show all printers...
+ *   show_printer()      - Show a single printer.
 */

 /*
 * Include necessary headers...
 */

-#include "ipp-var.h"
+#include "cgi-private.h"
+#include <errno.h>
+
+
+/*
+ * Local functions...
+ */
+
+static void	do_printer_op(http_t *http, const char *printer, ipp_op_t op,
+		              const char *title);
+static void	show_all_printers(http_t *http, const char *username);
+static void	show_printer(http_t *http, const char *printer);


 /*
@@ -41,17 +46,14 @@ int					/* O - Exit status */
 main(int  argc,				/* I - Number of command-line arguments */
     char *argv[])			/* I - Command-line arguments */
 {
-  cups_lang_t	*language;		/* Language information */
-  char		*printer;		/* Printer name */
+  const char	*printer;		/* Printer name */
+  const char	*user;			/* Username */
  http_t	*http;			/* Connection to the server */
  ipp_t		*request,		/* IPP request */
 		*response;		/* IPP response */
  ipp_attribute_t *attr;		/* IPP attribute */
-  ipp_status_t	status;			/* Operation status... */
-  char		uri[HTTP_MAX_URI];	/* Printer URI */
-  const char	*which_jobs;		/* Which jobs to show */
  const char	*op;			/* Operation to perform, if any */
-  static const char	*def_attrs[] =	/* Attributes for default printer */
+  static const char *def_attrs[] =	/* Attributes for default printer */
 		{
 		  "printer-name",
 		  "printer-uri-supported"
@@ -63,60 +65,54 @@ main(int  argc,				/* I - Number of command-line arguments */
  */

  cgiInitialize();
+
  op = cgiGetVariable("OP");

 /*
-  * Get the request language...
+  * Set the web interface section...
  */

-  language = cupsLangDefault();
+  cgiSetVariable("SECTION", "printers");
+  cgiSetVariable("REFRESH_PAGE", "");
+
+ /*
+  * See if we are displaying a printer or all printers...
+  */
+
+  if ((printer = getenv("PATH_INFO")) != NULL)
+  {
+    printer ++;
+
+    if (!*printer)
+      printer = NULL;
+
+    if (printer)
+      cgiSetVariable("PRINTER_NAME", printer);
+  }
+
+ /*
+  * See who is logged in...
+  */
+
+  user = getenv("REMOTE_USER");

 /*
  * Connect to the HTTP server...
  */

-  http = httpConnectEncrypt("localhost", ippPort(), cupsEncryption());
+  http = httpConnectEncrypt(cupsServer(), ippPort(), cupsEncryption());

 /*
-  * Tell the client to expect HTML...
+  * Get the default printer...
  */

-  printf("Content-Type: text/html;charset=%s\r\n\r\n",
-         cupsLangEncoding(language));
-
- /*
-  * See if we need to show a list of printers or the status of a
-  * single printer...
-  */
-
-  ippSetServerVersion();
-
-  printer = argv[0];
-  if (strcmp(printer, "/") == 0 || strstr(printer, "printers.cgi") != NULL)
-  {
-    printer = NULL;
-    cgiSetVariable("TITLE", cupsLangString(language, CUPS_MSG_PRINTER));
-  }
-  else
-    cgiSetVariable("TITLE", printer);
-
-  cgiCopyTemplateLang(stdout, TEMPLATES, "header.tmpl", getenv("LANG"));
-
-  if (op == NULL || strcasecmp(op, "print-test-page") != 0)
+  if (!op || !cgiIsPOST())
  {
   /*
    * Get the default destination...
    */

-    request = ippNew();
-    request->request.op.operation_id = CUPS_GET_DEFAULT;
-    request->request.op.request_id   = 1;
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-        	 "attributes-charset", NULL, cupsLangEncoding(language));
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-        	 "attributes-natural-language", NULL, language->language);
+    request = ippNewRequest(CUPS_GET_DEFAULT);

    ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                  "requested-attributes",
@@ -129,245 +125,92 @@ main(int  argc,				/* I - Number of command-line arguments */

      if ((attr = ippFindAttribute(response, "printer-uri-supported", IPP_TAG_URI)) != NULL)
      {
-	char	method[HTTP_MAX_URI],
-		username[HTTP_MAX_URI],
-		hostname[HTTP_MAX_URI],
-		resource[HTTP_MAX_URI],
-		uri[HTTP_MAX_URI];
-	int	port;			/* URI data */
-	const char *server;		/* Name of server */
+	char	url[HTTP_MAX_URI];	/* New URL */


-       /*
-	* Map localhost access to localhost...
-	*/
-
-        server = getenv("SERVER_NAME");
-
-	httpSeparate(attr->values[0].string.text, method, username,
-		     hostname, &port, resource);
-
-	if (strcasecmp(hostname, server) == 0 &&
-	    (strcmp(getenv("REMOTE_HOST"), "127.0.0.1") == 0 ||
-	     strcmp(getenv("REMOTE_HOST"), "localhost") == 0 ||
-	     strcmp(getenv("REMOTE_HOST"), server) == 0))
-	  strcpy(hostname, "localhost");
-
-       /*
-	* Rewrite URI with HTTP address...
-	*/
-
-	snprintf(uri, sizeof(uri), "http://%s:%d%s", hostname, port,
-		 resource);
-
-        cgiSetVariable("DEFAULT_URI", uri);
+        cgiSetVariable("DEFAULT_URI",
+	               cgiRewriteURL(attr->values[0].string.text,
+		                     url, sizeof(url), NULL));
      }

      ippDelete(response);
    }

   /*
-    * Get the printer info...
+    * See if we need to show a list of printers or the status of a
+    * single printer...
    */

-    request = ippNew();
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-        	 "attributes-charset", NULL, cupsLangEncoding(language));
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-        	 "attributes-natural-language", NULL, language->language);
-
-    if (printer == NULL)
+    if (!printer)
+      show_all_printers(http, user);
+    else
+      show_printer(http, printer);
+  }
+  else if (printer)
+  {
+    if (!*op)
    {
-     /*
-      * Build a CUPS_GET_PRINTERS request, which requires the following
-      * attributes:
-      *
-      *    attributes-charset
-      *    attributes-natural-language
-      */
+      const char *server_port = getenv("SERVER_PORT");
+					/* Port number string */
+      int	port = atoi(server_port ? server_port : "0");
+      					/* Port number */
+      char	uri[1024];		/* URL */

-      request->request.op.operation_id = CUPS_GET_PRINTERS;
-      request->request.op.request_id   = 1;
+      httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri),
+		       getenv("HTTPS") ? "https" : "http", NULL,
+		       getenv("SERVER_NAME"), port, "/printers/%s", printer);
+
+      printf("Location: %s\n\n", uri);
    }
+    else if (!strcmp(op, "start-printer"))
+      do_printer_op(http, printer, IPP_RESUME_PRINTER,
+                    cgiText(_("Resume Printer")));
+    else if (!strcmp(op, "stop-printer"))
+      do_printer_op(http, printer, IPP_PAUSE_PRINTER,
+                    cgiText(_("Pause Printer")));
+    else if (!strcmp(op, "accept-jobs"))
+      do_printer_op(http, printer, CUPS_ACCEPT_JOBS, cgiText(_("Accept Jobs")));
+    else if (!strcmp(op, "reject-jobs"))
+      do_printer_op(http, printer, CUPS_REJECT_JOBS, cgiText(_("Reject Jobs")));
+    else if (!strcmp(op, "purge-jobs"))
+      do_printer_op(http, printer, IPP_PURGE_JOBS, cgiText(_("Purge Jobs")));
+    else if (!strcasecmp(op, "print-self-test-page"))
+      cgiPrintCommand(http, printer, "PrintSelfTestPage",
+                      cgiText(_("Print Self-Test Page")));
+    else if (!strcasecmp(op, "clean-print-heads"))
+      cgiPrintCommand(http, printer, "Clean all",
+                      cgiText(_("Clean Print Heads")));
+    else if (!strcasecmp(op, "print-test-page"))
+      cgiPrintTestPage(http, printer);
+    else if (!strcasecmp(op, "move-jobs"))
+      cgiMoveJobs(http, printer, 0);
    else
    {
     /*
-      * Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the following
-      * attributes:
-      *
-      *    attributes-charset
-      *    attributes-natural-language
-      *    printer-uri
+      * Unknown/bad operation...
      */

-      request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
-      request->request.op.request_id   = 1;
-
-      snprintf(uri, sizeof(uri), "ipp://%s/printers/%s", getenv("SERVER_NAME"),
-               printer);
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL,
-                   uri);
-    }
-
-    ippGetAttributes(request, TEMPLATES, "printers.tmpl", getenv("LANG"));
-
-   /*
-    * Do the request and get back a response...
-    */
-
-    if ((response = cupsDoRequest(http, request, "/")) != NULL)
-    {
-      ippSetCGIVars(response, NULL, NULL, NULL, 0);
-      ippDelete(response);
-    }
-    else if (printer)
-      fprintf(stderr, "ERROR: Get-Printer-Attributes request failed - %s (%x)\n",
-              ippErrorString(cupsLastError()), cupsLastError());
-    else
-      fprintf(stderr, "ERROR: CUPS-Get-Printers request failed - %s (%x)\n",
-              ippErrorString(cupsLastError()), cupsLastError());
-
-   /*
-    * Write the report...
-    */
-
-    cgiCopyTemplateLang(stdout, TEMPLATES, "printers.tmpl", getenv("LANG"));
-
-   /*
-    * Get jobs for the specified printer if a printer has been chosen...
-    */
-
-    if (printer != NULL)
-    {
-     /*
-      * Build an IPP_GET_JOBS request, which requires the following
-      * attributes:
-      *
-      *    attributes-charset
-      *    attributes-natural-language
-      *    printer-uri
-      */
-
-      request = ippNew();
-
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-        	   "attributes-charset", NULL, cupsLangEncoding(language));
-
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-        	   "attributes-natural-language", NULL, language->language);
-
-      request->request.op.operation_id = IPP_GET_JOBS;
-      request->request.op.request_id   = 1;
-
-      snprintf(uri, sizeof(uri), "ipp://%s/printers/%s", getenv("SERVER_NAME"),
-               printer);
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL,
-                   uri);
-
-      if ((which_jobs = cgiGetVariable("which_jobs")) != NULL)
-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "which-jobs",
-                     NULL, which_jobs);
-
-      ippGetAttributes(request, TEMPLATES, "jobs.tmpl", getenv("LANG"));
-
-     /*
-      * Do the request and get back a response...
-      */
-
-      if ((response = cupsDoRequest(http, request, "/")) != NULL)
-      {
-	ippSetCGIVars(response, NULL, NULL, NULL, 0);
-	ippDelete(response);
-
-	cgiCopyTemplateLang(stdout, TEMPLATES, "jobs.tmpl", getenv("LANG"));
-      }
-      else
-	fprintf(stderr, "ERROR: Get-Jobs request failed - %s (%x)\n",
-        	ippErrorString(cupsLastError()), cupsLastError());
+      cgiStartHTML(printer);
+      cgiCopyTemplateLang("error-op.tmpl");
+      cgiEndHTML();
    }
  }
  else
  {
   /*
-    * Print a test page...
+    * Unknown/bad operation...
    */

-    snprintf(uri, sizeof(uri), "ipp://localhost/printers/%s", printer);
-
-   /*
-    * Build an IPP_PRINT_JOB request, which requires the following
-    * attributes:
-    *
-    *    attributes-charset
-    *    attributes-natural-language
-    *    printer-uri
-    *    requesting-user-name
-    *    document-format
-    */
-
-    request = ippNew();
-
-    request->request.op.operation_id = IPP_PRINT_JOB;
-    request->request.op.request_id   = 1;
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-        	 "attributes-charset", NULL, cupsLangEncoding(language));
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-        	 "attributes-natural-language", NULL, language->language);
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
-        	 NULL, uri);
-
-    if (getenv("REMOTE_USER") != NULL)
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
-                   NULL, getenv("REMOTE_USER"));
-    else
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
-                   NULL, "root");
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name",
-        	 NULL, "Test Page");
-
-    ippAddString(request, IPP_TAG_JOB, IPP_TAG_MIMETYPE, "document-format",
-        	 NULL, "application/postscript");
-
-   /*
-    * Do the request and get back a response...
-    */
-
-    if ((response = cupsDoFileRequest(http, request, uri + 15,
-                                      CUPS_DATADIR "/data/testprint.ps")) != NULL)
-    {
-      status = response->request.status.status_code;
-      ippSetCGIVars(response, NULL, NULL, NULL, 0);
-
-      ippDelete(response);
-    }
-    else
-      status = cupsLastError();
-
-    cgiSetVariable("PRINTER_NAME", printer);
-
-    if (status > IPP_OK_CONFLICT)
-    {
-      cgiSetVariable("ERROR", ippErrorString(status));
-      cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
-    }
-    else
-      cgiCopyTemplateLang(stdout, TEMPLATES, "test-page.tmpl", getenv("LANG"));
+    cgiStartHTML(cgiText(_("Printers")));
+    cgiCopyTemplateLang("error-op.tmpl");
+    cgiEndHTML();
  }

-  cgiCopyTemplateLang(stdout, TEMPLATES, "trailer.tmpl", getenv("LANG"));
-
 /*
  * Close the HTTP server connection...
  */

  httpClose(http);
-  cupsLangFree(language);

 /*
  * Return with no errors...
@@ -377,6 +220,359 @@ main(int  argc,				/* I - Number of command-line arguments */
 }


+/*
+ * 'do_printer_op()' - Do a printer operation.
+ */
+
+static void
+do_printer_op(http_t      *http,	/* I - HTTP connection */
+              const char  *printer,	/* I - Printer name */
+	      ipp_op_t    op,		/* I - Operation to perform */
+	      const char  *title)	/* I - Title of page */
+{
+  ipp_t		*request;		/* IPP request */
+  char		uri[HTTP_MAX_URI],	/* Printer URI */
+		resource[HTTP_MAX_URI];	/* Path for request */
+
+
+ /*
+  * Build a printer request, which requires the following
+  * attributes:
+  *
+  *    attributes-charset
+  *    attributes-natural-language
+  *    printer-uri
+  */
+
+  request = ippNewRequest(op);
+
+  httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
+                   "localhost", 0, "/printers/%s", printer);
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
+               NULL, uri);
+
+ /*
+  * Do the request and get back a response...
+  */
+
+  snprintf(resource, sizeof(resource), "/printers/%s", printer);
+  ippDelete(cupsDoRequest(http, request, resource));
+
+  if (cupsLastError() == IPP_NOT_AUTHORIZED)
+  {
+    puts("Status: 401\n");
+    exit(0);
+  }
+  else if (cupsLastError() > IPP_OK_CONFLICT)
+  {
+    cgiStartHTML(title);
+    cgiShowIPPError(_("Unable to do maintenance command:"));
+  }
+  else
+  {
+   /*
+    * Redirect successful updates back to the printer page...
+    */
+
+    char	url[1024],		/* Printer/class URL */
+		refresh[1024];		/* Refresh URL */
+
+
+    cgiRewriteURL(uri, url, sizeof(url), NULL);
+    cgiFormEncode(uri, url, sizeof(uri));
+    snprintf(refresh, sizeof(refresh), "5;URL=%s", uri);
+    cgiSetVariable("refresh_page", refresh);
+
+    cgiStartHTML(title);
+
+    if (op == IPP_PAUSE_PRINTER)
+      cgiCopyTemplateLang("printer-stop.tmpl");
+    else if (op == IPP_RESUME_PRINTER)
+      cgiCopyTemplateLang("printer-start.tmpl");
+    else if (op == CUPS_ACCEPT_JOBS)
+      cgiCopyTemplateLang("printer-accept.tmpl");
+    else if (op == CUPS_REJECT_JOBS)
+      cgiCopyTemplateLang("printer-reject.tmpl");
+    else if (op == IPP_PURGE_JOBS)
+      cgiCopyTemplateLang("printer-purge.tmpl");
+  }
+
+  cgiEndHTML();
+}
+
+
+/*
+ * 'show_all_printers()' - Show all printers...
+ */
+
+static void
+show_all_printers(http_t     *http,	/* I - Connection to server */
+                  const char *user)	/* I - Username */
+{
+  int			i;		/* Looping var */
+  ipp_t			*request,	/* IPP request */
+			*response;	/* IPP response */
+  cups_array_t		*printers;	/* Array of printer objects */
+  ipp_attribute_t	*printer;	/* Printer object */
+  int			ascending,	/* Order of printers (0 = descending) */
+			first,		/* First printer to show */
+			count;		/* Number of printers */
+  const char		*var;		/* Form variable */
+  void			*search;	/* Search data */
+  char			val[1024];	/* Form variable */
+
+
+  fprintf(stderr, "DEBUG: show_all_printers(http=%p, user=\"%s\")\n",
+          http, user ? user : "(null)");
+
+ /*
+  * Show the standard header...
+  */
+
+  cgiStartHTML(cgiText(_("Printers")));
+
+ /*
+  * Build a CUPS_GET_PRINTERS request, which requires the following
+  * attributes:
+  *
+  *    attributes-charset
+  *    attributes-natural-language
+  *    printer-type
+  *    printer-type-mask
+  *    requesting-user-name
+  */
+
+  request = ippNewRequest(CUPS_GET_PRINTERS);
+
+  ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_ENUM,
+                "printer-type", 0);
+  ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_ENUM,
+                "printer-type-mask", CUPS_PRINTER_CLASS);
+
+  if (user)
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+        	 "requesting-user-name", NULL, user);
+
+  cgiGetAttributes(request, "printers.tmpl");
+
+ /*
+  * Do the request and get back a response...
+  */
+
+  if ((response = cupsDoRequest(http, request, "/")) != NULL)
+  {
+   /*
+    * Get a list of matching job objects.
+    */
+
+    if ((var = cgiGetVariable("QUERY")) != NULL &&
+        !cgiGetVariable("CLEAR"))
+      search = cgiCompileSearch(var);
+    else
+      search = NULL;
+
+    printers  = cgiGetIPPObjects(response, search);
+    count     = cupsArrayCount(printers);
+
+    if (search)
+      cgiFreeSearch(search);
+
+   /*
+    * Figure out which printers to display...
+    */
+
+    if ((var = cgiGetVariable("FIRST")) != NULL)
+      first = atoi(var);
+    else
+      first = 0;
+
+    if (first >= count)
+      first = count - CUPS_PAGE_MAX;
+
+    first = (first / CUPS_PAGE_MAX) * CUPS_PAGE_MAX;
+
+    if (first < 0)
+      first = 0;
+
+    sprintf(val, "%d", count);
+    cgiSetVariable("TOTAL", val);
+
+    if ((var = cgiGetVariable("ORDER")) != NULL)
+      ascending = !strcasecmp(var, "asc");
+    else
+      ascending = 1;
+
+    if (ascending)
+    {
+      for (i = 0, printer = (ipp_attribute_t *)cupsArrayIndex(printers, first);
+	   i < CUPS_PAGE_MAX && printer;
+	   i ++, printer = (ipp_attribute_t *)cupsArrayNext(printers))
+        cgiSetIPPObjectVars(printer, NULL, i);
+    }
+    else
+    {
+      for (i = 0, printer = (ipp_attribute_t *)cupsArrayIndex(printers, count - first - 1);
+	   i < CUPS_PAGE_MAX && printer;
+	   i ++, printer = (ipp_attribute_t *)cupsArrayPrev(printers))
+        cgiSetIPPObjectVars(printer, NULL, i);
+    }
+
+   /*
+    * Save navigation URLs...
+    */
+
+    cgiSetVariable("THISURL", "/printers/");
+
+    if (first > 0)
+    {
+      sprintf(val, "%d", first - CUPS_PAGE_MAX);
+      cgiSetVariable("PREV", val);
+    }
+
+    if ((first + CUPS_PAGE_MAX) < count)
+    {
+      sprintf(val, "%d", first + CUPS_PAGE_MAX);
+      cgiSetVariable("NEXT", val);
+    }
+
+   /*
+    * Then show everything...
+    */
+
+    cgiCopyTemplateLang("search.tmpl");
+
+    cgiCopyTemplateLang("printers-header.tmpl");
+
+    if (count > CUPS_PAGE_MAX)
+      cgiCopyTemplateLang("pager.tmpl");
+
+    cgiCopyTemplateLang("printers.tmpl");
+
+    if (count > CUPS_PAGE_MAX)
+      cgiCopyTemplateLang("pager.tmpl");
+
+   /*
+    * Delete the response...
+    */
+
+    cupsArrayDelete(printers);
+    ippDelete(response);
+  }
+  else
+  {
+   /*
+    * Show the error...
+    */
+
+    cgiShowIPPError(_("Unable to get printer list:"));
+  }
+
+   cgiEndHTML();
+}
+
+
+/*
+ * 'show_printer()' - Show a single printer.
+ */
+
+static void
+show_printer(http_t     *http,		/* I - Connection to server */
+             const char *printer)	/* I - Name of printer */
+{
+  ipp_t		*request,		/* IPP request */
+		*response;		/* IPP response */
+  ipp_attribute_t *attr;		/* IPP attribute */
+  char		uri[HTTP_MAX_URI];	/* Printer URI */
+  char		refresh[1024];		/* Refresh URL */
+
+
+  fprintf(stderr, "DEBUG: show_printer(http=%p, printer=\"%s\")\n",
+          http, printer ? printer : "(null)");
+
+ /*
+  * Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the following
+  * attributes:
+  *
+  *    attributes-charset
+  *    attributes-natural-language
+  *    printer-uri
+  */
+
+  request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
+
+  httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
+                   "localhost", 0, "/printers/%s", printer);
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL,
+               uri);
+
+  cgiGetAttributes(request, "printer.tmpl");
+
+ /*
+  * Do the request and get back a response...
+  */
+
+  if ((response = cupsDoRequest(http, request, "/")) != NULL)
+  {
+   /*
+    * Got the result; set the CGI variables and check the status of a
+    * single-queue request...
+    */
+
+    cgiSetIPPVars(response, NULL, NULL, NULL, 0);
+
+    if (printer && (attr = ippFindAttribute(response, "printer-state",
+                                            IPP_TAG_ENUM)) != NULL &&
+        attr->values[0].integer == IPP_PRINTER_PROCESSING)
+    {
+     /*
+      * Printer is processing - automatically refresh the page until we
+      * are done printing...
+      */
+
+      cgiFormEncode(uri, printer, sizeof(uri));
+      snprintf(refresh, sizeof(refresh), "10;URL=/printers/%s", uri);
+      cgiSetVariable("refresh_page", refresh);
+    }
+
+   /*
+    * Delete the response...
+    */
+
+    ippDelete(response);
+
+   /*
+    * Show the standard header...
+    */
+
+    cgiStartHTML(printer);
+
+   /*
+    * Show the printer status...
+    */
+
+    cgiCopyTemplateLang("printer.tmpl");
+
+   /*
+    * Show jobs for the specified printer...
+    */
+
+    cgiCopyTemplateLang("printer-jobs-header.tmpl");
+    cgiShowJobs(http, printer);
+  }
+  else
+  {
+   /*
+    * Show the IPP error...
+    */
+
+    cgiStartHTML(printer);
+    cgiShowIPPError(_("Unable to get printer status:"));
+  }
+
+   cgiEndHTML();
+}
+
+
 /*
 * End of "$Id$".
 */
@@ -0,0 +1,381 @@
+/*
+ * "$Id$"
+ *
+ *   Search routines for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 1997-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/".
+ *
+ * Contents:
+ *
+ *   cgiCompileSearch() - Compile a search string.
+ *   cgiDoSearch()      - Do a search of some text.
+ *   cgiFreeSearch()    - Free a compiled search context.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "cgi-private.h"
+#include <regex.h>
+
+
+/*
+ * 'cgiCompileSearch()' - Compile a search string.
+ */
+
+void *					/* O - Search context */
+cgiCompileSearch(const char *query)	/* I - Query string */
+{
+  regex_t	*re;			/* Regular expression */
+  char		*s,			/* Regular expression string */
+		*sptr,			/* Pointer into RE string */
+		*sword;			/* Pointer to start of word */
+  int		slen;			/* Allocated size of RE string */
+  const char	*qptr,			/* Pointer into query string */
+		*qend;			/* End of current word */
+  const char	*prefix;		/* Prefix to add to next word */
+  int		quoted;			/* Word is quoted */
+  int		wlen;			/* Word length */
+  char		*lword;			/* Last word in query */
+
+
+  DEBUG_printf(("cgiCompileSearch(query=\"%s\")\n", query));
+
+ /*
+  * Range check input...
+  */
+
+  if (!query)
+    return (NULL);
+
+ /*
+  * Allocate a regular expression storage structure...
+  */
+
+  if ((re = (regex_t *)calloc(1, sizeof(regex_t))) == NULL)
+    return (NULL);
+
+ /*
+  * Allocate a buffer to hold the regular expression string, starting
+  * at 1024 bytes or 3 times the length of the query string, whichever
+  * is greater.  We'll expand the string as needed...
+  */
+
+  slen = strlen(query) * 3;
+  if (slen < 1024)
+    slen = 1024;
+
+  if ((s = (char *)malloc(slen)) == NULL)
+  {
+    free(re);
+    return (NULL);
+  }
+
+ /*
+  * Copy the query string to the regular expression, handling basic
+  * AND and OR logic...
+  */
+
+  prefix = ".*";
+  qptr   = query;
+  sptr   = s;
+  lword  = NULL;
+
+  while (*qptr)
+  {
+   /*
+    * Skip leading whitespace...
+    */
+
+    while (isspace(*qptr & 255))
+      qptr ++;
+
+    if (!*qptr)
+      break;
+
+   /*
+    * Find the end of the current word...
+    */
+
+    if (*qptr == '\"' || *qptr == '\'')
+    {
+     /*
+      * Scan quoted string...
+      */
+
+      quoted = *qptr ++;
+      for (qend = qptr; *qend && *qend != quoted; qend ++);
+
+      if (!*qend)
+      {
+       /*
+        * No closing quote, error out!
+	*/
+
+	free(s);
+	free(re);
+
+	if (lword)
+          free(lword);
+
+	return (NULL);
+      }
+    }
+    else
+    {
+     /*
+      * Scan whitespace-delimited string...
+      */
+
+      quoted = 0;
+      for (qend = qptr + 1; *qend && !isspace(*qend); qend ++);
+    }
+
+    wlen = qend - qptr;
+
+   /*
+    * Look for logic words: AND, OR
+    */
+
+    if (wlen == 3 && !strncasecmp(qptr, "AND", 3))
+    {
+     /*
+      * Logical AND with the following text...
+      */
+
+      if (sptr > s)
+        prefix = ".*";
+
+      qptr = qend;
+    }
+    else if (wlen == 2 && !strncasecmp(qptr, "OR", 2))
+    {
+     /*
+      * Logical OR with the following text...
+      */
+
+      if (sptr > s)
+        prefix = ".*|.*";
+
+      qptr = qend;
+    }
+    else
+    {
+     /*
+      * Add a search word, making sure we have enough room for the
+      * string + RE overhead...
+      */
+
+      wlen = (sptr - s) + 2 * 4 * wlen + 2 * strlen(prefix) + 11;
+      if (lword)
+        wlen += strlen(lword);
+
+      if (wlen > slen)
+      {
+       /*
+        * Expand the RE string buffer...
+	*/
+
+        char *temp;			/* Temporary string pointer */
+
+
+	slen = wlen + 128;
+        temp = (char *)realloc(s, slen);
+	if (!temp)
+	{
+	  free(s);
+	  free(re);
+
+	  if (lword)
+            free(lword);
+
+	  return (NULL);
+	}
+
+        sptr = temp + (sptr - s);
+	s    = temp;
+      }
+
+     /*
+      * Add the prefix string...
+      */
+
+      strcpy(sptr, prefix);
+      sptr += strlen(sptr);
+
+     /*
+      * Then quote the remaining word characters as needed for the
+      * RE...
+      */
+
+      sword = sptr;
+
+      while (qptr < qend)
+      {
+       /*
+        * Quote: ^ . [ $ ( ) | * + ? { \
+	*/
+
+        if (strchr("^.[$()|*+?{\\", *qptr))
+	  *sptr++ = '\\';
+
+	*sptr++ = *qptr++;
+      }
+
+      *sptr = '\0';
+
+     /*
+      * For "word1 AND word2", add reciprocal "word2 AND word1"...
+      */
+
+      if (!strcmp(prefix, ".*") && lword)
+      {
+        char *lword2;			/* New "last word" */
+
+
+        if ((lword2 = strdup(sword)) == NULL)
+	{
+	  free(lword);
+	  free(s);
+	  free(re);
+	  return (NULL);
+	}
+
+        strcpy(sptr, ".*|.*");
+	sptr += 5;
+
+	strcpy(sptr, lword2);
+	sptr += strlen(sptr);
+
+        strcpy(sptr, ".*");
+	sptr += 2;
+
+	strcpy(sptr, lword);
+	sptr += strlen(sptr);
+
+        free(lword);
+	lword = lword2;
+      }
+      else
+      {
+	if (lword)
+          free(lword);
+
+	lword = strdup(sword);
+      }
+
+      prefix = ".*|.*";
+    }
+
+   /*
+    * Advance to the next string...
+    */
+
+    if (quoted)
+      qptr ++;
+  }
+
+  if (lword)
+    free(lword);
+
+  if (sptr > s)
+    strcpy(sptr, ".*");
+  else
+  {
+   /*
+    * No query data, return NULL...
+    */
+
+    free(s);
+    free(re);
+
+    return (NULL);
+  }
+
+ /*
+  * Compile the regular expression...
+  */
+
+  DEBUG_printf(("    s=\"%s\"\n", s));
+
+  if (regcomp(re, s, REG_EXTENDED | REG_ICASE))
+  {
+    free(re);
+    free(s);
+
+    return (NULL);
+  }
+
+ /*
+  * Free the RE string and return the new regular expression we compiled...
+  */
+
+  free(s);
+
+  return ((void *)re);
+}
+
+
+/*
+ * 'cgiDoSearch()' - Do a search of some text.
+ */
+
+int					/* O - Number of matches */
+cgiDoSearch(void       *search,		/* I - Search context */
+            const char *text)		/* I - Text to search */
+{
+  int		i;			/* Looping var */
+  regmatch_t	matches[100];		/* RE matches */
+
+
+ /*
+  * Range check...
+  */
+
+  if (!search || !text)
+    return (0);
+
+ /*
+  * Do a lookup...
+  */
+
+  if (!regexec((regex_t *)search, text, sizeof(matches) / sizeof(matches[0]),
+               matches, 0))
+  {
+   /*
+    * Figure out the number of matches in the string...
+    */
+
+    for (i = 0; i < (int)(sizeof(matches) / sizeof(matches[0])); i ++)
+      if (matches[i].rm_so < 0)
+	break;
+
+    return (i);
+  }
+  else
+    return (0);
+}
+
+
+/*
+ * 'cgiFreeSearch()' - Free a compiled search context.
+ */
+
+void
+cgiFreeSearch(void *search)		/* I - Search context */
+{
+  regfree((regex_t *)search);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -3,41 +3,40 @@
 *
 *   CGI template function.
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 1997-2006 by Easy Software Products.
 *
- *   This program is free software; you can redistribute it and/or modify it
- *   under the terms of the GNU General Public License as published by the Free
- *   Software Foundation; either version 2 of the License, or (at your option)
- *   any later version.
- *
- *   This program is distributed in the hope that it will be useful, but
- *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *   for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   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/".
 *
 * Contents:
 *
 *   cgiCopyTemplateFile() - Copy a template file and replace all the
 *                           '{variable}' strings with the variable value.
 *   cgiCopyTemplateLang() - Copy a template file using a language...
+ *   cgiGetTemplateDir()   - Get the templates directory...
+ *   cgiSetServerVersion() - Set the server name and CUPS version...
 *   cgi_copy()            - Copy the template file, substituting as needed...
 *   cgi_puts()            - Put a string to the output file, quoting as
 *                           needed...
 */

-#include "cgi.h"
+#include "cgi-private.h"
+#include <errno.h>
+#include <regex.h>


 /*
 * Local functions...
 */

-static void	cgi_copy(FILE *out, FILE *in, int element, char term);
+static void	cgi_copy(FILE *out, FILE *in, int element, char term,
+		         int indent);
 static void	cgi_puts(const char *s, FILE *out);
+static void	cgi_puturi(const char *s, FILE *out);


 /*
@@ -52,18 +51,32 @@ cgiCopyTemplateFile(FILE       *out,	/* I - Output file */
  FILE	*in;				/* Input file */


+  fprintf(stderr, "DEBUG2: cgiCopyTemplateFile(out=%p, tmpl=\"%s\")\n", out,
+          tmpl ? tmpl : "(null)");
+
+ /*
+  * Range check input...
+  */
+
+  if (!tmpl || !out)
+    return;
+
 /*
  * Open the template file...
  */

  if ((in = fopen(tmpl, "r")) == NULL)
+  {
+    fprintf(stderr, "ERROR: Unable to open template file \"%s\" - %s\n",
+            tmpl ? tmpl : "(null)", strerror(errno));
    return;
+  }

 /*
  * Parse the file to the end...
  */

-  cgi_copy(out, in, 0, 0);
+  cgi_copy(out, in, 0, 0, 0);

 /*
  * Close the template file and return...
@@ -78,60 +91,74 @@ cgiCopyTemplateFile(FILE       *out,	/* I - Output file */
 */

 void
-cgiCopyTemplateLang(FILE       *out,		/* I - Output file */
-                    const char *directory,	/* I - Directory */
-                    const char *tmpl,		/* I - Base filename */
-		    const char *lang)		/* I - Language */
+cgiCopyTemplateLang(const char *tmpl)	/* I - Base filename */
 {
-  int	i;					/* Looping var */
-  char	filename[1024],				/* Filename */
-	locale[16];				/* Locale name */
-  FILE	*in;					/* Input file */
+  char		filename[1024],		/* Filename */
+		locale[16],		/* Locale name */
+		*locptr;		/* Pointer into locale name */
+  const char	*directory,		/* Directory for templates */
+		*lang;			/* Language */
+  FILE		*in;			/* Input file */


+  fprintf(stderr, "DEBUG2: cgiCopyTemplateLang(tmpl=\"%s\")\n",
+          tmpl ? tmpl : "(null)");
+
 /*
  * Convert the language to a locale name...
  */

-  if (lang != NULL)
-  {
-    for (i = 0; lang[i] && i < 15; i ++)
-      if (isalnum(lang[i]))
-        locale[i] = tolower(lang[i]);
-      else
-        locale[i] = '_';
+  locale[0] = '\0';

-    locale[i] = '\0';
+  if ((lang = getenv("LANG")) != NULL)
+  {
+    locale[0] = '/';
+    strlcpy(locale + 1, lang, sizeof(locale) - 1);
+
+    if ((locptr = strchr(locale, '.')) != NULL)
+      *locptr = '\0';			/* Strip charset */
  }
-  else
-    locale[0] = '\0';
+
+  fprintf(stderr, "DEBUG2: lang=\"%s\", locale=\"%s\"...\n",
+          lang ? lang : "(null)", locale);

 /*
  * See if we have a template file for this language...
  */

-  snprintf(filename, sizeof(filename), "%s/%s/%s", directory, locale, tmpl);
-  if (access(filename, 0))
-  {
-    locale[2] = '\0';
+  directory = cgiGetTemplateDir();

-    snprintf(filename, sizeof(filename), "%s/%s/%s", directory, locale, tmpl);
-    if (access(filename, 0))
+  snprintf(filename, sizeof(filename), "%s%s/%s", directory, locale, tmpl);
+  if ((in = fopen(filename, "r")) == NULL)
+  {
+    locale[3] = '\0';
+
+    snprintf(filename, sizeof(filename), "%s%s/%s", directory, locale, tmpl);
+    if ((in = fopen(filename, "r")) == NULL)
+    {
      snprintf(filename, sizeof(filename), "%s/%s", directory, tmpl);
+      in = fopen(filename, "r");
+    }
  }

+  fprintf(stderr, "DEBUG2: Template file is \"%s\"...\n", filename);
+
 /*
  * Open the template file...
  */

-  if ((in = fopen(filename, "r")) == NULL)
+  if (!in)
+  {
+    fprintf(stderr, "ERROR: Unable to open template file \"%s\" - %s\n",
+            filename, strerror(errno));
    return;
+  }

 /*
  * Parse the file to the end...
  */

-  cgi_copy(out, in, 0, 0);
+  cgi_copy(stdout, in, 0, 0, 0);

 /*
  * Close the template file and return...
@@ -141,31 +168,81 @@ cgiCopyTemplateLang(FILE       *out,		/* I - Output file */
 }


+/*
+ * 'cgiGetTemplateDir()' - Get the templates directory...
+ */
+
+char *					/* O - Template directory */
+cgiGetTemplateDir(void)
+{
+  const char	*datadir;		/* CUPS_DATADIR env var */
+  static char	templates[1024] = "";	/* Template directory */
+
+
+  if (!templates[0])
+  {
+   /*
+    * Build the template directory pathname...
+    */
+
+    if ((datadir = getenv("CUPS_DATADIR")) == NULL)
+      datadir = CUPS_DATADIR;
+
+    snprintf(templates, sizeof(templates), "%s/templates", datadir);
+  }
+
+  return (templates);
+}
+
+
+/*
+ * 'cgiSetServerVersion()' - Set the server name and CUPS version...
+ */
+
+void
+cgiSetServerVersion(void)
+{
+  cgiSetVariable("SERVER_NAME", getenv("SERVER_NAME"));
+  cgiSetVariable("REMOTE_USER", getenv("REMOTE_USER"));
+  cgiSetVariable("CUPS_VERSION", CUPS_SVERSION);
+
+#ifdef LC_TIME
+  setlocale(LC_TIME, "");
+#endif /* LC_TIME */
+}
+
+
 /*
 * 'cgi_copy()' - Copy the template file, substituting as needed...
 */

 static void
-cgi_copy(FILE *out,		/* I - Output file */
-         FILE *in,		/* I - Input file */
-	 int  element,		/* I - Element number (0 to N) */
-	 char term)		/* I - Terminating character */
+cgi_copy(FILE *out,			/* I - Output file */
+         FILE *in,			/* I - Input file */
+	 int  element,			/* I - Element number (0 to N) */
+	 char term,			/* I - Terminating character */
+	 int  indent)			/* I - Debug info indentation */
 {
-  int		ch;		/* Character from file */
-  char		op;		/* Operation */
-  char		name[255],	/* Name of variable */
-		*nameptr,	/* Pointer into name */
-		innername[255],	/* Inner comparison name */
-		*innerptr,	/* Pointer into inner name */
-		*s;		/* String pointer */
-  const char	*value;		/* Value of variable */
-  const char	*innerval;	/* Inner value */
-  const char	*outptr;	/* Output string pointer */
-  char		outval[1024],	/* Formatted output string */
-		compare[1024];	/* Comparison string */
-  int		result;		/* Result of comparison */
+  int		ch;			/* Character from file */
+  char		op;			/* Operation */
+  char		name[255],		/* Name of variable */
+		*nameptr,		/* Pointer into name */
+		innername[255],		/* Inner comparison name */
+		*innerptr,		/* Pointer into inner name */
+		*s;			/* String pointer */
+  const char	*value;			/* Value of variable */
+  const char	*innerval;		/* Inner value */
+  const char	*outptr;		/* Output string pointer */
+  char		outval[1024],		/* Formatted output string */
+		compare[1024];		/* Comparison string */
+  int		result;			/* Result of comparison */
+  int		uriencode;		/* Encode as URI */
+  regex_t	re;			/* Regular expression to match */


+  fprintf(stderr, "DEBUG2: %*sStarting at file position %ld...\n", indent, "",
+          ftell(in));
+
 /*
  * Parse the file to the end...
  */
@@ -179,9 +256,13 @@ cgi_copy(FILE *out,		/* I - Output file */
      * Get a variable name...
      */

+      uriencode = 0;
+
      for (s = name; (ch = getc(in)) != EOF;)
-        if (strchr("}]<>=! \t\n", ch))
+        if (strchr("}]<>=!~ \t\n", ch))
          break;
+	else if (s == name && ch == '%')
+	  uriencode = 1;
        else if (s > name && ch == '?')
 	  break;
 	else if (s < (name + sizeof(name) - 1))
@@ -189,8 +270,10 @@ cgi_copy(FILE *out,		/* I - Output file */

      *s = '\0';

-      if (s == name && isspace(ch))
+      if (s == name && isspace(ch & 255))
      {
+        fprintf(stderr, "DEBUG2: %*sLone { at %ld...\n", indent, "", ftell(in));
+
        if (out)
 	{
          putc('{', out);
@@ -200,6 +283,10 @@ cgi_copy(FILE *out,		/* I - Output file */
 	continue;
      }

+      if (ch == '}')
+	fprintf(stderr, "DEBUG2: %*s\"{%s}\" at %ld...\n", indent, "", name,
+        	ftell(in));
+
     /*
      * See if it has a value...
      */
@@ -210,7 +297,7 @@ cgi_copy(FILE *out,		/* I - Output file */
        * Insert value only if it exists...
 	*/

-	if ((nameptr = strrchr(name, '-')) != NULL && isdigit(nameptr[1]))
+	if ((nameptr = strrchr(name, '-')) != NULL && isdigit(nameptr[1] & 255))
 	{
 	  *nameptr++ = '\0';

@@ -254,33 +341,55 @@ cgi_copy(FILE *out,		/* I - Output file */
 	int  count;	/* Number of elements */


-        if (isdigit(name[1]))
+        if (isdigit(name[1] & 255))
 	  count = atoi(name + 1);
 	else
          count = cgiGetSize(name + 1);

 	pos = ftell(in);

+        fprintf(stderr, "DEBUG2: %*sLooping on \"%s\" at %ld, count=%d...\n",
+	        indent, "", name + 1, pos, count);
+
        if (count > 0)
 	{
          for (i = 0; i < count; i ++)
 	  {
-	    fseek(in, pos, SEEK_SET);
-	    cgi_copy(out, in, i, '}');
+	    if (i)
+	      fseek(in, pos, SEEK_SET);
+
+	    cgi_copy(out, in, i, '}', indent + 2);
 	  }
        }
 	else
-	  cgi_copy(NULL, in, 0, '}');
+	  cgi_copy(NULL, in, 0, '}', indent + 2);
+
+        fprintf(stderr, "DEBUG2: %*sFinished looping on \"%s\"...\n", indent,
+	        "", name + 1);

        continue;
      }
+      else if (name[0] == '$')
+      {
+       /*
+        * Insert cookie value or nothing if not defined.
+	*/
+
+        if ((value = cgiGetCookie(name + 1)) != NULL)
+	  outptr = value;
+	else
+	{
+	  outval[0] = '\0';
+	  outptr    = outval;
+	}
+      }
      else
      {
       /*
        * Insert variable or variable name (if element is NULL)...
 	*/

-	if ((nameptr = strrchr(name, '-')) != NULL && isdigit(nameptr[1]))
+	if ((nameptr = strrchr(name, '-')) != NULL && isdigit(nameptr[1] & 255))
 	{
 	  *nameptr++ = '\0';
 	  if ((value = cgiGetArray(name, atoi(nameptr) - 1)) == NULL)
@@ -311,7 +420,14 @@ cgi_copy(FILE *out,		/* I - Output file */
        */

 	if (out)
-	  cgi_puts(outptr, out);
+	{
+	  if (uriencode)
+	    cgi_puturi(outptr, out);
+	  else if (!strcasecmp(name, "?cupsdconf_default"))
+	    fputs(outptr, stdout);
+	  else
+	    cgi_puts(outptr, out);
+        }

        continue;
      }
@@ -324,15 +440,26 @@ cgi_copy(FILE *out,		/* I - Output file */
      *   {name<value?true:false}    Less than
      *   {name>value?true:false}    Greater than
      *   {name!value?true:false}    Not equal
+      *   {name~refex?true:false}    Regex match
      */

+      op = ch;
+
      if (ch == '?')
      {
       /*
        * Test for existance...
 	*/

-        result = cgiGetArray(name, element) != NULL && outptr[0];
+        if (name[0] == '?')
+	  result = cgiGetArray(name + 1, element) != NULL;
+	else if (name[0] == '#')
+	  result = cgiGetVariable(name + 1) != NULL;
+        else
+          result = cgiGetArray(name, element) != NULL;
+
+	result     = result && outptr[0];
+	compare[0] = '\0';
      }
      else
      {
@@ -340,8 +467,6 @@ cgi_copy(FILE *out,		/* I - Output file */
        * Compare to a string...
 	*/

-        op = ch;
-
 	for (s = compare; (ch = getc(in)) != EOF;)
          if (ch == '?')
            break;
@@ -367,7 +492,7 @@ cgi_copy(FILE *out,		/* I - Output file */
            if (innername[0] == '#')
 	      sprintf(s, "%d", cgiGetSize(innername + 1));
 	    else if ((innerptr = strrchr(innername, '-')) != NULL &&
-	             isdigit(innerptr[1]))
+	             isdigit(innerptr[1] & 255))
            {
 	      *innerptr++ = '\0';
 	      if ((innerval = cgiGetArray(innername, atoi(innerptr) - 1)) == NULL)
@@ -383,7 +508,7 @@ cgi_copy(FILE *out,		/* I - Output file */
 	        strlcpy(s, innerval, sizeof(compare) - (s - compare));
            }
 	    else if ((innerval = cgiGetArray(innername, element)) == NULL)
-	      snprintf(s, sizeof(s), "{%s}", innername);
+	      snprintf(s, sizeof(compare) - (s - compare), "{%s}", innername);
 	    else
 	      strlcpy(s, innerval, sizeof(compare) - (s - compare));

@@ -397,7 +522,12 @@ cgi_copy(FILE *out,		/* I - Output file */
        *s = '\0';

        if (ch != '?')
+	{
+	  fprintf(stderr,
+	          "DEBUG2: %*sBad terminator '%c' at file position %ld...\n",
+	          indent, "", ch, ftell(in));
 	  return;
+	}

       /*
        * Do the comparison...
@@ -417,20 +547,60 @@ cgi_copy(FILE *out,		/* I - Output file */
 	  case '!' :
 	      result = strcasecmp(outptr, compare) != 0;
 	      break;
+	  case '~' :
+	      fprintf(stderr, "DEBUG: Regular expression \"%s\"\n", compare);
+
+	      if (regcomp(&re, compare, REG_EXTENDED | REG_ICASE))
+	      {
+	        fprintf(stderr,
+		        "ERROR: Unable to compile regular expresion \"%s\"!\n",
+			compare);
+		result = 0;
+	      }
+	      else
+	      {
+	        regmatch_t matches[10];
+
+		result = 0;
+
+	        if (!regexec(&re, outptr, 10, matches, 0))
+		{
+		  int i;
+		  for (i = 0; i < 10; i ++)
+		  {
+		    fprintf(stderr, "DEBUG: matches[%d].rm_so=%d\n", i,
+		            (int)matches[i].rm_so);
+		    if (matches[i].rm_so < 0)
+		      break;
+
+		    result ++;
+		  }
+		}
+
+		regfree(&re);
+	      }
+	      break;
 	  default :
 	      result = 1;
 	      break;
 	}
      }

+      fprintf(stderr,
+              "DEBUG2: %*sStarting \"{%s%c%s\" at %ld, result=%d...\n",
+	      indent, "", name, op, compare, ftell(in), result);
+
      if (result)
      {
       /*
 	* Comparison true; output first part and ignore second...
 	*/

-	cgi_copy(out, in, element, ':');
-	cgi_copy(NULL, in, element, '}');
+        fprintf(stderr, "DEBUG2: %*sOutput first part...\n", indent, "");
+	cgi_copy(out, in, element, ':', indent + 2);
+
+        fprintf(stderr, "DEBUG2: %*sSkip second part...\n", indent, "");
+	cgi_copy(NULL, in, element, '}', indent + 2);
      }
      else
      {
@@ -438,9 +608,15 @@ cgi_copy(FILE *out,		/* I - Output file */
 	* Comparison false; ignore first part and output second...
 	*/

-	cgi_copy(NULL, in, element, ':');
-	cgi_copy(out, in, element, '}');
+        fprintf(stderr, "DEBUG2: %*sSkip first part...\n", indent, "");
+	cgi_copy(NULL, in, element, ':', indent + 2);
+
+        fprintf(stderr, "DEBUG2: %*sOutput second part...\n", indent, "");
+	cgi_copy(out, in, element, '}', indent + 2);
      }
+
+      fprintf(stderr, "DEBUG2: %*sFinished \"{%s%c%s\", out=%p...\n", indent, "",
+              name, op, compare, out);
    }
    else if (ch == '\\')	/* Quoted char */
    {
@@ -452,6 +628,17 @@ cgi_copy(FILE *out,		/* I - Output file */
    else if (out)
      putc(ch, out);

+  if (ch == EOF)
+    fprintf(stderr, "DEBUG2: %*sReturning at file position %ld on EOF...\n",
+	    indent, "", ftell(in));
+  else
+    fprintf(stderr,
+            "DEBUG2: %*sReturning at file position %ld on character '%c'...\n",
+	    indent, "", ftell(in), ch);
+
+  if (ch == EOF && term)
+    fprintf(stderr, "ERROR: %*sSaw EOF, expected '%c'!\n", indent, "", term);
+
 /*
  * Flush any pending output...
  */
@@ -466,18 +653,52 @@ cgi_copy(FILE *out,		/* I - Output file */
 */

 static void
-cgi_puts(const char *s,
-         FILE       *out)
+cgi_puts(const char *s,			/* I - String to output */
+         FILE       *out)		/* I - Output file */
 {
  while (*s)
  {
-    if (s[0] == '<')
-      fputs("&lt;", out);
-    else if (s[0] == '>')
+    if (*s == '<')
+    {
+     /*
+      * Pass <A HREF="url"> and </A>, otherwise quote it...
+      */
+
+      if (!strncasecmp(s, "<A HREF=\"", 9))
+      {
+        fputs("<A HREF=\"", out);
+	s += 9;
+
+	while (*s && *s != '\"')
+	{
+          if (*s == '&')
+            fputs("&amp;", out);
+	  else
+	    putc(*s, out);
+
+	  s ++;
+	}
+
+        if (*s)
+	  s ++;
+
+	fputs("\">", out);
+      }
+      else if (!strncasecmp(s, "</A>", 4))
+      {
+        fputs("</A>", out);
+	s += 3;
+      }
+      else
+        fputs("&lt;", out);
+    }
+    else if (*s == '>')
      fputs("&gt;", out);
    else if (*s == '\"')
      fputs("&quot;", out);
-    else if (s[0] == '&')
+    else if (*s == '\'')
+      fputs("&#39;", out);
+    else if (*s == '&')
      fputs("&amp;", out);
    else
      putc(*s, out);
@@ -487,6 +708,26 @@ cgi_puts(const char *s,
 }


+/*
+ * 'cgi_puturi()' - Put a URI string to the output file, quoting as needed...
+ */
+
+static void
+cgi_puturi(const char *s,		/* I - String to output */
+           FILE       *out)		/* I - Output file */
+{
+  while (*s)
+  {
+    if (strchr("%@&+ <>#=", *s) || *s < ' ' || *s & 128)
+      fprintf(out, "%%%02X", *s & 255);
+    else
+      putc(*s, out);
+
+    s ++;
+  }
+}
+
+
 /*
 * End of "$Id$".
 */
@@ -0,0 +1,75 @@
+/*
+ * "$Id$"
+ *
+ *   CGI test program for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 1997-2005 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/".
+ *
+ * Contents:
+ *
+ *   main()       - Test the help index code.
+ *   list_nodes() - List nodes in an array...
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "cgi.h"
+
+
+/*
+ * 'main()' - Test the CGI code.
+ */
+
+int					/* O - Exit status */
+main(int  argc,				/* I - Number of command-line arguments */
+     char *argv[])			/* I - Command-line arguments */
+{
+ /*
+  * Test file upload/multi-part submissions...
+  */
+
+  freopen("multipart.dat", "rb", stdin);
+
+  putenv("CONTENT_TYPE=multipart/form-data; "
+         "boundary=---------------------------1977426492562745908748943111");
+  putenv("REQUEST_METHOD=POST");
+
+  printf("cgiInitialize: ");
+  if (cgiInitialize())
+  {
+    const cgi_file_t	*file;		/* Upload file */
+
+    if ((file = cgiGetFile()) != NULL)
+    {
+      puts("PASS");
+      printf("    tempfile=\"%s\"\n", file->tempfile);
+      printf("    name=\"%s\"\n", file->name);
+      printf("    filename=\"%s\"\n", file->filename);
+      printf("    mimetype=\"%s\"\n", file->mimetype);
+    }
+    else
+      puts("FAIL (no file!)");
+  }
+  else
+    puts("FAIL (init)");
+    
+ /*
+  * Return with no errors...
+  */
+
+  return (0);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,113 @@
+/*
+ * "$Id$"
+ *
+ *   Help index test program for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 1997-2007 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/".
+ *
+ * Contents:
+ *
+ *   main()       - Test the help index code.
+ *   list_nodes() - List nodes in an array...
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "cgi.h"
+
+
+/*
+ * Local functions...
+ */
+
+static void	list_nodes(const char *title, cups_array_t *nodes);
+
+
+/*
+ * 'main()' - Test the help index code.
+ */
+
+int					/* O - Exit status */
+main(int  argc,				/* I - Number of command-line arguments */
+     char *argv[])			/* I - Command-line arguments */
+{
+  help_index_t	*hi,			/* Help index */
+		*search;		/* Search index */
+
+
+ /*
+  * Load the help index...
+  */
+
+  hi = helpLoadIndex("testhi.index", ".");
+
+  list_nodes("nodes", hi->nodes);
+  list_nodes("sorted", hi->sorted);
+
+ /*
+  * Do any searches...
+  */
+
+  if (argc > 1)
+  {
+    search = helpSearchIndex(hi, argv[1], NULL, argv[2]);
+
+    if (search)
+    {
+      list_nodes(argv[1], search->sorted);
+      helpDeleteIndex(search);
+    }
+    else
+      printf("%s (0 nodes)\n", argv[1]);
+  }
+
+  helpDeleteIndex(hi);
+
+ /*
+  * Return with no errors...
+  */
+
+  return (0);
+}
+
+
+/*
+ * 'list_nodes()' - List nodes in an array...
+ */
+
+static void
+list_nodes(const char   *title,		/* I - Title string */
+	   cups_array_t *nodes)		/* I - Nodes */
+{
+  int		i;			/* Looping var */
+  help_node_t	*node;			/* Current node */
+
+
+  printf("%s (%d nodes):\n", title, cupsArrayCount(nodes));
+  for (i = 1, node = (help_node_t *)cupsArrayFirst(nodes);
+       node;
+       i ++, node = (help_node_t *)cupsArrayNext(nodes))
+  {
+    if (node->anchor)
+      printf("    %d: %s#%s \"%s\"", i, node->filename, node->anchor,
+             node->text);
+    else
+      printf("    %d: %s \"%s\"", i, node->filename, node->text);
+
+    printf(" (%d words)\n", cupsArrayCount(node->words));
+  }
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,31 @@
+<HTML>
+<HEAD>
+	<TITLE>Test File for Help Index Code</TITLE>
+</HEAD>
+<BODY>
+
+<P>This is a test file for the help index code.  The help index
+code reads plain HTML and indexes the title and any anchored
+text, ignoring all other markup. Anchor tags must be on a single
+line, although the text they wrap may cross multiple lines and be
+up to 1024 bytes in length.</P>
+
+<H1><A NAME="FIRST">This is the First Anchor</A></H1>
+
+<P>This&nbsp;is some text for the <em>first</em> anchor.</P>
+
+
+<H1><A NAME="2ND">This is the Second Anchor</A></H1>
+
+<P>This is some text for the first anchor.</P>
+
+<P>John asked Mary to the dance.</P>
+
+
+<H1><A NAME="THIRD">This is the Third Anchor</A></H1>
+
+<P>This is some text for the third anchor. <A NAME="INLINE">This
+is an in-line anchor that crosses a line.</A></P>
+
+</BODY>
+</HTML>
@@ -0,0 +1,103 @@
+/*
+ * "$Id$"
+ *
+ *   CGI template test program for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 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/".
+ *
+ * Contents:
+ *
+ *   main() - Test the template code.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "cgi.h"
+
+
+/*
+ * 'main()' - Test the template code.
+ */
+
+int					/* O - Exit status */
+main(int  argc,				/* I - Number of command-line arguments */
+     char *argv[])			/* I - Command-line arguments */
+{
+  int	i;				/* Looping var */
+  char	*value;				/* Value in name=value */
+  FILE	*out;				/* Where to send output */
+
+
+ /*
+  * Don't buffer stdout or stderr so that the mixed output is sane...
+  */
+
+  setbuf(stdout, NULL);
+  setbuf(stderr, NULL);
+
+ /*
+  * Loop through the command-line, assigning variables for any args with
+  * "name=value"...
+  */
+
+  out = stdout;
+
+  for (i = 1; i < argc; i ++)
+  {
+    if (!strcmp(argv[i], "-o"))
+    {
+      i ++;
+      if (i < argc)
+      {
+        out = fopen(argv[i], "w");
+	if (!out)
+	{
+	  perror(argv[i]);
+	  return (1);
+	}
+      }
+    }
+    else if (!strcmp(argv[i], "-e"))
+    {
+      i ++;
+
+      if (i < argc)
+      {
+        if (!freopen(argv[i], "w", stderr))
+	{
+	  perror(argv[i]);
+	  return (1);
+	}
+      }
+    }
+    else if (!strcmp(argv[i], "-q"))
+      freopen("/dev/null", "w", stderr);
+    else if ((value = strchr(argv[i], '=')) != NULL)
+    {
+      *value++ = '\0';
+      cgiSetVariable(argv[i], value);
+    }
+    else
+      cgiCopyTemplateFile(out, argv[i]);
+  }
+
+ /*
+  * Return with no errors...
+  */
+
+  return (0);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,116 @@
+/*
+ * "$Id$"
+ *
+ *   Web search program for www.cups.org.
+ *
+ *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 1997-2007 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/".
+ *
+ * Usage:
+ *
+ *   websearch directory "search string"
+ *
+ * Contents:
+ *
+ *   main()       - Search a directory of help files.
+ *   list_nodes() - List matching nodes.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "cgi.h"
+
+
+/*
+ * Local functions...
+ */
+
+static void	list_nodes(help_index_t *hi, const char *title,
+		           cups_array_t *nodes);
+
+
+/*
+ * 'main()' - Test the help index code.
+ */
+
+int					/* O - Exit status */
+main(int  argc,				/* I - Number of command-line args */
+     char *argv[])			/* I - Command-line arguments */
+{
+  help_index_t	*hi,			/* Help index */
+		*search;		/* Search index */
+  char		indexname[1024];	/* Name of index file */
+
+
+  if (argc != 3)
+  {
+    puts("Usage: websearch directory \"search terms\"");
+    return (1);
+  }
+
+ /*
+  * Load the help index...
+  */
+
+  snprintf(indexname, sizeof(indexname), "%s/.index", argv[1]);
+  hi = helpLoadIndex(indexname, argv[1]);
+
+ /*
+  * Do any searches...
+  */
+
+  search = helpSearchIndex(hi, argv[2], NULL, NULL);
+
+  if (search)
+    list_nodes(hi, argv[1], search->sorted);
+
+ /*
+  * Return with no errors...
+  */
+
+  return (0);
+}
+
+
+/*
+ * 'list_nodes()' - List nodes in an array...
+ */
+
+static void
+list_nodes(help_index_t *hi,		/* I - Help index */
+           const char   *title,		/* I - Title string */
+	   cups_array_t *nodes)		/* I - Nodes */
+{
+  help_node_t	*node,			/* Current node */
+		*file;			/* File node */
+
+
+  printf("%d\n", cupsArrayCount(nodes));
+  for (node = (help_node_t *)cupsArrayFirst(nodes);
+       node;
+       node = (help_node_t *)cupsArrayNext(nodes))
+  {
+    if (node->anchor)
+    {
+      file = helpFindNode(hi, node->filename, NULL);
+      printf("%d|%s#%s|%s|%s\n", node->score, node->filename, node->anchor,
+             node->text, file ? file->text : node->filename);
+    }
+    else
+      printf("%d|%s|%s|%s\n", node->score, node->filename, node->text,
+             node->text);
+  }
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,2 +0,0 @@
-cupsd.conf
-pam.conf
@@ -3,23 +3,14 @@
 #
 #   Configuration file makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1993-2003 by Easy Software Products.
+#   Copyright 2007-2008 by Apple Inc.
+#   Copyright 1993-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
-#
-#       Voice: (301) 373-9603
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   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/".
 #

 include ../Makedefs
@@ -28,7 +19,7 @@ include ../Makedefs
 # Config files...
 #

-KEEP	=	classes.conf client.conf cupsd.conf printers.conf
+KEEP	=	cupsd.conf snmp.conf
 REPLACE	=	mime.convs mime.types


@@ -39,6 +30,20 @@ REPLACE	=	mime.convs mime.types
 all:


+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
 #
 # Clean all config and object files...
 #
@@ -47,27 +52,89 @@ clean:


 #
-# Install files...
+# Dummy depend...
 #

-install:
-	$(INSTALL_DIR) $(SERVERROOT)
+depend:
+
+
+#
+# Install all targets...
+#
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
 	for file in $(KEEP); do \
 		if test -r $(SERVERROOT)/$$file ; then \
-			$(INSTALL_DATA) $$file $(SERVERROOT)/$$file.N ; \
+			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \
 		else \
-			$(INSTALL_DATA) $$file $(SERVERROOT) ; \
+			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
 		fi ; \
 	done
+	$(INSTALL_CONFIG) -g $(CUPS_GROUP) cupsd.conf $(SERVERROOT)/cupsd.conf.default
+	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
 	for file in $(REPLACE); do \
-		if test -r $(SERVERROOT)/$$file ; then \
-			$(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
+		if test -r $(DATADIR)/mime/$$file ; then \
+			$(MV) $(DATADIR)/mime/$$file $(DATADIR)/mime/$$file.O ; \
 		fi ; \
-		$(INSTALL_DATA) $$file $(SERVERROOT) ; \
+		if test -r $(SERVERROOT)/$$file ; then \
+			$(MV) $(SERVERROOT)/$$file $(DATADIR)/mime/$$file.O ; \
+		fi ; \
+		$(INSTALL_DATA) $$file $(DATADIR)/mime ; \
 	done
-	-if test x$(PAMDIR) != x$(BUILDROOT); then \
-		$(INSTALL_DIR) $(PAMDIR); \
-		$(INSTALL_DATA) pam.conf $(PAMDIR)/cups; \
+	-if test x$(PAMDIR) != x; then \
+		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \
+		if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \
+			$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
+		else \
+			$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
+		fi ; \
+	fi
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
+# Uninstall files...
+#
+
+uninstall:
+	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
+		$(RM) $(SERVERROOT)/$$file; \
+	done
+	-$(RMDIR) $(SERVERROOT)
+	for file in $(REPLACE); do \
+		$(RM) $(DATADIR)/mime/$$file; \
+	done
+	-$(RMDIR) $(DATADIR)/mime
+	-if test x$(PAMDIR) != x; then \
+		$(RM) $(BUILDROOT)$(PAMDIR)/cups; \
+		$(RMDIR) $(BUILDROOT)$(PAMDIR); \
 	fi


@@ -1,89 +0,0 @@
-#
-# "$Id: classes.conf 3041 2002-12-17 19:00:27Z swdev $"
-#
-#   Sample class configuration file for the Common UNIX Printing System
-#   (CUPS) scheduler.
-#
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
-#
-#       Voice: (301) 373-9603
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
-#
-
-########################################################################
-#                                                                      #
-# This is a sample class configuration file.  This file is included    #
-# from the main configuration file (cups.conf) and lists all of the    #
-# printer classes known to the system.                                 #
-#                                                                      #
-########################################################################
-
-#
-# Each class starts with a <Class name> definition.  Class names
-# can be up to 128 characters in length and are *not* case sensitive.
-#
-# One <DefaultClass name> entry can appear in this file; if you don't
-# define a default destination, the first printer or class becomes
-# the default.
-#
-
-#<Class sample>
-#
-# Info: the description for the class.
-#
-
-#Info Acme LaserPrint 1000 Printers
-
-#
-# Location: the location of the printer.
-#
-
-#Location Room 101 in the activities building
-
-#
-# State: sets the initial state of the class.  Can be one of the
-# following:
-#
-#     Idle    - Class is available to print new jobs.
-#     Stopped - Class is disabled but accepting new jobs.
-#
-
-#State Idle
-
-#
-# StateMessage: sets the printer-state-message attribute for the class.
-#
-
-#StateMessage Class is idle.
-
-#
-# Accepting: is the class accepting jobs?
-#
-#Accepting Yes
-#Accepting No
-#
-
-#
-# Printer: adds a printer to the class.
-#
-
-#Printer sample
-#Printer sample@host2
-#</Class>
-
-#
-# End of "$Id: classes.conf 3041 2002-12-17 19:00:27Z swdev $".
-#
@@ -1,67 +0,0 @@
-#
-# "$Id: client.conf 3705 2003-05-09 19:14:44Z mike $"
-#
-#   Sample client configuration file for the Common UNIX Printing System
-#   (CUPS).
-#
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
-#
-#       Voice: (301) 373-9603
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
-#
-
-########################################################################
-#                                                                      #
-# This is the CUPS client configuration file.  This file is used to    #
-# define client-specific parameters, such as the default server or     #
-# default encryption settings.                                         #
-#                                                                      #
-########################################################################
-
-#
-# ServerName: the hostname of your server.  By default CUPS will use the
-# hostname of the system or the value of the CUPS_SERVER environment
-# variable.  ONLY ONE SERVER NAME MAY BE SPECIFIED AT A TIME.  To use
-# more than one server you must use a local scheduler with browsing
-# and possibly polling.
-#
-
-#ServerName myhost.domain.com
-
-#
-# Encryption: whether or not to use encryption; this depends on having
-# the OpenSSL library linked into the CUPS library.
-#
-# Possible values:
-#
-#     Always       - Always use encryption (SSL)
-#     Never        - Never use encryption
-#     Required     - Use TLS encryption upgrade
-#     IfRequested  - Use encryption if the server requests it
-#
-# The default value is "IfRequested".  This parameter can also be set
-# using the CUPS_ENCRYPTION environment variable.
-#
-
-#Encryption Always
-#Encryption Never
-#Encryption Required
-#Encryption IfRequested
-
-
-#
-# End of "$Id: client.conf 3705 2003-05-09 19:14:44Z mike $".
-#
@@ -1,825 +1,125 @@
 #
 # "$Id$"
 #
-#   Sample configuration file for the Common UNIX Printing System (CUPS)
-#   scheduler.
+# Sample configuration file for the CUPS scheduler.  See "man cupsd.conf" for a
+# complete description of this file.
 #
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
-#
-#       Voice: (301) 373-9603
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
-#
-
-########################################################################
-#                                                                      #
-# This is the CUPS configuration file.  If you are familiar with       #
-# Apache or any of the other popular web servers, we've followed the   #
-# same format.  Any configuration variable used here has the same      #
-# semantics as the corresponding variable in Apache.  If we need       #
-# different functionality then a different name is used to avoid       #
-# confusion...                                                         #
-#                                                                      #
-########################################################################
-
-
-########
-######## Server Identity
-########
-
-#
-# ServerName: the hostname of your server, as advertised to the world.
-# By default CUPS will use the hostname of the system.
-#
-# To set the default server used by clients, see the client.conf file.
-#
-
-#ServerName myhost.domain.com
-
-#
-# ServerAdmin: the email address to send all complaints/problems to.
-# By default CUPS will use "root@hostname".
-#
-
-#ServerAdmin root@your.domain.com
-
-
-########
-######## Server Options
-########
-
-#
-# AccessLog: the access log file; if this does not start with a leading /
-# then it is assumed to be relative to ServerRoot.  By default set to
-# "@CUPS_LOGDIR@/access_log"
-#
-# You can also use the special name "syslog" to send the output to the
-# syslog file or daemon.
-#
-
-#AccessLog @CUPS_LOGDIR@/access_log
-
-#
-# Classification: the classification level of the server.  If set, this
-# classification is displayed on all pages, and raw printing is disabled.
-# The default is the empty string.
-#
-
-#Classification classified
-#Classification confidential
-#Classification secret
-#Classification topsecret
-#Classification unclassified
-
-#
-# ClassifyOverride: whether to allow users to override the classification
-# on printouts. If enabled, users can limit banner pages to before or
-# after the job, and can change the classification of a job, but cannot
-# completely eliminate the classification or banners.
-#
-# The default is off.
-#
-
-#ClassifyOverride off
-
-#
-# DataDir: the root directory for the CUPS data files.
-# By default "@CUPS_DATADIR@".
-#
-
-#DataDir @CUPS_DATADIR@
-
-#
-# DefaultCharset: the default character set to use. If not specified,
-# defaults to "utf-8".  Note that this can also be overridden in
-# HTML documents...
-#
-
-#DefaultCharset utf-8
-
-#
-# DefaultLanguage: the default language if not specified by the browser.
-# If not specified, the current locale is used.
-#
-
-#DefaultLanguage en
-
-#
-# DocumentRoot: the root directory for HTTP documents that are served.
-# By default "@CUPS_DOCROOT@".
-#
-
-#DocumentRoot @CUPS_DOCROOT@
-
-#
-# ErrorLog: the error log file; if this does not start with a leading /
-# then it is assumed to be relative to ServerRoot.  By default set to
-# "@CUPS_LOGDIR@/error_log"
-#
-# You can also use the special name "syslog" to send the output to the
-# syslog file or daemon.
-#
-
-#ErrorLog @CUPS_LOGDIR@/error_log
-
-#
-# FileDevice: determines whether the scheduler will allow new printers
-# to be added using device URIs of the form "file:/foo/bar". The default
-# is not to allow file devices due to the potential security vulnerability
-# and due to the fact that file devices do not support raw printing.
-#
-
-#FileDevice No
-
-
-#
-# FontPath: the path to locate all font files (currently only for pstoraster)
-# By default "@CUPS_FONTPATH@".
-#
-
-#FontPath @CUPS_FONTPATH@
-
-#
-# LogLevel: controls the number of messages logged to the ErrorLog
-# file and can be one of the following:
-#
-#     debug2	Log everything.
-#     debug	Log almost everything.
-#     info      Log all requests and state changes.
-#     warn      Log errors and warnings.
-#     error     Log only errors.
-#     none      Log nothing.
-#
-
-LogLevel info
-
-#
-# MaxLogSize: controls the maximum size of each log file before they are
-# rotated.  Defaults to 1048576 (1MB).  Set to 0 to disable log rotating.
-#
-
-#MaxLogSize 0
-
-#
-# PageLog: the page log file; if this does not start with a leading /
-# then it is assumed to be relative to ServerRoot.  By default set to
-# "@CUPS_LOGDIR@/page_log"
-#
-# You can also use the special name "syslog" to send the output to the
-# syslog file or daemon.
-#
-
-#PageLog @CUPS_LOGDIR@/page_log
-
-#
-# PreserveJobHistory: whether or not to preserve the job history after a
-# job is completed, cancelled, or stopped.  Default is Yes.
-#
-
-#PreserveJobHistory Yes
-
-#
-# PreserveJobFiles: whether or not to preserve the job files after a
-# job is completed, cancelled, or stopped.  Default is No.
-#
-
-#PreserveJobFiles No
-
-#
-# AutoPurgeJobs: automatically purge jobs when not needed for quotas.
-# Default is No.
-#
-
-#AutoPurgeJobs No
-
-#
-# MaxCopies: maximum number of copies that a user can request. Default is
-# 100.
-#
-
-#MaxCopies 100
-
-#
-# MaxJobs: maximum number of jobs to keep in memory (active and completed.)
-# Default is 500; the value 0 is used for no limit.
-#
-
-#MaxJobs 500
-
-#
-# MaxJobsPerPrinter: maximum number of active jobs per printer. The default
-# is 0 for no limit.
-#
-
-#MaxJobsPerPrinter 0
-
-#
-# MaxJobsPerUser: maximum number of active jobs per user. The default
-# is 0 for no limit.
-#
-
-#MaxJobsPerUser 0
-
-#
-# MaxPrinterHistory: controls the maximum number of history collections
-# in the printer-state-history attribute.  Set to 0 to disable history
-# data.
-#
-
-#MaxPrinterHistory 10
-
-#
-# Printcap: the name of the printcap file.  Default is /etc/printcap.
-# Leave blank to disable printcap file generation.
-#
-
-#Printcap /etc/printcap
-
-#
-# PrintcapFormat: the format of the printcap file, currently either
-# BSD or Solaris.  The default is "BSD".
-#
-
-#PrintcapFormat BSD
-#PrintcapFormat Solaris
-
-#
-# PrintcapGUI: the name of the GUI options panel program to associate
-# with print queues under IRIX.  The default is "/usr/bin/glpoptions"
-# from ESP Print Pro.
-#
-# This option is only used under IRIX; the options panel program
-# must accept the "-d printer" and "-o options" options and write
-# the selected printer options back to stdout on completion.
-#
-
-#PrintcapGUI /usr/bin/glpoptions
-
-#
-# RequestRoot: the directory where request files are stored.
-# By default "@CUPS_REQUESTS@".
-#
-
-#RequestRoot @CUPS_REQUESTS@
-
-#
-# RemoteRoot: the name of the user assigned to unauthenticated accesses
-# from remote systems.  By default "remroot".
-#
-
-#RemoteRoot remroot
-
-#
-# ServerBin: the root directory for the scheduler executables.
-# By default "@CUPS_SERVERBIN@".
-#
-
-#ServerBin @CUPS_SERVERBIN@
-
-#
-# ServerRoot: the root directory for the scheduler.
-# By default "@CUPS_SERVERROOT@".
-#
-
-#ServerRoot @CUPS_SERVERROOT@
-
-
-########
-######## Fax Support
-########
-
-#
-# FaxRetryLimit: the number of times a fax job is retried.
-# The default is 5 times.
-#
-
-#FaxRetryLimit 5
-
-#
-# FaxRetryInterval: the number of seconds between fax job retries.
-# The default is 300 seconds/5 minutes.
-#
-
-#FaxRetryInterval 300
-
-
-########
-######## Encryption Support
-########
-
-#
-# ServerCertificate: the file to read containing the server's certificate.
-# Defaults to "@CUPS_SERVERROOT@/ssl/server.crt".
-#
-
-#ServerCertificate @CUPS_SERVERROOT@/ssl/server.crt
-
-#
-# ServerKey: the file to read containing the server's key.
-# Defaults to "@CUPS_SERVERROOT@/ssl/server.key".
-#
-
-#ServerKey @CUPS_SERVERROOT@/ssl/server.key

+# Log general information in error_log - change "@CUPS_LOG_LEVEL@" to "debug"
+# for troubleshooting...
+LogLevel @CUPS_LOG_LEVEL@

-########
-######## Filter Options
-########
+# Administrator user group...
+SystemGroup @CUPS_SYSTEM_GROUPS@
+@CUPS_SYSTEM_AUTHKEY@

-#
-# User/Group: the user and group the server runs under.  Normally this
-# must be @CUPS_USER@ and @CUPS_GROUP@, however you can configure things for another
-# user or group as needed.
-#
-# Note: the server must be run initially as root to support the
-# default IPP port of 631.  It changes users whenever an external
-# program is run, or if the RunAsUser directive is specified...
-#
-
-#User @CUPS_USER@
-#Group @CUPS_GROUP@
-
-#
-# RIPCache: the amount of memory that each RIP should use to cache
-# bitmaps.  The value can be any real number followed by "k" for
-# kilobytes, "m" for megabytes, "g" for gigabytes, or "t" for tiles
-# (1 tile = 256x256 pixels.)  Defaults to "8m" (8 megabytes).
-#
-
-#RIPCache 8m
-
-#
-# TempDir: the directory to put temporary files in.  This directory must be
-# writable by the user defined above!  Defaults to "@CUPS_REQUESTS@/tmp" or
-# the value of the TMPDIR environment variable.
-#
-
-#TempDir @CUPS_REQUESTS@/tmp
-
-#
-# FilterLimit: sets the maximum cost of all job filters that can be run
-# at the same time.  A limit of 0 means no limit.  A typical job may need
-# a filter limit of at least 200; limits less than the minimum required
-# by a job force a single job to be printed at any time.
-#
-# The default limit is 0 (unlimited).
-#
-
-#FilterLimit 0
-
-########
-######## Network Options
-########
-
-#
-# Ports/addresses that we listen to.  The default port 631 is reserved
-# for the Internet Printing Protocol (IPP) and is what we use here.
-#
-# You can have multiple Port/Listen lines to listen to more than one
-# port or address, or to restrict access:
-#
-#    Port 80
-#    Port 631
-#    Listen hostname
-#    Listen hostname:80
-#    Listen hostname:631
-#    Listen 1.2.3.4
-#    Listen 1.2.3.4:631
-# 
-# NOTE: Unfortunately, most web browsers don't support TLS or HTTP Upgrades
-# for encryption.  If you want to support web-based encryption you'll
-# probably need to listen on port 443 (the "https" port...)
-#
-
-#Port 80
-#Port 443
-Port 631
-
-#
-# HostNameLookups: whether or not to do lookups on IP addresses to get a
-# fully-qualified hostname.  This defaults to Off for performance reasons...
-#
-
-#HostNameLookups On
-
-#
-# KeepAlive: whether or not to support the Keep-Alive connection
-# option.  Default is on.
-#
-
-#KeepAlive On
-
-#
-# KeepAliveTimeout: the timeout before Keep-Alive connections are
-# automatically closed.  Default is 60 seconds.
-#
+# Only listen for connections from the local machine.
+Listen localhost:@DEFAULT_IPP_PORT@
+@CUPS_LISTEN_DOMAINSOCKET@

-#KeepAliveTimeout 60
+# Show shared printers on the local network.
+Browsing On
+BrowseOrder allow,deny
+BrowseAllow all
+BrowseLocalProtocols @CUPS_BROWSE_LOCAL_PROTOCOLS@

-#
-# MaxClients: controls the maximum number of simultaneous clients that
-# will be handled.  Defaults to 100.
-#
-
-#MaxClients 100
-
-#
-# MaxClientsPerHost: controls the maximum number of simultaneous clients that
-# will be handled from a specific host.  Defaults to 10 or 1/10th of the
-# MaxClients setting, whichever is larger.  A value of 0 specifies the
-# automatic (10 or 1/10th) setting.
-#
-
-#MaxClientsPerHost 0
-
-#
-# MaxRequestSize: controls the maximum size of HTTP requests and print files.
-# Set to 0 to disable this feature (defaults to 0.)
-#
-
-#MaxRequestSize 0
-
-#
-# Timeout: the timeout before requests time out.  Default is 300 seconds.
-#
-
-#Timeout 300
-
-
-########
-######## Browsing Options
-########
-
-#
-# Browsing: whether or not to broadcast and/or listen for CUPS printer
-# information on the network.  Enabled by default.
-#
-
-#Browsing On
-
-#
-# BrowseProtocols: which protocols to use for browsing.  Can be
-# any of the following separated by whitespace and/or commas:
-#
-#     all  - Use all supported protocols.
-#     cups - Use the CUPS browse protocol.
-#     slp  - Use the SLPv2 protocol.
-#
-# The default is "cups".
-#
-# NOTE: If you choose to use SLPv2, it is *strongly* recommended that
-#       you have at least one SLP Directory Agent (DA) on your
-#       network.  Otherwise, browse updates can take several seconds,
-#       during which the scheduler will not respond to client
-#       requests.
-#
-
-#BrowseProtocols cups
-
-#
-# BrowseAddress: specifies a broadcast address to be used.  By
-# default browsing information is not sent!
-#
-# Note: HP-UX does not properly handle broadcast unless you have a
-# Class A, B, C, or D netmask (i.e. no CIDR support).
-#
-# Note: Using the "global" broadcast address (255.255.255.255) will
-# activate a Linux demand-dial link with the default configuration.
-# If you have a LAN as well as the dial-up link, use the LAN's
-# broadcast address.
-#
-# The @LOCAL address broadcasts to all non point-to-point interfaces.
-# For example, if you have a LAN and a dial-up link, @LOCAL would
-# send printer updates to the LAN but not to the dial-up link.
-# Similarly, the @IF(name) address sends to the named network
-# interface, e.g. @IF(eth0) under Linux.  Interfaces are refreshed
-# automatically (no more than once every 60 seconds), so they can
-# be used on dynamically-configured interfaces, e.g. PPP, 802.11, etc.
-#
-
-#BrowseAddress x.y.z.255
-#BrowseAddress x.y.255.255
-#BrowseAddress x.255.255.255
-#BrowseAddress 255.255.255.255
-#BrowseAddress @LOCAL
-#BrowseAddress @IF(name)
-
-#
-# BrowseShortNames: whether or not to use "short" names for remote printers
-# when possible (e.g. "printer" instead of "printer@host".)  Enabled by
-# default.
-#
-
-#BrowseShortNames Yes
-
-#
-# BrowseAllow: specifies an address mask to allow for incoming browser
-# packets. The default is to allow packets from all addresses.
-#
-# BrowseDeny: specifies an address mask to deny for incoming browser
-# packets. The default is to deny packets from no addresses.
-#
-# Both "BrowseAllow" and "BrowseDeny" accept the following notations for
-# addresses:
-#
-#     All
-#     None
-#     *.domain.com
-#     .domain.com
-#     host.domain.com
-#     nnn.*
-#     nnn.nnn.*
-#     nnn.nnn.nnn.*
-#     nnn.nnn.nnn.nnn
-#     nnn.nnn.nnn.nnn/mm
-#     nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm
-#     @LOCAL
-#     @IF(name)
-#
-# The hostname/domainname restrictions only work if you have turned hostname
-# lookups on!
-#
-
-#BrowseAllow address
-#BrowseDeny address
-
-#
-# BrowseInterval: the time between browsing updates in seconds.  Default
-# is 30 seconds.
-#
-# Note that browsing information is sent whenever a printer's state changes
-# as well, so this represents the maximum time between updates.
-#
-# Set this to 0 to disable outgoing broadcasts so your local printers are
-# not advertised but you can still see printers on other hosts.
-#
-
-#BrowseInterval 30
-
-#
-# BrowseOrder: specifies the order of BrowseAllow/BrowseDeny comparisons.
-#
-
-#BrowseOrder allow,deny
-#BrowseOrder deny,allow
-
-#
-# BrowsePoll: poll the named server(s) for printers
-#
-
-#BrowsePoll address:port
-
-#
-# BrowsePort: the port used for UDP broadcasts.  By default this is
-# the IPP port; if you change this you need to do it on all servers.
-# Only one BrowsePort is recognized.
-#
-
-#BrowsePort 631
-
-#
-# BrowseRelay: relay browser packets from one address/network to another.
-#
-
-#BrowseRelay source-address destination-address
-#BrowseRelay @IF(src) @IF(dst)
-
-#
-# BrowseTimeout: the timeout for network printers - if we don't
-# get an update within this time the printer will be removed
-# from the printer list.  This number definitely should not be
-# less the BrowseInterval value for obvious reasons.  Defaults
-# to 300 seconds.
-#
-
-#BrowseTimeout 300
-
-#
-# ImplicitClasses: whether or not to use implicit classes.
-#
-# Printer classes can be specified explicitly in the classes.conf
-# file, implicitly based upon the printers available on the LAN, or
-# both.
-#
-# When ImplicitClasses is On, printers on the LAN with the same name
-# (e.g. Acme-LaserPrint-1000) will be put into a class with the same
-# name. This allows you to setup multiple redundant queues on a LAN
-# without a lot of administrative difficulties.  If a user sends a
-# job to Acme-LaserPrint-1000, the job will go to the first available
-# queue.
-#
-# Enabled by default.
-#
-
-#ImplicitClasses On
-
-#
-# ImplicitAnyClasses: whether or not to create "AnyPrinter" implicit
-# classes.
-#
-# When ImplicitAnyClasses is On and a local queue of the same name
-# exists, e.g. "printer", "printer@server1", "printer@server1", then
-# an implicit class called "Anyprinter" is created instead.
-#
-# When ImplicitAnyClasses is Off, implicit classes are not created
-# when there is a local queue of the same name.
-#
-# Disabled by default.
-#
-
-#ImplicitAnyCLasses Off
-
-#
-# HideImplicitMembers: whether or not to show the members of an
-# implicit class.
-#
-# When HideImplicitMembers is On, any remote printers that are
-# part of an implicit class are hidden from the user, who will
-# then only see a single queue even though many queues will be
-# supporting the implicit class.
-#
-# Enabled by default.
-#
-
-#HideImplicitMembers On
-
-
-########
-######## Security Options
-########
-
-#
-# SystemGroup: the group name for "System" (printer administration)
-# access.  The default varies depending on the operating system, but
-# will be "sys", "system", or "root" (checked for in that order.)
-#
-
-#SystemGroup @CUPS_GROUP@
-
-#
-# RootCertDuration: How frequently the root certificate is regenerated.
-# Defaults to 300 seconds.
-#
-
-#RootCertDuration 300
-
-#
-# Access permissions for each directory served by the scheduler.
-# Locations are relative to DocumentRoot...
-#
-# AuthType: the authorization to use:
-#
-#    None   - Perform no authentication
-#    Basic  - Perform authentication using the HTTP Basic method.
-#    Digest - Perform authentication using the HTTP Digest method.
-#
-#    (Note: local certificate authentication can be substituted by
-#           the client for Basic or Digest when connecting to the
-#           localhost interface)
-#
-# AuthClass: the authorization class; currently only "Anonymous", "User",
-# "System" (valid user belonging to group SystemGroup), and "Group"
-# (valid user belonging to the specified group) are supported.
-#
-# AuthGroupName: the group name for "Group" authorization.
-#
-# Order: the order of Allow/Deny processing.
-#
-# Allow: allows access from the specified hostname, domain, IP address,
-# network, or interface.
-#
-# Deny: denies access from the specified hostname, domain, IP address,
-# network, or interface.
-#
-# Both "Allow" and "Deny" accept the following notations for addresses:
-#
-#     All
-#     None
-#     *.domain.com
-#     .domain.com
-#     host.domain.com
-#     nnn.*
-#     nnn.nnn.*
-#     nnn.nnn.nnn.*
-#     nnn.nnn.nnn.nnn
-#     nnn.nnn.nnn.nnn/mm
-#     nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm
-#     @LOCAL
-#     @IF(name)
-#
-# The host and domain address require that you enable hostname lookups
-# with "HostNameLookups On" above.
-#
-# The @LOCAL address allows or denies from all non point-to-point
-# interfaces.  For example, if you have a LAN and a dial-up link,
-# @LOCAL could allow connections from the LAN but not from the dial-up
-# link.  Similarly, the @IF(name) address allows or denies from the
-# named network interface, e.g. @IF(eth0) under Linux.  Interfaces are
-# refreshed automatically (no more than once every 60 seconds), so
-# they can be used on dynamically-configured interfaces, e.g. PPP,
-# 802.11, etc.
-#
-# Encryption: whether or not to use encryption; this depends on having
-# the OpenSSL library linked into the CUPS library and scheduler.
-#
-# Possible values:
-#
-#     Always       - Always use encryption (SSL)
-#     Never        - Never use encryption
-#     Required     - Use TLS encryption upgrade
-#     IfRequested  - Use encryption if the server requests it
-#
-# The default value is "IfRequested".
-#
+# Default authentication type, when authentication is required...
+DefaultAuthType Basic

+# Restrict access to the server...
 <Location />
-Order Deny,Allow
-Deny From All
-Allow From 127.0.0.1
+  Order allow,deny
 </Location>

-#<Location /classes>
-#
-# You may wish to limit access to printers and classes, either with Allow
-# and Deny lines, or by requiring a username and password.
-#
-#</Location>
-
-#<Location /classes/name>
-#
-# You may wish to limit access to printers and classes, either with Allow
-# and Deny lines, or by requiring a username and password.
-#
-#</Location>
-
-#<Location /jobs>
-#
-# You may wish to limit access to job operations, either with Allow
-# and Deny lines, or by requiring a username and password.
-#
-#</Location>
-
-#<Location /printers>
-#
-# You may wish to limit access to printers and classes, either with Allow
-# and Deny lines, or by requiring a username and password.
-#
-#</Location>
-
-#<Location /printers/name>
-#
-# You may wish to limit access to printers and classes, either with Allow
-# and Deny lines, or by requiring a username and password.
-#
-
-## Anonymous access (default)
-#AuthType None
-
-## Require a username and password (Basic authentication)
-#AuthType Basic
-#AuthClass User
-
-## Require a username and password (Digest/MD5 authentication)
-#AuthType Digest
-#AuthClass User
-
-## Restrict access to local domain
-#Order Deny,Allow
-#Deny From All
-#Allow From .mydomain.com
-#</Location>
-
+# Restrict access to the admin pages...
 <Location /admin>
-#
-# You definitely will want to limit access to the administration functions.
-# The default configuration requires a local connection from a user who
-# is a member of the system group to do any admin tasks.  You can change
-# the group name using the SystemGroup directive.
-#
-
-AuthType Basic
-AuthClass System
-
-## Restrict access to local domain
-Order Deny,Allow
-Deny From All
-Allow From 127.0.0.1
-
-#Encryption Required
+  Order allow,deny
 </Location>

+# Restrict access to configuration files...
+<Location /admin/conf>
+  AuthType Default
+  Require user @SYSTEM
+  Order allow,deny
+</Location>
+
+# Set the default printer/job policies...
+<Policy default>
+  # Job-related operations must be done by the owner or an administrator...
+  <Limit Create-Job Print-Job Print-URI Validate-Job>
+    Order deny,allow
+  </Limit>
+
+  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job CUPS-Get-Document>
+    Require user @OWNER @SYSTEM
+    Order deny,allow
+  </Limit>
+
+  # All administration operations require an administrator to authenticate...
+  <Limit CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Set-Default CUPS-Get-Devices>
+    AuthType Default
+    Require user @SYSTEM
+    Order deny,allow
+  </Limit>
+
+  # All printer operations require a printer operator to authenticate...
+  <Limit Pause-Printer Resume-Printer Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Accept-Jobs CUPS-Reject-Jobs>
+    AuthType Default
+    Require user @CUPS_DEFAULT_PRINTOPERATOR_AUTH@
+    Order deny,allow
+  </Limit>
+
+  # Only the owner or an administrator can cancel or authenticate a job...
+  <Limit Cancel-Job CUPS-Authenticate-Job>
+    Require user @OWNER @CUPS_DEFAULT_PRINTOPERATOR_AUTH@
+    Order deny,allow
+  </Limit>
+
+  <Limit All>
+    Order deny,allow
+  </Limit>
+</Policy>
+
+# Set the authenticated printer/job policies...
+<Policy authenticated>
+  # Job-related operations must be done by the owner or an administrator...
+  <Limit Create-Job Print-Job Print-URI Validate-Job>
+    AuthType Default
+    Order deny,allow
+  </Limit>
+
+  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job CUPS-Get-Document>
+    AuthType Default
+    Require user @OWNER @SYSTEM
+    Order deny,allow
+  </Limit>
+
+  # All administration operations require an administrator to authenticate...
+  <Limit CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Set-Default>
+    AuthType Default
+    Require user @SYSTEM
+    Order deny,allow
+  </Limit>
+
+  # All printer operations require a printer operator to authenticate...
+  <Limit Pause-Printer Resume-Printer Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Accept-Jobs CUPS-Reject-Jobs>
+    AuthType Default
+    Require user @CUPS_DEFAULT_PRINTOPERATOR_AUTH@
+    Order deny,allow
+  </Limit>
+
+  # Only the owner or an administrator can cancel or authenticate a job...
+  <Limit Cancel-Job CUPS-Authenticate-Job>
+    AuthType Default
+    Require user @OWNER @CUPS_DEFAULT_PRINTOPERATOR_AUTH@
+    Order deny,allow
+  </Limit>
+
+  <Limit All>
+    Order deny,allow
+  </Limit>
+</Policy>
+
 #
 # End of "$Id$".
 #
@@ -1,118 +0,0 @@
-#
-# "$Id: mime.convs 3709 2003-05-12 17:38:18Z mike $"
-#
-#   MIME converts file for the Common UNIX Printing System (CUPS).
-#
-#   Copyright 1997-2003 by Easy Software Products.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
-#
-#       Voice: (301) 373-9603
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
-#
-
-########################################################################
-#
-# Format of Lines:
-#
-#   source/type destination/type cost filter
-#
-# General Notes:
-#
-#   The "cost" field is used to find the least costly filters to run
-#   when converting a job file to a printable format.
-#
-#   All filters *must* accept the standard command-line arguments
-#   (job-id, user, title, copies, options, [filename or stdin]) to
-#   work with CUPS.
-#
-
-########################################################################
-#
-# PostScript filters
-#
-
-application/pdf		application/postscript	33	pdftops
-application/postscript	application/vnd.cups-postscript	66	pstops
-application/vnd.hp-HPGL	application/postscript	66	hpgltops
-application/x-cshell	application/postscript	33	texttops
-application/x-perl	application/postscript	33	texttops
-application/x-shell	application/postscript	33	texttops
-text/plain		application/postscript	33	texttops
-text/html		application/postscript	33	texttops
-image/gif		application/vnd.cups-postscript	66	imagetops
-image/png		application/vnd.cups-postscript	66	imagetops
-image/jpeg		application/vnd.cups-postscript	66	imagetops
-image/tiff		application/vnd.cups-postscript	66	imagetops
-image/x-bitmap		application/vnd.cups-postscript	66	imagetops
-image/x-photocd		application/vnd.cups-postscript	66	imagetops
-image/x-portable-anymap	application/vnd.cups-postscript	66	imagetops
-image/x-portable-bitmap	application/vnd.cups-postscript	66	imagetops
-image/x-portable-graymap application/vnd.cups-postscript	66	imagetops
-image/x-portable-pixmap	application/vnd.cups-postscript	66	imagetops
-image/x-sgi-rgb		application/vnd.cups-postscript	66	imagetops
-image/x-xbitmap		application/vnd.cups-postscript	66	imagetops
-image/x-xpixmap		application/vnd.cups-postscript	66	imagetops
-#image/x-xwindowdump	application/vnd.cups-postscript	66	imagetops
-image/x-sun-raster	application/vnd.cups-postscript	66	imagetops
-
-
-########################################################################
-#
-# Form filter...
-#
-# This filter does not currently exist, but the file format is defined
-# in the IDD and registered with the IANA for future use...
-#
-
-#application/vnd.cups-form application/vnd.cups-postscript 33 formtops
-
-########################################################################
-#
-# Raster filters...
-#
-
-image/gif		application/vnd.cups-raster	100	imagetoraster
-image/png		application/vnd.cups-raster	100	imagetoraster
-image/jpeg		application/vnd.cups-raster	100	imagetoraster
-image/tiff		application/vnd.cups-raster	100	imagetoraster
-image/x-bitmap		application/vnd.cups-raster	100	imagetoraster
-image/x-photocd		application/vnd.cups-raster	100	imagetoraster
-image/x-portable-anymap	application/vnd.cups-raster	100	imagetoraster
-image/x-portable-bitmap	application/vnd.cups-raster	100	imagetoraster
-image/x-portable-graymap application/vnd.cups-raster	100	imagetoraster
-image/x-portable-pixmap	application/vnd.cups-raster	100	imagetoraster
-image/x-sgi-rgb		application/vnd.cups-raster	100	imagetoraster
-image/x-xbitmap		application/vnd.cups-raster	100	imagetoraster
-image/x-xpixmap		application/vnd.cups-raster	100	imagetoraster
-#image/x-xwindowdump	application/vnd.cups-raster	100	imagetoraster
-image/x-sun-raster	application/vnd.cups-raster	100	imagetoraster
-
-# pstoraster is now part of ESP Ghostscript...
-#application/vnd.cups-postscript	application/vnd.cups-raster	100	pstoraster
-
-########################################################################
-#
-# Raw filter...
-#
-# Uncomment the following filter and the application/octet-stream type
-# in mime.types to allow printing of arbitrary files without the -oraw
-# option.
-#
-
-#application/octet-stream	application/vnd.cups-raw	0	-
-
-#
-# End of "$Id: mime.convs 3709 2003-05-12 17:38:18Z mike $".
-#
@@ -0,0 +1,104 @@
+#
+# "$Id$"
+#
+#   DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW
+#   VERSIONS OF CUPS.  Instead, create a "local.convs" file that
+#   reflects your local configuration changes.
+#
+#   MIME converts file for the Common UNIX Printing System (CUPS).
+#
+#   Copyright 2007-2009 by Apple Inc.
+#   Copyright 1997-2007 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/".
+#
+
+########################################################################
+#
+# Format of Lines:
+#
+#   source/type destination/type cost filter
+#
+# General Notes:
+#
+#   The "cost" field is used to find the least costly filters to run
+#   when converting a job file to a printable format.
+#
+#   All filters *must* accept the standard command-line arguments
+#   (job-id, user, title, copies, options, [filename or stdin]) to
+#   work with CUPS.
+#
+
+########################################################################
+#
+# PostScript filters
+#
+
+application/pdf			application/vnd.cups-postscript	66	pdftops
+application/postscript		application/vnd.cups-postscript	66	pstops
+application/vnd.hp-HPGL		application/postscript		66	hpgltops
+application/x-cshell		application/postscript		33	texttops
+application/x-csource		application/postscript		33	texttops
+application/x-perl		application/postscript		33	texttops
+application/x-shell		application/postscript		33	texttops
+text/plain			application/postscript		33	texttops
+text/css			application/postscript		33	texttops
+text/html			application/postscript		33	texttops
+image/gif			application/vnd.cups-postscript	66	imagetops
+image/png			application/vnd.cups-postscript	66	imagetops
+image/jpeg			application/vnd.cups-postscript	66	imagetops
+image/tiff			application/vnd.cups-postscript	66	imagetops
+image/x-bitmap			application/vnd.cups-postscript	66	imagetops
+image/x-photocd			application/vnd.cups-postscript	66	imagetops
+image/x-portable-anymap		application/vnd.cups-postscript	66	imagetops
+image/x-portable-bitmap		application/vnd.cups-postscript	66	imagetops
+image/x-portable-graymap	application/vnd.cups-postscript	66	imagetops
+image/x-portable-pixmap		application/vnd.cups-postscript	66	imagetops
+image/x-sgi-rgb			application/vnd.cups-postscript	66	imagetops
+image/x-xbitmap			application/vnd.cups-postscript	66	imagetops
+image/x-xpixmap			application/vnd.cups-postscript	66	imagetops
+#image/x-xwindowdump		application/vnd.cups-postscript	66	imagetops
+image/x-sun-raster		application/vnd.cups-postscript	66	imagetops
+application/vnd.cups-banner	application/postscript		33	bannertops
+
+########################################################################
+#
+# Raster filters...
+#
+
+image/gif			application/vnd.cups-raster	100	imagetoraster
+image/png			application/vnd.cups-raster	100	imagetoraster
+image/jpeg			application/vnd.cups-raster	100	imagetoraster
+image/tiff			application/vnd.cups-raster	100	imagetoraster
+image/x-bitmap			application/vnd.cups-raster	100	imagetoraster
+image/x-photocd			application/vnd.cups-raster	100	imagetoraster
+image/x-portable-anymap		application/vnd.cups-raster	100	imagetoraster
+image/x-portable-bitmap		application/vnd.cups-raster	100	imagetoraster
+image/x-portable-graymap	application/vnd.cups-raster	100	imagetoraster
+image/x-portable-pixmap		application/vnd.cups-raster	100	imagetoraster
+image/x-sgi-rgb			application/vnd.cups-raster	100	imagetoraster
+image/x-xbitmap			application/vnd.cups-raster	100	imagetoraster
+image/x-xpixmap			application/vnd.cups-raster	100	imagetoraster
+#image/x-xwindowdump		application/vnd.cups-raster	100	imagetoraster
+image/x-sun-raster		application/vnd.cups-raster	100	imagetoraster
+
+# pstoraster is part of GPL Ghostscript...
+application/vnd.cups-postscript	application/vnd.cups-raster	100	pstoraster
+
+########################################################################
+#
+# Raw filter...
+#
+# Uncomment the following filter to allow printing of arbitrary files
+# without the -oraw option.
+#
+
+@DEFAULT_RAW_PRINTING@application/octet-stream	application/vnd.cups-raw	0	-
+
+#
+# End of "$Id$".
+#
@@ -1,25 +1,20 @@
 #
-# "$Id: mime.types 3564 2003-04-07 18:03:28Z mike $"
+# "$Id: mime.types 8783 2009-08-28 17:51:05Z mike $"
 #
 #   MIME types file for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2003 by Easy Software Products.
+#   DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW
+#   VERSIONS OF CUPS.  Instead, create a "local.types" file that
+#   reflects your local configuration changes.
+#
+#   Copyright 2007-2009 by Apple Inc.
+#   Copyright 1997-2007 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
-#
-#       Voice: (301) 373-9603
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   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/".
 #

 ########################################################################
@@ -38,6 +33,8 @@
 #   extension				Pattern match on "*.extension"
 #   ascii(offset,length)		True if bytes are valid printable ASCII
 #					(CR, NL, TAB, BS, 32-126)
+#   priority(number)                    Sets priority of type (0=lowest,
+#                                       100=default, 200=highest)
 #   printable(offset,length)		True if bytes are printable 8-bit chars
 #					(CR, NL, TAB, BS, 32-126, 128-254)
 #   string(offset,"string")		True if bytes are identical to string
@@ -53,10 +50,12 @@
 #
 #   MIME type names are case-insensitive.  Internally they are converted
 #   to lowercase.  Multiple occurrences of a type will cause the provided
-#   rules to be appended to the existing definition.  Type names are sorted
-#   in ascending order, so if two types use the same rules to resolve a type
-#   (e.g. doc extension for two types), the returned type will be the first
-#   type in the sorted list.
+#   rules to be appended to the existing definition.  If two types use the same
+#   rules to resolve a type and have the same priority, e.g. "doc" extension for
+#   "text/bar" and "text/foo", the returned type will be the first type as
+#   sorted in alphanumerically ascending order without regard to case.  Thus,
+#   the "text/bar" type will match the "doc" extension first unless the
+#   "text/foo" type has specified a higher priority.
 #
 #   The "printable" rule differs from the "ascii" rule in that it also
 #   accepts 8-bit characters in the range 128-255.
@@ -74,17 +73,20 @@
 application/pdf			pdf string(0,%PDF)
 application/postscript		ai eps ps string(0,%!) string(0,<04>%!) \
 				contains(0,128,<1B>%-12345X) + \
-				(contains(0,1024,"LANGUAGE=POSTSCRIPT") \
-				 contains(0,1024,"LANGUAGE = Postscript") \
-				 contains(0,1024,"LANGUAGE = POSTSCRIPT"))
-application/vnd.hp-HPGL		hpgl string(0,<1B>&)\
+				(contains(0,4096,"LANGUAGE=POSTSCRIPT") \
+				 contains(0,4096,"LANGUAGE = Postscript") \
+				 contains(0,4096,"LANGUAGE = PostScript") \
+				 contains(0,4096,"LANGUAGE = POSTSCRIPT") \
+				 (contains(0,4096,<0a>%!) + \
+				  !contains(0,4096,"ENTER LANGUAGE")))
+application/vnd.hp-HPGL		hpgl \
 				string(0,<1B>E<1B>%0B) \
 				string(0,<1B>%-1B) string(0,<201B>)\
 				string(0,BP;) string(0,IN;) string(0,DF;) \
 				string(0,BPINPS;) \
 				(contains(0,128,<1B>%-12345X) + \
-				 (contains(0,1024,"LANGUAGE=HPGL") \
-				  contains(0,1024,"LANGUAGE = HPGL")))
+				 (contains(0,4096,"LANGUAGE=HPGL") \
+				  contains(0,4096,"LANGUAGE = HPGL")))

 ########################################################################
 #
@@ -93,12 +95,12 @@ application/vnd.hp-HPGL		hpgl string(0,<1B>&)\

 image/gif			gif string(0,GIF87a) string(0,GIF89a)
 image/png			png string(0,<89>PNG)
-image/jpeg			jpeg jpg jpe string(0,<FFD8FF>) &&\
+image/jpeg			jpeg jpg jpe string(0,<FFD8FF>) +\
 				(char(3,0xe0) char(3,0xe1) char(3,0xe2) char(3,0xe3)\
 				 char(3,0xe4) char(3,0xe5) char(3,0xe6) char(3,0xe7)\
 				 char(3,0xe8) char(3,0xe9) char(3,0xea) char(3,0xeb)\
 				 char(3,0xec) char(3,0xed) char(3,0xee) char(3,0xef))
-image/tiff			tiff tif string(0,MM) string(0,II)
+image/tiff			tiff tif string(0,MM<002A>) string(0,II<2A00>)
 image/x-photocd			pcd string(2048,PCD_IPI)
 image/x-portable-anymap		pnm
 image/x-portable-bitmap		pbm string(0,P1) string(0,P4)
@@ -112,15 +114,14 @@ image/x-sun-raster		ras string(0,<59a66a95>)

 #image/fpx			fpx
 image/x-alias			pix short(8,8) short(8,24)
-image/x-bitmap			bmp string(0,BM) && !printable(2,14)
+image/x-bitmap			bmp string(0,BM) + !printable(2,14)
+image/x-icon			ico

 ########################################################################
 #
 # Text files...
 #

-text/html			html htm printable(0,1024) +\
-				(istring(0,"<HTML>") istring(0,"<!DOCTYPE"))
 application/x-cshell		csh printable(0,1024) + string(0,#!) +\
 				(contains(2,80,/csh) contains(2,80,/tcsh))
 application/x-perl		pl printable(0,1024) + string(0,#!) +\
@@ -128,34 +129,53 @@ application/x-perl		pl printable(0,1024) + string(0,#!) +\
 application/x-shell		sh printable(0,1024) + string(0,#!) +\
 				(contains(2,80,/bash) contains(2,80,/ksh)\
 				 contains(2,80,/sh) contains(2,80,/zsh))
+application/x-csource		c cxx cpp cc C h hpp \
+				printable(0,1024) + \
+				(string(0,/*) string(0,//)
+				 string(0,#include) contains(0,1024,<0a>#include) \
+				 string(0,#define) contains(0,1024,<0a>#define))
+text/html			html htm printable(0,1024) +\
+				(istring(0,"<HTML>") istring(0,"<!DOCTYPE"))
 text/plain			txt printable(0,1024)
+text/css			css
+
+
+########################################################################
+#
+# RSS feed type...
+#
+
+application/rss+xml		rss
+

 ########################################################################
 #
 # CUPS-specific types...
 #

+application/vnd.cups-banner	string(0,'#CUPS-BANNER')
 application/vnd.cups-command	string(0,'#CUPS-COMMAND')
-application/vnd.cups-form	string(0,"<CUPSFORM>")
+application/vnd.cups-pdf
 application/vnd.cups-postscript
-application/vnd.cups-raster	string(0,"RaSt") string(0,"tSaR")
+application/vnd.cups-ppd	ppd string(0,"*PPD-Adobe:")
+application/vnd.cups-raster	string(0,"RaSt") string(0,"tSaR") \
+				string(0,"RaS2") string(0,"2SaR") \
+				string(0,"RaS3") string(0,"3SaR")
 application/vnd.cups-raw	(string(0,<1B>E) + !string(2,<1B>%0B)) \
 				string(0,<1B>@) \
 				(contains(0,128,<1B>%-12345X) + \
-				 (contains(0,1024,"LANGUAGE=PCL") \
-				  contains(0,1024,"LANGUAGE = PCL")))
+				 (contains(0,4096,"LANGUAGE=PCL") \
+				  contains(0,4096,"LANGUAGE = PCL")))

 ########################################################################
 #
 # Raw print file support...
 #
-# Uncomment the following type and the application/octet-stream
-# filter line in mime.convs to allow raw file printing without the
-# -oraw option.
+# Comment the following type to prevent raw file printing.
 #

-#application/octet-stream
+application/octet-stream

 #
-# End of "$Id: mime.types 3564 2003-04-07 18:03:28Z mike $".
+# End of "$Id: mime.types 8783 2009-08-28 17:51:05Z mike $".
 #
@@ -1,2 +0,0 @@
-auth	required	@PAMMOD@ nullok shadow
-account	required	@PAMMOD@
@@ -0,0 +1,5 @@
+# cups: auth account password session
+auth       required       pam_opendirectory.so
+account    required       pam_permit.so
+password   required       pam_deny.so
+session    required       pam_permit.so
@@ -0,0 +1,7 @@
+# cups: auth account password session
+auth       sufficient     pam_securityserver.so
+auth       sufficient     pam_unix.so
+auth       required       pam_deny.so
+account    required       pam_permit.so
+password   required       pam_deny.so
+session    required       pam_permit.so
@@ -0,0 +1,2 @@
+auth	required	@PAMMODAUTH@
+account	required	@PAMMOD@
@@ -1,2 +0,0 @@
-# This is a dummy printcap file that is automatically generated by the
-# CUPS software for old applications that rely on it.
@@ -1,96 +0,0 @@
-#
-# "$Id: printers.conf 3041 2002-12-17 19:00:27Z swdev $"
-#
-#   Sample printer configuration file for the Common UNIX Printing System
-#   (CUPS) scheduler.
-#
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
-#
-#       Voice: (301) 373-9603
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
-#
-
-########################################################################
-#                                                                      #
-# This is a sample printer configuration file.  This file is included  #
-# from the main configuration file (cups.conf) and lists all of the    #
-# printers known to the system.                                        #
-#                                                                      #
-########################################################################
-
-#
-# Each printer starts with a <Printer name> definition.  Printer names
-# can be up to 128 characters in length and are *not* case sensitive.
-#
-# One <DefaultPrinter name> entry can appear in this file; if you don't
-# define a default destination, the first printer or class becomes the
-# default.
-#
-
-#<Printer sample>
-#
-# Info: the description for the printer.
-#
-
-#Info Acme LaserPrint 1000
-
-#
-# Location: the location of the printer.
-#
-
-#Location Room 101 in the activities building
-
-#
-# DeviceURI: the device URI for this printer.
-#
-
-#DeviceURI parallel:/dev/plp
-#DeviceURI serial:/dev/ttyd1?baud=38400+size=8+parity=none+flow=soft
-#DeviceURI scsi:/dev/scsi/sc1d6l0
-#DeviceURI socket://hostname:port
-#DeviceURI tftp://hostname/path
-#DeviceURI ftp://hostname/path
-#DeviceURI http://hostname[:port]/path
-#DeviceURI ipp://hostname/path
-#DeviceURI smb://hostname/printer
-
-#
-# State: sets the initial state of the printer.  Can be one of the
-# following:
-#
-#     Idle    - Printer is available to print new jobs.
-#     Stopped - Printer is disabled but accepting new jobs.
-#
-
-#State Idle
-
-#
-# StateMessage: sets the printer-state-message attribute for the printer.
-#
-
-#StateMessage Printer is idle.
-
-#
-# Accepting: is the printer accepting jobs?
-#
-#Accepting Yes
-#Accepting No
-
-#</Printer>
-
-#
-# End of "$Id: printers.conf 3041 2002-12-17 19:00:27Z swdev $".
-#
@@ -0,0 +1,13 @@
+#
+# "$Id$"
+#
+#   Sample SNMP configuration file for CUPS.  See "man cups-snmp.conf" for a
+#   complete description of this file.
+#
+
+@CUPS_SNMP_ADDRESS@
+@CUPS_SNMP_COMMUNITY@
+
+#
+# End of "$Id$".
+#
@@ -0,0 +1,140 @@
+dnl
+dnl "$Id: cups-3264.m4 8524 2009-04-19 21:18:45Z mike $"
+dnl
+dnl   32/64-bit library support stuff for the Common UNIX Printing System (CUPS).
+dnl
+dnl   Copyright 2007-2009 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 8524 2009-04-19 21:18:45Z mike $".
+dnl
@@ -1,37 +1,40 @@
 dnl
-dnl "$Id: cups-common.m4 3940 2003-09-17 19:35:22Z mike $"
+dnl "$Id: cups-common.m4 9482 2011-01-14 18:57:44Z mike $"
 dnl
-dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
+dnl   Common configuration stuff for CUPS.
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+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
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636-3111 USA
-dnl
-dnl       Voice: (301) 373-9603
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+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 We need at least autoconf 2.50...
-AC_PREREQ(2.50)
+dnl We need at least autoconf 2.60...
+AC_PREREQ(2.60)

 dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)

 dnl Version number information...
-CUPS_VERSION="1.1.20rc2"
+CUPS_VERSION="1.4.7"
+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
+CUPS_BUILD="cups-$CUPS_VERSION"
+
+AC_ARG_WITH(cups_build, [  --with-cups-build       set "cups-config --build" string ],
+	CUPS_BUILD="$withval")
+
 AC_SUBST(CUPS_VERSION)
-AC_DEFINE_UNQUOTED(CUPS_SVERSION, "CUPS v$CUPS_VERSION")
+AC_SUBST(CUPS_REVISION)
+AC_SUBST(CUPS_BUILD)
+AC_DEFINE_UNQUOTED(CUPS_SVERSION, "CUPS v$CUPS_VERSION$CUPS_REVISION")
+AC_DEFINE_UNQUOTED(CUPS_MINIMAL, "CUPS/$CUPS_VERSION$CUPS_REVISION")

 dnl Default compiler flags...
 CFLAGS="${CFLAGS:=}"
@@ -42,30 +45,30 @@ LDFLAGS="${LDFLAGS:=}"
 dnl Checks for programs...
 AC_PROG_AWK
 AC_PROG_CC
-AC_PROG_CXX
 AC_PROG_CPP
-AC_PROG_INSTALL
-if test "$INSTALL" = "$ac_install_sh"; then
-	# Use full path to install-sh script...
-	INSTALL="`pwd`/install-sh -c"
-fi
+AC_PROG_CXX
 AC_PROG_RANLIB
 AC_PATH_PROG(AR,ar)
+AC_PATH_PROG(CHMOD,chmod)
 AC_PATH_PROG(HTMLDOC,htmldoc)
+AC_PATH_PROG(LD,ld)
 AC_PATH_PROG(LN,ln)
 AC_PATH_PROG(MV,mv)
-AC_PATH_PROG(NROFF,nroff)
-if test "$NROFF" = ""; then
-	AC_PATH_PROG(GROFF,groff)
-	if test "$GROFF" = ""; then
-        	NROFF="echo"
-	else
-        	NROFF="$GROFF -T ascii"
-	fi
-fi
 AC_PATH_PROG(RM,rm)
+AC_PATH_PROG(RMDIR,rmdir)
 AC_PATH_PROG(SED,sed)
-AC_PATH_PROG(STRIP,strip)
+AC_PATH_PROG(XDGOPEN,xdg-open)
+if test "x$XDGOPEN" = x; then
+	CUPS_HTMLVIEW="htmlview"
+else
+	CUPS_HTMLVIEW="$XDGOPEN"
+fi
+AC_SUBST(CUPS_HTMLVIEW)
+
+AC_MSG_CHECKING(for install-sh script)
+INSTALL="`pwd`/install-sh"
+AC_SUBST(INSTALL)
+AC_MSG_RESULT(using $INSTALL)

 if test "x$AR" = x; then
 	AC_MSG_ERROR([Unable to find required library archive command.])
@@ -73,35 +76,40 @@ fi
 if test "x$CC" = x; then
 	AC_MSG_ERROR([Unable to find required C compiler command.])
 fi
-if test "x$CXX" = x; then
-	AC_MSG_ERROR([Unable to find required C++ compiler command.])
+
+dnl Static library option...
+INSTALLSTATIC=""
+AC_ARG_ENABLE(static, [  --enable-static         install static libraries])
+
+if test x$enable_static = xyes; then
+	echo Installing static libraries...
+	INSTALLSTATIC="installstatic"
 fi

-dnl Architecture checks...
-AC_C_BIGENDIAN
+AC_SUBST(INSTALLSTATIC)
+
+dnl Check for pkg-config, which is used for some other tests later on...
+AC_PATH_PROG(PKGCONFIG, pkg-config)

 dnl Check for libraries...
 AC_SEARCH_LIBS(crypt, crypt)
 AC_SEARCH_LIBS(getspent, sec gen)

 LIBMALLOC=""
-AC_ARG_ENABLE(mallinfo, [  --enable-mallinfo       turn on malloc debug information, default=no])
+AC_ARG_ENABLE(mallinfo, [  --enable-mallinfo       build with malloc debug logging])

 if test x$enable_mallinfo = xyes; then
-	AC_CHECK_LIB(c,mallinfo,LIBS="$LIBS"; AC_DEFINE(HAVE_MALLINFO),LIBS="$LIBS")
-	if test "$ac_cv_lib_c_mallinfo" = "no"; then
-		AC_CHECK_LIB(malloc,mallinfo,
-	        	     LIBS="$LIBS"
-			     LIBMALLOC="-lmalloc"
-			     AC_DEFINE(HAVE_MALLINFO),
-			     LIBS="$LIBS")
-	fi
+	SAVELIBS="$LIBS"
+	LIBS=""
+	AC_SEARCH_LIBS(mallinfo, malloc, AC_DEFINE(HAVE_MALLINFO))
+	LIBMALLOC="$LIBS"
+	LIBS="$SAVELIBS"
 fi

 AC_SUBST(LIBMALLOC)

 dnl Check for libpaper support...
-AC_ARG_ENABLE(libpaper, [  --enable-libpaper       turn on libpaper support, default=no])
+AC_ARG_ENABLE(libpaper, [  --enable-libpaper       build with libpaper support])

 if test x$enable_libpaper = xyes; then
 	AC_CHECK_LIB(paper,systempapername,
@@ -115,8 +123,8 @@ AC_SUBST(LIBPAPER)

 dnl Checks for header files.
 AC_HEADER_STDC
-AC_HEADER_DIRENT
 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))
 AC_CHECK_HEADER(shadow.h,AC_DEFINE(HAVE_SHADOW_H))
 AC_CHECK_HEADER(string.h,AC_DEFINE(HAVE_STRING_H))
@@ -124,6 +132,16 @@ AC_CHECK_HEADER(strings.h,AC_DEFINE(HAVE_STRINGS_H))
 AC_CHECK_HEADER(bstring.h,AC_DEFINE(HAVE_BSTRING_H))
 AC_CHECK_HEADER(usersec.h,AC_DEFINE(HAVE_USERSEC_H))
 AC_CHECK_HEADER(sys/ioctl.h,AC_DEFINE(HAVE_SYS_IOCTL_H))
+AC_CHECK_HEADER(sys/param.h,AC_DEFINE(HAVE_SYS_PARAM_H))
+AC_CHECK_HEADER(sys/ucred.h,AC_DEFINE(HAVE_SYS_UCRED_H))
+AC_CHECK_HEADER(scsi/sg.h,AC_DEFINE(HAVE_SCSI_SG_H))
+
+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))
+AC_CHECK_HEADER(sys/statvfs.h,AC_DEFINE(HAVE_SYS_STATVFS_H))
+AC_CHECK_HEADER(sys/vfs.h,AC_DEFINE(HAVE_SYS_VFS_H))
+AC_CHECK_FUNCS(statfs statvfs)

 dnl Checks for string functions.
 AC_CHECK_FUNCS(strdup strcasecmp strncasecmp strlcat strlcpy)
@@ -133,38 +151,30 @@ else
 	AC_CHECK_FUNCS(snprintf vsnprintf)
 fi

-dnl Check OS version and use appropriate format string for strftime...
-AC_MSG_CHECKING(for correct format string to use with strftime)
+dnl Check for random number functions...
+AC_CHECK_FUNCS(random lrand48 arc4random)

-case "$uname" in
-	IRIX* | SunOS*)
-		# IRIX and SunOS
-		AC_MSG_RESULT(NULL)
-		AC_DEFINE(CUPS_STRFTIME_FORMAT, NULL)
-		;;
-	*)
-		# All others
-		AC_MSG_RESULT("%c")
-		AC_DEFINE(CUPS_STRFTIME_FORMAT, "%c")
-		;;
-esac
+dnl Check for geteuid function.
+AC_CHECK_FUNCS(geteuid)

-dnl Checks for mkstemp and mkstemps functions.
-AC_CHECK_FUNCS(mkstemp mkstemps)
-
-dnl Checks for vsyslog function.
+dnl Check for vsyslog function.
 AC_CHECK_FUNCS(vsyslog)

 dnl Checks for signal functions.
-if test "$uname" != "Linux"; then
-	AC_CHECK_FUNCS(sigset)
-fi
+case "$uname" in
+	Linux | GNU)
+		# Do not use sigset on Linux or GNU HURD
+		;;
+	*)
+		# Use sigset on other platforms, if available
+		AC_CHECK_FUNCS(sigset)
+		;;
+esac

 AC_CHECK_FUNCS(sigaction)

 dnl Checks for wait functions.
-AC_CHECK_FUNCS(waitpid)
-AC_CHECK_FUNCS(wait3)
+AC_CHECK_FUNCS(waitpid wait3)

 dnl See if the tm structure has the tm_gmtoff member...
 AC_MSG_CHECKING(for tm_gmtoff member in tm structure)
@@ -174,6 +184,51 @@ AC_TRY_COMPILE([#include <time.h>],[struct tm t;
 	AC_DEFINE(HAVE_TM_GMTOFF),
 	AC_MSG_RESULT(no))

+dnl See if the stat structure has the st_gen member...
+AC_MSG_CHECKING(for st_gen member in stat structure)
+AC_TRY_COMPILE([#include <sys/stat.h>],[struct stat t;
+	int o = t.st_gen;],
+	AC_MSG_RESULT(yes)
+	AC_DEFINE(HAVE_ST_GEN),
+	AC_MSG_RESULT(no))
+
+dnl See if we have the removefile(3) function for securely removing files
+AC_CHECK_FUNCS(removefile)
+
+dnl See if we have libusb...
+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")])
+fi
+
+dnl See if we have libwrap for TCP wrappers support...
+AC_ARG_ENABLE(tcp_wrappers, [  --enable-tcp-wrappers   use libwrap for TCP wrappers support])
+
+LIBWRAP=""
+AC_SUBST(LIBWRAP)
+
+if test x$enable_tcp_wrappers = xyes; then
+	AC_CHECK_LIB(wrap, hosts_access,[
+		AC_CHECK_HEADER(tcpd.h,
+			AC_DEFINE(HAVE_TCPD_H)
+			LIBWRAP="-lwrap")])
+fi
+
 dnl Flags for "ar" command...
 case $uname in
        Darwin* | *BSD*)
@@ -186,21 +241,135 @@ esac

 AC_SUBST(ARFLAGS)

+dnl Prep libraries specifically for cupsd and backends...
+BACKLIBS=""
+CUPSDLIBS=""
+AC_SUBST(BACKLIBS)
+AC_SUBST(CUPSDLIBS)
+
+dnl See if we have POSIX ACL support...
+SAVELIBS="$LIBS"
+LIBS=""
+AC_ARG_ENABLE(acl, [  --enable-acl            build with POSIX ACL support])
+if test "x$enable_acl" != xno; then
+	AC_SEARCH_LIBS(acl_init, acl, AC_DEFINE(HAVE_ACL_INIT))
+	CUPSDLIBS="$CUPSDLIBS $LIBS"
+fi
+LIBS="$SAVELIBS"
+
+dnl Check for DBUS support
+if test -d /etc/dbus-1; then
+	DBUSDIR="/etc/dbus-1"
+else
+	DBUSDIR=""
+fi
+
+AC_ARG_ENABLE(dbus, [  --enable-dbus           build with DBUS support])
+AC_ARG_WITH(dbusdir, [  --with-dbusdir          set DBUS configuration directory ],
+	DBUSDIR="$withval")
+
+DBUS_NOTIFIER=""
+DBUS_NOTIFIERLIBS=""
+
+if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x; then
+	AC_MSG_CHECKING(for DBUS)
+	if $PKGCONFIG --exists dbus-1; then
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_DBUS)
+		CFLAGS="$CFLAGS `$PKGCONFIG --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE"
+		CUPSDLIBS="$CUPSDLIBS `$PKGCONFIG --libs dbus-1`"
+		DBUS_NOTIFIER="dbus"
+		DBUS_NOTIFIERLIBS="`$PKGCONFIG --libs dbus-1`"
+		SAVELIBS="$LIBS"
+		LIBS="$LIBS $DBUS_NOTIFIERLIBS"
+		AC_CHECK_FUNC(dbus_message_iter_init_append,
+			      AC_DEFINE(HAVE_DBUS_MESSAGE_ITER_INIT_APPEND))
+		LIBS="$SAVELIBS"
+	else
+		AC_MSG_RESULT(no)
+	fi
+fi
+
+AC_SUBST(DBUSDIR)
+AC_SUBST(DBUS_NOTIFIER)
+AC_SUBST(DBUS_NOTIFIERLIBS)
+
 dnl Extra platform-specific libraries...
+CUPS_DEFAULT_PRINTOPERATOR_AUTH="@SYSTEM"
+CUPS_SYSTEM_AUTHKEY=""
+FONTS="fonts"
+LEGACY_BACKENDS="parallel scsi"
+
 case $uname in
        Darwin*)
-                BACKLIBS="-framework IOKit"
-                COMMONLIBS="-framework CoreFoundation"
-                ;;
-        *)
-                BACKLIBS=""
-		COMMONLIBS=""
+		LEGACY_BACKENDS=""
+                BACKLIBS="$BACKLIBS -framework IOKit"
+                CUPSDLIBS="$CUPSDLIBS -sectorder __TEXT __text cupsd.order -e start -framework IOKit -framework SystemConfiguration -weak_framework ApplicationServices"
+                LIBS="-framework SystemConfiguration -framework CoreFoundation -framework Security $LIBS"
+
+		dnl Check for framework headers...
+		AC_CHECK_HEADER(ApplicationServices/ApplicationServices.h,AC_DEFINE(HAVE_APPLICATIONSERVICES_H))
+		AC_CHECK_HEADER(CoreFoundation/CoreFoundation.h,AC_DEFINE(HAVE_COREFOUNDATION_H))
+		AC_CHECK_HEADER(CoreFoundation/CFPriv.h,AC_DEFINE(HAVE_CFPRIV_H))
+		AC_CHECK_HEADER(CoreFoundation/CFBundlePriv.h,AC_DEFINE(HAVE_CFBUNDLEPRIV_H))
+
+		dnl Check for dynamic store function...
+		AC_CHECK_FUNCS(SCDynamicStoreCopyComputerName)
+
+		dnl Check for the new membership functions in MacOSX 10.4...
+		AC_CHECK_HEADER(membership.h,AC_DEFINE(HAVE_MEMBERSHIP_H))
+		AC_CHECK_HEADER(membershipPriv.h,AC_DEFINE(HAVE_MEMBERSHIPPRIV_H))
+		AC_CHECK_FUNCS(mbr_uid_to_uuid)
+
+                dnl Check for the vproc_transaction_begin/end stuff...
+		AC_CHECK_FUNCS(vproc_transaction_begin)
+
+		dnl Need <dlfcn.h> header...
+		AC_CHECK_HEADER(dlfcn.h,AC_DEFINE(HAVE_DLFCN_H))
+
+		dnl Check for notify_post support
+		AC_CHECK_HEADER(notify.h,AC_DEFINE(HAVE_NOTIFY_H))
+		AC_CHECK_FUNCS(notify_post)
+
+		dnl Check for Authorization Services support
+		AC_ARG_WITH(adminkey, [  --with-adminkey         set the default SystemAuthKey value],
+			default_adminkey="$withval",
+			default_adminkey="default")
+ 		AC_ARG_WITH(operkey, [  --with-operkey          set the default operator @AUTHKEY value],
+			default_operkey="$withval",
+			default_operkey="default")
+ 
+		AC_CHECK_HEADER(Security/Authorization.h, [
+			AC_DEFINE(HAVE_AUTHORIZATION_H)
+
+			if test "x$default_adminkey" != xdefault; then
+				CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey $default_adminkey"
+			elif grep -q system.print.operator /etc/authorization; then
+				CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.print.admin"
+			else
+				CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.preferences"
+			fi
+
+			if test "x$default_operkey" != xdefault; then
+				CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY($default_operkey) @admin @lpadmin"
+			elif grep -q system.print.operator /etc/authorization; then
+				CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.operator) @admin @lpadmin"
+			else
+				CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.admin) @admin @lpadmin"
+			fi])
+		AC_CHECK_HEADER(Security/SecBasePriv.h,AC_DEFINE(HAVE_SECBASEPRIV_H))
+
+		dnl Check for sandbox/Seatbelt support
+		AC_CHECK_HEADER(sandbox.h,AC_DEFINE(HAVE_SANDBOX_H))
                ;;
 esac

-AC_SUBST(BACKLIBS)
-AC_SUBST(COMMONLIBS)
+AC_SUBST(CUPS_DEFAULT_PRINTOPERATOR_AUTH)
+AC_DEFINE_UNQUOTED(CUPS_DEFAULT_PRINTOPERATOR_AUTH, "$CUPS_DEFAULT_PRINTOPERATOR_AUTH")
+AC_SUBST(CUPS_SYSTEM_AUTHKEY)
+AC_SUBST(FONTS)
+AC_SUBST(LEGACY_BACKENDS)

 dnl
-dnl End of "$Id: cups-common.m4 3940 2003-09-17 19:35:22Z mike $".
+dnl End of "$Id: cups-common.m4 9482 2011-01-14 18:57:44Z mike $".
 dnl
@@ -1,95 +1,348 @@
 dnl
-dnl "$Id: cups-compiler.m4 3874 2003-08-20 18:27:48Z mike $"
+dnl "$Id: cups-compiler.m4 9822 2011-06-10 22:59:36Z mike $"
 dnl
-dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
+dnl   Compiler stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 2007-2009 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
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636-3111 USA
-dnl
-dnl       Voice: (301) 373-9603
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
+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 Clear the debugging and non-shared library options unless the user asks
 dnl for them...
-
+INSTALL_STRIP=""
 OPTIM=""
+AC_SUBST(INSTALL_STRIP)
 AC_SUBST(OPTIM)

-AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging, default=no],
-	[if test x$enable_debug = xyes; then
-		OPTIM="-g"
-	fi])
+AC_ARG_WITH(optim, [  --with-optim            set optimization flags ])
+AC_ARG_ENABLE(debug, [  --enable-debug          build with debugging symbols])
+AC_ARG_ENABLE(debug_guards, [  --enable-debug-guards   build with memory allocation guards])
+AC_ARG_ENABLE(debug_printfs, [  --enable-debug-printfs  build with CUPS_DEBUG_LOG support])
+AC_ARG_ENABLE(unit_tests, [  --enable-unit-tests     build and run unit tests])

-AC_ARG_WITH(optim, [  --with-optim="flags"    set optimization flags ])
+dnl For debugging, keep symbols, otherwise strip them...
+if test x$enable_debug = xyes; then
+	OPTIM="-g"
+else
+	INSTALL_STRIP="-s"
+fi
+
+dnl Debug printfs can slow things down, so provide a separate option for that
+if test x$enable_debug_printfs = xyes; then
+	CFLAGS="$CFLAGS -DDEBUG"
+	CXXFLAGS="$CXXFLAGS -DDEBUG"
+fi
+
+dnl Debug guards use an extra 4 bytes for some structures like strings in the
+dnl string pool, so provide a separate option for that
+if test x$enable_debug_guards = xyes; then
+	CFLAGS="$CFLAGS -DDEBUG_GUARDS"
+	CXXFLAGS="$CXXFLAGS -DDEBUG_GUARDS"
+fi
+
+dnl Unit tests take up time during a compile...
+if test x$enable_unit_tests = xyes; then
+	UNITTESTS="unittests"
+else
+	UNITTESTS=""
+fi
+AC_SUBST(UNITTESTS)
+
+dnl Setup general architecture flags...
+AC_ARG_WITH(archflags, [  --with-archflags        set default architecture flags ])
+AC_ARG_WITH(ldarchflags, [  --with-ldarchflags      set program architecture flags ])
+
+if test -z "$with_archflags"; then
+	ARCHFLAGS=""
+else
+	ARCHFLAGS="$with_archflags"
+fi
+
+if test -z "$with_ldarchflags"; then
+	if test "$uname" = Darwin; then
+		# 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
+else
+	LDARCHFLAGS="$with_ldarchflags"
+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])

 dnl Update compiler options...
-CXXLIBS=""
+CXXLIBS="${CXXLIBS:=}"
 AC_SUBST(CXXLIBS)

+PIEFLAGS=""
+AC_SUBST(PIEFLAGS)
+
+RELROFLAGS=""
+AC_SUBST(RELROFLAGS)
+
+LIBCUPSORDER="libcups.order"
+AC_ARG_WITH(libcupsorder, [  --with-libcupsorder     set libcups secorder file, default=libcups.order],
+	if test -f "$withval"; then
+		LIBCUPSORDER="$withval"
+	fi)
+AC_SUBST(LIBCUPSORDER)
+
+LIBCUPSIMAGEORDER="libcupsimage.order"
+AC_ARG_WITH(libcupsimageorder, [  --with-libcupsimagesorder
+                          set libcupsimage secorder file, default=libcupsimage.order],
+	if test -f "$withval"; then
+		LIBCUPSIMAGEORDER="$withval"
+	fi)
+AC_SUBST(LIBCUPSIMAGEORDER)
+
+PHPOPTIONS=""
+AC_SUBST(PHPOPTIONS)
+
 if test -n "$GCC"; then
-	# Starting with GCC 3.0, you must link C++ programs against either
-	# libstdc++ (shared by default), or libsupc++ (always static).  If
-	# you care about binary portability between Linux distributions,
-	# you need to either 1) build your own GCC with static C++ libraries
-	# or 2) link using gcc and libsupc++.  We choose the latter since
-	# CUPS doesn't (currently) use any of the stdc++ library.
-	#
-	# Also, GCC 3.0.x still has problems compiling some code.  You may
-	# or may not have success with it.  USE 3.0.x WITH EXTREME CAUTION!
-	#
-	# Previous versions of GCC do not have the reliance on the stdc++
-	# or g++ libraries, so the extra supc++ library is not needed.
-
-	AC_MSG_CHECKING(if libsupc++ is required)
-
- 	SUPC="`$CXX -print-file-name=libsupc++.a 2>/dev/null`"
-	case "$SUPC" in
-    		libsupc++.a*)
-			# Library not found, so this is and older GCC...
-			AC_MSG_RESULT(no)
-			;;
-		*)
-        		# This is gcc 3.x, and it knows of libsupc++, so we need it
-        		CXXLIBS="-lsupc++"
-        		AC_MSG_RESULT(yes)
-			;;
-	esac
-
-	CXX="$CC"
-
+	# Add GCC-specific compiler options...
 	if test -z "$OPTIM"; then
 		if test "x$with_optim" = x; then
-			if test $uname = HP-UX; then
-				# GCC under HP-UX has bugs with -O2
-				OPTIM="-O1"
-			else
-		       		OPTIM="-O2"
-			fi
+			# Default to optimize-for-size and debug
+       			OPTIM="-Os -g"
 		else
 			OPTIM="$with_optim $OPTIM"
 		fi
 	fi

+	# Generate position-independent code as needed...
 	if test $PICFLAG = 1 -a $uname != AIX; then
    		OPTIM="-fPIC $OPTIM"
 	fi

+	# The -fstack-protector option is available with some versions of
+	# GCC and adds "stack canaries" which detect when the return address
+	# has been overwritten, preventing many types of exploit attacks.
+	AC_MSG_CHECKING(if GCC supports -fstack-protector)
+	OLDCFLAGS="$CFLAGS"
+	CFLAGS="$CFLAGS -fstack-protector"
+	AC_TRY_LINK(,,
+		OPTIM="$OPTIM -fstack-protector"
+		AC_MSG_RESULT(yes),
+		AC_MSG_RESULT(no))
+	CFLAGS="$OLDCFLAGS"
+
+	# The -fPIE option is available with some versions of GCC and adds
+	# randomization of addresses, which avoids another class of exploits
+	# that depend on a fixed address for common functions.
+	AC_MSG_CHECKING(if GCC supports -fPIE)
+	OLDCFLAGS="$CFLAGS"
+	CFLAGS="$CFLAGS -fPIE"
+	AC_TRY_COMPILE(,,
+		[case "$CC" in
+			*clang)
+				PIEFLAGS="-fPIE -Wl,-pie"
+				;;
+			*)
+				PIEFLAGS="-fPIE -pie"
+				;;
+		esac
+		AC_MSG_RESULT(yes)],
+		AC_MSG_RESULT(no))
+	CFLAGS="$OLDCFLAGS"
+
 	if test "x$with_optim" = x; then
-		OPTIM="-Wall $OPTIM"
+		# Add useful warning options for tracking down problems...
+		OPTIM="-Wall -Wno-format-y2k $OPTIM"
+		# Additional warning options for development testing...
+		if test -d .svn; then
+			OPTIM="-Wshadow -Wunused $OPTIM"
+			CFLAGS="-Werror-implicit-function-declaration $CFLAGS"
+			PHPOPTIONS="-Wno-shadow"
+		fi
 	fi
+
+	case "$uname" in
+		Darwin*)
+			# -D_FORTIFY_SOURCE=2 adds additional object size
+			# checking, basically wrapping all string functions
+			# with buffer-limited ones.  Not strictly needed for
+			# CUPS since we already use buffer-limited calls, but
+			# this will catch any additions that are broken.
+			CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
+
+			if test x$enable_pie = xyes; then
+				# GCC 4 on Mac OS X needs -Wl,-pie as well
+				LDFLAGS="$LDFLAGS -Wl,-pie"
+			fi
+			;;
+
+		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
+	# Add vendor-specific compiler options...
 	case $uname in
 		AIX*)
 			if test -z "$OPTIM"; then
@@ -111,15 +364,45 @@ else

 			CFLAGS="-Ae $CFLAGS"

-			if test "x$with_optim" = x; then
-				OPTIM="+DAportable $OPTIM"
-			fi
-
 			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*)
+        	IRIX)
 			if test -z "$OPTIM"; then
 				if test "x$with_optim" = x; then
 					OPTIM="-O2"
@@ -128,20 +411,51 @@ else
 				fi
 			fi

-			if test $uversion -ge 62 -a "x$with_optim" = x; then
-				OPTIM="$OPTIM -n32 -mips3"
+			if test "x$with_optim" = x; then
+				OPTIM="-fullwarn -woff 1183,1209,1349,1506,3201 $OPTIM"
 			fi

-			if test "x$with_optim" = x; then
-				# Show most warnings, but suppress the
-				# ones about arguments not being used,
-				# string constants assigned to const
-				# char *'s, etc.  We only set the warning
-				# options on IRIX 6.2 and higher because
-				# of limitations in the older SGI compiler
-				# tools.
-				if test $uversion -ge 62; then
-					OPTIM="-fullwarn -woff 1183,1209,1349,3201 $OPTIM"
+			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
+			if test -z "$OPTIM"; then
+				if test "x$with_optim" = x; then
+					OPTIM="-O"
+				else
+					OPTIM="$with_optim"
 				fi
 			fi
 			;;
@@ -149,21 +463,56 @@ else
 			# Solaris
 			if test -z "$OPTIM"; then
 				if test "x$with_optim" = x; then
-					OPTIM="-xO4"
+					OPTIM="-xO2"
 				else
 					OPTIM="$with_optim $OPTIM"
 				fi
 			fi

-			if test "x$with_optim" = x; then
-				# Specify "generic" SPARC output and suppress
-				# all of Sun's questionable warning messages...
-				OPTIM="-w $OPTIM -xarch=generic"
-			fi
-
 			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
@@ -185,22 +534,41 @@ else
 			# cups-support@cups.org...
 			echo "Building CUPS with default compiler optimizations; contact"
 			echo "cups-bugs@cups.org with uname and compiler options needed"
-			echo "for your platform, or set the CFLAGS and CXXFLAGS"
-			echo "environment variable before running configure."
+			echo "for your platform, or set the CFLAGS and LDFLAGS environment"
+			echo "variables before running configure."
 			;;
 	esac
 fi

-if test $uname = HP-UX; then
-	# HP-UX 10.20 (at least) needs this definition to get the
-	# h_errno global...
-	OPTIM="$OPTIM -D_XOPEN_SOURCE_EXTENDED"
+# Add general compiler options per platform...
+case $uname in
+	HP-UX*)
+		# HP-UX 10.20 (at least) needs this definition to get the
+		# h_errno global...
+		OPTIM="$OPTIM -D_XOPEN_SOURCE_EXTENDED"

-	# HP-UX 11.00 (at least) needs this definition to get the
-	# u_short type used by the IP headers...
-	OPTIM="$OPTIM -D_INCLUDE_HPUX_SOURCE"
-fi
+		# HP-UX 11.00 (at least) needs this definition to get the
+		# u_short type used by the IP headers...
+		OPTIM="$OPTIM -D_INCLUDE_HPUX_SOURCE"
+
+		# HP-UX 11.23 (at least) needs this definition to get the
+		# IPv6 header to work...
+		OPTIM="$OPTIM -D_HPUX_SOURCE"
+		;;
+
+	Linux*)
+		# glibc 2.8 and higher breaks peer credentials unless you
+		# define _GNU_SOURCE...
+		OPTIM="$OPTIM -D_GNU_SOURCE"
+		;;
+
+	OSF*)
+		# Tru64 UNIX aka Digital UNIX aka OSF/1 need to be told
+		# to be POSIX-compliant...
+		OPTIM="$OPTIM -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_OSF_SOURCE"
+		;;
+esac

 dnl
-dnl End of "$Id: cups-compiler.m4 3874 2003-08-20 18:27:48Z mike $".
+dnl End of "$Id: cups-compiler.m4 9822 2011-06-10 22:59:36Z mike $".
 dnl
@@ -0,0 +1,452 @@
+dnl
+dnl "$Id: cups-defaults.m4 8929 2009-12-15 22:40:37Z mike $"
+dnl
+dnl   Default cupsd configuration settings for the Common UNIX Printing System
+dnl   (CUPS).
+dnl
+dnl   Copyright 2007-2009 by Apple Inc.
+dnl   Copyright 2006-2007 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 Default languages...
+LANGUAGES="`ls -1 locale/cups_*.po | sed -e '1,$s/locale\/cups_//' -e '1,$s/\.po//' | tr '\n' ' '`"
+
+AC_ARG_WITH(languages, [  --with-languages        set installed languages, default=all ],[
+	case "$withval" in
+		none | no) LANGUAGES="" ;;
+		all) ;;
+		*) LANGUAGES="$withval" ;;
+	esac])
+AC_SUBST(LANGUAGES)
+
+dnl Default ConfigFilePerm
+AC_ARG_WITH(config_file_perm, [  --with-config-file-perm set default ConfigFilePerm value, default=0640],
+	CUPS_CONFIG_FILE_PERM="$withval",
+	if test "x$uname" = xDarwin; then
+		CUPS_CONFIG_FILE_PERM="644"
+	else
+		CUPS_CONFIG_FILE_PERM="640"
+	fi)
+AC_SUBST(CUPS_CONFIG_FILE_PERM)
+AC_DEFINE_UNQUOTED(CUPS_DEFAULT_CONFIG_FILE_PERM, 0$CUPS_CONFIG_FILE_PERM)
+
+dnl Default LogFilePerm
+AC_ARG_WITH(log_file_perm, [  --with-log-file-perm    set default LogFilePerm value, default=0644],
+	CUPS_LOG_FILE_PERM="$withval",
+	CUPS_LOG_FILE_PERM="644")
+AC_SUBST(CUPS_LOG_FILE_PERM)
+AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LOG_FILE_PERM, 0$CUPS_LOG_FILE_PERM)
+
+dnl Default FatalErrors
+AC_ARG_WITH(fatal_errors, [  --with-fatal-errors     set default FatalErrors value, default=config],
+	CUPS_FATAL_ERRORS="$withval",
+	CUPS_FATAL_ERRORS="config")
+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",
+	CUPS_LOG_LEVEL="warn")
+AC_SUBST(CUPS_LOG_LEVEL)
+AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LOG_LEVEL, "$CUPS_LOG_LEVEL")
+
+dnl Default AccessLogLevel
+AC_ARG_WITH(access_log_level, [  --with-access-log-level set default AccessLogLevel value, default=actions],
+	CUPS_ACCESS_LOG_LEVEL="$withval",
+	CUPS_ACCESS_LOG_LEVEL="actions")
+AC_SUBST(CUPS_ACCESS_LOG_LEVEL)
+AC_DEFINE_UNQUOTED(CUPS_DEFAULT_ACCESS_LOG_LEVEL, "$CUPS_ACCESS_LOG_LEVEL")
+
+dnl Default Browsing
+AC_ARG_ENABLE(browsing, [  --disable-browsing      disable Browsing by default])
+if test "x$enable_browsing" = xno; then
+	CUPS_BROWSING="No"
+	AC_DEFINE_UNQUOTED(CUPS_DEFAULT_BROWSING, 0)
+else
+	CUPS_BROWSING="Yes"
+	AC_DEFINE_UNQUOTED(CUPS_DEFAULT_BROWSING, 1)
+fi
+AC_SUBST(CUPS_BROWSING)
+
+dnl Default BrowseLocalProtocols
+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="CUPS dnssd"
+	else
+		CUPS_BROWSE_LOCAL_PROTOCOLS="CUPS"
+		fi
+	else
+		CUPS_BROWSE_LOCAL_PROTOCOLS="$default_local_protocols"
+	fi
+else
+	CUPS_BROWSE_LOCAL_PROTOCOLS=""
+fi
+
+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])
+if test "x$enable_default_shared" = xno; then
+	CUPS_DEFAULT_SHARED="No"
+	AC_DEFINE_UNQUOTED(CUPS_DEFAULT_DEFAULT_SHARED, 0)
+else
+	CUPS_DEFAULT_SHARED="Yes"
+	AC_DEFINE_UNQUOTED(CUPS_DEFAULT_DEFAULT_SHARED, 1)
+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",
+	AC_MSG_CHECKING(for default print user)
+	if test x$uname = xDarwin; then
+		if test x`id -u _lp 2>/dev/null` = x; then
+			CUPS_USER="lp";
+		else
+			CUPS_USER="_lp";
+		fi
+		AC_MSG_RESULT($CUPS_USER)
+	elif test -f /etc/passwd; then
+		CUPS_USER=""
+		for user in lp lpd guest daemon nobody; do
+			if test "`grep \^${user}: /etc/passwd`" != ""; then
+				CUPS_USER="$user"
+				AC_MSG_RESULT($user)
+				break;
+			fi
+		done
+
+		if test x$CUPS_USER = x; then
+			CUPS_USER="nobody"
+			AC_MSG_RESULT(not found, using "$CUPS_USER")
+		fi
+	else
+		CUPS_USER="nobody"
+		AC_MSG_RESULT(no password file, using "$CUPS_USER")
+	fi)
+
+if test "x$CUPS_USER" = "xroot" -o "x$CUPS_USER" = "x0"; then
+	AC_MSG_ERROR([The default user for CUPS cannot be root!])
+fi
+
+AC_ARG_WITH(cups_group, [  --with-cups-group       set default group for CUPS],
+	CUPS_GROUP="$withval",
+	AC_MSG_CHECKING(for default print group)
+	if test x$uname = xDarwin; then
+		if test x`id -g _lp 2>/dev/null` = x; then
+			CUPS_GROUP="lp";
+		else
+			CUPS_GROUP="_lp";
+		fi
+		AC_MSG_RESULT($CUPS_GROUP)
+	elif test -f /etc/group; then
+		GROUP_LIST="_lp lp nobody"
+		CUPS_GROUP=""
+		for group in $GROUP_LIST; do
+			if test "`grep \^${group}: /etc/group`" != ""; then
+				CUPS_GROUP="$group"
+				AC_MSG_RESULT($group)
+				break;
+			fi
+		done
+
+		if test x$CUPS_GROUP = x; then
+			CUPS_GROUP="nobody"
+			AC_MSG_RESULT(not found, using "$CUPS_GROUP")
+		fi
+	else
+		CUPS_GROUP="nobody"
+		AC_MSG_RESULT(no group file, using "$CUPS_GROUP")
+	fi)
+
+if test "x$CUPS_GROUP" = "xroot" -o "x$CUPS_GROUP" = "xwheel" -o "x$CUPS_GROUP" = "x0"; then
+	AC_MSG_ERROR([The default group for CUPS cannot be root!])
+fi
+
+AC_ARG_WITH(system_groups, [  --with-system-groups    set default system groups for CUPS],
+	CUPS_SYSTEM_GROUPS="$withval",
+	if test x$uname = xDarwin; then
+		CUPS_SYSTEM_GROUPS="admin"
+	else
+		AC_MSG_CHECKING(for default system groups)
+		if test -f /etc/group; then
+			CUPS_SYSTEM_GROUPS=""
+			GROUP_LIST="lpadmin sys system root"
+			for group in $GROUP_LIST; do
+				if test "`grep \^${group}: /etc/group`" != ""; then
+					if test "x$CUPS_SYSTEM_GROUPS" = x; then
+						CUPS_SYSTEM_GROUPS="$group"
+					else
+						CUPS_SYSTEM_GROUPS="$CUPS_SYSTEM_GROUPS $group"
+					fi
+				fi
+			done
+
+			if test "x$CUPS_SYSTEM_GROUPS" = x; then
+				CUPS_SYSTEM_GROUPS="$GROUP_LIST"
+				AC_MSG_RESULT(no groups found, using "$CUPS_SYSTEM_GROUPS")
+			else
+				AC_MSG_RESULT("$CUPS_SYSTEM_GROUPS")
+			fi
+		else
+			CUPS_SYSTEM_GROUPS="$GROUP_LIST"
+			AC_MSG_RESULT(no group file, using "$CUPS_SYSTEM_GROUPS")
+		fi
+	fi)
+
+CUPS_PRIMARY_SYSTEM_GROUP="`echo $CUPS_SYSTEM_GROUPS | awk '{print $1}'`"
+
+for group in $CUPS_SYSTEM_GROUPS; do
+	if test "x$CUPS_GROUP" = "x$group"; then
+		AC_MSG_ERROR([The default system groups cannot contain the default CUPS group!])
+	fi
+done
+
+AC_SUBST(CUPS_USER)
+AC_SUBST(CUPS_GROUP)
+AC_SUBST(CUPS_SYSTEM_GROUPS)
+AC_SUBST(CUPS_PRIMARY_SYSTEM_GROUP)
+
+AC_DEFINE_UNQUOTED(CUPS_DEFAULT_USER, "$CUPS_USER")
+AC_DEFINE_UNQUOTED(CUPS_DEFAULT_GROUP, "$CUPS_GROUP")
+AC_DEFINE_UNQUOTED(CUPS_DEFAULT_SYSTEM_GROUPS, "$CUPS_SYSTEM_GROUPS")
+
+dnl Default printcap file...
+AC_ARG_WITH(printcap, [  --with-printcap         set default printcap file],
+	default_printcap="$withval",
+	default_printcap="default")
+
+if test x$default_printcap != xno; then
+	if test "x$default_printcap" = "xdefault"; then
+		case $uname in
+			Darwin*)
+				if test $uversion -ge 90; then
+					CUPS_DEFAULT_PRINTCAP="/Library/Preferences/org.cups.printers.plist"
+				else
+					CUPS_DEFAULT_PRINTCAP="/etc/printcap"
+				fi
+				;;
+			SunOS*)
+				CUPS_DEFAULT_PRINTCAP="/etc/printers.conf"
+				;;
+			*)
+				CUPS_DEFAULT_PRINTCAP="/etc/printcap"
+				;;
+		esac
+	else
+		CUPS_DEFAULT_PRINTCAP="$default_printcap"
+	fi
+else
+	CUPS_DEFAULT_PRINTCAP=""
+fi
+
+AC_SUBST(CUPS_DEFAULT_PRINTCAP)
+AC_DEFINE_UNQUOTED(CUPS_DEFAULT_PRINTCAP, "$CUPS_DEFAULT_PRINTCAP")
+
+dnl Default LPD config file...
+AC_ARG_WITH(lpdconfigfile, [  --with-lpdconfigfile    set default LPDConfigFile URI],
+	default_lpdconfigfile="$withval",
+	default_lpdconfigfile="default")
+
+if test x$default_lpdconfigfile != xno; then
+	if test "x$default_lpdconfigfile" = "xdefault"; then
+		case $uname in
+			Darwin*)
+				CUPS_DEFAULT_LPD_CONFIG_FILE="launchd:///System/Library/LaunchDaemons/org.cups.cups-lpd.plist"
+				;;
+			*)
+				if test "x$XINETD" != x; then
+					CUPS_DEFAULT_LPD_CONFIG_FILE="xinetd://$XINETD/cups-lpd"
+				else
+					CUPS_DEFAULT_LPD_CONFIG_FILE=""
+				fi
+				;;
+		esac
+	else
+		CUPS_DEFAULT_LPD_CONFIG_FILE="$default_lpdconfigfile"
+	fi
+else
+	CUPS_DEFAULT_LPD_CONFIG_FILE=""
+fi
+
+AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LPD_CONFIG_FILE, "$CUPS_DEFAULT_LPD_CONFIG_FILE")
+
+dnl Default SMB config file...
+AC_ARG_WITH(smbconfigfile, [  --with-smbconfigfile    set default SMBConfigFile URI],
+	default_smbconfigfile="$withval",
+	default_smbconfigfile="default")
+
+if test x$default_smbconfigfile != xno; then
+	if test "x$default_smbconfigfile" = "xdefault"; then
+		if test -f /etc/smb.conf; then
+			CUPS_DEFAULT_SMB_CONFIG_FILE="samba:///etc/smb.conf"
+		else
+			CUPS_DEFAULT_SMB_CONFIG_FILE=""
+		fi
+	else
+		CUPS_DEFAULT_SMB_CONFIG_FILE="$default_smbconfigfile"
+	fi
+else
+	CUPS_DEFAULT_SMB_CONFIG_FILE=""
+fi
+
+AC_DEFINE_UNQUOTED(CUPS_DEFAULT_SMB_CONFIG_FILE, "$CUPS_DEFAULT_SMB_CONFIG_FILE")
+
+dnl Default MaxCopies value...
+AC_ARG_WITH(max-copies, [  --with-max-copies       set default max copies value, default=9999 ],
+	CUPS_MAX_COPIES="$withval",
+	CUPS_MAX_COPIES="9999")
+
+AC_SUBST(CUPS_MAX_COPIES)
+AC_DEFINE_UNQUOTED(CUPS_DEFAULT_MAX_COPIES, $CUPS_MAX_COPIES)
+
+dnl Default raw printing state
+AC_ARG_ENABLE(raw_printing, [  --disable-raw-printing  do not allow raw printing by default])
+if test "x$enable_raw_printing" != xno; then
+	DEFAULT_RAW_PRINTING=""
+else
+	DEFAULT_RAW_PRINTING="#"
+fi
+AC_SUBST(DEFAULT_RAW_PRINTING)
+
+dnl Default SNMP options...
+AC_ARG_WITH(snmp-address, [  --with-snmp-address     set SNMP query address, default=auto ],
+	if test "x$withval" = x; then
+		CUPS_SNMP_ADDRESS=""
+	else
+		CUPS_SNMP_ADDRESS="Address $withval"
+	fi,
+	if test "x$uname" = xDarwin; then
+		CUPS_SNMP_ADDRESS=""
+	else
+		CUPS_SNMP_ADDRESS="Address @LOCAL"
+	fi)
+
+AC_ARG_WITH(snmp-community, [  --with-snmp-community   set SNMP community, default=public ],
+	CUPS_SNMP_COMMUNITY="Community $withval",
+	CUPS_SNMP_COMMUNITY="Community public")
+
+AC_SUBST(CUPS_SNMP_ADDRESS)
+AC_SUBST(CUPS_SNMP_COMMUNITY)
+
+dnl New default port definition for IPP...
+AC_ARG_WITH(ipp-port, [  --with-ipp-port         set port number for IPP, default=631 ],
+	DEFAULT_IPP_PORT="$withval",
+	DEFAULT_IPP_PORT="631")
+
+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=""
+elif test "x$enable_bannertops" = xyes; then
+	BANNERTOPS="bannertops"
+elif test $uname = Darwin; then
+	BANNERTOPS=""
+else
+	BANNERTOPS="bannertops"
+fi
+
+if test "x$enable_texttops" = xno; then
+	TEXTTOPS=""
+elif test "x$enable_texttops" = xyes; then
+	TEXTTOPS="texttops"
+elif test $uname = Darwin; then
+	TEXTTOPS=""
+else
+	TEXTTOPS="texttops"
+fi
+
+AC_SUBST(BANNERTOPS)
+AC_SUBST(TEXTTOPS)
+
+dnl
+dnl End of "$Id: cups-defaults.m4 8929 2009-12-15 22:40:37Z mike $".
+dnl
--- a/Mostrar Mais
+++ b/Mostrar Mais