Import cups.org releases

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-1.1.23rc1@4306 a1ca3aef-8c08-0410-bb20-df032aa958be
2013-05-10 18:56:23 +00:00
@@ -0,0 +1,33 @@
+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
@@ -0,0 +1,81 @@
+CGI - CUPS v1.1.21 - 06/29/2004
+-------------------------------
+
+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-httpd-cgi      CGI script/program
+    application/x-httpd-java     Java program
+    application/x-httpd-perl     Perl script
+    application/x-httpd-php      PHP script
+    application/x-httpd-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-httpd-cgi cgi
+    application/x-httpd-php php
+
+CGI scripts/programs (application/x-httpd-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.
@@ -1,217 +0,0 @@
-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.
@@ -1,41 +1,33 @@
-CREDITS.txt - 2006-04-17
+CREDITS.txt - 04/26/2003
 ------------------------

 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.
-    Kenshi Muto                    - Japanese localization, patches, and
-                                     testing.
-    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.
-    Daniel Nylander                - Swedish localization.
-    Giulio Orsero                  - Bug fixes and testing.
-    Michal Osowiecki               - Polish localization.
-    Kurt Pfeifle                   - Bug fixes, beta testing, evangelism.
-    Petter Reinholdtsen            - HP-UX compiler stuff.
-    Juan Pablo González Riopedre   - Spanish localization
-    Stuart Stevens                 - HP JetDirect IPP information.
-    Andrea Suatoni                 - IRIX desktop integration and testing.
-    Tomohiro Kato                  - Japanese localization.
-    Tim Waugh                      - Lots of patches, testing, and Linux
-                                     integration.
-    Yugami                         - LDAP browsing support.
+    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.

 If I've missed someone, please let me know by sending an email to
 "mike@easysw.com".
@@ -0,0 +1,142 @@
+ENCRYPTION - CUPS v1.1.20 - 11/24/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,4 +1,4 @@
-INSTALL - CUPS v1.2rc1 - 2006-03-24
+INSTALL - CUPS v1.1.22 - 10/29/2004
 -----------------------------------

 This file describes how to compile and install CUPS from source
@@ -6,169 +6,185 @@ 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 AFTER YOU INSTALL CUPS ****
+**** IF YOU HAVE A NON-POSTSCRIPT PRINTER, YOU WILL ALSO  ****
+**** NEED TO INSTALL ESP GHOSTSCRIPT OR A PATCHED VERSION ****
+**** OF THE STANDARD GHOSTSCRIPT RELEASES.                ****


 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 several versions
-    of GCC with excellent results.
+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.

-    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 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).

-    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, and the OpenLDAP and
-    OpenSLP libraries for directory services support. CUPS will
-    compile and run without these, however you'll miss out on
-    many of the features provided by CUPS.
+Besides these tools you'll want the following libraries:

-    Also, please note that CUPS no longer includes the
-    Ghostscript- based pstoraster filter.  You *must* download
-    ESP Ghostscript separately from the CUPS web site if you want
-    to print PostScript files to non-PostScript printers.
+    - 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.


-COMPILING FROM SUBVERSION
+COMPILING 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.52 or higher) before compiling the
-    software from Subversion:
+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:

-	autoconf -f
+    autoconf ENTER


 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
+    ./configure ENTER

-    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
+    ./configure --prefix=/some/directory ENTER

-    To see a complete list of configuration options, use the
-    --help option:
+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:

-        ./configure --help
+    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

-    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:
+or:

-	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 ...
+    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

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

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

-    Once you have configured things, just type:
+SSL and TLS support require the OpenSSL library, available at:

-	make ENTER
+    http://www.openssl.org

-    or if you have FreeBSD, NetBSD, or OpenBSD type:
+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:

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

-    to build the software.
+See the file "ENCRYPTION.txt" for information on using the
+encryption support in CUPS.
+
+Once you have configured things, just type:
+
+    make ENTER
+
+or if you have FreeBSD, NetBSD, or OpenBSD type:
+
+    gmake ENTER
+
+to build the software.


 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
-    ("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 - 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 ("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 find the RPM software at:
+You can find the RPM software at:

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

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

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


 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 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)
+    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.


 REPORTING PROBLEMS

-    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 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.

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

-    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.
+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,19 @@
+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,36 +1,38 @@
 <HTML>
-<!-- SECTION: Getting Started -->
 <HEAD>
-	<TITLE>Software License Agreement</TITLE>
+	<TITLE>Software License Agreement - Common UNIX Printing System</TITLE>
 </HEAD>
-<BODY>

-<P ALIGN="CENTER">Copyright 1997-2006 by Easy Software Products<BR>
+<BODY BGCOLOR="#ffffff" TEXT="#000000">
+
+<H2 ALIGN="CENTER">Common UNIX Printing System License Agreement</H2>
+
+<P ALIGN="CENTER">Copyright 1997-2004 by Easy Software Products<BR>
 44141 AIRPORT VIEW DR STE 204<BR>
-HOLLYWOOD, MARYLAND 20636 USA<BR>
+HOLLYWOOD, MARYLAND 20636-3142 USA<BR>
 <BR>
 Voice: +1.301.373.9600<BR>
 Email: <A HREF="mailto:cups-info@cups.org">cups-info@cups.org</A><BR>
 WWW: <A HREF="http://www.cups.org">http://www.cups.org</A>

-<H2 CLASS="title"><A NAME="INTRO">Introduction</A></H2>
+<H3>Introduction</H3>

 <P>The Common UNIX Printing System<SUP>TM</SUP>,
 ("CUPS<SUP>TM</SUP>"), 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.</P>
+this introduction.

 <P>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.</P>
+Xpdf and the CUPS imaging library.

 <P>For those not familiar with the GNU GPL, the license basically
-allows you to:</P>
+allows you to:

 <UL>

@@ -48,25 +50,24 @@ allows you to:</P>

 </UL>

-<P>What this license <EM>does not</EM> allow you to do is make
+<P>What this license <B>does not</B> 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.</P>
+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.

 <P>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.</P>
+to develop applications that use the CUPS API library under
+other licenses and/or conditions as appropriate for your
+application.

-
-<H2 CLASS="title"><A NAME="EXCEPTIONS">License Exceptions</A></H2>
+<H3>License Exceptions</H3>

 <P>In addition, as the copyright holder of CUPS, Easy Software
-Products grants the following special exceptions:</P>
+Products grants the following special exceptions:

 <OL>

@@ -132,51 +133,48 @@ Products grants the following special exceptions:</P>
 </OL>

 <P>No developer is required to provide these exceptions in a
-derived work.</P>
+derived work.

-
-<H2 CLASS="title"><A NAME="TRADEMARKS">Trademarks</A></H2>
+<H3>Trademarks</H3>

 <P>Easy Software Products has trademarked the Common UNIX
-Printing System, CUPS, and CUPS logo. You may use these names and
-logos in any direct port or binary distribution of CUPS. Please
-contact 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.</P>
+Printing System, CUPS, and CUPS logo. You may use these names
+and logos in any direct port or binary distribution of CUPS.
+Please contact 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.

-
-<H2 CLASS="title"><A NAME="BINARY">Binary Distribution Rights</A></H2>
+<H3>Binary Distribution Rights</H3>

 <P>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.</P>
+modifications to CUPS under the GNU GPL and LGPL. For
+information please contact us at the address shown above.

 <P>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:</P>
+licensing of this software, please contact:

 <BLOCKQUOTE>
 Derek B. Noonburg<BR>
-Email: <A HREF="mailto:derekn@glyphandcog.com">derekn@glyphandcog.com</A><BR>
-WWW: <A HREF="http://www.glyphandcog.com/">http://www.glyphandcog.com/</A>
+Email: <A HREF="mailto:derekn@foolabs.com">derekn@foolabs.com</A><BR>
+WWW: <A HREF="http://www.foolabs.com/xpdf/">http://www.foolabs.com/xpdf/</A>
 </BLOCKQUOTE>

+<H3>Support</H3>

-<H2 CLASS="title"><A NAME="SUPPORT">Support</A></H2>
-
-<P>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:</P>
+<P>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:

 <UL><PRE>
 <A HREF="http://www.easysw.com/">http://www.easysw.com/</A>
 </PRE></UL>

-
-<H2 CLASS="title"><A NAME="GPL">GNU GENERAL PUBLIC LICENSE</A></H2>
+<!-- NEW PAGE -->
+<H2>GNU GENERAL PUBLIC LICENSE</H2>

 <P>Version 2, June 1991

@@ -188,7 +186,7 @@ Everyone is permitted to copy and distribute verbatim
 copies of this license document, but changing it is not allowed.
 </PRE>

-<H3>Preamble</H3>
+<H4>Preamble</H4>

 <P>The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -238,8 +236,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 <P>The precise terms and conditions for copying, distribution and
 modification follow.

-<H3>GNU GENERAL PUBLIC LICENSE<BR>
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</H3>
+<H4>GNU GENERAL PUBLIC LICENSE<BR>
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</H4>

 <OL START="0">

@@ -449,7 +447,7 @@ of promoting the sharing and reuse of software generally.

 </OL>

-<H3>NO WARRANTY</H3>
+<H4>NO WARRANTY</H4>

 <OL START="11">

@@ -475,72 +473,10 @@ POSSIBILITY OF SUCH DAMAGES.

 </OL>

-<H3>END OF TERMS AND CONDITIONS</H3>
+<H4>END OF TERMS AND CONDITIONS</H4>

-<H3>How to Apply These Terms to Your New Programs</H3>
-
-<P>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.
-
-<P>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.
-
-<PRE>
-<VAR>one line to give the program's name and an idea of what it does.</VAR>
-Copyright (C) <VAR>yyyy</VAR>  <VAR>name of author</VAR>
-
-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.
-</PRE>
-
-<P>Also add information on how to contact you by electronic and paper mail.
-
-<P>If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-<PRE>
-Gnomovision version 69, Copyright (C) <VAR>year</VAR> <VAR>name of author</VAR>
-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.
-</PRE>
-
-<P>The hypothetical commands <SAMP>`show w'</SAMP> and <SAMP>`show c'</SAMP> should show
-the appropriate parts of the General Public License.  Of course, the
-commands you use may be called something other than <SAMP>`show w'</SAMP> and
-<SAMP>`show c'</SAMP>; they could even be mouse-clicks or menu items--whatever
-suits your program.
-
-<P>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:
-
-<PRE>
-Yoyodyne, Inc., hereby disclaims all copyright
-interest in the program `Gnomovision'
-(which makes passes at compilers) written 
-by James Hacker.
-
-<VAR>signature of Ty Coon</VAR>, 1 April 1989
-Ty Coon, President of Vice
-</PRE>
-
-<H2 CLASS="title"><A NAME="LGPL">GNU LIBRARY GENERAL PUBLIC LICENSE</A></H2>
+<!-- NEW PAGE -->
+<H2>GNU LIBRARY GENERAL PUBLIC LICENSE</H2>

 <P>Version 2, June 1991

@@ -554,7 +490,7 @@ of this license document, but changing it is not allowed.
 numbered 2 because it goes with version 2 of the ordinary GPL.]
 </PRE>

-<H3>Preamble</H3>
+<H4>Preamble</H4>

 <P>The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -644,7 +580,7 @@ works together with the library.
 <P>Note that it is possible for a library to be covered by the ordinary
 General Public License rather than by this special one.

-<H3>TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</H3>
+<H4>TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</H4>

 <P><STRONG>0.</STRONG>
 This License Agreement applies to any software library which
@@ -1014,56 +950,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.

-<H3>END OF TERMS AND CONDITIONS</H3>
-
-<H3>How to Apply These Terms to Your New Libraries</H3>
-
-<P>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).
-
-<P>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.
-
-<PRE>
-<VAR>one line to give the library's name and an idea of what it does.</VAR>
-Copyright (C) <VAR>year</VAR>  <VAR>name of author</VAR>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 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
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-</PRE>
-
-<P>Also add information on how to contact you by electronic and paper mail.
-
-<P>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:
-
-<PRE>
-Yoyodyne, Inc., hereby disclaims all copyright interest in
-the library `Frob' (a library for tweaking knobs) written
-by James Random Hacker.
-
-<VAR>signature of Ty Coon</VAR>, 1 April 1990
-Ty Coon, President of Vice
-</PRE>
-
-<P>That's all there is to it!
+<H4>END OF TERMS AND CONDITIONS</H4>

 </BODY>
 </HTML>
@@ -1,8 +1,8 @@
                Common UNIX Printing System License Agreement

-                Copyright 1997-2006 by Easy Software Products
+                Copyright 1997-2004 by Easy Software Products
                        44141 AIRPORT VIEW DR STE 204
-                     HOLLYWOOD, MARYLAND 20636 USA
+                     HOLLYWOOD, MARYLAND 20636-3142 USA

                           Voice: +1.301.373.9600
                          Email: cups-info@cups.org
@@ -128,8 +128,8 @@ is based on the Xpdf software. For binary distribution licensing
 of this software, please contact:

     Derek B. Noonburg
-     Email: derekn@glyphandcog.com
-     WWW: http://www.glyphandcog.com/
+     Email: derekn@foolabs.com
+     WWW: http://www.foolabs.com/xpdf/


 SUPPORT
@@ -420,65 +420,6 @@ 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
@@ -918,47 +859,3 @@ 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!
@@ -3,7 +3,7 @@
 #
 #   Common makefile definitions for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2004 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
@@ -15,7 +15,7 @@
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
 #       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
+#       Hollywood, Maryland 20636-3142 USA
 #
 #       Voice: (301) 373-9600
 #       EMail: cups-info@cups.org
@@ -33,14 +33,12 @@ CXX		=	@LIBTOOL@ @CXX@
 DSO		=	@DSO@
 HTMLDOC		=	@HTMLDOC@
 INSTALL		=	@INSTALL@
-LD		=	@LD@
 LIBTOOL		=	@LIBTOOL@
 LN		=	@LN@ -sf
 MV		=	@MV@
-PHPCONFIG	=	@PHPCONFIG@
+NROFF		=	@NROFF@
 RANLIB		=	@RANLIB@
 RM		=	@RM@ -f
-RMDIR		=	@RMDIR@
 SED		=	@SED@
 SHELL		=	/bin/sh
 STRIP		=	@STRIP@
@@ -49,8 +47,7 @@ STRIP		=	@STRIP@
 # Installation programs...
 #

-INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -m 755
-INSTALL_CONFIG	=	$(INSTALL) -m @CUPS_CONFIG_FILE_PERM@
+INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -m 755 -s
 INSTALL_DATA	=	$(INSTALL) -m 644
 INSTALL_DIR	=	$(INSTALL) -d
 INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -m 755
@@ -58,26 +55,11 @@ INSTALL_MAN	=	$(INSTALL) -m 644
 INSTALL_SCRIPT	=	$(INSTALL) -m 755

 #
-# Default user, group, and system groups for the scheduler...
+# Default user and group 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@

 #
 # Libraries...
@@ -86,7 +68,6 @@ LANGUAGES	=	@LANGUAGES@
 LIBCUPS		=	@LIBCUPS@
 LIBCUPSIMAGE	=	@LIBCUPSIMAGE@
 LIBJPEG		=	@LIBJPEG@
-LIBLDAP		=	@LIBLDAP@
 LIBMALLOC	=	@LIBMALLOC@
 LIBPAPER	=	@LIBPAPER@
 LIBPNG		=	@LIBPNG@
@@ -94,72 +75,33 @@ LIBSLP		=	@LIBSLP@
 LIBTIFF		=	@LIBTIFF@
 LIBZ		=	@LIBZ@

-#
-# Install static libraries?
-#
-
-INSTALLSTATIC	=	@INSTALLSTATIC@
-
 #
 # Program options...
 #
-# ARCHFLAGS     Defines the default architecture build options, used
-#               when compiling separate 32/64-bit libraries.
-# 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)
+# OPTIM   defines the common compiler optimization/debugging options.
+# OPTIONS defines other compile-time options (currently only -dDEBUG for
+#         extra debug info)
 #

-ARCHFLAGS	=	@ARCHFLAGS@
 ARFLAGS		=	@ARFLAGS@
 BACKLIBS	=	@BACKLIBS@
-CFLAGS		=	-I.. $(SSLFLAGS) @CPPFLAGS@ @CFLAGS@ \
-			@LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
-COMMONLIBS	=	@LIBS@
-CUPSDLIBS	=	@CUPSDLIBS@
-CXXFLAGS	=	-I.. $(SSLFLAGS) @CPPFLAGS@ @CXXFLAGS@ \
-			@LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
+CFLAGS		=	$(RC_CFLAGS) $(SSLFLAGS) @CPPFLAGS@ @CFLAGS@ -I.. $(OPTIONS)
+COMMONLIBS	=	@COMMONLIBS@
+CXXFLAGS	=	$(RC_CFLAGS) @CPPFLAGS@ @CXXFLAGS@ -I.. $(OPTIONS)
 CXXLIBS		=	@CXXLIBS@
 DSOFLAGS	=	@DSOFLAGS@
 DSOLIBS		=	@DSOLIBS@ $(COMMONLIBS)
 IMGLIBS		=	@IMGLIBS@ -lm
-IMGFILTERS	=	@IMGFILTERS@
-LDFLAGS		=	-L../cups -L../filter $(RC_CFLAGS) $(ARCHFLAGS) \
-			@LDFLAGS@ $(OPTIM)
-LINKCUPS	=	@LINKCUPS@ $(SSLLIBS)
+LDFLAGS		=	-L../cups -L../filter $(RC_CFLAGS) @LDFLAGS@ $(OPTIM)
+LINKCUPS	=	@LINKCUPS@
 LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
-LIBS		=	$(LINKCUPS) $(COMMONLIBS)
+LIBS		=	$(LINKCUPS) $(NETLIBS) @LIBS@ $(COMMONLIBS)
+NETLIBS		=	@NETLIBS@
 OPTIM		=	@OPTIM@
 OPTIONS		=
 PAMLIBS		=	@PAMLIBS@
-PDFTOPS		=	@PDFTOPS@
-PHPDIR		=	@PHPDIR@
 SSLFLAGS	=	@SSLFLAGS@
 SSLLIBS		=	@SSLLIBS@
-LAUNCHDLIBS	=	@LAUNCHDLIBS@
-
-#
-# Separate 32/64-bit library support...
-#
-
-ARCH32FLAGS	=	@ARCH32FLAGS@
-INSTALL32	=	@INSTALL32@
-LIB32CUPS	=	@LIB32CUPS@
-LIB32CUPSIMAGE	=	@LIB32CUPSIMAGE@
-LIB32DIR	=	$(BUILDROOT)@LIB32DIR@
-UNINSTALL32	=	@UNINSTALL32@
-
-ARCH64FLAGS	=	@ARCH64FLAGS@
-INSTALL64	=	@INSTALL64@
-LIB64CUPS	=	@LIB64CUPS@
-LIB64CUPSIMAGE	=	@LIB64CUPSIMAGE@
-LIB64DIR	=	$(BUILDROOT)@LIB64DIR@
-UNINSTALL64	=	@UNINSTALL64@

 #
 # Directories...
@@ -194,7 +136,6 @@ BUILDROOT	=	$(DSTROOT)

 AMANDIR		=	$(BUILDROOT)@AMANDIR@
 BINDIR		=	$(BUILDROOT)@bindir@
-CACHEDIR	=	$(BUILDROOT)@CUPS_CACHEDIR@
 DATADIR		=	$(BUILDROOT)@CUPS_DATADIR@
 DOCDIR		=	$(BUILDROOT)@CUPS_DOCROOT@
 INCLUDEDIR	=	$(BUILDROOT)$(includedir)
@@ -209,54 +150,40 @@ REQUESTS	= 	$(BUILDROOT)@CUPS_REQUESTS@
 SBINDIR		=	$(BUILDROOT)@sbindir@
 SERVERBIN	= 	$(BUILDROOT)@CUPS_SERVERBIN@
 SERVERROOT	= 	$(BUILDROOT)@CUPS_SERVERROOT@
-STATEDIR	=	$(BUILDROOT)@CUPS_STATEDIR@
-XINETD		=	@XINETD@

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

-PAMDIR		=	@PAMDIR@
+PAMDIR		=	$(BUILDROOT)@PAMDIR@
 PAMFILE		=	@PAMFILE@

-DEFAULT_LAUNCHD_CONF =	@DEFAULT_LAUNCHD_CONF@
-DBUSDIR		=	@DBUSDIR@
-

 #
 # Rules...
 #

 .SILENT:
-.SUFFIXES:	.1 .1.gz .1m .1m.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz
-
+.SUFFIXES:	.a .c .cxx .h .man .o .0 .1 .1m .3 .5 .8 .z
 .c.o:
 	echo Compiling $<...
-	$(CC) $(ARCHFLAGS) $(OPTIM) $(CFLAGS) -c $<
-
-.c.32.o:
-	echo Compiling 32-bit $<...
-	$(CC) $(ARCH32FLAGS) $(OPTIM) $(CFLAGS) -c -o $@ $<
-
-.c.64.o:
-	echo Compiling 64-bit $<...
-	$(CC) $(ARCH64FLAGS) $(OPTIM) $(CFLAGS) -c -o $@ $<
-
+	$(CC) $(OPTIM) $(CFLAGS) -c $<
 .cxx.o:
 	echo Compiling $<...
-	$(CXX) $(ARCHFLAGS) $(OPTIM) $(CXXFLAGS) -c $<
-
-.man.1 .man.1m .man.5 .man.7 .man.8:
-	echo Linking $<...
+	$(CXX) $(OPTIM) $(CXXFLAGS) -c $<
+.man.0 .man.1 .man.1m .man.3 .man.5 .man.8:
+	echo Formatting $<...
 	$(RM) $@
-	$(LN) $< $@
-
-.man.1.gz .man.1m.gz .man.5.gz .man.7.gz .man.8.gz .man.gz:
-	echo -n Compressing $<...
-	$(RM) $@
-	gzip -v9 <$< >$@
+	-$(NROFF) -man $< >$@
+.man.z:
+	echo Formatting $<...
+	$(RM) $@ $@.tmp $@.tmp.z
+	-$(NROFF) -man $< >$@.tmp
+	pack -f $@.tmp
+	$(MV) $@.tmp.z $@


 #
@@ -3,7 +3,7 @@
 #
 #   Top-level Makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2004 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
@@ -15,9 +15,9 @@
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
 #       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3142 USA
+#       Hollywood, Maryland 20636-3111 USA
 #
-#       Voice: (301) 373-9600
+#       Voice: (301) 373-9603
 #       EMail: cups-info@cups.org
 #         WWW: http://www.cups.org
 #
@@ -28,11 +28,8 @@ include Makedefs
 # Directories to make...
 #

-DIRS	=	cups backend berkeley cgi-bin filter locale man monitor \
-		notifier $(PDFTOPS) scheduler systemv test \
-		$(PHPDIR) \
-		conf data doc fonts ppd templates
-
+DIRS	=	cups backend berkeley cgi-bin filter man pdftops \
+		scheduler systemv

 #
 # Make all targets...
@@ -45,7 +42,6 @@ all:
 		(cd $$dir ; $(MAKE) $(MFLAGS)) || exit 1;\
 	done

-
 #
 # Remove object and target files...
 #
@@ -56,7 +52,6 @@ clean:
 		(cd $$dir; $(MAKE) $(MFLAGS) clean) || exit 1;\
 	done

-
 #
 # Make dependencies
 #
@@ -77,123 +72,60 @@ install:	installhdrs
 		echo Installing in $$dir... ;\
 		(cd $$dir; $(MAKE) $(MFLAGS) install) || 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) -m 755 $(BINDIR)
+	$(INSTALL_DIR) $(BINDIR)
 	$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
 	echo Installing startup script...
-	if test "x$(INITDIR)" != x; then \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
-		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
-		$(INSTALL_SCRIPT) init/cups.sh  $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc2.d; \
-		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc3.d; \
-		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc5.d; \
-		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
+	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; \
 	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) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \
-			$(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
-			$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
-			$(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
-		elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
-			$(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
+			$(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; \
 		else \
-			$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
+			$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
 		fi \
 	fi
-	if test "x$(DBUSDIR)" != x; then \
-		echo Installing cups.conf in $(DBUSDIR)...;\
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(DBUSDIR); \
-		$(INSTALL_DATA) packaging/cups-dbus.conf $(BUILDROOT)$(DBUSDIR)/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 -d /usr/share/applications; then \
-		echo Installing desktop icons...; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/applications; \
-		$(INSTALL_DATA) desktop/cups.desktop $(BUILDROOT)/usr/share/applications; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps; \
-		$(INSTALL_DATA) desktop/cups-16.png $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps/cups.png; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps; \
-		$(INSTALL_DATA) desktop/cups-32.png $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps/cups.png; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps; \
-		$(INSTALL_DATA) desktop/cups-64.png $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps/cups.png; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps; \
-		$(INSTALL_DATA) desktop/cups-128.png $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps/cups.png; \
-	fi
-

 #
 # Install source and header files...
 #

 installsrc:
-	gnutar --dereference --exclude=.svn -cf - . | gnutar -C $(SRCROOT) -xf -
+	gnutar --dereference --exclude=CVS -cf - . | gnutar -C $(SRCROOT) -xf -

 installhdrs:
 	(cd cups ; $(MAKE) $(MFLAGS) installhdrs) || exit 1;\
 	(cd filter ; $(MAKE) $(MFLAGS) installhdrs) || exit 1;


-#
-# 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)$(DEFAULT_LAUNCHD_CONF); \
-		else \
-			$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
-		fi \
-		$(RMDIR) $(BUILDROOT)$(INITDDIR); \
-	fi
-	if test "x$(DBUSDIR)" != x; then \
-		echo Uninstalling cups.conf in $(DBUSDIR)...;\
-		$(RM) $(BUILDROOT)$(DBUSDIR)/cups.conf; \
-		$(RMDIR) $(BUILDROOT)$(DBUSDIR); \
-	fi
-	$(RM) $(BUILDROOT)/etc/xinetd.d/cups-lpd
-	$(RM) $(BUILDROOT)/usr/share/applications/cups.desktop
-	$(RM) $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps/cups.png
-	$(RM) $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps/cups.png
-	$(RM) $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps/cups.png
-	$(RM) $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps/cups.png
-
-
 #
 # Run the test suite...
 #
@@ -204,17 +136,34 @@ check test:	all


 #
-# Make software distributions using EPM (http://www.easysw.com/epm/)...
+# Make software distributions using EPM (http://www.easysw.com/epm)...
 #

 EPMFLAGS	=	-v

-aix bsd deb depot inst osx pkg rpm setld slackware swinstall tardist:
-	epm $(EPMFLAGS) -f $@ cups packaging/cups.list
+aix:
+	epm $(EPMFLAGS) -f aix cups
+
+bsd:
+	epm $(EPMFLAGS) -f bsd cups

 epm:
-	epm $(EPMFLAGS) cups packaging/cups.list
+	epm $(EPMFLAGS) cups

+rpm:
+	epm $(EPMFLAGS) -f rpm cups
+
+deb:
+	epm $(EPMFLAGS) -f deb cups
+
+depot:
+	epm $(EPMFLAGS) -f depot cups
+
+pkg:
+	epm $(EPMFLAGS) -f pkg cups
+
+tardist:
+	epm $(EPMFLAGS) -f tardist cups

 #
 # End of "$Id$".
@@ -1,206 +1,278 @@
-README - CUPS v1.2rc1 - 2006-03-24
+README - CUPS v1.1.22 - 10/29/2004
 ----------------------------------

 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 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 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.
+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.

-    CUPS includes an image file RIP that supports printing of
-    image files to non-PostScript printers.  A customized version
-    of GPL Ghostscript 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, OKIDATA, and Zebra printers are included that use
-    these filters.
+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:
+Drivers for thousands of printers are provided with our ESP
+Print Pro software, available at:

-	    http://www.easysw.com/printpro/
+	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.
+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
+    - HP-UX 11.00 or higher
+    - IRIX 6.5 or higher
+    - Linux 2.4 with glibc 2.2 or higher
+    - Solaris 7 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.


 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) on-line at:

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

-    If you're having trouble getting that far, the documentation
-    is located under the "doc/help" directory.
+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.

-    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!  We also
-    provide many discussion forums which are available at:
+If you have problems, READ THE DOCUMENTATION FIRST!

-	http://www.cups.org/newsgroups.php
+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.

-    Commercial support (with a guaranteed response time) is
-    available from Easy Software Products.  For more information
-    see:
+Commercial support (with a guaranteed response time) is
+available from Easy Software Products.  For more information
+see:

-	http://www.easysw.com/cups/
+    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 site
+links.


 SETTING UP PRINTER QUEUES USING YOUR WEB BROWSER

-    CUPS 1.2 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:
+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:

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

-    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.
+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.

-    You will be asked for the administration password (root or
-    any other user in the sys/system/root group on your system)
-    when performing any administrative function.
+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.


 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.

-    CUPS includes several sample PPD files you can use:
+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:

-	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
-	Zebra CPCL Label Printer       zebracpl.ppd
-	Zebra EPL1 Label Printer       zebraep1.ppd
-	Zebra EPL2 Label Printer       zebraep2.ppd
-	Zebra ZPL Label Printer        zebra.ppd
+    HP-UX:

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

-        lpinfo -v
+    IRIX:

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

-        lpadmin -p printername -E -v URI -m filename.ppd
+    Linux:

-    Network printers typically use "socket" or "lpd" URIs:
+        /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

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

-    The sample drivers provide basic printing capabilities, but
-    generally do not exercise the full potential of the printers
-    or CUPS.  For fully-functional commercial printer drivers
-    check out our ESP Print Pro software at:
+        /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

-	http://www.easysw.com/printpro/
+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


 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 -omedia=A4 -oresolution=600dpi filename
+    lpr -omedia=A4 -oresolution=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 -oraw 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-2006 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 1993-2004 by Easy Software Products.  CUPS,
+the CUPS logo, and the Common UNIX Printing System are the
+trademark property of Easy Software Products.

-    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-2005 by Derek B. Noonburg.
+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
-    "doc/help/license.html" or "LICENSE.txt" files for more
-    information.
+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:
+For commercial licensing information, please contact:

-	Attn: CUPS Licensing Information
-	Easy Software Products
-	44141 Airport View Drive, Suite 204
-	Hollywood, Maryland 20636 USA
+    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/
+    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.
+Note that commercial licensors may also require a license from
+Derek B. Noonburg who developed the Xpdf software used to print
+PDF files.
@@ -0,0 +1,19 @@
+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.
+
@@ -0,0 +1,8 @@
+betest
+ipp
+lpd
+parallel
+scsi
+serial
+socket
+usb
@@ -1,34 +1,17 @@
 # DO NOT DELETE

 betest.o: ../cups/string.h ../config.h
-ipp.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
-ipp.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/backend.h ../cups/cups.h
-ipp.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-ipp.o: ../cups/language.h ../cups/string.h
-lpd.o: ../cups/backend.h ../cups/http-private.h ../config.h ../cups/http.h
-lpd.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
-lpd.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-lpd.o: ../cups/string.h
-parallel.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-parallel.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-parallel.o: ../cups/language.h ../cups/string.h ../config.h ieee1284.c
-parallel.o: ../cups/debug.h
-scsi.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-scsi.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-scsi.o: ../cups/language.h ../cups/string.h ../config.h
-serial.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-serial.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-serial.o: ../cups/language.h ../cups/string.h ../config.h
-snmp.o: ../cups/backend.h ../cups/http-private.h ../config.h ../cups/http.h
-snmp.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
-snmp.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-snmp.o: ../cups/string.h ../cups/array.h ../cups/file.h ieee1284.c
-snmp.o: ../cups/debug.h
-socket.o: ../cups/backend.h ../cups/http-private.h ../config.h ../cups/http.h
-socket.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
-socket.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-socket.o: ../cups/string.h
-test1284.o: ../cups/string.h ../config.h ieee1284.c ../cups/debug.h
-usb.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-usb.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-usb.o: ../cups/language.h ../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
@@ -3,7 +3,7 @@
 #
 #   Backend makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2004 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
@@ -15,7 +15,7 @@
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
 #       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
+#       Hollywood, Maryland 20636-3142 USA
 #
 #       Voice: (301) 373-9600
 #       EMail: cups-info@cups.org
@@ -26,11 +26,9 @@

 include ../Makedefs

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


 #
@@ -61,30 +59,14 @@ depend:
 #

 install:	all
-	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
-	for file in $(RBACKENDS); do \
-		$(LIBTOOL) $(INSTALL) -m 700 $$file $(SERVERBIN)/backend; \
-	done
-	for file in $(UBACKENDS); do \
+	$(INSTALL_DIR) $(SERVERBIN)/backend
+	for file in $(BACKENDS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
 	done
 	$(RM) $(SERVERBIN)/backend/http
 	$(LN) ipp $(SERVERBIN)/backend/http


-#
-# Uninstall all targets...
-#
-
-uninstall:
-	for file in $(RBACKENDS) $(UBACKENDS); do \
-		$(RM) $(SERVERBIN)/backend/$$file; \
-	done
-	$(RM) $(SERVERBIN)/backend/http
-	-$(RMDIR) $(SERVERBIN)/backend
-	-$(RMDIR) $(SERVERBIN)
-
-
 #
 # betest
 #
@@ -94,28 +76,6 @@ betest:	betest.o ../cups/$(LIBCUPS)
 	$(CC) $(LDFLAGS) -o betest betest.o $(LIBS)


-#
-# test1284
-#
-
-test1284:	test1284.o ../cups/libcups.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o test1284 test1284.o ../cups/libcups.a \
-		$(SSLLIBS) $(COMMONLIBS) $(LIBZ)
-
-
-#
-# ieee1394
-#
-
-ieee1394:	ieee1394.o ieee1394-linux.o
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o ieee1394 ieee1394.o ieee1394-linux.o -lraw1394 $(LIBS)
-
-ieee1394.o:		ieee1394.h
-ieee1394-linux.o:	ieee1394.h
-
-
 #
 # ipp
 #
@@ -165,15 +125,6 @@ serial:	serial.o ../cups/$(LIBCUPS)
 	$(CC) $(LDFLAGS) -o serial serial.o $(BACKLIBS) $(LIBS)


-#
-# snmp
-#
-
-snmp:	snmp.o ../cups/$(LIBCUPS)
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o snmp snmp.o $(LIBS)
-
-
 #
 # socket
 #
@@ -190,7 +141,7 @@ socket:	socket.o ../cups/$(LIBCUPS)
 usb:	usb.o ../cups/$(LIBCUPS)
 	echo Linking $@...
 	$(CC) $(LDFLAGS) -o usb usb.o $(BACKLIBS) $(LIBS)
-usb.o:	usb.c usb-darwin.c usb-unix.c ieee1284.c
+usb.o:	usb.c usb-darwin.c usb-unix.c


 #
@@ -3,7 +3,7 @@
 *
 *   Backend test program for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2005 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2004 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
@@ -15,7 +15,7 @@
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
 *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
+ *       Hollywood, Maryland 20636-3142 USA
 *
 *       Voice: (301) 373-9600
 *       EMail: cups-info@cups.org
@@ -1,71 +0,0 @@
-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.
@@ -1,35 +0,0 @@
-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.
@@ -1,510 +0,0 @@
-/*
- * "$Id$"
- *
- *   IEEE-1284 support functions for the Common UNIX Printing System (CUPS).
- *
- *   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" 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 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   get_device_id()  - Get the IEEE-1284 device ID string and corresponding
- *                      URI.
- *   get_make_model() - Get the make and model string from the device ID.
- */
-
-/*
- * Include necessary headers.
- */
-
-#include <cups/debug.h>
-
-
-/*
- * Prototypes...
- */
-
-static int	get_make_model(const char *device_id, char *make_model,
-		               int make_model_size);
-
-
-/*
- * 'get_device_id()' - Get the IEEE-1284 device ID string and
- *                     corresponding URI.
- */
-
-#ifndef SNMP_BACKEND
-#  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)
-#  endif /* __linux */
-
-#  ifdef __sun
-#    ifdef __sparc
-#      include <sys/ecppio.h>
-#    else
-#      include <sys/ioccom.h>
-#      include <sys/ecppsys.h>
-#    endif /* __sparc */
-#  endif /* __sun */
-
-
-int					/* O - 0 on success, -1 on failure */
-get_device_id(
-    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 */
-{
-  char	*attr,				/* 1284 attribute */
-  	*delim,				/* 1284 delimiter */
-	*uriptr,			/* Pointer into URI */
-	manufacturer[256],		/* Manufacturer string */
-	serial_number[1024];		/* Serial number string */
-  int	manulen;			/* Length of manufacturer string */
-#ifdef __linux
-  int	length;				/* Length of device ID info */
-#endif /* __linux */
-#if defined(__sun) && defined(ECPPIOC_GETDEVID)
-  struct ecpp_device_id did;		/* Device ID buffer */
-#endif /* __sun && ECPPIOC_GETDEVID */
-
-
-  DEBUG_printf(("get_device_id(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 (fd < 0 ||
-      !device_id || device_id_size < 32 ||
-      !make_model || make_model_size < 32)
-  {
-    DEBUG_puts("get_device_id: Bad args!");
-    return (-1);
-  }
-
-  *device_id  = '\0';
-  *make_model = '\0';
-
-  if (uri)
-    *uri = '\0';
-
- /*
-  * Get the device ID string...
-  */
-
-#ifdef __linux
-  if (!ioctl(fd, LPIOC_GET_DEVICE_ID(device_id_size), device_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 - 2))
-      length = (((unsigned)device_id[1] & 255) << 8) +
-	       ((unsigned)device_id[0] & 255);
-
-    if (length > (device_id_size - 2))
-      length = device_id_size - 2;
-
-   /*
-    * Copy the device ID text to the beginning of the buffer and
-    * nul-terminate.
-    */
-
-    memmove(device_id, device_id + 2, length);
-    device_id[length] = '\0';
-  }
-#  ifdef DEBUG
-  else
-    printf("get_device_id: 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
-    printf("get_device_id: ioctl failed - %s\n", strerror(errno));
-#  endif /* DEBUG */
-#endif /* __sun && ECPPIOC_GETDEVID */
-
-  DEBUG_printf(("get_device_id: device_id=\"%s\"\n", device_id));
-
-  if (!*device_id)
-    return (-1);
-
- /*
-  * Get the make and model...
-  */
-
-  get_make_model(device_id, make_model, make_model_size);
-
- /*
-  * Then generate a device URI...
-  */
-
-  if (scheme && uri && uri_size > 32)
-  {
-   /*
-    * 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;
-    else if ((attr = strstr(device_id, ";SN:")) != NULL)
-      attr += 4;
-
-    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 manufacturer, make_model, and
-    * serial number strings.
-    */
-
-    snprintf(uri, uri_size, "%s://", scheme);
-
-    if ((attr = strstr(device_id, "MANUFACTURER:")) != NULL)
-      attr += 13;
-    else if ((attr = strstr(device_id, "Manufacturer:")) != NULL)
-      attr += 13;
-    else if ((attr = strstr(device_id, "MFG:")) != NULL)
-      attr += 4;
-
-    if (attr)
-    {
-      strlcpy(manufacturer, attr, sizeof(manufacturer));
-
-      if ((delim = strchr(manufacturer, ';')) != NULL)
-        *delim = '\0';
-
-      if (!strcasecmp(manufacturer, "Hewlett-Packard"))
-        strcpy(manufacturer, "HP");
-    }
-    else
-    {
-      strlcpy(manufacturer, make_model, sizeof(manufacturer));
-
-      if ((delim = strchr(manufacturer, ' ')) != NULL)
-        *delim = '\0';
-    }
-
-    manulen = strlen(manufacturer);
-
-    for (uriptr = uri + strlen(uri), delim = manufacturer;
-	 *delim && uriptr < (uri + uri_size - 3);
-	 delim ++)
-      if (*delim == ' ')
-      {
-	*uriptr++ = '%';
-	*uriptr++ = '2';
-	*uriptr++ = '0';
-      }
-      else
-	*uriptr++ = *delim;
-
-    *uriptr++ = '/';
-
-    if (!strncasecmp(make_model, manufacturer, manulen))
-    {
-      delim = make_model + manulen;
-
-      while (isspace(*delim & 255))
-        delim ++;
-    }
-    else
-      delim = make_model;
-
-    for (; *delim && uriptr < (uri + uri_size - 3); delim ++)
-      if (*delim == ' ')
-      {
-	*uriptr++ = '%';
-	*uriptr++ = '2';
-	*uriptr++ = '0';
-      }
-      else
-	*uriptr++ = *delim;
-
-    if (serial_number[0])
-    {
-     /*
-      * Add the serial number to the URI...
-      */
-
-      strlcpy(uriptr, "?serial=", uri_size - (uriptr - uri));
-      strlcat(uriptr, serial_number, uri_size - (uriptr - uri));
-    }
-    else
-      *uriptr = '\0';
-  }
-
-  return (0);
-}
-#endif /* !SNMP_BACKEND */
-
-
-/*
- * 'get_make_model()' - Get the make and model string from the device ID.
- */
-
-int					/* O - 0 on success, -1 on failure */
-get_make_model(
-    const char *device_id,		/* O - 1284 device ID */
-    char       *make_model,		/* O - Make/model */
-    int        make_model_size)		/* I - Size of buffer */
-{
-  char	*attr,				/* 1284 attribute */
-  	*delim,				/* 1284 delimiter */
-	*mfg,				/* Manufacturer string */
-	*mdl;				/* Model string */
-
-
-  DEBUG_printf(("get_make_model(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("get_make_model: Bad args!");
-    return (-1);
-  }
-
-  *make_model = '\0';
-
- /*
-  * 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 (attr)
-  {
-   /*
-    * 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 ((delim = strchr(attr, ';')) == NULL)
-      delim = attr + strlen(attr);
-
-    if ((delim - attr) < 8)
-      attr = NULL;
-    else
-    {
-      char	*ptr;			/* Pointer into description */
-      int	letters,		/* Number of letters seen */
-		spaces;			/* Number of spaces seen */
-
-
-      for (ptr = attr, letters = 0, spaces = 0; ptr < delim; ptr ++)
-      {
-        if (isspace(*ptr & 255))
-	  spaces ++;
-	else if (isalpha(*ptr & 255))
-	  letters ++;
-
-        if (spaces && letters)
-	  break;
-      }
-
-      if (!spaces || !letters)
-        attr = NULL;
-    }
-  }
-
-  if ((mfg = strstr(device_id, "MANUFACTURER:")) != NULL)
-    mfg += 13;
-  else 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, "Model:")) != NULL)
-    mdl += 6;
-  else if ((mdl = strstr(device_id, "MDL:")) != NULL)
-    mdl += 4;
-
-  if (mdl)
-  {
-   /*
-    * Build a make-model string from the manufacturer and model attributes...
-    */
-
-    if (mfg)
-    {
-      if (!strncasecmp(mfg, "Hewlett-Packard", 15))
-	strlcpy(make_model, "HP", make_model_size);
-      else
-	strlcpy(make_model, mfg, make_model_size);
-
-      if ((delim = strchr(make_model, ';')) != NULL)
-	*delim = '\0';
-
-      if (!strncasecmp(make_model, mdl, strlen(make_model)))
-      {
-       /*
-	* Just copy model string, since it has the manufacturer...
-	*/
-
-	strlcpy(make_model, mdl, make_model_size);
-      }
-      else
-      {
-       /*
-	* Concatenate the make and model...
-	*/
-
-	strlcat(make_model, " ", make_model_size);
-	strlcat(make_model, mdl, make_model_size);
-      }
-    }
-    else
-    {
-     /*
-      * Just copy model string, since it has the manufacturer...
-      */
-
-      strlcpy(make_model, mdl, make_model_size);
-    }
-  }
-  else if (attr)
-  {
-   /*
-    * Use description...
-    */
-
-    if (!strncasecmp(attr, "Hewlett-Packard hp ", 19))
-    {
-     /*
-      * Check for a common HP bug...
-      */
-
-      strlcpy(make_model, "HP ", make_model_size);
-      strlcpy(make_model + 3, attr + 19, make_model_size - 3);
-    }
-    else if (!strncasecmp(attr, "Hewlett-Packard ", 16))
-    {
-      strlcpy(make_model, "HP ", make_model_size);
-      strlcpy(make_model + 3, attr + 16, make_model_size - 3);
-    }
-    else
-    {
-      strlcpy(make_model, attr, make_model_size);
-    }
-  }
-  else
-  {
-   /*
-    * Use "Unknown" as the printer make and model...
-    */
-
-    strlcpy(make_model, "Unknown", make_model_size);
-  }
-
- /*
-  * Strip trailing data...
-  */
-
-  if ((delim = strchr(make_model, ';')) != NULL)
-    *delim = '\0';
-
- /*
-  * Strip trailing whitespace...
-  */
-
-  for (delim = make_model + strlen(make_model) - 1; delim >= make_model; delim --)
-    if (isspace(*delim & 255))
-      *delim = '\0';
-    else
-      break;
-
- /*
-  * Return...
-  */
-
-  if (make_model[0])
-    return (0);
-  else
-    return (-1);
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -1,877 +0,0 @@
-/*
- * "$Id$"
- *
- *   Linux IEEE-1394 glue for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2002 by Easy Software Products, all rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or
- *   without modification, are permitted provided that the
- *   following conditions are met:
- *
- *     1. Redistributions of source code must retain the above
- *	  copyright notice, this list of conditions and the
- *	  following disclaimer.
- *
- *     2. Redistributions in binary form must reproduce the
- *	  above copyright notice, this list of conditions and
- *	  the following disclaimer in the documentation and/or
- *	  other materials provided with the distribution.
- *
- *     3. All advertising materials mentioning features or use
- *	  of this software must display the following
- *	  acknowledgement:
- *
- *	    This product includes software developed by Easy
- *	    Software Products.
- *
- *     4. The name of Easy Software Products may not be used to
- *	  endorse or promote products derived from this software
- *	  without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS
- *   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- *   BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *   DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
- *   BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- *   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- *   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- *   OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- *   DAMAGE.
- *
- * Contents:
- *
- *   get_device_id()  - Get the IEEE-1284 device ID for a node...
- *   get_unit_type()  - Get the unit type for a node...
- *   show_data()      - Show a data node...
- *   show_dir()       - Show a directory list...
- *   ieee1394_list()  - List the available printer devices.
- *   ieee1394_open()  - Open a printer device.
- *   ieee1394_close() - Close a printer device.
- *   ieee1394_read()  - Read from a printer device.
- *   ieee1394_write() - Write data to a printer device.
- *   ieee1394_error() - Return the last error.
- */
-
-/*
- * Include necessary headers.
- */
-
-#include "ieee1394.h"
-#include <cups/debug.h>
-#include <libraw1394/raw1394.h>
-#include <libraw1394/csr.h>
-
-
-/*
- * Limits...
- */
-
-#define MAX_NODES	100
-
-
-/*
- * Structures...
- */
-
-typedef struct
-{
-  char			uri[HTTP_MAX_URI],/* URI for this node... */
-			description[128],/* Description of port */
-			make_model[128];/* Make and model */
-  int			port,		/* Port where this node is found */
-			node;		/* Node number */
-  unsigned long long	addr;		/* Management address */
-} linux1394_node_t;
-
-typedef struct
-{
-  raw1394handle_t	handle;		/* Handle for printer device */
-  int			node;		/* Node number for printer device */
-  unsigned long long	addr;		/* Management address */
-} linux1394_dev_t;
-
-
-/*
- * ORB messages for communication with the device...
- */
-
-typedef struct		/**** Login ORB Message */
-{
-  unsigned char		passwd_addr[8];	/* Password address */
-  unsigned char		resp_addr[8];	/* Login response address */
-  unsigned char		notify_excl;	/* Notify and exclusive bits */
-  unsigned char		recon_func;	/* Reconnect time and function */
-  unsigned char		lun[2];		/* Logical unit number */
-  unsigned char		passwd_len[2];	/* Length of password */
-  unsigned char		resp_len[2];	/* Length of login response */
-  unsigned char		fifo_addr[8];	/* Local status FIFO address */
-} login_orb_t;
-
-typedef struct		/**** Login Response Message ****/
-{
-  unsigned char		length[2];	/* Length of response */
-  unsigned char		login_id[2];	/* Login ID */
-  unsigned char		cmd_addr[8];	/* Command block agent address */
-  unsigned char		reserved[2];	/* Reserved (0) */
-  unsigned char		recon_hold[2];	/* Number of seconds to hold login */
-} login_resp_t;
-
-
-/*
- * Local globals...
- */
-
-static char		error_string[1024] = "";
-static int		num_nodes;
-static linux1394_node_t	nodes[MAX_NODES];
-
-
-/*
- * 'get_device_id()' - Get the IEEE-1284 device ID for a node...
- */
-
-static char *				/* O - Device ID */
-get_device_id(raw1394handle_t    handle,/* I - Handle for device */
-              int                node,	/* I - Node number */
-	      unsigned long long offset,/* I - Offset to directory */
-	      char               *id,	/* O - ID string */
-	      int                idlen)	/* I - Size of ID string */
-{
-  unsigned char		data[1024],	/* Data from ROM */
-			*dataptr;	/* Pointer into data */
-  int			length;		/* Length of directory */
-  int			datalen;	/* Length of data */
-  unsigned long long	dataoff;	/* Offset of data */
-
-
-  DEBUG_printf(("get_device_id(handle = %p, node = %d, offset = %llx, id = %p, idlen = %d)\n",
-                handle, node, offset, id, idlen));
-
-  *id = '\0';
-
- /*
-  * Read the directory length from the first quadlet...
-  */
-
-  if (raw1394_read(handle, 0xffc0 | node, offset, 4, (quadlet_t *)data) < 0)
-    return (NULL);
-
-  offset += 4;
-
- /*
-  * The length is in the upper 16 bits...
-  */
-
-  length = (data[0] << 8) | data[1];
-
-  DEBUG_printf(("    length = %d\n", length));
-
- /*
-  * Then read the directory, looking for unit directory or device tags...
-  */
-
-  while (length > 0)
-  {
-    if (raw1394_read(handle, 0xffc0 | node, offset, 4, (quadlet_t *)data) < 0)
-      return (NULL);
-
-    DEBUG_printf(("    data = %02X %02X %02X %02X\n", data[0], data[1],
-                  data[2], data[3]));
-
-    if (data[0] == 0xd1)
-    {
-     /*
-      * Found the unit directory...
-      */
-
-      offset += ((((data[1] << 8) | data[2]) << 8) | data[3]) << 2;
-
-      return (get_device_id(handle, node, offset, id, idlen));
-    }
-    else if (data[0] == 0x81)
-    {
-     /*
-      * Found potential IEEE-1284 device ID...
-      */
-
-      dataoff = offset + (((((data[1] << 8) | data[2]) << 8) | data[3]) << 2);
-
-      if (raw1394_read(handle, 0xffc0 | node, dataoff, 4, (quadlet_t *)data) < 0)
-	return (NULL);
-
-      dataoff += 4;
-
-     /*
-      * Read the leaf value...
-      */
-
-      datalen = (data[0] << 8) | data[1];
-
-      if (datalen > (sizeof(data) / 4))
-        datalen = sizeof(data) / 4;
-
-      for (dataptr = data; datalen > 0; datalen --, dataptr += 4, dataoff += 4)
-	if (raw1394_read(handle, 0xffc0 | node, dataoff, 4,
-	                 (quadlet_t *)dataptr) < 0)
-	  return (NULL);
-
-      if (data[0] == 0 && memcmp(data + 8, "MFG:", 4) == 0)
-      {
-       /*
-        * Found the device ID...
-	*/
-
-        datalen = dataptr - data - 8;
-	if (datalen >= idlen)
-	  datalen --;
-
-	memcpy(id, data + 8, datalen);
-	id[datalen] = '\0';
-
-        return (id);
-      }
-    }
-
-    offset += 4;
-    length --;
-  }
-
-  return (NULL);
-}
-
-
-/*
- * 'get_man_addr()' - Get the management address for a node...
- */
-
-static int				/* O - Unit type */
-get_man_addr(raw1394handle_t    handle,	/* I - Handle for device */
-             int                node,	/* I - Node number */
-	     unsigned long long offset)	/* I - Offset to directory */
-{
-  unsigned char	data[4];		/* Data from ROM */
-  int		length;			/* Length of directory */
-
-
-  DEBUG_printf(("get_man_addr(handle = %p, node = %d, offset = %llx)\n",
-                handle, node, offset));
-
- /*
-  * Read the directory length from the first quadlet...
-  */
-
-  if (raw1394_read(handle, 0xffc0 | node, offset, 4, (quadlet_t *)data) < 0)
-    return (-1);
-
-  offset += 4;
-
- /*
-  * The length is in the upper 16 bits...
-  */
-
-  length = (data[0] << 8) | data[1];
-
-  DEBUG_printf(("    length = %d\n", length));
-
- /*
-  * Then read the directory, looking for unit directory or type tags...
-  */
-
-  while (length > 0)
-  {
-    if (raw1394_read(handle, 0xffc0 | node, offset, 4, (quadlet_t *)data) < 0)
-      return (-1);
-
-    DEBUG_printf(("    data = %02X %02X %02X %02X\n", data[0], data[1],
-                  data[2], data[3]));
-
-    if (data[0] == 0xd1)
-    {
-     /*
-      * Found the unit directory...
-      */
-
-      offset += ((((data[1] << 8) | data[2]) << 8) | data[3]) << 2;
-
-      return (get_man_addr(handle, node, offset));
-    }
-    else if (data[0] == 0x54)
-    {
-     /*
-      * Found the management address...
-      */
-
-      return (((((data[1] << 8) | data[2]) << 8) | data[3]) << 2);
-    }
-
-    offset += 4;
-    length --;
-  }
-
-  return (-1);
-}
-
-
-/*
- * 'get_unit_type()' - Get the unit type for a node...
- */
-
-static int				/* O - Unit type */
-get_unit_type(raw1394handle_t    handle,/* I - Handle for device */
-              int                node,	/* I - Node number */
-	      unsigned long long offset)/* I - Offset to directory */
-{
-  unsigned char	data[4];		/* Data from ROM */
-  int		length;			/* Length of directory */
-
-
-  DEBUG_printf(("get_unit_type(handle = %p, node = %d, offset = %llx)\n",
-                handle, node, offset));
-
- /*
-  * Read the directory length from the first quadlet...
-  */
-
-  if (raw1394_read(handle, 0xffc0 | node, offset, 4, (quadlet_t *)data) < 0)
-    return (-1);
-
-  offset += 4;
-
- /*
-  * The length is in the upper 16 bits...
-  */
-
-  length = (data[0] << 8) | data[1];
-
-  DEBUG_printf(("    length = %d\n", length));
-
- /*
-  * Then read the directory, looking for unit directory or type tags...
-  */
-
-  while (length > 0)
-  {
-    if (raw1394_read(handle, 0xffc0 | node, offset, 4, (quadlet_t *)data) < 0)
-      return (-1);
-
-    DEBUG_printf(("    data = %02X %02X %02X %02X\n", data[0], data[1],
-                  data[2], data[3]));
-
-    if (data[0] == 0xd1)
-    {
-     /*
-      * Found the unit directory...
-      */
-
-      offset += ((((data[1] << 8) | data[2]) << 8) | data[3]) << 2;
-
-      return (get_unit_type(handle, node, offset));
-    }
-    else if (data[0] == 0x14)
-    {
-     /*
-      * Found the unit type...
-      */
-
-      return (data[1] & 0x1f);
-    }
-
-    offset += 4;
-    length --;
-  }
-
-  return (-1);
-}
-
-
-#ifdef DEBUG
-/*
- * 'show_data()' - Show a data node...
- */
-
-static void
-show_data(raw1394handle_t    handle,	/* I - Handle for device */
-          int                node,	/* I - Node number */
-	  unsigned long long offset,	/* I - Offset to directory */
-	  int                indent)	/* Amount to indent */
-{
-  int		i;			/* Looping var */
-  unsigned char	data[4];		/* Data from ROM */
-  int		length;			/* Length of data */
-
-
- /*
-  * Read the data length from the first quadlet...
-  */
-
-  if (raw1394_read(handle, 0xffc0 | node, offset, 4, (quadlet_t *)data) < 0)
-    return;
-
-  offset += 4;
-
- /*
-  * The length is in the upper 16 bits...
-  */
-
-  length = (data[0] << 8) | data[1];
-
- /*
-  * Then read the data...
-  */
-
-  for (i = 0; i < indent; i ++)
-    putchar(' ');
-
-  printf("LEAF (%d quadlets)\n", length);
-
-  while (length > 0)
-  {
-    if (raw1394_read(handle, 0xffc0 | node, offset, 4, (quadlet_t *)data) < 0)
-      return;
-
-    for (i = 0; i < indent; i ++)
-      putchar(' ');
-
-    printf("%02X %02X %02X %02X    '%c%c%c%c'\n",
-           data[0], data[1], data[2], data[3],
-           (data[0] < ' ' || data[0] >= 0x7f) ? '.' : data[0],
-           (data[1] < ' ' || data[1] >= 0x7f) ? '.' : data[1],
-           (data[2] < ' ' || data[2] >= 0x7f) ? '.' : data[2],
-           (data[3] < ' ' || data[3] >= 0x7f) ? '.' : data[3]);
-
-    offset += 4;
-    length --;
-  }
-}
-
-
-/*
- * 'show_dir()' - Show a directory list...
- */
-
-static void
-show_dir(raw1394handle_t    handle,	/* I - Handle for device */
-         int                node,	/* I - Node number */
-	 unsigned long long offset,	/* I - Offset to directory */
-	 int                indent)	/* Amount to indent */
-{
-  int			i;		/* Looping var */
-  unsigned char		data[4];	/* Data from ROM */
-  int			length;		/* Length of directory */
-  int			value;		/* Value in directory */
-
-
- /*
-  * Read the directory length from the first quadlet...
-  */
-
-  if (raw1394_read(handle, 0xffc0 | node, offset, 4, (quadlet_t *)data) < 0)
-    return;
-
-  offset += 4;
-
- /*
-  * The length is in the upper 16 bits...
-  */
-
-  length = (data[0] << 8) | data[1];
-
- /*
-  * Then read the directory...
-  */
-
-  while (length > 0)
-  {
-    if (raw1394_read(handle, 0xffc0 | node, offset, 4, (quadlet_t *)data) < 0)
-      return;
-
-    for (i = 0; i < indent; i ++)
-      putchar(' ');
-
-    printf("%02X %02X %02X %02X\n", data[0], data[1], data[2], data[3]);
-
-    value = (((data[1] << 8) | data[2]) << 8) | data[3];
-
-    switch (data[0] & 0xc0)
-    {
-      case 0x00 :
-	  for (i = -4; i < indent; i ++)
-	    putchar(' ');
-
-          printf("IMMEDIATE %d\n", value);
-	  break;
-
-      case 0x40 :
-	  for (i = -4; i < indent; i ++)
-	    putchar(' ');
-
-          printf("CSR OFFSET +%06X\n", value);
-	  break;
-
-      case 0x80 :
-          show_data(handle, node, offset + value * 4, indent + 4);
-	  break;
-
-      case 0xc0 :
-          show_dir(handle, node, offset + value * 4, indent + 4);
-	  break;
-    }
-
-    offset += 4;
-    length --;
-  }
-}
-#endif /* DEBUG */
-
-
-/*
- * 'ieee1394_list()' - List the available printer devices.
- */
-
-ieee1394_info_t	*			/* O - Printer information */
-ieee1394_list(int *num_devices)		/* O - Number of printers */
-{
-  int			i, j;		/* Looping vars */
-  raw1394handle_t	handle;		/* 1394 handle */
-  int			num_ports;	/* Number of ports */
-  struct raw1394_portinfo ports[100];	/* Port data... */
-  unsigned char		guid[8];	/* Global unique ID */
-  int			vendor;		/* Vendor portion of GUID */
-  int			unit_type;	/* Unit type */
-  int			addr;		/* Management address offset */
-  char			id[1024],	/* Device ID string */
-			*idptr,		/* Pointer into ID string */
-			*idsep;		/* Pointer to separator */
-  ieee1394_info_t	*devices;	/* Device list */
-
-
- /*
-  * Connect to the user-mode driver interface...
-  */
-
-  handle    = raw1394_new_handle();
-  num_ports = raw1394_get_port_info(handle, ports,
-                                    sizeof(ports) / sizeof(ports[0]));
-
-  DEBUG_printf(("num_ports = %d\n", num_ports));
-
- /*
-  * Loop through the ports to discover what nodes are available.
-  */
-
-  num_nodes = 0;
-
-  for (i = 0; i < num_ports; i ++)
-  {
-    DEBUG_printf(("ports[%d] = { nodes = %d, name = \"%s\" }\n", i,
-                  ports[i].nodes, ports[i].name));
-
-    raw1394_set_port(handle, i);
-
-    for (j = 0; j < ports[i].nodes; j ++)
-    {
-      if (raw1394_read(handle, 0xffc0 | j,
-                       CSR_REGISTER_BASE + CSR_CONFIG_ROM + 12, 4,
-		       (quadlet_t *)guid) < 0)
-      {
-        DEBUG_printf(("    Node #%d: Unable to contact (%s)!\n", j,
-	              strerror(errno)));
-        continue;
-      }
-      else
-      {
-        raw1394_read(handle, 0xffc0 | j,
-                     CSR_REGISTER_BASE + CSR_CONFIG_ROM + 16, 4,
-	             (quadlet_t *)(guid + 4));
-
-        DEBUG_printf(("    Node #%d: GUID = %02X%02X%02X%02X%02X%02X%02X%02X\n",
-		      j, guid[0], guid[1], guid[2], guid[3], guid[4],
-		      guid[5], guid[6], guid[7]));
-
-        vendor    = (((guid[0] << 8) | guid[1]) << 8) | guid[2];
-        unit_type = get_unit_type(handle, j,
-	                          CSR_REGISTER_BASE + CSR_CONFIG_ROM + 20);
-
-        DEBUG_printf(("vendor = %x, unit_type = %d\n", vendor, unit_type));
-
-        if (unit_type == 2 && num_nodes < MAX_NODES)
-	{
-	 /*
-	  * Found a printer device; add it to the nodes list...
-	  */
-
-#ifdef DEBUG
-          show_dir(handle, j, CSR_REGISTER_BASE + CSR_CONFIG_ROM + 20, 0);
-#endif /* DEBUG */
-
-          memset(nodes + num_nodes, 0, sizeof(linux1394_node_t));
-
-          sprintf(nodes[num_nodes].uri, "ieee1394://%02X%02X%02X%02X%02X%02X%02X%02X",
-		  guid[0], guid[1], guid[2], guid[3], guid[4],
-		  guid[5], guid[6], guid[7]);
-
-          nodes[num_nodes].port = i;
-	  nodes[num_nodes].node = j;
-
-          addr = get_man_addr(handle, j, CSR_REGISTER_BASE + CSR_CONFIG_ROM + 20);
-
-          if (addr < 0)
-	    continue;
-
-          nodes[num_nodes].addr = CSR_REGISTER_BASE + addr;
-
-          DEBUG_printf(("Node address = %llx\n", nodes[num_nodes].addr));
-
-          get_device_id(handle, j, CSR_REGISTER_BASE + CSR_CONFIG_ROM + 20,
-	                id, sizeof(id));
-
-          if (id[0])
-	  {
-	   /*
-	    * Grab the manufacturer and model name from the device ID
-	    * string...
-	    */
-
-            idptr = id + 4;
-            idsep = strchr(id, ';');
-	    if (idsep)
-	      *idsep++ = '\0';
-	    else
-	      idsep = idptr;
-
-	    snprintf(nodes[num_nodes].description,
-	             sizeof(nodes[num_nodes].description),
-		     "%s Firewire Printer", idptr);
-
-            if ((idptr = strstr(idsep, "DES:")) == NULL)
-	      idptr = strstr(idsep, "MDL:");
-
-            if (idptr == NULL)
-              strcpy(nodes[num_nodes].make_model, "Unknown");
-	    else
-	    {
-	     /*
-	      * Grab the DES or MDL code...
-	      */
-
-	      idptr += 4;
-	      idsep = strchr(idptr, ';');
-	      if (idsep)
-	        *idsep = '\0';
-
-              if (strncmp(id + 4, idptr, strlen(id + 4)) == 0)
-	      {
-	       /*
-	        * Use the description directly...
-		*/
-
-        	strlcpy(nodes[num_nodes].make_model, idptr,
-	        	sizeof(nodes[num_nodes].make_model));
-              }
-	      else
-	      {
-	       /*
-	        * Add the manufacturer to the front of the name...
-		*/
-
-        	snprintf(nodes[num_nodes].make_model,
-	        	 sizeof(nodes[num_nodes].make_model),
-			 "%s %s", id + 4, idptr);
-              }
-            }
-	  }
-	  else
-	  {
-	   /*
-	    * Flag it as an unknown printer...
-	    */
-
-	    sprintf(nodes[num_nodes].description,
-	            "Unknown%06X Firewire Printer", vendor);
-            strcpy(nodes[num_nodes].make_model, "Unknown");
-	  }
-
-	  num_nodes ++;
-	}
-      }
-    }
-  }
-
- /*
-  * Done querying the Firewire bus...
-  */
-
-  raw1394_destroy_handle(handle);
-
- /*
-  * Build an array of device info structures as needed...
-  */
-
-  if (num_devices == NULL)
-    return (NULL);
-
-  *num_devices = num_nodes;
-
-  if (num_nodes)
-  {
-    if ((devices = calloc(sizeof(ieee1394_info_t), num_nodes)) != NULL)
-    {
-      for (i = 0; i < num_nodes; i ++)
-      {
-        strcpy(devices[i].uri, nodes[i].uri);
-	strcpy(devices[i].description, nodes[i].description);
-	strcpy(devices[i].make_model, nodes[i].make_model);
-      }
-    }
-
-    return (devices);
-  }
-  else
-    return (NULL);
-}
-
-
-/*
- * 'ieee1394_open()' - Open a printer device.
- */
-
-ieee1394_dev_t				/* O - Printer device or NULL */
-ieee1394_open(const char *uri)		/* I - Device URI */
-{
-  int			i;		/* Looping var */
-  linux1394_dev_t	*ldev;		/* Linux device */
-
-
- /*
-  * Return early if we can't see any printers...
-  */
-
-  if (num_nodes == 0)
-    ieee1394_list(NULL);
-
-  if (num_nodes == 0)
-  {
-    strcpy(error_string, "No IEEE-1394 printers found!");
-    return (NULL);
-  }
-
- /*
-  * Look for the URI...
-  */
-
-  for (i = 0; i < num_nodes; i ++)
-    if (strcmp(nodes[i].uri, uri) == 0)
-      break;
-
-  if (i >= num_nodes)
-  {
-    snprintf(error_string, sizeof(error_string), "Device %s not found!", uri);
-    return (NULL);
-  }
-
- /*
-  * Now create a new device structure...
-  */
-
-  if ((ldev = calloc(sizeof(linux1394_dev_t), 1)) == NULL)
-  {
-    strcpy(error_string, "Out of memory!");
-    return (NULL);
-  }
-
-  ldev->handle = raw1394_new_handle();
-  ldev->node   = nodes[i].node;
-  ldev->addr   = nodes[i].addr;
-
-  raw1394_set_port(ldev->handle, nodes[i].port);
-
-  error_string[0] = '\0';
-
-  return ((ieee1394_dev_t)ldev);
-}
-
-
-/*
- * 'ieee1394_close()' - Close a printer device.
- */
-
-int					/* O - 0 on success, -1 on failure */
-ieee1394_close(ieee1394_dev_t dev)	/* I - Printer device */
-{
-  linux1394_dev_t	*ldev;		/* Linux device */
-
-
-  ldev = (linux1394_dev_t *)dev;
-
-  raw1394_destroy_handle(ldev->handle);
-
-  free(ldev);
-
-  return (0);
-}
-
-
-/*
- * 'ieee1394_read()' - Read from a printer device.
- */
-
-int					/* O - Number of bytes read or -1 */
-ieee1394_read(ieee1394_dev_t dev,	/* I - Printer device */
-              char           *buffer,	/* I - Read buffer */
-	      int            len)	/* I - Max bytes to read */
-{
-  linux1394_dev_t	*ldev;		/* Linux device */
-
-
-  ldev = (linux1394_dev_t *)dev;
-
-
-  return (0);
-}
-
-
-/*
- * 'ieee1394_write()' - Write data to a printer device.
- */
-
-int					/* O - Number of bytes written or -1 */
-ieee1394_write(ieee1394_dev_t dev,	/* I - Printer device */
-               char           *buffer,	/* I - Buffer to write */
-	       int            len)	/* I - Number of bytes to write */
-{
-  linux1394_dev_t	*ldev;		/* Linux device */
-
-
-  ldev = (linux1394_dev_t *)dev;
-
-
-/*  if (raw1394_write(handle, 0xffc0 | j, 0, ,
-		       (quadlet_t *)guid) < 0)*/
-
-  return (len);
-}
-
-
-/*
- * 'ieee1394_error()' - Return the last error.
- */
-
-const char *				/* O - Error string or NULL */
-ieee1394_error(void)
-{
-  if (error_string[0])
-    return (error_string);
-  else
-    return (NULL);
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -1,267 +0,0 @@
-/*
- * "$Id$"
- *
- *   IEEE-1394 backend for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2002 by Easy Software Products, all rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or
- *   without modification, are permitted provided that the
- *   following conditions are met:
- *
- *     1. Redistributions of source code must retain the above
- *	  copyright notice, this list of conditions and the
- *	  following disclaimer.
- *
- *     2. Redistributions in binary form must reproduce the
- *	  above copyright notice, this list of conditions and
- *	  the following disclaimer in the documentation and/or
- *	  other materials provided with the distribution.
- *
- *     3. All advertising materials mentioning features or use
- *	  of this software must display the following
- *	  acknowledgement:
- *
- *	    This product includes software developed by Easy
- *	    Software Products.
- *
- *     4. The name of Easy Software Products may not be used to
- *	  endorse or promote products derived from this software
- *	  without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS
- *   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- *   BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *   DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
- *   BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- *   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- *   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- *   OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- *   DAMAGE.
- *
- * Contents:
- *
- *   main()         - Send a file to the printer.
- *   list_devices() - List all known printer devices...
- */
-
-/*
- * Include necessary headers.
- */
-
-#include "ieee1394.h"
-
-
-/*
- * Local functions...
- */
-
-void	list_devices(void);
-
-
-/*
- * 'main()' - Send a file to the printer.
- *
- * Usage:
- *
- *    printer-uri job-id user title copies options [file]
- */
-
-int			/* O - Exit status */
-main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
-     char *argv[])	/* I - Command-line arguments */
-{
-  ieee1394_dev_t dev;		/* Printer device */
-  int		fp;		/* Print file */
-  int		copies;		/* Number of copies to print */
-  int		rbytes;		/* Number of bytes read from device */
-  size_t	nbytes,		/* Number of bytes read from file */
-		tbytes;		/* Total number of bytes written */
-  char		buffer[8192];	/* Input/output buffer */
-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  struct sigaction action;	/* Actions for POSIX signals */
-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-
-
- /*
-  * Make sure status messages are not buffered...
-  */
-
-  setbuf(stderr, NULL);
-
- /*
-  * Check command-line...
-  */
-
-  if (argc == 1)
-  {
-    list_devices();
-
-    return (0);
-  }
-  else if (argc < 6 || argc > 7)
-  {
-    fprintf(stderr, "Usage: %s job-id user title copies options [file]\n",
-            argv[0]);
-    return (1);
-  }
-
- /*
-  * If we have 7 arguments, print the file named on the command-line.
-  * Otherwise, send stdin instead...
-  */
-
-  if (argc == 6)
-  {
-    fp     = 0;
-    copies = 1;
-  }
-  else
-  {
-   /*
-    * Try to open the print file...
-    */
-
-    if ((fp = open(argv[6], O_RDONLY)) < 0)
-    {
-      perror("ERROR: unable to open print file");
-      return (1);
-    }
-
-    copies = atoi(argv[4]);
-  }
-
- /*
-  * Try to open the printer device...
-  */
-
-  fputs("STATE: +connecting-to-device\n", stderr);
-
-  do
-  {
-    if ((dev = ieee1394_open(argv[0])) == NULL)
-    {
-      fputs("INFO: Firewire printer busy; will retry in 30 seconds...\n", stderr);
-      sleep(30);
-    }
-  }
-  while (dev == NULL);
-
-  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
-  * 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...
-  */
-
-  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;
-
-      if (ieee1394_write(dev, buffer, nbytes) < 0)
-      {
-	perror("ERROR: Unable to send print file to printer");
-	break;
-      }
-
-      if ((rbytes = ieee1394_read(dev, buffer, sizeof(buffer))) > 0)
-        fprintf(stderr, "INFO: Read %d bytes from printer...\n", rbytes);
-
-      if (argc > 6)
-	fprintf(stderr, "INFO: Sending print file, %lu bytes...\n",
-	        (unsigned long)tbytes);
-    }
-  }
-
- /*
-  * Close the printer device and input file and return...
-  */
-
-  ieee1394_close(dev);
-
-  if (fp != 0)
-    close(fp);
-
-  fputs("INFO: Ready to print.\n", stderr);
-
-  return (0);
-}
-
-
-/*
- * 'list_devices()' - List all known devices...
- */
-
-void
-list_devices(void)
-{
-  int			i,		/* Looping var */
-			num_info;	/* Number of devices */
-  ieee1394_info_t	*info;		/* Devices... */
-
-
- /*
-  * Get the available devices...
-  */
-
-  info = ieee1394_list(&num_info);
-
- /*
-  * List them as needed...
-  */
-
-  if (num_info > 0)
-  {
-    for (i = 0; i < num_info; i ++)
-      printf("direct %s \"%s\" \"%s\"\n", info[i].uri,
-             info[i].make_model, info[i].description);
-
-    free(info);
-  }
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -1,103 +0,0 @@
-/*
- * "$Id$"
- *
- *   IEEE-1394 header for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2002 by Easy Software Products, all rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or
- *   without modification, are permitted provided that the
- *   following conditions are met:
- *
- *     1. Redistributions of source code must retain the above
- *	  copyright notice, this list of conditions and the
- *	  following disclaimer.
- *
- *     2. Redistributions in binary form must reproduce the
- *	  above copyright notice, this list of conditions and
- *	  the following disclaimer in the documentation and/or
- *	  other materials provided with the distribution.
- *
- *     3. All advertising materials mentioning features or use
- *	  of this software must display the following
- *	  acknowledgement:
- *
- *	    This product includes software developed by Easy
- *	    Software Products.
- *
- *     4. The name of Easy Software Products may not be used to
- *	  endorse or promote products derived from this software
- *	  without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS
- *   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- *   BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *   DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
- *   BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- *   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- *   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- *   OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- *   DAMAGE.
- */
-
-/*
- * Include necessary headers.
- */
-
-#include <cups/cups.h>
-#include <stdio.h>
-#include <stdlib.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 <io.h>
-#else
-#  include <unistd.h>
-#  include <fcntl.h>
-#endif /* WIN32 */
-
-
-/*
- * Device information structure...
- */
-
-typedef struct
-{
-  char	uri[HTTP_MAX_URI],	/* Device URI */
-	description[128],	/* Description of port */
-	make_model[128];	/* Make and model */
-} ieee1394_info_t;
-
-
-/*
- * Private device connection information...
- */
-
-typedef void	*ieee1394_dev_t;
-
-
-/*
- * Prototypes for standard IEEE-1394 interface...
- */
-
-extern ieee1394_info_t	*ieee1394_list(int *num_devices);
-extern ieee1394_dev_t	ieee1394_open(const char *uri);
-extern int		ieee1394_close(ieee1394_dev_t dev);
-extern int		ieee1394_read(ieee1394_dev_t dev, char *buffer, int len);
-extern int		ieee1394_write(ieee1394_dev_t dev, char *buffer, int len);
-extern const char	*ieee1394_error(void);
-
-
-/*
- * End of "$Id$".
- */
@@ -3,7 +3,7 @@
 *
 *   Line Printer Daemon backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2004 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
@@ -15,7 +15,7 @@
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
 *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
+ *       Hollywood, Maryland 20636-3142 USA
 *
 *       Voice: (301) 373-9600
 *       EMail: cups-info@cups.org
@@ -30,7 +30,7 @@
 *   lpd_queue()       - Queue a file using the Line Printer Daemon protocol.
 *   lpd_timeout()     - Handle timeout alarms...
 *   lpd_write()       - Write a buffer of data to an LPD server.
- *   rresvport_af()    - A simple implementation of rresvport_af().
+ *   rresvport()       - A simple implementation of rresvport().
 *   sigterm_handler() - Handle 'terminate' signals that stop the backend.
 */

@@ -38,13 +38,12 @@
 * Include necessary headers.
 */

-#include <cups/backend.h>
-#include <cups/http-private.h>
 #include <cups/cups.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <ctype.h>
+#include <cups/http-private.h>
 #include <cups/string.h>
 #include <errno.h>
 #include <sys/types.h>
@@ -59,10 +58,6 @@
 #  include <arpa/inet.h>
 #  include <netdb.h>
 #endif /* WIN32 */
-#ifdef __APPLE__
-#  include <CoreFoundation/CFNumber.h>
-#  include <CoreFoundation/CFPreferences.h>
-#endif /* __APPLE__ */


 /*
@@ -70,7 +65,6 @@
 */

 static char	tmpfilename[1024] = "";	/* Temporary spool file name */
-static int	abort_job = 0;		/* Non-zero if we get SIGTERM */


 /*
@@ -90,6 +84,13 @@ static int	abort_job = 0;		/* Non-zero if we get SIGTERM */
 #define RESERVE_ANY		2	/* Reserve port 1-1023 */


+/*
+ * It appears that rresvport() is never declared on most systems...
+ */
+
+extern int	rresvport(int *port);
+
+
 /*
 * Local functions...
 */
@@ -99,12 +100,9 @@ static int	lpd_queue(const char *hostname, int port, const char *printer,
 		          const char *filename,
 		          const char *user, const char *title, int copies,
 			  int banner, int format, int order, int reserve,
-			  int manual_copies, int timeout, int contimeout);
+			  int manual_copies, int timeout);
 static void	lpd_timeout(int sig);
 static int	lpd_write(int lpd_fd, char *buffer, int length);
-#ifndef HAVE_RRESVPORT_AF
-static int	rresvport_af(int *port, int family);
-#endif /* !HAVE_RRESVPORT_AF */
 static void	sigterm_handler(int sig);


@@ -139,7 +137,6 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  int			sanitize_title;	/* Sanitize title string? */
  int			manual_copies,	/* Do manual copies? */
 			timeout,	/* Timeout */
-			contimeout,	/* Connection timeout */
 			copies;		/* Number of copies */
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
  struct sigaction	action;		/* Actions for POSIX signals */
@@ -180,13 +177,13 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  if (argc == 1)
  {
    puts("network lpd \"Unknown\" \"LPD/LPR Host or Printer\"");
-    return (CUPS_BACKEND_OK);
+    return (0);
  }
  else if (argc < 6 || argc > 7)
  {
    fprintf(stderr, "Usage: %s job-id user title copies options [file]\n",
            argv[0]);
-    return (CUPS_BACKEND_FAILED);
+    return (1);
  }

 /*
@@ -209,7 +206,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
    if ((fd = cupsTempFd(tmpfilename, sizeof(tmpfilename))) < 0)
    {
      perror("ERROR: unable to create temporary file");
-      return (CUPS_BACKEND_FAILED);
+      return (1);
    }

    while ((bytes = fread(buffer, 1, sizeof(buffer), stdin)) > 0)
@@ -218,7 +215,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
        perror("ERROR: unable to write to temporary file");
 	close(fd);
 	unlink(tmpfilename);
-	return (CUPS_BACKEND_FAILED);
+	return (1);
      }

    close(fd);
@@ -231,10 +228,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  * Extract the hostname and printer name from the URI...
  */

-  httpSeparateURI(HTTP_URI_CODING_ALL, cupsBackendDeviceURI(argv),
-                  method, sizeof(method), username, sizeof(username),
-		  hostname, sizeof(hostname), &port,
-		  resource, sizeof(resource));
+  httpSeparate(argv[0], method, username, hostname, &port, resource);

  if (!username[0])
  {
@@ -249,41 +243,18 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  * See if there are any options...
  */

-  banner        = 0;
-  format        = 'l';
-  order         = ORDER_CONTROL_DATA;
-  reserve       = RESERVE_ANY;
-  manual_copies = 1;
-  timeout       = 300;
-  contimeout    = 7 * 24 * 60 * 60;
-
-#ifdef __APPLE__
-  /* We want to pass utf-8 characters, not re-map them (3071945) */
-  sanitize_title = 0;
-
-  {
-    CFPropertyListRef	pvalue;		/* Preference value */
-    SInt32		toval;		/* Timeout value */
-
-
-    pvalue = CFPreferencesCopyValue(CFSTR("timeout"),
-                                    CFSTR("com.apple.print.backends"),
-				    kCFPreferencesAnyUser,
-				    kCFPreferencesCurrentHost);
-    if (pvalue)
-    {
-      if (CFGetTypeID(pvalue) == CFNumberGetTypeID())
-      {
-	CFNumberGetValue(pvalue, kCFNumberSInt32Type, &toval);
-	contimeout = (int)toval;
-      }
-
-      CFRelease(pvalue);
-    }
-  }
-#else
+  banner         = 0;
+  format         = 'l';
+  order          = ORDER_CONTROL_DATA;
+  reserve        = RESERVE_ANY;
+  manual_copies  = 1;
+  timeout        = 300;
  sanitize_title = 1;
-#endif /* __APPLE__ */
+
+#if defined(__APPLE__)
+  /* We want to pass utf-8 characters, not re-map them (3071945) */
+  sanitize_title= 0;
+#endif

  if ((options = strchr(resource, '?')) != NULL)
  {
@@ -317,12 +288,12 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */

        options ++;

-	for (ptr = value; *options && *options != '+' && *options != '&';)
+	for (ptr = value; *options && *options != '+';)
          if (ptr < (value + sizeof(value) - 1))
            *ptr++ = *options++;
 	*ptr = '\0';

-	if (*options == '+' || *options == '&')
+	if (*options == '+')
 	  options ++;
      }
      else
@@ -332,47 +303,51 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
      * Process the option...
      */

-      if (!strcasecmp(name, "banner"))
+      if (strcasecmp(name, "banner") == 0)
      {
       /*
        * Set the banner...
 	*/

-        banner = !value[0] || !strcasecmp(value, "on") ||
-		 !strcasecmp(value, "yes") || !strcasecmp(value, "true");
+        banner = !value[0] ||
+	         strcasecmp(value, "on") == 0 ||
+		 strcasecmp(value, "yes") == 0 ||
+		 strcasecmp(value, "true") == 0;
      }
-      else if (!strcasecmp(name, "format") && value[0])
+      else if (strcasecmp(name, "format") == 0 && value[0])
      {
       /*
        * Set output format...
 	*/

-        if (strchr("cdfglnoprtv", value[0]))
+        if (strchr("cdfglnoprtv", value[0]) != NULL)
 	  format = value[0];
 	else
 	  fprintf(stderr, "ERROR: Unknown format character \"%c\"\n", value[0]);
      }
-      else if (!strcasecmp(name, "order") && value[0])
+      else if (strcasecmp(name, "order") == 0 && value[0])
      {
       /*
        * Set control/data order...
 	*/

-        if (!strcasecmp(value, "control,data"))
+        if (strcasecmp(value, "control,data") == 0)
 	  order = ORDER_CONTROL_DATA;
-	else if (!strcasecmp(value, "data,control"))
+	else if (strcasecmp(value, "data,control") == 0)
 	  order = ORDER_DATA_CONTROL;
 	else
 	  fprintf(stderr, "ERROR: Unknown file order \"%s\"\n", value);
      }
-      else if (!strcasecmp(name, "reserve"))
+      else if (strcasecmp(name, "reserve") == 0)
      {
       /*
        * Set port reservation mode...
 	*/

-        if (!value[0] || !strcasecmp(value, "on") ||
-	    !strcasecmp(value, "yes") || !strcasecmp(value, "true") ||
+        if (!value[0] ||
+	    !strcasecmp(value, "on") ||
+	    !strcasecmp(value, "yes") ||
+	    !strcasecmp(value, "true") ||
 	    !strcasecmp(value, "rfc1179"))
 	  reserve = RESERVE_RFC1179;
 	else if (!strcasecmp(value, "any"))
@@ -380,25 +355,29 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 	else
 	  reserve = RESERVE_NONE;
      }
-      else if (!strcasecmp(name, "manual_copies"))
+      else if (strcasecmp(name, "manual_copies") == 0)
      {
       /*
        * Set manual copies...
 	*/

-        manual_copies = !value[0] || !strcasecmp(value, "on") ||
-	 		!strcasecmp(value, "yes") || !strcasecmp(value, "true");
+        manual_copies = !value[0] ||
+	        	strcasecmp(value, "on") == 0 ||
+	 		strcasecmp(value, "yes") == 0 ||
+	 		strcasecmp(value, "true") == 0;
      }
-      else if (!strcasecmp(name, "sanitize_title"))
+      else if (strcasecmp(name, "sanitize_title") == 0)
      {
       /*
        * Set sanitize title...
 	*/

-        sanitize_title = !value[0] || !strcasecmp(value, "on") ||
-	 		!strcasecmp(value, "yes") || !strcasecmp(value, "true");
+        sanitize_title = !value[0] ||
+	        	strcasecmp(value, "on") == 0 ||
+	 		strcasecmp(value, "yes") == 0 ||
+	 		strcasecmp(value, "true") == 0;
      }
-      else if (!strcasecmp(name, "timeout"))
+      else if (strcasecmp(name, "timeout") == 0)
      {
       /*
        * Set the timeout...
@@ -407,15 +386,6 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 	if (atoi(value) > 0)
 	  timeout = atoi(value);
      }
-      else if (!strcasecmp(name, "contimeout"))
-      {
-       /*
-        * Set the timeout...
-	*/
-
-	if (atoi(value) > 0)
-	  contimeout = atoi(value);
-      }
    }
  }

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

    status = lpd_queue(hostname, port, resource + 1, filename,
                       username, title, copies,
-		       banner, format, order, reserve, manual_copies,
-		       timeout, contimeout);
+		       banner, format, order, reserve, manual_copies, timeout);

    if (!status)
      fprintf(stderr, "PAGE: 1 %d\n", atoi(argv[4]));
@@ -465,8 +434,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  else
    status = lpd_queue(hostname, port, resource + 1, filename,
                       username, title, 1,
-		       banner, format, order, reserve, 1,
-		       timeout, contimeout);
+		       banner, format, order, reserve, 1, timeout);

 /*
  * Remove the temporary file if necessary...
@@ -499,13 +467,6 @@ lpd_command(int  fd,		/* I - Socket connection to LPD host */
  char		status;		/* Status from command */


- /*
-  * Don't try to send commands if the job has been cancelled...
-  */
-
-  if (abort_job)
-    return (-1);
-
 /*
  * Format the string...
  */
@@ -568,8 +529,7 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */
          int        order,		/* I - Order of data/control files */
 	  int        reserve,		/* I - Reserve ports? */
 	  int        manual_copies,	/* I - Do copies by hand... */
-	  int        timeout,		/* I - Timeout... */
-	  int        contimeout)	/* I - Connection timeout */
+	  int        timeout)		/* I - Timeout... */
 {
  FILE			*fp;		/* Job file */
  char			localhost[255];	/* Local host name */
@@ -580,17 +540,12 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */
  char			control[10240],	/* LPD control 'file' */
 			*cptr;		/* Pointer into control file string */
  char			status;		/* Status byte from command */
-  char			portname[255];	/* Port name */
-  http_addrlist_t	*addrlist,	/* Address list */
-			*addr;		/* Socket address */
+  struct sockaddr_in	addr;		/* Socket address */
+  struct hostent	*hostaddr;	/* Host address */
  int			copy;		/* Copies written */
-  time_t		start_time;	/* Time of first connect */
-#ifdef __APPLE__
-  int			recoverable;	/* Recoverable error shown? */
-#endif /* __APPLE__ */
-  size_t		nbytes;		/* Number of bytes written */
-  off_t			tbytes;		/* Total bytes written */
-  char			buffer[65536];	/* Output buffer */
+  size_t		nbytes,		/* Number of bytes written */
+			tbytes;		/* Total bytes written */
+  char			buffer[8192];	/* Output buffer */
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
  struct sigaction	action;		/* Actions for POSIX signals */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
@@ -612,63 +567,37 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */
  signal(SIGALRM, lpd_timeout);
 #endif /* HAVE_SIGSET */

- /*
-  * Find the printer...
-  */
-
-  sprintf(portname, "%d", port);
-
-  if ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, portname)) == NULL)
-  {
-    fprintf(stderr, "ERROR: Unable to locate printer \'%s\'!\n",
-            hostname);
-    return (CUPS_BACKEND_STOP);
-  }
-
- /*
-  * Remember when we starting trying to connect to the printer...
-  */
-
-#ifdef __APPLE__
-  recoverable = 0;
-#endif /* __APPLE__ */
-  start_time  = time(NULL);
-
 /*
  * Loop forever trying to print the file...
  */

-  while (!abort_job)
+  for (;;) /* FOREVER */
  {
   /*
    * First try to reserve a port for this connection...
    */

-    fputs("STATE: +connecting-to-device\n", stderr);
+    if ((hostaddr = httpGetHostByName(hostname)) == NULL)
+    {
+      fprintf(stderr, "ERROR: Unable to locate printer \'%s\' - %s\n",
+              hostname, hstrerror(h_errno));
+      return (1);
+    }
+
    fprintf(stderr, "INFO: Attempting to connect to host %s for printer %s\n",
            hostname, printer);

-    for (lport = reserve == RESERVE_RFC1179 ? 732 : 1024, addr = addrlist;;
-         addr = addr->next)
+    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);
+
+    for (lport = reserve == RESERVE_RFC1179 ? 732 : 1024;;)
    {
-     /*
-      * Stop if this job has been cancelled...
-      */
-
-      if (abort_job)
-      {
-        httpAddrFreeList(addrlist);
-
-        return (CUPS_BACKEND_FAILED);
-      }
-
     /*
      * Choose the next priviledged port...
      */

-      if (!addr)
-        addr = addrlist;
-
      lport --;

      if (lport < 721 && reserve == RESERVE_RFC1179)
@@ -686,12 +615,10 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */
 	* Just create a regular socket...
 	*/

-	if ((fd = socket(addr->addr.addr.sa_family, SOCK_STREAM, 0)) < 0)
+	if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
 	{
          perror("ERROR: Unable to create socket");
-	  sleep(1);
-
-          continue;
+          return (1);
 	}

        lport = 0;
@@ -703,7 +630,7 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */
 	* priviledged lport between 721 and 731...
 	*/

-	if ((fd = rresvport_af(&lport, addr->addr.addr.sa_family)) < 0)
+	if ((fd = rresvport(&lport)) < 0)
 	{
 	  perror("ERROR: Unable to reserve port");
 	  sleep(1);
@@ -712,112 +639,37 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */
 	}
      }

-     /*
-      * Connect to the printer or server...
-      */
-
-      if (abort_job)
+      if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0)
      {
-        httpAddrFreeList(addrlist);
-
+	error = errno;
 	close(fd);
+	fd = -1;

-	return (CUPS_BACKEND_FAILED);
-      }
-
-      if (!connect(fd, &(addr->addr.addr), httpAddrLength(&(addr->addr))))
-	break;
-
-      error = errno;
-      close(fd);
-      fd = -1;
-
-      if (addr->next)
-        continue;
-
-      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.
-	*/
-
-        fprintf(stderr, "INFO: Unable to connect to %s, queuing on next printer in class...\n",
-		hostname);
-
-        httpAddrFreeList(addrlist);
-
-       /*
-        * Sleep 5 seconds to keep the job from requeuing too rapidly...
-	*/
-
-	sleep(5);
-
-        return (CUPS_BACKEND_FAILED);
-      }
-
-      if (error == ECONNREFUSED || error == EHOSTDOWN ||
-          error == EHOSTUNREACH)
-      {
-        if (contimeout && (time(NULL) - start_time) > contimeout)
+	if (error == ECONNREFUSED || error == EHOSTDOWN ||
+            error == EHOSTUNREACH)
 	{
-	  fputs("ERROR: Printer not responding!\n", stderr);
-	  return (CUPS_BACKEND_FAILED);
+	  fprintf(stderr, "WARNING: Network host \'%s\' is busy, down, or unreachable; will retry in 30 seconds...\n",
+                  hostname);
+	  sleep(30);
 	}
+	else if (error == EADDRINUSE)
+	{
+	 /*
+	  * Try on another port...
+	  */

-#ifdef __APPLE__
-        recoverable = 1;
-	fprintf(stderr, "WARNING: recoverable: "
-	                "Network host \'%s\' is busy, down, or "
-	                "unreachable; will retry in 30 seconds...\n",
-                hostname);
-#else
-	fprintf(stderr, "WARNING: "
-	                "Network host \'%s\' is busy, down, or "
-	                "unreachable; will retry in 30 seconds...\n",
-                hostname);
-#endif /* __APPLE__ */
-	sleep(30);
-      }
-      else if (error == EADDRINUSE)
-      {
-       /*
-	* Try on another port...
-	*/
-
-	sleep(1);
+	  sleep(1);
+	}
+	else
+	{
+	  perror("ERROR: Unable to connect to printer; will retry in 30 seconds...");
+          sleep(30);
+	}
      }
      else
-      {
-#ifdef __APPLE__
-        recoverable = 1;
-	perror("ERROR: recoverable: "
-	       "Unable to connect to printer; will retry in 30 seconds...");
-#else
-	perror("ERROR: "
-	       "Unable to connect to printer; will retry in 30 seconds...");
-#endif /* __APPLE__ */
-        sleep(30);
-      }
+	break;
    }

-#ifdef __APPLE__
-    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);
-    }
-#endif /* __APPLE__ */
-
-    fputs("STATE: -connecting-to-device\n", stderr);
    fprintf(stderr, "INFO: Connected to %s...\n", hostname);
    fprintf(stderr, "DEBUG: Connected on ports %d (local %d)...\n", port,
            lport);
@@ -828,22 +680,16 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */

    if (stat(filename, &filestats))
    {
-      httpAddrFreeList(addrlist);
-      close(fd);
-
      perror("ERROR: unable to stat print file");
-      return (CUPS_BACKEND_FAILED);
+      return (1);
    }

    filestats.st_size *= manual_copies;

    if ((fp = fopen(filename, "rb")) == NULL)
    {
-      httpAddrFreeList(addrlist);
-      close(fd);
-
      perror("ERROR: unable to open print file for reading");
-      return (CUPS_BACKEND_FAILED);
+      return (1);
    }

   /*
@@ -853,58 +699,44 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */

    if (lpd_command(fd, timeout, "\002%s\n",
                    printer))		/* Receive print job(s) */
-    {
-      httpAddrFreeList(addrlist);
-      close(fd);
-      return (CUPS_BACKEND_FAILED);
-    }
+      return (1);

-    httpGetHostname(NULL, localhost, sizeof(localhost));
+    gethostname(localhost, sizeof(localhost));
+    localhost[31] = '\0'; /* RFC 1179, Section 7.2 - host name < 32 chars */

-    snprintf(control, sizeof(control),
-             "H%.31s\n"		/* RFC 1179, Section 7.2 - host name <= 31 chars */
-	     "P%.31s\n"		/* RFC 1179, Section 7.2 - user name <= 31 chars */
-	     "J%.99s\n",	/* RFC 1179, Section 7.2 - job name <= 99 chars */
-	     localhost, user, title);
+    snprintf(control, sizeof(control), "H%s\nP%s\nJ%s\n", localhost, user,
+             title);
    cptr = control + strlen(control);

    if (banner)
    {
-      snprintf(cptr, sizeof(control) - (cptr - control),
-               "C%.31s\n"	/* RFC 1179, Section 7.2 - class name <= 31 chars */
-	       "L%s\n",
+      snprintf(cptr, sizeof(control) - (cptr - control), "C%s\nL%s\n",
               localhost, user);
      cptr   += strlen(cptr);
    }

    while (copies > 0)
    {
-      snprintf(cptr, sizeof(control) - (cptr - control), "%cdfA%03d%.15s\n",
-               format, (int)getpid() % 1000, localhost);
+      snprintf(cptr, sizeof(control) - (cptr - control), "%cdfA%03d%.15s\n", format,
+               getpid() % 1000, localhost);
      cptr   += strlen(cptr);
      copies --;
    }

    snprintf(cptr, sizeof(control) - (cptr - control),
-             "UdfA%03d%.15s\n"
-	     "N%.131s\n",	/* RFC 1179, Section 7.2 - sourcefile name <= 131 chars */
-             (int)getpid() % 1000, localhost, title);
+             "UdfA%03d%.15s\nN%s\n",
+             getpid() % 1000, localhost, title);

    fprintf(stderr, "DEBUG: Control file is:\n%s", control);

    if (order == ORDER_CONTROL_DATA)
    {
      if (lpd_command(fd, timeout, "\002%d cfA%03.3d%.15s\n", strlen(control),
-                      (int)getpid() % 1000, localhost))
-      {
-        httpAddrFreeList(addrlist);
-	close(fd);
+                      getpid() % 1000, localhost))
+        return (1);

-        return (CUPS_BACKEND_FAILED);
-      }
-
-      fprintf(stderr, "INFO: Sending control file (%u bytes)\n",
-              (unsigned)strlen(control));
+      fprintf(stderr, "INFO: Sending control file (%lu bytes)\n",
+              (unsigned long)strlen(control));

      if (lpd_write(fd, control, strlen(control) + 1) < (strlen(control) + 1))
      {
@@ -940,18 +772,13 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */
      * Send the print file...
      */

-      if (lpd_command(fd, timeout, "\003" CUPS_LLFMT " dfA%03.3d%.15s\n",
-                      CUPS_LLCAST filestats.st_size, (int)getpid() % 1000,
+      if (lpd_command(fd, timeout, "\003%u dfA%03.3d%.15s\n",
+                      (unsigned)filestats.st_size, getpid() % 1000,
 		      localhost))
-      {
-        httpAddrFreeList(addrlist);
-	close(fd);
+        return (1);

-        return (CUPS_BACKEND_FAILED);
-      }
-
-      fprintf(stderr, "INFO: Sending data file (" CUPS_LLFMT " bytes)\n",
-              CUPS_LLCAST filestats.st_size);
+      fprintf(stderr, "INFO: Sending data file (%u bytes)\n",
+              (unsigned)filestats.st_size);

      tbytes = 0;
      for (copy = 0; copy < manual_copies; copy ++)
@@ -960,8 +787,8 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */

 	while ((nbytes = fread(buffer, 1, sizeof(buffer), fp)) > 0)
 	{
-	  fprintf(stderr, "INFO: Spooling LPR job, %.0f%% complete...\n",
-        	  100.0 * tbytes / filestats.st_size);
+	  fprintf(stderr, "INFO: Spooling LPR job, %u%% complete...\n",
+        	  (unsigned)(100.0f * tbytes / filestats.st_size));

 	  if (lpd_write(fd, buffer, nbytes) < nbytes)
 	  {
@@ -1011,13 +838,8 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */
    if (status == 0 && order == ORDER_DATA_CONTROL)
    {
      if (lpd_command(fd, timeout, "\002%d cfA%03.3d%.15s\n", strlen(control),
-                      (int)getpid() % 1000, localhost))
-      {
-        httpAddrFreeList(addrlist);
-	close(fd);
-
-        return (CUPS_BACKEND_FAILED);
-      }
+                      getpid() % 1000, localhost))
+        return (1);

      fprintf(stderr, "INFO: Sending control file (%lu bytes)\n",
              (unsigned long)strlen(control));
@@ -1056,11 +878,7 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */
    fclose(fp);

    if (status == 0)
-    {
-      httpAddrFreeList(addrlist);
-
-      return (CUPS_BACKEND_OK);
-    }
+      return (0);

   /*
    * Waiting for a retry...
@@ -1068,14 +886,6 @@ lpd_queue(const char *hostname,		/* I - Host to connect to */

    sleep(30);
  }
-
-  httpAddrFreeList(addrlist);
-
- /*
-  * If we get here, then the job has been cancelled...
-  */
-
-  return (CUPS_BACKEND_FAILED);
 }


@@ -1107,9 +917,6 @@ lpd_write(int  lpd_fd,			/* I - LPD socket */
 	total;				/* Total number of bytes written */


-  if (abort_job)
-    return (-1);
-
  total = 0;
  while ((bytes = send(lpd_fd, buffer, length - total, 0)) >= 0)
  {
@@ -1127,24 +934,23 @@ lpd_write(int  lpd_fd,			/* I - LPD socket */
 }


-#ifndef HAVE_RRESVPORT_AF
+#ifndef HAVE_RRESVPORT
 /*
- * 'rresvport_af()' - A simple implementation of rresvport_af().
+ * 'rresvport()' - A simple implementation of rresvport().
 */

-static int				/* O  - Socket or -1 on error */
-rresvport_af(int *port,			/* IO - Port number to bind to */
-             int family)		/* I  - Address family */
+int					/* O  - Socket or -1 on error */
+rresvport(int *port)			/* IO - Port number to bind to */
 {
-  http_addr_t	addr;			/* Socket address */
-  int		fd;			/* Socket file descriptor */
+  struct sockaddr_in	addr;		/* Socket address */
+  int			fd;		/* Socket file descriptor */


 /*
  * Try to create an IPv4 socket...
  */

-  if ((fd = socket(family, SOCK_STREAM, 0)) < 0)
+  if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
    return (-1);

 /*
@@ -1152,24 +958,24 @@ rresvport_af(int *port,			/* IO - Port number to bind to */
  */

  memset(&addr, 0, sizeof(addr));
-  addr.addr.sa_family = family;
+
+  addr.sin_family      = AF_INET;
+  addr.sin_addr.s_addr = INADDR_ANY;

 /*
-  * Try to bind the socket to a reserved port...
+  * Try to bind the socket to a reserved port; unlike the standard
+  * BSD rresvport(), we limit the port number to 721 through 732
+  * (instead of 512 to 1023) since RFC 1179 defines the local port
+  * number between 721 and 732...
  */

-  while (*port > 511)
+  while (*port > 720)
  {
   /*
    * Set the port number...
    */

-#  ifdef AF_INET6
-    if (family == AF_INET6)
-      addr.ipv6.sin6_port = htons(*port);
-    else
-#  endif /* AF_INET6 */
-    addr.ipv4.sin_port = htons(*port);
+    addr.sin_port = htons(*port);

   /*
    * Try binding the port to the socket; return if all is OK...
@@ -1213,7 +1019,7 @@ rresvport_af(int *port,			/* IO - Port number to bind to */

  return (-1);
 }
-#endif /* !HAVE_RRESVPORT_AF */
+#endif /* !HAVE_RRESVPORT */


 /*
@@ -1225,7 +1031,14 @@ sigterm_handler(int sig)		/* I - Signal */
 {
  (void)sig;	/* remove compiler warnings... */

-  abort_job = 1;
+ /*
+  * Remove the temporary file if necessary...
+  */
+
+  if (tmpfilename[0])
+    unlink(tmpfilename);
+
+  exit(1);
 }


@@ -3,7 +3,7 @@
 *
 *   Parallel port backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2004 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
@@ -15,7 +15,7 @@
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
 *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
+ *       Hollywood, Maryland 20636-3142 USA
 *
 *       Voice: (301) 373-9600
 *       EMail: cups-info@cups.org
@@ -33,20 +33,12 @@
 * Include necessary headers.
 */

-#include <cups/backend.h>
 #include <cups/cups.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <cups/string.h>
 #include <signal.h>
-#include "ieee1284.c"
-
-#ifdef __hpux
-#  include <sys/time.h>
-#else
-#  include <sys/select.h>
-#endif /* __hpux */

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

 #ifdef __sgi
@@ -84,35 +75,28 @@ 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		rbytes;			/* Number of bytes read */
-  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 */
-  fd_set	input,			/* Input set for select() */
-		output;			/* Output set for select() */
-  int		paperout;		/* Paper out? */
+  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 */
 #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 int	status;			/* Port status (off-line, out-of-paper, etc.) */
-#endif /* __linux */


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

 /*
@@ -169,7 +153,7 @@ 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 (CUPS_BACKEND_FAILED);
+      return (1);
    }

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

-  httpSeparateURI(HTTP_URI_CODING_ALL, cupsBackendDeviceURI(argv),
-                  method, sizeof(method), username, sizeof(username),
-		  hostname, sizeof(hostname), &port,
-		  resource, sizeof(resource));
+  httpSeparate(argv[0], method, username, hostname, &port, resource);

 /*
  * See if there are any options...
@@ -202,33 +183,10 @@ 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 (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.
-	*/
-
-        fputs("INFO: Unable to open parallel port, queuing on next printer in class...\n",
-	      stderr);
-
-       /*
-        * 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);
@@ -243,14 +201,12 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
      {
 	fprintf(stderr, "ERROR: Unable to open parallel port device file \"%s\": %s\n",
 	        resource, strerror(errno));
-	return (CUPS_BACKEND_FAILED);
+	return (1);
      }
    }
  }
  while (fd < 0);

-  fputs("STATE: -connecting-to-device\n", stderr);
-
 /*
  * Set any options provided...
  */
@@ -263,40 +219,6 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */

  tcsetattr(fd, TCSANOW, &opts);

- /*
-  * Check printer status...
-  */
-
-  paperout = 0;
-
-#if defined(__linux) && defined(LP_POUTPA)
- /*
-  * Show the printer status before we send the file...
-  */
-
-  while (!ioctl(fd, LPGETSTATUS, &status))
-  {
-    fprintf(stderr, "DEBUG: LPGETSTATUS returned a port status of %02X...\n", status);
-
-    if (status & LP_POUTPA)
-    {
-      fputs("WARNING: Media tray empty!\n", stderr);
-      fputs("STATUS: +media-tray-empty-error\n", stderr);
-
-      paperout = 1;
-    }
-
-    if (!(status & LP_PERRORP))
-      fputs("WARNING: Printer fault!\n", stderr);
-    else if (!(status & LP_PSELECD))
-      fputs("WARNING: Printer off-line.\n", stderr);
-    else
-      break;
-
-    sleep(5);
-  }
-#endif /* __linux && LP_POUTPA */
-
 /*
  * 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
@@ -347,77 +269,18 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */

      while (nbytes > 0)
      {
-       /*
-        * See if we are ready to read or write...
-	*/
+	if ((wbytes = write(fd, bufptr, nbytes)) < 0)
+	  if (errno == ENOTTY)
+	    wbytes = write(fd, bufptr, nbytes);

-        do
+	if (wbytes < 0)
 	{
-          FD_ZERO(&input);
-	  FD_SET(fd, &input);
-	  FD_ZERO(&output);
-	  FD_SET(fd, &output);
-        }
-	while (select(fd + 1, &input, &output, NULL, NULL) < 0);
-
-        if (FD_ISSET(fd, &input))
-	{
-	 /*
-	  * Read backchannel data...
-	  */
-
-	  if ((rbytes = read(fd, resource, sizeof(resource))) > 0)
-	  {
-	    fprintf(stderr, "DEBUG: Received %d bytes of back-channel data!\n",
-	            rbytes);
-            cupsBackChannelWrite(resource, rbytes, 1.0);
-          }
+	  perror("ERROR: Unable to send print file to printer");
+	  break;
 	}

-        if (FD_ISSET(fd, &output))
-	{
-	 /*
-	  * Write print data...
-	  */
-
-	  if ((wbytes = write(fd, bufptr, nbytes)) < 0)
-	    if (errno == ENOTTY)
-	      wbytes = write(fd, bufptr, nbytes);
-
-	  if (wbytes < 0)
-	  {
-	   /*
-	    * Check for retryable errors...
-	    */
-
-            if (errno == ENOSPC)
-	    {
-	      paperout = 1;
-	      fputs("ERROR: Out of paper!\n", stderr);
-	      fputs("STATUS: +media-tray-empty-error\n", stderr);
-	    }
-	    else if (errno != EAGAIN && errno != EINTR)
-	    {
-	      perror("ERROR: Unable to send print file to printer");
-	      break;
-	    }
-	  }
-	  else
-	  {
-	   /*
-	    * Update count and pointer...
-	    */
-
-            if (paperout)
-	    {
-	      fputs("STATUS: -media-tray-empty-error\n", stderr);
-	      paperout = 0;
-	    }
-
-	    nbytes -= wbytes;
-	    bufptr += wbytes;
-	  }
-	}
+	nbytes -= wbytes;
+	bufptr += wbytes;
      }

      if (wbytes < 0)
@@ -437,7 +300,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  if (fp != 0)
    close(fp);

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


@@ -457,43 +320,120 @@ list_devices(void)
  int	i;			/* Looping var */
  int	fd;			/* File descriptor */
  char	device[255],		/* Device filename */
-	basedevice[255],	/* Base device filename for ports */
-	device_id[1024],	/* Device ID string */
-	make_model[1024];	/* Make and model */
+	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 */


-  if (!access("/dev/parallel/", 0))
-    strcpy(basedevice, "/dev/parallel/");
-  else if (!access("/dev/printers/", 0))
-    strcpy(basedevice, "/dev/printers/");
-  else
-    strcpy(basedevice, "/dev/lp");
-
  for (i = 0; i < 4; i ++)
  {
   /*
-    * Open the port, if available...
+    * First open the device to make sure the driver module is loaded...
    */

-    sprintf(device, "%s%d", basedevice, i);
-    if ((fd = open(device, O_RDWR | O_EXCL)) < 0)
-      fd = open(device, O_WRONLY);
+    if ((fd = open("/dev/parallel/0", O_WRONLY)) >= 0)
+    {
+      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");
+	}
+      }
+    }

-    if (fd >= 0)
+   /*
+    * Then try looking at the probe file...
+    */
+
+    sprintf(probefile, "/proc/parport/%d/autoprobe", i);
+    if ((probe = fopen(probefile, "r")) == NULL)
    {
     /*
-      * Now grab the IEEE 1284 device ID string...
+      * Linux 2.4 kernel has different path...
      */

-      if (!get_device_id(fd, device_id, sizeof(device_id),
-                         make_model, sizeof(make_model),
-			 NULL, NULL, 0))
-	printf("direct parallel:%s \"%s\" \"%s LPT #%d\" \"%s\"\n", device,
-	       make_model, make_model, i + 1, device_id);
-      else
-	printf("direct parallel:%s \"Unknown\" \"LPT #%d\"\n", device, i + 1);
+      sprintf(probefile, "/proc/sys/dev/parport/parport%d/autoprobe", i);
+      probe = fopen(probefile, "r");
+    }

-      close(fd);
+    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)
@@ -693,7 +633,7 @@ list_devices(void)
      printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
    }
  }
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
  int	i;			/* Looping var */
  int	fd;			/* File descriptor */
  char	device[255];		/* Device filename */
@@ -3,7 +3,7 @@
 *
 *   IRIX SCSI printer support for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2003-2005 by Easy Software Products, all rights reserved.
+ *   Copyright 2003-2004 by Easy Software Products, all rights reserved.
 *
 *   Redistribution and use in source and binary forms, with or
 *   without modification, are permitted provided that the
@@ -96,45 +96,22 @@ 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 (CUPS_BACKEND_STOP);
+    return (1);
  }

 /*
  * 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.
-	*/
-
-        fputs("INFO: Unable to open SCSI device, queuing on next printer in class...\n",
-	      stderr);
-
-       /*
-        * 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 (CUPS_BACKEND_FAILED);
+	return (1);
      }
      else
      {
@@ -146,8 +123,6 @@ print_device(const char *resource,	/* I - SCSI device */
  }
  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
@@ -213,7 +188,7 @@ print_device(const char *resource,	/* I - SCSI device */
 	fprintf(stderr, "ERROR: Unable to send print data (%d)\n",
 	        scsi_req.ds_status);
        close(scsi_fd);
-	return (CUPS_BACKEND_FAILED);
+	return (1);
      }
    }

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

  close(fd);

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


@@ -3,7 +3,7 @@
 *
 *   Linux SCSI printer support for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2003-2005 by Easy Software Products, all rights reserved.
+ *   Copyright 2003-2004 by Easy Software Products, all rights reserved.
 *
 *   Redistribution and use in source and binary forms, with or
 *   without modification, are permitted provided that the
@@ -95,7 +95,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 */
-  unsigned char	scsi_cmd[6],		/* SCSI command data */
+  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 */
@@ -109,45 +109,22 @@ 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 (CUPS_BACKEND_STOP);
+    return (1);
  }

 /*
  * 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.
-	*/
-
-        fputs("INFO: Unable to open SCSI device, queuing on next printer in class...\n",
-	      stderr);
-
-       /*
-        * 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 (CUPS_BACKEND_FAILED);
+	return (1);
      }
      else
      {
@@ -159,8 +136,6 @@ print_device(const char *resource,	/* I - SCSI device */
  }
  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
@@ -230,7 +205,7 @@ print_device(const char *resource,	/* I - SCSI device */
 	fprintf(stderr, "ERROR: Unable to send print data (%d)\n",
 	        scsi_req.status);
        close(scsi_fd);
-	return (CUPS_BACKEND_FAILED);
+	return (1);
      }
    }

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

  close(fd);

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

@@ -3,7 +3,7 @@
 *
 *   SCSI printer backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 2003-2006 by Easy Software Products, all rights reserved.
+ *   Copyright 2003-2004 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,7 +53,6 @@
 * Include necessary headers.
 */

-#include <cups/backend.h>
 #include <cups/cups.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -89,7 +88,7 @@ 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 (CUPS_BACKEND_FAILED); }
+int	print_device(const char *resource, int fd, int copies) { return (1); }
 #endif /* __linux */


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

 /*
@@ -173,7 +172,7 @@ 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 (CUPS_BACKEND_FAILED);
+      return (1);
    }

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

-  httpSeparateURI(HTTP_URI_CODING_ALL, cupsBackendDeviceURI(argv),
-                  method, sizeof(method), username, sizeof(username),
-		  hostname, sizeof(hostname), &port,
-		  resource, sizeof(resource));
+  httpSeparate(argv[0], method, username, hostname, &port, resource);

 /*
  * See if there are any options...
@@ -3,7 +3,7 @@
 *
 *   Serial port backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2004 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
@@ -15,7 +15,7 @@
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
 *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
+ *       Hollywood, Maryland 20636-3142 USA
 *
 *       Voice: (301) 373-9600
 *       EMail: cups-info@cups.org
@@ -33,7 +33,6 @@
 * Include necessary headers.
 */

-#include <cups/backend.h>
 #include <cups/cups.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -51,11 +50,6 @@
 #  include <unistd.h>
 #  include <fcntl.h>
 #  include <termios.h>
-#  ifdef __hpux
-#    include <sys/time.h>
-#  else
-#    include <sys/select.h>
-#  endif /* __hpux */
 #  ifdef HAVE_SYS_IOCTL_H
 #    include <sys/ioctl.h>
 #  endif /* HAVE_SYS_IOCTL_H */
@@ -87,11 +81,6 @@
 #  include <IOKit/IOBSD.h>
 #endif /* __APPLE__ */

-#if defined(__linux) && defined(TIOCGSERIAL)
-#  include <linux/serial.h>
-#  include <linux/ioctl.h>
-#endif /* __linux && TIOCGSERIAL */
-

 /*
 * Local functions...
@@ -108,36 +97,33 @@ 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 */
-		name[255],		/* Name of option */
-		value[255],		/* Value of option */
-		*ptr;			/* Pointer into name or value */
-  int		port;			/* Port number (not used) */
-  int		fp;			/* Print file */
-  int		copies;			/* Number of copies to print */
-  int		fd;			/* Parallel device */
-  int		rbytes;			/* Number of bytes read */
-  int		wbytes;			/* Number of bytes written */
-  size_t	nbytes,			/* Number of bytes read */
-		tbytes;			/* Total number of bytes written */
-  int		dtrdsr;			/* Do dtr/dsr flow control? */
-  int		bufsize;		/* Size of output buffer for writes */
-  char		buffer[8192],		/* Output buffer */
-		*bufptr;		/* Pointer into buffer */
-  struct termios opts;			/* Serial port options */
-  struct termios origopts;		/* Original port options */
-  fd_set	input,			/* Input set for select() */
-		output;			/* Output set for select() */
+  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 */
+		name[255],	/* Name of option */
+		value[255],	/* Value of option */
+		*ptr;		/* Pointer into name or value */
+  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 */
+  int		dtrdsr;		/* Do dtr/dsr flow control? */
+  int		bufsize;	/* Size of output buffer for writes */
+  char		buffer[8192],	/* Output buffer */
+		*bufptr;	/* Pointer into buffer */
+  struct termios opts;		/* Serial port options */
+  struct termios origopts;	/* Original 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 */


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

 /*
@@ -195,7 +181,7 @@ 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 (CUPS_BACKEND_FAILED);
+      return (1);
    }

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

-  httpSeparateURI(HTTP_URI_CODING_ALL, cupsBackendDeviceURI(argv),
-                  method, sizeof(method), username, sizeof(username),
-		  hostname, sizeof(hostname), &port,
-		  resource, sizeof(resource));
+  httpSeparate(argv[0], method, username, hostname, &port, resource);

 /*
  * See if there are any options...
@@ -228,33 +211,10 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  * Open the serial port device...
  */

-  fputs("STATE: +connecting-to-device\n", stderr);
-
  do
  {
    if ((fd = open(resource, O_WRONLY | O_NOCTTY | O_EXCL | O_NDELAY)) == -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.
-	*/
-
-        fputs("INFO: Unable to open serial port, queuing on next printer in class...\n",
-	      stderr);
-
-       /*
-        * Sleep 5 seconds to keep the job from requeuing too rapidly...
-	*/
-
-	sleep(5);
-
-        return (CUPS_BACKEND_FAILED);
-      }
-
      if (errno == EBUSY)
      {
        fputs("INFO: Serial port busy; will retry in 30 seconds...\n", stderr);
@@ -264,14 +224,12 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
      {
 	fprintf(stderr, "ERROR: Unable to open serial port device file \"%s\": %s\n",
 	        resource, strerror(errno));
-	return (CUPS_BACKEND_FAILED);
+	return (1);
      }
    }
  }
  while (fd < 0);

-  fputs("STATE: -connecting-to-device\n", stderr);
-
 /*
  * Set any options provided...
  */
@@ -305,7 +263,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */

        options ++;

-	for (ptr = value; *options && *options != '+' && *options != '&';)
+	for (ptr = value; *options && *options != '+';)
          if (ptr < (value + sizeof(value) - 1))
            *ptr++ = *options++;
 	*ptr = '\0';
@@ -320,7 +278,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
      * Process the option...
      */

-      if (!strcasecmp(name, "baud"))
+      if (strcasecmp(name, "baud") == 0)
      {
       /*
        * Set the baud rate...
@@ -382,7 +340,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 	}
 #endif /* B19200 == 19200 */
      }
-      else if (!strcasecmp(name, "bits"))
+      else if (strcasecmp(name, "bits") == 0)
      {
       /*
        * Set number of data bits...
@@ -403,70 +361,48 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 	      break;
 	}
      }
-      else if (!strcasecmp(name, "parity"))
+      else if (strcasecmp(name, "parity") == 0)
      {
       /*
 	* Set parity checking...
 	*/

-	if (!strcasecmp(value, "even"))
+	if (strcasecmp(value, "even") == 0)
 	{
 	  opts.c_cflag |= PARENB;
          opts.c_cflag &= ~PARODD;
 	}
-	else if (!strcasecmp(value, "odd"))
+	else if (strcasecmp(value, "odd") == 0)
 	{
 	  opts.c_cflag |= PARENB;
          opts.c_cflag |= PARODD;
 	}
-	else if (!strcasecmp(value, "none"))
+	else if (strcasecmp(value, "none") == 0)
 	  opts.c_cflag &= ~PARENB;
-	else if (!strcasecmp(value, "space"))
-	{
-	 /*
-	  * Note: we only support space parity with 7 bits per character...
-	  */
-
-	  opts.c_cflag &= ~CSIZE;
-          opts.c_cflag |= CS8;
-	  opts.c_cflag &= ~PARENB;
-        }
-	else if (!strcasecmp(value, "mark"))
-	{
-	 /*
-	  * Note: we only support mark parity with 7 bits per character
-	  * and 1 stop bit...
-	  */
-
-	  opts.c_cflag &= ~CSIZE;
-          opts.c_cflag |= CS7;
-	  opts.c_cflag &= ~PARENB;
-          opts.c_cflag |= CSTOPB;
-        }
      }
-      else if (!strcasecmp(name, "flow"))
+      else if (strcasecmp(name, "flow") == 0)
      {
       /*
 	* Set flow control...
 	*/

-	if (!strcasecmp(value, "none"))
+	if (strcasecmp(value, "none") == 0)
 	{
 	  opts.c_iflag &= ~(IXON | IXOFF);
          opts.c_cflag &= ~CRTSCTS;
 	}
-	else if (!strcasecmp(value, "soft"))
+	else if (strcasecmp(value, "soft") == 0)
 	{
 	  opts.c_iflag |= IXON | IXOFF;
          opts.c_cflag &= ~CRTSCTS;
 	}
-	else if (!strcasecmp(value, "hard") ||
-	         !strcasecmp(value, "rtscts"))
+	else if (strcasecmp(value, "hard") == 0 ||
+	         strcasecmp(value, "rtscts") == 0)
        {
 	  opts.c_iflag &= ~(IXON | IXOFF);
          opts.c_cflag |= CRTSCTS;
 	}
-	else if (!strcasecmp(value, "dtrdsr"))
+	else if (strcasecmp(value, "dtrdsr") == 0)
 	{
 	  opts.c_iflag &= ~(IXON | IXOFF);
          opts.c_cflag &= ~CRTSCTS;
@@ -474,19 +410,6 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 	  dtrdsr = 1;
 	}
      }
-      else if (!strcasecmp(name, "stop"))
-      {
-        switch (atoi(value))
-	{
-	  case 1 :
-	      opts.c_cflag &= ~CSTOPB;
-	      break;
-
-	  case 2 :
-	      opts.c_cflag |= CSTOPB;
-	      break;
-	}
-      }
    }

  tcsetattr(fd, TCSANOW, &opts);
@@ -575,65 +498,18 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */

      while (nbytes > 0)
      {
-       /*
-        * See if we are ready to read or write...
-	*/
+	if ((wbytes = write(fd, bufptr, nbytes)) < 0)
+	  if (errno == ENOTTY)
+	    wbytes = write(fd, bufptr, nbytes);

-        do
+	if (wbytes < 0)
 	{
-          FD_ZERO(&input);
-	  FD_SET(fd, &input);
-	  FD_ZERO(&output);
-	  FD_SET(fd, &output);
-        }
-	while (select(fd + 1, &input, &output, NULL, NULL) < 0);
-
-        if (FD_ISSET(fd, &input))
-	{
-	 /*
-	  * Read backchannel data...
-	  */
-
-	  if ((rbytes = read(fd, resource, sizeof(resource))) > 0)
-	  {
-	    fprintf(stderr, "DEBUG: Received %d bytes of back-channel data!\n",
-	            rbytes);
-            cupsBackChannelWrite(resource, rbytes, 1.0);
-          }
+	  perror("ERROR: Unable to send print file to printer");
+	  break;
 	}

-        if (FD_ISSET(fd, &output))
-	{
-	 /*
-	  * Write print data...
-	  */
-
-	  if ((wbytes = write(fd, bufptr, nbytes)) < 0)
-	    if (errno == ENOTTY)
-	      wbytes = write(fd, bufptr, nbytes);
-
-	  if (wbytes < 0)
-	  {
-	   /*
-	    * Check for retryable errors...
-	    */
-
-	    if (errno != EAGAIN && errno != EINTR)
-	    {
-	      perror("ERROR: Unable to send print file to printer");
-	      break;
-	    }
-	  }
-	  else
-	  {
-	   /*
-	    * Update count and pointer...
-	    */
-
-	    nbytes -= wbytes;
-	    bufptr += wbytes;
-	  }
-	}
+	nbytes -= wbytes;
+	bufptr += wbytes;
      }

      if (wbytes < 0)
@@ -655,7 +531,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  if (fp != 0)
    close(fp);

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


@@ -666,50 +542,23 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 void
 list_devices(void)
 {
-#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__)
  static char	*funky_hex = "0123456789abcdefghijklmnopqrstuvwxyz";
-					/* Funky hex numbering used for some *
-					 * devices                           */
+				/* Funky hex numbering used for some devices */
 #endif /* __hpux || __sgi || __sun || __FreeBSD__ || __OpenBSD__ */

-#ifdef __linux
-  int			i, j;		/* Looping vars */
-  int			fd;		/* File descriptor */
-  char			device[255];	/* Device filename */
-#  ifdef TIOCGSERIAL
-  struct serial_struct	serinfo;	/* serial port info */
-#  endif /* TIOCGSERIAL */
+#if defined(__linux) || defined(linux) || defined(__linux__)
+  int	i;		/* Looping var */
+  int	fd;		/* File descriptor */
+  char	device[255];	/* Device filename */


  for (i = 0; i < 100; i ++)
  {
    sprintf(device, "/dev/ttyS%d", i);
-
    if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
    {
-#  ifdef TIOCGSERIAL
-     /*
-      * See if this port exists...
-      */
-
-      serinfo.reserved_char[0] = 0;
-
-      if (!ioctl(fd, TIOCGSERIAL, &serinfo))
-      {
-	if (serinfo.type == PORT_UNKNOWN)
-	{
-	 /*
-	  * Nope...
-	  */
-
-	  close(fd);
-	  continue;
-	}
-      }
-#  endif /* TIOCGSERIAL */
-
      close(fd);
-
 #  if defined(_ARCH_PPC) || defined(powerpc) || defined(__powerpc)
      printf("serial serial:%s?baud=230400 \"Unknown\" \"Serial Port #%d\"\n",
             device, i + 1);
@@ -730,21 +579,6 @@ list_devices(void)
             device, i + 1);
    }
  }
-
-  for (i = 0; i < 64; i ++)
-  {
-    for (j = 0; j < 8; j ++)
-    {
-      sprintf(device, "/dev/ttyQ%02de%d", i, j);
-      if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
-      {
-        close(fd);
-        printf("serial serial:%s?baud=115200 \"Unknown\" "
-	       "\"Equinox ESP %d Port #%d\"\n",
-               device, i, j + 1);
-      }
-    }
-  }
 #elif defined(__sgi)
  int		i, j, n;	/* Looping vars */
  char		device[255];	/* Device filename */
@@ -856,13 +690,13 @@ list_devices(void)
  {
    sprintf(device, "/dev/cua/%c", 'a' + i);
    if (access(device, 0) == 0)
-#  ifdef B115200
+#ifdef B115200
      printf("serial serial:%s?baud=115200 \"Unknown\" \"Serial Port #%d\"\n",
             device, i + 1);
-#  else
+#else
      printf("serial serial:%s?baud=38400 \"Unknown\" \"Serial Port #%d\"\n",
             device, i + 1);
-#  endif /* B115200 */
+#endif /* B115200 */
  }

 /*
@@ -958,7 +792,7 @@ list_devices(void)
      printf("serial serial:%s?baud=38400 \"Unknown\" \"Serial Port #%d\"\n",
             device, i + 1);
  }
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#elif defined(__FreeBSD__) || defined(__OpenBSD__)
  int	i, j;		/* Looping vars */
  int	fd;		/* File descriptor */
  char	device[255];	/* Device filename */
@@ -993,14 +827,6 @@ list_devices(void)
 	printf("serial serial:%s?baud=115200 \"Unknown\" \"Cyclades #%d Serial Port #%d\"\n",
               device, i, j + 1);
      }
-
-      sprintf(device, "/dev/ttyC%d%c", i, funky_hex[j]);
-      if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
-      {
-	close(fd);
-	printf("serial serial:%s?baud=115200 \"Unknown\" \"Cyclades #%d Serial Port #%d\"\n",
-               device, i, j + 1);
-      }
    }

 /*
@@ -1095,6 +921,7 @@ list_devices(void)
  CFMutableDictionaryRef	classesToMatch;
  io_object_t			serialService;

+  printf("serial serial \"Unknown\" \"Serial Printer (serial)\"\n");

  kernResult = IOMasterPort(MACH_PORT_NULL, &masterPort);
  if (KERN_SUCCESS != kernResult)
@@ -1148,8 +975,8 @@ list_devices(void)
 	      CFRelease(bsdPathAsCFString);

 	      if (result)
-		printf("serial serial:%s?baud=115200 \"Unknown\" \"%s\"\n",
-		       bsdPath, serialName);
+		printf("serial serial:%s?baud=115200 \"Unknown\" \"%s\"\n", bsdPath,
+		       serialName);
 	    }
 	  }
 	}
@@ -1157,11 +984,7 @@ list_devices(void)
 	IOObjectRelease(serialService);
      }

-     /*
-      * Release the iterator.
-      */
-
-      IOObjectRelease(serialPortIterator);
+      IOObjectRelease(serialPortIterator);    /* Release the iterator. */
    }
  }
 #endif
@@ -1,172 +0,0 @@
-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,7 +3,7 @@
 *
 *   AppSocket backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2004 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
@@ -15,7 +15,7 @@
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
 *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
+ *       Hollywood, Maryland 20636-3142 USA
 *
 *       Voice: (301) 373-9600
 *       EMail: cups-info@cups.org
@@ -32,12 +32,11 @@
 * Include necessary headers.
 */

-#include <cups/backend.h>
-#include <cups/http-private.h>
 #include <cups/cups.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <cups/http-private.h>
 #include <cups/string.h>
 #include <errno.h>
 #include <sys/types.h>
@@ -56,6 +55,13 @@
 #endif /* WIN32 */


+/*
+ * Local functions...
+ */
+
+void	print_backchannel(const unsigned char *buffer, int nbytes);
+
+
 /*
 * 'main()' - Send a file to the printer or server.
 *
@@ -64,38 +70,31 @@
 *    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) */
-		*options,		/* Pointer to options */
-		name[255],		/* Name of option */
-		value[255],		/* Value of option */
-		*ptr;			/* Pointer into name or value */
-  int		fp;			/* Print file */
-  int		copies;			/* Number of copies to print */
-  int		waiteof;		/* Wait for end-of-file? */
-  int		port;			/* Port number */
-  char		portname[255];		/* Port name */
-  int		delay;			/* Delay for retries... */
-  int		fd;			/* AppSocket */
-  int		error;			/* Error code (if any) */
-  http_addrlist_t *addrlist;		/* Address list */
-  int		rbytes;			/* Number of bytes read */
-  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() */
-		output;			/* Output set for select() */
+  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() */
 #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,13 +125,13 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  if (argc == 1)
  {
    puts("network socket \"Unknown\" \"AppSocket/HP JetDirect\"");
-    return (CUPS_BACKEND_OK);
+    return (0);
  }
  else if (argc < 6 || argc > 7)
  {
    fprintf(stderr, "Usage: %s job-id user title copies options [file]\n",
            argv[0]);
-    return (CUPS_BACKEND_FAILED);
+    return (1);
  }

 /*
@@ -154,7 +153,7 @@ 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 (CUPS_BACKEND_FAILED);
+      return (1);
    }

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

-  httpSeparateURI(HTTP_URI_CODING_ALL, cupsBackendDeviceURI(argv),
-                  method, sizeof(method), username, sizeof(username),
-		  hostname, sizeof(hostname), &port,
-		  resource, sizeof(resource));
+  httpSeparate(argv[0], method, username, hostname, &port, resource);

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

- /*
-  * Get options, if any...
-  */
-
-  waiteof = 1;
-
-  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...
-      */
-
-      for (ptr = name; *options && *options != '=';)
-        if (ptr < (name + sizeof(name) - 1))
-          *ptr++ = *options++;
-      *ptr = '\0';
-
-      if (*options == '=')
-      {
-       /*
-        * Get the value...
-	*/
-
-        options ++;
-
-	for (ptr = value; *options && *options != '+' && *options != '&';)
-          if (ptr < (value + sizeof(value) - 1))
-            *ptr++ = *options++;
-	*ptr = '\0';
-
-	if (*options == '+' || *options == '&')
-	  options ++;
-      }
-      else
-        value[0] = '\0';
-
-     /*
-      * 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");
-      }
-    }
-  }
-
 /*
  * Then try to connect to the remote host...
  */

-  sprintf(portname, "%d", port);
-
-  if ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, portname)) == NULL)
+  if ((hostaddr = httpGetHostByName(hostname)) == NULL)
  {
-    fprintf(stderr, "ERROR: Unable to locate printer \'%s\'!\n", hostname);
-    return (CUPS_BACKEND_STOP);
+    fprintf(stderr, "ERROR: Unable to locate printer \'%s\' - %s\n",
+            hostname, hstrerror(h_errno));
+    return (1);
  }

  fprintf(stderr, "INFO: Attempting to connect to host %s on port %d\n",
          hostname, port);

+  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);
+
  wbytes = 0;

  while (copies > 0)
  {
-    fputs("STATE: +connecting-to-device\n", stderr);
-
    for (delay = 5;;)
    {
-      if (!httpAddrConnect(addrlist, &fd))
+      if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
+      {
+	perror("ERROR: Unable to create socket");
+	return (1);
+      }
+
+      if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0)
      {
 	error = errno;
-	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.
-	  */
-
-          fprintf(stderr, "INFO: Unable to connect to \"%s\", queuing on next printer in class...\n",
-		  hostname);
-
-	 /*
-          * Sleep 5 seconds to keep the job from requeuing too rapidly...
-	  */
-
-	  sleep(5);
-
-          return (CUPS_BACKEND_FAILED);
-	}
+	close(fd);
+	fd = -1;

 	if (error == ECONNREFUSED || error == EHOSTDOWN ||
            error == EHOSTUNREACH)
@@ -306,8 +225,6 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 	break;
    }

-    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
@@ -356,116 +273,88 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */

      while (nbytes > 0)
      {
-       /*
-        * See if we are ready to read or write...
-	*/
-
-        do
+	if ((wbytes = send(fd, bufptr, nbytes, 0)) < 0)
 	{
-          FD_ZERO(&input);
-	  FD_SET(fd, &input);
-	  FD_ZERO(&output);
-	  FD_SET(fd, &output);
-        }
-	while (select(fd + 1, &input, &output, NULL, NULL) < 0);
-
-        if (FD_ISSET(fd, &input))
-	{
-	 /*
-	  * Read backchannel data...
-	  */
-
-	  if ((rbytes = recv(fd, resource, sizeof(resource), 0)) > 0)
-	  {
-	    fprintf(stderr, "DEBUG: Received %d bytes of back-channel data!\n",
-	            rbytes);
-            cupsBackChannelWrite(resource, rbytes, 1.0);
-          }
+	  perror("ERROR: Unable to send print file to printer");
+	  break;
 	}

-        if (FD_ISSET(fd, &output))
-	{
-	 /*
-	  * Write print data...
-	  */
-
-	  if ((wbytes = send(fd, bufptr, nbytes, 0)) < 0)
-	  {
-	   /*
-	    * Check for retryable errors...
-	    */
-
-	    if (errno != EAGAIN && errno != EINTR)
-	    {
-	      perror("ERROR: Unable to send print file to printer");
-	      break;
-	    }
-	  }
-	  else
-	  {
-	   /*
-	    * Update count and pointer...
-	    */
-
-	    nbytes -= wbytes;
-	    bufptr += wbytes;
-	  }
-        }
+	nbytes -= wbytes;
+	bufptr += wbytes;
      }

      if (wbytes < 0)
        break;

-      if (argc > 6)
+     /*
+      * 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)
+      {
+       /*
+	* 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 if (argc > 6)
 	fprintf(stderr, "INFO: Sending print file, %lu bytes...\n",
 	        (unsigned long)tbytes);
    }

-    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);
+
+    shutdown(fd, 1);
+
+    for (;;)
    {
     /*
-      * Shutdown the socket and wait for the other end to finish...
+      * Wait a maximum of 90 seconds for backchannel data or a closed
+      * connection...
      */

-      fputs("INFO: Print file sent, waiting for printer to finish...\n", stderr);
+      timeout.tv_sec  = 90;
+      timeout.tv_usec = 0;

-      shutdown(fd, 1);
+      FD_ZERO(&input);
+      FD_SET(fd, &input);

-      for (;;)
+#ifdef __hpux
+      if (select(fd + 1, (int *)&input, NULL, NULL, &timeout) > 0)
+#else
+      if (select(fd + 1, &input, NULL, NULL, &timeout) > 0)
+#endif /* __hpux */
      {
       /*
-	* Wait a maximum of 90 seconds for backchannel data or a closed
-	* connection...
+	* Grab the data coming back and spit it out to stderr...
 	*/

-	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 */
+	if ((nbytes = recv(fd, buffer, sizeof(buffer), 0)) > 0)
 	{
-	 /*
-	  * Grab the data coming back and spit it out to stderr...
-	  */
-
-	  if ((rbytes = recv(fd, resource, sizeof(resource), 0)) > 0)
-	  {
-	    fprintf(stderr, "DEBUG: Received %d bytes of back-channel data!\n",
-		    rbytes);
-	    cupsBackChannelWrite(resource, rbytes, 1.0);
-	  }
-	  else
-	    break;
-	}
+	  fprintf(stderr, "INFO: Received %d bytes of back-channel data!\n",
+	          nbytes);
+          print_backchannel((unsigned char *)buffer, nbytes);
+        }
 	else
 	  break;
      }
+      else
+        break;
    }

   /*
@@ -475,8 +364,6 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
    close(fd);
  }

-  httpAddrFreeList(addrlist);
-
 /*
  * Close the input file and return...
  */
@@ -484,10 +371,45 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  if (fp != 0)
    close(fp);

-  if (wbytes >= 0)
-    fputs("INFO: Ready to print.\n", stderr);
+  return (wbytes < 0);
+}

-  return (wbytes < 0 ? CUPS_BACKEND_FAILED : CUPS_BACKEND_OK);
+
+/*
+ * 'print_backchannel()' - Print the contents of a back-channel buffer.
+ */
+
+void
+print_backchannel(const unsigned char *buffer,	/* I - Data buffer */
+                  int                 nbytes)	/* I - Number of bytes */
+{
+  char	line[255],				/* Formatted line */
+	*lineptr;				/* Pointer into line */
+
+
+  for (lineptr = line; nbytes > 0; buffer ++, nbytes --)
+  {
+    if (*buffer < 0x20 || *buffer >= 0x7f)
+    {
+      snprintf(lineptr, sizeof(line) - (lineptr - line), "<%02X>", *buffer);
+      lineptr += strlen(lineptr);
+    }
+    else
+      *lineptr++ = *buffer;
+
+    if ((lineptr - line) > 72)
+    {
+      *lineptr = '\0';
+      fprintf(stderr, "DEBUG: DATA: %s\n", line);
+      lineptr = line;
+    }
+  }
+
+  if (lineptr > line)
+  {
+    *lineptr = '\0';
+    fprintf(stderr, "DEBUG: DATA: %s\n", line);
+  }
 }


@@ -1,95 +0,0 @@
-/*
- * "$Id$"
- *
- *   IEEE-1284 support functions test program for the Common UNIX Printing
- *   System (CUPS).
- *
- *   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" 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 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- */
-
-/*
- * 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 */
-#define DEBUG
-#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]);
-
-    get_device_id(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$".
- */
@@ -5,7 +5,7 @@
 *
 *   This file is included from "usb.c" when compiled on UNIX/Linux.
 *
- *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2004 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
@@ -17,7 +17,7 @@
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
 *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
+ *       Hollywood, Maryland 20636-3142 USA
 *
 *       Voice: (301) 373-9600
 *       EMail: cups-info@cups.org
@@ -35,14 +35,34 @@
 * Include necessary headers.
 */

-#include "ieee1284.c"
-#include <sys/select.h>
+#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/ioccom.h>
+#    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);
 int	open_device(const char *uri);


@@ -56,22 +76,15 @@ print_device(const char *uri,		/* I - Device URI */
             const char *resource,	/* I - Resource/modelname */
 	     const char *options,	/* I - Device options/serial number */
 	     int        fp,		/* 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        copies)		/* I - Copies to print */
 {
  int		fd;			/* USB device */
-  int		rbytes;			/* Number of bytes read */
  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 */
-		backbuf[1024];		/* Backchannel buffer */
+		*bufptr;		/* Pointer into buffer */
  struct termios opts;			/* Parallel port options */
-  fd_set	input,			/* Input set for select() */
-		output;			/* Output set for select() */
-  int		paperout;		/* Paper out? */
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
  struct sigaction action;		/* Actions for POSIX signals */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
@@ -79,46 +92,21 @@ print_device(const char *uri,		/* I - Device URI */
  unsigned int	status;			/* Port status (off-line, out-of-paper, etc.) */
 #endif /* __linux */

-  (void)argc;
-  (void)argv;

 /*
  * Open the USB port device...
  */

-  fputs("STATE: +connecting-to-device\n", stderr);
-
  do
  {
    if ((fd = open_device(uri)) == -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.
-	*/
-
-        fputs("INFO: Unable to open USB device, queuing on next printer in class...\n",
-	      stderr);
-
-       /*
-        * Sleep 5 seconds to keep the job from requeuing too rapidly...
-	*/
-
-	sleep(5);
-
-        return (CUPS_BACKEND_FAILED);
-      }
-
      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 || errno == ENODEV)
+      else if (errno == ENXIO || errno == EIO || errno == ENOENT)
      {
        fputs("INFO: Printer not connected; will retry in 30 seconds...\n", stderr);
 	sleep(30);
@@ -127,14 +115,12 @@ print_device(const char *uri,		/* I - Device URI */
      {
 	fprintf(stderr, "ERROR: Unable to open USB device \"%s\": %s\n",
 	        uri, strerror(errno));
-	return (CUPS_BACKEND_FAILED);
+	return (1);
      }
    }
  }
  while (fd < 0);

-  fputs("STATE: -connecting-to-device\n", stderr);
-
 /*
  * Set any options provided...
  */
@@ -147,40 +133,6 @@ print_device(const char *uri,		/* I - Device URI */

  tcsetattr(fd, TCSANOW, &opts);

- /*
-  * Check printer status...
-  */
-
-  paperout = 0;
-
-#if defined(__linux) && defined(LP_POUTPA)
- /*
-  * Show the printer status before we send the file...
-  */
-
-  while (!ioctl(fd, LPGETSTATUS, &status))
-  {
-    fprintf(stderr, "DEBUG: LPGETSTATUS returned a port status of %02X...\n", status);
-
-    if (status & LP_POUTPA)
-    {
-      fputs("WARNING: Media tray empty!\n", stderr);
-      fputs("STATUS: +media-tray-empty-error\n", stderr);
-
-      paperout = 1;
-    }
-
-    if (!(status & LP_PERRORP))
-      fputs("WARNING: Printer fault!\n", stderr);
-    else if (!(status & LP_PSELECD))
-      fputs("WARNING: Printer off-line.\n", stderr);
-    else
-      break;
-
-    sleep(5);
-  }
-#endif /* __linux && LP_POUTPA */
-
 /*
  * 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
@@ -188,7 +140,7 @@ print_device(const char *uri,		/* I - Device URI */
  * stdin (otherwise you can't cancel raw jobs...)
  */

-  if (!fp)
+  if (fp)
  {
 #ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
    sigset(SIGTERM, SIG_IGN);
@@ -203,6 +155,31 @@ print_device(const char *uri,		/* I - Device URI */
 #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...
  */
@@ -231,77 +208,19 @@ print_device(const char *uri,		/* I - Device URI */

      while (nbytes > 0)
      {
-       /*
-        * See if we are ready to read or write...
-	*/

-        do
+	if ((wbytes = write(fd, bufptr, nbytes)) < 0)
+	  if (errno == ENOTTY)
+	    wbytes = write(fd, bufptr, nbytes);
+
+	if (wbytes < 0)
 	{
-          FD_ZERO(&input);
-	  FD_SET(fd, &input);
-	  FD_ZERO(&output);
-	  FD_SET(fd, &output);
-        }
-	while (select(fd + 1, &input, &output, NULL, NULL) < 0);
-
-        if (FD_ISSET(fd, &input))
-	{
-	 /*
-	  * Read backchannel data...
-	  */
-
-	  if ((rbytes = read(fd, backbuf, sizeof(backbuf))) > 0)
-	  {
-	    fprintf(stderr, "DEBUG: Received %d bytes of back-channel data!\n",
-	            rbytes);
-            cupsBackChannelWrite(backbuf, rbytes, 1.0);
-          }
+	  perror("ERROR: Unable to send print file to printer");
+	  break;
 	}

-        if (FD_ISSET(fd, &output))
-	{
-	 /*
-	  * Write print data...
-	  */
-
-	  if ((wbytes = write(fd, bufptr, nbytes)) < 0)
-	    if (errno == ENOTTY)
-	      wbytes = write(fd, bufptr, nbytes);
-
-	  if (wbytes < 0)
-	  {
-	   /*
-	    * Check for retryable errors...
-	    */
-
-	    if (errno == ENOSPC)
-	    {
-	      paperout = 1;
-	      fputs("ERROR: Out of paper!\n", stderr);
-	      fputs("STATUS: +media-tray-empty-error\n", stderr);
-	    }
-	    else if (errno != EAGAIN && errno != EINTR)
-	    {
-	      perror("ERROR: Unable to send print file to printer");
-	      break;
-	    }
-	  }
-	  else
-	  {
-	   /*
-	    * Update count and pointer...
-	    */
-
-            if (paperout)
-	    {
-	      fputs("STATUS: -media-tray-empty-error\n", stderr);
-	      paperout = 0;
-	    }
-
-	    nbytes -= wbytes;
-	    bufptr += wbytes;
-	  }
-	}
+	nbytes -= wbytes;
+	bufptr += wbytes;
      }

      if (wbytes < 0)
@@ -319,7 +238,169 @@ print_device(const char *uri,		/* I - Device URI */

  close(fd);

-  return (wbytes < 0 ? CUPS_BACKEND_FAILED : CUPS_BACKEND_OK);
+  return (wbytes < 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;
+  else if ((attr = strstr(device_id, ";SN:")) != NULL)
+    attr += 4;
+
+  if (mfg)
+  {
+   /*
+    * Make sure manufacturer is truncated at delimiter...
+    */
+
+    if ((delim = strchr(mfg, ';')) != NULL)
+      *delim = '\0';
+  }
+
+  if (mdl)
+  {
+   /*
+    * Make sure model is truncated at delimiter...
+    */
+
+    if ((delim = strchr(mdl, ';')) != NULL)
+      *delim = '\0';
+  }
+
+  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);
+  }
 }


@@ -332,6 +413,7 @@ 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 */
@@ -344,9 +426,9 @@ list_devices(void)
  * First figure out which USB printer filename to use...
  */

-  if (!access("/dev/usblp0", 0))
+  if (access("/dev/usblp0", 0) == 0)
    strcpy(format, "/dev/usblp%d");
-  else if (!access("/dev/usb/usblp0", 0))
+  else if (access("/dev/usb/usblp0", 0) == 0)
    strcpy(format, "/dev/usb/usblp%d");
  else
    strcpy(format, "/dev/usb/lp%d");
@@ -361,23 +443,57 @@ list_devices(void)

    if ((fd = open(device, O_RDWR | O_EXCL)) >= 0)
    {
-      if (!get_device_id(fd, device_id, sizeof(device_id),
-                         make_model, sizeof(make_model),
-			 "usb", device_uri, sizeof(device_uri)))
-	printf("direct %s \"%s\" \"%s USB #%d\" \"%s\"\n", device_uri,
-	       make_model, make_model, i + 1, device_id);
+      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) && defined(ECPPIOC_GETDEVID)
+#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 */


 /*
@@ -388,20 +504,47 @@ list_devices(void)
  {
    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)
    {
-      if (!get_device_id(fd, device_id, sizeof(device_id),
-                         make_model, sizeof(make_model),
-			 "usb", device_uri, sizeof(device_uri)))
-	printf("direct %s \"%s\" \"%s USB #%d\" \"%s\"\n", device_uri,
-	       make_model, make_model, i + 1, device_id);
+      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__) || defined(__DragonFly__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
  int   i;                      /* Looping var */
  char  device[255];            /* Device filename */

@@ -433,10 +576,10 @@ open_device(const char *uri)		/* I - Device URI */
  * number and/or make/model.
  */

-  if (!strncmp(uri, "usb:/dev/", 9))
+  if (strncmp(uri, "usb:/dev/", 9) == 0)
+    return (open(uri + 4, O_RDWR | O_EXCL));
 #ifdef __linux
-    return (-1); /* Do not allow direct devices anymore */
-  else if (!strncmp(uri, "usb://", 6))
+  else if (strncmp(uri, "usb://", 6) == 0)
  {
   /*
    * For Linux, try looking up the device serial number or model...
@@ -444,6 +587,7 @@ open_device(const char *uri)		/* I - Device URI */

    int		i;			/* Looping var */
    int		busy;			/* Are any ports busy? */
+    int		length;			/* Length of device ID info */
    int		fd;			/* File descriptor */
    char	format[255],		/* Format for device filename */
 		device[255],		/* Device filename */
@@ -456,9 +600,9 @@ open_device(const char *uri)		/* I - Device URI */
    * First figure out which USB printer filename to use...
    */

-    if (!access("/dev/usblp0", 0))
+    if (access("/dev/usblp0", 0) == 0)
      strcpy(format, "/dev/usblp%d");
-    else if (!access("/dev/usb/usblp0", 0))
+    else if (access("/dev/usb/usblp0", 0) == 0)
      strcpy(format, "/dev/usb/usblp%d");
    else
      strcpy(format, "/dev/usb/lp%d");
@@ -475,9 +619,15 @@ open_device(const char *uri)		/* I - Device URI */

 	if ((fd = open(device, O_RDWR | O_EXCL)) >= 0)
 	{
-	  get_device_id(fd, device_id, sizeof(device_id),
-                        make_model, sizeof(make_model),
-			"usb", device_uri, sizeof(device_uri));
+	  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
 	{
@@ -489,18 +639,28 @@ open_device(const char *uri)		/* I - Device URI */
 	  if (errno == EBUSY)
 	    busy = 1;

-	  device_uri[0] = '\0';
+	  device_id[0] = '\0';
        }

-        if (!strcmp(uri, device_uri))
+	if (device_id[0])
 	{
 	 /*
-	  * Yes, return this file descriptor...
+          * Got the device ID - is this the one?
 	  */

-	  fprintf(stderr, "DEBUG: Printer using device file \"%s\"...\n", device);
+	  decode_device_id(i, device_id, make_model, sizeof(make_model),
+                	   device_uri, sizeof(device_uri));

-	  return (fd);
+          if (strcmp(uri, device_uri) == 0)
+	  {
+	   /*
+	    * Yes, return this file descriptor...
+	    */
+
+	    fprintf(stderr, "DEBUG: Printer using device file \"%s\"...\n", device);
+
+	    return (fd);
+	  }
 	}

       /*
@@ -534,8 +694,7 @@ open_device(const char *uri)		/* I - Device URI */
    return (-1);
  }
 #elif defined(__sun) && defined(ECPPIOC_GETDEVID)
-    return (-1); /* Do not allow direct devices anymore */
-  else if (!strncmp(uri, "usb://", 6))
+  else if (strncmp(uri, "usb://", 6) == 0)
  {
   /*
    * For Solaris, try looking up the device serial number or model...
@@ -548,6 +707,7 @@ open_device(const char *uri)		/* I - Device URI */
 		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 */


   /*
@@ -561,9 +721,22 @@ open_device(const char *uri)		/* I - Device URI */
 	sprintf(device, "/dev/usb/printer%d", i);

 	if ((fd = open(device, O_RDWR | O_EXCL)) >= 0)
-	  get_device_id(fd, device_id, sizeof(device_id),
-                        make_model, sizeof(make_model),
-			"usb", device_uri, sizeof(device_uri));
+	{
+	  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
 	{
 	 /*
@@ -574,11 +747,21 @@ open_device(const char *uri)		/* I - Device URI */
 	  if (errno == EBUSY)
 	    busy = 1;

-	  device_uri[0] = '\0';
+	  device_id[0] = '\0';
        }

-        if (!strcmp(uri, device_uri))
-	  return (fd);	/* Yes, return this file descriptor... */
+	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...
@@ -610,8 +793,6 @@ open_device(const char *uri)		/* I - Device URI */

    return (-1);
  }
-#else
-    return (open(uri + 4, O_RDWR | O_EXCL));
 #endif /* __linux */
  else
  {
@@ -3,7 +3,7 @@
 *
 *   USB port backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2004 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
@@ -15,7 +15,7 @@
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
 *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
+ *       Hollywood, Maryland 20636-3142 USA
 *
 *       Voice: (301) 373-9600
 *       EMail: cups-info@cups.org
@@ -39,7 +39,6 @@
 #  include <ApplicationServices/ApplicationServices.h>
 #endif /* __APPLE__ */

-#include <cups/backend.h>
 #include <cups/cups.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -63,7 +62,7 @@
 void	list_devices(void);
 int	print_device(const char *uri, const char *hostname,
 	             const char *resource, const char *options,
-		     int fp, int copies, int argc, char *argv[]);
+		     int fp, int copies);


 /*
@@ -72,7 +71,7 @@ int	print_device(const char *uri, const char *hostname,

 #ifdef __APPLE__
 #  include "usb-darwin.c"
-#elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 #  include "usb-unix.c"
 #else
 /*
@@ -109,9 +108,7 @@ print_device(const char *uri,		/* I - Device URI */
             const char *resource,	/* I - Resource/modelname */
 	     const char *options,	/* I - Device options/serial number */
 	     int        fp,		/* 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        copies)		/* I - Copies to print */
 {
 /*
  * Can't print, so just reference the arguments to eliminate compiler
@@ -126,10 +123,8 @@ print_device(const char *uri,		/* I - Device URI */
  (void)options;
  (void)fp;
  (void)copies;
-  (void)argc;
-  (void)argv;

-  return (CUPS_BACKEND_FAILED);
+  return (1);
 }
 #endif /* __APPLE__ */

@@ -188,29 +183,31 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  if (argc == 1)
  {
    list_devices();
-    return (CUPS_BACKEND_OK);
+    return (0);
  }
  else if (argc < 6 || argc > 7)
  {
    fputs("Usage: usb job-id user title copies options [file]\n", stderr);
-    return (CUPS_BACKEND_FAILED);
+    return (1);
  }

 /*
  * Extract the device name and options from the URI...
  */

-  uri = cupsBackendDeviceURI(argv);
+  if (strncmp(argv[0], "usb:", 4))
+    uri = getenv("DEVICE_URI");
+  else
+    uri = argv[0];

-  if (httpSeparateURI(HTTP_URI_CODING_ALL, uri,
-                      method, sizeof(method), username, sizeof(username),
-		      hostname, sizeof(hostname), &port,
-		      resource, sizeof(resource)) < HTTP_URI_OK)
+  if (!uri)
  {
    fputs("ERROR: No device URI found in argv[0] or in DEVICE_URI environment variable!\n", stderr);
    return (1);
  }

+  httpSeparate(argv[0], method, username, hostname, &port, resource);
+
 /*
  * See if there are any options...
  */
@@ -245,7 +242,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
    {
      fprintf(stderr, "ERROR: unable to open print file %s - %s\n",
              argv[6], strerror(errno));
-      return (CUPS_BACKEND_FAILED);
+      return (1);
    }

    copies = atoi(argv[4]);
@@ -255,7 +252,7 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
  * Finally, send the print file...
  */

-  status = print_device(uri, hostname, resource, options, fp, copies, argc, argv);
+  status = print_device(uri, hostname, resource, options, fp, copies);

 /*
  * Close the input file and return...
@@ -0,0 +1,4 @@
+lpc
+lpq
+lpr
+lprm
@@ -1,14 +1,12 @@
 # DO NOT DELETE

 lpc.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-lpc.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-lpc.o: ../cups/i18n.h ../cups/debug.h ../cups/string.h ../config.h
+lpc.o: ../cups/ppd.h ../cups/language.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/array.h
-lpq.o: ../cups/file.h ../cups/language.h ../cups/i18n.h ../cups/debug.h
+lpq.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/language.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 ../cups/array.h
-lpr.o: ../cups/file.h ../cups/language.h ../cups/i18n.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/array.h ../cups/file.h ../cups/language.h
-lprm.o: ../cups/i18n.h ../cups/string.h ../config.h
+lprm.o: ../cups/ppd.h ../cups/language.h ../cups/string.h ../config.h
@@ -3,7 +3,7 @@
 #
 #   Berkeley commands makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2004 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
@@ -15,7 +15,7 @@
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
 #       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
+#       Hollywood, Maryland 20636-3142 USA
 #
 #       Voice: (301) 373-9600
 #       EMail: cups-info@cups.org
@@ -56,27 +56,14 @@ depend:
 #

 install:	all
-	$(INSTALL_DIR) -m 755 $(BINDIR)
+	$(INSTALL_DIR) $(BINDIR)
 	$(INSTALL_BIN) lpq $(BINDIR)
 	$(INSTALL_BIN) lpr $(BINDIR)
 	$(INSTALL_BIN) lprm $(BINDIR)
-	$(INSTALL_DIR) -m 755 $(SBINDIR)
+	$(INSTALL_DIR) $(SBINDIR)
 	$(INSTALL_BIN) lpc $(SBINDIR)


-#
-# Uninstall all targets...
-#
-
-uninstall:
-	$(RM) $(BINDIR)/lpq
-	$(RM) $(BINDIR)/lpr
-	$(RM) $(BINDIR)/lprm
-	$(RM) $(SBINDIR)/lpc
-	-$(RMDIR) $(SBINDIR)
-	-$(RMDIR) $(BINDIR)
-
-
 #
 # lpc
 #
@@ -3,7 +3,7 @@
 *
 *   "lpc" command for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2006 by Easy Software Products.
+ *   Copyright 1997-2004 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -36,8 +36,9 @@

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

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

-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 *);
+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 *);


 /*
@@ -57,12 +58,12 @@ static void	show_status(http_t *, const 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 */


 /*
@@ -85,42 +86,22 @@ main(int  argc,				/* I - Number of command-line arguments */
    * Do the command prompt thing...
    */

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

-      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;
-      }
+      line[strlen(line) - 1] = '\0';

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

+      while (isspace(line[0] & 255))
+        cups_strcpy(line, line + 1);
+
      for (params = line; *params != '\0'; params ++)
        if (isspace(*params & 255))
 	  break;
@@ -136,8 +117,8 @@ main(int  argc,				/* I - Number of command-line arguments */
      * The "quit" and "exit" commands exit; otherwise, process as needed...
      */

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

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

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

@@ -167,12 +148,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(const char *s,		/* I - Command-line string */
-                const 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(char *s,	/* I - Command-line string */
+                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);
@@ -188,18 +169,17 @@ compare_strings(const char *s,		/* I - Command-line string */
 */

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


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

 static void
-show_help(const char *command)		/* I - Command to describe or NULL */
+show_help(char *command)	/* I - Command to describe or NULL */
 {
-  if (!command)
+  if (command == NULL)
  {
-    _cupsLangPrintf(stdout,
-                    _("Commands may be abbreviated.  Commands are:\n"
-		      "\n"
-		      "exit    help    quit    status  ?\n"));
+    puts("Commands may be abbreviated.  Commands are:");
+    puts("");
+    puts("exit    help    quit    status  ?");
  }
-  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 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
-    _cupsLangPrintf(stdout, _("?Invalid help command unknown\n"));
+    puts("?Invalid help command unknown");
 }


@@ -231,28 +211,28 @@ show_help(const char *command)		/* I - Command to describe or NULL */
 */

 static void
-show_status(http_t     *http,		/* I - HTTP connection to server */
-            const char *dests)		/* I - Destinations */
+show_status(http_t *http,	/* I - HTTP connection to server */
+            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 */
-                *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 */
+  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 */
+                *delimiter;     /* Char search result */
+  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 URI */
+  static const char *requested[] =
+		{		/* Requested attributes */
 		  "printer-name",
 		  "device-uri",
 		  "printer-state",
@@ -260,7 +240,7 @@ show_status(http_t     *http,		/* I - HTTP connection to server */
 		};


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

  if (http == NULL)
    return;
@@ -327,19 +307,19 @@ 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") &&
+        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") &&
+        if (strcmp(attr->name, "device-uri") == 0 &&
 	    attr->value_tag == IPP_TAG_URI)
 	  device = attr->values[0].string.text;

-        if (!strcmp(attr->name, "printer-state") &&
+        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") &&
+        if (strcmp(attr->name, "printer-is-accepting-jobs") == 0 &&
 	    attr->value_tag == IPP_TAG_BOOLEAN)
 	  accepting = attr->values[0].boolean;

@@ -358,13 +338,6 @@ 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...
      */
@@ -420,92 +393,83 @@ show_status(http_t     *http,		/* I - HTTP connection to server */
      if (match)
      {
       /*
-	* Build an IPP_GET_JOBS request, which requires the following
-	* attributes:
-	*
-	*    attributes-charset
-	*    attributes-natural-language
-	*    printer-uri
-	*    limit
+        * If the printer state is "IPP_PRINTER_PROCESSING", then grab the
+	* current job for the printer.
 	*/

-	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);
-
-        httpAssembleURIf(HTTP_URI_CODING_ALL, printer_uri, sizeof(printer_uri),
-	                 "ipp", NULL, "localhost", 631, "/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, "/")) != NULL)
+        if (pstate == IPP_PRINTER_PROCESSING)
 	{
 	 /*
-	  * Grab the number of jobs for the printer.
+	  * Build an IPP_GET_JOBS request, which requires the following
+	  * attributes:
+	  *
+	  *    attributes-charset
+	  *    attributes-natural-language
+	  *    printer-uri
+	  *    limit
 	  */

-	  for (jattr = jobs->attrs; jattr != NULL; jattr = jattr->next)
-	    if (jattr->name && !strcmp(jattr->name, "job-id"))
-	      jobcount ++;
+	  request = ippNew();

-          ippDelete(jobs);
-	}
+	  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, "/")) != 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))
-	  _cupsLangPrintf(stdout,
-	                  _("\tprinter is on device \'%s\' speed -1\n"),
-			  device + 5);
+	if (strncmp(device, "file:", 5) == 0)
+	  printf("\tprinter is on device \'%s\' speed -1\n", device + 5);
 	else
 	{
 	 /*
-	  * Just show the scheme...
+	  * Just show the method...
 	  */

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

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

      if (attr == NULL)
@@ -3,7 +3,7 @@
 *
 *   "lpq" command for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2006 by Easy Software Products.
+ *   Copyright 1997-2004 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -15,9 +15,9 @@
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
 *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
+ *       Hollywood, Maryland 20636-3111 USA
 *
- *       Voice: (301) 373-9600
+ *       Voice: (301) 373-9603
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
 *
@@ -41,7 +41,7 @@
 #include <stdlib.h>
 #include <cups/string.h>
 #include <cups/cups.h>
-#include <cups/i18n.h>
+#include <cups/language.h>
 #include <cups/debug.h>


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

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


@@ -61,39 +60,49 @@ 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 */
-		*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 */
-  cups_lang_t	*language;		/* Language */
+  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 */
+#ifdef HAVE_SSL
+  http_encryption_t encryption;	/* Encryption? */
+#endif /* HAVE_SSL */


+ /*
+  * Connect to the scheduler...
+  */

+  if ((http = httpConnectEncrypt(cupsServer(), ippPort(),
+                                 cupsEncryption())) == NULL)
+  {
+    fputs("lpq: Unable to contact server!\n", stderr);
+    return (1);
+  }

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

-  http       = NULL;
  dest       = NULL;
  user       = NULL;
  id         = 0;
  interval   = 0;
  longstatus = 0;
  all        = 0;
-  language   = cupsLangDefault();
-  num_dests  = 0;
+
+  num_dests = cupsGetDests(&dests);

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

 	    if (http)
-	      httpEncryption(http, HTTP_ENCRYPT_REQUIRED);
+	      httpEncryption(http, encryption);
 #else
-            _cupsLangPrintf(stderr,
-	                    _("%s: Sorry, no encryption support compiled in!\n"),
-	                    argv[0]);
+            fprintf(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;
@@ -155,21 +144,13 @@ 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)
-		_cupsLangPrintf(stderr,
-		                _("%s: Error - unknown destination \"%s/%s\"!\n"),
-		        	argv[0], dest, instance);
+		fprintf(stderr, "lpq: Unknown destination \"%s/%s\"!\n",
+		        dest, instance);
              else
-		_cupsLangPrintf(stderr,
-		                _("%s: Unknown destination \"%s\"!\n"),
-				argv[0], dest);
+		fprintf(stderr, "lpq: Unknown destination \"%s\"!\n", dest);

 	      return (1);
 	    }
@@ -179,32 +160,6 @@ main(int  argc,				/* I - Number of command-line arguments */
 	    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 */
 	    longstatus = 1;
 	    break;
@@ -222,13 +177,8 @@ main(int  argc,				/* I - Number of command-line arguments */
    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;
@@ -251,14 +201,10 @@ main(int  argc,				/* I - Number of command-line arguments */
 	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);
+	fprintf(stderr, "lp: error - %s environment variable names non-existent destination \"%s\"!\n",
+        	val, dest);
      else
-	_cupsLangPrintf(stderr,
-	                _("%s: error - no default destination available.\n"),
-			argv[0]);
+	fputs("lpq: error - no default destination available.\n", stderr);
      httpClose(http);
      cupsFreeDests(num_dests, dests);
      return (1);
@@ -272,9 +218,9 @@ main(int  argc,				/* I - Number of command-line arguments */
  for (;;)
  {
    if (dest)
-      show_printer(argv[0], http, dest);
+      show_printer(http, dest);

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

    if (i && interval)
    {
@@ -296,61 +242,37 @@ 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(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 */
+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 */
 {
-  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 */
+  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 */
 #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 *ranks[10] =/* Ranking strings */
 		{
 		  "th",
 		  "st",
@@ -380,7 +302,18 @@ show_jobs(const char *command,		/* I - Command name */
  *    job-uri or printer-uri
  */

-  request = ippNewRequest(id ? IPP_GET_JOB_ATTRIBUTES : IPP_GET_JOBS);
+  request = ippNew();
+
+  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)
  {
@@ -394,8 +327,7 @@ show_jobs(const char *command,		/* I - Command name */
  }
  else
  {
-    httpAssembleURIf(HTTP_URI_CODING_ALL, resource, sizeof(resource), "ipp",
-                     NULL, "localhost", 0, "/printers/%s", dest);
+    snprintf(resource, sizeof(resource), "ipp://localhost/printers/%s", dest);

    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                 NULL, resource);
@@ -418,7 +350,8 @@ show_jobs(const char *command,		/* I - Command name */
  {
    if (response->request.status.status_code > IPP_OK_CONFLICT)
    {
-      _cupsLangPrintf(stderr, "%s: %s\n", command, cupsLastErrorString());
+      fprintf(stderr, "lpq: get-jobs failed: %s\n",
+              ippErrorString(response->request.status.status_code));
      ippDelete(response);
      return (0);
    }
@@ -458,38 +391,38 @@ show_jobs(const char *command,		/* I - Command name */

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

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

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

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

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

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

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

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

@@ -510,13 +443,9 @@ show_jobs(const char *command,		/* I - Command name */

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

      jobcount ++;
@@ -544,7 +473,7 @@ show_jobs(const char *command,		/* I - Command name */

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

        if (jobcopies > 1)
 	  snprintf(namestr, sizeof(namestr), "%d copies of %s", jobcopies,
@@ -552,21 +481,16 @@ show_jobs(const char *command,		/* I - Command name */
 	else
 	  strlcpy(namestr, jobname, sizeof(namestr));

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

      if (attr == NULL)
@@ -577,12 +501,12 @@ show_jobs(const char *command,		/* I - Command name */
  }
  else
  {
-    _cupsLangPrintf(stderr, "%s: %s\n", command, cupsLastErrorString());
+    fprintf(stderr, "lpq: get-jobs failed: %s\n", ippErrorString(cupsLastError()));
    return (0);
  }

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

  return (jobcount);
 }
@@ -593,15 +517,16 @@ show_jobs(const char *command,		/* I - Command name */
 */

 static void
-show_printer(const char *command,	/* I - Command name */
-             http_t     *http,		/* I - HTTP connection to server */
-             const char *dest)		/* I - Destination */
+show_printer(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 */
-  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 */
+  cups_lang_t	*language;	/* Default language */
+  ipp_pstate_t	state;		/* Printer state */
+  char		uri[HTTP_MAX_URI];
+				/* Printer URI */


  if (http == NULL)
@@ -616,10 +541,20 @@ show_printer(const char *command,	/* I - Command name */
  *    printer-uri
  */

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

-  httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
-                   "localhost", 0, "/printers/%s", dest);
+  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);
  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
               "printer-uri", NULL, uri);

@@ -631,7 +566,8 @@ show_printer(const char *command,	/* I - Command name */
  {
    if (response->request.status.status_code > IPP_OK_CONFLICT)
    {
-      _cupsLangPrintf(stderr, "%s: %s\n", command, cupsLastErrorString());
+      fprintf(stderr, "lpq: get-printer-attributes failed: %s\n",
+              ippErrorString(response->request.status.status_code));
      ippDelete(response);
      return;
    }
@@ -644,21 +580,21 @@ show_printer(const char *command,	/* I - Command name */
    switch (state)
    {
      case IPP_PRINTER_IDLE :
-          _cupsLangPrintf(stdout, _("%s is ready\n"), dest);
+          printf("%s is ready\n", dest);
 	  break;
      case IPP_PRINTER_PROCESSING :
-          _cupsLangPrintf(stdout, _("%s is ready and printing\n"),
-	                  dest);
+          printf("%s is ready and printing\n", dest);
 	  break;
      case IPP_PRINTER_STOPPED :
-          _cupsLangPrintf(stdout, _("%s is not ready\n"), dest);
+          printf("%s is not ready\n", dest);
 	  break;
    }

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


@@ -669,9 +605,7 @@ show_printer(const char *command,	/* I - Command name */
 static void
 usage(void)
 {
-  _cupsLangPuts(stderr,
-                _("Usage: lpq [-P dest] [-U username] [-h hostname[:port]] "
-		  "[-l] [+interval]\n"));
+  fputs("Usage: lpq [-P dest] [-l] [+interval]\n", stderr);
  exit(1);
 }

@@ -3,7 +3,7 @@
 *
 *   "lpr" command for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2006 by Easy Software Products.
+ *   Copyright 1997-2004 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -15,9 +15,9 @@
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
 *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
+ *       Hollywood, Maryland 20636-3111 USA
 *
- *       Voice: (301) 373-9600
+ *       Voice: (301) 373-9603
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
 *
@@ -37,7 +37,7 @@

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

 #ifndef WIN32
 #  include <unistd.h>
@@ -64,33 +64,30 @@ 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 */
-		*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 */
-  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 */
-  ssize_t	bytes;			/* Bytes copied */
-  off_t		filesize;		/* Size of temp file */
-  int		temp;			/* Temporary file descriptor */
-  cups_lang_t	*language;		/* Language information */
+  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 */
+  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 */
+  struct sigaction action;	/* Signal action */
+  struct sigaction oldaction;	/* Old signal action */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */


@@ -102,7 +99,6 @@ main(int  argc,				/* I - Number of command-line arguments */
  options     = NULL;
  num_files   = 0;
  title       = NULL;
-  language    = cupsLangDefault();

  for (i = 1; i < argc; i ++)
    if (argv[i][0] == '-')
@@ -112,51 +108,11 @@ main(int  argc,				/* I - Number of command-line arguments */
 #ifdef HAVE_SSL
 	    cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);
 #else
-            _cupsLangPrintf(stderr,
-	                    _("%s: Sorry, no encryption support compiled in!\n"),
-	                    argv[0]);
+            fprintf(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 */
@@ -169,9 +125,7 @@ main(int  argc,				/* I - Number of command-line arguments */

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

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

@@ -213,28 +162,18 @@ main(int  argc,				/* I - Number of command-line arguments */
 	    break;

 	case 'p' : /* Prettyprint */
-            num_options = cupsAddOption("prettyprint", "", num_options,
-	                                &options);
+            num_options = cupsAddOption("prettyprint", "", 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 */
-	    {
-	      char	email[1024];	/* EMail address */
-
-
-	      snprintf(email, sizeof(email), "mailto:%s@%s", cupsUser(),
-	               httpGetHostname(NULL, buffer, sizeof(buffer)));
-	      num_options = cupsAddOption("notify-recipient", email,
-	                                  num_options, &options);
-	    }
+	    fputs("lpr: warning - email notification is not currently supported!\n", stderr);
 	    break;

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

@@ -273,8 +209,7 @@ main(int  argc,				/* I - Number of command-line arguments */
            if ((dest = cupsGetDest(printer, instance, num_dests, dests)) != 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);
@@ -289,10 +224,7 @@ main(int  argc,				/* I - Number of command-line arguments */
 	      i ++;
 	      if (i >= argc)
 	      {
-	        _cupsLangPrintf(stderr,
-		        	_("%s: Error - expected copy count after "
-			          "\'-#\' option!\n"),
-				argv[0]);
+	        fputs("lpr: error - expected copy count after -# option!\n", stderr);
 		return (1);
 	      }

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

@@ -323,10 +253,24 @@ 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: error - expected username after -U option!\n", stderr);
+		return (1);
+	      }
+
+	      cupsSetUser(argv[i]);
+	    }
+	    break;
+
 	default :
-	    _cupsLangPrintf(stderr,
-	                    _("%s: Error - unknown option \'%c\'!\n"),
-			    argv[0], argv[i][1]);
+	    fprintf(stderr, "lpr: error - unknown option \'%c\'!\n", argv[i][1]);
 	    return (1);
      }
    else if (num_files < 1000)
@@ -337,9 +281,8 @@ main(int  argc,				/* I - Number of command-line arguments */

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

@@ -355,9 +298,7 @@ main(int  argc,				/* I - Number of command-line arguments */
      }
    }
    else
-      _cupsLangPrintf(stderr,
-                      _("%s: Error - too many files - \"%s\"\n"),
-		      argv[0], argv[i]);
+      fprintf(stderr, "lpr: error - too many files - \"%s\"\n", argv[i]);
 /*
  * See if we have any files to print; if not, print from stdin...
  */
@@ -397,18 +338,12 @@ main(int  argc,				/* I - Number of command-line arguments */
      val = "LPDEST";

    if (printer && !cupsGetDest(printer, NULL, num_dests, dests))
-      _cupsLangPrintf(stderr,
-                      _("%s: Error - %s environment variable names "
-		        "non-existent destination \"%s\"!\n"),
-        	      argv[0], val, printer);
+      fprintf(stderr, "lpr: error - %s environment variable names non-existent destination \"%s\"!\n",
+              val, printer);
    else if (cupsLastError() == IPP_NOT_FOUND)
-      _cupsLangPrintf(stderr,
-                      _("%s: Error - no default destination available.\n"),
-		      argv[0]);
+      fputs("lpr: error - no default destination available.\n", stderr);
    else
-      _cupsLangPrintf(stderr,
-                      _("%s: Error - scheduler not responding!\n"),
-		      argv[0]);
+      fputs("lpr: error - scheduler not responding!\n", stderr);

    return (1);
  }
@@ -456,34 +391,20 @@ main(int  argc,				/* I - Number of command-line arguments */

    if ((temp = cupsTempFd(tempfile, sizeof(tempfile))) < 0)
    {
-      _cupsLangPrintf(stderr,
-                      _("%s: Error - unable to create temporary file "
-		        "\"%s\" - %s\n"),
-        	      argv[0], tempfile, strerror(errno));
+      fprintf(stderr, "lpr: error - unable to create temporary file \"%s\" - %s\n",
+              tempfile, strerror(errno));
      return (1);
    }

-    while ((bytes = read(0, buffer, sizeof(buffer))) > 0)
-      if (write(temp, buffer, bytes) < 0)
-      {
-	_cupsLangPrintf(stderr,
-	                _("%s: Error - unable to write to temporary file "
-			  "\"%s\" - %s\n"),
-        		argv[0], tempfile, strerror(errno));
-        close(temp);
-        unlink(tempfile);
-	return (1);
-      }
+    while ((i = read(0, buffer, sizeof(buffer))) > 0)
+      write(temp, buffer, i);

-    filesize = lseek(temp, 0, SEEK_CUR);
+    i = lseek(temp, 0, SEEK_CUR);
    close(temp);

-    if (filesize <= 0)
+    if (i == 0)
    {
-      _cupsLangPrintf(stderr,
-                      _("%s: Error - stdin is empty, so no job has been sent.\n"),
-		      argv[0]);
-      unlink(tempfile);
+      fputs("lpr: error - stdin is empty, so no job has been sent.\n", stderr);
      return (1);
    }

@@ -497,7 +418,8 @@ main(int  argc,				/* I - Number of command-line arguments */

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

@@ -511,7 +433,7 @@ main(int  argc,				/* I - Number of command-line arguments */
 */

 void
-sighandler(int s)			/* I - Signal number */
+sighandler(int s)	/* I - Signal number */
 {
 /*
  * Remove the temporary file we're using to print from stdin...
@@ -3,7 +3,7 @@
 *
 *   "lprm" command for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2006 by Easy Software Products.
+ *   Copyright 1997-2004 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -15,9 +15,9 @@
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
 *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
+ *       Hollywood, Maryland 20636-3111 USA
 *
- *       Voice: (301) 373-9600
+ *       Voice: (301) 373-9603
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
 *
@@ -34,7 +34,7 @@
 #include <stdlib.h>

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


@@ -71,8 +71,8 @@ main(int  argc,			/* I - Number of command-line arguments */
  response   = NULL;
  http       = NULL;
  encryption = cupsEncryption();
-  language   = cupsLangDefault();
-  num_dests  = cupsGetDests(&dests);
+
+  num_dests = cupsGetDests(&dests);

  for (i = 0; i < num_dests; i ++)
    if (dests[i].is_default)
@@ -84,7 +84,7 @@ main(int  argc,			/* I - Number of command-line arguments */

  if ((http = httpConnectEncrypt(cupsServer(), ippPort(), encryption)) == NULL)
  {
-    _cupsLangPuts(stderr, _("lprm: Unable to contact server!\n"));
+    fputs("lprm: Unable to contact server!\n", stderr);
    cupsFreeDests(num_dests, dests);
    return (1);
  }
@@ -103,9 +103,8 @@ main(int  argc,			/* I - Number of command-line arguments */

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

@@ -123,61 +122,15 @@ main(int  argc,			/* I - Number of command-line arguments */

 	    if (cupsGetDest(dest, NULL, num_dests, dests) == NULL)
 	    {
-	      _cupsLangPrintf(stderr,
-	                      _("%s: Error - unknown destination \"%s\"!\n"),
-			      argv[0], dest);
+	      fprintf(stderr, "lprm: Unknown destination \"%s\"!\n", dest);
              cupsFreeDests(num_dests, dests);
 	      httpClose(http);
 	      return(1);
 	    }
 	    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 (http != NULL)
-	      httpClose(http);
-
-	    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;
-
 	default :
-	    _cupsLangPrintf(stderr,
-	                    _("%s: Error - unknown option \'%c\'!\n"),
-			    argv[0], argv[i][1]);
+	    fprintf(stderr, "lprm: Unknown option \'%c\'!\n", argv[i][1]);
            cupsFreeDests(num_dests, dests);
 	    httpClose(http);
 	    return (1);
@@ -195,7 +148,7 @@ main(int  argc,			/* I - Number of command-line arguments */
 	op     = IPP_CANCEL_JOB;
        job_id = atoi(argv[i]);
      }
-      else if (!strcmp(argv[i], "-"))
+      else if (strcmp(argv[i], "-") == 0)
      {
       /*
        * Cancel all jobs
@@ -219,12 +172,22 @@ main(int  argc,			/* I - Number of command-line arguments */
      *    [requesting-user-name]
      */

-      request = ippNewRequest(op);
+      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)
      {
-        httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
-	                 "localhost", 0, "/printers/%s", dest);
+        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",
@@ -249,12 +212,38 @@ main(int  argc,			/* I - Number of command-line arguments */
      else
        response = cupsDoRequest(http, request, "/jobs/");

-      ippDelete(response);
-
-      if (cupsLastError() > IPP_OK_CONFLICT)
+      if (response != NULL)
      {
-        _cupsLangPrintf(stderr, "%s: %s\n", argv[0], cupsLastErrorString());
+        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);
@@ -269,7 +258,7 @@ main(int  argc,			/* I - Number of command-line arguments */
  if (response == NULL)
    if (!cupsCancelJob(dest, 0))
    {
-      _cupsLangPrintf(stderr, "%s: %s\n", argv[0], cupsLastErrorString());
+      fputs("lprm: Unable to cancel job(s)!\n", stderr);
      cupsFreeDests(num_dests, dests);
      httpClose(http);
      return (1);
@@ -0,0 +1,5 @@
+admin.cgi
+classes.cgi
+jobs.cgi
+libcgi.a
+printers.cgi
@@ -1,55 +1,20 @@
 # DO NOT DELETE

-help-index.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-help-index.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-help-index.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
-help-index.o: ../cups/i18n.h ../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/md5.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/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/md5.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/string.h ../config.h
-search.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-search.o: ../cups/md5.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/string.h ../config.h
-template.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-template.o: ../cups/md5.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/string.h ../config.h
-var.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-var.o: ../cups/md5.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/string.h ../config.h
-admin.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-admin.o: ../cups/md5.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/string.h ../config.h ../cups/file.h
-classes.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-classes.o: ../cups/md5.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/string.h ../config.h
-help.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-help.o: ../cups/md5.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/string.h ../config.h
-jobs.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-jobs.o: ../cups/md5.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/string.h ../config.h
-printers.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-printers.o: ../cups/md5.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/string.h ../config.h
-testcgi.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-testcgi.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-testcgi.o: ../cups/array.h help-index.h
-testhi.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-testhi.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-testhi.o: ../cups/array.h help-index.h
-testtemplate.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-testtemplate.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-testtemplate.o: ../cups/language.h ../cups/array.h help-index.h
+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
@@ -3,7 +3,7 @@
 #
 #   CGI makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2006 by Easy Software Products.
+#   Copyright 1997-2004 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -15,7 +15,7 @@
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
 #       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
+#       Hollywood, Maryland 20636-3142 USA
 #
 #       Voice: (301) 373-9600
 #       EMail: cups-info@cups.org
@@ -24,11 +24,10 @@

 include ../Makedefs

-CGIS	=	admin.cgi classes.cgi help.cgi jobs.cgi printers.cgi
-TARGETS	=	libcgi.a $(CGIS) testcgi testhi testtemplate
-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 printers.o testcgi.o testhi.o testtemplate.o
+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


 #
@@ -59,23 +58,12 @@ depend:
 #

 install:	all
-	$(INSTALL_DIR) -m 755 $(SERVERBIN)/cgi-bin
+	$(INSTALL_DIR) $(SERVERBIN)/cgi-bin
 	for file in $(CGIS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/cgi-bin; \
 	done


-#
-# Uninstall all targets...
-#
-
-uninstall:
-	for file in $(CGIS); do \
-		$(RM) $(SERVERBIN)/cgi-bin/$$file; \
-	done
-	-$(RMDIR) $(SERVERBIN)/cgi-bin
-
-
 #
 # libcgi.a
 #
@@ -105,15 +93,6 @@ classes.cgi:	classes.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
 	$(CC) $(LDFLAGS) -o $@ classes.o libcgi.a $(LIBS)


-#
-# help.cgi
-#
-
-help.cgi:	help.o ../Makedefs libcgi.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ help.o libcgi.a $(LIBS)
-
-
 #
 # jobs.cgi
 #
@@ -132,36 +111,6 @@ printers.cgi:	printers.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
 	$(CC) $(LDFLAGS) -o $@ printers.o libcgi.a $(LIBS)


-#
-# testcgi
-#
-
-testcgi:	testcgi.o ../Makedefs libcgi.a ../cups/libcups.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testcgi.o libcgi.a ../cups/libcups.a \
-		$(COMMONLIBS) $(SSLLIBS) $(LIBZ)
-
-
-#
-# testhi
-#
-
-testhi:	testhi.o ../Makedefs libcgi.a ../cups/libcups.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testhi.o libcgi.a ../cups/libcups.a \
-		$(COMMONLIBS) $(SSLLIBS) $(LIBZ)
-
-
-#
-# testtemplate
-#
-
-testtemplate:	testtemplate.o ../Makedefs libcgi.a ../cups/libcups.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testtemplate.o libcgi.a ../cups/libcups.a \
-		$(COMMONLIBS) $(SSLLIBS) $(LIBZ)
-
-
 #
 # Dependencies...
 #
@@ -3,106 +3,83 @@
 *
 *   CGI support library definitions.
 *
- *   Copyright 1997-2006 by Easy Software Products.
+ *   Copyright 1997-2004 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:
+ *   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.
 *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
+ *   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.
 *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   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.
 */

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

 #  include <stdio.h>
 #  include <stdlib.h>
 #  include <time.h>
-#  include <sys/stat.h>
+
+#  include <cups/string.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"
-
-
-/*
- * 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		*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 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 char		*cgiGetCookie(const char *name, char *buf, int buflen);
-extern const cgi_file_t	*cgiGetFile(void);
-extern cups_array_t	*cgiGetIPPObjects(ipp_t *response, void *search);
 extern int		cgiGetSize(const char *name);
-extern char		*cgiGetTemplateDir(void);
+extern void		cgiSetSize(const char *name, int size);
 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		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 const char	*cgiText(const char *message);

-#endif /* !_CUPS_CGI_H_ */
+#  define cgiGetUser()	getenv("REMOTE_USER")
+#  define cgiGetHost()	(getenv("REMOTE_HOST") == NULL ? getenv("REMOTE_ADDR") : getenv("REMOTE_HOST"))
+
+#endif /* !_CGI_H_ */

 /*
 * End of "$Id$".
@@ -3,7 +3,7 @@
 *
 *   Class status CGI for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2006 by Easy Software Products.
+ *   Copyright 1997-2004 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -15,32 +15,22 @@
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
 *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
+ *       Hollywood, Maryland 20636-3111 USA
 *
- *       Voice: (301) 373-9600
+ *       Voice: (301) 373-9603
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
 *
 * Contents:
 *
- *   main()             - Main entry for CGI.
- *   show_all_classes() - Show all classes...
- *   show_class()       - Show a single class.
+ *   main() - Main entry for CGI.
 */

 /*
 * Include necessary headers...
 */

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


 /*
@@ -51,14 +41,17 @@ int					/* O - Exit status */
 main(int  argc,				/* I - Number of command-line arguments */
     char *argv[])			/* I - Command-line arguments */
 {
-  const char	*pclass;		/* Class name */
-  const char	*user;			/* Username */
+  cups_lang_t	*language;		/* Language information */
+  char		*pclass;		/* Printer class name */
  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"
@@ -70,51 +63,59 @@ main(int  argc,				/* I - Number of command-line arguments */
  */

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

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

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

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

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

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

-  if (!op)
+  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)
  {
   /*
    * Get the default destination...
    */

-    request = ippNewRequest(CUPS_GET_DEFAULT);
+    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);

    ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                  "requested-attributes",
@@ -131,7 +132,7 @@ main(int  argc,				/* I - Number of command-line arguments */


        cgiSetVariable("DEFAULT_URI",
-	               cgiRewriteURL(attr->values[0].string.text,
+	               ippRewriteURL(attr->values[0].string.text,
 		                     url, sizeof(url), NULL));
      }

@@ -139,39 +140,198 @@ main(int  argc,				/* I - Number of command-line arguments */
    }

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

-    if (!pclass)
-      show_all_classes(http, user);
+    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)
+    {
+     /*
+      * Build a CUPS_GET_CLASSES request, which requires the following
+      * attributes:
+      *
+      *    attributes-charset
+      *    attributes-natural-language
+      */
+
+      request->request.op.operation_id = CUPS_GET_CLASSES;
+      request->request.op.request_id   = 1;
+    }
    else
-      show_class(http, pclass);
+    {
+     /*
+      * Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the following
+      * attributes:
+      *
+      *    attributes-charset
+      *    attributes-natural-language
+      *    printer-uri
+      */
+
+      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"));
+      }
+    }
  }
-  else if (!strcasecmp(op, "print-test-page") && pclass)
-    cgiPrintTestPage(http, pclass);
-  else if (!strcasecmp(op, "move-jobs") && pclass)
-    cgiMoveJobs(http, pclass, 0);
  else
  {
   /*
-    * Unknown/bad operation...
+    * Print a test page...
    */

-    if (pclass)
-      cgiStartHTML(pclass);
-    else
-      cgiStartHTML(cgiText(_("Classes")));
+    snprintf(uri, sizeof(uri), "ipp://localhost/classes/%s", pclass);

-    cgiCopyTemplateLang("error-op.tmpl");
-    cgiEndHTML();
+   /*
+    * 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"));
  }

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

  httpClose(http);
+  cupsLangFree(language);

 /*
  * Return with no errors...
@@ -181,287 +341,6 @@ main(int  argc,				/* I - Number of command-line arguments */
 }


-/*
- * 'show_all_classes()' - Show all classes...
- */
-
-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			url[1024],	/* URL for prev/next/this */
-			*urlptr,	/* Position in URL */
-			*urlend;	/* End of URL */
-
-
- /*
-  * 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);
-
-  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)
-      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(url, "%d", count);
-    cgiSetVariable("TOTAL", url);
-
-    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...
-    */
-
-    urlend = url + sizeof(url);
-
-    if ((var = cgiGetVariable("QUERY")) != NULL)
-    {
-      strlcpy(url, "/classes/?QUERY=", sizeof(url));
-      urlptr = url + strlen(url);
-
-      cgiFormEncode(urlptr, var, urlend - urlptr);
-      urlptr += strlen(urlptr);
-
-      strlcpy(urlptr, "&", urlend - urlptr);
-      urlptr += strlen(urlptr);
-    }
-    else
-    {
-      strlcpy(url, "/classes/?", sizeof(url));
-      urlptr = url + strlen(url);
-    }
-
-    snprintf(urlptr, urlend - urlptr, "FIRST=%d", first);
-    cgiSetVariable("THISURL", url);
-
-    if (first > 0)
-    {
-      snprintf(urlptr, urlend - urlptr, "FIRST=%d&ORDER=%s",
-	       first - CUPS_PAGE_MAX, ascending ? "asc" : "dec");
-      cgiSetVariable("PREVURL", url);
-    }
-
-    if ((first + CUPS_PAGE_MAX) < count)
-    {
-      snprintf(urlptr, urlend - urlptr, "FIRST=%d&ORDER=%s",
-	       first + CUPS_PAGE_MAX, ascending ? "asc" : "dec");
-      cgiSetVariable("NEXTURL", url);
-    }
-
-   /*
-    * Then show everything...
-    */
-
-    cgiCopyTemplateLang("search.tmpl");
-
-    cgiCopyTemplateLang("classes-header.tmpl");
-
-    if (count > 0)
-      cgiCopyTemplateLang("pager.tmpl");
-
-    cgiCopyTemplateLang("classes.tmpl");
-
-    if (count > 0)
-      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.
- */
-
-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, "classes.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;/classes/%s", uri);
-      cgiSetVariable("refresh_page", refresh);
-    }
-
-   /*
-    * Delete the response...
-    */
-
-    ippDelete(response);
-
-   /*
-    * Show the standard header...
-    */
-
-    cgiStartHTML(pclass);
-
-   /*
-    * Show the class status...
-    */
-
-    cgiCopyTemplateLang("classes.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$".
 */
@@ -1,983 +0,0 @@
-/*
- * "$Id$"
- *
- *   On-line help index routines for the Common UNIX Printing System (CUPS).
- *
- *   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 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- * Contents:
- *
- *   helpDeleteIndex()          - Delete an index, freeing all memory used.
- *   helpFindNode()             - Find a node in an index.
- *   helpLoadIndex()            - Load a help index from disk.
- *   helpSaveIndex()            - Save a help index to disk.
- *   helpSearchIndex()          - Search an index.
- *   help_compile_search()      - Convert a search string into a regular expression.
- *   help_delete_node()         - Free all memory used by a node.
- *   help_load_directory()      - Load a directory of files into an index.
- *   help_load_file()           - Load a HTML files into an index.
- *   help_new_node()            - Create a new node and add it to an index.
- *   help_sort_nodes_by_name()  - Sort nodes by section, filename, and anchor.
- *   help_sort_nodes_by_score() - Sort nodes by score and text.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "cgi-private.h"
-#include <cups/dir.h>
-
-
-/*
- * Local functions...
- */
-
-static void		help_delete_node(help_node_t *n);
-static int		help_load_directory(help_index_t *hi,
-			                    const char *directory,
-					    const char *relative);
-static int		help_load_file(help_index_t *hi,
-			               const char *filename,
-				       const char *relative,
-				       time_t     mtime);
-static help_node_t	*help_new_node(const char *filename, const char *anchor,
-			               const char *section, const char *text,
-				       time_t mtime, off_t offset,
-				       size_t length);
-static int		help_sort_by_name(help_node_t *p1, help_node_t *p2);
-static int		help_sort_by_score(help_node_t *p1, help_node_t *p2);
-
-
-/*
- * 'helpDeleteIndex()' - Delete an index, freeing all memory used.
- */
-
-void
-helpDeleteIndex(help_index_t *hi)	/* I - Help index */
-{
-  help_node_t	*node;			/* Current node */
-
-
-  DEBUG_printf(("helpDeleteIndex(hi=%p)\n", hi));
-
-  if (!hi)
-    return;
-
-  for (node = (help_node_t *)cupsArrayFirst(hi->nodes);
-       node;
-       node = (help_node_t *)cupsArrayNext(hi->nodes))
-  {
-    cupsArrayRemove(hi->nodes, node);
-    cupsArrayRemove(hi->sorted, node);
-
-    if (!hi->search)
-      help_delete_node(node);
-  }
-
-  cupsArrayDelete(hi->nodes);
-  cupsArrayDelete(hi->sorted);
-
-  free(hi);
-}
-
-
-/*
- * 'helpFindNode()' - Find a node in an index.
- */
-
-help_node_t *				/* O - Node pointer or NULL */
-helpFindNode(help_index_t *hi,		/* I - Index */
-             const char   *filename,	/* I - Filename */
-             const char   *anchor)	/* I - Anchor */
-{
-  help_node_t	key;			/* Search key */
-
-
-  DEBUG_printf(("helpFindNode(hi=%p, filename=\"%s\", anchor=\"%s\")\n",
-                hi, filename ? filename : "(nil)", anchor ? anchor : "(nil)"));
-
- /*
-  * Range check input...
-  */
-
-  if (!hi || !filename)
-    return (NULL);
-
- /*
-  * Initialize the search key...
-  */
-
-  key.filename = (char *)filename;
-  key.anchor   = (char *)anchor;
-
- /*
-  * Return any match...
-  */
-
-  return ((help_node_t *)cupsArrayFind(hi->nodes, &key));
-}
-
-
-/*
- * 'helpLoadIndex()' - Load a help index from disk.
- */
-
-help_index_t *				/* O - Index pointer or NULL */
-helpLoadIndex(const char *hifile,	/* I - Index filename */
-              const char *directory)	/* I - Directory that is indexed */
-{
-  help_index_t	*hi;			/* Help index */
-  cups_file_t	*fp;			/* Current file */
-  char		line[2048],		/* Line from file */
-		*ptr,			/* Pointer into line */
-		*filename,		/* Filename in line */
-		*anchor,		/* Anchor in line */
-		*sectptr,		/* Section pointer in line */
-		section[1024],		/* Section name */
-		*text;			/* Text in line */
-  time_t	mtime;			/* Modification time */
-  off_t		offset;			/* Offset into file */
-  size_t	length;			/* Length in bytes */
-  int		update;			/* Update? */
-  help_node_t	*node;			/* Current node */
-
-
-  DEBUG_printf(("helpLoadIndex(hifile=\"%s\", directory=\"%s\")\n",
-                hifile, directory));
-
- /*
-  * Create a new, empty index.
-  */
-
-  if ((hi = (help_index_t *)calloc(1, sizeof(help_index_t))) == NULL)
-    return (NULL);
-
-  hi->nodes  = cupsArrayNew((cups_array_func_t)help_sort_by_name, NULL);
-  hi->sorted = cupsArrayNew((cups_array_func_t)help_sort_by_score, NULL);
-
-  if (!hi->nodes || !hi->sorted)
-  {
-    cupsArrayDelete(hi->nodes);
-    cupsArrayDelete(hi->sorted);
-    free(hi);
-    return (NULL);
-  }
-
- /*
-  * Try loading the existing index file...
-  */
-
-  if ((fp = cupsFileOpen(hifile, "r")) != NULL)
-  {
-   /*
-    * Lock the file and then read the first line...
-    */
-
-    cupsFileLock(fp, 1);
-
-    if (cupsFileGets(fp, line, sizeof(line)) && !strcmp(line, "HELPV1"))
-    {
-     /*
-      * Got a valid header line, now read the data lines...
-      */
-
-      while (cupsFileGets(fp, line, sizeof(line)))
-      {
-       /*
-	* Each line looks like one of the following:
-	*
-	*     filename mtime offset length "section" "text"
-	*     filename#anchor offset length "text"
-	*/
-
-	filename = line;
-
-	if ((ptr = strchr(line, ' ')) == NULL)
-          break;
-
-	while (isspace(*ptr & 255))
-          *ptr++ = '\0';
-
-	if ((anchor = strrchr(filename, '#')) != NULL)
-	{
-          *anchor++ = '\0';
-	  mtime = 0;
-	}
-	else
-	  mtime = strtol(ptr, &ptr, 10);
-
-	offset = strtoll(ptr, &ptr, 10);
-	length = strtoll(ptr, &ptr, 10);
-
-	while (isspace(*ptr & 255))
-          ptr ++;
-
-        if (!anchor)
-	{
-	 /*
-	  * Get section...
-	  */
-
-          if (*ptr != '\"')
-	    break;
-
-          ptr ++;
-	  sectptr = ptr;
-
-          while (*ptr && *ptr != '\"')
-	    ptr ++;
-
-          if (*ptr != '\"')
-	    break;
-
-          *ptr++ = '\0';
-
-          strlcpy(section, sectptr, sizeof(section));
-
-	  while (isspace(*ptr & 255))
-            ptr ++;
-        }
-
-        if (*ptr != '\"')
-	  break;
-
-        ptr ++;
-	text = ptr;
-
-        while (*ptr && *ptr != '\"')
-	  ptr ++;
-
-        if (*ptr != '\"')
-	  break;
-
-        *ptr++ = '\0';
-
-	if ((node = help_new_node(filename, anchor, section, text,
-				  mtime, offset, length)) == NULL)
-          break;
-
-	node->score = -1;
-
-	cupsArrayAdd(hi->nodes, node);
-      }
-    }
-
-    cupsFileClose(fp);
-  }
-
- /*
-  * Scan for new/updated files...
-  */
-
-  update = help_load_directory(hi, directory, NULL);
-
- /*
-  * Remove any files that are no longer installed...
-  */
-
-  for (node = (help_node_t *)cupsArrayFirst(hi->nodes);
-       node;
-       node = (help_node_t *)cupsArrayNext(hi->nodes))
-    if (node->score < 0)
-    {
-     /*
-      * Delete this node...
-      */
-
-      cupsArrayRemove(hi->nodes, node);
-      help_delete_node(node);
-    }
-
- /*
-  * Add nodes to the sorted array...
-  */
-
-  for (node = (help_node_t *)cupsArrayFirst(hi->nodes);
-       node;
-       node = (help_node_t *)cupsArrayNext(hi->nodes))
-    cupsArrayAdd(hi->sorted, node);
-
- /*
-  * Save the index if we updated it...
-  */
-
-  if (update)
-    helpSaveIndex(hi, hifile);
-
- /*
-  * Return the index...
-  */
-
-  return (hi);
-}
-
-
-/*
- * 'helpSaveIndex()' - Save a help index to disk.
- */
-
-int					/* O - 0 on success, -1 on error */
-helpSaveIndex(help_index_t *hi,		/* I - Index */
-              const char   *hifile)	/* I - Index filename */
-{
-  cups_file_t	*fp;			/* Index file */
-  help_node_t	*node;			/* Current node */
-
-
-  DEBUG_printf(("helpSaveIndex(hi=%p, hifile=\"%s\")\n", hi, hifile));
-
- /*
-  * Try creating a new index file...
-  */
-
-  if ((fp = cupsFileOpen(hifile, "w9")) == NULL)
-    return (-1);
-
- /*
-  * Lock the file while we write it...
-  */
-
-  cupsFileLock(fp, 1);
-
-  cupsFilePuts(fp, "HELPV1\n");
-
-  for (node = (help_node_t *)cupsArrayFirst(hi->nodes);
-       node;
-       node = (help_node_t *)cupsArrayNext(hi->nodes))
-  {
-   /*
-    * Write the current node with/without the anchor...
-    */
-
-    if (node->anchor)
-    {
-      if (cupsFilePrintf(fp, "%s#%s " CUPS_LLFMT " " CUPS_LLFMT " \"%s\"\n",
-                         node->filename, node->anchor,
-                         CUPS_LLCAST node->offset, CUPS_LLCAST node->length,
-			 node->text) < 0)
-        break;
-    }
-    else
-    {
-      if (cupsFilePrintf(fp, "%s %d " CUPS_LLFMT " " CUPS_LLFMT " \"%s\" \"%s\"\n",
-                         node->filename, node->mtime,
-                         CUPS_LLCAST node->offset, CUPS_LLCAST node->length,
-			 node->section ? node->section : "", node->text) < 0)
-        break;
-    }
-  }
-
-  cupsFileFlush(fp);
-
-  if (cupsFileClose(fp) < 0)
-    return (-1);
-  else if (node)
-    return (-1);
-  else
-    return (0);
-}
-
-
-/*
- * 'helpSearchIndex()' - Search an index.
- */
-
-help_index_t *				/* O - Search index */
-helpSearchIndex(help_index_t *hi,	/* I - Index */
-                const char   *query,	/* I - Query string */
-		const char   *section,	/* I - Limit search to this section */
-		const char   *filename)	/* I - Limit search to this file */
-{
-  help_index_t	*search;		/* Search index */
-  help_node_t	*node;			/* Current node */
-  void		*sc;			/* Search context */
-  int		matches;		/* Number of matches */
-
-
-  DEBUG_printf(("helpSearchIndex(hi=%p, query=\"%s\", filename=\"%s\")\n",
-                hi, query ? query : "(nil)",
-		filename ? filename : "(nil)"));
-
- /*
-  * Range check...
-  */
-
-  if (!hi || !query)
-    return (NULL);
-
- /*
-  * Reset the scores of all nodes to 0...
-  */
-
-  for (node = (help_node_t *)cupsArrayFirst(hi->nodes);
-       node;
-       node = (help_node_t *)cupsArrayNext(hi->nodes))
-    node->score = 0;
-
- /*
-  * Find the first node to search in...
-  */
-
-  if (filename)
-  {
-    node = helpFindNode(hi, filename, NULL);
-    if (!node)
-      return (NULL);
-  }
-  else
-    node = (help_node_t *)cupsArrayFirst(hi->nodes);
-
- /*
-  * Convert the query into a regular expression...
-  */
-
-  sc = cgiCompileSearch(query);
-  if (!sc)
-    return (NULL);
-
- /*
-  * Allocate a search index...
-  */
-
-  search = calloc(1, sizeof(help_index_t));
-  if (!search)
-  {
-    cgiFreeSearch(sc);
-    return (NULL);
-  }
-
-  search->nodes  = cupsArrayNew((cups_array_func_t)help_sort_by_name, NULL);
-  search->sorted = cupsArrayNew((cups_array_func_t)help_sort_by_score, NULL);
-  
-  if (!search->nodes || !search->sorted)
-  {
-    cupsArrayDelete(search->nodes);
-    cupsArrayDelete(search->sorted);
-    free(search);
-    cgiFreeSearch(sc);
-    return (NULL);
-  }
-
-  search->search = 1;
-
- /*
-  * Check each node in the index, adding matching nodes to the
-  * search index...
-  */
-
-  for (; node; node = (help_node_t *)cupsArrayNext(hi->nodes))
-    if (section && strcmp(node->section, section))
-      continue;
-    else if (filename && strcmp(node->filename, filename))
-      continue;
-    else if ((matches = cgiDoSearch(sc, node->text)) > 0)
-    {
-     /*
-      * Found a match, add the node to the search index...
-      */
-
-      node->score = matches;
-
-      cupsArrayAdd(search->nodes, node);      
-      cupsArrayAdd(search->sorted, node);      
-    }
-
- /*
-  * Free the search context...
-  */
-
-  cgiFreeSearch(sc);
-
- /*
-  * Return the results...
-  */
-
-  return (search);
-}
-
-
-/*
- * 'help_delete_node()' - Free all memory used by a node.
- */
-
-static void
-help_delete_node(help_node_t *n)	/* I - Node */
-{
-  DEBUG_printf(("help_delete_node(n=%p)\n", n));
-
-  if (!n)
-    return;
-
-  if (n->filename)
-    free(n->filename);
-
-  if (n->anchor)
-    free(n->anchor);
-
-  if (n->section)
-    free(n->section);
-
-  if (n->text)
-    free(n->text);
-
-  free(n);
-}
-
-
-/*
- * 'help_load_directory()' - Load a directory of files into an index.
- */
-
-static int				/* O - 0 = success, -1 = error, 1 = updated */
-help_load_directory(
-    help_index_t *hi,			/* I - Index */
-    const char   *directory,		/* I - Directory */
-    const char   *relative)		/* I - Relative path */
-{
-  cups_dir_t	*dir;			/* Directory file */
-  cups_dentry_t	*dent;			/* Directory entry */
-  char		*ext,			/* Pointer to extension */
-		filename[1024],		/* Full filename */
-		relname[1024];		/* Relative filename */
-  int		update;			/* Updated? */
-  help_node_t	*node;			/* Current node */
-
-
-  DEBUG_printf(("help_load_directory(hi=%p, directory=\"%s\", relative=\"%s\")\n",
-                hi, directory ? directory : "(nil)", relative ? relative : "(nil)"));
-
- /*
-  * Open the directory and scan it...
-  */
-
-  if ((dir = cupsDirOpen(directory)) == NULL)
-    return (0);
-
-  update = 0;
-
-  while ((dent = cupsDirRead(dir)) != NULL)
-  {
-   /*
-    * Skip "." files...
-    */
-
-    if (dent->filename[0] == '.')
-      continue;
-
-   /*
-    * Get absolute and relative filenames...
-    */
-
-    snprintf(filename, sizeof(filename), "%s/%s", directory, dent->filename);
-    if (relative)
-      snprintf(relname, sizeof(relname), "%s/%s", relative, dent->filename);
-    else
-      strlcpy(relname, dent->filename, sizeof(relname));
-
-   /*
-    * Check if we have a HTML file...
-    */
-
-    if ((ext = strstr(dent->filename, ".html")) != NULL &&
-        (!ext[5] || !strcmp(ext + 5, ".gz")))
-    {
-     /*
-      * HTML file, see if we have already indexed the file...
-      */
-
-      if ((node = helpFindNode(hi, relname, NULL)) != NULL)
-      {
-       /*
-        * File already indexed - check dates to confirm that the
-	* index is up-to-date...
-	*/
-
-        if (node->mtime == dent->fileinfo.st_mtime)
-	{
-	 /*
-	  * Same modification time, so mark all of the nodes
-	  * for this file as up-to-date...
-	  */
-
-          for (; node; node = (help_node_t *)cupsArrayNext(hi->nodes))
-	    if (!strcmp(node->filename, relname))
-	      node->score = 0;
-	    else
-	      break;
-
-          continue;
-	}
-      }
-
-      update = 1;
-
-      help_load_file(hi, filename, relname, dent->fileinfo.st_mtime);
-    }
-    else if (S_ISDIR(dent->fileinfo.st_mode))
-    {
-     /*
-      * Process sub-directory...
-      */
-
-      if (help_load_directory(hi, filename, relname) == 1)
-        update = 1;
-    }
-  }
-
-  cupsDirClose(dir);
-
-  return (update);
-}
-
-
-/*
- * 'help_load_file()' - Load a HTML files into an index.
- */
-
-static int				/* O - 0 = success, -1 = error */
-help_load_file(
-    help_index_t *hi,			/* I - Index */
-    const char   *filename,		/* I - Filename */
-    const char   *relative,		/* I - Relative path */
-    time_t       mtime)			/* I - Modification time */
-{
-  cups_file_t	*fp;			/* HTML file */
-  help_node_t	*node;			/* Current node */
-  char		line[1024],		/* Line from file */
-                section[1024],		/* Section */
-		*ptr,			/* Pointer into line */
-		*anchor,		/* Anchor name */
-		*text;			/* Text for anchor */
-  off_t		offset;			/* File offset */
-  char		quote;			/* Quote character */
-
-
-  DEBUG_printf(("help_load_file(hi=%p, filename=\"%s\", relative=\"%s\", mtime=%ld)\n",
-                hi, filename ? filename : "(nil)",
-		relative ? relative : "(nil)", mtime));
-
-  if ((fp = cupsFileOpen(filename, "r")) == NULL)
-    return (-1);
-
-  node   = NULL;
-  offset = 0;
-
-  strcpy(section, "Other");
-
-  while (cupsFileGets(fp, line, sizeof(line)))
-  {
-   /*
-    * Look for "<TITLE>", "<A NAME", or "<!-- SECTION:" prefix...
-    */
-
-    if (!strncasecmp(line, "<!-- SECTION:", 13))
-    {
-     /*
-      * Got section line, copy it!
-      */
-
-      for (ptr = line + 13; isspace(*ptr & 255); ptr ++);
-
-      strlcpy(section, ptr, sizeof(section));
-      if ((ptr = strstr(section, "-->")) != NULL)
-      {
-       /*
-        * Strip comment stuff from end of line...
-	*/
-
-        for (*ptr-- = '\0'; ptr > line && isspace(*ptr & 255); *ptr-- = '\0');
-
-	if (isspace(*ptr & 255))
-	  *ptr = '\0';
-      }
-      continue;
-    }
-
-    for (ptr = line; (ptr = strchr(ptr, '<')) != NULL;)
-    {
-      ptr ++;
-
-      if (!strncasecmp(ptr, "TITLE>", 6))
-      {
-       /*
-        * Found the title...
-	*/
-
-	anchor = NULL;
-	ptr += 6;
-      }
-      else if (!strncasecmp(ptr, "A NAME=", 7))
-      {
-       /*
-        * Found an anchor...
-	*/
-
-        ptr += 7;
-
-	if (*ptr == '\"' || *ptr == '\'')
-	{
-	 /*
-	  * Get quoted anchor...
-	  */
-
-	  quote  = *ptr;
-          anchor = ptr + 1;
-	  if ((ptr = strchr(anchor, quote)) != NULL)
-	    *ptr++ = '\0';
-	  else
-	    break;
-	}
-	else
-	{
-	 /*
-	  * Get unquoted anchor...
-	  */
-
-          anchor = ptr + 1;
-
-	  for (ptr = anchor; *ptr && *ptr != '>' && !isspace(*ptr & 255); ptr ++);
-
-	  if (*ptr)
-	    *ptr++ = '\0';
-	  else
-	    break;
-	}
-
-       /*
-        * Got the anchor, now lets find the end...
-	*/
-
-        while (*ptr && *ptr != '>')
-	  ptr ++;
-
-        if (*ptr != '>')
-	  break;
-
-        ptr ++;
-      }
-      else
-        continue;
-
-     /*
-      * Now collect text for the link...
-      */
-
-      text = ptr;
-      while ((ptr = strchr(text, '<')) == NULL)
-      {
-	ptr = text + strlen(text);
-	if (ptr >= (line + sizeof(line) - 2))
-	  break;
-
-        *ptr++ = ' ';
-
-        if (!cupsFileGets(fp, ptr, sizeof(line) - (ptr - line) - 1))
-	  break;
-      }
-
-      *ptr = '\0';
-
-      if (node)
-	node->length = offset - node->offset;
-
-      if (!*text)
-      {
-        node = NULL;
-        break;
-      }
-
-      if ((node = helpFindNode(hi, relative, anchor)) != NULL)
-      {
-       /*
-	* Node already in the index, so replace the text and other
-	* data...
-	*/
-
-        cupsArrayRemove(hi->nodes, node);
-
-        if (node->section)
-	  free(node->section);
-
-	if (node->text)
-	  free(node->text);
-
-	node->section = section[0] ? strdup(section) : NULL;
-	node->text    = strdup(text);
-	node->mtime   = mtime;
-	node->offset  = offset;
-	node->score   = 0;
-      }
-      else
-      {
-       /*
-	* New node...
-	*/
-
-        node = help_new_node(relative, anchor, section, text, mtime, offset, 0);
-      }
-
-     /*
-      * Go through the text value and replace tabs and newlines with
-      * whitespace and eliminate extra whitespace...
-      */
-
-      for (ptr = node->text, text = node->text; *ptr;)
-	if (isspace(*ptr & 255))
-	{
-	  while (isspace(*ptr & 255))
-	    *ptr ++;
-
-	  *text++ = ' ';
-        }
-	else if (text != ptr)
-	  *text++ = *ptr++;
-	else
-	{
-	  text ++;
-	  ptr ++;
-	}
-
-      *text = '\0';
-
-     /*
-      * (Re)add the node to the array...
-      */
-
-      cupsArrayAdd(hi->nodes, node);
-      break;
-    }
-
-   /*
-    * Get the offset of the next line...
-    */
-
-    offset = cupsFileTell(fp);
-  }
-
-  cupsFileClose(fp);
-
-  if (node)
-    node->length = offset - node->offset;
-
-  return (0);
-}
-
-
-/*
- * 'help_new_node()' - Create a new node and add it to an index.
- */
-
-static help_node_t *			/* O - Node pointer or NULL on error */
-help_new_node(const char   *filename,	/* I - Filename */
-              const char   *anchor,	/* I - Anchor */
-	      const char   *section,	/* I - Section */
-	      const char   *text,	/* I - Text */
-	      time_t       mtime,	/* I - Modification time */
-              off_t        offset,	/* I - Offset in file */
-	      size_t       length)	/* I - Length in bytes */
-{
-  help_node_t	*n;			/* Node */
-
-
-  DEBUG_printf(("help_new_node(filename=\"%s\", anchor=\"%s\", text=\"%s\", "
-                "mtime=%ld, offset=%ld, length=%ld)\n",
-                filename ? filename : "(nil)", anchor ? anchor : "(nil)",
-		text ? text : "(nil)", (long)mtime, (long)offset,
-		(long)length));
-
-  n = (help_node_t *)calloc(1, sizeof(help_node_t));
-  if (!n)
-    return (NULL);
-
-  n->filename = strdup(filename);
-  n->anchor   = anchor ? strdup(anchor) : NULL;
-  n->section  = (section && *section) ? strdup(section) : NULL;
-  n->text     = strdup(text);
-  n->mtime    = mtime;
-  n->offset   = offset;
-  n->length   = length;
-
-  return (n);
-}
-
-
-/*
- * 'help_sort_nodes_by_name()' - Sort nodes by section, filename, and anchor.
- */
-
-static int				/* O - Difference */
-help_sort_by_name(help_node_t *n1,	/* I - First node */
-                  help_node_t *n2)	/* I - Second node */
-{
-  int		diff;			/* Difference */
-
-
-  DEBUG_printf(("help_sort_by_name(n1=%p(%s#%s), n2=%p(%s#%s)\n",
-                n1, n1->filename, n1->anchor ? n1->anchor : "",
-		n2, n2->filename, n2->anchor ? n2->anchor : ""));
-
-  if ((diff = strcmp(n1->filename, n2->filename)) != 0)
-    return (diff);
-
-  if (!n1->anchor && !n2->anchor)
-    return (0);
-  else if (!n1->anchor)
-    return (-1);
-  else if (!n2->anchor)
-    return (1);
-  else
-    return (strcmp(n1->anchor, n2->anchor));
-}
-
-
-/*
- * 'help_sort_nodes_by_score()' - Sort nodes by score and text.
- */
-
-static int				/* O - Difference */
-help_sort_by_score(help_node_t *n1,	/* I - First node */
-                   help_node_t *n2)	/* I - Second node */
-{
-  int		diff;			/* Difference */
-
-
-  DEBUG_printf(("help_sort_by_score(n1=%p(%d \"%s\" \"%s\"), "
-                "n2=%p(%d \"%s\" \"%s\")\n",
-                n1, n1->score, n1->section ? n1->section : "", n1->text,
-                n2, n2->score, n2->section ? n2->section : "", n2->text));
-
-  if (n1->score != n2->score)
-    return (n1->score - n2->score);
-
-  if (n1->section && !n2->section)
-    return (1);
-  else if (!n1->section && n2->section)
-    return (-1);
-  else if (n1->section && n2->section &&
-           (diff = strcmp(n1->section, n2->section)) != 0)
-    return (diff);
-
-  return (strcasecmp(n1->text, n2->text));
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -1,77 +0,0 @@
-/*
- * "$Id$"
- *
- *   On-line help index definitions for the Common UNIX Printing System (CUPS).
- *
- *   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 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- */
-
-#ifndef _CUPS_HELP_INDEX_H_
-#  define _CUPS_HELP_INDEX_H_
-
-/*
- * Include necessary headers...
- */
-
-#  include <cups/array.h>
-
-
-/*
- * Data structures...
- */
-
-typedef struct				/**** 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 */
-  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 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);
-
-
-#endif /* !_CUPS_HELP_INDEX_H_ */
-
-/*
- * End of "$Id$".
- */
@@ -1,386 +0,0 @@
-/*
- * "$Id$"
- *
- *   On-line help CGI for the Common UNIX Printing System (CUPS).
- *
- *   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 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: 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");
-
- /*
-  * 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(_("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, "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(_("Help")));
-      cgiSetVariable("ERROR", "Unable to access help file!");
-      cgiCopyTemplateLang("error.tmpl");
-      cgiEndHTML();
-
-      return (1);
-    }
-
-    if ((n = helpFindNode(hi, helpfile, NULL)) == NULL)
-    {
-      cgiStartHTML(cgiText(_("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);
-
-   /*
-    * 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(_("Help")));
-  }
-
- /*
-  * Do a search as needed...
-  */
-
-  query = cgiGetVariable("QUERY");
-  topic = cgiGetVariable("TOPIC");
-  si    = helpSearchIndex(hi, query, topic, helpfile);
-
-  fprintf(stderr, "DEBUG: query=\"%s\", topic=\"%s\"\n", query, topic);
-
-  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)
-    cgiEndHTML();
-  else
-    puts("</BODY>\n</HTML>");
-
- /*
-  * Delete the index...
-  */
-
-  helpDeleteIndex(hi);
-
- /*
-  * Return with no errors...
-  */
-
-  return (0);
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -1,183 +1,86 @@
 /*
 * "$Id$"
 *
- *   HTML support functions for the Common UNIX Printing System (CUPS).
+ *   CGI HTML functions.
 *
- *   Copyright 1997-2006 by Easy Software Products.
+ *   Copyright 1997-2004 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:
+ *   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.
 *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
+ *   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.
 *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   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.
 *
 * Contents:
 *
- *   cgiEndHTML()      - End a HTML page.
- *   cgiFormEncode()   - Encode a string as a form variable...
- *   cgiStartHTML()    - Start a HTML page.
- *   cgi_null_passwd() - Return a NULL password for authentication.
+ *   cgiStartHTML() - Start an HTML document stream.
+ *   cgiEndHTML()   - End an HTML document stream.
 */

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


 /*
- * Local functions...
- */
-
-static const char	*cgi_null_passwd(const char *prompt);
-
-
-/*
- * 'cgiEndHTML()' - End a HTML page.
+ * 'cgiStartHTML()' - Start an HTML document stream.
 */

 void
-cgiEndHTML(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 */
 {
- /*
-  * Send the standard trailer...
-  */
+  va_list	ap;			/* Argument pointer */

-  cgiCopyTemplateLang("trailer.tmpl");
+
+  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);
 }


 /*
- * '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.
+ * 'cgiEndHTML()' - End an HTML document stream.
 */

 void
-cgiStartHTML(const char *title)		/* I - Title of page */
+cgiEndHTML(FILE *out)	/* I - Output file to use */
 {
- /*
-  * Disable any further authentication attempts...
-  */
-
-  cupsSetPasswordCB(cgi_null_passwd);
-
- /*
-  * Tell the client to expect UTF-8 encoded HTML...
-  */
-
-  puts("Content-Type: text/html;charset=utf-8\n");
-
- /*
-  * Send a standard header...
-  */
-
-  cgiSetVariable("TITLE", title);
-  cgiSetServerVersion();
-
-  cgiCopyTemplateLang("header.tmpl");
-}
-
-
-/*
- * '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);
-
-  return (NULL);
+  fputs("</BODY>\n", out);
+  fputs("</HTML>\n", out);
 }


@@ -1,9 +1,9 @@
 /*
 * "$Id$"
 *
- *   Private CGI definitions for the Common UNIX Printing System (CUPS).
+ *   IPP variable definitions for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2005 by Easy Software Products.
+ *   Copyright 1997-2004 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -15,9 +15,9 @@
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
 *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
+ *       Hollywood, Maryland 20636-3111 USA
 *
- *       Voice: (301) 373-9600
+ *       Voice: (301) 373-9603
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
 */
@@ -26,17 +26,31 @@
 * Include necessary headers...
 */

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


 /*
- * Limits...
+ * Definitions...
 */

-#define CUPS_PAGE_MAX	10		/* Maximum items per page */
+#define TEMPLATES	ippGetTemplateDir()
+
+
+/*
+ * Prototype...
+ */
+
+extern void	ippGetAttributes(ipp_t *request, const char *directory,
+		                 const char *tmpl, const char *lang);
+extern char	*ippGetTemplateDir(void);
+extern char	*ippRewriteURL(const char *, char *, int, const char *);
+extern void	ippSetServerVersion(void);
+extern void	ippSetCGIVars(ipp_t *, const char *, const char *,
+		              const char *, int);


 /*
@@ -3,7 +3,7 @@
 *
 *   Job status CGI for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2006 by Easy Software Products.
+ *   Copyright 1997-2004 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -15,9 +15,9 @@
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
 *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
+ *       Hollywood, Maryland 20636-3111 USA
 *
- *       Voice: (301) 373-9600
+ *       Voice: (301) 373-9603
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
 *
@@ -31,14 +31,14 @@
 * Include necessary headers...
 */

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


 /*
 * Local functions...
 */

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


 /*
@@ -49,10 +49,12 @@ 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	*op;			/* Operation name */
-  const char	*job_id_var;		/* Job ID form variable */
-  int		job_id;			/* Job ID */
+  const char	*which_jobs;		/* Which jobs to show */
+  ipp_t		*request,		/* IPP request */
+		*response;		/* IPP response */
+   const char	*op;			/* Operation name */


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

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

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

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

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

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

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

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

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

-    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);
+    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);
    else
    {
     /*
      * Bad operation code...  Display an error...
      */

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

-    cgiStartHTML(cgiText(_("Jobs")));
-    cgiShowJobs(http, NULL);
-    cgiEndHTML();
+    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"));
+    }
  }

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

  httpClose(http);
+  cupsLangFree(language);

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

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


+  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:
@@ -162,39 +206,53 @@ do_job_op(http_t      *http,		/* I - HTTP connection */
  *    requesting-user-name
  */

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

-  snprintf(uri, sizeof(uri), "ipp://localhost/jobs/%d", job_id);
+  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);

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

-  if ((user = getenv("REMOTE_USER")) == NULL)
-    user = "guest";
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-               "requesting-user-name", NULL, user);
+  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");

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

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

-  cgiStartHTML(cgiText(_("Jobs")));
+    ippDelete(response);
+  }
+  else
+    status = cupsLastError();

-  if (cupsLastError() > IPP_OK_CONFLICT)
-    cgiShowIPPError(_("Job operation failed:"));
+  if (status > IPP_OK_CONFLICT)
+  {
+    cgiSetVariable("ERROR", ippErrorString(status));
+    cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
+  }
  else if (op == IPP_CANCEL_JOB)
-    cgiCopyTemplateLang("job-cancel.tmpl");
+    cgiCopyTemplateLang(stdout, TEMPLATES, "job-cancel.tmpl", getenv("LANG"));
  else if (op == IPP_HOLD_JOB)
-    cgiCopyTemplateLang("job-hold.tmpl");
+    cgiCopyTemplateLang(stdout, TEMPLATES, "job-hold.tmpl", getenv("LANG"));
  else if (op == IPP_RELEASE_JOB)
-    cgiCopyTemplateLang("job-release.tmpl");
+    cgiCopyTemplateLang(stdout, TEMPLATES, "job-release.tmpl", getenv("LANG"));
  else if (op == IPP_RESTART_JOB)
-    cgiCopyTemplateLang("job-restart.tmpl");
-
-  cgiEndHTML();
+    cgiCopyTemplateLang(stdout, TEMPLATES, "job-restart.tmpl", getenv("LANG"));
 }


@@ -3,7 +3,7 @@
 *
 *   Printer status CGI for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2006 by Easy Software Products.
+ *   Copyright 1997-2004 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -15,35 +15,22 @@
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
 *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
+ *       Hollywood, Maryland 20636-3111 USA
 *
- *       Voice: (301) 373-9600
+ *       Voice: (301) 373-9603
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
 *
 * Contents:
 *
- *   main()              - Main entry for CGI.
- *   print_command()     - Send a print command to the printer.
- *   show_all_printers() - Show all printers...
- *   show_printer()      - Show a single printer.
+ *   main() - Main entry for CGI.
 */

 /*
 * Include necessary headers...
 */

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


 /*
@@ -54,14 +41,17 @@ int					/* O - Exit status */
 main(int  argc,				/* I - Number of command-line arguments */
     char *argv[])			/* I - Command-line arguments */
 {
-  const char	*printer;		/* Printer name */
-  const char	*user;			/* Username */
+  cups_lang_t	*language;		/* Language information */
+  char		*printer;		/* Printer name */
  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"
@@ -73,51 +63,60 @@ main(int  argc,				/* I - Number of command-line arguments */
  */

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

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

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

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

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

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

-  if (!op)
+  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)
  {
   /*
    * Get the default destination...
    */

-    request = ippNewRequest(CUPS_GET_DEFAULT);
+    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);

    ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                  "requested-attributes",
@@ -134,7 +133,7 @@ main(int  argc,				/* I - Number of command-line arguments */


        cgiSetVariable("DEFAULT_URI",
-	               cgiRewriteURL(attr->values[0].string.text,
+	               ippRewriteURL(attr->values[0].string.text,
 		                     url, sizeof(url), NULL));
      }

@@ -142,43 +141,207 @@ main(int  argc,				/* I - Number of command-line arguments */
    }

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

-    if (!printer)
-      show_all_printers(http, user);
+    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)
+    {
+     /*
+      * Build a CUPS_GET_PRINTERS request, which requires the following
+      * attributes:
+      *
+      *    attributes-charset
+      *    attributes-natural-language
+      */
+
+      request->request.op.operation_id = CUPS_GET_PRINTERS;
+      request->request.op.request_id   = 1;
+    }
    else
-      show_printer(http, printer);
+    {
+     /*
+      * Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the following
+      * attributes:
+      *
+      *    attributes-charset
+      *    attributes-natural-language
+      *    printer-uri
+      */
+
+      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());
+    }
  }
-  else if (!strcasecmp(op, "print-self-test-page") && printer)
-    print_command(http, printer, "PrintSelfTestPage");
-  else if (!strcasecmp(op, "clean-print-heads") && printer)
-    print_command(http, printer, "Clean all");
-  else if (!strcasecmp(op, "print-test-page") && printer)
-    cgiPrintTestPage(http, printer);
-  else if (!strcasecmp(op, "move-jobs") && printer)
-    cgiMoveJobs(http, printer, 0);
  else
  {
   /*
-    * Unknown/bad operation...
+    * Print a test page...
    */

-    if (printer)
-      cgiStartHTML(printer);
-    else
-      cgiStartHTML(cgiText(_("Printers")));
+    snprintf(uri, sizeof(uri), "ipp://localhost/printers/%s", printer);

-    cgiCopyTemplateLang("error-op.tmpl");
-    cgiEndHTML();
+   /*
+    * 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"));
  }

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

  httpClose(http);
+  cupsLangFree(language);

 /*
  * Return with no errors...
@@ -188,455 +351,6 @@ main(int  argc,				/* I - Number of command-line arguments */
 }


-/*
- * 'print_command()' - Send a print command to the printer.
- */
-
-void
-print_command(http_t     *http,		/* I - Connection to server */
-              const char *printer,	/* I - Printer */
-	      const char *command)	/* I - Command to send */
-{
-  cups_file_t	*fp;			/* File pointer */
-  char		filename[1024];		/* Temporary file */
-  ipp_t		*request,		/* IPP request */
-		*response;		/* IPP response */
-  char		uri[HTTP_MAX_URI],	/* Printer URI */
-		resource[1024],		/* POST resource path */
-		refresh[1024];		/* Refresh URL */
-  const char	*user;			/* Username */
-
-
- /*
-  * See who is logged in...
-  */
-
-  if ((user = getenv("REMOTE_USER")) == NULL)
-    user = "guest";
-
- /*
-  * Create the CUPS command file to print...
-  */
-
-  if ((fp = cupsTempFile2(filename, sizeof(filename))) == NULL)
-  {
-    cgiStartHTML(cgiText(_("Printer Maintenance")));
-    cgiSetVariable("MESSAGE", _("Unable to create temporary file:"));
-    cgiSetVariable("ERROR", strerror(errno));
-    cgiCopyTemplateLang("error.tmpl");
-    cgiEndHTML();
-    return;
-  }
-
-  cupsFilePuts(fp, "#CUPS-COMMAND\n");
-  cupsFilePrintf(fp, "%s\n", command);
-  cupsFileClose(fp);
-
- /*
-  * Point to the printer...
-  */
-
-  snprintf(resource, sizeof(resource), "/printers/%s", printer);
-
-  httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
-                   "localhost", ippPort(), "/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 = ippNewRequest(IPP_PRINT_JOB);
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
-               NULL, uri);
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-               "requesting-user-name", NULL, user);
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name",
-               NULL, "Printer Maintenance");
-
-  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, resource,
-                                    filename)) != NULL)
-  {
-    cgiSetIPPVars(response, NULL, NULL, NULL, 0);
-
-    ippDelete(response);
-  }
-
-  unlink(filename);
-
-  if (cupsLastError() <= IPP_OK_CONFLICT)
-  {
-   /*
-    * Automatically reload the printer status page...
-    */
-
-    cgiFormEncode(uri, resource, sizeof(uri));
-    snprintf(refresh, sizeof(refresh), "2;%s", uri);
-    cgiSetVariable("refresh_page", refresh);
-  }
-
-  cgiStartHTML(cgiText(_("Printer Maintenance")));
-
-  if (cupsLastError() > IPP_OK_CONFLICT)
-    cgiShowIPPError(_("Unable to send maintenance job:"));
-  else
-  {
-    cgiSetVariable("PRINTER_NAME", printer);
-
-    cgiCopyTemplateLang("maintenance.tmpl");
-  }
-
-  cgiEndHTML();
-}
-
-
-/*
- * 'show_all_printers()' - Show all printers...
- */
-
-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 */
-			*attr;		/* Current attribute */
-  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			url[1024],	/* URL for prev/next/this */
-			*urlptr,	/* Position in URL */
-			*urlend;	/* End of URL */
-
-
-  fprintf(stderr, "DEBUG: show_all_printers(http=%p, user=\"%s\")\n",
-          http, user);
-
- /*
-  * 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);
-
-  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)
-      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(url, "%d", count);
-    cgiSetVariable("TOTAL", url);
-
-    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);
-
-        cgiSetArray("cupscommand", i, "0");
-
-	for (attr = printer; attr; attr = attr->next)
-	  if (attr->group_tag != IPP_TAG_PRINTER || !attr->name)
-	    break;
-	  else if (!strcmp(attr->name, "printer-type"))
-	  {
-            if (attr->values[0].integer & CUPS_PRINTER_COMMANDS)
-	      cgiSetArray("cupscommand", i, "1");
-	    break;
-	  }
-      }
-    }
-    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);
-
-        cgiSetArray("cupscommand", i, "0");
-
-	for (attr = printer; attr; attr = attr->next)
-	  if (attr->group_tag == IPP_TAG_ZERO || !attr->name)
-	    break;
-	  else if (!strcmp(attr->name, "printer-type"))
-	  {
-            if (attr->values[0].integer & CUPS_PRINTER_COMMANDS)
-	      cgiSetArray("cupscommand", i, "1");
-	    break;
-	  }
-      }
-    }
-
-   /*
-    * Save navigation URLs...
-    */
-
-    urlend = url + sizeof(url);
-
-    if ((var = cgiGetVariable("QUERY")) != NULL)
-    {
-      strlcpy(url, "/printers/?QUERY=", sizeof(url));
-      urlptr = url + strlen(url);
-
-      cgiFormEncode(urlptr, var, urlend - urlptr);
-      urlptr += strlen(urlptr);
-
-      strlcpy(urlptr, "&", urlend - urlptr);
-      urlptr += strlen(urlptr);
-    }
-    else
-    {
-      strlcpy(url, "/printers/?", sizeof(url));
-      urlptr = url + strlen(url);
-    }
-
-    snprintf(urlptr, urlend - urlptr, "FIRST=%d", first);
-    cgiSetVariable("THISURL", url);
-
-    if (first > 0)
-    {
-      snprintf(urlptr, urlend - urlptr, "FIRST=%d&ORDER=%s",
-	       first - CUPS_PAGE_MAX, ascending ? "asc" : "dec");
-      cgiSetVariable("PREVURL", url);
-    }
-
-    if ((first + CUPS_PAGE_MAX) < count)
-    {
-      snprintf(urlptr, urlend - urlptr, "FIRST=%d&ORDER=%s",
-	       first + CUPS_PAGE_MAX, ascending ? "asc" : "dec");
-      cgiSetVariable("NEXTURL", url);
-    }
-
-   /*
-    * Then show everything...
-    */
-
-    cgiCopyTemplateLang("search.tmpl");
-
-    cgiCopyTemplateLang("printers-header.tmpl");
-
-    if (count > 0)
-      cgiCopyTemplateLang("pager.tmpl");
-
-    cgiCopyTemplateLang("printers.tmpl");
-
-    if (count > 0)
-      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.
- */
-
-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);
-
- /*
-  * 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, "printers.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 ((attr = ippFindAttribute(response, "printer-type",
-                                 IPP_TAG_ENUM)) != NULL)
-    {
-      cgiSetVariable("cupscommand",
-                     (attr->values[0].integer & CUPS_PRINTER_COMMANDS) ?
-		         "1" : "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;/printers/%s", uri);
-      cgiSetVariable("refresh_page", refresh);
-    }
-
-   /*
-    * Delete the response...
-    */
-
-    ippDelete(response);
-
-   /*
-    * Show the standard header...
-    */
-
-    cgiStartHTML(printer);
-
-   /*
-    * Show the printer status...
-    */
-
-    cgiCopyTemplateLang("printers.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$".
 */
@@ -1,368 +0,0 @@
-/*
- * "$Id$"
- *
- *   Search routines for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 1997-2005 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 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: 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(("help_compile_search(query=\"%s\")\n", query ? query : "(nil)"));
-
- /*
-  * Allocate a regular expression storage structure...
-  */
-
-  re = (regex_t *)calloc(1, sizeof(regex_t));
-
- /*
-  * 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;
-
-  s = (char *)malloc(slen);
-
- /*
-  * 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) + 4 * wlen + 2 * strlen(prefix) + 4;
-
-      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++;
-      }
-
-     /*
-      * For "word1 AND word2", add reciprocal "word2 AND word1"...
-      */
-
-      if (!strcmp(prefix, ".*") && lword)
-      {
-        char *lword2;			/* New "last word" */
-
-
-        lword2 = strdup(sword);
-
-        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,46 +3,40 @@
 *
 *   CGI template function.
 *
- *   Copyright 1997-2006 by Easy Software Products.
+ *   Copyright 1997-2004 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:
+ *   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.
 *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
+ *   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.
 *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   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.
 *
 * 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-private.h"
-#include <errno.h>
+#include "cgi.h"


 /*
 * Local functions...
 */

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


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


-  fprintf(stderr, "DEBUG: cgiCopyTemplateFile(out=%p, tmpl=\"%s\")\n", out,
-          tmpl);
-
 /*
  * Open the template file...
  */

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

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

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

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

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


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

-  if ((lang = getenv("LANG")) != NULL)
+  if (lang != NULL)
  {
    for (i = 0; lang[i] && i < 15; i ++)
-      if (isalnum(lang[i] & 255) || lang[i] == '_')
+      if (isalnum(lang[i] & 255))
        locale[i] = tolower(lang[i]);
-      else if (lang[i] == '-')
-        locale[i] = '_';
      else
-        break;
+        locale[i] = '_';

    locale[i] = '\0';
  }
  else
    locale[0] = '\0';

-  fprintf(stderr, "DEBUG: locale=\"%s\"...\n", locale);
-
 /*
  * See if we have a template file for this language...
  */

-  directory = cgiGetTemplateDir();
-
  snprintf(filename, sizeof(filename), "%s/%s/%s", directory, locale, tmpl);
  if (access(filename, 0))
  {
@@ -140,24 +120,18 @@ cgiCopyTemplateLang(const char *tmpl)	/* I - Base filename */
      snprintf(filename, sizeof(filename), "%s/%s", directory, tmpl);
  }

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

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

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

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

 /*
  * Close the template file and return...
@@ -167,79 +141,31 @@ cgiCopyTemplateLang(const char *tmpl)	/* I - Base filename */
 }


-/*
- * '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 */
-	 int  indent)			/* I - Debug info indentation */
+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		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 */


-  fprintf(stderr, "DEBUG: %*sStarting at file position %ld...\n", indent, "",
-          ftell(in));
-
 /*
  * Parse the file to the end...
  */
@@ -265,8 +191,6 @@ cgi_copy(FILE *out,			/* I - Output file */

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

-      if (ch == '}')
-	fprintf(stderr, "DEBUG: %*s\"{%s}\" at %ld...\n", indent, "", name,
-        	ftell(in));
-
     /*
      * See if it has a value...
      */
@@ -341,24 +261,16 @@ cgi_copy(FILE *out,			/* I - Output file */

 	pos = ftell(in);

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

        continue;
      }
@@ -414,16 +326,13 @@ cgi_copy(FILE *out,			/* I - Output file */
      *   {name!value?true:false}    Not equal
      */

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

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

+        op = ch;
+
 	for (s = compare; (ch = getc(in)) != EOF;)
          if (ch == '?')
            break;
@@ -472,7 +383,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(compare) - (s - compare), "{%s}", innername);
+	      snprintf(s, sizeof(s), "{%s}", innername);
 	    else
 	      strlcpy(s, innerval, sizeof(compare) - (s - compare));

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

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

       /*
        * Do the comparison...
@@ -517,21 +423,14 @@ cgi_copy(FILE *out,			/* I - Output file */
 	}
      }

-      fprintf(stderr,
-              "DEBUG: %*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...
 	*/

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

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

-  if (ch == EOF)
-    fprintf(stderr, "DEBUG: %*sReturning at file position %ld on EOF...\n",
-	    indent, "", ftell(in));
-  else
-    fprintf(stderr,
-            "DEBUG: %*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...
  */
@@ -584,50 +466,18 @@ cgi_copy(FILE *out,			/* I - Output file */
 */

 static void
-cgi_puts(const char *s,			/* I - String to output */
-         FILE       *out)		/* I - Output file */
+cgi_puts(const char *s,
+         FILE       *out)
 {
  while (*s)
  {
-    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 == '>')
+    if (s[0] == '<')
+      fputs("&lt;", out);
+    else if (s[0] == '>')
      fputs("&gt;", out);
    else if (*s == '\"')
      fputs("&quot;", out);
-    else if (*s == '&')
+    else if (s[0] == '&')
      fputs("&amp;", out);
    else
      putc(*s, out);
@@ -1,84 +0,0 @@
-/*
- * "$Id$"
- *
- *   CGI test program for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 1997-2005 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 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: 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$".
- */
@@ -1,118 +0,0 @@
-/*
- * "$Id$"
- *
- *   Help index test program for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 1997-2005 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 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: 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\"\n", i, node->filename, node->anchor,
-             node->text);
-    else
-      printf("    %d: %s \"%s\"\n", i, node->filename, node->text);
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -1,29 +0,0 @@
-<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 is some text for the first anchor.</P>
-
-
-<H1><A NAME="2ND">This is the Second Anchor</A></H1>
-
-<P>This is some text for the first anchor.</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>
@@ -1,112 +0,0 @@
-/*
- * "$Id$"
- *
- *   CGI template test program for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 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 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: 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$".
- */
@@ -3,94 +3,109 @@
 *
 *   CGI form variable and array functions.
 *
- *   Copyright 1997-2005 by Easy Software Products.
+ *   Copyright 1997-2004 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:
+ *   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.
 *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
+ *   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.
 *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   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.
 *
 * Contents:
 *
- *   cgiCheckVariables()        - Check for the presence of "required" variables.
- *   cgiGetArray()              - Get an element from a form array...
- *   cgiGetFile()               - Get the file (if any) that was submitted in the form.
- *   cgiGetSize()               - Get the size of a form array value.
- *   cgiGetVariable()           - Get a CGI variable from the database...
- *   cgiInitialize()            - Initialize the CGI variable "database"...
- *   cgiIsPOST()                - Determine whether this page was POSTed.
- *   cgiSetArray()              - Set array element N to the specified string.
- *   cgiSetSize()               - Set the array size.
- *   cgiSetVariable()           - Set a CGI variable in the database...
- *   cgi_add_variable()         - Add a form variable.
- *   cgi_compare_variables()    - Compare two variables.
- *   cgi_find_variable()        - Find a variable...
- *   cgi_initialize_get()       - Initialize form variables using the GET method.
- *   cgi_initialize_multipart() - Initialize variables and file using the POST method.
- *   cgi_initialize_post()      - Initialize variables using the POST method.
- *   cgi_initialize_string()    - Initialize form variables from a string.
- *   cgi_passwd()               - Catch authentication requests and notify the server.
- *   cgi_sort_variables()       - Sort all form variables for faster lookup.
- *   cgi_unlink_file()          - Remove the uploaded form.
+ *   cgiInitialize()         - Initialize the CGI variable "database"...
+ *   cgiCheckVariables()     - Check for the presence of "required" variables.
+ *   cgiGetArray()           - Get an element from a form array...
+ *   cgiGetSize()            - Get the size of a form array value.
+ *   cgiGetVariable()        - Get a CGI variable from the database...
+ *   cgiSetArray()           - Set array element N to the specified string.
+ *   cgiSetVariable()        - Set a CGI variable in the database...
+ *   cgi_add_variable()      - Add a form variable.
+ *   cgi_compare_variables() - Compare two variables.
+ *   cgi_find_variable()     - Find a variable...
+ *   cgi_initialize_get()    - Initialize form variables using the GET method.
+ *   cgi_initialize_post()   - Initialize variables using the POST method.
+ *   cgi_initialize_string() - Initialize form variables from a string.
+ *   cgi_sort_variables()    - Sort all form variables for faster lookup.
 */

 /*#define DEBUG*/
-#include "cgi-private.h"
+#include "cgi.h"
 #include <errno.h>
+#include <syslog.h>


 /*
 * Data structure to hold all the CGI form variables and arrays...
 */

-typedef struct				/**** Form variable structure ****/
+typedef struct
 {
-  const char	*name;			/* Name of variable */
-  int		nvalues,		/* Number of values */
-		avalues;		/* Number of values allocated */
-  const char	**values;		/* Value(s) of variable */
-} _cgi_var_t;
+  const char	*name;		/* Name of variable */
+  int		nvalues,	/* Number of values */
+		avalues;	/* Number of values allocated */
+  const char	**values;	/* Value(s) of variable */
+} var_t;


 /*
 * Local globals...
 */

-static int		form_count = 0,	/* Form variable count */
-			form_alloc = 0;	/* Number of variables allocated */
-static _cgi_var_t	*form_vars = NULL;
-					/* Form variables */
-static cgi_file_t	*form_file = NULL;
-					/* Uploaded file */
+static int	form_count = 0,		/* Form variable count */
+		form_alloc = 0;		/* Number of variables allocated */
+static var_t	*form_vars = NULL;	/* Form variables */


 /*
 * Local functions...
 */

-static void		cgi_add_variable(const char *name, int element,
-			                 const char *value);
-static int		cgi_compare_variables(const _cgi_var_t *v1,
-			                      const _cgi_var_t *v2);
-static _cgi_var_t	*cgi_find_variable(const char *name);
-static int		cgi_initialize_get(void);
-static int		cgi_initialize_multipart(const char *boundary);
-static int		cgi_initialize_post(void);
-static int		cgi_initialize_string(const char *data);
-static const char	*cgi_passwd(const char *prompt);
-static void		cgi_sort_variables(void);
-static void		cgi_unlink_file(void);
+static void	cgi_add_variable(const char *name, int element,
+		                 const char *value);
+static int	cgi_compare_variables(const var_t *v1, const var_t *v2);
+static var_t	*cgi_find_variable(const char *name);
+static int	cgi_initialize_get(void);
+static int	cgi_initialize_post(void);
+static int	cgi_initialize_string(const char *data);
+static void	cgi_sort_variables(void);
+
+
+/*
+ * 'cgiInitialize()' - Initialize the CGI variable "database"...
+ */
+
+int			/* O - Non-zero if there was form data */
+cgiInitialize(void)
+{
+  char	*method;	/* Form posting method */
+ 
+
+#ifdef DEBUG
+  setbuf(stdout, NULL);
+  puts("Content-type: text/plain\n");
+#endif /* DEBUG */
+
+  method = getenv("REQUEST_METHOD");
+
+  if (method == NULL)
+    return (0);
+
+  if (strcasecmp(method, "GET") == 0)
+    return (cgi_initialize_get());
+  else if (strcasecmp(method, "POST") == 0)
+    return (cgi_initialize_post());
+  else
+    return (0);
+}


 /*
@@ -147,11 +162,11 @@ cgiCheckVariables(const char *names)	/* I - Variables to look for */
 * 'cgiGetArray()' - Get an element from a form array...
 */

-const char *				/* O - Element value or NULL */
-cgiGetArray(const char *name,		/* I - Name of array variable */
-            int        element)		/* I - Element number (0 to N) */
+const char *			/* O - Element value or NULL */
+cgiGetArray(const char *name,	/* I - Name of array variable */
+            int        element)	/* I - Element number (0 to N) */
 {
-  _cgi_var_t	*var;			/* Pointer to variable */
+  var_t	*var;			/* Pointer to variable */


  if ((var = cgi_find_variable(name)) == NULL)
@@ -167,25 +182,14 @@ cgiGetArray(const char *name,		/* I - Name of array variable */
 }


-/*
- * 'cgiGetFile()' - Get the file (if any) that was submitted in the form.
- */
-
-const cgi_file_t *			/* O - Attached file or NULL */
-cgiGetFile(void)
-{
-  return (form_file);
-}
-
-
 /*
 * 'cgiGetSize()' - Get the size of a form array value.
 */

-int					/* O - Number of elements */
-cgiGetSize(const char *name)		/* I - Name of variable */
+int				/* O - Number of elements */
+cgiGetSize(const char *name)	/* I - Name of variable */
 {
-  _cgi_var_t	*var;			/* Pointer to variable */
+  var_t	*var;			/* Pointer to variable */


  if ((var = cgi_find_variable(name)) == NULL)
@@ -198,14 +202,14 @@ cgiGetSize(const char *name)		/* I - Name of variable */
 /*
 * 'cgiGetVariable()' - Get a CGI variable from the database...
 *
- * Returns NULL if the variable doesn't exist.  If the variable is an
+ * Returns NULL if the variable doesn't exist...  If the variable is an
 * array of values, returns the last element...
 */

-const char *				/* O - Value of variable */
-cgiGetVariable(const char *name)	/* I - Name of variable */
+const char *			/* O - Value of variable */
+cgiGetVariable(const char *name)/* I - Name of variable */
 {
-  const _cgi_var_t	*var;		/* Returned variable */
+  const var_t	*var;		/* Returned variable */


  var = cgi_find_variable(name);
@@ -222,87 +226,6 @@ cgiGetVariable(const char *name)	/* I - Name of variable */
 }


-/*
- * 'cgiInitialize()' - Initialize the CGI variable "database"...
- */
-
-int					/* O - Non-zero if there was form data */
-cgiInitialize(void)
-{
-  const char	*method;		/* Form posting method */
-  const char	*content_type;		/* Content-Type of post data */
-
-
- /*
-  * Setup a password callback for authentication...
-  */
-
-  cupsSetPasswordCB(cgi_passwd);
-
- /*
-  * Set the locale so that times, etc. are formatted properly...
-  */
-
-  setlocale(LC_ALL, "");
-
-#ifdef DEBUG
- /*
-  * Disable output buffering to find bugs...
-  */
-
-  setbuf(stdout, NULL);
-  puts("Content-type: text/plain\n");
-#endif /* DEBUG */
-
- /*
-  * Get the request method (GET or POST)...
-  */
-
-  method       = getenv("REQUEST_METHOD");
-  content_type = getenv("CONTENT_TYPE");
-  if (!method)
-    return (0);
-
- /*
-  * Grab form data from the corresponding location...
-  */
-
-  if (!strcasecmp(method, "GET"))
-    return (cgi_initialize_get());
-  else if (!strcasecmp(method, "POST") && content_type)
-  {
-    const char *boundary = strstr(content_type, "boundary=");
-
-    if (boundary)
-      boundary += 9;
-
-    if (content_type && !strncmp(content_type, "multipart/form-data; ", 21))
-      return (cgi_initialize_multipart(boundary));
-    else
-      return (cgi_initialize_post());
-  }
-  else
-    return (0);
-}
-
-
-/*
- * 'cgiIsPOST()' - Determine whether this page was POSTed.
- */
-
-int					/* O - 1 if POST, 0 if GET */
-cgiIsPOST(void)
-{
-  const char	*method;		/* REQUEST_METHOD environment variable */
-
-
-  if ((method = getenv("REQUEST_METHOD")) == NULL)
-    return (0);
-  else
-    return (!strcmp(method, "POST"));
-}
-
-
 /*
 * 'cgiSetArray()' - Set array element N to the specified string.
 *
@@ -311,12 +234,12 @@ cgiIsPOST(void)
 */

 void
-cgiSetArray(const char *name,		/* I - Name of variable */
-            int        element,		/* I - Element number (0 to N) */
-            const char *value)		/* I - Value of variable */
+cgiSetArray(const char *name,	/* I - Name of variable */
+            int        element,	/* I - Element number (0 to N) */
+            const char *value)	/* I - Value of variable */
 {
-  int		i;			/* Looping var */
-  _cgi_var_t	*var;			/* Returned variable */
+  int	i;	/* Looping var */
+  var_t	*var;	/* Returned variable */


  if (name == NULL || value == NULL || element < 0 || element > 100000)
@@ -356,11 +279,11 @@ cgiSetArray(const char *name,		/* I - Name of variable */
 */

 void
-cgiSetSize(const char *name,		/* I - Name of variable */
-           int        size)		/* I - Number of elements (0 to N) */
+cgiSetSize(const char *name,	/* I - Name of variable */
+           int        size)	/* I - Number of elements (0 to N) */
 {
-  int		i;			/* Looping var */
-  _cgi_var_t	*var;			/* Returned variable */
+  int	i;	/* Looping var */
+  var_t	*var;	/* Returned variable */


  if (name == NULL || size < 0 || size > 100000)
@@ -402,8 +325,8 @@ void
 cgiSetVariable(const char *name,	/* I - Name of variable */
               const char *value)	/* I - Value of variable */
 {
-  int		i;			/* Looping var */
-  _cgi_var_t	*var;			/* Returned variable */
+  int	i;				/* Looping var */
+  var_t	*var;				/* Returned variable */


  if (name == NULL || value == NULL)
@@ -435,7 +358,7 @@ cgi_add_variable(const char *name,	/* I - Variable name */
 		 int        element,	/* I - Array element number */
                 const char *value)	/* I - Variable value */
 {
-  _cgi_var_t	*var;				/* New variable */
+  var_t	*var;				/* New variable */


  if (name == NULL || value == NULL || element < 0 || element > 100000)
@@ -448,9 +371,9 @@ cgi_add_variable(const char *name,	/* I - Variable name */
  if (form_count >= form_alloc)
  {
    if (form_alloc == 0)
-      form_vars = malloc(sizeof(_cgi_var_t) * 16);
+      form_vars = malloc(sizeof(var_t) * 16);
    else
-      form_vars = realloc(form_vars, (form_alloc + 16) * sizeof(_cgi_var_t));
+      form_vars = realloc(form_vars, (form_alloc + 16) * sizeof(var_t));

    form_alloc += 16;
  }
@@ -471,9 +394,8 @@ cgi_add_variable(const char *name,	/* I - Variable name */
 */

 static int				/* O - Result of comparison */
-cgi_compare_variables(
-    const _cgi_var_t *v1,		/* I - First variable */
-    const _cgi_var_t *v2)		/* I - Second variable */
+cgi_compare_variables(const var_t *v1,	/* I - First variable */
+                      const var_t *v2)	/* I - Second variable */
 {
  return (strcasecmp(v1->name, v2->name));
 }
@@ -483,10 +405,10 @@ cgi_compare_variables(
 * 'cgi_find_variable()' - Find a variable...
 */

-static _cgi_var_t *			/* O - Variable pointer or NULL */
+static var_t *				/* O - Variable pointer or NULL */
 cgi_find_variable(const char *name)	/* I - Name of variable */
 {
-  _cgi_var_t	key;			/* Search key */
+  var_t	key;				/* Search key */


  if (form_count < 1 || name == NULL)
@@ -494,7 +416,7 @@ cgi_find_variable(const char *name)	/* I - Name of variable */

  key.name = name;

-  return ((_cgi_var_t *)bsearch(&key, form_vars, form_count, sizeof(_cgi_var_t),
+  return ((var_t *)bsearch(&key, form_vars, form_count, sizeof(var_t),
                           (int (*)(const void *, const void *))cgi_compare_variables));
 }

@@ -503,10 +425,10 @@ cgi_find_variable(const char *name)	/* I - Name of variable */
 * 'cgi_initialize_get()' - Initialize form variables using the GET method.
 */

-static int				/* O - 1 if form data read */
+static int		/* O - 1 if form data read */
 cgi_initialize_get(void)
 {
-  char	*data;				/* Pointer to form data string */
+  char	*data;		/* Pointer to form data string */


 #ifdef DEBUG
@@ -529,240 +451,19 @@ cgi_initialize_get(void)
 }


-/*
- * 'cgi_initialize_multipart()' - Initialize variables and file using the POST method.
- *
- * TODO: Update to support files > 2GB.
- */
-
-static int				/* O - 1 if form data was read */
-cgi_initialize_multipart(
-    const char *boundary)		/* I - Boundary string */
-{
-  char		line[10240],		/* MIME header line */
-		name[1024],		/* Form variable name */
-		filename[1024],		/* Form filename */
-		mimetype[1024],		/* MIME media type */
-		bstring[256],		/* Boundary string to look for */
-		*ptr,			/* Pointer into name/filename */
-		*end;			/* End of buffer */
-  int		ch,			/* Character from file */
-		fd,			/* Temporary file descriptor */
-		blen;			/* Length of boundary string */
-
-
-  DEBUG_printf(("cgi_initialize_multipart(boundary=\"%s\")\n", boundary));
-
- /*
-  * Read multipart form data until we run out...
-  */
-
-  name[0]     = '\0';
-  filename[0] = '\0';
-  mimetype[0] = '\0';
-
-  snprintf(bstring, sizeof(bstring), "\r\n--%s", boundary);
-  blen = strlen(bstring);
-
-  while (fgets(line, sizeof(line), stdin))
-  {
-    if (!strcmp(line, "\r\n"))
-    {
-     /*
-      * End of headers, grab value...
-      */
-
-      if (filename[0])
-      {
-       /*
-        * Read an embedded file...
-	*/
-
-        if (form_file)
-	{
-	 /*
-	  * Remove previous file...
-	  */
-
-	  cgi_unlink_file();
-	}
-
-       /*
-        * Allocate memory for the new file...
-	*/
-
-	if ((form_file = calloc(1, sizeof(cgi_file_t))) == NULL)
-	  return (0);
-
-        form_file->name     = strdup(name);
-	form_file->filename = strdup(filename);
-	form_file->mimetype = strdup(mimetype);
-
-        fd = cupsTempFd(form_file->tempfile, sizeof(form_file->tempfile));
-
-        if (fd < 0)
-	  return (0);
-
-        atexit(cgi_unlink_file);
-
-       /*
-        * Copy file data to the temp file...
-	*/
-	
-        ptr = line;
-
-	while ((ch = getchar()) != EOF)
-	{
-	  *ptr++ = ch;
-
-          if ((ptr - line) >= blen && !memcmp(ptr - blen, bstring, blen))
-	  {
-	    ptr -= blen;
-	    break;
-	  }
-
-          if ((ptr - line - blen) >= 8192)
-	  {
-	   /*
-	    * Write out the first 8k of the buffer...
-	    */
-
-	    write(fd, line, 8192);
-	    memmove(line, line + 8192, ptr - line - 8192);
-	    ptr -= 8192;
-	  }
-	}
-
-       /*
-        * Write the rest of the data and close the temp file...
-	*/
-
-	if (ptr > line)
-          write(fd, line, ptr - line);
-
-	close(fd);
-      }
-      else
-      {
-       /*
-        * Just get a form variable; the current code only handles
-	* form values up to 10k in size...
-	*/
-
-        ptr = line;
-	end = line + sizeof(line) - 1;
-
-	while ((ch = getchar()) != EOF)
-	{
-	  if (ptr < end)
-	    *ptr++ = ch;
-
-          if ((ptr - line) >= blen && !memcmp(ptr - blen, bstring, blen))
-	  {
-	    ptr -= blen;
-	    break;
-	  }
-	}
-
-	*ptr = '\0';
-
-       /*
-        * Set the form variable...
-	*/
-
-	if ((ptr = strrchr(name, '-')) != NULL && isdigit(ptr[1] & 255))
-	{
-	 /*
-	  * Set a specific index in the array...
-	  */
-
-	  *ptr++ = '\0';
-	  if (line[0])
-            cgiSetArray(name, atoi(ptr) - 1, line);
-	}
-	else if (cgiGetVariable(name))
-	{
-	 /*
-	  * Add another element in the array...
-	  */
-
-	  cgiSetArray(name, cgiGetSize(name), line);
-	}
-	else
-	{
-	 /*
-	  * Just set the line...
-	  */
-
-	  cgiSetVariable(name, line);
-	}
-      }
-
-     /*
-      * Read the rest of the current line...
-      */
-
-      fgets(line, sizeof(line), stdin);
-
-     /*
-      * Clear the state vars...
-      */
-
-      name[0]     = '\0';
-      filename[0] = '\0';
-      mimetype[0] = '\0';
-    }
-    else if (!strncasecmp(line, "Content-Disposition:", 20))
-    {
-      if ((ptr = strstr(line + 20, " name=\"")) != NULL)
-      {
-        strlcpy(name, ptr + 7, sizeof(name));
-
-	if ((ptr = strchr(name, '\"')) != NULL)
-	  *ptr = '\0';
-      }
-
-      if ((ptr = strstr(line + 20, " filename=\"")) != NULL)
-      {
-        strlcpy(filename, ptr + 11, sizeof(filename));
-
-	if ((ptr = strchr(filename, '\"')) != NULL)
-	  *ptr = '\0';
-      }
-    }
-    else if (!strncasecmp(line, "Content-Type:", 13))
-    {
-      for (ptr = line + 13; isspace(*ptr & 255); ptr ++);
-
-      strlcpy(mimetype, ptr, sizeof(mimetype));
-
-      for (ptr = mimetype + strlen(mimetype) - 1;
-           ptr > mimetype && isspace(*ptr & 255);
-	   *ptr-- = '\0');
-    }
-  }
-
- /*
-  * Return 1 for "form data found"...
-  */
-
-  return (1);
-}
-
-
 /*
 * 'cgi_initialize_post()' - Initialize variables using the POST method.
 */

-static int				/* O - 1 if form data was read */
+static int			/* O - 1 if form data was read */
 cgi_initialize_post(void)
 {
-  char	*content_length,		/* Length of input data (string) */
-	*data;				/* Pointer to form data string */
-  int	length,				/* Length of input data */
-	nbytes,				/* Number of bytes read this read() */
-	tbytes,				/* Total number of bytes read */
-	status;				/* Return status */
+  char	*content_length,	/* Length of input data (string) */
+	*data;			/* Pointer to form data string */
+  int	length,			/* Length of input data */
+	nbytes,			/* Number of bytes read this read() */
+	tbytes,			/* Total number of bytes read */
+	status;			/* Return status */


 #ifdef DEBUG
@@ -821,14 +522,14 @@ cgi_initialize_post(void)
 * 'cgi_initialize_string()' - Initialize form variables from a string.
 */

-static int				/* O - 1 if form data was processed */
+static int
 cgi_initialize_string(const char *data)	/* I - Form data string */
 {
-  int	done;				/* True if we're done reading a form variable */
-  char	*s,				/* Pointer to current form string */
-	ch,				/* Temporary character */
-	name[255],			/* Name of form variable */
-	value[65536];			/* Variable value... */
+  int	done;		/* True if we're done reading a form variable */
+  char	*s,		/* Pointer to current form string */
+	ch,		/* Temporary character */
+	name[255],	/* Name of form variable */
+	value[65536];	/* Variable value... */


 /*
@@ -937,36 +638,6 @@ cgi_initialize_string(const char *data)	/* I - Form data string */
 }


-/*
- * 'cgi_passwd()' - Catch authentication requests and notify the server.
- *
- * This function sends a Status header and exits, forcing authentication
- * for this request.
- */
-
-static const char *			/* O - NULL (no return) */
-cgi_passwd(const char *prompt)		/* I - Prompt (not used) */
-{
-  (void)prompt;
-
-  fprintf(stderr, "DEBUG: cgi_passwd(prompt=\"%s\") called!\n", prompt);
-
- /*
-  * Send a 401 (unauthorized) status to the server, so it can notify
-  * the client that authentication is required.
-  */
-
-  puts("Status: 401\n");
-  exit(0);
-
- /*
-  * This code is never executed, but is present to satisfy the compiler.
-  */
-
-  return (NULL);
-}
-
-
 /*
 * 'cgi_sort_variables()' - Sort all form variables for faster lookup.
 */
@@ -984,7 +655,7 @@ cgi_sort_variables(void)
  if (form_count < 2)
    return;

-  qsort(form_vars, form_count, sizeof(_cgi_var_t),
+  qsort(form_vars, form_count, sizeof(var_t),
        (int (*)(const void *, const void *))cgi_compare_variables);

 #ifdef DEBUG
@@ -996,35 +667,6 @@ cgi_sort_variables(void)
 }


-/*
- * 'cgi_unlink_file()' - Remove the uploaded form.
- */
-
-static void
-cgi_unlink_file(void)
-{
-  if (form_file)
-  {
-   /*
-    * Remove the temporary file...
-    */
-
-    unlink(form_file->tempfile);
-
-   /*
-    * Free memory used...
-    */
-
-    free(form_file->name);
-    free(form_file->filename);
-    free(form_file->mimetype);
-    free(form_file);
-
-    form_file = NULL;
-  }
-}
-
-
 /*
 * End of "$Id$".
 */
@@ -0,0 +1,2 @@
+cupsd.conf
+pam.conf
@@ -3,7 +3,7 @@
 #
 #   Configuration file makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1993-2006 by Easy Software Products.
+#   Copyright 1993-2004 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -15,7 +15,7 @@
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
 #       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
+#       Hollywood, Maryland 20636-3142 USA
 #
 #       Voice: (301) 373-9600
 #       EMail: cups-info@cups.org
@@ -28,7 +28,7 @@ include ../Makedefs
 # Config files...
 #

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


@@ -46,58 +46,28 @@ all:
 clean:


-#
-# Dummy depend...
-#
-
-depend:
-
-
 #
 # Install files...
 #

-install:	all
-	$(INSTALL_DIR) -m 755 $(SERVERROOT)
+install:
+	$(INSTALL_DIR) $(SERVERROOT)
 	for file in $(KEEP); do \
 		if test -r $(SERVERROOT)/$$file ; then \
-			$(INSTALL_CONFIG) $$file $(SERVERROOT)/$$file.N ; \
-			chgrp $(CUPS_GROUP) $(SERVERROOT)/$$file.N || true; \
+			$(INSTALL_DATA) $$file $(SERVERROOT)/$$file.N ; \
 		else \
-			$(INSTALL_CONFIG) $$file $(SERVERROOT) ; \
-			chgrp $(CUPS_GROUP) $(SERVERROOT)/$$file || true; \
+			$(INSTALL_DATA) $$file $(SERVERROOT) ; \
 		fi ; \
 	done
-	$(INSTALL_CONFIG) cupsd.conf $(SERVERROOT)/cupsd.conf.default
-	-chgrp $(CUPS_GROUP) $(SERVERROOT)/cupsd.conf.default
 	for file in $(REPLACE); do \
 		if test -r $(SERVERROOT)/$$file ; then \
 			$(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
 		fi ; \
 		$(INSTALL_DATA) $$file $(SERVERROOT) ; \
 	done
-	-if test x$(PAMDIR) != x; then \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \
-		if test -r $(BUILDROOT)$(PAMDIR)/cups/$(PAMFILE) ; then \
-			$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
-		else \
-			$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
-		fi ; \
-	fi
-
-
-#
-# Uninstall files...
-#
-
-uninstall:
-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
-		$(RM) $(SERVERROOT)/$$file; \
-	done
-	-$(RMDIR) $(SERVERROOT)
-	-if test x$(PAMDIR) != x; then \
-		$(RM) $(BUILDROOT)$(PAMDIR)/cups; \
-		$(RMDIR) $(BUILDROOT)$(PAMDIR); \
+	-if test x$(PAMDIR) != x$(BUILDROOT); then \
+		$(INSTALL_DIR) $(PAMDIR); \
+		$(INSTALL_DATA) $(PAMFILE) $(PAMDIR)/cups; \
 	fi


@@ -0,0 +1,89 @@
+#
+# "$Id: classes.conf 4088 2004-02-25 20:15:27Z mike $"
+#
+#   Sample class configuration file for the Common UNIX Printing System
+#   (CUPS) scheduler.
+#
+#   Copyright 1997-2004 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 4088 2004-02-25 20:15:27Z mike $".
+#
@@ -0,0 +1,67 @@
+#
+# "$Id: client.conf 4088 2004-02-25 20:15:27Z mike $"
+#
+#   Sample client configuration file for the Common UNIX Printing System
+#   (CUPS).
+#
+#   Copyright 1997-2004 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 4088 2004-02-25 20:15:27Z mike $".
+#
@@ -2,76 +2,844 @@
 # "$Id$"
 #
 #   Sample configuration file for the Common UNIX Printing System (CUPS)
-#   scheduler.  See "man cupsd.conf" for a complete description of this
-#   file.
+#   scheduler.
+#
+#   Copyright 1997-2004 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 USA
+#
+#       Voice: (301) 373-9600
+#       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.
 #

-# Log general information in error_log - change "info" to "debug" for
-# troubleshooting...
 LogLevel info

-# Administrator user group...
-SystemGroup @CUPS_SYSTEM_GROUPS@
+#
+# MaxLogSize: controls the maximum size of each log file before they are
+# rotated.  Defaults to 1048576 (1MB).  Set to 0 to disable log rotating.
+#

-# Only listen for connections from the local machine.
-Listen localhost:@DEFAULT_IPP_PORT@
-@CUPS_LISTEN_DOMAINSOCKET@
+#MaxLogSize 0

-# Show shared printers on the local network.
-Browsing On
-BrowseOrder allow,deny
-BrowseAllow @LOCAL
+#
+# 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.
+#

-# Default authentication type, when authentication is required...
-DefaultAuthType Basic
+#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@
+
+
+#
+# ServerTokens: specifies what information in provided in the Server
+# header of HTTP responses. The default is Minor.
+#
+# ServerTokens None
+# ServerTokens ProductOnly       CUPS
+# ServerTokens Major             CUPS/1
+# ServerTokens Minor             CUPS/1.1
+# ServerTokens Minimal           CUPS/@CUPS_VERSION@
+# ServerTokens OS                CUPS/@CUPS_VERSION@ (uname)
+# ServerTokens Full              CUPS/@CUPS_VERSION@ (uname) IPP/1.1
+#
+
+#ServerTokens Minor
+
+
+########
+######## 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
+
+
+########
+######## Filter Options
+########
+
+#
+# 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...)
+#
+# NOTE 2: In order for the command-line and web interfaces to work, you
+# must have at least one Port or Listen line that allows access from the
+# local loopback address (localhost).
+#
+
+#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.
+#
+
+#KeepAliveTimeout 60
+
+#
+# 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".
+#

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

-# Restrict access to the admin pages...
+#<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>
+
 <Location /admin>
-@ENCRYPTION_REQUIRED@
-  Order allow,deny
-  Allow localhost
+#
+# 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
 </Location>

-# Restrict access to configuration files...
-<Location /admin/conf>
-  AuthType Basic
-  Require user @SYSTEM
-  Order allow,deny
-  Allow localhost
-</Location>
-
-# Set the default printer/job policies...
-<Policy default>
-  # Job-related operations must be done by the owner or an adminstrator...
-  <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>
-    Require user @OWNER @SYSTEM
-    Order deny,allow
-  </Limit>
-
-  # All administration operations require an adminstrator to authenticate...
-  <Limit Pause-Printer Resume-Printer Set-Printer-Attributes 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-Add-Printer CUPS-Delete-Printer CUPS-Add-Class CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default>
-    AuthType Basic
-    Require user @SYSTEM
-    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 @SYSTEM
-    Order deny,allow
-  </Limit>
-
-  <Limit All>
-    Order deny,allow
-  </Limit>
-</Policy>
-
 #
 # End of "$Id$".
 #
@@ -1,9 +1,9 @@
 #
-# "$Id: mime.convs 5402 2006-04-14 19:21:03Z mike $"
+# "$Id: mime.convs 4087 2004-02-25 20:14:54Z mike $"
 #
 #   MIME converts file for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2005 by Easy Software Products.
+#   Copyright 1997-2004 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -15,9 +15,9 @@
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
 #       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
+#       Hollywood, Maryland 20636-3111 USA
 #
-#       Voice: (301) 373-9600
+#       Voice: (301) 373-9603
 #       EMail: cups-info@cups.org
 #         WWW: http://www.cups.org
 #
@@ -47,7 +47,6 @@ 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-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
@@ -107,12 +106,13 @@ image/x-sun-raster	application/vnd.cups-raster	100	imagetoraster
 #
 # Raw filter...
 #
-# Uncomment the following filter to allow printing of arbitrary files
-# without the -oraw option.
+# 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 5402 2006-04-14 19:21:03Z mike $".
+# End of "$Id: mime.convs 4087 2004-02-25 20:14:54Z mike $".
 #
@@ -1,9 +1,9 @@
 #
-# "$Id: mime.types 5402 2006-04-14 19:21:03Z mike $"
+# "$Id: mime.types 4413 2004-09-23 14:30:19Z mike $"
 #
 #   MIME types file for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2005 by Easy Software Products.
+#   Copyright 1997-2004 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -15,9 +15,9 @@
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
 #       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
+#       Hollywood, Maryland 20636-3111 USA
 #
-#       Voice: (301) 373-9600
+#       Voice: (301) 373-9603
 #       EMail: cups-info@cups.org
 #         WWW: http://www.cups.org
 #
@@ -77,9 +77,7 @@ application/postscript		ai eps ps string(0,%!) string(0,<04>%!) \
 				(contains(0,1024,"LANGUAGE=POSTSCRIPT") \
 				 contains(0,1024,"LANGUAGE = Postscript") \
 				 contains(0,1024,"LANGUAGE = PostScript") \
-				 contains(0,1024,"LANGUAGE = POSTSCRIPT") \
-				 (contains(0,1024,<0a>%!) + \
-				  !contains(0,1024,"ENTER LANGUAGE")))
+				 contains(0,1024,"LANGUAGE = POSTSCRIPT"))
 application/vnd.hp-HPGL		hpgl string(0,<1B>&)\
 				string(0,<1B>E<1B>%0B) \
 				string(0,<1B>%-1B) string(0,<201B>)\
@@ -116,13 +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-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,#!) +\
@@ -130,15 +129,7 @@ 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

 ########################################################################
 #
@@ -147,9 +138,7 @@ text/css			css

 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-ppd	ppd string(0,"*PPD-Adobe:")
 application/vnd.cups-raster	string(0,"RaSt") string(0,"tSaR")
 application/vnd.cups-raw	(string(0,<1B>E) + !string(2,<1B>%0B)) \
 				string(0,<1B>@) \
@@ -161,11 +150,13 @@ application/vnd.cups-raw	(string(0,<1B>E) + !string(2,<1B>%0B)) \
 #
 # Raw print file support...
 #
-# Comment the following type to prevent raw file printing.
+# Uncomment the following type and the application/octet-stream
+# filter line in mime.convs to allow raw file printing without the
+# -oraw option.
 #

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

 #
-# End of "$Id: mime.types 5402 2006-04-14 19:21:03Z mike $".
+# End of "$Id: mime.types 4413 2004-09-23 14:30:19Z mike $".
 #
@@ -0,0 +1,2 @@
+# This is a dummy printcap file that is automatically generated by the
+# CUPS software for old applications that rely on it.
@@ -0,0 +1,96 @@
+#
+# "$Id: printers.conf 4088 2004-02-25 20:15:27Z mike $"
+#
+#   Sample printer configuration file for the Common UNIX Printing System
+#   (CUPS) scheduler.
+#
+#   Copyright 1997-2004 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 4088 2004-02-25 20:15:27Z mike $".
+#
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-common.m4 5354 2006-03-29 20:55:15Z mike $"
+dnl "$Id: cups-common.m4 4473 2004-12-16 19:42:22Z mike $"
 dnl
 dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2004 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
@@ -15,7 +15,7 @@ dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
 dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
+dnl       Hollywood, Maryland 20636-3142 USA
 dnl
 dnl       Voice: (301) 373-9600
 dnl       EMail: cups-info@cups.org
@@ -28,17 +28,11 @@ AC_PREREQ(2.50)
 dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)

-dnl Versio number information...
-CUPS_VERSION="1.2svn"
-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
-
+dnl Version number information...
+CUPS_VERSION="1.1.23rc1"
 AC_SUBST(CUPS_VERSION)
-AC_SUBST(CUPS_REVISION)
-AC_DEFINE_UNQUOTED(CUPS_SVERSION, "CUPS v$CUPS_VERSION$CUPS_REVISION")
-AC_DEFINE_UNQUOTED(CUPS_MINIMAL, "CUPS/$CUPS_VERSION$CUPS_REVISION")
+AC_DEFINE_UNQUOTED(CUPS_SVERSION, "CUPS v$CUPS_VERSION")
+AC_DEFINE_UNQUOTED(CUPS_MINIMAL, "CUPS/$CUPS_VERSION")

 dnl Default compiler flags...
 CFLAGS="${CFLAGS:=}"
@@ -59,11 +53,18 @@ fi
 AC_PROG_RANLIB
 AC_PATH_PROG(AR,ar)
 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 "x$NROFF" = x; then
+	AC_PATH_PROG(GROFF,groff)
+	if test "x$GROFF" = x; 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)

@@ -77,16 +78,8 @@ if test "x$CXX" = x; then
 	AC_MSG_ERROR([Unable to find required C++ compiler command.])
 fi

-dnl Static library option...
-INSTALLSTATIC=""
-AC_ARG_ENABLE(static, [  --enable-static         install static libraries, default=no])
-
-if test x$enable_static = xyes; then
-	echo Installing static libraries...
-	INSTALLSTATIC="installstatic"
-fi
-
-AC_SUBST(INSTALLSTATIC)
+dnl Architecture checks...
+AC_C_BIGENDIAN

 dnl Check for libraries...
 AC_SEARCH_LIBS(crypt, crypt)
@@ -123,6 +116,7 @@ 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))
@@ -141,6 +135,22 @@ 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)
+
+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 Checks for mkstemp and mkstemps functions.
 AC_CHECK_FUNCS(mkstemp mkstemps)

@@ -188,82 +198,20 @@ esac
 AC_SUBST(ARFLAGS)

 dnl Extra platform-specific libraries...
-BACKLIBS=""
-CUPSDLIBS=""
-DBUSDIR=""
-
-AC_ARG_ENABLE(dbus, [  --enable-dbus           enable DBUS support, default=auto])
-
 case $uname in
        Darwin*)
                BACKLIBS="-framework IOKit"
-                CUPSDLIBS="-framework IOKit -framework SystemConfiguration"
-                LIBS="-framework CoreFoundation $LIBS"
-
-		dnl Check for CFLocaleCreateCanonicalLocaleIdentifierFromString...
-		AC_MSG_CHECKING(for CFLocaleCreateCanonicalLocaleIdentifierFromString)
-		if test "$uname" = "Darwin" -a $uversion -ge 70; then
-			AC_DEFINE(HAVE_CF_LOCALE_ID)
-			AC_MSG_RESULT(yes)
-		else
-			AC_MSG_RESULT(no)
-		fi
-
-		dnl Check for framework headers...
-		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 the new membership functions in MacOSX 10.4 (Tiger)...
-		AC_CHECK_HEADER(membership.h,AC_DEFINE(HAVE_MEMBERSHIP_H))
-		AC_CHECK_FUNCS(mbr_uid_to_uuid)
-
-		dnl Check for notify_post support
-		AC_CHECK_HEADER(notify.h,AC_DEFINE(HAVE_NOTIFY_H))
-		AC_CHECK_FUNCS(notify_post)
+                COMMONLIBS="-framework CoreFoundation"
+                ;;
+        *)
+                BACKLIBS=""
+		COMMONLIBS=""
                ;;
-
-	Linux*)
-		dnl Check for DBUS support
-		if test "x$enable_dbus" != xno; then
-			AC_PATH_PROG(PKGCONFIG, pkg-config)
-			if test "x$PKGCONFIG" != x; then
-				AC_MSG_CHECKING(for DBUS)
-				if $PKGCONFIG --exists dbus-1; then
-					AC_MSG_RESULT(yes)
-					AC_CHECK_LIB(dbus-1,
-					    dbus_message_iter_init_append,
-					    AC_DEFINE(HAVE_DBUS)
-					    CFLAGS="$CFLAGS `$PKGCONFIG --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE"
-					    CUPSDLIBS="`$PKGCONFIG --libs dbus-1`"
-					    DBUSDIR="/etc/dbus-1/system.d")
-				else
-					AC_MSG_RESULT(no)
-				fi
-			fi
-		fi
-		;;
 esac

-dnl See if we have POSIX ACL support...
-SAVELIBS="$LIBS"
-LIBS=""
-AC_SEARCH_LIBS(acl_init, acl, AC_DEFINE(HAVE_ACL_INIT))
-CUPSDLIBS="$CUPSDLIBS $LIBS"
-LIBS="$SAVELIBS"
-
 AC_SUBST(BACKLIBS)
-AC_SUBST(CUPSDLIBS)
-AC_SUBST(DBUSDIR)
-
-dnl New default port definition for IPP...
-AC_ARG_WITH(ipp-port, [  --with-ipp-port         set default port number for IPP ],
-	DEFAULT_IPP_PORT="$withval",
-	DEFAULT_IPP_PORT="631")
-
-AC_SUBST(DEFAULT_IPP_PORT)
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT)
+AC_SUBST(COMMONLIBS)

 dnl
-dnl End of "$Id: cups-common.m4 5354 2006-03-29 20:55:15Z mike $".
+dnl End of "$Id: cups-common.m4 4473 2004-12-16 19:42:22Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-compiler.m4 5288 2006-03-14 02:38:07Z mike $"
+dnl "$Id: cups-compiler.m4 4358 2004-08-11 14:39:26Z mike $"
 dnl
-dnl   Compiler stuff for the Common UNIX Printing System (CUPS).
+dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2004 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
@@ -15,75 +15,68 @@ dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
 dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
+dnl       Hollywood, Maryland 20636-3142 USA
 dnl
 dnl       Voice: (301) 373-9600
 dnl       EMail: cups-info@cups.org
 dnl         WWW: http://www.cups.org
 dnl
-
 dnl Clear the debugging and non-shared library options unless the user asks
 dnl for them...
-ARCHFLAGS=""
-OPTIM=""
-AC_SUBST(ARCHFLAGS)
-AC_SUBST(OPTIM)

-AC_ARG_WITH(optim, [  --with-optim="flags"    set optimization flags ])
-AC_ARG_WITH(archflags, [  --with-arch="flags"     set default architecture flags ])
+OPTIM=""
+AC_SUBST(OPTIM)

 AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging, default=no],
 	[if test x$enable_debug = xyes; then
 		OPTIM="-g"
 	fi])

-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, default=no])
-AC_ARG_WITH(arch32flags, [  --with-arch32="flags"   specifies 32-bit architecture flags])
-
-ARCH32FLAGS=""
-INSTALL32=""
-LIB32CUPS=""
-LIB32CUPSIMAGE=""
-LIB32DIR=""
-UNINSTALL32=""
-
-AC_SUBST(ARCH32FLAGS)
-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, default=no])
-AC_ARG_WITH(arch64flags, [  --with-arch64="flags"   specifies 64-bit architecture flags])
-
-ARCH64FLAGS=""
-INSTALL64=""
-LIB64CUPS=""
-LIB64CUPSIMAGE=""
-LIB64DIR=""
-UNINSTALL64=""
-
-AC_SUBST(ARCH64FLAGS)
-AC_SUBST(INSTALL64)
-AC_SUBST(LIB64CUPS)
-AC_SUBST(LIB64CUPSIMAGE)
-AC_SUBST(LIB64DIR)
-AC_SUBST(UNINSTALL64)
-
-dnl Position-Independent Executable support on Linux and *BSD...
-AC_ARG_ENABLE(pie, [  --enable-pie            use GCC -fpie option, default=no])
+AC_ARG_WITH(optim, [  --with-optim="flags"    set optimization flags ])

 dnl Update compiler options...
 CXXLIBS=""
 AC_SUBST(CXXLIBS)

 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"
+
 	if test -z "$OPTIM"; then
 		if test "x$with_optim" = x; then
-			# Default to optimize-for-size and debug
-       			OPTIM="-Os -g"
+			if test $uname = HP-UX; then
+				# GCC under HP-UX has bugs with -O2
+				OPTIM="-O1"
+			else
+		       		OPTIM="-O2"
+			fi
 		else
 			OPTIM="$with_optim $OPTIM"
 		fi
@@ -93,190 +86,9 @@ if test -n "$GCC"; then
    		OPTIM="-fPIC $OPTIM"
 	fi

-	case $uname in
-		Linux*)
-			if test x$enable_pie = xyes; then
-				OPTIM="$OPTIM -fpie"
-				LDFLAGS="$LDFLAGS -pie"
-			fi
-			;;
-	esac
-
 	if test "x$with_optim" = x; then
-		# Add useful warning options for tracking down problems...
-		OPTIM="-Wall -Wno-format-y2k $OPTIM"
-		# Additional warning options for alpha testing...
-		OPTIM="-Wshadow -Wunused $OPTIM"
+		OPTIM="-Wall $OPTIM"
 	fi
-
-	case "$uname" in
-		Darwin*)
-			if test -z "$with_archflags"; then
-				if test "x`uname -m`" = xi386; then
-					# Build universal binaries for OSX on Intel...
-					ARCHFLAGS="-arch i386 -arch ppc"
-				fi
-			else
-				ARCHFLAGS="$with_archflags"
-			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
-				INSTALL32="install32bit"
-				LIB32CUPS="libcups.32.so.2"
-				LIB32CUPSIMAGE="libcupsimage.32.so.2"
-				LIB32DIR="$prefix/lib32"
-				UNINSTALL32="uninstall32bit"
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch64flags"; then
-						ARCHFLAGS="-64 -mips4"
-					else
-						ARCHFLAGS="$with_arch64flags"
-					fi
-				else
-					ARCHFLAGS="$with_archflags"
-				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
-				INSTALL64="install64bit"
-				LIB64CUPS="libcups.64.so.2"
-				LIB64CUPSIMAGE="libcupsimage.64.so.2"
-				LIB64DIR="$prefix/lib64"
-				UNINSTALL64="uninstall64bit"
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch32flags"; then
-						ARCHFLAGS="-n32 -mips3"
-					else
-						ARCHFLAGS="$with_arch32flags"
-					fi
-				else
-					ARCHFLAGS="$with_archflags"
-				fi
-			fi
-			;;
-
-		Linux*)
-			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
-				INSTALL32="install32bit"
-				LIB32CUPS="libcups.32.so.2"
-				LIB32CUPSIMAGE="libcupsimage.32.so.2"
-				LIB32DIR="$exec_prefix/lib"
-				if test -d /usr/lib32; then
-					LIB32DIR="${LIB32DIR}32"
-				fi
-				UNINSTALL32="uninstall32bit"
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch64flags"; then
-						ARCHFLAGS="-m64"
-					else
-						ARCHFLAGS="$with_arch64flags"
-					fi
-				else
-					ARCHFLAGS="$with_archflags"
-				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
-				INSTALL64="install64bit"
-				LIB64CUPS="libcups.64.so.2"
-				LIB64CUPSIMAGE="libcupsimage.64.so.2"
-				LIB64DIR="$exec_prefix/lib"
-				if test -d /usr/lib64; then
-					LIB64DIR="${LIB64DIR}64"
-				fi
-				UNINSTALL64="uninstall64bit"
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch32flags"; then
-						ARCHFLAGS="-m32"
-					else
-						ARCHFLAGS="$with_arch32flags"
-					fi
-				else
-					ARCHFLAGS="$with_archflags"
-				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
-				INSTALL32="install32bit"
-				LIB32CUPS="libcups.32.so.2"
-				LIB32CUPSIMAGE="libcupsimage.32.so.2"
-				LIB32DIR="$exec_prefix/lib/32"
-				UNINSTALL32="uninstall32bit"
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch64flags"; then
-						ARCHFLAGS="-m64"
-					else
-						ARCHFLAGS="$with_arch64flags"
-					fi
-				else
-					ARCHFLAGS="$with_archflags"
-				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
-				INSTALL64="install64bit"
-				LIB64CUPS="libcups.64.so.2"
-				LIB64CUPSIMAGE="libcupsimage.64.so.2"
-				LIB64DIR="$exec_prefix/lib/64"
-				UNINSTALL64="uninstall64bit"
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch32flags"; then
-						ARCHFLAGS="-m32"
-					else
-						ARCHFLAGS="$with_arch32flags"
-					fi
-				else
-					ARCHFLAGS="$with_archflags"
-				fi
-			fi
-			;;
-	esac
 else
 	case $uname in
 		AIX*)
@@ -298,9 +110,6 @@ else
 			fi

 			CFLAGS="-Ae $CFLAGS"
-			# Warning 336 is "empty translation unit"
-			# Warning 829 is passing constant string as char *
-			CXXFLAGS="+W336,829 $CXXFLAGS"

 			if test "x$with_optim" = x; then
 				OPTIM="+DAportable $OPTIM"
@@ -319,55 +128,20 @@ else
 				fi
 			fi

+			if test $uversion -ge 62 -a "x$with_optim" = x; then
+				OPTIM="$OPTIM -n32 -mips3"
+			fi
+
 			if test "x$with_optim" = x; then
-				OPTIM="-fullwarn -woff 1183,1209,1349,1506,3201 $OPTIM"
-			fi
-
-			if test "x$enable_32bit" = xyes; then
-				# Build 32-bit libraries, 64-bit base...
-				if test -z "$with_arch32flags"; then
-					ARCH32FLAGS="-n32 -mips3"
-				else
-					ARCH32FLAGS="$with_arch32flags"
-				fi
-				INSTALL32="install32bit"
-				LIB32CUPS="libcups.32.so.2"
-				LIB32CUPSIMAGE="libcupsimage.32.so.2"
-				LIB32DIR="$prefix/lib32"
-				UNINSTALL32="uninstall32bit"
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch64flags"; then
-						ARCHFLAGS="-64 -mips4"
-					else
-						ARCHFLAGS="$with_arch64flags"
-					fi
-				else
-					ARCHFLAGS="$with_archflags"
-				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
-				INSTALL64="install64bit"
-				LIB64CUPS="libcups.64.so.2"
-				LIB64CUPSIMAGE="libcupsimage.64.so.2"
-				LIB64DIR="$prefix/lib64"
-				UNINSTALL64="uninstall64bit"
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch32flags"; then
-						ARCHFLAGS="-n32 -mips3"
-					else
-						ARCHFLAGS="$with_arch32flags"
-					fi
-				else
-					ARCHFLAGS="$with_archflags"
+				# 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"
 				fi
 			fi
 			;;
@@ -381,53 +155,14 @@ else
 				fi
 			fi

-			if test $PICFLAG = 1; then
-				OPTIM="-KPIC $OPTIM"
+			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 "x$enable_32bit" = xyes; then
-				# Compiling on a Solaris system, build 64-bit
-				# binaries with separate 32-bit libraries...
-				ARCH32FLAGS="-xarch=generic"
-				INSTALL32="install32bit"
-				LIB32CUPS="libcups.32.so.2"
-				LIB32CUPSIMAGE="libcupsimage.32.so.2"
-				LIB32DIR="$exec_prefix/lib/32"
-				UNINSTALL32="uninstall32bit"
-
-				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"
-					CFLAGS="-xarch=generic64 $CFLAGS"
-				fi
-			else
-				if test "x$enable_64bit" = xyes; then
-					# Build 64-bit libraries...
-					ARCH64FLAGS="-xarch=generic64"
-					INSTALL64="install64bit"
-					LIB64CUPS="libcups.64.so.2"
-					LIB64CUPSIMAGE="libcupsimage.64.so.2"
-					LIB64DIR="$exec_prefix/lib/64"
-					UNINSTALL64="uninstall64bit"
-
-					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"
-						CFLAGS="-xarch=generic $CFLAGS"
-					fi
-				else
-					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"
-						CFLAGS="-xarch=generic $CFLAGS"
-					fi
-				fi
+			if test $PICFLAG = 1; then
+				OPTIM="-KPIC $OPTIM"
 			fi
 			;;
 		UNIX_SVR*)
@@ -467,5 +202,5 @@ if test $uname = HP-UX; then
 fi

 dnl
-dnl End of "$Id: cups-compiler.m4 5288 2006-03-14 02:38:07Z mike $".
+dnl End of "$Id: cups-compiler.m4 4358 2004-08-11 14:39:26Z mike $".
 dnl
@@ -1,240 +0,0 @@
-dnl
-dnl "$Id$"
-dnl
-dnl   Default cupsd configuration settings for the Common UNIX Printing System
-dnl   (CUPS).
-dnl
-dnl   Copyright 2006 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 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
-dnl
-
-dnl Default langugages...
-AC_ARG_WITH(languages, [  --with-languages        set installed languages, default="es ja" ],
-	LANGUAGES="$withval",
-	LANGUAGES="es ja pl sv")
-AC_SUBST(LANGUAGES)
-
-dnl Default ConfigFilePerm
-AC_ARG_WITH(config_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_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 Browsing
-AC_ARG_ENABLE(browsing, [  --enable-browsing       enable Browsing by default, default=yes])
-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(browse_local, [  --with-local-protocols  set default BrowseLocalProtocols, default="CUPS"],
-	CUPS_BROWSE_LOCAL_PROTOCOLS="$withval",
-	CUPS_BROWSE_LOCAL_PROTOCOLS="CUPS")
-AC_SUBST(CUPS_BROWSE_LOCAL_PROTOCOLS)
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS,
-	"$CUPS_BROWSE_LOCAL_PROTOCOLS")
-
-dnl Default BrowseRemoteProtocols
-AC_ARG_WITH(browse_remote, [  --with-remote-protocols set default BrowseRemoteProtocols, default="CUPS"],
-	CUPS_BROWSE_REMOTE_PROTOCOLS="$withval",
-	CUPS_BROWSE_REMOTE_PROTOCOLS="CUPS")
-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, [  --enable-browse-short-names
-                          enable BrowseShortNames by default, default=yes])
-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, [  --enable-default-shared enable DefaultShared by default, default=yes])
-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, [  --enable-implicit-classes
-                          enable ImplicitClasses by default, default=yes])
-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(network_default, [  --enable-use-network-default
-                          enable UseNetworkDefault by default, default=auto])
-if test "x$enable_network_default" != xno; then
-	AC_MSG_CHECKING(whether to use network default printers)
-	if test "x$enable_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 -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)
-
-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 -f /etc/group; then
-		GROUP_LIST="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)
-
-AC_ARG_WITH(system-groups, [  --with-system-groups    set default system groups for CUPS],
-	CUPS_SYSTEM_GROUPS="$withval",
-	if test x$uname = xDarwin; then
-		GROUP_LIST="admin"
-	else
-		GROUP_LIST="lpadmin sys system root"
-	fi
-
-	AC_MSG_CHECKING(for default system groups)
-	if test -f /etc/group; then
-		CUPS_SYSTEM_GROUPS=""
-		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)
-
-CUPS_PRIMARY_SYSTEM_GROUP="`echo $CUPS_SYSTEM_GROUPS | awk '{print $1}'`"
-
-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="/etc/printcap")
-
-if test x$enable_printcap != xno -a x$default_printcap != xno; then
-	if test "x$default_printcap" = "x/etc/printcap" -a "$uname" = "Darwin" -a $uversion -ge 90; then
-		CUPS_DEFAULT_PRINTCAP=""
-	else
-		CUPS_DEFAULT_PRINTCAP="$default_printcap"
-	fi
-else
-	CUPS_DEFAULT_PRINTCAP=""
-fi
-
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_PRINTCAP, "$CUPS_DEFAULT_PRINTCAP")
-
-dnl
-dnl End of "$Id$".
-dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-directories.m4 5314 2006-03-20 19:06:50Z mike $"
+dnl "$Id: cups-directories.m4 4358 2004-08-11 14:39:26Z mike $"
 dnl
 dnl   Directory stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2004 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
@@ -15,7 +15,7 @@ dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
 dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
+dnl       Hollywood, Maryland 20636-3142 USA
 dnl
 dnl       Voice: (301) 373-9600
 dnl       EMail: cups-info@cups.org
@@ -24,6 +24,11 @@ dnl

 AC_PREFIX_DEFAULT(/)

+AC_ARG_WITH(fontpath, [  --with-fontpath         set font path for pstoraster],fontpath="$withval",fontpath="")
+AC_ARG_WITH(docdir, [  --with-docdir           set path for documentation],docdir="$withval",docdir="")
+AC_ARG_WITH(logdir, [  --with-logdir           set path for log files],logdir="$withval",logdir="")
+AC_ARG_WITH(rcdir, [  --with-rcdir            set path for rc scripts],rcdir="$withval",rcdir="")
+
 dnl Fix "prefix" variable if it hasn't been specified...
 if test "$prefix" = "NONE"; then
 	prefix="/"
@@ -38,20 +43,6 @@ if test "$exec_prefix" = "NONE"; then
 	fi
 fi

-dnl Fix "bindir" variable...
-if test "$bindir" = "\${exec_prefix}/bin"; then
-	bindir="$exec_prefix/bin"
-fi
-
-AC_DEFINE_UNQUOTED(CUPS_BINDIR, "$bindir")
-
-dnl Fix "sbindir" variable...
-if test "$sbindir" = "\${exec_prefix}/sbin"; then
-	sbindir="$exec_prefix/sbin"
-fi
-
-AC_DEFINE_UNQUOTED(CUPS_SBINDIR, "$sbindir")
-
 dnl Fix "sharedstatedir" variable if it hasn't been specified...
 if test "$sharedstatedir" = "\${prefix}/com" -a "$prefix" = "/"; then
 	sharedstatedir="/usr/com"
@@ -74,11 +65,7 @@ fi
 dnl Fix "localstatedir" variable if it hasn't been specified...
 if test "$localstatedir" = "\${prefix}/var"; then
 	if test "$prefix" = "/"; then
-		if test "$uname" = Darwin; then
-			localstatedir="/private/var"
-		else
-			localstatedir="/var"
-		fi
+		localstatedir="/var"
 	else
 		localstatedir="$prefix/var"
 	fi
@@ -87,11 +74,7 @@ fi
 dnl Fix "sysconfdir" variable if it hasn't been specified...
 if test "$sysconfdir" = "\${prefix}/etc"; then
 	if test "$prefix" = "/"; then
-		if test "$uname" = Darwin; then
-			sysconfdir="/private/etc"
-		else
-			sysconfdir="/etc"
-		fi
+		sysconfdir="/etc"
 	else
 		sysconfdir="$prefix/etc"
 	fi
@@ -99,20 +82,19 @@ fi

 dnl Fix "libdir" variable for IRIX 6.x...
 if test "$libdir" = "\${exec_prefix}/lib"; then
-	if test "$uname" = "IRIX"; then
-		libdir="$exec_prefix/lib32"
-	else
-		if test "$uname" = Linux -a -d /usr/lib64; then
-			libdir="$exec_prefix/lib64"
-		else
-			libdir="$exec_prefix/lib"
-		fi
-	fi
+	libdir="$exec_prefix/lib"
+fi
+
+if test "$uname" = "IRIX" -a $uversion -ge 62; then
+	libdir="$exec_prefix/lib32"
+fi
+
+dnl Fix "fontpath" variable...
+if test "x$fontpath" = "x"; then
+	fontpath="$datadir/cups/fonts"
 fi

 dnl Setup init.d locations...
-AC_ARG_WITH(rcdir, [  --with-rcdir            set path for rc scripts],rcdir="$withval",rcdir="")
-
 if test x$rcdir = x; then
 	case "$uname" in
 		FreeBSD* | OpenBSD*)
@@ -130,9 +112,7 @@ if test x$rcdir = x; then
 		Darwin*)
 			# Darwin and MacOS X...
 			INITDIR=""
-			AC_CHECK_PROG(INITDDIR, launchd, 
-				"/System/Library/LaunchDaemons", 
-				"/System/Library/StartupItems/PrintingServices")
+			INITDDIR="/System/Library/StartupItems/PrintingServices"
 			;;

 		Linux | GNU)
@@ -142,14 +122,14 @@ if test x$rcdir = x; then
 				INITDIR="/sbin/init.d"
 				INITDDIR=".."
 			else
-				if test -d /etc/init.d; then
-					# Others
-					INITDIR="/etc"
-					INITDDIR="../init.d"
-				else
+				if test -d /etc/rc.d; then
 					# RedHat
 					INITDIR="/etc/rc.d"
 					INITDDIR="../init.d"
+				else
+					# Others
+					INITDIR="/etc"
+					INITDDIR="../init.d"
 				fi
 			fi
 			;;
@@ -178,41 +158,70 @@ fi
 AC_SUBST(INITDIR)
 AC_SUBST(INITDDIR)

-dnl Xinetd support...
-XINETD=""
-for dir in /private/etc/xinetd.d /etc/xinetd.d /usr/local/etc/xinetd.d; do
-	if test -d $dir; then
-		XINETD="$dir"
-		break
-	fi
-done
-
-AC_SUBST(XINETD)
-
 dnl Setup default locations...
-# Cache data...
-AC_ARG_WITH(cachedir, [  --with-cachedir         set path for cache files],cachedir="$withval",cachedir="")
+CUPS_SERVERROOT="$sysconfdir/cups"
+CUPS_REQUESTS="$localstatedir/spool/cups"

-if test x$cachedir = x; then
-	if test "x$uname" = xDarwin; then
-		CUPS_CACHEDIR="$localstatedir/tmp/cups"
-	else
-		CUPS_CACHEDIR="$localstatedir/cache/cups"
-	fi
+AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$sysconfdir/cups")
+AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$localstatedir/spool/cups")
+
+if test x$logdir = x; then
+	CUPS_LOGDIR="$localstatedir/log/cups"
+	AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$localstatedir/log/cups")
 else
-	CUPS_CACHEDIR="$cachedir"
+	CUPS_LOGDIR="$logdir"
+	AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$logdir")
 fi
-AC_DEFINE_UNQUOTED(CUPS_CACHEDIR, "$CUPS_CACHEDIR")
-AC_SUBST(CUPS_CACHEDIR)

-# Data files
+dnl See what directory to put server executables...
+case "$uname" in
+	*BSD* | Darwin*)
+		# *BSD and Darwin (MacOS X)
+		INSTALL_SYSV=""
+		CUPS_SERVERBIN="$exec_prefix/libexec/cups"
+		AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$exec_prefix/libexec/cups")
+		;;
+	*)
+		# All others
+		INSTALL_SYSV="install-sysv"
+		CUPS_SERVERBIN="$libdir/cups"
+		AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$libdir/cups")
+		;;
+esac
+
+AC_SUBST(INSTALL_SYSV)
+AC_SUBST(CUPS_SERVERROOT)
+AC_SUBST(CUPS_SERVERBIN)
+AC_SUBST(CUPS_LOGDIR)
+AC_SUBST(CUPS_REQUESTS)
+
+dnl Set the CUPS_LOCALE directory...
+case "$uname" in
+	Linux | GNU | *BSD* | Darwin*)
+		CUPS_LOCALEDIR="$datadir/locale"
+		AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$datadir/locale")
+		;;
+
+	OSF1* | AIX*)
+		CUPS_LOCALEDIR="$exec_prefix/lib/nls/msg"
+		AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$exec_prefix/lib/nls/msg")
+		;;
+
+	*)
+		# This is the standard System V location...
+		CUPS_LOCALEDIR="$exec_prefix/lib/locale"
+		AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$exec_prefix/lib/locale")
+		;;
+esac
+
+AC_SUBST(CUPS_LOCALEDIR)
+
+dnl Set the CUPS_DATADIR directory...
 CUPS_DATADIR="$datadir/cups"
 AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$datadir/cups")
 AC_SUBST(CUPS_DATADIR)

-# Documentation files
-AC_ARG_WITH(docdir, [  --with-docdir           set path for documentation],docdir="$withval",docdir="")
-
+dnl Set the CUPS_DOCROOT directory...
 if test x$docdir = x; then
 	CUPS_DOCROOT="$datadir/doc/cups"
 	docdir="$datadir/doc/cups"
@@ -223,82 +232,11 @@ fi
 AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$docdir")
 AC_SUBST(CUPS_DOCROOT)

-# Fonts
-AC_ARG_WITH(fontpath, [  --with-fontpath         set font path for pstoraster],fontpath="$withval",fontpath="")
-
-if test "x$fontpath" = "x"; then
-	CUPS_FONTPATH="$datadir/cups/fonts"
-else
-	CUPS_FONTPATH="$fontpath"
-fi
-
+dnl Set the CUPS_FONTPATH directory...
+CUPS_FONTPATH="$fontpath"
 AC_SUBST(CUPS_FONTPATH)
-AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$CUPS_FONTPATH")
-
-# Locale data
-case "$uname" in
-	Linux | GNU | *BSD* | Darwin*)
-		CUPS_LOCALEDIR="$datadir/locale"
-		;;
-
-	OSF1* | AIX*)
-		CUPS_LOCALEDIR="$exec_prefix/lib/nls/msg"
-		;;
-
-	*)
-		# This is the standard System V location...
-		CUPS_LOCALEDIR="$exec_prefix/lib/locale"
-		;;
-esac
-
-AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR")
-AC_SUBST(CUPS_LOCALEDIR)
-
-# Log files...
-AC_ARG_WITH(logdir, [  --with-logdir           set path for log files],logdir="$withval",logdir="")
-
-if test x$logdir = x; then
-	CUPS_LOGDIR="$localstatedir/log/cups"
-	AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$localstatedir/log/cups")
-else
-	CUPS_LOGDIR="$logdir"
-fi
-AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$CUPS_LOGDIR")
-AC_SUBST(CUPS_LOGDIR)
-
-# Longer-term spool data
-CUPS_REQUESTS="$localstatedir/spool/cups"
-AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$localstatedir/spool/cups")
-AC_SUBST(CUPS_REQUESTS)
-
-# Server executables...
-case "$uname" in
-	*BSD* | Darwin*)
-		# *BSD and Darwin (MacOS X)
-		INSTALL_SYSV=""
-		CUPS_SERVERBIN="$exec_prefix/libexec/cups"
-		;;
-	*)
-		# All others
-		INSTALL_SYSV="install-sysv"
-		CUPS_SERVERBIN="$exec_prefix/lib/cups"
-		;;
-esac
-
-AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$CUPS_SERVERBIN")
-AC_SUBST(CUPS_SERVERBIN)
-AC_SUBST(INSTALL_SYSV)
-
-# Configuration files
-CUPS_SERVERROOT="$sysconfdir/cups"
-AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$sysconfdir/cups")
-AC_SUBST(CUPS_SERVERROOT)
-
-# Transient run-time state
-CUPS_STATEDIR="$localstatedir/run/cups"
-AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$localstatedir/run/cups")
-AC_SUBST(CUPS_STATEDIR)
+AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath")

 dnl
-dnl End of "$Id: cups-directories.m4 5314 2006-03-20 19:06:50Z mike $".
+dnl End of "$Id: cups-directories.m4 4358 2004-08-11 14:39:26Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-image.m4 5451 2006-04-22 21:54:49Z mike $"
+dnl "$Id: cups-image.m4 4213 2004-06-29 03:44:53Z mike $"
 dnl
-dnl   Image library/filter stuff for the Common UNIX Printing System (CUPS).
+dnl   Image library stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2004 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
@@ -15,38 +15,18 @@ dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
 dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
+dnl       Hollywood, Maryland 20636-3142 USA
 dnl
 dnl       Voice: (301) 373-9600
 dnl       EMail: cups-info@cups.org
 dnl         WWW: http://www.cups.org
 dnl

-dnl See if we want the image filters included at all...
-AC_ARG_ENABLE(image, [  --enable-image          turn on image filters, default=auto])
-
-IMGFILTERS=""
-if test "x$enable_image" != xno; then
-        AC_MSG_CHECKING(whether to build image filters)
-        if test "x$enable_image" = xyes -o $uname != Darwin; then
-		IMGFILTERS="imagetops imagetoraster"
-                AC_MSG_RESULT(yes)
-        else
-                AC_MSG_RESULT(no)
-        fi
-fi
-
-AC_SUBST(IMGFILTERS)
-
 dnl Save the current libraries since we don't want the image libraries
 dnl included with every program...
 SAVELIBS="$LIBS"

 dnl Check for image libraries...
-AC_ARG_ENABLE(jpeg, [  --enable-jpeg           turn on JPEG support, default=yes])
-AC_ARG_ENABLE(png, [  --enable-png            turn on PNG support, default=yes])
-AC_ARG_ENABLE(tiff, [  --enable-tiff           turn on TIFF support, default=yes])
-
 LIBJPEG=""
 LIBPNG=""
 LIBTIFF=""
@@ -57,15 +37,11 @@ AC_SUBST(LIBPNG)
 AC_SUBST(LIBTIFF)
 AC_SUBST(LIBZ)

-if test x$enable_jpeg != xno; then
-    AC_CHECK_HEADER(jpeglib.h,
-	AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
-	    AC_DEFINE(HAVE_LIBJPEG)
-	    LIBJPEG="-ljpeg"
-	    LIBS="$LIBS -ljpeg"))
-else
-    AC_MSG_NOTICE([JPEG support disabled with --disable-jpeg.])
-fi
+AC_CHECK_HEADER(jpeglib.h,
+    AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
+	AC_DEFINE(HAVE_LIBJPEG)
+	LIBJPEG="-ljpeg"
+	LIBS="$LIBS -ljpeg"))

 AC_CHECK_HEADER(zlib.h,
    AC_CHECK_LIB(z, gzgets,
@@ -76,23 +52,15 @@ AC_CHECK_HEADER(zlib.h,
 dnl PNG library uses math library functions...
 AC_CHECK_LIB(m, pow)

-if test x$enable_png != xno; then
-    AC_CHECK_HEADER(png.h,
-	AC_CHECK_LIB(png, png_create_read_struct,
-	    AC_DEFINE(HAVE_LIBPNG)
-	    LIBPNG="-lpng -lm"))
-else
-    AC_MSG_NOTICE([PNG support disabled with --disable-png.])
-fi
+AC_CHECK_HEADER(png.h,
+    AC_CHECK_LIB(png, png_set_tRNS_to_alpha,
+	AC_DEFINE(HAVE_LIBPNG)
+	LIBPNG="-lpng -lm"))

-if test x$enable_tiff != xno; then
-    AC_CHECK_HEADER(tiff.h,
-	AC_CHECK_LIB(tiff, TIFFReadScanline,
+AC_CHECK_HEADER(tiff.h,
+    AC_CHECK_LIB(tiff, TIFFReadScanline,
 	AC_DEFINE(HAVE_LIBTIFF)
 	LIBTIFF="-ltiff"))
-else
-    AC_MSG_NOTICE([TIFF support disabled with --disable-tiff.])
-fi

 dnl Restore original LIBS settings...
 LIBS="$SAVELIBS"
@@ -110,5 +78,5 @@ AC_SUBST(EXPORT_LIBZ)
 AC_CHECK_HEADER(stdlib.h,AC_DEFINE(HAVE_STDLIB_H))

 dnl
-dnl End of "$Id: cups-image.m4 5451 2006-04-22 21:54:49Z mike $".
+dnl End of "$Id: cups-image.m4 4213 2004-06-29 03:44:53Z mike $".
 dnl
@@ -1,61 +0,0 @@
-dnl
-dnl "$Id: cups-largefile.m4 4732 2005-09-30 23:23:25Z mike $"
-dnl
-dnl   Large file support stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of 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 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
-dnl
-
-dnl Check for largefile support...
-AC_SYS_LARGEFILE
-
-dnl Define largefile options as needed...
-LARGEFILE=""
-if test x$enable_largefile != xno; then
-	LARGEFILE="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-
-	if test $ac_cv_sys_large_files = 1; then
-		LARGEFILE="$LARGEFILE -D_LARGE_FILES"
-	fi
-
-	if test $ac_cv_sys_file_offset_bits = 64; then
-		LARGEFILE="$LARGEFILE -D_FILE_OFFSET_BITS=64"
-	fi
-fi
-AC_SUBST(LARGEFILE)
-
-dnl Check for "long long" support...
-AC_CACHE_CHECK(for long long int, ac_cv_c_long_long,
-	[if test "$GCC" = yes; then
-		ac_cv_c_long_long=yes
-	else
-		AC_TRY_COMPILE(,[long long int i;],
-			ac_cv_c_long_long=yes,
-			ac_cv_c_long_long=no)
-	fi])
-
-if test $ac_cv_c_long_long = yes; then
-	AC_DEFINE(HAVE_LONG_LONG)
-fi
-
-AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL))
-
-dnl
-dnl End of "$Id: cups-largefile.m4 4732 2005-09-30 23:23:25Z mike $".
-dnl
@@ -1,53 +0,0 @@
-dnl
-dnl "$Id$"
-dnl
-dnl   launchd stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of 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 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
-dnl
-
-
-AC_ARG_ENABLE(launchd, [  --enable-launchd        turn on launchd support, default=yes])
-
-DEFAULT_LAUNCHD_CONF=""
-LAUNCHDLIBS=""
-
-if test x$enable_launchd != xno; then
-	AC_CHECK_FUNC(launch_msg, AC_DEFINE(HAVE_LAUNCHD))
-	AC_CHECK_HEADER(launch.h, AC_DEFINE(HAVE_LAUNCH_H))
-
-	case "$uname" in
-		Darwin*)
-			# Darwin, MacOS X
-			DEFAULT_LAUNCHD_CONF="/System/Library/LaunchDaemons/org.cups.cupsd.plist"
-			# liblaunch is already part of libSystem
-			;;
-		*)
-			# All others; this test will need to be updated
-			;;
-	esac
-fi
-
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LAUNCHD_CONF, "$DEFAULT_LAUNCHD_CONF")
-AC_SUBST(DEFAULT_LAUNCHD_CONF)
-AC_SUBST(LAUNCHDLIBS)
-
-dnl
-dnl End of "$Id$".
-dnl
@@ -1,50 +0,0 @@
-dnl
-dnl "$Id$"
-dnl
-dnl   LDAP configuration stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 2003-2006 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of 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 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org/
-dnl
-
-AC_ARG_ENABLE(ldap, [  --enable-ldap           turn on LDAP support, default=yes])
-AC_ARG_WITH(openldap-libs, [  --with-openldap-libs    set directory for OpenLDAP library],
-    LDFLAGS="-L$withval $LDFLAGS"
-    DSOFLAGS="-L$withval $DSOFLAGS",)
-AC_ARG_WITH(openldap-includes, [  --with-openldap-includes
-                          set directory for OpenLDAP includes],
-    CFLAGS="-I$withval $CFLAGS"
-    CXXFLAGS="-I$withval $CXXFLAGS"
-    CPPFLAGS="-I$withval $CPPFLAGS",)
-
-LIBLDAP=""
-
-if test x$enable_ldap != xno; then
-    AC_CHECK_HEADER(ldap.h,
-	AC_CHECK_LIB(ldap, ldap_value_free,
-            AC_DEFINE(HAVE_LDAP)
-            AC_DEFINE(HAVE_OPENLDAP)
-	    LIBLDAP="-lldap"))
-fi
-
-AC_SUBST(LIBLDAP)
-
-
-dnl
-dnl End of "$Id$".
-dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-libtool.m4 4494 2005-02-18 02:18:11Z mike $"
+dnl "$Id: cups-libtool.m4 4213 2004-06-29 03:44:53Z mike $"
 dnl
 dnl   Libtool stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2004 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
@@ -15,7 +15,7 @@ dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
 dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
+dnl       Hollywood, Maryland 20636-3142 USA
 dnl
 dnl       Voice: (301) 373-9600
 dnl       EMail: cups-info@cups.org
@@ -45,5 +45,5 @@ if test x$LIBTOOL != x; then
 fi

 dnl
-dnl End of "$Id: cups-libtool.m4 4494 2005-02-18 02:18:11Z mike $".
+dnl End of "$Id: cups-libtool.m4 4213 2004-06-29 03:44:53Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-manpages.m4 5099 2006-02-13 02:46:10Z mike $"
+dnl "$Id: cups-manpages.m4 4358 2004-08-11 14:39:26Z mike $"
 dnl
 dnl   Manpage stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2004 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
@@ -15,7 +15,7 @@ dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
 dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
+dnl       Hollywood, Maryland 20636-3142 USA
 dnl
 dnl       Voice: (301) 373-9600
 dnl       EMail: cups-info@cups.org
@@ -56,52 +56,49 @@ dnl Setup manpage extensions...
 case "$uname" in
 	*BSD* | Darwin*)
 		# *BSD
-		MAN1EXT=1
-		MAN5EXT=5
-		MAN7EXT=7
+		CAT1EXT=0
+		CAT3EXT=0
+		CAT5EXT=0
+		CAT8EXT=0
 		MAN8EXT=8
 		MAN8DIR=8
 		;;
 	IRIX*)
 		# SGI IRIX
-		MAN1EXT=1
-		MAN5EXT=5
-		MAN7EXT=7
+		CAT1EXT=z
+		CAT3EXT=z
+		CAT5EXT=z
+		CAT8EXT=z
 		MAN8EXT=1m
 		MAN8DIR=1
 		;;
 	SunOS* | HP-UX*)
 		# Solaris and HP-UX
-		MAN1EXT=1
-		MAN5EXT=5
-		MAN7EXT=7
+		CAT1EXT=1
+		CAT3EXT=3
+		CAT5EXT=5
+		CAT8EXT=1m
 		MAN8EXT=1m
 		MAN8DIR=1m
 		;;
-	Linux* | GNU*)
-		# Linux and GNU Hurd
-		MAN1EXT=1.gz
-		MAN5EXT=5.gz
-		MAN7EXT=7.gz
-		MAN8EXT=8.gz
-		MAN8DIR=8
-		;;
 	*)
 		# All others
-		MAN1EXT=1
-		MAN5EXT=5
-		MAN7EXT=7
+		CAT1EXT=1
+		CAT3EXT=3
+		CAT5EXT=5
+		CAT8EXT=8
 		MAN8EXT=8
 		MAN8DIR=8
 		;;
 esac

-AC_SUBST(MAN1EXT)
-AC_SUBST(MAN5EXT)
-AC_SUBST(MAN7EXT)
+AC_SUBST(CAT1EXT)
+AC_SUBST(CAT3EXT)
+AC_SUBST(CAT5EXT)
+AC_SUBST(CAT8EXT)
 AC_SUBST(MAN8EXT)
 AC_SUBST(MAN8DIR)

 dnl
-dnl End of "$Id: cups-manpages.m4 5099 2006-02-13 02:46:10Z mike $".
+dnl End of "$Id: cups-manpages.m4 4358 2004-08-11 14:39:26Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-network.m4 4873 2005-12-07 01:46:54Z mike $"
+dnl "$Id: cups-network.m4 4213 2004-06-29 03:44:53Z mike $"
 dnl
 dnl   Networking stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2004 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
@@ -15,23 +15,26 @@ dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
 dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
+dnl       Hollywood, Maryland 20636-3142 USA
 dnl
 dnl       Voice: (301) 373-9600
 dnl       EMail: cups-info@cups.org
 dnl         WWW: http://www.cups.org
 dnl

-AC_SEARCH_LIBS(socket, socket)
-AC_SEARCH_LIBS(gethostbyaddr, nsl)
-AC_SEARCH_LIBS(getaddrinfo, nsl, AC_DEFINE(HAVE_GETADDRINFO))
-AC_SEARCH_LIBS(getifaddrs, nsl, AC_DEFINE(HAVE_GETIFADDRS))
-AC_SEARCH_LIBS(getnameinfo, nsl, AC_DEFINE(HAVE_GETNAMEINFO))
-AC_SEARCH_LIBS(hstrerror, nsl socket resolv, AC_DEFINE(HAVE_HSTRERROR))
-AC_SEARCH_LIBS(rresvport_af, nsl, AC_DEFINE(HAVE_RRESVPORT_AF))
+NETLIBS=""

-AC_CHECK_MEMBER(struct sockaddr.sa_len,,, [#include <sys/socket.h>])
-AC_CHECK_HEADER(sys/sockio.h, AC_DEFINE(HAVE_SYS_SOCKIO_H))
+if test "$uname" != "IRIX"; then
+	AC_CHECK_LIB(socket,socket,NETLIBS="-lsocket")
+	AC_CHECK_LIB(nsl,gethostbyaddr,NETLIBS="$NETLIBS -lnsl")
+fi
+
+AC_CHECK_FUNCS(rresvport getifaddrs hstrerror)
+
+AC_CHECK_MEMBER(struct sockaddr.sa_len,,,[#include <sys/socket.h>])
+AC_CHECK_HEADER(sys/sockio.h,AC_DEFINE(HAVE_SYS_SOCKIO_H))
+
+AC_SUBST(NETLIBS)

 if test "$uname" = "SunOS"; then
 	case "$uversion" in
@@ -51,39 +54,6 @@ AC_ARG_WITH(maxfiles, [  --with-maxfiles=N       set maximum number of file desc

 AC_DEFINE_UNQUOTED(CUPS_MAX_FDS, $maxfiles)

-CUPS_DEFAULT_DOMAINSOCKET=""
-
-dnl Domain socket support...
-AC_ARG_WITH(domainsocket, [  --with-domainsocket     set unix domain socket name],
-	default_domainsocket="$withval",
-	default_domainsocket="")
-
-if test x$enable_domainsocket != xno -a x$default_domainsocket != xno; then
-	if test "x$default_domainsocket" = x; then
-		case "$uname" in
-			Darwin*)
-				# Darwin and MaxOS X do their own thing...
-				CUPS_DEFAULT_DOMAINSOCKET="$localstatedir/run/cupsd"
-				;;
-			*)
-				# All others use FHS standard...
-				CUPS_DEFAULT_DOMAINSOCKET="$CUPS_STATEDIR/cups.sock"
-				;;
-		esac
-	else
-		CUPS_DEFAULT_DOMAINSOCKET="$default_domainsocket"
-	fi
-
-	CUPS_LISTEN_DOMAINSOCKET="Listen $CUPS_DEFAULT_DOMAINSOCKET"
-
-	AC_DEFINE_UNQUOTED(CUPS_DEFAULT_DOMAINSOCKET, "$CUPS_DEFAULT_DOMAINSOCKET")
-else
-	CUPS_LISTEN_DOMAINSOCKET=""
-fi
-
-AC_SUBST(CUPS_DEFAULT_DOMAINSOCKET)
-AC_SUBST(CUPS_LISTEN_DOMAINSOCKET)
-
 dnl
-dnl End of "$Id: cups-network.m4 4873 2005-12-07 01:46:54Z mike $".
+dnl End of "$Id: cups-network.m4 4213 2004-06-29 03:44:53Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-openslp.m4 4494 2005-02-18 02:18:11Z mike $"
+dnl "$Id: cups-openslp.m4 4213 2004-06-29 03:44:53Z mike $"
 dnl
 dnl   OpenSLP configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2004 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
@@ -15,7 +15,7 @@ dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
 dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
+dnl       Hollywood, Maryland 20636-3142 USA
 dnl
 dnl       Voice: (301) 373-9600
 dnl       EMail: cups-info@cups.org
@@ -44,5 +44,5 @@ AC_SUBST(LIBSLP)


 dnl
-dnl End of "$Id: cups-openslp.m4 4494 2005-02-18 02:18:11Z mike $".
+dnl End of "$Id: cups-openslp.m4 4213 2004-06-29 03:44:53Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-ssl.m4 5457 2006-04-24 15:36:12Z mike $"
+dnl "$Id: cups-openssl.m4 4213 2004-06-29 03:44:53Z mike $"
 dnl
 dnl   OpenSSL/GNUTLS stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2004 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
@@ -15,7 +15,7 @@ dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
 dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
+dnl       Hollywood, Maryland 20636-3142 USA
 dnl
 dnl       Voice: (301) 373-9600
 dnl       EMail: cups-info@cups.org
@@ -23,9 +23,9 @@ dnl         WWW: http://www.cups.org
 dnl

 AC_ARG_ENABLE(ssl, [  --enable-ssl            turn on SSL/TLS support, default=yes])
-AC_ARG_ENABLE(cdsassl, [  --enable-cdsassl        use CDSA for SSL/TLS support, default=first])
-AC_ARG_ENABLE(gnutls, [  --enable-gnutls         use GNU TLS for SSL/TLS support, default=second])
-AC_ARG_ENABLE(openssl, [  --enable-openssl        use OpenSSL for SSL/TLS support, default=third])
+AC_ARG_ENABLE(openssl, [  --enable-openssl        use OpenSSL for SSL/TLS support, default=yes])
+AC_ARG_ENABLE(gnutls, [  --enable-gnutls         use GNU TLS for SSL/TLS support, default=yes])
+AC_ARG_ENABLE(cdsassl, [  --enable-cdsassl        use CDSA for SSL/TLS support, default=yes])
 AC_ARG_WITH(openssl-libs, [  --with-openssl-libs     set directory for OpenSSL library],
    LDFLAGS="-L$withval $LDFLAGS"
    DSOFLAGS="-L$withval $DSOFLAGS",)
@@ -36,40 +36,10 @@ AC_ARG_WITH(openssl-includes, [  --with-openssl-includes set directory for OpenS

 SSLFLAGS=""
 SSLLIBS=""
-ENCRYPTION_REQUIRED=""

 if test x$enable_ssl != xno; then
-    dnl Look for CDSA...
-    if test "x${SSLLIBS}" = "x" -a "x${enable_cdsassl}" != "xno"; then
-	if test $uname = Darwin; then
-	    AC_CHECK_HEADER(Security/SecureTransport.h,
-		[SSLLIBS="-framework CoreFoundation -framework Security"
-		 # MacOS X doesn't (yet) come with pre-installed encryption
-		 # certificates for CUPS, so don't enable encryption on
-		 # /admin just yet...
-		 #ENCRYPTION_REQUIRED="  Encryption Required"
-		 AC_DEFINE(HAVE_SSL)
-		 AC_DEFINE(HAVE_CDSASSL)])
-	fi
-    fi
-
-    dnl Then look for GNU TLS...
-    if test "x${SSLLIBS}" = "x" -a "x${enable_gnutls}" != "xno"; then
-	AC_CHECK_HEADER(gnutls/gnutls.h,
-	    dnl Save the current libraries so the crypto stuff isn't always
-	    dnl included...
-	    SAVELIBS="$LIBS"
-
-	    AC_CHECK_LIB(gnutls, gnutls_x509_crt_set_dn_by_oid,
-		[SSLLIBS="-lgnutls"
-		 ENCRYPTION_REQUIRED="  Encryption Required"
-		 AC_DEFINE(HAVE_SSL)
-		 AC_DEFINE(HAVE_GNUTLS)])
-
-	    LIBS="$SAVELIBS")
-    fi
-
-    dnl Check for the OpenSSL library last...
+    dnl Check for the OpenSSL library first, which has precedence over
+    dnl CDSA and GNUTLS...
    if test "x${SSLLIBS}" = "x" -a "x${enable_openssl}" != "xno"; then
 	AC_CHECK_HEADER(openssl/ssl.h,
 	    dnl Save the current libraries so the crypto stuff isn't always
@@ -90,7 +60,6 @@ if test x$enable_ssl != xno; then
 		AC_CHECK_LIB(ssl,SSL_new,
 		    [SSLFLAGS="-DOPENSSL_DISABLE_OLD_DES_SUPPORT"
 		     SSLLIBS="-lssl $libcrypto"
-		     ENCRYPTION_REQUIRED="  Encryption Required"
 		     AC_DEFINE(HAVE_SSL)
 		     AC_DEFINE(HAVE_LIBSSL)],,
 		    $libcrypto)
@@ -102,16 +71,42 @@ if test x$enable_ssl != xno; then

 	    LIBS="$SAVELIBS")
    fi
+
+    dnl If OpenSSL wasn't found, look for CDSA...
+    if test "x${SSLLIBS}" = "x" -a "x${enable_cdsassl}" != "xno"; then
+	if test $uname = Darwin; then
+	    AC_CHECK_HEADER(Security/SecureTransport.h,
+		[SSLLIBS="-framework CoreFoundation -framework Security"
+		 AC_DEFINE(HAVE_SSL)
+		 AC_DEFINE(HAVE_CDSASSL)])
+	fi
+    fi
+
+    dnl Then look for GNU TLS...
+    if test "x${SSLLIBS}" = "x" -a "x${enable_gnutls}" != "xno"; then
+	AC_CHECK_HEADER(gnutls/gnutls.h,
+	    dnl Save the current libraries so the crypto stuff isn't always
+	    dnl included...
+	    SAVELIBS="$LIBS"
+
+	    TEST_GNUTLS_LIBS=`libgnutls-config --libs`
+	    AC_CHECK_LIB(gnutls, gnutls_init,
+		[SSLLIBS=$TEST_GNUTLS_LIBS
+		 AC_DEFINE(HAVE_SSL)
+		 AC_DEFINE(HAVE_GNUTLS)],,
+		$TEST_GNUTLS_LIBS)
+
+	    LIBS="$SAVELIBS")
+    fi
 fi

 AC_SUBST(SSLFLAGS)
 AC_SUBST(SSLLIBS)
-AC_SUBST(ENCRYPTION_REQUIRED)

 EXPORT_SSLLIBS="$SSLLIBS"
 AC_SUBST(EXPORT_SSLLIBS)


 dnl
-dnl End of "$Id: cups-ssl.m4 5457 2006-04-24 15:36:12Z mike $".
+dnl End of "$Id: cups-openssl.m4 4213 2004-06-29 03:44:53Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-opsys.m4 5075 2006-02-05 01:00:29Z mike $"
+dnl "$Id: cups-opsys.m4 4358 2004-08-11 14:39:26Z mike $"
 dnl
 dnl   Operating system stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2004 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
@@ -15,7 +15,7 @@ dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
 dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
+dnl       Hollywood, Maryland 20636-3142 USA
 dnl
 dnl       Voice: (301) 373-9600
 dnl       EMail: cups-info@cups.org
@@ -24,8 +24,7 @@ dnl

 dnl Get the operating system and version number...
 uname=`uname`
-uversion=`uname -r | sed -e '1,$s/^[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\).*/\1\2/'`
-
+uversion=`uname -r | sed -e '1,$s/[[^0-9]]//g'`
 case "$uname" in
 	GNU* | GNU/*)
 		uname="GNU"
@@ -38,6 +37,63 @@ case "$uname" in
 		;;
 esac

+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 -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="${USER:=nobody}"
+			AC_MSG_RESULT(not found, using "$CUPS_USER")
+		fi
+	else
+		CUPS_USER="${USER:=nobody}"
+		AC_MSG_RESULT(no password file, using "$CUPS_USER")
+	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 -f /etc/group; then
+		if test x$uname = xDarwin; then
+			GROUP_LIST="lp admin"
+		else
+			GROUP_LIST="sys system root"
+		fi
+
+		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="${GROUP:=nobody}"
+			AC_MSG_RESULT(not found, using "$CUPS_GROUP")
+		fi
+	else
+		CUPS_GROUP="${GROUP:=nobody}"
+		AC_MSG_RESULT(no group file, using "$CUPS_GROUP")
+	fi)
+
+AC_SUBST(CUPS_USER)
+AC_SUBST(CUPS_GROUP)
+
+AC_DEFINE_UNQUOTED(CUPS_DEFAULT_USER, "$CUPS_USER")
+AC_DEFINE_UNQUOTED(CUPS_DEFAULT_GROUP, "$CUPS_GROUP")
+
 dnl
-dnl "$Id: cups-opsys.m4 5075 2006-02-05 01:00:29Z mike $"
+dnl "$Id: cups-opsys.m4 4358 2004-08-11 14:39:26Z mike $"
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-pam.m4 4913 2006-01-11 01:42:04Z mike $"
+dnl "$Id: cups-pam.m4 4358 2004-08-11 14:39:26Z mike $"
 dnl
 dnl   PAM stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2004 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
@@ -15,7 +15,7 @@ dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
 dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
+dnl       Hollywood, Maryland 20636-3142 USA
 dnl
 dnl       Voice: (301) 373-9600
 dnl       EMail: cups-info@cups.org
@@ -39,11 +39,7 @@ if test x$enable_pam != xno; then

 	AC_CHECK_LIB(dl,dlopen)
 	AC_CHECK_LIB(pam,pam_start)
-	AC_CHECK_HEADER(security/pam_appl.h)
-	if test x$ac_cv_header_security_pam_appl_h != xyes; then
-		AC_CHECK_HEADER(pam/pam_appl.h,
-			AC_DEFINE(HAVE_PAM_PAM_APPL_H))
-	fi
+	AC_CHECK_HEADER(pam/pam_appl.h,AC_DEFINE(HAVE_PAM_PAM_APPL_H))

 	if test x$ac_cv_lib_pam_pam_start != xno; then
 		# Set the necessary libraries for PAM...
@@ -94,5 +90,5 @@ AC_SUBST(PAMLIBS)
 AC_SUBST(PAMMOD)

 dnl
-dnl End of "$Id: cups-pam.m4 4913 2006-01-11 01:42:04Z mike $".
+dnl End of "$Id: cups-pam.m4 4358 2004-08-11 14:39:26Z mike $".
 dnl
@@ -1,43 +0,0 @@
-dnl
-dnl "$Id$"
-dnl
-dnl   PDF filter configuration stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 2006 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 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
-dnl
-
-AC_ARG_ENABLE(pdftops, [  --enable-pdftops        build pdftops filter, default=auto ])
-
-PDFTOPS=""
-
-if test "x$enable_pdftops" != xno; then
-	AC_MSG_CHECKING(whether to build pdftops filter)
-	if test "x$enable_pdftops" = xyes -o $uname != Darwin; then
-		PDFTOPS="pdftops"
-		AC_MSG_RESULT(yes)
-	else
-		AC_MSG_RESULT(no)
-	fi
-fi
-
-AC_SUBST(PDFTOPS)
-
-dnl
-dnl End of "$Id$".
-dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-scripting.m4 5176 2006-02-25 18:14:10Z mike $"
+dnl "$Id: cups-scripting.m4 4213 2004-06-29 03:44:53Z mike $"
 dnl
 dnl   Scripting configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2004 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
@@ -15,7 +15,7 @@ dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
 dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
+dnl       Hollywood, Maryland 20636-3142 USA
 dnl
 dnl       Voice: (301) 373-9600
 dnl       EMail: cups-info@cups.org
@@ -66,23 +66,10 @@ fi

 AC_DEFINE_UNQUOTED(CUPS_PHP, "$CUPS_PHP")

-if test "x$CUPS_PHP" = x; then
-	CUPS_PHP="no"
-else
+if test "x$CUPS_PHP" != x; then
 	AC_DEFINE(HAVE_PHP)
 fi

-PHPDIR=""
-if test "x$CUPS_PHP" != xno; then
-	AC_PATH_PROG(PHPCONFIG, php-config)
-
-	if test "x$PHPCONFIG" != x; then
-		PHPDIR="scripting/php"
-	fi
-fi
-
-AC_SUBST(PHPDIR)
-
 dnl Do we have Python?
 AC_ARG_WITH(python, [  --with-python           set Python interpreter for web interfaces ],
 	CUPS_PYTHON="$withval",
@@ -100,5 +87,5 @@ if test "x$CUPS_PYTHON" != x; then
 fi

 dnl
-dnl End of "$Id: cups-scripting.m4 5176 2006-02-25 18:14:10Z mike $".
+dnl End of "$Id: cups-scripting.m4 4213 2004-06-29 03:44:53Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-sharedlibs.m4 5112 2006-02-16 04:41:59Z mike $"
+dnl "$Id: cups-sharedlibs.m4 4358 2004-08-11 14:39:26Z mike $"
 dnl
 dnl   Shared library support for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2004 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
@@ -15,7 +15,7 @@ dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
 dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
+dnl       Hollywood, Maryland 20636-3142 USA
 dnl
 dnl       Voice: (301) 373-9600
 dnl       EMail: cups-info@cups.org
@@ -38,14 +38,14 @@ if test x$enable_shared != xno; then
 		HP-UX*)
 			LIBCUPS="libcups.sl.2"
 			LIBCUPSIMAGE="libcupsimage.sl.2"
-			DSO="\$(LD)"
+			DSO="ld"
 			DSOFLAGS="$DSOFLAGS -b -z +h \$@"
 			;;
 		IRIX)
 			LIBCUPS="libcups.so.2"
 			LIBCUPSIMAGE="libcupsimage.so.2"
 			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-rpath,\$(libdir),-set_version,sgi2.6,-soname,\$@ -shared \$(OPTIM)"
+			DSOFLAGS="$DSOFLAGS -Wl,-rpath,\$(libdir),-set_version,sgi2.5,-soname,\$@ -shared \$(OPTIM)"
 			;;
 		OSF1* | Linux | GNU | *BSD*)
 			LIBCUPS="libcups.so.2"
@@ -57,7 +57,7 @@ if test x$enable_shared != xno; then
 			LIBCUPS="libcups.2.dylib"
 			LIBCUPSIMAGE="libcupsimage.2.dylib"
 			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS \$(RC_CFLAGS) -dynamiclib -single_module -lc"
+			DSOFLAGS="$DSOFLAGS \$(RC_CFLAGS) -dynamiclib -lc"
 			;;
 		AIX*)
 			LIBCUPS="libcups_s.a"
@@ -87,7 +87,7 @@ AC_SUBST(LIBCUPS)
 AC_SUBST(LIBCUPSIMAGE)

 if test x$enable_shared = xno; then
-	LINKCUPS="../cups/libcups.a"
+	LINKCUPS="../cups/libcups.a \$(SSLLIBS)"
 	LINKCUPSIMAGE="../filter/libcupsimage.a"
 else
 	if test $uname = AIX; then
@@ -152,5 +152,5 @@ AC_SUBST(IMGLIBS)
 AC_SUBST(EXPORT_LDFLAGS)

 dnl
-dnl End of "$Id: cups-sharedlibs.m4 5112 2006-02-16 04:41:59Z mike $".
+dnl End of "$Id: cups-sharedlibs.m4 4358 2004-08-11 14:39:26Z mike $".
 dnl
@@ -1,57 +0,0 @@
-dnl
-dnl "$Id$"
-dnl
-dnl   Threading stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of 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 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
-dnl
-
-AC_ARG_ENABLE(threads, [  --enable-threads        enable multi-threading support])
-
-have_pthread=no
-PTHREAD_FLAGS=""
-
-if test "x$enable_threads" != xno; then
-	AC_CHECK_HEADER(pthread.h, AC_DEFINE(HAVE_PTHREAD_H))
-
-	if test x$ac_cv_header_pthread_h = xyes; then
-		dnl Check various threading options for the platforms we support
-		for flag in -lpthreads -lpthread -pthread; do
-        		AC_MSG_CHECKING([for pthread_create using $flag])
-			SAVELIBS="$LIBS"
-			LIBS="$flag $LIBS"
-        		AC_TRY_LINK([#include <pthread.h>],
-				[pthread_create(0, 0, 0, 0);],
-        			have_pthread=yes,
-				LIBS="$SAVELIBS")
-        		AC_MSG_RESULT([$have_pthread])
-
-			if test $have_pthread = yes; then
-				PTHREAD_FLAGS="-D_THREAD_SAFE -D_REENTRANT"
-				break
-			fi
-		done
-	fi
-fi
-
-AC_SUBST(PTHREAD_FLAGS)
-
-dnl
-dnl End of "$Id$".
-dnl
@@ -3,7 +3,9 @@
 *
 *   Configuration file for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2006 by Easy Software Products.
+ *   @configure_input@
+ *
+ *   Copyright 1997-2004 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -29,52 +31,16 @@
 * Version of software...
 */

-#define CUPS_SVERSION	""
-#define CUPS_MINIMAL	""
+#define CUPS_SVERSION	"CUPS v1.1.21"
+#define CUPS_MINIMAL	"CUPS/1.1.21"


 /*
- * Default user and groups...
+ * Default user and group...
 */

 #define CUPS_DEFAULT_USER	"lp"
 #define CUPS_DEFAULT_GROUP	"sys"
-#define CUPS_DEFAULT_SYSTEM_GROUPS	"sys root system"
-
-
-/*
- * Default file permissions...
- */
-
-#define CUPS_DEFAULT_CONFIG_FILE_PERM	0640
-#define CUPS_DEFAULT_LOG_FILE_PERM	0644
-
-
-/*
- * Default browsing settings...
- */
-
-#define CUPS_DEFAULT_BROWSING	1
-#define CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS	"CUPS"
-#define CUPS_DEFAULT_BROWSE_REMOTE_PROTOCOLS	"CUPS"
-#define CUPS_DEFAULT_BROWSE_SHORT_NAMES	1
-#define CUPS_DEFAULT_DEFAULT_SHARED 1
-#define CUPS_DEFAULT_IMPLICIT_CLASSES	1
-#define CUPS_DEFAULT_USE_NETWORK_DEFAULT 1
-
-
-/*
- * Default IPP port...
- */
-
-#define CUPS_DEFAULT_IPP_PORT	631
-
-
-/*
- * Default printcap file...
- */
-
-#define CUPS_DEFAULT_PRINTCAP	"/etc/printcap"


 /*
@@ -85,31 +51,24 @@


 /*
- * Do we have domain socket support?
+ * Where are files stored?
 */

-#undef CUPS_DEFAULT_DOMAINSOCKET
+#define CUPS_LOCALEDIR	"/usr/share/locale"
+#define CUPS_SERVERROOT	"/etc/cups"
+#define CUPS_SERVERBIN	"/usr/lib/cups"
+#define CUPS_DOCROOT	"/usr/share/doc/cups"
+#define CUPS_REQUESTS	"/var/spool/cups"
+#define CUPS_LOGDIR	"/var/logs/cups"
+#define CUPS_DATADIR    "/usr/share/cups"
+#define CUPS_FONTPATH	"/usr/share/cups/fonts"


 /*
- * Where are files stored?
- *
- * Note: These are defaults, which can be overridden by environment
- *       variables at run-time...
+ * What is the format string for strftime?
 */

-#define CUPS_BINDIR	"/usr/bin"
-#define CUPS_CACHEDIR	"/var/cache/cups"
-#define CUPS_DATADIR    "/usr/share/cups"
-#define CUPS_DOCROOT	"/usr/share/doc/cups"
-#define CUPS_FONTPATH	"/usr/share/cups/fonts"
-#define CUPS_LOCALEDIR	"/usr/share/locale"
-#define CUPS_LOGDIR	"/var/logs/cups"
-#define CUPS_REQUESTS	"/var/spool/cups"
-#define CUPS_SBINDIR	"/usr/sbin"
-#define CUPS_SERVERBIN	"/usr/lib/cups"
-#define CUPS_SERVERROOT	"/etc/cups"
-#define CUPS_STATEDIR	"/var/run/cups"
+#define CUPS_STRFTIME_FORMAT	NULL


 /*
@@ -122,6 +81,23 @@
 #undef HAVE_LIBTIFF


+/*
+ * Does this machine store words in big-endian (MSB-first) order?
+ */
+
+#undef WORDS_BIGENDIAN
+
+
+/*
+ * Which directory functions and headers do we use?
+ */
+
+#undef HAVE_DIRENT_H
+#undef HAVE_SYS_DIR_H
+#undef HAVE_SYS_NDIR_H
+#undef HAVE_NDIR_H
+
+
 /*
 * Do we have PAM stuff?
 */
@@ -155,29 +131,6 @@
 #undef HAVE_STRINGS_H
 #undef HAVE_BSTRING_H

-/*
- * Do we have the long long type?
- */
-
-#undef HAVE_LONG_LONG
-
-#ifdef HAVE_LONG_LONG
-#  define CUPS_LLFMT	"%lld"
-#  define CUPS_LLCAST	(long long)
-#else
-#  define CUPS_LLFMT	"%ld"
-#  define CUPS_LLCAST	(long)
-#endif /* HAVE_LONG_LONG */
-
-/*
- * Do we have the strtoll() function?
- */
-
-#undef HAVE_STRTOLL
-
-#ifndef HAVE_STRTOLL
-#  define strtoll(nptr,endptr,base) strtol((nptr), (endptr), (base))
-#endif /* !HAVE_STRTOLL */

 /*
 * Do we have the strXXX() functions?
@@ -236,13 +189,6 @@
 #undef HAVE_MALLOC_H


-/*
- * Do we have the POSIX ACL functions?
- */
-
-#undef HAVE_ACL_INIT
-
-
 /*
 * Do we have the langinfo.h header file?
 */
@@ -261,20 +207,12 @@


 /*
- * Do we have the SLP library?
+ * Do we have the OpenSLP library?
 */

 #undef HAVE_LIBSLP


-/*
- * Do we have an LDAP library?
- */
-
-#undef HAVE_LDAP
-#undef HAVE_OPENLDAP
-
-
 /*
 * Do we have libpaper?
 */
@@ -305,24 +243,10 @@


 /*
- * Do we have rresvport_af()?
+ * Do we have rresvport()?
 */

-#undef HAVE_RRESVPORT_AF
-
-
-/*
- * Do we have getaddrinfo()?
- */
-
-#undef HAVE_GETADDRINFO
-
-
-/*
- * Do we have getnameinfo()?
- */
-
-#undef HAVE_GETNAMEINFO
+#undef HAVE_RRESVPORT


 /*
@@ -359,21 +283,6 @@

 #undef HAVE_USERSEC_H

-/*
- * Do we have pthread support?
- */
-
-#undef HAVE_PTHREAD_H
-
-
-/*
- * Do we have launchd support?
- */
-
-#undef HAVE_LAUNCH_H
-#undef HAVE_LAUNCHD
-#define CUPS_DEFAULT_LAUNCHD_CONF ""
-

 /*
 * Various scripting languages...
@@ -389,46 +298,6 @@
 #define CUPS_PYTHON	"/usr/bin/python"


-/*
- * Do we have Darwin's CoreFoundation and SystemConfiguration frameworks?
- */
-
-#undef HAVE_COREFOUNDATION
-#undef HAVE_SYSTEMCONFIGURATION
-
-
-/*
- * Do we have CoreFoundation public and private headers?
- */
-
-#undef HAVE_COREFOUNDATION_H
-#undef HAVE_CFPRIV_H
-#undef HAVE_CFBUNDLEPRIV_H
-
-
-/*
- * Do we have MacOSX 10.4's mbr_XXX functions()?
- */
-
-#undef HAVE_MEMBERSHIP_H
-#undef HAVE_MBR_UID_TO_UUID
-
-
-/*
- * Do we have Darwin's notify_post() header and function?
- */
-
-#undef HAVE_NOTIFY_H
-#undef HAVE_NOTIFY_POST
-
-
-/*
- * Do we have DBUS?
- */
-
-#undef HAVE_DBUS
-
-
 #endif /* !_CUPS_CONFIG_H_ */

 /*
@@ -3,7 +3,7 @@ dnl "$Id$"
 dnl
 dnl   Configuration script for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2004 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
@@ -15,7 +15,7 @@ dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
 dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
+dnl       Hollywood, Maryland 20636-3142 USA
 dnl
 dnl       Voice: (301) 373-9600
 dnl       EMail: cups-info@cups.org
@@ -35,34 +35,13 @@ sinclude(config-scripts/cups-compiler.m4)

 sinclude(config-scripts/cups-image.m4)
 sinclude(config-scripts/cups-network.m4)
-sinclude(config-scripts/cups-slp.m4)
-sinclude(config-scripts/cups-ldap.m4)
-sinclude(config-scripts/cups-ssl.m4)
+sinclude(config-scripts/cups-openslp.m4)
+sinclude(config-scripts/cups-openssl.m4)
 sinclude(config-scripts/cups-pam.m4)
-sinclude(config-scripts/cups-threads.m4)
-sinclude(config-scripts/cups-largefile.m4)
-sinclude(config-scripts/cups-launchd.m4)
-sinclude(config-scripts/cups-defaults.m4)
-sinclude(config-scripts/cups-pdf.m4)
+
 sinclude(config-scripts/cups-scripting.m4)

-LANGFILES=""
-if test "x$LANGUAGES" != x; then
-	for lang in $LANGUAGES; do
-		LANGFILES="$LANGFILES doc/$lang/index.html"
-		LANGFILES="$LANGFILES templates/$lang/edit-config.tmpl"
-		LANGFILES="$LANGFILES templates/$lang/header.tmpl"
-	done
-fi
-
-AC_OUTPUT(Makedefs packaging/cups.list init/cups.sh init/cups-lpd cups-config
-	  conf/cupsd.conf conf/pam.std doc/index.html
-	  doc/help/standard.html man/client.conf.man
-	  man/cups-deviced.man man/cups-driverd.man
-	  man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man
-	  man/cupsd.conf.man man/lpoptions.man
-	  templates/edit-config.tmpl templates/header.tmpl
-	  $LANGFILES)
+AC_OUTPUT(Makedefs cups.list cups.sh cups-config conf/cupsd.conf conf/pam.std)

 chmod +x cups-config

@@ -1,10 +1,10 @@
-#! /bin/sh
+#!/bin/sh
 #
 # "$Id$"
 # 
 #   CUPS configuration utility.
 #
-#   Copyright 2001-2006 by Easy Software Products, all rights reserved.
+#   Copyright 2001-2004 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
@@ -16,7 +16,7 @@
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
 #       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
+#       Hollywood, Maryland 20636-3142 USA
 #
 #       Voice: (301) 373-9600
 #       EMail: cups-info@cups.org
@@ -24,7 +24,7 @@
 #

 VERSION="@CUPS_VERSION@"
-APIVERSION="1.2"
+APIVERSION="1.1"

 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -36,12 +36,11 @@ sysconfdir=@sysconfdir@
 cups_datadir=@CUPS_DATADIR@
 cups_serverbin=@CUPS_SERVERBIN@
 cups_serverroot=@CUPS_SERVERROOT@
-INSTALLSTATIC=@INSTALLSTATIC@

 # flags for C++ compiler:
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@EXPORT_SSLLIBS@ @LIBS@"
+LIBS="@EXPORT_SSLLIBS@ @NETLIBS@ @COMMONLIBS@"
 IMGLIBS="@EXPORT_LIBTIFF@ @EXPORT_LIBJPEG@ @EXPORT_LIBPNG@ @EXPORT_LIBZ@"

 if test $includedir != /usr/include; then
@@ -97,11 +96,11 @@ while test $# -gt 0; do
 	    ;;
 	--libs)
 	    if test $static = no; then
- 	        if test $image = no; then
- 	            echo -lcups $LIBS
- 		else
- 	            echo -lcupsimage $IMGLIBS -lcups $LIBS
- 		fi
+	        if test $image = no; then
+	            echo -lcups $LIBS
+		else
+	            echo -lcupsimage $IMGLIBS -lcups $LIBS
+		fi
 	    else
 	        if test $image = no; then
 	            echo $libdir/libcups.a $LIBS
@@ -117,11 +116,7 @@ while test $# -gt 0; do
 	    echo $cups_serverroot
 	    ;;
 	--static)
-	    if test -z "$INSTALLSTATIC"; then
-	        echo "WARNING: Static libraries not installed!" >&2
-	    else
-	        static=yes
-	    fi
+	    static=yes
 	    ;;
 	--version)
 	    echo $VERSION
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "cups"=".\cups\cups.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
--- a/Mostrar Mais
+++ b/Mostrar Mais