Import cups.org releases

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-1.1.15@4306 a1ca3aef-8c08-0410-bb20-df032aa958be
2013-05-10 18:56:23 +00:00
@@ -0,0 +1,9 @@
+config.cache
+config.h
+config.log
+config.status
+configure
+cups-config
+cups.list
+cups.sh
+Makedefs
@@ -1,4 +1,4 @@
-ENCRYPTION - CUPS v1.1.5 - 12/20/2000
+ENCRYPTION - CUPS v1.1.7 - 02/21/2001
 -------------------------------------

 This file describes the encryption support provided by CUPS.
@@ -37,9 +37,12 @@ Stick with "https" for web browsers.

 The current implementation is very basic.  The CUPS client
 software (lp, lpr, etc.) uses encryption as requested by the
-server and/or as specified by the Encryption directive in the
-client.conf file or in the CUPS_ENCRYPTION environment
-variable:
+user or server.
+
+The user can specify the "-E" option with the printing commands
+to force encryption of the connection.  Encryption can also be
+specified using the Encryption directive in the client.conf file
+or in the CUPS_ENCRYPTION environment variable:

    Never

@@ -60,12 +63,18 @@ variable:
 	connection is made.  This is different than the "Always"
 	mode above since the connection is initially unsecure
 	and the client initiates the upgrade to TLS encryption.
+	(same as using the "-E" option)

 These keywords are also used in the cupsd.conf file to secure
 particular locations.  To secure all traffic on the server, listen
 on port 443 (https port) instead of port 631 and change the "ipp"
 service listing (or add it if you don't have one) in /etc/services
-to 443.
+to 443.  To provide both secure and normal methods, add a line
+reading:
+
+    SSLPort 443
+
+to /etc/cups/cupsd.conf.


 BEFORE YOU BEGIN
@@ -1,5 +1,5 @@
-INSTALL - CUPS v1.1.5 - 12/20/2000
----------------------------------
+INSTALL - CUPS v1.1.15 - 05/13/2002
+-----------------------------------

 This file describes how to compile and install CUPS from source
 code. For more information on CUPS see the file called
@@ -30,6 +30,15 @@ CUPS will compile and run without these, however you'll miss out on
 many of the features provided by CUPS.


+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

 CUPS uses GNU autoconf, so you should find the usual "configure"
@@ -48,11 +57,12 @@ another location:

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

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

@@ -60,6 +70,7 @@ or:

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

@@ -72,11 +83,22 @@ SSL and TLS support require the OpenSSL library, available at:

    http://www.openssl.org

+If the OpenSSL header files and libraries are not in a standard
+location, specify the locations of these files using the
+--with-openssl-includes and --with-openssl-libs directives:
+
+    ./configure --enable-ssl \
+        --with-openssl-includes=/foo/bar/include \
+        --with-openssl-libs=/foo/bar/lib
+
+See the file "ENCRYPTION.txt" for information on using the
+encryption support in CUPS.
+
 Once you have configured things, just type:

    make ENTER

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

    gmake ENTER

@@ -91,7 +113,7 @@ your local system:

    make install ENTER

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

    gmake install ENTER

@@ -105,9 +127,9 @@ You can find the RPM software at:

    http://www.rpm.org

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

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


 CREATING BINARY DISTRIBUTIONS WITH EPM
@@ -121,16 +143,19 @@ or

    gmake <format> ENTER

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

    epm      - Builds a portable shell script and tar file based
               distribution.  This format will also backup your
 	       existing printing system if you decide to remove
 	       CUPS at some future time.
-    rpm      - Builds a RPM binary distribution.
+    aix      - Builds an AIX binary distribution.
+    bsd      - Builds a *BSD binary distribution.
    deb      - Builds a Debian binary distribution.
    depot    - Builds a HP-UX binary distribution.
    pkg      - Builds a Solaris binary distribution.
+    rpm      - Builds a RPM binary distribution.
    tardist  - Builds an IRIX binary distribution.


@@ -7,94 +7,156 @@

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

-<P ALIGN="CENTER">Copyright 1997-2000 by Easy Software Products<BR>
+<P ALIGN="CENTER">Copyright 1997-2002 by Easy Software Products<BR>
 44141 AIRPORT VIEW DR STE 204<BR>
 HOLLYWOOD, MARYLAND 20636-3111 USA<BR>
 <BR>
-Voice: +1.301.373.9603<BR>
+Voice: +1.301.373.9600<BR>
 Email: <A HREF="mailto:cups-info@cups.org">cups-info@cups.org</A><BR>
 WWW: <A HREF="http://www.cups.org">http://www.cups.org</A>

 <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. A copy of these
-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, with exceptions for Apple operating systems and the
+OpenSSL toolkit. A copy of the exceptions and 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
-"/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.90.
+<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>For those not familiar with the GNU GPL, the license basically
 allows you to:

 <UL>

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

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

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

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

 </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.
+<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>The GNU LGPL relaxes the "link-to" restriction, allowing you to
-develop applications that use the CUPS API library under other licenses
-and/or conditions as appropriate for your application.
+<P>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.

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

 <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 "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.90 software. For binary
-distribution licensing of this software, please contact:
+<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:

 <BLOCKQUOTE>
 Derek B. Noonburg<BR>
@@ -104,12 +166,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 -->
@@ -0,0 +1,861 @@
+                Common UNIX Printing System License Agreement
+
+                Copyright 1997-2002 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-2000 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2002 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
@@ -29,32 +29,37 @@
 AR	=	@AR@
 AWK	=	@AWK@
 CC	=	@LIBTOOL@ @CC@
-CHMOD	=	@CHMOD@
-CHOWN	=	@CHOWN@
-CP	=	@CP@
 CXX	=	@LIBTOOL@ @CXX@
 DSO	=	@DSO@
 HTMLDOC	=	@HTMLDOC@
+INSTALL	=	@INSTALL@
 LIBTOOL	=	@LIBTOOL@
 LN	=	/bin/ln -sf
-MKDIR	=	@MKDIR@ -p
 MV	=	@MV@
 NROFF	=	@NROFF@
 RANLIB	=	@RANLIB@
 RM	=	@RM@ -f
 SED	=	@SED@
 SHELL	=	/bin/sh
+STRIP	=	@STRIP@

 #
 # Installation programs...
 #

-INSTALL_BIN	=	$(LIBTOOL) $(CP)
-INSTALL_DATA	=	$(CP)
-INSTALL_LIB	=	$(LIBTOOL) $(CP)
-INSTALL_MAN	=	$(CP)
-INSTALL_SCRIPT	=	$(CP)
-INSTALL_SYSV	=	@INSTALL_SYSV@
+INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -m 755 -s
+INSTALL_DATA	=	$(INSTALL) -m 644
+INSTALL_DIR	=	$(INSTALL) -d
+INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -m 755
+INSTALL_MAN	=	$(INSTALL) -m 644
+INSTALL_SCRIPT	=	$(INSTALL) -m 755
+
+#
+# Default user and group for the scheduler...
+#
+
+CUPS_USER	=	@CUPS_USER@
+CUPS_GROUP	=	@CUPS_GROUP@

 #
 # Libraries...
@@ -65,6 +70,7 @@ LIBCUPSIMAGE =	@LIBCUPSIMAGE@
 LIBJPEG	=	@LIBJPEG@
 LIBMALLOC =	@LIBMALLOC@
 LIBPNG	=	@LIBPNG@
+LIBSLP	=	@LIBSLP@
 LIBTIFF	=	@LIBTIFF@
 LIBZ	=	@LIBZ@

@@ -76,18 +82,21 @@ LIBZ	=	@LIBZ@
 #         extra debug info)
 #

-ARFLAGS	=	crvs
-CFLAGS	=	@CFLAGS@ $(OPTIM) -I.. $(OPTIONS)
-CXXFLAGS =	@CXXFLAGS@ $(OPTIM) -I.. $(OPTIONS)
+ARFLAGS	=	@ARFLAGS@
+CFLAGS	=	$(RC_CFLAGS) @CFLAGS@ -I.. $(OPTIONS)
+CXXFLAGS =	$(RC_CFLAGS) @CXXFLAGS@ -I.. $(OPTIONS)
+CXXLIBS	=	@CXXLIBS@
+DSOFLAGS =	@DSOFLAGS@
 DSOLIBS	=	@DSOLIBS@
 IMGLIBS	=	@IMGLIBS@ -lm
-LDFLAGS	=	@LDFLAGS@ $(OPTIM)
+LDFLAGS	=	-L../cups -L../filter @LDFLAGS@ $(OPTIM)
 LINKCUPS =	@LINKCUPS@
 LINKCUPSIMAGE =	@LINKCUPSIMAGE@
 LIBS	=	$(LINKCUPS) $(NETLIBS) @LIBS@
 NETLIBS	=	@NETLIBS@
 OPTIM	=	@OPTIM@
 OPTIONS	=
+PAMLIBS	=	@PAMLIBS@
 SSLLIBS	=	@SSLLIBS@

 #
@@ -119,46 +128,53 @@ srcdir		=	@srcdir@
 sysconfdir	=	@sysconfdir@
 top_srcdir	=	@top_srcdir@

-BINDIR		=	@bindir@
-DATADIR		=	@CUPS_DATADIR@
-DOCDIR		=	@CUPS_DOCROOT@
-INCLUDEDIR	=	$(includedir)
+BUILDROOT	=	$(DSTROOT)
+
+AMANDIR		=	$(BUILDROOT)@AMANDIR@
+BINDIR		=	$(BUILDROOT)@bindir@
+DATADIR		=	$(BUILDROOT)@CUPS_DATADIR@
+DOCDIR		=	$(BUILDROOT)@CUPS_DOCROOT@
+INCLUDEDIR	=	$(BUILDROOT)$(includedir)
 INITDIR		=	@INITDIR@
 INITDDIR	=	@INITDDIR@
-LIBDIR		=	$(libdir)
-LOCALEDIR	= 	@CUPS_LOCALEDIR@
-LOGDIR		= 	@CUPS_LOGDIR@
-MANDIR		=	@mandir@
-PAMDIR		=	@PAMDIR@
-REQUESTS	= 	@CUPS_REQUESTS@
-SBINDIR		=	@sbindir@
-SERVERBIN	= 	@CUPS_SERVERBIN@
-SERVERROOT	= 	@CUPS_SERVERROOT@
+LIBDIR		=	$(BUILDROOT)$(libdir)
+LOCALEDIR	= 	$(BUILDROOT)@CUPS_LOCALEDIR@
+LOGDIR		= 	$(BUILDROOT)@CUPS_LOGDIR@
+MANDIR		=	$(BUILDROOT)@mandir@
+PAMDIR		=	$(BUILDROOT)@PAMDIR@
+PMANDIR		=	$(BUILDROOT)@PMANDIR@
+REQUESTS	= 	$(BUILDROOT)@CUPS_REQUESTS@
+SBINDIR		=	$(BUILDROOT)@sbindir@
+SERVERBIN	= 	$(BUILDROOT)@CUPS_SERVERBIN@
+SERVERROOT	= 	$(BUILDROOT)@CUPS_SERVERROOT@

 CAT1EXT		=	@CAT1EXT@
+CAT3EXT		=	@CAT3EXT@
 CAT5EXT		=	@CAT5EXT@
 CAT8EXT		=	@CAT8EXT@
+MAN8EXT		=	@MAN8EXT@
+MAN8DIR		=	@MAN8DIR@

 #
 # Rules...
 #

 .SILENT:
-.SUFFIXES:	.a .c .cxx .h .man .o .0 .1 .5 .8 .z
+.SUFFIXES:	.a .c .cxx .h .man .o .0 .1 .1m .3 .5 .8 .z
 .c.o:
 	echo Compiling $<...
-	$(CC) $(CFLAGS) -c $<
+	$(CC) $(OPTIM) $(CFLAGS) -c $<
 .cxx.o:
 	echo Compiling $<...
-	$(CXX) $(CXXFLAGS) -c $<
-.man.0 .man.1 .man.5 .man.8:
+	$(CXX) $(OPTIM) $(CXXFLAGS) -c $<
+.man.0 .man.1 .man.1m .man.3 .man.5 .man.8:
 	echo Formatting $<...
 	$(RM) $@
-	$(NROFF) -man $< >$@
+	-$(NROFF) -man $< >$@
 .man.z:
 	echo Formatting $<...
 	$(RM) $@ t.z
-	$(NROFF) -man $< >t
+	-$(NROFF) -man $< >t
 	pack -f t
 	$(MV) t.z $@

@@ -3,7 +3,7 @@
 #
 #   Top-level Makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2000 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2002 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 pstoraster \
+DIRS	=	cups backend berkeley cgi-bin filter man pdftops \
 		scheduler systemv

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

 all:
+	chmod +x cups-config
 	for dir in $(DIRS); do\
 		echo Making all in $$dir... ;\
 		(cd $$dir ; $(MAKE) $(MFLAGS)) || exit 1;\
@@ -51,11 +52,22 @@ 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:
+install:	installhdrs
 	for dir in $(DIRS); do\
 		echo Installing in $$dir... ;\
 		(cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\
@@ -71,35 +83,69 @@ install:
 	echo Installing in locale...
 	(cd locale; $(MAKE) $(MFLAGS) install)
 	echo Installing in ppd...
-\	(cd ppd; $(MAKE) $(MFLAGS) install)
+	(cd ppd; $(MAKE) $(MFLAGS) install)
 	echo Installing in templates...
 	(cd templates; $(MAKE) $(MFLAGS) install)
+	echo Installing cups-config script...
+	$(INSTALL_DIR) $(BINDIR)
+	$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
 	echo Installing startup script...
-	if test "x$INITDIR" != "x"; then \
-		$(MKDIR) $(prefix)/$(INITDIR)/init.d; \
-		$(RM) $(prefix)/$(INITDIR)/init.d/cups; \
-		$(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDIR)/init.d/cups; \
-		$(CHMOD) ugo+rx $(prefix)/$(INITDIR)/init.d/cups; \
-		$(MKDIR) $(prefix)/$(INITDIR)/rc0.d; \
-		$(RM) $(prefix)/$(INITDIR)/rc0.d/K00cups; \
-		ln -s $(INITDDIR)/cups $(prefix)/$(INITDIR)/rc0.d/K00cups; \
-		$(MKDIR) $(prefix)/$(INITDIR)/rc3.d; \
-		$(RM) $(prefix)/$(INITDIR)/rc3.d/S99cups; \
-		ln -s $(INITDDIR)/cups $(prefix)/$(INITDIR)/rc3.d/S99cups; \
+	if test "x$(INITDIR)" != "x"; then \
+		$(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/init.d; \
+		$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
+		$(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc0.d; \
+		$(INSTALL_SCRIPT) cups.sh  $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
+		$(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc2.d; \
+		$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
+		$(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc3.d; \
+		$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
+		$(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc5.d; \
+		$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
 	fi
+	if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
+		$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
+		if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
+			$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/PrintingServices; \
+			$(INSTALL_DATA) cups.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
+			$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
+			$(INSTALL_DATA) cups.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
+		else \
+			$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
+		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
+	echo Running CUPS test suite...
+	cd test; ./run-stp-tests.sh
+

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

-EPMFLAGS	=	-v \
-			BINDIR=$(BINDIR) DATADIR=$(DATADIR) \
-			DOCDIR=$(DOCDIR) INCLUDEDIR=$(INCLUDEDIR) \
-			LIBDIR=$(LIBDIR) LOCALEDIR=$(LOCALEDIR) \
-			LOGDIR=$(LOGDIR) MANDIR=$(MANDIR) \
-			PAMDIR=$(PAMDIR) REQUESTS=$(REQUESTS) \
-			SBINDIR=$(SBINDIR) SERVERBIN=$(SERVERBIN) \
-			SERVERROOT=$(SERVERROOT)
+EPMFLAGS	=	-v
+
+aix:
+	epm $(EPMFLAGS) -f aix cups
+
+bsd:
+	epm $(EPMFLAGS) -f bsd cups

 epm:
 	epm $(EPMFLAGS) cups
@@ -1,5 +1,5 @@
-README - CUPS v1.1.5 - 12/20/2000
---------------------------------
+README - CUPS v1.1.14 - 02/13/2002
+----------------------------------

 Looking for compile instructions?  Read the file "INSTALL.txt"
 instead...
@@ -27,8 +27,8 @@ that are used to support non-PostScript printers.  Sample
 drivers for HP and EPSON printers are included that use these
 filters.

-Drivers for over 2300 printers are provided with our ESP Print
-Pro software, available at:
+Drivers for thousands of printers are provided with our ESP
+Print Pro software, available at:

 	http://www.easysw.com/printpro

@@ -55,7 +55,8 @@ SOFTWARE REQUIREMENTS
 The following operating system software is required to install
 one of the binary distributions from Easy Software Products:

-    - Digital UNIX (aka OSF1 aka Compaq Tru64 UNIX) 4.0 or higher
+    - AIX 4.3 or higher
+    - Compaq Tru64 UNIX (aka OSF1 aka Digital UNIX) 4.0 or higher
    - HP-UX 10.20 or higher
    - IRIX 5.3 or higher
    - Linux 2.0 with glibc2 or higher
@@ -188,14 +189,20 @@ the following commands:

 Similarly, for the other sample drivers you can use:

-    Driver                      PPD File
-    --------------------------  ------------
-    HP DeskJet Series           deskjet.ppd
-    HP LaserJet Series          laserjet.ppd
-    EPSON Stylus Color Series   stcolor.ppd
-    EPSON Stylus Photo Series   stphoto.ppd
-    EPSON 9-pin Series          epson9.ppd
-    EPSON 24-pin Series         epson24.ppd
+    Driver                         PPD File
+    -----------------------------  ------------
+    Dymo Label Printers            dymo.ppd
+    EPSON Stylus Color Series      stcolor.ppd
+    EPSON Stylus Photo Series      stphoto.ppd
+    EPSON Stylus New Color Series  stcolor2.ppd
+    EPSON Stylus New Photo Series  stphoto2.ppd
+    EPSON 9-pin Series             epson9.ppd
+    EPSON 24-pin Series            epson24.ppd
+    HP DeskJet Series              deskjet.ppd
+    HP New DeskJet Series          deskjet2.ppd
+    HP LaserJet Series             laserjet.ppd
+    OKIDATA 9-Pin Series           okidata9.ppd
+    OKIDATA 24-Pin Series          okidat24.ppd

 These sample drivers provide basic printing capabilities, but
 generally do not exercise the full potential of the printers or
@@ -236,7 +243,7 @@ file.

 LEGAL STUFF

-CUPS is Copyright 1993-2000 by Easy Software Products.  CUPS,
+CUPS is Copyright 1993-2002 by Easy Software Products.  CUPS,
 the CUPS logo, and the Common UNIX Printing System are the
 trademark property of Easy Software Products.

@@ -246,8 +253,8 @@ 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.90 software,
-Copyright 1996-1999 by Derek B. Noonburg.
+The PDF filter (pdftops) is based on the Xpdf 0.92 software,
+Copyright 1996-2002 by Derek B. Noonburg.

 This software is based in part on the work of the Independent
 JPEG Group.
@@ -266,7 +273,7 @@ For commercial licensing information, please contact:
    44141 Airport View Drive, Suite 204
    Hollywood, Maryland 20636-3111 USA

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

@@ -0,0 +1,7 @@
+ipp
+lpd
+usb
+parallel
+betest
+serial
+socket
@@ -0,0 +1,15 @@
+# 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
+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-2000 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2002 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,12 +21,14 @@
 #       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 serial socket usb
+BACKENDS =	ipp lpd parallel scsi serial socket usb
 TARGETS	=	betest $(BACKENDS)
-OBJS	=	betest.o ipp.o lpd.o parallel.o serial.o socket.o usb.o
+OBJS	=	betest.o ipp.o lpd.o parallel.o scsi.o serial.o socket.o usb.o


 #
@@ -44,15 +46,23 @@ 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:
-	-$(MKDIR) $(SERVERBIN)/backend
-	$(CHMOD) ugo+rx $(SERVERBIN)
-	$(CHMOD) ugo+rx $(SERVERBIN)/backend
-	$(INSTALL_BIN) $(BACKENDS) $(SERVERBIN)/backend
+install:	all
+	$(INSTALL_DIR) $(SERVERBIN)/backend
+	for file in $(BACKENDS); do \
+		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
+	done
 	$(RM) $(SERVERBIN)/backend/http
 	$(LN) ipp $(SERVERBIN)/backend/http

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

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

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

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

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

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

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

-parallel.o:	../cups/cups.h ../Makedefs
+
+#
+# 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


 #
@@ -111,8 +124,6 @@ serial:	serial.o ../cups/$(LIBCUPS)
 	echo Linking $@...
 	$(CC) $(LDFLAGS) -o serial serial.o $(LIBS)

-serial.o:	../cups/cups.h ../Makedefs
-

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

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

 #
 # usb
@@ -133,7 +142,12 @@ usb:	usb.o ../cups/$(LIBCUPS)
 	echo Linking $@...
 	$(CC) $(LDFLAGS) -o usb usb.o $(LIBS)

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


 #
@@ -3,7 +3,7 @@
 *
 *   Backend test program for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2002 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,6 +21,8 @@
 *       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-2000 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2002 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,9 +21,14 @@
 *       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.
+ *   main()                 - Send a file to the printer or server.
+ *   password_cb()          - Disable the password prompt for
+ *                            cupsDoFileRequest().
+ *   report_printer_state() - Report the printer state.
 */

 /*
@@ -41,6 +46,21 @@
 #include <signal.h>


+/*
+ * Local functions...
+ */
+
+const char	*password_cb(const char *);
+int		report_printer_state(ipp_t *ipp);
+
+
+/*
+ * Local globals...
+ */
+
+char	*password = NULL;
+
+
 /*
 * 'main()' - Send a file to the printer or server.
 *
@@ -62,31 +82,39 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 		resource[1024],	/* Resource info (printer name) */
 		filename[1024];	/* File to print */
  int		port;		/* Port number (not used) */
-  char		password[255],	/* Password info */
-		uri[HTTP_MAX_URI];/* Updated URI without user/pass */
-  http_status_t	status;		/* Status of HTTP job */
+  char		uri[HTTP_MAX_URI];/* Updated URI without user/pass */
  ipp_status_t	ipp_status;	/* Status of IPP request */
-  FILE		*fp;		/* File to print */
  http_t	*http;		/* HTTP connection */
  ipp_t		*request,	/* IPP request */
-		*response;	/* IPP response */
-  ipp_attribute_t *job_id;	/* job-id attribute */
+		*response,	/* IPP response */
+		*supported;	/* get-printer-attributes response */
+  ipp_attribute_t *job_id_attr;	/* job-id attribute */
+  int		job_id;		/* job-id value */
+  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 */
  const char	*charset;	/* Character set to use */
  cups_lang_t	*language;	/* Default language */
-  struct stat	fileinfo;	/* File statistics */
-  size_t	nbytes,		/* Number of bytes written */
-		tbytes;		/* Total bytes written */
-  char		buffer[8192];	/* Output buffer */
  int		copies;		/* Number of copies remaining */
  const char	*content_type;	/* CONTENT_TYPE environment variable */
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
  struct sigaction action;	/* Actions for POSIX signals */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
  int		version;	/* IPP version */
+  int		reasons;	/* Number of printer-state-reasons shown */


+ /*
+  * Make sure status messages are not buffered...
+  */
+
+  setbuf(stderr, NULL);
+
+ /*
+  * Check command-line...
+  */
+
  if (argc == 1)
  {
    char *s;
@@ -96,7 +124,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
    else
      s = argv[0];

-    printf("network %s \"Unknown\" \"Internet Printing Protocol\"\n", s);
+    printf("network %s \"Unknown\" \"Internet Printing Protocol (%s)\"\n", s, s);
    return (0);
  }
  else if (argc < 6 || argc > 7)
@@ -118,45 +146,30 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
    * Copy stdin to a temporary file...
    */

-    FILE *fp;		/* Temporary file */
+    int  fd;		/* Temporary file */
    char buffer[8192];	/* Buffer for copying */
    int  bytes;		/* Number of bytes read */


-    if ((fp = fopen(cupsTempFile(filename, sizeof(filename)), "w")) == NULL)
+    if ((fd = cupsTempFd(filename, sizeof(filename))) < 0)
    {
      perror("ERROR: unable to create temporary file");
      return (1);
    }

    while ((bytes = fread(buffer, 1, sizeof(buffer), stdin)) > 0)
-      if (fwrite(buffer, 1, bytes, fp) < bytes)
+      if (write(fd, buffer, bytes) < bytes)
      {
        perror("ERROR: unable to write to temporary file");
-	fclose(fp);
+	close(fd);
 	unlink(filename);
 	return (1);
      }

-    fclose(fp);
+    close(fd);
  }
  else
-  {
-    strncpy(filename, argv[6], sizeof(filename) - 1);
-    filename[sizeof(filename) - 1] = '\0';
-  }
-
- /*
-  * Open the print file...
-  */
-
-  if ((fp = fopen(filename, "rb")) == NULL)
-  {
-    perror("ERROR: Unable to open print file");
-    return (1);
-  }
-  else
-    stat(filename, &fileinfo);
+    strlcpy(filename, argv[6], sizeof(filename));

 /*
  * Extract the hostname and printer name from the URI...
@@ -164,17 +177,32 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

  httpSeparate(argv[0], method, username, hostname, &port, resource);

+ /*
+  * Set the authentication info, if any...
+  */
+
+  cupsSetPasswordCB(password_cb);
+
+  if (username[0])
+  {
+    if ((password = strchr(username, ':')) != NULL)
+      *password++ = '\0';
+
+    cupsSetUser(username);
+  }
+
 /*
  * Try connecting to the remote server...
  */

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

    if ((http = httpConnect(hostname, port)) == NULL)
    {
-      if (errno == ECONNREFUSED)
+      if (errno == ECONNREFUSED || errno == EHOSTDOWN ||
+          errno == EHOSTUNREACH)
      {
 	fprintf(stderr, "INFO: Network host \'%s\' is busy; will retry in 30 seconds...",
                hostname);
@@ -189,6 +217,8 @@ 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
@@ -206,7 +236,9 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  language    = cupsLangDefault();
  charset_sup = NULL;
  copies_sup  = NULL;
+  format_sup  = NULL;
  version     = 1;
+  supported   = NULL;

  do
  {
@@ -229,170 +261,103 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
        	 NULL, uri);

-   /*
-    * Now fill in the HTTP request stuff...
-    */
-
-    httpClearFields(http);
-    httpSetField(http, HTTP_FIELD_CONTENT_TYPE, "application/ipp");
-    if (username[0])
-    {
-      httpEncode64(password, username);
-      httpSetField(http, HTTP_FIELD_AUTHORIZATION, password);
-    }
-
-    sprintf(buffer, "%u", ippLength(request));
-    httpSetField(http, HTTP_FIELD_CONTENT_LENGTH, buffer);
-
   /*
    * Do the request...
    */

-    for (response = NULL, ipp_status = IPP_ERROR;;)
+    fputs("DEBUG: Getting supported attributes...\n", stderr);
+
+    if ((supported = cupsDoRequest(http, request, resource)) == NULL)
+      ipp_status = cupsLastError();
+    else
+      ipp_status = supported->request.status.status_code;
+
+    if (ipp_status > IPP_OK_CONFLICT)
    {
-     /*
-      * POST the request, retrying as needed...
-      */
-
-      if (httpPost(http, resource))
+      if (ipp_status == IPP_PRINTER_BUSY ||
+	  ipp_status == IPP_SERVICE_UNAVAILABLE)
      {
-	fputs("INFO: Unable to POST get-printer-attributes request; retrying...\n", stderr);
+	fputs("INFO: Printer busy; will retry in 10 seconds...\n", stderr);
+        report_printer_state(supported);
 	sleep(10);
+      }
+      else if ((ipp_status == IPP_BAD_REQUEST ||
+	        ipp_status == IPP_VERSION_NOT_SUPPORTED) && version == 1)
+      {
+       /*
+	* Switch to IPP/1.0...
+	*/
+
+	fputs("INFO: Printer does not support IPP/1.1, trying IPP/1.0...\n", stderr);
+	version = 0;
 	httpReconnect(http);
-	continue;
-      }
-
-      fputs("INFO: POST successful, sending IPP request...\n", stderr);
-
-     /*
-      * Send the IPP request...
-      */
-
-      request->state = IPP_IDLE;
-
-      if (ippWrite(http, request) == IPP_ERROR)
-      {
-	fputs("ERROR: Unable to send IPP request!\n", stderr);
-	status = HTTP_ERROR;
-	break;
-      }
-
-      fputs("INFO: IPP request sent, getting status...\n", stderr);
-
-     /*
-      * Finally, check the status from the HTTP server...
-      */
-
-      while ((status = httpUpdate(http)) == HTTP_CONTINUE);
-
-      if (status == HTTP_OK)
-      {
-	response = ippNew();
-	ippRead(http, response);
-
-	ipp_status = response->request.status.status_code;
-
-	if (ipp_status > IPP_OK_CONFLICT)
-	{
-	  if (ipp_status == IPP_PRINTER_BUSY ||
-	      ipp_status == IPP_SERVICE_UNAVAILABLE)
-	  {
-	    fputs("INFO: Printer busy; will retry in 10 seconds...\n", stderr);
-	    sleep(10);
-	  }
-	  else if (ipp_status == IPP_BAD_REQUEST && version == 1)
-	  {
-	   /*
-	    * Switch to IPP/1.0...
-	    */
-
-	    fputs("INFO: Printer does not support IPP/1.1, trying IPP/1.0...\n", stderr);
-	    version = 0;
-	  }
-	  else
-	  {
-	    fprintf(stderr, "ERROR: Printer will not accept print file (%x)!\n",
-	            ipp_status);
-	    fprintf(stderr, "ERROR: %s\n", ippErrorString(ipp_status));
-            status = HTTP_ERROR;
-	  }
-	}
-	else if ((copies_sup = ippFindAttribute(response, "copies-supported",
-	                                        IPP_TAG_RANGE)) != NULL)
-        {
-	 /*
-	  * Has the "copies-supported" attribute - does it have an upper
-	  * bound > 1?
-	  */
-
-	  if (copies_sup->values[0].range.upper <= 1)
-	    copies_sup = NULL; /* No */
-        }
-
-        charset_sup = ippFindAttribute(response, "charset-supported",
-	                               IPP_TAG_CHARSET);
      }
      else
-      {
-        response = NULL;
+	fprintf(stderr, "ERROR: Unable to get printer status (%s)!\n",
+	        ippErrorString(ipp_status));

-	if (status == HTTP_ERROR)
-	{
-          fprintf(stderr, "WARNING: Did not receive the IPP response (%d)\n",
-	          errno);
-	  status     = HTTP_OK;
-	  ipp_status = IPP_PRINTER_BUSY;
-	}
-	else
-	{
-          fprintf(stderr, "ERROR: Validate request was not accepted (%d)!\n",
-	          status);
-	  ipp_status = IPP_FORBIDDEN;
-	}
-      }
+      if (supported)
+        ippDelete(supported);

-      httpFlush(http);
-
-      break;
+      continue;
    }
-
-    if (status != HTTP_OK)
+    else if ((copies_sup = ippFindAttribute(supported, "copies-supported",
+	                                    IPP_TAG_RANGE)) != NULL)
    {
-      if (fp != stdin)
-	fclose(fp);
+     /*
+      * Has the "copies-supported" attribute - does it have an upper
+      * bound > 1?
+      */

-      httpClose(http);
-
-      return (1);
+      if (copies_sup->values[0].range.upper <= 1)
+	copies_sup = NULL; /* No */
    }
-    else if (ipp_status > IPP_OK_CONFLICT)
-      httpReconnect(http);
+
+    charset_sup = ippFindAttribute(supported, "charset-supported",
+	                           IPP_TAG_CHARSET);
+    format_sup  = ippFindAttribute(supported, "document-format-supported",
+	                           IPP_TAG_MIMETYPE);
+
+    if (format_sup)
+    {
+      fprintf(stderr, "DEBUG: document-format-supported (%d values)\n",
+	      format_sup->num_values);
+      for (i = 0; i < format_sup->num_values; i ++)
+	fprintf(stderr, "DEBUG: [%d] = \"%s\"\n", i,
+	        format_sup->values[i].string.text);
+    }
+
+    report_printer_state(supported);
  }
  while (ipp_status > IPP_OK_CONFLICT);

 /*
  * 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...
+  * current page...  Only ignore SIGTERM if we are printing data from
+  * stdin (otherwise you can't cancel raw jobs...)
  */

+  if (argc < 7)
+  {
 #ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-  sigset(SIGTERM, SIG_IGN);
+    sigset(SIGTERM, SIG_IGN);
 #elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
+    memset(&action, 0, sizeof(action));

-  sigemptyset(&action.sa_mask);
-  action.sa_handler = SIG_IGN;
-  sigaction(SIGTERM, &action, NULL);
+    sigemptyset(&action.sa_mask);
+    action.sa_handler = SIG_IGN;
+    sigaction(SIGTERM, &action, NULL);
 #else
-  signal(SIGTERM, SIG_IGN);
+    signal(SIGTERM, SIG_IGN);
 #endif /* HAVE_SIGSET */
+  }

 /*
  * See if the printer supports multiple copies...
  */

-  if (copies_sup)
+  if (copies_sup || argc < 7)
    copies = 1;
  else
    copies = atoi(argv[4]);
@@ -434,13 +399,12 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
    }
  }

-  if (response)
-    ippDelete(response);
-
 /*
  * Then issue the print-job request...
  */

+  reasons = 0;
+
  while (copies > 0)
  {
   /*
@@ -464,13 +428,15 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

    fprintf(stderr, "DEBUG: printer-uri = \"%s\"\n", uri);

-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
-        	 NULL, argv[2]);
+    if (argv[2][0])
+      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
+        	   NULL, argv[2]);

    fprintf(stderr, "DEBUG: requesting-user-name = \"%s\"\n", argv[2]);

-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name", NULL,
-        	 argv[3]);
+    if (argv[3][0])
+      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name", NULL,
+        	   argv[3]);

    fprintf(stderr, "DEBUG: job-name = \"%s\"\n", argv[3]);

@@ -481,147 +447,89 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
    options     = NULL;
    num_options = cupsParseOptions(argv[5], 0, &options);

-    if ((content_type = getenv("CONTENT_TYPE")) != NULL &&
-        strcasecmp(content_type, "application/vnd.cups-raw") == 0)
-      num_options = cupsAddOption("raw", "", num_options, &options);
+    if (argc > 6)
+      content_type = getenv("CONTENT_TYPE");
+    else
+      content_type = "application/vnd.cups-raw";

-    cupsEncodeOptions(request, num_options, options);
-    cupsFreeOptions(num_options, options);
-
-    if (copies_sup)
-      ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, "copies", atoi(argv[4]));
-
-   /*
-    * Now fill in the HTTP request stuff...
-    */
-
-    httpClearFields(http);
-    httpSetField(http, HTTP_FIELD_CONTENT_TYPE, "application/ipp");
-    if (username[0])
+    if (content_type != NULL && format_sup != NULL)
    {
-      httpEncode64(password, username);
-      httpSetField(http, HTTP_FIELD_AUTHORIZATION, password);
+      for (i = 0; i < format_sup->num_values; i ++)
+        if (strcasecmp(content_type, format_sup->values[i].string.text) == 0)
+          break;
+
+      if (i < format_sup->num_values)
+        num_options = cupsAddOption("document-format", content_type,
+	                            num_options, &options);
    }

-    sprintf(buffer, "%u", ippLength(request) + (size_t)fileinfo.st_size);
-    httpSetField(http, HTTP_FIELD_CONTENT_LENGTH, buffer);
+    if (copies_sup)
+    {
+     /*
+      * Only send options if the destination printer supports the copies
+      * attribute.  This is a hack for the HP JetDirect implementation of
+      * IPP, which does not accept extension attributes and incorrectly
+      * reports a client-error-bad-request error instead of the
+      * successful-ok-unsupported-attributes status.  In short, at least
+      * some HP implementations of IPP are non-compliant.
+      */
+
+      cupsEncodeOptions(request, num_options, options);
+      ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, "copies",
+                    atoi(argv[4]));
+    }
+
+    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...
    */

-    for (;;)
+    if ((response = cupsDoFileRequest(http, request, resource, filename)) == NULL)
+      ipp_status = cupsLastError();
+    else
+      ipp_status = response->request.status.status_code;
+
+    if (ipp_status > IPP_OK_CONFLICT)
    {
-     /*
-      * POST the request, retrying as needed...
-      */
+      job_id = 0;

-      httpReconnect(http);
-
-      if (httpPost(http, resource))
+      if (ipp_status == IPP_SERVICE_UNAVAILABLE ||
+	  ipp_status == IPP_PRINTER_BUSY)
      {
-	fputs("INFO: Unable to POST print request; retrying...\n", stderr);
+	fputs("INFO: Printer is busy; retrying print job...\n", stderr);
 	sleep(10);
-	continue;
-      }
-
-      fputs("INFO: POST successful, sending IPP request...\n", stderr);
-
-     /*
-      * Send the IPP request...
-      */
-
-      request->state = IPP_IDLE;
-
-      if (ippWrite(http, request) == IPP_ERROR)
-      {
-	fputs("ERROR: Unable to send IPP request!\n", stderr);
-	status = HTTP_ERROR;
-	break;
-      }
-
-      fputs("INFO: IPP request sent, sending print file...\n", stderr);
-
-     /*
-      * Then send the file...
-      */
-
-      rewind(fp);
-
-      tbytes = 0;
-      while ((nbytes = fread(buffer, 1, sizeof(buffer), fp)) > 0)
-      {
-	tbytes += nbytes;
-	fprintf(stderr, "INFO: Sending print file, %uk...\n", tbytes / 1024);
-
-	if (httpWrite(http, buffer, nbytes) < nbytes)
-	{
-          perror("ERROR: Unable to send print file to printer");
-	  status = HTTP_ERROR;
-          break;
-	}
-      }
-
-      fputs("INFO: Print file sent; checking status...\n", stderr);
-
-     /*
-      * Finally, check the status from the HTTP server...
-      */
-
-      while ((status = httpUpdate(http)) == HTTP_CONTINUE);
-
-      if (status == HTTP_OK)
-      {
-	response = ippNew();
-	ippRead(http, response);
-
-	if ((ipp_status = response->request.status.status_code) > IPP_OK_CONFLICT)
-	{
-          if (ipp_status == IPP_SERVICE_UNAVAILABLE ||
-	      ipp_status == IPP_PRINTER_BUSY)
-	  {
-	    fputs("INFO: Printer is busy; retrying print job...\n", stderr);
-	    sleep(10);
-	  }
-	  else
-	  {
-            fprintf(stderr, "ERROR: Print file was not accepted (%04x)!\n",
-	            response->request.status.status_code);
-	    fprintf(stderr, "ERROR: %s\n", ippErrorString(ipp_status));
-	  }
-	}
-	else if ((job_id = ippFindAttribute(response, "job-id", IPP_TAG_INTEGER)) == NULL)
-          fputs("INFO: Print file accepted - job ID unknown.\n", stderr);
-	else
-          fprintf(stderr, "INFO: Print file accepted - job ID %d.\n",
-	          job_id->values[0].integer);
      }
      else
-      {
-	response   = NULL;
-	ipp_status = IPP_PRINTER_BUSY;
-
-	if (status == HTTP_ERROR)
-	{
-          fprintf(stderr, "WARNING: Did not receive the IPP response (%d)\n",
-	          errno);
-	  status = HTTP_OK;
-	}
-	else
-          fprintf(stderr, "ERROR: Print request was not accepted (%d)!\n", status);
-      }
-
-      httpFlush(http);
-
-      break;
+        fprintf(stderr, "ERROR: Print file was not accepted (%s)!\n",
+	        ippErrorString(ipp_status));
+    }
+    else if ((job_id_attr = ippFindAttribute(response, "job-id",
+                                             IPP_TAG_INTEGER)) == NULL)
+    {
+      fputs("INFO: Print file accepted - job ID unknown.\n", stderr);
+      job_id = 0;
+    }
+    else
+    {
+      job_id = job_id_attr->values[0].integer;
+      fprintf(stderr, "INFO: Print file accepted - job ID %d.\n", job_id);
    }

-    if (request != NULL)
-      ippDelete(request);
-    if (response != NULL)
+    if (response)
      ippDelete(response);

-    if (ipp_status <= IPP_OK_CONFLICT)
+    if (ipp_status <= IPP_OK_CONFLICT && argc > 6)
    {
      fprintf(stderr, "PAGE: 1 %d\n", copies_sup ? atoi(argv[4]) : 1);
      copies --;
@@ -629,6 +537,146 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
    else if (ipp_status != IPP_SERVICE_UNAVAILABLE &&
 	     ipp_status != IPP_PRINTER_BUSY)
      break;
+
+   /*
+    * Wait for the job to complete...
+    */
+
+    if (!job_id)
+      continue;
+
+    fputs("INFO: Waiting for job to complete...\n", stderr);
+
+    for (;;)
+    {
+     /*
+      * Build an IPP_GET_JOB_ATTRIBUTES request...
+      */
+
+      request = ippNew();
+      request->request.op.version[1]   = version;
+      request->request.op.operation_id = IPP_GET_JOB_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);
+
+      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]);
+
+      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
+	ipp_status = response->request.status.status_code;
+
+      if (ipp_status == IPP_NOT_FOUND)
+      {
+       /*
+        * Job has gone away and/or the server has no job history...
+	*/
+
+        ippDelete(response);
+
+	ipp_status = IPP_OK;
+        break;
+      }
+
+      if (ipp_status > IPP_OK_CONFLICT)
+      {
+	if (ipp_status != IPP_SERVICE_UNAVAILABLE &&
+	    ipp_status != IPP_PRINTER_BUSY)
+	{
+	  if (response)
+	    ippDelete(response);
+
+          fprintf(stderr, "ERROR: Unable to get job %d attributes (%s)!\n",
+	          job_id, ippErrorString(ipp_status));
+          break;
+	}
+      }
+      else if ((job_state = ippFindAttribute(response, "job-state", IPP_TAG_ENUM)) != NULL)
+      {
+       /*
+        * 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;
+	}
+      }
+
+      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...
+      */
+
+      sleep(10);
+    }
  }

 /*
@@ -637,12 +685,13 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

  httpClose(http);

+  if (supported)
+    ippDelete(supported);
+
 /*
  * Close and remove the temporary file if necessary...
  */

-  fclose(fp);
-
  if (argc < 7)
    unlink(filename);

@@ -650,10 +699,123 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  * Return the queue status...
  */

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


+/*
+ * 'password_cb()' - Disable the password prompt for cupsDoFileRequest().
+ */
+
+const char *			/* O - Password  */
+password_cb(const char *prompt)	/* I - Prompt (not used) */
+{
+  (void)prompt;
+
+  return (password);
+}
+
+
+/*
+ * '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		*message;	/* Message to show */
+  char			unknown[1024];	/* Unknown message string */
+
+
+  if ((reasons = ippFindAttribute(ipp, "printer-state-reasons",
+                                  IPP_TAG_KEYWORD)) == NULL)
+    return (0);
+
+  for (i = 0, count = 0; i < reasons->num_values; i ++)
+  {
+    message = NULL;
+
+    if (strncmp(reasons->values[i].string.text, "media-needed", 12) == 0)
+      message = "Media tray needs to be filled.";
+    else if (strncmp(reasons->values[i].string.text, "media-jam", 9) == 0)
+      message = "Media jam!";
+    else if (strncmp(reasons->values[i].string.text, "moving-to-paused", 16) == 0 ||
+             strncmp(reasons->values[i].string.text, "paused", 6) == 0 ||
+	     strncmp(reasons->values[i].string.text, "shutdown", 8) == 0)
+      message = "Printer off-line.";
+    else if (strncmp(reasons->values[i].string.text, "toner-low", 9) == 0)
+      message = "Toner low.";
+    else if (strncmp(reasons->values[i].string.text, "toner-empty", 11) == 0)
+      message = "Out of toner!";
+    else if (strncmp(reasons->values[i].string.text, "cover-open", 10) == 0)
+      message = "Cover open.";
+    else if (strncmp(reasons->values[i].string.text, "interlock-open", 14) == 0)
+      message = "Interlock open.";
+    else if (strncmp(reasons->values[i].string.text, "door-open", 9) == 0)
+      message = "Door open.";
+    else if (strncmp(reasons->values[i].string.text, "input-tray-missing", 18) == 0)
+      message = "Media tray missing!";
+    else if (strncmp(reasons->values[i].string.text, "media-low", 9) == 0)
+      message = "Media tray almost empty.";
+    else if (strncmp(reasons->values[i].string.text, "media-empty", 11) == 0)
+      message = "Media tray empty!";
+    else if (strncmp(reasons->values[i].string.text, "output-tray-missing", 19) == 0)
+      message = "Output tray missing!";
+    else if (strncmp(reasons->values[i].string.text, "output-area-almost-full", 23) == 0)
+      message = "Output bin almost full.";
+    else if (strncmp(reasons->values[i].string.text, "output-area-full", 16) == 0)
+      message = "Output bin full!";
+    else if (strncmp(reasons->values[i].string.text, "marker-supply-low", 17) == 0)
+      message = "Ink/toner almost empty.";
+    else if (strncmp(reasons->values[i].string.text, "marker-supply-empty", 19) == 0)
+      message = "Ink/toner empty!";
+    else if (strncmp(reasons->values[i].string.text, "marker-waste-almost-full", 24) == 0)
+      message = "Ink/toner waste bin almost full.";
+    else if (strncmp(reasons->values[i].string.text, "marker-waste-full", 17) == 0)
+      message = "Ink/toner waste bin full!";
+    else if (strncmp(reasons->values[i].string.text, "fuser-over-temp", 15) == 0)
+      message = "Fuser temperature high!";
+    else if (strncmp(reasons->values[i].string.text, "fuser-under-temp", 16) == 0)
+      message = "Fuser temperature low!";
+    else if (strncmp(reasons->values[i].string.text, "opc-near-eol", 12) == 0)
+      message = "OPC almost at end-of-life.";
+    else if (strncmp(reasons->values[i].string.text, "opc-life-over", 13) == 0)
+      message = "OPC at end-of-life!";
+    else if (strncmp(reasons->values[i].string.text, "developer-low", 13) == 0)
+      message = "Developer almost empty.";
+    else if (strncmp(reasons->values[i].string.text, "developer-empty", 15) == 0)
+      message = "Developer empty!";
+    else if (strstr(reasons->values[i].string.text, "error") != NULL)
+    {
+      message = unknown;
+
+      snprintf(unknown, sizeof(unknown), "Unknown printer error (%s)!",
+               reasons->values[i].string.text);
+    }
+
+    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);
+    }
+  }
+
+  return (count);
+}
+
+
+
 /*
 * End of "$Id$".
 */
@@ -3,7 +3,7 @@
 *
 *   Line Printer Daemon backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2002 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,11 +21,14 @@
 *       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.
 *   lpd_command() - Send an LPR command sequence and wait for a reply.
 *   lpd_queue()   - Queue a file using the Line Printer Daemon protocol.
+ *   lpd_write()   - Write a buffer of data to an LPD server.
 */

 /*
@@ -36,22 +39,36 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <ctype.h>
 #include <cups/string.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <signal.h>

-#if defined(WIN32) || defined(__EMX__)
+#ifdef WIN32
 #  include <winsock.h>
 #else
 #  include <sys/socket.h>
 #  include <netinet/in.h>
 #  include <arpa/inet.h>
 #  include <netdb.h>
-#endif /* WIN32 || __EMX__ */
+#endif /* WIN32 */

-extern int	rresvport(int *port);	/* Hello?  No prototype for this... */
+
+/*
+ * The order for control and data files in LPD requests...
+ */
+
+#define ORDER_CONTROL_DATA	0
+#define ORDER_DATA_CONTROL	1
+
+
+/*
+ * It appears that rresvport() is never declared on most systems...
+ */
+
+extern int	rresvport(int *port);


 /*
@@ -60,8 +77,9 @@ extern int	rresvport(int *port);	/* Hello?  No prototype for this... */

 static int	lpd_command(int lpd_fd, char *format, ...);
 static int	lpd_queue(char *hostname, char *printer, char *filename,
-		          char *user, char *title, int copies, int banner,
-			  int format);
+		          int fromstdin, char *user, char *title, int copies,
+			  int banner, int format, int order);
+static int	lpd_write(int lpd_fd, char *buffer, int length);


 /*
@@ -84,13 +102,25 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 	name[255],	/* Name of option */
 	value[255],	/* Value of option */
 	*ptr,		/* Pointer into name or value */
-	filename[1024];	/* File to print */
+	filename[1024],	/* File to print */
+	title[256];	/* Title string */
  int	port;		/* Port number (not used) */
  int	status;		/* Status of LPD job */
  int	banner;		/* Print banner page? */
  int	format;		/* Print format */
+  int	order;		/* Order of control/data files */


+ /*
+  * Make sure status messages are not buffered...
+  */
+
+  setbuf(stderr, NULL);
+
+ /*
+  * Check command-line...
+  */
+
  if (argc == 1)
  {
    puts("network lpd \"Unknown\" \"LPD/LPR Host or Printer\"");
@@ -115,33 +145,30 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
    * Copy stdin to a temporary file...
    */

-    FILE *fp;		/* Temporary file */
+    int  fd;		/* Temporary file */
    char buffer[8192];	/* Buffer for copying */
    int  bytes;		/* Number of bytes read */


-    if ((fp = fopen(cupsTempFile(filename, sizeof(filename)), "w")) == NULL)
+    if ((fd = cupsTempFd(filename, sizeof(filename))) < 0)
    {
      perror("ERROR: unable to create temporary file");
      return (1);
    }

    while ((bytes = fread(buffer, 1, sizeof(buffer), stdin)) > 0)
-      if (fwrite(buffer, 1, bytes, fp) < bytes)
+      if (write(fd, buffer, bytes) < bytes)
      {
        perror("ERROR: unable to write to temporary file");
-	fclose(fp);
+	close(fd);
 	unlink(filename);
 	return (1);
      }

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

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

  banner = 0;
  format = 'l';
+  order  = ORDER_CONTROL_DATA;

  if ((options = strchr(resource, '?')) != NULL)
  {
@@ -223,26 +251,48 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 	else
 	  fprintf(stderr, "ERROR: Unknown format character \"%c\"\n", value[0]);
      }
+      else if (strcasecmp(name, "order") == 0 && value[0])
+      {
+       /*
+        * Set control/data order...
+	*/
+
+        if (strcasecmp(value, "control,data") == 0)
+	  order = ORDER_CONTROL_DATA;
+	else if (strcasecmp(value, "data,control") == 0)
+	  order = ORDER_DATA_CONTROL;
+	else
+	  fprintf(stderr, "ERROR: Unknown file order \"%s\"\n", value);
+      }
    }
  }

+ /*
+  * Sanitize the document title...
+  */
+
+  strlcpy(title, argv[3], sizeof(title));
+
+  for (ptr = title; *ptr; ptr ++)
+    if (!isalnum(*ptr) && !isspace(*ptr))
+      *ptr = '_';
+
 /*
  * Queue the job...
  */

  if (argc > 6)
  {
-    status = lpd_queue(hostname, resource + 1, filename,
-                       argv[2] /* user */, argv[3] /* title */,
-		       atoi(argv[4]) /* copies */, banner, format);
+    status = lpd_queue(hostname, resource + 1, filename, 0,
+                       argv[2] /* user */, title, atoi(argv[4]) /* copies */,
+		       banner, format, order);

    if (!status)
      fprintf(stderr, "PAGE: 1 %d\n", atoi(argv[4]));
  }
  else
-    status = lpd_queue(hostname, resource + 1, filename,
-                       argv[2] /* user */, argv[3] /* title */, 1,
-		       banner, format);
+    status = lpd_queue(hostname, resource + 1, filename, 1,
+                       argv[2] /* user */, title, 1, banner, format, order);

 /*
  * Remove the temporary file if necessary...
@@ -290,7 +340,7 @@ lpd_command(int  fd,		/* I - Socket connection to LPD host */

  fprintf(stderr, "DEBUG: Sending command string (%d bytes)...\n", bytes);

-  if (send(fd, buf, bytes, 0) < bytes)
+  if (lpd_write(fd, buf, bytes) < bytes)
    return (-1);

 /*
@@ -316,11 +366,13 @@ static int			/* O - Zero on success, non-zero on failure */
 lpd_queue(char *hostname,	/* I - Host to connect to */
          char *printer,	/* I - Printer/queue name */
 	  char *filename,	/* I - File to print */
+          int  fromstdin,	/* I - Printing from stdin? */
          char *user,		/* I - Requesting user */
 	  char *title,		/* I - Job title */
 	  int  copies,		/* I - Number of copies */
 	  int  banner,		/* I - Print LPD banner? */
-          int  format)		/* I - Format specifier */
+          int  format,		/* I - Format specifier */
+          int  order)		/* I - Order of data/control files */
 {
  FILE			*fp;		/* Job file */
  char			localhost[255];	/* Local host name */
@@ -345,7 +397,7 @@ lpd_queue(char *hostname,	/* I - Host to connect to */
  * First try to reserve a port for this connection...
  */

-  if ((hostaddr = gethostbyname(hostname)) == NULL)
+  if ((hostaddr = httpGetHostByName(hostname)) == NULL)
  {
    fprintf(stderr, "ERROR: Unable to locate printer \'%s\' - %s",
            hostname, strerror(errno));
@@ -362,11 +414,31 @@ lpd_queue(char *hostname,	/* I - Host to connect to */

  for (port = 732;;)
  {
-    if ((fd = rresvport(&port)) < 0)
+    if (getuid())
    {
-      perror("ERROR: Unable to reserve port");
-      sleep(30);
-      continue;
+     /*
+      * We're running as a normal user, so just create a regular socket...
+      */
+
+      if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
+      {
+        perror("ERROR: Unable to create socket");
+        return (1);
+      }
+    }
+    else
+    {
+     /*
+      * We're running as root, so comply with RFC 1179 and reserve a
+      * priviledged port between 721 and 732...
+      */
+
+      if ((fd = rresvport(&port)) < 0)
+      {
+	perror("ERROR: Unable to reserve port");
+	sleep(30);
+	continue;
+      }
    }

    if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0)
@@ -375,7 +447,8 @@ lpd_queue(char *hostname,	/* I - Host to connect to */
      close(fd);
      fd = -1;

-      if (error == ECONNREFUSED)
+      if (error == ECONNREFUSED || error == EHOSTDOWN ||
+          error == EHOSTUNREACH)
      {
 	fprintf(stderr, "INFO: Network host \'%s\' is busy; will retry in 30 seconds...",
                hostname);
@@ -397,25 +470,29 @@ lpd_queue(char *hostname,	/* I - Host to connect to */
      break;
  }

-  fprintf(stderr, "INFO: Connected on port %d...\n", port);
+  fprintf(stderr, "INFO: Connected from port %d...\n", port);

 /*
  * 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...
+  * current page...  Only ignore SIGTERM if we are printing data from
+  * stdin (otherwise you can't cancel raw jobs...)
  */

+  if (fromstdin)
+  {
 #ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-  sigset(SIGTERM, SIG_IGN);
+    sigset(SIGTERM, SIG_IGN);
 #elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
+    memset(&action, 0, sizeof(action));

-  sigemptyset(&action.sa_mask);
-  action.sa_handler = SIG_IGN;
-  sigaction(SIGTERM, &action, NULL);
+    sigemptyset(&action.sa_mask);
+    action.sa_handler = SIG_IGN;
+    sigaction(SIGTERM, &action, NULL);
 #else
-  signal(SIGTERM, SIG_IGN);
+    signal(SIGTERM, SIG_IGN);
 #endif /* HAVE_SIGSET */
+  }

 /*
  * Next, open the print file and figure out its size...
@@ -467,27 +544,36 @@ lpd_queue(char *hostname,	/* I - Host to connect to */

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

-  lpd_command(fd, "\002%d cfA%03.3d%s\n", strlen(control), getpid() % 1000,
-              localhost);
-
-  fprintf(stderr, "INFO: Sending control file (%d bytes)\n", strlen(control));
-
-  if (send(fd, control, strlen(control) + 1, 0) < (strlen(control) + 1))
+  if (order == ORDER_CONTROL_DATA)
  {
-    perror("ERROR: Unable to write control file");
-    status = 1;
+    lpd_command(fd, "\002%d cfA%03.3d%s\n", strlen(control), getpid() % 1000,
+        	localhost);
+
+    fprintf(stderr, "INFO: Sending control file (%lu bytes)\n", (unsigned long)strlen(control));
+
+    if (lpd_write(fd, control, strlen(control) + 1) < (strlen(control) + 1))
+    {
+      status = errno;
+      perror("ERROR: Unable to write control file");
+    }
+    else if (read(fd, &status, 1) < 1)
+      status = errno;
+
+    if (status != 0)
+      fprintf(stderr, "ERROR: Remote host did not accept control file (%d)\n",
+              status);
+    else
+      fputs("INFO: Control file sent successfully\n", stderr);
  }
-  else if (read(fd, &status, 1) < 1 || status != 0)
-    fprintf(stderr, "ERROR: Remote host did not accept control file (%d)\n",
-            status);
  else
+    status = 0;
+
+  if (status == 0)
  {
   /*
    * Send the print file...
    */

-    fputs("INFO: Control file sent successfully\n", stderr);
-
    lpd_command(fd, "\003%u dfA%03.3d%s\n", (unsigned)filestats.st_size,
                getpid() % 1000, localhost);

@@ -498,9 +584,9 @@ lpd_queue(char *hostname,	/* I - Host to connect to */
    while ((nbytes = fread(buffer, 1, sizeof(buffer), fp)) > 0)
    {
      fprintf(stderr, "INFO: Spooling LPR job, %u%% complete...\n",
-              (unsigned)(100 * tbytes / filestats.st_size));
+              (unsigned)(100.0f * tbytes / filestats.st_size));

-      if (send(fd, buffer, nbytes, 0) < nbytes)
+      if (lpd_write(fd, buffer, nbytes) < nbytes)
      {
        perror("ERROR: Unable to send print file to printer");
        break;
@@ -509,17 +595,42 @@ lpd_queue(char *hostname,	/* I - Host to connect to */
        tbytes += nbytes;
    }

-    send(fd, "", 1, 0);
-
    if (tbytes < filestats.st_size)
-      status = 1;
-    else if (recv(fd, &status, 1, 0) < 1 || status != 0)
+      status = errno;
+    else if (lpd_write(fd, "", 1) < 1)
+      status = errno;
+    else if (recv(fd, &status, 1, 0) < 1)
+      status = errno;
+
+    if (status != 0)
      fprintf(stderr, "ERROR: Remote host did not accept data file (%d)\n",
              status);
    else
      fputs("INFO: Data file sent successfully\n", stderr);
  }

+  if (status == 0 && order == ORDER_DATA_CONTROL)
+  {
+    lpd_command(fd, "\002%d cfA%03.3d%s\n", strlen(control), getpid() % 1000,
+        	localhost);
+
+    fprintf(stderr, "INFO: Sending control file (%lu bytes)\n", (unsigned long)strlen(control));
+
+    if (lpd_write(fd, control, strlen(control) + 1) < (strlen(control) + 1))
+    {
+      status = errno;
+      perror("ERROR: Unable to write control file");
+    }
+    else if (read(fd, &status, 1) < 1)
+      status = errno;
+
+    if (status != 0)
+      fprintf(stderr, "ERROR: Remote host did not accept control file (%d)\n",
+              status);
+    else
+      fputs("INFO: Control file sent successfully\n", stderr);
+  }
+
 /*
  * Close the socket connection and input file and return...
  */
@@ -531,6 +642,123 @@ lpd_queue(char *hostname,	/* I - Host to connect to */
 }


+/*
+ * 'lpd_write()' - Write a buffer of data to an LPD server.
+ */
+
+static int			/* O - Number of bytes written or -1 on error */
+lpd_write(int  lpd_fd,		/* I - LPD socket */
+          char *buffer,		/* I - Buffer to write */
+	  int  length)		/* I - Number of bytes to write */
+{
+  int	bytes,			/* Number of bytes written */
+	total;			/* Total number of bytes written */
+
+
+  total = 0;
+  while ((bytes = send(lpd_fd, buffer, length - total, 0)) >= 0)
+  {
+    total  += bytes;
+    buffer += bytes;
+
+    if (total == length)
+      break;
+  }
+
+  if (bytes < 0)
+    return (-1);
+  else
+    return (length);
+}
+
+
+#ifndef HAVE_RRESVPORT
+/*
+ * 'rresvport()' - A simple implementation of rresvport().
+ */
+
+int				/* O  - Socket or -1 on error */
+rresvport(int *port)		/* IO - Port number to bind to */
+{
+  struct sockaddr_in	addr;	/* Socket address */
+  int			fd;	/* Socket file descriptor */
+
+
+ /*
+  * Try to create an IPv4 socket...
+  */
+
+  if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
+    return (-1);
+
+ /*
+  * Initialize the address buffer...
+  */
+
+  memset(&addr, 0, sizeof(addr));
+
+  addr.sin_family      = AF_INET;
+  addr.sin_addr.s_addr = INADDR_ANY;
+
+ /*
+  * Try to bind the socket to a reserved port; unlike the standard
+  * BSD rresvport(), we limit the port number to 721 through 732
+  * (instead of 512 to 1023) since RFC 1179 defines the local port
+  * number between 721 and 732...
+  */
+
+  while (*port > 720)
+  {
+   /*
+    * Set the port number...
+    */
+
+    addr.sin_port = htons(*port);
+
+   /*
+    * Try binding the port to the socket; return if all is OK...
+    */
+
+    if (!bind(fd, (struct sockaddr *)&addr, sizeof(addr)))
+      return (fd);
+
+   /*
+    * Stop if we have any error other than "address already in use"...
+    */
+
+    if (errno != EADDRINUSE)
+    {
+#  ifdef WIN32
+      closesocket(fd);
+#  else
+      close(fd);
+#  endif /* WIN32 */
+
+      return (-1);
+    }
+
+   /*
+    * Try the next port...
+    */
+
+    (*port)--;
+  }
+
+ /*
+  * Wasn't able to bind to a reserved port, so close the socket and return
+  * -1...
+  */
+
+#  ifdef WIN32
+  closesocket(fd);
+#  else
+  close(fd);
+#  endif /* WIN32 */
+
+  return (-1);
+}
+#endif /* !HAVE_RRESVPORT */
+
 /*
 * End of "$Id$".
 */
@@ -3,7 +3,7 @@
 *
 *   Parallel port backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2002 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,6 +21,8 @@
 *       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.
@@ -38,13 +40,13 @@
 #include <cups/string.h>
 #include <signal.h>

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

 #ifdef __sgi
 #  include <invent.h>
@@ -83,7 +85,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) */
-  FILE		*fp;		/* Print file */
+  int		fp;		/* Print file */
  int		copies;		/* Number of copies to print */
  int		fd;		/* Parallel device */
  int		wbytes;		/* Number of bytes written */
@@ -97,6 +99,16 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */


+ /*
+  * Make sure status messages are not buffered...
+  */
+
+  setbuf(stderr, NULL);
+
+ /*
+  * Check command-line...
+  */
+
  if (argc == 1)
  {
    list_devices();
@@ -115,7 +127,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

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

-    if ((fp = fopen(argv[6], "rb")) == NULL)
+    if ((fp = open(argv[6], O_RDONLY)) < 0)
    {
      perror("ERROR: unable to open print file");
      return (1);
@@ -166,9 +178,15 @@ 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
      {
-	perror("ERROR: Unable to open parallel port device file");
+	fprintf(stderr, "ERROR: Unable to open parallel port device file \"%s\": %s\n",
+	        resource, strerror(errno));
 	return (1);
      }
    }
@@ -190,20 +208,24 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 /*
  * 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...
+  * current page...  Only ignore SIGTERM if we are printing data from
+  * stdin (otherwise you can't cancel raw jobs...)
  */

+  if (argc < 7)
+  {
 #ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-  sigset(SIGTERM, SIG_IGN);
+    sigset(SIGTERM, SIG_IGN);
 #elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
+    memset(&action, 0, sizeof(action));

-  sigemptyset(&action.sa_mask);
-  action.sa_handler = SIG_IGN;
-  sigaction(SIGTERM, &action, NULL);
+    sigemptyset(&action.sa_mask);
+    action.sa_handler = SIG_IGN;
+    sigaction(SIGTERM, &action, NULL);
 #else
-  signal(SIGTERM, SIG_IGN);
+    signal(SIGTERM, SIG_IGN);
 #endif /* HAVE_SIGSET */
+  }

 /*
  * Finally, send the print file...
@@ -213,14 +235,14 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  {
    copies --;

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

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

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

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

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

  return (0);
 }
@@ -278,7 +303,8 @@ list_devices(void)
  int	i;			/* Looping var */
  int	fd;			/* File descriptor */
  char	device[255],		/* Device filename */
-	probefile[255];		/* Probe filename */
+	probefile[255],		/* Probe filename */
+	basedevice[255];	/* Base device filename for ports */
  FILE	*probe;			/* /proc/parport/n/autoprobe file */
  char	line[1024],		/* Line from file */
 	*delim,			/* Delimiter in file */
@@ -292,14 +318,39 @@ list_devices(void)
    * First open the device to make sure the driver module is loaded...
    */

-    sprintf(device, "/dev/lp%d", i);
-    if ((fd = open(device, O_WRONLY)) >= 0)
+    if ((fd = open("/dev/parallel/0", O_WRONLY)) >= 0)
+    {
      close(fd);
+      strcpy(basedevice, "/dev/parallel/");
+    }
    else
    {
-      sprintf(device, "/dev/par%d", i);
+      sprintf(device, "/dev/lp%d", i);
      if ((fd = open(device, O_WRONLY)) >= 0)
+      {
 	close(fd);
+	strcpy(basedevice, "/dev/lp");
+      }
+      else
+      {
+	sprintf(device, "/dev/par%d", i);
+	if ((fd = open(device, O_WRONLY)) >= 0)
+	{
+	  close(fd);
+	  strcpy(basedevice, "/dev/par");
+	}
+	else
+	{
+	  sprintf(device, "/dev/printers/%d", i);
+	  if ((fd = open(device, O_WRONLY)) >= 0)
+	  {
+	    close(fd);
+	    strcpy(basedevice, "/dev/printers/");
+	  }
+	  else
+	    strcpy(basedevice, "/dev/unknown-parallel");
+	}
+      }
    }

   /*
@@ -344,20 +395,20 @@ list_devices(void)

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

      fclose(probe);

      if (make[0])
-	printf("direct parallel:/dev/lp%d \"%s %s\" \"Parallel Port #%d\"\n",
-	       i, make, model, i + 1);
+	printf("direct parallel:%s%d \"%s %s\" \"Parallel Port #%d\"\n",
+	       basedevice, i, make, model, i + 1);
      else
-	printf("direct parallel:/dev/lp%d \"%s\" \"Parallel Port #%d\"\n",
-	       i, model, i + 1);
+	printf("direct parallel:%s%d \"%s\" \"Parallel Port #%d\"\n",
+	       basedevice, i, model, i + 1);
    }
    else if (fd >= 0)
    {
@@ -575,6 +626,28 @@ list_devices(void)
  {
    sprintf(device, "/dev/lpt%d", i);
    if ((fd = open(device, O_WRONLY)) >= 0)
+    {
+      close(fd);
+      printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d (interrupt-driven)\"\n", device, i + 1);
+    }
+
+    sprintf(device, "/dev/lpa%d", i);
+    if ((fd = open(device, O_WRONLY)) >= 0)
+    {
+      close(fd);
+      printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d (polled)\"\n", device, i + 1);
+    }
+  }
+#elif defined(_AIX)
+  int	i;			/* Looping var */
+  int	fd;			/* File descriptor */
+  char	device[255];		/* Device filename */
+
+
+  for (i = 0; i < 8; i ++)
+  {
+    sprintf(device, "/dev/lp%d", i);
+    if ((fd = open(device, O_WRONLY)) >= 0)
    {
      close(fd);
      printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
@@ -0,0 +1,211 @@
+/*
+ * "$Id$"
+ *
+ *   IRIX SCSI printer support for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 2002 by Easy Software Products, all rights reserved.
+ *
+ *   Redistribution and use in source and binary forms, with or
+ *   without modification, are permitted provided that the
+ *   following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above
+ *	  copyright notice, this list of conditions and the
+ *	  following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the
+ *	  above copyright notice, this list of conditions and
+ *	  the following disclaimer in the documentation and/or
+ *	  other materials provided with the distribution.
+ *
+ *     3. All advertising materials mentioning features or use
+ *	  of this software must display the following
+ *	  acknowledgement:
+ *
+ *	    This product includes software developed by Easy
+ *	    Software Products.
+ *
+ *     4. The name of Easy Software Products may not be used to
+ *	  endorse or promote products derived from this software
+ *	  without specific prior written permission.
+ *
+ *   THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS
+ *   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+ *   BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ *   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *   DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
+ *   BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ *   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ *   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ *   OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ *   DAMAGE.
+ *
+ * Contents:
+ *
+ *   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 */
+		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/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$".
+ */
@@ -0,0 +1,228 @@
+/*
+ * "$Id$"
+ *
+ *   Linux SCSI printer support for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 2002 by Easy Software Products, all rights reserved.
+ *
+ *   Redistribution and use in source and binary forms, with or
+ *   without modification, are permitted provided that the
+ *   following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above
+ *	  copyright notice, this list of conditions and the
+ *	  following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the
+ *	  above copyright notice, this list of conditions and
+ *	  the following disclaimer in the documentation and/or
+ *	  other materials provided with the distribution.
+ *
+ *     3. All advertising materials mentioning features or use
+ *	  of this software must display the following
+ *	  acknowledgement:
+ *
+ *	    This product includes software developed by Easy
+ *	    Software Products.
+ *
+ *     4. The name of Easy Software Products may not be used to
+ *	  endorse or promote products derived from this software
+ *	  without specific prior written permission.
+ *
+ *   THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS
+ *   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+ *   BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ *   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *   DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
+ *   BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ *   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ *   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ *   OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ *   DAMAGE.
+ *
+ * Contents:
+ *
+ *   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$".
+ */
@@ -0,0 +1,206 @@
+/*
+ * "$Id$"
+ *
+ *   SCSI printer backend for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 2002 by Easy Software Products, all rights reserved.
+ *
+ *   Redistribution and use in source and binary forms, with or
+ *   without modification, are permitted provided that the
+ *   following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above
+ *	  copyright notice, this list of conditions and the
+ *	  following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the
+ *	  above copyright notice, this list of conditions and
+ *	  the following disclaimer in the documentation and/or
+ *	  other materials provided with the distribution.
+ *
+ *     3. All advertising materials mentioning features or use
+ *	  of this software must display the following
+ *	  acknowledgement:
+ *
+ *	    This product includes software developed by Easy
+ *	    Software Products.
+ *
+ *     4. The name of Easy Software Products may not be used to
+ *	  endorse or promote products derived from this software
+ *	  without specific prior written permission.
+ *
+ *   THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS
+ *   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+ *   BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ *   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *   DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
+ *   BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ *   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ *   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ *   OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ *   DAMAGE.
+ *
+ * Contents:
+ *
+ *   main() - Send a file to the 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 */
+
+
+ /*
+  * Make sure status messages are not buffered...
+  */
+
+  setbuf(stderr, NULL);
+
+ /*
+  * Check command-line...
+  */
+
+  if (argc == 1)
+  {
+    list_devices();
+    return (0);
+  }
+  else if (argc < 6 || argc > 7)
+  {
+    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-2000 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2002 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,6 +21,8 @@
 *       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.
@@ -42,16 +44,16 @@
 #  include <sys/modem.h>
 #endif /* __hpux */

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

 #ifdef __sgi
 #  include <invent.h>
@@ -101,7 +103,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) */
-  FILE		*fp;		/* Print file */
+  int		fp;		/* Print file */
  int		copies;		/* Number of copies to print */
  int		fd;		/* Parallel device */
  int		wbytes;		/* Number of bytes written */
@@ -111,12 +113,23 @@ 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;		/* Parallel port options */
+  struct termios opts;		/* Serial port options */
+  struct termios origopts;	/* Original port options */
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
  struct sigaction action;	/* Actions for POSIX signals */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */


+ /*
+  * Make sure status messages are not buffered...
+  */
+
+  setbuf(stderr, NULL);
+
+ /*
+  * Check command-line...
+  */
+
  if (argc == 1)
  {
    list_devices();
@@ -135,7 +148,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

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

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

  do
  {
-    if ((fd = open(resource, O_WRONLY | O_NOCTTY | O_EXCL)) == -1)
+    if ((fd = open(resource, O_WRONLY | O_NOCTTY | O_EXCL | O_NDELAY)) == -1)
    {
      if (errno == EBUSY)
      {
@@ -188,7 +201,8 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
      }
      else
      {
-	perror("ERROR: Unable to open serial port device file");
+	fprintf(stderr, "ERROR: Unable to open serial port device file \"%s\": %s\n",
+	        resource, strerror(errno));
 	return (1);
      }
    }
@@ -199,11 +213,13 @@ 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 = 480;	/* 9600 baud / 10 bits/char / 2Hz */
+  bufsize = 96;		/* 9600 baud / 10 bits/char / 10Hz */
  dtrdsr  = 0;		/* No dtr/dsr flow control */

  if (options != NULL)
@@ -245,7 +261,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
        * Set the baud rate...
 	*/

-        bufsize = atoi(value) / 20;
+        bufsize = atoi(value) / 100;

 #if B19200 == 19200
        cfsetispeed(&opts, atoi(value));
@@ -277,18 +293,24 @@ 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 */
+#  endif /* B115200 */
+#  ifdef B230400
+	  case 230400 :
+	      cfsetispeed(&opts, B230400);
+	      cfsetospeed(&opts, B230400);
+	      break;
+#  endif /* B230400 */
          default :
 	      fprintf(stderr, "WARNING: Unsupported baud rate %s!\n", value);
 	      break;
@@ -368,24 +390,29 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
    }

  tcsetattr(fd, TCSANOW, &opts);
+  fcntl(fd, F_SETFL, 0);

 /*
  * 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...
+  * current page...  Only ignore SIGTERM if we are printing data from
+  * stdin (otherwise you can't cancel raw jobs...)
  */

+  if (argc < 7)
+  {
 #ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-  sigset(SIGTERM, SIG_IGN);
+    sigset(SIGTERM, SIG_IGN);
 #elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
+    memset(&action, 0, sizeof(action));

-  sigemptyset(&action.sa_mask);
-  action.sa_handler = SIG_IGN;
-  sigaction(SIGTERM, &action, NULL);
+    sigemptyset(&action.sa_mask);
+    action.sa_handler = SIG_IGN;
+    sigaction(SIGTERM, &action, NULL);
 #else
-  signal(SIGTERM, SIG_IGN);
+    signal(SIGTERM, SIG_IGN);
 #endif /* HAVE_SIGSET */
+  }

 /*
  * Finally, send the print file...
@@ -398,10 +425,10 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  {
    copies --;

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

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

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

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

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

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

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

-#ifdef __linux
+#if defined(__linux) || defined(linux) || defined(__linux__)
  int	i;		/* Looping var */
  int	fd;		/* File descriptor */
  char	device[255];	/* Device filename */
@@ -501,8 +533,24 @@ 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)
@@ -532,7 +580,7 @@ list_devices(void)
        */

 	for (n = 0; n < 6; n ++)
-	  printf("serial serial:/dev/ttyd%d?baud=19200 \"Unknown\" \"CDSIO Board %d Serial Port #%d\"\n",
+	  printf("serial serial:/dev/ttyd%d?baud=38400 \"Unknown\" \"CDSIO Board %d Serial Port #%d\"\n",
        	 n + 5 + 8 * inv->inv_controller, inv->inv_controller, n + 1);
      }
      else if (inv->inv_type == INV_EPC_SERIAL)
@@ -547,7 +595,7 @@ list_devices(void)
          i = 41 + 4 * (int)inv->inv_controller;

 	for (n = 0; n < (int)inv->inv_state; n ++)
-	  printf("serial serial:/dev/ttyd%d?baud=19200 \"Unknown\" \"EPC Serial Port %d, Ebus slot %d\"\n",
+	  printf("serial serial:/dev/ttyd%d?baud=38400 \"Unknown\" \"EPC Serial Port %d, Ebus slot %d\"\n",
        	 n + i, n + 1, (int)inv->inv_controller);
      }
      else if (inv->inv_state > 1)
@@ -557,7 +605,7 @@ list_devices(void)
        */

 	for (n = 0; n < (int)inv->inv_state; n ++)
-	  printf("serial serial:/dev/ttyd%d?baud=19200 \"Unknown\" \"Onboard Serial Port %d\"\n",
+	  printf("serial serial:/dev/ttyd%d?baud=38400 \"Unknown\" \"Onboard Serial Port %d\"\n",
        	 n + (int)inv->inv_unit + 1, n + (int)inv->inv_unit + 1);
      }
      else
@@ -718,7 +766,7 @@ list_devices(void)
      printf("serial serial:%s?baud=38400 \"Unknown\" \"Serial Port #%d\"\n",
             device, i + 1);
  }
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__OpenBSD__)
  int	i, j;		/* Looping vars */
  int	fd;		/* File descriptor */
  char	device[255];	/* Device filename */
@@ -800,6 +848,43 @@ list_devices(void)
             device, i + 1);
    }
  }
+#elif defined(__NetBSD__)
+  int	i, j;		/* Looping vars */
+  int	fd;		/* File descriptor */
+  char	device[255];	/* Device filename */
+
+
+ /*
+  * Standard serial ports...
+  */
+
+  for (i = 0; i < 4; i ++)
+  {
+    sprintf(device, "/dev/tty%02d", i);
+    if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
+    {
+      close(fd);
+      printf("serial serial:%s?baud=115200 \"Unknown\" \"Serial Port #%d\"\n",
+             device, i + 1);
+    }
+  }
+
+ /*
+  * Cyclades-Z ports...
+  */
+
+  for (i = 0; i < 16; i ++) /* Should be up to 65536 boards... */
+    for (j = 0; j < 64; j ++)
+    {
+      sprintf(device, "/dev/ttyCZ%02d%02d", i, j);
+      if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
+      {
+	close(fd);
+	printf("serial serial:%s?baud=115200 \"Unknown\" \"Cyclades #%d Serial Prt #%d\"\n",
+	       device, i, j + 1);
+      }
+    }
+
 #endif
 }

@@ -3,7 +3,7 @@
 *
 *   AppSocket backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2002 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,6 +21,8 @@
 *       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.
@@ -40,14 +42,16 @@
 #include <sys/stat.h>
 #include <signal.h>

-#if defined(WIN32) || defined(__EMX__)
+#ifdef WIN32
 #  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 || __EMX__ */
+#endif /* WIN32 */


 /*
@@ -66,9 +70,10 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 		hostname[1024],	/* Hostname */
 		username[255],	/* Username info (not used) */
 		resource[1024];	/* Resource info (not used) */
-  FILE		*fp;		/* Print file */
+  int		fp;		/* Print file */
  int		copies;		/* Number of copies to print */
  int		port;		/* Port number */
+  int		delay;		/* Delay for retries... */
  int		fd;		/* AppSocket */
  int		error;		/* Error code (if any) */
  struct sockaddr_in addr;	/* Socket address */
@@ -85,6 +90,16 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */


+ /*
+  * Make sure status messages are not buffered...
+  */
+
+  setbuf(stderr, NULL);
+
+ /*
+  * Check command-line...
+  */
+
  if (argc == 1)
  {
    puts("network socket \"Unknown\" \"AppSocket/HP JetDirect\"");
@@ -104,7 +119,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

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

-    if ((fp = fopen(argv[6], "rb")) == NULL)
+    if ((fp = open(argv[6], O_RDONLY)) < 0)
    {
      perror("ERROR: unable to open print file");
      return (1);
@@ -135,7 +150,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  * Then try to connect to the remote host...
  */

-  if ((hostaddr = gethostbyname(hostname)) == NULL)
+  if ((hostaddr = httpGetHostByName(hostname)) == NULL)
  {
    fprintf(stderr, "ERROR: Unable to locate printer \'%s\' - %s\n",
            hostname, strerror(errno));
@@ -152,7 +167,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

  while (copies > 0)
  {
-    for (;;)
+    for (delay = 5;;)
    {
      if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
      {
@@ -166,15 +181,19 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 	close(fd);
 	fd = -1;

-	if (error == ECONNREFUSED)
+	if (error == ECONNREFUSED || error == EHOSTDOWN ||
+            error == EHOSTUNREACH)
 	{
-	  fprintf(stderr, "INFO: Network host \'%s\' is busy; will retry in 30 seconds...\n",
-                  hostname);
-	  sleep(30);
+	  fprintf(stderr, "INFO: Network host \'%s\' is busy; will retry in %d seconds...\n",
+                  hostname, delay);
+	  sleep(delay);
+
+	  if (delay < 30)
+	    delay += 5;
 	}
 	else
 	{
-	  perror("ERROR: Unable to connect to printer");
+	  perror("ERROR: Unable to connect to printer (retrying in 30 seconds)");
 	  sleep(30);
 	}
      }
@@ -185,20 +204,24 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
   /*
    * 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...
+    * current page...  Only ignore SIGTERM if we are printing data from
+    * stdin (otherwise you can't cancel raw jobs...)
    */

+    if (argc < 7)
+    {
 #ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-    sigset(SIGTERM, SIG_IGN);
+      sigset(SIGTERM, SIG_IGN);
 #elif defined(HAVE_SIGACTION)
-    memset(&action, 0, sizeof(action));
+      memset(&action, 0, sizeof(action));

-    sigemptyset(&action.sa_mask);
-    action.sa_handler = SIG_IGN;
-    sigaction(SIGTERM, &action, NULL);
+      sigemptyset(&action.sa_mask);
+      action.sa_handler = SIG_IGN;
+      sigaction(SIGTERM, &action, NULL);
 #else
-    signal(SIGTERM, SIG_IGN);
+      signal(SIGTERM, SIG_IGN);
 #endif /* HAVE_SIGSET */
+    }

   /*
    * Finally, send the print file...
@@ -206,16 +229,16 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

    copies --;

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

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

    tbytes = 0;
-    while ((nbytes = fread(buffer, 1, sizeof(buffer), fp)) > 0)
+    while ((nbytes = read(fp, buffer, sizeof(buffer))) > 0)
    {
     /*
      * Write the print data to the printer...
@@ -240,22 +263,69 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
      * Check for possible data coming back from the printer...
      */

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

 	if ((nbytes = recv(fd, buffer, sizeof(buffer), 0)) > 0)
-	  fprintf(stderr, "INFO: Received %u bytes of back-channel data!\n",
-	          nbytes);
+	  fprintf(stderr, "INFO: Received %lu bytes of back-channel data!\n",
+	          (unsigned long)nbytes);
      }
      else if (argc > 6)
-	fprintf(stderr, "INFO: Sending print file, %u bytes...\n", tbytes);
+	fprintf(stderr, "INFO: Sending print file, %lu bytes...\n",
+	        (unsigned long)tbytes);
+    }
+
+   /*
+    * Shutdown the socket and wait for the other end to finish...
+    */
+
+    fputs("INFO: Print file sent, waiting for printer to finish...\n", stderr);
+
+    shutdown(fd, 1);
+
+    for (;;)
+    {
+     /*
+      * Wait a maximum of 90 seconds for backchannel data or a closed
+      * connection...
+      */
+
+      timeout.tv_sec  = 90;
+      timeout.tv_usec = 0;
+
+      FD_ZERO(&input);
+      FD_SET(fd, &input);
+
+#ifdef __hpux
+      if (select(fd + 1, (int *)&input, NULL, NULL, &timeout) > 0)
+#else
+      if (select(fd + 1, &input, NULL, NULL, &timeout) > 0)
+#endif /* __hpux */
+      {
+       /*
+	* Grab the data coming back and spit it out to stderr...
+	*/
+
+	if ((nbytes = recv(fd, buffer, sizeof(buffer), 0)) > 0)
+	  fprintf(stderr, "INFO: Received %lu bytes of back-channel data!\n",
+	          (unsigned long)nbytes);
+        else
+	  break;
+      }
+      else
+        break;
    }

   /*
@@ -269,8 +339,10 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  * Close the input file and return...
  */

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

  return (0);
 }
@@ -3,7 +3,7 @@
 *
 *   USB port backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2002 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,6 +21,8 @@
 *       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.
@@ -38,13 +40,13 @@
 #include <cups/string.h>
 #include <signal.h>

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


 /*
@@ -72,7 +74,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) */
-  FILE		*fp;		/* Print file */
+  int		fp;		/* Print file */
  int		copies;		/* Number of copies to print */
  int		fd;		/* Parallel device */
  int		wbytes;		/* Number of bytes written */
@@ -86,6 +88,16 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */


+ /*
+  * Make sure status messages are not buffered...
+  */
+
+  setbuf(stderr, NULL);
+
+ /*
+  * Check command-line...
+  */
+
  if (argc == 1)
  {
    list_devices();
@@ -104,7 +116,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

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

-    if ((fp = fopen(argv[6], "rb")) == NULL)
+    if ((fp = open(argv[6], O_RDONLY)) < 0)
    {
      perror("ERROR: unable to open print file");
      return (1);
@@ -155,9 +167,15 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
        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
      {
-	perror("ERROR: Unable to open USB port device file");
+	fprintf(stderr, "ERROR: Unable to open USB port device file \"%s\": %s\n",
+	        resource, strerror(errno));
 	return (1);
      }
    }
@@ -179,20 +197,24 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 /*
  * 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...
+  * current page...  Only ignore SIGTERM if we are printing data from
+  * stdin (otherwise you can't cancel raw jobs...)
  */

+  if (argc < 7)
+  {
 #ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-  sigset(SIGTERM, SIG_IGN);
+    sigset(SIGTERM, SIG_IGN);
 #elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
+    memset(&action, 0, sizeof(action));

-  sigemptyset(&action.sa_mask);
-  action.sa_handler = SIG_IGN;
-  sigaction(SIGTERM, &action, NULL);
+    sigemptyset(&action.sa_mask);
+    action.sa_handler = SIG_IGN;
+    sigaction(SIGTERM, &action, NULL);
 #else
-  signal(SIGTERM, SIG_IGN);
+    signal(SIGTERM, SIG_IGN);
 #endif /* HAVE_SIGSET */
+  }

 /*
  * Finally, send the print file...
@@ -202,14 +224,14 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  {
    copies --;

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

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

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

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

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

  return (0);
 }
@@ -317,12 +342,12 @@ list_devices(void)

        if (strncmp(line, "S:  Manufacturer=", 17) == 0)
 	{
-	  strncpy(make, line + 17, sizeof(make) - 1);
+	  strlcpy(make, line + 17, sizeof(make));
 	  if (strcmp(make, "Hewlett-Packard") == 0)
 	    strcpy(make, "HP");
 	}
        else if (strncmp(line, "S:  Product=", 12) == 0)
-	  strncpy(model, line + 12, sizeof(model) - 1);
+	  strlcpy(model, line + 12, sizeof(model));
      }
      else if (strncmp(line, "I:", 2) == 0 &&
               (strstr(line, "Driver=printer") != NULL ||
@@ -353,55 +378,82 @@ list_devices(void)
    }

    fclose(probe);
+
+   /*
+    * Write empty device listings for unused USB devices...
+    */
+
+    for (; i < 16; i ++)
+    {
+      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);
+
+	  if (access(device, 0))
+	    continue;
+	}
+      }
+
+      printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
+    }
  }
  else
  {
   /*
-    * Just probe manually for USB devices...
+    * Just check manually for USB devices...
    */

-    for (i = 0; i < 8; i ++)
+    for (i = 0; i < 16; i ++)
    {
      sprintf(device, "/dev/usb/lp%d", i);
-      if ((fd = open(device, O_WRONLY)) >= 0)
+
+      if (access(device, 0))
      {
-	close(fd);
-	printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
+	sprintf(device, "/dev/usb/usblp%d", i);
+
+	if (access(device, 0))
+	{
+	  sprintf(device, "/dev/usblp%d", i);
+
+	  if (access(device, 0))
+	    continue;
+	}
      }

-      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);
-      }
+      printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
    }
  }
 #elif defined(__sgi)
 #elif defined(__sun)
 #elif defined(__hpux)
 #elif defined(__osf)
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__)
+  int   i;                      /* Looping var */
+  char  device[255];            /* Device filename */
+
+
+  for (i = 0; i < 3; i ++)
+  {
+    sprintf(device, "/dev/unlpt%d", i);
+    if (!access(device, 0))
+      printf("direct usb:%s \"Unknown\" \"USB Printer #%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 ((fd = open(device, O_WRONLY)) >= 0)
-    {
-      close(fd);
-      printf("direct usb:%s \"Unknown\" \"USB Port #%d\"\n", device, i + 1);
-    }
+    if (!access(device, 0))
+      printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
  }
 #endif
 }
@@ -0,0 +1,4 @@
+lpc
+lpq
+lpr
+lprm
@@ -0,0 +1,11 @@
+# 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
+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: ../config.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
+lpr.o: ../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
@@ -3,7 +3,7 @@
 #
 #   Berkeley commands makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2000 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2002 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,16 +43,24 @@ 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:
-	-$(MKDIR) $(BINDIR)
-	$(CHMOD) ugo+rx $(BINDIR)
-	$(INSTALL_BIN) lpq lpr lprm $(BINDIR)
-	-$(MKDIR) $(SBINDIR)
-	$(CHMOD) ugo+rx $(SBINDIR)
+install:	all
+	$(INSTALL_DIR) $(BINDIR)
+	$(INSTALL_BIN) lpq $(BINDIR)
+	$(INSTALL_BIN) lpr $(BINDIR)
+	$(INSTALL_BIN) lprm $(BINDIR)
+	$(INSTALL_DIR) $(SBINDIR)
 	$(INSTALL_BIN) lpc $(SBINDIR)


@@ -64,8 +72,6 @@ lpc:	lpc.o ../cups/$(LIBCUPS)
 	echo Linking $@...
 	$(CC) $(LDFLAGS) -o lpc lpc.o $(LIBS)

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

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

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

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

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

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

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


 #
@@ -3,7 +3,7 @@
 *
 *   "lpc" command for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products.
+ *   Copyright 1997-2002 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -69,7 +69,7 @@ main(int  argc,		/* I - Number of command-line arguments */
  * Connect to the scheduler...
  */

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

  if (argc > 1)
  {
@@ -178,7 +178,7 @@ do_command(http_t *http,	/* I - HTTP connection to server */
           strcmp(command, "?") == 0)
    show_help(params);
  else
-    puts("?Invalid command");
+    printf("%s is not implemented by the CUPS version of lpc.\n", command);
 }


@@ -3,7 +3,7 @@
 *
 *   "lpq" command for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products.
+ *   Copyright 1997-2002 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -38,7 +38,7 @@

 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
+#include <cups/string.h>
 #include <cups/cups.h>
 #include <cups/language.h>
 #include <cups/debug.h>
@@ -71,13 +71,21 @@ 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_LIBSSL
+  http_encryption_t encryption;	/* Encryption? */
+#endif /* HAVE_LIBSSL */


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

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

 /*
  * Check for command-line options...
@@ -102,6 +110,18 @@ main(int  argc,		/* I - Number of command-line arguments */
    {
      switch (argv[i][1])
      {
+        case 'E' : /* Encrypt */
+#ifdef HAVE_LIBSSL
+	    encryption = HTTP_ENCRYPT_REQUIRED;
+
+	    if (http)
+	      httpEncryption(http, encryption);
+#else
+            fprintf(stderr, "%s: Sorry, no encryption support compiled in!\n",
+	            argv[0]);
+#endif /* HAVE_LIBSSL */
+	    break;
+
        case 'P' : /* Printer */
 	    if (argv[i][2])
 	      dest = argv[i] + 2;
@@ -115,6 +135,10 @@ main(int  argc,		/* I - Number of command-line arguments */
 	      *instance = '\0';
 	    break;

+	case 'a' : /* All printers */
+	    dest = NULL;
+	    break;
+
 	case 'l' : /* Long status */
 	    longstatus = 1;
 	    break;
@@ -390,10 +414,7 @@ show_jobs(http_t     *http,	/* I - HTTP connection to server */
 	  snprintf(namestr, sizeof(namestr), "%d copies of %s", jobcopies,
 	           jobname);
 	else
-	{
-	  strncpy(namestr, jobname, sizeof(namestr) - 1);
-	  namestr[sizeof(namestr) - 1] = '\0';
-	}
+	  strlcpy(namestr, jobname, sizeof(namestr));

        printf("%s: %-34.34s[job %d localhost]\n", jobuser, rankstr, jobid);
        printf("        %-40.40s%d bytes\n", namestr, jobsize);
@@ -3,7 +3,7 @@
 *
 *   "lpr" command for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products.
+ *   Copyright 1997-2002 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -33,6 +33,8 @@

 #include <stdio.h>
 #include <stdlib.h>
+
+#include <config.h>
 #include <cups/cups.h>


@@ -65,6 +67,7 @@ main(int  argc,		/* I - Number of command-line arguments */
 {
  int		i, j;		/* Looping var */
  int		job_id;		/* Job ID */
+  char		ch;		/* Option character */
  char		*printer,	/* Destination printer or class */
 		*instance;	/* Instance */
  const char	*title;		/* Job title */
@@ -78,10 +81,11 @@ main(int  argc,		/* I - Number of command-line arguments */
  cups_option_t	*options;	/* Options */
  int		deletefile;	/* Delete file after print? */
  char		buffer[8192];	/* Copy buffer */
-  FILE		*temp;		/* Temporary file pointer */
-#ifdef HAVE_SIGACTION
+  int		temp;		/* Temporary file descriptor */
+#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
  struct sigaction action;	/* Signal action */
-#endif /* HAVE_SIGACTION */
+  struct sigaction oldaction;	/* Old signal action */
+#endif /* HAVE_SIGACTION && !HAVE_SIGSET */


  deletefile  = 0;
@@ -95,12 +99,34 @@ main(int  argc,		/* I - Number of command-line arguments */

  for (i = 1; i < argc; i ++)
    if (argv[i][0] == '-')
-      switch (argv[i][1])
+      switch (ch = argv[i][1])
      {
+        case 'E' : /* Encrypt */
+#ifdef HAVE_LIBSSL
+	    cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);
+#else
+            fprintf(stderr, "%s: Sorry, no encryption support compiled in!\n",
+	            argv[0]);
+#endif /* HAVE_LIBSSL */
+	    break;
+
+	case '1' : /* TROFF font set 1 */
+	case '2' : /* TROFF font set 2 */
+	case '3' : /* TROFF font set 3 */
+	case '4' : /* TROFF font set 4 */
 	case 'i' : /* indent */
 	case 'w' : /* width */
 	    if (argv[i][2] == '\0')
+	    {
 	      i ++;
+
+	      if (i >= argc)
+	      {
+		fprintf(stderr, "lpr: Expected value after -%c option!\n", ch);
+		return (1);
+	      }
+	    }
+
        case 'c' : /* CIFPLOT */
 	case 'd' : /* DVI */
 	case 'f' : /* FORTRAN */
@@ -109,7 +135,7 @@ main(int  argc,		/* I - Number of command-line arguments */
 	case 't' : /* Troff */
 	case 'v' : /* Raster image */
 	    fprintf(stderr, "Warning: \'%c\' format modifier not supported - output may not be correct!\n",
-	            argv[i][1]);
+	            ch);
 	    break;

 	case 'o' : /* Option */
@@ -118,6 +144,12 @@ main(int  argc,		/* I - Number of command-line arguments */
 	    else
 	    {
 	      i ++;
+	      if (i >= argc)
+	      {
+	        fputs("lpr: Expected option=value after -o option!\n", stderr);
+		return (1);
+	      }
+
 	      num_options = cupsParseOptions(argv[i], num_options, &options);
 	    }
 	    break;
@@ -141,6 +173,11 @@ main(int  argc,		/* I - Number of command-line arguments */
 	    fputs("Warning: email notification is not supported!\n", stderr);
 	    break;

+	case 'q' : /* Queue file but don't print */
+            num_options = cupsAddOption("job-hold-until", "indefinite",
+	                                num_options, &options);
+	    break;
+
 	case 'r' : /* Remove file after printing */
 	    deletefile = 1;
 	    break;
@@ -151,6 +188,12 @@ main(int  argc,		/* I - Number of command-line arguments */
 	    else
 	    {
 	      i ++;
+	      if (i >= argc)
+	      {
+	        fputs("lpr: Expected destination after -P option!\n", stderr);
+		return (1);
+	      }
+
 	      printer = argv[i];
 	    }

@@ -176,6 +219,12 @@ main(int  argc,		/* I - Number of command-line arguments */
 	    else
 	    {
 	      i ++;
+	      if (i >= argc)
+	      {
+	        fputs("lpr: Expected copy count after -# option!\n", stderr);
+		return (1);
+	      }
+
 	      num_copies = atoi(argv[i]);
 	    }

@@ -197,10 +246,32 @@ main(int  argc,		/* I - Number of command-line arguments */
 	    else
 	    {
 	      i ++;
+	      if (i >= argc)
+	      {
+		fprintf(stderr, "lpr: Expected name after -%c option!\n", ch);
+		return (1);
+	      }
+
 	      title = argv[i];
 	    }
 	    break;

+	case 'U' : /* User */
+	    if (argv[i][2] != '\0')
+	      cupsSetUser(argv[i] + 2);
+	    else
+	    {
+	      i ++;
+	      if (i >= argc)
+	      {
+	        fputs("lpr: Expected username after -U option!\n", stderr);
+		return (1);
+	      }
+
+	      cupsSetUser(argv[i]);
+	    }
+	    break;
+
 	default :
 	    fprintf(stderr, "lpr: Unknown option \'%c\'!\n", argv[i][1]);
 	    return (1);
@@ -274,35 +345,37 @@ main(int  argc,		/* I - Number of command-line arguments */
 #ifndef WIN32
 #  if defined(HAVE_SIGSET)
    sigset(SIGHUP, sighandler);
-    sigset(SIGINT, sighandler);
+    if (sigset(SIGINT, sighandler) == SIG_IGN)
+      sigset(SIGINT, SIG_IGN);
    sigset(SIGTERM, sighandler);
 #  elif defined(HAVE_SIGACTION)
    memset(&action, 0, sizeof(action));
    action.sa_handler = sighandler;

    sigaction(SIGHUP, &action, NULL);
-    sigaction(SIGINT, &action, NULL);
+    sigaction(SIGINT, NULL, &oldaction);
+    if (oldaction.sa_handler != SIG_IGN)
+      sigaction(SIGINT, &action, NULL);
    sigaction(SIGTERM, &action, NULL);
 #  else
    signal(SIGHUP, sighandler);
-    signal(SIGINT, sighandler);
+    if (signal(SIGINT, sighandler) == SIG_IGN)
+      signal(SIGINT, SIG_IGN);
    signal(SIGTERM, sighandler);
 #  endif
 #endif /* !WIN32 */

-    temp = fopen(cupsTempFile(tempfile, sizeof(tempfile)), "w");
-
-    if (temp == NULL)
+    if ((temp = cupsTempFd(tempfile, sizeof(tempfile))) < 0)
    {
      fputs("lpr: unable to create temporary file.\n", stderr);
      return (1);
    }

-    while ((i = fread(buffer, 1, sizeof(buffer), stdin)) > 0)
-      fwrite(buffer, 1, i, temp);
+    while ((i = read(0, buffer, sizeof(buffer))) > 0)
+      write(temp, buffer, i);

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

    if (i == 0)
    {
@@ -3,7 +3,7 @@
 *
 *   "lprm" command for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products.
+ *   Copyright 1997-2002 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -58,17 +58,19 @@ main(int  argc,			/* I - Number of command-line arguments */
  cups_lang_t	*language;	/* Language */
  int		num_dests;	/* Number of destinations */
  cups_dest_t	*dests;		/* Destinations */
+  http_encryption_t encryption;	/* Encryption? */


 /*
  * Setup to cancel individual print jobs...
  */

-  op       = IPP_CANCEL_JOB;
-  job_id   = 0;
-  dest     = NULL;
-  response = NULL;
-  http     = NULL;
+  op         = IPP_CANCEL_JOB;
+  job_id     = 0;
+  dest       = NULL;
+  response   = NULL;
+  http       = NULL;
+  encryption = cupsEncryption();

  num_dests = cupsGetDests(&dests);

@@ -80,7 +82,7 @@ main(int  argc,			/* I - Number of command-line arguments */
  * Open a connection to the server...
  */

-  if ((http = httpConnect(cupsServer(), ippPort())) == NULL)
+  if ((http = httpConnectEncrypt(cupsServer(), ippPort(), encryption)) == NULL)
  {
    fputs("lprm: Unable to contact server!\n", stderr);
    cupsFreeDests(num_dests, dests);
@@ -95,6 +97,17 @@ main(int  argc,			/* I - Number of command-line arguments */
    if (argv[i][0] == '-' && argv[i][1] != '\0')
      switch (argv[i][1])
      {
+        case 'E' : /* Encrypt */
+#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_LIBSSL */
+	    break;
+
        case 'P' : /* Cancel jobs on a printer */
 	    if (argv[i][2])
 	      dest = argv[i] + 2;
@@ -135,7 +148,10 @@ main(int  argc,			/* I - Number of command-line arguments */
        op = IPP_PURGE_JOBS;
      }
      else
+      {
+        dest   = argv[i];
        job_id = 0;
+      }

     /*
      * Build an IPP request, which requires the following
@@ -206,6 +222,14 @@ main(int  argc,			/* I - Number of command-line arguments */
 	      break;
 	}

+        if (response->request.status.status_code > IPP_OK_CONFLICT)
+	{
+          ippDelete(response);
+          cupsFreeDests(num_dests, dests);
+          httpClose(http);
+	  return (1);
+	}
+
        ippDelete(response);
      }
      else
@@ -0,0 +1,5 @@
+admin.cgi
+classes.cgi
+jobs.cgi
+libcgi.a
+printers.cgi
@@ -0,0 +1,20 @@
+# 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-1999 by Easy Software Products.
+#   Copyright 1997-2002 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -24,8 +24,9 @@

 include ../Makedefs

-TARGETS	=	admin.cgi classes.cgi jobs.cgi printers.cgi
-LIBOBJS	=	abort.o email.o html.o ipp-var.o template.o var.o
+CGIS	=	admin.cgi classes.cgi jobs.cgi printers.cgi
+TARGETS	=	libcgi.a $(CGIS)
+LIBOBJS	=	html.o ipp-var.o template.o var.o
 OBJS	=	$(LIBOBJS) admin.o classes.o jobs.o printers.o


@@ -41,18 +42,26 @@ all:	$(TARGETS)
 #

 clean:
-	$(RM) $(OBJS) libcgi.a $(TARGETS)
+	$(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:
-	-$(MKDIR) $(SERVERBIN)/cgi-bin
-	$(CHMOD) ugo+rx $(SERVERBIN)
-	$(CHMOD) ugo+rx $(SERVERBIN)/cgi-bin
-	$(INSTALL_BIN) $(TARGETS) $(SERVERBIN)/cgi-bin
+install:	all
+	$(INSTALL_DIR) $(SERVERBIN)/cgi-bin
+	for file in $(CGIS); do \
+		$(INSTALL_BIN) $$file $(SERVERBIN)/cgi-bin; \
+	done


 #
@@ -65,9 +74,6 @@ libcgi.a:	$(LIBOBJS)
 	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
 	$(RANLIB) $@

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

 #
 # admin.cgi
@@ -77,8 +83,6 @@ 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
@@ -88,8 +92,6 @@ 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
@@ -99,8 +101,6 @@ 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,9 +110,13 @@ 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

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

 #
 # End of "$Id$".
@@ -3,7 +3,7 @@
 *
 *   Administration CGI for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products.
+ *   Copyright 1997-2002 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -29,7 +29,6 @@
 *   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.
 */
@@ -40,6 +39,7 @@

 #include "ipp-var.h"
 #include <ctype.h>
+#include <errno.h>


 /*
@@ -51,7 +51,6 @@ 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);

@@ -104,21 +103,13 @@ main(int  argc,			/* I - Number of command-line arguments */
    * Connect to the HTTP server...
    */

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

   /*
    * Do the operation...
    */

-    if (strcmp(op, "cancel-job") == 0)
-      do_job_op(http, language, IPP_CANCEL_JOB);
-    else if (strcmp(op, "hold-job") == 0)
-      do_job_op(http, language, IPP_HOLD_JOB);
-    else if (strcmp(op, "release-job") == 0)
-      do_job_op(http, language, IPP_RELEASE_JOB);
-    else if (strcmp(op, "restart-job") == 0)
-      do_job_op(http, language, IPP_RESTART_JOB);
-    else if (strcmp(op, "start-printer") == 0)
+    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);
@@ -126,6 +117,8 @@ 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)
@@ -494,6 +487,7 @@ do_am_printer(http_t      *http,	/* I - HTTP connection */
 		*uriptr;		/* Pointer into URI */
  int		maxrate;		/* Maximum baud rate */
  char		baudrate[255];		/* Baud rate string */
+  char		make[255];		/* Make string */
  const char	*name,			/* Pointer to class name */
 		*ptr;			/* Pointer to CGI variable */
  static int	baudrates[] =		/* Baud rates */
@@ -547,7 +541,8 @@ do_am_printer(http_t      *http,	/* I - HTTP connection */
  else
    oldinfo = NULL;

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

@@ -692,7 +686,7 @@ do_am_printer(http_t      *http,	/* I - HTTP connection */
      * Get the PPD file...
      */

-      FILE		*fp;			/* PPD file */
+      int		fd;			/* PPD file */
      char		filename[1024];		/* PPD filename */
      ppd_file_t	*ppd;			/* PPD information */
      char		buffer[1024];		/* Buffer */
@@ -700,19 +694,18 @@ do_am_printer(http_t      *http,	/* I - HTTP connection */


      snprintf(uri, sizeof(uri), "/printers/%s.ppd", name);
-      cupsTempFile(filename, sizeof(filename));

      if (httpGet(http, uri))
        httpGet(http, uri);

      while (httpUpdate(http) == HTTP_CONTINUE);

-      if ((fp = fopen(filename, "w")) != NULL)
+      if ((fd = cupsTempFd(filename, sizeof(filename))) >= 0)
      {
 	while ((bytes = httpRead(http, buffer, sizeof(buffer))) > 0)
-          fwrite(buffer, 1, bytes, fp);
+          write(fd, buffer, bytes);

-	fclose(fp);
+	close(fd);

        if ((ppd = ppdOpenFile(filename)) != NULL)
 	{
@@ -723,11 +716,11 @@ do_am_printer(http_t      *http,	/* I - HTTP connection */

          ppdClose(ppd);
 	}
+
+        unlink(filename);
      }
      else
        httpFlush(http);
-
-      unlink(filename);
    }

   /*
@@ -787,7 +780,9 @@ do_am_printer(http_t      *http,	/* I - HTTP connection */
 	* Let the user choose a model...
 	*/

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

-    strncpy(uri, cgiGetVariable("DEVICE_URI"), sizeof(uri) - 1);
-    uri[sizeof(uri) - 1] = '\0';
+    strlcpy(uri, cgiGetVariable("DEVICE_URI"), sizeof(uri));
    if (strncmp(uri, "serial:", 7) == 0)
    {
     /*
@@ -921,6 +915,7 @@ do_config_printer(http_t      *http,	/* I - HTTP connection */
  char		tempfile[1024];		/* Temporary filename */
  FILE		*in,			/* Input file */
 		*out;			/* Output file */
+  int		outfd;			/* Output file descriptor */
  char		line[1024];		/* Line from PPD file */
  char		keyword[1024],		/* Keyword from Default line */
 		*keyptr;		/* Pointer into keyword... */
@@ -986,7 +981,12 @@ do_config_printer(http_t      *http,	/* I - HTTP connection */
 	 i > 0;
 	 i --, group ++)
    {
-      cgiSetVariable("GROUP", group->text);
+      if (strcmp(group->text, "InstallableOptions") == 0)
+	cgiSetVariable("GROUP",
+	               cupsLangString(language, CUPS_MSG_OPTIONS_INSTALLED));
+      else
+	cgiSetVariable("GROUP", group->text);
+
      cgiCopyTemplateLang(stdout, TEMPLATES, "option-header.tmpl",
                          getenv("LANG"));
      
@@ -1113,10 +1113,17 @@ do_config_printer(http_t      *http,	/* I - HTTP connection */
    * Set default options...
    */

-    cupsTempFile(tempfile, sizeof(tempfile));
+    outfd = cupsTempFd(tempfile, sizeof(tempfile));
+    in    = fopen(filename, "rb");
+    out   = fdopen(outfd, "wb");

-    in  = fopen(filename, "rb");
-    out = fopen(tempfile, "wb");
+    if (outfd < 0 || in == NULL || out == NULL)
+    {
+      cgiSetVariable("ERROR", strerror(errno));
+      cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
+      unlink(filename);
+      return;
+    }

    while (get_line(line, sizeof(line), in) != NULL)
    {
@@ -1128,8 +1135,7 @@ do_config_printer(http_t      *http,	/* I - HTTP connection */
        * Get default option name...
 	*/

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

 	for (keyptr = keyword; *keyptr; keyptr ++)
 	  if (*keyptr == ':' || isspace(*keyptr))
@@ -1151,6 +1157,7 @@ do_config_printer(http_t      *http,	/* I - HTTP connection */

    fclose(in);
    fclose(out);
+    close(outfd);

   /*
    * Build a CUPS_ADD_PRINTER request, which requires the following
@@ -1363,98 +1370,6 @@ 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.
 */
@@ -1529,6 +1444,8 @@ 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-2000 by Easy Software Products.
+ *   Copyright 1997-2002 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,15 +25,14 @@

 #  include <stdio.h>
 #  include <stdlib.h>
-#  include <string.h>
-#  include <ctype.h>
+#  include <time.h>
+
+#  include <cups/string.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-2000 by Easy Software Products.
+ *   Copyright 1997-2002 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -71,7 +71,7 @@ main(int  argc,			/* I - Number of command-line arguments */
  * Connect to the HTTP server...
  */

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

 /*
  * Tell the client to expect HTML...
@@ -3,7 +3,7 @@
 *
 *   CGI HTML functions.
 *
- *   Copyright 1997-2000 by Easy Software Products.
+ *   Copyright 1997-2002 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-2000 by Easy Software Products.
+ *   Copyright 1997-2002 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -97,12 +97,15 @@ ippSetCGIVars(ipp_t      *response,	/* I - Response data to be copied... */
 			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 */


  ippSetServerVersion();

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

  for (attr = response->attrs;
       attr && attr->group_tag == IPP_TAG_OPERATION;
@@ -155,17 +158,32 @@ ippSetCGIVars(ipp_t      *response,	/* I - Response data to be copied... */

      name[i] = '\0';

+     /*
+      * Add "job_printer_name" variable if we have a "job_printer_uri"
+      * attribute...
+      */
+
+      if (strcmp(name, "job_printer_uri") == 0)
+      {
+        if ((valptr = strrchr(attr->values[0].string.text, '/')) == NULL)
+	  valptr = "unknown";
+	else
+	  valptr ++;
+
+        cgiSetArray("job_printer_name", element, valptr);
+      }
+
     /*
      * Copy values...
      */

-      value[0] = '\0';
-      valptr   = value;
+      value[0] = '\0';	/* Initially an empty string */
+      valptr   = value; /* Start at the beginning */

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

 	valptr += strlen(valptr);

@@ -173,27 +191,38 @@ ippSetCGIVars(ipp_t      *response,	/* I - Response data to be copied... */
 	{
 	  case IPP_TAG_INTEGER :
 	  case IPP_TAG_ENUM :
-	      sprintf(valptr, "%d", attr->values[i].integer);
+	      if (strncmp(name, "time_at_", 8) == 0)
+	      {
+	        date = localtime((time_t *)&(attr->values[i].integer));
+		strftime(valptr, sizeof(value) - (valptr - value),
+		         CUPS_STRFTIME_FORMAT, date);
+	      }
+	      else
+	        snprintf(valptr, sizeof(value) - (valptr - value),
+		         "%d", attr->values[i].integer);
 	      break;

 	  case IPP_TAG_BOOLEAN :
-	      sprintf(valptr, "%d", attr->values[i].boolean);
+	      snprintf(valptr, sizeof(value) - (valptr - value),
+	               "%d", attr->values[i].boolean);
 	      break;

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

 	  case IPP_TAG_RANGE :
-	      sprintf(valptr, "%d-%d", attr->values[i].range.lower,
-		      attr->values[i].range.upper);
+	      snprintf(valptr, sizeof(value) - (valptr - value),
+	               "%d-%d", attr->values[i].range.lower,
+		       attr->values[i].range.upper);
 	      break;

 	  case IPP_TAG_RESOLUTION :
-	      sprintf(valptr, "%dx%d%s", attr->values[i].resolution.xres,
-		      attr->values[i].resolution.yres,
-		      attr->values[i].resolution.units == IPP_RES_PER_INCH ?
-			  "dpi" : "dpc");
+	      snprintf(valptr, sizeof(value) - (valptr - value),
+	               "%dx%d%s", attr->values[i].resolution.xres,
+		       attr->values[i].resolution.yres,
+		       attr->values[i].resolution.units == IPP_RES_PER_INCH ?
+			   "dpi" : "dpc");
 	      break;

 	  case IPP_TAG_URI :
@@ -206,27 +235,34 @@ ippSetCGIVars(ipp_t      *response,	/* I - Response data to be copied... */
 	            strcmp(method, "http") == 0)
        	{
        	 /*
-		  * Map localhost access to localhost...
+		  * 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");
+        	  if (strcasecmp(hostname, server) == 0)
+		  {
+		   /*
+		    * Make URI relative to the current server...
+		    */

-        	 /*
-		  * Rewrite URI with HTTP address...
-		  */
+                    strlcpy(uri, resource, sizeof(uri));
+		  }
+		  else
+		  {
+        	   /*
+		    * Rewrite URI with HTTP address...
+		    */

-		  if (username[0])
-		    snprintf(uri, sizeof(uri), "http://%s@%s:%d%s", username,
-		             hostname, port, resource);
-        	  else
-		    snprintf(uri, sizeof(uri), "http://%s:%d%s", hostname, port,
-		             resource);
+		    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);
+                  }

-		  strcat(valptr, uri);
+		  strlcat(valptr, uri, sizeof(value) - (valptr - value));
        	  break;
        	}
              }
@@ -237,7 +273,8 @@ ippSetCGIVars(ipp_t      *response,	/* I - Response data to be copied... */
 	  case IPP_TAG_KEYWORD :
 	  case IPP_TAG_CHARSET :
 	  case IPP_TAG_LANGUAGE :
-	      strcat(valptr, attr->values[i].string.text);
+	      strlcat(valptr, attr->values[i].string.text,
+	              sizeof(value) - (valptr - value));
 	      break;

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

 /*
@@ -33,6 +34,13 @@
 #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.
 */
@@ -46,7 +54,8 @@ main(int  argc,			/* I - Number of command-line arguments */
  const char	*which_jobs;	/* Which jobs to show */
  ipp_t		*request,	/* IPP request */
 		*response;	/* IPP response */
- 
+   const char	*op;		/* Operation name */
+

 /*
  * Get any form variables...
@@ -64,7 +73,7 @@ main(int  argc,			/* I - Number of command-line arguments */
  * Connect to the HTTP server...
  */

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

 /*
  * Tell the client to expect HTML...
@@ -78,43 +87,69 @@ main(int  argc,			/* I - Number of command-line arguments */

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

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

-    cgiCopyTemplateLang(stdout, TEMPLATES, "jobs.tmpl", getenv("LANG"));
+    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);
+
+   /*
+    * Do the request and get back a response...
+    */
+
+    if ((response = cupsDoRequest(http, request, "/")) != NULL)
+    {
+      ippSetCGIVars(response, NULL, NULL);
+      ippDelete(response);
+
+      cgiCopyTemplateLang(stdout, TEMPLATES, "jobs.tmpl", getenv("LANG"));
+    }
  }

  cgiCopyTemplateLang(stdout, TEMPLATES, "trailer.tmpl", getenv("LANG"));
@@ -134,6 +169,92 @@ 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 */
+  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
+  {
+    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 = 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"));
+}
+
+
 /*
 * End of "$Id$".
 */
@@ -3,7 +3,7 @@
 *
 *   Printer status CGI for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products.
+ *   Copyright 1997-2002 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -71,7 +71,7 @@ main(int  argc,			/* I - Number of command-line arguments */
  * Connect to the HTTP server...
  */

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

 /*
  * Tell the client to expect HTML...
@@ -87,7 +87,7 @@ main(int  argc,			/* I - Number of command-line arguments */
  ippSetServerVersion();

  printer = argv[0];
-  if (strcmp(printer, "/") == 0 || strcmp(printer, "printers.cgi") == 0)
+  if (strcmp(printer, "/") == 0 || strstr(printer, "printers.cgi") != NULL)
  {
    printer = NULL;
    cgiSetVariable("TITLE", cupsLangString(language, CUPS_MSG_PRINTER));
@@ -3,7 +3,7 @@
 *
 *   CGI template function.
 *
- *   Copyright 1997-2000 by Easy Software Products.
+ *   Copyright 1997-2002 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
@@ -373,28 +373,19 @@ cgi_copy(FILE *out,		/* I - Output file */
 	      if ((innerval = cgiGetArray(innername, atoi(innerptr) - 1)) == NULL)
 	        *s = '\0';
 	      else
-	      {
-	        strncpy(s, innerval, sizeof(compare) - (s - compare) - 1);
-		compare[sizeof(compare) - 1] = '\0';
-	      }
+	        strlcpy(s, innerval, sizeof(compare) - (s - compare));
 	    }
 	    else if (innername[0] == '?')
 	    {
 	      if ((innerval = cgiGetArray(innername + 1, element)) == NULL)
 		*s = '\0';
 	      else
-	      {
-	        strncpy(s, innerval, sizeof(compare) - (s - compare) - 1);
-		compare[sizeof(compare) - 1] = '\0';
-	      }
+	        strlcpy(s, innerval, sizeof(compare) - (s - compare));
            }
 	    else if ((innerval = cgiGetArray(innername, element)) == NULL)
 	      snprintf(s, sizeof(s), "{%s}", innername);
 	    else
-	    {
-	      strncpy(s, innerval, sizeof(compare) - (s - compare) - 1);
-	      compare[sizeof(compare) - 1] = '\0';
-	    }
+	      strlcpy(s, innerval, sizeof(compare) - (s - compare));

            s += strlen(s);
 	  }
@@ -480,11 +471,13 @@ cgi_puts(const char *s,
 {
  while (*s)
  {
-    if (s[0] == '<' && s[1] != '/' && !isalpha(s[1]))
+    if (s[0] == '<')
      fputs("&lt;", out);
+    else if (s[0] == '>')
+      fputs("&gt;", out);
    else if (*s == '\"')
      fputs("&quot;", out);
-    else if (s[0] == '&' && isspace(s[1]))
+    else if (s[0] == '&')
      fputs("&amp;", out);
    else
      putc(*s, out);
@@ -3,7 +3,7 @@
 *
 *   CGI form variable and array functions.
 *
- *   Copyright 1997-2000 by Easy Software Products.
+ *   Copyright 1997-2002 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
@@ -39,6 +39,8 @@

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


 /*
@@ -473,7 +475,7 @@ cgi_initialize_post(void)
  */

  content_length = getenv("CONTENT_LENGTH");
-  if (content_length == NULL || atoi(content_length) == 0)
+  if (content_length == NULL || atoi(content_length) <= 0)
    return (0);

 /*
@@ -483,16 +485,20 @@ cgi_initialize_post(void)
  length = atoi(content_length);
  data   = malloc(length + 1);

+  if (data == NULL)
+    return (0);
+
 /*
  * Read the data into the buffer...
  */

  for (tbytes = 0; tbytes < length; tbytes += nbytes)
    if ((nbytes = read(0, data + tbytes, length - tbytes)) < 0)
-    {
-      free(data);
-      return (0);
-    }
+      if (errno != EAGAIN)
+      {
+        free(data);
+        return (0);
+      }

  data[length] = '\0';

@@ -543,11 +549,11 @@ cgi_initialize_string(const char *data)	/* I - Form data string */
    * Get the variable name...
    */

-    for (s = name; *data != '\0'; data ++, s ++)
+    for (s = name; *data != '\0'; data ++)
      if (*data == '=')
        break;
-      else
-        *s = *data;
+      else if (*data >= ' ' && s < (name + sizeof(name) - 1))
+        *s++ = *data;

    *s = '\0';
    if (*data == '=')
@@ -559,38 +565,44 @@ cgi_initialize_string(const char *data)	/* I - Form data string */
    * Read the variable value...
    */

-    for (s = value, done = 0; !done && *data != '\0'; data ++, s ++)
+    for (s = value, done = 0; !done && *data != '\0'; data ++)
      switch (*data)
      {
 	case '&' :	/* End of data... */
            done = 1;
-            s --;
            break;

 	case '+' :	/* Escaped space character */
-            *s = ' ';
+            if (s < (value + sizeof(value) - 1))
+              *s++ = ' ';
            break;

 	case '%' :	/* Escaped control character */
 	   /*
-	    * Read the hex code from stdin...
+	    * Read the hex code...
 	    */

-            data ++;
-            ch = *data - '0';
-            if (ch > 9)
-              ch -= 7;
-            *s = ch << 4;
+            if (s < (value + sizeof(value) - 1))
+	    {
+              data ++;
+              ch = *data - '0';
+              if (ch > 9)
+        	ch -= 7;
+              *s = ch << 4;

-            data ++;
-            ch = *data - '0';
-            if (ch > 9)
-              ch -= 7;
-            *s |= ch;
+              data ++;
+              ch = *data - '0';
+              if (ch > 9)
+        	ch -= 7;
+              *s++ |= ch;
+            }
+	    else
+	      data += 2;
            break;

 	default :	/* Other characters come straight through */
-            *s = *data;
+	    if (*data >= ' ' && s < (value + sizeof(value) - 1))
+              *s++ = *data;
            break;
      }

@@ -600,7 +612,9 @@ cgi_initialize_string(const char *data)	/* I - Form data string */
    * Remove trailing whitespace...
    */

-    s --;
+    if (s > value)
+      s --;
+
    while (s >= value && *s == ' ')
      *s-- = '\0';

@@ -645,9 +659,10 @@ cgi_sort_variables(void)
        (int (*)(const void *, const void *))cgi_compare_variables);

 #ifdef DEBUG
-  puts("New variable list is:");
+  puts("Sorted variable list is:");
  for (i = 0; i < form_count; i ++)
-    printf("%s = %s\n", form_vars[i].name, form_vars[i].value);
+    printf("%d: %s (%d) = \"%s\" ...\n", i, form_vars[i].name,
+           form_vars[i].nvalues, form_vars[i].values[0]);
 #endif /* DEBUG */
 }

@@ -3,7 +3,7 @@
 #
 #   Configuration file makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1993-2000 by Easy Software Products.
+#   Copyright 1993-2002 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -51,8 +51,7 @@ clean:
 #

 install:
-	-$(MKDIR) $(SERVERROOT)
-	$(CHMOD) ugo+rx $(SERVERROOT)
+	$(INSTALL_DIR) $(SERVERROOT)
 	for file in $(KEEP); do \
 		if test -r $(SERVERROOT)/$$file ; then \
 			$(INSTALL_DATA) $$file $(SERVERROOT)/$$file.N ; \
@@ -1,10 +1,10 @@
 #
-# "$Id: classes.conf 1152 2000-06-22 18:25:29Z mike $"
+# "$Id: classes.conf 2010 2002-01-02 17:59:21Z mike $"
 #
 #   Sample class configuration file for the Common UNIX Printing System
 #   (CUPS) scheduler.
 #
-#   Copyright 1997-2000 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2002 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 1152 2000-06-22 18:25:29Z mike $".
+# End of "$Id: classes.conf 2010 2002-01-02 17:59:21Z mike $".
 #
@@ -1,10 +1,10 @@
 #
-# "$Id: client.conf 1485 2000-12-20 13:41:17Z mike $"
+# "$Id: client.conf 2010 2002-01-02 17:59:21Z mike $"
 #
 #   Sample client configuration file for the Common UNIX Printing System
 #   (CUPS).
 #
-#   Copyright 1997-2000 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2002 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
@@ -61,5 +61,5 @@


 #
-# End of "$Id: client.conf 1485 2000-12-20 13:41:17Z mike $".
+# End of "$Id: client.conf 2010 2002-01-02 17:59:21Z mike $".
 #
@@ -1,10 +1,10 @@
 #
-# "$Id: cupsd.conf 1485 2000-12-20 13:41:17Z mike $"
+# "$Id$"
 #
 #   Sample configuration file for the Common UNIX Printing System (CUPS)
 #   scheduler.
 #
-#   Copyright 1997-2000 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2002 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,24 +63,47 @@
 #
 # 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
-# "/var/log/cups/access_log"
+# "@CUPS_LOGDIR@/access_log"
 #
 # You can also use the special name "syslog" to send the output to the
 # syslog file or daemon.
 #

-#AccessLog /var/log/cups/access_log
+#AccessLog @CUPS_LOGDIR@/access_log
+
+#
+# Classification: the classification level of the server.  If set, this
+# classification is displayed on all pages, and raw printing is disabled.
+# The default is the empty string.
+#
+
+#Classification classified
+#Classification confidential
+#Classification secret
+#Classification topsecret
+#Classification unclassified
+
+#
+# ClassifyOverride: whether to allow users to override the classification
+# on printouts. If enabled, users can limit banner pages to before or
+# after the job, and can change the classification of a job, but cannot
+# completely eliminate the classification or banners.
+#
+# The default is off.
+#
+
+#ClassifyOverride off

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

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

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

@@ -95,28 +118,28 @@

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

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

 #
 # ErrorLog: the error log file; if this does not start with a leading /
 # then it is assumed to be relative to ServerRoot.  By default set to
-# "/var/log/cups/error_log"
+# "@CUPS_LOGDIR@/error_log"
 #
 # You can also use the special name "syslog" to send the output to the
 # syslog file or daemon.
 #

-#ErrorLog /var/log/cups/error_log
+#ErrorLog @CUPS_LOGDIR@/error_log

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

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

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

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

 #
 # PreserveJobHistory: whether or not to preserve the job history after a
@@ -173,10 +196,10 @@ LogLevel info

 #
 # MaxJobs: maximum number of jobs to keep in memory (active and completed.)
-# Default is 0 (no limit.)
+# Default is 500; the value 0 is used for no limit.
 #

-#MaxJobs 0
+#MaxJobs 500

 #
 # Printcap: the name of the printcap file.  Default is /etc/printcap.
@@ -186,11 +209,31 @@ LogLevel info
 #Printcap /etc/printcap

 #
-# RequestRoot: the directory where request files are stored.
-# By default /var/spool/cups.
+# PrintcapFormat: the format of the printcap file, currently either
+# BSD or Solaris.  The default is "BSD".
 #

-#RequestRoot /var/spool/cups
+#PrintcapFormat BSD
+#PrintcapFormat Solaris
+
+#
+# PrintcapGUI: the name of the GUI options panel program to associate
+# with print queues under IRIX.  The default is "/usr/bin/glpoptions"
+# from ESP Print Pro.
+#
+# This option is only used under IRIX; the options panel program
+# must accept the "-d printer" and "-o options" options and write
+# the selected printer options back to stdout on completion.
+#
+
+#PrintcapGUI /usr/bin/glpoptions
+
+#
+# RequestRoot: the directory where request files are stored.
+# By default "@CUPS_REQUESTS@".
+#
+
+#RequestRoot @CUPS_REQUESTS@

 #
 # RemoteRoot: the name of the user assigned to unauthenticated accesses
@@ -201,17 +244,17 @@ LogLevel info

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

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

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

-#ServerRoot /etc/cups
+#ServerRoot @CUPS_SERVERROOT@


 ########
@@ -220,17 +263,17 @@ LogLevel info

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

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

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

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


 ########
@@ -239,16 +282,16 @@ LogLevel info

 #
 # User/Group: the user and group the server runs under.  Normally this
-# must be lp and sys, however you can configure things for another user
-# or group as needed.
+# must be @CUPS_USER@ and @CUPS_GROUP@, however you can configure things for another
+# user or group as needed.
 #
 # Note: the server must be run initially as root to support the
 # default IPP port of 631.  It changes users whenever an external
-# program is run...
+# program is run, or if the RunAsUser directive is specified...
 #

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

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

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

 #
 # FilterLimit: sets the maximum cost of all job filters that can be run
@@ -359,6 +402,25 @@ Port 631

 #Browsing On

+#
+# BrowseProtocols: which protocols to use for browsing.  Can be
+# any of the following separated by whitespace and/or commas:
+#
+#     all  - Use all supported protocols.
+#     cups - Use the CUPS browse protocol.
+#     slp  - Use the SLPv2 protocol.
+#
+# The default is "cups".
+#
+# NOTE: If you choose to use SLPv2, it is *strongly* recommended that
+#       you have at least one SLP Directory Agent (DA) on your
+#       network.  Otherwise, browse updates can take several seconds,
+#       during which the scheduler will not response to client
+#       requests.
+#
+
+#BrowseProtocols cups
+
 #
 # BrowseAddress: specifies a broadcast address to be used.  By
 # default browsing information is not sent!
@@ -371,11 +433,21 @@ 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
@@ -406,6 +478,8 @@ 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!
@@ -453,6 +527,7 @@ Port 631
 #

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

 #
 # BrowseTimeout: the timeout for network printers - if we don't
@@ -483,6 +558,36 @@ Port 631

 #ImplicitClasses On

+#
+# ImplicitAnyClasses: whether or not to create "AnyPrinter" implicit
+# classes.
+#
+# When ImplicitAnyClasses is On and a local queue of the same name
+# exists, e.g. "printer", "printer@server1", "printer@server1", then
+# an implicit class called "Anyprinter" is created instead.
+#
+# When ImplicitAnyClasses is Off, implicit classes are not created
+# when there is a local queue of the same name.
+#
+# Disabled by default.
+#
+
+#ImplicitAnyCLasses Off
+
+#
+# HideImplicitMembers: whether or not to show the members of an
+# implicit class.
+#
+# When HideImplicitMembers is On, any remote printers that are
+# part of an implicit class are hidden from the user, who will
+# then only see a single queue even though many queues will be
+# supporting the implicit class.
+#
+# Enabled by default.
+#
+
+#HideImplicitMembers On
+

 ########
 ######## Security Options
@@ -494,7 +599,7 @@ Port 631
 # will be "sys", "system", or "root" (checked for in that order.)
 #

-#SystemGroup sys
+#SystemGroup @CUPS_GROUP@

 #
 # Access permissions for each directory served by the scheduler.
@@ -518,11 +623,11 @@ Port 631
 #
 # Order: the order of Allow/Deny processing.
 #
-# Allow: allows access from the specified hostname, domain, IP address, or
-# network.
+# Allow: allows access from the specified hostname, domain, IP address,
+# network, or interface.
 #
-# Deny: denies access from the specified hostname, domain, IP address, or
-# network.
+# Deny: denies access from the specified hostname, domain, IP address,
+# network, or interface.
 #
 # Both "Allow" and "Deny" accept the following notations for addresses:
 #
@@ -537,10 +642,21 @@ 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.
 #
@@ -574,6 +690,13 @@ 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
@@ -624,5 +747,5 @@ Allow From 127.0.0.1
 </Location>

 #
-# End of "$Id: cupsd.conf 1485 2000-12-20 13:41:17Z mike $".
+# End of "$Id$".
 #
@@ -1,9 +1,9 @@
 #
-# "$Id: mime.convs 1340 2000-09-06 13:53:00Z mike $"
+# "$Id: mime.convs 2355 2002-04-23 17:54:04Z mike $"
 #
 #   MIME converts file for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2000 by Easy Software Products.
+#   Copyright 1997-2002 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -30,10 +30,12 @@
 #
 # General Notes:
 #
-#   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.
+#   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.
 #

 ########################################################################
@@ -41,18 +43,25 @@
 # 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/html		application/postscript	33	texttops
 text/plain		application/postscript	33	texttops
-application/vnd.cups-form application/vnd.cups-postscript 33 formtops
+text/html		application/postscript	33	texttops
+
+########################################################################
+#
+# 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

 ########################################################################
 #
@@ -60,7 +69,9 @@ application/vnd.cups-form application/vnd.cups-postscript 33 formtops
 #

 image/*			application/vnd.cups-raster	100	imagetoraster
-application/vnd.cups-postscript	application/vnd.cups-raster	100	pstoraster
+
+# pstoraster is now part of ESP Ghostscript...
+#application/vnd.cups-postscript	application/vnd.cups-raster	100	pstoraster

 ########################################################################
 #
@@ -71,8 +82,8 @@ application/vnd.cups-postscript	application/vnd.cups-raster	100	pstoraster
 # option.
 #

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

 #
-# End of "$Id: mime.convs 1340 2000-09-06 13:53:00Z mike $".
+# End of "$Id: mime.convs 2355 2002-04-23 17:54:04Z mike $".
 #
@@ -1,9 +1,9 @@
 #
-# "$Id: mime.types 1430 2000-11-06 16:39:17Z mike $"
+# "$Id: mime.types 2233 2002-03-19 15:47:47Z mike $"
 #
 #   MIME types file for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2000 by Easy Software Products.
+#   Copyright 1997-2002 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -60,7 +60,7 @@
 #   accepts 8-bit characters in the range 128-255.
 #
 #   String constants must be surrounded by "" if they contain whitespace.
-#   To instead binary data into a string, use the <hex> notation.
+#   To insert binary data into a string, use the <hex> notation.
 #

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

 ########################################################################
 #
@@ -97,7 +102,7 @@ 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
-image/x-sun-raster		ras
+image/x-sun-raster		ras string(0,<59a66a95>)

 #image/fpx			fpx
 image/x-alias			pix short(8,8) short(8,24)
@@ -125,13 +130,16 @@ text/plain			txt printable(0,1024)
 #

 application/vnd.cups-form	string(0,"<CUPSFORM>")
-application/vnd.cups-postscript	string(0,<1B>%-12345X) + \
-				contains(9,512,"LANGUAGE=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) \
+application/vnd.cups-raw	(string(0,<1B>E) + !string(2,<1B>%0B)) \
 				string(0,<1B>@) \
-				(string(0,<1B>%-12345X) + \
-				 contains(9,512,"LANGUAGE=PCL"))
+				(contains(0,128,<1B>%-12345X) + \
+				 (contains(9,512,"LANGUAGE=PCL") \
+				  contains(9,512,"LANGUAGE = PCL")))

 ########################################################################
 #
@@ -145,5 +153,5 @@ application/vnd.cups-raw	string(0,<1B>E) \
 #application/octet-stream

 #
-# End of "$Id: mime.types 1430 2000-11-06 16:39:17Z mike $".
+# End of "$Id: mime.types 2233 2002-03-19 15:47:47Z mike $".
 #
@@ -1,10 +1,10 @@
 #
-# "$Id: printers.conf 1152 2000-06-22 18:25:29Z mike $"
+# "$Id: printers.conf 2010 2002-01-02 17:59:21Z mike $"
 #
 #   Sample printer configuration file for the Common UNIX Printing System
 #   (CUPS) scheduler.
 #
-#   Copyright 1997-2000 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2002 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 1152 2000-06-22 18:25:29Z mike $".
+# End of "$Id: printers.conf 2010 2002-01-02 17:59:21Z mike $".
 #
@@ -0,0 +1,161 @@
+dnl
+dnl "$Id: cups-common.m4 2476 2002-06-04 20:58:55Z mike $"
+dnl
+dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
+dnl
+dnl   Copyright 1997-2002 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 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 Default compiler flags...
+CFLAGS="${CFLAGS:=}"
+CPPFLAGS="${CPPFLAGS:=}"
+CXXFLAGS="${CXXFLAGS:=}"
+LDFLAGS="${LDFLAGS:=}"
+
+dnl Checks for programs...
+AC_PROG_AWK
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_CPP
+AC_PROG_INSTALL
+if test "$INSTALL" = "$ac_install_sh"; then
+	# Use full path to install-sh script...
+	INSTALL="`pwd`/install-sh -c"
+fi
+AC_PROG_RANLIB
+AC_PATH_PROG(AR,ar)
+AC_PATH_PROG(HTMLDOC,htmldoc)
+AC_PATH_PROG(MV,mv)
+AC_PATH_PROG(NROFF,nroff)
+if test "$NROFF" = ""; then
+	AC_PATH_PROG(GROFF,groff)
+	if test "$GROFF" = ""; then
+        	NROFF="echo"
+	else
+        	NROFF="$GROFF -T ascii"
+	fi
+fi
+AC_PATH_PROG(RM,rm)
+AC_PATH_PROG(SED,sed)
+AC_PATH_PROG(STRIP,strip)
+
+dnl Architecture checks...
+AC_C_BIGENDIAN
+
+dnl Check for libraries...
+AC_SEARCH_LIBS(crypt, crypt)
+AC_SEARCH_LIBS(getspent, sec gen)
+
+LIBMALLOC=""
+AC_ARG_ENABLE(mallinfo, [  --enable-mallinfo       turn on malloc debug information, default=no])
+
+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
+fi
+
+AC_SUBST(LIBMALLOC)
+
+dnl Checks for header files.
+AC_HEADER_STDC
+AC_HEADER_DIRENT
+AC_CHECK_HEADER(crypt.h,AC_DEFINE(HAVE_CRYPT_H))
+AC_CHECK_HEADER(malloc.h,AC_DEFINE(HAVE_MALLOC_H))
+AC_CHECK_HEADER(shadow.h,AC_DEFINE(HAVE_SHADOW_H))
+AC_CHECK_HEADER(string.h,AC_DEFINE(HAVE_STRING_H))
+AC_CHECK_HEADER(strings.h,AC_DEFINE(HAVE_STRINGS_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)
+if test "$uname" = "HP-UX" -a "$uversion" = "1020"; then
+	echo Forcing snprintf emulation for HP-UX.
+else
+	AC_CHECK_FUNCS(snprintf vsnprintf)
+fi
+
+dnl Check OS version and use appropriate format string for strftime...
+AC_MSG_CHECKING(for correct format string to use with strftime)
+
+case "$uname" in
+	IRIX* | SunOS*)
+		# IRIX and SunOS
+		AC_MSG_RESULT(NULL)
+		AC_DEFINE(CUPS_STRFTIME_FORMAT, NULL)
+		;;
+	*)
+		# All others
+		AC_MSG_RESULT("%c")
+		AC_DEFINE(CUPS_STRFTIME_FORMAT, "%c")
+		;;
+esac
+
+dnl Checks for mkstemp and mkstemps functions.
+AC_CHECK_FUNCS(mkstemp mkstemps)
+
+dnl Checks for vsyslog function.
+AC_CHECK_FUNCS(vsyslog)
+
+dnl Checks for signal functions.
+if test "$uname" != "Linux"; then
+	AC_CHECK_FUNCS(sigset)
+fi
+
+AC_CHECK_FUNCS(sigaction)
+
+dnl Checks for wait functions.
+AC_CHECK_FUNCS(waitpid)
+AC_CHECK_FUNCS(wait3)
+
+dnl See if the tm structure has the tm_gmtoff member...
+AC_MSG_CHECKING(for tm_gmtoff member in tm structure)
+AC_TRY_COMPILE([#include <time.h>],[struct tm t;
+	int o = t.tm_gmtoff;],
+	AC_MSG_RESULT(yes)
+	AC_DEFINE(HAVE_TM_GMTOFF),
+	AC_MSG_RESULT(no))
+
+dnl Flags for "ar" command...
+case $uname in
+        Darwin* | *BSD*)
+                ARFLAGS="-rcv"
+                ;;
+        *)
+                ARFLAGS="crvs"
+                ;;
+esac
+
+AC_SUBST(ARFLAGS)
+
+dnl
+dnl End of "$Id: cups-common.m4 2476 2002-06-04 20:58:55Z mike $".
+dnl
@@ -0,0 +1,190 @@
+dnl
+dnl "$Id: cups-compiler.m4 2476 2002-06-04 20:58:55Z mike $"
+dnl
+dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
+dnl
+dnl   Copyright 1997-2002 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 Clear the debugging and non-shared library options unless the user asks
+dnl for them...
+
+OPTIM=""
+AC_SUBST(OPTIM)
+
+AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging, default=no],
+	[if test x$enable_debug = xyes; then
+		OPTIM="-g"
+	fi])
+
+AC_ARG_WITH(optim, [  --with-optim="flags"    set optimization flags ])
+
+dnl Update compiler options...
+CXXLIBS=""
+AC_SUBST(CXXLIBS)
+
+if test -n "$GCC"; then
+	# Starting with GCC 3.0, you must link C++ programs against either
+	# libstdc++ (shared by default), or libsupc++ (always static).  If
+	# you care about binary portability between Linux distributions,
+	# you need to either 1) build your own GCC with static C++ libraries
+	# or 2) link using gcc and libsupc++.  We choose the latter since
+	# CUPS doesn't (currently) use any of the stdc++ library.
+	#
+	# Also, GCC 3.0.x still has problems compiling some code.  You may
+	# or may not have success with it.  USE 3.0.x WITH EXTREME CAUTION!
+	#
+	# Previous versions of GCC do not have the reliance on the stdc++
+	# or g++ libraries, so the extra supc++ library is not needed.
+
+	AC_MSG_CHECKING(if libsupc++ is required)
+
+ 	SUPC="`$CXX -print-file-name=libsupc++.a 2>/dev/null`"
+ 	if test -n "$SUPC" -a "$SUPC" != "libsupc++.a"; then
+ 		# This is gcc 3.x, and it knows of libsupc++, so we need it
+ 		CXXLIBS="-lsupc++"
+		AC_MSG_RESULT(yes)
+	else
+		AC_MSG_RESULT(no)
+ 	fi
+
+	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
+		else
+			OPTIM="$with_optim $OPTIM"
+		fi
+	fi
+
+	if test $PICFLAG = 1 -a $uname != AIX; then
+    		OPTIM="-fPIC $OPTIM"
+	fi
+
+	if test "x$with_optim" = x; then
+		OPTIM="-Wall $OPTIM"
+	fi
+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
+			fi
+			;;
+		HP-UX*)
+			if test -z "$OPTIM"; then
+				if test "x$with_optim" = x; then
+					OPTIM="+O2"
+				else
+					OPTIM="$with_optim $OPTIM"
+				fi
+			fi
+
+			CFLAGS="-Ae $CFLAGS"
+
+			if test "x$with_optim" = x; then
+				OPTIM="+DAportable $OPTIM"
+			fi
+
+			if test $PICFLAG = 1; then
+				OPTIM="+z $OPTIM"
+			fi
+			;;
+        	IRIX*)
+			if test -z "$OPTIM"; then
+				if test "x$with_optim" = x; then
+					OPTIM="-O2"
+				else
+					OPTIM="$with_optim $OPTIM"
+				fi
+			fi
+
+			if test $uversion -ge 62 -a "x$with_optim" = x; then
+				OPTIM="$OPTIM -n32 -mips3"
+			fi
+
+			if test "x$with_optim" = x; then
+				OPTIM="-fullwarn $OPTIM"
+			fi
+			;;
+		SunOS*)
+			# Solaris
+			if test -z "$OPTIM"; then
+				if test "x$with_optim" = x; then
+					OPTIM="-xO4"
+				else
+					OPTIM="$with_optim $OPTIM"
+				fi
+			fi
+
+			if test "x$with_optim" = x; then
+				OPTIM="$OPTIM -xarch=generic"
+			fi
+
+			if test $PICFLAG = 1; then
+				OPTIM="-KPIC $OPTIM"
+			fi
+			;;
+		UNIX_SVR*)
+			# UnixWare
+			if test -z "$OPTIM"; then
+				if test "x$with_optim" = x; then
+					OPTIM="-O"
+				else
+					OPTIM="$with_optim $OPTIM"
+				fi
+			fi
+
+			if test $PICFLAG = 1; then
+				OPTIM="-KPIC $OPTIM"
+			fi
+			;;
+		*)
+			# Running some other operating system; inform the user they
+			# should contribute the necessary options to
+			# cups-support@cups.org...
+			echo "Building CUPS with default compiler optimizations; contact"
+			echo "cups-bugs@cups.org with uname and compiler options needed"
+			echo "for your platform, or set the CFLAGS and CXXFLAGS"
+			echo "environment variable before running configure."
+			;;
+	esac
+fi
+
+case $uname in
+	*BSD | Darwin*)
+		ARFLAGS="-rcv"
+		;;
+	*)
+		ARFLAGS="crvs"
+		;;
+esac
+
+dnl
+dnl End of "$Id: cups-compiler.m4 2476 2002-06-04 20:58:55Z mike $".
+dnl
@@ -0,0 +1,238 @@
+dnl
+dnl "$Id: cups-directories.m4 2138 2002-02-12 19:05:39Z mike $"
+dnl
+dnl   Directory stuff for the Common UNIX Printing System (CUPS).
+dnl
+dnl   Copyright 1997-2002 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
+
+AC_PREFIX_DEFAULT(/)
+
+AC_ARG_WITH(fontpath, [  --with-fontpath         set font path for pstoraster],fontpath="$withval",fontpath="")
+AC_ARG_WITH(docdir, [  --with-docdir           set path for documentation],docdir="$withval",docdir="")
+AC_ARG_WITH(logdir, [  --with-logdir           set path for log files],logdir="$withval",logdir="")
+AC_ARG_WITH(rcdir, [  --with-rcdir            set path for rc scripts],rcdir="$withval",rcdir="")
+
+dnl Fix "prefix" variable if it hasn't been specified...
+if test "$prefix" = "NONE"; then
+	prefix="/"
+fi
+
+dnl Fix "exec_prefix" variable if it hasn't been specified...
+if test "$exec_prefix" = "NONE"; then
+	if test "$prefix" = "/"; then
+		exec_prefix="/usr"
+	else
+		exec_prefix="$prefix"
+	fi
+fi
+
+dnl Fix "sharedstatedir" variable if it hasn't been specified...
+if test "$sharedstatedir" = "\${prefix}/com" -a "$prefix" = "/"; then
+	sharedstatedir="/usr/com"
+fi
+
+dnl Fix "datadir" variable if it hasn't been specified...
+if test "$datadir" = "\${prefix}/share"; then
+	if test "$prefix" = "/"; then
+		datadir="/usr/share"
+	else
+		datadir="$prefix/share"
+	fi
+fi
+
+dnl Fix "includedir" variable if it hasn't been specified...
+if test "$includedir" = "\${prefix}/include" -a "$prefix" = "/"; then
+	includedir="/usr/include"
+fi
+
+dnl Fix "localstatedir" variable if it hasn't been specified...
+if test "$localstatedir" = "\${prefix}/var"; then
+	if test "$prefix" = "/"; then
+		localstatedir="/var"
+	else
+		localstatedir="$prefix/var"
+	fi
+fi
+
+dnl Fix "sysconfdir" variable if it hasn't been specified...
+if test "$sysconfdir" = "\${prefix}/etc"; then
+	if test "$prefix" = "/"; then
+		sysconfdir="/etc"
+	else
+		sysconfdir="$prefix/etc"
+	fi
+fi
+
+dnl Fix "libdir" variable for IRIX 6.x...
+if test "$uname" = "IRIX" -a $uversion -ge 62; then
+	libdir="$exec_prefix/lib32"
+fi
+
+dnl Fix "fontpath" variable...
+if test "x$fontpath" = "x"; then
+	fontpath="$datadir/cups/fonts"
+fi
+
+dnl Setup init.d locations...
+if test x$rcdir = x; then
+	case "$uname" in
+		FreeBSD* | OpenBSD*)
+			# FreeBSD and OpenBSD
+			INITDIR=""
+			INITDDIR=""
+			;;
+
+		NetBSD*)
+			# NetBSD
+			INITDIR=""
+			INITDDIR="/etc/rc.d"
+			;;
+
+		Darwin*)
+			# Darwin and MacOS X...
+			INITDIR=""
+			INITDDIR="/System/Library/StartupItems/PrintingServices"
+			;;
+
+		Linux*)
+			# Linux seems to choose an init.d directory at random...
+			if test -d /sbin/init.d; then
+				# SuSE
+				INITDIR="/sbin/init.d"
+				INITDDIR=".."
+			else
+				if test -d /etc/rc.d; then
+					# RedHat
+					INITDIR="/etc/rc.d"
+					INITDDIR="../init.d"
+				else
+					# Others
+					INITDIR="/etc"
+					INITDDIR="../init.d"
+				fi
+			fi
+			;;
+
+		OSF1* | HP-UX*)
+			INITDIR="/sbin"
+			INITDDIR="../init.d"
+			;;
+
+		AIX*)
+			INITDIR="/etc/rc.d"
+			INITDDIR=".."
+			;;
+
+		*)
+			INITDIR="/etc"
+			INITDDIR="../init.d"
+			;;
+
+	esac
+else
+	INITDIR=""
+	INITDDIR="$rcdir"
+fi
+
+AC_SUBST(INITDIR)
+AC_SUBST(INITDDIR)
+
+dnl Setup default locations...
+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"
+	AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$localstatedir/log/cups")
+else
+	CUPS_LOGDIR="$logdir"
+	AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$logdir")
+fi
+
+dnl See what directory to put server executables...
+case "$uname" in
+	*BSD* | Darwin*)
+		# *BSD and Darwin (MacOS X)
+		INSTALL_SYSV=""
+		CUPS_SERVERBIN="$exec_prefix/libexec/cups"
+		AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$exec_prefix/libexec/cups")
+		;;
+	*)
+		# All others
+		INSTALL_SYSV="install-sysv"
+		CUPS_SERVERBIN="$exec_prefix/lib/cups"
+		AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$exec_prefix/lib/cups")
+		;;
+esac
+
+AC_SUBST(INSTALL_SYSV)
+AC_SUBST(CUPS_SERVERROOT)
+AC_SUBST(CUPS_SERVERBIN)
+AC_SUBST(CUPS_LOGDIR)
+AC_SUBST(CUPS_REQUESTS)
+
+dnl Set the CUPS_LOCALE directory...
+case "$uname" in
+	Linux* | *BSD* | Darwin*)
+		CUPS_LOCALEDIR="$datadir/locale"
+		AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$datadir/locale")
+		;;
+
+	OSF1* | AIX*)
+		CUPS_LOCALEDIR="$exec_prefix/lib/nls/msg"
+		AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$exec_prefix/lib/nls/msg")
+		;;
+
+	*)
+		# This is the standard System V location...
+		CUPS_LOCALEDIR="$exec_prefix/lib/locale"
+		AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$exec_prefix/lib/locale")
+		;;
+esac
+
+AC_SUBST(CUPS_LOCALEDIR)
+
+dnl Set the CUPS_DATADIR directory...
+CUPS_DATADIR="$datadir/cups"
+AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$datadir/cups")
+AC_SUBST(CUPS_DATADIR)
+
+dnl Set the CUPS_DOCROOT directory...
+if test x$docdir = x; then
+	CUPS_DOCROOT="$datadir/doc/cups"
+	docdir="$datadir/doc/cups"
+else
+	CUPS_DOCROOT="$docdir"
+fi
+
+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 2138 2002-02-12 19:05:39Z mike $".
+dnl
@@ -0,0 +1,72 @@
+dnl
+dnl "$Id: cups-image.m4 2013 2002-01-02 18:50:43Z mike $"
+dnl
+dnl   Image library stuff for the Common UNIX Printing System (CUPS).
+dnl
+dnl   Copyright 1997-2002 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 Save the current libraries since we don't want the image libraries
+dnl included with every program...
+SAVELIBS="$LIBS"
+
+dnl Check for image libraries...
+LIBJPEG=""
+LIBPNG=""
+LIBTIFF=""
+LIBZ=""
+
+AC_SUBST(LIBJPEG)
+AC_SUBST(LIBPNG)
+AC_SUBST(LIBTIFF)
+AC_SUBST(LIBZ)
+
+AC_CHECK_HEADER(jpeglib.h,
+    AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
+	AC_DEFINE(HAVE_LIBJPEG)
+	LIBJPEG="-ljpeg"
+	LIBS="$LIBS -ljpeg"))
+
+AC_CHECK_HEADER(zlib.h,
+    AC_CHECK_LIB(z, gzgets,
+	AC_DEFINE(HAVE_LIBZ)
+	LIBZ="-lz"
+	LIBS="$LIBS -lz"))
+
+dnl PNG library uses math library functions...
+AC_CHECK_LIB(m, pow)
+
+AC_CHECK_HEADER(png.h,
+    AC_CHECK_LIB(png, png_set_tRNS_to_alpha,
+	AC_DEFINE(HAVE_LIBPNG)
+	LIBPNG="-lpng -lm"))
+
+AC_CHECK_HEADER(tiff.h,
+    AC_CHECK_LIB(tiff, TIFFReadScanline,
+	AC_DEFINE(HAVE_LIBTIFF)
+	LIBTIFF="-ltiff"))
+
+dnl Restore original LIBS settings...
+LIBS="$SAVELIBS"
+
+AC_CHECK_HEADER(stdlib.h,AC_DEFINE(HAVE_STDLIB_H))
+
+dnl
+dnl End of "$Id: cups-image.m4 2013 2002-01-02 18:50:43Z mike $".
+dnl
@@ -0,0 +1,49 @@
+dnl
+dnl "$Id: cups-libtool.m4 2476 2002-06-04 20:58:55Z mike $"
+dnl
+dnl   Libtool stuff for the Common UNIX Printing System (CUPS).
+dnl
+dnl   Copyright 1997-2002 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
+
+AC_ARG_ENABLE(libtool_unsupported, [  --enable-libtool-unsupported=LIBTOOL_PATH
+                          turn on building with libtool (UNSUPPORTED!), default=no],
+	[if test x$enable_libtool_unsupported != xno; then
+		LIBTOOL="$enable_libtool_unsupported"
+		enable_shared=no
+		echo "WARNING: libtool is not supported or endorsed by Easy Software Products."
+		echo "         WE DO NOT PROVIDE TECHNICAL SUPPORT FOR LIBTOOL PROBLEMS."
+		echo "         (even if you have a support contract)"
+	else
+		LIBTOOL=""
+	fi])
+
+AC_SUBST(LIBTOOL)
+
+if test x$LIBTOOL != x; then
+	LIBCUPS="libcups.la"
+	LIBCUPSIMAGE="libcupsimage.la"
+	LINKCUPS="../cups/\$(LIBCUPS)"
+	LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)"
+	DSO="\$(CC)"
+fi
+
+dnl
+dnl End of "$Id: cups-libtool.m4 2476 2002-06-04 20:58:55Z mike $".
+dnl
@@ -0,0 +1,104 @@
+dnl
+dnl "$Id: cups-manpages.m4 2013 2002-01-02 18:50:43Z mike $"
+dnl
+dnl   Manpage stuff for the Common UNIX Printing System (CUPS).
+dnl
+dnl   Copyright 1997-2002 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 Fix "mandir" variable...
+if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then
+	case "$uname" in
+        	Darwin* | Linux* | *BSD* | AIX*)
+        		# Darwin, MacOS X, Linux, *BSD, and AIX
+        		mandir="/usr/share/man"
+        		AMANDIR="/usr/share/man"
+        		PMANDIR="/usr/share/man"
+        		;;
+        	IRIX*)
+        		# SGI IRIX
+        		mandir="/usr/share/catman/u_man"
+        		AMANDIR="/usr/share/catman/a_man"
+        		PMANDIR="/usr/share/catman/p_man"
+        		;;
+        	*)
+        		# All others
+        		mandir="/usr/man"
+        		AMANDIR="/usr/man"
+        		PMANDIR="/usr/man"
+        		;;
+	esac
+else
+	AMANDIR="$mandir"
+	PMANDIR="$mandir"
+fi
+
+AC_SUBST(AMANDIR)
+AC_SUBST(PMANDIR)
+
+dnl Setup manpage extensions...
+case "$uname" in
+	*BSD* | Darwin*)
+		# *BSD
+		CAT1EXT=0
+		CAT3EXT=0
+		CAT5EXT=0
+		CAT8EXT=0
+		MAN8EXT=8
+		MAN8DIR=8
+		;;
+	IRIX*)
+		# SGI IRIX
+		CAT1EXT=z
+		CAT3EXT=z
+		CAT5EXT=z
+		CAT8EXT=z
+		MAN8EXT=1m
+		MAN8DIR=1
+		;;
+	SunOS* | HP-UX*)
+		# Solaris and HP-UX
+		CAT1EXT=1
+		CAT3EXT=3
+		CAT5EXT=5
+		CAT8EXT=1m
+		MAN8EXT=1m
+		MAN8DIR=1m
+		;;
+	*)
+		# All others
+		CAT1EXT=1
+		CAT3EXT=3
+		CAT5EXT=5
+		CAT8EXT=8
+		MAN8EXT=8
+		MAN8DIR=8
+		;;
+esac
+
+AC_SUBST(CAT1EXT)
+AC_SUBST(CAT3EXT)
+AC_SUBST(CAT5EXT)
+AC_SUBST(CAT8EXT)
+AC_SUBST(MAN8EXT)
+AC_SUBST(MAN8DIR)
+
+dnl
+dnl End of "$Id: cups-manpages.m4 2013 2002-01-02 18:50:43Z mike $".
+dnl
@@ -0,0 +1,41 @@
+dnl
+dnl "$Id: cups-network.m4 2309 2002-03-28 22:13:20Z mike $"
+dnl
+dnl   Networking stuff for the Common UNIX Printing System (CUPS).
+dnl
+dnl   Copyright 1997-2002 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
+
+NETLIBS=""
+
+if test "$uname" != "IRIX"; then
+	AC_CHECK_LIB(socket,socket,NETLIBS="-lsocket")
+	AC_CHECK_LIB(nsl,gethostbyaddr,NETLIBS="$NETLIBS -lnsl")
+fi
+
+AC_CHECK_FUNCS(rresvport getifaddrs)
+
+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)
+
+dnl
+dnl End of "$Id: cups-network.m4 2309 2002-03-28 22:13:20Z mike $".
+dnl
@@ -0,0 +1,48 @@
+dnl
+dnl "$Id: cups-openslp.m4 2476 2002-06-04 20:58:55Z mike $"
+dnl
+dnl   OpenSLP configuration stuff for the Common UNIX Printing System (CUPS).
+dnl
+dnl   Copyright 1997-2002 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
+
+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],
+    CFLAGS="-I$withval $CFLAGS"
+    CXXFLAGS="-I$withval $CXXFLAGS"
+    CPPFLAGS="-I$withval $CPPFLAGS",)
+
+LIBSLP=""
+
+if test x$enable_slp != xno; then
+    AC_CHECK_HEADER(slp.h,
+	AC_CHECK_LIB(slp, SLPOpen,
+            AC_DEFINE(HAVE_LIBSLP)
+	    LIBSLP="-lslp"))
+fi
+
+AC_SUBST(LIBSLP)
+
+
+dnl
+dnl End of "$Id: cups-openslp.m4 2476 2002-06-04 20:58:55Z mike $".
+dnl
@@ -0,0 +1,70 @@
+dnl
+dnl "$Id: cups-openssl.m4 2476 2002-06-04 20:58:55Z mike $"
+dnl
+dnl   OpenSSL stuff for the Common UNIX Printing System (CUPS).
+dnl
+dnl   Copyright 1997-2002 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
+
+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",)
+
+SSLLIBS=""
+
+if test x$enable_ssl != xno; then
+    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.
+
+	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
+
+	LIBS="$SAVELIBS")
+fi
+
+AC_SUBST(SSLLIBS)
+
+dnl
+dnl End of "$Id: cups-openssl.m4 2476 2002-06-04 20:58:55Z mike $".
+dnl
@@ -0,0 +1,90 @@
+dnl
+dnl "$Id: cups-opsys.m4 2193 2002-03-08 19:49:00Z mike $"
+dnl
+dnl   Operating system stuff for the Common UNIX Printing System (CUPS).
+dnl
+dnl   Copyright 1997-2002 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 Get the operating system and version number...
+uname=`uname`
+uversion=`uname -r | sed -e '1,$s/[[^0-9]]//g'`
+if test x$uname = xIRIX64; then
+	uname="IRIX"
+fi
+
+dnl Determine the correct username and group for this OS...
+AC_ARG_WITH(cups-user, [  --with-cups-user        set default user for CUPS],
+	CUPS_USER="$withval",
+	AC_MSG_CHECKING(for default print user)
+	if test -f /etc/passwd; then
+		CUPS_USER=""
+		for user in lp lpd guest daemon nobody; do
+			if test "`grep \^${user}: /etc/passwd`" != ""; then
+				CUPS_USER="$user"
+				AC_MSG_RESULT($user)
+				break;
+			fi
+		done
+
+		if test x$CUPS_USER = x; then
+			CUPS_USER="${USER:=nobody}"
+			AC_MSG_RESULT(not found, using "$CUPS_USER")
+		fi
+	else
+		CUPS_USER="${USER:=nobody}"
+		AC_MSG_RESULT(no password file, using "$CUPS_USER")
+	fi)
+
+AC_ARG_WITH(cups-group, [  --with-cups-group       set default group for CUPS],
+	CUPS_GROUP="$withval",
+	AC_MSG_CHECKING(for default print group)
+	if test x$uname = xDarwin; then
+		CUPS_GROUP="admin"
+		AC_MSG_RESULT(Darwin, using "$CUPS_GROUP")
+	else
+		if test -f /etc/group; then
+			CUPS_GROUP=""
+			for group in sys system root; do
+				if test "`grep \^${group}: /etc/group`" != ""; then
+					CUPS_GROUP="$group"
+					AC_MSG_RESULT($group)
+					break;
+				fi
+			done
+
+			if test x$CUPS_GROUP = x; then
+				CUPS_GROUP="${GROUP:=nobody}"
+				AC_MSG_RESULT(not found, using "$CUPS_GROUP")
+			fi
+		else
+			CUPS_GROUP="${GROUP:=nobody}"
+			AC_MSG_RESULT(no group file, using "$CUPS_GROUP")
+		fi
+	fi)
+
+AC_SUBST(CUPS_USER)
+AC_SUBST(CUPS_GROUP)
+
+AC_DEFINE_UNQUOTED(CUPS_DEFAULT_USER, "$CUPS_USER")
+AC_DEFINE_UNQUOTED(CUPS_DEFAULT_GROUP, "$CUPS_GROUP")
+
+dnl
+dnl "$Id: cups-opsys.m4 2193 2002-03-08 19:49:00Z mike $"
+dnl
@@ -0,0 +1,61 @@
+dnl
+dnl "$Id: cups-pam.m4 2476 2002-06-04 20:58:55Z mike $"
+dnl
+dnl   PAM stuff for the Common UNIX Printing System (CUPS).
+dnl
+dnl   Copyright 1997-2002 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
+
+AC_ARG_ENABLE(pam, [  --enable-pam            turn on PAM support, default=yes])
+
+dnl Don't use PAM with AIX...
+if test $uname = AIX; then
+	enable_pam=no
+fi
+
+PAMDIR=""
+PAMLIBS=""
+
+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
+			PAMLIBS="-lpam -ldl"
+		else
+			PAMLIBS="-lpam"
+		fi
+		if test -d /etc/pam.d; then
+			PAMDIR="/etc/pam.d"
+		fi
+	fi
+
+	LIBS="$SAVELIBS"
+fi
+
+AC_SUBST(PAMDIR)
+AC_SUBST(PAMLIBS)
+
+dnl
+dnl End of "$Id: cups-pam.m4 2476 2002-06-04 20:58:55Z mike $".
+dnl
@@ -0,0 +1,149 @@
+dnl
+dnl "$Id: cups-sharedlibs.m4 2476 2002-06-04 20:58:55Z mike $"
+dnl
+dnl   Shared library support for the Common UNIX Printing System (CUPS).
+dnl
+dnl   Copyright 1997-2002 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
+
+PICFLAG=1
+DSOFLAGS="${DSOFLAGS:=}"
+
+AC_ARG_ENABLE(shared, [  --enable-shared         turn on shared libraries, default=yes])
+
+if test x$enable_shared != xno; then
+	case "$uname" in
+		SunOS* | UNIX_S*)
+			LIBCUPS="libcups.so.2"
+			LIBCUPSIMAGE="libcupsimage.so.2"
+			DSO="\$(CC)"
+			DSOFLAGS="$DSOFLAGS -Wl,-h,\$@ -G \$(OPTIM)"
+			;;
+		HP-UX*)
+			LIBCUPS="libcups.sl.2"
+			LIBCUPSIMAGE="libcupsimage.sl.2"
+			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.4,-soname,\$@ -shared \$(OPTIM)"
+			;;
+		OSF1* | Linux* | *BSD*)
+			LIBCUPS="libcups.so.2"
+			LIBCUPSIMAGE="libcupsimage.so.2"
+			DSO="\$(CC)"
+			DSOFLAGS="$DSOFLAGS -Wl,-soname,\$@ -shared \$(OPTIM)"
+			;;
+		Darwin*)
+			LIBCUPS="libcups.2.dylib"
+			LIBCUPSIMAGE="libcupsimage.2.dylib"
+			DSO="\$(CC)"
+			DSOFLAGS="$DSOFLAGS \$(RC_CFLAGS) -dynamiclib -lc"
+			;;
+		AIX*)
+			LIBCUPS="libcups_s.a"
+			LIBCUPSIMAGE="libcupsimage_s.a"
+			DSO="\$(CC)"
+			DSOFLAGS="$DSOFLAGS -Wl,-bexpall,-bM:SRE,-bnoentry"
+			;;
+		*)
+			echo "Warning: shared libraries may not be supported.  Trying -shared"
+			echo "         option with compiler."
+			LIBCUPS="libcups.so.2"
+			LIBCUPSIMAGE="libcupsimage.so.2"
+			DSO="\$(CC)"
+			DSOFLAGS="$DSOFLAGS -Wl,-soname,\$@ -shared \$(OPTIM)"
+			;;
+	esac
+else
+	PICFLAG=0
+	LIBCUPS="libcups.a"
+	LIBCUPSIMAGE="libcupsimage.a"
+	DSO=":"
+fi
+
+AC_SUBST(DSO)
+AC_SUBST(DSOFLAGS)
+AC_SUBST(LIBCUPS)
+AC_SUBST(LIBCUPSIMAGE)
+
+if test x$enable_shared = xno; then
+	LINKCUPS="-lcups \$(SSLLIBS)"
+	LINKCUPSIMAGE="-lcupsimage"
+else
+	if test $uname = AIX; then
+		LINKCUPS="-lcups_s"
+		LINKCUPSIMAGE="-lcupsimage_s"
+	else
+		LINKCUPS="-lcups"
+		LINKCUPSIMAGE="-lcupsimage"
+	fi
+fi
+
+AC_SUBST(LINKCUPS)
+AC_SUBST(LINKCUPSIMAGE)
+
+dnl Update libraries for DSOs...
+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
+	# are using any static libraries, and it also allows us to distribute
+	# a single DSO rather than a bunch...
+	DSOLIBS="\$(LIBPNG) \$(LIBTIFF) \$(LIBJPEG) \$(LIBZ)"
+	IMGLIBS=""
+
+	# The *BSD, HP-UX, and Solaris run-time linkers need help when
+	# deciding where to find a DSO.  Add linker options to tell them
+	# where to find the DSO (usually in /usr/lib...  duh!)
+	case $uname in
+                HP-UX*)
+			# HP-UX
+                	DSOFLAGS="+b $libdir +fb $DSOFLAGS"
+                	LDFLAGS="$LDFLAGS -Wl,+b,$libdir,+fb"
+                	;;
+                SunOS*)
+                	# Solaris
+                	DSOFLAGS="-R$libdir $DSOFLAGS"
+                	LDFLAGS="$LDFLAGS -R$libdir"
+                	;;
+                *BSD*)
+                        # *BSD
+                	DSOFLAGS="-Wl,-R$libdir $DSOFLAGS"
+                        LDFLAGS="$LDFLAGS -Wl,-R$libdir"
+                        ;;
+                Linux*)
+                        # Linux
+                	DSOFLAGS="-Wl,-rpath,$libdir $DSOFLAGS"
+                        LDFLAGS="$LDFLAGS -Wl,-rpath,$libdir"
+                        ;;
+	esac
+else
+	DSOLIBS=""
+	IMGLIBS="\$(LIBPNG) \$(LIBTIFF) \$(LIBJPEG) \$(LIBZ)"
+fi
+
+AC_SUBST(DSOLIBS)
+AC_SUBST(IMGLIBS)
+
+dnl
+dnl End of "$Id: cups-sharedlibs.m4 2476 2002-06-04 20:58:55Z mike $".
+dnl
@@ -5,7 +5,7 @@
 *
 *   @configure_input@
 *
- *   Copyright 1997-2000 by Easy Software Products.
+ *   Copyright 1997-2002 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -19,7 +19,7 @@
 *       44141 Airport View Drive, Suite 204
 *       Hollywood, Maryland 20636-3111 USA
 *
- *       Voice: (301) 373-9603
+ *       Voice: (301) 373-9600
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
 */
@@ -28,7 +28,16 @@
 * Version of software...
 */

-#define CUPS_SVERSION	"CUPS v1.1.4"
+#define CUPS_SVERSION	"CUPS v1.1.15"
+
+
+/*
+ * Default user and group...
+ */
+
+#define CUPS_DEFAULT_USER	"lp"
+#define CUPS_DEFAULT_GROUP	"sys"
+

 /*
 * Where are files stored?
@@ -44,6 +53,13 @@
 #define CUPS_FONTPATH	"/usr/share/cups/fonts"


+/*
+ * What is the format string for strftime?
+ */
+
+#define CUPS_STRFTIME_FORMAT	NULL
+
+
 /*
 * Do we have various image libraries?
 */
@@ -53,12 +69,14 @@
 #undef HAVE_LIBJPEG
 #undef HAVE_LIBTIFF

+
 /*
 * Does this machine store words in big-endian (MSB-first) order?
 */

 #undef WORDS_BIGENDIAN

+
 /*
 * Which directory functions and headers do we use?
 */
@@ -68,6 +86,7 @@
 #undef HAVE_SYS_NDIR_H
 #undef HAVE_NDIR_H

+
 /*
 * Do we have PAM stuff?
 */
@@ -76,18 +95,31 @@
 #define HAVE_LIBPAM 0
 #endif /* !HAVE_LIBPAM */

+#undef HAVE_PAM_PAM_APPL_H
+
+
 /*
 * Do we have <shadow.h>?
 */

 #undef HAVE_SHADOW_H

+
 /*
 * Do we have <crypt.h>?
 */

 #undef HAVE_CRYPT_H

+
+/*
+ * Use <string.h>, <strings.h>, or both?
+ */
+
+#undef HAVE_STRING_H
+#undef HAVE_STRINGS_H
+
+
 /*
 * Do we have the strXXX() functions?
 */
@@ -95,6 +127,9 @@
 #undef HAVE_STRDUP
 #undef HAVE_STRCASECMP
 #undef HAVE_STRNCASECMP
+#undef HAVE_STRLCAT
+#undef HAVE_STRLCPY
+

 /*
 * Do we have the vsyslog() function?
@@ -102,6 +137,7 @@

 #undef HAVE_VSYSLOG

+
 /*
 * Do we have the (v)snprintf() functions?
 */
@@ -109,6 +145,7 @@
 #undef HAVE_SNPRINTF
 #undef HAVE_VSNPRINTF

+
 /*
 * What signal functions to use?
 */
@@ -116,6 +153,7 @@
 #undef HAVE_SIGSET
 #undef HAVE_SIGACTION

+
 /*
 * What wait functions to use?
 */
@@ -123,6 +161,7 @@
 #undef HAVE_WAITPID
 #undef HAVE_WAIT3

+
 /*
 * Do we have the mallinfo function and malloc.h?
 */
@@ -130,6 +169,7 @@
 #undef HAVE_MALLINFO
 #undef HAVE_MALLOC_H

+
 /*
 * Do we have the OpenSSL library?
 */
@@ -137,6 +177,63 @@
 #undef HAVE_LIBSSL


+/*
+ * Do we have the OpenSLP library?
+ */
+
+#undef HAVE_LIBSLP
+
+
+/*
+ * Do we have <sys/ioctl.h>?
+ */
+
+#undef HAVE_SYS_IOCTL_H
+
+
+/*
+ * Do we have mkstemp() and/or mkstemps()?
+ */
+
+#undef HAVE_MKSTEMP
+#undef HAVE_MKSTEMPS
+
+
+/*
+ * Does the "tm" structure contain the "tm_gmtoff" member?
+ */
+
+#undef HAVE_TM_GMTOFF
+
+
+/*
+ * Do we have rresvport()?
+ */
+
+#undef HAVE_RRESVPORT
+
+
+/*
+ * Do we have getifaddrs()?
+ */
+
+#undef HAVE_GETIFADDRS
+
+
+/*
+ * 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
+
+
 /*
 * End of "$Id$".
 */
@@ -3,7 +3,7 @@ dnl "$Id$"
 dnl
 dnl   Configuration script for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2000 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2002 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,550 +23,25 @@ dnl         WWW: http://www.cups.org
 dnl

 AC_INIT(cups/cups.h)
-AC_CONFIG_HEADER(config.h)
-AC_PREFIX_DEFAULT(/)

-dnl Get the operating system and version number...
+sinclude(config-scripts/cups-opsys.m4)
+sinclude(config-scripts/cups-common.m4)
+sinclude(config-scripts/cups-directories.m4)
+sinclude(config-scripts/cups-manpages.m4)

-uname=`uname`
-uversion=`uname -r | sed -e '1,$s/[[^0-9]]//g'`
-if test "$uname" = "IRIX64"; then
-    uname="IRIX"
-fi
+sinclude(config-scripts/cups-sharedlibs.m4)
+sinclude(config-scripts/cups-libtool.m4)
+sinclude(config-scripts/cups-compiler.m4)

-dnl Clear the debugging and non-shared library options unless the user asks
-dnl for them...
+sinclude(config-scripts/cups-image.m4)
+sinclude(config-scripts/cups-network.m4)
+sinclude(config-scripts/cups-openslp.m4)
+sinclude(config-scripts/cups-openssl.m4)
+sinclude(config-scripts/cups-pam.m4)

-OPTIM=""
-AC_SUBST(OPTIM)
-PICFLAG=1
-CFLAGS="${CFLAGS:=}"
-CXXFLAGS="${CXXFLAGS:=}"
+AC_OUTPUT(Makedefs cups.list cups.sh cups-config conf/cupsd.conf)

-AC_ARG_ENABLE(debug, [  --enable-debug        turn on debugging [default=no]],[if eval "test x$enable_debug = xyes"; then
-	OPTIM="-g "
-fi])
-AC_ARG_ENABLE(shared, [  --enable-shared        turn on shared libraries [default=yes]])
-AC_ARG_ENABLE(ssl, [  --enable-ssl           turn on SSL/TLS support [default=no]])
-AC_ARG_ENABLE(libtool_unsupported, [  --enable-libtool-unsupported=LIBTOOL_PATH
-                          turn on building with libtool (UNSUPPORTED!) [default=no]],[if eval "test x$enable_libtool_unsupported != xno"; then
-	LIBTOOL="$enable_libtool_unsupported"
-	enable_shared=no
-	echo "WARNING: libtool is not supported or endorsed by Easy Software Products."
-	echo "         WE DO NOT PROVIDE TECHNICAL SUPPORT FOR LIBTOOL PROBLEMS."
-	echo "         (even if you have a support contract)"
-else
-	LIBTOOL=""
-fi])
-
-if test "$enable_shared" != "no"; then
-	case "$uname" in
-		SunOS* | UNIX_S*)
-			LIBCUPS="libcups.so.2"
-			LIBCUPSIMAGE="libcupsimage.so.2"
-			DSO="\$(CC) -Wl,-h,\$@ -G \$(OPTIM) -o"
-			;;
-		HP-UX*)
-			LIBCUPS="libcups.sl.2"
-			LIBCUPSIMAGE="libcupsimage.sl.2"
-			DSO="ld -b -z +h \$@ -o"
-			;;
-		FreeBSD* | NetBSD* | OpenBSD*)
-			LIBCUPS="libcups.so.2"
-			LIBCUPSIMAGE="libcupsimage.so.2"
-			DSO="\$(CC) -Wl,-soname,\$@ -shared \$(OPTIM) -o"
-			;;
-		OSF1* | Linux*)
-			LIBCUPS="libcups.so.2"
-			LIBCUPSIMAGE="libcupsimage.so.2"
-			DSO="\$(CC) -Wl,-soname,\$@ -shared \$(OPTIM) -o"
-			;;
-		IRIX*)
-			LIBCUPS="libcups.so.2"
-			LIBCUPSIMAGE="libcupsimage.so.2"
-			DSO="\$(CC) -soname \$@ -shared \$(OPTIM) -o"
-			;;
-		*)
-			echo "Warning: shared libraries may not be supported.  Trying -shared"
-			echo "         option with compiler."
-			LIBCUPS="libcups.so.2"
-			LIBCUPSIMAGE="libcupsimage.so.2"
-			DSO="\$(CC) -Wl,-soname,\$@ -shared \$(OPTIM) -o"
-			;;
-	esac
-else
-	PICFLAG=0
-	LIBCUPS="libcups.a"
-	LIBCUPSIMAGE="libcupsimage.a"
-	DSO=":"
-fi
-
-if test "$LIBTOOL" != ""; then
-	LIBCUPS="libcups.la"
-	LIBCUPSIMAGE="libcupsimage.la"
-	LINKCUPS="../cups/\$(LIBCUPS)"
-	LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)"
-	DSO=":"
-else
-	LINKCUPS="-L../cups -lcups"
-	LINKCUPSIMAGE="-L../filter -lcupsimage"
-fi
-
-AC_ARG_ENABLE(pam, [  --enable-pam        turn on PAM support [default=yes]])
-
-AC_ARG_WITH(fontpath, [  --with-fontpath     set font path for pstoraster],fontpath="$withval",fontpath="")
-
-dnl Checks for programs...
-AC_PROG_AWK
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_CPP
-AC_PROG_RANLIB
-AC_PATH_PROG(AR,ar)
-AC_PATH_PROG(CHMOD,chmod)
-AC_PATH_PROG(CHOWN,chown)
-AC_PATH_PROG(CP,cp)
-AC_PATH_PROG(MV,mv)
-AC_PATH_PROG(NROFF,nroff)
-if test "$NROFF" = ""; then
-    AC_PATH_PROG(GROFF,groff)
-    if test "$GROFF" = ""; then
-        NROFF="echo"
-    else
-        NROFF="$GROFF -T ascii"
-    fi
-fi
-AC_PATH_PROG(HTMLDOC,htmldoc)
-AC_PATH_PROG(MKDIR,mkdir)
-AC_PATH_PROG(RM,rm)
-AC_PATH_PROG(SED,sed)
-
-dnl Architecture checks...
-AC_C_BIGENDIAN
-
-dnl Check for libraries...
-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)
-
-LIBMALLOC=""
-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)
-
-if test "$enable_pam" != "no"; then
-	OLDLIBS="$LIBS"
-	AC_CHECK_LIB(dl,dlopen)
-	AC_CHECK_LIB(pam,pam_start)
-	if test "$ac_cv_lib_pam_pam_start" != "no"; then
-		PAMDIR="/etc/pam.d"
-	else
-		PAMDIR=""
-		LIBS="$OLDLIBS"
-	fi
-	AC_SUBST(PAMDIR)
-fi
-
-NETLIBS=""
-AC_SUBST(NETLIBS)
-AC_CHECK_LIB(socket,socket,
-if test "$uname" != "IRIX"; then
-	NETLIBS="-lsocket"
-else
-	echo "Not using -lsocket since you are running IRIX."
-fi)
-AC_CHECK_LIB(nsl,gethostbyaddr,
-if test "$uname" != "IRIX"; then
-	NETLIBS="$NETLIBS -lnsl"
-else
-	echo "Not using -lnsl since you are running IRIX."
-fi)
-
-dnl Encryption support...
-
-SSLLIBS=""
-AC_SUBST(SSLLIBS)
-
-if test "$enable_ssl" = "yes"; then
-	AC_CHECK_LIB(ssl,SSL_new,
-		SSLLIBS="-lssl -lcrypto"
-		AC_DEFINE(HAVE_LIBSSL)
-	)
-fi
-
-dnl Save the current libraries since we don't want the image libraries
-dnl included with every program...
-SAVELIBS="$LIBS"
-
-dnl Check for image libraries...
-LIBJPEG=""
-LIBPNG=""
-LIBTIFF=""
-LIBZ=""
-
-AC_SUBST(LIBJPEG)
-AC_SUBST(LIBPNG)
-AC_SUBST(LIBTIFF)
-AC_SUBST(LIBZ)
-
-AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
-    AC_DEFINE(HAVE_LIBJPEG)
-    LIBJPEG="-ljpeg"
-    LIBS="$LIBS -ljpeg")
-
-AC_CHECK_LIB(z, gzgets,
-    AC_DEFINE(HAVE_LIBZ)
-    LIBZ="-lz"
-    LIBS="$LIBS -lz")
-
-dnl PNG library uses math library functions...
-AC_CHECK_LIB(m, pow)
-
-AC_CHECK_LIB(png, png_set_tRNS_to_alpha,
-    AC_DEFINE(HAVE_LIBPNG)
-    LIBPNG="-lpng")
-
-AC_CHECK_LIB(tiff, TIFFReadScanline,
-    AC_DEFINE(HAVE_LIBTIFF)
-    LIBTIFF="-ltiff")
-
-dnl Restore original LIBS settings...
-LIBS="$SAVELIBS"
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_HEADER_DIRENT
-AC_CHECK_HEADER(crypt.h,AC_DEFINE(HAVE_CRYPT_H))
-AC_CHECK_HEADER(malloc.h,AC_DEFINE(HAVE_MALLOC_H))
-AC_CHECK_HEADER(shadow.h,AC_DEFINE(HAVE_SHADOW_H))
-AC_CHECK_HEADER(stddef.h,AC_DEFINE(HAVE_STDDEF_H))
-AC_CHECK_HEADER(stdlib.h,AC_DEFINE(HAVE_STDLIB_H))
-
-dnl Checks for string functions.
-AC_CHECK_FUNCS(strdup)
-AC_CHECK_FUNCS(strcasecmp)
-AC_CHECK_FUNCS(strncasecmp)
-AC_CHECK_FUNCS(snprintf)
-AC_CHECK_FUNCS(vsnprintf)
-
-dnl Checks for vsyslog function.
-AC_CHECK_FUNCS(vsyslog)
-
-dnl Checks for signal functions.
-if test "$uname" != "Linux"; then
-	AC_CHECK_FUNCS(sigset)
-fi
-
-AC_CHECK_FUNCS(sigaction)
-
-dnl Checks for wait functions.
-AC_CHECK_FUNCS(waitpid)
-AC_CHECK_FUNCS(wait3)
-
-dnl Update compiler options...
-if test -n "$GCC"; then
-	GXX="gcc"
-
-	if test -z "$OPTIM"; then
-	       	OPTIM="-O2 -g3"
-	fi
-	if test $PICFLAG = 1; then
-    		OPTIM="-fPIC $OPTIM"
-	fi
-	OPTIM="-Wall $OPTIM"
-else
-	case $uname in
-        	IRIX*)
-			if test -z "$OPTIM"; then
-        			OPTIM="-O2"
-			fi
-			if test $uversion -ge 62; then
-				OPTIM="$OPTIM -n32 -mips3"
-			fi
-			OPTIM="-fullwarn $OPTIM"
-			;;
-		HP-UX*)
-			if test -z "$OPTIM"; then
-				OPTIM="+O2 -g3"
-			fi
-			OPTIM="-Ae $OPTIM"
-			;;
-		SunOS*)
-			# Solaris
-			if test -z "$OPTIM"; then
-				OPTIM="-xO4"
-			fi
-			if test $PICFLAG = 1; then
-				OPTIM="-KPIC $OPTIM"
-			fi
-			;;
-		*)
-			# Running some other operating system; inform the user they
-			# should contribute the necessary options to
-			# cups-support@cups.org...
-			echo "Building CUPS with default compiler optimizations; contact"
-			echo "cups-support@cups.org with uname and compiler options needed"
-			echo "for your platform, or set the CFLAGS environment variable"
-			echo "before running configure."
-			;;
-	esac
-fi
-
-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
-	# are using any static libraries, and it also allows us to distribute
-	# a single DSO rather than a bunch...
-	DSOLIBS="\$(LIBJPEG) \$(LIBPNG) \$(LIBTIFF) \$(LIBZ)"
-	IMGLIBS=""
-
-	# The *BSD, HP-UX, and Solaris run-time linkers need help when
-	# deciding where to find a DSO.  Add linker options to tell them
-	# where to find the DSO (usually in /usr/lib...  duh!)
-	case $uname in
-		HP-UX*)
-			LDFLAGS="$LDFLAGS -Wl,+b,$libdir,+fb"
-			;;
-		SunOS*)
-			# Solaris
-			LDFLAGS="$LDFLAGS -R$libdir"
-			;;
-		FreeBSD* | NetBSD* | OpenBSD*)
-			# *BSD
-			LDFLAGS="$LDFLAGS -Wl,-R$libdir"
-			;;
-	esac
-else
-	DSOLIBS=""
-	IMGLIBS="\$(LIBJPEG) \$(LIBPNG) \$(LIBTIFF) \$(LIBZ)"
-fi
-
-AC_SUBST(DSO)
-AC_SUBST(DSOLIBS)
-AC_SUBST(IMGLIBS)
-AC_SUBST(LIBCUPS)
-AC_SUBST(LIBCUPSIMAGE)
-AC_SUBST(LIBTOOL)
-AC_SUBST(LINKCUPS)
-AC_SUBST(LINKCUPSIMAGE)
-
-dnl Fix "prefix" variable if it hasn't been specified...
-if test "$prefix" = "NONE"; then
-	prefix="/"
-fi
-
-dnl Fix "exec_prefix" variable if it hasn't been specified...
-if test "$exec_prefix" = "NONE"; then
-	if test "$prefix" = "/"; then
-		exec_prefix="/usr"
-	else
-		exec_prefix="$prefix"
-	fi
-fi
-
-dnl Fix "sharedstatedir" variable if it hasn't been specified...
-if test "$sharedstatedir" = "\${prefix}/com" -a "$prefix" = "/"; then
-	sharedstatedir="/usr/com"
-fi
-
-dnl Fix "infodir" variable if it hasn't been specified...
-if test "$infodir" = "\${prefix}/info" -a "$prefix" = "/"; then
-	infodir="/usr/info"
-fi
-
-dnl Fix "datadir" variable if it hasn't been specified...
-if test "$datadir" = "\${prefix}/share"; then
-	if test "$prefix" = "/"; then
-		datadir="/usr/share"
-	else
-		datadir="$prefix/share"
-        fi
-fi
-
-dnl Fix "includedir" variable if it hasn't been specified...
-if test "$includedir" = "\${prefix}/include" -a "$prefix" = "/"; then
-	includedir="/usr/include"
-fi
-
-dnl Fix "localstatedir" variable if it hasn't been specified...
-if test "$localstatedir" = "\${prefix}/var"; then
-	if test "$prefix" = "/"; then
-		localstatedir="/var"
-	else
-		localstatedir="$prefix/var"
-	fi
-fi
-
-dnl Fix "sysconfdir" variable if it hasn't been specified...
-if test "$sysconfdir" = "\${prefix}/etc"; then
-	if test "$prefix" = "/"; then
-		sysconfdir="/etc"
-	else
-		sysconfdir="$prefix/etc"
-	fi
-fi
-
-dnl Fix "libdir" variable for IRIX 6.x...
-if test "$uname" = "IRIX" -a $uversion -ge 62; then
-	libdir="$exec_prefix/lib32"
-fi
-
-dnl Fix "mandir" variable...
-if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then
-	if test "$uname" = "IRIX"; then
-		mandir="/usr/share/catman"
-	else
-		mandir="/usr/man"
-	fi
-fi
-
-dnl Fix "fontpath" variable...
-if test "x$fontpath" = "x"; then
-	fontpath="$datadir/cups/fonts"
-fi
-
-dnl Setup manpage extensions...
-case "$uname" in
-	FreeBSD* | NetBSD* | OpenBSD*)
-		# *BSD
-		CAT1EXT=0
-		CAT5EXT=0
-		CAT8EXT=0
-		;;
-	IRIX*)
-		# SGI IRIX
-		CAT1EXT=z
-		CAT5EXT=z
-		CAT8EXT=z
-		;;
-	*)
-		# All others
-		CAT1EXT=1
-		CAT5EXT=5
-		CAT8EXT=8
-		;;
-esac
-
-AC_SUBST(CAT1EXT)
-AC_SUBST(CAT5EXT)
-AC_SUBST(CAT8EXT)
-
-dnl Setup init.d locations...
-case "$uname" in
-	FreeBSD* | NetBSD* | OpenBSD*)
-		# *BSD
-		INITDIR=""
-		INITDDIR=""
-		;;
-
-	Linux*)
-		# Linux seems to choose an init.d directory at random...
-		if test -d /sbin/init.d; then
-			# SuSE
-			INITDIR="/sbin/init.d"
-			INITDDIR=".."
-		else
-			if test -d /etc/rc.d; then
-				# RedHat
-				INITDIR="/etc/rc.d"
-				INITDDIR="../init.d"
-			else
-				# Others
-				INITDIR="/etc"
-				INITDDIR="../init.d"
-			fi
-		fi
-		;;
-
-	OSF1* | HP-UX*)
-		INITDIR="/sbin"
-		INITDDIR="../init.d"
-		;;
-
-	*)
-		INITDIR="/etc"
-		INITDDIR="../init.d"
-		;;
-
-esac
-
-AC_SUBST(INITDIR)
-AC_SUBST(INITDDIR)
-
-dnl Setup default locations...
-CUPS_SERVERROOT='${prefix}/etc/cups'
-CUPS_LOGDIR='${prefix}/var/log/cups'
-CUPS_REQUESTS='${prefix}/var/spool/cups'
-
-AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$prefix/etc/cups")
-AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$prefix/var/log/cups")
-AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$prefix/var/spool/cups")
-
-dnl See what directory to put server executables...
-case "$uname" in
-	FreeBSD* | NetBSD* | OpenBSD*)
-		# *BSD
-		INSTALL_SYSV=""
-		CUPS_SERVERBIN='${exec_prefix}/libexec/cups'
-		AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$exec_prefix/libexec/cups")
-		;;
-	*)
-		# All others
-		INSTALL_SYSV="install-sysv"
-		CUPS_SERVERBIN='${exec_prefix}/lib/cups'
-		AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$exec_prefix/lib/cups")
-		;;
-esac
-
-AC_SUBST(INSTALL_SYSV)
-AC_SUBST(CUPS_SERVERROOT)
-AC_SUBST(CUPS_SERVERBIN)
-AC_SUBST(CUPS_LOGDIR)
-AC_SUBST(CUPS_REQUESTS)
-
-dnl Set the CUPS_LOCALE directory...
-case "$uname" in
-	Linux* | FreeBSD* | NetBSD* | OpenBSD*)
-		CUPS_LOCALEDIR='${exec_prefix}/share/locale'
-		AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$exec_prefix/share/locale")
-		;;
-
-	OSF1*)
-		CUPS_LOCALEDIR='${exec_prefix}/lib/nls/msg'
-		AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$exec_prefix/lib/nls/msg")
-		;;
-
-	*)
-		# This is the standard System V location...
-		CUPS_LOCALEDIR='${exec_prefix}/lib/locale'
-		AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$exec_prefix/lib/locale")
-		;;
-esac
-
-AC_SUBST(CUPS_LOCALEDIR)
-
-dnl Set the CUPS_DATADIR directory...
-CUPS_DATADIR='${exec_prefix}/share/cups'
-AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$exec_prefix/share/cups")
-AC_SUBST(CUPS_DATADIR)
-
-dnl Set the CUPS_DOCROOT directory...
-CUPS_DOCROOT='${exec_prefix}/share/doc/cups'
-AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$exec_prefix/share/doc/cups")
-AC_SUBST(CUPS_DOCROOT)
-
-dnl Set the CUPS_FONTPATH directory...
-AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath")
-
-AC_OUTPUT(Makedefs cups.sh)
+chmod +x cups-config

 dnl
 dnl End of "$Id$".
@@ -0,0 +1,134 @@
+#!/bin/sh
+#
+# "$Id$"
+# 
+#   CUPS configuration utility.
+#
+#   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
+#   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
+#
+
+VERSION="1.1.15"
+APIVERSION="1.1"
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+bindir=@bindir@
+includedir=@includedir@
+libdir=@libdir@
+datadir=@datadir@
+sysconfdir=@sysconfdir@
+cups_datadir=@CUPS_DATADIR@
+cups_serverbin=@CUPS_SERVERBIN@
+cups_serverroot=@CUPS_SERVERROOT@
+
+# flags for C++ compiler:
+CFLAGS=""
+LDFLAGS=""
+LIBS="@SSLLIBS@ @NETLIBS@"
+IMGLIBS="@LIBTIFF@ @LIBJPEG@ @LIBPNG@ @LIBZ@"
+
+if test $includedir != /usr/include; then
+    CFLAGS="$CFLAGS -I$includedir"
+fi
+
+if test $libdir != /usr/lib -a $libdir != /usr/lib32; then
+    LDFLAGS="$LDFLAGS -L$libdir"
+fi
+
+usage ()
+{
+    echo "Usage: cups-config --api-version"
+    echo "       cups-config --cflags"
+    echo "       cups-config --datadir"
+    echo "       cups-config --help"
+    echo "       cups-config --ldflags"
+    echo "       cups-config [--image] [--static] --libs"
+    echo "       cups-config --serverbin"
+    echo "       cups-config --serverroot"
+    echo "       cups-config --version"
+
+    exit $1
+}
+
+if test $# -eq 0; then
+    usage 1
+fi
+
+# Parse command line options
+static=no
+image=no
+
+while test $# -gt 0; do
+    case $1 in
+	--api-version)
+	    echo $APIVERSION
+	    ;;
+	--cflags)
+	    echo $CFLAGS
+	    ;;
+	--datadir)
+	    echo $cups_datadir
+	    ;;
+	--help)
+	    usage 0
+	    ;;
+	--image)
+	    image=yes
+	    ;;
+	--ldflags)
+	    echo $LDFLAGS
+	    ;;
+	--libs)
+	    if test $static = no; then
+	        if test $image = no; then
+	            echo -lcups $LIBS
+		else
+	            echo -lcupsimage $IMGLIBS -lcups $LIBS
+		fi
+	    else
+	        if test $image = no; then
+	            echo $libdir/libcups.a $LIBS
+		else
+	            echo $libdir/libcupsimage.a $IMGLIBS $libdir/libcups.a $LIBS
+		fi
+	    fi
+	    ;;
+	--serverbin)
+	    echo $cups_serverbin
+	    ;;
+	--serverroot)
+	    echo $cups_serverroot
+	    ;;
+	--static)
+	    static=yes
+	    ;;
+	--version)
+	    echo $VERSION
+	    ;;
+	*)
+	    usage 1
+	    ;;
+    esac
+
+    shift
+done
+
+#
+# End of "$Id$".
+#
@@ -15,105 +15,6 @@ Package=<4>

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

-Project: "cupsd"=.\scheduler\cupsd.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name cups
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hpgltops"=.\filter\hpgltops.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name cups
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "image"=.\filter\image.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "pstops"=.\filter\pstops.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "testmime"=.\cups\testmime.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name cups
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "testppd"=.\cups\testppd.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name cups
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "texttops"=.\filter\texttops.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name cups
-    End Project Dependency
-}}}
-
-###############################################################################
-
 Global:

 Package=<5>
@@ -1,320 +0,0 @@
-#
-# "$Id: cups.list 1471 2000-12-11 04:40:31Z mike $"
-#
-#   ESP Package Manager (EPM) file list for the Common UNIX Printing
-#   System (CUPS).
-#
-#   Copyright 1997-2000 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
-#
-
-# Product information
-%product Common UNIX Printing System
-%copyright 1993-2000 by Easy Software Products, All Rights Reserved.
-%vendor Easy Software Products
-%license LICENSE.txt
-%readme README.txt
-%version 1.1.5
-%incompat printpro
-
-# Server programs
-%system all
-# Server files
-f 0555 root sys $SBINDIR/cupsd scheduler/cupsd
-
-d 0555 root sys $SERVERBIN -
-d 0555 root sys $SERVERBIN/backend -
-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/serial backend/serial
-f 0555 root sys $SERVERBIN/backend/socket backend/socket
-f 0555 root sys $SERVERBIN/backend/usb backend/usb
-d 0555 root sys $SERVERBIN/cgi-bin -
-f 0555 root sys $SERVERBIN/cgi-bin/admin.cgi cgi-bin/admin.cgi
-f 0555 root sys $SERVERBIN/cgi-bin/classes.cgi cgi-bin/classes.cgi
-f 0555 root sys $SERVERBIN/cgi-bin/jobs.cgi cgi-bin/jobs.cgi
-f 0555 root sys $SERVERBIN/cgi-bin/printers.cgi cgi-bin/printers.cgi
-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/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/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/hpgltops filter/hpgltops
-f 0555 root sys $SERVERBIN/filter/imagetoraster filter/imagetoraster
-
-# Admin commands
-l 0555 root sys $BINDIR/disable $SBINDIR/accept
-l 0555 root sys $BINDIR/enable $SBINDIR/accept
-l 0555 root sys $LIBDIR/accept $SBINDIR/accept
-l 0555 root sys $LIBDIR/lpadmin $SBINDIR/lpadmin
-l 0555 root sys $LIBDIR/reject accept
-f 0555 root sys $SBINDIR/accept systemv/accept
-f 0555 root sys $SBINDIR/lpadmin systemv/lpadmin
-f 0555 root sys $SBINDIR/lpc berkeley/lpc
-f 0555 root sys $SBINDIR/lpinfo systemv/lpinfo
-f 0555 root sys $SBINDIR/lpmove systemv/lpmove
-l 0555 root sys $SBINDIR/reject accept
-
-%system irix
-l 0555 root sys /usr/etc/lpc $SBINDIR/lpc
-%system all
-
-# User commands
-f 0555 root sys $BINDIR/cancel systemv/cancel
-f 0555 root sys $BINDIR/lp systemv/lp
-f 0555 root sys $BINDIR/lpoptions systemv/lpoptions
-f 4555 root sys $BINDIR/lppasswd systemv/lppasswd
-f 0555 root sys $BINDIR/lpq berkeley/lpq
-f 0555 root sys $BINDIR/lpr berkeley/lpr
-f 0555 root sys $BINDIR/lprm berkeley/lprm
-f 0555 root sys $BINDIR/lpstat systemv/lpstat
-
-%system irix
-l 0555 root sys /usr/bsd/lpq $BINDIR/lpq
-l 0555 root sys /usr/bsd/lpr $BINDIR/lpr
-l 0555 root sys /usr/bsd/lprm $BINDIR/lprm
-%system all
-
-# DSOs
-%system hpux
-f 0555 root sys $LIBDIR/libcups.sl.2 cups/libcups.sl.2
-l 0555 root sys $LIBDIR/libcups.sl libcups.sl.2
-f 0555 root sys $LIBDIR/libcupsimage.sl.2 filter/libcupsimage.sl.2
-l 0555 root sys $LIBDIR/libcupsimage.sl libcupsimage.sl.2
-%system !hpux
-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
-
-# Directories
-d 0755 root sys $LOGDIR -
-d 0700 lp sys $REQUESTS -
-d 1700 lp sys $REQUESTS/tmp -
-
-# Data files
-f 0444 root sys $LOCALEDIR/C/cups_C locale/C/cups_C
-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/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
-
-d 0555 root sys $DATADIR -
-
-d 0555 root sys $DATADIR/banners -
-f 0444 root sys $DATADIR/banners/classified data/classified
-f 0444 root sys $DATADIR/banners/confidential data/confidential
-f 0444 root sys $DATADIR/banners/secret data/secret
-f 0444 root sys $DATADIR/banners/standard data/standard
-f 0444 root sys $DATADIR/banners/topsecret data/topsecret
-f 0444 root sys $DATADIR/banners/unclassified data/unclassified
-
-d 0555 root sys $DATADIR/charsets -
-f 0444 root sys $DATADIR/charsets/windows-874 data/windows-874
-f 0444 root sys $DATADIR/charsets/windows-1250 data/windows-1250
-f 0444 root sys $DATADIR/charsets/windows-1251 data/windows-1251
-f 0444 root sys $DATADIR/charsets/windows-1252 data/windows-1252
-f 0444 root sys $DATADIR/charsets/windows-1253 data/windows-1253
-f 0444 root sys $DATADIR/charsets/windows-1254 data/windows-1254
-f 0444 root sys $DATADIR/charsets/windows-1255 data/windows-1255
-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
-f 0444 root sys $DATADIR/charsets/iso-8859-5 data/iso-8859-5
-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/utf-8 data/utf-8
-
-d 0555 root sys $DATADIR/data -
-f 0444 root sys $DATADIR/data/HPGLprolog data/HPGLprolog
-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/*
-
-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
-
-d 0555 root sys $DATADIR/templates -
-f 0444 root sys $DATADIR/templates templates/*.tmpl
-
-# Config files
-d 0555 root sys $SERVERROOT -
-d 0711 root sys $SERVERROOT/certs -
-d 0755 root sys $SERVERROOT/interfaces -
-d 0755 root sys $SERVERROOT/ppd -
-c 0644 root sys $SERVERROOT conf/*.conf
-f 0644 root sys $SERVERROOT/mime.convs conf/mime.convs
-f 0644 root sys $SERVERROOT/mime.types conf/mime.types
-
-%system linux
-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
-
-# Developer files
-d 0555 root sys $INCLUDEDIR/cups -
-f 0444 root sys $INCLUDEDIR/cups/cups.h cups/cups.h
-f 0444 root sys $INCLUDEDIR/cups/http.h cups/http.h
-f 0444 root sys $INCLUDEDIR/cups/image.h filter/image.h
-f 0444 root sys $INCLUDEDIR/cups/ipp.h cups/ipp.h
-f 0444 root sys $INCLUDEDIR/cups/language.h cups/language.h
-f 0444 root sys $INCLUDEDIR/cups/md5.h cups/md5.h
-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
-
-# Documentation files
-d 0555 root sys $DOCDIR -
-f 0444 root sys $DOCDIR/cups.css doc/cups.css
-f 0444 root sys $DOCDIR doc/*.html
-f 0444 root sys $DOCDIR doc/*.pdf
-d 0555 root sys $DOCDIR/images -
-f 0444 root sys $DOCDIR/images doc/images/*.gif
-
-# Man pages
-%system irix
-d 0555 root sys $MANDIR/a_man -
-d 0555 root sys $MANDIR/a_man/cat1 -
-d 0555 root sys $MANDIR/u_man -
-d 0555 root sys $MANDIR/u_man/cat1 -
-d 0555 root sys $MANDIR/u_man/cat5 -
-
-f 0444 root sys $MANDIR/a_man/cat1/accept.z man/accept.z
-l 0444 root sys $MANDIR/a_man/cat1/reject.z accept.z
-f 0444 root sys $MANDIR/u_man/cat1/backend.z man/backend.z
-f 0444 root sys $MANDIR/u_man/cat5/classes.conf.z man/classes.conf.z
-f 0444 root sys $MANDIR/a_man/cat1/cups-lpd.z man/cups-lpd.z
-f 0444 root sys $MANDIR/a_man/cat1/cups-polld.z man/cups-polld.z
-f 0444 root sys $MANDIR/u_man/cat5/cupsd.conf.z man/cupsd.conf.z
-f 0444 root sys $MANDIR/a_man/cat1/cupsd.z man/cupsd.z
-f 0444 root sys $MANDIR/a_man/cat1/enable.z man/enable.z
-l 0444 root sys $MANDIR/a_man/cat1/disable.z enable.z
-f 0444 root sys $MANDIR/u_man/cat1/filter.z man/filter.z
-f 0444 root sys $MANDIR/a_man/cat1/lpadmin.z man/lpadmin.z
-f 0444 root sys $MANDIR/a_man/cat1/lpc.z man/lpc.z
-f 0444 root sys $MANDIR/a_man/cat1/lpinfo.z man/lpinfo.z
-f 0444 root sys $MANDIR/a_man/cat1/lpmove.z man/lpmove.z
-f 0444 root sys $MANDIR/u_man/cat1/lpoptions.z man/lpoptions.z
-f 0444 root sys $MANDIR/u_man/cat1/lpq.z man/lpq.z
-f 0444 root sys $MANDIR/u_man/cat1/lprm.z man/lprm.z
-f 0444 root sys $MANDIR/u_man/cat1/lpr.z man/lpr.z
-f 0444 root sys $MANDIR/u_man/cat1/lpstat.z man/lpstat.z
-f 0444 root sys $MANDIR/u_man/cat1/lp.z man/lp.z
-l 0444 root sys $MANDIR/u_man/cat1/cancel.z lp.z
-f 0444 root sys $MANDIR/u_man/cat5/mime.convs.z man/mime.convs.z
-f 0444 root sys $MANDIR/u_man/cat5/mime.types.z man/mime.types.z
-f 0444 root sys $MANDIR/u_man/cat5/printers.conf.z man/printers.conf.z
-
-%system solaris hpux
-d 0555 root sys $MANDIR/man1 -
-d 0555 root sys $MANDIR/man5 -
-d 0555 root sys $MANDIR/man1m -
-
-f 0444 root sys $MANDIR/man1m/accept.1m man/accept.man
-l 0444 root sys $MANDIR/man1m/reject.1m accept.1m
-f 0444 root sys $MANDIR/man1/backend.1 man/backend.man
-f 0444 root sys $MANDIR/man1/classes.conf.5 man/classes.conf.man
-f 0444 root sys $MANDIR/man1m/cups-lpd.1m man/cups-lpd.man
-f 0444 root sys $MANDIR/man1m/cups-polld.1m man/cups-polld.man
-f 0444 root sys $MANDIR/man1m/cupsd.1m man/cupsd.man
-f 0444 root sys $MANDIR/man5/cupsd.conf.5 man/cupsd.conf.man
-f 0444 root sys $MANDIR/man1m/enable.1m man/enable.man
-l 0444 root sys $MANDIR/man1m/disable.1m enable.1m
-f 0444 root sys $MANDIR/man1/filter.1 man/filter.man
-f 0444 root sys $MANDIR/man1m/lpadmin.1m man/lpadmin.man
-f 0444 root sys $MANDIR/man1m/lpc.1m man/lpc.man
-f 0444 root sys $MANDIR/man1m/lpinfo.1m man/lpinfo.man
-f 0444 root sys $MANDIR/man1m/lpmove.1m man/lpmove.man
-f 0444 root sys $MANDIR/man1/lpoptions.1 man/lpoptions.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/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
-
-%system !irix !solaris !hpux
-d 0555 root sys $MANDIR/man1 -
-d 0555 root sys $MANDIR/man5 -
-d 0555 root sys $MANDIR/man8 -
-
-f 0444 root sys $MANDIR/man8/accept.8 man/accept.man
-l 0444 root sys $MANDIR/man8/reject.8 accept.8
-f 0444 root sys $MANDIR/man1/backend.1 man/backend.man
-f 0444 root sys $MANDIR/man1/classes.conf.5 man/classes.conf.man
-f 0444 root sys $MANDIR/man8/cups-lpd.8 man/cups-lpd.man
-f 0444 root sys $MANDIR/man8/cups-polld.8 man/cups-polld.man
-f 0444 root sys $MANDIR/man8/cupsd.8 man/cupsd.man
-f 0444 root sys $MANDIR/man5/cupsd.conf.5 man/cupsd.conf.man
-f 0444 root sys $MANDIR/man8/enable.8 man/enable.man
-l 0444 root sys $MANDIR/man8/disable.8 enable.8
-f 0444 root sys $MANDIR/man1/filter.1 man/filter.man
-f 0444 root sys $MANDIR/man8/lpadmin.8 man/lpadmin.man
-f 0444 root sys $MANDIR/man8/lpc.8 man/lpc.man
-f 0444 root sys $MANDIR/man8/lpinfo.8 man/lpinfo.man
-f 0444 root sys $MANDIR/man8/lpmove.8 man/lpmove.man
-f 0444 root sys $MANDIR/man1/lpoptions.1 man/lpoptions.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/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
-
-# Startup script
-%system all
-i 0555 root sys cups cups.sh
-
-#
-# End of "$Id: cups.list 1471 2000-12-11 04:40:31Z mike $".
-#
@@ -0,0 +1,469 @@
+#
+# "$Id$"
+#
+#   ESP Package Manager (EPM) file list for the Common UNIX Printing
+#   System (CUPS).
+#
+#   Copyright 1997-2002 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
+#
+
+# Product information
+%product Common UNIX Printing System
+%copyright 1993-2002 by Easy Software Products, All Rights Reserved.
+%vendor Easy Software Products
+%license LICENSE.txt
+%readme README.txt
+%version 1.1.15
+%provides cupsys
+%provides cups-devel
+%provides cupsys-devel
+%provides libcups1
+%provides libcups.so.2
+
+#
+# GNU variables...
+#
+
+$prefix=@prefix@
+$exec_prefix=@exec_prefix@
+$bindir=@bindir@
+$datadir=@datadir@
+$includedir=@includedir@
+$infodir=@infodir@
+$libdir=@libdir@
+$libexecdir=@libexecdir@
+$localstatedir=@localstatedir@
+$mandir=@mandir@
+$oldincludedir=@oldincludedir@
+$sbindir=@sbindir@
+$sharedstatedir=@sharedstatedir@
+$srcdir=@srcdir@
+$sysconfdir=@sysconfdir@
+$top_srcdir=@top_srcdir@
+
+#
+# ESP variables...
+#
+
+$AMANDIR=@AMANDIR@
+$BINDIR=@bindir@
+$DATADIR=@CUPS_DATADIR@
+$DOCDIR=@CUPS_DOCROOT@
+$INCLUDEDIR=${includedir}
+$INITDIR=@INITDIR@
+$INITDDIR=@INITDDIR@
+$LIBDIR=${libdir}
+$LOCALEDIR=@CUPS_LOCALEDIR@
+$LOGDIR=@CUPS_LOGDIR@
+$MANDIR=@mandir@
+$PAMDIR=@PAMDIR@
+$PMANDIR=@PMANDIR@
+$REQUESTS=@CUPS_REQUESTS@
+$SBINDIR=@sbindir@
+$SERVERBIN=@CUPS_SERVERBIN@
+$SERVERROOT=@CUPS_SERVERROOT@
+
+$CUPS_USER=@CUPS_USER@
+$CUPS_GROUP=@CUPS_GROUP@
+
+$CAT1EXT=@CAT1EXT@
+$CAT3EXT=@CAT3EXT@
+$CAT5EXT=@CAT5EXT@
+$CAT8EXT=@CAT8EXT@
+$MAN8EXT=@MAN8EXT@
+$MAN8DIR=@MAN8DIR@
+
+# 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
+f 0555 root sys $SBINDIR/cupsd scheduler/cupsd
+
+d 0555 root sys $SERVERBIN -
+d 0555 root sys $SERVERBIN/backend -
+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
+d 0555 root sys $SERVERBIN/cgi-bin -
+f 0555 root sys $SERVERBIN/cgi-bin/admin.cgi cgi-bin/admin.cgi
+f 0555 root sys $SERVERBIN/cgi-bin/classes.cgi cgi-bin/classes.cgi
+f 0555 root sys $SERVERBIN/cgi-bin/jobs.cgi cgi-bin/jobs.cgi
+f 0555 root sys $SERVERBIN/cgi-bin/printers.cgi cgi-bin/printers.cgi
+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/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/texttops filter/texttops
+f 0555 root sys $SERVERBIN/filter/rastertodymo filter/rastertodymo
+f 0555 root sys $SERVERBIN/filter/rastertoepson filter/rastertoepson
+f 0555 root sys $SERVERBIN/filter/rastertohp filter/rastertohp
+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
+l 0555 root sys $BINDIR/enable $SBINDIR/accept
+l 0555 root sys $LIBDIR/accept $SBINDIR/accept
+l 0555 root sys $LIBDIR/lpadmin $SBINDIR/lpadmin
+l 0555 root sys $LIBDIR/reject accept
+f 0555 root sys $SBINDIR/accept systemv/accept
+f 0555 root sys $SBINDIR/cupsaddsmb systemv/cupsaddsmb
+f 0555 root sys $SBINDIR/lpadmin systemv/lpadmin
+f 0555 root sys $SBINDIR/lpc berkeley/lpc
+f 0555 root sys $SBINDIR/lpinfo systemv/lpinfo
+f 0555 root sys $SBINDIR/lpmove systemv/lpmove
+l 0555 root sys $SBINDIR/reject accept
+
+%system irix
+l 0555 root sys /usr/etc/lpc $SBINDIR/lpc
+%system all
+
+# User commands
+f 0555 root sys $BINDIR/cancel systemv/cancel
+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
+f 0555 root sys $BINDIR/lpq berkeley/lpq
+f 0555 root sys $BINDIR/lpr berkeley/lpr
+f 0555 root sys $BINDIR/lprm berkeley/lprm
+f 0555 root sys $BINDIR/lpstat systemv/lpstat
+
+%system irix
+l 0555 root sys /usr/bsd/lpq $BINDIR/lpq
+l 0555 root sys /usr/bsd/lpr $BINDIR/lpr
+l 0555 root sys /usr/bsd/lprm $BINDIR/lprm
+%system all
+
+# DSOs
+%system hpux
+f 0555 root sys $LIBDIR/libcups.sl.2 cups/libcups.sl.2
+l 0555 root sys $LIBDIR/libcups.sl libcups.sl.2
+f 0555 root sys $LIBDIR/libcupsimage.sl.2 filter/libcupsimage.sl.2
+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
+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
+
+# Directories
+d 0755 root sys $LOGDIR -
+d 0700 $CUPS_USER sys $REQUESTS -
+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/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.cp1251/cups_ru_RU.cp1251 locale/ru_RU.cp1251/cups_ru_RU.cp1251
+f 0444 root sys $LOCALEDIR/ru_RU.koi8r/cups_ru_RU.koi8r locale/ru_RU.koi8r/cups_ru_RU.koi8r
+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.cp1251/cups_uk_UA.cp1251 locale/uk_UA.cp1251/cups_uk_UA.cp1251
+f 0444 root sys $LOCALEDIR/zh_CN/cups_zh_CN locale/zh_CN/cups_zh_CN
+
+d 0555 root sys $DATADIR -
+
+d 0555 root sys $DATADIR/banners -
+f 0444 root sys $DATADIR/banners/classified data/classified
+f 0444 root sys $DATADIR/banners/confidential data/confidential
+f 0444 root sys $DATADIR/banners/secret data/secret
+f 0444 root sys $DATADIR/banners/standard data/standard
+f 0444 root sys $DATADIR/banners/topsecret data/topsecret
+f 0444 root sys $DATADIR/banners/unclassified data/unclassified
+
+d 0555 root sys $DATADIR/charsets -
+f 0444 root sys $DATADIR/charsets/windows-874 data/windows-874
+f 0444 root sys $DATADIR/charsets/windows-1250 data/windows-1250
+f 0444 root sys $DATADIR/charsets/windows-1251 data/windows-1251
+f 0444 root sys $DATADIR/charsets/windows-1252 data/windows-1252
+f 0444 root sys $DATADIR/charsets/windows-1253 data/windows-1253
+f 0444 root sys $DATADIR/charsets/windows-1254 data/windows-1254
+f 0444 root sys $DATADIR/charsets/windows-1255 data/windows-1255
+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-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
+f 0444 root sys $DATADIR/charsets/iso-8859-5 data/iso-8859-5
+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 -
+f 0444 root sys $DATADIR/data/HPGLprolog data/HPGLprolog
+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
+
+d 0555 root sys $DATADIR/model -
+f 0444 root sys $DATADIR/model ppd/*.ppd
+
+d 0555 root sys $DATADIR/templates -
+c 0444 root sys $DATADIR/templates templates/*.tmpl
+
+# Config files
+d 0555 root sys $SERVERROOT -
+d 0711 $CUPS_USER $CUPS_GROUP $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
+
+%system linux
+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
+
+# IRIX doesn't normally support PAM, but the freeware project
+# includes a version of PAM that can be used...
+%system irix
+d 0555 root sys $PAMDIR -
+c 0644 root sys $PAMDIR/cups data/cups.irix
+
+%system all
+
+# Developer files
+f 0555 root sys $BINDIR/cups-config cups-config
+d 0555 root sys $INCLUDEDIR/cups -
+f 0444 root sys $INCLUDEDIR/cups/cups.h cups/cups.h
+f 0444 root sys $INCLUDEDIR/cups/http.h cups/http.h
+f 0444 root sys $INCLUDEDIR/cups/image.h filter/image.h
+f 0444 root sys $INCLUDEDIR/cups/ipp.h cups/ipp.h
+f 0444 root sys $INCLUDEDIR/cups/language.h cups/language.h
+f 0444 root sys $INCLUDEDIR/cups/md5.h cups/md5.h
+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
+
+# Documentation files
+d 0555 root sys $DOCDIR -
+f 0444 root sys $DOCDIR doc/*.css
+f 0444 root sys $DOCDIR doc/*.html
+f 0444 root sys $DOCDIR doc/*.pdf
+d 0555 root sys $DOCDIR/images -
+f 0444 root sys $DOCDIR/images doc/images/*.gif
+
+# Man pages
+d 0555 root sys $AMANDIR -
+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 $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 -
+
+f 0444 root sys $MANDIR/cat1/backend.$CAT1EXT man/backend.$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
+f 0444 root sys $MANDIR/cat1/lpq.$CAT1EXT man/lpq.$CAT1EXT
+f 0444 root sys $MANDIR/cat1/lprm.$CAT1EXT man/lprm.$CAT1EXT
+f 0444 root sys $MANDIR/cat1/lpr.$CAT1EXT man/lpr.$CAT1EXT
+f 0444 root sys $MANDIR/cat1/lpstat.$CAT1EXT man/lpstat.$CAT1EXT
+f 0444 root sys $MANDIR/cat1/lp.$CAT1EXT man/lp.$CAT1EXT
+l 0444 root sys $MANDIR/cat1/cancel.$CAT1EXT lp.$CAT1EXT
+
+f 0444 root sys $PMANDIR/cat3/cups-config.$CAT3EXT man/cups-config.$CAT3EXT
+
+f 0444 root sys $MANDIR/cat5/classes.conf.$CAT5EXT man/classes.conf.$CAT5EXT
+f 0444 root sys $MANDIR/cat5/cupsd.conf.$CAT5EXT man/cupsd.conf.$CAT5EXT
+f 0444 root sys $MANDIR/cat5/mime.convs.$CAT5EXT man/mime.convs.$CAT5EXT
+f 0444 root sys $MANDIR/cat5/mime.types.$CAT5EXT man/mime.types.$CAT5EXT
+f 0444 root sys $MANDIR/cat5/printers.conf.$CAT5EXT man/printers.conf.$CAT5EXT
+
+f 0444 root sys $AMANDIR/cat$MAN8DIR/accept.$CAT8EXT man/accept.$CAT8EXT
+l 0444 root sys $AMANDIR/cat$MAN8DIR/reject.$CAT8EXT accept.$CAT8EXT
+f 0444 root sys $AMANDIR/cat$MAN8DIR/cupsaddsmb.$CAT8EXT man/cupsaddsmb.$CAT8EXT
+f 0444 root sys $AMANDIR/cat$MAN8DIR/cups-lpd.$CAT8EXT man/cups-lpd.$CAT8EXT
+f 0444 root sys $AMANDIR/cat$MAN8DIR/cups-polld.$CAT8EXT man/cups-polld.$CAT8EXT
+f 0444 root sys $AMANDIR/cat$MAN8DIR/cupsd.$CAT8EXT man/cupsd.$CAT8EXT
+f 0444 root sys $AMANDIR/cat$MAN8DIR/enable.$CAT8EXT man/enable.$CAT8EXT
+l 0444 root sys $AMANDIR/cat$MAN8DIR/disable.$CAT8EXT enable.$CAT8EXT
+f 0444 root sys $AMANDIR/cat$MAN8DIR/lpadmin.$CAT8EXT man/lpadmin.$CAT8EXT
+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.$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.$MAN1EXT
+
+f 0444 root sys $PMANDIR/man3/cups-config.$MAN3EXT man/cups-config.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
+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
+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.$MAN1EXT man/backend.man
+f 0444 root sys $MANDIR/fr/man1/filter.$MAN1EXT man/filter.man
+f 0444 root sys $MANDIR/fr/man1/lpoptions.$MAN1EXT man/lpoptions.man
+f 0444 root sys $MANDIR/fr/man1/lppasswd.$MAN1EXT man/lppasswd.man
+f 0444 root sys $MANDIR/fr/man1/lpq.$MAN1EXT man/lpq.man
+f 0444 root sys $MANDIR/fr/man1/lprm.$MAN1EXT man/lprm.man
+f 0444 root sys $MANDIR/fr/man1/lpr.$MAN1EXT man/lpr.man
+f 0444 root sys $MANDIR/fr/man1/lpstat.$MAN1EXT man/lpstat.man
+f 0444 root sys $MANDIR/fr/man1/lp.$MAN1EXT man/lp.man
+l 0444 root sys $MANDIR/fr/man1/cancel.$MAN1EXT lp.$MAN1EXT
+
+f 0444 root sys $PMANDIR/fr/man3/cups-config.$MAN3EXT man/cups-config.man
+
+f 0444 root sys $MANDIR/fr/man5/classes.conf.$MAN5EXT man/classes.conf.man
+f 0444 root sys $MANDIR/fr/man5/cupsd.conf.$MAN5EXT man/cupsd.conf.man
+f 0444 root sys $MANDIR/fr/man5/mime.convs.$MAN5EXT man/mime.convs.man
+f 0444 root sys $MANDIR/fr/man5/mime.types.$MAN5EXT man/mime.types.man
+f 0444 root sys $MANDIR/fr/man5/printers.conf.$MAN5EXT 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
+
+#
+# End of "$Id$".
+#
@@ -0,0 +1,11 @@
+{
+  Description     = "Printing Services";
+  Provides        = ("Printing");
+  Requires        = ("Resolver");
+  OrderPreference = "None";
+  Messages =
+  {
+    start = "Starting printing services";
+    stop  = "Stopping printing services";
+  };
+}
@@ -4,13 +4,7 @@
 #
 #   Startup/shutdown script for the Common UNIX Printing System (CUPS).
 #
-#   Linux chkconfig stuff:
-#
-#   chkconfig: 0235 99 00
-#   description: Startup/shutdown script for the Common UNIX \
-#                Printing System (CUPS).
-#
-#   Copyright 1997-2000 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2002 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
@@ -29,59 +23,127 @@
 #         WWW: http://www.cups.org
 #

-# See what program to use for configuration stuff...
+#### OS-Dependent Information
+
+#
+#   Linux chkconfig stuff:
+#
+#   chkconfig: 235 99 00
+#   description: Startup/shutdown script for the Common UNIX \
+#                Printing System (CUPS).
+#
+
+#
+#   NetBSD 1.5+ rcorder script lines.  The format of the following two
+#   lines is very strict -- please don't add additional spaces!
+#
+# PROVIDE: cups
+# REQUIRE: DAEMON
+#
+
+
+#### OS-Dependent Configuration
+
 case "`uname`" in
 	IRIX*)
 		IS_ON=/sbin/chkconfig
 		;;

+	*BSD*)
+        	IS_ON=:
+		;;
+
+	Darwin*)
+		. /etc/rc.common
+
+		if test "${CUPS:=-YES-}" = "-NO-"; then
+			exit 0
+		fi
+
+        	IS_ON=:
+		;;
+
+	Linux*)
+		# Set the timezone, if possible...
+		if test -f /etc/TIMEZONE; then
+                        . /etc/TIMEZONE
+                else
+			if test -f /etc/sysconfig/clock; then
+	                        . /etc/sysconfig/clock
+        	                TZ="$ZONE"
+                	        export TZ
+			fi
+                fi
+
+		IS_ON=/bin/true
+		;;
+
 	*)
 		IS_ON=/bin/true
 		;;
 esac

+#### OS-Independent Stuff
+
+#
 # The verbose flag controls the printing of the names of
-# daemons as they are started.
-if $IS_ON verbose; then
-	ECHO=echo
+# daemons as they are started.  Currently always echos for
+# all but IRIX, which can configure verbose bootup messages.
+#
+
+if test "`uname`" = "Darwin"; then
+	ECHO=ConsoleMessage
 else
-	ECHO=:
+	if $IS_ON verbose; then
+		ECHO=echo
+	else
+		ECHO=:
+	fi
 fi

-# See if the CUPS server is running...
+#
+# See if the CUPS server (cupsd) is running...
+#
+
 case "`uname`" in
-	IRIX* | HP-UX | SunOS)
-		pid=`ps -e | awk '{print $1,$4}' | grep cupsd | awk '{print $1}'`
+	HP-UX* | AIX* | SINIX*)
+		pid=`ps -e | awk '{if (match($4, ".*/cupsd$") || $4 == "cupsd") print $1}'`
 		;;
-	OSF1)
-		pid=`ps -e | awk '{print $1,$5}' | grep cupsd | awk '{print $1}'`
+	IRIX* | SunOS*)
+		pid=`ps -e | nawk '{if (match($4, ".*/cupsd$") || $4 == "cupsd") print $1}'`
 		;;
-	Linux)
-		pid=`ps ax | awk '{print $1,$5}' | grep cupsd | awk '{print $1}'`
+	UnixWare*)
+		pid=`ps -e | awk '{if (match($6, ".*/cupsd$") || $6 == "cupsd") print $1}'`
+		. /etc/TIMEZONE
+		;;
+	OSF1*)
+		pid=`ps -e | awk '{if (match($5, ".*/cupsd$") || $5 == "cupsd") print $1}'`
+		;;
+	Linux* | *BSD* | Darwin*)
+		pid=`ps ax | awk '{if (match($5, ".*/cupsd$") || $5 == "cupsd") print $1}'`
 		;;
 	*)
 		pid=""
 		;;
 esac

+#
 # Start or stop the CUPS server based upon the first argument to the script.
+#
+
 case $1 in
 	start | restart | reload)
-		if test "$pid" != ""; then
-			if $IS_ON cups; then
+		if $IS_ON cups; then
+			if test "$pid" != ""; then
 				kill -HUP $pid
-				$ECHO "cups: scheduler restarted."
 			else
-				kill $pid
-				$ECHO "cups: scheduler stopped."
-			fi
-		else
-			if $IS_ON cups; then
 				prefix=@prefix@
 				exec_prefix=@exec_prefix@
 				@sbindir@/cupsd
-				$ECHO "cups: scheduler started."
 			fi
+			$ECHO "cups: scheduler ${1}ed."
+		else
+			$ECHO "cups: scheduler stopped."
 		fi
 		;;

@@ -106,6 +168,10 @@ case $1 in
 		;;
 esac

+#
+# Exit with no errors.
+#
+
 exit 0


@@ -1,11 +1,11 @@
 #
-# "$Id: cups.spec 1421 2000-10-19 20:55:06Z mike $"
+# "$Id: cups.spec 2429 2002-05-21 19:59:43Z mike $"
 #
 #   RPM "spec" file for the Common UNIX Printing System (CUPS).
 #
 #   Original version by Jason McMullan <jmcc@ontv.com>.
 #
-#   Copyright 1999-2000 by Easy Software Products, all rights reserved.
+#   Copyright 1999-2002 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,21 +26,27 @@

 Summary: Common Unix Printing System
 Name: cups
-Version: 1.1.5
+Version: 1.1.15
 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: Michael Sweet <mike@easysw.com>
+Packager: Anonymous <anonymous@foo.com>
 Vendor: Easy Software Products
-# use buildroot so as not to disturb the version already installed
+
+# Use buildroot so as not to disturb the version already installed
 BuildRoot: /var/tmp/%{name}-root
-Conflicts: lpr
+
+# Dependencies...
+Conflicts: lpr, LPRng
+Provides: libcups.so.2
+Provides: libcupsimage.so.2

 %package devel
 Summary: Common Unix Printing System - development environment
 Group: Development/Libraries
+Provides: libcups1

 %description
 The Common UNIX Printing System provides a portable printing layer for 
@@ -51,57 +57,42 @@ CUPS provides the System V and Berkeley command-line interfaces.
 %description devel
 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.
+additional printer drivers and other CUPS services.

 %prep
 %setup

 %build
-./configure
+CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" ./configure

 # If we got this far, all prerequisite libraries must be here.
 make

 %install
-# these lines just make sure the directory structure in the
-# RPM_BUILD_ROOT exists
+# Make sure the RPM_BUILD_ROOT directory exists.
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-mkdir -p $RPM_BUILD_ROOT/etc/rc.d/rc0.d
-mkdir -p $RPM_BUILD_ROOT/etc/rc.d/rc3.d
-mkdir -p $RPM_BUILD_ROOT/etc/rc.d/rc5.d

-make	prefix=$RPM_BUILD_ROOT \
-	exec_prefix=$RPM_BUILD_ROOT/usr \
-	BINDIR=$RPM_BUILD_ROOT/usr/bin \
-	DATADIR=$RPM_BUILD_ROOT/usr/share/cups \
-	DOCDIR=$RPM_BUILD_ROOT/usr/share/doc/cups \
-	INCLUDEDIR=$RPM_BUILD_ROOT/usr/include \
-	LIBDIR=$RPM_BUILD_ROOT/usr/lib \
-	LOCALEDIR=$RPM_BUILD_ROOT/usr/share/locale \
-	MANDIR=$RPM_BUILD_ROOT/usr/man \
-	PAMDIR=$RPM_BUILD_ROOT/etc/pam.d \
-	REQUESTS=$RPM_BUILD_ROOT/var/spool/cups \
-	SBINDIR=$RPM_BUILD_ROOT/usr/sbin \
-	SERVERBIN=$RPM_BUILD_ROOT/usr/lib/cups \
-	SERVERROOT=$RPM_BUILD_ROOT/etc/cups \
-	install
+make BUILDROOT=$RPM_BUILD_ROOT install

 %post
+ldconfig
+
 if test -x /sbin/chkconfig; then
 	/sbin/chkconfig --add cups
 	/sbin/chkconfig cups on
 fi

-if test -f /sbin/init.d/cups; then
-	/sbin/init.d/cups start
-fi
-if test -f /etc/rc.d/init.d/cups; then
-	/etc/rc.d/init.d/cups start
-fi
-if test -f /etc/init.d/cups; then
-	/etc/init.d/cups start
-fi
+# these lines automatically start cupsd after installation; commented out
+# by request...
+#if test -f /sbin/init.d/cups; then
+#	/sbin/init.d/cups start
+#fi
+#if test -f /etc/rc.d/init.d/cups; then
+#	/etc/rc.d/init.d/cups start
+#fi
+#if test -f /etc/init.d/cups; then
+#	/etc/init.d/cups start
+#fi

 %preun
 if test -f /sbin/init.d/cups; then
@@ -124,7 +115,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %dir /etc/cups
-%config /etc/cups/*.conf
+%config(noreplace) /etc/cups/*.conf
 %dir /etc/cups/certs
 %dir /etc/cups/interfaces
 /etc/cups/mime.types
@@ -151,11 +142,13 @@ rm -rf $RPM_BUILD_ROOT
 #/sbin/rc.d/rc3.d/*
 #/sbin/rc.d/rc5.d/*

-/usr/bin/*
+/usr/bin/cancel
+/usr/bin/disable
+/usr/bin/enable
+/usr/bin/lp*
 /usr/lib/*.so*
 %dir /usr/lib/cups
 /usr/lib/cups/*
-/usr/man/*
 /usr/sbin/*
 %dir /usr/share/cups
 /usr/share/cups/*
@@ -163,14 +156,52 @@ rm -rf $RPM_BUILD_ROOT
 /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
+/usr/share/man/cat5/*
+%dir /usr/share/man/cat8
+/usr/share/man/cat8/*
+%dir /usr/share/man/man1
+/usr/share/man/man1/*
+%dir /usr/share/man/man5
+/usr/share/man/man5/*
+%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/*
+
+%dir /usr/share/man/fr/cat3
+/usr/share/man/fr/cat3/*
+%dir /usr/share/man/fr/man3
+/usr/share/man/fr/man3/*
+
 #
-# End of "$Id: cups.spec 1421 2000-10-19 20:55:06Z mike $".
+# End of "$Id: cups.spec 2429 2002-05-21 19:59:43Z mike $".
 #
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-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>
+</dict>
+</plist>
+
@@ -0,0 +1,4 @@
+libcups.a
+libcups.sl.2
+libcups.so.2
+libcups_s.a
@@ -0,0 +1,22 @@
+# DO NOT DELETE
+
+dest.o: cups.h ipp.h http.h md5.h ppd.h language.h string.h ../config.h
+emit.o: ppd.h string.h ../config.h
+encode.o: cups.h ipp.h http.h md5.h ppd.h string.h ../config.h debug.h
+http.o: string.h ../config.h http.h md5.h ipp.h debug.h
+ipp.o: string.h ../config.h language.h ipp.h http.h md5.h debug.h
+language.o: string.h ../config.h language.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 md5.h string.h ../config.h
+options.o: cups.h ipp.h http.h md5.h ppd.h string.h ../config.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 md5.h ppd.h string.h ../config.h debug.h
+usersys.o: cups.h ipp.h http.h md5.h ppd.h string.h ../config.h
+util.o: cups.h ipp.h http.h md5.h ppd.h language.h string.h ../config.h
+util.o: debug.h
+testhttp.o: http.h md5.h
+testppd.o: cups.h ipp.h http.h md5.h ppd.h string.h ../config.h
@@ -3,7 +3,7 @@
 #
 #   Support library Makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2000 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2002 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,6 +21,8 @@
 #       EMail: cups-info@cups.org
 #         WWW: http://www.cups.org
 #
+#   This file is subject to the Apple OS-Developed Software exception.
+#

 include ../Makedefs

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

-LIBOBJS	=	dest.o emit.o http.o ipp.o language.o mark.o md5.o md5passwd.o \
-		options.o page.o ppd.o snprintf.o string.o usersys.o util.o
-OBJS	=	$(LIBOBJS) testhttp.o testppd.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 testlang.o testppd.o ppd-debug.o


 #
@@ -59,46 +62,93 @@ all:	$(TARGETS)
 #

 clean:
-	$(RM) $(OBJS) $(TARGETS) `basename $(LIBCUPS) .2`
+	$(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


 #
 # Install object and target files...
 #

-install:	all
-	-$(MKDIR) $(INCLUDEDIR)/cups
-	$(CHMOD) ugo+rx $(INCLUDEDIR)
-	$(CHMOD) ugo+rx $(INCLUDEDIR)/cups
-	$(INSTALL_DATA) $(HEADERS) $(INCLUDEDIR)/cups
-	-$(MKDIR) $(LIBDIR)
-	$(CHMOD) ugo+rx $(LIBDIR)
+install:	all	installhdrs
+	$(INSTALL_DIR) $(LIBDIR)
 	$(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
-	if test $(LIBCUPS) != "libcups.a" -a $(LIBCUPS) != "libcups.la"; then \
+	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 \
+		$(STRIP) -x $(LIBDIR)/$(LIBCUPS); \
+		$(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
+
+installhdrs:
+	$(INSTALL_DIR) $(INCLUDEDIR)/cups
+	for file in $(HEADERS); do \
+		$(INSTALL_DATA) $$file $(INCLUDEDIR)/cups; \
+	done


 #
-# libcups.so.2, libcups.sl.1
+# libcups.so.2, libcups.sl.2
 #

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


+#
+# libcups.2.dylib
+#
+
+libcups.2.dylib:	$(LIBOBJS) ../Makedefs
+	echo Linking $@...
+	$(DSO) $(DSOFLAGS) -o $@ \
+		-install_name $(libdir)/$@ \
+		-current_version 2.0.4 \
+		-compatibility_version 2.0.0 \
+		$(LIBOBJS) $(SSLLIBS)
+	$(RM) libcups.dylib
+	$(LN) $@ libcups.dylib
+
+
+#
+# libcups_s.a
+#
+
+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) -lm
+	$(RM) $@
+	$(AR) $(ARFLAGS) $@ libcups_s.o
+
+
 #
 # libcups.la
 #

 libcups.la:    $(LIBOBJS) ../Makedefs
 	echo Linking $@...
-	$(CC) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) -version-info 2:0
+	$(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
+		-version-info 2:4 $(SSLLIBS)


 #
@@ -121,21 +171,6 @@ 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
-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
-usersys.o:	cups.h
-util.o:		cups.h http.h ipp.h
-

 #
 # testhttp (dependency on static CUPS library is intentional)
@@ -143,22 +178,37 @@ util.o:		cups.h http.h ipp.h

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


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

-testppd:	testppd.o libcups.a
+testlang:	testlang.o libcups.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testppd.o libcups.a $(NETLIBS)
+	$(CC) $(LDFLAGS) -o $@ testlang.o libcups.a $(NETLIBS) $(SSLLIBS)

-testppd.o:	ppd.h

-$(OBJS):	../Makedefs ../config.h
+#
+# testppd
+#
+
+testppd:	testppd.o ppd-debug.o language.o mark.o page.o string.o
+	echo Linking $@...
+	$(CC) $(LDFLAGS) -o $@ testppd.o ppd-debug.o language.o mark.o page.o \
+		string.o
+
+ppd-debug.o:	ppd.c ppd.h string.h ../config.h language.h debug.h
+	echo Compiling $< with debugging...
+	$(CC) $(OPTIM) $(CFLAGS) -DDEBUG -c -o $@ $<
+
+
+#
+# Dependencies...
+#
+
+include Dependencies


 #
@@ -85,11 +85,11 @@ LIB32=link.exe -lib
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File

-SOURCE=.\emit.c
+SOURCE=.\dest.c
 # End Source File
 # Begin Source File

-SOURCE=.\filter.c
+SOURCE=.\emit.c
 # End Source File
 # Begin Source File

@@ -109,7 +109,11 @@ SOURCE=.\mark.c
 # End Source File
 # Begin Source File

-SOURCE=.\mime.c
+SOURCE=.\md5.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\md5passwd.c
 # End Source File
 # Begin Source File

@@ -125,10 +129,6 @@ SOURCE=.\ppd.c
 # End Source File
 # Begin Source File

-SOURCE=.\raster.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\snprintf.c
 # End Source File
 # Begin Source File
@@ -137,7 +137,7 @@ SOURCE=.\string.c
 # End Source File
 # Begin Source File

-SOURCE=.\type.c
+SOURCE=.\usersys.c
 # End Source File
 # Begin Source File

@@ -153,6 +153,14 @@ SOURCE=.\cups.h
 # End Source File
 # Begin Source File

+SOURCE=.\cups_C.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\debug.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\http.h
 # End Source File
 # Begin Source File
@@ -165,7 +173,7 @@ SOURCE=.\language.h
 # End Source File
 # Begin Source File

-SOURCE=.\mime.h
+SOURCE=.\md5.h
 # End Source File
 # Begin Source File

@@ -173,7 +181,7 @@ SOURCE=.\ppd.h
 # End Source File
 # Begin Source File

-SOURCE=.\raster.h
+SOURCE=.\string.h
 # End Source File
 # End Group
 # End Target
@@ -3,7 +3,7 @@
 *
 *   API definitions for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products.
+ *   Copyright 1997-2002 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -20,6 +20,8 @@
 *       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_
@@ -46,7 +48,7 @@ extern "C" {
 * Constants...
 */

-#  define CUPS_VERSION		1.0103
+#  define CUPS_VERSION		1.0115
 #  define CUPS_DATE_ANY		-1


@@ -94,7 +96,22 @@ typedef struct				/**** Destination ****/
  cups_option_t	*options;		/* Options */
 } cups_dest_t;

-  
+typedef struct				/**** Job ****/
+{
+  int		id;			/* The job ID */
+  char		*dest,			/* Printer or class name */
+		*title,			/* Title/job name */
+		*user,			/* User the submitted the job */
+		*format;		/* Document format */
+  ipp_jstate_t	state;			/* Job state */
+  int		size,			/* Size in kilobytes */
+		priority;		/* Priority (1-100) */
+  time_t	completed_time,		/* Time the job was completed */
+		creation_time,		/* Time the job was created */
+		processing_time;	/* Time the job was processed */
+} cups_job_t;
+
+
 /*
 * Functions...
 */
@@ -104,8 +121,11 @@ extern int		cupsCancelJob(const char *printer, int job);
 extern ipp_t		*cupsDoFileRequest(http_t *http, ipp_t *request,
 			                   const char *resource, const char *filename);
 extern http_encryption_t cupsEncryption(void);
+extern void		cupsFreeJobs(int num_jobs, cups_job_t *jobs);
 extern int		cupsGetClasses(char ***classes);
 extern const char	*cupsGetDefault(void);
+extern int		cupsGetJobs(cups_job_t **jobs, const char *dest,
+			            int myjobs, int completed);
 extern const char	*cupsGetPPD(const char *printer);
 extern int		cupsGetPrinters(char ***printers);
 extern ipp_status_t	cupsLastError(void);
@@ -116,6 +136,7 @@ extern int		cupsPrintFiles(const char *printer, int num_files,
 			               const char **files, const char *title,
 				       int num_options, cups_option_t *options);
 extern char		*cupsTempFile(char *filename, int len);
+extern int		cupsTempFd(char *filename, int len);

 extern int		cupsAddDest(const char *name, const char *instance,
 			            int num_dests, cups_dest_t **dests);
@@ -18,7 +18,7 @@
 "Cyan",
 "Magenta",
 "Yellow",
-"Copyright 1993-2000 by Easy Software Products, All Rights Reserved.",
+"Copyright 1993-2002 by Easy Software Products, All Rights Reserved.",
 "General",
 "Printer",
 "Image",
@@ -108,6 +108,8 @@
 "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-2000 by Easy Software Products.
+ *   Copyright 1997-2002 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -20,6 +20,8 @@
 *       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-2000 by Easy Software Products.
+ *   Copyright 1997-2002 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -22,14 +22,17 @@
 *       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.
- *   cupsFreeDests()  - Free the memory used by the list of destinations.
- *   cupsGetDest()    - Get the named destination from the list.
- *   cupsGetDests()   - Get the list of destinations.
- *   cupsSetDests()   - Set the list of destinations.
- *   cups_get_dests() - Get destinations from a file.
+ *   cupsAddDest()     - Add a destination to the list of destinations.
+ *   cupsFreeDests()   - Free the memory used by the list of destinations.
+ *   cupsGetDest()     - Get the named destination from the list.
+ *   cupsGetDests()    - Get the list of destinations.
+ *   cupsSetDests()    - Set the list of destinations.
+ *   cups_get_dests()  - Get destinations from a file.
+ *   cups_get_sdests() - Get destinations from a server.
 */

 /*
@@ -37,6 +40,7 @@
 */

 #include "cups.h"
+#include "language.h"
 #include "string.h"
 #include <stdlib.h>
 #include <ctype.h>
@@ -48,6 +52,8 @@

 static int	cups_get_dests(const char *filename, int num_dests,
 		               cups_dest_t **dests);
+static int	cups_get_sdests(ipp_op_t op, int num_dests,
+		                cups_dest_t **dests);


 /*
@@ -205,11 +211,14 @@ cupsGetDests(cups_dest_t **dests)	/* O - Destinations */
 {
  int		i;			/* Looping var */
  int		num_dests;		/* Number of destinations */
-  int		count;			/* Number of printers/classes */
-  char		**names;		/* Printer/class names */
  cups_dest_t	*dest;			/* Destination pointer */
  const char	*home;			/* HOME environment variable */
  char		filename[1024];		/* Local ~/.lpoptions file */
+  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 */


 /*
@@ -220,41 +229,63 @@ cupsGetDests(cups_dest_t **dests)	/* O - Destinations */
  *dests    = (cups_dest_t *)0;

 /*
-  * Grab all available printers...
+  * Grab the printers and classes...
  */

-  if ((count = cupsGetPrinters(&names)) > 0)
-  {
-    for (i = 0; i < count; i ++)
-    {
-      num_dests = cupsAddDest(names[i], NULL, num_dests, dests);
-      free(names[i]);
-    }
-
-    free(names);
-  }
+  num_dests = cups_get_sdests(CUPS_GET_PRINTERS, num_dests, dests);
+  num_dests = cups_get_sdests(CUPS_GET_CLASSES, num_dests, dests);

 /*
-  * Grab all available classes...
+  * Make a copy of the "real" queues for a later sanity check...
  */
-      
-  if ((count = cupsGetClasses(&names)) > 0)
-  {
-    for (i = 0; i < count; i ++)
-    {
-      num_dests = cupsAddDest(names[i], NULL, num_dests, dests);
-      free(names[i]);
-    }

-    free(names);
+  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...
  */

-  if ((dest = cupsGetDest(cupsGetDefault(), NULL, num_dests, *dests)) != NULL)
-    dest->is_default = 1;
+  if ((defprinter = cupsGetDefault()) != NULL)
+  {
+   /*
+    * Grab printer and instance name...
+    */
+
+    strlcpy(name, defprinter, sizeof(name));
+
+    if ((instance = strchr(name, '/')) != NULL)
+      *instance++ = '\0';
+
+   /*
+    * Lookup the printer and instance and make it the default...
+    */
+
+    if ((dest = cupsGetDest(name, instance, num_dests, *dests)) != NULL)
+      dest->is_default = 1;
+  }
+  else
+  {
+   /*
+    * This initialization of "instance" is unnecessary, but avoids a
+    * compiler warning...
+    */
+
+    instance = NULL;
+  }

 /*
  * Load the /etc/cups/lpoptions and ~/.lpoptions files...
@@ -274,6 +305,48 @@ cupsGetDests(cups_dest_t **dests)	/* O - Destinations */
    num_dests = cups_get_dests(filename, num_dests, dests);
  }

+ /*
+  * 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...
+  */
+
+  if (num_reals)
+  {
+   /*
+    * See if we have a default printer...
+    */
+
+    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);
+  }
+
 /*
  * Return the number of destinations...
  */
@@ -291,35 +364,61 @@ cupsSetDests(int         num_dests,	/* I - Number of destinations */
             cups_dest_t *dests)	/* I - Destinations */
 {
  int		i, j;			/* Looping vars */
+  int		wrote;			/* Wrote definition? */
  cups_dest_t	*dest;			/* Current destination */
  cups_option_t	*option;		/* Current option */
  FILE		*fp;			/* File pointer */
  const char	*home;			/* HOME environment variable */
  char		filename[1024];		/* lpoptions file */
+  int		num_temps;		/* Number of temporary destinations */
+  cups_dest_t	*temps,			/* Temporary destinations */
+		*temp;			/* Current temporary dest */
+  const char	*val;			/* Value of temporary option */


+ /*
+  * Get the server destinations...
+  */
+
+  num_temps = cups_get_sdests(CUPS_GET_PRINTERS, 0, &temps);
+  num_temps = cups_get_sdests(CUPS_GET_CLASSES, num_temps, &temps);
+
 /*
  * Figure out which file to write to...
  */

-  if (getuid() == 0)
-  {
-    if ((home = getenv("CUPS_SERVERROOT")) == NULL)
-      home = CUPS_SERVERROOT;
-
+  if ((home = getenv("CUPS_SERVERROOT")) != NULL)
    snprintf(filename, sizeof(filename), "%s/lpoptions", home);
-  }
-  else if ((home = getenv("HOME")) != NULL)
-    snprintf(filename, sizeof(filename), "%s/.lpoptions", home);
  else
-    return;
+    strcpy(filename, CUPS_SERVERROOT "/lpoptions");
+
+#ifndef WIN32
+  if (getuid())
+  {
+   /*
+    * Merge in server defaults...
+    */
+
+    num_temps = cups_get_dests(filename, num_temps, &temps);
+
+   /*
+    * Point to user defaults...
+    */
+
+    if ((home = getenv("HOME")) != NULL)
+      snprintf(filename, sizeof(filename), "%s/.lpoptions", home);
+  }
+#endif /* !WIN32 */

 /*
  * Try to open the file...
  */

  if ((fp = fopen(filename, "w")) == NULL)
+  {
+    cupsFreeDests(num_temps, temps);
    return;
+  }

 /*
  * Write each printer; each line looks like:
@@ -331,20 +430,67 @@ cupsSetDests(int         num_dests,	/* I - Number of destinations */
  for (i = num_dests, dest = dests; i > 0; i --, dest ++)
    if (dest->instance != NULL || dest->num_options != 0 || dest->is_default)
    {
-      fprintf(fp, "%s %s", dest->is_default ? "Default" : "Dest",
-              dest->name);
-      if (dest->instance)
-	fprintf(fp, "/%s", dest->instance);
+      if (dest->is_default)
+      {
+	fprintf(fp, "Default %s", dest->name);
+	if (dest->instance)
+	  fprintf(fp, "/%s", dest->instance);
+
+        wrote = 1;
+      }
+      else
+        wrote = 0;
+
+      if ((temp = cupsGetDest(dest->name, dest->instance, num_temps, temps)) == NULL)
+        temp = cupsGetDest(dest->name, NULL, num_temps, temps);

      for (j = dest->num_options, option = dest->options; j > 0; j --, option ++)
+      {
+       /*
+	* See if the server/global options match these; if so, don't
+	* write 'em.
+	*/
+
+        if (temp && (val = cupsGetOption(option->name, temp->num_options,
+	                                 temp->options)) != NULL)
+	{
+	  if (strcasecmp(val, option->value) == 0)
+	    continue;
+	}
+
+       /*
+        * Options don't match, write to the file...
+	*/
+
+        if (!wrote)
+	{
+	  fprintf(fp, "Dest %s", dest->name);
+	  if (dest->instance)
+	    fprintf(fp, "/%s", dest->instance);
+          wrote = 1;
+	}
+        
        if (option->value[0])
-	  fprintf(fp, " %s=%s", option->name, option->value);
+	{
+	  if (strchr(option->value, ' ') != NULL)
+	    fprintf(fp, " %s=\"%s\"", option->name, option->value);
+          else
+	    fprintf(fp, " %s=%s", option->name, option->value);
+	}
 	else
 	  fprintf(fp, " %s", option->name);
+      }

-      fputs("\n", fp);
+      if (wrote)
+        fputs("\n", fp);
    }

+ /*
+  * Free the temporary destinations...
+  */
+
+  cupsFreeDests(num_temps, temps);
+
 /*
  * Close the file and return...
  */
@@ -451,6 +597,14 @@ 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...
    */
@@ -471,18 +625,6 @@ 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));

@@ -509,6 +651,148 @@ cups_get_dests(const char  *filename,	/* I - File to read from */
 }


+/*
+ * 'cups_get_sdests()' - Get destinations from a server.
+ */
+
+static int				/* O - Number of destinations */
+cups_get_sdests(ipp_op_t    op,		/* I - get-printers or get-classes */
+                int         num_dests,	/* I - Number of destinations */
+                cups_dest_t **dests)	/* IO - Destinations */
+{
+  cups_dest_t	*dest;			/* Current destination */
+  http_t	*http;			/* HTTP connection */
+  ipp_t		*request,		/* IPP Request */
+		*response;		/* IPP Response */
+  ipp_attribute_t *attr;		/* Current attribute */
+  cups_lang_t	*language;		/* Default language */
+  const char	*name;			/* printer-name attribute */
+  char		job_sheets[1024];	/* job-sheets option */
+  static const char	*pattrs[] =	/* Attributes we're interested in */
+		{
+		  "printer-name",
+		  "job-sheets-default"
+		};
+
+
+ /*
+  * Connect to the CUPS server...
+  */
+
+  if ((http = httpConnect(cupsServer(), ippPort())) == NULL)
+    return (num_dests);
+
+ /*
+  * Build a CUPS_GET_PRINTERS or CUPS_GET_CLASSES request, which require
+  * the following attributes:
+  *
+  *    attributes-charset
+  *    attributes-natural-language
+  */
+
+  request = ippNew();
+
+  request->request.op.operation_id = op;
+  request->request.op.request_id   = 1;
+
+  language = cupsLangDefault();
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+               "attributes-charset", NULL, cupsLangEncoding(language));
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+               "attributes-natural-language", NULL, language->language);
+
+  ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
+                "requested-attributes", sizeof(pattrs) / sizeof(pattrs[0]),
+		NULL, pattrs);
+
+ /*
+  * Do the request and get back a response...
+  */
+
+  if ((response = cupsDoRequest(http, request, "/")) != NULL)
+  {
+    for (attr = response->attrs; attr != NULL; attr = attr->next)
+    {
+     /*
+      * Skip leading attributes until we hit a printer...
+      */
+
+      while (attr != NULL && attr->group_tag != IPP_TAG_PRINTER)
+        attr = attr->next;
+
+      if (attr == NULL)
+        break;
+
+     /*
+      * Pull the needed attributes from this job...
+      */
+
+      name = NULL;
+
+      strcpy(job_sheets, "");
+
+      while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER)
+      {
+        if (strcmp(attr->name, "printer-name") == 0 &&
+	    attr->value_tag == IPP_TAG_NAME)
+	  name = attr->values[0].string.text;
+
+        if (strcmp(attr->name, "job-sheets-default") == 0 &&
+	    (attr->value_tag == IPP_TAG_KEYWORD ||
+	     attr->value_tag == IPP_TAG_NAME))
+        {
+	  if (attr->num_values == 2)
+	    snprintf(job_sheets, sizeof(job_sheets), "%s,%s",
+	             attr->values[0].string.text, attr->values[1].string.text);
+	  else
+	    strcpy(job_sheets, attr->values[0].string.text);
+        }
+
+        attr = attr->next;
+      }
+
+     /*
+      * See if we have everything needed...
+      */
+
+      if (!name)
+      {
+        if (attr == NULL)
+	  break;
+	else
+          continue;
+      }
+
+      num_dests = cupsAddDest(name, NULL, num_dests, dests);
+
+      if ((dest = cupsGetDest(name, NULL, num_dests, *dests)) != NULL)
+        if (job_sheets[0])
+          dest->num_options = cupsAddOption("job-sheets", job_sheets, 0,
+	                                    &(dest->options));
+
+      if (attr == NULL)
+	break;
+    }
+
+    ippDelete(response);
+  }
+
+ /*
+  * Close the server connection...
+  */
+
+  httpClose(http);
+
+ /*
+  * Return the count...
+  */
+
+  return (num_dests);
+}
+
+
 /*
 * End of "$Id$".
 */
@@ -3,7 +3,7 @@
 *
 *   PPD code emission routines for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2002 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,12 +23,17 @@
 *
 *   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
- *   ppdEmit()    - Emit code for marked options to a file.
- *   ppdEmitFd()  - Emit code for marked options to a file.
- *   ppd_sort()   - Sort options by ordering numbers...
+ *   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...
 */

 /*
@@ -50,9 +55,19 @@
 * 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.
@@ -150,6 +165,16 @@ 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);

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

-      if (fprintf(fp, "%%%%BeginFeature: %s %s\n",
+      if (fprintf(fp, "%%%%BeginFeature: *%s %s\n",
                  ((ppd_option_t *)choices[i]->option)->keyword,
 		  choices[i]->choice) < 0)
      {
@@ -179,7 +204,8 @@ ppdEmit(ppd_file_t    *ppd,		/* I - PPD file record */
        return (-1);
      }

-      if (strcasecmp(((ppd_option_t *)choices[i]->option)->keyword, "PageSize") == 0 &&
+      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)
      {
       /*
@@ -199,8 +225,7 @@ ppdEmit(ppd_file_t    *ppd,		/* I - PPD file record */
 	  * Level 2 command sequence...
 	  */

-	  fputs("pop pop pop\n", fp);
-	  fputs("<</PageSize[5 -2 roll]/ImagingBBox null>>setpagedevice\n", fp);
+	  fputs(ppd_custom_code, fp);
 	}
      }

@@ -251,9 +276,20 @@ ppdEmitFd(ppd_file_t    *ppd,		/* I - PPD file record */
  int		i,			/* Looping var */
 		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);

@@ -275,7 +311,7 @@ ppdEmitFd(ppd_file_t    *ppd,		/* I - PPD file record */
      * Send DSC comments with option...
      */

-      snprintf(buf, sizeof(buf), "%%%%BeginFeature: %s %s\n",
+      snprintf(buf, sizeof(buf), "%%%%BeginFeature: *%s %s\n",
               ((ppd_option_t *)choices[i]->option)->keyword,
 	       choices[i]->choice);

@@ -285,10 +321,49 @@ ppdEmitFd(ppd_file_t    *ppd,		/* I - PPD file record */
        return (-1);
      }

-      if (write(fd, choices[i]->code, strlen(choices[i]->code)) < 1)
+      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)
      {
-        free(choices);
-        return (-1);
+       /*
+        * Variable size; write out standard size options (this should
+	* eventually be changed to use the parameter positions defined
+	* in the PPD file...)
+	*/
+
+        size = ppdPageSize(ppd, "Custom");
+        snprintf(buf, sizeof(buf), "%.0f %.0f 0 0 0\n", size->width,
+	         size->length);
+
+	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);
+	}
      }

      if (write(fd, "%%EndFeature\n", 13) < 1)
@@ -314,6 +389,143 @@ ppdEmitFd(ppd_file_t    *ppd,		/* I - PPD file record */
 }


+/*
+ * 'ppdEmitJCL()' - Emit code for JCL options to a file.
+ */
+
+int					/* O - 0 on success, -1 on failure */
+ppdEmitJCL(ppd_file_t *ppd,		/* I - PPD file record */
+           FILE       *fp,		/* I - File to write to */
+           int        job_id,		/* I - Job ID */
+	   const char *user,		/* I - Username */
+	   const char *title)		/* I - Title */
+{
+  const char	*ptr;			/* Pointer into JCL string */
+
+
+ /*
+  * Range check the input...
+  */
+
+  if (ppd == NULL || ppd->jcl_begin == NULL || ppd->jcl_ps == NULL)
+    return (0);
+
+ /*
+  * See if the printer supports HP PJL...
+  */
+
+  if (strncmp(ppd->jcl_begin, "\033%-12345X@", 10) == 0)
+  {
+   /*
+    * This printer uses HP PJL commands for output; filter the output
+    * so that we only have a single "@PJL JOB" command in the header...
+    */
+
+    fputs("\033%-12345X", fp);
+    for (ptr = ppd->jcl_begin + 9; *ptr;)
+      if (strncmp(ptr, "@PJL JOB", 8) == 0)
+      {
+       /*
+        * Skip job command...
+	*/
+
+        for (;*ptr; ptr ++)
+	  if (*ptr == '\n')
+	    break;
+
+	if (*ptr)
+	  ptr ++;
+      }
+      else
+      {
+       /*
+        * Copy line...
+	*/
+
+        for (;*ptr; ptr ++)
+	{
+	  putc(*ptr, fp);
+	  if (*ptr == '\n')
+	    break;
+	}
+
+	if (*ptr)
+	  ptr ++;
+      }
+
+   /*
+    * Eliminate any path info from the job title...
+    */
+
+    if ((ptr = strrchr(title, '/')) != NULL)
+      title = ptr + 1;
+
+   /*
+    * Send PJL JOB command before we enter PostScript mode...
+    */
+
+    fprintf(fp, "@PJL JOB NAME = \"%s\" DISPLAY = \"%d %s %s\"\n", title,
+            job_id, user, title);
+  }
+  else
+    fputs(ppd->jcl_begin, stdout);
+
+  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 */
+  ppd_size_t	*size;			/* Current media size */
+
+
+ /*
+  * 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 (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);
+  }
+}
+
+
 /*
 * 'ppd_sort()' - Sort options by ordering numbers...
 */
@@ -0,0 +1,402 @@
+/*
+ * "$Id$"
+ *
+ *   Option encoding routines for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-2002 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:
+ *
+ *   cupsEncodeOptions() - Encode printer options into IPP attributes.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "cups.h"
+#include <stdlib.h>
+#include <ctype.h>
+#include "string.h"
+#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 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-priority",		IPP_TAG_INTEGER },
+			  { "landscape",		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 },
+			  { "wrap",			IPP_TAG_BOOLEAN }
+			};
+
+
+/*
+ * 'cupsEncodeOptions()' - Encode printer options into IPP attributes.
+ */
+
+void
+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 */
+
+
+  DEBUG_printf(("cupsEncodeOptions(%p, %d, %p)\n", ipp, num_options, options));
+
+  if (ipp == NULL || num_options < 1 || options == NULL)
+    return;
+
+ /*
+  * Handle the document format stuff first...
+  */
+
+  if ((val = (char *)cupsGetOption("document-format", num_options, options)) != NULL)
+    ippAddString(ipp, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
+        	 NULL, val);
+  else if (cupsGetOption("raw", num_options, options))
+    ippAddString(ipp, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
+        	 NULL, "application/vnd.cups-raw");
+  else
+    ippAddString(ipp, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
+        	 NULL, "application/octet-stream");
+
+ /*
+  * Then add all other options...
+  */
+
+  for (i = 0; i < num_options; i ++)
+  {
+   /*
+    * Skip document format options - handled above...
+    */
+
+    if (strcasecmp(options[i].name, "raw") == 0 ||
+        strcasecmp(options[i].name, "document-format") == 0 ||
+	!options[i].name[0])
+      continue;
+
+   /*
+    * 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 ++;
+    }
+
+    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)
+    {
+     /*
+      * Ran out of memory!
+      */
+
+      DEBUG_puts("cupsEncodeOptions: Ran out of memory for attributes!");
+      return;
+    }
+
+   /*
+    * Now figure out what type of value we have...
+    */
+
+    attr->group_tag = IPP_TAG_JOB;
+
+    if (strncasecmp(options[i].name, "no", 2) == 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)
+    {
+     /*
+      * Ran out of memory!
+      */
+
+      DEBUG_puts("cupsEncodeOptions: Ran out of memory for name!");
+      return;
+    }
+
+    if (count > 1)
+    {
+     /*
+      * Make a copy of the value we can fiddle with...
+      */
+
+      if ((copy = strdup(options[i].value)) == NULL)
+      {
+       /*
+	* Ran out of memory!
+	*/
+
+	DEBUG_puts("cupsEncodeOptions: Ran out of memory for value copy!");
+	return;
+      }
+
+      val = copy;
+    }
+    else
+    {
+     /*
+      * Since we have a single value, use the value directly...
+      */
+
+      val  = options[i].value;
+      copy = NULL;
+    }
+
+   /*
+    * Scan the value string for values...
+    */
+
+    for (j = 0; *val != '\0' || j == 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);
+
+     /*
+      * Copy the option value(s) over as needed by the type...
+      */
+
+      switch (attr->value_tag)
+      {
+	case IPP_TAG_INTEGER :
+	case IPP_TAG_ENUM :
+	   /*
+	    * Integer/enumeration value...
+	    */
+
+            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 (!*val)
+	    {
+	     /*
+	      * Add a boolean option without a value, so the option is
+	      * passed in as "name" or "noname" for true/false...
+	      */
+
+	      if (strncasecmp(attr->name, "no", 2) == 0)
+	      {
+        	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 if (strcasecmp(val, "true") == 0 ||
+        	     strcasecmp(val, "on") == 0 ||
+		     strcasecmp(val, "yes") == 0)
+	    {
+	     /*
+	      * Boolean value - true...
+	      */
+
+	      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->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)
+	    {
+	     /*
+	      * Ran out of memory!
+	      */
+
+	      DEBUG_puts("cupsEncodeOptions: Ran out of memory for string!");
+	      return;
+	    }
+
+	    DEBUG_printf(("cupsEncodeOptions: Added string value \'%s\'...\n",
+	                  val));
+            break;
+      }
+    }
+  }
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -4,7 +4,7 @@
 *   Hyper-Text Transport Protocol definitions for the Common UNIX Printing
 *   System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2002 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,6 +21,8 @@
 *       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_
@@ -32,7 +34,7 @@

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

 #  include "md5.h"

@@ -290,6 +294,8 @@ extern int		httpCheck(http_t *http);
 						httpSetField((http), HTTP_FIELD_HOST, (http)->hostname)
 extern void		httpClose(http_t *http);
 extern http_t		*httpConnect(const char *host, int port);
+extern http_t		*httpConnectEncrypt(const char *host, int port,
+			                    http_encryption_t encrypt);
 extern int		httpDelete(http_t *http, const char *uri);
 extern int		httpEncryption(http_t *http, http_encryption_t e);
 #  define		httpError(http) ((http)->error)
@@ -299,13 +305,18 @@ extern char		*httpGets(char *line, int length, http_t *http);
 extern const char	*httpGetDateString(time_t t);
 extern time_t		httpGetDateTime(const char *s);
 #  define		httpGetField(http,field)	(http)->fields[field]
+extern struct hostent	*httpGetHostByName(const char *name);
 extern char		*httpGetSubField(http_t *http, http_field_t field,
 			                 const char *name, char *value);
 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, ...);
+extern int		httpPrintf(http_t *http, const char *format, ...)
+#  ifdef __GNUC__
+__attribute__ ((__format__ (__printf__, 2, 3)))
+#  endif /* __GNUC__ */
+;
 extern int		httpPut(http_t *http, const char *uri);
 extern int		httpRead(http_t *http, char *buffer, int length);
 extern int		httpReconnect(http_t *http);
@@ -4,7 +4,7 @@
 *   Internet Printing Protocol definitions for the Common UNIX Printing
 *   System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products.
+ *   Copyright 1997-2002 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -21,6 +21,8 @@
 *       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_
@@ -46,7 +48,7 @@ extern "C" {
 * IPP version string...
 */

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

 /*
 * IPP registered port number...  This is the default value - applications
@@ -61,7 +63,7 @@ extern "C" {
 */

 #  define IPP_MAX_NAME		256
-#  define IPP_MAX_VALUES	100
+#  define IPP_MAX_VALUES	10	/* Now just an allocation increment */


 /*
@@ -76,13 +78,15 @@ typedef enum			/**** Format tags for attribute formats... ****/
  IPP_TAG_END,
  IPP_TAG_PRINTER,
  IPP_TAG_UNSUPPORTED_GROUP,
+  IPP_TAG_SUBSCRIPTION,
+  IPP_TAG_EVENT_NOTIFICATION,
  IPP_TAG_UNSUPPORTED_VALUE = 0x10,
  IPP_TAG_DEFAULT,
  IPP_TAG_UNKNOWN,
  IPP_TAG_NOVALUE,
  IPP_TAG_NOTSETTABLE = 0x15,
  IPP_TAG_DELETEATTR,
-  IPP_TAG_ANYVALUE,
+  IPP_TAG_ADMINDEFINE,
  IPP_TAG_INTEGER = 0x21,
  IPP_TAG_BOOLEAN,
  IPP_TAG_ENUM,
@@ -90,9 +94,10 @@ typedef enum			/**** Format tags for attribute formats... ****/
  IPP_TAG_DATE,
  IPP_TAG_RESOLUTION,
  IPP_TAG_RANGE,
-  IPP_TAG_COLLECTION,
+  IPP_TAG_BEGIN_COLLECTION,
  IPP_TAG_TEXTLANG,
  IPP_TAG_NAMELANG,
+  IPP_TAG_END_COLLECTION,
  IPP_TAG_TEXT = 0x41,
  IPP_TAG_NAME,
  IPP_TAG_KEYWORD = 0x44,
@@ -101,7 +106,9 @@ typedef enum			/**** Format tags for attribute formats... ****/
  IPP_TAG_CHARSET,
  IPP_TAG_LANGUAGE,
  IPP_TAG_MIMETYPE,
-  IPP_TAG_COPY = 0x80000000
+  IPP_TAG_MEMBERNAME,
+  IPP_TAG_MASK = 0x7fffffff,	/* Mask for copied attribute values */
+  IPP_TAG_COPY = -0x7fffffff-1	/* Bitflag for copied attribute values */
 } ipp_tag_t;

 typedef enum			/**** Resolution units... ****/
@@ -112,11 +119,34 @@ typedef enum			/**** Resolution units... ****/

 typedef enum			/**** Finishings... ****/
 {
-  IPP_FINISH_NONE = 3,
-  IPP_FINISH_STAPLE,
-  IPP_FINISH_PUNCH,
-  IPP_FINISH_COVER,
-  IPP_FINISH_BIND
+  IPP_FINISHINGS_NONE = 3,
+  IPP_FINISHINGS_STAPLE,
+  IPP_FINISHINGS_PUNCH,
+  IPP_FINISHINGS_COVER,
+  IPP_FINISHINGS_BIND,
+  IPP_FINISHINGS_SADDLE_STITCH,
+  IPP_FINISHINGS_EDGE_STITCH,
+  IPP_FINISHINGS_FOLD,
+  IPP_FINISHINGS_TRIM,
+  IPP_FINISHINGS_BALE,
+  IPP_FINISHINGS_BOOKLET_MAKER,
+  IPP_FINISHINGS_JOB_OFFSET,
+  IPP_FINISHINGS_STAPLE_TOP_LEFT = 20,
+  IPP_FINISHINGS_STAPLE_BOTTOM_LEFT,
+  IPP_FINISHINGS_STAPLE_TOP_RIGHT,
+  IPP_FINISHINGS_STAPLE_BOTTOM_RIGHT,
+  IPP_FINISHINGS_EDGE_STITCH_LEFT,
+  IPP_FINISHINGS_EDGE_STITCH_TOP,
+  IPP_FINISHINGS_EDGE_STITCH_RIGHT,
+  IPP_FINISHINGS_EDGE_STITCH_BOTTOM,
+  IPP_FINISHINGS_STAPLE_DUAL_LEFT,
+  IPP_FINISHINGS_STAPLE_DUAL_TOP,
+  IPP_FINISHINGS_STAPLE_DUAL_RIGHT,
+  IPP_FINISHINGS_STAPLE_DUAL_BOTTOM,
+  IPP_FINISHINGS_BIND_LEFT = 50,
+  IPP_FINISHINGS_BIND_TOP,
+  IPP_FINISHINGS_BIND_RIGHT,
+  IPP_FINISHINGS_BIND_BOTTOM
 } ipp_finish_t;

 typedef enum			/**** Orientation... ****/
@@ -182,6 +212,31 @@ typedef enum			/**** IPP operations... ****/
  IPP_SET_PRINTER_ATTRIBUTES,
  IPP_SET_JOB_ATTRIBUTES,
  IPP_GET_PRINTER_SUPPORTED_VALUES,
+  IPP_CREATE_PRINTER_SUBSCRIPTION,
+  IPP_CREATE_JOB_SUBSCRIPTION,
+  IPP_GET_SUBSCRIPTION_ATTRIBUTES,
+  IPP_GET_SUBSCRIPTIONS,
+  IPP_RENEW_SUBSCRIPTION,
+  IPP_CANCEL_SUBSCRIPTION,
+  IPP_GET_NOTIFICATIONS,
+  IPP_SEND_NOTIFICATIONS,
+  IPP_GET_PRINT_SUPPORT_FILES = 0x0021,
+  IPP_ENABLE_PRINTER,
+  IPP_DISABLE_PRINTER,
+  IPP_PAUSE_PRINTER_AFTER_CURRENT_JOB,
+  IPP_HOLD_NEW_JOBS,
+  IPP_RELEASE_HELD_NEW_JOBS,
+  IPP_DEACTIVATE_PRINTER,
+  IPP_ACTIVATE_PRINTER,
+  IPP_RESTART_PRINTER,
+  IPP_SHUTDOWN_PRINTER,
+  IPP_STARTUP_PRINTER,
+  IPP_REPROCESS_JOB,
+  IPP_CANCEL_CURRENT_JOB,
+  IPP_SUSPEND_CURRENT_JOB,
+  IPP_RESUME_JOB,
+  IPP_PROMOTE_JOB,
+  IPP_SCHEDULE_JOB_AFTER,
  IPP_PRIVATE = 0x4000,
  CUPS_GET_DEFAULT,
  CUPS_GET_PRINTERS,
@@ -195,7 +250,9 @@ typedef enum			/**** IPP operations... ****/
  CUPS_SET_DEFAULT,
  CUPS_GET_DEVICES,
  CUPS_GET_PPDS,
-  CUPS_MOVE_JOB
+  CUPS_MOVE_JOB,
+  CUPS_ADD_DEVICE,
+  CUPS_DELETE_DEVICE
 } ipp_op_t;

 typedef enum			/**** IPP status codes... ****/
@@ -203,6 +260,11 @@ typedef enum			/**** IPP status codes... ****/
  IPP_OK = 0x0000,
  IPP_OK_SUBST,
  IPP_OK_CONFLICT,
+  IPP_OK_IGNORED_SUBSCRIPTIONS,
+  IPP_OK_IGNORED_NOTIFICATIONS,
+  IPP_OK_TOO_MANY_EVENTS,
+  IPP_OK_BUT_CANCEL_SUBSCRIPTION,
+  IPP_REDIRECTION_OTHER_SITE = 0x300,
  IPP_BAD_REQUEST = 0x0400,
  IPP_FORBIDDEN,
  IPP_NOT_AUTHENTICATED,
@@ -222,6 +284,12 @@ typedef enum			/**** IPP status codes... ****/
  IPP_COMPRESSION_ERROR,
  IPP_DOCUMENT_FORMAT_ERROR,
  IPP_DOCUMENT_ACCESS_ERROR,
+  IPP_ATTRIBUTES_NOT_SETTABLE,
+  IPP_IGNORED_ALL_SUBSCRIPTIONS,
+  IPP_TOO_MANY_SUBSCRIPTIONS,
+  IPP_IGNORED_ALL_NOTIFICATIONS,
+  IPP_PRINT_SUPPORT_FILE_NOT_FOUND,
+
  IPP_INTERNAL_ERROR = 0x0500,
  IPP_OPERATION_NOT_SUPPORTED,
  IPP_SERVICE_UNAVAILABLE,
@@ -231,7 +299,8 @@ typedef enum			/**** IPP status codes... ****/
  IPP_NOT_ACCEPTING,
  IPP_PRINTER_BUSY,
  IPP_ERROR_JOB_CANCELLED,
-  IPP_MULTIPLE_JOBS_NOT_SUPPORTED
+  IPP_MULTIPLE_JOBS_NOT_SUPPORTED,
+  IPP_PRINTER_IS_DEACTIVATED
 } ipp_status_t;

 typedef unsigned char ipp_uchar_t;/**** Unsigned 8-bit integer/character ****/
@@ -297,8 +366,7 @@ typedef union			/**** Attribute Value ****/

 typedef struct ipp_attribute_s	/**** Attribute ****/
 {
-  struct ipp_attribute_s	*next;
-  				/* Next atrtribute in list */
+  struct ipp_attribute_s *next;	/* Next attribute in list */
  ipp_tag_t	group_tag,	/* Job/Printer/Operation group tag */
 		value_tag;	/* What type of value is it? */
  char		*name;		/* Name of attribute */
@@ -336,7 +404,10 @@ extern ipp_attribute_t	*ippAddStrings(ipp_t *ipp, ipp_tag_t group, ipp_tag_t typ
 extern time_t		ippDateToTime(const ipp_uchar_t *date);
 extern void		ippDelete(ipp_t *ipp);
 extern const char	*ippErrorString(ipp_status_t error);
-extern ipp_attribute_t	*ippFindAttribute(ipp_t *ipp, const char *name, ipp_tag_t type);
+extern ipp_attribute_t	*ippFindAttribute(ipp_t *ipp, const char *name,
+			                  ipp_tag_t type);
+extern ipp_attribute_t	*ippFindNextAttribute(ipp_t *ipp, const char *name,
+			                      ipp_tag_t type);
 extern size_t		ippLength(ipp_t *ipp);
 extern ipp_t		*ippNew(void);
 extern ipp_state_t	ippRead(http_t *http, ipp_t *ipp);
@@ -3,7 +3,7 @@
 *
 *   I18N/language support for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products.
+ *   Copyright 1997-2002 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -21,6 +21,8 @@
 *       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.)
@@ -73,7 +75,9 @@ static char		*lang_encodings[] =	/* Encoding strings */
 			  "windows-1255",
 			  "windows-1256",
 			  "windows-1257",
-			  "windows-1258"
+			  "windows-1258",
+			  "koi8-r",
+			  "koi8-u"
 			};
 static char		*lang_default[] =	/* Default POSIX locale */
 			{
@@ -143,8 +147,10 @@ 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 */
-		real[16],	/* Real language name */
+  char		langname[32],	/* Requested language name */
+		*langptr,	/* Pointer into language name */
+		real[32],	/* Real language name */
+		*realptr,	/* Pointer into real language name */
 		filename[1024],	/* Filename for language locale file */
 		*localedir;	/* Directory for locale files */
  FILE		*fp;		/* Language locale file pointer */
@@ -159,8 +165,7 @@ cupsLangGet(const char *language) /* I - Language or locale */
  * standard POSIX locale and is copied unchanged.  Otherwise the
  * 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.
+  * operating systems.
  */

  if (language == NULL || language[0] == '\0' ||
@@ -172,65 +177,61 @@ cupsLangGet(const char *language) /* I - Language or locale */
    * Copy the locale string over safely...
    */

-    strncpy(langname, language, sizeof(langname) - 1);
-    langname[sizeof(langname) - 1] = '\0';
-
-   /*
-    * Strip charset from "locale.charset"...
-    */
-
-    if ((text = strchr(langname, '.')) != NULL)
-      *text = '\0';
+    strlcpy(langname, language, sizeof(langname));
  }

  if (strlen(langname) < 2)
    strcpy(real, "C");
  else
  {
+   /*
+    * Convert the language name to a normalized form, e.g.:
+    *
+    *     ll[_CC[.charset]]
+    */
+
    real[0] = tolower(langname[0]);
    real[1] = tolower(langname[1]);
+    realptr = real + 2;
+    langptr = langname + 2;

-    if (langname[2] == '_' || langname[2] == '-')
+    if (*langptr == '_' || *langptr == '-')
    {
-      real[2]     = '_';
-      real[3]     = toupper(langname[3]);
-      real[4]     = toupper(langname[4]);
-      real[5]     = '\0';
-      langname[5] = '\0';
+     /*
+      * Add country code...
+      */
+
+      *realptr++ = '_';
+      langptr ++;
+
+      *realptr++ = toupper(*langptr++);
+      *realptr++ = toupper(*langptr++);
    }
-    else
+
+    if (*langptr == '.')
    {
-      langname[2] = '\0';
-      real[2]     = '\0';
+     /*
+      * Add charset...
+      */
+
+      *langptr++ = '\0';
+      *realptr++ = '.';
+
+      while (*langptr)
+      {
+        if ((realptr - real) < (sizeof(real) - 1) &&
+	    *langptr != '-' && *langptr != '_')
+	  *realptr++ = tolower(*langptr++);
+        else
+          langptr ++;
+      }
    }
+
+    *realptr = '\0';
  }

 /*
-  * 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;
-
-  snprintf(filename, sizeof(filename), "%s/%s/cups_%s", localedir, real, real);
-
-  if ((fp = fopen(filename, "r")) == NULL)
-    if (strlen(real) > 2)
-    {
-     /*
-      * Nope, see if we can open a generic language file...
-      */
-
-      real[2] = '\0';
-      snprintf(filename, sizeof(filename), "%s/%s/cups_%s", localedir, real,
-               real);
-      fp = fopen(filename, "r");
-    }
-
- /*
-  * Then see if we already have this language loaded...
+  * See if we already have this language loaded...
  */

  for (lang = lang_cache; lang != NULL; lang = lang->next)
@@ -238,12 +239,36 @@ cupsLangGet(const char *language) /* I - Language or locale */
    {
      lang->used ++;

-      if (fp != NULL)
-        fclose(fp);
-
      return (lang);
    }

+
+ /*
+  * Next try to open a locale file; we will try the charset-localized
+  * file first, then the country-localized file, and finally look for
+  * a generic language file.  If all else fails we will use the POSIX
+  * locale.
+  */
+
+  if ((localedir = getenv("LOCALEDIR")) == NULL)
+    localedir = CUPS_LOCALEDIR;
+
+  for (fp = NULL; fp == NULL;)
+  {
+    snprintf(filename, sizeof(filename), "%s/%s/cups_%s", localedir,
+             real, real);
+
+    if ((fp = fopen(filename, "r")) == NULL)
+    {
+      if ((realptr = strchr(real, '.')) != NULL)
+        *realptr = '\0';
+      else if ((realptr = strchr(real, '_')) != NULL)
+        *realptr = '\0';
+      else
+        break;
+    }
+  }
+
 /*
  * 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
@@ -263,10 +288,7 @@ cupsLangGet(const char *language) /* I - Language or locale */
  */

  if (fp == NULL)
-  {
-    strncpy(line, lang_default[0], sizeof(line) - 1);
-    line[sizeof(line) - 1] = '\0';
-  }
+    strlcpy(line, lang_default[0], sizeof(line));
  else if (fgets(line, sizeof(line), fp) == NULL)
  {
   /*
@@ -323,8 +345,7 @@ cupsLangGet(const char *language) /* I - Language or locale */
  */

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

  for (i = 0; i < (sizeof(lang_encodings) / sizeof(lang_encodings[0])); i ++)
    if (strcmp(lang_encodings[i], line) == 0)
@@ -351,8 +372,7 @@ cupsLangGet(const char *language) /* I - Language or locale */
      if (lang_default[count] == NULL)
        break;

-      strncpy(line, lang_default[count], sizeof(line) - 1);
-      /* Already set last byte to 0 above... */
+      strlcpy(line, lang_default[count], sizeof(line));
    }
    else if (fgets(line, sizeof(line), fp) == NULL)
      break;
@@ -3,7 +3,7 @@
 *
 *   Multi-language support for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products.
+ *   Copyright 1997-2002 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -20,6 +20,8 @@
 *       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_
@@ -150,6 +152,8 @@ 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
@@ -181,7 +185,9 @@ typedef enum			/**** Language Encodings ****/
  CUPS_WINDOWS_1255,
  CUPS_WINDOWS_1256,
  CUPS_WINDOWS_1257,
-  CUPS_WINDOWS_1258
+  CUPS_WINDOWS_1258,
+  CUPS_KOI8_R,
+  CUPS_KOI8_U
 } cups_encoding_t;

 typedef struct cups_lang_str	/**** Language Cache Structure ****/
@@ -199,11 +205,11 @@ typedef struct cups_lang_str	/**** Language Cache Structure ****/
 * Prototypes...
 */

-#  ifdef WIN32
+#  if defined(WIN32) || defined(__EMX__) || defined(__APPLE__)
 #    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 */
+#  else
+#    define		cupsLangDefault() cupsLangGet(setlocale(LC_MESSAGES, ""))
+#  endif /* WIN32 || __EMX__ || __APPLE__ */

 extern char		*cupsLangEncoding(cups_lang_t *lang);
 extern void		cupsLangFlush(void);
@@ -3,7 +3,7 @@
 *
 *   Option marking routines for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2002 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,6 +23,8 @@
 *
 *   PostScript is a trademark of Adobe Systems, Inc.
 *
+ *   This file is subject to the Apple OS-Developed Software exception.
+ *
 * Contents:
 *
 *   ppdConflicts()        - Check to see if there are any conflicts.
@@ -3,7 +3,7 @@
 *
 *   MD5 password support for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products.
+ *   Copyright 1997-2002 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -21,6 +21,8 @@
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
 *
+ *   This file is subject to the Apple OS-Developed Software exception.
+ *
 * Contents:
 *
 *   httpMD5()       - Compute the MD5 sum of the username:group:password.
@@ -103,7 +105,7 @@ httpMD5Final(const char *nonce,		/* I - Server nonce value */
  * request...
  */

-  snprintf(line, sizeof(line), "%s%s:%s", md5, nonce, a2);
+  snprintf(line, sizeof(line), "%s:%s:%s", md5, nonce, a2);

  md5_init(&state);
  md5_append(&state, (md5_byte_t *)line, strlen(line));
@@ -3,7 +3,7 @@
 *
 *   Option routines for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products.
+ *   Copyright 1997-2002 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -21,14 +21,15 @@
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
 *
+ *   This file is subject to the Apple OS-Developed Software exception.
+ *
 * Contents:
 *
- *   cupsAddOption()     - Add an option to an option array.
- *   cupsEncodeOptions() - Encode printer options into IPP attributes.
- *   cupsFreeOptions()   - Free all memory used by options.
- *   cupsGetOption()     - Get an option value.
- *   cupsParseOptions()  - Parse options from a command-line argument.
- *   cupsMarkOptions()   - Mark command-line options in a PPD file.
+ *   cupsAddOption()    - Add an option to an option array.
+ *   cupsFreeOptions()  - Free all memory used by options.
+ *   cupsGetOption()    - Get an option value.
+ *   cupsParseOptions() - Parse options from a command-line argument.
+ *   cupsMarkOptions()  - Mark command-line options in a PPD file.
 */

 /*
@@ -56,8 +57,9 @@ cupsAddOption(const char    *name,		/* I - Name of option */
  cups_option_t	*temp;				/* Pointer to new option */


-  if (name == NULL || value == NULL || options == NULL)
-    return (0);
+  if (name == NULL || !name[0] || value == NULL ||
+      options == NULL || num_options < 0)
+    return (num_options);

 /*
  * Look for an existing option with the same name...
@@ -102,274 +104,6 @@ cupsAddOption(const char    *name,		/* I - Name of option */
 }


-/*
- * 'cupsEncodeOptions()' - Encode printer options into IPP attributes.
- */
-
-void
-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 */
-  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));
-
-  if (ipp == NULL || num_options < 1 || options == NULL)
-    return;
-
- /*
-  * Handle the document format stuff first...
-  */
-
-  if ((val = (char *)cupsGetOption("document-format", num_options, options)) != NULL)
-    ippAddString(ipp, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
-        	 NULL, val);
-  else if (cupsGetOption("raw", num_options, options))
-    ippAddString(ipp, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
-        	 NULL, "application/vnd.cups-raw");
-  else
-    ippAddString(ipp, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
-        	 NULL, "application/octet-stream");
-
- /*
-  * Then add all other options...
-  */
-
-  for (i = 0; i < num_options; i ++)
-  {
-   /*
-    * Skip document format options - handled above...
-    */
-
-    if (strcasecmp(options[i].name, "raw") == 0 ||
-        strcasecmp(options[i].name, "document-format") == 0)
-      continue;
-
-   /*
-    * Count the number of values...
-    */
-
-    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));
-
-    if ((attr = _ipp_add_attr(ipp, count)) == NULL)
-    {
-     /*
-      * Ran out of memory!
-      */
-
-      DEBUG_puts("cupsEncodeOptions: Ran out of memory for attributes!");
-      return;
-    }
-
-    attr->group_tag = IPP_TAG_JOB;
-
-    if ((attr->name = strdup(options[i].name)) == NULL)
-    {
-     /*
-      * Ran out of memory!
-      */
-
-      DEBUG_puts("cupsEncodeOptions: Ran out of memory for name!");
-      return;
-    }
-
-    if (count > 1)
-    {
-     /*
-      * Make a copy of the value we can fiddle with...
-      */
-
-      if ((copy = strdup(options[i].value)) == NULL)
-      {
-       /*
-	* Ran out of memory!
-	*/
-
-	DEBUG_puts("cupsEncodeOptions: Ran out of memory for value copy!");
-	return;
-      }
-
-      val = copy;
-    }
-    else
-    {
-     /*
-      * Since we have a single value, use the value directly...
-      */
-
-      val  = options[i].value;
-      copy = NULL;
-    }
-
-   /*
-    * 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.
-    */
-
-    if (*val == '\0')
-    {
-     /*
-      * Old-style System V boolean value...
-      */
-
-      attr->value_tag = IPP_TAG_BOOLEAN;
-
-      if (strncasecmp(attr->name, "no", 2) == 0)
-      {
-        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))
-	  {
-	   /*
-	    * String value(s)...
-	    */
-
-            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));
-	  }
-	  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));
-	  }
-        }
-      }
-    }
-  }
-}
-
-
 /*
 * 'cupsFreeOptions()' - Free all memory used by options.
 */
@@ -381,7 +115,7 @@ cupsFreeOptions(int           num_options,	/* I - Number of options */
  int	i;					/* Looping var */


-  if (num_options == 0 || options == NULL)
+  if (num_options <= 0 || options == NULL)
    return;

  for (i = 0; i < num_options; i ++)
@@ -406,7 +140,7 @@ cupsGetOption(const char    *name,	/* I - Name of option */
  int	i;				/* Looping var */


-  if (name == NULL || num_options == 0 || options == NULL)
+  if (name == NULL || num_options <= 0 || options == NULL)
    return (NULL);

  for (i = 0; i < num_options; i ++)
@@ -432,7 +166,7 @@ cupsParseOptions(const char    *arg,		/* I - Argument to parse */
 	*value;					/* Pointer to value */


-  if (arg == NULL || options == NULL)
+  if (arg == NULL || options == NULL || num_options < 0)
    return (0);

 /*
@@ -463,6 +197,13 @@ cupsParseOptions(const char    *arg,		/* I - Argument to parse */
    while (!isspace(*ptr) && *ptr != '=' && *ptr != '\0')
      ptr ++;

+   /*
+    * Avoid an empty name...
+    */
+
+    if (ptr == name)
+      break;
+
   /*
    * Skip trailing spaces...
    */
@@ -476,7 +217,12 @@ cupsParseOptions(const char    *arg,		/* I - Argument to parse */
      * Start of another option...
      */

-      num_options = cupsAddOption(name, "", num_options, options);
+      if (strncasecmp(name, "no", 2) == 0)
+        num_options = cupsAddOption(name + 2, "false", num_options,
+	                            options);
+      else
+        num_options = cupsAddOption(name, "true", num_options, options);
+
      continue;
    }

@@ -526,11 +272,15 @@ cupsParseOptions(const char    *arg,		/* I - Argument to parse */

      while (!isspace(*ptr) && *ptr != '\0')
 	ptr ++;
-
-      while (isspace(*ptr))
-        *ptr++ = '\0';
    }

+   /*
+    * Skip trailing whitespace...
+    */
+
+    while (isspace(*ptr))
+      *ptr++ = '\0';
+
   /*
    * Add the string value...
    */
@@ -565,6 +315,17 @@ cupsMarkOptions(ppd_file_t    *ppd,		/* I - PPD file */
 	s[255];					/* Temporary string */


+ /*
+  * Check arguments...
+  */
+
+  if (ppd == NULL || num_options <= 0 || options == NULL)
+    return (0);
+
+ /*
+  * Mark options...
+  */
+
  conflict = 0;

  for (i = num_options; i > 0; i --, options ++)
@@ -611,6 +372,8 @@ cupsMarkOptions(ppd_file_t    *ppd,		/* I - PPD file */
      {
        if (ppdMarkOption(ppd, "Duplex", "None"))
 	  conflict = 1;
+        if (ppdMarkOption(ppd, "JCLDuplex", "None"))	/* Samsung */
+	  conflict = 1;
        if (ppdMarkOption(ppd, "EFDuplex", "None"))	/* EFI */
 	  conflict = 1;
        if (ppdMarkOption(ppd, "KD03Duplex", "None"))	/* Kodak */
@@ -620,6 +383,8 @@ cupsMarkOptions(ppd_file_t    *ppd,		/* I - PPD file */
      {
        if (ppdMarkOption(ppd, "Duplex", "DuplexNoTumble"))
 	  conflict = 1;
+        if (ppdMarkOption(ppd, "JCLDuplex", "DuplexNoTumble"))	/* Samsung */
+	  conflict = 1;
        if (ppdMarkOption(ppd, "EFDuplex", "DuplexNoTumble"))	/* EFI */
 	  conflict = 1;
        if (ppdMarkOption(ppd, "KD03Duplex", "DuplexNoTumble"))	/* Kodak */
@@ -629,6 +394,8 @@ cupsMarkOptions(ppd_file_t    *ppd,		/* I - PPD file */
      {
        if (ppdMarkOption(ppd, "Duplex", "DuplexTumble"))
 	  conflict = 1;
+        if (ppdMarkOption(ppd, "JCLDuplex", "DuplexTumble"))	/* Samsung */
+	  conflict = 1;
        if (ppdMarkOption(ppd, "EFDuplex", "DuplexTumble"))	/* EFI */
 	  conflict = 1;
        if (ppdMarkOption(ppd, "KD03Duplex", "DuplexTumble"))	/* Kodak */
@@ -3,7 +3,7 @@
 *
 *   Page size functions for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2002 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,6 +23,8 @@
 *
 *   PostScript is a trademark of Adobe Systems, Inc.
 *
+ *   This file is subject to the Apple OS-Developed Software exception.
+ *
 * Contents:
 *
 *   ppdPageSize()   - Get the page size record for the given size.
@@ -3,7 +3,7 @@
 *
 *   PPD file routines for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2002 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
@@ -30,6 +30,8 @@
 *   GhostScript (or its derivatives) is governed by the CUPS license
 *   agreement.
 *
+ *   This file is subject to the Apple OS-Developed Software exception.
+ *
 * Contents:
 *
 *   ppdClose()        - Free all memory used by the PPD file.
@@ -284,12 +286,16 @@ ppd_get_group(ppd_file_t *ppd,	/* I - PPD file */
  ppd_group_t	*group;		/* Group */


+  DEBUG_printf(("ppd_get_group(%p, \"%s\")\n", ppd, name));
+
  for (i = ppd->num_groups, group = ppd->groups; i > 0; i --, group ++)
    if (strcmp(group->text, name) == 0)
      break;

  if (i == 0)
  {
+    DEBUG_printf(("Adding group %s...\n", name));
+
    if (ppd->num_groups == 0)
      group = malloc(sizeof(ppd_group_t));
    else
@@ -304,7 +310,7 @@ ppd_get_group(ppd_file_t *ppd,	/* I - PPD file */
    ppd->num_groups ++;

    memset(group, 0, sizeof(ppd_group_t));
-    strncpy(group->text, name, sizeof(group->text) - 1);
+    strlcpy(group->text, name, sizeof(group->text));
  }

  return (group);
@@ -343,7 +349,7 @@ ppd_get_option(ppd_group_t *group,	/* I - Group */
    group->num_options ++;

    memset(option, 0, sizeof(ppd_option_t));
-    strncpy(option->keyword, name, sizeof(option->keyword) - 1);
+    strlcpy(option->keyword, name, sizeof(option->keyword));
  }

  return (option);
@@ -375,7 +381,7 @@ ppd_add_choice(ppd_option_t *option,	/* I - Option */
  option->num_choices ++;

  memset(choice, 0, sizeof(ppd_choice_t));
-  strncpy(choice->choice, name, sizeof(choice->choice) - 1);
+  strlcpy(choice->choice, name, sizeof(choice->choice));

  return (choice);
 }
@@ -405,7 +411,7 @@ ppd_add_size(ppd_file_t *ppd,	/* I - PPD file */
  ppd->num_sizes ++;

  memset(size, 0, sizeof(ppd_size_t));
-  strncpy(size->name, name, sizeof(size->name) - 1);
+  strlcpy(size->name, name, sizeof(size->name));

  return (size);
 }
@@ -428,12 +434,17 @@ ppdOpen(FILE *fp)		/* I - File to read from */
  ppd_const_t	*constraint;	/* Current constraint */
  ppd_size_t	*size;		/* Current page size */
  int		mask;		/* Line data mask */
-  char		keyword[41],	/* Keyword from file */
-		name[41],	/* Option from file */
-		text[81],	/* Human-readable text from file */
+  char		keyword[PPD_MAX_NAME],
+  				/* Keyword from file */
+		name[PPD_MAX_NAME],
+				/* Option from file */
+		text[PPD_MAX_LINE],
+				/* Human-readable text from file */
 		*string,	/* Code/text from file */
 		*sptr,		/* Pointer into string */
-		*nameptr;	/* Pointer into name */
+		*nameptr,	/* Pointer into name */
+		*temp,		/* Temporary string pointer */
+		**tempfonts;	/* Temporary fonts pointer */
  float		order;		/* Order dependency number */
  ppd_section_t	section;	/* Order dependency section */
  ppd_profile_t	*profile;	/* Pointer to color profile */
@@ -473,7 +484,7 @@ ppdOpen(FILE *fp)		/* I - File to read from */
    return (NULL);
  }

-  DEBUG_printf(("ppdOpen: keyword = %s, string = %08x\n", keyword, string));
+  DEBUG_printf(("ppdOpen: keyword = %s, string = %p\n", keyword, string));

  safe_free(string);

@@ -487,7 +498,7 @@ ppdOpen(FILE *fp)		/* I - File to read from */
  ppd->language_level = 1;
  ppd->color_device   = 0;
  ppd->colorspace     = PPD_CS_GRAY;
-  ppd->landscape      = 90;
+  ppd->landscape      = -90;

 /*
  * Read lines from the PPD file and add them to the file record...
@@ -512,7 +523,7 @@ ppdOpen(FILE *fp)		/* I - File to read from */
    if (string != NULL)
    {
      if (strlen(string) > 40)
-        printf(", string = %08x", string);
+        printf(", string = %p", string);
      else
        printf(", string = \"%s\"", string);
    }
@@ -520,6 +531,21 @@ ppdOpen(FILE *fp)		/* I - File to read from */
    puts("");
 #endif /* DEBUG */

+    if (strcmp(keyword, "CloseUI") != 0 &&
+        strcmp(keyword, "JCLCloseUI") != 0 &&
+        strcmp(keyword, "CloseGroup") != 0 &&
+	strcmp(keyword, "CloseSubGroup") != 0 &&
+	strncmp(keyword, "Default", 7) != 0 &&
+	string == NULL)
+    {
+     /*
+      * Need a string value!
+      */
+
+      ppdClose(ppd);
+      return (NULL);
+    }
+
    if (strcmp(keyword, "LanguageLevel") == 0)
      ppd->language_level = atoi(string);
    else if (strcmp(keyword, "LanguageEncoding") == 0)
@@ -620,8 +646,8 @@ ppdOpen(FILE *fp)		/* I - File to read from */
      ppd->num_profiles ++;

      memset(profile, 0, sizeof(ppd_profile_t));
-      strncpy(profile->resolution, name, sizeof(profile->resolution) - 1);
-      strncpy(profile->media_type, text, sizeof(profile->media_type) - 1);
+      strlcpy(profile->resolution, name, sizeof(profile->resolution));
+      strlcpy(profile->media_type, text, sizeof(profile->media_type));
      sscanf(string, "%f%f%f%f%f%f%f%f%f%f%f", &(profile->density),
 	     &(profile->gamma),
 	     profile->matrix[0] + 0, profile->matrix[0] + 1,
@@ -637,6 +663,13 @@ ppdOpen(FILE *fp)		/* I - File to read from */
      else
        filter = realloc(ppd->filters, sizeof(char *) * (ppd->num_filters + 1));

+      if (filter == NULL)
+      {
+        safe_free(filter);
+	ppdClose(ppd);
+	return (NULL);
+      }
+
      ppd->filters     = filter;
      filter           += ppd->num_filters;
      ppd->num_filters ++;
@@ -657,17 +690,19 @@ ppdOpen(FILE *fp)		/* I - File to read from */
      */

      if (ppd->num_fonts == 0)
-        ppd->fonts = (char **)malloc(sizeof(char *));
+        tempfonts = (char **)malloc(sizeof(char *));
      else
-        ppd->fonts = (char **)realloc(ppd->fonts,
-	                              sizeof(char *) * (ppd->num_fonts + 1));
+        tempfonts = (char **)realloc(ppd->fonts,
+	                             sizeof(char *) * (ppd->num_fonts + 1));

-      if (ppd->fonts == NULL)
+      if (tempfonts == NULL)
      {
+        safe_free(string);
        ppdClose(ppd);
 	return (NULL);
      }
-        
+      
+      ppd->fonts                 = tempfonts;
      ppd->fonts[ppd->num_fonts] = strdup(name);
      ppd->num_fonts ++;
    }
@@ -716,8 +751,8 @@ ppdOpen(FILE *fp)		/* I - File to read from */
 	return (NULL);
      }

-      strncpy(choice->text, cupsLangString(language, CUPS_MSG_VARIABLE),
-              sizeof(choice->text) - 1);
+      strlcpy(choice->text, cupsLangString(language, CUPS_MSG_VARIABLE),
+              sizeof(choice->text));
      option = NULL;
    }
    else if (strcmp(keyword, "MaxMediaWidth") == 0)
@@ -786,8 +821,8 @@ ppdOpen(FILE *fp)		/* I - File to read from */
 	  return (NULL);
 	}

-	strncpy(choice->text, cupsLangString(language, CUPS_MSG_VARIABLE),
-        	sizeof(choice->text) - 1);
+	strlcpy(choice->text, cupsLangString(language, CUPS_MSG_VARIABLE),
+        	sizeof(choice->text));
 	option = NULL;
      }

@@ -815,7 +850,7 @@ ppdOpen(FILE *fp)		/* I - File to read from */
    {
      if (strcmp(string, "Minus90") == 0)
        ppd->landscape = -90;
-      else
+      else if (strcmp(string, "Plus90") == 0)
        ppd->landscape = 90;
    }
    else if (strcmp(keyword, "Emulators") == 0)
@@ -833,8 +868,11 @@ ppdOpen(FILE *fp)		/* I - File to read from */

      for (i = 0, sptr = string; i < count; i ++)
      {
-        for (nameptr = ppd->emulations[i].name; *sptr != '\0' && *sptr != ' ';)
-	  *nameptr ++ = *sptr ++;
+        for (nameptr = ppd->emulations[i].name;
+	     *sptr != '\0' && *sptr != ' ';
+	     sptr ++)
+	  if (nameptr < (ppd->emulations[i].name + sizeof(ppd->emulations[i].name) - 1))
+	    *nameptr++ = *sptr;

 	*nameptr = '\0';

@@ -873,8 +911,16 @@ ppdOpen(FILE *fp)		/* I - File to read from */
      }
      else
      {
-        ppd->patches = realloc(ppd->patches, strlen(ppd->patches) +
-	                                     strlen(string) + 1);
+        temp = realloc(ppd->patches, strlen(ppd->patches) +
+	                             strlen(string) + 1);
+        if (temp == NULL)
+	{
+	  safe_free(string);
+	  ppdClose(ppd);
+	  return (NULL);
+	}
+
+        ppd->patches = temp;

        strcpy(ppd->patches + strlen(ppd->patches), string);
      }
@@ -886,13 +932,13 @@ ppdOpen(FILE *fp)		/* I - File to read from */
      */

      if (name[0] == '*')
-        strcpy(name, name + 1);
+        strcpy(name, name + 1); /* Eliminate leading asterisk */

-      if (string == NULL)
-      {
-        ppdClose(ppd);
-	return (NULL);
-      }
+      for (i = strlen(name) - 1; i > 0 && isspace(name[i]); i --)
+        name[i] = '\0'; /* Eliminate trailing spaces */
+
+      DEBUG_printf(("OpenUI of %s in group %s...\n", name,
+                    group ? group->text : "(null)"));

      if (subgroup != NULL)
        option = ppd_get_option(subgroup, name);
@@ -921,6 +967,7 @@ ppdOpen(FILE *fp)		/* I - File to read from */
 	  return (NULL);
 	}

+        DEBUG_printf(("Adding to group %s...\n", group->text));
        option = ppd_get_option(group, name);
 	group  = NULL;
      }
@@ -947,28 +994,28 @@ ppdOpen(FILE *fp)		/* I - File to read from */

      if (text[0])
      {
-        strncpy(option->text, text, sizeof(option->text) - 1);
+        strlcpy(option->text, text, sizeof(option->text));
 	ppd_fix(option->text);
      }
      else
      {
        if (strcmp(name, "PageSize") == 0)
-	  strncpy(option->text, cupsLangString(language, CUPS_MSG_MEDIA_SIZE),
-                  sizeof(option->text) - 1);
+	  strlcpy(option->text, cupsLangString(language, CUPS_MSG_MEDIA_SIZE),
+                  sizeof(option->text));
 	else if (strcmp(name, "MediaType") == 0)
-	  strncpy(option->text, cupsLangString(language, CUPS_MSG_MEDIA_TYPE),
-                  sizeof(option->text) - 1);
+	  strlcpy(option->text, cupsLangString(language, CUPS_MSG_MEDIA_TYPE),
+                  sizeof(option->text));
 	else if (strcmp(name, "InputSlot") == 0)
-	  strncpy(option->text, cupsLangString(language, CUPS_MSG_MEDIA_SOURCE),
-                  sizeof(option->text) - 1);
+	  strlcpy(option->text, cupsLangString(language, CUPS_MSG_MEDIA_SOURCE),
+                  sizeof(option->text));
 	else if (strcmp(name, "ColorModel") == 0)
-	  strncpy(option->text, cupsLangString(language, CUPS_MSG_OUTPUT_MODE),
-                  sizeof(option->text) - 1);
+	  strlcpy(option->text, cupsLangString(language, CUPS_MSG_OUTPUT_MODE),
+                  sizeof(option->text));
 	else if (strcmp(name, "Resolution") == 0)
-	  strncpy(option->text, cupsLangString(language, CUPS_MSG_RESOLUTION),
-                  sizeof(option->text) - 1);
+	  strlcpy(option->text, cupsLangString(language, CUPS_MSG_RESOLUTION),
+                  sizeof(option->text));
        else
-	  strncpy(option->text, name, sizeof(option->text) - 1);
+	  strlcpy(option->text, name, sizeof(option->text));
      }

      option->section = PPD_ORDER_ANY;
@@ -1015,7 +1062,7 @@ ppdOpen(FILE *fp)		/* I - File to read from */
      else
        option->ui = PPD_UI_PICKONE;

-      strncpy(option->text, text, sizeof(option->text) - 1);
+      strlcpy(option->text, text, sizeof(option->text));

      option->section = PPD_ORDER_JCL;
      group = NULL;
@@ -1036,12 +1083,33 @@ ppdOpen(FILE *fp)		/* I - File to read from */
 	return (NULL);
      }

-      if (strchr(string, '/') != NULL)	/* Just show human readable text */
-        strcpy(string, strchr(string, '/') + 1);
+      if (strncasecmp(string, "InstallableOptions", 18) == 0)
+      {
+       /*
+        * Handle the InstallableOptions group differently than other
+	* groups; this is necessary so that UIs can correctly
+	* isolate them from normal user options.
+	*
+	* In CUPS 1.2 we have separate text and keyword fields,
+	* so this "hack" won't be needed...
+	*/

-      ppd_decode(string);
-      ppd_fix(string);
-      group = ppd_get_group(ppd, string);
+	group = ppd_get_group(ppd, "InstallableOptions");
+      }
+      else
+      {
+       /*
+        * For all other groups, just use the human readable text...
+        */
+
+	if (strchr(string, '/') != NULL)
+          strcpy(string, strchr(string, '/') + 1);
+
+	ppd_decode(string);
+	ppd_fix(string);
+
+	group = ppd_get_group(ppd, string);
+      }
    }
    else if (strcmp(keyword, "CloseGroup") == 0)
      group = NULL;
@@ -1124,13 +1192,13 @@ ppdOpen(FILE *fp)		/* I - File to read from */
          for (i = 0; i < temp->num_options; i ++)
 	    if (strcmp(keyword, temp->options[i].keyword) == 0)
 	    {
-	      strncpy(temp->options[i].defchoice, string,
-                      sizeof(temp->options[i].defchoice) - 1);
+	      strlcpy(temp->options[i].defchoice, string,
+                      sizeof(temp->options[i].defchoice));
 	      break;
 	    }
      }
-      else
-        strncpy(option->defchoice, string, sizeof(option->defchoice) - 1);
+      else if (strcmp(keyword + 7, option->keyword) == 0)
+        strlcpy(option->defchoice, string, sizeof(option->defchoice));
    }
    else if (strcmp(keyword, "UIConstraints") == 0 ||
             strcmp(keyword, "NonUIConstraints") == 0)
@@ -1163,6 +1231,11 @@ ppdOpen(FILE *fp)		/* I - File to read from */
 	    break;

 	case 2 : /* Two options... */
+	   /*
+	    * The following strcpy's are safe, as optionN and
+	    * choiceN are all the same size (size defined by PPD spec...)
+	    */
+
 	    if (constraint->option1[0] == '*')
 	      strcpy(constraint->option1, constraint->option1 + 1);

@@ -1176,6 +1249,11 @@ ppdOpen(FILE *fp)		/* I - File to read from */
 	    break;
 	    
 	case 3 : /* Two options, one choice... */
+	   /*
+	    * The following strcpy's are safe, as optionN and
+	    * choiceN are all the same size (size defined by PPD spec...)
+	    */
+
 	    if (constraint->option1[0] == '*')
 	      strcpy(constraint->option1, constraint->option1 + 1);

@@ -1205,18 +1283,45 @@ ppdOpen(FILE *fp)		/* I - File to read from */
    }
    else if (strcmp(keyword, "PaperDimension") == 0)
    {
-      if ((size = ppdPageSize(ppd, name)) != NULL)
-        sscanf(string, "%f%f", &(size->width), &(size->length));
+      if ((size = ppdPageSize(ppd, name)) == NULL)
+	size = ppd_add_size(ppd, name);
+
+      if (size == NULL)
+      {
+       /*
+        * Unable to add or find size!
+	*/
+
+        ppdClose(ppd);
+	safe_free(string);
+	return (NULL);
+      }
+
+      sscanf(string, "%f%f", &(size->width), &(size->length));
    }
    else if (strcmp(keyword, "ImageableArea") == 0)
    {
-      if ((size = ppdPageSize(ppd, name)) != NULL)
-	sscanf(string, "%f%f%f%f", &(size->left), &(size->bottom),
-	       &(size->right), &(size->top));
+      if ((size = ppdPageSize(ppd, name)) == NULL)
+	size = ppd_add_size(ppd, name);
+
+      if (size == NULL)
+      {
+       /*
+        * Unable to add or find size!
+	*/
+
+        ppdClose(ppd);
+	safe_free(string);
+	return (NULL);
+      }
+
+      sscanf(string, "%f%f%f%f", &(size->left), &(size->bottom),
+	     &(size->right), &(size->top));
    }
    else if (option != NULL &&
             (mask & (PPD_KEYWORD | PPD_OPTION | PPD_STRING)) ==
-	         (PPD_KEYWORD | PPD_OPTION | PPD_STRING))
+	         (PPD_KEYWORD | PPD_OPTION | PPD_STRING) &&
+	     strcmp(keyword, option->keyword) == 0)
    {
      DEBUG_printf(("group = %p, subgroup = %p\n", group, subgroup));

@@ -1226,7 +1331,8 @@ ppdOpen(FILE *fp)		/* I - File to read from */
        * Add a page size...
 	*/

-	ppd_add_size(ppd, name);
+        if (ppdPageSize(ppd, name) == NULL)
+	  ppd_add_size(ppd, name);
      }

     /*
@@ -1237,7 +1343,7 @@ ppdOpen(FILE *fp)		/* I - File to read from */

      if (mask & PPD_TEXT)
      {
-        strncpy(choice->text, text, sizeof(choice->text) - 1);
+        strlcpy(choice->text, text, sizeof(choice->text));
        ppd_fix(choice->text);
      }
      else if (strcmp(name, "True") == 0)
@@ -1245,9 +1351,9 @@ ppdOpen(FILE *fp)		/* I - File to read from */
      else if (strcmp(name, "False") == 0)
        strcpy(choice->text, "No");
      else
-        strncpy(choice->text, name, sizeof(choice->text) - 1);
+        strlcpy(choice->text, name, sizeof(choice->text));

-      if (strncmp(keyword, "JCL", 3) == 0)
+      if (option->section == PPD_ORDER_JCL)
        ppd_decode(string);		/* Decode quoted string */

      choice->code = string;
@@ -1259,9 +1365,34 @@ ppdOpen(FILE *fp)		/* I - File to read from */

 #ifdef DEBUG
  if (!feof(fp))
-    printf("Premature EOF at %d...\n", ftell(fp));
+    printf("Premature EOF at %lu...\n", (unsigned long)ftell(fp));
 #endif /* DEBUG */

+ /*
+  * Make sure that all PPD files with an InputSlot option have an
+  * "auto" choice that maps to no specific tray or media type.
+  */
+
+  if ((option = ppdFindOption(ppd, "InputSlot")) != NULL)
+  {
+    for (i = 0; i < option->num_choices; i ++)
+      if (option->choices[i].code == NULL || !option->choices[i].code[0])
+	break;
+
+    if (i >= option->num_choices)
+    {
+     /*
+      * No "auto" input slot, add one...
+      */
+
+      choice = ppd_add_choice(option, "Auto");
+
+      strlcpy(choice->text, cupsLangString(language, CUPS_MSG_AUTO),
+              sizeof(choice->text));
+      choice->code = NULL;
+    }
+  }
+
 /*
  * Set the option back-pointer for each choice...
  */
@@ -1390,7 +1521,7 @@ ppdOpenFile(const char *filename) /* I - File to read from */
 * 'compare_strings()' - Compare two strings.
 */

-int				/* O - Result of comparison */
+static int			/* O - Result of comparison */
 compare_strings(char *s,	/* I - First string */
                char *t)	/* I - Second string */
 {
@@ -1544,6 +1675,7 @@ ppd_read(FILE *fp,		/* I - File to read from */
 	 char **string)		/* O - Code/string data */
 {
  int		ch,		/* Character from file */
+		colon,		/* Colon seen? */
 		endquote,	/* Waiting for an end quote */
 		mask;		/* Mask to be returned */
  char		*keyptr,	/* Keyword pointer */
@@ -1576,6 +1708,7 @@ ppd_read(FILE *fp,		/* I - File to read from */

    lineptr  = line;
    endquote = 0;
+    colon    = 0;

    while ((ch = getc(fp)) != EOF &&
           (lineptr - line) < (sizeof(line) - 1))
@@ -1616,7 +1749,10 @@ ppd_read(FILE *fp,		/* I - File to read from */

 	*lineptr++ = ch;

-	if (ch == '\"')
+	if (ch == ':' && strncmp(line, "*%", 2) != 0)
+	  colon = 1;
+
+	if (ch == '\"' && colon)
        {
 	  endquote = !endquote;

@@ -1634,6 +1770,8 @@ ppd_read(FILE *fp,		/* I - File to read from */
 		ch = getc(fp);
 		if (ch != '\n')
 	          ungetc(ch, fp);
+
+		ch = '\n';
 		break;
 	      }

@@ -1688,6 +1826,8 @@ ppd_read(FILE *fp,		/* I - File to read from */

    *lineptr = '\0';

+/*    DEBUG_printf(("LINE = \"%s\"\n", line));*/
+
    if (ch == EOF && lineptr == line)
      return (0);

@@ -1706,7 +1846,8 @@ ppd_read(FILE *fp,		/* I - File to read from */
    if (line[0] != '*')			/* All lines start with an asterisk */
      continue;

-    if (strncmp(line, "*%", 2) == 0 ||	/* Comment line */
+    if (strcmp(line, "*") == 0 ||	/* (Bad) comment line */
+        strncmp(line, "*%", 2) == 0 ||	/* Comment line */
        strncmp(line, "*?", 2) == 0 ||	/* Query line */
        strcmp(line, "*End") == 0)	/* End of multi-line string */
      continue;
@@ -1717,31 +1858,40 @@ ppd_read(FILE *fp,		/* I - File to read from */

    keyptr = keyword;

-    while (*lineptr != '\0' && *lineptr != ':' && !isspace(*lineptr) &&
-	   (keyptr - keyword) < 40)
-      *keyptr++ = *lineptr++;
+    while (*lineptr != '\0' && *lineptr != ':' && !isspace(*lineptr))
+      if ((keyptr - keyword) < (PPD_MAX_NAME - 1))
+	*keyptr++ = *lineptr++;

    *keyptr = '\0';
+
+    if (strcmp(keyword, "End") == 0)
+      continue;
+
    mask |= PPD_KEYWORD;

-    if (*lineptr == ' ' || *lineptr == '\t')
+/*    DEBUG_printf(("keyword = \"%s\", lineptr = \"%s\"\n", keyword, lineptr));*/
+
+    if (isspace(*lineptr))
    {
     /*
      * Get an option name...
      */

-      while (*lineptr == ' ' || *lineptr == '\t')
+      while (isspace(*lineptr))
        lineptr ++;

      optptr = option;

      while (*lineptr != '\0' && *lineptr != '\n' && *lineptr != ':' &&
-             *lineptr != '/' && (optptr - option) < 40)
-	*optptr++ = *lineptr++;
+             *lineptr != '/')
+        if ((optptr - option) < (PPD_MAX_NAME - 1))
+	  *optptr++ = *lineptr++;

      *optptr = '\0';
      mask |= PPD_OPTION;

+/*      DEBUG_printf(("option = \"%s\", lineptr = \"%s\"\n", option, lineptr));*/
+
      if (*lineptr == '/')
      {
       /*
@@ -1752,15 +1902,17 @@ ppd_read(FILE *fp,		/* I - File to read from */
 	
 	textptr = text;

-	while (*lineptr != '\0' && *lineptr != '\n' && *lineptr != ':' &&
-               (textptr - text) < 80)
-	  *textptr++ = *lineptr++;
+	while (*lineptr != '\0' && *lineptr != '\n' && *lineptr != ':')
+	  if ((textptr - text) < (PPD_MAX_LINE - 1))
+	    *textptr++ = *lineptr++;

 	*textptr = '\0';
 	ppd_decode(text);

 	mask |= PPD_TEXT;
      }
+
+/*      DEBUG_printf(("text = \"%s\", lineptr = \"%s\"\n", text, lineptr));*/
    }

    if (*lineptr == ':')
@@ -1786,6 +1938,8 @@ ppd_read(FILE *fp,		/* I - File to read from */

      *strptr = '\0';

+/*      DEBUG_printf(("string = \"%s\", lineptr = \"%s\"\n", *string, lineptr));*/
+
      mask |= PPD_STRING;
    }
  }
@@ -4,7 +4,7 @@
 *   PostScript Printer Description definitions for the Common UNIX Printing
 *   System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2002 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
@@ -30,6 +30,8 @@
 *   (or any derivative of it) with software other than GNU
 *   GhostScript (or its derivatives) is governed by the CUPS license
 *   agreement.
+ *
+ *   This file is subject to the Apple OS-Developed Software exception.
 */

 #ifndef _CUPS_PPD_H_
@@ -58,6 +60,15 @@ extern "C" {
 #  define PPD_VERSION	4.3	/* Kept in sync with Adobe version number */


+/*
+ * PPD size limits (defined in Adobe spec)
+ */
+
+#  define PPD_MAX_NAME	41	/* Maximum size of name + 1 for nul */
+#  define PPD_MAX_TEXT	81	/* Maximum size of text + 1 for nul */
+#  define PPD_MAX_LINE	256	/* Maximum size of line + 1 for nul */
+
+
 /*
 * Types and structures...
 */
@@ -92,8 +103,10 @@ typedef enum			/**** Colorspaces ****/
 typedef struct			/**** Option choices ****/
 {
  char		marked,		/* 0 if not selected, 1 otherwise */
-		choice[41],	/* Computer-readable option name */
-		text[81],	/* Human-readable option name */
+		choice[PPD_MAX_NAME],
+				/* Computer-readable option name */
+		text[PPD_MAX_TEXT],
+				/* Human-readable option name */
 		*code;		/* Code to send for this option */
  void		*option;	/* Pointer to parent option structure */
 } ppd_choice_t;
@@ -101,9 +114,12 @@ typedef struct			/**** Option choices ****/
 typedef struct			/**** Options ****/
 {
  char		conflicted,	/* 0 if no conflicts exist, 1 otherwise */
-		keyword[41],	/* Option keyword name ("PageSize", etc.) */
-		defchoice[41],	/* Default option choice */
-		text[81];	/* Human-readable text */
+		keyword[PPD_MAX_NAME],
+				/* Option keyword name ("PageSize", etc.) */
+		defchoice[PPD_MAX_NAME],
+				/* Default option choice */
+		text[PPD_MAX_TEXT];
+				/* Human-readable text */
  ppd_ui_t	ui;		/* Type of UI option */
  ppd_section_t	section;	/* Section for command */
  float		order;		/* Order number */
@@ -113,7 +129,8 @@ typedef struct			/**** Options ****/

 typedef struct ppd_group_str	/**** Groups ****/
 {
-  char		text[81];	/* Human-readable group name */
+  char		text[PPD_MAX_TEXT];
+  				/* Human-readable group name */
  int		num_options;	/* Number of options */
  ppd_option_t	*options;	/* Options */
  int		num_subgroups;	/* Number of sub-groups */
@@ -123,16 +140,21 @@ typedef struct ppd_group_str	/**** Groups ****/

 typedef struct			/**** Constraints ****/
 {
-  char		option1[41],	/* First keyword */
-		choice1[41],	/* First option/choice (blank for all) */
-		option2[41],	/* Second keyword */
-		choice2[41];	/* Second option/choice (blank for all) */
+  char		option1[PPD_MAX_NAME],
+  				/* First keyword */
+		choice1[PPD_MAX_NAME],
+				/* First option/choice (blank for all) */
+		option2[PPD_MAX_NAME],
+				/* Second keyword */
+		choice2[PPD_MAX_NAME];
+				/* Second option/choice (blank for all) */
 } ppd_const_t;

 typedef struct			/**** Page Sizes ****/
 {
  int		marked;		/* Page size selected? */
-  char		name[41];	/* Media size option */
+  char		name[PPD_MAX_NAME];
+  				/* Media size option */
  float		width,		/* Width of media in points */
 		length,		/* Length of media in points */
 		left,		/* Left printable margin in points */
@@ -143,15 +165,18 @@ typedef struct			/**** Page Sizes ****/

 typedef struct			/**** Emulators ****/
 {
-  char		name[41],	/* Emulator name */
+  char		name[PPD_MAX_NAME],
+  				/* Emulator name */
 		*start,		/* Code to switch to this emulation */
 		*stop;		/* Code to stop this emulation */
 } ppd_emul_t;

 typedef struct			/**** sRGB Color Profiles ****/
 {
-  char		resolution[41],	/* Resolution or "-" */
-		media_type[41];	/* Media type of "-" */
+  char		resolution[PPD_MAX_NAME],
+  				/* Resolution or "-" */
+		media_type[PPD_MAX_NAME];
+				/* Media type of "-" */
  float		density,	/* Ink density to use */
 		gamma,		/* Gamma correction to use */
 		matrix[3][3];	/* Transform matrix */
@@ -214,6 +239,8 @@ extern int		ppdEmit(ppd_file_t *ppd, FILE *fp,
 			        ppd_section_t section);
 extern int		ppdEmitFd(ppd_file_t *ppd, int fd,
 			          ppd_section_t section);
+extern int		ppdEmitJCL(ppd_file_t *ppd, FILE *fp, int job_id,
+			           const char *user, const char *title);
 extern int		ppdIsMarked(ppd_file_t *ppd, const char *keyword,
 			            const char *option);
 extern void		ppdMarkDefaults(ppd_file_t *ppd);
@@ -3,7 +3,7 @@
 *
 *   snprintf functions for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products.
+ *   Copyright 1997-2002 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -21,10 +21,12 @@
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
 *
+ *   This file is subject to the Apple OS-Developed Software exception.
+ *
 * Contents:
 *
- *   vsnprintf() - Format a string into a fixed size buffer.
- *   snprintf()  - Format a string into a fixed size buffer.
+ *   cups_vsnprintf() - Format a string into a fixed size buffer.
+ *   cups_snprintf()  - Format a string into a fixed size buffer.
 */

 /*
@@ -38,28 +40,28 @@

 #ifndef HAVE_VSNPRINTF
 /*
- * 'vsnprintf()' - Format a string into a fixed size buffer.
+ * 'cups_vsnprintf()' - Format a string into a fixed size buffer.
 */

-int				/* O - Number of bytes formatted */
-vsnprintf(char       *buffer,	/* O - Output buffer */
-          size_t     bufsize,	/* O - Size of output buffer */
-	  const char *format,	/* I - printf-style format string */
-	  va_list    ap)	/* I - Pointer to additional arguments */
+int					/* O - Number of bytes formatted */
+cups_vsnprintf(char       *buffer,	/* O - Output buffer */
+               size_t     bufsize,	/* O - Size of output buffer */
+	       const char *format,	/* I - printf-style format string */
+	       va_list    ap)		/* I - Pointer to additional arguments */
 {
-  char		*bufptr,	/* Pointer to position in buffer */
-		*bufend,	/* Pointer to end of buffer */
-		sign,		/* Sign of format width */
-		size,		/* Size character (h, l, L) */
-		type;		/* Format type character */
-  const char	*bufformat;	/* Start of format */
-  int		width,		/* Width of field */
-		prec;		/* Number of characters of precision */
-  char		tformat[100],	/* Temporary format string for sprintf() */
-		temp[1024];	/* Buffer for formatted numbers */
-  int		*chars;		/* Pointer to integer for %p */
-  char		*s;		/* Pointer to string */
-  int		slen;		/* Length of string */
+  char		*bufptr,		/* Pointer to position in buffer */
+		*bufend,		/* Pointer to end of buffer */
+		sign,			/* Sign of format width */
+		size,			/* Size character (h, l, L) */
+		type;			/* Format type character */
+  const char	*bufformat;		/* Start of format */
+  int		width,			/* Width of field */
+		prec;			/* Number of characters of precision */
+  char		tformat[100],		/* Temporary format string for sprintf() */
+		temp[1024];		/* Buffer for formatted numbers */
+  int		*chars;			/* Pointer to integer for %p */
+  char		*s;			/* Pointer to string */
+  int		slen;			/* Length of string */


 /*
@@ -259,17 +261,17 @@ vsnprintf(char       *buffer,	/* O - Output buffer */

 #ifndef HAVE_SNPRINTF
 /*
- * 'snprintf()' - Format a string into a fixed size buffer.
+ * 'cups_snprintf()' - Format a string into a fixed size buffer.
 */

-int				/* O - Number of bytes formatted */
-snprintf(char       *buffer,	/* O - Output buffer */
-         size_t     bufsize,	/* O - Size of output buffer */
-         const char *format,	/* I - printf-style format string */
-	 ...)			/* I - Additional arguments as needed */
+int					/* O - Number of bytes formatted */
+cups_snprintf(char       *buffer,	/* O - Output buffer */
+              size_t     bufsize,	/* O - Size of output buffer */
+              const char *format,	/* I - printf-style format string */
+	      ...)			/* I - Additional arguments as needed */
 {
-  int		bytes;		/* Number of bytes formatted */
-  va_list 	ap;		/* Pointer to additional arguments */
+  int		bytes;			/* Number of bytes formatted */
+  va_list 	ap;			/* Pointer to additional arguments */


  va_start(ap, format);
@@ -3,7 +3,7 @@
 *
 *   String functions for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products.
+ *   Copyright 1997-2002 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -21,11 +21,15 @@
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
 *
+ *   This file is subject to the Apple OS-Developed Software exception.
+ *
 * Contents:
 *
- *   strdup()      - Duplicate a string.
- *   strcasecmp()  - Do a case-insensitive comparison.
- *   strncasecmp() - Do a case-insensitive comparison on up to N chars.
+ *   cups_strdup()      - Duplicate a string.
+ *   cups_strcasecmp()  - Do a case-insensitive comparison.
+ *   cups_strncasecmp() - Do a case-insensitive comparison on up to N chars.
+ *   cups_strlcat()     - Safely concatenate two strings.
+ *   cups_strlcpy()     - Safely copy two strings.
 */

 /*
@@ -36,14 +40,14 @@


 /*
- * 'strdup()' - Duplicate a string.
+ * 'cups_strdup()' - Duplicate a string.
 */

-#  ifndef HAVE_STRDUP
-char *			/* O - New string pointer */
-strdup(const char *s)	/* I - String to duplicate */
+#ifndef HAVE_STRDUP
+char 	*			/* O - New string pointer */
+cups_strdup(const char *s)	/* I - String to duplicate */
 {
-  char	*t;		/* New string pointer */
+  char	*t;			/* New string pointer */


  if (s == NULL)
@@ -54,17 +58,17 @@ strdup(const char *s)	/* I - String to duplicate */

  return (strcpy(t, s));
 }
-#  endif /* !HAVE_STRDUP */
+#endif /* !HAVE_STRDUP */


 /*
- * 'strcasecmp()' - Do a case-insensitive comparison.
+ * 'cups_strcasecmp()' - Do a case-insensitive comparison.
 */

-#  ifndef HAVE_STRCASECMP
+#ifndef HAVE_STRCASECMP
 int				/* O - Result of comparison (-1, 0, or 1) */
-strcasecmp(const char *s,	/* I - First string */
-           const char *t)	/* I - Second string */
+cups_strcasecmp(const char *s,	/* I - First string */
+                const char *t)	/* I - Second string */
 {
  while (*s != '\0' && *t != '\0')
  {
@@ -84,17 +88,17 @@ strcasecmp(const char *s,	/* I - First string */
  else
    return (-1);
 }
-#  endif /* !HAVE_STRCASECMP */
+#endif /* !HAVE_STRCASECMP */

 /*
- * 'strncasecmp()' - Do a case-insensitive comparison on up to N chars.
+ * 'cups_strncasecmp()' - Do a case-insensitive comparison on up to N chars.
 */

-#  ifndef HAVE_STRNCASECMP
+#ifndef HAVE_STRNCASECMP
 int				/* O - Result of comparison (-1, 0, or 1) */
-strncasecmp(const char *s,	/* I - First string */
-            const char *t,	/* I - Second string */
-	    size_t     n)	/* I - Maximum number of characters to compare */
+cups_strncasecmp(const char *s,	/* I - First string */
+                 const char *t,	/* I - Second string */
+		 size_t     n)	/* I - Maximum number of characters to compare */
 {
  while (*s != '\0' && *t != '\0' && n > 0)
  {
@@ -117,7 +121,88 @@ strncasecmp(const char *s,	/* I - First string */
  else
    return (-1);
 }
-#  endif /* !HAVE_STRNCASECMP */
+#endif /* !HAVE_STRNCASECMP */
+
+
+#ifndef HAVE_STRLCAT
+/*
+ * 'cups_strlcat()' - Safely concatenate two strings.
+ */
+
+size_t				/* O - Length of string */
+cups_strlcat(char       *dst,	/* O - Destination string */
+             const char *src,	/* I - Source string */
+	     size_t     size)	/* I - Size of destination string buffer */
+{
+  size_t	srclen;		/* Length of source string */
+  size_t	dstlen;		/* Length of destination string */
+
+
+ /*
+  * Figure out how much room is left...
+  */
+
+  dstlen = strlen(dst);
+  size   -= dstlen + 1;
+
+  if (!size)
+    return (dstlen);		/* No room, return immediately... */
+
+ /*
+  * Figure out how much room is needed...
+  */
+
+  srclen = strlen(src);
+
+ /*
+  * Copy the appropriate amount...
+  */
+
+  if (srclen > size)
+    srclen = size;
+
+  memcpy(dst + dstlen, src, srclen);
+  dst[dstlen + srclen] = '\0';
+
+  return (dstlen + srclen);
+}
+#endif /* !HAVE_STRLCAT */
+
+
+#ifndef HAVE_STRLCPY
+/*
+ * 'cups_strlcpy()' - Safely copy two strings.
+ */
+
+size_t				/* O - Length of string */
+cups_strlcpy(char       *dst,	/* O - Destination string */
+             const char *src,	/* I - Source string */
+	     size_t      size)	/* I - Size of destination string buffer */
+{
+  size_t	srclen;		/* Length of source string */
+
+
+ /*
+  * Figure out how much room is needed...
+  */
+
+  size --;
+
+  srclen = strlen(src);
+
+ /*
+  * Copy the appropriate amount...
+  */
+
+  if (srclen > size)
+    srclen = size;
+
+  memcpy(dst, src, srclen);
+  dst[srclen] = '\0';
+
+  return (srclen);
+}
+#endif /* !HAVE_STRLCPY */


 /*
@@ -3,7 +3,7 @@
 *
 *   String definitions for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products.
+ *   Copyright 1997-2002 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -20,6 +20,8 @@
 *       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_STRING_H_
@@ -29,10 +31,19 @@
 * Include necessary headers...
 */

+#  include <config.h>
+
 #  include <stdio.h>
 #  include <stdarg.h>
-#  include <config.h>
-#  include <string.h>
+#  include <ctype.h>
+
+#  ifdef HAVE_STRING_H
+#    include <string.h>
+#  endif /* HAVE_STRING_H */
+
+#  ifdef HAVE_STRINGS_H
+#    include <strings.h>
+#  endif /* HAVE_STRINGS_H */


 /*
@@ -59,23 +70,42 @@ extern "C" {
 */

 #  ifndef HAVE_STRDUP
-extern char	*strdup(const char *);
+extern char	*cups_strdup(const char *);
+#    define strdup cups_strdup
 #  endif /* !HAVE_STRDUP */

 #  ifndef HAVE_STRCASECMP
-extern int	strcasecmp(const char *, const char *);
+extern int	cups_strcasecmp(const char *, const char *);
+#    define strcasecmp cups_strcasecmp
 #  endif /* !HAVE_STRCASECMP */

 #  ifndef HAVE_STRNCASECMP
-extern int	strncasecmp(const char *, const char *, size_t n);
+extern int	cups_strncasecmp(const char *, const char *, size_t n);
+#    define strncasecmp cups_strncasecmp
 #  endif /* !HAVE_STRNCASECMP */

+#  ifndef HAVE_STRLCAT
+extern size_t cups_strlcat(char *, const char *, size_t);
+#    define strlcat cups_strlcat
+#  endif /* !HAVE_STRLCAT */
+
+#  ifndef HAVE_STRLCPY
+extern size_t cups_strlcpy(char *, const char *, size_t);
+#    define strlcpy cups_strlcpy
+#  endif /* !HAVE_STRLCPY */
+
 #  ifndef HAVE_SNPRINTF
-extern int	snprintf(char *, size_t, const char *, ...);
+extern int	cups_snprintf(char *, size_t, const char *, ...)
+#    ifdef __GNUC__
+__attribute__ ((__format__ (__printf__, 3, 4)))
+#    endif /* __GNUC__ */
+;
+#    define snprintf cups_snprintf
 #  endif /* !HAVE_SNPRINTF */

 #  ifndef HAVE_VSNPRINTF
-extern int	vsnprintf(char *, size_t, const char *, va_list);
+extern int	cups_vsnprintf(char *, size_t, const char *, va_list);
+#    define vsnprintf cups_vsnprintf
 #  endif /* !HAVE_VSNPRINTF */


@@ -0,0 +1,202 @@
+/*
+ * "$Id$"
+ *
+ *   Temp file utilities for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-2002 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:
+ *
+ *   cupsTempFd()   - Create a temporary file.
+ *   cupsTempFile() - Generate a temporary filename.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "cups.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__ */
+
+
+/*
+ * 'cupsTempFd()' - Create a temporary file.
+ */
+
+int					/* O - New file descriptor */
+cupsTempFd(char *filename,		/* I - Pointer to buffer */
+           int  len)			/* I - Size of buffer */
+{
+  int		fd;			/* File descriptor for temp file */
+#ifdef WIN32
+  char		tmpdir[1024];		/* Windows temporary directory */
+  DWORD		curtime;		/* Current time */
+#else
+  char		*tmpdir;		/* TMPDIR environment var */
+  struct timeval curtime;		/* Current time */
+#endif /* WIN32 */
+  static char	buf[1024] = "";		/* Buffer if you pass in NULL and 0 */
+
+
+ /*
+  * See if a filename was specified...
+  */
+
+  if (filename == NULL)
+  {
+    filename = buf;
+    len      = sizeof(buf);
+  }
+
+ /*
+  * See if TMPDIR is defined...
+  */
+
+#ifdef WIN32
+  GetTempPath(sizeof(tmpdir), tmpdir);
+#else
+  if ((tmpdir = getenv("TMPDIR")) == NULL)
+  {
+   /*
+    * Put root temp files in restricted temp directory...
+    */
+
+    if (getuid() == 0)
+      tmpdir = CUPS_REQUESTS "/tmp";
+    else
+      tmpdir = "/var/tmp";
+  }
+#endif /* WIN32 */
+
+ /*
+  * Make the temporary name using the specified directory...
+  */
+
+  do
+  {
+#ifdef WIN32
+   /*
+    * Get the current time of day...
+    */
+
+    curtime = GetTickCount();
+
+   /*
+    * Format a string using the hex time values...
+    */
+
+    snprintf(filename, len - 1, "%s/%08lx", tmpdir, curtime);
+#else
+   /*
+    * Get the current time of day...
+    */
+
+    gettimeofday(&curtime, NULL);
+
+   /*
+    * Format a string using the hex time values...
+    */
+
+    snprintf(filename, len - 1, "%s/%08lx%05lx", tmpdir,
+             (unsigned long)curtime.tv_sec, (unsigned long)curtime.tv_usec);
+#endif /* WIN32 */
+
+   /*
+    * Open the file in "exclusive" mode, making sure that we don't
+    * stomp on an existing file or someone's symlink crack...
+    */
+
+#ifdef O_NOFOLLOW
+    fd = open(filename, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW, 0600);
+#else
+    fd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600);
+#endif /* O_NOFOLLOW */
+
+    if (fd < 0 && (errno == EPERM || errno == ENOENT))
+      break; /* Stop immediately if permission denied or the dir doesn't exist! */
+  }
+  while (fd < 0);
+
+ /*
+  * Return the file descriptor...
+  */
+
+  return (fd);
+}
+
+
+/*
+ * 'cupsTempFile()' - Generate a temporary filename.
+ */
+
+char *					/* O - Filename */
+cupsTempFile(char *filename,		/* I - Pointer to buffer */
+             int  len)			/* I - Size of buffer */
+{
+  int		fd;			/* File descriptor for temp file */
+  static char	buf[1024] = "";		/* Buffer if you pass in NULL and 0 */
+
+
+ /*
+  * See if a filename was specified...
+  */
+
+  if (filename == NULL)
+  {
+    filename = buf;
+    len      = sizeof(buf);
+  }
+
+ /*
+  * Create the temporary file...
+  */
+
+  if ((fd = cupsTempFd(filename, len)) < 0)
+    return (NULL);
+
+ /*
+  * Close the temp file - it'll be reopened later as needed...
+  */
+
+  close(fd);
+
+ /*
+  * Return the temp filename...
+  */
+
+  return (filename);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -3,7 +3,7 @@
 *
 *   HTTP test program for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products.
+ *   Copyright 1997-2002 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -21,6 +21,8 @@
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
 *
+ *   This file is subject to the Apple OS-Developed Software exception.
+ *
 * Contents:
 *
 *   main() - Main entry.
@@ -45,25 +47,20 @@ main(int  argc,			/* I - Number of command-line arguments */
  int		i;		/* Looping var */
  http_t	*http;		/* HTTP connection */
  http_status_t	status;		/* Status of GET command */
-  char		buffer[1024];	/* Input buffer */
+  char		buffer[8192];	/* Input buffer */
  long		bytes;		/* Number of bytes read */
  FILE		*out;		/* Output file */
+  char		host[HTTP_MAX_URI],
+		method[HTTP_MAX_URI],
+		username[HTTP_MAX_URI],
+		resource[HTTP_MAX_URI];
+  int		port;
+  long		length, total;
+  time_t	start, current;

-#define HOST "dns.easysw.com"
-#define PORT 80

-  puts("Connecting to " HOST "...");
-
-  httpInitialize();
-  http = httpConnect(HOST, PORT);
-  if (http == NULL)
-  {
-    puts("Unable to connect to " HOST "!");
-    return (1);
-  }
-
-  puts("Connected to " HOST "...");

+  http = NULL;
  out = stdout;

  for (i = 1; i < argc; i ++)
@@ -75,22 +72,42 @@ main(int  argc,			/* I - Number of command-line arguments */
      continue;
    }

-    printf("Requesting file \"%s\"...\n", argv[i]);
+    httpSeparate(argv[i], method, username, host, &port, resource);
+
+    http = httpConnect(host, port);
+    if (http == NULL)
+    {
+      perror(host);
+      continue;
+    }
+    printf("Requesting file \"%s\"...\n", resource);
    httpClearFields(http);
    httpSetField(http, HTTP_FIELD_ACCEPT_LANGUAGE, "en");
-    httpGet(http, argv[i]);
-    status = httpUpdate(http);
+    httpGet(http, resource);
+    while ((status = httpUpdate(http)) == HTTP_CONTINUE);

    if (status == HTTP_OK)
      puts("GET OK:");
    else
      printf("GET failed with status %d...\n", status);

+
+    start = time(NULL);
+    length = atoi(httpGetField(http, HTTP_FIELD_CONTENT_LENGTH));
+    total  = 0;
+
    while ((bytes = httpRead(http, buffer, sizeof(buffer))) > 0)
    {
+      total += bytes;
      fwrite(buffer, bytes, 1, out);
      if (out != stdout)
-        printf("Read %ld bytes, %ld total...\n", bytes, ftell(out));
+      {
+        current = time(NULL);
+        if (current == start) current ++;
+        printf("\r%ld/%ld bytes (%ld bytes/sec)      ", total, length,
+               total / (current - start));
+        fflush(stdout);
+      }
    }
  }

@@ -0,0 +1,96 @@
+/*
+ * "$Id$"
+ *
+ *   HTTP test program for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-2002 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:
+ *
+ *   main() - Load the specified language and show the strings for yes and no.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include <stdio.h>
+#include "language.h"
+
+
+/*
+ * 'main()' - Load the specified language and show the strings for yes and no.
+ */
+
+int					/* O - Exit status */
+main(int  argc,				/* I - Number of command-line arguments */
+     char *argv[])			/* I - Command-line arguments */
+{
+  cups_lang_t		*language;	/* Message catalog */
+  static const char	*charsets[] =	/* Character sets */
+			{
+			  "us-ascii",
+			  "iso-8859-1",
+			  "iso-8859-2",
+			  "iso-8859-3",
+			  "iso-8859-4",
+			  "iso-8859-5",
+			  "iso-8859-6",
+			  "iso-8859-7",
+			  "iso-8859-8",
+			  "iso-8859-9",
+			  "iso-8859-10",
+			  "utf-8",
+			  "iso8859-13",
+			  "iso8859-14",
+			  "iso8859-15",
+			  "windows-874",
+			  "windows-1250",
+			  "windows-1251",
+			  "windows-1252",
+			  "windows-1253",
+			  "windows-1254",
+			  "windows-1255",
+			  "windows-1256",
+			  "windows-1257",
+			  "windows-1258",
+			  "koi8-r",
+			  "koi8-u"
+			};
+
+
+  if (argc == 1)
+    language = cupsLangDefault();
+  else
+    language = cupsLangGet(argv[1]);
+
+  printf("Language = \"%s\"\n", language->language);
+  printf("Encoding = \"%s\"\n", charsets[language->encoding]);
+  printf("No       = \"%s\"\n", cupsLangString(language, CUPS_MSG_NO));
+  printf("Yes      = \"%s\"\n", cupsLangString(language, CUPS_MSG_YES));
+
+  return (0);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -3,7 +3,7 @@
 *
 *   PPD test program for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2002 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,6 +23,8 @@
 *
 *   PostScript is a trademark of Adobe Systems, Inc.
 *
+ *   This file is subject to the Apple OS-Developed Software exception.
+ *
 * Contents:
 *
 *   main() - Main entry for test program.
@@ -45,7 +47,6 @@ main(int  argc,			/* I - Number of command-line arguments */
     char *argv[])		/* I - Command-line arguments */
 {
  int		i, j, k, m;	/* Looping vars */
-  const char	*filename;	/* File to load */
  ppd_file_t	*ppd;		/* PPD file record */
  ppd_size_t	*size;		/* Size record */
  ppd_group_t	*group;		/* UI group */
@@ -56,6 +57,8 @@ main(int  argc,			/* I - Number of command-line arguments */
                                "JCL", "PAGE", "PROLOG" };


+  setbuf(stdout, NULL);
+
 /*
  * Display PPD files for each file listed on the command-line...
  */
@@ -68,18 +71,13 @@ main(int  argc,			/* I - Number of command-line arguments */

  for (i = 1; i < argc; i ++)
  {
-    if (strstr(argv[i], ".ppd"))
-      filename = argv[i];
-    else
-      filename = cupsGetPPD(argv[i]);
-
-    if ((ppd = ppdOpenFile(filename)) == NULL)
+    if ((ppd = ppdOpenFile(argv[i])) == NULL)
    {
-      fprintf(stderr, "Unable to open \'%s\' as a PPD file!\n", filename);
+      fprintf(stderr, "Unable to open \'%s\' as a PPD file!\n", argv[i]);
      continue;
    }

-    printf("FILE: %s\n", filename);
+    printf("FILE: %s\n", argv[i]);
    printf("    language_level = %d\n", ppd->language_level);
    printf("    color_device = %s\n", ppd->color_device ? "TRUE" : "FALSE");
    printf("    variable_sizes = %s\n", ppd->variable_sizes ? "TRUE" : "FALSE");
@@ -118,7 +116,7 @@ main(int  argc,			/* I - Number of command-line arguments */
    printf("    nickname = %s\n", ppd->nickname);
    printf("    shortnickname = %s\n", ppd->shortnickname);
    printf("    patches = %d bytes\n",
-           ppd->patches == NULL ? 0 : strlen(ppd->patches));
+           ppd->patches == NULL ? 0 : (int)strlen(ppd->patches));

    printf("    num_groups = %d\n", ppd->num_groups);
    for (j = 0, group = ppd->groups; j < ppd->num_groups; j ++, group ++)
@@ -127,9 +125,10 @@ main(int  argc,			/* I - Number of command-line arguments */

      for (k = 0, option = group->options; k < group->num_options; k ++, option ++)
      {
-	printf("            options[%d] = %s (%s) %s %s %.0f\n", k,
+	printf("            options[%d] = %s (%s) %s %s %.0f (%d choices)\n", k,
 	       option->keyword, option->text, uis[option->ui],
-	       sections[option->section], option->order);
+	       sections[option->section], option->order,
+	       option->num_choices);

        if (strcmp(option->keyword, "PageSize") == 0 ||
            strcmp(option->keyword, "PageRegion") == 0)
--- a/Mostrar Mais
+++ b/Mostrar Mais