Import cups.org releases

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-1.1.12@4306 a1ca3aef-8c08-0410-bb20-df032aa958be
2013-05-10 18:56:23 +00:00
@@ -2,32 +2,7 @@ config.cache
 config.h
 config.log
 config.status
-configure
 cups-config
 cups.list
 cups.sh
-make.log
-printpro.common
-printpro.version
 Makedefs
-aix-4.3-powerpc
-darwin-5.2-powerpc
-darwin-5.3-powerpc
-darwin-6.0-powerpc
-freebsd-4.5-intel
-hpux-10.20-hppa
-hpux-11.00-hppa
-irix-5.3-mips
-irix-6.5-mips
-linux-2.0-intel
-linux-2.2-intel
-linux-2.4-intel
-solaris-2.5-intel
-solaris-2.5-sparc
-solaris-2.7-intel
-solaris-2.7-sparc
-solaris-2.8-intel
-solaris-2.8-sparc
-solaris-2.9-intel
-solaris-2.9-sparc
-tru64-4.0-alpha
@@ -1,81 +0,0 @@
-CGI - CUPS v1.1.19 - 05/27/2003
-------------------------------
-
-This file describes the experimental scripting/CGI support
-provided by CUPS starting with CUPS 1.1.19.
-
-WARNING: CGI support is not complete; you may run into problems
-and limitations in the implementation of CGI in CUPS that are
-not present in full-featured web servers like Apache.
-
-
-OVERVIEW OF CGI SUPPORT IN CUPS
-
-CUPS has traditionally provided a dynamic web interface through
-four CGI programs that are executed when users open special
-directories on the CUPS server.  Each CGI performs
-administration, class, job, and printer functions as directed by
-the user, but the actual programs that are run and functions
-that are available are limited to those that were originally
-designed into the scheduler.
-
-Starting with CUPS 1.1.19, support is now available for CGI
-programs and specific scripting languages, currently Java, Perl,
-PHP, and Python.  The interpreters for these languages are
-currently configured at compile time.  Future versions may
-expand the interface to allow for generic support of scripting
-languages similar to the Apache "AddHandler" directive, but with
-external programs instead of modules.
-
-The following MIME types are reserved for the CGI support in
-CUPS (the names have been chosen to mirror those used by
-Apache):
-
-    application/x-http-cgi      CGI script/program
-    application/x-http-java     Java program
-    application/x-http-perl     Perl script
-    application/x-http-php      PHP script
-    application/x-http-python   Python script
-
-In order to enable the corresponding type, you must create a new
-/etc/cups/cgi.types file which maps the filename extensions to
-the appropriate MIME type, for example:
-
-    application/x-http-cgi cgi
-    application/x-http-php php
-
-CGI scripts/programs (application/x-http-cgi) also must have
-execution permissions to be treated as a CGI script or program.
-
-
-LIMITATIONS
-
-CUPS implements most of the CGI/1.1 specification, with the
-following limitations:
-
-    - No Location: redirection support.
-    - No PATH_INFO or PATH_TRANSLATED support.
-    - Limited HTTP field support; only the Content-Length
-      (CONTENT_LENGTH), Cookie (HTTP_COOKIE), and User-Agent
-      (HTTP_USER_AGENT) fields are placed in environment
-      variables at this time.
-
-
-REPORTING PROBLEMS
-
-If you have problems, READ THE DOCUMENTATION FIRST!  If the
-documentation does not solve your problems please send an email
-to "cups-support@cups.org".  Include your operating system and
-version, compiler and version, and any errors or problems you've
-run into. The "/var/log/cups/error_log" file should also be sent,
-as it often helps to determine the cause of your problem.
-
-If you are running a version of Linux, be sure to provide the
-Linux distribution you have, too.
-
-Please note that the "cups-support@cups.org" email address goes
-to the CUPS developers; they are busy people, so your email may
-go unanswered for days or weeks.  In general, only general build
-or distribution problems will actually get answered - for
-end-user support see the "README.txt" for a summary of the
-resources available.
@@ -1,4 +1,4 @@
-CREDITS.txt - 04/26/2003
+CREDITS.txt - 01/27/2000
 ------------------------

 Few projects are completed by one person, and CUPS is no exception.  We'd
@@ -8,26 +8,19 @@ like to thank the following individuals for their contributions:
    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.
+    Kiko                - Bug fixes.
+    L. Peter Deutsch    - MD5 code.

 If I've missed someone, please let me know by sending an email to
 "mike@easysw.com".
@@ -1,5 +1,5 @@
-ENCRYPTION - CUPS v1.1.20 - 11/24/2003
--------------------------------------
+ENCRYPTION - CUPS v1.1.7 - 02/21/2001
+-------------------------------------

 This file describes the encryption support provided by CUPS.

@@ -17,16 +17,15 @@ 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.
+any encryption code, but it can link against the OpenSSL library
+which does.


 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.
+the OpenSSL library 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
@@ -80,22 +79,19 @@ to /etc/cups/cupsd.conf.

 BEFORE YOU BEGIN

-You'll need the OpenSSL, GNU TLS, or CDSA libraries from:
+You'll need the OpenSSL library from:

-    http://www.openssl.org/
-    http://www.gnutls.org/
-    http://www.intel.com/labs/archive/cdsa.htm
+    http://www.openssl.org


 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:
+Once you have the OpenSSL library 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
+If the OpenSSL 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.

@@ -1,4 +1,4 @@
-INSTALL - CUPS v1.1.20 - 11/24/2003
+INSTALL - CUPS v1.1.12 - 11/14/2001
 -----------------------------------

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

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

 BEFORE YOU BEGIN

@@ -33,22 +29,6 @@ Besides these tools you'll want the following libraries:
 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 CVS
-
-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 ENTER
-

 CONFIGURATION

@@ -138,9 +118,9 @@ You can find the RPM software at:

    http://www.rpm.org

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

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


 CREATING BINARY DISTRIBUTIONS WITH EPM
@@ -1,19 +0,0 @@
-INSTALL_fr - CUPS v1.1.19 - 04/08/2003
--------------------------------------
-
-Vous cherchez des instructions d'installation ? Lisez le fichier
-INSTALL.txt (anglais) et/ou reportez vous au "Manuel de
-l'administrateur" (en français) situé dans le sous-répertoire
-"doc/fr"
-
-Vous trouverez deux autres manuels en français dans ce
-sous-répertoire :
-
-	- Aperçu de CUPS
-	- Manuel de l'utilisateur
-
-Une fois CUPS installé, si vous configurez votre navigateur
-"web" pour que  la langue de base soit le français, vous
-disposerez également d'une interface "web" en français pour
-l'administration et d'utilistation de CUPS.
-
@@ -7,7 +7,7 @@

 <H2 ALIGN="CENTER">Common UNIX Printing System License Agreement</H2>

-<P ALIGN="CENTER">Copyright 1997-2003 by Easy Software Products<BR>
+<P ALIGN="CENTER">Copyright 1997-2001 by Easy Software Products<BR>
 44141 AIRPORT VIEW DR STE 204<BR>
 HOLLYWOOD, MARYLAND 20636-3111 USA<BR>
 <BR>
@@ -17,146 +17,84 @@ WWW: <A HREF="http://www.cups.org">http://www.cups.org</A>

 <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>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. A copy of these
+licenses follow 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>The GNU LGPL applies to the CUPS API library, located in the "cups"
+subdirectory of the CUPS source distribution and in the
+"/usr/include/cups" directory and "libcups.a", "libcups.sl", or
+"libcups.so" files in the binary distributions.
+
+<P>The GNU GPL applies to the remainder of the CUPS distribution,
+including the "pstoraster" filter which is based upon GNU Ghostscript
+5.50 and the "pdftops" filter which is based upon Xpdf 0.92.

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

 <UL>

-	<LI>Use the CUPS software at no charge.</LI>
+	<LI>Use the CUPS software at no charge.

-	<LI>Distribute verbatim copies of the software in source
-	or binary form.</LI>
+	<LI>Distribute verbatim copies of the software in source or
+	binary form.

-	<LI>Sell verbatim copies of the software for a media
-	fee, or sell support for the software.</LI>
+	<LI>Sell verbatim copies of the software for a media fee, or
+	sell support for the software.

-	<LI>Distribute or sell printer drivers and filters that
-	use CUPS so long as source code is made available under
-	the GPL.</LI>
+	<LI>Distribute or sell printer drivers and filters that use
+	CUPS so long as source code is made available under the GPL.

 </UL>

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

-<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.
-
-<H3>License Exceptions</H3>
-
-<P>In addition, as the copyright holder of CUPS, Easy Software
-Products grants the following special exceptions:
-
-<OL>
-
-	<LI><B>Apple Operating System Development License
-	Exception</B>;
-
-	<OL TYPE="a">
-
-		<LI>Software that is developed by any person or
-		entity for an Apple Operating System ("Apple
-		OS-Developed Software"), including but not
-		limited to Apple and third party printer
-		drivers, filters, and backends for an Apple
-		Operating System, that is linked to the CUPS
-		imaging library or based on any sample filters
-		or backends provided with CUPS shall not be
-		considered to be a derivative work or collective
-		work based on the CUPS program and is exempt
-		from the mandatory source code release clauses
-		of the GNU GPL. You may therefore distribute
-		linked combinations of the CUPS imaging library
-		with Apple OS-Developed Software without
-		releasing the source code of the Apple
-		OS-Developed Software. You may also use sample
-		filters and backends provided with CUPS to
-		develop Apple OS-Developed Software without
-		releasing the source code of the Apple
-		OS-Developed Software.</LI>
-
-		<LI>An Apple Operating System means any
-		operating system software developed and/or
-		marketed by Apple Computer, Inc., including but
-		not limited to all existing releases and
-		versions of Apple's Darwin, Mac OS X, and Mac OS
-		X Server products and all follow-on releases and
-		future versions thereof.</LI>
-
-		<LI>This exception is only available for Apple
-		OS-Developed Software and does not apply to
-		software that is distributed for use on other
-		operating systems.</LI>
-
-		<LI>All CUPS software that falls under this
-		license exception have the following text at the
-		top of each source file:
-
-		<BLOCKQUOTE>This file is subject to the Apple
-		OS-Developed Software
-		exception.</BLOCKQUOTE></LI>
-
-	</OL>
-
-	<LI><B>OpenSSL Toolkit License Exception</B>;
-
-	<OL TYPE="a">
-
-		<LI>Easy Software Products explicitly allows the
-		compilation and distribution of the CUPS
-		software with the OpenSSL Toolkit.</LI>
-
-	</OL>
-
-</OL>
-
-<P>No developer is required to provide these exceptions in a
-derived work.
+<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.

 <H3>Trademarks</H3>

-<P>Easy Software Products has trademarked the Common UNIX
-Printing System, CUPS, and CUPS logo. These names and logos may
-be used freely in any direct port or binary distribution of
-CUPS. Please contract Easy Software Products for written
-permission to use them in derivative products. Our intention is
-to protect the value of these trademarks and ensure that any
-derivative product meets the same high-quality standards as the
-original.
+<P>Easy Software Products has trademarked the Common UNIX Printing
+System, CUPS, and CUPS logo. These names and logos may be used freely
+in any direct port or binary distribution of CUPS. To use them in
+derivative products, please contract Easy Software Products for written
+permission. 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.

 <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>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>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>The Common UNIX Printing System provides a "pstoraster" filter that
+utilizes the GNU GhostScript 5.50 core to convert PostScript files into
+a stream of raster images. For binary distribution licensing of this
+software, please contact:
+
+<BLOCKQUOTE>
+Miles Jones<BR>
+Director of Marketing<BR>
+Artifex Software Inc.<BR>
+454 Las Gallinas Ave., Suite 108<BR>
+San Rafael, CA 94903 USA<BR>
+Voice: +1.415.492.9861<BR>
+Fax: +1.415.492.9862<BR>
+EMail: <A HREF="mailto:info@arsoft.com">info@arsoft.com</A>
+</BLOCKQUOTE>
+
+<P>The "pdftops" filter is based on the Xpdf 0.92 software. For binary
+distribution licensing of this software, please contact:

 <BLOCKQUOTE>
 Derek B. Noonburg<BR>
@@ -166,12 +104,12 @@ WWW: <A HREF="http://www.foolabs.com/xpdf/">http://www.foolabs.com/xpdf/</A>

 <H3>Support</H3>

-<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>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>
+<A HREF="http://www.easysw.com">http://www.easysw.com</A>
 </PRE></UL>

 <!-- NEW PAGE -->
@@ -185,7 +123,7 @@ Copyright 1989, 1991 Free Software Foundation, Inc.

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

 <H4>Preamble</H4>

@@ -1,861 +0,0 @@
-                Common UNIX Printing System License Agreement
-
-                Copyright 1997-2003 by Easy Software Products
-                        44141 AIRPORT VIEW DR STE 204
-                     HOLLYWOOD, MARYLAND 20636-3111 USA
-
-                           Voice: +1.301.373.9600
-                          Email: cups-info@cups.org
-                          WWW: http://www.cups.org
-
-
-INTRODUCTION
-
-The Common UNIX Printing System(tm), ("CUPS(tm)"), is provided
-under the GNU General Public License ("GPL") and GNU Library
-General Public License ("LGPL"), Version 2, with exceptions for
-Apple operating systems and the OpenSSL toolkit. A copy of the
-exceptions and licenses follow this introduction.
-
-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.
-
-For those not familiar with the GNU GPL, the license basically
-allows you to:
-
-   - Use the CUPS software at no charge.
-   - Distribute verbatim copies of the software in source or
-     binary form.
-   - Sell verbatim copies of the software for a media fee, or
-     sell support for the software.
-   - Distribute or sell printer drivers and filters that use
-     CUPS so long as source code is made available under the
-     GPL.
-
-What this license *does not* allow you to do is make changes or
-add features to CUPS and then sell a binary distribution without
-source code. You must provide source for any new drivers,
-changes, or additions to the software, and all code must be
-provided under the GPL or LGPL as appropriate. The only
-exceptions to this are the portions of the CUPS software covered
-by the Apple operating system license exceptions outlined later
-in this license agreement.
-
-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.
-
-
-LICENSE EXCEPTIONS
-
-In addition, as the copyright holder of CUPS, Easy Software
-Products grants the following special exceptions:
-
-     1. Apple Operating System Development License Exception;
-
-	a. Software that is developed by any person or entity
-	   for an Apple Operating System ("Apple OS-Developed
-	   Software"), including but not limited to Apple and
-	   third party printer drivers, filters, and backends
-	   for an Apple Operating System, that is linked to the
-	   CUPS imaging library or based on any sample filters
-	   or backends provided with CUPS shall not be
-	   considered to be a derivative work or collective work
-	   based on the CUPS program and is exempt from the
-	   mandatory source code release clauses of the GNU GPL.
-	   You may therefore distribute linked combinations of
-	   the CUPS imaging library with Apple OS-Developed
-	   Software without releasing the source code of the
-	   Apple OS-Developed Software. You may also use sample
-	   filters and backends provided with CUPS to develop
-	   Apple OS-Developed Software without releasing the
-	   source code of the Apple OS-Developed Software.
-
-	b. An Apple Operating System means any operating system
-	   software developed and/or marketed by Apple Computer,
-	   Inc., including but not limited to all existing
-	   releases and versions of Apple's Darwin, Mac OS X,
-	   and Mac OS X Server products and all follow-on
-	   releases and future versions thereof.
-
-	c. This exception is only available for Apple
-	   OS-Developed Software and does not apply to software
-	   that is distributed for use on other operating
-	   systems.
-
-	d. All CUPS software that falls under this license
-	   exception have the following text at the top of each
-	   source file:
-
-	     This file is subject to the Apple OS-Developed
-	     Software exception.
-
-     2. OpenSSL Toolkit License Exception;
-
-	a. Easy Software Products explicitly allows the
-	   compilation and distribution of the CUPS software
-	   with the OpenSSL Toolkit.
-
-No developer is required to provide these exceptions in a
-derived work.
-
-
-TRADEMARKS
-
-Easy Software Products has trademarked the Common UNIX Printing
-System, CUPS, and CUPS logo. These names and logos may be used
-freely in any direct port or binary distribution of CUPS. Please
-contract Easy Software Products for written permission to use
-them in derivative products. Our intention is to protect the
-value of these trademarks and ensure that any derivative product
-meets the same high-quality standards as the original.
-
-
-BINARY DISTRIBUTION RIGHTS
-
-Easy Software Products also sells rights to the CUPS source code
-under a binary distribution license for vendors that are unable
-to release source code for their drivers, additions, and
-modifications to CUPS under the GNU GPL and LGPL. For
-information please contact us at the address shown above.
-
-The Common UNIX Printing System provides a "pdftops" filter that
-is based on the Xpdf software. For binary distribution licensing
-of this software, please contact:
-
-     Derek B. Noonburg
-     Email: derekn@foolabs.com
-     WWW: http://www.foolabs.com/xpdf/
-
-
-SUPPORT
-
-Easy Software Products sells software support for CUPS as well
-as a commercial printing product based on CUPS called ESP Print
-Pro. You can find out more at our web site:
-
-     http://www.easysw.com/
-
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-			 Version 2, June 1991
-
-	  Copyright (C) 1991 Free Software Foundation, Inc.
-       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-     Everyone is permitted to copy and distribute verbatim copies
-      of this license document, but changing it is not allowed.
-
-    [This is the first released version of the library GPL.  It is
-   numbered 2 because it goes with version 2 of the ordinary GPL.]
-
-			       Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it.  You can use it for
-your libraries, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if
-you distribute copies of the library, or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  Also, for each distributor's protection, we want to make certain
-that everyone understands that there is no warranty for this free
-library.  If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, so that any problems introduced by others will not reflect on
-the original authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software.  To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-  Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs.  This
-license, the GNU Library General Public License, applies to certain
-designated libraries.  This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
-
-  The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it.  Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program.  However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
-
-  Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries.  We
-concluded that weaker conditions might promote sharing better.
-
-  However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves.  This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them.  (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.)  The hope is that this
-will lead to faster development of free libraries.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, while the latter only
-works together with the library.
-
-  Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
-
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-General Public License (also called "this License").  Each licensee is
-addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also compile or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    c) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    d) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the source code distributed need not include anything that is normally
-distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Library General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-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.
-
-		     END OF TERMS AND CONDITIONS
@@ -3,7 +3,7 @@
 #
 #   Common makefile definitions for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2001 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
@@ -26,22 +26,21 @@
 # Programs...
 #

-AR		=	@AR@
-AWK		=	@AWK@
-CC		=	@LIBTOOL@ @CC@
-CXX		=	@LIBTOOL@ @CXX@
-DSO		=	@DSO@
-HTMLDOC		=	@HTMLDOC@
-INSTALL		=	@INSTALL@
-LIBTOOL		=	@LIBTOOL@
-LN		=	@LN@ -sf
-MV		=	@MV@
-NROFF		=	@NROFF@
-RANLIB		=	@RANLIB@
-RM		=	@RM@ -f
-SED		=	@SED@
-SHELL		=	/bin/sh
-STRIP		=	@STRIP@
+AR	=	@AR@
+AWK	=	@AWK@
+CC	=	@LIBTOOL@ @CC@
+CXX	=	@LIBTOOL@ @CXX@
+DSO	=	@DSO@
+HTMLDOC	=	@HTMLDOC@
+INSTALL	=	@INSTALL@
+LIBTOOL	=	@LIBTOOL@
+LN	=	/bin/ln -sf
+MV	=	@MV@
+NROFF	=	@NROFF@
+RANLIB	=	@RANLIB@
+RM	=	@RM@ -f
+SED	=	@SED@
+SHELL	=	/bin/sh

 #
 # Installation programs...
@@ -65,15 +64,14 @@ CUPS_GROUP	=	@CUPS_GROUP@
 # Libraries...
 #

-LIBCUPS		=	@LIBCUPS@
-LIBCUPSIMAGE	=	@LIBCUPSIMAGE@
-LIBJPEG		=	@LIBJPEG@
-LIBMALLOC	=	@LIBMALLOC@
-LIBPAPER	=	@LIBPAPER@
-LIBPNG		=	@LIBPNG@
-LIBSLP		=	@LIBSLP@
-LIBTIFF		=	@LIBTIFF@
-LIBZ		=	@LIBZ@
+LIBCUPS	=	@LIBCUPS@
+LIBCUPSIMAGE =	@LIBCUPSIMAGE@
+LIBJPEG	=	@LIBJPEG@
+LIBMALLOC =	@LIBMALLOC@
+LIBPNG	=	@LIBPNG@
+LIBSLP	=	@LIBSLP@
+LIBTIFF	=	@LIBTIFF@
+LIBZ	=	@LIBZ@

 #
 # Program options...
@@ -83,25 +81,21 @@ LIBZ		=	@LIBZ@
 #         extra debug info)
 #

-ARFLAGS		=	@ARFLAGS@
-BACKLIBS	=	@BACKLIBS@
-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
-LDFLAGS		=	-L../cups -L../filter $(RC_CFLAGS) @LDFLAGS@ $(OPTIM)
-LINKCUPS	=	@LINKCUPS@
-LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
-LIBS		=	$(LINKCUPS) $(NETLIBS) @LIBS@ $(COMMONLIBS)
-NETLIBS		=	@NETLIBS@
-OPTIM		=	@OPTIM@
-OPTIONS		=
-PAMLIBS		=	@PAMLIBS@
-SSLFLAGS	=	@SSLFLAGS@
-SSLLIBS		=	@SSLLIBS@
+ARFLAGS	=	@ARFLAGS@
+CFLAGS	=	@CFLAGS@ -I.. $(OPTIONS)
+CXXFLAGS =	@CXXFLAGS@ -I.. $(OPTIONS)
+DSOFLAGS =	@DSOFLAGS@
+DSOLIBS	=	@DSOLIBS@
+IMGLIBS	=	@IMGLIBS@ -lm
+LDFLAGS	=	@LDFLAGS@ $(OPTIM)
+LINKCUPS =	@LINKCUPS@
+LINKCUPSIMAGE =	@LINKCUPSIMAGE@
+LIBS	=	$(LINKCUPS) $(NETLIBS) @LIBS@
+NETLIBS	=	@NETLIBS@
+OPTIM	=	@OPTIM@
+OPTIONS	=
+PAMLIBS	=	@PAMLIBS@
+SSLLIBS	=	@SSLLIBS@

 #
 # Directories...
@@ -132,8 +126,6 @@ srcdir		=	@srcdir@
 sysconfdir	=	@sysconfdir@
 top_srcdir	=	@top_srcdir@

-BUILDROOT	=	$(DSTROOT)
-
 AMANDIR		=	$(BUILDROOT)@AMANDIR@
 BINDIR		=	$(BUILDROOT)@bindir@
 DATADIR		=	$(BUILDROOT)@CUPS_DATADIR@
@@ -174,14 +166,13 @@ MAN8DIR		=	@MAN8DIR@
 .man.0 .man.1 .man.1m .man.3 .man.5 .man.8:
 	echo Formatting $<...
 	$(RM) $@
-	-$(NROFF) -man $< >$@
+	$(NROFF) -man $< >$@
 .man.z:
 	echo Formatting $<...
-	$(RM) $@ $@.tmp $@.tmp.z
-	-$(NROFF) -man $< >$@.tmp
-	pack -f $@.tmp
-	$(MV) $@.tmp.z $@
-
+	$(RM) $@ t.z
+	$(NROFF) -man $< >t
+	pack -f t
+	$(MV) t.z $@

 #
 # End of "$Id$"
@@ -3,7 +3,7 @@
 #
 #   Top-level Makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2001 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
@@ -28,7 +28,7 @@ include Makedefs
 # Directories to make...
 #

-DIRS	=	cups backend berkeley cgi-bin filter man pdftops \
+DIRS	=	cups backend berkeley cgi-bin filter man pdftops pstoraster \
 		scheduler systemv

 #
@@ -36,7 +36,6 @@ DIRS	=	cups backend berkeley cgi-bin filter man pdftops \
 #

 all:
-	chmod +x cups-config
 	for dir in $(DIRS); do\
 		echo Making all in $$dir... ;\
 		(cd $$dir ; $(MAKE) $(MFLAGS)) || exit 1;\
@@ -52,22 +51,11 @@ clean:
 		(cd $$dir; $(MAKE) $(MFLAGS) clean) || exit 1;\
 	done

-#
-# Make dependencies
-#
-
-depend:
-	for dir in $(DIRS); do\
-		echo Making dependencies in $$dir... ;\
-		(cd $$dir; $(MAKE) $(MFLAGS) depend) || exit 1;\
-	done
-
-
 #
 # Install object and target files...
 #

-install:	installhdrs
+install:
 	for dir in $(DIRS); do\
 		echo Installing in $$dir... ;\
 		(cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\
@@ -87,8 +75,8 @@ install:	installhdrs
 	echo Installing in templates...
 	(cd templates; $(MAKE) $(MFLAGS) install)
 	echo Installing cups-config script...
-	$(INSTALL_DIR) $(BINDIR)
-	$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
+	$(INSTALL_DIR) $(bindir)
+	$(INSTALL_SCRIPT) cups-config $(bindir)/cups-config
 	echo Installing startup script...
 	if test "x$(INITDIR)" != "x"; then \
 		$(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/init.d; \
@@ -104,8 +92,8 @@ install:	installhdrs
 	fi
 	if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
 		$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
-		if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
-			$(INSTALL_SCRIPT) cups.osx $(BUILDROOT)$(INITDDIR)/PrintingServices; \
+		if test "$(INITDDIR)" = "/System/Library/StartupItems/CUPS"; then \
+			$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/CUPS; \
 			$(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; \
@@ -114,23 +102,12 @@ install:	installhdrs
 		fi \
 	fi

-#
-# Install source and header files...
-#
-
-installsrc:
-	gnutar --dereference --exclude=CVS -cf - . | gnutar -C $(SRCROOT) -xf -
-
-installhdrs:
-	(cd cups ; $(MAKE) $(MFLAGS) installhdrs) || exit 1;\
-	(cd filter ; $(MAKE) $(MFLAGS) installhdrs) || exit 1;
-

 #
 # Run the test suite...
 #

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

@@ -1,13 +1,9 @@
-README - CUPS v1.1.20 - 11/24/2003
+README - CUPS v1.1.12 - 11/14/2001
 ----------------------------------

 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

@@ -25,12 +21,11 @@ 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 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.
+CUPS also includes a customized version of GNU Ghostscript
+(currently based off GNU Ghostscript 5.50) and an image file RIP
+that are used to support non-PostScript printers.  Sample
+drivers for HP and EPSON printers are included that use these
+filters.

 Drivers for thousands of printers are provided with our ESP
 Print Pro software, available at:
@@ -248,14 +243,18 @@ file.

 LEGAL STUFF

-CUPS is Copyright 1993-2003 by Easy Software Products.  CUPS,
+CUPS is Copyright 1993-2001 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 PDF filter (pdftops) is based on the Xpdf software,
-Copyright 1996-2002 by Derek B. Noonburg.
+The PostScript RIP software (pstoraster) is based on the GNU
+Ghostscript 5.50 core, Copyright 1986-1998 by Aladdin
+Enterprises.
+
+The PDF filter (pdftops) is based on the Xpdf 0.92 software,
+Copyright 1996-2001 by Derek B. Noonburg.

 This software is based in part on the work of the Independent
 JPEG Group.
@@ -279,5 +278,6 @@ For commercial licensing information, please contact:
    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.
+Artifex Software Inc. which handles commercial licensing of the
+Ghostscript software, and from Derek B. Noonburg who developed
+the Xpdf software used to print PDF files.
@@ -1,19 +0,0 @@
-README_fr - CUPS v1.1.19 - 04/08/2003
-------------------------------------
-
-Vous cherchez des instructions d'installation ? Lisez le fichier
-INSTALL.txt (anglais) et/ou reportez vous au "Manuel de
-l'administrateur" (en français) situé dans le sous-répertoire
-"doc/fr"
-
-Vous trouverez deux autres manuels en français dans ce
-sous-répertoire :
-
-	- Aperçu de CUPS
-	- Manuel de l'utilisateur
-
-Une fois CUPS installé, si vous configurez votre navigateur
-"web" pour que  la langue de base soit le français, vous
-disposerez également d'une interface "web" en français pour
-l'administration et d'utilistation de CUPS.
-
@@ -1,8 +1,7 @@
-betest
 ipp
 lpd
+usb
 parallel
-scsi
+betest
 serial
 socket
-usb
@@ -1,17 +0,0 @@
-# DO NOT DELETE
-
-betest.o: ../cups/string.h ../config.h
-ipp.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-ipp.o: ../cups/ppd.h ../cups/language.h ../cups/string.h ../config.h
-lpd.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-lpd.o: ../cups/ppd.h ../cups/string.h ../config.h
-parallel.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-parallel.o: ../cups/ppd.h ../cups/string.h ../config.h
-scsi.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-scsi.o: ../cups/ppd.h ../cups/string.h ../config.h
-serial.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-serial.o: ../cups/ppd.h ../cups/string.h ../config.h
-socket.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-socket.o: ../cups/ppd.h ../cups/string.h ../config.h
-usb.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-usb.o: ../cups/ppd.h ../cups/string.h ../config.h
@@ -3,7 +3,7 @@
 #
 #   Backend makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2001 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
@@ -21,14 +21,12 @@
 #       EMail: cups-info@cups.org
 #         WWW: http://www.cups.org
 #
-#   This file is subject to the Apple OS-Developed Software exception.
-#

 include ../Makedefs

-BACKENDS =	ipp lpd parallel scsi serial socket usb
+BACKENDS =	ipp lpd parallel serial socket usb
 TARGETS	=	betest $(BACKENDS)
-OBJS	=	betest.o ipp.o lpd.o parallel.o scsi.o serial.o socket.o usb.o
+OBJS	=	betest.o ipp.o lpd.o parallel.o serial.o socket.o usb.o


 #
@@ -46,19 +44,11 @@ clean:
 	$(RM) $(OBJS) $(TARGETS) http


-#
-# Update dependencies (without system header dependencies...)
-#
-
-depend:
-	makedepend -Y -I.. -fDependencies $(OBJS:.o=.c) >/dev/null 2>&1
-
-
 #
 # Install all targets...
 #

-install:	all
+install:
 	$(INSTALL_DIR) $(SERVERBIN)/backend
 	for file in $(BACKENDS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
@@ -75,6 +65,8 @@ betest:	betest.o ../cups/$(LIBCUPS)
 	echo Linking $@...
 	$(CC) $(LDFLAGS) -o betest betest.o $(LIBS)

+betest.o:	../cups/string.h ../Makedefs
+

 #
 # ipp
@@ -86,6 +78,8 @@ ipp:	ipp.o ../cups/$(LIBCUPS)
 	$(RM) http
 	$(LN) ipp http

+ipp.o:	../cups/cups.h ../Makedefs
+

 #
 # lpd
@@ -95,6 +89,8 @@ lpd:	lpd.o ../cups/$(LIBCUPS)
 	echo Linking $@...
 	$(CC) $(LDFLAGS) -o lpd lpd.o $(LIBS)

+lpd.o:	../cups/cups.h ../Makedefs
+

 #
 # parallel
@@ -104,16 +100,7 @@ parallel:	parallel.o ../cups/$(LIBCUPS)
 	echo Linking $@...
 	$(CC) $(LDFLAGS) -o parallel parallel.o $(LIBS)

-
-#
-# scsi
-#
-
-scsi:	scsi.o ../cups/$(LIBCUPS)
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o scsi scsi.o $(LIBS)
-
-scsi.o:	scsi.c scsi-irix.c scsi-linux.c
+parallel.o:	../cups/cups.h ../Makedefs


 #
@@ -122,7 +109,9 @@ scsi.o:	scsi.c scsi-irix.c scsi-linux.c

 serial:	serial.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o serial serial.o $(BACKLIBS) $(LIBS)
+	$(CC) $(LDFLAGS) -o serial serial.o $(LIBS)
+
+serial.o:	../cups/cups.h ../Makedefs


 #
@@ -133,6 +122,8 @@ socket:	socket.o ../cups/$(LIBCUPS)
 	echo Linking $@...
 	$(CC) $(LDFLAGS) -o socket socket.o $(LIBS)

+socket.o:	../cups/cups.h ../Makedefs
+

 #
 # usb
@@ -140,14 +131,9 @@ socket:	socket.o ../cups/$(LIBCUPS)

 usb:	usb.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o usb usb.o $(BACKLIBS) $(LIBS)
+	$(CC) $(LDFLAGS) -o usb usb.o $(LIBS)

-
-#
-# Dependencies...
-#
-
-include Dependencies
+usb.o:	../cups/cups.h ../Makedefs


 #
@@ -3,7 +3,7 @@
 *
 *   Backend test program for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2001 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
@@ -21,8 +21,6 @@
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
 *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
 * Contents:
 *
 *   main() - Run the named backend.
@@ -3,7 +3,7 @@
 *
 *   IPP backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2001 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
@@ -21,17 +21,10 @@
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
 *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
 * Contents:
 *
- *   main()                 - Send a file to the printer or server.
- *   password_cb()          - Disable the password prompt for
- *                            cupsDoFileRequest().
- *   report_printer_state() - Report the printer state.
- *   run_pictwps_filter()   - Convert PICT files to PostScript when printing
- *                            remotely.
- *   sigterm_handler()      - Handle 'terminate' signals that stop the backend.
+ *   main()        - Send a file to the printer or server.
+ *   password_cb() - Disable the password prompt for cupsDoFileRequest().
 */

 /*
@@ -43,22 +36,10 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <cups/http-private.h>
 #include <cups/cups.h>
 #include <cups/language.h>
 #include <cups/string.h>
 #include <signal.h>
-#include <sys/wait.h>
-
-
-/*
- * Globals...
- */
-
-static char	tmpfilename[1024] = "";	/* Temporary spool file name */
-#ifdef __APPLE__
-static char	pstmpname[1024] = "";	/* Temporary PostScript file name */
-#endif /* __APPLE__ */


 /*
@@ -66,12 +47,6 @@ static char	pstmpname[1024] = "";	/* Temporary PostScript file name */
 */

 const char	*password_cb(const char *);
-int		report_printer_state(ipp_t *ipp);
-
-#ifdef __APPLE__
-int		run_pictwps_filter(char **argv, const char *filename);
-#endif /* __APPLE__ */
-static void	sigterm_handler(int sig);


 /*
@@ -99,8 +74,8 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  char		method[255],	/* Method in URI */
 		hostname[1024],	/* Hostname */
 		username[255],	/* Username info */
-		resource[1024];	/* Resource info (printer name) */
-  char		*filename;	/* File to print */
+		resource[1024],	/* Resource info (printer name) */
+		filename[1024];	/* File to print */
  int		port;		/* Port number (not used) */
  char		uri[HTTP_MAX_URI];/* Updated URI without user/pass */
  ipp_status_t	ipp_status;	/* Status of IPP request */
@@ -110,15 +85,10 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 		*supported;	/* get-printer-attributes response */
  ipp_attribute_t *job_id_attr;	/* job-id attribute */
  int		job_id;		/* job-id value */
-  ipp_attribute_t *job_sheets;	/* job-media-sheets-completed attribute */
  ipp_attribute_t *job_state;	/* job-state attribute */
  ipp_attribute_t *copies_sup;	/* copies-supported attribute */
  ipp_attribute_t *charset_sup;	/* charset-supported attribute */
  ipp_attribute_t *format_sup;	/* document-format-supported attribute */
-  ipp_attribute_t *printer_state;
-  				/* printer-state attribute */
-  ipp_attribute_t *printer_accepting;
-  				/* printer-is-accepting-jobs attribute */
  const char	*charset;	/* Character set to use */
  cups_lang_t	*language;	/* Default language */
  int		copies;		/* Number of copies remaining */
@@ -127,21 +97,6 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  struct sigaction action;	/* Actions for POSIX signals */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
  int		version;	/* IPP version */
-  int		reasons;	/* Number of printer-state-reasons shown */
-  static const char * const pattrs[] =
-		{		/* Printer attributes we want */
-		  "copies-supported",
-		  "charset-supported",
-		  "document-format-supported",
-		  "printer-is-accepting-jobs",
-		  "printer-state",
-		  "printer-state-reasons",
-		};
-  static const char * const jattrs[] =
-		{		/* Job attributes we want */
-		  "job-media-sheets-completed",
-		  "job-state"
-		};


 /*
@@ -150,27 +105,6 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

  setbuf(stderr, NULL);

- /*
-  * Ignore SIGPIPE and catch SIGTERM signals...
-  */
-
-#ifdef HAVE_SIGSET
-  sigset(SIGPIPE, SIG_IGN);
-  sigset(SIGTERM, sigterm_handler);
-#elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
-  action.sa_handler = SIG_IGN;
-  sigaction(SIGPIPE, &action, NULL);
-
-  sigemptyset(&action.sa_mask);
-  sigaddset(&action.sa_mask, SIGTERM);
-  action.sa_handler = sigterm_handler;
-  sigaction(SIGTERM, &action, NULL);
-#else
-  signal(SIGPIPE, SIG_IGN);
-  signal(SIGTERM, sigterm_handler);
-#endif /* HAVE_SIGSET */
-
 /*
  * Check command-line...
  */
@@ -184,7 +118,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
    else
      s = argv[0];

-    printf("network %s \"Unknown\" \"Internet Printing Protocol (%s)\"\n", s, s);
+    printf("network %s \"Unknown\" \"Internet Printing Protocol\"\n", s);
    return (0);
  }
  else if (argc < 6 || argc > 7)
@@ -194,18 +128,6 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
    return (1);
  }

- /*
-  * Get the content type...
-  */
-
-  if (argc > 6)
-    content_type = getenv("CONTENT_TYPE");
-  else
-    content_type = "application/vnd.cups-raw";
-
-  if (content_type == NULL)
-    content_type = "application/octet-stream";
-
 /*
  * If we have 7 arguments, print the file named on the command-line.
  * Otherwise, copy stdin to a temporary file and print the temporary
@@ -223,7 +145,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
    int  bytes;		/* Number of bytes read */


-    if ((fd = cupsTempFd(tmpfilename, sizeof(tmpfilename))) < 0)
+    if ((fd = cupsTempFd(filename, sizeof(filename))) < 0)
    {
      perror("ERROR: unable to create temporary file");
      return (1);
@@ -234,15 +156,17 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
      {
        perror("ERROR: unable to write to temporary file");
 	close(fd);
-	unlink(tmpfilename);
+	unlink(filename);
 	return (1);
      }

    close(fd);
-    filename = tmpfilename;
  }
  else
-    filename = argv[6];
+  {
+    strncpy(filename, argv[6], sizeof(filename) - 1);
+    filename[sizeof(filename) - 1] = '\0';
+  }

 /*
  * Extract the hostname and printer name from the URI...
@@ -270,47 +194,16 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

  do
  {
-    fprintf(stderr, "INFO: Connecting to %s on port %d...\n", hostname, port);
+    fprintf(stderr, "INFO: Connecting to %s...\n", hostname);

-    if ((http = httpConnectEncrypt(hostname, port, cupsEncryption())) == NULL)
+    if ((http = httpConnect(hostname, port)) == NULL)
    {
-      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 queue job on %s, queuing on next printer in class...\n",
-	        hostname);
-
-        if (argc == 6 || strcmp(filename, argv[6]))
-	  unlink(filename);
-
-       /*
-        * Sleep 5 seconds to keep the job from requeuing too rapidly...
-	*/
-
-	sleep(5);
-
-        return (1);
-      }
-
-      if (errno == ECONNREFUSED || errno == EHOSTDOWN ||
-          errno == EHOSTUNREACH)
+      if (errno == ECONNREFUSED)
      {
 	fprintf(stderr, "INFO: Network host \'%s\' is busy; will retry in 30 seconds...",
                hostname);
 	sleep(30);
      }
-      else if (h_errno)
-      {
-        fprintf(stderr, "INFO: Unable to lookup host \'%s\' - %s\n",
-	        hostname, hstrerror(h_errno));
-	sleep(30);
-      }
      else
      {
 	perror("ERROR: Unable to connect to IPP host");
@@ -320,8 +213,6 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  }
  while (http == NULL);

-  fprintf(stderr, "INFO: Connected to %s...\n", hostname);
-
 /*
  * Build a URI for the printer and fill the standard IPP attributes for
  * an IPP_PRINT_FILE request.  We can't use the URI in argv[0] because it
@@ -364,16 +255,10 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
        	 NULL, uri);

-    ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-                  "requested-attributes", sizeof(pattrs) / sizeof(pattrs[0]),
-		  NULL, pattrs);
-
   /*
    * Do the request...
    */

-    fputs("DEBUG: Getting supported attributes...\n", stderr);
-
    if ((supported = cupsDoRequest(http, request, resource)) == NULL)
      ipp_status = cupsLastError();
    else
@@ -381,11 +266,13 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

    if (ipp_status > IPP_OK_CONFLICT)
    {
+      if (supported)
+        ippDelete(supported);
+
      if (ipp_status == IPP_PRINTER_BUSY ||
 	  ipp_status == IPP_SERVICE_UNAVAILABLE)
      {
 	fputs("INFO: Printer busy; will retry in 10 seconds...\n", stderr);
-        report_printer_state(supported);
 	sleep(10);
      }
      else if ((ipp_status == IPP_BAD_REQUEST ||
@@ -397,28 +284,10 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

 	fputs("INFO: Printer does not support IPP/1.1, trying IPP/1.0...\n", stderr);
 	version = 0;
-	httpReconnect(http);
-      }
-      else if (ipp_status == IPP_NOT_FOUND)
-      {
-        fputs("ERROR: Destination printer does not exist!\n", stderr);
-
-	if (supported)
-          ippDelete(supported);
-
-	return (1);
      }
      else
-      {
-	fprintf(stderr, "ERROR: Unable to get printer status (%s)!\n",
+	fprintf(stderr, "ERROR: Printer will not accept print file (%s)!\n",
 	        ippErrorString(ipp_status));
-        sleep(10);
-      }
-
-      if (supported)
-        ippDelete(supported);
-
-      continue;
    }
    else if ((copies_sup = ippFindAttribute(supported, "copies-supported",
 	                                    IPP_TAG_RANGE)) != NULL)
@@ -445,52 +314,29 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 	fprintf(stderr, "DEBUG: [%d] = \"%s\"\n", i,
 	        format_sup->values[i].string.text);
    }
-
-    report_printer_state(supported);
  }
  while (ipp_status > IPP_OK_CONFLICT);

 /*
-  * See if the printer is accepting jobs and is not stopped; if either
-  * condition is true and we are printing to a class, requeue the job...
+  * 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 (getenv("CLASS") != NULL)
+  if (argc < 7)
  {
-    printer_state     = ippFindAttribute(supported, "printer-state",
-                                	 IPP_TAG_ENUM);
-    printer_accepting = ippFindAttribute(supported, "printer-is-accepting-jobs",
-                                	 IPP_TAG_BOOLEAN);
+#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));

-    if (printer_state == NULL ||
-	printer_state->values[0].integer > IPP_PRINTER_PROCESSING ||
-	printer_accepting == NULL ||
-	!printer_accepting->values[0].boolean)
-    {
-     /*
-      * 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 queue job on %s, queuing on next printer in class...\n",
-	      hostname);
-
-      ippDelete(supported);
-      httpClose(http);
-
-      if (argc == 6 || strcmp(filename, argv[6]))
-	unlink(filename);
-
-     /*
-      * Sleep 5 seconds to keep the job from requeuing too rapidly...
-      */
-
-      sleep(5);
-
-      return (1);
-    }
+    sigemptyset(&action.sa_mask);
+    action.sa_handler = SIG_IGN;
+    sigaction(SIGTERM, &action, NULL);
+#else
+    signal(SIGTERM, SIG_IGN);
+#endif /* HAVE_SIGSET */
  }

 /*
@@ -543,8 +389,6 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  * Then issue the print-job request...
  */

-  reasons = 0;
-
  while (copies > 0)
  {
   /*
@@ -587,36 +431,10 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
    options     = NULL;
    num_options = cupsParseOptions(argv[5], 0, &options);

-#ifdef __APPLE__
-    if (content_type != NULL && strcasecmp(content_type, "application/pictwps") == 0)
-    {
-      if (format_sup != NULL)
-      {
-	for (i = 0; i < format_sup->num_values; i ++)
-	  if (strcasecmp(content_type, format_sup->values[i].string.text) == 0)
-	    break;
-      }
-
-      if (format_sup == NULL || i >= format_sup->num_values)
-      {
-       /*
-	* Remote doesn't support "application/pictwps" (i.e. it's not MacOS X)
-	* so convert the document to PostScript...
-	*/
-
-	if (run_pictwps_filter(argv, filename))
-	  return (1);
-
-        filename = pstmpname;
-
-       /*
-	* Change the MIME type to application/postscript...
-	*/
-
-	content_type = "application/postscript";
-      }
-    }
-#endif /* __APPLE__ */
+    if (argc > 6)
+      content_type = getenv("CONTENT_TYPE");
+    else
+      content_type = "application/vnd.cups-raw";

    if (content_type != NULL && format_sup != NULL)
    {
@@ -647,15 +465,6 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

    cupsFreeOptions(num_options, options);

-   /*
-    * If copies aren't supported, then we are likely dealing with an HP
-    * JetDirect.  The HP IPP implementation seems to close the connection
-    * after every request (that is, it does *not* implement HTTP Keep-
-    * Alive, which is REQUIRED by HTTP/1.1...
-    */
-
-    if (!copies_sup)
-      httpReconnect(http);

   /*
    * Do the request...
@@ -737,21 +546,13 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
      ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "job-id",
        	    job_id);

-      if (argv[2][0])
-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
-        	     NULL, argv[2]);
-
-      ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-                    "requested-attributes", sizeof(jattrs) / sizeof(jattrs[0]),
-		    NULL, jattrs);
+      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
+                   "requested-attributes", NULL, "job-state");

     /*
      * Do the request...
      */

-      if (!copies_sup)
-	httpReconnect(http);
-
      if ((response = cupsDoRequest(http, request, resource)) == NULL)
 	ipp_status = cupsLastError();
      else
@@ -782,75 +583,27 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
          break;
 	}
      }
-
-      if (response != NULL)
+      else if ((job_state = ippFindAttribute(response, "job-state", IPP_TAG_ENUM)) != NULL)
      {
-	if ((job_sheets = ippFindAttribute(response, "job-media-sheets-completed",
-	                                   IPP_TAG_INTEGER)) != NULL)
-	  fprintf(stderr, "PAGE: total %d\n", job_sheets->values[0].integer);
+       /*
+        * Stop polling if the job is finished or pending-held...
+	*/

-	if ((job_state = ippFindAttribute(response, "job-state",
-	                                  IPP_TAG_ENUM)) != NULL)
+        if (job_state->values[0].integer > IPP_JOB_PROCESSING ||
+	    job_state->values[0].integer == IPP_JOB_HELD)
 	{
-	 /*
-          * Stop polling if the job is finished or pending-held...
-	  */
-
-          if (job_state->values[0].integer > IPP_JOB_PROCESSING ||
-	      job_state->values[0].integer == IPP_JOB_HELD)
-	  {
-	    ippDelete(response);
-	    break;
-	  }
+	  ippDelete(response);
+	  break;
 	}
      }

-      if (response)
-	ippDelete(response);
-
-     /*
-      * Now check on the printer state...
-      */
-
-      request = ippNew();
-      request->request.op.version[1]   = version;
-      request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
-      request->request.op.request_id   = 1;
-
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-        	   "attributes-charset", NULL, charset);
-
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-        	   "attributes-natural-language", NULL,
-        	   language != NULL ? language->language : "en");
-
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
-        	   NULL, uri);
-
-      if (argv[2][0])
-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
-        	     NULL, argv[2]);
-
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-                   "requested-attributes", NULL, "printer-state-reasons");
-
-     /*
-      * Do the request...
-      */
-
-      if (!copies_sup)
-	httpReconnect(http);
-
-      if ((response = cupsDoRequest(http, request, resource)) != NULL)
-      {
-        reasons = report_printer_state(response);
-	ippDelete(response);
-      }
-
     /*
      * Wait 10 seconds before polling again...
      */

+      if (response)
+	ippDelete(response);
+
      sleep(10);
    }
  }
@@ -865,22 +618,17 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
    ippDelete(supported);

 /*
-  * Remove the temporary file(s) if necessary...
+  * Close and remove the temporary file if necessary...
  */

-  if (tmpfilename[0])
-    unlink(tmpfilename);
-
-#ifdef __APPLE__
-  if (pstmpname[0])
-    unlink(pstmpname);
-#endif /* __APPLE__ */
+  if (argc < 7)
+    unlink(filename);

 /*
  * Return the queue status...
  */

-  if (ipp_status <= IPP_OK_CONFLICT && reasons == 0)
+  if (ipp_status <= IPP_OK_CONFLICT)
    fputs("INFO: Ready to print.\n", stderr);

  return (ipp_status > IPP_OK_CONFLICT);
@@ -900,312 +648,6 @@ password_cb(const char *prompt)	/* I - Prompt (not used) */
 }


-/*
- * 'report_printer_state()' - Report the printer state.
- */
-
-int					/* O - Number of reasons shown */
-report_printer_state(ipp_t *ipp)	/* I - IPP response */
-{
-  int			i;		/* Looping var */
-  int			count;		/* Count of reasons shown... */
-  ipp_attribute_t	*reasons;	/* printer-state-reasons */
-  const char		*reason;	/* Current reason */
-  const char		*message;	/* Message to show */
-  char			unknown[1024];	/* Unknown message string */
-  const char		*prefix;	/* Prefix for STATE: line */
-  char			state[1024];	/* State string */
-
-
-  if ((reasons = ippFindAttribute(ipp, "printer-state-reasons",
-                                  IPP_TAG_KEYWORD)) == NULL)
-    return (0);
-
-  state[0] = '\0';
-  prefix   = "STATE: ";
-
-  for (i = 0, count = 0; i < reasons->num_values; i ++)
-  {
-    reason = reasons->values[i].string.text;
-
-    strlcat(state, prefix, sizeof(state));
-    strlcat(state, reason, sizeof(state));
-
-    prefix  = ",";
-    message = NULL;
-
-    if (strncmp(reason, "media-needed", 12) == 0)
-      message = "Media tray needs to be filled.";
-    else if (strncmp(reason, "media-jam", 9) == 0)
-      message = "Media jam!";
-    else if (strncmp(reason, "moving-to-paused", 16) == 0 ||
-             strncmp(reason, "paused", 6) == 0 ||
-	     strncmp(reason, "shutdown", 8) == 0)
-      message = "Printer off-line.";
-    else if (strncmp(reason, "toner-low", 9) == 0)
-      message = "Toner low.";
-    else if (strncmp(reason, "toner-empty", 11) == 0)
-      message = "Out of toner!";
-    else if (strncmp(reason, "cover-open", 10) == 0)
-      message = "Cover open.";
-    else if (strncmp(reason, "interlock-open", 14) == 0)
-      message = "Interlock open.";
-    else if (strncmp(reason, "door-open", 9) == 0)
-      message = "Door open.";
-    else if (strncmp(reason, "input-tray-missing", 18) == 0)
-      message = "Media tray missing!";
-    else if (strncmp(reason, "media-low", 9) == 0)
-      message = "Media tray almost empty.";
-    else if (strncmp(reason, "media-empty", 11) == 0)
-      message = "Media tray empty!";
-    else if (strncmp(reason, "output-tray-missing", 19) == 0)
-      message = "Output tray missing!";
-    else if (strncmp(reason, "output-area-almost-full", 23) == 0)
-      message = "Output bin almost full.";
-    else if (strncmp(reason, "output-area-full", 16) == 0)
-      message = "Output bin full!";
-    else if (strncmp(reason, "marker-supply-low", 17) == 0)
-      message = "Ink/toner almost empty.";
-    else if (strncmp(reason, "marker-supply-empty", 19) == 0)
-      message = "Ink/toner empty!";
-    else if (strncmp(reason, "marker-waste-almost-full", 24) == 0)
-      message = "Ink/toner waste bin almost full.";
-    else if (strncmp(reason, "marker-waste-full", 17) == 0)
-      message = "Ink/toner waste bin full!";
-    else if (strncmp(reason, "fuser-over-temp", 15) == 0)
-      message = "Fuser temperature high!";
-    else if (strncmp(reason, "fuser-under-temp", 16) == 0)
-      message = "Fuser temperature low!";
-    else if (strncmp(reason, "opc-near-eol", 12) == 0)
-      message = "OPC almost at end-of-life.";
-    else if (strncmp(reason, "opc-life-over", 13) == 0)
-      message = "OPC at end-of-life!";
-    else if (strncmp(reason, "developer-low", 13) == 0)
-      message = "Developer almost empty.";
-    else if (strncmp(reason, "developer-empty", 15) == 0)
-      message = "Developer empty!";
-    else if (strstr(reason, "error") != NULL)
-    {
-      message = unknown;
-
-      snprintf(unknown, sizeof(unknown), "Unknown printer error (%s)!",
-               reason);
-    }
-
-    if (message)
-    {
-      count ++;
-      if (strstr(reasons->values[i].string.text, "error"))
-        fprintf(stderr, "ERROR: %s\n", message);
-      else if (strstr(reasons->values[i].string.text, "warning"))
-        fprintf(stderr, "WARNING: %s\n", message);
-      else
-        fprintf(stderr, "INFO: %s\n", message);
-    }
-  }
-
-  fprintf(stderr, "%s\n", state);
-
-  return (count);
-}
-
-
-#ifdef __APPLE__
-/*
- * 'run_pictwps_filter()' - Convert PICT files to PostScript when printing
- *                          remotely.
- *
- * This step is required because the PICT format is not documented and
- * subject to change, so developing a filter for other OS's is infeasible.
- * Also, fonts required by the PICT file need to be embedded on the
- * client side (which has the fonts), so we run the filter to get a
- * PostScript file for printing...
- */
-
-int						/* O - Exit status of filter */
-run_pictwps_filter(char       **argv,		/* I - Command-line arguments */
-                   const char *filename)	/* I - Filename */
-{
-  struct stat	fileinfo;			/* Print file information */
-  const char	*ppdfile;			/* PPD file for destination printer */
-  int		pid;				/* Child process ID */
-  int		fd;				/* Temporary file descriptor */
-  int		status;				/* Exit status of filter */
-  const char	*printer;			/* PRINTER env var */
-  static char	ppdenv[1024];			/* PPD environment variable */
-
-
- /*
-  * First get the PPD file for the printer...
-  */
-
-  printer = getenv("PRINTER");
-  if (!printer)
-  {
-    fputs("ERROR: PRINTER environment variable not defined!\n", stderr);
-    return (-1);
-  }
-
-  if ((ppdfile = cupsGetPPD(printer)) == NULL)
-  {
-    fprintf(stderr, "ERROR: Unable to get PPD file for printer \"%s\" - %s.\n",
-            printer, ippErrorString(cupsLastError()));
-    /*return (-1);*/
-  }
-  else
-  {
-    snprintf(ppdenv, sizeof(ppdenv), "PPD=%s", ppdfile);
-    putenv(ppdenv);
-  }
-
- /*
-  * Then create a temporary file for printing...
-  */
-
-  if ((fd = cupsTempFd(pstmpname, sizeof(pstmpname))) < 0)
-  {
-    fprintf(stderr, "ERROR: Unable to create temporary file - %s.\n",
-            strerror(errno));
-    if (ppdfile)
-      unlink(ppdfile);
-    return (-1);
-  }
-
- /*
-  * Get the owner of the spool file - it is owned by the user we want to run
-  * as...
-  */
-
-  if (argv[6])
-    stat(argv[6], &fileinfo);
-  else
-  {
-   /*
-    * Use the OSX defaults, as an up-stream filter created the PICT
-    * file...
-    */
-
-    fileinfo.st_uid = 1;
-    fileinfo.st_gid = 80;
-  }
-
-  if (ppdfile)
-    chown(ppdfile, fileinfo.st_uid, fileinfo.st_gid);
-
-  fchown(fd, fileinfo.st_uid, fileinfo.st_gid);
-
- /*
-  * Finally, run the filter to convert the file...
-  */
-
-  if ((pid = fork()) == 0)
-  {
-   /*
-    * Child process for pictwpstops...  Redirect output of pictwpstops to a
-    * file...
-    */
-
-    close(1);
-    dup(fd);
-    close(fd);
-
-    if (!getuid())
-    {
-     /*
-      * Change to an unpriviledged user...
-      */
-
-      setgid(fileinfo.st_gid);
-      setuid(fileinfo.st_uid);
-    }
-
-    execlp("pictwpstops", printer, argv[1], argv[2], argv[3], argv[4], argv[5],
-           filename, NULL);
-    perror("ERROR: Unable to exec pictwpstops");
-    return (errno);
-  }
-
-  close(fd);
-
-  if (pid < 0)
-  {
-   /*
-    * Error!
-    */
-
-    perror("ERROR: Unable to fork pictwpstops");
-    unlink(filename);
-    if (ppdfile)
-      unlink(ppdfile);
-    return (-1);
-  }
-
- /*
-  * Now wait for the filter to complete...
-  */
-
-  if (wait(&status) < 0)
-  {
-    perror("ERROR: Unable to wait for pictwpstops");
-    close(fd);
-    unlink(filename);
-    if (ppdfile)
-      unlink(ppdfile);
-    return (-1);
-  }
-
-  if (ppdfile)
-    unlink(ppdfile);
-
-  close(fd);
-
-  if (status)
-  {
-    if (status >= 256)
-      fprintf(stderr, "ERROR: pictwpstops exited with status %d!\n",
-              status / 256);
-    else
-      fprintf(stderr, "ERROR: pictwpstops exited on signal %d!\n",
-              status);
-
-    unlink(filename);
-    return (status);
-  }
-
- /*
-  * Return with no errors..
-  */
-
-  return (0);
-}
-#endif /* __APPLE__ */
-
-
-/*
- * 'sigterm_handler()' - Handle 'terminate' signals that stop the backend.
- */
-
-static void
-sigterm_handler(int sig)		/* I - Signal */
-{
-  (void)sig;	/* remove compiler warnings... */
-
- /*
-  * Remove the temporary file(s) if necessary...
-  */
-
-  if (tmpfilename[0])
-    unlink(tmpfilename);
-
-#ifdef __APPLE__
-  if (pstmpname[0])
-    unlink(pstmpname);
-#endif /* __APPLE__ */
-
-  exit(1);
-}
-
-
 /*
 * End of "$Id$".
 */
@@ -3,7 +3,7 @@
 *
 *   Parallel port backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2001 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
@@ -21,8 +21,6 @@
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
 *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
 * Contents:
 *
 *   main()         - Send a file to the specified parallel port.
@@ -40,13 +38,13 @@
 #include <cups/string.h>
 #include <signal.h>

-#ifdef WIN32
+#if defined(WIN32) || defined(__EMX__)
 #  include <io.h>
 #else
 #  include <unistd.h>
 #  include <fcntl.h>
 #  include <termios.h>
-#endif /* WIN32 */
+#endif /* WIN32 || __EMX__ */

 #ifdef __sgi
 #  include <invent.h>
@@ -85,7 +83,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 		resource[1024],	/* Resource info (device and options) */
 		*options;	/* Pointer to options */
  int		port;		/* Port number (not used) */
-  int		fp;		/* Print file */
+  FILE		*fp;		/* Print file */
  int		copies;		/* Number of copies to print */
  int		fd;		/* Parallel device */
  int		wbytes;		/* Number of bytes written */
@@ -105,20 +103,6 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

  setbuf(stderr, NULL);

- /*
-  * Ignore SIGPIPE signals...
-  */
-
-#ifdef HAVE_SIGSET
-  sigset(SIGPIPE, SIG_IGN);
-#elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
-  action.sa_handler = SIG_IGN;
-  sigaction(SIGPIPE, &action, NULL);
-#else
-  signal(SIGPIPE, SIG_IGN);
-#endif /* HAVE_SIGSET */
-
 /*
  * Check command-line...
  */
@@ -141,7 +125,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

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

-    if ((fp = open(argv[6], O_RDONLY)) < 0)
+    if ((fp = fopen(argv[6], "rb")) == NULL)
    {
      perror("ERROR: unable to open print file");
      return (1);
@@ -192,15 +176,9 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
        fputs("INFO: Parallel port busy; will retry in 30 seconds...\n", stderr);
 	sleep(30);
      }
-      else if (errno == ENXIO || errno == EIO || errno == ENOENT)
-      {
-        fputs("INFO: Printer not connected; will retry in 30 seconds...\n", stderr);
-	sleep(30);
-      }
      else
      {
-	fprintf(stderr, "ERROR: Unable to open parallel port device file \"%s\": %s\n",
-	        resource, strerror(errno));
+	perror("ERROR: Unable to open parallel port device file");
 	return (1);
      }
    }
@@ -249,14 +227,14 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  {
    copies --;

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

    tbytes = 0;
-    while ((nbytes = read(fp, buffer, sizeof(buffer))) > 0)
+    while ((nbytes = fread(buffer, 1, sizeof(buffer), fp)) > 0)
    {
     /*
      * Write the print data to the printer...
@@ -281,12 +259,8 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 	bufptr += wbytes;
      }

-      if (wbytes < 0)
-        break;
-
      if (argc > 6)
-	fprintf(stderr, "INFO: Sending print file, %lu bytes...\n",
-	        (unsigned long)tbytes);
+	fprintf(stderr, "INFO: Sending print file, %u bytes...\n", tbytes);
    }
  }

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

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

  return (0);
 }
@@ -357,16 +329,7 @@ list_devices(void)
 	  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");
-	}
+	  strcpy(basedevice, "/dev/unknown-parallel");
      }
    }

@@ -412,10 +375,10 @@ list_devices(void)

        if (strncmp(line, "MODEL:", 6) == 0 &&
 	    strncmp(line, "MODEL:Unknown", 13) != 0)
-	  strlcpy(model, line + 6, sizeof(model));
+	  strncpy(model, line + 6, sizeof(model) - 1);
 	else if (strncmp(line, "MANUFACTURER:", 13) == 0 &&
 	         strncmp(line, "MANUFACTURER:Unknown", 20) != 0)
-	  strlcpy(make, line + 13, sizeof(make));
+	  strncpy(make, line + 13, sizeof(make) - 1);
      }

      fclose(probe);
@@ -645,14 +608,14 @@ list_devices(void)
    if ((fd = open(device, O_WRONLY)) >= 0)
    {
      close(fd);
-      printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d (interrupt-driven)\"\n", device, i + 1);
+      printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
    }

    sprintf(device, "/dev/lpa%d", i);
    if ((fd = open(device, O_WRONLY)) >= 0)
    {
      close(fd);
-      printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d (polled)\"\n", device, i + 1);
+      printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
    }
  }
 #elif defined(_AIX)
@@ -1,210 +0,0 @@
-/*
- * "$Id$"
- *
- *   IRIX SCSI printer support for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2003 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:
- *
- *   list_devices() - List the available SCSI printer devices.
- *   print_device() - Print a file to a SCSI device.
- */
-
-/*
- * Include necessary headers.
- */
-
-#include <bstring.h>		/* memcpy() and friends */
-#include <sys/dsreq.h>		/* SCSI interface stuff */
-
-
-/*
- * 'list_devices()' - List the available SCSI printer devices.
- */
-
-void
-list_devices(void)
-{
-  puts("direct scsi \"Unknown\" \"SCSI Printer\"");
-}
-
-
-/*
- * 'print_device()' - Print a file to a SCSI device.
- */
-
-int					/* O - Print status */
-print_device(const char *resource,	/* I - SCSI device */
-             int        fd,		/* I - File to print */
-	     int        copies)		/* I - Number of copies to print */
-{
-  int		scsi_fd;		/* SCSI file descriptor */
-  char		buffer[8192];		/* Data buffer */
-  int		bytes;			/* Number of bytes */
-  int		try;			/* Current try */
-  dsreq_t	scsi_req;		/* SCSI request */
-  char		scsi_cmd[6];		/* SCSI command data */
-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  struct sigaction action;		/* Actions for POSIX signals */
-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-
-
- /*
-  * Make sure we have a valid resource name...
-  */
-
-  if (strncmp(resource, "/dev/scsi/", 10) != 0)
-  {
-    fprintf(stderr, "ERROR: Bad SCSI device file \"%s\"!\n", resource);
-    return (1);
-  }
-
- /*
-  * Open the SCSI device file...
-  */
-
-  do
-  {
-    if ((scsi_fd = open(resource, O_RDWR | O_EXCL)) == -1)
-    {
-      if (errno != EAGAIN && errno != EBUSY)
-      {
-	fprintf(stderr, "ERROR: Unable to open SCSI device \"%s\" - %s\n",
-        	resource, strerror(errno));
-	return (1);
-      }
-      else
-      {
-        fprintf(stderr, "INFO: SCSI device \"%s\" busy; retrying...\n",
-	        resource);
-        sleep(30);
-      }
-    }
-  }
-  while (scsi_fd == -1);
-
- /*
-  * 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 (fd != 0)
-  {
-#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 */
-  }
-
- /*
-  * Copy the print file to the device...
-  */
-
-  while (copies > 0)
-  {
-    if (fd != 0)
-      lseek(fd, 0, SEEK_SET);
-
-    while ((bytes = read(fd, buffer, sizeof(buffer))) > 0)
-    {
-      memset(&scsi_req, 0, sizeof(scsi_req));
-
-      scsi_req.ds_flags   = DSRQ_WRITE;
-      scsi_req.ds_time    = 60 * 1000;
-      scsi_req.ds_cmdbuf  = scsi_cmd;
-      scsi_req.ds_cmdlen  = 6;
-      scsi_req.ds_databuf = buffer;
-      scsi_req.ds_datalen = bytes;
-
-      scsi_cmd[0] = 0x0a;	/* Group 0 print command */
-      scsi_cmd[1] = 0x00;
-      scsi_cmd[2] = bytes / 65536;
-      scsi_cmd[3] = bytes / 256;
-      scsi_cmd[4] = bytes;
-      scsi_cmd[5] = 0x00;
-
-      for (try = 0; try < 10; try ++)
-	if (ioctl(scsi_fd, DS_ENTER, &scsi_req) < 0 ||
-            scsi_req.ds_status != 0)
-        {
-	  fprintf(stderr, "WARNING: SCSI command timed out (%d); retrying...\n",
-	          scsi_req.ds_status);
-          sleep(try + 1);
-	}
-	else
-          break;
-
-      if (try >= 10)
-      {
-	fprintf(stderr, "ERROR: Unable to send print data (%d)\n",
-	        scsi_req.ds_status);
-        close(scsi_fd);
-	return (1);
-      }
-    }
-
-    copies --;
-  }
-
- /*
-  * Close the device and return...
-  */
-
-  close(fd);
-
-  return (0);
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -1,228 +0,0 @@
-/*
- * "$Id$"
- *
- *   Linux SCSI printer support for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2003 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:
- *
- *   list_devices() - List the available SCSI printer devices.
- *   print_device() - Print a file to a SCSI device.
- */
-
-/*
- * Include necessary headers.
- */
-
-#include <scsi/sg.h>
-
-
-/*
- * We currently only support the Linux 2.4 generic SCSI interface.
- */
-
-#ifndef SG_DXFER_TO_DEV
-/*
- * Dummy functions that do nothing on unsupported platforms...
- */
-void	list_devices(void) {}
-int	print_device(const char *resource, int fd, int copies) { return (1); }
-#else
-
-
-/*
- * 'list_devices()' - List the available SCSI printer devices.
- */
-
-void
-list_devices(void)
-{
-  puts("direct scsi \"Unknown\" \"SCSI Printer\"");
-}
-
-
-/*
- * 'print_device()' - Print a file to a SCSI device.
- */
-
-int					/* O - Print status */
-print_device(const char *resource,	/* I - SCSI device */
-             int        fd,		/* I - File to print */
-	     int        copies)		/* I - Number of copies to print */
-{
-  int		scsi_fd;		/* SCSI file descriptor */
-  char		buffer[8192];		/* Data buffer */
-  int		bytes;			/* Number of bytes */
-  int		try;			/* Current try */
-  sg_io_hdr_t	scsi_req;		/* SCSI request */
-  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 */
-#  endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-
-
- /*
-  * Make sure we have a valid resource name...
-  */
-
-  if (strncmp(resource, "/dev/sg", 7) != 0)
-  {
-    fprintf(stderr, "ERROR: Bad SCSI device file \"%s\"!\n", resource);
-    return (1);
-  }
-
- /*
-  * Open the SCSI device file...
-  */
-
-  do
-  {
-    if ((scsi_fd = open(resource, O_RDWR | O_EXCL)) == -1)
-    {
-      if (errno != EAGAIN && errno != EBUSY)
-      {
-	fprintf(stderr, "ERROR: Unable to open SCSI device \"%s\" - %s\n",
-        	resource, strerror(errno));
-	return (1);
-      }
-      else
-      {
-        fprintf(stderr, "INFO: SCSI device \"%s\" busy; retrying...\n",
-	        resource);
-        sleep(30);
-      }
-    }
-  }
-  while (scsi_fd == -1);
-
- /*
-  * 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 (fd != 0)
-  {
-#  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 */
-  }
-
- /*
-  * Copy the print file to the device...
-  */
-
-  while (copies > 0)
-  {
-    if (fd != 0)
-      lseek(fd, 0, SEEK_SET);
-
-    while ((bytes = read(fd, buffer, sizeof(buffer))) > 0)
-    {
-      memset(&scsi_req, 0, sizeof(scsi_req));
-
-      scsi_req.interface_id    = 'S';
-      scsi_req.dxfer_direction = SG_DXFER_TO_DEV;
-      scsi_req.cmd_len         = 6;
-      scsi_req.mx_sb_len       = sizeof(scsi_sense);
-      scsi_req.iovec_count     = 0;
-      scsi_req.dxfer_len       = bytes;
-      scsi_req.dxferp          = buffer;
-      scsi_req.cmdp            = scsi_cmd;
-      scsi_req.sbp             = scsi_sense;
-      scsi_req.timeout         = 60 * 1000;
-      
-      scsi_cmd[0] = 0x0a;	/* Group 0 print command */
-      scsi_cmd[1] = 0x00;
-      scsi_cmd[2] = bytes / 65536;
-      scsi_cmd[3] = bytes / 256;
-      scsi_cmd[4] = bytes;
-      scsi_cmd[5] = 0x00;
-
-      for (try = 0; try < 10; try ++)
-	if (ioctl(scsi_fd, SG_IO, &scsi_req) < 0 ||
-            scsi_req.status != 0)
-        {
-	  fprintf(stderr, "WARNING: SCSI command timed out (%d); retrying...\n",
-	          scsi_req.status);
-          sleep(try + 1);
-	}
-	else
-          break;
-
-      if (try >= 10)
-      {
-	fprintf(stderr, "ERROR: Unable to send print data (%d)\n",
-	        scsi_req.status);
-        close(scsi_fd);
-	return (1);
-      }
-    }
-
-    copies --;
-  }
-
- /*
-  * Close the device and return...
-  */
-
-  close(fd);
-
-  return (0);
-}
-#endif /* !SG_DXFER_TO_DEV */
-
-
-/*
- * End of "$Id$".
- */
@@ -1,223 +0,0 @@
-/*
- * "$Id$"
- *
- *   SCSI printer backend for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2003 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 specified SCSI printer.
- */
-
-/*
- * Include necessary headers.
- */
-
-#include <cups/cups.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <cups/string.h>
-#include <signal.h>
-
-#ifdef WIN32
-#  include <io.h>
-#else
-#  include <unistd.h>
-#  include <fcntl.h>
-#  ifdef HAVE_SYS_IOCTL_H
-#    include <sys/ioctl.h>
-#  endif /* HAVE_SYS_IOCTL_H */
-#endif /* WIN32 */
-
-
-/*
- * Local functions...
- */
-
-void	list_devices(void);
-int	print_device(const char *resource, int fd, int copies);
-
-
-#ifdef __linux__
-#  include "scsi-linux.c"
-#elif defined(__sgi)
-#  include "scsi-irix.c"
-#else
-/*
- * Dummy functions that do nothing on unsupported platforms...
- */
-void	list_devices(void) {}
-int	print_device(const char *resource, int fd, int copies) { return (1); }
-#endif /* __linux */
-
-
-/*
- * 'main()' - Send a file to the specified SCSI 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 */
-{
-  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		status;		/* Exit status */
-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  struct sigaction action;	/* Actions for POSIX signals */
-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-
-
- /*
-  * Make sure status messages are not buffered...
-  */
-
-  setbuf(stderr, NULL);
-
- /*
-  * Ignore SIGPIPE signals...
-  */
-
-#ifdef HAVE_SIGSET
-  sigset(SIGPIPE, SIG_IGN);
-#elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
-  action.sa_handler = SIG_IGN;
-  sigaction(SIGPIPE, &action, NULL);
-#else
-  signal(SIGPIPE, SIG_IGN);
-#endif /* HAVE_SIGSET */
-
- /*
-  * Check command-line...
-  */
-
-  if (argc == 1)
-  {
-    list_devices();
-    return (0);
-  }
-  else if (argc < 6 || argc > 7)
-  {
-    fputs("Usage: scsi:/dev/file job-id user title copies options [file]\n", stderr);
-    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]);
-  }
-
- /*
-  * Extract the device name and options from the URI...
-  */
-
-  httpSeparate(argv[0], method, username, hostname, &port, resource);
-
- /*
-  * See if there are any options...
-  */
-
-  if ((options = strchr(resource, '?')) != NULL)
-  {
-   /*
-    * Yup, terminate the device name string and move to the first
-    * character of the options...
-    */
-
-    *options++ = '\0';
-  }
-
- /*
-  * Finally, send the print file...
-  */
-
-  status = print_device(resource, fp, copies);
-
- /*
-  * Close input file and return...
-  */
-
-  if (fp != 0)
-    close(fp);
-
-  if (!status)
-    fputs("INFO: Ready to print.\n", stderr);
-
-  return (status);
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -3,7 +3,7 @@
 *
 *   Serial port backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2001 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
@@ -21,8 +21,6 @@
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
 *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
 * Contents:
 *
 *   main()         - Send a file to the printer or server.
@@ -44,7 +42,7 @@
 #  include <sys/modem.h>
 #endif /* __hpux */

-#ifdef WIN32
+#if defined(WIN32) || defined(__EMX__)
 #  include <io.h>
 #else
 #  include <unistd.h>
@@ -53,7 +51,7 @@
 #  ifdef HAVE_SYS_IOCTL_H
 #    include <sys/ioctl.h>
 #  endif /* HAVE_SYS_IOCTL_H */
-#endif /* WIN32 */
+#endif /* WIN32 || __EMX__ */

 #ifdef __sgi
 #  include <invent.h>
@@ -74,13 +72,6 @@
 #  endif /* CNEW_RTSCTS */
 #endif /* !CRTSCTS */

-#if defined(__APPLE__)
-#  include <CoreFoundation/CoreFoundation.h>
-#  include <IOKit/IOKitLib.h>
-#  include <IOKit/serial/IOSerialKeys.h>
-#  include <IOKit/IOBSD.h>
-#endif /* __APPLE__ */
-

 /*
 * Local functions...
@@ -110,7 +101,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 		value[255],	/* Value of option */
 		*ptr;		/* Pointer into name or value */
  int		port;		/* Port number (not used) */
-  int		fp;		/* Print file */
+  FILE		*fp;		/* Print file */
  int		copies;		/* Number of copies to print */
  int		fd;		/* Parallel device */
  int		wbytes;		/* Number of bytes written */
@@ -120,8 +111,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  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 */
+  struct termios opts;		/* Parallel port options */
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
  struct sigaction action;	/* Actions for POSIX signals */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
@@ -133,20 +123,6 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

  setbuf(stderr, NULL);

- /*
-  * Ignore SIGPIPE signals...
-  */
-
-#ifdef HAVE_SIGSET
-  sigset(SIGPIPE, SIG_IGN);
-#elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
-  action.sa_handler = SIG_IGN;
-  sigaction(SIGPIPE, &action, NULL);
-#else
-  signal(SIGPIPE, SIG_IGN);
-#endif /* HAVE_SIGSET */
-
 /*
  * Check command-line...
  */
@@ -169,7 +145,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

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

-    if ((fp = open(argv[6], O_RDONLY)) < 0)
+    if ((fp = fopen(argv[6], "rb")) == NULL)
    {
      perror("ERROR: unable to open print file");
      return (1);
@@ -222,8 +198,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
      }
      else
      {
-	fprintf(stderr, "ERROR: Unable to open serial port device file \"%s\": %s\n",
-	        resource, strerror(errno));
+	perror("ERROR: Unable to open serial port device file");
 	return (1);
      }
    }
@@ -234,11 +209,9 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  * Set any options provided...
  */

-  tcgetattr(fd, &origopts);
  tcgetattr(fd, &opts);

  opts.c_lflag &= ~(ICANON | ECHO | ISIG);	/* Raw mode */
-  opts.c_oflag &= ~OPOST;			/* Don't post-process */

  bufsize = 96;		/* 9600 baud / 10 bits/char / 10Hz */
  dtrdsr  = 0;		/* No dtr/dsr flow control */
@@ -314,24 +287,18 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 	      cfsetispeed(&opts, B38400);
 	      cfsetospeed(&opts, B38400);
 	      break;
-#  ifdef B57600
+#ifdef B57600
 	  case 57600 :
 	      cfsetispeed(&opts, B57600);
 	      cfsetospeed(&opts, B57600);
 	      break;
-#  endif /* B57600 */
-#  ifdef B115200
+#endif /* B57600 */
+#ifdef B115200
 	  case 115200 :
 	      cfsetispeed(&opts, B115200);
 	      cfsetospeed(&opts, B115200);
 	      break;
-#  endif /* B115200 */
-#  ifdef B230400
-	  case 230400 :
-	      cfsetispeed(&opts, B230400);
-	      cfsetospeed(&opts, B230400);
-	      break;
-#  endif /* B230400 */
+#endif /* B115200 */
          default :
 	      fprintf(stderr, "WARNING: Unsupported baud rate %s!\n", value);
 	      break;
@@ -386,23 +353,23 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

 	if (strcasecmp(value, "none") == 0)
 	{
-	  opts.c_iflag &= ~(IXON | IXOFF);
+	  opts.c_iflag &= ~(IXON | IXOFF | IXANY);
          opts.c_cflag &= ~CRTSCTS;
 	}
 	else if (strcasecmp(value, "soft") == 0)
 	{
-	  opts.c_iflag |= IXON | IXOFF;
+	  opts.c_iflag |= IXON | IXOFF | IXANY;
          opts.c_cflag &= ~CRTSCTS;
 	}
 	else if (strcasecmp(value, "hard") == 0 ||
 	         strcasecmp(value, "rtscts") == 0)
        {
-	  opts.c_iflag &= ~(IXON | IXOFF);
+	  opts.c_iflag &= ~(IXON | IXOFF | IXANY);
          opts.c_cflag |= CRTSCTS;
 	}
 	else if (strcasecmp(value, "dtrdsr") == 0)
 	{
-	  opts.c_iflag &= ~(IXON | IXOFF);
+	  opts.c_iflag &= ~(IXON | IXOFF | IXANY);
          opts.c_cflag &= ~CRTSCTS;

 	  dtrdsr = 1;
@@ -446,10 +413,10 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  {
    copies --;

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

    if (dtrdsr)
@@ -483,7 +450,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
    }

    tbytes = 0;
-    while ((nbytes = read(fp, buffer, bufsize)) > 0)
+    while ((nbytes = fread(buffer, 1, bufsize, fp)) > 0)
    {
     /*
      * Write the print data to the printer...
@@ -508,12 +475,8 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 	bufptr += wbytes;
      }

-      if (wbytes < 0)
-        break;
-
      if (argc > 6)
-	fprintf(stderr, "INFO: Sending print file, %lu bytes...\n",
-	        (unsigned long)tbytes);
+	fprintf(stderr, "INFO: Sending print file, %u bytes...\n", tbytes);
    }
  }

@@ -521,13 +484,9 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  * Close the serial port and input file and return...
  */

-  tcsetattr(fd, TCSADRAIN, &origopts);
-
  close(fd);
-  if (fp != 0)
-    close(fp);
-
-  fputs("INFO: Ready to print.\n", stderr);
+  if (fp != stdin)
+    fclose(fp);

  return (0);
 }
@@ -545,7 +504,7 @@ list_devices(void)
 				/* Funky hex numbering used for some devices */
 #endif /* __hpux || __sgi || __sun || __FreeBSD__ || __OpenBSD__ */

-#if defined(__linux) || defined(linux) || defined(__linux__)
+#ifdef __linux
  int	i;		/* Looping var */
  int	fd;		/* File descriptor */
  char	device[255];	/* Device filename */
@@ -557,24 +516,8 @@ list_devices(void)
    if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
    {
      close(fd);
-#  if defined(_ARCH_PPC) || defined(powerpc) || defined(__powerpc)
-      printf("serial serial:%s?baud=230400 \"Unknown\" \"Serial Port #%d\"\n",
-             device, i + 1);
-#  else
      printf("serial serial:%s?baud=115200 \"Unknown\" \"Serial Port #%d\"\n",
             device, i + 1);
-#  endif /* _ARCH_PPC || powerpc || __powerpc */
-    }
-  }
-
-  for (i = 0; i < 16; i ++)
-  {
-    sprintf(device, "/dev/usb/ttyUSB%d", i);
-    if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
-    {
-      close(fd);
-      printf("serial serial:%s?baud=230400 \"Unknown\" \"USB Serial Port #%d\"\n",
-             device, i + 1);
    }
  }
 #elif defined(__sgi)
@@ -908,83 +851,7 @@ list_devices(void)
 	       device, i, j + 1);
      }
    }
-#elif defined(__APPLE__)
- /*
-  * Standard serial ports on MacOS X...
-  */

-  kern_return_t			kernResult;
-  mach_port_t			masterPort;
-  io_iterator_t			serialPortIterator;
-  CFMutableDictionaryRef	classesToMatch;
-  io_object_t			serialService;
-
-  printf("serial serial \"Unknown\" \"Serial Printer (serial)\"\n");
-
-  kernResult = IOMasterPort(MACH_PORT_NULL, &masterPort);
-  if (KERN_SUCCESS != kernResult)
-    return;
-
- /*
-  * Serial devices are instances of class IOSerialBSDClient.
-  */
-
-  classesToMatch = IOServiceMatching(kIOSerialBSDServiceValue);
-  if (classesToMatch != NULL)
-  {
-    CFDictionarySetValue(classesToMatch, CFSTR(kIOSerialBSDTypeKey),
-                         CFSTR(kIOSerialBSDRS232Type));
-
-    kernResult = IOServiceGetMatchingServices(masterPort, classesToMatch,
-                                              &serialPortIterator);
-    if (kernResult == KERN_SUCCESS)
-    {
-      while ((serialService = IOIteratorNext(serialPortIterator)))
-      {
-	CFTypeRef	serialNameAsCFString;
-	CFTypeRef	bsdPathAsCFString;
-	char		serialName[128];
-	char		bsdPath[1024];
-	Boolean		result;
-
-
-	serialNameAsCFString =
-	    IORegistryEntryCreateCFProperty(serialService,
-	                                    CFSTR(kIOTTYDeviceKey),
-					    kCFAllocatorDefault, 0);
-	if (serialNameAsCFString)
-	{
-	  result = CFStringGetCString(serialNameAsCFString, serialName,
-	                              sizeof(serialName),
-				      kCFStringEncodingASCII);
-	  CFRelease(serialNameAsCFString);
-
-	  if (result)
-	  {
-	    bsdPathAsCFString =
-	        IORegistryEntryCreateCFProperty(serialService,
-		                                CFSTR(kIOCalloutDeviceKey),
-						kCFAllocatorDefault, 0);
-	    if (bsdPathAsCFString)
-	    {
-	      result = CFStringGetCString(bsdPathAsCFString, bsdPath,
-	                                  sizeof(bsdPath),
-					  kCFStringEncodingASCII);
-	      CFRelease(bsdPathAsCFString);
-
-	      if (result)
-		printf("serial serial:%s?baud=115200 \"Unknown\" \"%s\"\n", bsdPath,
-		       serialName);
-	    }
-	  }
-	}
-
-	IOObjectRelease(serialService);
-      }
-
-      IOObjectRelease(serialPortIterator);    /* Release the iterator. */
-    }
-  }
 #endif
 }

@@ -3,7 +3,7 @@
 *
 *   AppSocket backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2001 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
@@ -21,8 +21,6 @@
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
 *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
 * Contents:
 *
 *   main() - Send a file to the printer or server.
@@ -36,30 +34,20 @@
 #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>
 #include <sys/stat.h>
 #include <signal.h>

-#ifdef WIN32
+#if defined(WIN32) || defined(__EMX__)
 #  include <winsock.h>
 #else
-#  include <unistd.h>
-#  include <fcntl.h>
 #  include <sys/socket.h>
 #  include <netinet/in.h>
 #  include <arpa/inet.h>
 #  include <netdb.h>
-#endif /* WIN32 */
-
-
-/*
- * Local functions...
- */
-
-void	print_backchannel(const unsigned char *buffer, int nbytes);
+#endif /* WIN32 || __EMX__ */


 /*
@@ -70,15 +58,15 @@ void	print_backchannel(const unsigned char *buffer, int nbytes);
 *    printer-uri job-id user title copies options [file]
 */

-int				/* O - Exit status */
-main(int  argc,			/* I - Number of command-line arguments (6 or 7) */
-     char *argv[])		/* I - Command-line arguments */
+int			/* O - Exit status */
+main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
+     char *argv[])	/* I - Command-line arguments */
 {
  char		method[255],	/* Method in URI */
 		hostname[1024],	/* Hostname */
 		username[255],	/* Username info (not used) */
 		resource[1024];	/* Resource info (not used) */
-  int		fp;		/* Print file */
+  FILE		*fp;		/* Print file */
  int		copies;		/* Number of copies to print */
  int		port;		/* Port number */
  int		delay;		/* Delay for retries... */
@@ -87,8 +75,8 @@ main(int  argc,			/* I - Number of command-line arguments (6 or 7) */
  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 */
+  size_t	nbytes,		/* Number of bytes read */
+		tbytes;		/* Total number of bytes written */
  char		buffer[8192],	/* Output buffer */
 		*bufptr;	/* Pointer into buffer */
  struct timeval timeout;	/* Timeout for select() */
@@ -104,20 +92,6 @@ main(int  argc,			/* I - Number of command-line arguments (6 or 7) */

  setbuf(stderr, NULL);

- /*
-  * Ignore SIGPIPE signals...
-  */
-
-#ifdef HAVE_SIGSET
-  sigset(SIGPIPE, SIG_IGN);
-#elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
-  action.sa_handler = SIG_IGN;
-  sigaction(SIGPIPE, &action, NULL);
-#else
-  signal(SIGPIPE, SIG_IGN);
-#endif /* HAVE_SIGSET */
-
 /*
  * Check command-line...
  */
@@ -141,7 +115,7 @@ main(int  argc,			/* I - Number of command-line arguments (6 or 7) */

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

-    if ((fp = open(argv[6], O_RDONLY)) < 0)
+    if ((fp = fopen(argv[6], "rb")) == NULL)
    {
      perror("ERROR: unable to open print file");
      return (1);
@@ -175,7 +149,7 @@ main(int  argc,			/* I - Number of command-line arguments (6 or 7) */
  if ((hostaddr = httpGetHostByName(hostname)) == NULL)
  {
    fprintf(stderr, "ERROR: Unable to locate printer \'%s\' - %s\n",
-            hostname, hstrerror(h_errno));
+            hostname, strerror(errno));
    return (1);
  }

@@ -203,8 +177,7 @@ main(int  argc,			/* I - Number of command-line arguments (6 or 7) */
 	close(fd);
 	fd = -1;

-	if (error == ECONNREFUSED || error == EHOSTDOWN ||
-            error == EHOSTUNREACH)
+	if (error == ECONNREFUSED)
 	{
 	  fprintf(stderr, "INFO: Network host \'%s\' is busy; will retry in %d seconds...\n",
                  hostname, delay);
@@ -251,16 +224,16 @@ main(int  argc,			/* I - Number of command-line arguments (6 or 7) */

    copies --;

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

    fputs("INFO: Connected to host, sending print job...\n", stderr);

    tbytes = 0;
-    while ((nbytes = read(fp, buffer, sizeof(buffer))) > 0)
+    while ((nbytes = fread(buffer, 1, sizeof(buffer), fp)) > 0)
    {
     /*
      * Write the print data to the printer...
@@ -281,9 +254,6 @@ main(int  argc,			/* I - Number of command-line arguments (6 or 7) */
 	bufptr += wbytes;
      }

-      if (wbytes < 0)
-        break;
-
     /*
      * Check for possible data coming back from the printer...
      */
@@ -293,22 +263,22 @@ main(int  argc,			/* I - Number of command-line arguments (6 or 7) */

      FD_ZERO(&input);
      FD_SET(fd, &input);
+#ifdef __hpux
+      if (select(fd + 1, (int *)&input, NULL, NULL, &timeout) > 0)
+#else
      if (select(fd + 1, &input, NULL, NULL, &timeout) > 0)
+#endif /* __hpux */
      {
       /*
 	* Grab the data coming back and spit it out to stderr...
 	*/

 	if ((nbytes = recv(fd, buffer, sizeof(buffer), 0)) > 0)
-	{
-	  fprintf(stderr, "INFO: Received %d bytes of back-channel data!\n",
+	  fprintf(stderr, "INFO: Received %u 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);
+	fprintf(stderr, "INFO: Sending print file, %u bytes...\n", tbytes);
    }

   /*
@@ -343,12 +313,9 @@ main(int  argc,			/* I - Number of command-line arguments (6 or 7) */
 	*/

 	if ((nbytes = recv(fd, buffer, sizeof(buffer), 0)) > 0)
-	{
-	  fprintf(stderr, "INFO: Received %d bytes of back-channel data!\n",
+	  fprintf(stderr, "INFO: Received %u bytes of back-channel data!\n",
 	          nbytes);
-          print_backchannel((unsigned char *)buffer, nbytes);
-        }
-	else
+        else
 	  break;
      }
      else
@@ -366,8 +333,8 @@ main(int  argc,			/* I - Number of command-line arguments (6 or 7) */
  * Close the input file and return...
  */

-  if (fp != 0)
-    close(fp);
+  if (fp != stdin)
+    fclose(fp);

  fputs("INFO: Ready to print.\n", stderr);

@@ -375,44 +342,6 @@ main(int  argc,			/* I - Number of command-line arguments (6 or 7) */
 }


-/*
- * '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);
-  }
-}
-
-
 /*
 * End of "$Id$".
 */
@@ -3,7 +3,7 @@
 *
 *   USB port backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2001 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
@@ -21,8 +21,6 @@
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
 *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
 * Contents:
 *
 *   main()         - Send a file to the specified USB port.
@@ -40,43 +38,20 @@
 #include <cups/string.h>
 #include <signal.h>

-#ifdef WIN32
+#if defined(WIN32) || defined(__EMX__)
 #  include <io.h>
 #else
 #  include <unistd.h>
 #  include <fcntl.h>
 #  include <termios.h>
-#endif /* WIN32 */
-
-#ifdef __linux
-#  include <sys/ioctl.h>
-#  include <linux/lp.h>
-#  define IOCNR_GET_DEVICE_ID		1
-
-/*
- * Get device_id string
- */
-#  define LPIOC_GET_DEVICE_ID(len)	_IOC(_IOC_READ, 'P', IOCNR_GET_DEVICE_ID, len)
-#endif /* __linux */
-
-#ifdef __sun
-#  ifdef __sparc
-#    include <sys/ecppio.h>
-#  else
-#    include <sys/ecppsys.h>
-#  endif /* __sparc */
-#endif /* __sun */
+#endif /* WIN32 || __EMX__ */


 /*
 * Local functions...
 */

-void	decode_device_id(int port, const char *device_id,
-	                 char *make_model, int mmsize,
-			 char *uri, int urisize);
 void	list_devices(void);
-int	open_device(const char *uri);


 /*
@@ -91,7 +66,13 @@ int			/* O - Exit status */
 main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
     char *argv[])	/* I - Command-line arguments */
 {
-  int		fp;		/* Print file */
+  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) */
+  FILE		*fp;		/* Print file */
  int		copies;		/* Number of copies to print */
  int		fd;		/* Parallel device */
  int		wbytes;		/* Number of bytes written */
@@ -103,9 +84,6 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
  struct sigaction action;	/* Actions for POSIX signals */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-#ifdef __linux
-  unsigned char	status;		/* Port status (off-line, out-of-paper, etc.) */
-#endif /* __linux */


 /*
@@ -114,20 +92,6 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

  setbuf(stderr, NULL);

- /*
-  * Ignore SIGPIPE signals...
-  */
-
-#ifdef HAVE_SIGSET
-  sigset(SIGPIPE, SIG_IGN);
-#elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
-  action.sa_handler = SIG_IGN;
-  sigaction(SIGPIPE, &action, NULL);
-#else
-  signal(SIGPIPE, SIG_IGN);
-#endif /* HAVE_SIGSET */
-
 /*
  * Check command-line...
  */
@@ -150,7 +114,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

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

-    if ((fp = open(argv[6], O_RDONLY)) < 0)
+    if ((fp = fopen(argv[6], "rb")) == NULL)
    {
      perror("ERROR: unable to open print file");
      return (1);
@@ -168,28 +132,42 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
    copies = atoi(argv[4]);
  }

+ /*
+  * Extract the device name and options from the URI...
+  */
+
+  httpSeparate(argv[0], method, username, hostname, &port, resource);
+
+ /*
+  * See if there are any options...
+  */
+
+  if ((options = strchr(resource, '?')) != NULL)
+  {
+   /*
+    * Yup, terminate the device name string and move to the first
+    * character of the options...
+    */
+
+    *options++ = '\0';
+  }
+
 /*
  * Open the USB port device...
  */

  do
  {
-    if ((fd = open_device(argv[0])) == -1)
+    if ((fd = open(resource, O_WRONLY | O_EXCL)) == -1)
    {
      if (errno == EBUSY)
      {
        fputs("INFO: USB port busy; will retry in 30 seconds...\n", stderr);
 	sleep(30);
      }
-      else if (errno == ENXIO || errno == EIO || errno == ENOENT)
-      {
-        fputs("INFO: Printer not connected; will retry in 30 seconds...\n", stderr);
-	sleep(30);
-      }
      else
      {
-	fprintf(stderr, "ERROR: Unable to open USB device \"%s\": %s\n",
-	        argv[0], strerror(errno));
+	perror("ERROR: Unable to open USB port device file");
 	return (1);
      }
    }
@@ -230,31 +208,6 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 #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...
  */
@@ -263,14 +216,14 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  {
    copies --;

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

    tbytes = 0;
-    while ((nbytes = read(fp, buffer, sizeof(buffer))) > 0)
+    while ((nbytes = fread(buffer, 1, sizeof(buffer), fp)) > 0)
    {
     /*
      * Write the print data to the printer...
@@ -281,7 +234,6 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

      while (nbytes > 0)
      {
-
 	if ((wbytes = write(fd, bufptr, nbytes)) < 0)
 	  if (errno == ENOTTY)
 	    wbytes = write(fd, bufptr, nbytes);
@@ -296,12 +248,8 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 	bufptr += wbytes;
      }

-      if (wbytes < 0)
-        break;
-
      if (argc > 6)
-	fprintf(stderr, "INFO: Sending print file, %lu bytes...\n",
-	        (unsigned long)tbytes);
+	fprintf(stderr, "INFO: Sending print file, %u bytes...\n", tbytes);
    }
  }

@@ -310,155 +258,13 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  */

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

  return (0);
 }


-/*
- * 'decode_device_id()' - Decode the IEEE-1284 device ID string.
- */
-
-void
-decode_device_id(int        port,		/* I - Port number */
-                 const char *device_id,		/* I - 1284 device ID string */
-                 char       *make_model,	/* O - Make/model */
-		 int        mmsize,		/* I - Size of buffer */
-		 char       *uri,		/* O - Device URI */
-		 int        urisize)		/* I - Size of buffer */
-{
-  char	*attr,					/* 1284 attribute */
-  	*delim,					/* 1284 delimiter */
-	*uriptr,				/* Pointer into URI */
-	*mfg,					/* Manufacturer string */
-	*mdl,					/* Model string */
-	serial_number[1024];			/* Serial number string */
-
-
- /*
-  * Look for the description field...
-  */
-
-  if ((attr = strstr(device_id, "DES:")) != NULL)
-    attr += 4;
-  else if ((attr = strstr(device_id, "DESCRIPTION:")) != NULL)
-    attr += 12;
-
-  if ((mfg = strstr(device_id, "MANUFACTURER:")) != NULL)
-    mfg += 13;
-  else if ((mfg = strstr(device_id, "MFG:")) != NULL)
-    mfg += 4;
-
-  if ((mdl = strstr(device_id, "MODEL:")) != NULL)
-    mdl += 6;
-  else if ((mdl = strstr(device_id, "MDL:")) != NULL)
-    mdl += 4;
-
-  if (attr)
-  {
-    if (strncasecmp(attr, "Hewlett-Packard ", 16) == 0)
-    {
-      strlcpy(make_model, "HP ", mmsize);
-      strlcpy(make_model + 3, attr + 16, mmsize - 3);
-    }
-    else
-    {
-      strlcpy(make_model, attr, mmsize);
-    }
-
-    if ((delim = strchr(make_model, ';')) != NULL)
-      *delim = '\0';
-  }
-  else if (mfg && mdl)
-  {
-   /*
-    * Build a make-model string from the manufacturer and model attributes...
-    */
-
-    strlcpy(make_model, mfg, mmsize);
-
-    if ((delim = strchr(make_model, ';')) != NULL)
-      *delim = '\0';
-
-    strlcat(make_model, " ", mmsize);
-    strlcat(make_model, mdl, mmsize);
-
-    if ((delim = strchr(make_model, ';')) != NULL)
-      *delim = '\0';
-  }
-  else
-  {
-   /*
-    * Use "Unknown" as the printer make and model...
-    */
-
-    strlcpy(make_model, "Unknown", mmsize);
-  }
-
- /*
-  * Look for the serial number field...
-  */
-
-  if ((attr = strstr(device_id, "SERN:")) != NULL)
-    attr += 5;
-  else if ((attr = strstr(device_id, "SERIALNUMBER:")) != NULL)
-    attr += 13;
-
-  if (attr)
-  {
-    strlcpy(serial_number, attr, sizeof(serial_number));
-
-    if ((delim = strchr(serial_number, ';')) != NULL)
-      *delim = '\0';
-  }
-  else
-    serial_number[0] = '\0';
-
- /*
-  * Generate the device URI from the make_model and serial number strings.
-  */
-
-  strlcpy(uri, "usb://", urisize);
-  for (uriptr = uri + 6, delim = make_model;
-       *delim && uriptr < (uri + urisize - 1);
-       delim ++)
-    if (*delim == ' ')
-    {
-      delim ++;
-      *uriptr++ = '/';
-      break;
-    }
-    else
-      *uriptr++ = *delim;
-
-  for (; *delim && uriptr < (uri + urisize - 3); delim ++)
-    if (*delim == ' ')
-    {
-      *uriptr++ = '%';
-      *uriptr++ = '2';
-      *uriptr++ = '0';
-    }
-    else
-      *uriptr++ = *delim;
-
-  *uriptr = '\0';
-
-  if (serial_number[0])
-  {
-   /*
-    * Add the serial number to the URI...
-    */
-
-    strlcat(uri, "?serial=", urisize);
-    strlcat(uri, serial_number, urisize);
-  }
-}
-
-
 /*
 * 'list_devices()' - List all USB devices.
 */
@@ -468,339 +274,168 @@ list_devices(void)
 {
 #ifdef __linux
  int	i;			/* Looping var */
-  int	length;			/* Length of device ID info */
  int	fd;			/* File descriptor */
-  char	format[255],		/* Format for device filename */
-	device[255],		/* Device filename */
-	device_id[1024],	/* Device ID string */
-	device_uri[1024],	/* Device URI string */
-	make_model[1024];	/* Make and model */
+  char	device[255];		/* Device filename */
+  FILE	*probe;			/* /proc/bus/usb/devices 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 */


 /*
-  * First figure out which USB printer filename to use...
+  * First try opening one of the USB devices to load the driver
+  * module as needed...
  */

-  if (access("/dev/usb/lp0", 0) == 0)
-    strcpy(format, "/dev/usb/lp%d");
-  else if (access("/dev/usb/usblp0", 0) == 0)
-    strcpy(format, "/dev/usb/usblp%d");
-  else
-    strcpy(format, "/dev/usblp%d");
+  if ((fd = open("/dev/usb/lp0", O_WRONLY)) >= 0)
+    close(fd); /* 2.3.x and 2.4.x */
+  else if ((fd = open("/dev/usb/usblp0", O_WRONLY)) >= 0)
+    close(fd); /* Mandrake 7.x */
+  else if ((fd = open("/dev/usblp0", O_WRONLY)) >= 0)
+    close(fd); /* 2.2.x */

 /*
-  * Then open each USB device...
+  * Then look at the device list for the USB bus...
  */

-  for (i = 0; i < 16; i ++)
+  if ((probe = fopen("/proc/bus/usb/devices", "r")) != NULL)
  {
-    sprintf(device, format, i);
+   /*
+    * Scan the device list...
+    */

-    if ((fd = open(device, O_RDWR | O_EXCL)) >= 0)
+    i = 0;
+
+    memset(make, 0, sizeof(make));
+    memset(model, 0, sizeof(model));
+
+    while (fgets(line, sizeof(line), probe) != NULL)
    {
-      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);
+     /*
+      * Strip trailing newline.
+      */

+      if ((delim = strrchr(line, '\n')) != NULL)
+	*delim = '\0';
+
+     /*
+      * See if it is a printer device ("P: ...")
+      */
+
+      if (strncmp(line, "S:", 2) == 0)
+      {
       /*
-        * 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...
+        * String attribute...
 	*/

-        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';
+        if (strncmp(line, "S:  Manufacturer=", 17) == 0)
+	{
+	  strncpy(make, line + 17, sizeof(make) - 1);
+	  if (strcmp(make, "Hewlett-Packard") == 0)
+	    strcpy(make, "HP");
+	}
+        else if (strncmp(line, "S:  Product=", 12) == 0)
+	  strncpy(model, line + 12, sizeof(model) - 1);
      }
-      else
-        device_id[0] = '\0';
+      else if (strncmp(line, "I:", 2) == 0 &&
+               (strstr(line, "Driver=printer") != NULL ||
+	        strstr(line, "Driver=usblp") != NULL) &&
+	       make[0] && model[0])
+      {
+       /*
+        * We were processing a printer device; send the info out...
+	*/

-      close(fd);
+        sprintf(device, "/dev/usb/lp%d", i);
+	if (access(device, 0))
+	{
+	  sprintf(device, "/dev/usb/usblp%d", i);
+
+	  if (access(device, 0))
+	    sprintf(device, "/dev/usblp%d", i);
+	}
+
+	printf("direct usb:%s \"%s %s\" \"USB Printer #%d\"\n",
+	       device, make, model, i + 1);
+
+	i ++;
+
+	memset(make, 0, sizeof(make));
+	memset(model, 0, sizeof(model));
+      }
    }
-    else
-      device_id[0] = '\0';

-    if (device_id[0])
+    fclose(probe);
+  }
+  else
+  {
+   /*
+    * Just probe manually for USB devices...
+    */
+
+    for (i = 0; i < 8; i ++)
    {
-      decode_device_id(i, device_id, make_model, sizeof(make_model),
-		       device_uri, sizeof(device_uri));
+      sprintf(device, "/dev/usb/lp%d", i);
+      if ((fd = open(device, O_WRONLY)) >= 0)
+      {
+	close(fd);
+	printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
+      }

-      printf("direct %s \"%s\" \"USB Printer #%d\"\n", device_uri,
-	     make_model, i + 1);
+      sprintf(device, "/dev/usb/usblp%d", i);
+      if ((fd = open(device, O_WRONLY)) >= 0)
+      {
+	close(fd);
+	printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
+      }
+
+      sprintf(device, "/dev/usblp%d", i);
+      if ((fd = open(device, O_WRONLY)) >= 0)
+      {
+	close(fd);
+	printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
+      }
    }
-    else
-      printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
  }
 #elif defined(__sgi)
 #elif defined(__sun)
-  int	i;			/* Looping var */
-  int	fd;			/* File descriptor */
-  char	device[255],		/* Device filename */
-	device_id[1024],	/* Device ID string */
-	device_uri[1024],	/* Device URI string */
-	make_model[1024];	/* Make and model */
-#  ifdef ECPPIOC_GETDEVID
-  struct ecpp_device_id did;	/* Device ID buffer */
-#  endif /* ECPPIOC_GETDEVID */
-
-
- /*
-  * Open each USB device...
-  */
-
-  for (i = 0; i < 8; i ++)
-  {
-    sprintf(device, "/dev/usb/printer%d", i);
-
-#  ifndef ECPPIOC_GETDEVID
-    if (!access(device, 0))
-      printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
-#  else
-    if ((fd = open(device, O_RDWR | O_EXCL)) >= 0)
-    {
-      did.mode = ECPP_CENTRONICS;
-      did.len  = sizeof(device_id);
-      did.rlen = 0;
-      did.addr = device_id;
-
-      if (ioctl(fd, ECPPIOC_GETDEVID, &did) == 0)
-      {
-        if (did.rlen < (sizeof(device_id) - 1))
-	  device_id[did.rlen] = '\0';
-        else
-	  device_id[sizeof(device_id) - 1] = '\0';
-      }
-      else
-        device_id[0] = '\0';
-
-      close(fd);
-    }
-    else
-      device_id[0] = '\0';
-
-    if (device_id[0])
-    {
-      decode_device_id(i, device_id, make_model, sizeof(make_model),
-		       device_uri, sizeof(device_uri));
-
-      printf("direct %s \"%s\" \"USB Printer #%d\"\n", device_uri,
-	     make_model, i + 1);
-    }
-    else
-      printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
-#  endif /* !ECPPIOC_GETDEVID */
-  }
 #elif defined(__hpux)
 #elif defined(__osf)
-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#elif defined(__FreeBSD__)
  int   i;                      /* Looping var */
+  int   fd;                     /* File descriptor */
  char  device[255];            /* Device filename */


-  for (i = 0; i < 8; i ++)
+  for (i = 0; i < 3; i ++)
+  {
+    sprintf(device, "/dev/unlpt%d", i);
+    if ((fd = open(device, O_WRONLY)) >= 0)
+    {
+      close(fd);
+      printf("direct usb:%s \"Unknown\" \"USB Port #%d\"\n", device, i + 1);
+    }
+  }
+#elif defined(__NetBSD__) || defined(__OpenBSD__)
+  int   i;                      /* Looping var */
+  int   fd;                     /* File descriptor */
+  char  device[255];            /* Device filename */
+
+
+  for (i = 0; i < 3; i ++)
  {
    sprintf(device, "/dev/ulpt%d", i);
-    if (!access(device, 0))
-      printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
-
-    sprintf(device, "/dev/unlpt%d", i);
-    if (!access(device, 0))
-      printf("direct usb:%s \"Unknown\" \"USB Printer #%d (no reset)\"\n", device, i + 1);
+    if ((fd = open(device, O_WRONLY)) >= 0)
+    {
+      close(fd);
+      printf("direct usb:%s \"Unknown\" \"USB Port #%d\"\n", device, i + 1);
+    }
  }
 #endif
 }


-/*
- * 'open_device()' - Open a USB device...
- */
-
-int					/* O - File descriptor or -1 on error */
-open_device(const char *uri)		/* I - Device URI */
-{
- /*
-  * The generic implementation just treats the URI as a device filename...
-  * Specific operating systems may also support using the device serial
-  * number and/or make/model.
-  */
-
-  if (strncmp(uri, "usb:/dev/", 9) == 0)
-    return (open(uri + 4, O_RDWR | O_EXCL));
-#ifdef __linux
-  else if (strncmp(uri, "usb://", 6) == 0)
-  {
-   /*
-    * For Linux, try looking up the device serial number or model...
-    */
-
-    int		i;			/* Looping var */
-    int		length;			/* Length of device ID info */
-    int		fd;			/* File descriptor */
-    char	format[255],		/* Format for device filename */
-		device[255],		/* Device filename */
-		device_id[1024],	/* Device ID string */
-		make_model[1024],	/* Make and model */
-		device_uri[1024];	/* Device URI string */
-
-
-   /*
-    * First figure out which USB printer filename to use...
-    */
-
-    if (access("/dev/usb/lp0", 0) == 0)
-      strcpy(format, "/dev/usb/lp%d");
-    else if (access("/dev/usb/usblp0", 0) == 0)
-      strcpy(format, "/dev/usb/usblp%d");
-    else
-      strcpy(format, "/dev/usblp%d");
-
-   /*
-    * Then find the correct USB device...
-    */
-
-    for (i = 0; i < 16; i ++)
-    {
-      sprintf(device, format, i);
-
-      if ((fd = open(device, O_RDWR | O_EXCL)) >= 0)
-      {
-	if (ioctl(fd, LPIOC_GET_DEVICE_ID(sizeof(device_id)), device_id) == 0)
-	{
-	  length = (((unsigned)device_id[0] & 255) << 8) +
-	           ((unsigned)device_id[1] & 255);
-	  memmove(device_id, device_id + 2, length);
-	  device_id[length] = '\0';
-	}
-	else
-          device_id[0] = '\0';
-      }
-      else
-	device_id[0] = '\0';
-
-      if (device_id[0])
-      {
-       /*
-        * Got the device ID - is this the one?
-	*/
-
-	decode_device_id(i, device_id, make_model, sizeof(make_model),
-                	 device_uri, sizeof(device_uri));
-
-        if (strcmp(uri, device_uri) == 0)
-	{
-	 /*
-	  * Yes, return this file descriptor...
-	  */
-
-	  fprintf(stderr, "DEBUG: Printer using device file \"%s\"...\n", device);
-
-	  return (fd);
-	}
-      }
-
-     /*
-      * This wasn't the one...
-      */
-
-      close(fd);
-    }
-
-   /*
-    * Couldn't find the printer, return "no such device or address"...
-    */
-
-    errno = ENODEV;
-
-    return (-1);
-  }
-#elif defined(__sun) && defined(ECPPIOC_GETDEVID)
-  else if (strncmp(uri, "usb://", 6) == 0)
-  {
-   /*
-    * For Solaris, try looking up the device serial number or model...
-    */
-
-    int		i;			/* Looping var */
-    int		fd;			/* File descriptor */
-    char	device[255],		/* Device filename */
-		device_id[1024],	/* Device ID string */
-		make_model[1024],	/* Make and model */
-		device_uri[1024];	/* Device URI string */
-    struct ecpp_device_id did;		/* Device ID buffer */
-
-
-   /*
-    * Find the correct USB device...
-    */
-
-    for (i = 0; i < 8; i ++)
-    {
-      sprintf(device, "/dev/usb/printer%d", i);
-
-      if ((fd = open(device, O_RDWR | O_EXCL)) >= 0)
-      {
-	did.mode = ECPP_CENTRONICS;
-	did.len  = sizeof(device_id);
-	did.rlen = 0;
-	did.addr = device_id;
-
-	if (ioctl(fd, ECPPIOC_GETDEVID, &did) == 0)
-	{
-          if (did.rlen < (sizeof(device_id) - 1))
-	    device_id[did.rlen] = '\0';
-          else
-	    device_id[sizeof(device_id) - 1] = '\0';
-	}
-	else
-          device_id[0] = '\0';
-      }
-      else
-	device_id[0] = '\0';
-
-      if (device_id[0])
-      {
-       /*
-        * Got the device ID - is this the one?
-	*/
-
-	decode_device_id(i, device_id, make_model, sizeof(make_model),
-                	 device_uri, sizeof(device_uri));
-
-        if (strcmp(uri, device_uri) == 0)
-	  return (fd);	/* Yes, return this file descriptor... */
-      }
-
-     /*
-      * This wasn't the one...
-      */
-
-      close(fd);
-    }
-
-   /*
-    * Couldn't find the printer, return "no such device or address"...
-    */
-
-    errno = ENODEV;
-
-    return (-1);
-  }
-#endif /* __linux */
-  else
-  {
-    errno = ENODEV;
-    return (-1);
-  }
-}
-
-
 /*
 * End of "$Id$".
 */
@@ -1,12 +0,0 @@
-# DO NOT DELETE
-
-lpc.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-lpc.o: ../cups/ppd.h ../cups/language.h ../cups/debug.h ../cups/string.h
-lpc.o: ../config.h
-lpq.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-lpq.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/language.h
-lpq.o: ../cups/debug.h
-lpr.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-lpr.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h
-lprm.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-lprm.o: ../cups/ppd.h ../cups/language.h ../cups/string.h ../config.h
@@ -3,7 +3,7 @@
 #
 #   Berkeley commands makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2001 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
@@ -43,19 +43,11 @@ clean:
 	$(RM) $(OBJS) $(TARGETS)


-#
-# Update dependencies (without system header dependencies...)
-#
-
-depend:
-	makedepend -Y -I.. -fDependencies $(OBJS:.o=.c) >/dev/null 2>&1
-
-
 #
 # Install all targets...
 #

-install:	all
+install:
 	$(INSTALL_DIR) $(BINDIR)
 	$(INSTALL_BIN) lpq $(BINDIR)
 	$(INSTALL_BIN) lpr $(BINDIR)
@@ -72,6 +64,8 @@ lpc:	lpc.o ../cups/$(LIBCUPS)
 	echo Linking $@...
 	$(CC) $(LDFLAGS) -o lpc lpc.o $(LIBS)

+lpc.o:	../cups/cups.h ../Makedefs
+

 #
 # lpq
@@ -81,6 +75,8 @@ lpq:	lpq.o ../cups/$(LIBCUPS)
 	echo Linking $@...
 	$(CC) $(LDFLAGS) -o lpq lpq.o $(LIBS)

+lpq.o:	../cups/cups.h ../Makedefs
+

 #
 # lpr
@@ -90,6 +86,8 @@ lpr:	lpr.o ../cups/$(LIBCUPS)
 	echo Linking $@...
 	$(CC) $(LDFLAGS) -o lpr lpr.o $(LIBS)

+lpr.o:	../cups/cups.h ../Makedefs
+

 #
 # lprm
@@ -99,12 +97,7 @@ lprm:	lprm.o ../cups/$(LIBCUPS)
 	echo Linking $@...
 	$(CC) $(LDFLAGS) -o lprm lprm.o $(LIBS)

-
-#
-# Dependencies...
-#
-
-include Dependencies
+lprm.o:	../cups/cups.h ../Makedefs


 #
@@ -3,7 +3,7 @@
 *
 *   "lpc" command for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-2001 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -40,7 +40,6 @@
 #include <cups/cups.h>
 #include <cups/language.h>
 #include <cups/debug.h>
-#include <cups/string.h>


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

      while (isspace(line[0]))
-        cups_strcpy(line, line + 1);
+        strcpy(line, line + 1);

      for (params = line; *params != '\0'; params ++)
        if (isspace(*params))
@@ -3,7 +3,7 @@
 *
 *   "lpq" command for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-2001 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -26,7 +26,6 @@
 *   main()         - Parse options and commands.
 *   show_jobs()    - Show jobs.
 *   show_printer() - Show printer status.
- *   usage()        - Show program usage.
 */

 /*
@@ -39,7 +38,8 @@

 #include <stdio.h>
 #include <stdlib.h>
-#include <cups/string.h>
+#include <ctype.h>
+#include <config.h>
 #include <cups/cups.h>
 #include <cups/language.h>
 #include <cups/debug.h>
@@ -52,7 +52,6 @@
 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);


 /*
@@ -73,9 +72,9 @@ main(int  argc,		/* I - Number of command-line arguments */
 		longstatus;	/* Show file details */
  int		num_dests;	/* Number of destinations */
  cups_dest_t	*dests;		/* Destinations */
-#ifdef HAVE_SSL
+#ifdef HAVE_LIBSSL
  http_encryption_t encryption;	/* Encryption? */
-#endif /* HAVE_SSL */
+#endif /* HAVE_LIBSSL */


 /*
@@ -113,7 +112,7 @@ main(int  argc,		/* I - Number of command-line arguments */
      switch (argv[i][1])
      {
        case 'E' : /* Encrypt */
-#ifdef HAVE_SSL
+#ifdef HAVE_LIBSSL
 	    encryption = HTTP_ENCRYPT_REQUIRED;

 	    if (http)
@@ -121,7 +120,7 @@ main(int  argc,		/* I - Number of command-line arguments */
 #else
            fprintf(stderr, "%s: Sorry, no encryption support compiled in!\n",
 	            argv[0]);
-#endif /* HAVE_SSL */
+#endif /* HAVE_LIBSSL */
 	    break;

        case 'P' : /* Printer */
@@ -130,31 +129,11 @@ main(int  argc,		/* I - Number of command-line arguments */
 	    else
 	    {
 	      i ++;
-
-	      if (i >= argc)
-	      {
-		httpClose(http);
-		cupsFreeDests(num_dests, dests);
-	        
-	        usage();
-	      }
-
 	      dest = argv[i];
 	    }

 	    if ((instance = strchr(dest, '/')) != NULL)
-	      *instance++ = '\0';
-
-            if (cupsGetDest(dest, instance, num_dests, dests) == NULL)
-	    {
-	      if (instance)
-		fprintf(stderr, "lpq: Unknown destination \"%s/%s\"!\n",
-		        dest, instance);
-              else
-		fprintf(stderr, "lpq: Unknown destination \"%s\"!\n", dest);
-
-	      return (1);
-	    }
+	      *instance = '\0';
 	    break;

 	case 'a' : /* All printers */
@@ -166,11 +145,10 @@ main(int  argc,		/* I - Number of command-line arguments */
 	    break;

 	default :
+	    fputs("Usage: lpq [-P dest] [-l] [+interval]\n", stderr);
 	    httpClose(http);
-	    cupsFreeDests(num_dests, dests);
-
-	    usage();
-	    break;
+            cupsFreeDests(num_dests, dests);
+	    return (1);
      }
    }
    else if (isdigit(argv[i][0]))
@@ -437,17 +415,20 @@ show_jobs(http_t     *http,	/* I - HTTP connection to server */
 	  snprintf(namestr, sizeof(namestr), "%d copies of %s", jobcopies,
 	           jobname);
 	else
-	  strlcpy(namestr, jobname, sizeof(namestr));
+	{
+	  strncpy(namestr, jobname, sizeof(namestr) - 1);
+	  namestr[sizeof(namestr) - 1] = '\0';
+	}

-        printf("%s: %-33.33s [job %d localhost]\n", jobuser, rankstr, jobid);
-        printf("        %-39.39s %d bytes\n", namestr, jobsize);
+        printf("%s: %-34.34s[job %d localhost]\n", jobuser, rankstr, jobid);
+        printf("        %-40.40s%d bytes\n", namestr, jobsize);
      }
      else
 #ifdef __osf__
        printf("%-6s %-10.10s %-4d %-10d %-27.27s %d bytes\n", rankstr, jobuser,
 	       jobpriority, jobid, jobname, jobsize);
 #else
-        printf("%-7s %-7.7s %-7d %-31.31s %d bytes\n", rankstr, jobuser,
+        printf("%-7s %-8.8s%-8d%-32.32s%d bytes\n", rankstr, jobuser,
 	       jobid, jobname, jobsize);
 #endif /* __osf */

@@ -556,18 +537,6 @@ show_printer(http_t     *http,	/* I - HTTP connection to server */
 }


-/*
- * 'usage()' - Show program usage.
- */
-
-static void
-usage(void)
-{
-  fputs("Usage: lpq [-P dest] [-l] [+interval]\n", stderr);
-  exit(1);
-}
-
-
 /*
 * End of "$Id$".
 */
@@ -3,7 +3,7 @@
 *
 *   "lpr" command for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-2001 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -33,14 +33,12 @@

 #include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>

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


 #ifndef WIN32
-#  include <unistd.h>
 #  include <signal.h>


@@ -86,7 +84,6 @@ main(int  argc,		/* I - Number of command-line arguments */
  int		temp;		/* Temporary file descriptor */
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
  struct sigaction action;	/* Signal action */
-  struct sigaction oldaction;	/* Old signal action */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */


@@ -104,12 +101,12 @@ main(int  argc,		/* I - Number of command-line arguments */
      switch (ch = argv[i][1])
      {
        case 'E' : /* Encrypt */
-#ifdef HAVE_SSL
+#ifdef HAVE_LIBSSL
 	    cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);
 #else
            fprintf(stderr, "%s: Sorry, no encryption support compiled in!\n",
 	            argv[0]);
-#endif /* HAVE_SSL */
+#endif /* HAVE_LIBSSL */
 	    break;

 	case '1' : /* TROFF font set 1 */
@@ -230,6 +227,12 @@ main(int  argc,		/* I - Number of command-line arguments */
 	      num_copies = atoi(argv[i]);
 	    }

+	    if (num_copies < 1 || num_copies > 100)
+	    {
+	      fputs("lpr: Number copies must be between 1 and 100.\n", stderr);
+	      return (1);
+	    }
+
            sprintf(buffer, "%d", num_copies);
            num_options = cupsAddOption("copies", buffer, num_options, &options);
 	    break;
@@ -278,13 +281,6 @@ main(int  argc,		/* I - Number of command-line arguments */
      * Print a file...
      */

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

@@ -307,25 +303,23 @@ main(int  argc,		/* I - Number of command-line arguments */
    if (num_dests == 0)
      num_dests = cupsGetDests(&dests);

-    if ((dest = cupsGetDest(NULL, NULL, num_dests, dests)) != NULL)
-    {
-      printer = dest->name;
+    for (j = 0, dest = dests; j < num_dests; j ++, dest ++)
+      if (dest->is_default)
+      {
+	printer = dests[j].name;

-      for (j = 0; j < dest->num_options; j ++)
-	if (cupsGetOption(dest->options[j].name, num_options, options) == NULL)
-	  num_options = cupsAddOption(dest->options[j].name,
-		                      dest->options[j].value,
-				      num_options, &options);
-    }
+	for (j = 0; j < dest->num_options; j ++)
+	  if (cupsGetOption(dest->options[j].name, num_options, options) == NULL)
+	    num_options = cupsAddOption(dest->options[j].name,
+		                        dest->options[j].value,
+					num_options, &options);
+        break;
+      }
  }

  if (printer == NULL)
  {
-    if (cupsLastError() >= IPP_BAD_REQUEST)
-      fputs("lpr: error - scheduler not responding!\n", stderr);
-    else
-      fputs("lpr: error - no default destination available.\n", stderr);
-
+    fputs("lpr: error - no default destination available.\n", stderr);
    return (1);
  }

@@ -350,22 +344,18 @@ main(int  argc,		/* I - Number of command-line arguments */
 #ifndef WIN32
 #  if defined(HAVE_SIGSET)
    sigset(SIGHUP, sighandler);
-    if (sigset(SIGINT, sighandler) == SIG_IGN)
-      sigset(SIGINT, SIG_IGN);
+    sigset(SIGINT, sighandler);
    sigset(SIGTERM, sighandler);
 #  elif defined(HAVE_SIGACTION)
    memset(&action, 0, sizeof(action));
    action.sa_handler = sighandler;

    sigaction(SIGHUP, &action, NULL);
-    sigaction(SIGINT, NULL, &oldaction);
-    if (oldaction.sa_handler != SIG_IGN)
-      sigaction(SIGINT, &action, NULL);
+    sigaction(SIGINT, &action, NULL);
    sigaction(SIGTERM, &action, NULL);
 #  else
    signal(SIGHUP, sighandler);
-    if (signal(SIGINT, sighandler) == SIG_IGN)
-      signal(SIGINT, SIG_IGN);
+    signal(SIGINT, sighandler);
    signal(SIGTERM, sighandler);
 #  endif
 #endif /* !WIN32 */
@@ -3,7 +3,7 @@
 *
 *   "lprm" command for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-2001 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -32,10 +32,10 @@

 #include <stdio.h>
 #include <stdlib.h>
+#include <ctype.h>

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


 /*
@@ -98,14 +98,14 @@ main(int  argc,			/* I - Number of command-line arguments */
      switch (argv[i][1])
      {
        case 'E' : /* Encrypt */
-#ifdef HAVE_SSL
+#ifdef HAVE_LIBSSL
 	    encryption = HTTP_ENCRYPT_REQUIRED;

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

        case 'P' : /* Cancel jobs on a printer */
@@ -119,14 +119,6 @@ main(int  argc,			/* I - Number of command-line arguments */

 	    if ((instance = strchr(dest, '/')) != NULL)
 	      *instance = '\0';
-
-	    if (cupsGetDest(dest, NULL, num_dests, dests) == NULL)
-	    {
-	      fprintf(stderr, "lprm: Unknown destination \"%s\"!\n", dest);
-              cupsFreeDests(num_dests, dests);
-	      httpClose(http);
-	      return(1);
-	    }
 	    break;

 	default :
@@ -141,7 +133,7 @@ main(int  argc,			/* I - Number of command-line arguments */
      * Cancel a job or printer...
      */

-      if (isdigit(argv[i][0]) && cupsGetDest(argv[i], NULL, num_dests, dests) == NULL)
+      if (isdigit(argv[i][0]))
      {
        dest   = NULL;
 	op     = IPP_CANCEL_JOB;
@@ -1,20 +0,0 @@
-# DO NOT DELETE
-
-html.o: cgi.h ../cups/string.h ../config.h
-ipp-var.o: ipp-var.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-ipp-var.o: ../cups/md5.h ../cups/ppd.h ../cups/debug.h ../cups/language.h
-ipp-var.o: ../cups/string.h ../config.h cgi.h
-template.o: cgi.h ../cups/string.h ../config.h
-var.o: cgi.h ../cups/string.h ../config.h
-admin.o: ipp-var.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-admin.o: ../cups/ppd.h ../cups/debug.h ../cups/language.h ../cups/string.h
-admin.o: ../config.h cgi.h
-classes.o: ipp-var.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-classes.o: ../cups/md5.h ../cups/ppd.h ../cups/debug.h ../cups/language.h
-classes.o: ../cups/string.h ../config.h cgi.h
-jobs.o: ipp-var.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-jobs.o: ../cups/ppd.h ../cups/debug.h ../cups/language.h ../cups/string.h
-jobs.o: ../config.h cgi.h
-printers.o: ipp-var.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-printers.o: ../cups/md5.h ../cups/ppd.h ../cups/debug.h ../cups/language.h
-printers.o: ../cups/string.h ../config.h cgi.h
@@ -3,7 +3,7 @@
 #
 #   CGI makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2003 by Easy Software Products.
+#   Copyright 1997-2001 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -45,19 +45,11 @@ clean:
 	$(RM) $(OBJS) $(TARGETS)


-#
-# Update dependencies (without system header dependencies...)
-#
-
-depend:
-	makedepend -Y -I.. -fDependencies $(OBJS:.o=.c) >/dev/null 2>&1
-
-
 #
 # Install all targets...
 #

-install:	all
+install:
 	$(INSTALL_DIR) $(SERVERBIN)/cgi-bin
 	for file in $(CGIS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/cgi-bin; \
@@ -74,6 +66,9 @@ libcgi.a:	$(LIBOBJS)
 	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
 	$(RANLIB) $@

+$(LIBOBJS):	cgi.h
+ipp-var.o:	ipp-var.h
+

 #
 # admin.cgi
@@ -83,6 +78,8 @@ admin.cgi:	admin.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
 	echo Linking $@...
 	$(CC) $(LDFLAGS) -o $@ admin.o libcgi.a $(LIBS)

+admin.o:	cgi.h ipp-var.h ../cups/cups.h ../cups/ipp.h ../cups/language.h
+

 #
 # classes.cgi
@@ -92,6 +89,8 @@ classes.cgi:	classes.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
 	echo Linking $@...
 	$(CC) $(LDFLAGS) -o $@ classes.o libcgi.a $(LIBS)

+classes.o:	cgi.h ipp-var.h ../cups/cups.h ../cups/ipp.h ../cups/language.h
+

 #
 # jobs.cgi
@@ -101,6 +100,8 @@ jobs.cgi:	jobs.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
 	echo Linking $@...
 	$(CC) $(LDFLAGS) -o $@ jobs.o libcgi.a $(LIBS)

+jobs.o:	cgi.h ipp-var.h ../cups/cups.h ../cups/ipp.h ../cups/language.h
+

 #
 # printers.cgi
@@ -110,12 +111,9 @@ printers.cgi:	printers.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
 	echo Linking $@...
 	$(CC) $(LDFLAGS) -o $@ printers.o libcgi.a $(LIBS)

+printers.o:	cgi.h ipp-var.h ../cups/cups.h ../cups/ipp.h ../cups/language.h

-#
-# Dependencies...
-#
-
-include Dependencies
+$(OBJS):	../Makedefs


 #
@@ -3,7 +3,7 @@
 *
 *   Administration CGI for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-2001 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -29,6 +29,7 @@
 *   do_config_printer() - Configure the default options for a printer.
 *   do_delete_class()   - Delete a class...
 *   do_delete_printer() - Delete a printer...
+ *   do_job_op()         - Do a job operation.
 *   do_printer_op()     - Do a printer operation.
 *   get_line()          - Get a line that is terminated by a LF, CR, or CR LF.
 */
@@ -51,6 +52,7 @@ static void	do_am_printer(http_t *http, cups_lang_t *language, int modify);
 static void	do_config_printer(http_t *http, cups_lang_t *language);
 static void	do_delete_class(http_t *http, cups_lang_t *language);
 static void	do_delete_printer(http_t *http, cups_lang_t *language);
+static void	do_job_op(http_t *http, cups_lang_t *language, ipp_op_t op);
 static void	do_printer_op(http_t *http, cups_lang_t *language, ipp_op_t op);
 static char	*get_line(char *buf, int length, FILE *fp);

@@ -109,7 +111,15 @@ main(int  argc,			/* I - Number of command-line arguments */
    * Do the operation...
    */

-    if (strcmp(op, "start-printer") == 0)
+    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 if (strcmp(op, "start-printer") == 0)
      do_printer_op(http, language, IPP_RESUME_PRINTER);
    else if (strcmp(op, "stop-printer") == 0)
      do_printer_op(http, language, IPP_PAUSE_PRINTER);
@@ -117,8 +127,6 @@ main(int  argc,			/* I - Number of command-line arguments */
      do_printer_op(http, language, CUPS_ACCEPT_JOBS);
    else if (strcmp(op, "reject-jobs") == 0)
      do_printer_op(http, language, CUPS_REJECT_JOBS);
-    else if (strcmp(op, "purge-jobs") == 0)
-      do_printer_op(http, language, IPP_PURGE_JOBS);
    else if (strcmp(op, "add-class") == 0)
      do_am_class(http, language, 0);
    else if (strcmp(op, "add-printer") == 0)
@@ -233,7 +241,7 @@ do_am_class(http_t      *http,		/* I - HTTP connection */

      if ((response = cupsDoRequest(http, request, "/")) != NULL)
      {
-	ippSetCGIVars(response, NULL, NULL, NULL, 0);
+	ippSetCGIVars(response, NULL, NULL);
 	ippDelete(response);
      }

@@ -256,14 +264,17 @@ do_am_class(http_t      *http,		/* I - HTTP connection */
  }

  name = cgiGetVariable("PRINTER_NAME");
-  for (ptr = name; *ptr; ptr ++)
-    if ((*ptr >= 0 && *ptr <= ' ') || *ptr == 127 || *ptr == '/')
-      break;
+  if (isdigit(*name))
+    ptr = name;
+  else
+    for (ptr = name; *ptr; ptr ++)
+      if (!isalnum(*ptr) && *ptr != '_')
+	break;

-  if (*ptr || ptr == name || strlen(name) > 127)
+  if (*ptr || ptr == name)
  {
-    cgiSetVariable("ERROR", "The class name may only contain up to 127 printable "
-                            "characters.");
+    cgiSetVariable("ERROR", "The class name may only contain letters, "
+                            "numbers, and the underscore.");
    cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
    return;
  }
@@ -447,7 +458,7 @@ do_am_class(http_t      *http,		/* I - HTTP connection */
      ippDelete(response);
    }
    else
-      status = cupsLastError();
+      status = IPP_NOT_AUTHORIZED;

    if (status > IPP_OK_CONFLICT)
    {
@@ -548,7 +559,7 @@ do_am_printer(http_t      *http,	/* I - HTTP connection */
      */

      if (oldinfo)
-	ippSetCGIVars(oldinfo, NULL, NULL, NULL, 0);
+	ippSetCGIVars(oldinfo, NULL, NULL);

      cgiCopyTemplateLang(stdout, TEMPLATES, "modify-printer.tmpl", getenv("LANG"));
    }
@@ -567,14 +578,17 @@ do_am_printer(http_t      *http,	/* I - HTTP connection */
    return;
  }

-  for (ptr = name; *ptr; ptr ++)
-    if ((*ptr >= 0 && *ptr <= ' ') || *ptr == 127 || *ptr == '/')
-      break;
+  if (isdigit(*name))
+    ptr = name;
+  else
+    for (ptr = name; *ptr; ptr ++)
+      if (!isalnum(*ptr) && *ptr != '_')
+	break;

-  if (*ptr || ptr == name || strlen(name) > 127)
+  if (*ptr || ptr == name)
  {
-    cgiSetVariable("ERROR", "The printer name may only contain up to 127 printable "
-                            "characters.");
+    cgiSetVariable("ERROR", "The printer name may only contain letters, "
+                            "numbers, and the underscore.");
    cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
    return;
  }
@@ -610,7 +624,7 @@ do_am_printer(http_t      *http,	/* I - HTTP connection */

    if ((response = cupsDoRequest(http, request, "/")) != NULL)
    {
-      ippSetCGIVars(response, NULL, NULL, NULL, 0);
+      ippSetCGIVars(response, NULL, NULL);
      ippDelete(response);
    }

@@ -621,7 +635,8 @@ do_am_printer(http_t      *http,	/* I - HTTP connection */
    if (oldinfo &&
        (attr = ippFindAttribute(oldinfo, "device-uri", IPP_TAG_URI)) != NULL)
    {
-      strlcpy(uri, attr->values[0].string.text, sizeof(uri));
+      strncpy(uri, attr->values[0].string.text, sizeof(uri) - 1);
+      uri[sizeof(uri) - 1] = '\0';
      if ((uriptr = strchr(uri, ':')) != NULL && strncmp(uriptr, "://", 3) == 0)
        *uriptr = '\0';

@@ -774,9 +789,10 @@ do_am_printer(http_t      *http,	/* I - HTTP connection */
 	* Let the user choose a model...
 	*/

-        strlcpy(make, var, sizeof(make));
+        strncpy(make, var, sizeof(make) - 1);
+	make[sizeof(make) - 1] = '\0';

-        ippSetCGIVars(response, "ppd-make", make, NULL, 0);
+        ippSetCGIVars(response, "ppd-make", make);
 	cgiCopyTemplateLang(stdout, TEMPLATES, "choose-model.tmpl",
 	                    getenv("LANG"));
      }
@@ -836,7 +852,8 @@ do_am_printer(http_t      *http,	/* I - HTTP connection */
    ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_NAME, "ppd-name",
                 NULL, cgiGetVariable("PPD_NAME"));

-    strlcpy(uri, cgiGetVariable("DEVICE_URI"), sizeof(uri));
+    strncpy(uri, cgiGetVariable("DEVICE_URI"), sizeof(uri) - 1);
+    uri[sizeof(uri) - 1] = '\0';
    if (strncmp(uri, "serial:", 7) == 0)
    {
     /*
@@ -870,7 +887,7 @@ do_am_printer(http_t      *http,	/* I - HTTP connection */
      ippDelete(response);
    }
    else
-      status = cupsLastError();
+      status = IPP_NOT_AUTHORIZED;

    if (status > IPP_OK_CONFLICT)
    {
@@ -916,7 +933,6 @@ do_config_printer(http_t      *http,	/* I - HTTP connection */
  ppd_file_t	*ppd;			/* PPD file */
  ppd_group_t	*group;			/* Option group */
  ppd_option_t	*option;		/* Option */
-  ppd_attr_t	*protocol;		/* cupsProtocol attribute */


 /*
@@ -936,72 +952,34 @@ do_config_printer(http_t      *http,	/* I - HTTP connection */
  * Get the PPD file...
  */

-  cupsSetServer("localhost");
-
  if ((filename = cupsGetPPD(printer)) == NULL)
  {
-    if (cupsLastError() == IPP_NOT_FOUND)
-    {
-     /*
-      * No PPD file for this printer, so we can't configure it!
-      */
-
-      cgiSetVariable("ERROR", ippErrorString(IPP_NOT_POSSIBLE));
-      cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
-    }
-    else
-    {
-     /*
-      * Unable to access the PPD file for some reason...
-      */
-
-      cgiSetVariable("ERROR", ippErrorString(cupsLastError()));
-      cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
-    }
-    return;
-  }
-
-  if ((ppd = ppdOpenFile(filename)) == NULL)
-  {
-    cgiSetVariable("ERROR", ippErrorString(IPP_DEVICE_ERROR));
+    cgiSetVariable("ERROR", ippErrorString(IPP_NOT_FOUND));
    cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
    return;
  }

+  ppd = ppdOpenFile(filename);
+
  if (cgiGetVariable("job_sheets_start") != NULL ||
      cgiGetVariable("job_sheets_end") != NULL)
    have_options = 1;
  else
    have_options = 0;

-  ppdMarkDefaults(ppd);
-
-  DEBUG_printf(("<P>ppd->num_groups = %d\n"
-                "<UL>\n", ppd->num_groups));
-
-  for (i = ppd->num_groups, group = ppd->groups; i > 0; i --, group ++)
-  {
-    DEBUG_printf(("<LI>%s<UL>\n", group->text));
-
-    for (j = group->num_options, option = group->options; j > 0; j --, option ++)
+  for (i = ppd->num_groups, group = ppd->groups;
+       i > 0 && !have_options;
+       i --, group ++)
+    for (j = group->num_options, option = group->options;
+         j > 0;
+	 j --, option ++)
      if ((var = cgiGetVariable(option->keyword)) != NULL)
      {
-        DEBUG_printf(("<LI>%s = \"%s\"</LI>\n", option->keyword, var));
        have_options = 1;
-	ppdMarkOption(ppd, option->keyword, var);
+	break;
      }
-#ifdef DEBUG
-      else
-        printf("<LI>%s not defined!</LI>\n", option->keyword);
-#endif /* DEBUG */

-    DEBUG_puts("</UL></LI>");
-  }
-
-  DEBUG_printf(("</UL>\n"
-                "<P>ppdConflicts(ppd) = %d\n", ppdConflicts(ppd)));
-
-  if (!have_options || ppdConflicts(ppd))
+  if (!have_options)
  {
   /*
    * Show the options to the user...
@@ -1010,31 +988,11 @@ do_config_printer(http_t      *http,	/* I - HTTP connection */
    cgiCopyTemplateLang(stdout, TEMPLATES, "config-printer.tmpl",
                        getenv("LANG"));

-    if (ppdConflicts(ppd))
-    {
-      for (i = ppd->num_groups, k = 0, group = ppd->groups; i > 0; i --, group ++)
-	for (j = group->num_options, option = group->options; j > 0; j --, option ++)
-          if (option->conflicted)
-	  {
-	    cgiSetArray("ckeyword", k, option->keyword);
-	    cgiSetArray("ckeytext", k, option->text);
-	    k ++;
-	  }
-
-      cgiCopyTemplateLang(stdout, TEMPLATES, "option-conflict.tmpl",
-                          getenv("LANG"));
-    }
-
    for (i = ppd->num_groups, group = ppd->groups;
 	 i > 0;
 	 i --, group ++)
    {
-      if (strcmp(group->text, "InstallableOptions") == 0)
-	cgiSetVariable("GROUP",
-	               cupsLangString(language, CUPS_MSG_OPTIONS_INSTALLED));
-      else
-	cgiSetVariable("GROUP", group->text);
-
+      cgiSetVariable("GROUP", group->text);
      cgiCopyTemplateLang(stdout, TEMPLATES, "option-header.tmpl",
                          getenv("LANG"));
      
@@ -1047,11 +1005,7 @@ do_config_printer(http_t      *http,	/* I - HTTP connection */

        cgiSetVariable("KEYWORD", option->keyword);
        cgiSetVariable("KEYTEXT", option->text);
-	    
-	if (option->conflicted)
-	  cgiSetVariable("CONFLICTED", "1");
-	else
-	  cgiSetVariable("CONFLICTED", "0");
+	cgiSetVariable("DEFCHOICE", option->defchoice);

 	cgiSetSize("CHOICES", option->num_choices);
 	cgiSetSize("TEXT", option->num_choices);
@@ -1059,9 +1013,6 @@ do_config_printer(http_t      *http,	/* I - HTTP connection */
 	{
 	  cgiSetArray("CHOICES", k, option->choices[k].choice);
 	  cgiSetArray("TEXT", k, option->choices[k].text);
-
-          if (option->choices[k].marked)
-	    cgiSetVariable("DEFCHOICE", option->choices[k].choice);
 	}

        switch (option->ui)
@@ -1159,45 +1110,6 @@ do_config_printer(http_t      *http,	/* I - HTTP connection */
      ippDelete(response);
    }

-   /*
-    * Binary protocol support...
-    */
-
-    if (ppd->protocols && strstr(ppd->protocols, "BCP"))
-    {
-      protocol = ppdFindAttr(ppd, "cupsProtocol", NULL);
-
-      cgiSetVariable("GROUP", "PS Binary Protocol");
-      cgiCopyTemplateLang(stdout, TEMPLATES, "option-header.tmpl",
-                          getenv("LANG"));
-
-      cgiSetSize("CHOICES", 2);
-      cgiSetSize("TEXT", 2);
-      cgiSetArray("CHOICES", 0, "None");
-      cgiSetArray("TEXT", 0, "None");
-
-      if (strstr(ppd->protocols, "TBCP"))
-      {
-	cgiSetArray("CHOICES", 1, "TBCP");
-	cgiSetArray("TEXT", 1, "TBCP");
-      }
-      else
-      {
-	cgiSetArray("CHOICES", 1, "BCP");
-	cgiSetArray("TEXT", 1, "BCP");
-      }
-
-      cgiSetVariable("KEYWORD", "protocol");
-      cgiSetVariable("KEYTEXT", "PS Binary Protocol");
-      cgiSetVariable("DEFCHOICE", protocol ? protocol->value : "None");
-
-      cgiCopyTemplateLang(stdout, TEMPLATES, "option-pickone.tmpl",
-	                  getenv("LANG"));
-
-      cgiCopyTemplateLang(stdout, TEMPLATES, "option-trailer.tmpl",
-                          getenv("LANG"));
-    }
-
    cgiCopyTemplateLang(stdout, TEMPLATES, "config-printer2.tmpl",
                        getenv("LANG"));
  }
@@ -1221,9 +1133,7 @@ do_config_printer(http_t      *http,	/* I - HTTP connection */

    while (get_line(line, sizeof(line), in) != NULL)
    {
-      if (!strncmp(line, "*cupsProtocol:", 14) && cgiGetVariable("protocol"))
-        continue;
-      else if (strncmp(line, "*Default", 8))
+      if (strncmp(line, "*Default", 8) != 0)
        fprintf(out, "%s\n", line);
      else
      {
@@ -1231,7 +1141,8 @@ do_config_printer(http_t      *http,	/* I - HTTP connection */
        * Get default option name...
 	*/

-        strlcpy(keyword, line + 8, sizeof(keyword));
+        strncpy(keyword, line + 8, sizeof(keyword) - 1);
+	keyword[sizeof(keyword) - 1] = '\0';

 	for (keyptr = keyword; *keyptr; keyptr ++)
 	  if (*keyptr == ':' || isspace(*keyptr))
@@ -1251,9 +1162,6 @@ do_config_printer(http_t      *http,	/* I - HTTP connection */
      }
    }

-    if ((var = cgiGetVariable("protocol")) != NULL)
-      fprintf(out, "*cupsProtocol: %s\n", cgiGetVariable("protocol"));
-
    fclose(in);
    fclose(out);
    close(outfd);
@@ -1300,7 +1208,7 @@ do_config_printer(http_t      *http,	/* I - HTTP connection */
      ippDelete(response);
    }
    else
-      status = cupsLastError();
+      status = IPP_NOT_AUTHORIZED;

    if (status > IPP_OK_CONFLICT)
    {
@@ -1381,7 +1289,7 @@ do_delete_class(http_t      *http,	/* I - HTTP connection */
    ippDelete(response);
  }
  else
-    status = cupsLastError();
+    status = IPP_GONE;

  if (status > IPP_OK_CONFLICT)
  {
@@ -1457,7 +1365,7 @@ do_delete_printer(http_t      *http,	/* I - HTTP connection */
    ippDelete(response);
  }
  else
-    status = cupsLastError();
+    status = IPP_GONE;

  if (status > IPP_OK_CONFLICT)
  {
@@ -1469,6 +1377,98 @@ do_delete_printer(http_t      *http,	/* I - HTTP connection */
 }


+/*
+ * 'do_job_op()' - Do a job operation.
+ */
+
+static void
+do_job_op(http_t      *http,		/* I - HTTP connection */
+          cups_lang_t *language,	/* I - Client's language */
+	  ipp_op_t    op)		/* I - Operation to perform */
+{
+  ipp_t		*request,		/* IPP request */
+		*response;		/* IPP response */
+  char		uri[HTTP_MAX_URI];	/* Job URI */
+  const char	*job;			/* Job ID */
+  const char	*printer;		/* Printer name (purge-jobs) */
+  ipp_status_t	status;			/* Operation status... */
+
+
+  if ((job = cgiGetVariable("JOB_ID")) != NULL)
+    snprintf(uri, sizeof(uri), "ipp://localhost/jobs/%s", job);
+  else if ((printer = cgiGetVariable("PRINTER_NAME")) != NULL)
+    snprintf(uri, sizeof(uri), "ipp://localhost/printers/%s", printer);
+  else
+  {
+    cgiSetVariable("ERROR", ippErrorString(IPP_NOT_FOUND));
+    cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
+    return;
+  }
+
+ /*
+  * Build a job request, which requires the following
+  * attributes:
+  *
+  *    attributes-charset
+  *    attributes-natural-language
+  *    job-uri or printer-uri (purge-jobs)
+  *    requesting-user-name
+  */
+
+  request = ippNew();
+
+  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);
+
+  if (job)
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri",
+                 NULL, uri);
+  else
+    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");
+
+ /*
+  * Do the request and get back a response...
+  */
+
+  if ((response = cupsDoRequest(http, request, "/jobs")) != NULL)
+  {
+    status = response->request.status.status_code;
+
+    ippDelete(response);
+  }
+  else
+    status = IPP_GONE;
+
+  if (status > IPP_OK_CONFLICT)
+  {
+    cgiSetVariable("ERROR", ippErrorString(status));
+    cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
+  }
+  else if (op == IPP_CANCEL_JOB)
+    cgiCopyTemplateLang(stdout, TEMPLATES, "job-cancel.tmpl", getenv("LANG"));
+  else if (op == IPP_HOLD_JOB)
+    cgiCopyTemplateLang(stdout, TEMPLATES, "job-hold.tmpl", getenv("LANG"));
+  else if (op == IPP_RELEASE_JOB)
+    cgiCopyTemplateLang(stdout, TEMPLATES, "job-release.tmpl", getenv("LANG"));
+  else if (op == IPP_RESTART_JOB)
+    cgiCopyTemplateLang(stdout, TEMPLATES, "job-restart.tmpl", getenv("LANG"));
+}
+
+
 /*
 * 'do_printer_op()' - Do a printer operation.
 */
@@ -1528,7 +1528,7 @@ do_printer_op(http_t      *http,	/* I - HTTP connection */
    ippDelete(response);
  }
  else
-    status = cupsLastError();
+    status = IPP_GONE;

  if (status > IPP_OK_CONFLICT)
  {
@@ -1543,8 +1543,6 @@ do_printer_op(http_t      *http,	/* I - HTTP connection */
    cgiCopyTemplateLang(stdout, TEMPLATES, "printer-accept.tmpl", getenv("LANG"));
  else if (op == CUPS_REJECT_JOBS)
    cgiCopyTemplateLang(stdout, TEMPLATES, "printer-reject.tmpl", getenv("LANG"));
-  else if (op == IPP_PURGE_JOBS)
-    cgiCopyTemplateLang(stdout, TEMPLATES, "printer-purge.tmpl", getenv("LANG"));
 }


@@ -3,7 +3,7 @@
 *
 *   CGI support library definitions.
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-2001 by Easy Software Products.
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the Free
@@ -25,14 +25,15 @@

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

 #  ifdef WIN32
 #    include <direct.h>
 #    include <io.h>
 #    include <malloc.h>
+#    define strcasecmp(s,t)	stricmp((s),(t))
+#    define strncasecmp(s,t,n)	strnicmp((s),(t),(n))
 #  else
 #    include <unistd.h>
 #  endif /* WIN32 */
@@ -3,7 +3,7 @@
 *
 *   Class status CGI for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-2001 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -37,25 +37,21 @@
 * 'main()' - Main entry for CGI.
 */

-int					/* O - Exit status */
-main(int  argc,				/* I - Number of command-line arguments */
-     char *argv[])			/* I - Command-line arguments */
+int				/* O - Exit status */
+main(int  argc,			/* I - Number of command-line arguments */
+     char *argv[])		/* I - Command-line arguments */
 {
-  cups_lang_t	*language;		/* Language information */
-  char		*pclass;		/* Printer class name */
-  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 */
-		{
-		  "printer-name",
-		  "printer-uri-supported"
-		};
+  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 */


 /*
@@ -117,10 +113,6 @@ main(int  argc,				/* I - Number of command-line arguments */
    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
        	 "attributes-natural-language", NULL, language->language);

-    ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-                  "requested-attributes",
-		  sizeof(def_attrs) / sizeof(def_attrs[0]), NULL, def_attrs);
-
    if ((response = cupsDoRequest(http, request, "/")) != NULL)
    {
      if ((attr = ippFindAttribute(response, "printer-name", IPP_TAG_NAME)) != NULL)
@@ -128,12 +120,38 @@ main(int  argc,				/* I - Number of command-line arguments */

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


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

      ippDelete(response);
@@ -184,15 +202,13 @@ main(int  argc,				/* I - Number of command-line arguments */
                   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);
+      ippSetCGIVars(response, NULL, NULL);
      ippDelete(response);
    }

@@ -237,15 +253,13 @@ main(int  argc,				/* I - Number of command-line arguments */
 	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);
+	ippSetCGIVars(response, NULL, NULL);
 	ippDelete(response);

 	cgiCopyTemplateLang(stdout, TEMPLATES, "jobs.tmpl", getenv("LANG"));
@@ -306,12 +320,12 @@ main(int  argc,				/* I - Number of command-line arguments */
                                      CUPS_DATADIR "/data/testprint.ps")) != NULL)
    {
      status = response->request.status.status_code;
-      ippSetCGIVars(response, NULL, NULL, NULL, 0);
+      ippSetCGIVars(response, NULL, NULL);

      ippDelete(response);
    }
    else
-      status = cupsLastError();
+      status = IPP_GONE;

    cgiSetVariable("PRINTER_NAME", pclass);

@@ -3,7 +3,7 @@
 *
 *   CGI HTML functions.
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-2001 by Easy Software Products.
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the Free
@@ -3,7 +3,7 @@
 *
 *   IPP variable routines for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-2001 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -23,10 +23,7 @@
 *
 * Contents:
 *
- *   ippGetAttributes()    - Get the list of attributes that are needed
- *                           by the template file.
 *   ippGetTemplateDir()   - Get the templates directory...
- *   ippRewriteURL()       - Rewrite a printer URI into a web browser URL...
 *   ippSetServerVersion() - Set the server name and CUPS version...
 *   ippSetCGIVars()       - Set CGI variables from an IPP response.
 */
@@ -38,127 +35,6 @@
 #include "ipp-var.h"


-/*
- * 'ippGetAttributes()' - Get the list of attributes that are needed
- *                        by the template file.
- */
-
-void
-ippGetAttributes(ipp_t      *request,	/* I - IPP request */
-                 const char *directory,	/* I - Directory */
-		 const char *tmpl,	/* I - Base filename */
-		 const char *lang)	/* I - Language */
-{
-  int	num_attrs;			/* Number of attributes */
-  char	*attrs[1000];			/* Attributes */
-  int	i;				/* Looping var */
-  char	filename[1024],			/* Filename */
-	locale[16];			/* Locale name */
-  FILE	*in;				/* Input file */
-  int	ch;				/* Character from file */
-  char	name[255],			/* Name of variable */
-	*nameptr;			/* Pointer into name */
-
-
- /*
-  * Convert the language to a locale name...
-  */
-
-  if (lang != NULL)
-  {
-    for (i = 0; lang[i] && i < 15; i ++)
-      if (isalnum(lang[i]))
-        locale[i] = tolower(lang[i]);
-      else
-        locale[i] = '_';
-
-    locale[i] = '\0';
-  }
-  else
-    locale[0] = '\0';
-
- /*
-  * See if we have a template file for this language...
-  */
-
-  snprintf(filename, sizeof(filename), "%s/%s/%s", directory, locale, tmpl);
-  if (access(filename, 0))
-  {
-    locale[2] = '\0';
-
-    snprintf(filename, sizeof(filename), "%s/%s/%s", directory, locale, tmpl);
-    if (access(filename, 0))
-      snprintf(filename, sizeof(filename), "%s/%s", directory, tmpl);
-  }
-
- /*
-  * Open the template file...
-  */
-
-  if ((in = fopen(filename, "r")) == NULL)
-    return;
-
- /*
-  * Loop through the file adding attribute names as needed...
-  */
-
-  num_attrs = 0;
-
-  while ((ch = getc(in)) != EOF)
-    if (ch == '\\')
-      getc(in);
-    else if (ch == '{' && num_attrs < (sizeof(attrs) / sizeof(attrs[0])))
-    {
-     /*
-      * Grab the name...
-      */
-
-      for (nameptr = name; (ch = getc(in)) != EOF;)
-        if (strchr("}]<>=! \t\n", ch))
-          break;
-        else if (nameptr > name && ch == '?')
-	  break;
-	else if (nameptr < (name + sizeof(name) - 1))
-	{
-	  if (ch == '_')
-	    *nameptr++ = '-';
-	  else
-            *nameptr++ = ch;
-	}
-
-      *nameptr = '\0';
-
-     /*
-      * Possibly add it to the list of attributes...
-      */
-
-      for (i = 0; i < num_attrs; i ++)
-        if (!strcmp(attrs[i], name))
-	  break;
-
-      if (i >= num_attrs)
-      {
-	attrs[num_attrs] = strdup(name);
-	num_attrs ++;
-      }
-    }
-
- /*
-  * If we have attributes, add a requested-attributes attribute to the
-  * request...
-  */
-
-  if (num_attrs > 0)
-  {
-    ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-                  "requested-attributes", num_attrs, NULL, (const char **)attrs);
-
-    for (i = 0; i < num_attrs; i ++)
-      free(attrs[i]);
-  }
-}
-
-
 /*
 * 'ippGetTemplateDir()' - Get the templates directory...
 */
@@ -186,123 +62,6 @@ ippGetTemplateDir(void)
 }


-/*
- * 'ippRewriteURL()' - Rewrite a printer URI into a web browser URL...
- */
-
-char *					/* O - New URL */
-ippRewriteURL(const char *uri,		/* I - Current URI */
-              char       *url,		/* O - New URL */
-	      int        urlsize)	/* I - Size of URL buffer */
-{
-  char			method[HTTP_MAX_URI],
-			userpass[HTTP_MAX_URI],
-			hostname[HTTP_MAX_URI],
-			rawresource[HTTP_MAX_URI],
-			resource[HTTP_MAX_URI],
-					/* URI components... */
-			*rawptr,	/* Pointer into rawresource */
-			*resptr;	/* Pointer into resource */
-  int			port;		/* Port number */
-  static int		ishttps = -1;	/* Using encryption? */
-  static const char	*server;	/* Name of server */
-  static char		servername[1024];
-					/* Local server name */
-  static const char	hexchars[] = "0123456789ABCDEF";
-					/* Hexadecimal conversion characters */
-
-
- /*
-  * Check if we have been called before...
-  */
-
-  if (ishttps < 0)
-  {
-   /*
-    * No, initialize static vars for the conversion...
-    *
-    * First get the server name associated with the client interface as
-    * well as the locally configured hostname.  We'll check *both* of
-    * these to see if the printer URL is local...
-    */
-
-    server = getenv("SERVER_NAME");
-    gethostname(servername, sizeof(servername));
-
-   /*
-    * Then flag whether we are using SSL on this connection...
-    */
-
-    ishttps = getenv("HTTPS") != NULL;
-  }
-
- /*
-  * Convert the URI to a URL...
-  */
-
-  httpSeparate(uri, method, userpass, hostname, &port, rawresource);
-
-  if (strcmp(method, "ipp") == 0 ||
-      strcmp(method, "http") == 0)
-  {
-   /*
-    * Rewrite the resource string so it doesn't contain any
-    * illegal chars...
-    */
-
-    for (rawptr = rawresource, resptr = resource; *rawptr;)
-      if ((*rawptr & 128) || *rawptr == '%' || *rawptr == ' ' ||
-	  *rawptr == '#' || *rawptr == '?' ||
-	  *rawptr == '.') /* For MSIE */
-      {
-	if (resptr < (resource + sizeof(resource) - 3))
-	{
-	  *resptr++ = '%';
-	  *resptr++ = hexchars[(*rawptr >> 4) & 15];
-	  *resptr++ = hexchars[*rawptr & 15];
-	}
-      }
-      else if (resptr < (resource + sizeof(resource) - 1))
-	*resptr++ = *rawptr++;
-
-    *resptr = '\0';
-
-   /*
-    * Map local access to a local URI...
-    */
-
-    if (strcasecmp(hostname, server) == 0 ||
-	strcasecmp(hostname, servername) == 0)
-    {
-     /*
-      * Make URI relative to the current server...
-      */
-
-      strlcpy(url, resource, urlsize);
-    }
-    else
-    {
-     /*
-      * Rewrite URI with HTTP/HTTPS scheme...
-      */
-
-      if (userpass[0])
-	snprintf(url, urlsize, "%s://%s@%s:%d%s",
-		 ishttps ? "https" : "http",
-		 userpass, hostname, port, resource);
-      else
-	snprintf(url, urlsize, "%s://%s:%d%s", 
-		 ishttps ? "https" : "http",
-		 hostname, port, resource);
-    }
-  }
-  else
-    strlcpy(url, uri, urlsize);
-
-  return (url);
-}
-
-
 /*
 * 'ippSetServerVersion()' - Set the server name and CUPS version...
 */
@@ -313,10 +72,6 @@ ippSetServerVersion(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 */
 }


@@ -327,42 +82,36 @@ ippSetServerVersion(void)
 void
 ippSetCGIVars(ipp_t      *response,	/* I - Response data to be copied... */
              const char *filter_name,	/* I - Filter name */
-	      const char *filter_value,	/* I - Filter value */
-	      const char *prefix,	/* I - Prefix for name or NULL */
-	      int        parent_el)	/* I - Parent element number */
+	      const char *filter_value)	/* I - Filter value */
 {
  int			element;	/* Element in CGI array */
  ipp_attribute_t	*attr,		/* Attribute in response... */
 			*filter;	/* Filtering attribute */
  int			i;		/* Looping var */
  char			name[1024],	/* Name of attribute */
-			*nameptr,	/* Pointer into name */
 			value[16384],	/* Value(s) */
 			*valptr;	/* Pointer into value */
+  char			method[HTTP_MAX_URI],
+			username[HTTP_MAX_URI],
+			hostname[HTTP_MAX_URI],
+			resource[HTTP_MAX_URI],
+			uri[HTTP_MAX_URI];
+  int			port;		/* URI data */
+  int			ishttps;	/* Using encryption? */
+  const char		*server;	/* Name of server */
  struct tm		*date;		/* Date information */


-  DEBUG_printf(("<P>ippSetCGIVars(response=%p, filter_name=\"%s\", filter_value=\"%s\", prefix=\"%s\")\n",
-                response, filter_name, filter_value, prefix));
-  
- /*
-  * Set common CGI template variables...
-  */
+  ippSetServerVersion();

-  if (!prefix)
-    ippSetServerVersion();
+  server  = getenv("SERVER_NAME");
+  ishttps = getenv("HTTPS") != NULL;

- /*
-  * Loop through the attributes and set them for the template...
-  */
+  for (attr = response->attrs;
+       attr && attr->group_tag == IPP_TAG_OPERATION;
+       attr = attr->next);

-  attr = response->attrs;
-
-  if (!prefix)
-    while (attr && attr->group_tag == IPP_TAG_OPERATION)
-     attr = attr->next;
-
-  for (element = parent_el; attr != NULL; attr = attr->next, element ++)
+  for (element = 0; attr != NULL; attr = attr->next, element ++)
  {
   /*
    * Copy attributes to a separator...
@@ -401,28 +150,20 @@ ippSetCGIVars(ipp_t      *response,	/* I - Response data to be copied... */
      if (attr->name == NULL)
        continue;

-      if (prefix)
-      {
-        snprintf(name, sizeof(name), "%s.", prefix);
-	nameptr = name + strlen(name);
-      }
-      else
-        nameptr = name;
-
-      for (i = 0; attr->name[i] && nameptr < (name + sizeof(name) - 1); i ++)
+      for (i = 0; attr->name[i]; i ++)
        if (attr->name[i] == '-')
-	  *nameptr++ = '_';
+	  name[i] = '_';
 	else
-          *nameptr++ = attr->name[i];
+          name[i] = attr->name[i];

-      *nameptr = '\0';
+      name[i] = '\0';

     /*
      * Add "job_printer_name" variable if we have a "job_printer_uri"
      * attribute...
      */

-      if (!strcmp(name, "job_printer_uri"))
+      if (strcmp(name, "job_printer_uri") == 0)
      {
        if ((valptr = strrchr(attr->values[0].string.text, '/')) == NULL)
 	  valptr = "unknown";
@@ -436,13 +177,14 @@ ippSetCGIVars(ipp_t      *response,	/* I - Response data to be copied... */
      * Copy values...
      */

-      value[0] = '\0';	/* Initially an empty string */
-      valptr   = value; /* Start at the beginning */
+      value[0]                 = '\0';	/* Initially an empty string */
+      value[sizeof(value) - 1] = '\0';	/* In case string gets full */
+      valptr                   = value; /* Start at the beginning */

      for (i = 0; i < attr->num_values; i ++)
      {
 	if (i)
-	  strlcat(valptr, ",", sizeof(value) - (valptr - value));
+	  strncat(valptr, ",", sizeof(value) - (valptr - value) - 1);

 	valptr += strlen(valptr);

@@ -452,11 +194,7 @@ ippSetCGIVars(ipp_t      *response,	/* I - Response data to be copied... */
 	  case IPP_TAG_ENUM :
 	      if (strncmp(name, "time_at_", 8) == 0)
 	      {
-	        time_t	t;		/* Temporary time value */
-
-                t    = (time_t)attr->values[i].integer;
-	        date = localtime(&t);
-
+	        date = localtime((time_t *)&(attr->values[i].integer));
 		strftime(valptr, sizeof(value) - (valptr - value),
 		         CUPS_STRFTIME_FORMAT, date);
 	      }
@@ -471,7 +209,7 @@ ippSetCGIVars(ipp_t      *response,	/* I - Response data to be copied... */
 	      break;

 	  case IPP_TAG_NOVALUE :
-	      strlcat(valptr, "novalue", sizeof(value) - (valptr - value));
+	      strncat(valptr, "novalue", sizeof(value) - (valptr - value) - 1);
 	      break;

 	  case IPP_TAG_RANGE :
@@ -491,13 +229,41 @@ ippSetCGIVars(ipp_t      *response,	/* I - Response data to be copied... */
 	  case IPP_TAG_URI :
 	      if (strchr(attr->values[i].string.text, ':') != NULL)
 	      {
-	       /*
-	        * Rewrite URIs...
-		*/
+		httpSeparate(attr->values[i].string.text, method, username,
+		             hostname, &port, resource);

-		ippRewriteURL(attr->values[i].string.text, valptr,
-		              sizeof(value) - (valptr - value));
-        	break;
+        	if (strcmp(method, "ipp") == 0 ||
+	            strcmp(method, "http") == 0)
+        	{
+        	 /*
+		  * Map localhost access to localhost and local port...
+		  */
+
+        	  if (strcasecmp(hostname, server) == 0 &&
+	              (strcmp(getenv("REMOTE_HOST"), "127.0.0.1") == 0 ||
+		       strcmp(getenv("REMOTE_HOST"), "localhost") == 0 ||
+		       strcmp(getenv("REMOTE_HOST"), server) == 0))
+		  {
+		    strcpy(hostname, "localhost");
+		    port = atoi(getenv("SERVER_PORT"));
+		  }
+
+        	 /*
+		  * Rewrite URI with HTTP address...
+		  */
+
+		  if (username[0])
+		    snprintf(uri, sizeof(uri), "%s://%s@%s:%d%s",
+		             ishttps ? "https" : "http",
+		             username, hostname, port, resource);
+        	  else
+		    snprintf(uri, sizeof(uri), "%s://%s:%d%s", 
+		             ishttps ? "https" : "http",
+			     hostname, port, resource);
+
+		  strncat(valptr, uri, sizeof(value) - (valptr - value) - 1);
+        	  break;
+        	}
              }

          case IPP_TAG_STRING :
@@ -506,17 +272,10 @@ ippSetCGIVars(ipp_t      *response,	/* I - Response data to be copied... */
 	  case IPP_TAG_KEYWORD :
 	  case IPP_TAG_CHARSET :
 	  case IPP_TAG_LANGUAGE :
-	  case IPP_TAG_MIMETYPE :
-	      strlcat(valptr, attr->values[i].string.text,
-	              sizeof(value) - (valptr - value));
+	      strncat(valptr, attr->values[i].string.text,
+	              sizeof(value) - (valptr - value) - 1);
 	      break;

-          case IPP_TAG_BEGIN_COLLECTION :
-	      snprintf(value, sizeof(value), "%s%d", name, i + 1);
-              ippSetCGIVars(attr->values[i].collection, filter_name,
-	                    filter_value, value, element);
-              break;
-
          default :
 	      break; /* anti-compiler-warning-code */
 	}
@@ -526,19 +285,12 @@ ippSetCGIVars(ipp_t      *response,	/* I - Response data to be copied... */
      * Add the element...
      */

-      if (attr->value_tag != IPP_TAG_BEGIN_COLLECTION)
-      {
-        cgiSetArray(name, element, value);
-
-        DEBUG_printf(("<P>%s[%d]=\"%s\"\n", name, element, value));
-      }
+      cgiSetArray(name, element, value);
    }

    if (attr == NULL)
      break;
  }
-
-  DEBUG_puts("<P>Leaving ippSetCGIVars()...");
 }


@@ -3,7 +3,7 @@
 *
 *   IPP variable definitions for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-2001 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -26,6 +26,7 @@
 * Include necessary headers...
 */

+#include <ctype.h>
 #include <cups/cups.h>
 #include <cups/debug.h>
 #include <cups/language.h>
@@ -44,13 +45,9 @@
 * 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);
 extern void	ippSetServerVersion(void);
-extern void	ippSetCGIVars(ipp_t *, const char *, const char *,
-		              const char *, int);
+extern void	ippSetCGIVars(ipp_t *, const char *, const char *);


 /*
@@ -3,7 +3,7 @@
 *
 *   Job status CGI for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-2001 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -23,8 +23,7 @@
 *
 * Contents:
 *
- *   main()      - Main entry for CGI.
- *   do_job_op() - Do a job operation.
+ *   main() - Main entry for CGI.
 */

 /*
@@ -34,28 +33,20 @@
 #include "ipp-var.h"


-/*
- * Local functions...
- */
-
-static void	do_job_op(http_t *http, cups_lang_t *language, ipp_op_t op);
-
-
 /*
 * 'main()' - Main entry for CGI.
 */

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

 /*
  * Get any form variables...
@@ -87,71 +78,43 @@ main(int  argc,				/* I - Number of command-line arguments */

  cgiCopyTemplateLang(stdout, TEMPLATES, "header.tmpl", getenv("LANG"));

-  if ((op = cgiGetVariable("OP")) != 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;
+
+  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);
+
+ /*
+  * Do the request and get back a response...
+  */
+
+  if ((response = cupsDoRequest(http, request, "/")) != NULL)
  {
-   /*
-    * Do the operation...
-    */
+    ippSetCGIVars(response, NULL, NULL);
+    ippDelete(response);

-    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...
-      */
-
-      cgiCopyTemplateLang(stdout, TEMPLATES, "job-op.tmpl", getenv("LANG"));
-    }
-  }
-  else
-  {
-   /*
-    * 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;
-
-    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, "jobs.tmpl", getenv("LANG"));
  }

  cgiCopyTemplateLang(stdout, TEMPLATES, "trailer.tmpl", getenv("LANG"));
@@ -171,91 +134,6 @@ main(int  argc,				/* I - Number of command-line arguments */
 }


-/*
- * 'do_job_op()' - Do a job operation.
- */
-
-static void
-do_job_op(http_t      *http,		/* I - HTTP connection */
-          cups_lang_t *language,	/* I - Client's language */
-	  ipp_op_t    op)		/* I - Operation to perform */
-{
-  ipp_t		*request,		/* IPP request */
-		*response;		/* IPP response */
-  char		uri[HTTP_MAX_URI];	/* Job URI */
-  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:
-  *
-  *    attributes-charset
-  *    attributes-natural-language
-  *    job-uri or printer-uri (purge-jobs)
-  *    requesting-user-name
-  */
-
-  request = ippNew();
-
-  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 (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...
-  */
-
-  if ((response = cupsDoRequest(http, request, "/jobs")) != NULL)
-  {
-    status = response->request.status.status_code;
-
-    ippDelete(response);
-  }
-  else
-    status = cupsLastError();
-
-  if (status > IPP_OK_CONFLICT)
-  {
-    cgiSetVariable("ERROR", ippErrorString(status));
-    cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
-  }
-  else if (op == IPP_CANCEL_JOB)
-    cgiCopyTemplateLang(stdout, TEMPLATES, "job-cancel.tmpl", getenv("LANG"));
-  else if (op == IPP_HOLD_JOB)
-    cgiCopyTemplateLang(stdout, TEMPLATES, "job-hold.tmpl", getenv("LANG"));
-  else if (op == IPP_RELEASE_JOB)
-    cgiCopyTemplateLang(stdout, TEMPLATES, "job-release.tmpl", getenv("LANG"));
-  else if (op == IPP_RESTART_JOB)
-    cgiCopyTemplateLang(stdout, TEMPLATES, "job-restart.tmpl", getenv("LANG"));
-}
-
-
 /*
 * End of "$Id$".
 */
@@ -3,7 +3,7 @@
 *
 *   Printer status CGI for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-2001 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -37,26 +37,22 @@
 * 'main()' - Main entry for CGI.
 */

-int					/* O - Exit status */
-main(int  argc,				/* I - Number of command-line arguments */
-     char *argv[])			/* I - Command-line arguments */
+int				/* O - Exit status */
+main(int  argc,			/* I - Number of command-line arguments */
+     char *argv[])		/* I - Command-line arguments */
 {
-  cups_lang_t	*language;		/* Language information */
-  char		*printer;		/* Printer name */
-  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 */
-		{
-		  "printer-name",
-		  "printer-uri-supported"
-		};
-
+  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 */
+ 

 /*
  * Get any form variables...
@@ -81,8 +77,7 @@ main(int  argc,				/* I - Number of command-line arguments */
  * Tell the client to expect HTML...
  */

-  printf("Content-Type: text/html;charset=%s\r\n\r\n",
-         cupsLangEncoding(language));
+  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
@@ -92,7 +87,7 @@ main(int  argc,				/* I - Number of command-line arguments */
  ippSetServerVersion();

  printer = argv[0];
-  if (strcmp(printer, "/") == 0 || strstr(printer, "printers.cgi") != NULL)
+  if (strcmp(printer, "/") == 0 || strcmp(printer, "printers.cgi") == 0)
  {
    printer = NULL;
    cgiSetVariable("TITLE", cupsLangString(language, CUPS_MSG_PRINTER));
@@ -118,10 +113,6 @@ main(int  argc,				/* I - Number of command-line arguments */
    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
        	 "attributes-natural-language", NULL, language->language);

-    ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-                  "requested-attributes",
-		  sizeof(def_attrs) / sizeof(def_attrs[0]), NULL, def_attrs);
-
    if ((response = cupsDoRequest(http, request, "/")) != NULL)
    {
      if ((attr = ippFindAttribute(response, "printer-name", IPP_TAG_NAME)) != NULL)
@@ -129,12 +120,38 @@ main(int  argc,				/* I - Number of command-line arguments */

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


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

      ippDelete(response);
@@ -185,23 +202,15 @@ main(int  argc,				/* I - Number of command-line arguments */
                   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);
+      ippSetCGIVars(response, NULL, NULL);
      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...
@@ -244,22 +253,17 @@ main(int  argc,				/* I - Number of command-line arguments */
 	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);
+	ippSetCGIVars(response, NULL, NULL);
 	ippDelete(response);

 	cgiCopyTemplateLang(stdout, TEMPLATES, "jobs.tmpl", getenv("LANG"));
      }
-      else
-	fprintf(stderr, "ERROR: Get-Jobs request failed - %s (%x)\n",
-        	ippErrorString(cupsLastError()), cupsLastError());
    }
  }
  else
@@ -316,12 +320,12 @@ main(int  argc,				/* I - Number of command-line arguments */
                                      CUPS_DATADIR "/data/testprint.ps")) != NULL)
    {
      status = response->request.status.status_code;
-      ippSetCGIVars(response, NULL, NULL, NULL, 0);
+      ippSetCGIVars(response, NULL, NULL);

      ippDelete(response);
    }
    else
-      status = cupsLastError();
+      status = IPP_GONE;

    cgiSetVariable("PRINTER_NAME", printer);

@@ -3,7 +3,7 @@
 *
 *   CGI template function.
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-2001 by Easy Software Products.
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the Free
@@ -222,7 +222,7 @@ cgi_copy(FILE *out,		/* I - Output file */
 	    outptr    = outval;
 	  }
 	}
-        else if ((value = cgiGetArray(name + 1, element)) != NULL)
+        if ((value = cgiGetArray(name + 1, element)) != NULL)
 	  outptr = value;
 	else
 	{
@@ -332,7 +332,7 @@ cgi_copy(FILE *out,		/* I - Output file */
        * Test for existance...
 	*/

-        result = cgiGetArray(name, element) != NULL && outptr[0];
+        result = cgiGetArray(name, element) != NULL && outval[0];
      }
      else
      {
@@ -373,19 +373,28 @@ cgi_copy(FILE *out,		/* I - Output file */
 	      if ((innerval = cgiGetArray(innername, atoi(innerptr) - 1)) == NULL)
 	        *s = '\0';
 	      else
-	        strlcpy(s, innerval, sizeof(compare) - (s - compare));
+	      {
+	        strncpy(s, innerval, sizeof(compare) - (s - compare) - 1);
+		compare[sizeof(compare) - 1] = '\0';
+	      }
 	    }
 	    else if (innername[0] == '?')
 	    {
 	      if ((innerval = cgiGetArray(innername + 1, element)) == NULL)
 		*s = '\0';
 	      else
-	        strlcpy(s, innerval, sizeof(compare) - (s - compare));
+	      {
+	        strncpy(s, innerval, sizeof(compare) - (s - compare) - 1);
+		compare[sizeof(compare) - 1] = '\0';
+	      }
            }
 	    else if ((innerval = cgiGetArray(innername, element)) == NULL)
 	      snprintf(s, sizeof(s), "{%s}", innername);
 	    else
-	      strlcpy(s, innerval, sizeof(compare) - (s - compare));
+	    {
+	      strncpy(s, innerval, sizeof(compare) - (s - compare) - 1);
+	      compare[sizeof(compare) - 1] = '\0';
+	    }

            s += strlen(s);
 	  }
@@ -3,7 +3,7 @@
 *
 *   CGI form variable and array functions.
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-2001 by Easy Software Products.
 *
 *   This program is free software; you can redistribute it and/or modify it
 *   under the terms of the GNU General Public License as published by the Free
@@ -242,7 +242,7 @@ cgiSetArray(const char *name,	/* I - Name of variable */
  var_t	*var;	/* Returned variable */


-  if (name == NULL || value == NULL || element < 0 || element > 100000)
+  if (name == NULL || value == NULL || element < 0)
    return;

  if ((var = cgi_find_variable(name)) == NULL)
@@ -286,7 +286,7 @@ cgiSetSize(const char *name,	/* I - Name of variable */
  var_t	*var;	/* Returned variable */


-  if (name == NULL || size < 0 || size > 100000)
+  if (name == NULL || size < 0)
    return;

  if ((var = cgi_find_variable(name)) == NULL)
@@ -361,7 +361,7 @@ cgi_add_variable(const char *name,	/* I - Variable name */
  var_t	*var;				/* New variable */


-  if (name == NULL || value == NULL || element < 0 || element > 100000)
+  if (name == NULL || value == NULL)
    return;

 #ifdef DEBUG
@@ -1,2 +0,0 @@
-cupsd.conf
-pam.conf
@@ -3,7 +3,7 @@
 #
 #   Configuration file makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1993-2003 by Easy Software Products.
+#   Copyright 1993-2001 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -65,10 +65,6 @@ install:
 		fi ; \
 		$(INSTALL_DATA) $$file $(SERVERROOT) ; \
 	done
-	-if test x$(PAMDIR) != x$(BUILDROOT); then \
-		$(INSTALL_DIR) $(PAMDIR); \
-		$(INSTALL_DATA) pam.conf $(PAMDIR)/cups; \
-	fi


 #
@@ -1,10 +1,10 @@
 #
-# "$Id: classes.conf 3041 2002-12-17 19:00:27Z swdev $"
+# "$Id: classes.conf 1605 2001-03-02 22:34:21Z andy $"
 #
 #   Sample class configuration file for the Common UNIX Printing System
 #   (CUPS) scheduler.
 #
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2001 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
@@ -85,5 +85,5 @@
 #</Class>

 #
-# End of "$Id: classes.conf 3041 2002-12-17 19:00:27Z swdev $".
+# End of "$Id: classes.conf 1605 2001-03-02 22:34:21Z andy $".
 #
@@ -1,10 +1,10 @@
 #
-# "$Id: client.conf 3705 2003-05-09 19:14:44Z mike $"
+# "$Id: client.conf 1605 2001-03-02 22:34:21Z andy $"
 #
 #   Sample client configuration file for the Common UNIX Printing System
 #   (CUPS).
 #
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2001 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
@@ -34,9 +34,7 @@
 #
 # 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.
+# variable.
 #

 #ServerName myhost.domain.com
@@ -63,5 +61,5 @@


 #
-# End of "$Id: client.conf 3705 2003-05-09 19:14:44Z mike $".
+# End of "$Id: client.conf 1605 2001-03-02 22:34:21Z andy $".
 #
@@ -1,10 +1,10 @@
 #
-# "$Id$"
+# "$Id: cupsd.conf 1891 2001-09-14 16:52:08Z mike $"
 #
 #   Sample configuration file for the Common UNIX Printing System (CUPS)
 #   scheduler.
 #
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2001 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
@@ -63,13 +63,13 @@
 #
 # 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"
+# "/var/log/cups/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
+#AccessLog /var/log/cups/access_log

 #
 # Classification: the classification level of the server.  If set, this
@@ -96,14 +96,14 @@

 #
 # DataDir: the root directory for the CUPS data files.
-# By default "@CUPS_DATADIR@".
+# By default /usr/share/cups.
 #

-#DataDir @CUPS_DATADIR@
+#DataDir /usr/share/cups

 #
 # DefaultCharset: the default character set to use. If not specified,
-# defaults to "utf-8".  Note that this can also be overridden in
+# defaults to utf-8.  Note that this can also be overridden in
 # HTML documents...
 #

@@ -118,38 +118,28 @@

 #
 # DocumentRoot: the root directory for HTTP documents that are served.
-# By default "@CUPS_DOCROOT@".
+# By default the compiled in directory.
 #

-#DocumentRoot @CUPS_DOCROOT@
+#DocumentRoot /usr/share/doc/cups

 #
 # 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"
+# "/var/log/cups/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
-
+#ErrorLog /var/log/cups/error_log

 #
 # FontPath: the path to locate all font files (currently only for pstoraster)
-# By default "@CUPS_FONTPATH@".
+# By default /usr/share/cups/fonts.
 #

-#FontPath @CUPS_FONTPATH@
+#FontPath /usr/share/cups/fonts

 #
 # LogLevel: controls the number of messages logged to the ErrorLog
@@ -175,13 +165,13 @@ LogLevel info
 #
 # 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"
+# "/var/log/cups/page_log"
 #
 # You can also use the special name "syslog" to send the output to the
 # syslog file or daemon.
 #

-#PageLog @CUPS_LOGDIR@/page_log
+#PageLog /var/log/cups/page_log

 #
 # PreserveJobHistory: whether or not to preserve the job history after a
@@ -204,13 +194,6 @@ LogLevel info

 #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.
@@ -218,28 +201,6 @@ LogLevel info

 #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.
@@ -247,32 +208,12 @@ LogLevel info

 #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@".
+# By default /var/spool/cups.
 #

-#RequestRoot @CUPS_REQUESTS@
+#RequestRoot /var/spool/cups

 #
 # RemoteRoot: the name of the user assigned to unauthenticated accesses
@@ -283,36 +224,17 @@ LogLevel info

 #
 # ServerBin: the root directory for the scheduler executables.
-# By default "@CUPS_SERVERBIN@".
+# By default /usr/lib/cups or /usr/lib32/cups (IRIX 6.5).
 #

-#ServerBin @CUPS_SERVERBIN@
+#ServerBin /usr/lib/cups

 #
 # ServerRoot: the root directory for the scheduler.
-# By default "@CUPS_SERVERROOT@".
+# By default /etc/cups.
 #

-#ServerRoot @CUPS_SERVERROOT@
-
-
-########
-######## Fax Support
-########
-
-#
-# FaxRetryLimit: the number of times a fax job is retried.
-# The default is 5 times.
-#
-
-#FaxRetryLimit 5
-
-#
-# FaxRetryInterval: the number of seconds between fax job retries.
-# The default is 300 seconds/5 minutes.
-#
-
-#FaxRetryInterval 300
+#ServerRoot /etc/cups


 ########
@@ -321,17 +243,17 @@ LogLevel info

 #
 # ServerCertificate: the file to read containing the server's certificate.
-# Defaults to "@CUPS_SERVERROOT@/ssl/server.crt".
+# Defaults to "/etc/cups/ssl/server.crt".
 #

-#ServerCertificate @CUPS_SERVERROOT@/ssl/server.crt
+#ServerCertificate /etc/cups/ssl/server.crt

 #
 # ServerKey: the file to read containing the server's key.
-# Defaults to "@CUPS_SERVERROOT@/ssl/server.key".
+# Defaults to "/etc/cups/ssl/server.key".
 #

-#ServerKey @CUPS_SERVERROOT@/ssl/server.key
+#ServerKey /etc/cups/ssl/server.key


 ########
@@ -340,16 +262,16 @@ LogLevel info

 #
 # 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.
+# must be lp and sys, 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...
+# program is run...
 #

-#User @CUPS_USER@
-#Group @CUPS_GROUP@
+#User lp
+#Group sys

 #
 # RIPCache: the amount of memory that each RIP should use to cache
@@ -361,12 +283,12 @@ LogLevel info
 #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
+# TempDir: the directory to put temporary files in. This directory must be
+# writable by the user defined above!  Defaults to "/var/spool/cups/tmp" or
 # the value of the TMPDIR environment variable.
 #

-#TempDir @CUPS_REQUESTS@/tmp
+#TempDir /var/spool/cups/tmp

 #
 # FilterLimit: sets the maximum cost of all job filters that can be run
@@ -435,15 +357,6 @@ Port 631

 #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.)
@@ -482,7 +395,7 @@ Port 631
 # 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
+#       during which the scheduler will not response to client
 #       requests.
 #

@@ -500,21 +413,11 @@ Port 631
 # 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
@@ -545,8 +448,6 @@ Port 631
 #     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!
@@ -594,7 +495,6 @@ Port 631
 #

 #BrowseRelay source-address destination-address
-#BrowseRelay @IF(src) @IF(dst)

 #
 # BrowseTimeout: the timeout for network printers - if we don't
@@ -666,14 +566,7 @@ Port 631
 # 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
+#SystemGroup sys

 #
 # Access permissions for each directory served by the scheduler.
@@ -697,11 +590,11 @@ Port 631
 #
 # Order: the order of Allow/Deny processing.
 #
-# Allow: allows access from the specified hostname, domain, IP address,
-# network, or interface.
+# Allow: allows access from the specified hostname, domain, IP address, or
+# network.
 #
-# Deny: denies access from the specified hostname, domain, IP address,
-# network, or interface.
+# Deny: denies access from the specified hostname, domain, IP address, or
+# network.
 #
 # Both "Allow" and "Deny" accept the following notations for addresses:
 #
@@ -716,21 +609,10 @@ Port 631
 #     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.
 #
@@ -764,13 +646,6 @@ Allow From 127.0.0.1
 #
 #</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
@@ -821,5 +696,5 @@ Allow From 127.0.0.1
 </Location>

 #
-# End of "$Id$".
+# End of "$Id: cupsd.conf 1891 2001-09-14 16:52:08Z mike $".
 #
@@ -1,9 +1,9 @@
 #
-# "$Id: mime.convs 3709 2003-05-12 17:38:18Z mike $"
+# "$Id: mime.convs 1605 2001-03-02 22:34:21Z andy $"
 #
 #   MIME converts file for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2003 by Easy Software Products.
+#   Copyright 1997-2001 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -30,12 +30,10 @@
 #
 # General Notes:
 #
-#   The "cost" field is used to find the least costly filters to run
-#   when converting a job file to a printable format.
-#
-#   All filters *must* accept the standard command-line arguments
-#   (job-id, user, title, copies, options, [filename or stdin]) to
-#   work with CUPS.
+#   Currently the "cost" field is not used (all filters are assumed to
+#   be equally costly in terms of speed/memory).  Also, a filter program
+#   *must* accept the standard command-line arguments (job-id, user, title,
+#   copies,options,[filename or stdin]) or this won't work.
 #

 ########################################################################
@@ -43,64 +41,26 @@
 # PostScript filters
 #

+#application/msword	application/postscript	33	mswordtops
 application/pdf		application/postscript	33	pdftops
 application/postscript	application/vnd.cups-postscript	66	pstops
 application/vnd.hp-HPGL	application/postscript	66	hpgltops
+image/*			application/vnd.cups-postscript	66	imagetops
+#text/html		application/postscript	33	htmltops
 application/x-cshell	application/postscript	33	texttops
 application/x-perl	application/postscript	33	texttops
 application/x-shell	application/postscript	33	texttops
-text/plain		application/postscript	33	texttops
 text/html		application/postscript	33	texttops
-image/gif		application/vnd.cups-postscript	66	imagetops
-image/png		application/vnd.cups-postscript	66	imagetops
-image/jpeg		application/vnd.cups-postscript	66	imagetops
-image/tiff		application/vnd.cups-postscript	66	imagetops
-image/x-bitmap		application/vnd.cups-postscript	66	imagetops
-image/x-photocd		application/vnd.cups-postscript	66	imagetops
-image/x-portable-anymap	application/vnd.cups-postscript	66	imagetops
-image/x-portable-bitmap	application/vnd.cups-postscript	66	imagetops
-image/x-portable-graymap application/vnd.cups-postscript	66	imagetops
-image/x-portable-pixmap	application/vnd.cups-postscript	66	imagetops
-image/x-sgi-rgb		application/vnd.cups-postscript	66	imagetops
-image/x-xbitmap		application/vnd.cups-postscript	66	imagetops
-image/x-xpixmap		application/vnd.cups-postscript	66	imagetops
-#image/x-xwindowdump	application/vnd.cups-postscript	66	imagetops
-image/x-sun-raster	application/vnd.cups-postscript	66	imagetops
-
-
-########################################################################
-#
-# Form filter...
-#
-# This filter does not currently exist, but the file format is defined
-# in the IDD and registered with the IANA for future use...
-#
-
-#application/vnd.cups-form application/vnd.cups-postscript 33 formtops
+text/plain		application/postscript	33	texttops
+application/vnd.cups-form application/vnd.cups-postscript 33 formtops

 ########################################################################
 #
 # Raster filters...
 #

-image/gif		application/vnd.cups-raster	100	imagetoraster
-image/png		application/vnd.cups-raster	100	imagetoraster
-image/jpeg		application/vnd.cups-raster	100	imagetoraster
-image/tiff		application/vnd.cups-raster	100	imagetoraster
-image/x-bitmap		application/vnd.cups-raster	100	imagetoraster
-image/x-photocd		application/vnd.cups-raster	100	imagetoraster
-image/x-portable-anymap	application/vnd.cups-raster	100	imagetoraster
-image/x-portable-bitmap	application/vnd.cups-raster	100	imagetoraster
-image/x-portable-graymap application/vnd.cups-raster	100	imagetoraster
-image/x-portable-pixmap	application/vnd.cups-raster	100	imagetoraster
-image/x-sgi-rgb		application/vnd.cups-raster	100	imagetoraster
-image/x-xbitmap		application/vnd.cups-raster	100	imagetoraster
-image/x-xpixmap		application/vnd.cups-raster	100	imagetoraster
-#image/x-xwindowdump	application/vnd.cups-raster	100	imagetoraster
-image/x-sun-raster	application/vnd.cups-raster	100	imagetoraster
-
-# pstoraster is now part of ESP Ghostscript...
-#application/vnd.cups-postscript	application/vnd.cups-raster	100	pstoraster
+image/*			application/vnd.cups-raster	100	imagetoraster
+application/vnd.cups-postscript	application/vnd.cups-raster	100	pstoraster

 ########################################################################
 #
@@ -111,8 +71,8 @@ image/x-sun-raster	application/vnd.cups-raster	100	imagetoraster
 # option.
 #

-#application/octet-stream	application/vnd.cups-raw	0	-
+#*/*			application/vnd.cups-raw	0	-

 #
-# End of "$Id: mime.convs 3709 2003-05-12 17:38:18Z mike $".
+# End of "$Id: mime.convs 1605 2001-03-02 22:34:21Z andy $".
 #
@@ -1,9 +1,9 @@
 #
-# "$Id: mime.types 3564 2003-04-07 18:03:28Z mike $"
+# "$Id: mime.types 1806 2001-06-28 18:01:17Z mike $"
 #
 #   MIME types file for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2003 by Easy Software Products.
+#   Copyright 1997-2001 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -41,8 +41,6 @@
 #   printable(offset,length)		True if bytes are printable 8-bit chars
 #					(CR, NL, TAB, BS, 32-126, 128-254)
 #   string(offset,"string")		True if bytes are identical to string
-#   istring(offset,"string")		True if bytes are identical to
-#                                       case-insensitive string
 #   char(offset,value)			True if byte is identical
 #   short(offset,value)			True if 16-bit integer is identical
 #   int(offset,value)			True if 32-bit integer is identical
@@ -70,21 +68,16 @@
 # Application-generated files...
 #

-#application/msword		doc string(0,<D0CF11E0A1B11AE1>)
+application/msword		doc string(0,<D0CF11E0A1B11AE1>)
 application/pdf			pdf string(0,%PDF)
-application/postscript		ai eps ps string(0,%!) string(0,<04>%!) \
-				contains(0,128,<1B>%-12345X) + \
-				(contains(0,1024,"LANGUAGE=POSTSCRIPT") \
-				 contains(0,1024,"LANGUAGE = Postscript") \
-				 contains(0,1024,"LANGUAGE = POSTSCRIPT"))
+application/postscript		ai eps ps string(0,%!) string(0,<04>%!)
 application/vnd.hp-HPGL		hpgl string(0,<1B>&)\
-				string(0,<1B>E<1B>%0B) \
-				string(0,<1B>%-1B) string(0,<201B>)\
+				string(0,<1B>E<1B>%0B) string(0,<201B>)\
 				string(0,BP;) string(0,IN;) string(0,DF;) \
 				string(0,BPINPS;) \
 				(contains(0,128,<1B>%-12345X) + \
-				 (contains(0,1024,"LANGUAGE=HPGL") \
-				  contains(0,1024,"LANGUAGE = HPGL")))
+				 (contains(9,512,"LANGUAGE=HPGL") \
+				  contains(9,512,"LANGUAGE = HPGL")))

 ########################################################################
 #
@@ -107,7 +100,7 @@ image/x-portable-pixmap		ppm string(0,P3) string(0,P6)
 image/x-sgi-rgb			rgb sgi bw icon short(0,474)
 image/x-xbitmap			xbm
 image/x-xpixmap			xpm ascii(0,1024) + string(3,"XPM")
-#image/x-xwindowdump		xwd string(4,<00000007>)
+image/x-xwindowdump		xwd
 image/x-sun-raster		ras string(0,<59a66a95>)

 #image/fpx			fpx
@@ -120,7 +113,7 @@ image/x-bitmap			bmp string(0,BM) && !printable(2,14)
 #

 text/html			html htm printable(0,1024) +\
-				(istring(0,"<HTML>") istring(0,"<!DOCTYPE"))
+				(string(0,"<HTML>") string(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,#!) +\
@@ -135,15 +128,17 @@ text/plain			txt printable(0,1024)
 # CUPS-specific types...
 #

-application/vnd.cups-command	string(0,'#CUPS-COMMAND')
 application/vnd.cups-form	string(0,"<CUPSFORM>")
-application/vnd.cups-postscript
+application/vnd.cups-postscript	contains(0,128,<1B>%-12345X) + \
+				(contains(9,512,"LANGUAGE=POSTSCRIPT") \
+				 contains(9,512,"LANGUAGE = Postscript") \
+				 contains(9,512,"LANGUAGE = POSTSCRIPT"))
 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>@) \
 				(contains(0,128,<1B>%-12345X) + \
-				 (contains(0,1024,"LANGUAGE=PCL") \
-				  contains(0,1024,"LANGUAGE = PCL")))
+				 (contains(9,512,"LANGUAGE=PCL") \
+				  contains(9,512,"LANGUAGE = PCL")))

 ########################################################################
 #
@@ -157,5 +152,5 @@ application/vnd.cups-raw	(string(0,<1B>E) + !string(2,<1B>%0B)) \
 #application/octet-stream

 #
-# End of "$Id: mime.types 3564 2003-04-07 18:03:28Z mike $".
+# End of "$Id: mime.types 1806 2001-06-28 18:01:17Z mike $".
 #
@@ -1,2 +0,0 @@
-auth	required	@PAMMOD@ nullok shadow
-account	required	@PAMMOD@
@@ -1,3 +0,0 @@
-#%PAM-1.0
-auth	required	pam_unix.so shadow nodelay nullok
-account	required	pam_unix.so
@@ -1,10 +1,10 @@
 #
-# "$Id: printers.conf 3041 2002-12-17 19:00:27Z swdev $"
+# "$Id: printers.conf 1605 2001-03-02 22:34:21Z andy $"
 #
 #   Sample printer configuration file for the Common UNIX Printing System
 #   (CUPS) scheduler.
 #
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2001 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
@@ -92,5 +92,5 @@
 #</Printer>

 #
-# End of "$Id: printers.conf 3041 2002-12-17 19:00:27Z swdev $".
+# End of "$Id: printers.conf 1605 2001-03-02 22:34:21Z andy $".
 #
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-common.m4 4011 2003-11-19 17:32:06Z mike $"
+dnl "$Id: cups-common.m4 1939 2001-11-02 17:34:55Z mike $"
 dnl
 dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2001 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
@@ -22,20 +22,10 @@ dnl       EMail: cups-info@cups.org
 dnl         WWW: http://www.cups.org
 dnl

-dnl We need at least autoconf 2.50...
-AC_PREREQ(2.50)
-
-dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)

-dnl Version number information...
-CUPS_VERSION="1.1.20"
-AC_SUBST(CUPS_VERSION)
-AC_DEFINE_UNQUOTED(CUPS_SVERSION, "CUPS v$CUPS_VERSION")
-
 dnl Default compiler flags...
 CFLAGS="${CFLAGS:=}"
-CPPFLAGS="${CPPFLAGS:=}"
 CXXFLAGS="${CXXFLAGS:=}"
 LDFLAGS="${LDFLAGS:=}"

@@ -52,12 +42,11 @@ fi
 AC_PROG_RANLIB
 AC_PATH_PROG(AR,ar)
 AC_PATH_PROG(HTMLDOC,htmldoc)
-AC_PATH_PROG(LN,ln)
 AC_PATH_PROG(MV,mv)
 AC_PATH_PROG(NROFF,nroff)
-if test "x$NROFF" = x; then
+if test "$NROFF" = ""; then
 	AC_PATH_PROG(GROFF,groff)
-	if test "x$GROFF" = x; then
+	if test "$GROFF" = ""; then
        	NROFF="echo"
 	else
        	NROFF="$GROFF -T ascii"
@@ -65,54 +54,29 @@ if test "x$NROFF" = x; then
 fi
 AC_PATH_PROG(RM,rm)
 AC_PATH_PROG(SED,sed)
-AC_PATH_PROG(STRIP,strip)
-
-if test "x$AR" = x; then
-	AC_MSG_ERROR([Unable to find required library archive command.])
-fi
-if test "x$CC" = x; then
-	AC_MSG_ERROR([Unable to find required C compiler command.])
-fi
-if test "x$CXX" = x; then
-	AC_MSG_ERROR([Unable to find required C++ compiler command.])
-fi

 dnl Architecture checks...
 AC_C_BIGENDIAN

 dnl Check for libraries...
-AC_SEARCH_LIBS(crypt, crypt)
-AC_SEARCH_LIBS(getspent, sec gen)
+AC_CHECK_LIB(c,crypt,LIBS="$LIBS")
+if test "$ac_cv_lib_c_crypt" = "no"; then
+	AC_CHECK_LIB(crypt,crypt)
+fi
+AC_CHECK_LIB(sec,getspent)
+AC_CHECK_LIB(gen,getspent)

 LIBMALLOC=""
-AC_ARG_ENABLE(mallinfo, [  --enable-mallinfo       turn on malloc debug information, default=no])
-
-if test x$enable_mallinfo = xyes; then
-	AC_CHECK_LIB(c,mallinfo,LIBS="$LIBS"; AC_DEFINE(HAVE_MALLINFO),LIBS="$LIBS")
-	if test "$ac_cv_lib_c_mallinfo" = "no"; then
-		AC_CHECK_LIB(malloc,mallinfo,
-	        	     LIBS="$LIBS"
-			     LIBMALLOC="-lmalloc"
-			     AC_DEFINE(HAVE_MALLINFO),
-			     LIBS="$LIBS")
-	fi
+AC_CHECK_LIB(c,mallinfo,LIBS="$LIBS"; AC_DEFINE(HAVE_MALLINFO),LIBS="$LIBS")
+if test "$ac_cv_lib_c_mallinfo" = "no"; then
+	AC_CHECK_LIB(malloc,mallinfo,
+	             LIBS="$LIBS"
+		     LIBMALLOC="-lmalloc"
+		     AC_DEFINE(HAVE_MALLINFO),
+		     LIBS="$LIBS")
 fi
-
 AC_SUBST(LIBMALLOC)

-dnl Check for libpaper support...
-AC_ARG_ENABLE(libpaper, [  --enable-libpaper       turn on libpaper support, default=no])
-
-if test x$enable_libpaper = xyes; then
-	AC_CHECK_LIB(paper,systempapername,
-		AC_DEFINE(HAVE_LIBPAPER)
-		LIBPAPER="-lpaper",
-		LIBPAPER="")
-else
-	LIBPAPER=""
-fi
-AC_SUBST(LIBPAPER)
-
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_DIRENT
@@ -121,12 +85,11 @@ AC_CHECK_HEADER(malloc.h,AC_DEFINE(HAVE_MALLOC_H))
 AC_CHECK_HEADER(shadow.h,AC_DEFINE(HAVE_SHADOW_H))
 AC_CHECK_HEADER(string.h,AC_DEFINE(HAVE_STRING_H))
 AC_CHECK_HEADER(strings.h,AC_DEFINE(HAVE_STRINGS_H))
-AC_CHECK_HEADER(bstring.h,AC_DEFINE(HAVE_BSTRING_H))
 AC_CHECK_HEADER(usersec.h,AC_DEFINE(HAVE_USERSEC_H))
 AC_CHECK_HEADER(sys/ioctl.h,AC_DEFINE(HAVE_SYS_IOCTL_H))

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

 AC_SUBST(ARFLAGS)

-dnl Extra platform-specific libraries...
-case $uname in
-        Darwin*)
-                BACKLIBS="-framework IOKit"
-                COMMONLIBS="-framework CoreFoundation"
-                ;;
-        *)
-                BACKLIBS=""
-		COMMONLIBS=""
-                ;;
-esac
-
-AC_SUBST(BACKLIBS)
-AC_SUBST(COMMONLIBS)
-
 dnl
-dnl End of "$Id: cups-common.m4 4011 2003-11-19 17:32:06Z mike $".
+dnl End of "$Id: cups-common.m4 1939 2001-11-02 17:34:55Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-compiler.m4 3874 2003-08-20 18:27:48Z mike $"
+dnl "$Id: cups-compiler.m4 1939 2001-11-02 17:34:55Z mike $"
 dnl
 dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2001 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
@@ -27,17 +27,12 @@ dnl for them...
 OPTIM=""
 AC_SUBST(OPTIM)

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

-AC_ARG_WITH(optim, [  --with-optim="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
@@ -52,33 +47,24 @@ if test -n "$GCC"; then
 	# 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)
+	case "`$CXX --version`" in
+    		3*)
+			AC_MSG_WARN(GCC 3.0.x is known to produce incorrect code - use with caution!)
+			LIBS="$LIBS -lsupc++"
 			;;
-		*)
-        		# This is gcc 3.x, and it knows of libsupc++, so we need it
-        		CXXLIBS="-lsupc++"
-        		AC_MSG_RESULT(yes)
+    		3.1*)
+			LIBS="$LIBS -lsupc++"
 			;;
 	esac

 	CXX="$CC"

 	if test -z "$OPTIM"; then
-		if test "x$with_optim" = x; then
-			if test $uname = HP-UX; then
-				# GCC under HP-UX has bugs with -O2
-				OPTIM="-O1"
-			else
-		       		OPTIM="-O2"
-			fi
+		if test $uname = HP-UX; then
+			# GCC under HP-UX has bugs with -O2
+			OPTIM="-O1"
 		else
-			OPTIM="$with_optim $OPTIM"
+		       	OPTIM="-O2"
 		fi
 	fi

@@ -86,34 +72,22 @@ if test -n "$GCC"; then
    		OPTIM="-fPIC $OPTIM"
 	fi

-	if test "x$with_optim" = x; then
-		OPTIM="-Wall $OPTIM"
-	fi
+	OPTIM="-Wall $OPTIM"
 else
 	case $uname in
 		AIX*)
 			if test -z "$OPTIM"; then
-				if test "x$with_optim" = x; then
-					OPTIM="-O2 -qmaxmem=6000"
-				else
-					OPTIM="$with_optim $OPTIM"
-				fi
+				OPTIM="-O2 -qmaxmem=6000"
 			fi
 			;;
 		HP-UX*)
 			if test -z "$OPTIM"; then
-				if test "x$with_optim" = x; then
-					OPTIM="+O2"
-				else
-					OPTIM="$with_optim $OPTIM"
-				fi
+				OPTIM="+O2"
 			fi

 			CFLAGS="-Ae $CFLAGS"

-			if test "x$with_optim" = x; then
-				OPTIM="+DAportable $OPTIM"
-			fi
+			OPTIM="+DAportable $OPTIM"

 			if test $PICFLAG = 1; then
 				OPTIM="+z $OPTIM"
@@ -121,45 +95,22 @@ else
 			;;
        	IRIX*)
 			if test -z "$OPTIM"; then
-				if test "x$with_optim" = x; then
-					OPTIM="-O2"
-				else
-					OPTIM="$with_optim $OPTIM"
-				fi
+        			OPTIM="-O2"
 			fi

-			if test $uversion -ge 62 -a "x$with_optim" = x; then
+			if test $uversion -ge 62; then
 				OPTIM="$OPTIM -n32 -mips3"
 			fi

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

-			if test "x$with_optim" = x; then
-				# Specify "generic" SPARC output and suppress
-				# all of Sun's questionable warning messages...
-				OPTIM="-w $OPTIM -xarch=generic"
-			fi
+			OPTIM="$OPTIM -xarch=generic"

 			if test $PICFLAG = 1; then
 				OPTIM="-KPIC $OPTIM"
@@ -168,11 +119,7 @@ else
 		UNIX_SVR*)
 			# UnixWare
 			if test -z "$OPTIM"; then
-				if test "x$with_optim" = x; then
-					OPTIM="-O"
-				else
-					OPTIM="$with_optim $OPTIM"
-				fi
+				OPTIM="-O"
 			fi

 			if test $PICFLAG = 1; then
@@ -191,16 +138,15 @@ else
 	esac
 fi

-if test $uname = HP-UX; then
-	# HP-UX 10.20 (at least) needs this definition to get the
-	# h_errno global...
-	OPTIM="$OPTIM -D_XOPEN_SOURCE_EXTENDED"
-
-	# HP-UX 11.00 (at least) needs this definition to get the
-	# u_short type used by the IP headers...
-	OPTIM="$OPTIM -D_INCLUDE_HPUX_SOURCE"
-fi
+case $uname in
+	Darwin* | *BSD)
+		ARFLAGS="-rcv"
+		;;
+	*)
+		ARFLAGS="crvs"
+		;;
+esac

 dnl
-dnl End of "$Id: cups-compiler.m4 3874 2003-08-20 18:27:48Z mike $".
+dnl End of "$Id: cups-compiler.m4 1939 2001-11-02 17:34:55Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-directories.m4 3041 2002-12-17 19:00:27Z swdev $"
+dnl "$Id: cups-directories.m4 1939 2001-11-02 17:34:55Z mike $"
 dnl
 dnl   Directory stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2001 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
@@ -81,10 +81,6 @@ if test "$sysconfdir" = "\${prefix}/etc"; then
 fi

 dnl Fix "libdir" variable for IRIX 6.x...
-if test "$libdir" = "\${exec_prefix}/lib"; then
-	libdir="$exec_prefix/lib"
-fi
-
 if test "$uname" = "IRIX" -a $uversion -ge 62; then
 	libdir="$exec_prefix/lib32"
 fi
@@ -110,9 +106,9 @@ if test x$rcdir = x; then
 			;;

 		Darwin*)
-			# Darwin and MacOS X...
+			# Darwin and MacOS X - this is just strange...
 			INITDIR=""
-			INITDDIR="/System/Library/StartupItems/PrintingServices"
+			INITDDIR="/System/Library/StartupItems/CUPS"
 			;;

 		Linux*)
@@ -159,14 +155,14 @@ AC_SUBST(INITDIR)
 AC_SUBST(INITDDIR)

 dnl Setup default locations...
-CUPS_SERVERROOT="$sysconfdir/cups"
-CUPS_REQUESTS="$localstatedir/spool/cups"
+CUPS_SERVERROOT='${sysconfdir}/cups'
+CUPS_REQUESTS='${localstatedir}/spool/cups'

 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"
+	CUPS_LOGDIR='${localstatedir}/log/cups'
 	AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$localstatedir/log/cups")
 else
 	CUPS_LOGDIR="$logdir"
@@ -178,14 +174,14 @@ case "$uname" in
 	*BSD* | Darwin*)
 		# *BSD and Darwin (MacOS X)
 		INSTALL_SYSV=""
-		CUPS_SERVERBIN="$exec_prefix/libexec/cups"
+		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")
+		CUPS_SERVERBIN='${exec_prefix}/lib/cups'
+		AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$exec_prefix/lib/cups")
 		;;
 esac

@@ -198,18 +194,18 @@ AC_SUBST(CUPS_REQUESTS)
 dnl Set the CUPS_LOCALE directory...
 case "$uname" in
 	Linux* | *BSD* | Darwin*)
-		CUPS_LOCALEDIR="$datadir/locale"
+		CUPS_LOCALEDIR='${datadir}/locale'
 		AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$datadir/locale")
 		;;

 	OSF1* | AIX*)
-		CUPS_LOCALEDIR="$exec_prefix/lib/nls/msg"
+		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"
+		CUPS_LOCALEDIR='${exec_prefix}/lib/locale'
 		AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$exec_prefix/lib/locale")
 		;;
 esac
@@ -217,13 +213,13 @@ esac
 AC_SUBST(CUPS_LOCALEDIR)

 dnl Set the CUPS_DATADIR directory...
-CUPS_DATADIR="$datadir/cups"
+CUPS_DATADIR='${datadir}/cups'
 AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$datadir/cups")
 AC_SUBST(CUPS_DATADIR)

 dnl Set the CUPS_DOCROOT directory...
 if test x$docdir = x; then
-	CUPS_DOCROOT="$datadir/doc/cups"
+	CUPS_DOCROOT='${datadir}/doc/cups'
 	docdir="$datadir/doc/cups"
 else
 	CUPS_DOCROOT="$docdir"
@@ -233,10 +229,8 @@ AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$docdir")
 AC_SUBST(CUPS_DOCROOT)

 dnl Set the CUPS_FONTPATH directory...
-CUPS_FONTPATH="$fontpath"
-AC_SUBST(CUPS_FONTPATH)
 AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath")

 dnl
-dnl End of "$Id: cups-directories.m4 3041 2002-12-17 19:00:27Z swdev $".
+dnl End of "$Id: cups-directories.m4 1939 2001-11-02 17:34:55Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-image.m4 3041 2002-12-17 19:00:27Z swdev $"
+dnl "$Id: cups-image.m4 1912 2001-10-04 16:50:18Z mike $"
 dnl
 dnl   Image library stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2001 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
@@ -65,18 +65,8 @@ AC_CHECK_HEADER(tiff.h,
 dnl Restore original LIBS settings...
 LIBS="$SAVELIBS"

-EXPORT_LIBJPEG="$LIBJPEG"
-EXPORT_LIBPNG="$LIBPNG"
-EXPORT_LIBTIFF="$LIBTIFF"
-EXPORT_LIBZ="$LIBZ"
-
-AC_SUBST(EXPORT_LIBJPEG)
-AC_SUBST(EXPORT_LIBPNG)
-AC_SUBST(EXPORT_LIBTIFF)
-AC_SUBST(EXPORT_LIBZ)
-
 AC_CHECK_HEADER(stdlib.h,AC_DEFINE(HAVE_STDLIB_H))

 dnl
-dnl End of "$Id: cups-image.m4 3041 2002-12-17 19:00:27Z swdev $".
+dnl End of "$Id: cups-image.m4 1912 2001-10-04 16:50:18Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-libtool.m4 3041 2002-12-17 19:00:27Z swdev $"
+dnl "$Id: cups-libtool.m4 1880 2001-08-06 19:37:10Z mike $"
 dnl
 dnl   Libtool stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2001 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
@@ -23,7 +23,7 @@ dnl         WWW: http://www.cups.org
 dnl

 AC_ARG_ENABLE(libtool_unsupported, [  --enable-libtool-unsupported=LIBTOOL_PATH
-                          turn on building with libtool (UNSUPPORTED!), default=no],
+                          turn on building with libtool (UNSUPPORTED!) [default=no]],
 	[if test x$enable_libtool_unsupported != xno; then
 		LIBTOOL="$enable_libtool_unsupported"
 		enable_shared=no
@@ -45,5 +45,5 @@ if test x$LIBTOOL != x; then
 fi

 dnl
-dnl End of "$Id: cups-libtool.m4 3041 2002-12-17 19:00:27Z swdev $".
+dnl End of "$Id: cups-libtool.m4 1880 2001-08-06 19:37:10Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-manpages.m4 3041 2002-12-17 19:00:27Z swdev $"
+dnl "$Id: cups-manpages.m4 1939 2001-11-02 17:34:55Z mike $"
 dnl
 dnl   Manpage stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2001 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
@@ -100,5 +100,5 @@ AC_SUBST(MAN8EXT)
 AC_SUBST(MAN8DIR)

 dnl
-dnl End of "$Id: cups-manpages.m4 3041 2002-12-17 19:00:27Z swdev $".
+dnl End of "$Id: cups-manpages.m4 1939 2001-11-02 17:34:55Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-network.m4 3888 2003-08-28 15:16:08Z mike $"
+dnl "$Id: cups-network.m4 1794 2001-06-27 19:06:46Z mike $"
 dnl
 dnl   Networking stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2001 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
@@ -29,31 +29,8 @@ if test "$uname" != "IRIX"; then
 	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
-		55* | 56*)
-			maxfiles=1024
-			;;
-		*)
-			maxfiles=4096
-			;;
-	esac
-else
-	maxfiles=4096
-fi
-
-AC_ARG_WITH(maxfiles, [  --with-maxfiles=N       set maximum number of file descriptors for scheduler ],
-	maxfiles=$withval)
-
-AC_DEFINE_UNQUOTED(CUPS_MAX_FDS, $maxfiles)
-
 dnl
-dnl End of "$Id: cups-network.m4 3888 2003-08-28 15:16:08Z mike $".
+dnl End of "$Id: cups-network.m4 1794 2001-06-27 19:06:46Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-openslp.m4 3041 2002-12-17 19:00:27Z swdev $"
+dnl "$Id: cups-openslp.m4 1870 2001-07-24 20:23:03Z mike $"
 dnl
 dnl   OpenSLP configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2001 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
@@ -22,14 +22,13 @@ dnl       EMail: cups-info@cups.org
 dnl         WWW: http://www.cups.org
 dnl

-AC_ARG_ENABLE(slp, [  --enable-slp            turn on SLP support, default=yes])
-AC_ARG_WITH(openslp-libs, [  --with-openslp-libs     set directory for OpenSLP library],
+AC_ARG_ENABLE(slp, [  --enable-slp            turn on SLP support [default=yes]])
+AC_ARG_WITH(openslp-libs, [  --with-openslp-libs    set directory for OpenSLP library],
    LDFLAGS="-L$withval $LDFLAGS"
    DSOFLAGS="-L$withval $DSOFLAGS",)
-AC_ARG_WITH(openslp-includes, [  --with-openslp-includes set directory for OpenSLP includes],
+AC_ARG_WITH(openslp-includes, [  --with-openslp-includes    set directory for OpenSLP includes],
    CFLAGS="-I$withval $CFLAGS"
-    CXXFLAGS="-I$withval $CXXFLAGS"
-    CPPFLAGS="-I$withval $CPPFLAGS",)
+    CXXFLAGS="-I$withval $CXXFLAGS",)

 LIBSLP=""

@@ -44,5 +43,5 @@ AC_SUBST(LIBSLP)


 dnl
-dnl End of "$Id: cups-openslp.m4 3041 2002-12-17 19:00:27Z swdev $".
+dnl End of "$Id: cups-openslp.m4 1870 2001-07-24 20:23:03Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-openssl.m4 3940 2003-09-17 19:35:22Z mike $"
+dnl "$Id: cups-openssl.m4 1870 2001-07-24 20:23:03Z mike $"
 dnl
-dnl   OpenSSL/GNUTLS stuff for the Common UNIX Printing System (CUPS).
+dnl   OpenSSL stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2001 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
@@ -22,91 +22,48 @@ dnl       EMail: cups-info@cups.org
 dnl         WWW: http://www.cups.org
 dnl

-AC_ARG_ENABLE(ssl, [  --enable-ssl            turn on SSL/TLS support, default=yes])
-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],
+AC_ARG_ENABLE(ssl, [  --enable-ssl            turn on 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",)
 AC_ARG_WITH(openssl-includes, [  --with-openssl-includes set directory for OpenSSL includes],
    CFLAGS="-I$withval $CFLAGS"
-    CXXFLAGS="-I$withval $CXXFLAGS"
-    CPPFLAGS="-I$withval $CPPFLAGS",)
+    CXXFLAGS="-I$withval $CXXFLAGS",)

-SSLFLAGS=""
 SSLLIBS=""

 if test x$enable_ssl != xno; then
-    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
-	    dnl included...
-	    SAVELIBS="$LIBS"
+    AC_CHECK_HEADER(openssl/ssl.h,
+	dnl Save the current libraries so the crypto stuff isn't always
+	dnl included...
+	SAVELIBS="$LIBS"

-	    dnl Some ELF systems can't resolve all the symbols in libcrypto
-	    dnl if libcrypto was linked against RSAREF, and fail to link the
-	    dnl test program correctly, even though a correct installation
-	    dnl of OpenSSL exists.  So we test the linking three times in
-	    dnl case the RSAREF libraries are needed.
+	dnl Some ELF systems can't resolve all the symbols in libcrypto
+	dnl if libcrypto was linked against RSAREF, and fail to link the
+	dnl test program correctly, even though a correct installation
+	dnl of OpenSSL exists.  So we test the linking three times in
+	dnl case the RSAREF libraries are needed.

-	    for libcrypto in \
-	        "-lcrypto" \
-	        "-lcrypto -lrsaref" \
-	        "-lcrypto -lRSAglue -lrsaref"
-	    do
-		AC_CHECK_LIB(ssl,SSL_new,
-		    [SSLFLAGS="-DOPENSSL_DISABLE_OLD_DES_SUPPORT"
-		     SSLLIBS="-lssl $libcrypto"
-		     AC_DEFINE(HAVE_SSL)
-		     AC_DEFINE(HAVE_LIBSSL)],,
-		    $libcrypto)
+	for libcrypto in \
+	    "-lcrypto" \
+	    "-lcrypto -lrsaref" \
+	    "-lcrypto -lRSAglue -lrsaref"
+	do
+	    AC_CHECK_LIB(ssl,SSL_new,
+		[SSLLIBS="-lssl $libcrypto"
+		 AC_DEFINE(HAVE_LIBSSL)],,
+		$libcrypto)

-		if test "x${SSLLIBS}" != "x"; then
-		    break
-		fi
-	    done
+	    if test "x${SSLLIBS}" != "x"; then
+		break
+	    fi
+	done

-	    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
+	LIBS="$SAVELIBS")
 fi

-AC_SUBST(SSLFLAGS)
 AC_SUBST(SSLLIBS)

-EXPORT_SSLLIBS="$SSLLIBS"
-AC_SUBST(EXPORT_SSLLIBS)
-
-
 dnl
-dnl End of "$Id: cups-openssl.m4 3940 2003-09-17 19:35:22Z mike $".
+dnl End of "$Id: cups-openssl.m4 1870 2001-07-24 20:23:03Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-opsys.m4 3929 2003-09-15 20:32:12Z mike $"
+dnl "$Id: cups-opsys.m4 1870 2001-07-24 20:23:03Z mike $"
 dnl
 dnl   Operating system stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2001 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
@@ -56,14 +56,8 @@ 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
+		for group in sys system root; do
 			if test "`grep \^${group}: /etc/group`" != ""; then
 				CUPS_GROUP="$group"
 				AC_MSG_RESULT($group)
@@ -87,5 +81,5 @@ AC_DEFINE_UNQUOTED(CUPS_DEFAULT_USER, "$CUPS_USER")
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_GROUP, "$CUPS_GROUP")

 dnl
-dnl "$Id: cups-opsys.m4 3929 2003-09-15 20:32:12Z mike $"
+dnl "$Id: cups-opsys.m4 1870 2001-07-24 20:23:03Z mike $"
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-pam.m4 3041 2002-12-17 19:00:27Z swdev $"
+dnl "$Id: cups-pam.m4 1870 2001-07-24 20:23:03Z mike $"
 dnl
 dnl   PAM stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2001 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
@@ -22,7 +22,7 @@ dnl       EMail: cups-info@cups.org
 dnl         WWW: http://www.cups.org
 dnl

-AC_ARG_ENABLE(pam, [  --enable-pam            turn on PAM support, default=yes])
+AC_ARG_ENABLE(pam, [  --enable-pam            turn on PAM support [default=yes]])

 dnl Don't use PAM with AIX...
 if test $uname = AIX; then
@@ -31,14 +31,11 @@ fi

 PAMDIR=""
 PAMLIBS=""
-PAMMOD="pam_unknown.so"

 if test x$enable_pam != xno; then
 	SAVELIBS="$LIBS"
-
 	AC_CHECK_LIB(dl,dlopen)
 	AC_CHECK_LIB(pam,pam_start)
-	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
 		if test x$ac_cv_lib_dl_dlopen != xno; then
@@ -52,20 +49,11 @@ if test x$enable_pam != xno; then
 	fi

 	LIBS="$SAVELIBS"
-
-	# This test might need to be updated as Linux distributors move
-	# things around...
-	for mod in pam_unix2.so pam_unix.so pam_pwdb.so; do
-		if test -f /lib/security/$mod; then
-			PAMMOD="$mod"
-		fi
-	done
 fi

 AC_SUBST(PAMDIR)
 AC_SUBST(PAMLIBS)
-AC_SUBST(PAMMOD)

 dnl
-dnl End of "$Id: cups-pam.m4 3041 2002-12-17 19:00:27Z swdev $".
+dnl End of "$Id: cups-pam.m4 1870 2001-07-24 20:23:03Z mike $".
 dnl
@@ -1,91 +0,0 @@
-dnl
-dnl "$Id: cups-scripting.m4 3472 2003-03-14 17:04:09Z mike $"
-dnl
-dnl   Scripting configuration stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636-3111 USA
-dnl
-dnl       Voice: (301) 373-9603
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
-dnl
-
-dnl Do we have Java?
-AC_ARG_WITH(java, [  --with-java             set Java interpreter for web interfaces ],
-	CUPS_JAVA="$withval",
-	CUPS_JAVA="")
-
-if test "x$CUPS_JAVA" = x; then
-	AC_PATH_PROG(JAVA,java)
-	CUPS_JAVA="$JAVA"
-fi
-
-AC_DEFINE_UNQUOTED(CUPS_JAVA, "$CUPS_JAVA")
-
-if test "x$CUPS_JAVA" != x; then
-	AC_DEFINE(HAVE_JAVA)
-fi
-
-dnl Do we have Perl?
-AC_ARG_WITH(perl, [  --with-perl             set Perl interpreter for web interfaces ],
-	CUPS_PERL="$withval",
-	CUPS_PERL="")
-
-if test "x$CUPS_PERL" = x; then
-	AC_PATH_PROG(PERL,perl)
-	CUPS_PERL="$PERL"
-fi
-
-AC_DEFINE_UNQUOTED(CUPS_PERL, "$CUPS_PERL")
-
-if test "x$CUPS_PERL" != x; then
-	AC_DEFINE(HAVE_PERL)
-fi
-
-dnl Do we have PHP?
-AC_ARG_WITH(php, [  --with-php              set PHP interpreter for web interfaces ],
-	CUPS_PHP="$withval",
-	CUPS_PHP="")
-
-if test "x$CUPS_PHP" = x; then
-	AC_PATH_PROG(PHP,php)
-	CUPS_PHP="$PHP"
-fi
-
-AC_DEFINE_UNQUOTED(CUPS_PHP, "$CUPS_PHP")
-
-if test "x$CUPS_PHP" != x; then
-	AC_DEFINE(HAVE_PHP)
-fi
-
-dnl Do we have Python?
-AC_ARG_WITH(python, [  --with-python           set Python interpreter for web interfaces ],
-	CUPS_PYTHON="$withval",
-	CUPS_PYTHON="")
-
-if test "x$CUPS_PYTHON" = x; then
-	AC_PATH_PROG(PYTHON,python)
-	CUPS_PYTHON="$PYTHON"
-fi
-
-AC_DEFINE_UNQUOTED(CUPS_PYTHON, "$CUPS_PYTHON")
-
-if test "x$CUPS_PYTHON" != x; then
-	AC_DEFINE(HAVE_PYTHON)
-fi
-
-dnl
-dnl End of "$Id: cups-scripting.m4 3472 2003-03-14 17:04:09Z mike $".
-dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-sharedlibs.m4 3826 2003-07-23 20:07:35Z mike $"
+dnl "$Id: cups-sharedlibs.m4 1924 2001-10-26 03:16:48Z mike $"
 dnl
 dnl   Shared library support for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2001 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
@@ -25,7 +25,7 @@ dnl
 PICFLAG=1
 DSOFLAGS="${DSOFLAGS:=}"

-AC_ARG_ENABLE(shared, [  --enable-shared         turn on shared libraries, default=yes])
+AC_ARG_ENABLE(shared, [  --enable-shared         turn on shared libraries [default=yes]])

 if test x$enable_shared != xno; then
 	case "$uname" in
@@ -41,13 +41,7 @@ if test x$enable_shared != xno; then
 			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.5,-soname,\$@ -shared \$(OPTIM)"
-			;;
-		OSF1* | Linux* | *BSD*)
+		OSF1* | Linux* | IRIX* | FreeBSD* | NetBSD* | OpenBSD*)
 			LIBCUPS="libcups.so.2"
 			LIBCUPSIMAGE="libcupsimage.so.2"
 			DSO="\$(CC)"
@@ -56,14 +50,14 @@ if test x$enable_shared != xno; then
 		Darwin*)
 			LIBCUPS="libcups.2.dylib"
 			LIBCUPSIMAGE="libcupsimage.2.dylib"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS \$(RC_CFLAGS) -dynamiclib -lc"
+			DSO="ld"
+			DSOFLAGS="$DSOFLAGS -dylib /usr/lib/dylib1.o -lc"
 			;;
 		AIX*)
 			LIBCUPS="libcups_s.a"
 			LIBCUPSIMAGE="libcupsimage_s.a"
 			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-bexpall,-bM:SRE,-bnoentry,-blibpath:\$(libdir)"
+			DSOFLAGS="$DSOFLAGS -Wl,-bexpall,-bM:SRE,-bnoentry"
 			;;
 		*)
 			echo "Warning: shared libraries may not be supported.  Trying -shared"
@@ -87,15 +81,17 @@ AC_SUBST(LIBCUPS)
 AC_SUBST(LIBCUPSIMAGE)

 if test x$enable_shared = xno; then
-	LINKCUPS="../cups/libcups.a \$(SSLLIBS)"
-	LINKCUPSIMAGE="../filter/libcupsimage.a"
+	LINKCUPS="-L../cups -lcups"
+	LINKCUPSIMAGE="-L../filter -lcupsimage"
+	LINKCUPS="$LINKCUPS \$(SSLLIBS)"
 else
 	if test $uname = AIX; then
-		LINKCUPS="-lcups_s"
-		LINKCUPSIMAGE="-lcupsimage_s"
+		
+		LINKCUPS="-L../cups -lcups_s"
+		LINKCUPSIMAGE="-L../filter -lcupsimage_s"
 	else
-		LINKCUPS="-lcups"
-		LINKCUPSIMAGE="-lcupsimage"
+		LINKCUPS="-L../cups -lcups"
+		LINKCUPSIMAGE="-L../filter -lcupsimage"
 	fi
 fi

@@ -103,8 +99,6 @@ AC_SUBST(LINKCUPS)
 AC_SUBST(LINKCUPSIMAGE)

 dnl Update libraries for DSOs...
-EXPORT_LDFLAGS=""
-
 if test "$DSO" != ":"; then
 	# When using DSOs the image libraries are linked to libcupsimage.so
 	# rather than to the executables.  This makes things smaller if you
@@ -119,27 +113,23 @@ if test "$DSO" != ":"; then
 	case $uname in
                HP-UX*)
 			# HP-UX
-                	DSOFLAGS="+s +b $libdir $DSOFLAGS"
-                	LDFLAGS="$LDFLAGS -Wl,+s,+b,$libdir"
-                	EXPORT_LDFLAGS="-Wl,+s,+b,$libdir"
+                	DSOFLAGS="+b $libdir +fb $DSOFLAGS"
+                	LDFLAGS="$LDFLAGS -Wl,+b,$libdir,+fb"
                	;;
                SunOS*)
                	# Solaris
                	DSOFLAGS="-R$libdir $DSOFLAGS"
                	LDFLAGS="$LDFLAGS -R$libdir"
-                	EXPORT_LDFLAGS="-R$libdir"
                	;;
-                *BSD*)
+                FreeBSD* | NetBSD* | OpenBSD*)
                        # *BSD
                	DSOFLAGS="-Wl,-R$libdir $DSOFLAGS"
                        LDFLAGS="$LDFLAGS -Wl,-R$libdir"
-                        EXPORT_LDFLAGS="-Wl,-R$libdir"
                        ;;
                Linux*)
                        # Linux
                	DSOFLAGS="-Wl,-rpath,$libdir $DSOFLAGS"
                        LDFLAGS="$LDFLAGS -Wl,-rpath,$libdir"
-                        EXPORT_LDFLAGS="-Wl,-rpath,$libdir"
                        ;;
 	esac
 else
@@ -149,8 +139,7 @@ fi

 AC_SUBST(DSOLIBS)
 AC_SUBST(IMGLIBS)
-AC_SUBST(EXPORT_LDFLAGS)

 dnl
-dnl End of "$Id: cups-sharedlibs.m4 3826 2003-07-23 20:07:35Z mike $".
+dnl End of "$Id: cups-sharedlibs.m4 1924 2001-10-26 03:16:48Z mike $".
 dnl
@@ -5,7 +5,7 @@
 *
 *   @configure_input@
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-2001 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -24,14 +24,11 @@
 *         WWW: http://www.cups.org
 */

-#ifndef _CUPS_CONFIG_H_
-#define _CUPS_CONFIG_H_
-
 /*
 * Version of software...
 */

-#define CUPS_SVERSION	"CUPS v1.1.19rc3"
+#define CUPS_SVERSION	"CUPS v1.1.12"


 /*
@@ -42,13 +39,6 @@
 #define CUPS_DEFAULT_GROUP	"sys"


-/*
- * Maximum number of file descriptors to support.
- */
-
-#define CUPS_MAX_FDS		4096
-
-
 /*
 * Where are files stored?
 */
@@ -105,8 +95,6 @@
 #define HAVE_LIBPAM 0
 #endif /* !HAVE_LIBPAM */

-#undef HAVE_PAM_PAM_APPL_H
-

 /*
 * Do we have <shadow.h>?
@@ -123,12 +111,11 @@


 /*
- * Use <string.h>, <strings.h>, and/or <bstring.h>?
+ * Use <string.h>, <strings.h>, or both?
 */

 #undef HAVE_STRING_H
 #undef HAVE_STRINGS_H
-#undef HAVE_BSTRING_H


 /*
@@ -138,8 +125,6 @@
 #undef HAVE_STRDUP
 #undef HAVE_STRCASECMP
 #undef HAVE_STRNCASECMP
-#undef HAVE_STRLCAT
-#undef HAVE_STRLCPY


 /*
@@ -182,13 +167,10 @@


 /*
- * Which encryption libraries do we have?
+ * Do we have the OpenSSL library?
 */

-#undef HAVE_CDSASSL
-#undef HAVE_GNUTLS
 #undef HAVE_LIBSSL
-#undef HAVE_SSL


 /*
@@ -198,13 +180,6 @@
 #undef HAVE_LIBSLP


-/*
- * Do we have libpaper?
- */
-
-#undef HAVE_LIBPAPER
-
-
 /*
 * Do we have <sys/ioctl.h>?
 */
@@ -227,57 +202,6 @@
 #undef HAVE_TM_GMTOFF


-/*
- * Do we have rresvport()?
- */
-
-#undef HAVE_RRESVPORT
-
-
-/*
- * Do we have getifaddrs()?
- */
-
-#undef HAVE_GETIFADDRS
-
-
-/*
- * Do we have hstrerror()?
- */
-
-#undef HAVE_HSTRERROR
-
-
-/*
- * Do we have the <sys/sockio.h> header file?
- */
-
-#undef HAVE_SYS_SOCKIO_H
-
-
-/*
- * Does the sockaddr structure contain an sa_len parameter?
- */
-
-#undef HAVE_STRUCT_SOCKADDR_SA_LEN
-
-
-/*
- * Various scripting languages...
- */
-
-#undef HAVE_JAVA
-#define CUPS_JAVA	"/usr/bin/java"
-#undef HAVE_PERL
-#define CUPS_PERL	"/usr/bin/perl"
-#undef HAVE_PHP
-#define CUPS_PHP	"/usr/bin/php"
-#undef HAVE_PYTHON
-#define CUPS_PYTHON	"/usr/bin/python"
-
-
-#endif /* !_CUPS_CONFIG_H_ */
-
 /*
 * End of "$Id$".
 */
@@ -3,7 +3,7 @@ dnl "$Id$"
 dnl
 dnl   Configuration script for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2001 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
@@ -39,9 +39,7 @@ sinclude(config-scripts/cups-openslp.m4)
 sinclude(config-scripts/cups-openssl.m4)
 sinclude(config-scripts/cups-pam.m4)

-sinclude(config-scripts/cups-scripting.m4)
-
-AC_OUTPUT(Makedefs cups.list cups.sh cups-config conf/cupsd.conf conf/pam.conf)
+AC_OUTPUT(Makedefs cups.list cups.sh cups-config)

 chmod +x cups-config

@@ -1,10 +1,10 @@
-#!/bin/sh
+#! /bin/sh
 #
 # "$Id$"
 # 
 #   CUPS configuration utility.
 #
-#   Copyright 2001-2003 by Easy Software Products, all rights reserved.
+#   Copyright 2001 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
@@ -23,7 +23,7 @@
 #         WWW: http://www.cups.org
 #

-VERSION="@CUPS_VERSION@"
+VERSION="1.1.11-1"
 APIVERSION="1.1"

 prefix=@prefix@
@@ -38,10 +38,9 @@ cups_serverbin=@CUPS_SERVERBIN@
 cups_serverroot=@CUPS_SERVERROOT@

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

 if test $includedir != /usr/include; then
    CFLAGS="$CFLAGS -I$includedir"
@@ -99,13 +98,13 @@ while test $# -gt 0; do
 	        if test $image = no; then
 	            echo -lcups $LIBS
 		else
-	            echo -lcupsimage $IMGLIBS -lcups $LIBS
+	            echo -lcupsimage -lcups $LIBS
 		fi
 	    else
 	        if test $image = no; then
 	            echo $libdir/libcups.a $LIBS
 		else
-	            echo $libdir/libcupsimage.a $IMGLIBS $libdir/libcups.a $LIBS
+	            echo $libdir/libcupsimage.a $libdir/libcups.a $LIBS
 		fi
 	    fi
 	    ;;
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00

 ###############################################################################

-Project: "cups"=".\cups\cups.dsp" - Package Owner=<4>
+Project: "cups"=.\cups\cups.dsp - Package Owner=<4>

 Package=<5>
 {{{
@@ -4,7 +4,7 @@
 #   ESP Package Manager (EPM) file list for the Common UNIX Printing
 #   System (CUPS).
 #
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2001 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
@@ -25,30 +25,18 @@

 # Product information
 %product Common UNIX Printing System
-%copyright 1993-2003 by Easy Software Products, All Rights Reserved.
+%copyright 1993-2001 by Easy Software Products, All Rights Reserved.
 %vendor Easy Software Products
 %license LICENSE.txt
 %readme README.txt
-%version @CUPS_VERSION@
-%description The Common UNIX Printing System provides a portable printing
-%description layer for UNIX® operating systems.  It has been developed by
-%description Easy Software Products to promote a standard printing solution
-%description for all UNIX vendors and users.  CUPS provides the System V and
-%description Berkeley command-line interfaces. 
-%provides cups-devel
-%provides cups-libs
+%version 1.1.12
+%provides cups
 %provides cupsys
-%provides cupsys-bsd
-%provides cupsys-client
+%provides cups-devel
 %provides cupsys-devel
+%provides cups-pstoraster
 %provides libcups1
-%provides libcupsys2
-%provides libcupsys2-dev
-
-%format rpm deb portable
-%provides @LIBCUPS@
-%provides @LIBCUPSIMAGE@
-%format all
+%provides libcups.so.2

 #
 # GNU variables...
@@ -94,7 +82,6 @@ $SERVERBIN=@CUPS_SERVERBIN@
 $SERVERROOT=@CUPS_SERVERROOT@

 $CUPS_USER=@CUPS_USER@
-$CUPS_GROUP=@CUPS_GROUP@

 $CAT1EXT=@CAT1EXT@
 $CAT3EXT=@CAT3EXT@
@@ -103,18 +90,11 @@ $CAT8EXT=@CAT8EXT@
 $MAN8EXT=@MAN8EXT@
 $MAN8DIR=@MAN8DIR@

-$DSOLIBS=@DSOLIBS@
-
 # Make sure the MD5 password file is now owned by CUPS_USER...
 %postinstall if test -f $SERVERROOT/passwd.md5; then
 %postinstall chown $CUPS_USER $SERVERROOT/passwd.md5
 %postinstall fi

-# Make sure the shared libraries are refreshed...
-%system linux
-%postinstall ldconfig
-%system all
-
 # Server programs
 %system all
 # Server files
@@ -126,7 +106,6 @@ f 0555 root sys $SERVERBIN/backend/ipp backend/ipp
 l 0555 root sys $SERVERBIN/backend/http ipp
 f 0555 root sys $SERVERBIN/backend/lpd backend/lpd
 f 0555 root sys $SERVERBIN/backend/parallel backend/parallel
-f 0555 root sys $SERVERBIN/backend/scsi backend/scsi
 f 0555 root sys $SERVERBIN/backend/serial backend/serial
 f 0555 root sys $SERVERBIN/backend/socket backend/socket
 f 0555 root sys $SERVERBIN/backend/usb backend/usb
@@ -139,16 +118,15 @@ d 0555 root sys $SERVERBIN/daemon -
 f 0555 root sys $SERVERBIN/daemon/cups-lpd scheduler/cups-lpd
 f 0555 root sys $SERVERBIN/daemon/cups-polld scheduler/cups-polld
 d 0555 root sys $SERVERBIN/filter -
-f 0555 root sys $SERVERBIN/filter/gziptoany filter/gziptoany
-f 0555 root sys $SERVERBIN/filter/hpgltops filter/hpgltops
-f 0555 root sys $SERVERBIN/filter/imagetops filter/imagetops
-f 0555 root sys $SERVERBIN/filter/imagetoraster filter/imagetoraster
+f 0555 root sys $SERVERBIN/filter/pstoraster pstoraster/pstoraster
 f 0555 root sys $SERVERBIN/filter/pdftops pdftops/pdftops
+f 0555 root sys $SERVERBIN/filter/imagetops filter/imagetops
 f 0555 root sys $SERVERBIN/filter/pstops filter/pstops
-f 0555 root sys $SERVERBIN/filter/rastertodymo filter/rastertodymo
+f 0555 root sys $SERVERBIN/filter/texttops filter/texttops
 f 0555 root sys $SERVERBIN/filter/rastertoepson filter/rastertoepson
 f 0555 root sys $SERVERBIN/filter/rastertohp filter/rastertohp
-f 0555 root sys $SERVERBIN/filter/texttops filter/texttops
+f 0555 root sys $SERVERBIN/filter/hpgltops filter/hpgltops
+f 0555 root sys $SERVERBIN/filter/imagetoraster filter/imagetoraster

 # Admin commands
 l 0555 root sys $BINDIR/disable $SBINDIR/accept
@@ -170,7 +148,6 @@ l 0555 root sys /usr/etc/lpc $SBINDIR/lpc

 # User commands
 f 0555 root sys $BINDIR/cancel systemv/cancel
-f 0555 root sys $BINDIR/cupstestppd systemv/cupstestppd
 f 0555 root sys $BINDIR/lp systemv/lp
 f 0555 root sys $BINDIR/lpoptions systemv/lpoptions
 f 4555 $CUPS_USER sys $BINDIR/lppasswd systemv/lppasswd
@@ -186,7 +163,6 @@ l 0555 root sys /usr/bsd/lprm $BINDIR/lprm
 %system all

 # DSOs
-%if DSOLIBS
 %system hpux
 f 0555 root sys $LIBDIR/libcups.sl.2 cups/libcups.sl.2
 l 0555 root sys $LIBDIR/libcups.sl libcups.sl.2
@@ -195,18 +171,12 @@ l 0555 root sys $LIBDIR/libcupsimage.sl libcupsimage.sl.2
 %system aix
 f 0555 root sys $LIBDIR/libcups_s.a cups/libcups_s.a
 f 0555 root sys $LIBDIR/libcupsimage_s.a filter/libcupsimage_s.a
-%system darwin
-f 0555 root sys $LIBDIR/libcups.2.dylib cups/libcups.2.dylib
-l 0555 root sys $LIBDIR/libcups.dylib libcups.2.dylib
-f 0555 root sys $LIBDIR/libcupsimage.2.dylib filter/libcupsimage.2.dylib
-l 0555 root sys $LIBDIR/libcupsimage.dylib libcupsimage.2.dylib
-%system !hpux !aix !darwin
+%system !hpux !aix
 f 0555 root sys $LIBDIR/libcups.so.2 cups/libcups.so.2
 l 0555 root sys $LIBDIR/libcups.so libcups.so.2
 f 0555 root sys $LIBDIR/libcupsimage.so.2 filter/libcupsimage.so.2
 l 0555 root sys $LIBDIR/libcupsimage.so libcupsimage.so.2
 %system all
-%endif

 # Directories
 d 0755 root sys $LOGDIR -
@@ -215,19 +185,11 @@ d 1700 $CUPS_USER sys $REQUESTS/tmp -

 # Data files
 f 0444 root sys $LOCALEDIR/C/cups_C locale/C/cups_C
-f 0444 root sys $LOCALEDIR/be/cups_be locale/be/cups_be
-f 0444 root sys $LOCALEDIR/cs/cups_cs locale/cs/cups_cs
 f 0444 root sys $LOCALEDIR/de/cups_de locale/de/cups_de
 f 0444 root sys $LOCALEDIR/en/cups_en locale/en/cups_en
-f 0444 root sys $LOCALEDIR/en_US/cups_en_US locale/en_US/cups_en_US
 f 0444 root sys $LOCALEDIR/es/cups_es locale/es/cups_es
 f 0444 root sys $LOCALEDIR/fr/cups_fr locale/fr/cups_fr
 f 0444 root sys $LOCALEDIR/it/cups_it locale/it/cups_it
-f 0444 root sys $LOCALEDIR/ru_RU/cups_ru_RU locale/ru_RU/cups_ru_RU
-f 0444 root sys $LOCALEDIR/sv/cups_sv locale/sv/cups_sv
-f 0444 root sys $LOCALEDIR/uk/cups_uk locale/uk/cups_uk
-f 0444 root sys $LOCALEDIR/uk_UA/cups_uk_UA locale/uk_UA/cups_uk_UA
-f 0444 root sys $LOCALEDIR/zh_CN/cups_zh_CN locale/zh_CN/cups_zh_CN

 d 0555 root sys $DATADIR -

@@ -251,6 +213,8 @@ f 0444 root sys $DATADIR/charsets/windows-1256 data/windows-1256
 f 0444 root sys $DATADIR/charsets/windows-1257 data/windows-1257
 f 0444 root sys $DATADIR/charsets/windows-1258 data/windows-1258
 f 0444 root sys $DATADIR/charsets/iso-8859-1 data/iso-8859-1
+f 0444 root sys $DATADIR/charsets/iso-8859-14 data/iso-8859-14
+f 0444 root sys $DATADIR/charsets/iso-8859-15 data/iso-8859-15
 f 0444 root sys $DATADIR/charsets/iso-8859-2 data/iso-8859-2
 f 0444 root sys $DATADIR/charsets/iso-8859-3 data/iso-8859-3
 f 0444 root sys $DATADIR/charsets/iso-8859-4 data/iso-8859-4
@@ -259,10 +223,6 @@ f 0444 root sys $DATADIR/charsets/iso-8859-6 data/iso-8859-6
 f 0444 root sys $DATADIR/charsets/iso-8859-7 data/iso-8859-7
 f 0444 root sys $DATADIR/charsets/iso-8859-8 data/iso-8859-8
 f 0444 root sys $DATADIR/charsets/iso-8859-9 data/iso-8859-9
-f 0444 root sys $DATADIR/charsets/iso-8859-10 data/iso-8859-10
-f 0444 root sys $DATADIR/charsets/iso-8859-13 data/iso-8859-13
-f 0444 root sys $DATADIR/charsets/iso-8859-14 data/iso-8859-14
-f 0444 root sys $DATADIR/charsets/iso-8859-15 data/iso-8859-15
 f 0444 root sys $DATADIR/charsets/utf-8 data/utf-8

 d 0555 root sys $DATADIR/data -
@@ -271,8 +231,11 @@ f 0444 root sys $DATADIR/data/psglyphs data/psglyphs
 f 0444 root sys $DATADIR/data/testprint.ps data/testprint.ps

 d 0555 root sys $DATADIR/fonts -
-f 0444 root sys $DATADIR/fonts fonts/Courier*
-f 0444 root sys $DATADIR/fonts/Symbol fonts/Symbol
+f 0444 root sys $DATADIR/fonts fonts/*
+
+d 0555 root sys $DATADIR/pstoraster -
+f 0444 root sys $DATADIR/pstoraster/Fontmap pstoraster/Fontmap
+f 0444 root sys $DATADIR/pstoraster pstoraster/gs*.ps

 d 0555 root sys $DATADIR/model -
 f 0444 root sys $DATADIR/model ppd/*.ppd
@@ -280,35 +243,23 @@ f 0444 root sys $DATADIR/model ppd/*.ppd
 d 0555 root sys $DATADIR/templates -
 c 0444 root sys $DATADIR/templates templates/*.tmpl

-d 0555 root sys $DATADIR/templates/de -
-c 0444 root sys $DATADIR/templates/de templates/de/*.tmpl
-
-d 0555 root sys $DATADIR/templates/fr -
-c 0444 root sys $DATADIR/templates/fr templates/fr/*.tmpl
-
 # Config files
 d 0555 root sys $SERVERROOT -
-d 0711 $CUPS_USER $CUPS_GROUP $SERVERROOT/certs -
+d 0711 root sys $SERVERROOT/certs -
 d 0755 root sys $SERVERROOT/interfaces -
 d 0755 root sys $SERVERROOT/ppd -
-c 0600 root sys $SERVERROOT conf/*.conf
-c 0600 root sys $SERVERROOT/mime.convs conf/mime.convs
-c 0600 root sys $SERVERROOT/mime.types conf/mime.types
-
-%if PAMDIR
-d 0555 root sys $PAMDIR -
+c 0644 root sys $SERVERROOT conf/*.conf
+c 0644 root sys $SERVERROOT/mime.convs conf/mime.convs
+c 0644 root sys $SERVERROOT/mime.types conf/mime.types

 %system linux
-# Linux almost always supports PAM...
-c 0644 root sys $PAMDIR/cups conf/pam.conf
-
-%system irix
-# IRIX doesn't normally support PAM, but the freeware project
-# includes a version of PAM that can be used...
-c 0644 root sys $PAMDIR/cups conf/pam.irix
-
+d 0555 root sys $PAMDIR -
+c 0644 root sys $PAMDIR/cups data/cups.pam
+c 0644 root sys $PAMDIR/cups.suse data/cups.suse
+%install if test -f /lib/security/pam_unix.so; then
+%install     mv $PAMDIR/cups.suse $PAMDIR/cups
+%install fi
 %system all
-%endif

 # Developer files
 f 0555 root sys $BINDIR/cups-config cups-config
@@ -323,22 +274,12 @@ f 0444 root sys $INCLUDEDIR/cups/ppd.h cups/ppd.h
 f 0444 root sys $INCLUDEDIR/cups/raster.h filter/raster.h

 f 0444 root sys $LIBDIR/libcups.a cups/libcups.a
-f 0444 root sys $LIBDIR/libcupsimage.a filter/libcupsimage.a

 # Documentation files
 d 0555 root sys $DOCDIR -
-f 0444 root sys $DOCDIR doc/*.css
+f 0444 root sys $DOCDIR/cups.css doc/cups.css
 f 0444 root sys $DOCDIR doc/*.html
 f 0444 root sys $DOCDIR doc/*.pdf
-f 0444 root sys $DOCDIR/robots.txt doc/robots.txt
-d 0555 root sys $DOCDIR/de -
-f 0444 root sys $DOCDIR/de doc/de/*.css
-f 0444 root sys $DOCDIR/de doc/de/*.html
-f 0444 root sys $DOCDIR/de doc/de/*.pdf
-d 0555 root sys $DOCDIR/fr -
-f 0444 root sys $DOCDIR/fr doc/fr/*.css
-f 0444 root sys $DOCDIR/fr doc/fr/*.html
-f 0444 root sys $DOCDIR/fr doc/fr/*.pdf
 d 0555 root sys $DOCDIR/images -
 f 0444 root sys $DOCDIR/images doc/images/*.gif

@@ -348,15 +289,13 @@ d 0555 root sys $AMANDIR/cat$MAN8DIR -
 d 0555 root sys $AMANDIR/man$MAN8DIR -
 d 0555 root sys $MANDIR -
 d 0555 root sys $MANDIR/cat1 -
+d 0555 root sys $PMANDIR/cat3 -
 d 0555 root sys $MANDIR/cat5 -
 d 0555 root sys $MANDIR/man1 -
-d 0555 root sys $MANDIR/man5 -
-d 0555 root sys $PMANDIR -
-d 0555 root sys $PMANDIR/cat3 -
 d 0555 root sys $PMANDIR/man3 -
+d 0555 root sys $MANDIR/man5 -

 f 0444 root sys $MANDIR/cat1/backend.$CAT1EXT man/backend.$CAT1EXT
-f 0444 root sys $MANDIR/cat1/cupstestppd.$CAT1EXT man/cupstestppd.$CAT1EXT
 f 0444 root sys $MANDIR/cat1/filter.$CAT1EXT man/filter.$CAT1EXT
 f 0444 root sys $MANDIR/cat1/lpoptions.$CAT1EXT man/lpoptions.$CAT1EXT
 f 0444 root sys $MANDIR/cat1/lppasswd.$CAT1EXT man/lppasswd.$CAT1EXT
@@ -388,115 +327,38 @@ f 0444 root sys $AMANDIR/cat$MAN8DIR/lpc.$CAT8EXT man/lpc.$CAT8EXT
 f 0444 root sys $AMANDIR/cat$MAN8DIR/lpinfo.$CAT8EXT man/lpinfo.$CAT8EXT
 f 0444 root sys $AMANDIR/cat$MAN8DIR/lpmove.$CAT8EXT man/lpmove.$CAT8EXT

-f 0444 root sys $MANDIR/man1/backend.1 man/backend.man
-f 0444 root sys $MANDIR/man1/cupstestppd.1 man/cupstestppd.man
-f 0444 root sys $MANDIR/man1/filter.1 man/filter.man
-f 0444 root sys $MANDIR/man1/lpoptions.1 man/lpoptions.man
-f 0444 root sys $MANDIR/man1/lppasswd.1 man/lppasswd.man
-f 0444 root sys $MANDIR/man1/lpq.1 man/lpq.man
-f 0444 root sys $MANDIR/man1/lprm.1 man/lprm.man
-f 0444 root sys $MANDIR/man1/lpr.1 man/lpr.man
-f 0444 root sys $MANDIR/man1/lpstat.1 man/lpstat.man
-f 0444 root sys $MANDIR/man1/lp.1 man/lp.man
-l 0444 root sys $MANDIR/man1/cancel.1 lp.1
+f 0444 root sys $MANDIR/man1/backend.$MAN1EXT man/backend.man
+f 0444 root sys $MANDIR/man1/filter.$MAN1EXT man/filter.man
+f 0444 root sys $MANDIR/man1/lpoptions.$MAN1EXT man/lpoptions.man
+f 0444 root sys $MANDIR/man1/lppasswd.$MAN1EXT man/lppasswd.man
+f 0444 root sys $MANDIR/man1/lpq.$MAN1EXT man/lpq.man
+f 0444 root sys $MANDIR/man1/lprm.$MAN1EXT man/lprm.man
+f 0444 root sys $MANDIR/man1/lpr.$MAN1EXT man/lpr.man
+f 0444 root sys $MANDIR/man1/lpstat.$MAN1EXT man/lpstat.man
+f 0444 root sys $MANDIR/man1/lp.$MAN1EXT man/lp.man
+l 0444 root sys $MANDIR/man1/cancel.$MAN1EXT lp.man

-f 0444 root sys $PMANDIR/man3/cups-config.3 man/cups-config.man
+f 0444 root sys $PMANDIR/man3/cups-config.$MAN3EXT man/cups-config.man

-f 0444 root sys $MANDIR/man5/classes.conf.5 man/classes.conf.man
-f 0444 root sys $MANDIR/man5/cupsd.conf.5 man/cupsd.conf.man
-f 0444 root sys $MANDIR/man5/mime.convs.5 man/mime.convs.man
-f 0444 root sys $MANDIR/man5/mime.types.5 man/mime.types.man
-f 0444 root sys $MANDIR/man5/printers.conf.5 man/printers.conf.man
+f 0444 root sys $MANDIR/man5/classes.conf.$MAN5EXT man/classes.conf.man
+f 0444 root sys $MANDIR/man5/cupsd.conf.$MAN5EXT man/cupsd.conf.man
+f 0444 root sys $MANDIR/man5/mime.convs.$MAN5EXT man/mime.convs.man
+f 0444 root sys $MANDIR/man5/mime.types.$MAN5EXT man/mime.types.man
+f 0444 root sys $MANDIR/man5/printers.conf.$MAN5EXT man/printers.conf.man

 f 0444 root sys $AMANDIR/man$MAN8DIR/accept.$MAN8EXT man/accept.man
-l 0444 root sys $AMANDIR/man$MAN8DIR/reject.$MAN8EXT accept.$MAN8EXT
+l 0444 root sys $AMANDIR/man$MAN8DIR/reject.$MAN8EXT accept.man
 f 0444 root sys $AMANDIR/man$MAN8DIR/cupsaddsmb.$MAN8EXT man/cupsaddsmb.man
 f 0444 root sys $AMANDIR/man$MAN8DIR/cups-lpd.$MAN8EXT man/cups-lpd.man
 f 0444 root sys $AMANDIR/man$MAN8DIR/cups-polld.$MAN8EXT man/cups-polld.man
 f 0444 root sys $AMANDIR/man$MAN8DIR/cupsd.$MAN8EXT man/cupsd.man
 f 0444 root sys $AMANDIR/man$MAN8DIR/enable.$MAN8EXT man/enable.man
-l 0444 root sys $AMANDIR/man$MAN8DIR/disable.$MAN8EXT enable.$MAN8EXT
+l 0444 root sys $AMANDIR/man$MAN8DIR/disable.$MAN8EXT enable.man
 f 0444 root sys $AMANDIR/man$MAN8DIR/lpadmin.$MAN8EXT man/lpadmin.man
 f 0444 root sys $AMANDIR/man$MAN8DIR/lpc.$MAN8EXT man/lpc.man
 f 0444 root sys $AMANDIR/man$MAN8DIR/lpinfo.$MAN8EXT man/lpinfo.man
 f 0444 root sys $AMANDIR/man$MAN8DIR/lpmove.$MAN8EXT man/lpmove.man

-d 0555 root sys $AMANDIR/fr -
-d 0555 root sys $AMANDIR/fr/cat$MAN8DIR -
-d 0555 root sys $AMANDIR/fr/man$MAN8DIR -
-d 0555 root sys $MANDIR/fr -
-d 0555 root sys $MANDIR/fr/cat1 -
-d 0555 root sys $MANDIR/fr/cat5 -
-d 0555 root sys $MANDIR/fr/man1 -
-d 0555 root sys $MANDIR/fr/man5 -
-d 0555 root sys $PMANDIR/fr -
-d 0555 root sys $PMANDIR/fr/cat3 -
-d 0555 root sys $PMANDIR/fr/man3 -
-
-f 0444 root sys $MANDIR/fr/cat1/backend.$CAT1EXT man/backend.$CAT1EXT
-f 0444 root sys $MANDIR/fr/cat1/filter.$CAT1EXT man/filter.$CAT1EXT
-f 0444 root sys $MANDIR/fr/cat1/lpoptions.$CAT1EXT man/lpoptions.$CAT1EXT
-f 0444 root sys $MANDIR/fr/cat1/lppasswd.$CAT1EXT man/lppasswd.$CAT1EXT
-f 0444 root sys $MANDIR/fr/cat1/lpq.$CAT1EXT man/lpq.$CAT1EXT
-f 0444 root sys $MANDIR/fr/cat1/lprm.$CAT1EXT man/lprm.$CAT1EXT
-f 0444 root sys $MANDIR/fr/cat1/lpr.$CAT1EXT man/lpr.$CAT1EXT
-f 0444 root sys $MANDIR/fr/cat1/lpstat.$CAT1EXT man/lpstat.$CAT1EXT
-f 0444 root sys $MANDIR/fr/cat1/lp.$CAT1EXT man/lp.$CAT1EXT
-l 0444 root sys $MANDIR/fr/cat1/cancel.$CAT1EXT lp.$CAT1EXT
-
-f 0444 root sys $PMANDIR/fr/cat3/cups-config.$CAT3EXT man/cups-config.$CAT3EXT
-
-f 0444 root sys $MANDIR/fr/cat5/classes.conf.$CAT5EXT man/classes.conf.$CAT5EXT
-f 0444 root sys $MANDIR/fr/cat5/cupsd.conf.$CAT5EXT man/cupsd.conf.$CAT5EXT
-f 0444 root sys $MANDIR/fr/cat5/mime.convs.$CAT5EXT man/mime.convs.$CAT5EXT
-f 0444 root sys $MANDIR/fr/cat5/mime.types.$CAT5EXT man/mime.types.$CAT5EXT
-f 0444 root sys $MANDIR/fr/cat5/printers.conf.$CAT5EXT man/printers.conf.$CAT5EXT
-
-f 0444 root sys $AMANDIR/fr/cat$MAN8DIR/accept.$CAT8EXT man/accept.$CAT8EXT
-l 0444 root sys $AMANDIR/fr/cat$MAN8DIR/reject.$CAT8EXT accept.$CAT8EXT
-f 0444 root sys $AMANDIR/fr/cat$MAN8DIR/cupsaddsmb.$CAT8EXT man/cupsaddsmb.$CAT8EXT
-f 0444 root sys $AMANDIR/fr/cat$MAN8DIR/cups-lpd.$CAT8EXT man/cups-lpd.$CAT8EXT
-f 0444 root sys $AMANDIR/fr/cat$MAN8DIR/cups-polld.$CAT8EXT man/cups-polld.$CAT8EXT
-f 0444 root sys $AMANDIR/fr/cat$MAN8DIR/cupsd.$CAT8EXT man/cupsd.$CAT8EXT
-f 0444 root sys $AMANDIR/fr/cat$MAN8DIR/enable.$CAT8EXT man/enable.$CAT8EXT
-l 0444 root sys $AMANDIR/fr/cat$MAN8DIR/disable.$CAT8EXT enable.$CAT8EXT
-f 0444 root sys $AMANDIR/fr/cat$MAN8DIR/lpadmin.$CAT8EXT man/lpadmin.$CAT8EXT
-f 0444 root sys $AMANDIR/fr/cat$MAN8DIR/lpc.$CAT8EXT man/lpc.$CAT8EXT
-f 0444 root sys $AMANDIR/fr/cat$MAN8DIR/lpinfo.$CAT8EXT man/lpinfo.$CAT8EXT
-f 0444 root sys $AMANDIR/fr/cat$MAN8DIR/lpmove.$CAT8EXT man/lpmove.$CAT8EXT
-
-f 0444 root sys $MANDIR/fr/man1/backend.1 man/backend.man
-f 0444 root sys $MANDIR/fr/man1/filter.1 man/filter.man
-f 0444 root sys $MANDIR/fr/man1/lpoptions.1 man/lpoptions.man
-f 0444 root sys $MANDIR/fr/man1/lppasswd.1 man/lppasswd.man
-f 0444 root sys $MANDIR/fr/man1/lpq.1 man/lpq.man
-f 0444 root sys $MANDIR/fr/man1/lprm.1 man/lprm.man
-f 0444 root sys $MANDIR/fr/man1/lpr.1 man/lpr.man
-f 0444 root sys $MANDIR/fr/man1/lpstat.1 man/lpstat.man
-f 0444 root sys $MANDIR/fr/man1/lp.1 man/lp.man
-l 0444 root sys $MANDIR/fr/man1/cancel.1 lp.1
-
-f 0444 root sys $PMANDIR/fr/man3/cups-config.3 man/cups-config.man
-
-f 0444 root sys $MANDIR/fr/man5/classes.conf.5 man/classes.conf.man
-f 0444 root sys $MANDIR/fr/man5/cupsd.conf.5 man/cupsd.conf.man
-f 0444 root sys $MANDIR/fr/man5/mime.convs.5 man/mime.convs.man
-f 0444 root sys $MANDIR/fr/man5/mime.types.5 man/mime.types.man
-f 0444 root sys $MANDIR/fr/man5/printers.conf.5 man/printers.conf.man
-
-f 0444 root sys $AMANDIR/fr/man$MAN8DIR/accept.$MAN8EXT man/accept.man
-l 0444 root sys $AMANDIR/fr/man$MAN8DIR/reject.$MAN8EXT accept.$MAN8EXT
-f 0444 root sys $AMANDIR/fr/man$MAN8DIR/cupsaddsmb.$MAN8EXT man/cupsaddsmb.man
-f 0444 root sys $AMANDIR/fr/man$MAN8DIR/cups-lpd.$MAN8EXT man/cups-lpd.man
-f 0444 root sys $AMANDIR/fr/man$MAN8DIR/cups-polld.$MAN8EXT man/cups-polld.man
-f 0444 root sys $AMANDIR/fr/man$MAN8DIR/cupsd.$MAN8EXT man/cupsd.man
-f 0444 root sys $AMANDIR/fr/man$MAN8DIR/enable.$MAN8EXT man/enable.man
-l 0444 root sys $AMANDIR/fr/man$MAN8DIR/disable.$MAN8EXT enable.$MAN8EXT
-f 0444 root sys $AMANDIR/fr/man$MAN8DIR/lpadmin.$MAN8EXT man/lpadmin.man
-f 0444 root sys $AMANDIR/fr/man$MAN8DIR/lpc.$MAN8EXT man/lpc.man
-f 0444 root sys $AMANDIR/fr/man$MAN8DIR/lpinfo.$MAN8EXT man/lpinfo.man
-f 0444 root sys $AMANDIR/fr/man$MAN8DIR/lpmove.$MAN8EXT man/lpmove.man
-
 # Startup script
 %system all
 i 0555 root sys cups cups.sh
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-##
-# PrintingServices - a.k.a. CUPS
-##
-
-. /etc/rc.common
-
-StartService ()
-{
-	if [ "${CUPS:=-YES-}" = "-YES-" ]; then
-		ConsoleMessage "Starting printing services"
-		/usr/sbin/cupsd
-    fi
-}
-
-StopService ()
-{
-	# Until cupsd has a pid file...
-	pid=`ps ax | awk '{if (match($5, ".*/cupsd$") || $5 == "cupsd") print $1}'`
-	if test "$pid" != ""; then
-		ConsoleMessage "Stopping printing services"
-		kill "${pid}"
-    fi
-}
-
-RestartService ()
-{
-	# Until cupsd has a pid file...
-	pid=`ps ax | awk '{if (match($5, ".*/cupsd$") || $5 == "cupsd") print $1}'`
-	if test "x$pid" != x; then
-		ConsoleMessage "Restarting printing services"
-		kill -HUP "${pid}"
-	else
-		StartService
-	fi
-}
-
-RunService "$1"
@@ -1,7 +1,11 @@
 {
-  Description     = "Printing Services";
-  Provides        = ("PrintingServices");
+  Description     = "CUPS Printing";
+  Provides        = ("CUPS");
  Requires        = ("Resolver");
-  Uses            = ("Network Time");
-  OrderPreference = "Late";
+  OrderPreference = "None";
+  Messages =
+  {
+    start = "Starting CUPS";
+    stop  = "Stopping CUPS";
+  };
 }
@@ -4,7 +4,7 @@
 #
 #   Startup/shutdown script for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2001 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
@@ -47,21 +47,10 @@
 case "`uname`" in
 	IRIX*)
 		IS_ON=/sbin/chkconfig
-
-		if $IS_ON verbose; then
-			ECHO=echo
-		else
-			ECHO=:
-		fi
-		ECHO_OK=:
-		ECHO_ERROR=:
 		;;

-	*BSD*)
+	NetBSD*)
        	IS_ON=:
-		ECHO=echo
-		ECHO_OK=:
-		ECHO_ERROR=:
 		;;

 	Darwin*)
@@ -72,59 +61,29 @@ case "`uname`" in
 		fi

        	IS_ON=:
-		ECHO=ConsoleMessage
-		ECHO_OK=:
-		ECHO_ERROR=:
-		;;
-
-	Linux*)
-		IS_ON=/bin/true
-		if test -f /etc/init.d/functions; then
-			. /etc/init.d/functions
-			ECHO=echo
-			ECHO_OK="echo_success"
-			ECHO_ERROR="echo_failure"
-		else
-			ECHO=echo
-			ECHO_OK=:
-			ECHO_ERROR=:
-		fi
 		;;

 	*)
 		IS_ON=/bin/true
-		ECHO=echo
-		ECHO_OK=:
-		ECHO_ERROR=:
 		;;
 esac

 #### OS-Independent Stuff

 #
-# Set the timezone, if possible...  This allows the
-# scheduler and all child processes to know the local
-# timezone when reporting dates and times to the user. 
-# If no timezone information is found, then Greenwich
-# Mean Time (GMT) will probably be used.
+# The verbose flag controls the printing of the names of
+# daemons as they are started.  Currently always echos for
+# all but IRIX, which can configure verbose bootup messages.
 #

-for file in /etc/TIMEZONE /etc/rc.config /etc/sysconfig/clock; do
-	if test -f $file; then
-	        . $file
+if test "`uname`" = "Darwin"; then
+	ECHO=ConsoleMessage
+else
+	if $IS_ON verbose; then
+		ECHO=echo
+	else
+		ECHO=:
 	fi
-done
-
-if test "x$ZONE" != x; then
-	TZ="$ZONE"
-fi
-
-if test "x$TIMEZONE" != x; then
-	TZ="$TIMEZONE"
-fi
-
-if test "x$TZ" != x; then
-	export TZ
 fi

 #
@@ -132,10 +91,10 @@ fi
 #

 case "`uname`" in
-	HP-UX* | AIX* | SINIX*)
+	IRIX* | HP-UX* | AIX* | SINIX*)
 		pid=`ps -e | awk '{if (match($4, ".*/cupsd$") || $4 == "cupsd") print $1}'`
 		;;
-	IRIX* | SunOS*)
+	SunOS*)
 		pid=`ps -e | nawk '{if (match($4, ".*/cupsd$") || $4 == "cupsd") print $1}'`
 		;;
 	UnixWare*)
@@ -145,7 +104,7 @@ case "`uname`" in
 	OSF1*)
 		pid=`ps -e | awk '{if (match($5, ".*/cupsd$") || $5 == "cupsd") print $1}'`
 		;;
-	Linux* | *BSD* | Darwin*)
+	Linux* | NetBSD* | Darwin*)
 		pid=`ps ax | awk '{if (match($5, ".*/cupsd$") || $5 == "cupsd") print $1}'`
 		;;
 	*)
@@ -166,30 +125,25 @@ case $1 in
 				prefix=@prefix@
 				exec_prefix=@exec_prefix@
 				@sbindir@/cupsd
-				if test $? != 0; then
-					$ECHO_FAIL
-					$ECHO "cups: unable to $1 scheduler."
-					exit 1
-				fi
 			fi
-			$ECHO_OK
-			$ECHO "cups: ${1}ed scheduler."
+			$ECHO "cups: scheduler ${1}ed."
+		else
+			$ECHO "cups: scheduler stopped."
 		fi
 		;;

 	stop)
 		if test "$pid" != ""; then
 			kill $pid
-			$ECHO_OK
-			$ECHO "cups: stopped scheduler."
+			$ECHO "cups: scheduler stopped."
 		fi
 		;;

 	status)
 		if test "$pid" != ""; then
-			echo "cups: scheduler is running."
+			echo "cups: Scheduler is running."
 		else
-			echo "cups: scheduler is not running."
+			echo "cups: Scheduler is not running."
 		fi
 		;;

@@ -1,11 +1,11 @@
 #
-# "$Id: cups.spec 3996 2003-11-07 21:41:38Z mike $"
+# "$Id: cups.spec 1949 2001-11-13 19:34:47Z mike $"
 #
 #   RPM "spec" file for the Common UNIX Printing System (CUPS).
 #
 #   Original version by Jason McMullan <jmcc@ontv.com>.
 #
-#   Copyright 1999-2003 by Easy Software Products, all rights reserved.
+#   Copyright 1999-2001 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
@@ -26,13 +26,13 @@

 Summary: Common Unix Printing System
 Name: cups
-Version: 1.1.20
-Release: 1
+Version: 1.1.12
+Release: 0
 Copyright: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.gz
 Url: http://www.cups.org
-Packager: Anonymous <anonymous@foo.com>
+Packager: Michael Sweet <mike@easysw.com>
 Vendor: Easy Software Products

 # Use buildroot so as not to disturb the version already installed
@@ -42,16 +42,18 @@ BuildRoot: /var/tmp/%{name}-root
 Conflicts: lpr, LPRng
 Provides: libcups.so.2
 Provides: libcupsimage.so.2
+Provides: cups

 %package devel
 Summary: Common Unix Printing System - development environment
 Group: Development/Libraries
-
-%package libs
-Summary: Common Unix Printing System - shared libraries
-Group: System Environment/Libraries
 Provides: libcups1

+%package pstoraster
+Summary: Common Unix Printing System - PostScript RIP
+Group: System Environment/Daemons
+Provides: pstoraster
+
 %description
 The Common UNIX Printing System provides a portable printing layer for 
 UNIX® operating systems. It has been developed by Easy Software Products 
@@ -63,9 +65,10 @@ The Common UNIX Printing System provides a portable printing layer for
 UNIX® operating systems. This is the development package for creating
 additional printer drivers and other CUPS services.

-%description libs
+%description pstoraster
 The Common UNIX Printing System provides a portable printing layer for 
-UNIX® operating systems. This package contains the CUPS shared libraries.
+UNIX® operating systems. This is the PostScript RIP package for
+supporting non-PostScript printer drivers.

 %prep
 %setup
@@ -83,8 +86,6 @@ rm -rf $RPM_BUILD_ROOT
 make BUILDROOT=$RPM_BUILD_ROOT install

 %post
-ldconfig
-
 if test -x /sbin/chkconfig; then
 	/sbin/chkconfig --add cups
 	/sbin/chkconfig cups on
@@ -135,41 +136,58 @@ rm -rf $RPM_BUILD_ROOT
 # RC dirs are a pain under Linux...  Uncomment the appropriate ones if you
 # don't use Red Hat or Mandrake...

-# OLD RedHat/Mandrake
 /etc/rc.d/init.d/*
 /etc/rc.d/rc0.d/*
-/etc/rc.d/rc2.d/*
 /etc/rc.d/rc3.d/*
 /etc/rc.d/rc5.d/*

-#/sbin/rc.d/*
-#/sbin/rc.d/rc0.d/*
-#/sbin/rc.d/rc2.d/*
-#/sbin/rc.d/rc3.d/*
-#/sbin/rc.d/rc5.d/*
-
-# NEW RedHat/Mandrake
 #/etc/init.d/*
 #/etc/rc0.d/*
-#/etc/rc2.d/*
 #/etc/rc3.d/*
 #/etc/rc5.d/*

+#/sbin/rc.d/*
+#/sbin/rc.d/rc0.d/*
+#/sbin/rc.d/rc3.d/*
+#/sbin/rc.d/rc5.d/*
+
 /usr/bin/cancel
-/usr/bin/cupstestppd
 /usr/bin/disable
 /usr/bin/enable
 /usr/bin/lp*
+/usr/lib/*.so*
 %dir /usr/lib/cups
-/usr/lib/cups/*
+%dir /usr/lib/cups/backend
+/usr/lib/cups/backend/*
+%dir /usr/lib/cups/cgi-bin
+/usr/lib/cups/cgi-bin/*
+%dir /usr/lib/cups/daemon
+/usr/lib/cups/daemon/*
+%dir /usr/lib/cups/filter
+/usr/lib/cups/filter/hpgltops
+/usr/lib/cups/filter/imagetops
+/usr/lib/cups/filter/imagetoraster
+/usr/lib/cups/filter/pdftops
+/usr/lib/cups/filter/pstops
+/usr/lib/cups/filter/rastertoepson
+/usr/lib/cups/filter/rastertohp
+/usr/lib/cups/filter/texttops
 /usr/sbin/*
 %dir /usr/share/cups
-/usr/share/cups/*
+%dir /usr/share/cups/banners
+/usr/share/cups/banners/*
+%dir /usr/share/cups/charsets
+/usr/share/cups/charsets/*
+%dir /usr/share/cups/data
+/usr/share/cups/data/*
+%dir /usr/share/cups/model
+/usr/share/cups/model/*
+%dir /usr/share/cups/templates
+/usr/share/cups/templates/*
 %dir /usr/share/doc/cups
 /usr/share/doc/cups/*
 %dir /usr/share/locale
 /usr/share/locale/*
-
 %dir /usr/share/man/cat1
 /usr/share/man/cat1/*
 %dir /usr/share/man/cat5
@@ -183,41 +201,26 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/share/man/man8
 /usr/share/man/man8/*

-%dir /usr/share/man/fr/cat1
-/usr/share/man/fr/cat1/*
-%dir /usr/share/man/fr/cat5
-/usr/share/man/fr/cat5/*
-%dir /usr/share/man/fr/cat8
-/usr/share/man/fr/cat8/*
-%dir /usr/share/man/fr/man1
-/usr/share/man/fr/man1/*
-%dir /usr/share/man/fr/man5
-/usr/share/man/fr/man5/*
-%dir /usr/share/man/fr/man8
-/usr/share/man/fr/man8/*
-
 %attr(0700,lp,root) %dir /var/spool/cups
 %attr(1700,lp,root) %dir /var/spool/cups/tmp

 %files devel
-/usr/bin/cups-config
 %dir /usr/include/cups
 /usr/include/cups/*
 /usr/lib/*.a
-
 %dir /usr/share/man/cat3
 /usr/share/man/cat3/*
 %dir /usr/share/man/man3
-/usr/share/man/man3/*
+/usr/share/man/man1/*

-%dir /usr/share/man/fr/cat3
-/usr/share/man/fr/cat3/*
-%dir /usr/share/man/fr/man3
-/usr/share/man/fr/man3/*
-
-%files libs
-/usr/lib/*.so*
+%files pstoraster
+%dir /usr/lib/cups/filter
+/usr/lib/cups/filter/pstoraster
+%dir /usr/share/cups/fonts
+/usr/share/cups/fonts/*
+%dir /usr/share/cups/pstoraster
+/usr/share/cups/pstoraster/*

 #
-# End of "$Id: cups.spec 3996 2003-11-07 21:41:38Z mike $".
+# End of "$Id: cups.spec 1949 2001-11-13 19:34:47Z mike $".
 #
@@ -2,8 +2,8 @@
 <!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
 <plist version="0.9">
 <dict>
-	<key>Starting printing services</key>
-	<string>Starting printing services</string>
+	<key>Starting CUPS</key>
+	<string>Starting CUPS</string>
 </dict>
 </plist>

@@ -1,13 +1,4 @@
 libcups.a
-libcups.la
-libcups.sl
 libcups.sl.2
-libcups.so
 libcups.so.2
 libcups_s.a
-libcups.2.dylib
-libcups.dylib
-testhttp
-testipp
-testlang
-testppd
@@ -1,31 +0,0 @@
-# DO NOT DELETE
-
-attr.o: ppd.h debug.h string.h ../config.h
-auth.o: cups.h ipp.h http.h string.h ../config.h md5.h ppd.h language.h
-auth.o: debug.h
-dest.o: cups.h ipp.h http.h string.h ../config.h md5.h ppd.h language.h
-emit.o: ppd.h string.h ../config.h
-encode.o: cups.h ipp.h http.h string.h ../config.h md5.h ppd.h debug.h
-getputfile.o: cups.h ipp.h http.h string.h ../config.h md5.h ppd.h language.h
-getputfile.o: debug.h
-http.o: http-private.h ../config.h http.h string.h md5.h debug.h
-http-addr.o: string.h ../config.h http.h md5.h
-http-support.o: string.h ../config.h http.h md5.h ipp.h
-ipp.o: string.h ../config.h ipp.h http.h md5.h debug.h
-ipp-support.o: string.h ../config.h language.h ipp.h http.h md5.h debug.h
-language.o: string.h ../config.h language.h debug.h cups_C.h
-mark.o: ppd.h string.h ../config.h debug.h
-md5.o: md5.h string.h ../config.h
-md5passwd.o: http.h string.h ../config.h md5.h
-options.o: cups.h ipp.h http.h string.h ../config.h md5.h ppd.h debug.h
-page.o: ppd.h string.h ../config.h
-ppd.o: ppd.h string.h ../config.h language.h debug.h
-snprintf.o: string.h ../config.h
-string.o: string.h ../config.h
-tempfile.o: cups.h ipp.h http.h string.h ../config.h md5.h ppd.h debug.h
-usersys.o: cups.h ipp.h http.h string.h ../config.h md5.h ppd.h
-util.o: cups.h ipp.h http.h string.h ../config.h md5.h ppd.h language.h
-util.o: debug.h
-testhttp.o: http.h string.h ../config.h md5.h
-testipp.o: ../cups/string.h ../config.h string.h ipp.h http.h md5.h
-testlang.o: language.h
@@ -3,7 +3,7 @@
 #
 #   Support library Makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2001 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
@@ -21,8 +21,6 @@
 #       EMail: cups-info@cups.org
 #         WWW: http://www.cups.org
 #
-#   This file is subject to the Apple OS-Developed Software exception.
-#

 include ../Makedefs

@@ -30,11 +28,10 @@ include ../Makedefs
 # Object files...
 #

-LIBOBJS	=	attr.o auth.o dest.o emit.o encode.o getputfile.o \
-		http.o http-addr.o http-support.o ipp.o ipp-support.o \
-		language.o mark.o md5.o md5passwd.o options.o page.o \
-		ppd.o snprintf.o string.o tempfile.o usersys.o util.o
-OBJS	=	$(LIBOBJS) testhttp.o testipp.o testlang.o
+LIBOBJS	=	dest.o emit.o encode.o http.o ipp.o language.o mark.o md5.o \
+		md5passwd.o options.o page.o ppd.o snprintf.o string.o \
+		tempfile.o usersys.o util.o
+OBJS	=	$(LIBOBJS) testhttp.o testppd.o ppd-debug.o


 #
@@ -48,8 +45,7 @@ HEADERS	=	cups.h http.h ipp.h language.h md5.h ppd.h
 # Targets in this directory...
 #

-TARGETS	=	$(LIBCUPS) libcups.a \
-		testhttp testipp testlang
+TARGETS	=	$(LIBCUPS) libcups.a


 #
@@ -64,43 +60,33 @@ all:	$(TARGETS)
 #

 clean:
-	$(RM) $(OBJS) $(TARGETS) `basename $(LIBCUPS) .2` libcups.dylib
-
-
-#
-# Update dependencies (without system header dependencies...)
-#
-
-depend:
-	makedepend -Y -I.. -fDependencies $(OBJS:.o=.c) >/dev/null 2>&1
+	$(RM) $(OBJS) $(TARGETS) `basename $(LIBCUPS) .2`


 #
 # Install object and target files...
 #

-install:	all	installhdrs
-	$(INSTALL_DIR) $(LIBDIR)
-	$(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
-	if test $(LIBCUPS) = "libcups.so.2" -o $(LIBCUPS) = "libcups.sl.2"; then \
-		$(RM) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
-		$(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
-	fi
-	if test $(LIBCUPS) = "libcups.2.dylib"; then \
-		$(STRIP) -x $(LIBDIR)/$(LIBCUPS); \
-		$(RM) $(LIBDIR)/libcups.dylib; \
-		$(LN) $(LIBCUPS) $(LIBDIR)/libcups.dylib; \
-	fi
-	if test $(LIBCUPS) != "libcups.a"; then \
-		$(INSTALL_LIB) libcups.a $(LIBDIR); \
-	fi
-	$(RANLIB) $(LIBDIR)/libcups.a
-
-installhdrs:
+install:	all
 	$(INSTALL_DIR) $(INCLUDEDIR)/cups
 	for file in $(HEADERS); do \
 		$(INSTALL_DATA) $$file $(INCLUDEDIR)/cups; \
 	done
+	$(INSTALL_DIR) $(LIBDIR)
+	$(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
+	if test $(LIBCUPS) = "libcups.so.2" -o $(LIBCUPS) = "libcups.sl.2"; then \
+		$(INSTALL_LIB) libcups.a $(LIBDIR); \
+		$(RM) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
+		$(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
+	fi
+	if test $(LIBCUPS) = "libcups.2.dylib"; then \
+		$(INSTALL_LIB) libcups.a $(LIBDIR); \
+		$(RM) $(LIBDIR)/libcups.dylib; \
+		$(LN) $(LIBCUPS) $(LIBDIR)/libcups.dylib; \
+	fi
+	if test $(LIBCUPS) = "libcups_s.a"; then \
+		$(INSTALL_LIB) libcups.a $(LIBDIR); \
+	fi


 #
@@ -109,7 +95,7 @@ installhdrs:

 libcups.so.2 libcups.sl.2:	$(LIBOBJS) ../Makedefs
 	echo Linking $@...
-	$(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS)
+	$(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS) $(SSLLIBS)
 	$(RM) `basename $@ .2`
 	$(LN) $@ `basename $@ .2`

@@ -120,11 +106,7 @@ libcups.so.2 libcups.sl.2:	$(LIBOBJS) ../Makedefs

 libcups.2.dylib:	$(LIBOBJS) ../Makedefs
 	echo Linking $@...
-	$(DSO) $(DSOFLAGS) -o $@ \
-		-install_name $(libdir)/$@ \
-		-current_version 2.5.0 \
-		-compatibility_version 2.0.0 \
-		$(LIBOBJS) $(SSLLIBS) $(COMMONLIBS)
+	$(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS) $(SSLLIBS)
 	$(RM) libcups.dylib
 	$(LN) $@ libcups.dylib

@@ -137,7 +119,7 @@ libcups_s.a:	$(LIBOBJS) ../Makedefs
 	echo Creating $@...
 	$(RM) libcups_s.exp
 	(echo _ipp_add_attr; echo _ipp_free_attr) >libcups_s.exp
-	$(DSO) $(DSOFLAGS) -Wl,-bexport:libcups_s.exp -o libcups_s.o $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS) -lm
+	$(DSO) $(DSOFLAGS) -Wl,-bexport:libcups_s.exp -o libcups_s.o $(LIBOBJS) $(SSLLIBS) -lm
 	$(RM) $@
 	$(AR) $(ARFLAGS) $@ libcups_s.o

@@ -149,7 +131,7 @@ libcups_s.a:	$(LIBOBJS) ../Makedefs
 libcups.la:    $(LIBOBJS) ../Makedefs
 	echo Linking $@...
 	$(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
-		-version-info 2:5 $(SSLLIBS) $(COMMONLIBS)
+		-version-info 2:4 $(SSLLIBS)


 #
@@ -172,6 +154,23 @@ cups_C.h:	../locale/C/cups_C
 	$(RM) cups_C.h
 	$(AWK) '{print "\"" $$0 "\","}' < ../locale/C/cups_C > cups_C.h

+dest.o:		cups.h http.h ipp.h language.h string.h
+emit.o:		ppd.h
+encode.o:	cups.h ipp.h string.h
+http.o:		http.h ipp.h md5.h string.h
+ipp.o:		http.h ipp.h string.h language.h
+language.o:	cups_C.h language.h string.h
+mark.o:		ppd.h
+md5.o:		md5.h
+options.o:	cups.h
+page.o:		ppd.h
+ppd.o:		language.h ppd.h
+snprintf.o:	string.h
+string.o:	string.h
+tempfile.o:	cups.h string.h
+usersys.o:	cups.h
+util.o:		cups.h http.h ipp.h
+

 #
 # testhttp (dependency on static CUPS library is intentional)
@@ -179,32 +178,25 @@ cups_C.h:	../locale/C/cups_C

 testhttp:	testhttp.o libcups.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testhttp.o libcups.a $(NETLIBS) $(SSLLIBS) $(COMMONLIBS)
+	$(CC) $(LDFLAGS) -o $@ testhttp.o libcups.a $(NETLIBS) $(SSLLIBS)
+
+testhttp.o:	http.h


 #
-# testipp (dependency on static CUPS library is intentional)
+# testppd
 #

-testipp:	testipp.o libcups.a
+testppd:	testppd.o ppd-debug.o language.o mark.o page.o
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testipp.o libcups.a $(NETLIBS) $(SSLLIBS) $(COMMONLIBS)
+	$(CC) $(LDFLAGS) -o $@ testppd.o ppd-debug.o language.o mark.o page.o

+testppd.o:	ppd.h
+ppd-debug.o:	ppd.c language.h ppd.h
+	echo Compiling $< with debugging...
+	$(CC) $(OPTIM) $(CFLAGS) -DDEBUG -c -o $@ $<

-#
-# testlang (dependency on static CUPS library is intentional)
-#
-
-testlang:	testlang.o libcups.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testlang.o libcups.a $(NETLIBS) $(SSLLIBS) $(COMMONLIBS)
-
-
-#
-# Dependencies...
-#
-
-include Dependencies
+$(OBJS):	../Makedefs ../config.h


 #
@@ -1,180 +0,0 @@
-/*
- * "$Id$"
- *
- *   PPD model-specific attribute routines for the Common UNIX Printing System
- *   (CUPS).
- *
- *   Copyright 1997-2003 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- * Contents:
- *
- *   ppdFindAttr()     - Find the first matching attribute...
- *   ppdFindNextAttr() - Find the next matching attribute...
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "ppd.h"
-#include "debug.h"
-#include "string.h"
-#include <stdlib.h>
-
-
-/*
- * Private function...
- */
-
-extern int	_ppd_attr_compare(ppd_attr_t **a, ppd_attr_t **b);
-
-
-/*
- * 'ppdFindAttr()' - Find the first matching attribute...
- */
-
-ppd_attr_t *			/* O - Attribute or NULL if not found */
-ppdFindAttr(ppd_file_t *ppd,	/* I - PPD file data */
-            const char *name,	/* I - Attribute name */
-            const char *spec)	/* I - Specifier string or NULL */
-{
-  ppd_attr_t	key,		/* Search key */
-		*keyptr,	/* Pointer to key */
-		**match;	/* Matching attribute */
-
-
- /*
-  * Range check input...
-  */
-
-  if (ppd == NULL || name == NULL || ppd->num_attrs == 0)
-    return (NULL);
-
- /*
-  * Do a binary search for a matching attribute...
-  */
-
-  memset(&key, 0, sizeof(key));
-  strncpy(key.name, name, sizeof(key.name) - 1);
-  if (spec)
-    strncpy(key.spec, spec, sizeof(key.spec) - 1);
-
-  keyptr = &key;
-
-  match = bsearch(&keyptr, ppd->attrs, ppd->num_attrs, sizeof(ppd_attr_t *),
-                  (int (*)(const void *, const void *))_ppd_attr_compare);
-
-  if (match == NULL)
-  {
-   /* 
-    * No match!
-    */
-
-    ppd->cur_attr = -1;
-    return (NULL);
-  }
-
-  if (match > ppd->attrs && spec == NULL)
-  {
-   /*
-    * Find the first attribute with the same name...
-    */
-
-    while (match > ppd->attrs)
-    {
-      if (strcmp(match[-1]->name, name) != 0)
-        break;
-
-      match --;
-    }
-  }
-
- /*
-  * Save the current attribute and return its value...
-  */
-
-  ppd->cur_attr = match - ppd->attrs;
-
-  return (*match);
-}
-
-
-/*
- * 'ppdFindNextAttr()' - Find the next matching attribute...
- */
-
-ppd_attr_t *				/* O - Attribute or NULL if not found */
-ppdFindNextAttr(ppd_file_t *ppd,	/* I - PPD file data */
-                const char *name,	/* I - Attribute name */
-		const char *spec)	/* I - Specifier string or NULL */
-{
-  ppd_attr_t	**match;		/* Matching attribute */
-
-
- /*
-  * Range check input...
-  */
-
-  if (ppd == NULL || name == NULL || ppd->num_attrs == 0 || ppd->cur_attr < 0)
-    return (NULL);
-
- /*
-  * See if there are more attributes to return...
-  */
-
-  ppd->cur_attr ++;
-
-  if (ppd->cur_attr >= ppd->num_attrs)
-  {
-   /*
-    * Nope...
-    */
-
-    ppd->cur_attr = -1;
-    return (NULL);
-  }
-
- /*
-  * Check the next attribute to see if it is a match...
-  */
-
-  match = ppd->attrs + ppd->cur_attr;
-
-  if (strcmp((*match)->name, name) != 0 ||
-      (spec != NULL && strcmp((*match)->spec, spec) != 0))
-  {
-   /*
-    * Nope...
-    */
-
-    ppd->cur_attr = -1;
-    return (NULL);
-  }
-  
- /*
-  * Return the next attribute's value...
-  */
-
-  return (*match);
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -1,238 +0,0 @@
-/*
- * "$Id$"
- *
- *   Authentication functions for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 1997-2003 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   cupsDoAuthentication() - Authenticate a request...
- *   cups_local_auth()      - Get the local authorization certificate if
- *                            available/applicable...
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "cups.h"
-#include "ipp.h"
-#include "language.h"
-#include "string.h"
-#include "debug.h"
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#if defined(WIN32) || defined(__EMX__)
-#  include <io.h>
-#else
-#  include <unistd.h>
-#endif /* WIN32 || __EMX__ */
-
-
-/*
- * Local functions...
- */
-
-static int	cups_local_auth(http_t *http);
-
-
-/*
- * 'cupsDoAuthentication()' - Authenticate a request...
- */
-
-int					/* O - 0 on success, -1 on error */
-cupsDoAuthentication(http_t     *http,	/* I - HTTP connection to server */
-                     const char *method,/* I - Request method (GET, POST, PUT) */
-		     const char *resource)
-					/* I - Resource path */
-{
-  const char	*password;		/* Password string */
-  char		prompt[1024],		/* Prompt for user */
-		realm[HTTP_MAX_VALUE],	/* realm="xyz" string */
-		nonce[HTTP_MAX_VALUE],	/* nonce="xyz" string */
-		encode[512];		/* Encoded username:password */
-
-
- /*
-  * Clear the current authentication string...
-  */
-
-  http->authstring[0] = '\0';
-
- /*
-  * See if we can do local authentication...
-  */
-
-  if (!cups_local_auth(http))
-    return (0);
-
- /*
-  * Nope, see if we should retry the current digest password...
-  */
-
-  if (strncasecmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0 ||
-      http->digest_tries > 1 || !http->userpass[0])
-  {
-   /*
-    * Nope - get a new password from the user...
-    */
-
-    snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
-             http->hostname);
-
-    http->digest_tries  = 0;
-    http->userpass[0]   = '\0';
-
-    if ((password = cupsGetPassword(prompt)) == NULL)
-      return (-1);
-
-    if (!password[0])
-      return (-1);
-
-    snprintf(http->userpass, sizeof(http->userpass), "%s:%s", cupsUser(),
-             password);
-  }
-  else
-    http->digest_tries ++;
-
- /*
-  * Got a password; encode it for the server...
-  */
-
-  if (strncasecmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0)
-  {
-   /*
-    * Basic authentication...
-    */
-
-    httpEncode64(encode, http->userpass);
-    snprintf(http->authstring, sizeof(http->authstring), "Basic %s", encode);
-  }
-  else
-  {
-   /*
-    * Digest authentication...
-    */
-
-    httpGetSubField(http, HTTP_FIELD_WWW_AUTHENTICATE, "realm", realm);
-    httpGetSubField(http, HTTP_FIELD_WWW_AUTHENTICATE, "nonce", nonce);
-
-    httpMD5(cupsUser(), realm, strchr(http->userpass, ':') + 1, encode);
-    httpMD5Final(nonce, "POST", resource, encode);
-    snprintf(http->authstring, sizeof(http->authstring),
-	     "Digest username=\"%s\", realm=\"%s\", nonce=\"%s\", "
-	     "response=\"%s\"", cupsUser(), realm, nonce, encode);
-  }
-
-  return (0);
-}
-
-
-/*
- * 'cups_local_auth()' - Get the local authorization certificate if
- *                       available/applicable...
- */
-
-static int				/* O - 0 if available, -1 if not */
-cups_local_auth(http_t *http)		/* I - HTTP connection to server */
-{
-#if defined(WIN32) || defined(__EMX__)
- /*
-  * Currently WIN32 and OS-2 do not support the CUPS server...
-  */
-
-  return (-1);
-#else
-  int		pid;			/* Current process ID */
-  FILE		*fp;			/* Certificate file */
-  char		filename[1024],		/* Certificate filename */
-		certificate[33];	/* Certificate string */
-  const char	*root;			/* Server root directory */
-
-
-  DEBUG_printf(("cups_local_auth(http=%p) hostaddr=%08x, hostname=\"%s\"\n",
-                http, ntohl(http->hostaddr.sin_addr.s_addr), http->hostname));
-
- /*
-  * See if we are accessing localhost...
-  */
-
-  if (ntohl(http->hostaddr.sin_addr.s_addr) != 0x7f000001 &&
-      strcasecmp(http->hostname, "localhost") != 0)
-  {
-    DEBUG_puts("cups_local_auth: Not a local connection!");
-    return (-1);
-  }
-
- /*
-  * Try opening a certificate file for this PID.  If that fails,
-  * try the root certificate...
-  */
-
-  if ((root = getenv("CUPS_SERVERROOT")) == NULL)
-    root = CUPS_SERVERROOT;
-
-  pid = getpid();
-  snprintf(filename, sizeof(filename), "%s/certs/%d", root, pid);
-  if ((fp = fopen(filename, "r")) == NULL && pid > 0)
-  {
-    DEBUG_printf(("cups_local_auth: Unable to open file %s: %s\n",
-                  filename, strerror(errno)));
-
-    snprintf(filename, sizeof(filename), "%s/certs/0", root);
-    fp = fopen(filename, "r");
-  }
-
-  if (fp == NULL)
-  {
-    DEBUG_printf(("cups_local_auth: Unable to open file %s: %s\n",
-                  filename, strerror(errno)));
-    return (-1);
-  }
-
- /*
-  * Read the certificate from the file...
-  */
-
-  fgets(certificate, sizeof(certificate), fp);
-  fclose(fp);
-
- /*
-  * Set the authorization string and return...
-  */
-
-  snprintf(http->authstring, sizeof(http->authstring), "Local %s", certificate);
-
-  DEBUG_printf(("cups_local_auth: Returning authstring = \"%s\"\n",
-                http->authstring));
-
-  return (0);
-#endif /* WIN32 || __EMX__ */
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../visualc" /I ".." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\visualc" /I ".." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -64,7 +64,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../visualc" /I ".." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\visualc" /I ".." /I "../visualc" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -85,10 +85,6 @@ LIB32=link.exe -lib
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File

-SOURCE=.\auth.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\dest.c
 # End Source File
 # Begin Source File
@@ -97,30 +93,10 @@ SOURCE=.\emit.c
 # End Source File
 # Begin Source File

-SOURCE=.\encode.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\getputfile.c
-# End Source File
-# Begin Source File
-
-SOURCE=".\http-addr.c"
-# End Source File
-# Begin Source File
-
-SOURCE=".\http-support.c"
-# End Source File
-# Begin Source File
-
 SOURCE=.\http.c
 # End Source File
 # Begin Source File

-SOURCE=".\ipp-support.c"
-# End Source File
-# Begin Source File
-
 SOURCE=.\ipp.c
 # End Source File
 # Begin Source File
@@ -161,10 +137,6 @@ SOURCE=.\string.c
 # End Source File
 # Begin Source File

-SOURCE=.\tempfile.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\usersys.c
 # End Source File
 # Begin Source File
@@ -201,10 +173,6 @@ SOURCE=.\language.h
 # End Source File
 # Begin Source File

-SOURCE=..\oemlicense\license.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\md5.h
 # End Source File
 # Begin Source File
@@ -3,7 +3,7 @@
 *
 *   API definitions for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-2001 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -20,8 +20,6 @@
 *       Voice: (301) 373-9603
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
- *
- *   This file is subject to the Apple OS-Developed Software exception.
 */

 #ifndef _CUPS_CUPS_H_
@@ -48,10 +46,7 @@ extern "C" {
 * Constants...
 */

-#  define CUPS_VERSION		1.0120
-#  define CUPS_VERSION_MAJOR	1
-#  define CUPS_VERSION_MINOR	1
-#  define CUPS_VERSION_PATCH	20
+#  define CUPS_VERSION		1.0111
 #  define CUPS_DATE_ANY		-1


@@ -81,8 +76,7 @@ enum					/* Not a typedef'd enum so we can OR */
  CUPS_PRINTER_VARIABLE = 0x8000,	/* Can do variable sizes */
  CUPS_PRINTER_IMPLICIT = 0x10000,	/* Implicit class */
  CUPS_PRINTER_DEFAULT = 0x20000,	/* Default printer on network */
-  CUPS_PRINTER_FAX = 0x40000,		/* Fax queue */
-  CUPS_PRINTER_OPTIONS = 0x6fffc	/* ~(CLASS | REMOTE | IMPLICIT) */
+  CUPS_PRINTER_OPTIONS = 0xfffc		/* ~(CLASS | REMOTE | IMPLICIT) */
 };

 typedef struct				/**** Printer Options ****/
@@ -170,17 +164,6 @@ extern void		cupsSetServer(const char *server);
 extern void		cupsSetUser(const char *user);
 extern const char	*cupsUser(void);

-/**** New in CUPS 1.1.20 ****/
-extern int		cupsDoAuthentication(http_t *http, const char *method,
-			                     const char *resource);
-extern http_status_t	cupsGetFile(http_t *http, const char *resource,
-			            const char *filename);
-extern http_status_t	cupsGetFd(http_t *http, const char *resource, int fd);
-extern http_status_t	cupsPutFile(http_t *http, const char *resource,
-			            const char *filename);
-extern http_status_t	cupsPutFd(http_t *http, const char *resource, int fd);
-
-
 #  ifdef __cplusplus
 }
 #  endif /* __cplusplus */
@@ -18,7 +18,7 @@
 "Cyan",
 "Magenta",
 "Yellow",
-"Copyright 1993-2003 by Easy Software Products, All Rights Reserved.",
+"Copyright 1993-2001 by Easy Software Products, All Rights Reserved.",
 "General",
 "Printer",
 "Image",
@@ -108,8 +108,6 @@
 "Top",
 "Filename(s)",
 "Print",
-"Options Installed",
-"Auto",
 "400 Your browser sent a request that this server could not understand.",
 "This server could not verify that you are authorized to access the resource.",
 "You must pay to access this server.",
@@ -3,7 +3,7 @@
 *
 *   Debugging macros for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-2001 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -20,8 +20,6 @@
 *       Voice: (301) 373-9603
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
- *
- *   This file is subject to the Apple OS-Developed Software exception.
 */

 #ifndef _CUPS_DEBUG_H_
@@ -4,7 +4,7 @@
 *   User-defined destination (and option) support for the Common UNIX
 *   Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-2001 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -22,8 +22,6 @@
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
 *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
 * Contents:
 *
 *   cupsAddDest()     - Add a destination to the list of destinations.
@@ -209,7 +207,6 @@ cupsGetDest(const char  *name,		/* I - Name of destination */
 int					/* O - Number of destinations */
 cupsGetDests(cups_dest_t **dests)	/* O - Destinations */
 {
-  int		i;			/* Looping var */
  int		num_dests;		/* Number of destinations */
  cups_dest_t	*dest;			/* Destination pointer */
  const char	*home;			/* HOME environment variable */
@@ -217,8 +214,6 @@ cupsGetDests(cups_dest_t **dests)	/* O - Destinations */
  const char	*defprinter;		/* Default printer */
  char		name[1024],		/* Copy of printer name */
 		*instance;		/* Pointer to instance name */
-  int		num_reals;		/* Number of real queues */
-  cups_dest_t	*reals;			/* Real queues */


 /*
@@ -235,26 +230,6 @@ cupsGetDests(cups_dest_t **dests)	/* O - Destinations */
  num_dests = cups_get_sdests(CUPS_GET_PRINTERS, num_dests, dests);
  num_dests = cups_get_sdests(CUPS_GET_CLASSES, num_dests, dests);

- /*
-  * Make a copy of the "real" queues for a later sanity check...
-  */
-
-  if (num_dests > 0)
-  {
-    num_reals = num_dests;
-    reals     = calloc(num_reals, sizeof(cups_dest_t));
-
-    if (reals)
-      memcpy(reals, *dests, num_reals * sizeof(cups_dest_t));
-    else
-      num_reals = 0;
-  }
-  else
-  {
-    num_reals = 0;
-    reals     = NULL;
-  }
-
 /*
  * Grab the default destination...
  */
@@ -265,7 +240,8 @@ cupsGetDests(cups_dest_t **dests)	/* O - Destinations */
    * Grab printer and instance name...
    */

-    strlcpy(name, defprinter, sizeof(name));
+    strncpy(name, defprinter, sizeof(name) - 1);
+    name[sizeof(name) - 1] = '\0';

    if ((instance = strchr(name, '/')) != NULL)
      *instance++ = '\0';
@@ -306,45 +282,18 @@ cupsGetDests(cups_dest_t **dests)	/* O - Destinations */
  }

 /*
-  * Validate the current default destination - this prevents old
-  * Default lines in /etc/cups/lpoptions and ~/.lpoptions from
-  * pointing to a non-existent printer or class...
+  * Reset the default destination if the LPDEST or PRINTER environment
+  * variables are set...
  */

-  if (num_reals)
+  if (getenv("LPDEST") != NULL || getenv("PRINTER") != NULL)
  {
   /*
-    * See if we have a default printer...
+    * Lookup the printer and instance and make it the default...
    */

-    if ((dest = cupsGetDest(NULL, NULL, num_dests, *dests)) != NULL)
-    {
-     /*
-      * Have a default; see if it is real...
-      */
-
-      dest = cupsGetDest(dest->name, NULL, num_reals, reals);
-    }
-
-   /*
-    * If dest is NULL, then no default (that exists) is set, so we
-    * need to set a default if one exists...
-    */
-
-    if (dest == NULL && defprinter != NULL)
-    {
-      for (i = 0; i < num_dests; i ++)
-        (*dests)[i].is_default = 0;
-
-      if ((dest = cupsGetDest(name, instance, num_dests, *dests)) != NULL)
-	dest->is_default = 1;
-    }
-
-   /*
-    * Free memory...
-    */
-
-    free(reals);
+    if ((dest = cupsGetDest(name, instance, num_dests, *dests)) != NULL)
+      dest->is_default = 1;
  }

 /*
@@ -597,14 +546,6 @@ cups_get_dests(const char  *filename,	/* I - File to read from */

    *lineptr++ = '\0';

-   /*
-    * See if the primary instance of the destination exists; if not,
-    * ignore this entry and move on...
-    */
-
-    if (cupsGetDest(name, NULL, num_dests, *dests) == NULL)
-      continue;
-
   /*
    * Add the destination...
    */
@@ -625,6 +566,18 @@ cups_get_dests(const char  *filename,	/* I - File to read from */
    * Add options until we hit the end of the line...
    */

+    if (dest->num_options)
+    {
+     /*
+      * Free old options...
+      */
+
+      cupsFreeOptions(dest->num_options, dest->options);
+
+      dest->num_options = 0;
+      dest->options     = (cups_option_t *)0;
+    }
+
    dest->num_options = cupsParseOptions(lineptr, dest->num_options,
                                         &(dest->options));

@@ -668,7 +621,7 @@ cups_get_sdests(ipp_op_t    op,		/* I - get-printers or get-classes */
  cups_lang_t	*language;		/* Default language */
  const char	*name;			/* printer-name attribute */
  char		job_sheets[1024];	/* job-sheets option */
-  static const char * const pattrs[] =	/* Attributes we're interested in */
+  static const char	*pattrs[] =	/* Attributes we're interested in */
 		{
 		  "printer-name",
 		  "job-sheets-default"
@@ -703,8 +656,6 @@ cups_get_sdests(ipp_op_t    op,		/* I - get-printers or get-classes */
  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
               "attributes-natural-language", NULL, language->language);

-  cupsLangFree(language);
-
  ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                "requested-attributes", sizeof(pattrs) / sizeof(pattrs[0]),
 		NULL, pattrs);
@@ -3,7 +3,7 @@
 *
 *   PPD code emission routines for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2001 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
@@ -23,17 +23,13 @@
 *
 *   PostScript is a trademark of Adobe Systems, Inc.
 *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
 * Contents:
 *
- *   ppdCollect()       - Collect all marked options that reside in the
- *                        specified section.
- *   ppdEmit()          - Emit code for marked options to a file.
- *   ppdEmitFd()        - Emit code for marked options to a file.
- *   ppdEmitJCL()       - Emit code for JCL options to a file.
- *   ppd_handle_media() - Handle media selection...
- *   ppd_sort()         - Sort options by ordering numbers...
+ *   ppdCollect() - Collect all marked options that reside in the specified
+ *   ppdEmit()    - Emit code for marked options to a file.
+ *   ppdEmitFd()  - Emit code for marked options to a file.
+ *   ppdEmitJCL() - Emit code for JCL options to a file.
+ *   ppd_sort()   - Sort options by ordering numbers...
 */

 /*
@@ -55,19 +51,9 @@
 * Local functions...
 */

-static void	ppd_handle_media(ppd_file_t *ppd);
 static int	ppd_sort(ppd_choice_t **c1, ppd_choice_t **c2);


-/*
- * Local globals...
- */
-
-static const char *ppd_custom_code =
-		"pop pop pop\n"
-		"<</PageSize[5 -2 roll]/ImagingBBox null>>setpagedevice\n";
-
-
 /*
 * 'ppdCollect()' - Collect all marked options that reside in the specified
 *                  section.
@@ -165,16 +151,6 @@ ppdEmit(ppd_file_t    *ppd,		/* I - PPD file record */
  ppd_size_t	*size;			/* Custom page size */


- /*
-  * Use PageSize or PageRegion as required...
-  */
-
-  ppd_handle_media(ppd);
-
- /*
-  * Collect the options we need to emit and emit them!
-  */
-
  if ((count = ppdCollect(ppd, section, &choices)) == 0)
    return (0);

@@ -196,85 +172,25 @@ ppdEmit(ppd_file_t    *ppd,		/* I - PPD file record */
      * Send DSC comments with option...
      */

-      if ((strcasecmp(((ppd_option_t *)choices[i]->option)->keyword, "PageSize") == 0 ||
-           strcasecmp(((ppd_option_t *)choices[i]->option)->keyword, "PageRegion") == 0) &&
+      if (fprintf(fp, "%%%%BeginFeature: %s %s\n",
+                  ((ppd_option_t *)choices[i]->option)->keyword,
+		  choices[i]->choice) < 0)
+      {
+        free(choices);
+        return (-1);
+      }
+
+      if (strcasecmp(((ppd_option_t *)choices[i]->option)->keyword, "PageSize") == 0 &&
          strcasecmp(choices[i]->choice, "Custom") == 0)
      {
       /*
-        * Variable size; write out standard size options, using the
-	* parameter positions defined in the PPD file...
+        * Variable size; write out standard size options (this should
+	* eventually be changed to use the parameter positions defined
+	* in the PPD file...)
 	*/

-        ppd_attr_t	*attr;		/* PPD attribute */
-	int		pos,		/* Position of custom value */
-			values[5],	/* Values for custom command */
-			orientation;	/* Orientation to use */
-
-
-        fputs("%%BeginFeature: *CustomPageSize True\n", fp);
-
        size = ppdPageSize(ppd, "Custom");
-
-        memset(values, 0, sizeof(values));
-
-	if ((attr = ppdFindAttr(ppd, "ParamCustomPageSize", "Width")) != NULL)
-	{
-	  pos = atoi(attr->value) - 1;
-
-          if (pos < 0 || pos > 4)
-	    pos = 0;
-	}
-	else
-	  pos = 0;
-
-	values[pos] = (int)size->width;
-
-	if ((attr = ppdFindAttr(ppd, "ParamCustomPageSize", "Height")) != NULL)
-	{
-	  pos = atoi(attr->value) - 1;
-
-          if (pos < 0 || pos > 4)
-	    pos = 1;
-	}
-	else
-	  pos = 1;
-
-	values[pos] = (int)size->length;
-
-        if (size->width < size->length)
-	  orientation = 1;
-	else
-	  orientation = 0;
-
-	if ((attr = ppdFindAttr(ppd, "ParamCustomPageSize",
-	                        "Orientation")) != NULL)
-	{
-	  int min_orient, max_orient;	/* Minimum and maximum orientations */
-
-
-          if (sscanf(attr->value, "%d%*s%d%d", &pos, &min_orient,
-	             &max_orient) != 3)
-	    pos = 4;
-	  else
-	  {
-	    pos --;
-
-            if (pos < 0 || pos > 4)
-	      pos = 4;
-
-            if (orientation > max_orient)
-	      orientation = max_orient;
-	    else if (orientation < min_orient)
-	      orientation = min_orient;
-	  }
-	}
-	else
-	  pos = 4;
-
-	values[pos] = orientation;
-
-        fprintf(fp, "%d %d %d %d %d\n", values[0], values[1],
-	        values[2], values[3], values[4]);
+        fprintf(fp, "%.0f %.0f 0 0 0\n", size->width, size->length);

 	if (choices[i]->code == NULL)
 	{
@@ -284,16 +200,10 @@ ppdEmit(ppd_file_t    *ppd,		/* I - PPD file record */
 	  * Level 2 command sequence...
 	  */

-	  fputs(ppd_custom_code, fp);
+	  fputs("pop pop pop\n", fp);
+	  fputs("<</PageSize[5 -2 roll]/ImagingBBox null>>setpagedevice\n", fp);
 	}
      }
-      else if (fprintf(fp, "%%%%BeginFeature: *%s %s\n",
-                       ((ppd_option_t *)choices[i]->option)->keyword,
-		       choices[i]->choice) < 0)
-      {
-        free(choices);
-        return (-1);
-      }

      if (choices[i]->code != NULL && choices[i]->code[0] != '\0')
      {
@@ -340,23 +250,11 @@ ppdEmitFd(ppd_file_t    *ppd,		/* I - PPD file record */
          ppd_section_t section)	/* I - Section to write */
 {
  int		i,			/* Looping var */
-		count,			/* Number of choices */
-		custom_size;		/* Non-zero if this option is a custom size */
+		count;			/* Number of choices */
  ppd_choice_t	**choices;		/* Choices */
-  ppd_size_t	*size;			/* Custom page size */
  char		buf[1024];		/* Output buffer for feature */


- /*
-  * Use PageSize or PageRegion as required...
-  */
-
-  ppd_handle_media(ppd);
-
- /*
-  * Collect the options we need to emit and emit them!
-  */
-
  if ((count = ppdCollect(ppd, section, &choices)) == 0)
    return (0);

@@ -378,22 +276,9 @@ ppdEmitFd(ppd_file_t    *ppd,		/* I - PPD file record */
      * Send DSC comments with option...
      */

-      if ((strcasecmp(((ppd_option_t *)choices[i]->option)->keyword, "PageSize") == 0 ||
-           strcasecmp(((ppd_option_t *)choices[i]->option)->keyword, "PageRegion") == 0) &&
-          strcasecmp(choices[i]->choice, "Custom") == 0)
-      {
-        custom_size = 1;
-
-	strcpy(buf, "%%BeginFeature: *CustomPageSize True\n");
-      }
-      else
-      {
-        custom_size = 0;
-
-	snprintf(buf, sizeof(buf), "%%%%BeginFeature: *%s %s\n",
-        	 ((ppd_option_t *)choices[i]->option)->keyword,
-		 choices[i]->choice);
-      }
+      snprintf(buf, sizeof(buf), "%%%%BeginFeature: %s %s\n",
+               ((ppd_option_t *)choices[i]->option)->keyword,
+	       choices[i]->choice);

      if (write(fd, buf, strlen(buf)) < 1)
      {
@@ -401,111 +286,10 @@ ppdEmitFd(ppd_file_t    *ppd,		/* I - PPD file record */
        return (-1);
      }

-      if (custom_size)
+      if (write(fd, choices[i]->code, strlen(choices[i]->code)) < 1)
      {
-       /*
-        * Variable size; write out standard size options, using the
-	* parameter positions defined in the PPD file...
-	*/
-
-        ppd_attr_t	*attr;		/* PPD attribute */
-	int		pos,		/* Position of custom value */
-			values[5],	/* Values for custom command */
-			orientation;	/* Orientation to use */
-
-
-        size = ppdPageSize(ppd, "Custom");
-
-        memset(values, 0, sizeof(values));
-
-	if ((attr = ppdFindAttr(ppd, "ParamCustomPageSize", "Width")) != NULL)
-	{
-	  pos = atoi(attr->value) - 1;
-
-          if (pos < 0 || pos > 4)
-	    pos = 0;
-	}
-	else
-	  pos = 0;
-
-	values[pos] = (int)size->width;
-
-	if ((attr = ppdFindAttr(ppd, "ParamCustomPageSize", "Height")) != NULL)
-	{
-	  pos = atoi(attr->value) - 1;
-
-          if (pos < 0 || pos > 4)
-	    pos = 1;
-	}
-	else
-	  pos = 1;
-
-	values[pos] = (int)size->length;
-
-        if (size->width < size->length)
-	  orientation = 1;
-	else
-	  orientation = 0;
-
-	if ((attr = ppdFindAttr(ppd, "ParamCustomPageSize",
-	                        "Orientation")) != NULL)
-	{
-	  int min_orient, max_orient;	/* Minimum and maximum orientations */
-
-
-          if (sscanf(attr->value, "%d%*s%d%d", &pos, &min_orient,
-	             &max_orient) != 3)
-	    pos = 4;
-	  else
-	  {
-	    pos --;
-
-            if (pos < 0 || pos > 4)
-	      pos = 4;
-
-            if (orientation > max_orient)
-	      orientation = max_orient;
-	    else if (orientation < min_orient)
-	      orientation = min_orient;
-	  }
-	}
-	else
-	  pos = 4;
-
-	values[pos] = orientation;
-
-        snprintf(buf, sizeof(buf), "%d %d %d %d %d\n", values[0], values[1],
-	         values[2], values[3], values[4]);
-
-	if (write(fd, buf, strlen(buf)) < 1)
-	{
-          free(choices);
-          return (-1);
-	}
-
-	if (choices[i]->code == NULL)
-	{
-	 /*
-	  * This can happen with certain buggy PPD files that don't include
-	  * a CustomPageSize command sequence...  We just use a generic
-	  * Level 2 command sequence...
-	  */
-
-	  if (write(fd, ppd_custom_code, strlen(ppd_custom_code)) < 1)
-	  {
-            free(choices);
-            return (-1);
-	  }
-	}
-      }
-
-      if (choices[i]->code != NULL && choices[i]->code[0] != '\0')
-      {
-	if (write(fd, choices[i]->code, strlen(choices[i]->code)) < 1)
-	{
-          free(choices);
-          return (-1);
-	}
+        free(choices);
+        return (-1);
      }

      if (write(fd, "%%EndFeature\n", 13) < 1)
@@ -542,8 +326,7 @@ ppdEmitJCL(ppd_file_t *ppd,		/* I - PPD file record */
 	   const char *user,		/* I - Username */
 	   const char *title)		/* I - Title */
 {
-  char		*ptr;			/* Pointer into JCL string */
-  char		temp[81];		/* Local title string */
+  const char	*ptr;			/* Pointer into JCL string */


 /*
@@ -562,13 +345,9 @@ ppdEmitJCL(ppd_file_t *ppd,		/* I - PPD file record */
   /*
    * This printer uses HP PJL commands for output; filter the output
    * so that we only have a single "@PJL JOB" command in the header...
-    *
-    * To avoid bugs in the PJL implementation of certain vendors' products
-    * (Xerox in particular), we add a dummy "@PJL" command at the beginning
-    * of the PJL commands to initialize PJL processing.
    */

-    fputs("\033%-12345X@PJL\n", fp);
+    fputs("\033%-12345X", fp);
    for (ptr = ppd->jcl_begin + 9; *ptr;)
      if (strncmp(ptr, "@PJL JOB", 8) == 0)
      {
@@ -607,109 +386,23 @@ ppdEmitJCL(ppd_file_t *ppd,		/* I - PPD file record */
    if ((ptr = strrchr(title, '/')) != NULL)
      title = ptr + 1;

-   /*
-    * Replace double quotes with single quotes so that the title
-    * does not cause a PJL syntax error.
-    */
-
-    strlcpy(temp, title, sizeof(temp));
-
-    for (ptr = temp; *ptr; ptr ++)
-      if (*ptr == '\"')
-        *ptr = '\'';
-
   /*
    * Send PJL JOB command before we enter PostScript mode...
    */

-    fprintf(fp, "@PJL JOB NAME = \"%s\" DISPLAY = \"%d %s %s\"\n", temp,
-            job_id, user, temp);
+    fprintf(fp, "@PJL JOB NAME = \"%s\" DISPLAY = \"%d %s %s\"\n", title,
+            job_id, user, title);
  }
  else
-    fputs(ppd->jcl_begin, fp);
+    fputs(ppd->jcl_begin, stdout);

-  ppdEmit(ppd, fp, PPD_ORDER_JCL);
-  fputs(ppd->jcl_ps, fp);
+  ppdEmit(ppd, stdout, PPD_ORDER_JCL);
+  fputs(ppd->jcl_ps, stdout);

  return (0);
 }


-/*
- * 'ppd_handle_media()' - Handle media selection...
- */
-
-static void
-ppd_handle_media(ppd_file_t *ppd)
-{
-  ppd_choice_t	*manual_feed,		/* ManualFeed choice, if any */
-		*input_slot,		/* InputSlot choice, if any */
-		*page;			/* PageSize/PageRegion */
-  ppd_size_t	*size;			/* Current media size */
-  ppd_attr_t	*rpr;			/* RequiresPageRegion value */
-
-
- /*
-  * This function determines if the user has selected a media source
-  * via the InputSlot or ManualFeed options; if so, it marks the
-  * PageRegion option corresponding to the current media size.
-  * Otherwise it marks the PageSize option.
-  */
-
-  if ((size = ppdPageSize(ppd, NULL)) == NULL)
-    return;
-
-  manual_feed = ppdFindMarkedChoice(ppd, "ManualFeed");
-  input_slot  = ppdFindMarkedChoice(ppd, "InputSlot");
-
-  if (input_slot != NULL)
-    rpr = ppdFindAttr(ppd, "RequiresPageRegion", input_slot->choice);
-  else
-    rpr = NULL;
-
-  if (!rpr)
-    rpr = ppdFindAttr(ppd, "RequiresPageRegion", "All");
-
-  if (strcasecmp(size->name, "Custom") == 0 ||
-      (manual_feed == NULL && input_slot == NULL) ||
-      (manual_feed != NULL && strcasecmp(manual_feed->choice, "False") == 0) ||
-      (input_slot != NULL && (input_slot->code == NULL || !input_slot->code[0])))
-  {
-   /*
-    * Manual feed was not selected and/or the input slot selection does
-    * not contain any PostScript code.  Use the PageSize option...
-    */
-
-    ppdMarkOption(ppd, "PageSize", size->name);
-  }
-  else
-  {
-   /*
-    * Manual feed was selected and/or the input slot selection contains
-    * PostScript code.  Use the PageRegion option...
-    */
-
-    ppdMarkOption(ppd, "PageRegion", size->name);
-
-    if ((rpr && rpr->value && !strcmp(rpr->value, "False")) ||
-        (!rpr && !ppd->num_filters))
-    {
-     /*
-      * Either the PPD file specifies no PageRegion code or the PPD file
-      * not for a CUPS raster driver and thus defaults to no PageRegion
-      * code...  Unmark the PageRegion choice so that we don't output the
-      * code...
-      */
-
-      page = ppdFindMarkedChoice(ppd, "PageRegion");
-
-      if (page)
-        page->marked = 0;
-    }
-  }
-}
-
-
 /*
 * 'ppd_sort()' - Sort options by ordering numbers...
 */
@@ -3,7 +3,7 @@
 *
 *   Option encoding routines for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-2001 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -21,8 +21,6 @@
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
 *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
 * Contents:
 *
 *   cupsEncodeOptions() - Encode printer options into IPP attributes.
@@ -39,53 +37,6 @@
 #include "debug.h"


-/*
- * Local list of option names and the value tags they should use...
- */
-
-typedef struct
-{
-  const char	*name;
-  ipp_tag_t	value_tag;
-} ipp_option_t;
-
-static const ipp_option_t ipp_options[] =
-			{
-			  { "blackplot",		IPP_TAG_BOOLEAN },
-			  { "brightness",		IPP_TAG_INTEGER },
-			  { "columns",			IPP_TAG_INTEGER },
-			  { "copies",			IPP_TAG_INTEGER },
-			  { "finishings",		IPP_TAG_ENUM },
-			  { "fitplot",			IPP_TAG_BOOLEAN },
-			  { "gamma",			IPP_TAG_INTEGER },
-			  { "hue",			IPP_TAG_INTEGER },
-			  { "job-k-limit",		IPP_TAG_INTEGER },
-			  { "job-page-limit",		IPP_TAG_INTEGER },
-			  { "job-priority",		IPP_TAG_INTEGER },
-			  { "job-quota-period",		IPP_TAG_INTEGER },
-			  { "landscape",		IPP_TAG_BOOLEAN },
-			  { "media",			IPP_TAG_KEYWORD },
-			  { "mirror",			IPP_TAG_BOOLEAN },
-			  { "natural-scaling",		IPP_TAG_INTEGER },
-			  { "number-up",		IPP_TAG_INTEGER },
-			  { "orientation-requested",	IPP_TAG_ENUM },
-			  { "page-bottom",		IPP_TAG_INTEGER },
-			  { "page-left",		IPP_TAG_INTEGER },
-			  { "page-ranges",		IPP_TAG_RANGE },
-			  { "page-right",		IPP_TAG_INTEGER },
-			  { "page-top",			IPP_TAG_INTEGER },
-			  { "penwidth",			IPP_TAG_INTEGER },
-			  { "ppi",			IPP_TAG_INTEGER },
-			  { "prettyprint",		IPP_TAG_BOOLEAN },
-			  { "printer-resolution",	IPP_TAG_RESOLUTION },
-			  { "print-quality",		IPP_TAG_ENUM },
-			  { "saturation",		IPP_TAG_INTEGER },
-			  { "scaling",			IPP_TAG_INTEGER },
-			  { "sides",			IPP_TAG_KEYWORD },
-			  { "wrap",			IPP_TAG_BOOLEAN }
-			};
-
-
 /*
 * 'cupsEncodeOptions()' - Encode printer options into IPP attributes.
 */
@@ -95,13 +46,14 @@ cupsEncodeOptions(ipp_t         *ipp,		/* I - Request to add to */
        	  int           num_options,	/* I - Number of options */
 		  cups_option_t *options)	/* I - Options */
 {
-  int		i, j;				/* Looping vars */
-  int		count;				/* Number of values */
-  char		*s,				/* Pointer into option value */
-		*val,				/* Pointer to option value */
-		*copy,				/* Copy of option value */
-		*sep;				/* Option separator */
-  ipp_attribute_t *attr;			/* IPP job-id attribute */
+  int		i, j;			/* Looping vars */
+  int		count;			/* Number of values */
+  int		n;			/* Attribute value */
+  char		*s,			/* Pointer into option value */
+		*val,			/* Pointer to option value */
+		*copy,			/* Copy of option value */
+		*sep;			/* Option separator */
+  ipp_attribute_t *attr;		/* IPP job-id attribute */


  DEBUG_printf(("cupsEncodeOptions(%p, %d, %p)\n", ipp, num_options, options));
@@ -142,49 +94,13 @@ cupsEncodeOptions(ipp_t         *ipp,		/* I - Request to add to */
    * Count the number of values...
    */

-    for (count = 1, sep = options[i].value; *sep; sep ++)
-    {
-      if (*sep == '\'')
-      {
-       /*
-        * Skip quoted option value...
-	*/
-
-        sep ++;
-
-        while (*sep && *sep != '\'')
-	  sep ++;
-
-	if (!*sep)
-	  sep --;
-      }
-      else if (*sep == '\"')
-      {
-       /*
-        * Skip quoted option value...
-	*/
-
-        sep ++;
-
-        while (*sep && *sep != '\"')
-	  sep ++;
-
-	if (!*sep)
-	  sep --;
-      }
-      else if (*sep == ',')
-        count ++;
-      else if (*sep == '\\' && sep[1])
-        sep ++;
-    }
+    for (count = 1, sep = options[i].value;
+         (sep = strchr(sep + 1, ',')) != NULL;
+	 count ++);

    DEBUG_printf(("cupsEncodeOptions: option = \'%s\', count = %d\n",
                  options[i].name, count));

-   /*
-    * Allocate memory for the attribute values...
-    */
-
    if ((attr = _ipp_add_attr(ipp, count)) == NULL)
    {
     /*
@@ -195,29 +111,8 @@ cupsEncodeOptions(ipp_t         *ipp,		/* I - Request to add to */
      return;
    }

-   /*
-    * Now figure out what type of value we have...
-    */
-
    attr->group_tag = IPP_TAG_JOB;

-    if (strcasecmp(options[i].value, "true") == 0 ||
-        strcasecmp(options[i].value, "false") == 0)
-      attr->value_tag = IPP_TAG_BOOLEAN;
-    else
-      attr->value_tag = IPP_TAG_NAME;
-
-    for (j = 0; j < (int)(sizeof(ipp_options) / sizeof(ipp_options[0])); j ++)
-      if (strcasecmp(options[i].name, ipp_options[j].name) == 0)
-      {
-        attr->value_tag = ipp_options[j].value_tag;
-	break;
-      }
-
-   /*
-    * Copy the name over...
-    */
-
    if ((attr->name = strdup(options[i].name)) == NULL)
    {
     /*
@@ -257,113 +152,92 @@ cupsEncodeOptions(ipp_t         *ipp,		/* I - Request to add to */
    }

   /*
-    * Scan the value string for values...
+    * See what the option value is; for compatibility with older interface
+    * scripts, we have to support single-argument options as well as
+    * option=value, option=low-high, option=MxN, and option=val1,val2,...,valN.
    */

-    for (j = 0; j < count; val = sep, j ++)
+    if (*val == '\0')
    {
     /*
-      * Find the end of this value and mark it if needed...
+      * Old-style System V boolean value...
      */

-      if ((sep = strchr(val, ',')) != NULL)
-	*sep++ = '\0';
-      else
-	sep = val + strlen(val);
+      attr->value_tag = IPP_TAG_BOOLEAN;

-     /*
-      * Copy the option value(s) over as needed by the type...
-      */
-
-      switch (attr->value_tag)
+      if (strncasecmp(attr->name, "no", 2) == 0)
      {
-	case IPP_TAG_INTEGER :
-	case IPP_TAG_ENUM :
+        DEBUG_puts("cupsEncodeOptions: Added boolean false value...");
+        strcpy(attr->name, attr->name + 2);
+	attr->values[0].boolean = 0;
+      }
+      else
+      {
+        DEBUG_puts("cupsEncodeOptions: Added boolean true value...");
+	attr->values[0].boolean = 1;
+      }
+    }
+    else
+    {
+     /*
+      * Scan the value string for values...
+      */
+
+      for (j = 0; *val != '\0'; val = sep, j ++)
+      {
+       /*
+        * Find the end of this value and mark it if needed...
+	*/
+
+        if ((sep = strchr(val, ',')) != NULL)
+	  *sep++ = '\0';
+	else
+	  sep = val + strlen(val);
+
+       /*
+        * See what kind of value it is...
+	*/
+
+	if (strcasecmp(val, "true") == 0 ||
+            strcasecmp(val, "on") == 0 ||
+	    strcasecmp(val, "yes") == 0)
+	{
+	 /*
+	  * Boolean value - true...
+	  */
+
+          attr->value_tag         = IPP_TAG_BOOLEAN;
+	  attr->values[j].boolean = 1;
+
+          DEBUG_puts("cupsEncodeOptions: Added boolean true value...");
+	}
+	else if (strcasecmp(val, "false") == 0 ||
+        	 strcasecmp(val, "off") == 0 ||
+		 strcasecmp(val, "no") == 0)
+	{
+	 /*
+	  * Boolean value - false...
+	  */
+
+          attr->value_tag         = IPP_TAG_BOOLEAN;
+	  attr->values[j].boolean = 0;
+
+          DEBUG_puts("cupsEncodeOptions: Added boolean false value...");
+	}
+	else
+	{
+	 /*
+	  * Number, range, resolution, or string...
+	  */
+
+	  n = strtol(val, &s, 0);
+
+	  if (*s != '\0' && *s != '-' && (*s != 'x' || s == val))
+	  {
 	   /*
-	    * Integer/enumeration value...
+	    * String value(s)...
 	    */

-            attr->values[j].integer = strtol(val, &s, 0);
-
-            DEBUG_printf(("cupsEncodeOptions: Adding integer option value %d...\n",
-	                  attr->values[j].integer));
-            break;
-
-	case IPP_TAG_BOOLEAN :
-	    if (!strcasecmp(val, "true") ||
-	        !strcasecmp(val, "on") ||
-	        !strcasecmp(val, "yes"))
-	    {
-	     /*
-	      * Boolean value - true...
-	      */
-
-	      attr->values[j].boolean = 1;
-
-              DEBUG_puts("cupsEncodeOptions: Added boolean true value...");
-	    }
-	    else
-	    {
-	     /*
-	      * Boolean value - false...
-	      */
-
-	      attr->values[j].boolean = 0;
-
-              DEBUG_puts("cupsEncodeOptions: Added boolean false value...");
-	    }
-            break;
-
-	case IPP_TAG_RANGE :
-	   /*
-	    * Range...
-	    */
-
-            if (*val == '-')
-	    {
-	      attr->values[j].range.lower = 1;
-	      s = val;
-	    }
-	    else
-	      attr->values[j].range.lower = strtol(val, &s, 0);
-
-	    if (*s == '-')
-	    {
-	      if (s[1])
-		attr->values[j].range.upper = strtol(s + 1, NULL, 0);
-	      else
-		attr->values[j].range.upper = 2147483647;
-            }
-	    else
-	      attr->values[j].range.upper = attr->values[j].range.lower;
-
-	    DEBUG_printf(("cupsEncodeOptions: Added range option value %d-%d...\n",
-                	  attr->values[j].range.lower,
-			  attr->values[j].range.upper));
-            break;
-
-	case IPP_TAG_RESOLUTION :
-	   /*
-	    * Resolution...
-	    */
-
-	    attr->values[j].resolution.xres = strtol(val, &s, 0);
-
-	    if (*s == 'x')
-	      attr->values[j].resolution.yres = strtol(s + 1, &s, 0);
-	    else
-	      attr->values[j].resolution.yres = attr->values[j].resolution.xres;
-
-	    if (strcasecmp(s, "dpc") == 0)
-              attr->values[j].resolution.units = IPP_RES_PER_CM;
-            else
-              attr->values[j].resolution.units = IPP_RES_PER_INCH;
-
-	    DEBUG_printf(("cupsEncodeOptions: Adding resolution option value %s...\n",
-                	  val));
-            break;
-
-	default :
            if ((attr->values[j].string.text = strdup(val)) == NULL)
 	    {
 	     /*
@@ -374,9 +248,58 @@ cupsEncodeOptions(ipp_t         *ipp,		/* I - Request to add to */
 	      return;
 	    }

-	    DEBUG_printf(("cupsEncodeOptions: Added string value \'%s\'...\n",
-	                  val));
-            break;
+            attr->value_tag = IPP_TAG_NAME;
+
+	    DEBUG_printf(("cupsEncodeOptions: Added string value \'%s\'...\n", val));
+	  }
+	  else if (*s == '-')
+	  {
+            attr->value_tag             = IPP_TAG_RANGE;
+	    attr->values[j].range.lower = n;
+	    attr->values[j].range.upper = strtol(s + 1, NULL, 0);
+
+	    DEBUG_printf(("cupsEncodeOptions: Added range option value %d-%d...\n",
+                	  n, attr->values[j].range.upper));
+	  }
+	  else if (*s == 'x')
+	  {
+            attr->value_tag                 = IPP_TAG_RESOLUTION;
+	    attr->values[j].resolution.xres = n;
+	    attr->values[j].resolution.yres = strtol(s + 1, &s, 0);
+
+	    if (strcasecmp(s, "dpc") == 0)
+              attr->values[j].resolution.units = IPP_RES_PER_CM;
+            else if (strcasecmp(s, "dpi") == 0)
+              attr->values[j].resolution.units = IPP_RES_PER_INCH;
+            else
+	    {
+              if ((attr->values[j].string.text = strdup(val)) == NULL)
+	      {
+	       /*
+		* Ran out of memory!
+		*/
+
+		DEBUG_puts("cupsEncodeOptions: Ran out of memory for string!");
+		return;
+	      }
+
+              attr->value_tag = IPP_TAG_NAME;
+
+	      DEBUG_printf(("cupsEncodeOptions: Added string value \'%s\'...\n", val));
+	      continue;
+            }
+
+	    DEBUG_printf(("cupsEncodeOptions: Adding resolution option value %s...\n",
+                	  val));
+	  }
+	  else
+	  {
+            attr->value_tag         = IPP_TAG_INTEGER;
+	    attr->values[j].integer = n;
+
+	    DEBUG_printf(("cupsEncodeOptions: Adding integer option value %d...\n", n));
+	  }
+        }
      }
    }
  }
@@ -1,435 +0,0 @@
-/*
- * "$Id$"
- *
- *   Get/put file functions for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 1997-2003 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   cupsGetFd()   - Get a file from the server.
- *   cupsGetFile() - Get a file from the server.
- *   cupsPutFd()   - Put a file on the server.
- *   cupsPutFile() - Put a file on the server.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "cups.h"
-#include "ipp.h"
-#include "language.h"
-#include "string.h"
-#include "debug.h"
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#if defined(WIN32) || defined(__EMX__)
-#  include <io.h>
-#else
-#  include <unistd.h>
-#endif /* WIN32 || __EMX__ */
-
-
-/*
- * 'cupsGetFd()' - Get a file from the server.
- */
-
-http_status_t				/* O - Status */
-cupsGetFd(http_t     *http,		/* I - HTTP connection to server */
-	  const char *resource,		/* I - Resource name */
-	  int        fd)		/* I - File descriptor */
-{
-  int		bytes;			/* Number of bytes read */
-  char		buffer[8192];		/* Buffer for file */
-  http_status_t	status;			/* HTTP status from server */
-
-
- /*
-  * Range check input...
-  */
-
-  if (!http || !resource || fd < 0)
-  {
-    if (http)
-      http->error = EINVAL;
-
-    return (HTTP_ERROR);
-  }
-
- /*
-  * Then send GET requests to the HTTP server...
-  */
-
-  do
-  {
-    httpClearFields(http);
-    httpSetField(http, HTTP_FIELD_AUTHORIZATION, http->authstring);
-
-    if (httpGet(http, resource))
-    {
-      if (httpReconnect(http))
-      {
-        status = HTTP_ERROR;
-	break;
-      }
-      else
-      {
-        status = HTTP_UNAUTHORIZED;
-        continue;
-      }
-    }
-
-    while ((status = httpUpdate(http)) == HTTP_CONTINUE);
-
-    if (status == HTTP_UNAUTHORIZED)
-    {
-     /*
-      * Flush any error message...
-      */
-
-      httpFlush(http);
-
-     /*
-      * See if we can do authentication...
-      */
-
-      if (cupsDoAuthentication(http, "GET", resource))
-        break;
-
-      httpReconnect(http);
-
-      continue;
-    }
-    else if (status == HTTP_ERROR)
-    {
-#ifdef WIN32
-      if (http->error != WSAENETDOWN && http->error != WSAENETUNREACH)
-#else
-      if (http->error != ENETDOWN && http->error != ENETUNREACH)
-#endif /* WIN32 */
-        continue;
-      else
-        break;
-    }
-#ifdef HAVE_LIBSSL
-    else if (status == HTTP_UPGRADE_REQUIRED)
-    {
-     /*
-      * Flush any error message...
-      */
-
-      httpFlush(http);
-
-     /*
-      * Upgrade with encryption...
-      */
-
-      httpEncryption(http, HTTP_ENCRYPT_REQUIRED);
-
-     /*
-      * Try again, this time with encryption enabled...
-      */
-
-      continue;
-    }
-#endif /* HAVE_LIBSSL */
-  }
-  while (status == HTTP_UNAUTHORIZED || status == HTTP_UPGRADE_REQUIRED ||
-         status == HTTP_ERROR);
-
- /*
-  * See if we actually got the file or an error...
-  */
-
-  if (status == HTTP_OK)
-  {
-   /*
-    * Yes, copy the file...
-    */
-
-    while ((bytes = httpRead(http, buffer, sizeof(buffer))) > 0)
-      write(fd, buffer, bytes);
-  }
-  else
-    httpFlush(http);
-
- /*
-  * Return the request status...
-  */
-
-  return (status);
-}
-
-
-/*
- * 'cupsGetFile()' - Get a file from the server.
- */
-
-http_status_t				/* O - Status */
-cupsGetFile(http_t     *http,		/* I - HTTP connection to server */
-	    const char *resource,	/* I - Resource name */
-	    const char *filename)	/* I - Filename */
-{
-  int		fd;			/* File descriptor */
-  http_status_t	status;			/* Status */
-
-
- /*
-  * Range check input...
-  */
-
-  if (!http || !resource || !filename)
-  {
-    if (http)
-      http->error = EINVAL;
-
-    return (HTTP_ERROR);
-  }
-
- /*
-  * Create the file...
-  */
-
-  if ((fd = open(filename, O_WRONLY | O_EXCL | O_TRUNC)) < 0)
-  {
-   /*
-    * Couldn't open the file!
-    */
-
-    http->error = errno;
-
-    return (HTTP_ERROR);
-  }
-
- /*
-  * Get the file...
-  */
-
-  status = cupsGetFd(http, resource, fd);
-
- /*
-  * If the file couldn't be gotten, then remove the file...
-  */
-
-  close(fd);
-
-  if (status != HTTP_OK)
-    unlink(filename);
-
- /*
-  * Return the HTTP status code...
-  */
-
-  return (status);
-}
-
-
-/*
- * 'cupsPutFd()' - Put a file on the server.
- */
-
-http_status_t				/* O - Status */
-cupsPutFd(http_t     *http,		/* I - HTTP connection to server */
-          const char *resource,		/* I - Resource name */
-	  int        fd)		/* I - File descriptor */
-{
-  int		bytes;			/* Number of bytes read */
-  char		buffer[8192];		/* Buffer for file */
-  http_status_t	status;			/* HTTP status from server */
-
-
- /*
-  * Range check input...
-  */
-
-  if (!http || !resource || fd < 0)
-  {
-    if (http)
-      http->error = EINVAL;
-
-    return (HTTP_ERROR);
-  }
-
- /*
-  * Then send PUT requests to the HTTP server...
-  */
-
-  do
-  {
-    httpClearFields(http);
-    httpSetField(http, HTTP_FIELD_AUTHORIZATION, http->authstring);
-    httpSetField(http, HTTP_FIELD_TRANSFER_ENCODING, "chunked");
-
-    if (httpPut(http, resource))
-    {
-      if (httpReconnect(http))
-      {
-        status = HTTP_ERROR;
-	break;
-      }
-      else
-      {
-        status = HTTP_UNAUTHORIZED;
-        continue;
-      }
-    }
-
-   /*
-    * Copy the file...
-    */
-
-    lseek(fd, 0, SEEK_SET);
-
-    status = HTTP_CONTINUE;
-
-    while ((bytes = read(fd, buffer, sizeof(buffer))) > 0)
-      if (httpCheck(http))
-      {
-        if ((status = httpUpdate(http)) != HTTP_CONTINUE)
-          break;
-      }
-      else
-        httpWrite(http, buffer, bytes);
-
-    if (status == HTTP_CONTINUE)
-    {
-      httpWrite(http, buffer, 0);
-
-      while ((status = httpUpdate(http)) == HTTP_CONTINUE);
-    }
-
-    if (status == HTTP_UNAUTHORIZED)
-    {
-     /*
-      * Flush any error message...
-      */
-
-      httpFlush(http);
-
-     /*
-      * See if we can do authentication...
-      */
-
-      if (cupsDoAuthentication(http, "PUT", resource))
-        break;
-
-      httpReconnect(http);
-
-      continue;
-    }
-    else if (status == HTTP_ERROR)
-    {
-#ifdef WIN32
-      if (http->error != WSAENETDOWN && http->error != WSAENETUNREACH)
-#else
-      if (http->error != ENETDOWN && http->error != ENETUNREACH)
-#endif /* WIN32 */
-        continue;
-      else
-        break;
-    }
-#ifdef HAVE_LIBSSL
-    else if (status == HTTP_UPGRADE_REQUIRED)
-    {
-      /* Flush any error message... */
-      httpFlush(http);
-
-      /* Upgrade with encryption... */
-      httpEncryption(http, HTTP_ENCRYPT_REQUIRED);
-
-      /* Try again, this time with encryption enabled... */
-      continue;
-    }
-#endif /* HAVE_LIBSSL */
-  }
-  while (status == HTTP_UNAUTHORIZED || status == HTTP_UPGRADE_REQUIRED ||
-         status == HTTP_ERROR);
-
- /*
-  * See if we actually put the file or an error...
-  */
-
-  if (status != HTTP_CREATED)
-    httpFlush(http);
-
-  return (status);
-}
-
-
-/*
- * 'cupsPutFile()' - Put a file on the server.
- */
-
-http_status_t				/* O - Status */
-cupsPutFile(http_t     *http,		/* I - HTTP connection to server */
-            const char *resource,	/* I - Resource name */
-	    const char *filename)	/* I - Filename */
-{
-  int		fd;			/* File descriptor */
-  http_status_t	status;			/* Status */
-
-
- /*
-  * Range check input...
-  */
-
-  if (!http || !resource || !filename)
-  {
-    if (http)
-      http->error = EINVAL;
-
-    return (HTTP_ERROR);
-  }
-
- /*
-  * Open the local file...
-  */
-
-  if ((fd = open(filename, O_RDONLY)) < 0)
-  {
-   /*
-    * Couldn't open the file!
-    */
-
-    http->error = errno;
-
-    return (HTTP_ERROR);
-  }
-
- /*
-  * Put the file...
-  */
-
-  status = cupsPutFd(http, resource, fd);
-
-  close(fd);
-
-  return (status);
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -1,119 +0,0 @@
-/*
- * "$Id$"
- *
- *   HTTP host/address routines for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 1997-2003 by Easy Software Products, all rights reserved.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   httpGetHostByName() - Lookup a hostname or IP address, and return
- *                         address records for the specified name.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include "string.h"
-
-#include "http.h"
-
-
-/*
- * 'httpGetHostByName()' - Lookup a hostname or IP address, and return
- *                         address records for the specified name.
- */
-
-struct hostent *			/* O - Host entry */
-httpGetHostByName(const char *name)	/* I - Hostname or IP address */
-{
-  const char		*nameptr;	/* Pointer into name */
-  unsigned		ip[4];		/* IP address components */
-  static unsigned	packed_ip;	/* Packed IPv4 address */
-  static char		*packed_ptr[2];	/* Pointer to packed address */
-  static struct hostent	host_ip;	/* Host entry for IP address */
-
-
-#if defined(__APPLE__)
-  /* OS X hack to avoid it's ocassional long delay in lookupd */
-  static const char sLoopback[] = "127.0.0.1";
-  if (strcmp(name, "localhost") == 0)
-    name = sLoopback;
-#endif /* __APPLE__ */
-
- /*
-  * This function is needed because some operating systems have a
-  * buggy implementation of gethostbyname() that does not support
-  * IP addresses.  If the first character of the name string is a
-  * number, then sscanf() is used to extract the IP components.
-  * We then pack the components into an IPv4 address manually,
-  * since the inet_aton() function is deprecated.  We use the
-  * htonl() macro to get the right byte order for the address.
-  */
-
-  for (nameptr = name; isdigit(*nameptr) || *nameptr == '.'; nameptr ++);
-
-  if (!*nameptr)
-  {
-   /*
-    * We have an IP address; break it up and provide the host entry
-    * to the caller.  Currently only supports IPv4 addresses, although
-    * it should be trivial to support IPv6 in CUPS 1.2.
-    */
-
-    if (sscanf(name, "%u.%u.%u.%u", ip, ip + 1, ip + 2, ip + 3) != 4)
-      return (NULL); /* Must have 4 numbers */
-
-    packed_ip = htonl(((((((ip[0] << 8) | ip[1]) << 8) | ip[2]) << 8) | ip[3]));
-
-   /*
-    * Fill in the host entry and return it...
-    */
-
-    host_ip.h_name      = (char *)name;
-    host_ip.h_aliases   = NULL;
-    host_ip.h_addrtype  = AF_INET;
-    host_ip.h_length    = 4;
-    host_ip.h_addr_list = packed_ptr;
-    packed_ptr[0]       = (char *)(&packed_ip);
-    packed_ptr[1]       = NULL;
-
-    return (&host_ip);
-  }
-  else
-  {
-   /*
-    * Use the gethostbyname() function to get the IP address for
-    * the name...
-    */
-
-    return (gethostbyname(name));
-  }
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -1,102 +0,0 @@
-/*
- * "$Id$"
- *
- *   Private HTTP definitions for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 1997-2003 by Easy Software Products, all rights reserved.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- */
-
-#ifndef _CUPS_HTTP_PRIVATE_H_
-#  define _CUPS_HTTP_PRIVATE_H_
-
-/*
- * Include necessary headers...
- */
-
-#  include "config.h"
-
-#  ifdef __sun
-/*
- * Define FD_SETSIZE to CUPS_MAX_FDS on Solaris to get the correct version of
- * select() for large numbers of file descriptors.
- */
-
-#    define FD_SETSIZE	CUPS_MAX_FDS
-#    include <sys/select.h>
-#  endif /* __sun */
-
-#  include "http.h"
-
-#  if defined HAVE_LIBSSL
-/*
- * The OpenSSL library provides its own SSL/TLS context structure for its
- * IO and protocol management...
- */
-
-#    include <openssl/err.h>
-#    include <openssl/rand.h>
-#    include <openssl/ssl.h>
-
-typedef SSL http_tls_t;
-
-#  elif defined HAVE_GNUTLS
-/*
- * The GNU TLS library is more of a "bare metal" SSL/TLS library...
- */
-#    include <gnutls/gnutls.h>
-
-typedef struct
-{
-  gnutls_session	session;	/* GNU TLS session object */
-  void			*credentials;	/* GNU TLS credentials object */
-} http_tls_t;
-
-#  elif defined(HAVE_CDSASSL)
-/*
- * Darwin's Security framework provides its own SSL/TLS context structure
- * for its IO and protocol management...
- */
-
-#    include <Security/SecureTransport.h>
-
-typedef SSLConnectionRef http_tls_t;
-
-#  endif /* HAVE_LIBSSL */
-
-/*
- * Some OS's don't have hstrerror(), most notably Solaris...
- */
-
-#  ifndef HAVE_HSTRERROR
-extern const char *cups_hstrerror(int error);
-#    define hstrerror cups_hstrerror
-#  elif defined(_AIX) || defined(__osf__)
-/*
- * AIX and Tru64 UNIX don't provide a prototype but do provide the function...
- */
-extern const char *hstrerror(int error);
-#  endif /* !HAVE_HSTRERROR */
-
-#endif /* !_CUPS_HTTP_PRIVATE_H_ */
-
-/*
- * End of "$Id$".
- */
@@ -1,345 +0,0 @@
-/*
- * "$Id$"
- *
- *   HTTP support routines for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 1997-2003 by Easy Software Products, all rights reserved.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   httpSeparate()   - Separate a Universal Resource Identifier into its
- *                      components.
- *   httpStatus()     - Return a short string describing a HTTP status code.
- *   cups_hstrerror() - hstrerror() emulation function for Solaris and others...
- */
-
-/*
- * Include necessary headers...
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <ctype.h>
-#include "string.h"
-
-#include "http.h"
-#include "ipp.h"
-
-
-/*
- * 'httpSeparate()' - Separate a Universal Resource Identifier into its
- *                    components.
- */
-
-void
-httpSeparate(const char *uri,		/* I - Universal Resource Identifier */
-             char       *method,	/* O - Method [32] (http, https, etc.) */
-	     char       *username,	/* O - Username [32] */
-	     char       *host,		/* O - Hostname [32] */
-	     int        *port,		/* O - Port number to use */
-             char       *resource)	/* O - Resource/filename [1024] */
-{
-  char		*ptr;			/* Pointer into string... */
-  const char	*atsign,		/* @ sign */
-		*slash;			/* Separator */
-  char		safeuri[HTTP_MAX_URI];	/* "Safe" local copy of URI */
-  char		quoted;			/* Quoted character */
-
-
- /*
-  * Range check input...
-  */
-
-  if (uri == NULL || method == NULL || username == NULL || host == NULL ||
-      port == NULL || resource == NULL)
-    return;
-
- /*
-  * Copy the URL to a local string to make sure we don't have a URL
-  * longer than HTTP_MAX_URI characters long...
-  */
-
-  strlcpy(safeuri, uri, sizeof(safeuri));
-
-  uri = safeuri;
-
- /*
-  * Grab the method portion of the URI...
-  */
-
-  if (strncmp(uri, "//", 2) == 0)
-  {
-   /*
-    * Workaround for HP IPP client bug...
-    */
-
-    strcpy(method, "ipp");
-  }
-  else
-  {
-   /*
-    * Standard URI with method...
-    */
-
-    for (ptr = host; *uri != ':' && *uri != '\0'; uri ++)
-      if (ptr < (host + HTTP_MAX_URI - 1))
-        *ptr++ = *uri;
-
-    *ptr = '\0';
-    if (*uri == ':')
-      uri ++;
-
-   /*
-    * If the method contains a period or slash, then it's probably
-    * hostname/filename...
-    */
-
-    if (strchr(host, '.') != NULL || strchr(host, '/') != NULL || *uri == '\0')
-    {
-      if ((ptr = strchr(host, '/')) != NULL)
-      {
-	strlcpy(resource, ptr, HTTP_MAX_URI);
-	*ptr = '\0';
-      }
-      else
-	resource[0] = '\0';
-
-      if (isdigit(*uri))
-      {
-       /*
-	* OK, we have "hostname:port[/resource]"...
-	*/
-
-	*port = strtol(uri, (char **)&uri, 10);
-
-	if (*uri == '/')
-          strlcpy(resource, uri, HTTP_MAX_URI);
-      }
-      else
-	*port = 631;
-
-      strcpy(method, "http");
-      username[0] = '\0';
-      return;
-    }
-    else
-      strlcpy(method, host, 32);
-  }
-
- /*
-  * If the method starts with less than 2 slashes then it is a local resource...
-  */
-
-  if (strncmp(uri, "//", 2) != 0)
-  {
-    strlcpy(resource, uri, HTTP_MAX_URI);
-
-    username[0] = '\0';
-    host[0]     = '\0';
-    *port       = 0;
-    return;
-  }
-
- /*
-  * Grab the username, if any...
-  */
-
-  uri += 2;
-
-  if ((slash = strchr(uri, '/')) == NULL)
-    slash = uri + strlen(uri);
-
-  if ((atsign = strchr(uri, '@')) != NULL && atsign < slash)
-  {
-   /*
-    * Got a username:password combo...
-    */
-
-    for (ptr = username; uri < atsign; uri ++)
-      if (ptr < (username + HTTP_MAX_URI - 1))
-      {
-        if (*uri == '%' && isxdigit(uri[1]) && isxdigit(uri[2]))
-	{
-	 /*
-	  * Grab a hex-encoded username and password...
-	  */
-
-          uri ++;
-	  if (isalpha(*uri))
-	    quoted = (tolower(*uri) - 'a' + 10) << 4;
-	  else
-	    quoted = (*uri - '0') << 4;
-
-          uri ++;
-	  if (isalpha(*uri))
-	    quoted |= tolower(*uri) - 'a' + 10;
-	  else
-	    quoted |= *uri - '0';
-
-          *ptr++ = quoted;
-	}
-	else
-	  *ptr++ = *uri;
-      }
-
-    *ptr = '\0';
-
-    uri = atsign + 1;
-  }
-  else
-    username[0] = '\0';
-
- /*
-  * Grab the hostname...
-  */
-
-  for (ptr = host; *uri != ':' && *uri != '/' && *uri != '\0'; uri ++)
-    if (ptr < (host + HTTP_MAX_URI - 1))
-      *ptr++ = *uri;
-
-  *ptr = '\0';
-
-  if (*uri != ':')
-  {
-    if (strcasecmp(method, "http") == 0)
-      *port = 80;
-    else if (strcasecmp(method, "https") == 0)
-      *port = 443;
-    else if (strcasecmp(method, "ipp") == 0)
-      *port = ippPort();
-    else if (strcasecmp(method, "lpd") == 0)
-      *port = 515;
-    else if (strcasecmp(method, "socket") == 0)	/* Not registered yet... */
-      *port = 9100;
-    else
-      *port = 0;
-  }
-  else
-  {
-   /*
-    * Parse port number...
-    */
-
-    *port = 0;
-    uri ++;
-    while (isdigit(*uri))
-    {
-      *port = (*port * 10) + *uri - '0';
-      uri ++;
-    }
-  }
-
-  if (*uri == '\0')
-  {
-   /*
-    * Hostname but no port or path...
-    */
-
-    resource[0] = '/';
-    resource[1] = '\0';
-    return;
-  }
-
- /*
-  * The remaining portion is the resource string...
-  */
-
-  strlcpy(resource, uri, HTTP_MAX_URI);
-}
-
-
-/*
- * 'httpStatus()' - Return a short string describing a HTTP status code.
- */
-
-const char *				/* O - String or NULL */
-httpStatus(http_status_t status)	/* I - HTTP status code */
-{
-  switch (status)
-  {
-    case HTTP_CONTINUE :
-        return ("Continue");
-    case HTTP_SWITCHING_PROTOCOLS :
-        return ("Switching Protocols");
-    case HTTP_OK :
-        return ("OK");
-    case HTTP_CREATED :
-        return ("Created");
-    case HTTP_ACCEPTED :
-        return ("Accepted");
-    case HTTP_NO_CONTENT :
-        return ("No Content");
-    case HTTP_NOT_MODIFIED :
-        return ("Not Modified");
-    case HTTP_BAD_REQUEST :
-        return ("Bad Request");
-    case HTTP_UNAUTHORIZED :
-        return ("Unauthorized");
-    case HTTP_FORBIDDEN :
-        return ("Forbidden");
-    case HTTP_NOT_FOUND :
-        return ("Not Found");
-    case HTTP_REQUEST_TOO_LARGE :
-        return ("Request Entity Too Large");
-    case HTTP_URI_TOO_LONG :
-        return ("URI Too Long");
-    case HTTP_UPGRADE_REQUIRED :
-        return ("Upgrade Required");
-    case HTTP_NOT_IMPLEMENTED :
-        return ("Not Implemented");
-    case HTTP_NOT_SUPPORTED :
-        return ("Not Supported");
-    default :
-        return ("Unknown");
-  }
-}
-
-
-#ifndef HAVE_HSTRERROR
-/*
- * 'cups_hstrerror()' - hstrerror() emulation function for Solaris and others...
- */
-
-const char *				/* O - Error string */
-cups_hstrerror(int error)		/* I - Error number */
-{
-  static const char * const errors[] =	/* Error strings */
-		{
-		  "OK",
-		  "Host not found.",
-		  "Try again.",
-		  "Unrecoverable lookup error.",
-		  "No data associated with name."
-		};
-
-
-  if (error < 0 || error > 4)
-    return ("Unknown hostname lookup error.");
-  else
-    return (errors[error]);
-}
-#endif /* !HAVE_HSTRERROR */
-
-
-/*
- * End of "$Id$".
- */
@@ -4,7 +4,7 @@
 *   Hyper-Text Transport Protocol definitions for the Common UNIX Printing
 *   System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2001 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
@@ -21,8 +21,6 @@
 *       Voice: (301) 373-9603
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
- *
- *   This file is subject to the Apple OS-Developed Software exception.
 */

 #ifndef _CUPS_HTTP_H_
@@ -34,7 +32,7 @@

 #  include <string.h>
 #  include <time.h>
-#  ifdef WIN32
+#  if defined(WIN32) || defined(__EMX__)
 #    include <winsock.h>
 #  else
 #    include <unistd.h>
@@ -46,10 +44,8 @@
 #    include <arpa/inet.h>
 #    include <netinet/in_systm.h>
 #    include <netinet/ip.h>
-#    if !defined(__APPLE__) || !defined(TCP_NODELAY)
-#      include <netinet/tcp.h>
-#    endif /* !__APPLE__ || !TCP_NODELAY */
-#  endif /* WIN32 */
+#    include <netinet/tcp.h>
+#  endif /* WIN32 || __EMX__ */

 #  include "md5.h"

@@ -281,16 +277,6 @@ typedef struct
  int			nonce_count;	/* Nonce count */
  void			*tls;		/* TLS state information */
  http_encryption_t	encryption;	/* Encryption requirements */
-  /**** New in CUPS 1.1.19 ****/
-  fd_set		*input_set;	/* select() set for httpWait() */
-  http_status_t		expect;		/* Expect: header */
-  char			*cookie;	/* Cookie value(s) */
-  /**** New in CUPS 1.1.20 ****/
-  char			authstring[HTTP_MAX_VALUE],
-					/* Current Authentication value */
-			userpass[HTTP_MAX_VALUE];
-					/* Username:password string */
-  int			digest_tries;	/* Number of tries for digest auth */
 } http_t;


@@ -322,11 +308,7 @@ extern int		httpHead(http_t *http, const char *uri);
 extern void		httpInitialize(void);
 extern int		httpOptions(http_t *http, const char *uri);
 extern int		httpPost(http_t *http, const char *uri);
-extern int		httpPrintf(http_t *http, const char *format, ...)
-#  ifdef __GNUC__
-__attribute__ ((__format__ (__printf__, 2, 3)))
-#  endif /* __GNUC__ */
-;
+extern int		httpPrintf(http_t *http, const char *format, ...);
 extern int		httpPut(http_t *http, const char *uri);
 extern int		httpRead(http_t *http, char *buffer, int length);
 extern int		httpReconnect(http_t *http);
@@ -348,12 +330,6 @@ extern char		*httpMD5Final(const char *, const char *, const char *,
 			              char [33]);
 extern char		*httpMD5String(const md5_byte_t *, char [33]);

-/**** New in CUPS 1.1.19 ****/
-extern void		httpClearCookie(http_t *http);
-#define httpGetCookie(http) ((http)->cookie)
-extern void		httpSetCookie(http_t *http, const char *cookie);
-extern int		httpWait(http_t *http, int msec);
-

 /*
 * C++ magic...
@@ -1,175 +0,0 @@
-/*
- * "$Id$"
- *
- *   Internet Printing Protocol support functions for the Common UNIX
- *   Printing System (CUPS).
- *
- *   Copyright 1997-2003 by Easy Software Products, all rights reserved.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   ippErrorString() - Return a textual message for the given error
- *                      message.
- *   ippPort()        - Return the default IPP port number.
- *   ippSetPort()     - Set the default port number.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "string.h"
-#include "language.h"
-
-#include "ipp.h"
-#include "debug.h"
-#include <ctype.h>
-
-
-/*
- * Local globals...
- */
-
-static int	ipp_port = 0;
-
-
-/*
- * 'ippErrorString()' - Return a textual message for the given error message.
- */
-
-const char *				/* O - Text string */
-ippErrorString(ipp_status_t error)	/* I - Error status */
-{
-  static char	unknown[255];		/* Unknown error statuses */
-  static const char * const status_oks[] =
-		{			/* "OK" status codes */
-		  "successful-ok",
-		  "successful-ok-ignored-or-substituted-attributes",
-		  "successful-ok-conflicting-attributes",
-		  "successful-ok-ignored-subscriptions",
-		  "successful-ok-ignored-notifications",
-		  "successful-ok-too-many-events",
-		  "successful-ok-but-cancel-subscription"
-		},
-		* const status_400s[] =	/* Client errors */
-		{
-		  "client-error-bad-request",
-		  "client-error-forbidden",
-		  "client-error-not-authenticated",
-		  "client-error-not-authorized",
-		  "client-error-not-possible",
-		  "client-error-timeout",
-		  "client-error-not-found",
-		  "client-error-gone",
-		  "client-error-request-entity-too-large",
-		  "client-error-request-value-too-long",
-		  "client-error-document-format-not-supported",
-		  "client-error-attributes-or-values-not-supported",
-		  "client-error-uri-scheme-not-supported",
-		  "client-error-charset-not-supported",
-		  "client-error-conflicting-attributes",
-		  "client-error-compression-not-supported",
-		  "client-error-compression-error",
-		  "client-error-document-format-error",
-		  "client-error-document-access-error",
-		  "client-error-attributes-not-settable",
-		  "client-error-ignored-all-subscriptions",
-		  "client-error-too-many-subscriptions",
-		  "client-error-ignored-all-notifications",
-		  "client-error-print-support-file-not-found"
-		},
-		* const status_500s[] =	/* Server errors */
-		{
-		  "server-error-internal-error",
-		  "server-error-operation-not-supported",
-		  "server-error-service-unavailable",
-		  "server-error-version-not-supported",
-		  "server-error-device-error",
-		  "server-error-temporary-error",
-		  "server-error-not-accepting-jobs",
-		  "server-error-busy",
-		  "server-error-job-canceled",
-		  "server-error-multiple-document-jobs-not-supported",
-		  "server-error-printer-is-deactivated"
-		};
-
-
- /*
-  * See if the error code is a known value...
-  */
-
-  if (error >= IPP_OK && error <= IPP_OK_BUT_CANCEL_SUBSCRIPTION)
-    return (status_oks[error]);
-  else if (error == IPP_REDIRECTION_OTHER_SITE)
-    return ("redirection-other-site");
-  else if (error >= IPP_BAD_REQUEST && error <= IPP_PRINT_SUPPORT_FILE_NOT_FOUND)
-    return (status_400s[error - IPP_BAD_REQUEST]);
-  else if (error >= IPP_INTERNAL_ERROR && error <= IPP_PRINTER_IS_DEACTIVATED)
-    return (status_500s[error - IPP_INTERNAL_ERROR]);
-
- /*
-  * No, build an "unknown-xxxx" error string...
-  */
-
-  sprintf(unknown, "unknown-%04x", error);
-
-  return (unknown);
-}
-
-
-/*
- * 'ippPort()' - Return the default IPP port number.
- */
-
-int				/* O - Port number */
-ippPort(void)
-{
-  const char	*server_port;	/* SERVER_PORT environment variable */
-  struct servent *port;		/* Port number info */  
-
-
-  if (ipp_port)
-    return (ipp_port);
-  else if ((server_port = getenv("IPP_PORT")) != NULL)
-    return (ipp_port = atoi(server_port));
-  else if ((port = getservbyname("ipp", NULL)) == NULL)
-    return (ipp_port = IPP_PORT);
-  else
-    return (ipp_port = ntohs(port->s_port));
-}
-
-
-/*
- * 'ippSetPort()' - Set the default port number.
- */
-
-void
-ippSetPort(int p)		/* I - Port number to use */
-{
-  ipp_port = p;
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -4,7 +4,7 @@
 *   Internet Printing Protocol definitions for the Common UNIX Printing
 *   System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-2001 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -21,8 +21,6 @@
 *       Voice: (301) 373-9603
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
- *
- *   This file is subject to the Apple OS-Developed Software exception.
 */

 #ifndef _CUPS_IPP_H_
@@ -48,14 +46,12 @@ extern "C" {
 * IPP version string...
 */

-#  define IPP_VERSION		"\001\001"
+#  define IPP_VERSION		"\001\000"

 /*
- * IPP registered port number...
- *
- * Note: Applications should never use IPP_PORT, but instead use the
- * ippPort() function to allow overrides via the IPP_PORT environment
- * variable and services file if needed!
+ * IPP registered port number...  This is the default value - applications
+ * should use the ippPort() function so that you can customize things in
+ * /etc/services if needed!
 */

 #  define IPP_PORT		631
@@ -307,10 +303,6 @@ typedef enum			/**** IPP status codes... ****/

 typedef unsigned char ipp_uchar_t;/**** Unsigned 8-bit integer/character ****/

-/**** New in CUPS 1.1.19 ****/
-typedef int	(*ipp_iocb_t)(void *, ipp_uchar_t *, int);
-				/**** IPP IO Callback Function ****/
-
 typedef union			/**** Request Header ****/
 {
  struct			/* Any Header */
@@ -333,18 +325,8 @@ typedef union			/**** Request Header ****/
    ipp_status_t status_code;	/* Status code */
    int		request_id;	/* Request ID */
  }		status;
-
-  /**** New in CUPS 1.1.19 ****/
-  struct			/* Event Header */
-  {
-    ipp_uchar_t	version[2];	/* Protocol version number */
-    int		status_code;	/* Status code */
-    int		request_id;	/* Request ID */
-  }		event;
 } ipp_request_t;

-/**** New in CUPS 1.1.19 ****/
-typedef struct ipp_str ipp_t;

 typedef union			/**** Attribute Value ****/
 {
@@ -378,9 +360,6 @@ typedef union			/**** Attribute Value ****/
    int		length;		/* Length of attribute */
    void	*data;		/* Data in attribute */
  }		unknown;	/* Unknown attribute type */
-
-/**** New in CUPS 1.1.19 ****/
-  ipp_t		*collection;	/* Collection value */
 } ipp_value_t;

 typedef struct ipp_attribute_s	/**** Attribute ****/
@@ -393,7 +372,7 @@ typedef struct ipp_attribute_s	/**** Attribute ****/
  ipp_value_t	values[1];	/* Values */
 } ipp_attribute_t;

-struct ipp_str			/**** IPP Request/Response/Notification ****/
+typedef struct			/**** Request State ****/
 {
  ipp_state_t	state;		/* State of request */
  ipp_request_t	request;	/* Request header */
@@ -401,7 +380,7 @@ struct ipp_str			/**** IPP Request/Response/Notification ****/
 		*last,		/* Last attribute in list */
 		*current;	/* Current attribute (for read/write) */
  ipp_tag_t	curtag;		/* Current attribute group tag */
-};
+} ipp_t;


 /*
@@ -419,7 +398,7 @@ extern ipp_attribute_t	*ippAddResolution(ipp_t *ipp, ipp_tag_t group, const char
 extern ipp_attribute_t	*ippAddResolutions(ipp_t *ipp, ipp_tag_t group, const char *name, int num_values, ipp_res_t units, const int *xres, const int *yres);
 extern ipp_attribute_t	*ippAddSeparator(ipp_t *ipp);
 extern ipp_attribute_t	*ippAddString(ipp_t *ipp, ipp_tag_t group, ipp_tag_t type, const char *name, const char *charset, const char *value);
-extern ipp_attribute_t	*ippAddStrings(ipp_t *ipp, ipp_tag_t group, ipp_tag_t type, const char *name, int num_values, const char *charset, const char * const *values);
+extern ipp_attribute_t	*ippAddStrings(ipp_t *ipp, ipp_tag_t group, ipp_tag_t type, const char *name, int num_values, const char *charset, const char **values);
 extern time_t		ippDateToTime(const ipp_uchar_t *date);
 extern void		ippDelete(ipp_t *ipp);
 extern const char	*ippErrorString(ipp_status_t error);
@@ -435,20 +414,6 @@ extern ipp_state_t	ippWrite(http_t *http, ipp_t *ipp);
 extern int		ippPort(void);
 extern void		ippSetPort(int p);

-/**** New in CUPS 1.1.19 ****/
-extern ipp_attribute_t	*ippAddCollection(ipp_t *ipp, ipp_tag_t group, const char *name, ipp_t *value);
-extern ipp_attribute_t	*ippAddCollections(ipp_t *ipp, ipp_tag_t group, const char *name, int num_values, const ipp_t **values);
-extern void		ippDeleteAttribute(ipp_t *ipp, ipp_attribute_t *attr);
-extern ipp_state_t	ippReadFile(int fd, ipp_t *ipp);
-extern ipp_state_t	ippReadIO(void *src, ipp_iocb_t cb, int blocking, ipp_t *parent, ipp_t *ipp);
-extern ipp_state_t	ippWriteFile(int fd, ipp_t *ipp);
-extern ipp_state_t	ippWriteIO(void *dst, ipp_iocb_t cb, int blocking, ipp_t *parent, ipp_t *ipp);
-
-
-/*
- * "Private" functions used internally by CUPS...
- */
-
 extern ipp_attribute_t	*_ipp_add_attr(ipp_t *, int);
 extern void		_ipp_free_attr(ipp_attribute_t *);

@@ -3,7 +3,7 @@
 *
 *   I18N/language support for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-2001 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -21,19 +21,13 @@
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
 *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
 * Contents:
 *
- *   cupsLangEncoding()   - Return the character encoding (us-ascii, etc.)
- *                          for the given language.
- *   cupsLangFlush()      - Flush all language data out of the cache.
- *   cupsLangFree()       - Free language data.
- *   cupsLangGet()        - Get a language.
- *   _cupsRestoreLocale() - Restore the original locale...
- *   _cupsSaveLocale()    - Set the locale and save a copy of the old locale...
- *   appleLangDefault()   - Get the default locale string.
- *   cups_cache_lookup()  - Lookup a language in the cache...
+ *   cupsLangEncoding() - Return the character encoding (us-ascii, etc.)
+ *                        for the given language.
+ *   cupsLangFlush()    - Flush all language data out of the cache.
+ *   cupsLangFree()     - Free language data.
+ *   cupsLangGet()      - Get a language.
 */

 /*
@@ -43,39 +37,18 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#ifdef WIN32
-#  include <io.h>
-#else
-#  include <unistd.h>
-#endif /* WIN32 */
 #include "string.h"
 #include "language.h"
-#include "debug.h"
-
-
-/*
- * Local functions...
- */
-
-#ifdef __APPLE__
-#  include <CoreFoundation/CoreFoundation.h>
-static const char	*appleLangDefault(void);
-#endif /* __APPLE__ */
-
-static cups_lang_t	*cups_cache_lookup(const char *name,
-			                   cups_encoding_t encoding);


 /*
 * Local globals...
 */

-static cups_lang_t	*lang_cache = NULL;
-					/* Language string cache */
-static const char	lang_blank[] = "";
-					/* Blank constant string */
-static const char * const lang_encodings[] =
-			{		/* Encoding strings */
+static cups_lang_t	*lang_cache = NULL;	/* Language string cache */
+static char		*lang_blank = "";	/* Blank constant string */
+static char		*lang_encodings[] =	/* Encoding strings */
+			{
 			  "us-ascii",
 			  "iso-8859-1",
 			  "iso-8859-2",
@@ -100,12 +73,10 @@ static const char * const lang_encodings[] =
 			  "windows-1255",
 			  "windows-1256",
 			  "windows-1257",
-			  "windows-1258",
-			  "koi8-r",
-			  "koi8-u"
+			  "windows-1258"
 			};
-static const char * const lang_default[] =
-			{		/* Default POSIX locale */
+static char		*lang_default[] =	/* Default POSIX locale */
+			{
 #include "cups_C.h"
 			  NULL
 			};
@@ -120,9 +91,9 @@ char *					/* O - Character encoding */
 cupsLangEncoding(cups_lang_t *lang)	/* I - Language data */
 {
  if (lang == NULL)
-    return ((char*)lang_encodings[0]);
+    return (lang_encodings[0]);
  else
-    return ((char*)lang_encodings[lang->encoding]);
+    return (lang_encodings[lang->encoding]);
 }


@@ -133,34 +104,20 @@ cupsLangEncoding(cups_lang_t *lang)	/* I - Language data */
 void
 cupsLangFlush(void)
 {
-  int		i;			/* Looping var */
-  cups_lang_t	*lang,			/* Current language */
-		*next;			/* Next language */
+  int		i;	/* Looping var */
+  cups_lang_t	*lang,	/* Current language */
+		*next;	/* Next language */


- /*
-  * Free all languages in the cache...
-  */
-
  for (lang = lang_cache; lang != NULL; lang = next)
  {
-   /*
-    * Free all messages...
-    */
-
    for (i = 0; i < CUPS_MSG_MAX; i ++)
      if (lang->messages[i] != NULL && lang->messages[i] != lang_blank)
        free(lang->messages[i]);

-   /*
-    * Then free the language structure itself...
-    */
-
    next = lang->next;
    free(lang);
  }
-
-  lang_cache = NULL;
 }


@@ -182,266 +139,115 @@ cupsLangFree(cups_lang_t *lang)	/* I - Language to free */
 * 'cupsLangGet()' - Get a language.
 */

-cups_lang_t *				/* O - Language data */
-cupsLangGet(const char *language)	/* I - Language or locale */
+cups_lang_t *			/* O - Language data */
+cupsLangGet(const char *language) /* I - Language or locale */
 {
-  int			i, count;	/* Looping vars */
-  char			langname[16],	/* Requested language name */
-			country[16],	/* Country code */
-			charset[16],	/* Character set */
-			*ptr,		/* Pointer into language/ */
-			real[48],	/* Real language name */
-			filename[1024],	/* Filename for language locale file */
-			*localedir;	/* Directory for locale files */
-  cups_encoding_t	encoding;	/* Encoding to use */
-  FILE			*fp;		/* Language locale file pointer */
-  char			line[1024];	/* Line from file */
-  cups_msg_t		msg;		/* Message number */
-  char			*text;		/* Message text */
-  cups_lang_t		*lang;		/* Current language... */
-  char			*oldlocale;	/* Old locale name */
-  static const char * const locale_encodings[] =
-			{		/* Locale charset names */
-			  "ASCII",
-			  "ISO8859-1",
-			  "ISO8859-2",
-			  "ISO8859-3",
-			  "ISO8859-4",
-			  "ISO8859-5",
-			  "ISO8859-6",
-			  "ISO8859-7",
-			  "ISO8859-8",
-			  "ISO8859-9",
-			  "ISO8859-10",
-			  "UTF-8",
-			  "ISO8859-13",
-			  "ISO8859-14",
-			  "ISO8859-15",
-			  "CP874",
-			  "CP1250",
-			  "CP1251",
-			  "CP1252",
-			  "CP1253",
-			  "CP1254",
-			  "CP1255",
-			  "CP1256",
-			  "CP1257",
-			  "CP1258",
-			  "KOI8R",
-			  "KOI8U"
-			};
+  int		i, count;	/* Looping vars */
+  char		langname[16],	/* Requested language name */
+		real[16],	/* Real language name */
+		filename[1024],	/* Filename for language locale file */
+		*localedir;	/* Directory for locale files */
+  FILE		*fp;		/* Language locale file pointer */
+  char		line[1024];	/* Line from file */
+  cups_msg_t	msg;		/* Message number */
+  char		*text;		/* Message text */
+  cups_lang_t	*lang;		/* Current language... */


-#ifdef __APPLE__
- /*
-  * Apple's setlocale doesn't give us the user's localization 
-  * preference so we have to look it up this way...
-  */
-
-  if (language == NULL)
-    language = appleLangDefault();
-#elif defined(LC_MESSAGES)
-  if (language == NULL)
-  {
-   /*
-    * First see if the locale has been set; if it is still "C" or
-    * "POSIX", set the locale to the default...
-    */
-
-    language = setlocale(LC_MESSAGES, NULL);
-
-    if (!language || !strcmp(language, "C") || !strcmp(language, "POSIX"))
-      language = setlocale(LC_MESSAGES, "");
-  }
-#else
-  if (language == NULL)
-  {
-   /*
-    * First see if the locale has been set; if it is still "C" or
-    * "POSIX", set the locale to the default...
-    */
-
-    language = setlocale(LC_ALL, NULL);
-
-    if (!language || !strcmp(language, "C") || !strcmp(language, "POSIX"))
-      language = setlocale(LC_ALL, "");
-  }
-#endif /* __APPLE__ */
-
 /*
-  * If "language" is NULL at this point, then chances are we are using
-  * a language that is not installed for the base OS.
-  */
-
-  if (!language)
-  {
-   /*
-    * Switch to the value of the "LANG" environment variable, and if
-    * that is NULL as well, use "C".
-    */
-
-    if ((language = getenv("LANG")) == NULL)
-      language = "C";
-  }
-
- /*
-  * Set the locale back to POSIX while we do string ops, since
-  * apparently some buggy C libraries break ctype() for non-I18N
-  * chars...
-  */
-
-#if defined(__APPLE__)
-  /* The ctype bug isn't in Apple's libc */
-#elif !defined(LC_CTYPE)
-  oldlocale = _cupsSaveLocale(LC_ALL, "C");
-#else
-  oldlocale = _cupsSaveLocale(LC_CTYPE, "C");
-#endif /* __APPLE__ */
-
- /*
-  * Parse the language string passed in to a locale string. "C" is the
+  * Convert the language string passed in to a locale string. "C" is the
  * standard POSIX locale and is copied unchanged.  Otherwise the
-  * language string is converted from ll-cc[.charset] (language-country)
-  * to ll_CC[.CHARSET] to match the file naming convention used by all
-  * POSIX-compliant operating systems.  Invalid language names are mapped
-  * to the POSIX locale.
+  * language string is converted from ll-cc (language-country) to ll_cc
+  * to match the file naming convention used by all POSIX-compliant
+  * operating systems.  Any trailing character set specification is
+  * dropped.
  */

-  country[0] = '\0';
-  charset[0] = '\0';
-
-  if (language == NULL || !language[0] ||
+  if (language == NULL || language[0] == '\0' ||
      strcmp(language, "POSIX") == 0)
    strcpy(langname, "C");
  else
  {
   /*
-    * Copy the parts of the locale string over safely...
+    * Copy the locale string over safely...
    */

-    for (ptr = langname; *language; language ++)
-      if (*language == '_' || *language == '-' || *language == '.')
-	break;
-      else if (ptr < (langname + sizeof(langname) - 1))
-        *ptr++ = tolower(*language);
-
-    *ptr = '\0';
-
-    if (*language == '_' || *language == '-')
-    {
-     /*
-      * Copy the country code...
-      */
-
-      for (language ++, ptr = country; *language; language ++)
-	if (*language == '.')
-	  break;
-	else if (ptr < (country + sizeof(country) - 1))
-          *ptr++ = toupper(*language);
-
-      *ptr = '\0';
-    }
-
-    if (*language == '.')
-    {
-     /*
-      * Copy the encoding...
-      */
-
-      for (language ++, ptr = charset; *language; language ++)
-	if (ptr < (charset + sizeof(charset) - 1))
-          *ptr++ = toupper(*language);
-
-      *ptr = '\0';
-    }
+    strncpy(langname, language, sizeof(langname) - 1);
+    langname[sizeof(langname) - 1] = '\0';

   /*
-    * Force a POSIX locale for an invalid language name...
+    * Strip charset from "locale.charset"...
    */

-    if (strlen(langname) != 2)
+    if ((text = strchr(langname, '.')) != NULL)
+      *text = '\0';
+  }
+
+  if (strlen(langname) < 2)
+    strcpy(real, "C");
+  else
+  {
+    real[0] = tolower(langname[0]);
+    real[1] = tolower(langname[1]);
+
+    if (langname[2] == '_' || langname[2] == '-')
    {
-      strcpy(langname, "C");
-      country[0] = '\0';
-      charset[0] = '\0';
+      real[2]     = '_';
+      real[3]     = toupper(langname[3]);
+      real[4]     = toupper(langname[4]);
+      real[5]     = '\0';
+      langname[5] = '\0';
+    }
+    else
+    {
+      langname[2] = '\0';
+      real[2]     = '\0';
    }
  }

 /*
-  * Restore the locale...
-  */
-
-#if defined(__APPLE__)
-  /* The ctype bug isn't in Apple's libc */
-#elif !defined(LC_CTYPE)
-  _cupsRestoreLocale(LC_ALL, oldlocale);
-#else
-  _cupsRestoreLocale(LC_CTYPE, oldlocale);
-#endif /* __APPLE__ */
-
- /*
-  * Figure out the desired encoding...
-  */
-
-  encoding = CUPS_AUTO_ENCODING;
-
-  if (charset[0])
-  {
-    for (i = 0; i < (int)(sizeof(locale_encodings) / sizeof(locale_encodings[0])); i ++)
-      if (!strcasecmp(charset, locale_encodings[i]))
-      {
-	encoding = (cups_encoding_t)i;
-	break;
-      }
-  }
-
- /*
-  * Now find the message catalog for this locale...
+  * Next try to open a locale file; we will try the country-localized file
+  * first, and then look for generic language file.  If all else fails we
+  * will use the POSIX locale.
  */

  if ((localedir = getenv("LOCALEDIR")) == NULL)
    localedir = CUPS_LOCALEDIR;

- /*
-  * See if we already have this language/country loaded...
-  */
-
-  snprintf(real, sizeof(real), "%s_%s", langname, country);
-
-  if ((lang = cups_cache_lookup(real, encoding)) != NULL)
-    return (lang);
-
  snprintf(filename, sizeof(filename), "%s/%s/cups_%s", localedir, real, real);

-  if (!country[0] || access(filename, 0))
-  {
-   /*
-    * Country localization not available, look for generic localization...
-    */
-
-    if ((lang = cups_cache_lookup(langname, encoding)) != NULL)
-      return (lang);
-
-    snprintf(filename, sizeof(filename), "%s/%s/cups_%s", localedir,
-             langname, langname);
-
-    if (access(filename, 0))
+  if ((fp = fopen(filename, "r")) == NULL)
+    if (strlen(real) > 2)
    {
     /*
-      * No generic localization, so use POSIX...
+      * Nope, see if we can open a generic language file...
      */

-      strcpy(real, "C");
-      snprintf(filename, sizeof(filename), "%s/C/cups_C", localedir);
+      real[2] = '\0';
+      snprintf(filename, sizeof(filename), "%s/%s/cups_%s", localedir, real,
+               real);
+      fp = fopen(filename, "r");
    }
-    else
-      strcpy(real, langname);
-  }

 /*
-  * Open the messages file; the first line contains the default
-  * language encoding (us-ascii, iso-8859-1, etc.), and the rest are
-  * messages consisting of:
+  * Then see if we already have this language loaded...
+  */
+
+  for (lang = lang_cache; lang != NULL; lang = lang->next)
+    if (strcmp(lang->language, langname) == 0)
+    {
+      lang->used ++;
+
+      if (fp != NULL)
+        fclose(fp);
+
+      return (lang);
+    }
+
+ /*
+  * OK, we have an open messages file; the first line will contain the
+  * language encoding (us-ascii, iso-8859-1, etc.), and the rest will
+  * be messages consisting of:
  *
  *    #### SP message text
  *
@@ -456,13 +262,11 @@ cupsLangGet(const char *language)	/* I - Language or locale */
  * All leading whitespace is deleted.
  */

-  if (strcmp(real, "C"))
-    fp = fopen(filename, "r");
-  else
-    fp = NULL;
-
  if (fp == NULL)
-    strlcpy(line, lang_default[0], sizeof(line));
+  {
+    strncpy(line, lang_default[0], sizeof(line) - 1);
+    line[sizeof(line) - 1] = '\0';
+  }
  else if (fgets(line, sizeof(line), fp) == NULL)
  {
   /*
@@ -511,7 +315,7 @@ cupsLangGet(const char *language)	/* I - Language or locale */
    if (lang->messages[i] != NULL && lang->messages[i] != lang_blank)
      free(lang->messages[i]);

-    lang->messages[i] = (char*)lang_blank;
+    lang->messages[i] = lang_blank;
  }

 /*
@@ -519,21 +323,15 @@ cupsLangGet(const char *language)	/* I - Language or locale */
  */

  lang->used ++;
-  strlcpy(lang->language, real, sizeof(lang->language));
+  strncpy(lang->language, langname, sizeof(lang->language) - 1);
+  lang->language[sizeof(lang->language) - 1] = '\0';

-  if (encoding != CUPS_AUTO_ENCODING)
-    lang->encoding = encoding;
-  else
-  {
-    lang->encoding = CUPS_US_ASCII;
-
-    for (i = 0; i < (sizeof(lang_encodings) / sizeof(lang_encodings[0])); i ++)
-      if (strcmp(lang_encodings[i], line) == 0)
-      {
-	lang->encoding = (cups_encoding_t)i;
-	break;
-      }
-  }
+  for (i = 0; i < (sizeof(lang_encodings) / sizeof(lang_encodings[0])); i ++)
+    if (strcmp(lang_encodings[i], line) == 0)
+    {
+      lang->encoding = (cups_encoding_t)i;
+      break;
+    }

 /*
  * Read the strings from the file...
@@ -553,7 +351,8 @@ cupsLangGet(const char *language)	/* I - Language or locale */
      if (lang_default[count] == NULL)
        break;

-      strlcpy(line, lang_default[count], sizeof(line));
+      strncpy(line, lang_default[count], sizeof(line) - 1);
+      /* Already set last byte to 0 above... */
    }
    else if (fgets(line, sizeof(line), fp) == NULL)
      break;
@@ -603,329 +402,6 @@ cupsLangGet(const char *language)	/* I - Language or locale */
 }


-/*
- * '_cupsRestoreLocale()' - Restore the original locale...
- */
-
-void
-_cupsRestoreLocale(int  category,	/* I - Category */
-                   char *oldlocale)	/* I - Old locale or NULL */
-{
-  DEBUG_printf(("_cupsRestoreLocale(category=%d, oldlocale=\"%s\")\n",
-                category, oldlocale));
-
-  if (oldlocale)
-  {
-   /*
-    * Reset the locale and free the locale string...
-    */
-
-    setlocale(category, oldlocale);
-    free(oldlocale);
-  }
-}
-
-
-/*
- * '_cupsSaveLocale()' - Set the locale and save a copy of the old locale...
- */
-
-char *					/* O - Old locale or NULL */
-_cupsSaveLocale(int        category,	/* I - Category */
-                const char *locale)	/* I - New locale or NULL */
-{
-  char	*oldlocale;			/* Old locale */
-
-
-  DEBUG_printf(("_cupsSaveLocale(category=%d, locale=\"%s\")\n",
-                category, locale));
-
- /*
-  * Get the old locale and copy it...
-  */
-
-  if ((oldlocale = setlocale(category, NULL)) != NULL)
-    oldlocale = strdup(oldlocale);
-
-  DEBUG_printf(("    oldlocale=\"%s\"\n", oldlocale ? oldlocale : "(null)"));
-
- /*
-  * Set the new locale...
-  */
-
-  setlocale(category, locale);
-
- /*
-  * Return a copy of the old locale...
-  */
-
-  return (oldlocale);
-}
-
-
-#ifdef __APPLE__
-/*
- * Code & data to translate OSX's language names to their ISO 639-1 locale.
- *
- * The first version uses the new CoreFoundation API added in 10.3 (Panther),
- * the second is for 10.2 (Jaguar).
- */
-
-#  ifdef HAVE_CF_LOCALE_ID
-/*
- * 'appleLangDefault()' - Get the default locale string.
- */
-
-static const char *			/* O - Locale string */
-appleLangDefault(void)
-{
-  CFPropertyListRef 	localizationList;
-					/* List of localization data */
-  CFStringRef		languageName;	/* Current name */
-  CFStringRef		localeName;	/* Canonical from of name */
-  static char		language[32] = "";
-					/* Cached language */
-
-
- /*
-  * Only do the lookup and translation the first time.
-  */
-
-  if (!language[0])
-  {
-    localizationList =
-        CFPreferencesCopyAppValue(CFSTR("AppleLanguages"),
-                                  kCFPreferencesCurrentApplication);
-
-    if (localizationList != NULL)
-    {
-      if (CFGetTypeID(localizationList) == CFArrayGetTypeID() &&
-	  CFArrayGetCount(localizationList) > 0)
-      {
-        languageName = CFArrayGetValueAtIndex(localizationList, 0);
-
-        if (languageName != NULL &&
-            CFGetTypeID(languageName) == CFStringGetTypeID())
-        {
-	  localeName = CFLocaleCreateCanonicalLocaleIdentifierFromString(
-	                   kCFAllocatorDefault, languageName);
-
-	  if (localeName != NULL)
-	  {
-	    CFStringGetCString(localeName, language, sizeof(language),
-			       kCFStringEncodingASCII);
-	    CFRelease(localeName);
-
-	    if (!strcmp(language, "en"))
-	      strlcpy(language, "en_US.UTF-8", sizeof(language));
-	    else if (strchr(language, '.') == NULL)
-	      strlcat(language, ".UTF-8", sizeof(language));
-	  }
-        }
-      }
-
-      CFRelease(localizationList);
-    }
-  
-   /*
-    * If we didn't find the language, default to en_US...
-    */
-
-    if (!language[0])
-      strlcpy(language, "en_US.UTF-8", sizeof(language));
-  }
-
- /*
-  * Return the cached locale...
-  */
-
-  return (language);
-}
-#  else
-/*
- * Code & data to translate OSX 10.2's language names to their ISO 639-1
- * locale.
- */
-
-typedef struct
-{
-  const char * const name;		/* Language name */
-  const char * const locale;		/* Locale name */
-} apple_name_locale_t;
-
-static const apple_name_locale_t apple_name_locale[] =
-{
-  { "English"     , "en_US.UTF-8" },	{ "French"     , "fr.UTF-8" },
-  { "German"      , "de.UTF-8" },	{ "Italian"    , "it.UTF-8" },  
-  { "Dutch"       , "nl.UTF-8" },	{ "Swedish"    , "sv.UTF-8" },
-  { "Spanish"     , "es.UTF-8" },	{ "Danish"     , "da.UTF-8" },  
-  { "Portuguese"  , "pt.UTF-8" },	{ "Norwegian"  , "no.UTF-8" },
-  { "Hebrew"      , "he.UTF-8" },	{ "Japanese"   , "ja.UTF-8" },  
-  { "Arabic"      , "ar.UTF-8" },	{ "Finnish"    , "fi.UTF-8" },
-  { "Greek"       , "el.UTF-8" },	{ "Icelandic"  , "is.UTF-8" },  
-  { "Maltese"     , "mt.UTF-8" },	{ "Turkish"    , "tr.UTF-8" },
-  { "Croatian"    , "hr.UTF-8" },	{ "Chinese"    , "zh.UTF-8" },  
-  { "Urdu"        , "ur.UTF-8" },	{ "Hindi"      , "hi.UTF-8" },
-  { "Thai"        , "th.UTF-8" },	{ "Korean"     , "ko.UTF-8" },  
-  { "Lithuanian"  , "lt.UTF-8" },	{ "Polish"     , "pl.UTF-8" },
-  { "Hungarian"   , "hu.UTF-8" },	{ "Estonian"   , "et.UTF-8" },  
-  { "Latvian"     , "lv.UTF-8" },	{ "Sami"       , "se.UTF-8" },
-  { "Faroese"     , "fo.UTF-8" },	{ "Farsi"      , "fa.UTF-8" },  
-  { "Russian"     , "ru.UTF-8" },	{ "Chinese"    , "zh.UTF-8" },
-  { "Dutch"       , "nl.UTF-8" },	{ "Irish"      , "ga.UTF-8" },  
-  { "Albanian"    , "sq.UTF-8" },	{ "Romanian"   , "ro.UTF-8" },
-  { "Czech"       , "cs.UTF-8" },	{ "Slovak"     , "sk.UTF-8" },  
-  { "Slovenian"   , "sl.UTF-8" },	{ "Yiddish"    , "yi.UTF-8" },
-  { "Serbian"     , "sr.UTF-8" },	{ "Macedonian" , "mk.UTF-8" },  
-  { "Bulgarian"   , "bg.UTF-8" },	{ "Ukrainian"  , "uk.UTF-8" },
-  { "Byelorussian", "be.UTF-8" },	{ "Uzbek"      , "uz.UTF-8" },  
-  { "Kazakh"      , "kk.UTF-8" },	{ "Azerbaijani", "az.UTF-8" },
-  { "Azerbaijani" , "az.UTF-8" },	{ "Armenian"   , "hy.UTF-8" },  
-  { "Georgian"    , "ka.UTF-8" },	{ "Moldavian"  , "mo.UTF-8" },
-  { "Kirghiz"     , "ky.UTF-8" },	{ "Tajiki"     , "tg.UTF-8" },  
-  { "Turkmen"     , "tk.UTF-8" },	{ "Mongolian"  , "mn.UTF-8" },
-  { "Mongolian"   , "mn.UTF-8" },	{ "Pashto"     , "ps.UTF-8" },  
-  { "Kurdish"     , "ku.UTF-8" },	{ "Kashmiri"   , "ks.UTF-8" },
-  { "Sindhi"      , "sd.UTF-8" },	{ "Tibetan"    , "bo.UTF-8" },  
-  { "Nepali"      , "ne.UTF-8" },	{ "Sanskrit"   , "sa.UTF-8" },
-  { "Marathi"     , "mr.UTF-8" },	{ "Bengali"    , "bn.UTF-8" },  
-  { "Assamese"    , "as.UTF-8" },	{ "Gujarati"   , "gu.UTF-8" },
-  { "Punjabi"     , "pa.UTF-8" },	{ "Oriya"      , "or.UTF-8" },  
-  { "Malayalam"   , "ml.UTF-8" },	{ "Kannada"    , "kn.UTF-8" },
-  { "Tamil"       , "ta.UTF-8" },	{ "Telugu"     , "te.UTF-8" },  
-  { "Sinhalese"   , "si.UTF-8" },	{ "Burmese"    , "my.UTF-8" },
-  { "Khmer"       , "km.UTF-8" },	{ "Lao"        , "lo.UTF-8" },  
-  { "Vietnamese"  , "vi.UTF-8" },	{ "Indonesian" , "id.UTF-8" },
-  { "Tagalog"     , "tl.UTF-8" },	{ "Malay"      , "ms.UTF-8" },  
-  { "Malay"       , "ms.UTF-8" },	{ "Amharic"    , "am.UTF-8" },
-  { "Tigrinya"    , "ti.UTF-8" },	{ "Oromo"      , "om.UTF-8" },  
-  { "Somali"      , "so.UTF-8" },	{ "Swahili"    , "sw.UTF-8" },
-  { "Kinyarwanda" , "rw.UTF-8" },	{ "Rundi"      , "rn.UTF-8" },  
-  { "Nyanja"      , "" },		{ "Malagasy"   , "mg.UTF-8" },
-  { "Esperanto"   , "eo.UTF-8" },	{ "Welsh"      , "cy.UTF-8" },  
-  { "Basque"      , "eu.UTF-8" },	{ "Catalan"    , "ca.UTF-8" },
-  { "Latin"       , "la.UTF-8" },	{ "Quechua"    , "qu.UTF-8" },  
-  { "Guarani"     , "gn.UTF-8" },	{ "Aymara"     , "ay.UTF-8" },
-  { "Tatar"       , "tt.UTF-8" },	{ "Uighur"     , "ug.UTF-8" },  
-  { "Dzongkha"    , "dz.UTF-8" },	{ "Javanese"   , "jv.UTF-8" },
-  { "Sundanese"   , "su.UTF-8" },	{ "Galician"   , "gl.UTF-8" },  
-  { "Afrikaans"   , "af.UTF-8" },	{ "Breton"     , "br.UTF-8" },
-  { "Inuktitut"   , "iu.UTF-8" },	{ "Scottish"   , "gd.UTF-8" },  
-  { "Manx"        , "gv.UTF-8" },	{ "Irish"      , "ga.UTF-8" },
-  { "Tongan"      , "to.UTF-8" },	{ "Greek"      , "el.UTF-8" },  
-  { "Greenlandic" , "kl.UTF-8" },	{ "Azerbaijani", "az.UTF-8" }
-};
-
-
-/*
- * 'appleLangDefault()' - Get the default locale string.
- */
-
-static const char *			/* O - Locale string */
-appleLangDefault(void)
-{
-  int			i;		/* Looping var */
-  CFPropertyListRef 	localizationList;
-					/* List of localization data */
-  CFStringRef		localizationName;
-					/* Current name */
-  char			buff[256];	/* Temporary buffer */
-  static const char	*language = NULL;
-					/* Cached language */
-
-
- /*
-  * Only do the lookup and translation the first time.
-  */
-
-  if (language == NULL)
-  {
-    localizationList =
-        CFPreferencesCopyAppValue(CFSTR("AppleLanguages"),
-                                  kCFPreferencesCurrentApplication);
-
-    if (localizationList != NULL)
-    {
-      if (CFGetTypeID(localizationList) == CFArrayGetTypeID() &&
-	  CFArrayGetCount(localizationList) > 0)
-      {
-	localizationName = CFArrayGetValueAtIndex(localizationList, 0);
-
-	if (localizationName != NULL &&
-            CFGetTypeID(localizationName) == CFStringGetTypeID())
-	{
-	  CFIndex length = CFStringGetLength(localizationName);
-
-	  if (length <= sizeof(buff) &&
-	      CFStringGetCString(localizationName, buff, sizeof(buff),
-	                         kCFStringEncodingASCII))
-	  {
-	    buff[sizeof(buff) - 1] = '\0';
-
-	    for (i = 0;
-		 i < sizeof(apple_name_locale) / sizeof(apple_name_locale[0]);
-		 i++)
-	    {
-	      if (strcasecmp(buff, apple_name_locale[i].name) == 0)
-	      {
-		language = apple_name_locale[i].locale;
-		break;
-	      }
-	    }
-	  }
-	}
-      }
-
-      CFRelease(localizationList);
-    }
-  
-   /*
-    * If we didn't find the language, default to en_US...
-    */
-
-    if (language == NULL)
-      language = apple_name_locale[0].locale;
-  }
-
- /*
-  * Return the cached locale...
-  */
-
-  return (language);
-}
-#  endif /* HAVE_CF_LOCALE_ID */
-#endif /* __APPLE__ */
-
-
-/*
- * 'cups_cache_lookup()' - Lookup a language in the cache...
- */
-
-static cups_lang_t *			/* O - Language data or NULL */
-cups_cache_lookup(const char      *name,/* I - Name of locale */
-                  cups_encoding_t encoding)
-					/* I - Encoding of locale */
-{
-  cups_lang_t	*lang;			/* Current language */
-
-
- /*
-  * Loop through the cache and return a match if found...
-  */
-
-  for (lang = lang_cache; lang != NULL; lang = lang->next)
-    if (!strcmp(lang->language, name) &&
-        (encoding == CUPS_AUTO_ENCODING || encoding == lang->encoding))
-    {
-      lang->used ++;
-
-      return (lang);
-    }
-
-  return (NULL);
-}
-
-
 /*
 * End of "$Id$".
 */
@@ -3,7 +3,7 @@
 *
 *   Multi-language support for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-2001 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -20,8 +20,6 @@
 *       Voice: (301) 373-9603
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
- *
- *   This file is subject to the Apple OS-Developed Software exception.
 */

 #ifndef _CUPS_LANGUAGE_H_
@@ -152,8 +150,6 @@ typedef enum			/**** Message Indices ****/
  CUPS_MSG_TOP,
  CUPS_MSG_FILENAME,
  CUPS_MSG_PRINT,
-  CUPS_MSG_OPTIONS_INSTALLED,
-  CUPS_MSG_AUTO,
  CUPS_MSG_HTTP_BASE = 200,
  CUPS_MSG_HTTP_END = 505,
  CUPS_MSG_MAX
@@ -161,7 +157,6 @@ typedef enum			/**** Message Indices ****/

 typedef enum			/**** Language Encodings ****/
 {
-  CUPS_AUTO_ENCODING = -1,
  CUPS_US_ASCII,
  CUPS_ISO8859_1,
  CUPS_ISO8859_2,
@@ -186,9 +181,7 @@ typedef enum			/**** Language Encodings ****/
  CUPS_WINDOWS_1255,
  CUPS_WINDOWS_1256,
  CUPS_WINDOWS_1257,
-  CUPS_WINDOWS_1258,
-  CUPS_KOI8_R,
-  CUPS_KOI8_U
+  CUPS_WINDOWS_1258
 } cups_encoding_t;

 typedef struct cups_lang_str	/**** Language Cache Structure ****/
@@ -206,17 +199,18 @@ typedef struct cups_lang_str	/**** Language Cache Structure ****/
 * Prototypes...
 */

-#  define		cupsLangDefault() cupsLangGet(NULL)
+#  ifdef WIN32
+#    define		cupsLangDefault() cupsLangGet(setlocale(LC_ALL, ""))
+#  else /* This fix works around bugs in the Linux and HP-UX setlocale() */
+#    define		cupsLangDefault() cupsLangGet(getenv("LANG"))
+#  endif /* WIN32 */
+
 extern char		*cupsLangEncoding(cups_lang_t *lang);
 extern void		cupsLangFlush(void);
 extern void		cupsLangFree(cups_lang_t *lang);
 extern cups_lang_t	*cupsLangGet(const char *language);
 #  define		cupsLangString(lang,msg) (lang)->messages[(msg)]

-/**** New in CUPS 1.1.20 ****/
-extern void		_cupsRestoreLocale(int category, char *oldlocale);
-extern char		*_cupsSaveLocale(int category, const char *locale);
-
 #  ifdef __cplusplus
 }
 #  endif /* __cplusplus */
--- a/Mostrar Mais
+++ b/Mostrar Mais