Import cups.org releases

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-1.0b2@4306 a1ca3aef-8c08-0410-bb20-df032aa958be
2013-05-10 18:56:23 +00:00
@@ -1,33 +0,0 @@
-config.cache
-config.h
-config.log
-config.status
-configure
-cups-config
-cups.list
-cups.sh
-make.log
-printpro.common
-printpro.version
-Makedefs
-aix-4.3-powerpc
-darwin-5.2-powerpc
-darwin-5.3-powerpc
-darwin-6.0-powerpc
-freebsd-4.5-intel
-hpux-10.20-hppa
-hpux-11.00-hppa
-irix-5.3-mips
-irix-6.5-mips
-linux-2.0-intel
-linux-2.2-intel
-linux-2.4-intel
-solaris-2.5-intel
-solaris-2.5-sparc
-solaris-2.7-intel
-solaris-2.7-sparc
-solaris-2.8-intel
-solaris-2.8-sparc
-solaris-2.9-intel
-solaris-2.9-sparc
-tru64-4.0-alpha
@@ -1,31 +0,0 @@
-CREDITS.txt - 12/12/2002
------------------------
-
-Few projects are completed by one person, and CUPS is no exception.  We'd
-like to thank the following individuals for their contributions:
-
-    Nathaniel Barbour   - Lots of testing and feedback.
-    N. Becker           - setsid().
-    Jean-Eric Cuendet   - GhostScript filters for CUPS.
-    Van Dang            - HTTP and IPP policeman.
-    L. Peter Deutsch    - MD5 code.
-    Dr. ZP Han          - setgid()/setuid().
-    Guy Harris          - *BSD shared libraries and lots of other fixes.
-    Wang Jian           - CUPS RPM corrections.
-    Roderick Johnstone  - Beta tester of the millenium.
-    Till Kamppeter      - Bug fixes, beta testing, evangelism.
-    Kiko                - Bug fixes.
-    Sergey V. Kovalyov  - ESP Print Pro and CUPS beta tester.
-    Mark Lawrence       - Microsoft interoperability testing.
-    Jeff Licquia        - Bug fixes, beta testing, evangelism.
-    Jason McMullan      - Original CUPS RPM distributions.
-    Wes Morgan          - *BSD fixes.
-    Ulrich Oldendorf    - German locale.
-    Giulio Orsero       - Bug fixes and testing.
-    Kurt Pfeifle        - Bug fixes, beta testing, evangelism.
-    Petter Reinholdtsen - HP-UX compiler stuff.
-    Stuart Stevens      - HP JetDirect IPP information.
-    Andrea Suatoni      - IRIX desktop integration and testing.
-
-If I've missed someone, please let me know by sending an email to
-"mike@easysw.com".
@@ -1,138 +0,0 @@
-ENCRYPTION - CUPS v1.1.7 - 02/21/2001
-------------------------------------
-
-This file describes the encryption support provided by CUPS.
-
-WARNING: CLIENTS CURRENTLY TRUST ALL CERTIFICATES FROM SERVERS. 
-This makes the CUPS client applications vulnerable to "man in
-the middle" attacks, so we don't recommend using this to do
-remote administration over WANs at this time.
-
-Future versions of CUPS will keep track of server certificates
-and provide a callback/confirmation interface for accepting new
-certificates and warning when a certificate has changed.
-
-
-LEGAL STUFF
-
-BEFORE USING THE ENCRYPTION SUPPORT, PLEASE VERIFY THAT IT IS
-LEGAL TO DO SO IN YOUR COUNTRY.  CUPS by itself doesn't include
-any encryption code, but it can link against the OpenSSL library
-which does.
-
-
-OVERVIEW OF ENCRYPTION SUPPORT IN CUPS
-
-CUPS supports SSL/2.0, SSL/3.0, and TLS/1.0 encryption using
-keys as large as 128-bits.  Encryption support is provided via
-the OpenSSL library and some new hooks in the CUPS code.
-
-CUPS provides support for dedicated (https) and "upgrade" (TLS)
-encryption of sessions.  The "HTTP Upgrade" method is described
-in RFC 2817; basically, the client can be secure or unsecure,
-and the client or server initiates an upgrade to a secure
-connection via some new HTTP fields and status codes.  The HTTP
-Upgrade method is new and no browsers we know of support it yet.
-Stick with "https" for web browsers.
-
-The current implementation is very basic.  The CUPS client
-software (lp, lpr, etc.) uses encryption as requested by the
-user or server.
-
-The user can specify the "-E" option with the printing commands
-to force encryption of the connection.  Encryption can also be
-specified using the Encryption directive in the client.conf file
-or in the CUPS_ENCRYPTION environment variable:
-
-    Never
-
-        Never do encryption.
-
-    Always
-
-        Always do SSL/TLS encryption using the https scheme.
-
-    IfRequested
-
-	Upgrade to TLS encryption if the server asks for it.
-	This is the default setting.
-
-    Required
-
-	Always upgrade to TLS encryption as soon as the
-	connection is made.  This is different than the "Always"
-	mode above since the connection is initially unsecure
-	and the client initiates the upgrade to TLS encryption.
-	(same as using the "-E" option)
-
-These keywords are also used in the cupsd.conf file to secure
-particular locations.  To secure all traffic on the server, listen
-on port 443 (https port) instead of port 631 and change the "ipp"
-service listing (or add it if you don't have one) in /etc/services
-to 443.  To provide both secure and normal methods, add a line
-reading:
-
-    SSLPort 443
-
-to /etc/cups/cupsd.conf.
-
-
-BEFORE YOU BEGIN
-
-You'll need the OpenSSL library from:
-
-    http://www.openssl.org
-
-
-CONFIGURING WITH ENCRYPTION SUPPORT
-
-Once you have the OpenSSL library installed, you'll need to
-configure CUPS to use it with the "--enable-ssl" option:
-
-    ./configure --enable-ssl
-
-If the OpenSSL stuff is not in a standard location, make sure to
-define the CFLAGS, CXXFLAGS, and LDFLAGS environment variables
-with the appropriate compiler and linker options first.
-
-
-GENERATING A SERVER CERTIFICATE AND KEY
-
-The following OpenSSL command will generate a server certificate
-and key that you can play with.  Since the certificate is not
-properly signed it will generate all kinds of warnings in
-Netscape and MSIE:
-
-    openssl req -new -x509 -keyout /etc/cups/ssl/server.key \
-        -out /etc/cups/ssl/server.crt -days 365 -nodes
-
-    chmod 600 /etc/cups/ssl/server.*
-
-The "-nodes" option prevents the certificate and key from being
-encrypted.  The cupsd process runs in the background, detached
-from any input source; if you encrypt these files then cupsd
-will not be able to load them!
-
-Send all rants about non-encrypted certificate and key files to
-/dev/null.  It makes sense to encrypt user files, but not for
-files used by system processes/daemons...
-
-
-REPORTING PROBLEMS
-
-If you have problems, READ THE DOCUMENTATION FIRST!  If the
-documentation does not solve your problems please send an email
-to "cups-support@cups.org".  Include your operating system and
-version, compiler and version, and any errors or problems you've
-run into. The "/var/log/cups/error_log" file should also be sent,
-as it often helps to determine the cause of your problem.
-
-If you are running a version of Linux, be sure to provide the
-Linux distribution you have, too.
-
-Please note that the "cups-support@cups.org" email address goes
-to the CUPS developers; they are busy people, so your email may
-go unanswered for days or weeks.  In general, only general build
-or distribution problems will actually get answered - for
-end-user support see the "README.txt" for a summary of the
-resources available.
@@ -1,190 +0,0 @@
-INSTALL - CUPS v1.1.17 - 12/02/2002
-----------------------------------
-
-This file describes how to compile and install CUPS from source
-code. For more information on CUPS see the file called
-"README.txt".  A complete change log can be found in
-"CHANGES.txt".
-
-**** IF YOU HAVE A NON-POSTSCRIPT PRINTER, YOU WILL ALSO  ****
-**** NEED TO INSTALL ESP GHOSTSCRIPT OR A PATCHED VERSION ****
-**** OF THE STANDARD GHOSTSCRIPT RELEASES.                ****
-
-
-BEFORE YOU BEGIN
-
-You'll need ANSI-compliant C and C++ compilers, plus a make
-program and Bourne shell.  The GNU compiler tools work well -
-we've tested the current CUPS code against GCC 2.95.x with
-excellent results.
-
-The makefiles used by the project should work with all versions
-of make.  We've tested them with GNU make as well as the make
-programs shipped by Compaq, HP, SGI, and Sun.  FreeBSD users
-should use GNU make (gmake).
-
-Besides these tools you'll want the following libraries:
-
-    - JPEG 6b or higher
-    - PNG 1.0.6 or higher
-    - TIFF 3.4 or higher
-    - ZLIB 1.1.3 or higher
-
-CUPS will compile and run without these, however you'll miss out on
-many of the features provided by CUPS.
-
-Also, please note that CUPS no longer includes the Ghostscript-
-based pstoraster filter.  You *must* download Ghostscript
-separately and patch it using the files in the pstoraster
-subdirectory, or download the ESP Ghostscript distribution from
-the CUPS web site. For more information see the README file in
-the pstoraster subdirectory.
-
-
-COMPILING FROM 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"
-script in the main CUPS source directory.  To configure CUPS for
-your system, type:
-
-    ./configure ENTER
-
-The default installation will put the CUPS software in the
-"/etc", "/usr", and "/var" directories on your system, which
-will overwrite any existing printing commands on your system.
-Use the "--prefix" option to install the CUPS software in
-another location:
-
-    ./configure --prefix=/some/directory ENTER
-
-If the PNG, JPEG, TIFF, and ZLIB libraries are not installed in
-a system default location (typically "/usr/include" and
-"/usr/lib") you'll need to set the CFLAGS, CXXFLAGS, DSOFLAGS,
-and LDFLAGS environment variables prior to running configure:
-
-    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
-
-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
-
-To enable support for encryption, you'll also want to add the
-"--enable-ssl" option:
-
-    ./configure --enable-ssl
-
-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, NetBSD, or OpenBSD type:
-
-    gmake ENTER
-
-to build the software.
-
-
-INSTALLING THE SOFTWARE
-
-Once you have built the software you need to install it.  The
-"install" target provides a quick way to install the software on
-your local system:
-
-    make install ENTER
-
-or for FreeBSD, NetBSD, or OpenBSD:
-
-    gmake install ENTER
-
-You can also build binary packages that can be installed on other
-machines using the RPM spec file ("cups.spec") or EPM list file
-("cups.list").  The latter also supports building of binary RPMs,
-so it may be more convenient to use - we use EPM to build all of
-our binary distributions.
-
-You can find the RPM software at:
-
-    http://www.rpm.org
-
-The EPM software is at:
-
-    http://www.easysw.com/epm/
-
-
-CREATING BINARY DISTRIBUTIONS WITH EPM
-
-The top level makefile supports generation of many types of binary
-distributions using EPM.  To build a binary distribution type:
-
-    make <format> ENTER
-
-or
-
-    gmake <format> ENTER
-
-for FreeBSD, NetBSD, and OpenBSD.  The <format> target is one of
-the following:
-
-    epm      - Builds a portable shell script and tar file based
-               distribution.  This format will also backup your
-	       existing printing system if you decide to remove
-	       CUPS at some future time.
-    aix      - Builds an AIX binary distribution.
-    bsd      - Builds a *BSD binary distribution.
-    deb      - Builds a Debian binary distribution.
-    depot    - Builds a HP-UX binary distribution.
-    pkg      - Builds a Solaris binary distribution.
-    rpm      - Builds a RPM binary distribution.
-    tardist  - Builds an IRIX binary distribution.
-
-
-REPORTING PROBLEMS
-
-If you have problems, READ THE DOCUMENTATION FIRST!  If the
-documentation does not solve your problems please send an email
-to "cups-support@cups.org".  Include your operating system and
-version, compiler and version, and any errors or problems you've
-run into. The "/var/log/cups/error_log" file should also be sent,
-as it often helps to determine the cause of your problem.
-
-If you are running a version of Linux, be sure to provide the
-Linux distribution you have, too.
-
-Please note that the "cups-support@cups.org" email address goes
-to the CUPS developers; they are busy people, so your email may
-go unanswered for days or weeks.  In general, only general build
-or distribution problems will actually get answered - for
-end-user support see the "README.txt" for a summary of the
-resources available.
@@ -3,7 +3,9 @@
 #
 #   Common makefile definitions for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+#   @configure_input@
+#
+#   Copyright 1997-1999 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
@@ -14,7 +16,7 @@
 #
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
-#       44141 Airport View Drive, Suite 204
+#       44145 Airport View Drive, Suite 204
 #       Hollywood, Maryland 20636-3111 USA
 #
 #       Voice: (301) 373-9603
@@ -28,51 +30,15 @@

 AR	=	@AR@
 AWK	=	@AWK@
-CC	=	@LIBTOOL@ @CC@
-CXX	=	@LIBTOOL@ @CXX@
-DSO	=	@DSO@
+CC	=	@CC@
+CP	=	@CP@
 HTMLDOC	=	@HTMLDOC@
-INSTALL	=	@INSTALL@
-LIBTOOL	=	@LIBTOOL@
 LN	=	/bin/ln -sf
-MV	=	@MV@
-NROFF	=	@NROFF@
+MKDIR	=	@MKDIR@ -p
+NROFF	=	@GROFF@ -T ascii
 RANLIB	=	@RANLIB@
 RM	=	@RM@ -f
-SED	=	@SED@
 SHELL	=	/bin/sh
-STRIP	=	@STRIP@
-
-#
-# Installation programs...
-#
-
-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...
-#
-
-LIBCUPS	=	@LIBCUPS@
-LIBCUPSIMAGE =	@LIBCUPSIMAGE@
-LIBJPEG	=	@LIBJPEG@
-LIBMALLOC =	@LIBMALLOC@
-LIBPNG	=	@LIBPNG@
-LIBSLP	=	@LIBSLP@
-LIBTIFF	=	@LIBTIFF@
-LIBZ	=	@LIBZ@

 #
 # Program options...
@@ -82,23 +48,13 @@ LIBZ	=	@LIBZ@
 #         extra debug info)
 #

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

 #
 # Directories...
@@ -129,55 +85,26 @@ srcdir		=	@srcdir@
 sysconfdir	=	@sysconfdir@
 top_srcdir	=	@top_srcdir@

-BUILDROOT	=	$(DSTROOT)
-
-AMANDIR		=	$(BUILDROOT)@AMANDIR@
-BINDIR		=	$(BUILDROOT)@bindir@
-DATADIR		=	$(BUILDROOT)@CUPS_DATADIR@
-DOCDIR		=	$(BUILDROOT)@CUPS_DOCROOT@
-INCLUDEDIR	=	$(BUILDROOT)$(includedir)
-INITDIR		=	@INITDIR@
-INITDDIR	=	@INITDDIR@
-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@
+BINDIR		=	@bindir@
+DATADIR		=	@CUPS_DATADIR@
+INCLUDEDIR	=	$(includedir)/cups
+LIBDIR		=	$(libdir)
+LOCALEDIR	= 	@CUPS_LOCALEDIR@
+MANDIR		=	@mandir@
+SBINDIR		=	@sbindir@
+SERVERROOT	= 	@CUPS_SERVERROOT@

 #
 # Rules...
 #

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

 #
 # End of "$Id$"
@@ -3,7 +3,7 @@
 #
 #   Top-level Makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+#   Copyright 1997-1999 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
@@ -14,7 +14,7 @@
 #
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
-#       44141 Airport View Drive, Suite 204
+#       44145 Airport View Drive, Suite 204
 #       Hollywood, Maryland 20636-3111 USA
 #
 #       Voice: (301) 373-9603
@@ -28,7 +28,7 @@ include Makedefs
 # Directories to make...
 #

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

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

 all:
-	chmod +x cups-config
 	for dir in $(DIRS); do\
-		echo Making all in $$dir... ;\
-		(cd $$dir ; $(MAKE) $(MFLAGS)) || exit 1;\
+		(cd $$dir; make);\
 	done

 #
@@ -48,122 +46,22 @@ all:

 clean:
 	for dir in $(DIRS); do\
-		echo Cleaning in $$dir... ;\
-		(cd $$dir; $(MAKE) $(MFLAGS) clean) || exit 1;\
+		(cd $$dir; make clean);\
 	done

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

-install:	installhdrs
+install:
 	for dir in $(DIRS); do\
-		echo Installing in $$dir... ;\
-		(cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\
+		(cd $$dir; make install);\
 	done
-	echo Installing in conf...
-	(cd conf; $(MAKE) $(MFLAGS) install)
-	echo Installing in data...
-	(cd data; $(MAKE) $(MFLAGS) install)
-	echo Installing in doc...
-	(cd doc; $(MAKE) $(MFLAGS) install)
-	echo Installing in fonts...
-	(cd fonts; $(MAKE) $(MFLAGS) install)
-	echo Installing in locale...
-	(cd locale; $(MAKE) $(MFLAGS) install)
-	echo Installing in ppd...
-	(cd ppd; $(MAKE) $(MFLAGS) install)
-	echo Installing in templates...
-	(cd templates; $(MAKE) $(MFLAGS) install)
-	echo Installing cups-config script...
-	$(INSTALL_DIR) $(BINDIR)
-	$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
-	echo Installing startup script...
-	if test "x$(INITDIR)" != "x"; then \
-		$(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/init.d; \
-		$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
-		$(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc0.d; \
-		$(INSTALL_SCRIPT) cups.sh  $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
-		$(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc2.d; \
-		$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
-		$(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc3.d; \
-		$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
-		$(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc5.d; \
-		$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
-	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
-
-aix:
-	epm $(EPMFLAGS) -f aix cups
-
-bsd:
-	epm $(EPMFLAGS) -f bsd cups
-
-epm:
-	epm $(EPMFLAGS) cups
-
-rpm:
-	epm $(EPMFLAGS) -f rpm cups
-
-deb:
-	epm $(EPMFLAGS) -f deb cups
-
-depot:
-	epm $(EPMFLAGS) -f depot cups
-
-pkg:
-	epm $(EPMFLAGS) -f pkg cups
-
-tardist:
-	epm $(EPMFLAGS) -f tardist cups
+	(cd conf; make install)
+	(cd data; make install)
+	(cd doc; make install)
+	(cd fonts; make install)
+	(cd ppd; make install)

 #
 # End of "$Id$".
@@ -0,0 +1,243 @@
+<HTML>
+<HEAD>
+	<TITLE>README - Common UNIX Printing System</TITLE>
+</HEAD>
+<BODY>
+
+<H1>README - CUPS v1.0b1</H1>
+
+<H2>Contents</H2>
+
+<UL>
+	<LI><A HREF="#intro">Introduction</A>
+	<LI><A HREF="#require">Requirements</A>
+	<LI><A HREF="#compile">Compiling CUPS</A>
+	<LI><A HREF="#config">Configuring the Software</A>
+	<LI><A HREF="#run">Running the Software</A>
+	<LI><A HREF="#use">Using the Software</A>
+	<LI><A HREF="#known">Known Problems</A>
+	<LI><A HREF="#report">Reporting Problems</A>
+	<LI><A HREF="#resources">Other Resources</A>
+	<LI><A HREF="#license">Legal Stuff</A>
+</UL>
+
+<H2><A NAME="intro">Introduction</A></H2>
+
+The Common UNIX Printing System provides a portable printing layer for 
+UNIX&reg; operating systems. It has been developed by Easy Software 
+Products to promote a standard printing solution for all UNIX vendors 
+and users. CUPS provides the System V and Berkeley command-line 
+interfaces. 
+
+<P>CUPS uses the Internet Printing Protocol (IETF-IPP) as the basis
+for  managing print jobs and queues. The Line Printer Daemon (LPD,
+RFC1179), Server Message Block (SMB), and AppSocket protocols are also
+supported with reduced functionality.
+
+<P>CUPS adds network printer browsing and PostScript Printer 
+Description (&quot;PPD&quot;)-based printing options to support real
+world applications under UNIX.
+
+<P>CUPS also includes a customized version of GNU GhostScript (currently
+based off GNU GhostScript 4.03) and an image file RIP that can be used to
+support non-PostScript printers.
+
+<H2><A NAME="require">Requirements</A></H2>
+
+You'll need an ANSI C compiler to build CUPS on your system. As its name
+implies, CUPS is designed to run on the UNIX operating system, however
+the CUPS interface library and most of the filters and backends supplied
+with CUPS should also run under Microsoft&reg; Windows&reg;.
+
+<P>For the image file filters you'll need the JPEG, PNG, TIFF, and ZLIB
+libraries.  CUPS will build without these, but with reduced functionality.
+
+<P>If you make changes to the man pages you'll need GNU groff or another
+nroff-like package.
+
+<P>The documentation is formatted using the HTMLDOC software (again, not
+needed unless you make changes.)
+
+<H2><A NAME="compile">Compiling CUPS</A></H2>
+
+CUPS uses GNU autoconf to configure the makefiles and source code for your
+system. To configure CUPS for your system type:
+
+<UL><PRE>
+% ./configure ENTER
+</PRE></UL>
+
+The default installation will put the CUPS software in the <CODE>/usr</CODE>
+and <CODE>/var</CODE> directories on your system, which will overwrite any
+existing printing commands on your system. To install the CUPS software in
+another location use the <CODE>--prefix</CODE> option:
+
+<UL><PRE>
+% ./configure --prefix=/usr/local ENTER
+</PRE></UL>
+
+Once you have configured things, just type:
+
+<UL><PRE>
+% make ENTER
+</PRE></UL>
+
+to build the software.
+
+<H2><A NAME="install">Installing the Software</A></H2>
+
+To install the software type:
+
+<UL><PRE>
+% make install ENTER
+</PRE></UL>
+
+<H2><A NAME="config">Configuring the Software</A></H2>
+
+Before you run CUPS for the first time you'll need to edit the CUPS
+configuration files which are normally located in /var/cups/conf.
+
+<UL>
+
+	The <CODE>cupsd.conf</CODE> file configures all of the
+	"global" server settings and access control. The default
+	settings are usually appropriate for most environments.
+
+	<P>The <CODE>printers.conf</CODE> file configures each printer
+	queue. You'll need to add a listing for each printer on your
+	system.
+
+	<P>The <CODE>classes.conf</CODE> file configures each printer
+	class. You'll need to add a listing for each printer class you
+	want.
+
+	<P>The <CODE>mime.types</CODE> file defines all of the
+	recognized file types. You don't normally have to edit this
+	file.
+
+	<P>The <CODE>mime.convs</CODE> file defines all of the file
+	conversion filters. You don't normally have to edit this file.
+
+</UL>
+
+In addition to the files in the /var/cups/conf directory, you'll also need
+to copy PPD files for each printer to the /var/cups/ppd directory.  If you
+don't have a PPD file for your printer, the drivers will still work, just
+with reduced functionality.
+
+<H2><A NAME="run">Running the Software</A></H2>
+
+Once you have configured the software you can start the CUPS daemon by
+typing:
+
+<UL><PRE>
+% /usr/sbin/cupsd &amp; ENTER
+</PRE></UL>
+
+<H2><A NAME="use">Using the Software</A></H2>
+
+Once you have installed the software, you can use the normal lp or lpr
+commands to print jobs. If you installed the software under /usr then
+you shouldn't have to reconfigure any applications to recognize the new
+printing system.
+
+<P>One of the advantages of CUPS is that you don't always have to send
+PostScript or Text files to your printers. If you have a JPEG file, you
+can just type "lp filename.jpg" and CUPS will handle converting it for
+you!
+
+<P>You can monitor the status of jobs via the lpstat command or with your
+web browser by pointing it at "http://localhost:631".
+
+<H2><A NAME="known">Known Problems</A></H2>
+
+The following known problems are being worked on and should be resolved for
+the second beta release of CUPS:
+
+<UL>
+
+	<LI>Documentation is not completed.
+
+	<LI>The lpadmin command is currently not provided.
+
+	<LI>The lpq command is currently not provided.
+
+	<LI>The lpc command currently only supports the help and status
+	commands.
+
+	<LI>While both GNU GhostScript and the CUPS image RIP are
+	provided, no sample raster printer driver is provided. The
+	final release of CUPS will include a PCL printer driver.
+
+	<LI>Automatic classing is currently not supported.
+
+	<LI>The CUPS server should disable core dumps by filters, backends,
+	and CGI programs.
+
+	<LI>The CUPS server should increase the FD limit to the maximum
+	allowed on the system.
+
+	<LI>The CUPS server should close stdin, stdout, and stderr and
+	run in the background ("daemon" mode...)
+
+	<LI>The class and job CGIs are currently not provided.
+
+</UL>
+
+CUPS has been built and tested on the following operating systems:
+
+<UL>
+	<LI>Digital UNIX 4.0d
+	<LI>HP-UX 10.20 and 11.0
+	<LI>IRIX 5.3, 6.2, 6.5.3
+	<LI>Linux (RedHat 5.2)
+	<LI>Solaris 2.5.1, 2.6, 2.7 (aka 7)
+</UL>
+
+The client libraries and filters have been successfully compiled under
+Microsoft Windows using Visual C++ 6.0.
+
+<H2><A NAME="report">Reporting Problems</A></H2>
+
+If you have problems, please send an email to
+<A HREF="mailto:cups-support@cups.org">cups-support@cups.org</A>.  Include
+your operating system and version, compiler and version, and any errors
+or problems you've run into.
+
+<H2><A NAME="resources">Other Resources</A></H2>
+
+See the CUPS web site at "http://www.cups.org" for other site links.
+
+<P>You can subscribe to the CUPS mailing list by sending a message containing
+"subscribe cups" to <A HREF="mailto:majordomo@cups.org">majordomo@cups.org</A>.
+This list is provided to discuss problems, questions, and improvements to
+the CUPS software. New releases of CUPS are announced to this list as well.
+
+<H2><A NAME="legal">Legal Stuff</A></H2>
+
+CUPS is Copyright 1993-1999 by Easy Software Products. CUPS, the CUPS logo,
+and the Common UNIX Printing System are the trademark property of Easy Software
+Products.
+
+<P>CUPS is provided under the terms of the
+<A HREF="LICENSE.html">Aladdin Free Public License</A>
+which is located in the files "LICENSE.html" and "LICENSE.txt". For commercial
+licensing information, please contact:
+
+<UL>
+	Attn: CUPS Licensing Information
+	<BR>Easy Software Products
+	<BR>44141 Airport View Drive, Suite 204
+	<BR>Hollywood, Maryland 20636-3111 USA
+
+	<P>Voice: +1.301.373.9603
+	<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>
+</UL>
+
+<P>If you're interested in a complete, commercial printing solution for UNIX,
+check out our ESP Print software at <A HREF="http://www.easysw.com/print.html">
+http://www.easysw.com/print.html</A>.
+
+</BODY>
+</HTML>
@@ -1,288 +1,192 @@
-README - CUPS v1.1.17 - 12/02/2002
----------------------------------
+README - CUPS v1.0b1

-Looking for compile instructions?  Read the file "INSTALL.txt"
-instead...
-
-**** IF YOU HAVE A NON-POSTSCRIPT PRINTER, YOU WILL ALSO  ****
-**** NEED TO INSTALL ESP GHOSTSCRIPT OR A PATCHED VERSION ****
-**** OF THE STANDARD GHOSTSCRIPT RELEASES.                ****
+CONTENTS

+   * Introduction
+   * Requirements
+   * Compiling CUPS
+   * Configuring the Software
+   * Running the Software
+   * Using the Software
+   * Known Problems
+   * Reporting Problems
+   * Other Resources
+   * Legal Stuff

 INTRODUCTION

-CUPS provides a portable printing layer for UNIX(r)-based
-operating systems.  It has been developed by Easy Software
-Products to promote a standard printing solution for all UNIX
-vendors and users.  CUPS provides the System V and Berkeley
-command-line interfaces.
+The Common UNIX Printing System provides a portable printing layer for UNIX®
+operating systems. It has been developed by Easy Software Products to
+promote a standard printing solution for all UNIX vendors and users. CUPS
+provides the System V and Berkeley command-line interfaces.

-CUPS uses the Internet Printing Protocol ("IPP") as the basis
-for managing print jobs and queues.  The Line Printer Daemon
-("LPD") Server Message Block ("SMB"), and AppSocket (a.k.a.
-JetDirect) protocols are also supported with reduced
-functionality.  CUPS adds network printer browsing and
-PostScript Printer Description ("PPD") based printing options to
-support real-world printing under UNIX.
+CUPS uses the Internet Printing Protocol (IETF-IPP) as the basis for
+managing print jobs and queues. The Line Printer Daemon (LPD, RFC1179),
+Server Message Block (SMB), and AppSocket protocols are also supported with
+reduced functionality.

-CUPS includes an image file RIP that supports printing of image
-files to non-PostScript printers.  A customized version of GNU
-Ghostscript 7.05 for CUPS called ESP Ghostscript is available
-separately to support printing of PostScript files within the
-CUPS driver framework.  Sample drivers for Dymo, EPSON, HP, and
-OKIDATA printers are included that use these filters.
+CUPS adds network printer browsing and PostScript Printer Description
+("PPD")-based printing options to support real world applications under
+UNIX.

-Drivers for thousands of printers are provided with our ESP
-Print Pro software, available at:
+CUPS also includes a customized version of GNU GhostScript (currently based
+off GNU GhostScript 4.03) and an image file RIP that can be used to support
+non-PostScript printers.

-	http://www.easysw.com/printpro
+REQUIREMENTS

-CUPS is licensed under the GNU General Public License and GNU
-Library General Public License.  Please contact Easy Software
-Products for commercial support and "binary distribution"
-rights.
+You'll need an ANSI C compiler to build CUPS on your system. As its name
+implies, CUPS is designed to run on the UNIX operating system, however the
+CUPS interface library and most of the filters and backends supplied with
+CUPS should also run under Microsoft® Windows®.

+For the image file filters you'll need the JPEG, PNG, TIFF, and ZLIB
+libraries. CUPS will build without these, but with reduced functionality.

-SYSTEM REQUIREMENTS
+If you make changes to the man pages you'll need GNU groff or another
+nroff-like package.

-Binary distributions require a minimum of 10MB of free disk
-space. We do not recommend using CUPS on a workstation with less
-than 32MB of RAM or a PC with less than 16MB of RAM.
+The documentation is formatted using the HTMLDOC software (again, not needed
+unless you make changes.)

-If you are installing from source you'll need ANSI-compliant C
-and C++ compilers and optionally one or more image file support
-libraries.  Complete source installation instructions can be
-found in the file "INSTALL.txt".
+COMPILING CUPS

+CUPS uses GNU autoconf to configure the makefiles and source code for your
+system. To configure CUPS for your system type:

-SOFTWARE REQUIREMENTS
+     % ./configure ENTER

-The following operating system software is required to install
-one of the binary distributions from Easy Software Products:
+The default installation will put the CUPS software in the /usr and /var
+directories on your system, which will overwrite any existing printing
+commands on your system. To install the CUPS software in another location
+use the --prefix option:

-    - AIX 4.3 or higher
-    - Compaq Tru64 UNIX (aka OSF1 aka Digital UNIX) 4.0 or higher
-    - HP-UX 10.20 or higher
-    - IRIX 5.3 or higher
-    - Linux 2.0 with glibc2 or higher
-    - Solaris 2.5 or higher (SPARC or Intel)
+     % ./configure --prefix=/usr/local ENTER

+Once you have configured things, just type:

-INSTALLING "PORTABLE" CUPS DISTRIBUTIONS
+     % make ENTER

-We are currently distributing "portable" CUPS binary
-distributions in TAR format with installation and removal
-scripts generated by our ESP Package Manager (EPM) software,
-which is available from:
+to build the software.

-    http://www.easysw.com/epm
+INSTALLING THE SOFTWARE

-WARNING: Installing CUPS will overwrite your existing printing
-system. Backup files are made by the installation script and
-restored by the removal script, so if you experience problems
-you should be able to remove the CUPS software to restore your
-previous configuration.  However, Easy Software Products makes
-no warranty for this and will not be liable for any lost
-revenues, etc.
+To install the software type:

-To install the CUPS software you will need to be logged in as
-root (doing an "su" is good enough).  Once you are the root
-user, run the installation script with:
+     % make install ENTER

-    ./cups.install ENTER
+CONFIGURING THE SOFTWARE

-After asking you a few yes/no questions the CUPS software will
-be installed and the scheduler will be started automatically.
+Before you run CUPS for the first time you'll need to edit the CUPS
+configuration files which are normally located in /var/cups/conf.

+     The cupsd.conf file configures all of the "global" server settings and
+     access control. The default settings are usually appropriate for most
+     environments.

-INSTALLING HOST-SPECIFIC (RPM, DEBIAN, ETC.) DISTRIBUTIONS
+     The printers.conf file configures each printer queue. You'll need to
+     add a listing for each printer on your system.

-The host-specific distributions use the operating system
-software installation tools.  To install a host-specific
-distribution please consult the CUPS Software Administrators
-Manual or your operating system documentation.
+     The classes.conf file configures each printer class. You'll need to add
+     a listing for each printer class you want.

+     The mime.types file defines all of the recognized file types. You don't
+     normally have to edit this file.

-READING THE DOCUMENTATION
+     The mime.convs file defines all of the file conversion filters. You
+     don't normally have to edit this file.

-Once you have installed the software you can access the
-documentation (and a bunch of other stuff) on-line at:
+In addition to the files in the /var/cups/conf directory, you'll also need
+to copy PPD files for each printer to the /var/cups/ppd directory. If you
+don't have a PPD file for your printer, the drivers will still work, just
+with reduced functionality.

-    http://localhost:631
+RUNNING THE SOFTWARE

-If you're having trouble getting that far, the documentation is
-located in the "/usr/share/doc/cups" directory in the binary
-distributions, and under the "doc" directory in the source
-archives.
+Once you have configured the software you can start the CUPS daemon by
+typing:

-Please read the documentation before asking questions.
+     % /usr/sbin/cupsd & ENTER

+USING THE SOFTWARE

-GETTING SUPPORT AND OTHER RESOURCES
+Once you have installed the software, you can use the normal lp or lpr
+commands to print jobs. If you installed the software under /usr then you
+shouldn't have to reconfigure any applications to recognize the new printing
+system.

-If you have problems, READ THE DOCUMENTATION FIRST!
+One of the advantages of CUPS is that you don't always have to send
+PostScript or Text files to your printers. If you have a JPEG file, you can
+just type "lp filename.jpg" and CUPS will handle converting it for you!

-You can subscribe to the CUPS mailing list by sending a message
-containing "subscribe cups" to majordomo@cups.org.  This list is
-provided to discuss problems, questions, and improvements to the
-CUPS software.  New releases of CUPS are announced to this list
-as well.
+You can monitor the status of jobs via the lpstat command or with your web
+browser by pointing it at "http://localhost:631".

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

-    http://www.easysw.com/cups
+The following known problems are being worked on and should be resolved for
+the second beta release of CUPS:

-See the CUPS web site at "http://www.cups.org" for other site
-links.
+   * Documentation is not completed.
+   * The lpadmin command is currently not provided.
+   * The lpq command is currently not provided.
+   * The lpc command currently only supports the help and status commands.
+   * While both GNU GhostScript and the CUPS image RIP are provided, no
+     sample raster printer driver is provided. The final release of CUPS
+     will include a PCL printer driver.
+   * Automatic classing is currently not supported.
+   * The CUPS server should disable core dumps by filters, backends, and CGI
+     programs.
+   * The CUPS server should increase the FD limit to the maximum allowed on
+     the system.
+   * The CUPS server should close stdin, stdout, and stderr and run in the
+     background ("daemon" mode...)
+   * The class and job CGIs are currently not provided.

+CUPS has been built and tested on the following operating systems:

-SETTING UP PRINTER QUEUES USING YOUR WEB BROWSER
+   * Digital UNIX 4.0d
+   * HP-UX 10.20 and 11.0
+   * IRIX 5.3, 6.2, 6.5.3
+   * Linux (RedHat 5.2)
+   * Solaris 2.5.1, 2.6, 2.7 (aka 7)

-CUPS 1.1 includes a new web-based administration tool that
-allows you to manage printers, classes, and jobs on your
-server.  To access the printer administration tools open the
-following URL in your browser:
+The client libraries and filters have been successfully compiled under
+Microsoft Windows using Visual C++ 6.0.

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

-You will be asked for the administration password (root or any
-other user in the sys/system/root group on your system) and then
-shown a menu of available functions.
+If you have problems, please send an email to cups-support@cups.org. Include
+your operating system and version, compiler and version, and any errors or
+problems you've run into.

-DO NOT use the hostname for your machine - it will not work with
-the default CUPS configuration.  To enable administration access
-on other addresses, consult the CUPS Software Administrators
-Manual.
+OTHER RESOURCES

+See the CUPS web site at "http://www.cups.org" for other site links.

-SETTING UP PRINTER QUEUES FROM THE COMMAND-LINE
-
-CUPS works best with PPD (PostScript Printer Description)
-files.  In a pinch you can also use System V style printer
-interface scripts.
-
-Six sample PPD files are provided with this distribution that
-utilize the PostScript and image file RIPs and the sample EPSON
-and HP printer drivers.  To add the sample DeskJet driver to the
-system for a printer connected to the parallel port, use one of
-the following commands:
-
-    Digital UNIX:
-
-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/lp0 -E
-
-    HP-UX:
-
-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/c2t0d0_lp -E
-
-    IRIX:
-
-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/plp -E
-
-    Linux:
-
-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/lp0 -E
-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/lp1 -E
-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/lp2 -E
-
-    Solaris:
-
-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/bpp0 -E
-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/ecpp0 -E
-
-Similarly, for the other sample drivers you can use:
-
-    Driver                         PPD File
-    -----------------------------  ------------
-    Dymo Label Printers            dymo.ppd
-    EPSON Stylus Color Series      stcolor.ppd
-    EPSON Stylus Photo Series      stphoto.ppd
-    EPSON Stylus New Color Series  stcolor2.ppd
-    EPSON Stylus New Photo Series  stphoto2.ppd
-    EPSON 9-pin Series             epson9.ppd
-    EPSON 24-pin Series            epson24.ppd
-    HP DeskJet Series              deskjet.ppd
-    HP New DeskJet Series          deskjet2.ppd
-    HP LaserJet Series             laserjet.ppd
-    OKIDATA 9-Pin Series           okidata9.ppd
-    OKIDATA 24-Pin Series          okidat24.ppd
-
-These sample drivers provide basic printing capabilities, but
-generally do not exercise the full potential of the printers or
-CUPS.  For commercial printer drivers check out our ESP Print
-Pro software at:
-
-    http://www.easysw.com/printpro
-
-
-PRINTING FILES
-
-CUPS provides both the System V "lp" and Berkeley "lpr" commands
-for printing:
-
-    lp filename
-    lpr filename
-
-Both the "lp" and "lpr" commands support printing options for
-the driver:
-
-    lp -omedia=A4 -oresolution=600dpi filename
-    lpr -omedia=A4 -oresolution=600dpi filename
-
-CUPS recognizes many types of images files as well as PDF,
-PostScript, HP-GL/2, and text files, so you can print those
-files directly rather than through an application.
-
-If you have an application that generates output specifically
-for your printer then you need to use the "-oraw" or "-l"
-options:
-
-    lp -oraw filename
-    lpr -l filename
-
-This will prevent the filters from misinterpreting your print
-file.
-
+You can subscribe to the CUPS mailing list by sending a message containing
+"subscribe cups" to majordomo@cups.org. This list is provided to discuss
+problems, questions, and improvements to the CUPS software. New releases of
+CUPS are announced to this list as well.

 LEGAL STUFF

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

-The MD5 Digest code is Copyright 1999 Aladdin Enterprises.
+CUPS is provided under the terms of the Aladdin Free Public License which is
+located in the files "LICENSE.html" and "LICENSE.txt". For commercial
+licensing information, please contact:

-The PostScript RIP software (pstoraster) is based on the GNU
-Ghostscript 5.50 core, Copyright 1986-1998 by Aladdin
-Enterprises.
+     Attn: CUPS Licensing Information
+     Easy Software Products
+     44141 Airport View Drive, Suite 204
+     Hollywood, Maryland 20636-3111 USA

-The PDF filter (pdftops) is based on the Xpdf 1.01 software,
-Copyright 1996-2002 by Derek B. Noonburg.
+     Voice: +1.301.373.9603
+     Email: cups-info@cups.org
+     WWW: http://www.cups.org

-This software is based in part on the work of the Independent
-JPEG Group.
-
-CUPS is provided under the terms of the GNU General Public
-License and GNU Library General Public License. This program is
-distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE.  See the "LICENSE.html",
-"LICENSE.txt", or "cups.license" files for more information.
-
-For commercial licensing information, please contact:
-
-    Attn: CUPS Licensing Information
-    Easy Software Products
-    44141 Airport View Drive, Suite 204
-    Hollywood, Maryland 20636-3111 USA
-
-    Voice: +1.301.373.9600
-    Email: cups-info@cups.org
-    WWW: http://www.cups.org
-
-Note that commercial licensors may also require a license from
-Artifex Software Inc. which handles commercial licensing of the
-Ghostscript software, and from Derek B. Noonburg who developed
-the Xpdf software used to print PDF files.
+If you're interested in a complete, commercial printing solution for UNIX,
+check out our ESP Print software at http://www.easysw.com/print.html.
@@ -1,7 +0,0 @@
-ipp
-lpd
-usb
-parallel
-betest
-serial
-socket
@@ -1,15 +0,0 @@
-# DO NOT DELETE
-
-betest.o: ../cups/string.h ../config.h
-ipp.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-ipp.o: ../cups/ppd.h ../cups/language.h ../cups/string.h ../config.h
-lpd.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-lpd.o: ../cups/ppd.h ../cups/string.h ../config.h
-parallel.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-parallel.o: ../cups/ppd.h ../cups/string.h ../config.h
-serial.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-serial.o: ../cups/ppd.h ../cups/string.h ../config.h
-socket.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-socket.o: ../cups/ppd.h ../cups/string.h ../config.h
-usb.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-usb.o: ../cups/ppd.h ../cups/string.h ../config.h
@@ -3,7 +3,7 @@
 #
 #   Backend makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+#   Copyright 1997-1999 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
@@ -14,22 +14,18 @@
 #
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
-#       44141 Airport View Drive, Suite 204
+#       44145 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.
-#

 include ../Makedefs

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

 #
 # Make all targets...
@@ -37,118 +33,65 @@ OBJS	=	betest.o ipp.o lpd.o parallel.o scsi.o serial.o socket.o usb.o

 all:	$(TARGETS)

-
 #
 # Clean all object files...
 #

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

 #
 # Install all targets...
 #

-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
-
-
-#
-# betest
-#
-
-betest:	betest.o ../cups/$(LIBCUPS)
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o betest betest.o $(LIBS)
-
-
-#
-# ipp
-#
-
-ipp:	ipp.o ../cups/$(LIBCUPS)
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o ipp ipp.o $(LIBS)
-	$(RM) http
-	$(LN) ipp http
-
+install:
+	-$(MKDIR) $(SERVERROOT)/backend
+	$(CP) $(TARGETS) $(SERVERROOT)/backend

 #
 # lpd
 #

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

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

 #
 # parallel
 #

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

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

 #
 # serial
 #

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

+serial.o:	../cups/cups.h ../Makedefs
+
+#
+# smb
+#
+
+smb:	smb.o ../cups/libcups.a
+	$(CC) $(LDFLAGS) -o smb smb.o $(LIBS)
+
+smb.o:	../cups/cups.h ../Makedefs

 #
 # socket
 #

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

-
-#
-# usb
-#
-
-usb:	usb.o ../cups/$(LIBCUPS)
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o usb usb.o $(BACKLIBS) $(LIBS)
-
-
-#
-# Dependencies...
-#
-
-include Dependencies
-
+socket.o:	../cups/cups.h ../Makedefs

 #
 # End of "$Id$".
@@ -1,87 +0,0 @@
-/*
- * "$Id$"
- *
- *   Backend test program for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 1997-2003 by Easy Software Products, all rights reserved.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   main() - Run the named backend.
- */
-
-/*
- * Include necessary headers.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <cups/string.h>
-#include <unistd.h>
-
-
-/*
- * 'main()' - Run the named backend.
- *
- * Usage:
- *
- *    betest device-uri job-id user title copies options [file]
- */
-
-int			/* O - Exit status */
-main(int  argc,		/* I - Number of command-line arguments (7 or 8) */
-     char *argv[])	/* I - Command-line arguments */
-{
-  char		backend[255];	/* Method in URI */
-
-
-  if (argc < 7 || argc > 8)
-  {
-    fputs("Usage: betest device-uri job-id user title copies options [file]\n",
-          stderr);
-    return (1);
-  }
-
- /*
-  * Extract the method from the device-uri - that's the program we want to
-  * execute.
-  */
-
-  if (sscanf(argv[1], "%254[^:]", backend) != 1)
-  {
-    fputs("betest: Bad device-uri - no colon!\n", stderr);
-    return (1);
-  }
-
- /*
-  * Execute and return
-  */
-
-  execl(backend, argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7],
-        NULL);
-
-  return (1);
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -1,906 +0,0 @@
-/*
- * "$Id$"
- *
- *   IPP backend for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 1997-2003 by Easy Software Products, all rights reserved.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   main()                 - Send a file to the printer or server.
- *   password_cb()          - Disable the password prompt for
- *                            cupsDoFileRequest().
- *   report_printer_state() - Report the printer state.
- */
-
-/*
- * Include necessary headers.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <cups/cups.h>
-#include <cups/language.h>
-#include <cups/string.h>
-#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.
- *
- * 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 */
-{
-  int		i;		/* Looping var */
-  int		num_options;	/* Number of printer options */
-  cups_option_t	*options;	/* Printer options */
-  char		method[255],	/* Method in URI */
-		hostname[1024],	/* Hostname */
-		username[255],	/* Username info */
-		resource[1024],	/* Resource info (printer name) */
-		filename[1024];	/* File to print */
-  int		port;		/* Port number (not used) */
-  char		uri[HTTP_MAX_URI];/* Updated URI without user/pass */
-  ipp_status_t	ipp_status;	/* Status of IPP request */
-  http_t	*http;		/* HTTP connection */
-  ipp_t		*request,	/* IPP request */
-		*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 */
-  ipp_attribute_t *printer_state;
-  				/* printer-state attribute */
-  ipp_attribute_t *printer_accepting;
-  				/* printer-is-accepting-jobs attribute */
-  const char	*charset;	/* Character set to use */
-  cups_lang_t	*language;	/* Default language */
-  int		copies;		/* Number of copies remaining */
-  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);
-
- /*
-  * Ignore SIGPIPE signals...
-  */
-
-#ifdef HAVE_SIGSET
-  sigset(SIGPIPE, SIG_IGN);
-#elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
-  action.sa_handler = SIG_IGN;
-  sigaction(SIGPIPE, &action, NULL);
-#else
-  signal(SIGPIPE, SIG_IGN);
-#endif /* HAVE_SIGSET */
-
- /*
-  * Check command-line...
-  */
-
-  if (argc == 1)
-  {
-    char *s;
-
-    if ((s = strrchr(argv[0], '/')) != NULL)
-      s ++;
-    else
-      s = argv[0];
-
-    printf("network %s \"Unknown\" \"Internet Printing Protocol (%s)\"\n", s, s);
-    return (0);
-  }
-  else if (argc < 6 || argc > 7)
-  {
-    fprintf(stderr, "Usage: %s job-id user title copies options [file]\n",
-            argv[0]);
-    return (1);
-  }
-
- /*
-  * If we have 7 arguments, print the file named on the command-line.
-  * Otherwise, copy stdin to a temporary file and print the temporary
-  * file.
-  */
-
-  if (argc == 6)
-  {
-   /*
-    * Copy stdin to a temporary file...
-    */
-
-    int  fd;		/* Temporary file */
-    char buffer[8192];	/* Buffer for copying */
-    int  bytes;		/* Number of bytes read */
-
-
-    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 (write(fd, buffer, bytes) < bytes)
-      {
-        perror("ERROR: unable to write to temporary file");
-	close(fd);
-	unlink(filename);
-	return (1);
-      }
-
-    close(fd);
-  }
-  else
-    strlcpy(filename, argv[6], sizeof(filename));
-
- /*
-  * Extract the hostname and printer name from the URI...
-  */
-
-  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 on port %d...\n", hostname, port);
-
-    if ((http = httpConnectEncrypt(hostname, port, cupsEncryption())) == NULL)
-    {
-      if (getenv("CLASS") != NULL)
-      {
-       /*
-        * If the CLASS environment variable is set, the job was submitted
-	* to a class and not to a specific queue.  In this case, we want
-	* to abort immediately so that the job can be requeued on the next
-	* available printer in the class.
-	*/
-
-        fprintf(stderr, "INFO: Unable to queue job on %s, queuing on next printer in class...\n",
-	        hostname);
-
-        if (argc == 6)
-	  unlink(filename);
-
-       /*
-        * Sleep 5 seconds to keep the job from requeuing too rapidly...
-	*/
-
-	sleep(5);
-
-        return (1);
-      }
-
-      if (errno == ECONNREFUSED || errno == EHOSTDOWN ||
-          errno == EHOSTUNREACH)
-      {
-	fprintf(stderr, "INFO: Network host \'%s\' is busy; will retry in 30 seconds...",
-                hostname);
-	sleep(30);
-      }
-      else
-      {
-	perror("ERROR: Unable to connect to IPP host");
-	sleep(30);
-      }
-    }
-  }
-  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
-  * might contain username:password information...
-  */
-
-  snprintf(uri, sizeof(uri), "%s://%s:%d%s", method, hostname, port, resource);
-
- /*
-  * First validate the destination and see if the device supports multiple
-  * copies.  We have to do this because some IPP servers (e.g. HP JetDirect)
-  * don't support the copies attribute...
-  */
-
-  language    = cupsLangDefault();
-  charset_sup = NULL;
-  copies_sup  = NULL;
-  format_sup  = NULL;
-  version     = 1;
-  supported   = NULL;
-
-  do
-  {
-   /*
-    * Build the IPP request...
-    */
-
-    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, "utf-8");
-
-    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);
-
-   /*
-    * Do the request...
-    */
-
-    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)
-    {
-      if (ipp_status == IPP_PRINTER_BUSY ||
-	  ipp_status == IPP_SERVICE_UNAVAILABLE)
-      {
-	fputs("INFO: Printer busy; will retry in 10 seconds...\n", stderr);
-        report_printer_state(supported);
-	sleep(10);
-      }
-      else if ((ipp_status == IPP_BAD_REQUEST ||
-	        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);
-      }
-      else
-	fprintf(stderr, "ERROR: Unable to get printer status (%s)!\n",
-	        ippErrorString(ipp_status));
-
-      if (supported)
-        ippDelete(supported);
-
-      continue;
-    }
-    else if ((copies_sup = ippFindAttribute(supported, "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(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);
-
- /*
-  * See if the printer is accepting jobs and is not stopped; if either
-  * condition is true and we are printing to a class, requeue the job...
-  */
-
-  if (getenv("CLASS") != NULL)
-  {
-    printer_state     = ippFindAttribute(supported, "printer-state",
-                                	 IPP_TAG_ENUM);
-    printer_accepting = ippFindAttribute(supported, "printer-is-accepting-jobs",
-                                	 IPP_TAG_BOOLEAN);
-
-    if (printer_state == NULL ||
-	printer_state->values[0].integer > IPP_PRINTER_PROCESSING ||
-	printer_accepting == NULL ||
-	!printer_accepting->values[0].boolean)
-    {
-     /*
-      * If the CLASS environment variable is set, the job was submitted
-      * to a class and not to a specific queue.  In this case, we want
-      * to abort immediately so that the job can be requeued on the next
-      * available printer in the class.
-      */
-
-      fprintf(stderr, "INFO: Unable to queue job on %s, queuing on next printer in class...\n",
-	      hostname);
-
-      ippDelete(supported);
-      httpClose(http);
-
-      if (argc == 6)
-	unlink(filename);
-
-     /*
-      * Sleep 5 seconds to keep the job from requeuing too rapidly...
-      */
-
-      sleep(5);
-
-      return (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 (argc < 7)
-  {
-#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-    sigset(SIGTERM, SIG_IGN);
-#elif defined(HAVE_SIGACTION)
-    memset(&action, 0, sizeof(action));
-
-    sigemptyset(&action.sa_mask);
-    action.sa_handler = SIG_IGN;
-    sigaction(SIGTERM, &action, NULL);
-#else
-    signal(SIGTERM, SIG_IGN);
-#endif /* HAVE_SIGSET */
-  }
-
- /*
-  * See if the printer supports multiple copies...
-  */
-
-  if (copies_sup || argc < 7)
-    copies = 1;
-  else
-    copies = atoi(argv[4]);
-
- /*
-  * Figure out the character set to use...
-  */
-
-  charset = language ? cupsLangEncoding(language) : "us-ascii";
-
-  if (charset_sup)
-  {
-   /*
-    * See if IPP server supports the requested character set...
-    */
-
-    for (i = 0; i < charset_sup->num_values; i ++)
-      if (strcasecmp(charset, charset_sup->values[i].string.text) == 0)
-        break;
-
-   /*
-    * If not, choose us-ascii or utf-8...
-    */
-
-    if (i >= charset_sup->num_values)
-    {
-     /*
-      * See if us-ascii is supported...
-      */
-
-      for (i = 0; i < charset_sup->num_values; i ++)
-        if (strcasecmp("us-ascii", charset_sup->values[i].string.text) == 0)
-          break;
-
-      if (i < charset_sup->num_values)
-        charset = "us-ascii";
-      else
-        charset = "utf-8";
-    }
-  }
-
- /*
-  * Then issue the print-job request...
-  */
-
-  reasons = 0;
-
-  while (copies > 0)
-  {
-   /*
-    * Build the IPP request...
-    */
-
-    request = ippNew();
-    request->request.op.version[1]   = version;
-    request->request.op.operation_id = IPP_PRINT_JOB;
-    request->request.op.request_id   = 1;
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-        	 "attributes-charset", NULL, 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);
-
-    fprintf(stderr, "DEBUG: printer-uri = \"%s\"\n", uri);
-
-    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]);
-
-    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]);
-
-   /*
-    * Handle options on the command-line...
-    */
-
-    options     = NULL;
-    num_options = cupsParseOptions(argv[5], 0, &options);
-
-    if (argc > 6)
-      content_type = getenv("CONTENT_TYPE");
-    else
-      content_type = "application/vnd.cups-raw";
-
-    if (content_type != NULL && format_sup != NULL)
-    {
-      for (i = 0; i < format_sup->num_values; i ++)
-        if (strcasecmp(content_type, format_sup->values[i].string.text) == 0)
-          break;
-
-      if (i < format_sup->num_values)
-        num_options = cupsAddOption("document-format", content_type,
-	                            num_options, &options);
-    }
-
-    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...
-    */
-
-    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)
-    {
-      job_id = 0;
-
-      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 (%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 (response)
-      ippDelete(response);
-
-    if (ipp_status <= IPP_OK_CONFLICT && argc > 6)
-    {
-      fprintf(stderr, "PAGE: 1 %d\n", copies_sup ? atoi(argv[4]) : 1);
-      copies --;
-    }
-    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);
-    }
-  }
-
- /*
-  * Free memory...
-  */
-
-  httpClose(http);
-
-  if (supported)
-    ippDelete(supported);
-
- /*
-  * Close and remove the temporary file if necessary...
-  */
-
-  if (argc < 7)
-    unlink(filename);
-
- /*
-  * Return the queue status...
-  */
-
-  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 @@
 *
 *   Parallel port backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-1999 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
@@ -14,19 +14,16 @@
 *
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
+ *       44145 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()         - Send a file to the specified parallel port.
- *   list_devices() - List all parallel devices.
+ *   main() - Send a file to the specified parallel port.
 */

 /*
@@ -36,35 +33,15 @@
 #include <cups/cups.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
 #include <cups/string.h>
-#include <signal.h>

-#ifdef WIN32
+#if defined(WIN32) || defined(__EMX__)
 #  include <io.h>
 #else
 #  include <unistd.h>
 #  include <fcntl.h>
 #  include <termios.h>
-#endif /* WIN32 */
-
-#ifdef __sgi
-#  include <invent.h>
-#  ifndef INV_EPP_ECP_PLP
-#    define INV_EPP_ECP_PLP	6	/* From 6.3/6.4/6.5 sys/invent.h */
-#    define INV_ASO_SERIAL	14	/* serial portion of SGI ASO board */
-#    define INV_IOC3_DMA	16	/* DMA mode IOC3 serial */
-#    define INV_IOC3_PIO	17	/* PIO mode IOC3 serial */
-#    define INV_ISA_DMA		19	/* DMA mode ISA serial -- O2 */
-#  endif /* !INV_EPP_ECP_PLP */
-#endif /* __sgi */
-
-
-/*
- * Local functions...
- */
-
-void	list_devices(void);
+#endif /* WIN32 || __EMX__ */


 /*
@@ -85,50 +62,16 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 		resource[1024],	/* Resource info (device and options) */
 		*options;	/* Pointer to options */
  int		port;		/* Port number (not used) */
-  int		fp;		/* Print file */
-  int		copies;		/* Number of copies to print */
+  FILE		*fp;		/* Print file */
  int		fd;		/* Parallel device */
-  int		wbytes;		/* Number of bytes written */
-  size_t	nbytes,		/* Number of bytes read */
+  int		error;		/* Error code (if any) */
+  size_t	nbytes,		/* Number of bytes written */
 		tbytes;		/* Total number of bytes written */
-  char		buffer[8192],	/* Output buffer */
-		*bufptr;	/* Pointer into buffer */
+  char		buffer[8192];	/* Output buffer */
  struct termios opts;		/* Parallel port options */
-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  struct sigaction action;	/* Actions for POSIX signals */
-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */


- /*
-  * Make sure status messages are not buffered...
-  */
-
-  setbuf(stderr, NULL);
-
- /*
-  * Ignore SIGPIPE signals...
-  */
-
-#ifdef HAVE_SIGSET
-  sigset(SIGPIPE, SIG_IGN);
-#elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
-  action.sa_handler = SIG_IGN;
-  sigaction(SIGPIPE, &action, NULL);
-#else
-  signal(SIGPIPE, SIG_IGN);
-#endif /* HAVE_SIGSET */
-
- /*
-  * Check command-line...
-  */
-
-  if (argc == 1)
-  {
-    list_devices();
-    return (0);
-  }
-  else if (argc < 6 || argc > 7)
+  if (argc < 6 || argc > 7)
  {
    fputs("Usage: parallel job-id user title copies options [file]\n", stderr);
    return (1);
@@ -140,23 +83,18 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  */

  if (argc == 6)
-  {
-    fp     = 0;
-    copies = 1;
-  }
+    fp = stdin;
  else
  {
   /*
    * Try to open the print file...
    */

-    if ((fp = open(argv[6], O_RDONLY)) < 0)
+    if ((fp = fopen(argv[6], "rb")) == NULL)
    {
      perror("ERROR: unable to open print file");
      return (1);
    }
-
-    copies = atoi(argv[4]);
  }

 /*
@@ -183,29 +121,11 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  * Open the parallel port device...
  */

-  do
+  if ((fd = open(resource, O_WRONLY)) == -1)
  {
-    if ((fd = open(resource, O_WRONLY | O_EXCL)) == -1)
-    {
-      if (errno == EBUSY)
-      {
-        fputs("INFO: Parallel port busy; will retry in 30 seconds...\n", stderr);
-	sleep(30);
-      }
-      else if (errno == ENXIO || errno == EIO || errno == ENOENT)
-      {
-        fputs("INFO: Printer not connected; will retry in 30 seconds...\n", stderr);
-	sleep(30);
-      }
-      else
-      {
-	fprintf(stderr, "ERROR: Unable to open parallel port device file \"%s\": %s\n",
-	        resource, strerror(errno));
-	return (1);
-      }
-    }
+    perror("ERROR: Unable to open parallel port device file");
+    return (1);
  }
-  while (fd < 0);

 /*
  * Set any options provided...
@@ -219,72 +139,27 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

  tcsetattr(fd, TCSANOW, &opts);

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

-  while (copies > 0)
+  tbytes = 0;
+  while ((nbytes = fread(buffer, 1, sizeof(buffer), fp)) > 0)
  {
-    copies --;
+   /*
+    * Write the print data to the printer...
+    */

-    if (fp != 0)
+    if (write(fd, buffer, nbytes) < nbytes)
    {
-      fputs("PAGE: 1 1\n", stderr);
-      lseek(fp, 0, SEEK_SET);
+      perror("ERROR: Unable to send print file to printer");
+      break;
    }
-
-    tbytes = 0;
-    while ((nbytes = read(fp, buffer, sizeof(buffer))) > 0)
-    {
-     /*
-      * Write the print data to the printer...
-      */
-
+    else
      tbytes += nbytes;
-      bufptr = buffer;

-      while (nbytes > 0)
-      {
-	if ((wbytes = write(fd, bufptr, nbytes)) < 0)
-	  if (errno == ENOTTY)
-	    wbytes = write(fd, bufptr, nbytes);
-
-	if (wbytes < 0)
-	{
-	  perror("ERROR: Unable to send print file to printer");
-	  break;
-	}
-
-	nbytes -= wbytes;
-	bufptr += wbytes;
-      }
-
-      if (argc > 6)
-	fprintf(stderr, "INFO: Sending print file, %lu bytes...\n",
-	        (unsigned long)tbytes);
-    }
+    if (argc > 6)
+      fprintf(stderr, "INFO: Sending print file, %u bytes...\n", tbytes);
  }

 /*
@@ -292,385 +167,13 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  */

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

  return (0);
 }


-/*
- * 'list_devices()' - List all parallel devices.
- */
-
-void
-list_devices(void)
-{
-#if defined(__hpux) || defined(__sgi) || defined(__sun)
-  static char	*funky_hex = "0123456789abcdefghijklmnopqrstuvwxyz";
-				/* Funky hex numbering used for some devices */
-#endif /* __hpux || __sgi || __sun */
-
-#ifdef __linux
-  int	i;			/* Looping var */
-  int	fd;			/* File descriptor */
-  char	device[255],		/* Device filename */
-	probefile[255],		/* Probe filename */
-	basedevice[255];	/* Base device filename for ports */
-  FILE	*probe;			/* /proc/parport/n/autoprobe file */
-  char	line[1024],		/* Line from file */
-	*delim,			/* Delimiter in file */
-	make[IPP_MAX_NAME],	/* Make from file */
-	model[IPP_MAX_NAME];	/* Model from file */
-
-
-  for (i = 0; i < 4; i ++)
-  {
-   /*
-    * First open the device to make sure the driver module is loaded...
-    */
-
-    if ((fd = open("/dev/parallel/0", O_WRONLY)) >= 0)
-    {
-      close(fd);
-      strcpy(basedevice, "/dev/parallel/");
-    }
-    else
-    {
-      sprintf(device, "/dev/lp%d", i);
-      if ((fd = open(device, O_WRONLY)) >= 0)
-      {
-	close(fd);
-	strcpy(basedevice, "/dev/lp");
-      }
-      else
-      {
-	sprintf(device, "/dev/par%d", i);
-	if ((fd = open(device, O_WRONLY)) >= 0)
-	{
-	  close(fd);
-	  strcpy(basedevice, "/dev/par");
-	}
-	else
-	{
-	  sprintf(device, "/dev/printers/%d", i);
-	  if ((fd = open(device, O_WRONLY)) >= 0)
-	  {
-	    close(fd);
-	    strcpy(basedevice, "/dev/printers/");
-	  }
-	  else
-	    strcpy(basedevice, "/dev/unknown-parallel");
-	}
-      }
-    }
-
-   /*
-    * Then try looking at the probe file...
-    */
-
-    sprintf(probefile, "/proc/parport/%d/autoprobe", i);
-    if ((probe = fopen(probefile, "r")) == NULL)
-    {
-     /*
-      * Linux 2.4 kernel has different path...
-      */
-
-      sprintf(probefile, "/proc/sys/dev/parport/parport%d/autoprobe", i);
-      probe = fopen(probefile, "r");
-    }
-
-    if (probe != NULL)
-    {
-     /*
-      * Found a probe file!
-      */
-
-      memset(make, 0, sizeof(make));
-      memset(model, 0, sizeof(model));
-      strcpy(model, "Unknown");
-
-      while (fgets(line, sizeof(line), probe) != NULL)
-      {
-       /*
-        * Strip trailing ; and/or newline.
-	*/
-
-        if ((delim = strrchr(line, ';')) != NULL)
-	  *delim = '\0';
-	else if ((delim = strrchr(line, '\n')) != NULL)
-	  *delim = '\0';
-
-       /*
-        * Look for MODEL and MANUFACTURER lines...
-	*/
-
-        if (strncmp(line, "MODEL:", 6) == 0 &&
-	    strncmp(line, "MODEL:Unknown", 13) != 0)
-	  strlcpy(model, line + 6, sizeof(model));
-	else if (strncmp(line, "MANUFACTURER:", 13) == 0 &&
-	         strncmp(line, "MANUFACTURER:Unknown", 20) != 0)
-	  strlcpy(make, line + 13, sizeof(make));
-      }
-
-      fclose(probe);
-
-      if (make[0])
-	printf("direct parallel:%s%d \"%s %s\" \"Parallel Port #%d\"\n",
-	       basedevice, i, make, model, i + 1);
-      else
-	printf("direct parallel:%s%d \"%s\" \"Parallel Port #%d\"\n",
-	       basedevice, i, model, i + 1);
-    }
-    else if (fd >= 0)
-    {
-     /*
-      * No probe file, but we know the port is there...
-      */
-
-      printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
-    }
-  }
-#elif defined(__sgi)
-  int		i, j, n;	/* Looping vars */
-  char		device[255];	/* Device filename */
-  inventory_t	*inv;		/* Hardware inventory info */
-
-
- /*
-  * IRIX maintains a hardware inventory of most devices...
-  */
-
-  setinvent();
-
-  while ((inv = getinvent()) != NULL)
-  {
-    if (inv->inv_class == INV_PARALLEL &&
-        (inv->inv_type == INV_ONBOARD_PLP ||
-         inv->inv_type == INV_EPP_ECP_PLP))
-    {
-     /*
-      * Standard parallel port...
-      */
-
-      puts("direct parallel:/dev/plp \"Unknown\" \"Onboard Parallel Port\"");
-    }
-    else if (inv->inv_class == INV_PARALLEL &&
-             inv->inv_type == INV_EPC_PLP)
-    {
-     /*
-      * EPC parallel port...
-      */
-
-      printf("direct parallel:/dev/plp%d \"Unknown\" \"Integral EPC parallel port, Ebus slot %d\"\n",
-             inv->inv_controller, inv->inv_controller);
-    }
-  }
-
-  endinvent();
-
- /*
-  * Central Data makes serial and parallel "servers" that can be
-  * connected in a number of ways.  Look for ports...
-  */
-
-  for (i = 0; i < 10; i ++)
-    for (j = 0; j < 8; j ++)
-      for (n = 0; n < 32; n ++)
-      {
-        if (i == 8)		/* EtherLite */
-          sprintf(device, "/dev/lpn%d%c", j, funky_hex[n]);
-        else if (i == 9)	/* PCI */
-          sprintf(device, "/dev/lpp%d%c", j, funky_hex[n]);
-        else			/* SCSI */
-          sprintf(device, "/dev/lp%d%d%c", i, j, funky_hex[n]);
-
-	if (access(device, 0) == 0)
-	{
-	  if (i == 8)
-	    printf("direct parallel:%s \"Unknown\" \"Central Data EtherLite Parallel Port, ID %d, port %d\"\n",
-	           device, j, n);
-	  else if (i == 9)
-	    printf("direct parallel:%s \"Unknown\" \"Central Data PCI Parallel Port, ID %d, port %d\"\n",
-	           device, j, n);
-  	  else
-	    printf("direct parallel:%s \"Unknown\" \"Central Data SCSI Parallel Port, logical bus %d, ID %d, port %d\"\n",
-	           device, i, j, n);
-	}
-      }
-#elif defined(__sun)
-  int		i, j, n;	/* Looping vars */
-  char		device[255];	/* Device filename */
-
-
- /*
-  * Standard parallel ports...
-  */
-
-  for (i = 0; i < 10; i ++)
-  {
-    sprintf(device, "/dev/ecpp%d", i);
-    if (access(device, 0) == 0)
-      printf("direct parallel:%s \"Unknown\" \"Sun IEEE-1284 Parallel Port #%d\"\n",
-             device, i + 1);
-  }
-
-  for (i = 0; i < 10; i ++)
-  {
-    sprintf(device, "/dev/bpp%d", i);
-    if (access(device, 0) == 0)
-      printf("direct parallel:%s \"Unknown\" \"Sun Standard Parallel Port #%d\"\n",
-             device, i + 1);
-  }
-
-  for (i = 0; i < 3; i ++)
-  {
-    sprintf(device, "/dev/lp%d", i);
-
-    if (access(device, 0) == 0)
-      printf("direct parallel:%s \"Unknown\" \"PC Parallel Port #%d\"\n",
-             device, i + 1);
-  }
-
- /*
-  * MAGMA parallel ports...
-  */
-
-  for (i = 0; i < 40; i ++)
-  {
-    sprintf(device, "/dev/pm%02d", i);
-    if (access(device, 0) == 0)
-      printf("direct parallel:%s \"Unknown\" \"MAGMA Parallel Board #%d Port #%d\"\n",
-             device, (i / 10) + 1, (i % 10) + 1);
-  }
-
- /*
-  * Central Data parallel ports...
-  */
-
-  for (i = 0; i < 9; i ++)
-    for (j = 0; j < 8; j ++)
-      for (n = 0; n < 32; n ++)
-      {
-        if (i == 8)	/* EtherLite */
-          sprintf(device, "/dev/sts/lpN%d%c", j, funky_hex[n]);
-        else
-          sprintf(device, "/dev/sts/lp%c%d%c", i + 'C', j,
-                  funky_hex[n]);
-
-	if (access(device, 0) == 0)
-	{
-	  if (i == 8)
-	    printf("direct parallel:%s \"Unknown\" \"Central Data EtherLite Parallel Port, ID %d, port %d\"\n",
-	           device, j, n);
-  	  else
-	    printf("direct parallel:%s \"Unknown\" \"Central Data SCSI Parallel Port, logical bus %d, ID %d, port %d\"\n",
-	           device, i, j, n);
-	}
-      }
-#elif defined(__hpux)
-  int		i, j, n;	/* Looping vars */
-  char		device[255];	/* Device filename */
-
-
- /*
-  * Standard parallel ports...
-  */
-
-  if (access("/dev/rlp", 0) == 0)
-    puts("direct parallel:/dev/rlp \"Unknown\" \"Standard Parallel Port (/dev/rlp)\"");
-
-  for (i = 0; i < 7; i ++)
-    for (j = 0; j < 7; j ++)
-    {
-      sprintf(device, "/dev/c%dt%dd0_lp", i, j);
-      if (access(device, 0) == 0)
-	printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d,%d\"\n",
-	       device, i, j);
-    }
-
- /*
-  * Central Data parallel ports...
-  */
-
-  for (i = 0; i < 9; i ++)
-    for (j = 0; j < 8; j ++)
-      for (n = 0; n < 32; n ++)
-      {
-        if (i == 8)	/* EtherLite */
-          sprintf(device, "/dev/lpN%d%c", j, funky_hex[n]);
-        else
-          sprintf(device, "/dev/lp%c%d%c", i + 'C', j,
-                  funky_hex[n]);
-
-	if (access(device, 0) == 0)
-	{
-	  if (i == 8)
-	    printf("direct parallel:%s \"Unknown\" \"Central Data EtherLite Parallel Port, ID %d, port %d\"\n",
-	           device, j, n);
-  	  else
-	    printf("direct parallel:%s \"Unknown\" \"Central Data SCSI Parallel Port, logical bus %d, ID %d, port %d\"\n",
-	           device, i, j, n);
-	}
-      }
-#elif defined(__osf__)
-  int	i;			/* Looping var */
-  int	fd;			/* File descriptor */
-  char	device[255];		/* Device filename */
-
-
-  for (i = 0; i < 3; i ++)
-  {
-    sprintf(device, "/dev/lp%d", i);
-    if ((fd = open(device, O_WRONLY)) >= 0)
-    {
-      close(fd);
-      printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
-    }
-  }
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-  int	i;			/* Looping var */
-  int	fd;			/* File descriptor */
-  char	device[255];		/* Device filename */
-
-
-  for (i = 0; i < 3; i ++)
-  {
-    sprintf(device, "/dev/lpt%d", i);
-    if ((fd = open(device, O_WRONLY)) >= 0)
-    {
-      close(fd);
-      printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d (interrupt-driven)\"\n", device, i + 1);
-    }
-
-    sprintf(device, "/dev/lpa%d", i);
-    if ((fd = open(device, O_WRONLY)) >= 0)
-    {
-      close(fd);
-      printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d (polled)\"\n", device, i + 1);
-    }
-  }
-#elif defined(_AIX)
-  int	i;			/* Looping var */
-  int	fd;			/* File descriptor */
-  char	device[255];		/* Device filename */
-
-
-  for (i = 0; i < 8; i ++)
-  {
-    sprintf(device, "/dev/lp%d", i);
-    if ((fd = open(device, O_WRONLY)) >= 0)
-    {
-      close(fd);
-      printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
-    }
-  }
-#endif
-}
-
-
 /*
 * End of "$Id$".
 */
@@ -1,211 +0,0 @@
-/*
- * "$Id$"
- *
- *   IRIX SCSI printer support for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2003 by Easy Software Products, all rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or
- *   without modification, are permitted provided that the
- *   following conditions are met:
- *
- *     1. Redistributions of source code must retain the above
- *	  copyright notice, this list of conditions and the
- *	  following disclaimer.
- *
- *     2. Redistributions in binary form must reproduce the
- *	  above copyright notice, this list of conditions and
- *	  the following disclaimer in the documentation and/or
- *	  other materials provided with the distribution.
- *
- *     3. All advertising materials mentioning features or use
- *	  of this software must display the following
- *	  acknowledgement:
- *
- *	    This product includes software developed by Easy
- *	    Software Products.
- *
- *     4. The name of Easy Software Products may not be used to
- *	  endorse or promote products derived from this software
- *	  without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS
- *   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- *   BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *   DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
- *   BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- *   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- *   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- *   OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- *   DAMAGE.
- *
- * Contents:
- *
- *   list_devices() - List the available SCSI printer devices.
- *   print_device() - Print a file to a SCSI device.
- */
-
-/*
- * Include necessary headers.
- */
-
-#include <bstring.h>		/* memcpy() and friends */
-#include <sys/dsreq.h>		/* SCSI interface stuff */
-
-
-/*
- * 'list_devices()' - List the available SCSI printer devices.
- */
-
-void
-list_devices(void)
-{
-  puts("direct scsi \"Unknown\" \"SCSI Printer\"");
-}
-
-
-/*
- * 'print_device()' - Print a file to a SCSI device.
- */
-
-int					/* O - Print status */
-print_device(const char *resource,	/* I - SCSI device */
-             int        fd,		/* I - File to print */
-	     int        copies)		/* I - Number of copies to print */
-{
-  int		scsi_fd;		/* SCSI file descriptor */
-  char		buffer[8192];		/* Data buffer */
-  int		bytes;			/* Number of bytes */
-  int		try;			/* Current try */
-  dsreq_t	scsi_req;		/* SCSI request */
-  char		scsi_cmd[6],		/* SCSI command data */
-		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$".
- */
@@ -1,228 +0,0 @@
-/*
- * "$Id$"
- *
- *   Linux SCSI printer support for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2003 by Easy Software Products, all rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or
- *   without modification, are permitted provided that the
- *   following conditions are met:
- *
- *     1. Redistributions of source code must retain the above
- *	  copyright notice, this list of conditions and the
- *	  following disclaimer.
- *
- *     2. Redistributions in binary form must reproduce the
- *	  above copyright notice, this list of conditions and
- *	  the following disclaimer in the documentation and/or
- *	  other materials provided with the distribution.
- *
- *     3. All advertising materials mentioning features or use
- *	  of this software must display the following
- *	  acknowledgement:
- *
- *	    This product includes software developed by Easy
- *	    Software Products.
- *
- *     4. The name of Easy Software Products may not be used to
- *	  endorse or promote products derived from this software
- *	  without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS
- *   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- *   BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *   DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
- *   BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- *   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- *   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- *   OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- *   DAMAGE.
- *
- * Contents:
- *
- *   list_devices() - List the available SCSI printer devices.
- *   print_device() - Print a file to a SCSI device.
- */
-
-/*
- * Include necessary headers.
- */
-
-#include <scsi/sg.h>
-
-
-/*
- * We currently only support the Linux 2.4 generic SCSI interface.
- */
-
-#ifndef SG_DXFER_TO_DEV
-/*
- * Dummy functions that do nothing on unsupported platforms...
- */
-void	list_devices(void) {}
-int	print_device(const char *resource, int fd, int copies) { return (1); }
-#else
-
-
-/*
- * 'list_devices()' - List the available SCSI printer devices.
- */
-
-void
-list_devices(void)
-{
-  puts("direct scsi \"Unknown\" \"SCSI Printer\"");
-}
-
-
-/*
- * 'print_device()' - Print a file to a SCSI device.
- */
-
-int					/* O - Print status */
-print_device(const char *resource,	/* I - SCSI device */
-             int        fd,		/* I - File to print */
-	     int        copies)		/* I - Number of copies to print */
-{
-  int		scsi_fd;		/* SCSI file descriptor */
-  char		buffer[8192];		/* Data buffer */
-  int		bytes;			/* Number of bytes */
-  int		try;			/* Current try */
-  sg_io_hdr_t	scsi_req;		/* SCSI request */
-  char		scsi_cmd[6],		/* SCSI command data */
-		scsi_sense[32];		/* SCSI sense data */
-#  if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  struct sigaction action;		/* Actions for POSIX signals */
-#  endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-
-
- /*
-  * Make sure we have a valid resource name...
-  */
-
-  if (strncmp(resource, "/dev/sg", 7) != 0)
-  {
-    fprintf(stderr, "ERROR: Bad SCSI device file \"%s\"!\n", resource);
-    return (1);
-  }
-
- /*
-  * Open the SCSI device file...
-  */
-
-  do
-  {
-    if ((scsi_fd = open(resource, O_RDWR | O_EXCL)) == -1)
-    {
-      if (errno != EAGAIN && errno != EBUSY)
-      {
-	fprintf(stderr, "ERROR: Unable to open SCSI device \"%s\" - %s\n",
-        	resource, strerror(errno));
-	return (1);
-      }
-      else
-      {
-        fprintf(stderr, "INFO: SCSI device \"%s\" busy; retrying...\n",
-	        resource);
-        sleep(30);
-      }
-    }
-  }
-  while (scsi_fd == -1);
-
- /*
-  * Now that we are "connected" to the port, ignore SIGTERM so that we
-  * can finish out any page data the driver sends (e.g. to eject the
-  * current page...  Only ignore SIGTERM if we are printing data from
-  * stdin (otherwise you can't cancel raw jobs...)
-  */
-
-  if (fd != 0)
-  {
-#  ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-    sigset(SIGTERM, SIG_IGN);
-#  elif defined(HAVE_SIGACTION)
-    memset(&action, 0, sizeof(action));
-
-    sigemptyset(&action.sa_mask);
-    action.sa_handler = SIG_IGN;
-    sigaction(SIGTERM, &action, NULL);
-#  else
-    signal(SIGTERM, SIG_IGN);
-#  endif /* HAVE_SIGSET */
-  }
-
- /*
-  * Copy the print file to the device...
-  */
-
-  while (copies > 0)
-  {
-    if (fd != 0)
-      lseek(fd, 0, SEEK_SET);
-
-    while ((bytes = read(fd, buffer, sizeof(buffer))) > 0)
-    {
-      memset(&scsi_req, 0, sizeof(scsi_req));
-
-      scsi_req.interface_id    = 'S';
-      scsi_req.dxfer_direction = SG_DXFER_TO_DEV;
-      scsi_req.cmd_len         = 6;
-      scsi_req.mx_sb_len       = sizeof(scsi_sense);
-      scsi_req.iovec_count     = 0;
-      scsi_req.dxfer_len       = bytes;
-      scsi_req.dxferp          = buffer;
-      scsi_req.cmdp            = scsi_cmd;
-      scsi_req.sbp             = scsi_sense;
-      scsi_req.timeout         = 60 * 1000;
-      
-      scsi_cmd[0] = 0x0a;	/* Group 0 print command */
-      scsi_cmd[1] = 0x00;
-      scsi_cmd[2] = bytes / 65536;
-      scsi_cmd[3] = bytes / 256;
-      scsi_cmd[4] = bytes;
-      scsi_cmd[5] = 0x00;
-
-      for (try = 0; try < 10; try ++)
-	if (ioctl(scsi_fd, SG_IO, &scsi_req) < 0 ||
-            scsi_req.status != 0)
-        {
-	  fprintf(stderr, "WARNING: SCSI command timed out (%d); retrying...\n",
-	          scsi_req.status);
-          sleep(try + 1);
-	}
-	else
-          break;
-
-      if (try >= 10)
-      {
-	fprintf(stderr, "ERROR: Unable to send print data (%d)\n",
-	        scsi_req.status);
-        close(scsi_fd);
-	return (1);
-      }
-    }
-
-    copies --;
-  }
-
- /*
-  * Close the device and return...
-  */
-
-  close(fd);
-
-  return (0);
-}
-#endif /* !SG_DXFER_TO_DEV */
-
-
-/*
- * End of "$Id$".
- */
@@ -1,223 +0,0 @@
-/*
- * "$Id$"
- *
- *   SCSI printer backend for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2003 by Easy Software Products, all rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or
- *   without modification, are permitted provided that the
- *   following conditions are met:
- *
- *     1. Redistributions of source code must retain the above
- *	  copyright notice, this list of conditions and the
- *	  following disclaimer.
- *
- *     2. Redistributions in binary form must reproduce the
- *	  above copyright notice, this list of conditions and
- *	  the following disclaimer in the documentation and/or
- *	  other materials provided with the distribution.
- *
- *     3. All advertising materials mentioning features or use
- *	  of this software must display the following
- *	  acknowledgement:
- *
- *	    This product includes software developed by Easy
- *	    Software Products.
- *
- *     4. The name of Easy Software Products may not be used to
- *	  endorse or promote products derived from this software
- *	  without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS
- *   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- *   BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *   DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
- *   BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- *   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- *   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- *   OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- *   DAMAGE.
- *
- * Contents:
- *
- *   main() - Send a file to the specified SCSI printer.
- */
-
-/*
- * Include necessary headers.
- */
-
-#include <cups/cups.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <cups/string.h>
-#include <signal.h>
-
-#ifdef WIN32
-#  include <io.h>
-#else
-#  include <unistd.h>
-#  include <fcntl.h>
-#  ifdef HAVE_SYS_IOCTL_H
-#    include <sys/ioctl.h>
-#  endif /* HAVE_SYS_IOCTL_H */
-#endif /* WIN32 */
-
-
-/*
- * Local functions...
- */
-
-void	list_devices(void);
-int	print_device(const char *resource, int fd, int copies);
-
-
-#ifdef __linux__
-#  include "scsi-linux.c"
-#elif defined(__sgi)
-#  include "scsi-irix.c"
-#else
-/*
- * Dummy functions that do nothing on unsupported platforms...
- */
-void	list_devices(void) {}
-int	print_device(const char *resource, int fd, int copies) { return (1); }
-#endif /* __linux */
-
-
-/*
- * 'main()' - Send a file to the specified SCSI printer.
- *
- * Usage:
- *
- *    printer-uri job-id user title copies options [file]
- */
-
-int			/* O - Exit status */
-main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
-     char *argv[])	/* I - Command-line arguments */
-{
-  char		method[255],	/* Method in URI */
-		hostname[1024],	/* Hostname */
-		username[255],	/* Username info (not used) */
-		resource[1024],	/* Resource info (device and options) */
-		*options;	/* Pointer to options */
-  int		port;		/* Port number (not used) */
-  int		fp;		/* Print file */
-  int		copies;		/* Number of copies to print */
-  int		status;		/* Exit status */
-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  struct sigaction action;	/* Actions for POSIX signals */
-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-
-
- /*
-  * Make sure status messages are not buffered...
-  */
-
-  setbuf(stderr, NULL);
-
- /*
-  * Ignore SIGPIPE signals...
-  */
-
-#ifdef HAVE_SIGSET
-  sigset(SIGPIPE, SIG_IGN);
-#elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
-  action.sa_handler = SIG_IGN;
-  sigaction(SIGPIPE, &action, NULL);
-#else
-  signal(SIGPIPE, SIG_IGN);
-#endif /* HAVE_SIGSET */
-
- /*
-  * Check command-line...
-  */
-
-  if (argc == 1)
-  {
-    list_devices();
-    return (0);
-  }
-  else if (argc < 6 || argc > 7)
-  {
-    fputs("Usage: scsi:/dev/file job-id user title copies options [file]\n", stderr);
-    return (1);
-  }
-
- /*
-  * If we have 7 arguments, print the file named on the command-line.
-  * Otherwise, send stdin instead...
-  */
-
-  if (argc == 6)
-  {
-    fp     = 0;
-    copies = 1;
-  }
-  else
-  {
-   /*
-    * Try to open the print file...
-    */
-
-    if ((fp = open(argv[6], O_RDONLY)) < 0)
-    {
-      perror("ERROR: unable to open print file");
-      return (1);
-    }
-
-    copies = atoi(argv[4]);
-  }
-
- /*
-  * Extract the device name and options from the URI...
-  */
-
-  httpSeparate(argv[0], method, username, hostname, &port, resource);
-
- /*
-  * See if there are any options...
-  */
-
-  if ((options = strchr(resource, '?')) != NULL)
-  {
-   /*
-    * Yup, terminate the device name string and move to the first
-    * character of the options...
-    */
-
-    *options++ = '\0';
-  }
-
- /*
-  * Finally, send the print file...
-  */
-
-  status = print_device(resource, fp, copies);
-
- /*
-  * Close input file and return...
-  */
-
-  if (fp != 0)
-    close(fp);
-
-  if (!status)
-    fputs("INFO: Ready to print.\n", stderr);
-
-  return (status);
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -3,7 +3,7 @@
 *
 *   Serial port backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-1999 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
@@ -14,19 +14,16 @@
 *
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
+ *       44145 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()         - Send a file to the printer or server.
- *   list_devices() - List all serial devices.
+ *   main() - Send a file to the printer or server.
 */

 /*
@@ -36,57 +33,15 @@
 #include <cups/cups.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
 #include <cups/string.h>
-#include <signal.h>

-#ifdef __hpux
-#  include <sys/modem.h>
-#endif /* __hpux */
-
-#ifdef WIN32
+#if defined(WIN32) || defined(__EMX__)
 #  include <io.h>
 #else
 #  include <unistd.h>
 #  include <fcntl.h>
 #  include <termios.h>
-#  ifdef HAVE_SYS_IOCTL_H
-#    include <sys/ioctl.h>
-#  endif /* HAVE_SYS_IOCTL_H */
-#endif /* WIN32 */
-
-#ifdef __sgi
-#  include <invent.h>
-#  ifndef INV_EPP_ECP_PLP
-#    define INV_EPP_ECP_PLP	6	/* From 6.3/6.4/6.5 sys/invent.h */
-#    define INV_ASO_SERIAL	14	/* serial portion of SGI ASO board */
-#    define INV_IOC3_DMA	16	/* DMA mode IOC3 serial */
-#    define INV_IOC3_PIO	17	/* PIO mode IOC3 serial */
-#    define INV_ISA_DMA		19	/* DMA mode ISA serial -- O2 */
-#  endif /* !INV_EPP_ECP_PLP */
-#endif /* __sgi */
-
-#ifndef CRTSCTS
-#  ifdef CNEW_RTSCTS
-#    define CRTSCTS CNEW_RTSCTS
-#  else
-#    define CRTSCTS 0
-#  endif /* CNEW_RTSCTS */
-#endif /* !CRTSCTS */
-
-#if defined(__APPLE__)
-#  include <CoreFoundation/CoreFoundation.h>
-#  include <IOKit/IOKitLib.h>
-#  include <IOKit/serial/IOSerialKeys.h>
-#  include <IOKit/IOBSD.h>
-#endif /* __APPLE__ */
-
-
-/*
- * Local functions...
- */
-
-void	list_devices(void);
+#endif /* WIN32 || __EMX__ */


 /*
@@ -110,53 +65,16 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 		value[255],	/* Value of option */
 		*ptr;		/* Pointer into name or value */
  int		port;		/* Port number (not used) */
-  int		fp;		/* Print file */
-  int		copies;		/* Number of copies to print */
+  FILE		*fp;		/* Print file */
  int		fd;		/* Parallel device */
-  int		wbytes;		/* Number of bytes written */
-  size_t	nbytes,		/* Number of bytes read */
+  int		error;		/* Error code (if any) */
+  size_t	nbytes,		/* Number of bytes written */
 		tbytes;		/* Total number of bytes written */
-  int		dtrdsr;		/* Do dtr/dsr flow control? */
-  int		bufsize;	/* Size of output buffer for writes */
-  char		buffer[8192],	/* Output buffer */
-		*bufptr;	/* Pointer into buffer */
-  struct termios opts;		/* Serial port options */
-  struct termios origopts;	/* Original port options */
-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  struct sigaction action;	/* Actions for POSIX signals */
-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
+  char		buffer[8192];	/* Output buffer */
+  struct termios opts;		/* Parallel port options */


- /*
-  * Make sure status messages are not buffered...
-  */
-
-  setbuf(stderr, NULL);
-
- /*
-  * Ignore SIGPIPE signals...
-  */
-
-#ifdef HAVE_SIGSET
-  sigset(SIGPIPE, SIG_IGN);
-#elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
-  action.sa_handler = SIG_IGN;
-  sigaction(SIGPIPE, &action, NULL);
-#else
-  signal(SIGPIPE, SIG_IGN);
-#endif /* HAVE_SIGSET */
-
- /*
-  * Check command-line...
-  */
-
-  if (argc == 1)
-  {
-    list_devices();
-    return (0);
-  }
-  else if (argc < 6 || argc > 7)
+  if (argc < 6 || argc > 7)
  {
    fputs("Usage: serial job-id user title copies options [file]\n", stderr);
    return (1);
@@ -168,23 +86,18 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  */

  if (argc == 6)
-  {
-    fp     = 0;
-    copies = 1;
-  }
+    fp = stdin;
  else
  {
   /*
    * Try to open the print file...
    */

-    if ((fp = open(argv[6], O_RDONLY)) < 0)
+    if ((fp = fopen(argv[6], "rb")) == NULL)
    {
      perror("ERROR: unable to open print file");
      return (1);
    }
-
-    copies = atoi(argv[4]);
  }

 /*
@@ -208,40 +121,22 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  }

 /*
-  * Open the serial port device...
+  * Open the parallel port device...
  */

-  do
+  if ((fd = open(resource, O_WRONLY)) == -1)
  {
-    if ((fd = open(resource, O_WRONLY | O_NOCTTY | O_EXCL | O_NDELAY)) == -1)
-    {
-      if (errno == EBUSY)
-      {
-        fputs("INFO: Serial port busy; will retry in 30 seconds...\n", stderr);
-	sleep(30);
-      }
-      else
-      {
-	fprintf(stderr, "ERROR: Unable to open serial port device file \"%s\": %s\n",
-	        resource, strerror(errno));
-	return (1);
-      }
-    }
+    perror("ERROR: Unable to open serial port device file");
+    return (1);
  }
-  while (fd < 0);

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

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

  opts.c_lflag &= ~(ICANON | ECHO | ISIG);	/* Raw mode */
-  opts.c_oflag &= ~OPOST;			/* Don't post-process */
-
-  bufsize = 96;		/* 9600 baud / 10 bits/char / 10Hz */
-  dtrdsr  = 0;		/* No dtr/dsr flow control */

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

-        bufsize = atoi(value) / 100;
-
 #if B19200 == 19200
        cfsetispeed(&opts, atoi(value));
 	cfsetospeed(&opts, atoi(value));
@@ -314,24 +207,6 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 	      cfsetispeed(&opts, B38400);
 	      cfsetospeed(&opts, B38400);
 	      break;
-#  ifdef B57600
-	  case 57600 :
-	      cfsetispeed(&opts, B57600);
-	      cfsetospeed(&opts, B57600);
-	      break;
-#  endif /* B57600 */
-#  ifdef B115200
-	  case 115200 :
-	      cfsetispeed(&opts, B115200);
-	      cfsetospeed(&opts, B115200);
-	      break;
-#  endif /* B115200 */
-#  ifdef B230400
-	  case 230400 :
-	      cfsetispeed(&opts, B230400);
-	      cfsetospeed(&opts, B230400);
-	      break;
-#  endif /* B230400 */
          default :
 	      fprintf(stderr, "WARNING: Unsupported baud rate %s!\n", value);
 	      break;
@@ -378,614 +253,45 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 	else if (strcasecmp(value, "none") == 0)
 	  opts.c_cflag &= ~PARENB;
      }
-      else if (strcasecmp(name, "flow") == 0)
-      {
-       /*
-	* Set flow control...
-	*/
-
-	if (strcasecmp(value, "none") == 0)
-	{
-	  opts.c_iflag &= ~(IXON | IXOFF | IXANY);
-          opts.c_cflag &= ~CRTSCTS;
-	}
-	else if (strcasecmp(value, "soft") == 0)
-	{
-	  opts.c_iflag |= IXON | IXOFF | IXANY;
-          opts.c_cflag &= ~CRTSCTS;
-	}
-	else if (strcasecmp(value, "hard") == 0 ||
-	         strcasecmp(value, "rtscts") == 0)
-        {
-	  opts.c_iflag &= ~(IXON | IXOFF | IXANY);
-          opts.c_cflag |= CRTSCTS;
-	}
-	else if (strcasecmp(value, "dtrdsr") == 0)
-	{
-	  opts.c_iflag &= ~(IXON | IXOFF | IXANY);
-          opts.c_cflag &= ~CRTSCTS;
-
-	  dtrdsr = 1;
-	}
-      }
    }

  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...  Only ignore SIGTERM if we are printing data from
-  * stdin (otherwise you can't cancel raw jobs...)
-  */
-
-  if (argc < 7)
-  {
-#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-    sigset(SIGTERM, SIG_IGN);
-#elif defined(HAVE_SIGACTION)
-    memset(&action, 0, sizeof(action));
-
-    sigemptyset(&action.sa_mask);
-    action.sa_handler = SIG_IGN;
-    sigaction(SIGTERM, &action, NULL);
-#else
-    signal(SIGTERM, SIG_IGN);
-#endif /* HAVE_SIGSET */
-  }

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

-  if (bufsize > sizeof(buffer))
-    bufsize = sizeof(buffer);
-
-  while (copies > 0)
+  tbytes = 0;
+  while ((nbytes = fread(buffer, 1, sizeof(buffer), fp)) > 0)
  {
-    copies --;
+   /*
+    * Write the print data to the printer...
+    */

-    if (fp != 0)
+    if (write(fd, buffer, nbytes) < nbytes)
    {
-      fputs("PAGE: 1 1\n", stderr);
-      lseek(fp, 0, SEEK_SET);
+      perror("ERROR: Unable to send print file to printer");
+      break;
    }
-
-    if (dtrdsr)
-    {
-     /*
-      * Check the port and sleep until DSR is set...
-      */
-
-      int status;
-
-
-      if (!ioctl(fd, TIOCMGET, &status))
-        if (!(status & TIOCM_DSR))
-	{
-	 /*
-	  * Wait for DSR to go high...
-	  */
-
-	  fputs("DEBUG: DSR is low; waiting for device...\n", stderr);
-
-          do
-	  {
-	    sleep(1);
-	    if (ioctl(fd, TIOCMGET, &status))
-	      break;
-	  }
-	  while (!(status & TIOCM_DSR));
-
-	  fputs("DEBUG: DSR is high; writing to device...\n", stderr);
-        }
-    }
-
-    tbytes = 0;
-    while ((nbytes = read(fp, buffer, bufsize)) > 0)
-    {
-     /*
-      * Write the print data to the printer...
-      */
-
+    else
      tbytes += nbytes;
-      bufptr = buffer;

-      while (nbytes > 0)
-      {
-	if ((wbytes = write(fd, bufptr, nbytes)) < 0)
-	  if (errno == ENOTTY)
-	    wbytes = write(fd, bufptr, nbytes);
-
-	if (wbytes < 0)
-	{
-	  perror("ERROR: Unable to send print file to printer");
-	  break;
-	}
-
-	nbytes -= wbytes;
-	bufptr += wbytes;
-      }
-
-      if (argc > 6)
-	fprintf(stderr, "INFO: Sending print file, %lu bytes...\n",
-	        (unsigned long)tbytes);
-    }
+    if (argc > 6)
+      fprintf(stderr, "INFO: Sending print file, %u bytes...\n", tbytes);
  }

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

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

  return (0);
 }


-/*
- * 'list_devices()' - List all serial devices.
- */
-
-void
-list_devices(void)
-{
-#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 || __FreeBSD__ || __OpenBSD__ */
-
-#if defined(__linux) || defined(linux) || defined(__linux__)
-  int	i;		/* Looping var */
-  int	fd;		/* File descriptor */
-  char	device[255];	/* Device filename */
-
-
-  for (i = 0; i < 100; i ++)
-  {
-    sprintf(device, "/dev/ttyS%d", i);
-    if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
-    {
-      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)
-  int		i, j, n;	/* Looping vars */
-  char		device[255];	/* Device filename */
-  inventory_t	*inv;		/* Hardware inventory info */
-
-
- /*
-  * IRIX maintains a hardware inventory of most devices...
-  */
-
-  setinvent();
-
-  while ((inv = getinvent()) != NULL)
-  {
-    if (inv->inv_class == INV_SERIAL)
-    {
-     /*
-      * Some sort of serial port...
-      */
-
-      if (inv->inv_type == INV_CDSIO || inv->inv_type == INV_CDSIO_E)
-      {
-       /*
-        * CDSIO port...
-        */
-
-	for (n = 0; n < 6; 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)
-      {
-       /*
-        * Everest serial port...
-        */
-
-	if (inv->inv_unit == 0)
-          i = 1;
-	else
-          i = 41 + 4 * (int)inv->inv_controller;
-
-	for (n = 0; n < (int)inv->inv_state; 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)
-      {
-       /*
-        * Standard serial port under IRIX 6.4 and earlier...
-        */
-
-	for (n = 0; n < (int)inv->inv_state; 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
-      {
-       /*
-        * Standard serial port under IRIX 6.5 and beyond...
-        */
-
-	printf("serial serial:/dev/ttyd%d?baud=115200 \"Unknown\" \"Onboard Serial Port %d\"\n",
-               (int)inv->inv_controller, (int)inv->inv_controller);
-      }
-    }
-  }
-
-  endinvent();
-
- /*
-  * Central Data makes serial and parallel "servers" that can be
-  * connected in a number of ways.  Look for ports...
-  */
-
-  for (i = 0; i < 10; i ++)
-    for (j = 0; j < 8; j ++)
-      for (n = 0; n < 32; n ++)
-      {
-        if (i == 8)		/* EtherLite */
-          sprintf(device, "/dev/ttydn%d%c", j, funky_hex[n]);
-        else if (i == 9)	/* PCI */
-          sprintf(device, "/dev/ttydp%d%c", j, funky_hex[n]);
-        else			/* SCSI */
-          sprintf(device, "/dev/ttyd%d%d%c", i, j, funky_hex[n]);
-
-	if (access(device, 0) == 0)
-	{
-	  if (i == 8)
-	    printf("serial serial:%s?baud=38400 \"Unknown\" \"Central Data EtherLite Serial Port, ID %d, port %d\"\n",
-  	           device, j, n);
-	  else if (i == 9)
-	    printf("serial serial:%s?baud=38400 \"Unknown\" \"Central Data PCI Serial Port, ID %d, port %d\"\n",
-  	           device, j, n);
-  	  else
-	    printf("serial serial:%s?baud=38400 \"Unknown\" \"Central Data SCSI Serial Port, logical bus %d, ID %d, port %d\"\n",
-  	           device, i, j, n);
-	}
-      }
-#elif defined(__sun)
-  int		i, j, n;	/* Looping vars */
-  char		device[255];	/* Device filename */
-
-
- /*
-  * Standard serial ports...
-  */
-
-  for (i = 0; i < 26; i ++)
-  {
-    sprintf(device, "/dev/cua/%c", 'a' + i);
-    if (access(device, 0) == 0)
-#ifdef B115200
-      printf("serial serial:%s?baud=115200 \"Unknown\" \"Serial Port #%d\"\n",
-             device, i + 1);
-#else
-      printf("serial serial:%s?baud=38400 \"Unknown\" \"Serial Port #%d\"\n",
-             device, i + 1);
-#endif /* B115200 */
-  }
-
- /*
-  * MAGMA serial ports...
-  */
-
-  for (i = 0; i < 40; i ++)
-  {
-    sprintf(device, "/dev/term/%02d", i);
-    if (access(device, 0) == 0)
-      printf("serial serial:%s?baud=38400 \"Unknown\" \"MAGMA Serial Board #%d Port #%d\"\n",
-             device, (i / 10) + 1, (i % 10) + 1);
-  }
-
- /*
-  * Central Data serial ports...
-  */
-
-  for (i = 0; i < 9; i ++)
-    for (j = 0; j < 8; j ++)
-      for (n = 0; n < 32; n ++)
-      {
-        if (i == 8)	/* EtherLite */
-          sprintf(device, "/dev/sts/ttyN%d%c", j, funky_hex[n]);
-        else
-          sprintf(device, "/dev/sts/tty%c%d%c", i + 'C', j,
-                  funky_hex[n]);
-
-	if (access(device, 0) == 0)
-	{
-	  if (i == 8)
-	    printf("serial serial:%s?baud=38400 \"Unknown\" \"Central Data EtherLite Serial Port, ID %d, port %d\"\n",
-  	           device, j, n);
-  	  else
-	    printf("serial serial:%s?baud=38400 \"Unknown\" \"Central Data SCSI Serial Port, logical bus %d, ID %d, port %d\"\n",
-  	           device, i, j, n);
-	}
-      }
-#elif defined(__hpux)
-  int		i, j, n;	/* Looping vars */
-  char		device[255];	/* Device filename */
-
-
- /*
-  * Standard serial ports...
-  */
-
-  for (i = 0; i < 10; i ++)
-  {
-    sprintf(device, "/dev/tty%dp0", i);
-    if (access(device, 0) == 0)
-      printf("serial serial:%s?baud=38400 \"Unknown\" \"Serial Port #%d\"\n",
-             device, i + 1);
-  }
-
- /*
-  * Central Data serial ports...
-  */
-
-  for (i = 0; i < 9; i ++)
-    for (j = 0; j < 8; j ++)
-      for (n = 0; n < 32; n ++)
-      {
-        if (i == 8)	/* EtherLite */
-          sprintf(device, "/dev/ttyN%d%c", j, funky_hex[n]);
-        else
-          sprintf(device, "/dev/tty%c%d%c", i + 'C', j,
-                  funky_hex[n]);
-
-	if (access(device, 0) == 0)
-	{
-	  if (i == 8)
-	    printf("serial serial:%s?baud=38400 \"Unknown\" \"Central Data EtherLite Serial Port, ID %d, port %d\"\n",
-  	           device, j, n);
-  	  else
-	    printf("serial serial:%s?baud=38400 \"Unknown\" \"Central Data SCSI Serial Port, logical bus %d, ID %d, port %d\"\n",
-  	           device, i, j, n);
-	}
-      }
-#elif defined(__osf__)
-  int		i;		/* Looping var */
-  char		device[255];	/* Device filename */
-
-
- /*
-  * Standard serial ports...
-  */
-
-  for (i = 0; i < 100; i ++)
-  {
-    sprintf(device, "/dev/tty%02d", i);
-    if (access(device, 0) == 0)
-      printf("serial serial:%s?baud=38400 \"Unknown\" \"Serial Port #%d\"\n",
-             device, i + 1);
-  }
-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
-  int	i, j;		/* Looping vars */
-  int	fd;		/* File descriptor */
-  char	device[255];	/* Device filename */
-
-
- /*
-  * SIO ports...
-  */
-
-  for (i = 0; i < 32; i ++)
-  {
-    sprintf(device, "/dev/ttyd%c", funky_hex[i]);
-    if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
-    {
-      close(fd);
-      printf("serial serial:%s?baud=115200 \"Unknown\" \"Standard Serial Port #%d\"\n",
-             device, i + 1);
-    }
-  }
-
- /*
-  * Cyclades ports...
-  */
-
-  for (i = 0; i < 16; i ++) /* Should be up to 65536 boards... */
-    for (j = 0; j < 32; j ++)
-    {
-      sprintf(device, "/dev/ttyc%d%c", i, funky_hex[j]);
-      if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
-      {
-	close(fd);
-	printf("serial serial:%s?baud=115200 \"Unknown\" \"Cyclades #%d Serial Port #%d\"\n",
-               device, i, j + 1);
-      }
-    }
-
- /*
-  * Digiboard ports...
-  */
-
-  for (i = 0; i < 16; i ++) /* Should be up to 65536 boards... */
-    for (j = 0; j < 32; j ++)
-    {
-      sprintf(device, "/dev/ttyD%d%c", i, funky_hex[j]);
-      if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
-      {
-	close(fd);
-	printf("serial serial:%s?baud=115200 \"Unknown\" \"Digiboard #%d Serial Port #%d\"\n",
-               device, i, j + 1);
-      }
-    }
-
- /*
-  * Stallion ports...
-  */
-
-  for (i = 0; i < 32; i ++)
-  {
-    sprintf(device, "/dev/ttyE%c", funky_hex[i]);
-    if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
-    {
-      close(fd);
-      printf("serial serial:%s?baud=115200 \"Unknown\" \"Stallion Serial Port #%d\"\n",
-             device, i + 1);
-    }
-  }
-
- /*
-  * SX ports...
-  */
-
-  for (i = 0; i < 128; i ++)
-  {
-    sprintf(device, "/dev/ttyA%d", i + 1);
-    if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
-    {
-      close(fd);
-      printf("serial serial:%s?baud=115200 \"Unknown\" \"SX Serial Port #%d\"\n",
-             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);
-      }
-    }
-#elif defined(__APPLE__)
- /*
-  * Standard serial ports on MacOS X...
-  */
-
-  kern_return_t			kernResult;
-  mach_port_t			masterPort;
-  io_iterator_t			serialPortIterator;
-  CFMutableDictionaryRef	classesToMatch;
-  io_object_t			serialService;
-
-  printf("serial serial \"Unknown\" \"Serial Printer (serial)\"\n");
-
-  kernResult = IOMasterPort(MACH_PORT_NULL, &masterPort);
-  if (KERN_SUCCESS != kernResult)
-    return;
-
- /*
-  * Serial devices are instances of class IOSerialBSDClient.
-  */
-
-  classesToMatch = IOServiceMatching(kIOSerialBSDServiceValue);
-  if (classesToMatch != NULL)
-  {
-    CFDictionarySetValue(classesToMatch, CFSTR(kIOSerialBSDTypeKey),
-                         CFSTR(kIOSerialBSDRS232Type));
-
-    kernResult = IOServiceGetMatchingServices(masterPort, classesToMatch,
-                                              &serialPortIterator);
-    if (kernResult == KERN_SUCCESS)
-    {
-      while ((serialService = IOIteratorNext(serialPortIterator)))
-      {
-	CFTypeRef	serialNameAsCFString;
-	CFTypeRef	bsdPathAsCFString;
-	char		serialName[128];
-	char		bsdPath[1024];
-	Boolean		result;
-
-
-	serialNameAsCFString =
-	    IORegistryEntryCreateCFProperty(serialService,
-	                                    CFSTR(kIOTTYDeviceKey),
-					    kCFAllocatorDefault, 0);
-	if (serialNameAsCFString)
-	{
-	  result = CFStringGetCString(serialNameAsCFString, serialName,
-	                              sizeof(serialName),
-				      kCFStringEncodingASCII);
-	  CFRelease(serialNameAsCFString);
-
-	  if (result)
-	  {
-	    bsdPathAsCFString =
-	        IORegistryEntryCreateCFProperty(serialService,
-		                                CFSTR(kIOCalloutDeviceKey),
-						kCFAllocatorDefault, 0);
-	    if (bsdPathAsCFString)
-	    {
-	      result = CFStringGetCString(bsdPathAsCFString, bsdPath,
-	                                  sizeof(bsdPath),
-					  kCFStringEncodingASCII);
-	      CFRelease(bsdPathAsCFString);
-
-	      if (result)
-		printf("serial serial:%s?baud=115200 \"Unknown\" \"%s\"\n", bsdPath,
-		       serialName);
-	    }
-	  }
-	}
-
-	IOObjectRelease(serialService);
-      }
-
-      IOObjectRelease(serialPortIterator);    /* Release the iterator. */
-    }
-  }
-#endif
-}
-
-
 /*
 * End of "$Id$".
 */
@@ -0,0 +1,66 @@
+/*
+ * "$Id$"
+ *
+ *   Server Message Block backend for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-1999 by Easy Software Products, all rights reserved.
+ *
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44145 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ */
+
+/*
+ * Include necessary headers.
+ */
+
+#include <cups/cups.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <cups/string.h>
+
+
+/*
+ * 'main()' - Send a file to the printer or server.
+ *
+ * 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 */
+{
+  if (argc < 6 || argc > 7)
+  {
+    fprintf(stderr, "Usage: %s job-id user title copies options [file]\n",
+            argv[0]);
+    return (1);
+  }
+
+  fputs("ERROR: Backend not implemented yet!\n", stderr);
+
+  return (1);
+}
+
+
+
+/*
+ * End of "$Id$".
+ */
@@ -3,7 +3,7 @@
 *
 *   AppSocket backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-1999 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -21,8 +21,6 @@
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
 *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
 * Contents:
 *
 *   main() - Send a file to the printer or server.
@@ -40,18 +38,15 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <signal.h>

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


 /*
@@ -70,10 +65,8 @@ 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) */
-  int		fp;		/* Print file */
-  int		copies;		/* Number of copies to print */
+  FILE		*fp;		/* Print file */
  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,41 +78,9 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 		*bufptr;	/* Pointer into buffer */
  struct timeval timeout;	/* Timeout for select() */
  fd_set	input;		/* Input set for select() */
-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  struct sigaction action;	/* Actions for POSIX signals */
-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */


- /*
-  * Make sure status messages are not buffered...
-  */
-
-  setbuf(stderr, NULL);
-
- /*
-  * Ignore SIGPIPE signals...
-  */
-
-#ifdef HAVE_SIGSET
-  sigset(SIGPIPE, SIG_IGN);
-#elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
-  action.sa_handler = SIG_IGN;
-  sigaction(SIGPIPE, &action, NULL);
-#else
-  signal(SIGPIPE, SIG_IGN);
-#endif /* HAVE_SIGSET */
-
- /*
-  * Check command-line...
-  */
-
-  if (argc == 1)
-  {
-    puts("network socket \"Unknown\" \"AppSocket/HP JetDirect\"");
-    return (0);
-  }
-  else if (argc < 6 || argc > 7)
+  if (argc < 6 || argc > 7)
  {
    fprintf(stderr, "Usage: %s job-id user title copies options [file]\n",
            argv[0]);
@@ -132,23 +93,18 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  */

  if (argc == 6)
-  {
-    fp     = 0;
-    copies = 1;
-  }
+    fp = stdin;
  else
  {
   /*
    * Try to open the print file...
    */

-    if ((fp = open(argv[6], O_RDONLY)) < 0)
+    if ((fp = fopen(argv[6], "rb")) == NULL)
    {
      perror("ERROR: unable to open print file");
      return (1);
    }
-
-    copies = atoi(argv[4]);
  }

 /*
@@ -164,9 +120,9 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  * Then try to connect to the remote host...
  */

-  if ((hostaddr = httpGetHostByName(hostname)) == NULL)
+  if ((hostaddr = gethostbyname(hostname)) == NULL)
  {
-    fprintf(stderr, "ERROR: Unable to locate printer \'%s\' - %s\n",
+    fprintf(stderr, "ERROR: Unable to locate printer \'%s\' - %s",
            hostname, strerror(errno));
    return (1);
  }
@@ -179,184 +135,93 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  addr.sin_family = hostaddr->h_addrtype;
  addr.sin_port   = htons(port);

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

 /*
-  * Close the input file and return...
+  * Finally, send the print file...
  */

-  if (fp != 0)
-    close(fp);
+  fputs("INFO: Connected to host, sending print job...\n", stderr);

-  fputs("INFO: Ready to print.\n", stderr);
+  tbytes = 0;
+  while ((nbytes = fread(buffer, 1, sizeof(buffer), fp)) > 0)
+  {
+   /*
+    * Write the print data to the printer...
+    */
+
+    tbytes += nbytes;
+    bufptr = buffer;
+
+    while (nbytes > 0)
+    {
+      if ((wbytes = send(fd, bufptr, nbytes, 0)) < 0)
+      {
+	perror("ERROR: Unable to send print file to printer");
+	break;
+      }
+
+      nbytes -= wbytes;
+      bufptr += wbytes;
+    }
+
+   /*
+    * Check for possible data coming back from the printer...
+    */
+
+    timeout.tv_sec = 0;
+    timeout.tv_usec = 0;
+    FD_ZERO(&input);
+    FD_SET(fd, &input);
+    if (select(fd + 1, &input, NULL, NULL, &timeout) > 0)
+    {
+     /*
+      * Grab the data coming back and spit it out to stderr...
+      */
+
+      if ((nbytes = recv(fd, buffer, sizeof(buffer), 0)) > 0)
+	fprintf(stderr, "INFO: Received %u bytes of back-channel data!\n",
+	        nbytes);
+    }
+    else if (argc > 6)
+      fprintf(stderr, "INFO: Sending print file, %u bytes...\n", tbytes);
+  }
+
+ /*
+  * Close the socket connection and input file and return...
+  */
+
+  close(fd);
+  if (fp != stdin)
+    fclose(fp);

  return (0);
 }
@@ -1,789 +0,0 @@
-/*
- * "$Id$"
- *
- *   USB port backend for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 1997-2003 by Easy Software Products, all rights reserved.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   main()         - Send a file to the specified USB port.
- *   list_devices() - List all USB devices.
- */
-
-/*
- * Include necessary headers.
- */
-
-#include <cups/cups.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <cups/string.h>
-#include <signal.h>
-
-#ifdef WIN32
-#  include <io.h>
-#else
-#  include <unistd.h>
-#  include <fcntl.h>
-#  include <termios.h>
-#endif /* WIN32 */
-
-#ifdef __linux
-#  include <sys/ioctl.h>
-#  include <linux/lp.h>
-#  define IOCNR_GET_DEVICE_ID		1
-
-/*
- * Get device_id string
- */
-#  define LPIOC_GET_DEVICE_ID(len)	_IOC(_IOC_READ, 'P', IOCNR_GET_DEVICE_ID, len)
-#endif /* __linux */
-
-#ifdef __sun
-#  include <sys/ecppio.h>
-#endif /* __sun */
-
-
-/*
- * Local functions...
- */
-
-void	decode_device_id(int port, const char *device_id,
-	                 char *make_model, int mmsize,
-			 char *uri, int urisize);
-void	list_devices(void);
-int	open_device(const char *uri);
-
-
-/*
- * 'main()' - Send a file to the specified USB port.
- *
- * Usage:
- *
- *    printer-uri job-id user title copies options [file]
- */
-
-int			/* O - Exit status */
-main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
-     char *argv[])	/* I - Command-line arguments */
-{
-  int		fp;		/* Print file */
-  int		copies;		/* Number of copies to print */
-  int		fd;		/* Parallel device */
-  int		wbytes;		/* Number of bytes written */
-  size_t	nbytes,		/* Number of bytes read */
-		tbytes;		/* Total number of bytes written */
-  char		buffer[8192],	/* Output buffer */
-		*bufptr;	/* Pointer into buffer */
-  struct termios opts;		/* Parallel port options */
-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  struct sigaction action;	/* Actions for POSIX signals */
-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-#ifdef __linux
-  unsigned char	status;		/* Port status (off-line, out-of-paper, etc.) */
-#endif /* __linux */
-
-
- /*
-  * Make sure status messages are not buffered...
-  */
-
-  setbuf(stderr, NULL);
-
- /*
-  * Ignore SIGPIPE signals...
-  */
-
-#ifdef HAVE_SIGSET
-  sigset(SIGPIPE, SIG_IGN);
-#elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
-  action.sa_handler = SIG_IGN;
-  sigaction(SIGPIPE, &action, NULL);
-#else
-  signal(SIGPIPE, SIG_IGN);
-#endif /* HAVE_SIGSET */
-
- /*
-  * Check command-line...
-  */
-
-  if (argc == 1)
-  {
-    list_devices();
-    return (0);
-  }
-  else if (argc < 6 || argc > 7)
-  {
-    fputs("Usage: USB 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]);
-  }
-
- /*
-  * Open the USB port device...
-  */
-
-  do
-  {
-    if ((fd = open_device(argv[0])) == -1)
-    {
-      if (errno == EBUSY)
-      {
-        fputs("INFO: USB port busy; will retry in 30 seconds...\n", stderr);
-	sleep(30);
-      }
-      else if (errno == ENXIO || errno == EIO || errno == ENOENT)
-      {
-        fputs("INFO: Printer not connected; will retry in 30 seconds...\n", stderr);
-	sleep(30);
-      }
-      else
-      {
-	fprintf(stderr, "ERROR: Unable to open USB device \"%s\": %s\n",
-	        argv[0], strerror(errno));
-	return (1);
-      }
-    }
-  }
-  while (fd < 0);
-
- /*
-  * Set any options provided...
-  */
-
-  tcgetattr(fd, &opts);
-
-  opts.c_lflag &= ~(ICANON | ECHO | ISIG);	/* Raw mode */
-
-  /**** No options supported yet ****/
-
-  tcsetattr(fd, TCSANOW, &opts);
-
- /*
-  * Now that we are "connected" to the port, ignore SIGTERM so that we
-  * can finish out any page data the driver sends (e.g. to eject the
-  * current page...  Only ignore SIGTERM if we are printing data from
-  * stdin (otherwise you can't cancel raw jobs...)
-  */
-
-  if (argc < 7)
-  {
-#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-    sigset(SIGTERM, SIG_IGN);
-#elif defined(HAVE_SIGACTION)
-    memset(&action, 0, sizeof(action));
-
-    sigemptyset(&action.sa_mask);
-    action.sa_handler = SIG_IGN;
-    sigaction(SIGTERM, &action, NULL);
-#else
-    signal(SIGTERM, SIG_IGN);
-#endif /* HAVE_SIGSET */
-  }
-
-#ifdef __linux
- /*
-  * Show the printer status before we send the file; normally, we'd
-  * do this while we write data to the printer, however at least some
-  * Linux kernels have buggy USB drivers which don't like to be
-  * queried while sending data to the printer...
-  */
-
-  if (ioctl(fd, LPGETSTATUS, &status) == 0)
-  {
-    fprintf(stderr, "DEBUG: LPGETSTATUS returned a port status of %02X...\n", status);
-
-    if (status & LP_NOPA)
-      fputs("WARNING: Media tray empty!\n", stderr);
-    else if (status & LP_ERR)
-      fputs("WARNING: Printer fault!\n", stderr);
-    else if (status & LP_OFFL)
-      fputs("WARNING: Printer off-line.\n", stderr);
-  }
-#endif /* __linux */
-
- /*
-  * Finally, send the print file...
-  */
-
-  while (copies > 0)
-  {
-    copies --;
-
-    if (fp != 0)
-    {
-      fputs("PAGE: 1 1\n", stderr);
-      lseek(fp, 0, SEEK_SET);
-    }
-
-    tbytes = 0;
-    while ((nbytes = read(fp, buffer, sizeof(buffer))) > 0)
-    {
-     /*
-      * Write the print data to the printer...
-      */
-
-      tbytes += nbytes;
-      bufptr = buffer;
-
-      while (nbytes > 0)
-      {
-
-	if ((wbytes = write(fd, bufptr, nbytes)) < 0)
-	  if (errno == ENOTTY)
-	    wbytes = write(fd, bufptr, nbytes);
-
-	if (wbytes < 0)
-	{
-	  perror("ERROR: Unable to send print file to printer");
-	  break;
-	}
-
-	nbytes -= wbytes;
-	bufptr += wbytes;
-      }
-
-      if (argc > 6)
-	fprintf(stderr, "INFO: Sending print file, %lu bytes...\n",
-	        (unsigned long)tbytes);
-    }
-  }
-
- /*
-  * Close the socket connection and input file and return...
-  */
-
-  close(fd);
-  if (fp != 0)
-    close(fp);
-
-  fputs("INFO: Ready to print.\n", stderr);
-
-  return (0);
-}
-
-
-/*
- * 'decode_device_id()' - Decode the IEEE-1284 device ID string.
- */
-
-void
-decode_device_id(int        port,		/* I - Port number */
-                 const char *device_id,		/* I - 1284 device ID string */
-                 char       *make_model,	/* O - Make/model */
-		 int        mmsize,		/* I - Size of buffer */
-		 char       *uri,		/* O - Device URI */
-		 int        urisize)		/* I - Size of buffer */
-{
-  char	*attr,					/* 1284 attribute */
-  	*delim,					/* 1284 delimiter */
-	*uriptr,				/* Pointer into URI */
-	line[1024];				/* Line from devices file */
-  FILE	*fp;					/* /proc/bus/usb/devices file */
-  int	current;				/* Current printer port */
-  char	serial_number[1024],			/* Serial number string */
-	temp[1024];				/* Temporary string */
-
-
- /*
-  * Look for the description field...
-  */
-
-  if ((attr = strstr(device_id, "DES:")) != NULL)
-    attr += 4;
-  else if ((attr = strstr(device_id, "DESCRIPTION:")) != NULL)
-    attr += 12;
-
-  if (attr)
-  {
-    if (strncasecmp(attr, "Hewlett-Packard ", 16) == 0)
-    {
-      strlcpy(make_model, "HP ", mmsize);
-      strlcpy(make_model + 3, attr + 16, mmsize - 3);
-    }
-    else
-    {
-      strlcpy(make_model, attr, mmsize);
-    }
-
-    if ((delim = strchr(make_model, ';')) != NULL)
-      *delim = '\0';
-  }
-  else
-    strlcpy(make_model, "Unknown", mmsize);
-
- /*
-  * Look for the serial number field...
-  */
-
-  if ((attr = strstr(device_id, "SERN:")) != NULL)
-    attr += 5;
-  else if ((attr = strstr(device_id, "SERIALNUMBER:")) != NULL)
-    attr += 13;
-
-  if (attr)
-  {
-    strlcpy(serial_number, attr, sizeof(serial_number));
-
-    if ((delim = strchr(serial_number, ';')) != NULL)
-      *delim = '\0';
-  }
-  else if ((fp = fopen("/proc/bus/usb/devices", "r")) != NULL)
-  {
-    serial_number[0] = '\0';
-
-    for (current = 0; fgets(line, sizeof(line), fp) != NULL;)
-    {
-      if (line[0] == 'S' && (attr = strstr(line, "SerialNumber=")) != NULL)
-      {
-       /*
-        * Copy serial number from line...
-	*/
-
-	strlcpy(temp, attr + 13, sizeof(temp));
-	if ((delim = strchr(temp, '\n')) != NULL)
-	  *delim = '\0';
-      }
-      else if (line[0] == 'I' && strstr(line, "Driver=usblp") != NULL &&
-               strstr(line, "Prot=02") != NULL)
-      {
-       /*
-        * Found printer device; if current == port, then use it!
-	*/
-
-	if (current == port)
-	{
-	  strlcpy(serial_number, temp, sizeof(serial_number));
-	  break;
-	}
-
-	current ++;
-      }
-    }
-
-    fclose(fp);
-  }
-
- /*
-  * Generate the device URI from the make_model and serial number strings.
-  */
-
-  strlcpy(uri, "usb://", urisize);
-  for (uriptr = uri + 6, delim = make_model;
-       *delim && uriptr < (uri + urisize - 1);
-       delim ++)
-    if (*delim == ' ')
-    {
-      delim ++;
-      *uriptr++ = '/';
-      break;
-    }
-    else
-      *uriptr++ = *delim;
-
-  for (; *delim && uriptr < (uri + urisize - 3); delim ++)
-    if (*delim == ' ')
-    {
-      *uriptr++ = '%';
-      *uriptr++ = '2';
-      *uriptr++ = '0';
-    }
-    else
-      *uriptr++ = *delim;
-
-  *uriptr = '\0';
-
-  if (serial_number[0])
-  {
-   /*
-    * Add the serial number to the URI...
-    */
-
-    strlcat(uri, "?serial=", urisize);
-    strlcat(uri, serial_number, urisize);
-  }
-}
-
-
-/*
- * 'list_devices()' - List all USB devices.
- */
-
-void
-list_devices(void)
-{
-#ifdef __linux
-  int	i;			/* Looping var */
-  int	length;			/* Length of device ID info */
-  int	fd;			/* File descriptor */
-  char	format[255],		/* Format for device filename */
-	device[255],		/* Device filename */
-	device_id[1024],	/* Device ID string */
-	device_uri[1024],	/* Device URI string */
-	make_model[1024];	/* Make and model */
-
-
- /*
-  * First figure out which USB printer filename to use...
-  */
-
-  if (access("/dev/usb/lp0", 0) == 0)
-    strcpy(format, "/dev/usb/lp%d");
-  else if (access("/dev/usb/usblp0", 0) == 0)
-    strcpy(format, "/dev/usb/usblp%d");
-  else
-    strcpy(format, "/dev/usblp%d");
-
- /*
-  * Then open each USB device...
-  */
-
-  for (i = 0; i < 16; i ++)
-  {
-    sprintf(device, format, i);
-
-    if ((fd = open(device, O_RDWR | O_EXCL)) >= 0)
-    {
-      if (ioctl(fd, LPIOC_GET_DEVICE_ID(sizeof(device_id)), device_id) == 0)
-      {
-	length = (((unsigned)device_id[0] & 255) << 8) +
-	         ((unsigned)device_id[1] & 255);
-
-       /*
-        * Check to see if the length is larger than our buffer; first
-	* assume that the vendor incorrectly implemented the 1284 spec,
-	* and then limit the length to the size of our buffer...
-	*/
-
-        if (length > (sizeof(device_id) - 2))
-	  length = (((unsigned)device_id[1] & 255) << 8) +
-	           ((unsigned)device_id[0] & 255);
-
-        if (length > (sizeof(device_id) - 2))
-	  length = sizeof(device_id) - 2;
-
-	memcpy(device_id, device_id + 2, length);
-	device_id[length] = '\0';
-      }
-      else
-        device_id[0] = '\0';
-
-      close(fd);
-    }
-    else
-      device_id[0] = '\0';
-
-    if (device_id[0])
-    {
-      decode_device_id(i, device_id, make_model, sizeof(make_model),
-		       device_uri, sizeof(device_uri));
-
-      printf("direct %s \"%s\" \"USB Printer #%d\"\n", device_uri,
-	     make_model, i + 1);
-    }
-    else
-      printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
-  }
-#elif defined(__sgi)
-#elif defined(__sun)
-  int	i;			/* Looping var */
-  int	fd;			/* File descriptor */
-  char	device[255],		/* Device filename */
-	device_id[1024],	/* Device ID string */
-	device_uri[1024],	/* Device URI string */
-	make_model[1024];	/* Make and model */
-#  ifdef ECPPIOC_GETDEVID
-  struct ecpp_device_id did;	/* Device ID buffer */
-#  endif /* ECPPIOC_GETDEVID */
-
-
- /*
-  * Open each USB device...
-  */
-
-  for (i = 0; i < 8; i ++)
-  {
-    sprintf(device, "/dev/usb/printer%d", i);
-
-#  ifndef ECPPIOC_GETDEVID
-    if (!access(device, 0))
-      printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
-#  else
-    if ((fd = open(device, O_RDWR | O_EXCL)) >= 0)
-    {
-      did.mode = ECPP_CENTRONICS;
-      did.len  = sizeof(device_id);
-      did.rlen = 0;
-      did.addr = device_id;
-
-      if (ioctl(fd, ECPPIOC_GETDEVID, &did) == 0)
-      {
-        if (did.rlen < (sizeof(device_id) - 1))
-	  device_id[did.rlen] = '\0';
-        else
-	  device_id[sizeof(device_id) - 1] = '\0';
-      }
-      else
-        device_id[0] = '\0';
-
-      close(fd);
-    }
-    else
-      device_id[0] = '\0';
-
-    if (device_id[0])
-    {
-      decode_device_id(i, device_id, make_model, sizeof(make_model),
-		       device_uri, sizeof(device_uri));
-
-      printf("direct %s \"%s\" \"USB Printer #%d\"\n", device_uri,
-	     make_model, i + 1);
-    }
-    else
-      printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
-#  endif /* !ECPPIOC_GETDEVID */
-  }
-#elif defined(__hpux)
-#elif defined(__osf)
-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-  int   i;                      /* Looping var */
-  char  device[255];            /* Device filename */
-
-
-  for (i = 0; i < 8; i ++)
-  {
-    sprintf(device, "/dev/ulpt%d", i);
-    if (!access(device, 0))
-      printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
-
-    sprintf(device, "/dev/unlpt%d", i);
-    if (!access(device, 0))
-      printf("direct usb:%s \"Unknown\" \"USB Printer #%d (no reset)\"\n", device, i + 1);
-  }
-#endif
-}
-
-
-/*
- * 'open_device()' - Open a USB device...
- */
-
-int					/* O - File descriptor or -1 on error */
-open_device(const char *uri)		/* I - Device URI */
-{
- /*
-  * The generic implementation just treats the URI as a device filename...
-  * Specific operating systems may also support using the device serial
-  * number and/or make/model.
-  */
-
-  if (strncmp(uri, "usb:/dev/", 9) == 0)
-    return (open(uri + 4, O_RDWR | O_EXCL));
-#ifdef __linux
-  else if (strncmp(uri, "usb://", 6) == 0)
-  {
-   /*
-    * For Linux, try looking up the device serial number or model...
-    */
-
-    int		i;			/* Looping var */
-    int		length;			/* Length of device ID info */
-    int		fd;			/* File descriptor */
-    char	format[255],		/* Format for device filename */
-		device[255],		/* Device filename */
-		device_id[1024],	/* Device ID string */
-		make_model[1024],	/* Make and model */
-		device_uri[1024];	/* Device URI string */
-
-
-   /*
-    * First figure out which USB printer filename to use...
-    */
-
-    if (access("/dev/usb/lp0", 0) == 0)
-      strcpy(format, "/dev/usb/lp%d");
-    else if (access("/dev/usb/usblp0", 0) == 0)
-      strcpy(format, "/dev/usb/usblp%d");
-    else
-      strcpy(format, "/dev/usblp%d");
-
-   /*
-    * Then find the correct USB device...
-    */
-
-    for (i = 0; i < 16; i ++)
-    {
-      sprintf(device, format, i);
-
-      if ((fd = open(device, O_RDWR | O_EXCL)) >= 0)
-      {
-	if (ioctl(fd, LPIOC_GET_DEVICE_ID(sizeof(device_id)), device_id) == 0)
-	{
-	  length = (((unsigned)device_id[0] & 255) << 8) +
-	           ((unsigned)device_id[1] & 255);
-	  memcpy(device_id, device_id + 2, length);
-	  device_id[length] = '\0';
-	}
-	else
-          device_id[0] = '\0';
-      }
-      else
-	device_id[0] = '\0';
-
-      if (device_id[0])
-      {
-       /*
-        * Got the device ID - is this the one?
-	*/
-
-	decode_device_id(i, device_id, make_model, sizeof(make_model),
-                	 device_uri, sizeof(device_uri));
-
-        if (strcmp(uri, device_uri) == 0)
-	  return (fd);	/* Yes, return this file descriptor... */
-      }
-
-     /*
-      * This wasn't the one...
-      */
-
-      close(fd);
-    }
-
-   /*
-    * Couldn't find the printer, return "no such device or address"...
-    */
-
-    errno = ENODEV;
-
-    return (-1);
-  }
-#elif defined(__sun) && defined(ECPPIOC_GETDEVID)
-  else if (strncmp(uri, "usb://", 6) == 0)
-  {
-   /*
-    * For Solaris, try looking up the device serial number or model...
-    */
-
-    int		i;			/* Looping var */
-    int		fd;			/* File descriptor */
-    char	device[255],		/* Device filename */
-		device_id[1024],	/* Device ID string */
-		make_model[1024],	/* Make and model */
-		device_uri[1024];	/* Device URI string */
-    struct ecpp_device_id did;		/* Device ID buffer */
-
-
-   /*
-    * Find the correct USB device...
-    */
-
-    for (i = 0; i < 8; i ++)
-    {
-      sprintf(device, "/dev/usb/printer%d", i);
-
-      if ((fd = open(device, O_RDWR | O_EXCL)) >= 0)
-      {
-	did.mode = ECPP_CENTRONICS;
-	did.len  = sizeof(device_id);
-	did.rlen = 0;
-	did.addr = device_id;
-
-	if (ioctl(fd, ECPPIOC_GETDEVID, &did) == 0)
-	{
-          if (did.rlen < (sizeof(device_id) - 1))
-	    device_id[did.rlen] = '\0';
-          else
-	    device_id[sizeof(device_id) - 1] = '\0';
-	}
-	else
-          device_id[0] = '\0';
-      }
-      else
-	device_id[0] = '\0';
-
-      if (device_id[0])
-      {
-       /*
-        * Got the device ID - is this the one?
-	*/
-
-	decode_device_id(i, device_id, make_model, sizeof(make_model),
-                	 device_uri, sizeof(device_uri));
-
-        if (strcmp(uri, device_uri) == 0)
-	  return (fd);	/* Yes, return this file descriptor... */
-      }
-
-     /*
-      * This wasn't the one...
-      */
-
-      close(fd);
-    }
-
-   /*
-    * Couldn't find the printer, return "no such device or address"...
-    */
-
-    errno = ENODEV;
-
-    return (-1);
-  }
-#endif /* __linux */
-  else
-  {
-    errno = ENODEV;
-    return (-1);
-  }
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -1,4 +0,0 @@
-lpc
-lpq
-lpr
-lprm
@@ -1,11 +0,0 @@
-# DO NOT DELETE
-
-lpc.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-lpc.o: ../cups/ppd.h ../cups/language.h ../cups/debug.h
-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-2003 by Easy Software Products, all rights reserved.
+#   Copyright 1997-1999 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
@@ -14,7 +14,7 @@
 #
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
-#       44141 Airport View Drive, Suite 204
+#       44145 Airport View Drive, Suite 204
 #       Hollywood, Maryland 20636-3111 USA
 #
 #       Voice: (301) 373-9603
@@ -24,9 +24,8 @@

 include ../Makedefs

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

 #
 # Make all targets...
@@ -34,78 +33,49 @@ OBJS	=	lpc.o lpq.o lpr.o lprm.o

 all:	$(TARGETS)

-
 #
 # Clean all object files...
 #

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

 #
 # Install all targets...
 #

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

 #
 # lpc
 #

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

-
-#
-# lpq
-#
-
-lpq:	lpq.o ../cups/$(LIBCUPS)
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o lpq lpq.o $(LIBS)
-
+lpc.o:	../cups/cups.h ../Makedefs

 #
 # lpr
 #

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

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

 #
 # lprm
 #

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

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

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


 /*
@@ -61,6 +60,7 @@ int
 main(int  argc,		/* I - Number of command-line arguments */
     char *argv[])	/* I - Command-line arguments */
 {
+  int		i;		/* Looping var */
  http_t	*http;		/* Connection to server */
  char		line[1024],	/* Input line from user */
 		*params;	/* Pointer to parameters */
@@ -70,7 +70,7 @@ main(int  argc,		/* I - Number of command-line arguments */
  * Connect to the scheduler...
  */

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

  if (argc > 1)
  {
@@ -87,14 +87,8 @@ main(int  argc,		/* I - Number of command-line arguments */
    */

    printf("lpc> ");
-    while (fgets(line, sizeof(line), stdin) != NULL)
+    while (gets(line) != NULL)
    {
-     /*
-      * Strip the trailing newline...
-      */
-
-      line[strlen(line) - 1] = '\0';
-
     /*
      * Find any options in the string...
      */
@@ -179,7 +173,7 @@ do_command(http_t *http,	/* I - HTTP connection to server */
           strcmp(command, "?") == 0)
    show_help(params);
  else
-    printf("%s is not implemented by the CUPS version of lpc.\n", command);
+    puts("?Invalid command");
 }


@@ -217,8 +211,7 @@ show_status(http_t *http,	/* I - HTTP connection to server */
  ipp_t		*request,	/* IPP Request */
 		*response,	/* IPP Response */
 		*jobs;		/* IPP Get Jobs response */
-  ipp_attribute_t *attr,	/* Current attribute */
-		*jattr;		/* Current job attribute */
+  ipp_attribute_t *attr;	/* Current attribute */
  cups_lang_t	*language;	/* Default language */
  char		*printer,	/* Printer name */
 		*device;	/* Device URI */
@@ -230,16 +223,9 @@ show_status(http_t *http,	/* I - HTTP connection to server */
  int		match;		/* Non-zero if this job matches */
  char		printer_uri[HTTP_MAX_URI];
 				/* Printer URI */
-  static const char *requested[] =
-		{		/* Requested attributes */
-		  "printer-name",
-		  "device-uri",
-		  "printer-state",
-		  "printer-is-accepting-jobs"
-		};


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

  if (http == NULL)
    return;
@@ -259,15 +245,11 @@ show_status(http_t *http,	/* I - HTTP connection to server */

  language = cupsLangDefault();

-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-               "attributes-charset", NULL, cupsLangEncoding(language));
+  attr = 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(requested) / sizeof(requested[0]),
-		NULL, requested);
+  attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+                      "attributes-natural-language", NULL, language->language);

 /*
  * Do the request and get back a response...
@@ -275,7 +257,7 @@ show_status(http_t *http,	/* I - HTTP connection to server */

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

   /*
    * Loop through the printers returned in the list and display
@@ -415,26 +397,22 @@ show_status(http_t *http,	/* I - HTTP connection to server */

 	  language = cupsLangDefault();

-	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-                       "attributes-charset", NULL,
-		       cupsLangEncoding(language));
+	  attr = 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);
+	  attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+                	      "attributes-natural-language", NULL,
+			      language->language);

-          snprintf(printer_uri, sizeof(printer_uri),
-                   "ipp://localhost/printers/%s", printer);
-	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
-	               "printer-uri", NULL, printer_uri);
-
-	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-	               "requested-attributes", NULL, "job-id");
+          sprintf(printer_uri, "http://localhost/printers/%s", printer);
+	  attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
+	                      "printer-uri", NULL, printer_uri);

          if ((jobs = cupsDoRequest(http, request, "/jobs/")) != NULL)
 	  {
-	    for (jattr = jobs->attrs; jattr != NULL; jattr = jattr->next)
-	      if (jattr->name && strcmp(jattr->name, "job-id") == 0)
+	    for (attr = jobs->attrs; attr != NULL; attr = attr->next)
+	      if (strcmp(attr->name, "job-id") == 0)
 	        jobcount ++;

            ippDelete(jobs);
@@ -449,15 +427,7 @@ show_status(http_t *http,	/* I - HTTP connection to server */
 	if (strncmp(device, "file:", 5) == 0)
 	  printf("\tprinter is on device \'%s\' speed -1\n", device + 5);
 	else
-	{
-	 /*
-	  * Just show the method...
-	  */
-
-	  *strchr(device, ':') = '\0';
 	  printf("\tprinter is on device \'%s\' speed -1\n", device);
-	}
-
 	printf("\tqueuing is %sabled\n", accepting ? "en" : "dis");
 	printf("\tprinting is %sabled\n",
 	       pstate == IPP_PRINTER_STOPPED ? "dis" : "en");
@@ -1,549 +0,0 @@
-/*
- * "$Id$"
- *
- *   "lpq" command for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 1997-2003 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- * Contents:
- *
- *   main()         - Parse options and commands.
- *   show_jobs()    - Show jobs.
- *   show_printer() - Show printer status.
- */
-
-/*
- * Include necessary headers...
- */
-
-/*
- * Include necessary headers...
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <cups/string.h>
-#include <cups/cups.h>
-#include <cups/language.h>
-#include <cups/debug.h>
-
-
-/*
- * Local functions...
- */
-
-static int	show_jobs(http_t *, const char *, const char *, const int,
-		          const int);
-static void	show_printer(http_t *, const char *);
-
-
-/*
- * 'main()' - Parse options and commands.
- */
-
-int
-main(int  argc,		/* I - Number of command-line arguments */
-     char *argv[])	/* I - Command-line arguments */
-{
-  int		i;		/* Looping var */
-  http_t	*http;		/* Connection to server */
-  const char	*dest,		/* Desired printer */
-		*user;		/* Desired user */
-  char		*instance;	/* Printer instance */
-  int		id,		/* Desired job ID */
-		interval,	/* Reporting interval */
-		longstatus;	/* Show file details */
-  int		num_dests;	/* Number of destinations */
-  cups_dest_t	*dests;		/* Destinations */
-#ifdef HAVE_LIBSSL
-  http_encryption_t encryption;	/* Encryption? */
-#endif /* HAVE_LIBSSL */
-
-
- /*
-  * Connect to the scheduler...
-  */
-
-  if ((http = httpConnectEncrypt(cupsServer(), ippPort(),
-                                 cupsEncryption())) == NULL)
-  {
-    fputs("lpq: Unable to contact server!\n", stderr);
-    return (1);
-  }
-
- /*
-  * Check for command-line options...
-  */
-
-  dest       = NULL;
-  user       = NULL;
-  id         = 0;
-  interval   = 0;
-  longstatus = 0;
-
-  num_dests = cupsGetDests(&dests);
-
-  for (i = 0; i < num_dests; i ++)
-    if (dests[i].is_default)
-      dest = dests[i].name;
-
-  for (i = 1; i < argc; i ++)
-    if (argv[i][0] == '+')
-      interval = atoi(argv[i] + 1);
-    else if (argv[i][0] == '-')
-    {
-      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;
-	    else
-	    {
-	      i ++;
-	      dest = argv[i];
-	    }
-
-	    if ((instance = strchr(dest, '/')) != NULL)
-	      *instance++ = '\0';
-
-            if (cupsGetDest(dest, instance, num_dests, dests) == NULL)
-	    {
-	      if (instance)
-		fprintf(stderr, "lpq: Unknown destination \"%s/%s\"!\n",
-		        dest, instance);
-              else
-		fprintf(stderr, "lpq: Unknown destination \"%s\"!\n", dest);
-
-	      return (1);
-	    }
-	    break;
-
-	case 'a' : /* All printers */
-	    dest = NULL;
-	    break;
-
-	case 'l' : /* Long status */
-	    longstatus = 1;
-	    break;
-
-	default :
-	    fputs("Usage: lpq [-P dest] [-l] [+interval]\n", stderr);
-	    httpClose(http);
-            cupsFreeDests(num_dests, dests);
-	    return (1);
-      }
-    }
-    else if (isdigit(argv[i][0]))
-      id = atoi(argv[i]);
-    else
-      user = argv[i];
-
- /*
-  * Show the status in a loop...
-  */
-
-  for (;;)
-  {
-    if (dest)
-      show_printer(http, dest);
-
-    i = show_jobs(http, dest, user, id, longstatus);
-
-    if (i && interval)
-    {
-      fflush(stdout);
-      sleep(interval);
-    }
-    else
-      break;
-  }
-
- /*
-  * Close the connection to the server and return...
-  */
-
-  cupsFreeDests(num_dests, dests);
-  httpClose(http);
-
-  return (0);
-}
-
-
-/*
- * 'show_jobs()' - Show jobs.
- */
-
-static int			/* O - Number of jobs in queue */
-show_jobs(http_t     *http,	/* I - HTTP connection to server */
-          const char *dest,	/* I - Destination */
-	  const char *user,	/* I - User */
-	  const int  id,	/* I - Job ID */
-	  const int  longstatus)/* I - 1 if long report desired */
-{
-  ipp_t		*request,	/* IPP Request */
-		*response;	/* IPP Response */
-  ipp_attribute_t *attr;	/* Current attribute */
-  cups_lang_t	*language;	/* Default language */
-  const char	*jobdest,	/* Pointer into job-printer-uri */
-		*jobuser,	/* Pointer to job-originating-user-name */
-		*jobname;	/* Pointer to job-name */
-  ipp_jstate_t	jobstate;	/* job-state */
-  int		jobid,		/* job-id */
-		jobsize,	/* job-k-octets */
-#ifdef __osf__
-		jobpriority,	/* job-priority */
-#endif /* __osf__ */
-		jobcount,	/* Number of jobs */
-		jobcopies,	/* Number of copies */
-		rank;		/* Rank of job */
-  char		resource[1024];	/* Resource string */
-  char		rankstr[255];	/* Rank string */
-  char		namestr[1024];	/* Job name string */
-  static const char *ranks[10] =/* Ranking strings */
-		{
-		  "th",
-		  "st",
-		  "nd",
-		  "rd",
-		  "th",
-		  "th",
-		  "th",
-		  "th",
-		  "th",
-		  "th"
-		};
-
-
-  DEBUG_printf(("show_jobs(%08x, %08x, %08x, %d, %d)\n", http, dest, user, id,
-                longstatus));
-
-  if (http == NULL)
-    return (0);
-
- /*
-  * Build an IPP_GET_JOBS or IPP_GET_JOB_ATTRIBUTES request, which requires
-  * the following attributes:
-  *
-  *    attributes-charset
-  *    attributes-natural-language
-  *    job-uri or printer-uri
-  */
-
-  request = ippNew();
-
-  request->request.op.operation_id = id ? IPP_GET_JOB_ATTRIBUTES : IPP_GET_JOBS;
-  request->request.op.request_id   = 1;
-
-  language = cupsLangDefault();
-
-  attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-                      "attributes-charset", NULL, cupsLangEncoding(language));
-
-  attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-                      "attributes-natural-language", NULL, language->language);
-
-  if (dest == NULL)
-  {
-    if (id)
-      sprintf(resource, "ipp://localhost/jobs/%d", id);
-    else
-      strcpy(resource, "ipp://localhost/jobs");
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri",
-                 NULL, resource);
-  }
-  else
-  {
-    snprintf(resource, sizeof(resource), "ipp://localhost/printers/%s", dest);
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
-                 NULL, resource);
-  }
-
-  if (user)
-  {
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-                 "requesting-user-name", NULL, user);
-    ippAddBoolean(request, IPP_TAG_OPERATION, "my-jobs", 1);
-  }
-
- /*
-  * Do the request and get back a response...
-  */
-
-  jobcount = 0;
-
-  if ((response = cupsDoRequest(http, request, "/")) != NULL)
-  {
-    if (response->request.status.status_code > IPP_OK_CONFLICT)
-    {
-      fprintf(stderr, "lpq: get-jobs failed: %s\n",
-              ippErrorString(response->request.status.status_code));
-      ippDelete(response);
-      return (0);
-    }
-
-    rank = 1;
-
-   /*
-    * Loop through the job list and display them...
-    */
-
-    for (attr = response->attrs; attr != NULL; attr = attr->next)
-    {
-     /*
-      * Skip leading attributes until we hit a job...
-      */
-
-      while (attr != NULL && attr->group_tag != IPP_TAG_JOB)
-        attr = attr->next;
-
-      if (attr == NULL)
-        break;
-
-     /*
-      * Pull the needed attributes from this job...
-      */
-
-      jobid       = 0;
-      jobsize     = 0;
-#ifdef __osf__
-      jobpriority = 50;
-#endif /* __osf__ */
-      jobstate    = IPP_JOB_PENDING;
-      jobname     = "untitled";
-      jobuser     = NULL;
-      jobdest     = NULL;
-      jobcopies   = 1;
-
-      while (attr != NULL && attr->group_tag == IPP_TAG_JOB)
-      {
-        if (strcmp(attr->name, "job-id") == 0 &&
-	    attr->value_tag == IPP_TAG_INTEGER)
-	  jobid = attr->values[0].integer;
-
-        if (strcmp(attr->name, "job-k-octets") == 0 &&
-	    attr->value_tag == IPP_TAG_INTEGER)
-	  jobsize = attr->values[0].integer * 1024;
-
-#ifdef __osf__
-        if (strcmp(attr->name, "job-priority") == 0 &&
-	    attr->value_tag == IPP_TAG_INTEGER)
-	  jobpriority = attr->values[0].integer;
-#endif /* __osf__ */
-
-        if (strcmp(attr->name, "job-state") == 0 &&
-	    attr->value_tag == IPP_TAG_ENUM)
-	  jobstate = (ipp_jstate_t)attr->values[0].integer;
-
-        if (strcmp(attr->name, "job-printer-uri") == 0 &&
-	    attr->value_tag == IPP_TAG_URI)
-	  if ((jobdest = strrchr(attr->values[0].string.text, '/')) != NULL)
-	    jobdest ++;
-
-        if (strcmp(attr->name, "job-originating-user-name") == 0 &&
-	    attr->value_tag == IPP_TAG_NAME)
-	  jobuser = attr->values[0].string.text;
-
-        if (strcmp(attr->name, "job-name") == 0 &&
-	    attr->value_tag == IPP_TAG_NAME)
-	  jobname = attr->values[0].string.text;
-
-        if (strcmp(attr->name, "copies") == 0 &&
-	    attr->value_tag == IPP_TAG_INTEGER)
-	  jobcopies = attr->values[0].integer;
-
-        attr = attr->next;
-      }
-
-     /*
-      * See if we have everything needed...
-      */
-
-      if (jobdest == NULL || jobid == 0)
-      {
-        if (attr == NULL)
-	  break;
-	else
-          continue;
-      }
-
-      if (!longstatus && jobcount == 0)
-#ifdef __osf__
-	puts("Rank   Owner      Pri  Job        Files                       Total Size");
-#else
-	puts("Rank    Owner   Job     File(s)                         Total Size");
-#endif /* __osf__ */
-
-      jobcount ++;
-
-     /*
-      * Display the job...
-      */
-
-      if (jobstate == IPP_JOB_PROCESSING)
-	strcpy(rankstr, "active");
-      else
-      {
-	snprintf(rankstr, sizeof(rankstr), "%d%s", rank, ranks[rank % 10]);
-	rank ++;
-      }
-
-      if (longstatus)
-      {
-        puts("");
-
-        if (jobcopies > 1)
-	  snprintf(namestr, sizeof(namestr), "%d copies of %s", jobcopies,
-	           jobname);
-	else
-	  strlcpy(namestr, jobname, sizeof(namestr));
-
-        printf("%s: %-34.34s[job %d localhost]\n", jobuser, rankstr, jobid);
-        printf("        %-40.40s%d bytes\n", namestr, jobsize);
-      }
-      else
-#ifdef __osf__
-        printf("%-6s %-10.10s %-4d %-10d %-27.27s %d bytes\n", rankstr, jobuser,
-	       jobpriority, jobid, jobname, jobsize);
-#else
-        printf("%-7s %-8.8s%-8d%-32.32s%d bytes\n", rankstr, jobuser,
-	       jobid, jobname, jobsize);
-#endif /* __osf */
-
-      if (attr == NULL)
-        break;
-    }
-
-    ippDelete(response);
-  }
-  else
-  {
-    fprintf(stderr, "lpq: get-jobs failed: %s\n", ippErrorString(cupsLastError()));
-    return (0);
-  }
-
-  if (jobcount == 0)
-    puts("no entries");
-
-  return (jobcount);
-}
-
-
-/*
- * 'show_printer()' - Show printer status.
- */
-
-static void
-show_printer(http_t     *http,	/* I - HTTP connection to server */
-             const char *dest)	/* I - Destination */
-{
-  ipp_t		*request,	/* IPP Request */
-		*response;	/* IPP Response */
-  ipp_attribute_t *attr;	/* Current attribute */
-  cups_lang_t	*language;	/* Default language */
-  ipp_pstate_t	state;		/* Printer state */
-  char		uri[HTTP_MAX_URI];
-				/* Printer URI */
-
-
-  if (http == NULL)
-    return;
-
- /*
-  * Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the following
-  * attributes:
-  *
-  *    attributes-charset
-  *    attributes-natural-language
-  *    printer-uri
-  */
-
-  request = ippNew();
-
-  request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
-  request->request.op.request_id   = 1;
-
-  language = cupsLangDefault();
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-               "attributes-charset", NULL, cupsLangEncoding(language));
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-               "attributes-natural-language", NULL, language->language);
-
-  snprintf(uri, sizeof(uri), "ipp://localhost/printers/%s", dest);
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
-               "printer-uri", NULL, uri);
-
- /*
-  * Do the request and get back a response...
-  */
-
-  if ((response = cupsDoRequest(http, request, "/")) != NULL)
-  {
-    if (response->request.status.status_code > IPP_OK_CONFLICT)
-    {
-      fprintf(stderr, "lpq: get-printer-attributes failed: %s\n",
-              ippErrorString(response->request.status.status_code));
-      ippDelete(response);
-      return;
-    }
-
-    if ((attr = ippFindAttribute(response, "printer-state", IPP_TAG_ENUM)) != NULL)
-      state = (ipp_pstate_t)attr->values[0].integer;
-    else
-      state = IPP_PRINTER_STOPPED;
-
-    switch (state)
-    {
-      case IPP_PRINTER_IDLE :
-          printf("%s is ready\n", dest);
-	  break;
-      case IPP_PRINTER_PROCESSING :
-          printf("%s is ready and printing\n", dest);
-	  break;
-      case IPP_PRINTER_STOPPED :
-          printf("%s is not ready\n", dest);
-	  break;
-    }
-
-    ippDelete(response);
-  }
-  else
-    fprintf(stderr, "lpq: get-printer-attributes failed: %s\n",
-            ippErrorString(cupsLastError()));
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -3,7 +3,7 @@
 *
 *   "lpr" command for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-1999 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -23,8 +23,7 @@
 *
 * Contents:
 *
- *   main()       - Parse options and send files for printing.
- *   sighandler() - Signal catcher for when we print from stdin...
+ *   main() - Parse options and send files for printing.
 */

 /*
@@ -33,32 +32,9 @@

 #include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
-
-#include <cups/string.h>
 #include <cups/cups.h>


-#ifndef WIN32
-#  include <unistd.h>
-#  include <signal.h>
-
-
-/*
- * Local functions.
- */
-
-void	sighandler(int);
-#endif /* !WIN32 */
-
-
-/*
- * Globals...
- */
-
-char	tempfile[1024];		/* Temporary file for printing from stdin */
-
-
 /*
 * 'main()' - Parse options and send files for printing.
 */
@@ -67,33 +43,23 @@ int
 main(int  argc,		/* I - Number of command-line arguments */
     char *argv[])	/* I - Command-line arguments */
 {
-  int		i, j;		/* Looping var */
+  int		i;		/* Looping var */
  int		job_id;		/* Job ID */
-  char		ch;		/* Option character */
-  char		*printer,	/* Destination printer or class */
-		*instance;	/* Instance */
-  const char	*title;		/* Job title */
+  char		*dest;		/* Destination printer */
+  char		*title;		/* Job title */
+  int		priority;	/* Job priority (1-100) */
  int		num_copies;	/* Number of copies per file */
-  int		num_files;	/* Number of files to print */
-  const char	*files[1000];	/* Files to print */
-  int		num_dests;	/* Number of destinations */
-  cups_dest_t	*dests,		/* Destinations */
-		*dest;		/* Selected destination */
+  int		num_files;	/* Number of files printed */
  int		num_options;	/* Number of options */
  cups_option_t	*options;	/* Options */
-  int		deletefile;	/* Delete file after print? */
+  int		silent;		/* Silent or verbose output? */
+  char		tempfile[1024];	/* Temporary file for printing from stdin */
  char		buffer[8192];	/* Copy buffer */
-  int		temp;		/* Temporary file descriptor */
-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  struct sigaction action;	/* Signal action */
-  struct sigaction oldaction;	/* Old signal action */
-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
+  FILE		*temp;		/* Temporary file pointer */


-  deletefile  = 0;
-  printer     = NULL;
-  num_dests   = 0;
-  dests       = NULL;
+  silent      = 0;
+  dest        = cupsGetDefault();
  num_options = 0;
  options     = NULL;
  num_files   = 0;
@@ -101,34 +67,12 @@ main(int  argc,		/* I - Number of command-line arguments */

  for (i = 1; i < argc; i ++)
    if (argv[i][0] == '-')
-      switch (ch = argv[i][1])
+      switch (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 */
@@ -137,81 +81,32 @@ 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",
-	            ch);
-	    break;
-
-	case 'o' : /* Option */
-	    if (argv[i][2] != '\0')
-	      num_options = cupsParseOptions(argv[i] + 2, num_options, &options);
-	    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);
-	    }
+	            argv[i][1]);
 	    break;

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

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

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

-	case 'm' : /* Mail on completion */
+	case 'm' : /* mail on completion */
 	    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;
-
        case 'P' : /* Destination printer or class */
 	    if (argv[i][2] != '\0')
-	      printer = argv[i] + 2;
+	      dest = argv[i] + 2;
 	    else
 	    {
 	      i ++;
-	      if (i >= argc)
-	      {
-	        fputs("lpr: Expected destination after -P option!\n", stderr);
-		return (1);
-	      }
-
-	      printer = argv[i];
-	    }
-
-            if ((instance = strrchr(printer, '/')) != NULL)
-	      *instance++ = '\0';
-
-	    if (num_dests == 0)
-	      num_dests = cupsGetDests(&dests);
-
-            if ((dest = cupsGetDest(printer, instance, num_dests, dests)) != NULL)
-	    {
-	      for (j = 0; j < dest->num_options; j ++)
-	        if (cupsGetOption(dest->options[j].name, num_options, options) == NULL)
-	          num_options = cupsAddOption(dest->options[j].name,
-		                              dest->options[j].value,
-					      num_options, &options);
+	      dest = argv[i];
 	    }
 	    break;

@@ -221,15 +116,15 @@ 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]);
 	    }

+	    if (num_copies < 1 || num_copies > 100)
+	    {
+	      fputs("lpr: Number copies must be between 1 and 100.\n", stderr);
+	      return (1);
+	    }
+
            sprintf(buffer, "%d", num_copies);
            num_options = cupsAddOption("copies", buffer, num_options, &options);
 	    break;
@@ -242,143 +137,73 @@ 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);
      }
-    else if (num_files < 1000)
+    else
    {
     /*
      * Print a file...
      */

-      if (access(argv[i], R_OK) != 0)
+      if (dest == NULL)
      {
-        fprintf(stderr, "lpr: Unable to access \"%s\" - %s\n", argv[i],
-	        strerror(errno));
-        return (1);
+	fputs("lpr: error - no default destination available.\n", stderr);
+	return (1);
      }

-      files[num_files] = argv[i];
      num_files ++;
-
-      if (title == NULL)
+      if (title)
+        job_id = cupsPrintFile(dest, argv[i], title, num_options, options);
+      else
      {
-        if ((title = strrchr(argv[i], '/')) != NULL)
-	  title ++;
+        char *filename;
+
+        if ((filename = strrchr(argv[i], '/')) != NULL)
+	  filename ++;
 	else
-          title = argv[i];
+	  filename = argv[i];
+
+        job_id = cupsPrintFile(dest, argv[i], filename, num_options, options);
+      }
+
+      if (job_id < 1)
+      {
+	fprintf(stderr, "lpr: unable to print file \'%s\'.\n", argv[i]);
+	return (1);
      }
    }
-    else
-      fprintf(stderr, "lpr: Too many files - \"%s\"\n", argv[i]);
+
 /*
-  * See if we have any files to print; if not, print from stdin...
+  * See if we printed anything; if not, print from stdin...
  */

-  if (printer == NULL)
+  if (num_files == 0)
  {
-    if (num_dests == 0)
-      num_dests = cupsGetDests(&dests);
-
-    for (j = 0, dest = dests; j < num_dests; j ++, dest ++)
-      if (dest->is_default)
-      {
-	printer = dests[j].name;
-
-	for (j = 0; j < dest->num_options; j ++)
-	  if (cupsGetOption(dest->options[j].name, num_options, options) == NULL)
-	    num_options = cupsAddOption(dest->options[j].name,
-		                        dest->options[j].value,
-					num_options, &options);
-        break;
-      }
-  }
-
-  if (printer == NULL)
-  {
-    fputs("lpr: error - no default destination available.\n", stderr);
-    return (1);
-  }
-
-  if (num_files > 0)
-  {
-    job_id = cupsPrintFiles(printer, num_files, files, title, num_options, options);
-
-    if (deletefile)
+    if (dest == NULL)
    {
-     /*
-      * Delete print files after printing...
-      */
-
-      for (i = 0; i < num_files; i ++)
-        unlink(files[i]);
+      fputs("lpr: error - no default destination available.\n", stderr);
+      return (1);
    }
-  }
-  else
-  {
-    num_files = 1;

-#ifndef WIN32
-#  if defined(HAVE_SIGSET)
-    sigset(SIGHUP, sighandler);
-    if (sigset(SIGINT, sighandler) == SIG_IGN)
-      sigset(SIGINT, SIG_IGN);
-    sigset(SIGTERM, sighandler);
-#  elif defined(HAVE_SIGACTION)
-    memset(&action, 0, sizeof(action));
-    action.sa_handler = sighandler;
+    temp = fopen(tmpnam(tempfile), "w");

-    sigaction(SIGHUP, &action, NULL);
-    sigaction(SIGINT, NULL, &oldaction);
-    if (oldaction.sa_handler != SIG_IGN)
-      sigaction(SIGINT, &action, NULL);
-    sigaction(SIGTERM, &action, NULL);
-#  else
-    signal(SIGHUP, sighandler);
-    if (signal(SIGINT, sighandler) == SIG_IGN)
-      signal(SIGINT, SIG_IGN);
-    signal(SIGTERM, sighandler);
-#  endif
-#endif /* !WIN32 */
-
-    if ((temp = cupsTempFd(tempfile, sizeof(tempfile))) < 0)
+    if (temp == NULL)
    {
      fputs("lpr: unable to create temporary file.\n", stderr);
      return (1);
    }

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

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

    if (i == 0)
    {
@@ -387,47 +212,21 @@ main(int  argc,		/* I - Number of command-line arguments */
    }

    if (title)
-      job_id = cupsPrintFile(printer, tempfile, title, num_options, options);
+      job_id = cupsPrintFile(dest, tempfile, title, num_options, options);
    else
-      job_id = cupsPrintFile(printer, tempfile, "(stdin)", num_options, options);
+      job_id = cupsPrintFile(dest, tempfile, "(stdin)", num_options, options);

-    unlink(tempfile);
-  }
-
-  if (job_id < 1)
-  {
-    fprintf(stderr, "lpr: unable to print file: %s\n",
-	    ippErrorString(cupsLastError()));
-    return (1);
+    if (job_id < 1)
+    {
+      fprintf(stderr, "lpr: unable to print file \'%s\'.\n", argv[i]);
+      return (1);
+    }
  }

  return (0);
 }


-#ifndef WIN32
-/*
- * 'sighandler()' - Signal catcher for when we print from stdin...
- */
-
-void
-sighandler(int s)	/* I - Signal number */
-{
- /*
-  * Remove the temporary file we're using to print from stdin...
-  */
-
-  unlink(tempfile);
-
- /*
-  * Exit...
-  */
-
-  exit(s);
-}
-#endif /* !WIN32 */
-
-
 /*
 * End of "$Id$".
 */
@@ -3,7 +3,7 @@
 *
 *   "lprm" command for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-1999 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -14,7 +14,7 @@
 *
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
+ *       44145 Airport View Drive, Suite 204
 *       Hollywood, Maryland 20636-3111 USA
 *
 *       Voice: (301) 373-9603
@@ -32,10 +32,10 @@

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

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


 /*
@@ -49,43 +49,30 @@ main(int  argc,			/* I - Number of command-line arguments */
  http_t	*http;		/* HTTP connection to server */
  int		i;		/* Looping var */
  int		job_id;		/* Job ID */
-  const char	*dest;		/* Destination printer */
-  char		*instance;	/* Pointer to instance name */
+  char		*dest;		/* Destination printer */
  char		uri[1024];	/* Printer or job URI */
  ipp_t		*request;	/* IPP request */
  ipp_t		*response;	/* IPP response */
  ipp_op_t	op;		/* Operation */
  cups_lang_t	*language;	/* Language */
-  int		num_dests;	/* Number of destinations */
-  cups_dest_t	*dests;		/* Destinations */
-  http_encryption_t encryption;	/* Encryption? */


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

-  op         = IPP_CANCEL_JOB;
-  job_id     = 0;
-  dest       = NULL;
-  response   = NULL;
-  http       = NULL;
-  encryption = cupsEncryption();
-
-  num_dests = cupsGetDests(&dests);
-
-  for (i = 0; i < num_dests; i ++)
-    if (dests[i].is_default)
-      dest = dests[i].name;
+  op       = IPP_CANCEL_JOB;
+  job_id   = 0;
+  dest     = cupsGetDefault();
+  response = NULL;

 /*
  * Open a connection to the server...
  */

-  if ((http = httpConnectEncrypt(cupsServer(), ippPort(), encryption)) == NULL)
+  if ((http = httpConnect("localhost", ippPort())) == NULL)
  {
    fputs("lprm: Unable to contact server!\n", stderr);
-    cupsFreeDests(num_dests, dests);
    return (1);
  }

@@ -97,17 +84,6 @@ 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;
@@ -116,23 +92,10 @@ main(int  argc,			/* I - Number of command-line arguments */
 	      i ++;
 	      dest = argv[i];
 	    }
-
-	    if ((instance = strchr(dest, '/')) != NULL)
-	      *instance = '\0';
-
-	    if (cupsGetDest(dest, NULL, num_dests, dests) == NULL)
-	    {
-	      fprintf(stderr, "lprm: Unknown destination \"%s\"!\n", dest);
-              cupsFreeDests(num_dests, dests);
-	      httpClose(http);
-	      return(1);
-	    }
 	    break;

 	default :
 	    fprintf(stderr, "lprm: Unknown option \'%c\'!\n", argv[i][1]);
-            cupsFreeDests(num_dests, dests);
-	    httpClose(http);
 	    return (1);
      }
    else
@@ -141,7 +104,7 @@ main(int  argc,			/* I - Number of command-line arguments */
      * Cancel a job or printer...
      */

-      if (isdigit(argv[i][0]) && cupsGetDest(argv[i], NULL, num_dests, dests) == NULL)
+      if (isdigit(argv[i][0]))
      {
        dest   = NULL;
 	op     = IPP_CANCEL_JOB;
@@ -156,10 +119,7 @@ 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
@@ -186,7 +146,7 @@ main(int  argc,			/* I - Number of command-line arguments */

      if (dest)
      {
-        snprintf(uri, sizeof(uri), "ipp://localhost/printers/%s", dest);
+        sprintf(uri, "http://localhost/printers/%s", dest);
 	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
 	             "printer-uri", NULL, uri);
 	ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "job-id",
@@ -194,14 +154,11 @@ main(int  argc,			/* I - Number of command-line arguments */
      }
      else
      {
-        sprintf(uri, "ipp://localhost/jobs/%d", job_id);
+        sprintf(uri, "http://localhost/jobs/%d", job_id);
 	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri", NULL,
 	             uri);
      }

-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-                   "requesting-user-name", NULL, cupsUser());
-
     /*
      * Do the request and get back a response...
      */
@@ -212,39 +169,10 @@ main(int  argc,			/* I - Number of command-line arguments */
        response = cupsDoRequest(http, request, "/jobs/");

      if (response != NULL)
-      {
-        switch (response->request.status.status_code)
-	{
-	  case IPP_NOT_FOUND :
-              fputs("lprm: Job or printer not found!\n", stderr);
-	      break;
-	  case IPP_NOT_AUTHORIZED :
-              fputs("lprm: Not authorized to lprm job(s)!\n", stderr);
-	      break;
-	  case IPP_FORBIDDEN :
-              fprintf(stderr, "lprm: You don't own job ID %d!\n", job_id);
-	      break;
-	  default :
-              if (response->request.status.status_code > IPP_OK_CONFLICT)
-                fputs("lprm: Unable to lprm job(s)!\n", stderr);
-	      break;
-	}
-
-        if (response->request.status.status_code > IPP_OK_CONFLICT)
-	{
-          ippDelete(response);
-          cupsFreeDests(num_dests, dests);
-          httpClose(http);
-	  return (1);
-	}
-
        ippDelete(response);
-      }
      else
      {
        fputs("lprm: Unable to cancel job(s)!\n", stderr);
-        cupsFreeDests(num_dests, dests);
-        httpClose(http);
 	return (1);
      }
    }
@@ -258,14 +186,9 @@ main(int  argc,			/* I - Number of command-line arguments */
    if (!cupsCancelJob(dest, 0))
    {
      fputs("lprm: Unable to cancel job(s)!\n", stderr);
-      cupsFreeDests(num_dests, dests);
-      httpClose(http);
      return (1);
    }

-  cupsFreeDests(num_dests, dests);
-  httpClose(http);
-
  return (0);
 }

@@ -1,5 +0,0 @@
-admin.cgi
-classes.cgi
-jobs.cgi
-libcgi.a
-printers.cgi
@@ -1,20 +0,0 @@
-# DO NOT DELETE
-
-html.o: cgi.h ../cups/string.h ../config.h
-ipp-var.o: ipp-var.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-ipp-var.o: ../cups/md5.h ../cups/ppd.h ../cups/debug.h ../cups/language.h
-ipp-var.o: ../cups/string.h ../config.h cgi.h
-template.o: cgi.h ../cups/string.h ../config.h
-var.o: cgi.h ../cups/string.h ../config.h
-admin.o: ipp-var.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-admin.o: ../cups/ppd.h ../cups/debug.h ../cups/language.h ../cups/string.h
-admin.o: ../config.h cgi.h
-classes.o: ipp-var.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-classes.o: ../cups/md5.h ../cups/ppd.h ../cups/debug.h ../cups/language.h
-classes.o: ../cups/string.h ../config.h cgi.h
-jobs.o: ipp-var.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-jobs.o: ../cups/ppd.h ../cups/debug.h ../cups/language.h ../cups/string.h
-jobs.o: ../config.h cgi.h
-printers.o: ipp-var.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-printers.o: ../cups/md5.h ../cups/ppd.h ../cups/debug.h ../cups/language.h
-printers.o: ../cups/string.h ../config.h cgi.h
@@ -3,7 +3,7 @@
 #
 #   CGI makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2003 by Easy Software Products.
+#   Copyright 1997-1999 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -14,7 +14,7 @@
 #
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
-#       44141 Airport View Drive, Suite 204
+#       44145 Airport View Drive, Suite 204
 #       Hollywood, Maryland 20636-3111 USA
 #
 #       Voice: (301) 373-9603
@@ -24,11 +24,9 @@

 include ../Makedefs

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

 #
 # Make all targets...
@@ -36,87 +34,29 @@ OBJS	=	$(LIBOBJS) admin.o classes.o jobs.o printers.o

 all:	$(TARGETS)

-
 #
 # Clean all object files...
 #

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

 #
 # Install all targets...
 #

-install:	all
-	$(INSTALL_DIR) $(SERVERBIN)/cgi-bin
-	for file in $(CGIS); do \
-		$(INSTALL_BIN) $$file $(SERVERBIN)/cgi-bin; \
-	done
-
-
-#
-# libcgi.a
-#
-
-libcgi.a:	$(LIBOBJS)
-	echo Archiving $@...
-	$(RM) $@
-	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
-	$(RANLIB) $@
-
-
-#
-# admin.cgi
-#
-
-admin.cgi:	admin.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ admin.o libcgi.a $(LIBS)
-
-
-#
-# classes.cgi
-#
-
-classes.cgi:	classes.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ classes.o libcgi.a $(LIBS)
-
-
-#
-# jobs.cgi
-#
-
-jobs.cgi:	jobs.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ jobs.o libcgi.a $(LIBS)
-
+install:
+	-$(MKDIR) $(SERVERROOT)/cgi-bin
+	$(CP) $(TARGETS) $(SERVERROOT)/cgi-bin

 #
 # printers.cgi
 #

-printers.cgi:	printers.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ printers.o libcgi.a $(LIBS)
-
-
-#
-# Dependencies...
-#
-
-include Dependencies
+printers.cgi:	printers.o ../Makedefs ../cups/libcups.a
+	$(CC) $(LDFLAGS) -o $@ printers.o $(LIBS)

+$(OBJS):	../Makedefs ../cups/cups.h ../cups/ipp.h ../cups/language.h

 #
 # End of "$Id$".
@@ -1,86 +0,0 @@
-/*
- * "$Id$"
- *
- *   CGI support library definitions.
- *
- *   Copyright 1997-2003 by Easy Software Products.
- *
- *   This program is free software; you can redistribute it and/or modify it
- *   under the terms of the GNU General Public License as published by the Free
- *   Software Foundation; either version 2 of the License, or (at your option)
- *   any later version.
- *
- *   This program is distributed in the hope that it will be useful, but
- *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *   for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef _CGI_H_
-#  define _CGI_H_
-
-#  include <stdio.h>
-#  include <stdlib.h>
-#  include <time.h>
-
-#  include <cups/string.h>
-
-#  ifdef WIN32
-#    include <direct.h>
-#    include <io.h>
-#    include <malloc.h>
-#  else
-#    include <unistd.h>
-#  endif /* WIN32 */
-
-
-/*
- * Prototypes...
- */
-
-extern int		cgiInitialize(void);
-extern void		cgiAbort(const char *title, const char *stylesheet,
-			         const char *format, ...);
-extern int		cgiCheckVariables(const char *names);
-extern const char	*cgiGetArray(const char *name, int element);
-extern int		cgiGetSize(const char *name);
-extern void		cgiSetSize(const char *name, int size);
-extern const char	*cgiGetVariable(const char *name);
-extern void		cgiSetArray(const char *name, int element,
-			            const char *value);
-extern void		cgiSetVariable(const char *name, const char *value);
-extern void		cgiCopyTemplateFile(FILE *out, const char *tmpl);
-extern void		cgiCopyTemplateLang(FILE *out, const char *directory,
-			                    const char *tmpl, const char *lang);
-
-extern void		cgiStartHTML(FILE *out, const char *author,
-			             const char *stylesheet,
-			             const char *keywords,
-			             const char *description,
-				     const char *title, ...);
-extern void		cgiEndHTML(FILE *out);
-
-extern FILE		*cgiEMailOpen(const char *from, const char *to,
-			              const char *cc, const char *subject,
-				      int multipart);
-extern void		cgiEMailPart(FILE *mail, const char *type,
-			             const char *charset, const char *encoding);
-extern void		cgiEMailClose(FILE *mail);
-
-extern char		*cgiGetCookie(const char *name, char *buf, int buflen);
-extern void		cgiSetCookie(const char *name, const char *value,
-			             const char *path, const char *domain,
-				     time_t expires, int secure);
-
-#  define cgiGetUser()	getenv("REMOTE_USER")
-#  define cgiGetHost()	(getenv("REMOTE_HOST") == NULL ? getenv("REMOTE_ADDR") : getenv("REMOTE_HOST"))
-
-#endif /* !_CGI_H_ */
-
-/*
- * End of "$Id$".
- */
@@ -1,360 +0,0 @@
-/*
- * "$Id$"
- *
- *   Class status CGI for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 1997-2003 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- * Contents:
- *
- *   main() - Main entry for CGI.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "ipp-var.h"
-
-
-/*
- * 'main()' - Main entry for CGI.
- */
-
-int				/* O - Exit status */
-main(int  argc,			/* I - Number of command-line arguments */
-     char *argv[])		/* I - Command-line arguments */
-{
-  cups_lang_t	*language;	/* Language information */
-  char		*pclass;	/* Printer class name */
-  http_t	*http;		/* Connection to the server */
-  ipp_t		*request,	/* IPP request */
-		*response;	/* IPP response */
-  ipp_attribute_t *attr;	/* IPP attribute */
-  ipp_status_t	status;		/* Operation status... */
-  char		uri[HTTP_MAX_URI];
-				/* Printer URI */
-  const char	*which_jobs;	/* Which jobs to show */
-  const char	*op;		/* Operation to perform, if any */
-
-
- /*
-  * Get any form variables...
-  */
-
-  cgiInitialize();
-  op = cgiGetVariable("OP");
-
- /*
-  * Get the request language...
-  */
-
-  language = cupsLangDefault();
-
- /*
-  * Connect to the HTTP server...
-  */
-
-  http = httpConnectEncrypt("localhost", ippPort(), cupsEncryption());
-
- /*
-  * Tell the client to expect HTML...
-  */
-
-  printf("Content-Type: text/html;charset=%s\n\n", cupsLangEncoding(language));
-
- /*
-  * See if we need to show a list of printers or the status of a
-  * single printer...
-  */
-
-  ippSetServerVersion();
-
-  pclass = argv[0];
-  if (strcmp(pclass, "/") == 0 || strcmp(pclass, "classes.cgi") == 0)
-  {
-    pclass = NULL;
-    cgiSetVariable("TITLE", cupsLangString(language, CUPS_MSG_CLASS));
-  }
-  else
-    cgiSetVariable("TITLE", pclass);
-
-  cgiCopyTemplateLang(stdout, TEMPLATES, "header.tmpl", getenv("LANG"));
-
-  if (op == NULL || strcasecmp(op, "print-test-page") != 0)
-  {
-   /*
-    * Get the default destination...
-    */
-
-    request = ippNew();
-    request->request.op.operation_id = CUPS_GET_DEFAULT;
-    request->request.op.request_id   = 1;
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-        	 "attributes-charset", NULL, cupsLangEncoding(language));
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-        	 "attributes-natural-language", NULL, language->language);
-
-    if ((response = cupsDoRequest(http, request, "/")) != NULL)
-    {
-      if ((attr = ippFindAttribute(response, "printer-name", IPP_TAG_NAME)) != NULL)
-        cgiSetVariable("DEFAULT_NAME", attr->values[0].string.text);
-
-      if ((attr = ippFindAttribute(response, "printer-uri-supported", IPP_TAG_URI)) != NULL)
-      {
-	char	method[HTTP_MAX_URI],
-		username[HTTP_MAX_URI],
-		hostname[HTTP_MAX_URI],
-		resource[HTTP_MAX_URI],
-		uri[HTTP_MAX_URI];
-	int	port;			/* URI data */
-	const char *server;		/* Name of server */
-
-
-       /*
-	* Map localhost access to localhost...
-	*/
-
-        server = getenv("SERVER_NAME");
-
-	httpSeparate(attr->values[0].string.text, method, username,
-		     hostname, &port, resource);
-
-	if (strcasecmp(hostname, server) == 0 &&
-	    (strcmp(getenv("REMOTE_HOST"), "127.0.0.1") == 0 ||
-	     strcmp(getenv("REMOTE_HOST"), "localhost") == 0 ||
-	     strcmp(getenv("REMOTE_HOST"), server) == 0))
-	  strcpy(hostname, "localhost");
-
-       /*
-	* Rewrite URI with HTTP address...
-	*/
-
-	snprintf(uri, sizeof(uri), "http://%s:%d%s", hostname, port,
-		 resource);
-
-        cgiSetVariable("DEFAULT_URI", uri);
-      }
-
-      ippDelete(response);
-    }
-
-   /*
-    * Get the class info...
-    */
-
-    request = ippNew();
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-        	 "attributes-charset", NULL, cupsLangEncoding(language));
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-        	 "attributes-natural-language", NULL, language->language);
-
-    if (pclass == NULL)
-    {
-     /*
-      * Build a CUPS_GET_CLASSES request, which requires the following
-      * attributes:
-      *
-      *    attributes-charset
-      *    attributes-natural-language
-      */
-
-      request->request.op.operation_id = CUPS_GET_CLASSES;
-      request->request.op.request_id   = 1;
-    }
-    else
-    {
-     /*
-      * Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the following
-      * attributes:
-      *
-      *    attributes-charset
-      *    attributes-natural-language
-      *    printer-uri
-      */
-
-      request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
-      request->request.op.request_id   = 1;
-
-      snprintf(uri, sizeof(uri), "ipp://%s/classes/%s", getenv("SERVER_NAME"),
-               pclass);
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL,
-                   uri);
-    }
-
-   /*
-    * Do the request and get back a response...
-    */
-
-    if ((response = cupsDoRequest(http, request, "/")) != NULL)
-    {
-      ippSetCGIVars(response, NULL, NULL);
-      ippDelete(response);
-    }
-
-   /*
-    * Write the report...
-    */
-
-    cgiCopyTemplateLang(stdout, TEMPLATES, "classes.tmpl", getenv("LANG"));
-
-   /*
-    * Get jobs for the specified class if a class has been chosen...
-    */
-
-    if (pclass != NULL)
-    {
-     /*
-      * Build an IPP_GET_JOBS request, which requires the following
-      * attributes:
-      *
-      *    attributes-charset
-      *    attributes-natural-language
-      *    printer-uri
-      */
-
-      request = ippNew();
-
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-        	   "attributes-charset", NULL, cupsLangEncoding(language));
-
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-        	   "attributes-natural-language", NULL, language->language);
-
-      request->request.op.operation_id = IPP_GET_JOBS;
-      request->request.op.request_id   = 1;
-
-      snprintf(uri, sizeof(uri), "ipp://%s/classes/%s", getenv("SERVER_NAME"),
-               pclass);
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL,
-                   uri);
-
-      if ((which_jobs = cgiGetVariable("which_jobs")) != NULL)
-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "which-jobs",
-                     NULL, which_jobs);
-
-     /*
-      * 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"));
-      }
-    }
-  }
-  else
-  {
-   /*
-    * Print a test page...
-    */
-
-    snprintf(uri, sizeof(uri), "ipp://localhost/classes/%s", pclass);
-
-   /*
-    * Build an IPP_PRINT_JOB request, which requires the following
-    * attributes:
-    *
-    *    attributes-charset
-    *    attributes-natural-language
-    *    printer-uri
-    *    requesting-user-name
-    *    document-format
-    */
-
-    request = ippNew();
-
-    request->request.op.operation_id = IPP_PRINT_JOB;
-    request->request.op.request_id   = 1;
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-        	 "attributes-charset", NULL, cupsLangEncoding(language));
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-        	 "attributes-natural-language", NULL, language->language);
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
-        	 NULL, uri);
-
-    if (getenv("REMOTE_USER") != NULL)
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
-                   NULL, getenv("REMOTE_USER"));
-    else
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
-                   NULL, "root");
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name",
-        	 NULL, "Test Page");
-
-    ippAddString(request, IPP_TAG_JOB, IPP_TAG_MIMETYPE, "document-format",
-        	 NULL, "application/postscript");
-
-   /*
-    * Do the request and get back a response...
-    */
-
-    if ((response = cupsDoFileRequest(http, request, uri + 15,
-                                      CUPS_DATADIR "/data/testprint.ps")) != NULL)
-    {
-      status = response->request.status.status_code;
-      ippSetCGIVars(response, NULL, NULL);
-
-      ippDelete(response);
-    }
-    else
-      status = cupsLastError();
-
-    cgiSetVariable("PRINTER_NAME", pclass);
-
-    if (status > IPP_OK_CONFLICT)
-    {
-      cgiSetVariable("ERROR", ippErrorString(status));
-      cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
-    }
-    else
-      cgiCopyTemplateLang(stdout, TEMPLATES, "test-page.tmpl", getenv("LANG"));
-  }
-
-  cgiCopyTemplateLang(stdout, TEMPLATES, "trailer.tmpl", getenv("LANG"));
-
- /*
-  * Close the HTTP server connection...
-  */
-
-  httpClose(http);
-  cupsLangFree(language);
-
- /*
-  * Return with no errors...
-  */
-
-  return (0);
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -1,89 +0,0 @@
-/*
- * "$Id$"
- *
- *   CGI HTML functions.
- *
- *   Copyright 1997-2003 by Easy Software Products.
- *
- *   This program is free software; you can redistribute it and/or modify it
- *   under the terms of the GNU General Public License as published by the Free
- *   Software Foundation; either version 2 of the License, or (at your option)
- *   any later version.
- *
- *   This program is distributed in the hope that it will be useful, but
- *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *   for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * Contents:
- *
- *   cgiStartHTML() - Start an HTML document stream.
- *   cgiEndHTML()   - End an HTML document stream.
- */
-
-#include "cgi.h"
-#include <stdarg.h>
-
-
-/*
- * 'cgiStartHTML()' - Start an HTML document stream.
- */
-
-void
-cgiStartHTML(FILE       *out,		/* I - Output file to use */
-             const char *stylesheet,	/* I - Stylesheet to use */
-	     const char *author,	/* I - Author name */
-	     const char *keywords,	/* I - Search keywords */
-	     const char *description,	/* I - Description of document */
-             const char *title,		/* I - Title for page */
-             ...)			/* I - Any addition args for title */
-{
-  va_list	ap;			/* Argument pointer */
-
-
-  fputs("Content-type: text/html\n\n", out);
-  fputs("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" "
-        "\"http://www.w3.org/TR/REC-html40/loose.dtd\">\n", out);
-  fputs("<HTML>\n", out);
-  fputs("<HEAD>\n", out);
-
-  fputs("\t<TITLE>\n", out);
-    va_start(ap, title);
-    vfprintf(out, title, ap);
-    va_end(ap);
-  fputs("</TITLE>\n", out);
-
-  if (stylesheet)
-    fprintf(out, "\t<LINK REL=\"STYLESHEET\" TYPE=\"text/css\" HREF=\"%s\">\n",
-            stylesheet);
-  if (author)
-    fprintf(out, "\t<META NAME=\"AUTHOR\" CONTENT=\"%s\">\n", author);
-  if (keywords)
-    fprintf(out, "\t<META NAME=\"KEYWORDS\" CONTENT=\"%s\">\n", keywords);
-  if (description)
-    fprintf(out, "\t<META NAME=\"DESCRIPTION\" CONTENT=\"%s\">\n", description);
-
-  fputs("</HEAD>\n", out);
-  fputs("<BODY>\n", out);
-}
-
-
-/*
- * 'cgiEndHTML()' - End an HTML document stream.
- */
-
-void
-cgiEndHTML(FILE *out)	/* I - Output file to use */
-{
-  fputs("</BODY>\n", out);
-  fputs("</HTML>\n", out);
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -1,304 +0,0 @@
-/*
- * "$Id$"
- *
- *   IPP variable routines for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 1997-2003 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- * Contents:
- *
- *   ippGetTemplateDir()   - Get the templates directory...
- *   ippSetServerVersion() - Set the server name and CUPS version...
- *   ippSetCGIVars()       - Set CGI variables from an IPP response.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "ipp-var.h"
-
-
-/*
- * 'ippGetTemplateDir()' - Get the templates directory...
- */
-
-char *					/* O - Template directory */
-ippGetTemplateDir(void)
-{
-  const char	*datadir;		/* CUPS_DATADIR env var */
-  static char	templates[1024] = "";	/* Template directory */
-
-
-  if (!templates[0])
-  {
-   /*
-    * Build the template directory pathname...
-    */
-
-    if ((datadir = getenv("CUPS_DATADIR")) == NULL)
-      datadir = CUPS_DATADIR;
-
-    snprintf(templates, sizeof(templates), "%s/templates", datadir);
-  }
-
-  return (templates);
-}
-
-
-/*
- * 'ippSetServerVersion()' - Set the server name and CUPS version...
- */
-
-void
-ippSetServerVersion(void)
-{
-  cgiSetVariable("SERVER_NAME", getenv("SERVER_NAME"));
-  cgiSetVariable("REMOTE_USER", getenv("REMOTE_USER"));
-  cgiSetVariable("CUPS_VERSION", CUPS_SVERSION);
-
-#ifdef LC_TIME
-  setlocale(LC_TIME, "");
-#endif /* LC_TIME */
-}
-
-
-/*
- * 'ippSetCGIVars()' - Set CGI variables from an IPP response.
- */
-
-void
-ippSetCGIVars(ipp_t      *response,	/* I - Response data to be copied... */
-              const char *filter_name,	/* I - Filter name */
-	      const char *filter_value)	/* I - Filter value */
-{
-  int			element;	/* Element in CGI array */
-  ipp_attribute_t	*attr,		/* Attribute in response... */
-			*filter;	/* Filtering attribute */
-  int			i;		/* Looping var */
-  char			name[1024],	/* Name of attribute */
-			value[16384],	/* Value(s) */
-			*valptr;	/* Pointer into value */
-  char			method[HTTP_MAX_URI],
-			username[HTTP_MAX_URI],
-			hostname[HTTP_MAX_URI],
-			resource[HTTP_MAX_URI],
-			uri[HTTP_MAX_URI];
-  int			port;		/* URI data */
-  int			ishttps;	/* Using encryption? */
-  const char		*server;	/* Name of server */
-  struct tm		*date;		/* Date information */
-
-
-  ippSetServerVersion();
-
-  server  = getenv("SERVER_NAME");
-  ishttps = getenv("HTTPS") != NULL;
-
-  for (attr = response->attrs;
-       attr && attr->group_tag == IPP_TAG_OPERATION;
-       attr = attr->next);
-
-  for (element = 0; attr != NULL; attr = attr->next, element ++)
-  {
-   /*
-    * Copy attributes to a separator...
-    */
-
-    if (filter_name)
-    {
-      for (filter = attr;
-           filter != NULL && filter->group_tag != IPP_TAG_ZERO;
-           filter = filter->next)
-        if (filter->name && strcmp(filter->name, filter_name) == 0 &&
-	    (filter->value_tag == IPP_TAG_STRING ||
-	     (filter->value_tag >= IPP_TAG_TEXTLANG &&
-	      filter->value_tag <= IPP_TAG_MIMETYPE)) &&
-	    filter->values[0].string.text != NULL &&
-	    strcasecmp(filter->values[0].string.text, filter_value) == 0)
-	  break;
-
-      if (!filter)
-        return;
-
-      if (filter->group_tag == IPP_TAG_ZERO)
-      {
-        attr = filter;
-	element --;
-	continue;
-      }
-    }
-
-    for (; attr != NULL && attr->group_tag != IPP_TAG_ZERO; attr = attr->next)
-    {
-     /*
-      * Copy the attribute name, substituting "_" for "-"...
-      */
-
-      if (attr->name == NULL)
-        continue;
-
-      for (i = 0; attr->name[i]; i ++)
-        if (attr->name[i] == '-')
-	  name[i] = '_';
-	else
-          name[i] = attr->name[i];
-
-      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';	/* Initially an empty string */
-      valptr   = value; /* Start at the beginning */
-
-      for (i = 0; i < attr->num_values; i ++)
-      {
-	if (i)
-	  strlcat(valptr, ",", sizeof(value) - (valptr - value));
-
-	valptr += strlen(valptr);
-
-	switch (attr->value_tag)
-	{
-	  case IPP_TAG_INTEGER :
-	  case IPP_TAG_ENUM :
-	      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 :
-	      snprintf(valptr, sizeof(value) - (valptr - value),
-	               "%d", attr->values[i].boolean);
-	      break;
-
-	  case IPP_TAG_NOVALUE :
-	      strlcat(valptr, "novalue", sizeof(value) - (valptr - value));
-	      break;
-
-	  case IPP_TAG_RANGE :
-	      snprintf(valptr, sizeof(value) - (valptr - value),
-	               "%d-%d", attr->values[i].range.lower,
-		       attr->values[i].range.upper);
-	      break;
-
-	  case IPP_TAG_RESOLUTION :
-	      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 :
-	      if (strchr(attr->values[i].string.text, ':') != NULL)
-	      {
-		httpSeparate(attr->values[i].string.text, method, username,
-		             hostname, &port, resource);
-
-        	if (strcmp(method, "ipp") == 0 ||
-	            strcmp(method, "http") == 0)
-        	{
-        	 /*
-		  * Map localhost access to localhost and local port...
-		  */
-
-        	  if (strcasecmp(hostname, server) == 0)
-		  {
-		   /*
-		    * Make URI relative to the current server...
-		    */
-
-                    strlcpy(uri, resource, sizeof(uri));
-		  }
-		  else
-		  {
-        	   /*
-		    * Rewrite URI with HTTP address...
-		    */
-
-		    if (username[0])
-		      snprintf(uri, sizeof(uri), "%s://%s@%s:%d%s",
-		               ishttps ? "https" : "http",
-		               username, hostname, port, resource);
-        	    else
-		      snprintf(uri, sizeof(uri), "%s://%s:%d%s", 
-		               ishttps ? "https" : "http",
-			       hostname, port, resource);
-                  }
-
-		  strlcat(valptr, uri, sizeof(value) - (valptr - value));
-        	  break;
-        	}
-              }
-
-          case IPP_TAG_STRING :
-	  case IPP_TAG_TEXT :
-	  case IPP_TAG_NAME :
-	  case IPP_TAG_KEYWORD :
-	  case IPP_TAG_CHARSET :
-	  case IPP_TAG_LANGUAGE :
-	      strlcat(valptr, attr->values[i].string.text,
-	              sizeof(value) - (valptr - value));
-	      break;
-
-          default :
-	      break; /* anti-compiler-warning-code */
-	}
-      }
-
-     /*
-      * Add the element...
-      */
-
-      cgiSetArray(name, element, value);
-    }
-
-    if (attr == NULL)
-      break;
-  }
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -1,55 +0,0 @@
-/*
- * "$Id$"
- *
- *   IPP variable definitions for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 1997-2003 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- */
-
-/*
- * Include necessary headers...
- */
-
-#include <ctype.h>
-#include <cups/cups.h>
-#include <cups/debug.h>
-#include <cups/language.h>
-#include <cups/string.h>
-#include "cgi.h"
-
-
-/*
- * Definitions...
- */
-
-#define TEMPLATES	ippGetTemplateDir()
-
-
-/*
- * Prototype...
- */
-
-extern char	*ippGetTemplateDir(void);
-extern void	ippSetServerVersion(void);
-extern void	ippSetCGIVars(ipp_t *, const char *, const char *);
-
-
-/*
- * End of "$Id$".
- */
@@ -1,259 +0,0 @@
-/*
- * "$Id$"
- *
- *   Job status CGI for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 1997-2003 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- * Contents:
- *
- *   main()      - Main entry for CGI.
- *   do_job_op() - Do a job operation.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "ipp-var.h"
-
-
-/*
- * Local functions...
- */
-
-static void	do_job_op(http_t *http, cups_lang_t *language, ipp_op_t op);
-
-
-/*
- * 'main()' - Main entry for CGI.
- */
-
-int				/* O - Exit status */
-main(int  argc,			/* I - Number of command-line arguments */
-     char *argv[])		/* I - Command-line arguments */
-{
-  cups_lang_t	*language;	/* Language information */
-  http_t	*http;		/* Connection to the server */
-  const char	*which_jobs;	/* Which jobs to show */
-  ipp_t		*request,	/* IPP request */
-		*response;	/* IPP response */
-   const char	*op;		/* Operation name */
-
-
- /*
-  * Get any form variables...
-  */
-
-  cgiInitialize();
-
- /*
-  * Get the request language...
-  */
-
-  language = cupsLangDefault();
-
- /*
-  * Connect to the HTTP server...
-  */
-
-  http = httpConnectEncrypt("localhost", ippPort(), cupsEncryption());
-
- /*
-  * Tell the client to expect HTML...
-  */
-
-  printf("Content-Type: text/html;charset=%s\n\n", cupsLangEncoding(language));
-
-  cgiSetVariable("TITLE", "Jobs");
-
-  ippSetServerVersion();
-
-  cgiCopyTemplateLang(stdout, TEMPLATES, "header.tmpl", getenv("LANG"));
-
-  if ((op = cgiGetVariable("OP")) != NULL)
-  {
-   /*
-    * 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
-    {
-     /*
-      * 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"));
-
- /*
-  * Close the HTTP server connection...
-  */
-
-  httpClose(http);
-  cupsLangFree(language);
-
- /*
-  * Return with no errors...
-  */
-
-  return (0);
-}
-
-
-/*
- * 'do_job_op()' - Do a job operation.
- */
-
-static void
-do_job_op(http_t      *http,		/* I - HTTP connection */
-          cups_lang_t *language,	/* I - Client's language */
-	  ipp_op_t    op)		/* I - Operation to perform */
-{
-  ipp_t		*request,		/* IPP request */
-		*response;		/* IPP response */
-  char		uri[HTTP_MAX_URI];	/* Job URI */
-  const char	*job;			/* Job ID */
-  ipp_status_t	status;			/* Operation status... */
-
-
-  if ((job = cgiGetVariable("JOB_ID")) != NULL)
-    snprintf(uri, sizeof(uri), "ipp://localhost/jobs/%s", job);
-  else
-  {
-    cgiSetVariable("ERROR", ippErrorString(IPP_NOT_FOUND));
-    cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
-    return;
-  }
-
- /*
-  * Build a job request, which requires the following
-  * attributes:
-  *
-  *    attributes-charset
-  *    attributes-natural-language
-  *    job-uri or printer-uri (purge-jobs)
-  *    requesting-user-name
-  */
-
-  request = ippNew();
-
-  request->request.op.operation_id = op;
-  request->request.op.request_id   = 1;
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-               "attributes-charset", NULL, cupsLangEncoding(language));
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-               "attributes-natural-language", NULL, language->language);
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri",
-               NULL, uri);
-
-  if (getenv("REMOTE_USER") != NULL)
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
-                 NULL, getenv("REMOTE_USER"));
-  else
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
-                 NULL, "unknown");
-
- /*
-  * Do the request and get back a response...
-  */
-
-  if ((response = cupsDoRequest(http, request, "/jobs")) != NULL)
-  {
-    status = response->request.status.status_code;
-
-    ippDelete(response);
-  }
-  else
-    status = cupsLastError();
-
-  if (status > IPP_OK_CONFLICT)
-  {
-    cgiSetVariable("ERROR", ippErrorString(status));
-    cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
-  }
-  else if (op == IPP_CANCEL_JOB)
-    cgiCopyTemplateLang(stdout, TEMPLATES, "job-cancel.tmpl", getenv("LANG"));
-  else if (op == IPP_HOLD_JOB)
-    cgiCopyTemplateLang(stdout, TEMPLATES, "job-hold.tmpl", getenv("LANG"));
-  else if (op == IPP_RELEASE_JOB)
-    cgiCopyTemplateLang(stdout, TEMPLATES, "job-release.tmpl", getenv("LANG"));
-  else if (op == IPP_RESTART_JOB)
-    cgiCopyTemplateLang(stdout, TEMPLATES, "job-restart.tmpl", getenv("LANG"));
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -3,7 +3,7 @@
 *
 *   Printer status CGI for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-1999 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -23,14 +23,30 @@
 *
 * Contents:
 *
- *   main() - Main entry for CGI.
+ *   main()              - Main entry for CGI.
+ *   show_printer_list() - Show a list of printers...
+ *   show_printer_info() - Show printer information.
 */

 /*
 * Include necessary headers...
 */

-#include "ipp-var.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <cups/cups.h>
+#include <cups/language.h>
+#include <cups/debug.h>
+
+
+/*
+ * Local functions...
+ */
+
+static void	show_printer_list(http_t *http, cups_lang_t *language);
+static void	show_printer_info(http_t *http, cups_lang_t *language,
+		                  char *name);


 /*
@@ -44,23 +60,9 @@ main(int  argc,			/* I - Number of command-line arguments */
  cups_lang_t	*language;	/* Language information */
  char		*printer;	/* Printer name */
  http_t	*http;		/* Connection to the server */
-  ipp_t		*request,	/* IPP request */
-		*response;	/* IPP response */
-  ipp_attribute_t *attr;	/* IPP attribute */
-  ipp_status_t	status;		/* Operation status... */
-  char		uri[HTTP_MAX_URI];
-				/* Printer URI */
-  const char	*which_jobs;	/* Which jobs to show */
-  const char	*op;		/* Operation to perform, if any */
- 

- /*
-  * Get any form variables...
-  */
-
-  cgiInitialize();
-  op = cgiGetVariable("OP");

+  setbuf(stdout, NULL);
 /*
  * Get the request language...
  */
@@ -71,7 +73,7 @@ main(int  argc,			/* I - Number of command-line arguments */
  * Connect to the HTTP server...
  */

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

 /*
  * Tell the client to expect HTML...
@@ -84,261 +86,74 @@ main(int  argc,			/* I - Number of command-line arguments */
  * single printer...
  */

-  ippSetServerVersion();
-
  printer = argv[0];
-  if (strcmp(printer, "/") == 0 || strstr(printer, "printers.cgi") != NULL)
-  {
+  if (strcmp(printer, "/") == 0 || strcmp(printer, "printers.cgi") == 0)
    printer = NULL;
-    cgiSetVariable("TITLE", cupsLangString(language, CUPS_MSG_PRINTER));
-  }
+
+ /*
+  * Print the standard header...
+  */
+
+  puts("<HTML>");
+  puts("<HEAD>");
+  if (printer)
+    puts("<META HTTP-EQUIV=\"Refresh\" CONTENT=\"10\">");
  else
-    cgiSetVariable("TITLE", printer);
+    puts("<META HTTP-EQUIV=\"Refresh\" CONTENT=\"30\">");
+  printf("<TITLE>%s on %s - Common UNIX Printing System</TITLE>\n",
+         printer == NULL ? "Printers" : printer, getenv("SERVER_NAME"));
+  puts("<LINK REL=STYLESHEET TYPE=\"text/css\" HREF=\"/cups.css\">");
+  puts("<MAP NAME=\"navbar\">");
+  puts("<AREA SHAPE=\"RECT\" COORDS=\"10,10,100,35\" HREF=\"/printers\" ALT=\"Current Printer Status\">");
+  puts("<AREA SHAPE=\"RECT\" COORDS=\"115,10,205,35\" HREF=\"/classes\" ALT=\"Current Printer Classes Status\">");
+  puts("<AREA SHAPE=\"RECT\" COORDS=\"220,10,280,35\" HREF=\"/jobs\" ALT=\"Current Jobs Status\">");
+  puts("<AREA SHAPE=\"RECT\" COORDS=\"295,10,470,35\" HREF=\"/documentation.html\" ALT=\"Read CUPS Documentation On-Line\">");
+  puts("<AREA SHAPE=\"RECT\" COORDS=\"485,10,590,35\" HREF=\"http://www.cups.org\" ALT=\"Download the Current CUPS Software\">");
+  puts("</MAP>");
+  puts("</HEAD>");
+  puts("<BODY>");
+  puts("<P ALIGN=CENTER>");
+  puts("<A HREF=\"http://www.easysw.com\" ALT=\"Easy Software Products Home Page\">");
+  puts("<IMG SRC=\"/images/logo.gif\" WIDTH=\"71\" HEIGHT=\"40\" BORDER=0 ALT=\"Easy Software Products Home Page\"></A>");
+  puts("<IMG SRC=\"/images/navbar.gif\" WIDTH=\"540\" HEIGHT=\"40\" USEMAP=\"#navbar\" BORDER=0>");

-  cgiCopyTemplateLang(stdout, TEMPLATES, "header.tmpl", getenv("LANG"));
+  printf("<H1>%s on %s</H1>\n", printer == NULL ? "Printers" : printer,
+         getenv("SERVER_NAME"));
+  fflush(stdout);

-  if (op == NULL || strcasecmp(op, "print-test-page") != 0)
-  {
-   /*
-    * Get the default destination...
-    */
+  puts("<CENTER>");
+  puts("<TABLE WIDTH=\"90%\" BORDER=\"1\">");
+  puts("<TR>");
+  puts("<TH>Name</TH>");
+  puts("<TH WIDTH=\"50%\">Status</TH>");
+  puts("<TH WIDTH=\"25%\">Jobs</TH>");
+  puts("</TR>");

-    request = ippNew();
-    request->request.op.operation_id = CUPS_GET_DEFAULT;
-    request->request.op.request_id   = 1;
+ /*
+  * Show the information...
+  */

-    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 ((response = cupsDoRequest(http, request, "/")) != NULL)
-    {
-      if ((attr = ippFindAttribute(response, "printer-name", IPP_TAG_NAME)) != NULL)
-        cgiSetVariable("DEFAULT_NAME", attr->values[0].string.text);
-
-      if ((attr = ippFindAttribute(response, "printer-uri-supported", IPP_TAG_URI)) != NULL)
-      {
-	char	method[HTTP_MAX_URI],
-		username[HTTP_MAX_URI],
-		hostname[HTTP_MAX_URI],
-		resource[HTTP_MAX_URI],
-		uri[HTTP_MAX_URI];
-	int	port;			/* URI data */
-	const char *server;		/* Name of server */
-
-
-       /*
-	* Map localhost access to localhost...
-	*/
-
-        server = getenv("SERVER_NAME");
-
-	httpSeparate(attr->values[0].string.text, method, username,
-		     hostname, &port, resource);
-
-	if (strcasecmp(hostname, server) == 0 &&
-	    (strcmp(getenv("REMOTE_HOST"), "127.0.0.1") == 0 ||
-	     strcmp(getenv("REMOTE_HOST"), "localhost") == 0 ||
-	     strcmp(getenv("REMOTE_HOST"), server) == 0))
-	  strcpy(hostname, "localhost");
-
-       /*
-	* Rewrite URI with HTTP address...
-	*/
-
-	snprintf(uri, sizeof(uri), "http://%s:%d%s", hostname, port,
-		 resource);
-
-        cgiSetVariable("DEFAULT_URI", uri);
-      }
-
-      ippDelete(response);
-    }
-
-   /*
-    * Get the printer info...
-    */
-
-    request = ippNew();
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-        	 "attributes-charset", NULL, cupsLangEncoding(language));
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-        	 "attributes-natural-language", NULL, language->language);
-
-    if (printer == NULL)
-    {
-     /*
-      * Build a CUPS_GET_PRINTERS request, which requires the following
-      * attributes:
-      *
-      *    attributes-charset
-      *    attributes-natural-language
-      */
-
-      request->request.op.operation_id = CUPS_GET_PRINTERS;
-      request->request.op.request_id   = 1;
-    }
-    else
-    {
-     /*
-      * Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the following
-      * attributes:
-      *
-      *    attributes-charset
-      *    attributes-natural-language
-      *    printer-uri
-      */
-
-      request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
-      request->request.op.request_id   = 1;
-
-      snprintf(uri, sizeof(uri), "ipp://%s/printers/%s", getenv("SERVER_NAME"),
-               printer);
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL,
-                   uri);
-    }
-
-   /*
-    * Do the request and get back a response...
-    */
-
-    if ((response = cupsDoRequest(http, request, "/")) != NULL)
-    {
-      ippSetCGIVars(response, NULL, NULL);
-      ippDelete(response);
-    }
-
-   /*
-    * Write the report...
-    */
-
-    cgiCopyTemplateLang(stdout, TEMPLATES, "printers.tmpl", getenv("LANG"));
-
-   /*
-    * Get jobs for the specified printer if a printer has been chosen...
-    */
-
-    if (printer != NULL)
-    {
-     /*
-      * Build an IPP_GET_JOBS request, which requires the following
-      * attributes:
-      *
-      *    attributes-charset
-      *    attributes-natural-language
-      *    printer-uri
-      */
-
-      request = ippNew();
-
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-        	   "attributes-charset", NULL, cupsLangEncoding(language));
-
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-        	   "attributes-natural-language", NULL, language->language);
-
-      request->request.op.operation_id = IPP_GET_JOBS;
-      request->request.op.request_id   = 1;
-
-      snprintf(uri, sizeof(uri), "ipp://%s/printers/%s", getenv("SERVER_NAME"),
-               printer);
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL,
-                   uri);
-
-      if ((which_jobs = cgiGetVariable("which_jobs")) != NULL)
-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "which-jobs",
-                     NULL, which_jobs);
-
-     /*
-      * 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"));
-      }
-    }
-  }
+  if (printer == NULL)
+    show_printer_list(http, language);
  else
-  {
-   /*
-    * Print a test page...
-    */
+    show_printer_info(http, language, printer);

-    snprintf(uri, sizeof(uri), "ipp://localhost/printers/%s", printer);
+ /*
+  * Write a standard trailer...
+  */

-   /*
-    * Build an IPP_PRINT_JOB request, which requires the following
-    * attributes:
-    *
-    *    attributes-charset
-    *    attributes-natural-language
-    *    printer-uri
-    *    requesting-user-name
-    *    document-format
-    */
+  puts("</TABLE>");
+  puts("</CENTER>");

-    request = ippNew();
+  puts("<HR>");

-    request->request.op.operation_id = IPP_PRINT_JOB;
-    request->request.op.request_id   = 1;
+  puts("<P>The Common UNIX Printing System, CUPS, and the CUPS logo are the");
+  puts("trademark property of <A HREF=\"http://www.easysw.com\">Easy Software");
+  puts("Products</A>. CUPS is copyright 1997-1999 by Easy Software Products,");
+  puts("All Rights Reserved.");

-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-        	 "attributes-charset", NULL, cupsLangEncoding(language));
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-        	 "attributes-natural-language", NULL, language->language);
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
-        	 NULL, uri);
-
-    if (getenv("REMOTE_USER") != NULL)
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
-                   NULL, getenv("REMOTE_USER"));
-    else
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
-                   NULL, "root");
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name",
-        	 NULL, "Test Page");
-
-    ippAddString(request, IPP_TAG_JOB, IPP_TAG_MIMETYPE, "document-format",
-        	 NULL, "application/postscript");
-
-   /*
-    * Do the request and get back a response...
-    */
-
-    if ((response = cupsDoFileRequest(http, request, uri + 15,
-                                      CUPS_DATADIR "/data/testprint.ps")) != NULL)
-    {
-      status = response->request.status.status_code;
-      ippSetCGIVars(response, NULL, NULL);
-
-      ippDelete(response);
-    }
-    else
-      status = cupsLastError();
-
-    cgiSetVariable("PRINTER_NAME", printer);
-
-    if (status > IPP_OK_CONFLICT)
-    {
-      cgiSetVariable("ERROR", ippErrorString(status));
-      cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
-    }
-    else
-      cgiCopyTemplateLang(stdout, TEMPLATES, "test-page.tmpl", getenv("LANG"));
-  }
-
-  cgiCopyTemplateLang(stdout, TEMPLATES, "trailer.tmpl", getenv("LANG"));
+  puts("</BODY>");
+  puts("</HTML>");

 /*
  * Close the HTTP server connection...
@@ -355,6 +170,292 @@ main(int  argc,			/* I - Number of command-line arguments */
 }


+/*
+ * 'show_printer_list()' - Show a list of printers...
+ */
+
+static void
+show_printer_list(http_t      *http,	/* I - HTTP connection */
+                  cups_lang_t *language)/* I - Client's language */
+{
+  ipp_t		*request,	/* IPP request */
+		*response;	/* IPP response */
+  ipp_attribute_t *attr;	/* IPP attribute */
+
+
+ /*
+  * Build a CUPS_GET_PRINTERS request, which requires the following
+  * attributes:
+  *
+  *    attributes-charset
+  *    attributes-natural-language
+  */
+
+  request = ippNew();
+
+  request->request.op.operation_id = CUPS_GET_PRINTERS;
+  request->request.op.request_id   = 1;
+
+
+  attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+                      "attributes-charset", NULL, cupsLangEncoding(language));
+
+  attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+                      "attributes-natural-language", NULL, language->language);
+
+ /*
+  * Do the request and get back a response...
+  */
+
+  if ((response = cupsDoRequest(http, request, "/printers/")) != NULL)
+  {
+   /*
+    * Loop through the printers returned in the list and display
+    * their devices...
+    */
+
+    for (attr = response->attrs; attr != NULL; attr = attr->next)
+    {
+     /*
+      * Skip leading attributes until we hit a job...
+      */
+
+      while (attr != NULL && attr->group_tag != IPP_TAG_PRINTER)
+        attr = attr->next;
+
+      if (attr == NULL)
+        break;
+
+     /*
+      * Show the printer status for each printer...
+      */
+
+      while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER)
+      {
+        if (strcmp(attr->name, "printer-name") == 0 &&
+	    attr->value_tag == IPP_TAG_NAME)
+	  show_printer_info(http, language, attr->values[0].string.text);
+
+        attr = attr->next;
+      }
+
+      if (attr == NULL)
+        break;
+    }
+
+    ippDelete(response);
+  }
+}
+
+
+/*
+ * 'show_printer_info()' - Show printer information.
+ */
+
+static void
+show_printer_info(http_t      *http,
+                  cups_lang_t *language,
+                  char        *name)
+{
+  ipp_t		*request,	/* IPP request */
+		*response,	/* IPP response */
+		*jobs;		/* IPP Get Jobs response */
+  int		jobcount;	/* Number of jobs */
+  ipp_attribute_t *attr;	/* IPP attribute */
+  char		*message;	/* Printer state message */
+  int		accepting;	/* Accepting requests? */
+  ipp_pstate_t	pstate;		/* Printer state */
+  char		uri[1024];	/* Printer URI */
+
+
+ /*
+  * Build a IPP_GET_PRINTER_ATTRIBUTES request, which requires the following
+  * attributes:
+  *
+  *    attributes-charset
+  *    attributes-natural-language
+  *    printer-uri
+  */
+
+  request = ippNew();
+
+  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, cupsLangEncoding(language));
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+               "attributes-natural-language", NULL, language->language);
+
+  sprintf(uri, "ipp://localhost/printers/%s", name);
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, uri);
+
+ /*
+  * Do the request and get back a response...
+  */
+
+  if ((response = cupsDoRequest(http, request, uri + 15)) != NULL)
+  {
+   /*
+    * Grab the needed printer attributes...
+    */
+
+    if ((attr = ippFindAttribute(response, "printer-state", IPP_TAG_ENUM)) != NULL)
+      pstate = (ipp_pstate_t)attr->values[0].integer;
+    else
+      pstate = IPP_PRINTER_IDLE;
+
+    if ((attr = ippFindAttribute(response, "printer-state-message", IPP_TAG_TEXT)) != NULL)
+      message = attr->values[0].string.text;
+    else
+      message = NULL;
+
+    if ((attr = ippFindAttribute(response, "printer-is-accepting-jobs",
+                                 IPP_TAG_BOOLEAN)) != NULL)
+      accepting = attr->values[0].boolean;
+    else
+      accepting = 1;
+
+   /*
+    * Display the printer entry...
+    */
+
+    puts("<TR>");
+
+    printf("<TD VALIGN=TOP><A HREF=\"/printers/%s\">%s</A></TD>\n", name, name);
+
+    printf("<TD VALIGN=TOP><IMG SRC=\"/images/printer-%s.gif\" ALIGN=\"LEFT\">\n",
+           pstate == IPP_PRINTER_IDLE ? "idle" :
+	       pstate == IPP_PRINTER_PROCESSING ? "processing" : "stopped");
+
+    printf("%s: %s, %s<BR>\n",
+           cupsLangString(language, CUPS_MSG_PRINTER_STATE),
+           cupsLangString(language, pstate == IPP_PRINTER_IDLE ? CUPS_MSG_IDLE :
+	                            pstate == IPP_PRINTER_PROCESSING ?
+				    CUPS_MSG_PROCESSING : CUPS_MSG_STOPPED),
+           cupsLangString(language, accepting ? CUPS_MSG_ACCEPTING_JOBS :
+	                            CUPS_MSG_NOT_ACCEPTING_JOBS));
+
+    if (message)
+      printf("<BR CLEAR=ALL><I>\"%s\"</I>\n", message);
+    else if (!accepting || pstate == IPP_PRINTER_STOPPED)
+      puts("<BR CLEAR=ALL><I>\"Reason Unknown\"</I>");
+
+    puts("</TD>");
+
+   /*
+    * Show a list of jobs as needed...
+    */
+
+    if (pstate != IPP_PRINTER_IDLE)
+    {
+     /*
+      * Build an IPP_GET_JOBS request, which requires the following
+      * attributes:
+      *
+      *    attributes-charset
+      *    attributes-natural-language
+      *    printer-uri
+      */
+
+      request = ippNew();
+
+      request->request.op.operation_id = IPP_GET_JOBS;
+      request->request.op.request_id   = 1;
+
+      attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+                	  "attributes-charset", NULL,
+			  cupsLangEncoding(language));
+
+      attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+                	  "attributes-natural-language", NULL,
+			  language->language);
+
+      attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
+	                  "printer-uri", NULL, uri);
+
+      jobs = cupsDoRequest(http, request, uri + 15);
+    }
+    else
+      jobs = NULL;
+
+    puts("<TD VALIGN=\"TOP\">");
+    jobcount = 0;
+
+    if (jobs != NULL)
+    {
+      char	*username;	/* Pointer to job-originating-user-name */
+      int	jobid,		/* job-id */
+		size;		/* job-k-octets */
+
+
+      for (attr = jobs->attrs; attr != NULL; attr = attr->next)
+      {
+       /*
+	* Skip leading attributes until we hit a job...
+	*/
+
+	while (attr != NULL && attr->group_tag != IPP_TAG_JOB)
+          attr = attr->next;
+
+	if (attr == NULL)
+          break;
+
+       /*
+	* Pull the needed attributes from this job...
+	*/
+
+	jobid    = 0;
+	size     = 0;
+	username = NULL;
+
+	while (attr != NULL && attr->group_tag == IPP_TAG_JOB)
+	{
+          if (strcmp(attr->name, "job-id") == 0 &&
+	      attr->value_tag == IPP_TAG_INTEGER)
+	    jobid = attr->values[0].integer;
+
+          if (strcmp(attr->name, "job-k-octets") == 0 &&
+	      attr->value_tag == IPP_TAG_INTEGER)
+	    size = attr->values[0].integer;
+
+          if (strcmp(attr->name, "job-originating-user-name") == 0 &&
+	      attr->value_tag == IPP_TAG_NAME)
+	    username = attr->values[0].string.text;
+
+          attr = attr->next;
+	}
+
+       /*
+        * Display the job if it matches the current printer...
+	*/
+
+        if (username != NULL)
+	{
+	  jobcount ++;
+	  printf("<A HREF=\"/jobs/%d\">%s-%d %s %dk</A><BR>\n", jobid, name,
+	         jobid, username, size);
+	}
+
+	if (attr == NULL)
+          break;
+      }
+
+      ippDelete(jobs);
+    }
+      
+    if (jobcount == 0)
+      puts("None");
+    puts("</TD>");
+    puts("</TR>");
+
+    ippDelete(response);
+  }
+}
+
+
 /*
 * End of "$Id$".
 */
@@ -1,492 +0,0 @@
-/*
- * "$Id$"
- *
- *   CGI template function.
- *
- *   Copyright 1997-2003 by Easy Software Products.
- *
- *   This program is free software; you can redistribute it and/or modify it
- *   under the terms of the GNU General Public License as published by the Free
- *   Software Foundation; either version 2 of the License, or (at your option)
- *   any later version.
- *
- *   This program is distributed in the hope that it will be useful, but
- *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *   for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * Contents:
- *
- *   cgiCopyTemplateFile() - Copy a template file and replace all the
- *                           '{variable}' strings with the variable value.
- *   cgiCopyTemplateLang() - Copy a template file using a language...
- *   cgi_copy()            - Copy the template file, substituting as needed...
- *   cgi_puts()            - Put a string to the output file, quoting as
- *                           needed...
- */
-
-#include "cgi.h"
-
-
-/*
- * Local functions...
- */
-
-static void	cgi_copy(FILE *out, FILE *in, int element, char term);
-static void	cgi_puts(const char *s, FILE *out);
-
-
-/*
- * 'cgiCopyTemplateFile()' - Copy a template file and replace all the
- *                           '{variable}' strings with the variable value.
- */
-
-void
-cgiCopyTemplateFile(FILE       *out,	/* I - Output file */
-                    const char *tmpl)	/* I - Template file to read */
-{
-  FILE	*in;				/* Input file */
-
-
- /*
-  * Open the template file...
-  */
-
-  if ((in = fopen(tmpl, "r")) == NULL)
-    return;
-
- /*
-  * Parse the file to the end...
-  */
-
-  cgi_copy(out, in, 0, 0);
-
- /*
-  * Close the template file and return...
-  */
-
-  fclose(in);
-}
-
-
-/*
- * 'cgiCopyTemplateLang()' - Copy a template file using a language...
- */
-
-void
-cgiCopyTemplateLang(FILE       *out,		/* I - Output file */
-                    const char *directory,	/* I - Directory */
-                    const char *tmpl,		/* I - Base filename */
-		    const char *lang)		/* I - Language */
-{
-  int	i;					/* Looping var */
-  char	filename[1024],				/* Filename */
-	locale[16];				/* Locale name */
-  FILE	*in;					/* Input file */
-
-
- /*
-  * Convert the language to a locale name...
-  */
-
-  if (lang != NULL)
-  {
-    for (i = 0; lang[i] && i < 15; i ++)
-      if (isalnum(lang[i]))
-        locale[i] = tolower(lang[i]);
-      else
-        locale[i] = '_';
-
-    locale[i] = '\0';
-  }
-  else
-    locale[0] = '\0';
-
- /*
-  * See if we have a template file for this language...
-  */
-
-  snprintf(filename, sizeof(filename), "%s/%s/%s", directory, locale, tmpl);
-  if (access(filename, 0))
-  {
-    locale[2] = '\0';
-
-    snprintf(filename, sizeof(filename), "%s/%s/%s", directory, locale, tmpl);
-    if (access(filename, 0))
-      snprintf(filename, sizeof(filename), "%s/%s", directory, tmpl);
-  }
-
- /*
-  * Open the template file...
-  */
-
-  if ((in = fopen(filename, "r")) == NULL)
-    return;
-
- /*
-  * Parse the file to the end...
-  */
-
-  cgi_copy(out, in, 0, 0);
-
- /*
-  * Close the template file and return...
-  */
-
-  fclose(in);
-}
-
-
-/*
- * 'cgi_copy()' - Copy the template file, substituting as needed...
- */
-
-static void
-cgi_copy(FILE *out,		/* I - Output file */
-         FILE *in,		/* I - Input file */
-	 int  element,		/* I - Element number (0 to N) */
-	 char term)		/* I - Terminating character */
-{
-  int		ch;		/* Character from file */
-  char		op;		/* Operation */
-  char		name[255],	/* Name of variable */
-		*nameptr,	/* Pointer into name */
-		innername[255],	/* Inner comparison name */
-		*innerptr,	/* Pointer into inner name */
-		*s;		/* String pointer */
-  const char	*value;		/* Value of variable */
-  const char	*innerval;	/* Inner value */
-  const char	*outptr;	/* Output string pointer */
-  char		outval[1024],	/* Formatted output string */
-		compare[1024];	/* Comparison string */
-  int		result;		/* Result of comparison */
-
-
- /*
-  * Parse the file to the end...
-  */
-
-  while ((ch = getc(in)) != EOF)
-    if (ch == term)
-      break;
-    else if (ch == '{')
-    {
-     /*
-      * Get a variable name...
-      */
-
-      for (s = name; (ch = getc(in)) != EOF;)
-        if (strchr("}]<>=! \t\n", ch))
-          break;
-        else if (s > name && ch == '?')
-	  break;
-	else if (s < (name + sizeof(name) - 1))
-          *s++ = ch;
-
-      *s = '\0';
-
-      if (s == name && isspace(ch))
-      {
-        if (out)
-	{
-          putc('{', out);
-	  putc(ch, out);
-        }
-
-	continue;
-      }
-
-     /*
-      * See if it has a value...
-      */
-
-      if (name[0] == '?')
-      {
-       /*
-        * Insert value only if it exists...
-	*/
-
-	if ((nameptr = strrchr(name, '-')) != NULL && isdigit(nameptr[1]))
-	{
-	  *nameptr++ = '\0';
-
-	  if ((value = cgiGetArray(name + 1, atoi(nameptr) - 1)) != NULL)
-	    outptr = value;
-	  else
-	  {
-	    outval[0] = '\0';
-	    outptr    = outval;
-	  }
-	}
-        if ((value = cgiGetArray(name + 1, element)) != NULL)
-	  outptr = value;
-	else
-	{
-	  outval[0] = '\0';
-	  outptr    = outval;
-	}
-      }
-      else if (name[0] == '#')
-      {
-       /*
-        * Insert count...
-	*/
-
-        if (name[1])
-          sprintf(outval, "%d", cgiGetSize(name + 1));
-	else
-	  sprintf(outval, "%d", element + 1);
-
-        outptr = outval;
-      }
-      else if (name[0] == '[')
-      {
-       /*
-        * Loop for # of elements...
-	*/
-
-	int  i;		/* Looping var */
-        long pos;	/* File position */
-	int  count;	/* Number of elements */
-
-
-        if (isdigit(name[1]))
-	  count = atoi(name + 1);
-	else
-          count = cgiGetSize(name + 1);
-
-	pos = ftell(in);
-
-        if (count > 0)
-	{
-          for (i = 0; i < count; i ++)
-	  {
-	    fseek(in, pos, SEEK_SET);
-	    cgi_copy(out, in, i, '}');
-	  }
-        }
-	else
-	  cgi_copy(NULL, in, 0, '}');
-
-        continue;
-      }
-      else
-      {
-       /*
-        * Insert variable or variable name (if element is NULL)...
-	*/
-
-	if ((nameptr = strrchr(name, '-')) != NULL && isdigit(nameptr[1]))
-	{
-	  *nameptr++ = '\0';
-	  if ((value = cgiGetArray(name, atoi(nameptr) - 1)) == NULL)
-          {
-	    snprintf(outval, sizeof(outval), "{%s}", name);
-	    outptr = outval;
-	  }
-	  else
-	    outptr = value;
-	}
-	else if ((value = cgiGetArray(name, element)) == NULL)
-        {
-	  snprintf(outval, sizeof(outval), "{%s}", name);
-	  outptr = outval;
-	}
-	else
-	  outptr = value;
-      }
-
-     /*
-      * See if the terminating character requires another test...
-      */
-
-      if (ch == '}')
-      {
-       /*
-        * End of substitution...
-        */
-
-	if (out)
-	  cgi_puts(outptr, out);
-
-        continue;
-      }
-
-     /*
-      * OK, process one of the following checks:
-      *
-      *   {name?exist:not-exist}     Exists?
-      *   {name=value?true:false}    Equal
-      *   {name<value?true:false}    Less than
-      *   {name>value?true:false}    Greater than
-      *   {name!value?true:false}    Not equal
-      */
-
-      if (ch == '?')
-      {
-       /*
-        * Test for existance...
-	*/
-
-        result = cgiGetArray(name, element) != NULL && outval[0];
-      }
-      else
-      {
-       /*
-        * Compare to a string...
-	*/
-
-        op = ch;
-
-	for (s = compare; (ch = getc(in)) != EOF;)
-          if (ch == '?')
-            break;
-	  else if (s >= (compare + sizeof(compare) - 1))
-	    continue;
-	  else if (ch == '#')
-	  {
-	    sprintf(s, "%d", element + 1);
-	    s += strlen(s);
-	  }
-	  else if (ch == '{')
-	  {
-	   /*
-	    * Grab the value of a variable...
-	    */
-
-	    innerptr = innername;
-	    while ((ch = getc(in)) != EOF && ch != '}')
-	      if (innerptr < (innername + sizeof(innername) - 1))
-	        *innerptr++ = ch;
-	    *innerptr = '\0';
-
-            if (innername[0] == '#')
-	      sprintf(s, "%d", cgiGetSize(innername + 1));
-	    else if ((innerptr = strrchr(innername, '-')) != NULL &&
-	             isdigit(innerptr[1]))
-            {
-	      *innerptr++ = '\0';
-	      if ((innerval = cgiGetArray(innername, atoi(innerptr) - 1)) == NULL)
-	        *s = '\0';
-	      else
-	        strlcpy(s, innerval, sizeof(compare) - (s - compare));
-	    }
-	    else if (innername[0] == '?')
-	    {
-	      if ((innerval = cgiGetArray(innername + 1, element)) == NULL)
-		*s = '\0';
-	      else
-	        strlcpy(s, innerval, sizeof(compare) - (s - compare));
-            }
-	    else if ((innerval = cgiGetArray(innername, element)) == NULL)
-	      snprintf(s, sizeof(s), "{%s}", innername);
-	    else
-	      strlcpy(s, innerval, sizeof(compare) - (s - compare));
-
-            s += strlen(s);
-	  }
-          else if (ch == '\\')
-	    *s++ = getc(in);
-	  else
-            *s++ = ch;
-
-        *s = '\0';
-
-        if (ch != '?')
-	  return;
-
-       /*
-        * Do the comparison...
-	*/
-
-        switch (op)
-	{
-	  case '<' :
-	      result = strcasecmp(outptr, compare) < 0;
-	      break;
-	  case '>' :
-	      result = strcasecmp(outptr, compare) > 0;
-	      break;
-	  case '=' :
-	      result = strcasecmp(outptr, compare) == 0;
-	      break;
-	  case '!' :
-	      result = strcasecmp(outptr, compare) != 0;
-	      break;
-	  default :
-	      result = 1;
-	      break;
-	}
-      }
-
-      if (result)
-      {
-       /*
-	* Comparison true; output first part and ignore second...
-	*/
-
-	cgi_copy(out, in, element, ':');
-	cgi_copy(NULL, in, element, '}');
-      }
-      else
-      {
-       /*
-	* Comparison false; ignore first part and output second...
-	*/
-
-	cgi_copy(NULL, in, element, ':');
-	cgi_copy(out, in, element, '}');
-      }
-    }
-    else if (ch == '\\')	/* Quoted char */
-    {
-      if (out)
-        putc(getc(in), out);
-      else
-        getc(in);
-    }
-    else if (out)
-      putc(ch, out);
-
- /*
-  * Flush any pending output...
-  */
-
-  if (out)
-    fflush(out);
-}
-
-
-/*
- * 'cgi_puts()' - Put a string to the output file, quoting as needed...
- */
-
-static void
-cgi_puts(const char *s,
-         FILE       *out)
-{
-  while (*s)
-  {
-    if (s[0] == '<')
-      fputs("&lt;", out);
-    else if (s[0] == '>')
-      fputs("&gt;", out);
-    else if (*s == '\"')
-      fputs("&quot;", out);
-    else if (s[0] == '&')
-      fputs("&amp;", out);
-    else
-      putc(*s, out);
-
-    s ++;
-  }
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -1,672 +0,0 @@
-/*
- * "$Id$"
- *
- *   CGI form variable and array functions.
- *
- *   Copyright 1997-2003 by Easy Software Products.
- *
- *   This program is free software; you can redistribute it and/or modify it
- *   under the terms of the GNU General Public License as published by the Free
- *   Software Foundation; either version 2 of the License, or (at your option)
- *   any later version.
- *
- *   This program is distributed in the hope that it will be useful, but
- *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *   for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * Contents:
- *
- *   cgiInitialize()         - Initialize the CGI variable "database"...
- *   cgiCheckVariables()     - Check for the presence of "required" variables.
- *   cgiGetArray()           - Get an element from a form array...
- *   cgiGetSize()            - Get the size of a form array value.
- *   cgiGetVariable()        - Get a CGI variable from the database...
- *   cgiSetArray()           - Set array element N to the specified string.
- *   cgiSetVariable()        - Set a CGI variable in the database...
- *   cgi_add_variable()      - Add a form variable.
- *   cgi_compare_variables() - Compare two variables.
- *   cgi_find_variable()     - Find a variable...
- *   cgi_initialize_get()    - Initialize form variables using the GET method.
- *   cgi_initialize_post()   - Initialize variables using the POST method.
- *   cgi_initialize_string() - Initialize form variables from a string.
- *   cgi_sort_variables()    - Sort all form variables for faster lookup.
- */
-
-/*#define DEBUG*/
-#include "cgi.h"
-#include <errno.h>
-#include <syslog.h>
-
-
-/*
- * Data structure to hold all the CGI form variables and arrays...
- */
-
-typedef struct
-{
-  const char	*name;		/* Name of variable */
-  int		nvalues,	/* Number of values */
-		avalues;	/* Number of values allocated */
-  const char	**values;	/* Value(s) of variable */
-} var_t;
-
-
-/*
- * Local globals...
- */
-
-static int	form_count = 0,		/* Form variable count */
-		form_alloc = 0;		/* Number of variables allocated */
-static var_t	*form_vars = NULL;	/* Form variables */
-
-
-/*
- * Local functions...
- */
-
-static void	cgi_add_variable(const char *name, int element,
-		                 const char *value);
-static int	cgi_compare_variables(const var_t *v1, const var_t *v2);
-static var_t	*cgi_find_variable(const char *name);
-static int	cgi_initialize_get(void);
-static int	cgi_initialize_post(void);
-static int	cgi_initialize_string(const char *data);
-static void	cgi_sort_variables(void);
-
-
-/*
- * 'cgiInitialize()' - Initialize the CGI variable "database"...
- */
-
-int			/* O - Non-zero if there was form data */
-cgiInitialize(void)
-{
-  char	*method;	/* Form posting method */
- 
-
-#ifdef DEBUG
-  setbuf(stdout, NULL);
-  puts("Content-type: text/plain\n");
-#endif /* DEBUG */
-
-  method = getenv("REQUEST_METHOD");
-
-  if (method == NULL)
-    return (0);
-
-  if (strcasecmp(method, "GET") == 0)
-    return (cgi_initialize_get());
-  else if (strcasecmp(method, "POST") == 0)
-    return (cgi_initialize_post());
-  else
-    return (0);
-}
-
-
-/*
- * 'cgiCheckVariables()' - Check for the presence of "required" variables.
- *
- * Names may be separated by spaces and/or commas.
- */
-
-int					/* O - 1 if all variables present, 0 otherwise */
-cgiCheckVariables(const char *names)	/* I - Variables to look for */
-{
-  char		name[255],		/* Current variable name */
-		*s;			/* Pointer in string */
-  const char	*val;			/* Value of variable */
-  int		element;		/* Array element number */
-
-
-  if (names == NULL)
-    return (1);
-
-  while (*names != '\0')
-  {
-    while (*names == ' ' || *names == ',')
-      names ++;
-
-    for (s = name; *names != '\0' && *names != ' ' && *names != ','; s ++, names ++)
-      *s = *names;
-
-    *s = 0;
-    if (name[0] == '\0')
-      break;
-
-    if ((s = strrchr(name, '-')) != NULL)
-    {
-      *s      = '\0';
-      element = atoi(s + 1) - 1;
-      val     = cgiGetArray(name, element);
-    }
-    else
-      val = cgiGetVariable(name);
-
-    if (val == NULL)
-      return (0);
-
-    if (*val == '\0')
-      return (0);	/* Can't be blank, either! */
-  }
-
-  return (1);
-}
-
-
-/*
- * 'cgiGetArray()' - Get an element from a form array...
- */
-
-const char *			/* O - Element value or NULL */
-cgiGetArray(const char *name,	/* I - Name of array variable */
-            int        element)	/* I - Element number (0 to N) */
-{
-  var_t	*var;			/* Pointer to variable */
-
-
-  if ((var = cgi_find_variable(name)) == NULL)
-    return (NULL);
-
-  if (var->nvalues == 1)
-    return (var->values[0]);
-
-  if (element < 0 || element >= var->nvalues)
-    return (NULL);
-
-  return (var->values[element]);
-}
-
-
-/*
- * 'cgiGetSize()' - Get the size of a form array value.
- */
-
-int				/* O - Number of elements */
-cgiGetSize(const char *name)	/* I - Name of variable */
-{
-  var_t	*var;			/* Pointer to variable */
-
-
-  if ((var = cgi_find_variable(name)) == NULL)
-    return (0);
-
-  return (var->nvalues);
-}
-
-
-/*
- * 'cgiGetVariable()' - Get a CGI variable from the database...
- *
- * Returns NULL if the variable doesn't exist...  If the variable is an
- * array of values, returns the last element...
- */
-
-const char *			/* O - Value of variable */
-cgiGetVariable(const char *name)/* I - Name of variable */
-{
-  const var_t	*var;		/* Returned variable */
-
-
-  var = cgi_find_variable(name);
-
-#ifdef DEBUG
-  if (var == NULL)
-    printf("cgiGetVariable(\"%s\") is returning NULL...\n", name);
-  else
-    printf("cgiGetVariable(\"%s\") is returning \"%s\"...\n", name,
-           var->values[var->nvalues - 1]);
-#endif /* DEBUG */
-
-  return ((var == NULL) ? NULL : var->values[var->nvalues - 1]);
-}
-
-
-/*
- * 'cgiSetArray()' - Set array element N to the specified string.
- *
- * If the variable array is smaller than (element + 1), the intervening
- * elements are set to NULL.
- */
-
-void
-cgiSetArray(const char *name,	/* I - Name of variable */
-            int        element,	/* I - Element number (0 to N) */
-            const char *value)	/* I - Value of variable */
-{
-  int	i;	/* Looping var */
-  var_t	*var;	/* Returned variable */
-
-
-  if (name == NULL || value == NULL || element < 0 || element > 100000)
-    return;
-
-  if ((var = cgi_find_variable(name)) == NULL)
-  {
-    cgi_add_variable(name, element, value);
-    cgi_sort_variables();
-  }
-  else
-  {
-    if (element >= var->avalues)
-    {
-      var->avalues = element + 16;
-      var->values  = (const char **)realloc((void *)(var->values),
-                                            sizeof(char *) * var->avalues);
-    }
-
-    if (element >= var->nvalues)
-    {
-      for (i = var->nvalues; i < element; i ++)
-	var->values[i] = NULL;
-
-      var->nvalues = element + 1;
-    }
-    else if (var->values[element])
-      free((char *)var->values[element]);
-
-    var->values[element] = strdup(value);
-  }
-}
-
-
-/*
- * 'cgiSetSize()' - Set the array size.
- */
-
-void
-cgiSetSize(const char *name,	/* I - Name of variable */
-           int        size)	/* I - Number of elements (0 to N) */
-{
-  int	i;	/* Looping var */
-  var_t	*var;	/* Returned variable */
-
-
-  if (name == NULL || size < 0 || size > 100000)
-    return;
-
-  if ((var = cgi_find_variable(name)) == NULL)
-    return;
-
-  if (size >= var->avalues)
-  {
-    var->avalues = size + 16;
-    var->values  = (const char **)realloc((void *)(var->values),
-                                          sizeof(char *) * var->avalues);
-  }
-
-  if (size > var->nvalues)
-  {
-    for (i = var->nvalues; i < size; i ++)
-      var->values[i] = NULL;
-  }
-  else if (size < var->nvalues)
-  {
-    for (i = size; i < var->nvalues; i ++)
-      if (var->values[i])
-        free((void *)(var->values[i]));
-  }
-
-  var->nvalues = size;
-}
-
-
-/*
- * 'cgiSetVariable()' - Set a CGI variable in the database...
- *
- * If the variable is an array, this truncates the array to a single element.
- */
-
-void
-cgiSetVariable(const char *name,	/* I - Name of variable */
-               const char *value)	/* I - Value of variable */
-{
-  int	i;				/* Looping var */
-  var_t	*var;				/* Returned variable */
-
-
-  if (name == NULL || value == NULL)
-    return;
-
-  if ((var = cgi_find_variable(name)) == NULL)
-  {
-    cgi_add_variable(name, 0, value);
-    cgi_sort_variables();
-  }
-  else
-  {
-    for (i = 0; i < var->nvalues; i ++)
-      if (var->values[i])
-        free((char *)var->values[i]);
-
-    var->values[0] = strdup(value);
-    var->nvalues   = 1;
-  }
-}
-
-
-/*
- * 'cgi_add_variable()' - Add a form variable.
- */
-
-static void
-cgi_add_variable(const char *name,	/* I - Variable name */
-		 int        element,	/* I - Array element number */
-                 const char *value)	/* I - Variable value */
-{
-  var_t	*var;				/* New variable */
-
-
-  if (name == NULL || value == NULL || element < 0 || element > 100000)
-    return;
-
-#ifdef DEBUG
-  printf("Adding variable \'%s\' with value \'%s\'...\n", name, value);
-#endif /* DEBUG */
-
-  if (form_count >= form_alloc)
-  {
-    if (form_alloc == 0)
-      form_vars = malloc(sizeof(var_t) * 16);
-    else
-      form_vars = realloc(form_vars, (form_alloc + 16) * sizeof(var_t));
-
-    form_alloc += 16;
-  }
-
-  var                  = form_vars + form_count;
-  var->name            = strdup(name);
-  var->nvalues         = element + 1;
-  var->avalues         = element + 1;
-  var->values          = calloc(element + 1, sizeof(char *));
-  var->values[element] = strdup(value);
-
-  form_count ++;
-}
-
-
-/*
- * 'cgi_compare_variables()' - Compare two variables.
- */
-
-static int				/* O - Result of comparison */
-cgi_compare_variables(const var_t *v1,	/* I - First variable */
-                      const var_t *v2)	/* I - Second variable */
-{
-  return (strcasecmp(v1->name, v2->name));
-}
-
-
-/*
- * 'cgi_find_variable()' - Find a variable...
- */
-
-static var_t *				/* O - Variable pointer or NULL */
-cgi_find_variable(const char *name)	/* I - Name of variable */
-{
-  var_t	key;				/* Search key */
-
-
-  if (form_count < 1 || name == NULL)
-    return (NULL);
-
-  key.name = name;
-
-  return ((var_t *)bsearch(&key, form_vars, form_count, sizeof(var_t),
-                           (int (*)(const void *, const void *))cgi_compare_variables));
-}
-
-
-/*
- * 'cgi_initialize_get()' - Initialize form variables using the GET method.
- */
-
-static int		/* O - 1 if form data read */
-cgi_initialize_get(void)
-{
-  char	*data;		/* Pointer to form data string */
-
-
-#ifdef DEBUG
-  puts("Initializing variables using GET method...");
-#endif /* DEBUG */
-
- /*
-  * Check to see if there is anything for us to read...
-  */
-
-  data = getenv("QUERY_STRING");
-  if (data == NULL || strlen(data) == 0)
-    return (0);
-
- /*
-  * Parse it out and return...
-  */
-
-  return (cgi_initialize_string(data));
-}
-
-
-/*
- * 'cgi_initialize_post()' - Initialize variables using the POST method.
- */
-
-static int			/* O - 1 if form data was read */
-cgi_initialize_post(void)
-{
-  char	*content_length,	/* Length of input data (string) */
-	*data;			/* Pointer to form data string */
-  int	length,			/* Length of input data */
-	nbytes,			/* Number of bytes read this read() */
-	tbytes,			/* Total number of bytes read */
-	status;			/* Return status */
-
-
-#ifdef DEBUG
-  puts("Initializing variables using POST method...");
-#endif /* DEBUG */
-
- /*
-  * Check to see if there is anything for us to read...
-  */
-
-  content_length = getenv("CONTENT_LENGTH");
-  if (content_length == NULL || atoi(content_length) <= 0)
-    return (0);
-
- /*
-  * Get the length of the input stream and allocate a buffer for it...
-  */
-
-  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)
-      if (errno != EAGAIN)
-      {
-        free(data);
-        return (0);
-      }
-
-  data[length] = '\0';
-
- /*
-  * Parse it out...
-  */
-
-  status = cgi_initialize_string(data);
-
- /*
-  * Free the data and return...
-  */
-
-  free(data);
-
-  return (status);
-}
-
-
-/*
- * 'cgi_initialize_string()' - Initialize form variables from a string.
- */
-
-static int
-cgi_initialize_string(const char *data)	/* I - Form data string */
-{
-  int	done;		/* True if we're done reading a form variable */
-  char	*s,		/* Pointer to current form string */
-	ch,		/* Temporary character */
-	name[255],	/* Name of form variable */
-	value[65536];	/* Variable value... */
-
-
- /*
-  * Check input...
-  */
-
-  if (data == NULL)
-    return (0);
-
- /*
-  * Loop until we've read all the form data...
-  */
-
-  while (*data != '\0')
-  {
-   /*
-    * Get the variable name...
-    */
-
-    for (s = name; *data != '\0'; data ++)
-      if (*data == '=')
-        break;
-      else if (*data >= ' ' && s < (name + sizeof(name) - 1))
-        *s++ = *data;
-
-    *s = '\0';
-    if (*data == '=')
-      data ++;
-    else
-      return (0);
-
-   /*
-    * Read the variable value...
-    */
-
-    for (s = value, done = 0; !done && *data != '\0'; data ++)
-      switch (*data)
-      {
-	case '&' :	/* End of data... */
-            done = 1;
-            break;
-
-	case '+' :	/* Escaped space character */
-            if (s < (value + sizeof(value) - 1))
-              *s++ = ' ';
-            break;
-
-	case '%' :	/* Escaped control character */
-	   /*
-	    * Read the hex code...
-	    */
-
-            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;
-            }
-	    else
-	      data += 2;
-            break;
-
-	default :	/* Other characters come straight through */
-	    if (*data >= ' ' && s < (value + sizeof(value) - 1))
-              *s++ = *data;
-            break;
-      }
-
-    *s = '\0';		/* nul terminate the string */
-
-   /*
-    * Remove trailing whitespace...
-    */
-
-    if (s > value)
-      s --;
-
-    while (s >= value && *s == ' ')
-      *s-- = '\0';
-
-   /*
-    * Add the string to the variable "database"...
-    */
-
-    if ((s = strrchr(name, '-')) != NULL && isdigit(s[1]))
-    {
-      *s++ = '\0';
-      if (value[0])
-        cgiSetArray(name, atoi(s) - 1, value);
-    }
-    else if (cgiGetVariable(name) != NULL)
-      cgiSetArray(name, cgiGetSize(name), value);
-    else
-      cgiSetVariable(name, value);
-  }
-
-  return (1);
-}
-
-
-/*
- * 'cgi_sort_variables()' - Sort all form variables for faster lookup.
- */
-
-static void
-cgi_sort_variables(void)
-{
-#ifdef DEBUG
-  int	i;
-
-
-  puts("Sorting variables...");
-#endif /* DEBUG */
-
-  if (form_count < 2)
-    return;
-
-  qsort(form_vars, form_count, sizeof(var_t),
-        (int (*)(const void *, const void *))cgi_compare_variables);
-
-#ifdef DEBUG
-  puts("Sorted variable list is:");
-  for (i = 0; i < form_count; i ++)
-    printf("%d: %s (%d) = \"%s\" ...\n", i, form_vars[i].name,
-           form_vars[i].nvalues, form_vars[i].values[0]);
-#endif /* DEBUG */
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -3,7 +3,7 @@
 #
 #   Configuration file makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1993-2003 by Easy Software Products.
+#   Copyright 1993-1999 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -28,9 +28,7 @@ include ../Makedefs
 # Config files...
 #

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

 #
 # Make everything...
@@ -38,38 +36,25 @@ REPLACE	=	mime.convs mime.types

 all:

-
 #
 # Clean all config and object files...
 #

 clean:

-
 #
 # Install files...
 #

 install:
-	$(INSTALL_DIR) $(SERVERROOT)
-	for file in $(KEEP); do \
-		if test -r $(SERVERROOT)/$$file ; then \
-			$(INSTALL_DATA) $$file $(SERVERROOT)/$$file.N ; \
+	-$(MKDIR) $(SERVERROOT)/conf
+	for file in $(FILES); do \
+		if test -e $(SERVERROOT)/conf/$$file ; then \
+			$(CP) $$file $(SERVERROOT)/conf/$$file.N ; \
 		else \
-			$(INSTALL_DATA) $$file $(SERVERROOT) ; \
+			$(CP) $$file $(SERVERROOT)/conf ; \
 		fi ; \
 	done
-	for file in $(REPLACE); do \
-		if test -r $(SERVERROOT)/$$file ; then \
-			$(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
-		fi ; \
-		$(INSTALL_DATA) $$file $(SERVERROOT) ; \
-	done
-	-if test x$(PAMDIR) != x$(BUILDROOT); then \
-		$(INSTALL_DIR) $(PAMDIR); \
-		$(INSTALL_DATA) pam.conf $(PAMDIR)/cups; \
-	fi
-

 #
 # End of "$Id$".
@@ -1,10 +1,10 @@
 #
-# "$Id: classes.conf 3041 2002-12-17 19:00:27Z swdev $"
+# "$Id: classes.conf 333 1999-05-17 18:03:40Z mike $"
 #
 #   Sample class configuration file for the Common UNIX Printing System
 #   (CUPS) scheduler.
 #
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+#   Copyright 1997-1999 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -15,7 +15,7 @@
 #
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
-#       44141 Airport View Drive, Suite 204
+#       44145 Airport View Drive, Suite 204
 #       Hollywood, Maryland 20636-3111 USA
 #
 #       Voice: (301) 373-9603
@@ -47,35 +47,18 @@

 #Info Acme LaserPrint 1000 Printers

+#
+# MoreInfo: a URL for more information on the printer.
+#
+
+#MoreInfo http://www.acme.com/lp1000.html
+
 #
 # Location: the location of the printer.
 #

 #Location Room 101 in the activities building

-#
-# State: sets the initial state of the class.  Can be one of the
-# following:
-#
-#     Idle    - Class is available to print new jobs.
-#     Stopped - Class is disabled but accepting new jobs.
-#
-
-#State Idle
-
-#
-# StateMessage: sets the printer-state-message attribute for the class.
-#
-
-#StateMessage Class is idle.
-
-#
-# Accepting: is the class accepting jobs?
-#
-#Accepting Yes
-#Accepting No
-#
-
 #
 # Printer: adds a printer to the class.
 #
@@ -85,5 +68,5 @@
 #</Class>

 #
-# End of "$Id: classes.conf 3041 2002-12-17 19:00:27Z swdev $".
+# End of "$Id: classes.conf 333 1999-05-17 18:03:40Z mike $".
 #
@@ -1,65 +0,0 @@
-#
-# "$Id: client.conf 3041 2002-12-17 19:00:27Z swdev $"
-#
-#   Sample client configuration file for the Common UNIX Printing System
-#   (CUPS).
-#
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
-#
-#       Voice: (301) 373-9603
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
-#
-
-########################################################################
-#                                                                      #
-# This is the CUPS client configuration file.  This file is used to    #
-# define client-specific parameters, such as the default server or     #
-# default encryption settings.                                         #
-#                                                                      #
-########################################################################
-
-#
-# ServerName: the hostname of your server.  By default CUPS will use the
-# hostname of the system or the value of the CUPS_SERVER environment
-# variable.
-#
-
-#ServerName myhost.domain.com
-
-#
-# Encryption: whether or not to use encryption; this depends on having
-# the OpenSSL library linked into the CUPS library.
-#
-# Possible values:
-#
-#     Always       - Always use encryption (SSL)
-#     Never        - Never use encryption
-#     Required     - Use TLS encryption upgrade
-#     IfRequested  - Use encryption if the server requests it
-#
-# The default value is "IfRequested".  This parameter can also be set
-# using the CUPS_ENCRYPTION environment variable.
-#
-
-#Encryption Always
-#Encryption Never
-#Encryption Required
-#Encryption IfRequested
-
-
-#
-# End of "$Id: client.conf 3041 2002-12-17 19:00:27Z swdev $".
-#
@@ -0,0 +1,332 @@
+#
+# "$Id: cupsd.conf 349 1999-05-21 20:53:02Z mike $"
+#
+#   Sample configuration file for the Common UNIX Printing System (CUPS)
+#   scheduler.
+#
+#   Copyright 1997-1999 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
+#       44145 Airport View Drive, Suite 204
+#       Hollywood, Maryland 20636-3111 USA
+#
+#       Voice: (301) 373-9603
+#       EMail: cups-info@cups.org
+#         WWW: http://www.cups.org
+#
+
+########################################################################
+#                                                                      #
+# This is the CUPS configuration file.  If you are familiar with       #
+# Apache or any of the other popular web servers, we've followed the   #
+# same format.  Any configuration variable used here has the same      #
+# semantics as the corresponding variable in Apache.  If we need       #
+# different functionality then a different name is used to avoid       #
+# confusion...                                                         #
+#                                                                      #
+########################################################################
+
+#
+# Ports/addresses that we listen to.  The default port 631 is reserved
+# for the Internet Printing Protocol (IPP) and is what we use here.
+#
+# You can have multiple Port/Listen lines to listen to more than one
+# port or address, or to restrict access:
+#
+#    Port 80
+#    Port 631
+#    Listen hostname
+#    Listen hostname:80
+#    Listen hostname:631
+#    Listen 1.2.3.4
+#    Listen 1.2.3.4:631
+# 
+
+#Port 80
+Port 631
+
+#
+# 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.
+#
+# 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...
+#
+
+User lp
+Group sys
+
+#
+# SystemGroup: the group name for "System" (printer administration)
+# access.
+#
+
+SystemGroup sys
+
+#
+# ServerName: the hostname of your server, as advertised to the world.
+# By default CUPS will use the hostname of the system.
+#
+
+#ServerName myhost.domain.com
+
+#
+# ServerAdmin: the email address to send all complaints/problems to.
+# By default CUPS will use "root@hostname".
+#
+
+#ServerAdmin root@your.domain.com
+
+#
+# ServerRoot: the root directory for the scheduler.
+# By default the compiled-in value.
+#
+
+#ServerRoot /var/cups
+
+#
+# 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
+# "logs/access_log"
+#
+
+#AccessLog logs/access_log
+
+#
+# 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
+# "logs/error_log"
+#
+
+#ErrorLog logs/error_log
+
+#
+# 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
+# "logs/page_log"
+#
+
+#PageLog logs/page_log
+
+#
+# LogLevel: controls the number of messages logged to the ErrorLog
+# file and can be one of the following:
+#
+#     debug	Log everything.
+#     info      Log all requests and state changes.
+#     warn      Log errors and warnings.
+#     error     Log only errors.
+#     none      Log nothing.
+#
+
+LogLevel info
+
+#
+# MaxLogSize: controls the maximum size of each log file before they are
+# rotated.  Defaults to 1048576 (1MB).  Set to 0 to disable log rotating.
+#
+
+#MaxLogSize 0
+
+#
+# MaxRequestSize: controls the maximum size of print files.  Set to 0 to
+# disable this feature (defaults to 0.)
+#
+
+#MaxRequestSize 0
+
+#
+# HostNameLookups: whether or not to do lookups on IP addresses to get a
+# fully-qualified hostname.  This defaults to Off for performance reasons...
+#
+
+#HostNameLookups On
+
+#
+# Timeout: the timeout before requests time out.  Default is 300 seconds.
+#
+
+#Timeout 300
+
+#
+# KeepAlive: whether or not to support the Keep-Alive connection
+# option.  Default is on.
+#
+
+#KeepAlive On
+
+#
+# KeepAliveTimeout: the timeout before Keep-Alive connections are
+# automatically closed.  Default is 60 seconds.
+#
+
+#KeepAliveTimeout 60
+
+#
+# ImplicitClasses: whether or not to use implicit classes.
+#
+# Printer classes can be specified explicitly in the classes.conf
+# file, implicitly based upon the printers available on the LAN, or
+# both.
+#
+# When ImplicitClasses is On, printers on the LAN with the same name
+# (e.g. Acme-LaserPrint-1000) will be put into a class with the same
+# name. This allows you to setup multiple redundant queues on a LAN
+# without a lot of administrative difficulties.  If a user sends a
+# job to Acme-LaserPrint-1000, the job will go to the first available
+# queue.
+#
+# Enabled by default.
+#
+
+#ImplicitClasses On
+
+#
+# Browsing: whether or not to broadcast printer information to
+# other CUPS servers.  Enabled by default.
+#
+
+#Browsing On
+
+#
+# BrowseInterval: the time between browsing updates in seconds.  Default
+# is 30 seconds.
+#
+# Note that browsing information is sent whenever a printer's state changes
+# as well, so this represents the maximum time between updates.
+#
+
+#BrowseInterval 30
+
+#
+# BrowseTimeout: the timeout for network printers - if we don't
+# get an update within this time the printer will be removed
+# from the printer list.  This number definitely should not be
+# less the BrowseInterval value for obvious reasons.  Defaults
+# to 300 seconds.
+#
+
+#BrowseTimeout 300
+
+#
+# BrowsePort: the port used for UDP broadcasts.  By default this is
+# the IPP port; if you change this you need to do it on all servers.
+# Only one BrowsePort is recognized.
+#
+
+#BrowsePort 631
+
+#
+# BrowseAddress: specifies a broadcast address to be used.  By
+# default browsing information is broadcast to all active interfaces.
+#
+# Note: HP-UX 10.20 and earlier do not properly handle broadcast unless
+# you have a Class A, B, C, or D netmask (i.e. no CIDR support).
+#
+
+#BrowseAddress x.y.z.255
+#BrowseAddress x.y.255.255
+#BrowseAddress x.255.255.255
+
+#
+# DocumentRoot: the root directory for HTTP documents that are served.
+# By default the compiled in directory.
+#
+
+#DocumentRoot /usr/share/cups/doc
+
+#
+# DefaultLanguage: the default language if not specified by the browser.
+# If not specified, the current locale is used.
+#
+
+#DefaultLanguage en
+
+#
+# DefaultCharset: the default character set to use. If not specified,
+# defaults to iso-8859-1.  Note that this can also be overridden in
+# HTML documents...
+#
+
+#DefaultCharset iso-8859-1
+
+#
+# RIPCache: the amount of memory that each RIP should use to cache
+# bitmaps.  The value can be any real number followed by "k" for
+# kilobytes, "m" for megabytes, "g" for gigabytes, or "t" for tiles
+# (1 tile = 256x256 pixels.)  Defaults to "32m" (32 megabytes).
+#
+
+#RIPCache: 32m
+
+#
+# Access permissions for each directory served by the scheduler.
+# Locations are relative to DocumentRoot...
+#
+# AuthType: the authorization to use; currently only "Basic" authorization is
+# supported.
+#
+# AuthClass: the authorization class; currently only "Anonymous", "User",
+# "System" (valid user belonging to group SystemGroup), and "Group"
+# (valid user belonging to the specified group) are supported.
+#
+# AuthGroupName: the group name for "Group" authorization.
+#
+# Order: the order of Allow/Deny processing.
+#
+# Allow: allows access from the specified hostname, domain, IP address, or
+# network.
+#
+# Deny: denies access from the specified hostname, domain, IP address, or
+# network.
+#
+
+<Location />
+</Location>
+
+<Location /printers>
+#
+# You may wish to limit access to printers and classes, either with Allow
+# and Deny lines, or by requiring a username and password.
+#
+
+## Require a username and password
+#AuthType Basic
+#AuthClass User
+
+## Restrict access to local domain
+#Order Deny,Allow
+#Deny From All
+#Allow From .mydomain.com
+</Location>
+
+<Location /admin>
+#
+# You definitely will want to limit access to the administration tools.
+# The default configuration requires a local connection from a user who
+# is a member of group "sys" to do any admin tasks.  You can change the
+# group name using the SystemGroup directive.
+#
+
+AuthType Basic
+AuthClass System
+
+## Restrict access to local domain
+Order Deny,Allow
+Deny From All
+Allow From 127.0.0.1
+</Location>
+
+#
+# End of "$Id: cupsd.conf 349 1999-05-21 20:53:02Z mike $".
+#
@@ -1,784 +0,0 @@
-#
-# "$Id$"
-#
-#   Sample configuration file for the Common UNIX Printing System (CUPS)
-#   scheduler.
-#
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
-#
-#       Voice: (301) 373-9603
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
-#
-
-########################################################################
-#                                                                      #
-# This is the CUPS configuration file.  If you are familiar with       #
-# Apache or any of the other popular web servers, we've followed the   #
-# same format.  Any configuration variable used here has the same      #
-# semantics as the corresponding variable in Apache.  If we need       #
-# different functionality then a different name is used to avoid       #
-# confusion...                                                         #
-#                                                                      #
-########################################################################
-
-
-########
-######## Server Identity
-########
-
-#
-# ServerName: the hostname of your server, as advertised to the world.
-# By default CUPS will use the hostname of the system.
-#
-# To set the default server used by clients, see the client.conf file.
-#
-
-#ServerName myhost.domain.com
-
-#
-# ServerAdmin: the email address to send all complaints/problems to.
-# By default CUPS will use "root@hostname".
-#
-
-#ServerAdmin root@your.domain.com
-
-
-########
-######## Server Options
-########
-
-#
-# AccessLog: the access log file; if this does not start with a leading /
-# then it is assumed to be relative to ServerRoot.  By default set to
-# "@CUPS_LOGDIR@/access_log"
-#
-# You can also use the special name "syslog" to send the output to the
-# syslog file or daemon.
-#
-
-#AccessLog @CUPS_LOGDIR@/access_log
-
-#
-# Classification: the classification level of the server.  If set, this
-# classification is displayed on all pages, and raw printing is disabled.
-# The default is the empty string.
-#
-
-#Classification classified
-#Classification confidential
-#Classification secret
-#Classification topsecret
-#Classification unclassified
-
-#
-# ClassifyOverride: whether to allow users to override the classification
-# on printouts. If enabled, users can limit banner pages to before or
-# after the job, and can change the classification of a job, but cannot
-# completely eliminate the classification or banners.
-#
-# The default is off.
-#
-
-#ClassifyOverride off
-
-#
-# DataDir: the root directory for the CUPS data files.
-# By default "@CUPS_DATADIR@".
-#
-
-#DataDir @CUPS_DATADIR@
-
-#
-# DefaultCharset: the default character set to use. If not specified,
-# defaults to "utf-8".  Note that this can also be overridden in
-# HTML documents...
-#
-
-#DefaultCharset utf-8
-
-#
-# DefaultLanguage: the default language if not specified by the browser.
-# If not specified, the current locale is used.
-#
-
-#DefaultLanguage en
-
-#
-# DocumentRoot: the root directory for HTTP documents that are served.
-# By default "@CUPS_DOCROOT@".
-#
-
-#DocumentRoot @CUPS_DOCROOT@
-
-#
-# ErrorLog: the error log file; if this does not start with a leading /
-# then it is assumed to be relative to ServerRoot.  By default set to
-# "@CUPS_LOGDIR@/error_log"
-#
-# You can also use the special name "syslog" to send the output to the
-# syslog file or daemon.
-#
-
-#ErrorLog @CUPS_LOGDIR@/error_log
-
-#
-# FileDevice: determines whether the scheduler will allow new printers
-# to be added using device URIs of the form "file:/foo/bar". The default
-# is not to allow file devices due to the potential security vulnerability
-# and due to the fact that file devices do not support raw printing.
-#
-
-#FileDevice No
-
-
-#
-# FontPath: the path to locate all font files (currently only for pstoraster)
-# By default "@CUPS_FONTPATH@".
-#
-
-#FontPath @CUPS_FONTPATH@
-
-#
-# LogLevel: controls the number of messages logged to the ErrorLog
-# file and can be one of the following:
-#
-#     debug2	Log everything.
-#     debug	Log almost everything.
-#     info      Log all requests and state changes.
-#     warn      Log errors and warnings.
-#     error     Log only errors.
-#     none      Log nothing.
-#
-
-LogLevel info
-
-#
-# MaxLogSize: controls the maximum size of each log file before they are
-# rotated.  Defaults to 1048576 (1MB).  Set to 0 to disable log rotating.
-#
-
-#MaxLogSize 0
-
-#
-# PageLog: the page log file; if this does not start with a leading /
-# then it is assumed to be relative to ServerRoot.  By default set to
-# "@CUPS_LOGDIR@/page_log"
-#
-# You can also use the special name "syslog" to send the output to the
-# syslog file or daemon.
-#
-
-#PageLog @CUPS_LOGDIR@/page_log
-
-#
-# PreserveJobHistory: whether or not to preserve the job history after a
-# job is completed, cancelled, or stopped.  Default is Yes.
-#
-
-#PreserveJobHistory Yes
-
-#
-# PreserveJobFiles: whether or not to preserve the job files after a
-# job is completed, cancelled, or stopped.  Default is No.
-#
-
-#PreserveJobFiles No
-
-#
-# AutoPurgeJobs: automatically purge jobs when not needed for quotas.
-# Default is No.
-#
-
-#AutoPurgeJobs No
-
-#
-# MaxCopies: maximum number of copies that a user can request. Default is
-# 100.
-#
-
-#MaxCopies 100
-
-#
-# MaxJobs: maximum number of jobs to keep in memory (active and completed.)
-# Default is 500; the value 0 is used for no limit.
-#
-
-#MaxJobs 500
-
-#
-# Printcap: the name of the printcap file.  Default is /etc/printcap.
-# Leave blank to disable printcap file generation.
-#
-
-#Printcap /etc/printcap
-
-#
-# PrintcapFormat: the format of the printcap file, currently either
-# BSD or Solaris.  The default is "BSD".
-#
-
-#PrintcapFormat BSD
-#PrintcapFormat Solaris
-
-#
-# PrintcapGUI: the name of the GUI options panel program to associate
-# with print queues under IRIX.  The default is "/usr/bin/glpoptions"
-# from ESP Print Pro.
-#
-# This option is only used under IRIX; the options panel program
-# must accept the "-d printer" and "-o options" options and write
-# the selected printer options back to stdout on completion.
-#
-
-#PrintcapGUI /usr/bin/glpoptions
-
-#
-# RequestRoot: the directory where request files are stored.
-# By default "@CUPS_REQUESTS@".
-#
-
-#RequestRoot @CUPS_REQUESTS@
-
-#
-# RemoteRoot: the name of the user assigned to unauthenticated accesses
-# from remote systems.  By default "remroot".
-#
-
-#RemoteRoot remroot
-
-#
-# ServerBin: the root directory for the scheduler executables.
-# By default "@CUPS_SERVERBIN@".
-#
-
-#ServerBin @CUPS_SERVERBIN@
-
-#
-# ServerRoot: the root directory for the scheduler.
-# By default "@CUPS_SERVERROOT@".
-#
-
-#ServerRoot @CUPS_SERVERROOT@
-
-
-########
-######## Encryption Support
-########
-
-#
-# ServerCertificate: the file to read containing the server's certificate.
-# Defaults to "@CUPS_SERVERROOT@/ssl/server.crt".
-#
-
-#ServerCertificate @CUPS_SERVERROOT@/ssl/server.crt
-
-#
-# ServerKey: the file to read containing the server's key.
-# Defaults to "@CUPS_SERVERROOT@/ssl/server.key".
-#
-
-#ServerKey @CUPS_SERVERROOT@/ssl/server.key
-
-
-########
-######## Filter Options
-########
-
-#
-# User/Group: the user and group the server runs under.  Normally this
-# must be @CUPS_USER@ and @CUPS_GROUP@, however you can configure things for another
-# user or group as needed.
-#
-# Note: the server must be run initially as root to support the
-# default IPP port of 631.  It changes users whenever an external
-# program is run, or if the RunAsUser directive is specified...
-#
-
-#User @CUPS_USER@
-#Group @CUPS_GROUP@
-
-#
-# RIPCache: the amount of memory that each RIP should use to cache
-# bitmaps.  The value can be any real number followed by "k" for
-# kilobytes, "m" for megabytes, "g" for gigabytes, or "t" for tiles
-# (1 tile = 256x256 pixels.)  Defaults to "8m" (8 megabytes).
-#
-
-#RIPCache 8m
-
-#
-# TempDir: the directory to put temporary files in.  This directory must be
-# writable by the user defined above!  Defaults to "@CUPS_REQUESTS@/tmp" or
-# the value of the TMPDIR environment variable.
-#
-
-#TempDir @CUPS_REQUESTS@/tmp
-
-#
-# FilterLimit: sets the maximum cost of all job filters that can be run
-# at the same time.  A limit of 0 means no limit.  A typical job may need
-# a filter limit of at least 200; limits less than the minimum required
-# by a job force a single job to be printed at any time.
-#
-# The default limit is 0 (unlimited).
-#
-
-#FilterLimit 0
-
-########
-######## Network Options
-########
-
-#
-# Ports/addresses that we listen to.  The default port 631 is reserved
-# for the Internet Printing Protocol (IPP) and is what we use here.
-#
-# You can have multiple Port/Listen lines to listen to more than one
-# port or address, or to restrict access:
-#
-#    Port 80
-#    Port 631
-#    Listen hostname
-#    Listen hostname:80
-#    Listen hostname:631
-#    Listen 1.2.3.4
-#    Listen 1.2.3.4:631
-# 
-# NOTE: Unfortunately, most web browsers don't support TLS or HTTP Upgrades
-# for encryption.  If you want to support web-based encryption you'll
-# probably need to listen on port 443 (the "https" port...)
-#
-
-#Port 80
-#Port 443
-Port 631
-
-#
-# HostNameLookups: whether or not to do lookups on IP addresses to get a
-# fully-qualified hostname.  This defaults to Off for performance reasons...
-#
-
-#HostNameLookups On
-
-#
-# KeepAlive: whether or not to support the Keep-Alive connection
-# option.  Default is on.
-#
-
-#KeepAlive On
-
-#
-# KeepAliveTimeout: the timeout before Keep-Alive connections are
-# automatically closed.  Default is 60 seconds.
-#
-
-#KeepAliveTimeout 60
-
-#
-# MaxClients: controls the maximum number of simultaneous clients that
-# will be handled.  Defaults to 100.
-#
-
-#MaxClients 100
-
-#
-# MaxClientsPerHost: controls the maximum number of simultaneous clients that
-# will be handled from a specific host.  Defaults to 10 or 1/10th of the
-# MaxClients setting, whichever is larger.  A value of 0 specifies the
-# automatic (10 or 1/10th) setting.
-#
-
-#MaxClientsPerHost 0
-
-#
-# MaxRequestSize: controls the maximum size of HTTP requests and print files.
-# Set to 0 to disable this feature (defaults to 0.)
-#
-
-#MaxRequestSize 0
-
-#
-# Timeout: the timeout before requests time out.  Default is 300 seconds.
-#
-
-#Timeout 300
-
-
-########
-######## Browsing Options
-########
-
-#
-# Browsing: whether or not to broadcast and/or listen for CUPS printer
-# information on the network.  Enabled by default.
-#
-
-#Browsing On
-
-#
-# BrowseProtocols: which protocols to use for browsing.  Can be
-# any of the following separated by whitespace and/or commas:
-#
-#     all  - Use all supported protocols.
-#     cups - Use the CUPS browse protocol.
-#     slp  - Use the SLPv2 protocol.
-#
-# The default is "cups".
-#
-# NOTE: If you choose to use SLPv2, it is *strongly* recommended that
-#       you have at least one SLP Directory Agent (DA) on your
-#       network.  Otherwise, browse updates can take several seconds,
-#       during which the scheduler will not response to client
-#       requests.
-#
-
-#BrowseProtocols cups
-
-#
-# BrowseAddress: specifies a broadcast address to be used.  By
-# default browsing information is not sent!
-#
-# Note: HP-UX does not properly handle broadcast unless you have a
-# Class A, B, C, or D netmask (i.e. no CIDR support).
-#
-# Note: Using the "global" broadcast address (255.255.255.255) will
-# activate a Linux demand-dial link with the default configuration.
-# If you have a LAN as well as the dial-up link, use the LAN's
-# broadcast address.
-#
-# The @LOCAL address broadcasts to all non point-to-point interfaces.
-# For example, if you have a LAN and a dial-up link, @LOCAL would
-# send printer updates to the LAN but not to the dial-up link.
-# Similarly, the @IF(name) address sends to the named network
-# interface, e.g. @IF(eth0) under Linux.  Interfaces are refreshed
-# automatically (no more than once every 60 seconds), so they can
-# be used on dynamically-configured interfaces, e.g. PPP, 802.11, etc.
-#
-
-#BrowseAddress x.y.z.255
-#BrowseAddress x.y.255.255
-#BrowseAddress x.255.255.255
-#BrowseAddress 255.255.255.255
-#BrowseAddress @LOCAL
-#BrowseAddress @IF(name)
-
-#
-# BrowseShortNames: whether or not to use "short" names for remote printers
-# when possible (e.g. "printer" instead of "printer@host".)  Enabled by
-# default.
-#
-
-#BrowseShortNames Yes
-
-#
-# BrowseAllow: specifies an address mask to allow for incoming browser
-# packets. The default is to allow packets from all addresses.
-#
-# BrowseDeny: specifies an address mask to deny for incoming browser
-# packets. The default is to deny packets from no addresses.
-#
-# Both "BrowseAllow" and "BrowseDeny" accept the following notations for
-# addresses:
-#
-#     All
-#     None
-#     *.domain.com
-#     .domain.com
-#     host.domain.com
-#     nnn.*
-#     nnn.nnn.*
-#     nnn.nnn.nnn.*
-#     nnn.nnn.nnn.nnn
-#     nnn.nnn.nnn.nnn/mm
-#     nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm
-#     @LOCAL
-#     @IF(name)
-#
-# The hostname/domainname restrictions only work if you have turned hostname
-# lookups on!
-#
-
-#BrowseAllow address
-#BrowseDeny address
-
-#
-# BrowseInterval: the time between browsing updates in seconds.  Default
-# is 30 seconds.
-#
-# Note that browsing information is sent whenever a printer's state changes
-# as well, so this represents the maximum time between updates.
-#
-# Set this to 0 to disable outgoing broadcasts so your local printers are
-# not advertised but you can still see printers on other hosts.
-#
-
-#BrowseInterval 30
-
-#
-# BrowseOrder: specifies the order of BrowseAllow/BrowseDeny comparisons.
-#
-
-#BrowseOrder allow,deny
-#BrowseOrder deny,allow
-
-#
-# BrowsePoll: poll the named server(s) for printers
-#
-
-#BrowsePoll address:port
-
-#
-# BrowsePort: the port used for UDP broadcasts.  By default this is
-# the IPP port; if you change this you need to do it on all servers.
-# Only one BrowsePort is recognized.
-#
-
-#BrowsePort 631
-
-#
-# BrowseRelay: relay browser packets from one address/network to another.
-#
-
-#BrowseRelay source-address destination-address
-#BrowseRelay @IF(src) @IF(dst)
-
-#
-# BrowseTimeout: the timeout for network printers - if we don't
-# get an update within this time the printer will be removed
-# from the printer list.  This number definitely should not be
-# less the BrowseInterval value for obvious reasons.  Defaults
-# to 300 seconds.
-#
-
-#BrowseTimeout 300
-
-#
-# ImplicitClasses: whether or not to use implicit classes.
-#
-# Printer classes can be specified explicitly in the classes.conf
-# file, implicitly based upon the printers available on the LAN, or
-# both.
-#
-# When ImplicitClasses is On, printers on the LAN with the same name
-# (e.g. Acme-LaserPrint-1000) will be put into a class with the same
-# name. This allows you to setup multiple redundant queues on a LAN
-# without a lot of administrative difficulties.  If a user sends a
-# job to Acme-LaserPrint-1000, the job will go to the first available
-# queue.
-#
-# Enabled by default.
-#
-
-#ImplicitClasses On
-
-#
-# ImplicitAnyClasses: whether or not to create "AnyPrinter" implicit
-# classes.
-#
-# When ImplicitAnyClasses is On and a local queue of the same name
-# exists, e.g. "printer", "printer@server1", "printer@server1", then
-# an implicit class called "Anyprinter" is created instead.
-#
-# When ImplicitAnyClasses is Off, implicit classes are not created
-# when there is a local queue of the same name.
-#
-# Disabled by default.
-#
-
-#ImplicitAnyCLasses Off
-
-#
-# HideImplicitMembers: whether or not to show the members of an
-# implicit class.
-#
-# When HideImplicitMembers is On, any remote printers that are
-# part of an implicit class are hidden from the user, who will
-# then only see a single queue even though many queues will be
-# supporting the implicit class.
-#
-# Enabled by default.
-#
-
-#HideImplicitMembers On
-
-
-########
-######## Security Options
-########
-
-#
-# SystemGroup: the group name for "System" (printer administration)
-# access.  The default varies depending on the operating system, but
-# will be "sys", "system", or "root" (checked for in that order.)
-#
-
-#SystemGroup @CUPS_GROUP@
-
-#
-# RootCertDuration: How frequently the root certificate is regenerated.
-# Defaults to 300 seconds.
-#
-
-#RootCertDuration 300
-
-#
-# Access permissions for each directory served by the scheduler.
-# Locations are relative to DocumentRoot...
-#
-# AuthType: the authorization to use:
-#
-#    None   - Perform no authentication
-#    Basic  - Perform authentication using the HTTP Basic method.
-#    Digest - Perform authentication using the HTTP Digest method.
-#
-#    (Note: local certificate authentication can be substituted by
-#           the client for Basic or Digest when connecting to the
-#           localhost interface)
-#
-# AuthClass: the authorization class; currently only "Anonymous", "User",
-# "System" (valid user belonging to group SystemGroup), and "Group"
-# (valid user belonging to the specified group) are supported.
-#
-# AuthGroupName: the group name for "Group" authorization.
-#
-# Order: the order of Allow/Deny processing.
-#
-# Allow: allows access from the specified hostname, domain, IP address,
-# network, or interface.
-#
-# Deny: denies access from the specified hostname, domain, IP address,
-# network, or interface.
-#
-# Both "Allow" and "Deny" accept the following notations for addresses:
-#
-#     All
-#     None
-#     *.domain.com
-#     .domain.com
-#     host.domain.com
-#     nnn.*
-#     nnn.nnn.*
-#     nnn.nnn.nnn.*
-#     nnn.nnn.nnn.nnn
-#     nnn.nnn.nnn.nnn/mm
-#     nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm
-#     @LOCAL
-#     @IF(name)
-#
-# The host and domain address require that you enable hostname lookups
-# with "HostNameLookups On" above.
-#
-# The @LOCAL address allows or denies from all non point-to-point
-# interfaces.  For example, if you have a LAN and a dial-up link,
-# @LOCAL could allow connections from the LAN but not from the dial-up
-# link.  Similarly, the @IF(name) address allows or denies from the
-# named network interface, e.g. @IF(eth0) under Linux.  Interfaces are
-# refreshed automatically (no more than once every 60 seconds), so
-# they can be used on dynamically-configured interfaces, e.g. PPP,
-# 802.11, etc.
-#
-# Encryption: whether or not to use encryption; this depends on having
-# the OpenSSL library linked into the CUPS library and scheduler.
-#
-# Possible values:
-#
-#     Always       - Always use encryption (SSL)
-#     Never        - Never use encryption
-#     Required     - Use TLS encryption upgrade
-#     IfRequested  - Use encryption if the server requests it
-#
-# The default value is "IfRequested".
-#
-
-<Location />
-Order Deny,Allow
-Deny From All
-Allow From 127.0.0.1
-</Location>
-
-#<Location /classes>
-#
-# You may wish to limit access to printers and classes, either with Allow
-# and Deny lines, or by requiring a username and password.
-#
-#</Location>
-
-#<Location /classes/name>
-#
-# You may wish to limit access to printers and classes, either with Allow
-# and Deny lines, or by requiring a username and password.
-#
-#</Location>
-
-#<Location /jobs>
-#
-# You may wish to limit access to job operations, either with Allow
-# and Deny lines, or by requiring a username and password.
-#
-#</Location>
-
-#<Location /printers>
-#
-# You may wish to limit access to printers and classes, either with Allow
-# and Deny lines, or by requiring a username and password.
-#
-#</Location>
-
-#<Location /printers/name>
-#
-# You may wish to limit access to printers and classes, either with Allow
-# and Deny lines, or by requiring a username and password.
-#
-
-## Anonymous access (default)
-#AuthType None
-
-## Require a username and password (Basic authentication)
-#AuthType Basic
-#AuthClass User
-
-## Require a username and password (Digest/MD5 authentication)
-#AuthType Digest
-#AuthClass User
-
-## Restrict access to local domain
-#Order Deny,Allow
-#Deny From All
-#Allow From .mydomain.com
-#</Location>
-
-<Location /admin>
-#
-# You definitely will want to limit access to the administration functions.
-# The default configuration requires a local connection from a user who
-# is a member of the system group to do any admin tasks.  You can change
-# the group name using the SystemGroup directive.
-#
-
-AuthType Basic
-AuthClass System
-
-## Restrict access to local domain
-Order Deny,Allow
-Deny From All
-Allow From 127.0.0.1
-
-#Encryption Required
-</Location>
-
-#
-# End of "$Id$".
-#
@@ -1,9 +1,9 @@
 #
-# "$Id: mime.convs 3041 2002-12-17 19:00:27Z swdev $"
+# "$Id: mime.convs 237 1999-04-21 19:29:35Z mike $"
 #
 #   MIME converts file for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2003 by Easy Software Products.
+#   Copyright 1997-1999 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -30,12 +30,10 @@
 #
 # General Notes:
 #
-#   The "cost" field is used to find the least costly filters to run
-#   when converting a job file to a printable format.
-#
-#   All filters *must* accept the standard command-line arguments
-#   (job-id, user, title, copies, options, [filename or stdin]) to
-#   work with CUPS.
+#   Currently the "cost" field is not used (all filters are assumed to
+#   be equally costly in terms of speed/memory).  Also, a filter program
+#   *must* accept the standard command-line arguments (job-id, user, title,
+#   copies,options,[filename or stdin]) or this won't work.
 #

 ########################################################################
@@ -43,74 +41,22 @@
 # PostScript filters
 #

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

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

-image/gif		application/vnd.cups-raster	100	imagetoraster
-image/png		application/vnd.cups-raster	100	imagetoraster
-image/jpeg		application/vnd.cups-raster	100	imagetoraster
-image/tiff		application/vnd.cups-raster	100	imagetoraster
-image/x-photocd		application/vnd.cups-raster	100	imagetoraster
-image/x-portable-anymap	application/vnd.cups-raster	100	imagetoraster
-image/x-portable-bitmap	application/vnd.cups-raster	100	imagetoraster
-image/x-portable-graymap application/vnd.cups-raster	100	imagetoraster
-image/x-portable-pixmap	application/vnd.cups-raster	100	imagetoraster
-image/x-sgi-rgb		application/vnd.cups-raster	100	imagetoraster
-image/x-xbitmap		application/vnd.cups-raster	100	imagetoraster
-image/x-xpixmap		application/vnd.cups-raster	100	imagetoraster
-image/x-xwindowdump	application/vnd.cups-raster	100	imagetoraster
-image/x-sun-raster	application/vnd.cups-raster	100	imagetoraster
-
-# pstoraster is now part of ESP Ghostscript...
-#application/vnd.cups-postscript	application/vnd.cups-raster	100	pstoraster
-
-########################################################################
-#
-# Raw filter...
-#
-# Uncomment the following filter and the application/octet-stream type
-# in mime.types to allow printing of arbitrary files without the -oraw
-# option.
-#
-
-#application/octet-stream	application/vnd.cups-raw	0	-
+image/*			application/vnd.cups-raster	50	imagetoraster
+application/vnd.cups-postscript	application/vnd.cups-raster	50	pstoraster

 #
-# End of "$Id: mime.convs 3041 2002-12-17 19:00:27Z swdev $".
+# End of "$Id: mime.convs 237 1999-04-21 19:29:35Z mike $".
 #
@@ -1,9 +1,9 @@
 #
-# "$Id: mime.types 3041 2002-12-17 19:00:27Z swdev $"
+# "$Id: mime.types 185 1999-03-24 18:38:50Z mike $"
 #
 #   MIME types file for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2003 by Easy Software Products.
+#   Copyright 1997-1999 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -39,13 +39,12 @@
 #   ascii(offset,length)		True if bytes are valid printable ASCII
 #					(CR, NL, TAB, BS, 32-126)
 #   printable(offset,length)		True if bytes are printable 8-bit chars
-#					(CR, NL, TAB, BS, 32-126, 128-254)
+#					(CR, NL, TAB, BS, 32-126, 160-254)
 #   string(offset,"string")		True if bytes are identical to string
 #   char(offset,value)			True if byte is identical
 #   short(offset,value)			True if 16-bit integer is identical
 #   int(offset,value)			True if 32-bit integer is identical
 #   locale("string")                    True if current locale matches string
-#   contains(offset,range,"string")	True if the range contains the string
 #
 # General Notes:
 #
@@ -57,10 +56,10 @@
 #   type in the sorted list.
 #
 #   The "printable" rule differs from the "ascii" rule in that it also
-#   accepts 8-bit characters in the range 128-255.
+#   accepts 8-bit characters in the range 160-254.
 #
 #   String constants must be surrounded by "" if they contain whitespace.
-#   To insert binary data into a string, use the <hex> notation.
+#   To instead binary data into a string, use the <hex> notation.
 #

 ########################################################################
@@ -71,14 +70,9 @@
 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>E<1B>%0B) \
-				string(0,<1B>%-1B) string(0,<201B>)\
-				string(0,BP;) string(0,IN;) string(0,DF;) \
-				string(0,BPINPS;) \
-				(contains(0,128,<1B>%-12345X) + \
-				 (contains(0,1024,"LANGUAGE=HPGL") \
-				  contains(0,1024,"LANGUAGE = HPGL")))
+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;) 

 ########################################################################
 #
@@ -87,11 +81,7 @@ application/vnd.hp-HPGL		hpgl string(0,<1B>&)\

 image/gif			gif string(0,GIF87a) string(0,GIF89a)
 image/png			png string(0,<89>PNG)
-image/jpeg			jpeg jpg jpe string(0,<FFD8FF>) &&\
-				(char(3,0xe0) char(3,0xe1) char(3,0xe2) char(3,0xe3)\
-				 char(3,0xe4) char(3,0xe5) char(3,0xe6) char(3,0xe7)\
-				 char(3,0xe8) char(3,0xe9) char(3,0xea) char(3,0xeb)\
-				 char(3,0xec) char(3,0xed) char(3,0xee) char(3,0xef))
+image/jpeg			jpeg jpg jpe string(6,JFIF)
 image/tiff			tiff tif string(0,MM) string(0,II)
 image/x-photocd			pcd string(2048,PCD_IPI)
 image/x-portable-anymap		pnm
@@ -101,12 +91,14 @@ image/x-portable-pixmap		ppm string(0,P3) string(0,P6)
 image/x-sgi-rgb			rgb sgi bw icon short(0,474)
 image/x-xbitmap			xbm
 image/x-xpixmap			xpm ascii(0,1024) + string(3,"XPM")
-image/x-xwindowdump		xwd string(4,<00000007>)
-image/x-sun-raster		ras string(0,<59a66a95>)
+image/x-xwindowdump		xwd

-#image/fpx			fpx
-image/x-alias			pix short(8,8) short(8,24)
-image/x-bitmap			bmp string(0,BM) && !printable(2,14)
+# TODO: Add Sun Raster, Alias, SoftImage, GIMP??? files
+
+image/x-sun-raster		ras
+#image/x-alias			pix
+#image/x-softimage
+#image/x-gimp-xcf		xcf xcf.gz

 ########################################################################
 #
@@ -115,13 +107,6 @@ image/x-bitmap			bmp string(0,BM) && !printable(2,14)

 text/html			html htm printable(0,1024) +\
 				(string(0,"<HTML>") string(0,"<!DOCTYPE"))
-application/x-cshell		csh printable(0,1024) + string(0,#!) +\
-				(contains(2,80,/csh) contains(2,80,/tcsh))
-application/x-perl		pl printable(0,1024) + string(0,#!) +\
-				contains(2,80,/perl)
-application/x-shell		sh printable(0,1024) + string(0,#!) +\
-				(contains(2,80,/bash) contains(2,80,/ksh)\
-				 contains(2,80,/sh) contains(2,80,/zsh))
 text/plain			txt printable(0,1024)

 ########################################################################
@@ -129,30 +114,10 @@ text/plain			txt printable(0,1024)
 # CUPS-specific types...
 #

-application/vnd.cups-command	string(0,'#CUPS-COMMAND')
-application/vnd.cups-form	string(0,"<CUPSFORM>")
-application/vnd.cups-postscript	contains(0,128,<1B>%-12345X) + \
-				(contains(0,1024,"LANGUAGE=POSTSCRIPT") \
-				 contains(0,1024,"LANGUAGE = Postscript") \
-				 contains(0,1024,"LANGUAGE = POSTSCRIPT"))
+application/vnd.cups-postscript
 application/vnd.cups-raster	string(0,"RaSt") string(0,"tSaR")
-application/vnd.cups-raw	(string(0,<1B>E) + !string(2,<1B>%0B)) \
-				string(0,<1B>@) \
-				(contains(0,128,<1B>%-12345X) + \
-				 (contains(0,1024,"LANGUAGE=PCL") \
-				  contains(0,1024,"LANGUAGE = PCL")))
-
-########################################################################
-#
-# Raw print file support...
-#
-# Uncomment the following type and the application/octet-stream
-# filter line in mime.convs to allow raw file printing without the
-# -oraw option.
-#
-
-#application/octet-stream
+application/vnd.cups-raw

 #
-# End of "$Id: mime.types 3041 2002-12-17 19:00:27Z swdev $".
+# End of "$Id: mime.types 185 1999-03-24 18:38:50Z mike $".
 #
@@ -1,2 +0,0 @@
-auth	required	@PAMMOD@ nullok shadow
-account	required	@PAMMOD@
@@ -1,3 +0,0 @@
-#%PAM-1.0
-auth	required	pam_unix.so shadow nodelay nullok
-account	required	pam_unix.so
@@ -1,2 +0,0 @@
-# This is a dummy printcap file that is automatically generated by the
-# CUPS software for old applications that rely on it.
@@ -1,10 +1,10 @@
 #
-# "$Id: printers.conf 3041 2002-12-17 19:00:27Z swdev $"
+# "$Id: printers.conf 334 1999-05-17 18:11:26Z mike $"
 #
 #   Sample printer configuration file for the Common UNIX Printing System
 #   (CUPS) scheduler.
 #
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+#   Copyright 1997-1999 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -15,7 +15,7 @@
 #
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
-#       44141 Airport View Drive, Suite 204
+#       44145 Airport View Drive, Suite 204
 #       Hollywood, Maryland 20636-3111 USA
 #
 #       Voice: (301) 373-9603
@@ -47,6 +47,12 @@

 #Info Acme LaserPrint 1000

+#
+# MoreInfo: a URL for more information on the printer.
+#
+
+#MoreInfo http://www.acme.com/lp1000.html
+
 #
 # Location: the location of the printer.
 #
@@ -71,26 +77,13 @@
 # State: sets the initial state of the printer.  Can be one of the
 # following:
 #
-#     Idle    - Printer is available to print new jobs.
+#     Idle    - Printer is available to accept new jobs.
 #     Stopped - Printer is disabled but accepting new jobs.
 #

 #State Idle
-
-#
-# StateMessage: sets the printer-state-message attribute for the printer.
-#
-
-#StateMessage Printer is idle.
-
-#
-# Accepting: is the printer accepting jobs?
-#
-#Accepting Yes
-#Accepting No
-
 #</Printer>

 #
-# End of "$Id: printers.conf 3041 2002-12-17 19:00:27Z swdev $".
+# End of "$Id: printers.conf 334 1999-05-17 18:11:26Z mike $".
 #
@@ -1,174 +0,0 @@
-dnl
-dnl "$Id: cups-common.m4 3041 2002-12-17 19:00:27Z swdev $"
-dnl
-dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
-dnl
-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(bstring.h,AC_DEFINE(HAVE_BSTRING_H))
-AC_CHECK_HEADER(usersec.h,AC_DEFINE(HAVE_USERSEC_H))
-AC_CHECK_HEADER(sys/ioctl.h,AC_DEFINE(HAVE_SYS_IOCTL_H))
-
-dnl Checks for string functions.
-AC_CHECK_FUNCS(strdup strcasecmp strncasecmp strlcat strlcpy)
-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 Libraries for the backends...
-case $uname in
-        Darwin*)
-                BACKLIBS="-framework CoreFoundation -framework IOKit"
-                ;;
-        *)
-                BACKLIBS=""
-                ;;
-esac
-
-AC_SUBST(BACKLIBS)
-
-dnl
-dnl End of "$Id: cups-common.m4 3041 2002-12-17 19:00:27Z swdev $".
-dnl
@@ -1,185 +0,0 @@
-dnl
-dnl "$Id: cups-compiler.m4 3041 2002-12-17 19:00:27Z swdev $"
-dnl
-dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
-dnl
-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`"
-	case "$SUPC" in
-    		libsupc++.a*)
-			# Library not found, so this is and older GCC...
-			AC_MSG_RESULT(no)
-			;;
-		*)
-        		# This is gcc 3.x, and it knows of libsupc++, so we need it
-        		CXXLIBS="-lsupc++"
-        		AC_MSG_RESULT(yes)
-			;;
-	esac
-
-	CXX="$CC"
-
-	if test -z "$OPTIM"; then
-		if test "x$with_optim" = x; then
-			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
-
-dnl
-dnl End of "$Id: cups-compiler.m4 3041 2002-12-17 19:00:27Z swdev $".
-dnl
@@ -1,242 +0,0 @@
-dnl
-dnl "$Id: cups-directories.m4 3041 2002-12-17 19:00:27Z swdev $"
-dnl
-dnl   Directory stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636-3111 USA
-dnl
-dnl       Voice: (301) 373-9603
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
-dnl
-
-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 "$libdir" = "\${exec_prefix}/lib"; then
-	libdir="$exec_prefix/lib"
-fi
-
-if test "$uname" = "IRIX" -a $uversion -ge 62; then
-	libdir="$exec_prefix/lib32"
-fi
-
-dnl Fix "fontpath" variable...
-if test "x$fontpath" = "x"; then
-	fontpath="$datadir/cups/fonts"
-fi
-
-dnl Setup init.d locations...
-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="$libdir/cups"
-		AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$libdir/cups")
-		;;
-esac
-
-AC_SUBST(INSTALL_SYSV)
-AC_SUBST(CUPS_SERVERROOT)
-AC_SUBST(CUPS_SERVERBIN)
-AC_SUBST(CUPS_LOGDIR)
-AC_SUBST(CUPS_REQUESTS)
-
-dnl Set the CUPS_LOCALE directory...
-case "$uname" in
-	Linux* | *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 3041 2002-12-17 19:00:27Z swdev $".
-dnl
@@ -1,82 +0,0 @@
-dnl
-dnl "$Id: cups-image.m4 3041 2002-12-17 19:00:27Z swdev $"
-dnl
-dnl   Image library stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
-dnl
-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"
-
-EXPORT_LIBJPEG="$LIBJPEG"
-EXPORT_LIBPNG="$LIBPNG"
-EXPORT_LIBTIFF="$LIBTIFF"
-EXPORT_LIBZ="$LIBZ"
-
-AC_SUBST(EXPORT_LIBJPEG)
-AC_SUBST(EXPORT_LIBPNG)
-AC_SUBST(EXPORT_LIBTIFF)
-AC_SUBST(EXPORT_LIBZ)
-
-AC_CHECK_HEADER(stdlib.h,AC_DEFINE(HAVE_STDLIB_H))
-
-dnl
-dnl End of "$Id: cups-image.m4 3041 2002-12-17 19:00:27Z swdev $".
-dnl
@@ -1,49 +0,0 @@
-dnl
-dnl "$Id: cups-libtool.m4 3041 2002-12-17 19:00:27Z swdev $"
-dnl
-dnl   Libtool stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636-3111 USA
-dnl
-dnl       Voice: (301) 373-9603
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
-dnl
-
-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 3041 2002-12-17 19:00:27Z swdev $".
-dnl
@@ -1,104 +0,0 @@
-dnl
-dnl "$Id: cups-manpages.m4 3041 2002-12-17 19:00:27Z swdev $"
-dnl
-dnl   Manpage stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636-3111 USA
-dnl
-dnl       Voice: (301) 373-9603
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
-dnl
-
-dnl 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 3041 2002-12-17 19:00:27Z swdev $".
-dnl
@@ -1,41 +0,0 @@
-dnl
-dnl "$Id: cups-network.m4 3041 2002-12-17 19:00:27Z swdev $"
-dnl
-dnl   Networking stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636-3111 USA
-dnl
-dnl       Voice: (301) 373-9603
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
-dnl
-
-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 3041 2002-12-17 19:00:27Z swdev $".
-dnl
@@ -1,48 +0,0 @@
-dnl
-dnl "$Id: cups-openslp.m4 3041 2002-12-17 19:00:27Z swdev $"
-dnl
-dnl   OpenSLP configuration stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
-dnl
-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 3041 2002-12-17 19:00:27Z swdev $".
-dnl
@@ -1,74 +0,0 @@
-dnl
-dnl "$Id: cups-openssl.m4 3041 2002-12-17 19:00:27Z swdev $"
-dnl
-dnl   OpenSSL stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636-3111 USA
-dnl
-dnl       Voice: (301) 373-9603
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
-dnl
-
-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)
-
-EXPORT_SSLLIBS="$SSLLIBS"
-AC_SUBST(EXPORT_SSLLIBS)
-
-
-dnl
-dnl End of "$Id: cups-openssl.m4 3041 2002-12-17 19:00:27Z swdev $".
-dnl
@@ -1,90 +0,0 @@
-dnl
-dnl "$Id: cups-opsys.m4 3041 2002-12-17 19:00:27Z swdev $"
-dnl
-dnl   Operating system stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
-dnl
-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 3041 2002-12-17 19:00:27Z swdev $"
-dnl
@@ -1,71 +0,0 @@
-dnl
-dnl "$Id: cups-pam.m4 3041 2002-12-17 19:00:27Z swdev $"
-dnl
-dnl   PAM stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636-3111 USA
-dnl
-dnl       Voice: (301) 373-9603
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
-dnl
-
-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=""
-PAMMOD="pam_unknown.so"
-
-if test x$enable_pam != xno; then
-	SAVELIBS="$LIBS"
-
-	AC_CHECK_LIB(dl,dlopen)
-	AC_CHECK_LIB(pam,pam_start)
-	AC_CHECK_HEADER(pam/pam_appl.h,AC_DEFINE(HAVE_PAM_PAM_APPL_H))
-
-	if test x$ac_cv_lib_pam_pam_start != xno; then
-		if test x$ac_cv_lib_dl_dlopen != xno; then
-			PAMLIBS="-lpam -ldl"
-		else
-			PAMLIBS="-lpam"
-		fi
-		if test -d /etc/pam.d; then
-			PAMDIR="/etc/pam.d"
-		fi
-	fi
-
-	LIBS="$SAVELIBS"
-
-	# This test might need to be updated as Linux distributors move
-	# things around...
-	for mod in pam_unix2.so pam_unix.so pam_pwdb.so; do
-		if test -f /lib/security/$mod; then
-			PAMMOD="$mod"
-		fi
-	done
-fi
-
-AC_SUBST(PAMDIR)
-AC_SUBST(PAMLIBS)
-AC_SUBST(PAMMOD)
-
-dnl
-dnl End of "$Id: cups-pam.m4 3041 2002-12-17 19:00:27Z swdev $".
-dnl
@@ -1,149 +0,0 @@
-dnl
-dnl "$Id: cups-sharedlibs.m4 3041 2002-12-17 19:00:27Z swdev $"
-dnl
-dnl   Shared library support for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 1997-2003 by Easy Software Products, all rights reserved.
-dnl
-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="+s +b $libdir $DSOFLAGS"
-                	LDFLAGS="$LDFLAGS -Wl,+s,+b,$libdir"
-                	;;
-                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 3041 2002-12-17 19:00:27Z swdev $".
-dnl
@@ -5,7 +5,7 @@
 *
 *   @configure_input@
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-1999 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -16,10 +16,10 @@
 *
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
+ *       44145 Airport View Drive, Suite 204
 *       Hollywood, Maryland 20636-3111 USA
 *
- *       Voice: (301) 373-9600
+ *       Voice: (301) 373-9603
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
 */
@@ -28,37 +28,15 @@
 * Version of software...
 */

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

 /*
 * Where are files stored?
 */

-#define CUPS_LOCALEDIR	"/usr/share/locale"
-#define CUPS_SERVERROOT	"/etc/cups"
-#define CUPS_SERVERBIN	"/usr/lib/cups"
-#define CUPS_DOCROOT	"/usr/share/doc/cups"
-#define CUPS_REQUESTS	"/var/spool/cups"
-#define CUPS_LOGDIR	"/var/logs/cups"
-#define CUPS_DATADIR    "/usr/share/cups"
-#define CUPS_FONTPATH	"/usr/share/cups/fonts"
-
-
-/*
- * What is the format string for strftime?
- */
-
-#define CUPS_STRFTIME_FORMAT	NULL
-
+#define CUPS_LOCALEDIR	"/usr/lib/locale"
+#define CUPS_SERVERROOT	"/var/cups"
+#define CUPS_DATADIR	"/usr/share/cups"

 /*
 * Do we have various image libraries?
@@ -69,14 +47,12 @@
 #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?
 */
@@ -86,41 +62,18 @@
 #undef HAVE_SYS_NDIR_H
 #undef HAVE_NDIR_H

-
-/*
- * Do we have PAM stuff?
- */
-
-#ifndef HAVE_LIBPAM
-#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>, and/or <bstring.h>?
- */
-
-#undef HAVE_STRING_H
-#undef HAVE_STRINGS_H
-#undef HAVE_BSTRING_H
-
-
 /*
 * Do we have the strXXX() functions?
 */
@@ -128,24 +81,6 @@
 #undef HAVE_STRDUP
 #undef HAVE_STRCASECMP
 #undef HAVE_STRNCASECMP
-#undef HAVE_STRLCAT
-#undef HAVE_STRLCPY
-
-
-/*
- * Do we have the vsyslog() function?
- */
-
-#undef HAVE_VSYSLOG
-
-
-/*
- * Do we have the (v)snprintf() functions?
- */
-
-#undef HAVE_SNPRINTF
-#undef HAVE_VSNPRINTF
-

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

-
 /*
 * What wait functions to use?
 */
@@ -162,79 +96,6 @@
 #undef HAVE_WAITPID
 #undef HAVE_WAIT3

-
-/*
- * Do we have the mallinfo function and malloc.h?
- */
-
-#undef HAVE_MALLINFO
-#undef HAVE_MALLOC_H
-
-
-/*
- * Do we have the OpenSSL library?
- */
-
-#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-2003 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-1999 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
@@ -14,7 +14,7 @@ dnl   at:
 dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
+dnl       44145 Airport View Drive, Suite 204
 dnl       Hollywood, Maryland 20636-3111 USA
 dnl
 dnl       Voice: (301) 373-9603
@@ -23,25 +23,116 @@ dnl         WWW: http://www.cups.org
 dnl

 AC_INIT(cups/cups.h)
+AC_CONFIG_HEADER(config.h)
+AC_PREFIX_DEFAULT(/usr)

-sinclude(config-scripts/cups-opsys.m4)
-sinclude(config-scripts/cups-common.m4)
-sinclude(config-scripts/cups-directories.m4)
-sinclude(config-scripts/cups-manpages.m4)
+dnl Clear default debugging options and set normal optimization by
+dnl default unless the user asks for debugging specifically.

-sinclude(config-scripts/cups-sharedlibs.m4)
-sinclude(config-scripts/cups-libtool.m4)
-sinclude(config-scripts/cups-compiler.m4)
+CFLAGS="${CFLAGS:=}"
+CXXFLAGS="${CXXFLAGS:=}"
+OPTIM="-O"
+AC_SUBST(OPTIM)

-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)
+AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging [default=no]],
+if eval "test x$enable_debug = xyes"; then
+	OPTIM="-g"
+fi)

-AC_OUTPUT(Makedefs cups.list cups.sh cups-config conf/cupsd.conf conf/pam.conf)
+dnl Checks for programs...
+AC_PROG_AWK
+AC_PROG_CC
+AC_PROG_CPP
+AC_PROG_RANLIB
+AC_PATH_PROG(AR,ar)
+AC_PATH_PROG(CP,cp)
+AC_PATH_PROG(MKDIR,mkdir)
+AC_PATH_PROG(RM,rm)
+AC_PATH_PROG(GROFF,groff)
+AC_PATH_PROG(HTMLDOC,htmldoc)

-chmod +x cups-config
+dnl Architecture checks...
+AC_C_BIGENDIAN
+uname=`uname`
+if test "$uname" = "IRIX64"; then
+	uname=IRIX
+fi
+
+dnl Check for libraries...
+AC_CHECK_LIB(c,crypt,LIBS="$LIBS",AC_CHECK_LIB(crypt,crypt))
+AC_CHECK_HEADER(crypt.h, AC_DEFINE(HAVE_CRYPT_H))
+AC_CHECK_LIB(sec,getspent)
+AC_CHECK_LIB(socket,socket,
+if test "$uname" != "IRIX"; then
+	LIBS="$LIBS -lsocket"
+else
+	echo "Not using -lsocket since you are running IRIX."
+fi)
+AC_CHECK_LIB(nsl,gethostbyaddr,
+if test "$uname" != "IRIX"; then
+	LIBS="$LIBS -lnsl"
+else
+	echo "Not using -lnsl since you are running IRIX."
+fi)
+
+IMGLIBS=""
+AC_SUBST(IMGLIBS)
+AC_CHECK_HEADER(jpeglib.h,
+    AC_DEFINE(HAVE_LIBJPEG)
+    IMGLIBS="$IMGLIBS -ljpeg")
+AC_CHECK_HEADER(zlib.h,
+    AC_DEFINE(HAVE_LIBZ)
+    IMGLIBS="$IMGLIBS -lz")
+AC_CHECK_HEADER(png.h,
+    AC_DEFINE(HAVE_LIBPNG)
+    IMGLIBS="$IMGLIBS -lpng")
+AC_CHECK_HEADER(tiff.h,
+    AC_DEFINE(HAVE_LIBTIFF)
+    IMGLIBS="$IMGLIBS -ltiff")
+
+dnl Checks for header files.
+AC_HEADER_STDC
+AC_HEADER_DIRENT
+AC_CHECK_HEADER(shadow.h,AC_DEFINE(HAVE_SHADOW_H))
+
+dnl Checks for string functions.
+AC_CHECK_FUNCS(strdup)
+AC_CHECK_FUNCS(strcasecmp)
+AC_CHECK_FUNCS(strncasecmp)
+
+dnl Checks for signal functions.
+AC_CHECK_FUNCS(sigset)
+AC_CHECK_FUNCS(sigaction)
+
+dnl Checks for wait functions.
+AC_CHECK_FUNCS(waitpid)
+AC_CHECK_FUNCS(wait3)
+
+dnl Fix "prefix" variable if it hasn't been specified...
+if test "$prefix" = "NONE"; then
+	prefix="/usr"
+fi
+
+dnl CUPS_SERVERROOT needs special attention for the default location...
+if test "$prefix" = "/usr"; then
+	CUPS_SERVERROOT="/var/cups"
+else
+	CUPS_SERVERROOT="$prefix/var/cups"
+fi
+AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$CUPS_SERVERROOT")
+AC_SUBST(CUPS_SERVERROOT)
+
+dnl Set the CUPS_LOCALE directory...
+CUPS_LOCALEDIR="$prefix/lib/locale"
+AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR")
+AC_SUBST(CUPS_LOCALEDIR)
+
+dnl Set the CUPS_DATAFILE directory...
+CUPS_DATADIR="$prefix/share/cups"
+AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$CUPS_DATADIR")
+AC_SUBST(CUPS_DATADIR)
+
+AC_OUTPUT(Makedefs)

 dnl
 dnl End of "$Id$".
@@ -1,134 +0,0 @@
-#!/bin/sh
-#
-# "$Id$"
-# 
-#   CUPS configuration utility.
-#
-#   Copyright 2001-2003 by Easy Software Products, all rights reserved.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
-#
-#       Voice: (301) 373-9603
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
-#
-
-VERSION="1.1.18"
-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="@EXPORT_SSLLIBS@ @NETLIBS@"
-IMGLIBS="@EXPORT_LIBTIFF@ @EXPORT_LIBJPEG@ @EXPORT_LIBPNG@ @EXPORT_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,55 +15,7 @@ Package=<4>

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

-Project: "enumports"=.\visualc\enumports.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "fltk"="..\fltk-1.1\visualc\fltk.lib.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "fltkimages"="..\fltk-1.1\visualc\fltkimages.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "gui"=.\gui\gui.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "printers"=.\gui\printers.dsp - Package Owner=<4>
+Project: "hpgltops"=.\filter\hpgltops.dsp - Package Owner=<4>

 Package=<5>
 {{{
@@ -74,23 +26,11 @@ Package=<4>
    Begin Project Dependency
    Project_Dep_Name cups
    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name fltk
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name gui
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name fltkimages
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name zlib
-    End Project Dependency
 }}}

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

-Project: "restartspooler"=.\visualc\restartspooler.dsp - Package Owner=<4>
+Project: "image"=.\filter\image.dsp - Package Owner=<4>

 Package=<5>
 {{{
@@ -102,7 +42,7 @@ Package=<4>

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

-Project: "zlib"="..\htmldoc-1.8\visualc\zlib.dsp" - Package Owner=<4>
+Project: "pstops"=.\filter\pstops.dsp - Package Owner=<4>

 Package=<5>
 {{{
@@ -114,6 +54,51 @@ 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,472 +0,0 @@
-#
-# "$Id$"
-#
-#   ESP Package Manager (EPM) file list for the Common UNIX Printing
-#   System (CUPS).
-#
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
-#
-#       Voice: (301) 373-9603
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
-#
-
-# Product information
-%product Common UNIX Printing System
-%copyright 1993-2003 by Easy Software Products, All Rights Reserved.
-%vendor Easy Software Products
-%license LICENSE.txt
-%readme README.txt
-%version 1.1.18
-%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
-
-d 0555 root sys $DATADIR/templates/fr -
-c 0444 root sys $DATADIR/templates/fr templates/fr/*.tmpl
-
-# Config files
-d 0555 root sys $SERVERROOT -
-d 0711 $CUPS_USER $CUPS_GROUP $SERVERROOT/certs -
-d 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 conf/pam.conf
-
-# 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 conf/pam.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/fr -
-f 0444 root sys $DOCDIR/fr doc/fr/*.css
-f 0444 root sys $DOCDIR/fr doc/fr/*.html
-f 0444 root sys $DOCDIR/fr doc/fr/*.pdf
-d 0555 root sys $DOCDIR/images -
-f 0444 root sys $DOCDIR/images doc/images/*.gif
-
-# 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$".
-#
@@ -1,7 +0,0 @@
-{
-  Description     = "Printing Services";
-  Provides        = ("Printing");
-  Requires        = ("Resolver");
-  Uses            = ("Network Time");
-  OrderPreference = "Late";
-}
@@ -1,211 +0,0 @@
-#!/bin/sh
-#
-# "$Id$"
-#
-#   Startup/shutdown script for the Common UNIX Printing System (CUPS).
-#
-#   Copyright 1997-2003 by Easy Software Products, all rights reserved.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
-#
-#       Voice: (301) 373-9603
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
-#
-
-#### 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
-
-		if $IS_ON verbose; then
-			ECHO=echo
-		else
-			ECHO=:
-		fi
-		ECHO_OK=:
-		ECHO_ERROR=:
-		;;
-
-	*BSD*)
-        	IS_ON=:
-		ECHO=echo
-		ECHO_OK=:
-		ECHO_ERROR=:
-		;;
-
-	Darwin*)
-		. /etc/rc.common
-
-		if test "${CUPS:=-YES-}" = "-NO-"; then
-			exit 0
-		fi
-
-        	IS_ON=:
-		ECHO=ConsoleMessage
-		ECHO_OK=:
-		ECHO_ERROR=:
-		;;
-
-	Linux*)
-		IS_ON=/bin/true
-		if test -f /etc/init.d/functions; then
-			. /etc/init.d/functions
-			ECHO=echo
-			ECHO_OK="echo_success"
-			ECHO_ERROR="echo_failure"
-		else
-			ECHO=echo
-			ECHO_OK=:
-			ECHO_ERROR=:
-		fi
-		;;
-
-	*)
-		IS_ON=/bin/true
-		ECHO=echo
-		ECHO_OK=:
-		ECHO_ERROR=:
-		;;
-esac
-
-#### OS-Independent Stuff
-
-#
-# Set the timezone, if possible...  This allows the
-# scheduler and all child processes to know the local
-# timezone when reporting dates and times to the user. 
-# If no timezone information is found, then Greenwich
-# Mean Time (GMT) will probably be used.
-#
-
-for file in /etc/TIMEZONE /etc/rc.config /etc/sysconfig/clock; do
-	if test -f $file; then
-	        . $file
-	fi
-done
-
-if test "x$ZONE" != x; then
-	TZ="$ZONE"
-fi
-
-if test "x$TIMEZONE" != x; then
-	TZ="$TIMEZONE"
-fi
-
-if test "x$TZ" != x; then
-	export TZ
-fi
-
-#
-# See if the CUPS server (cupsd) is running...
-#
-
-case "`uname`" in
-	HP-UX* | AIX* | SINIX*)
-		pid=`ps -e | awk '{if (match($4, ".*/cupsd$") || $4 == "cupsd") print $1}'`
-		;;
-	IRIX* | SunOS*)
-		pid=`ps -e | nawk '{if (match($4, ".*/cupsd$") || $4 == "cupsd") 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 $IS_ON cups; then
-			if test "$pid" != ""; then
-				kill -HUP $pid
-			else
-				prefix=@prefix@
-				exec_prefix=@exec_prefix@
-				@sbindir@/cupsd
-				if test $? != 0; then
-					$ECHO_FAIL
-					$ECHO "cups: unable to $1 scheduler."
-					exit 1
-				fi
-			fi
-			$ECHO_OK
-			$ECHO "cups: ${1}ed scheduler."
-		fi
-		;;
-
-	stop)
-		if test "$pid" != ""; then
-			kill $pid
-			$ECHO_OK
-			$ECHO "cups: stopped scheduler."
-		fi
-		;;
-
-	status)
-		if test "$pid" != ""; then
-			echo "cups: scheduler is running."
-		else
-			echo "cups: scheduler is not running."
-		fi
-		;;
-
-	*)
-		echo "Usage: cups {reload|restart|start|status|stop}"
-		exit 1
-		;;
-esac
-
-#
-# Exit with no errors.
-#
-
-exit 0
-
-
-#
-# End of "$Id$".
-#
@@ -1,207 +0,0 @@
-#
-# "$Id: cups.spec 3041 2002-12-17 19:00:27Z swdev $"
-#
-#   RPM "spec" file for the Common UNIX Printing System (CUPS).
-#
-#   Original version by Jason McMullan <jmcc@ontv.com>.
-#
-#   Copyright 1999-2003 by Easy Software Products, all rights reserved.
-#
-#   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
-#
-
-Summary: Common Unix Printing System
-Name: cups
-Version: 1.1.18
-Release: 1
-Copyright: GPL
-Group: System Environment/Daemons
-Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.gz
-Url: http://www.cups.org
-Packager: Anonymous <anonymous@foo.com>
-Vendor: Easy Software Products
-
-# Use buildroot so as not to disturb the version already installed
-BuildRoot: /var/tmp/%{name}-root
-
-# 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 
-UNIX® operating systems. It has been developed by Easy Software Products 
-to promote a standard printing solution for all UNIX vendors and users. 
-CUPS provides the System V and Berkeley command-line interfaces. 
-
-%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.
-
-%prep
-%setup
-
-%build
-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
-# Make sure the RPM_BUILD_ROOT directory exists.
-rm -rf $RPM_BUILD_ROOT
-
-make BUILDROOT=$RPM_BUILD_ROOT install
-
-%post
-ldconfig
-
-if test -x /sbin/chkconfig; then
-	/sbin/chkconfig --add cups
-	/sbin/chkconfig cups on
-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
-	/sbin/init.d/cups stop
-fi
-if test -f /etc/rc.d/init.d/cups; then
-	/etc/rc.d/init.d/cups stop
-fi
-if test -f /etc/init.d/cups; then
-	/etc/init.d/cups stop
-fi
-
-if test -x /sbin/chkconfig; then
-	/sbin/chkconfig --del cups
-fi
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-%dir /etc/cups
-%config(noreplace) /etc/cups/*.conf
-%dir /etc/cups/certs
-%dir /etc/cups/interfaces
-/etc/cups/mime.types
-/etc/cups/mime.convs
-%dir /etc/cups/ppd
-%dir /etc/pam.d
-/etc/pam.d/*
-
-# RC dirs are a pain under Linux...  Uncomment the appropriate ones if you
-# don't use Red Hat or Mandrake...
-
-/etc/rc.d/init.d/*
-/etc/rc.d/rc0.d/*
-/etc/rc.d/rc3.d/*
-/etc/rc.d/rc5.d/*
-
-#/etc/init.d/*
-#/etc/rc0.d/*
-#/etc/rc3.d/*
-#/etc/rc5.d/*
-
-#/sbin/rc.d/*
-#/sbin/rc.d/rc0.d/*
-#/sbin/rc.d/rc3.d/*
-#/sbin/rc.d/rc5.d/*
-
-/usr/bin/cancel
-/usr/bin/disable
-/usr/bin/enable
-/usr/bin/lp*
-/usr/lib/*.so*
-%dir /usr/lib/cups
-/usr/lib/cups/*
-/usr/sbin/*
-%dir /usr/share/cups
-/usr/share/cups/*
-%dir /usr/share/doc/cups
-/usr/share/doc/cups/*
-%dir /usr/share/locale
-/usr/share/locale/*
-
-%dir /usr/share/man/cat1
-/usr/share/man/cat1/*
-%dir /usr/share/man/cat5
-/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 3041 2002-12-17 19:00:27Z swdev $".
-#
@@ -1,9 +0,0 @@
-<?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>
-
@@ -1,11 +0,0 @@
-libcups.a
-libcups.la
-libcups.sl
-libcups.sl.2
-libcups.so
-libcups.so.2
-libcups_s.a
-libcups.2.dylib
-libcups.dylib
-testhttp
-testppd
@@ -1,26 +0,0 @@
-# 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 debug.h
-http-addr.o: string.h ../config.h http.h md5.h
-http-support.o: string.h ../config.h http.h md5.h ipp.h
-ipp.o: string.h ../config.h language.h ipp.h http.h md5.h debug.h
-ipp-support.o: string.h ../config.h language.h ipp.h http.h md5.h debug.h
-language.o: string.h ../config.h language.h 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
-testlang.o: language.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-2003 by Easy Software Products, all rights reserved.
+#   Copyright 1997-1999 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
@@ -14,15 +14,13 @@
 #
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
-#       44141 Airport View Drive, Suite 204
+#       44145 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.
-#

 include ../Makedefs

@@ -30,26 +28,20 @@ include ../Makedefs
 # Object files...
 #

-LIBOBJS	=	dest.o emit.o encode.o http.o http-addr.o http-support.o \
-		ipp.o ipp-support.o language.o mark.o md5.o md5passwd.o \
-		options.o page.o ppd.o snprintf.o string.o tempfile.o \
-		usersys.o util.o
-OBJS	=	$(LIBOBJS) testhttp.o testlang.o
-
+OBJS	=	emit.o filter.o http.o ipp.o language.o mark.o mime.o \
+		options.o page.o ppd.o raster.o string.o type.o util.o

 #
 # Header files to install...
 #

-HEADERS	=	cups.h http.h ipp.h language.h md5.h ppd.h
-
+HEADERS	=	cups.h http.h ipp.h language.h mime.h ppd.h raster.h

 #
 # Targets in this directory...
 #

-TARGETS	=	$(LIBCUPS) libcups.a
-
+TARGETS	=	libcups.a testmime testppd testhttp

 #
 # Make all targets...
@@ -57,145 +49,81 @@ TARGETS	=	$(LIBCUPS) libcups.a

 all:	$(TARGETS)

-
 #
 # Remove object and target files...
 #

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

 #
 # Install object and target files...
 #

-install:	all	installhdrs
-	$(INSTALL_DIR) $(LIBDIR)
-	$(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
-	if test $(LIBCUPS) = "libcups.so.2" -o $(LIBCUPS) = "libcups.sl.2"; then \
-		$(RM) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
-		$(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
-	fi
-	if test $(LIBCUPS) = "libcups.2.dylib"; then \
-		$(STRIP) -x $(LIBDIR)/$(LIBCUPS); \
-		$(RM) $(LIBDIR)/libcups.dylib; \
-		$(LN) $(LIBCUPS) $(LIBDIR)/libcups.dylib; \
-	fi
-	if test $(LIBCUPS) != "libcups.a"; then \
-		$(INSTALL_LIB) libcups.a $(LIBDIR); \
-	fi
-	$(RANLIB) $(LIBDIR)/libcups.a
-
-installhdrs:
-	$(INSTALL_DIR) $(INCLUDEDIR)/cups
-	for file in $(HEADERS); do \
-		$(INSTALL_DATA) $$file $(INCLUDEDIR)/cups; \
-	done
-
-
-#
-# libcups.so.2, libcups.sl.2
-#
-
-libcups.so.2 libcups.sl.2:	$(LIBOBJS) ../Makedefs
-	echo Linking $@...
-	$(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 $@...
-	$(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
-		-version-info 2:4 $(SSLLIBS)
-
+install:	all
+	-$(MKDIR) $(LIBDIR)
+	$(CP) libcups.a $(LIBDIR)
+	-$(MKDIR) $(INCLUDEDIR)/cups
+	$(CP) $(HEADERS) $(INCLUDEDIR)/cups

 #
 # libcups.a
 #

-libcups.a:	$(LIBOBJS)
-	echo Archiving $@...
+libcups.a:	$(OBJS)
 	$(RM) $@
-	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
 	$(RANLIB) $@

-
 #
 # cups_C.h - the default POSIX locale that is compiled in.
 #

 cups_C.h:	../locale/C/cups_C
-	echo Generating $@...
 	$(RM) cups_C.h
 	$(AWK) '{print "\"" $$0 "\","}' < ../locale/C/cups_C > cups_C.h

+emit.o:		ppd.h ../config.h ../Makedefs
+filter.o:	mime.h ../config.h ../Makedefs
+http.o:		http.h ipp.h string.h ../config.h ../Makedefs
+ipp.o:		http.h ipp.h ../config.h ../Makedefs
+language.o:	cups_C.h language.h string.h ../config.h ../Makedefs
+mark.o:		ppd.h ../config.h ../Makedefs
+mime.o:		mime.h ../config.h ../Makedefs
+options.o:	cups.h ../config.h ../Makedefs
+page.o:		ppd.h ../config.h ../Makedefs
+ppd.o:		ppd.h ../config.h ../Makedefs
+raster.o:	raster.h ../config.h ../Makedefs
+string.o:	string.h ../config.h ../Makedefs
+type.o:		mime.h ../config.h ../Makedefs
+util.o:		cups.h http.h ipp.h ../config.h ../Makedefs

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

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

+testhttp.o:	http.h ../Makedefs

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

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

+testmime.o:	mime.h ../Makedefs

 #
-# Dependencies...
+# testppd
 #

-include Dependencies
+testppd:	testppd.o libcups.a
+	$(CC) $(LDFLAGS) -o $@ testppd.o $(LIBS)

+testppd.o:	ppd.h ../Makedefs

 #
 # End of "$Id$".
@@ -1,216 +0,0 @@
-# Microsoft Developer Studio Project File - Name="cups" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=cups - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "cups.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "cups.mak" CFG="cups - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "cups - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "cups - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "cups - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../visualc" /I ".." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"cups.lib"
-
-!ELSEIF  "$(CFG)" == "cups - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../visualc" /I ".." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"cupsd.lib"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "cups - Win32 Release"
-# Name "cups - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\dest.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\emit.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\encode.c
-# End Source File
-# Begin Source File
-
-SOURCE=".\http-addr.c"
-# End Source File
-# Begin Source File
-
-SOURCE=".\http-support.c"
-# End Source File
-# Begin Source File
-
-SOURCE=.\http.c
-# End Source File
-# Begin Source File
-
-SOURCE=".\ipp-support.c"
-# End Source File
-# Begin Source File
-
-SOURCE=.\ipp.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\language.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\oemlicense\license.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mark.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\md5.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\md5passwd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\options.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\page.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ppd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\snprintf.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\string.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tempfile.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\usersys.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\util.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-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
-
-SOURCE=.\ipp.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\language.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\oemlicense\license.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\md5.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ppd.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\string.h
-# End Source File
-# End Group
-# End Target
-# End Project
@@ -3,7 +3,7 @@
 *
 *   API definitions for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-1999 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -20,8 +20,6 @@
 *       Voice: (301) 373-9603
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
- *
- *   This file is subject to the Apple OS-Developed Software exception.
 */

 #ifndef _CUPS_CUPS_H_
@@ -31,8 +29,9 @@
 * Include necessary headers...
 */

-#  include "ipp.h"
-#  include "ppd.h"
+#  include <cups/ipp.h>
+#  include <cups/mime.h>
+#  include <cups/ppd.h>


 /*
@@ -48,10 +47,7 @@ extern "C" {
 * Constants...
 */

-#  define CUPS_VERSION		1.0118
-#  define CUPS_VERSION_MAJOR	1
-#  define CUPS_VERSION_MINOR	1
-#  define CUPS_VERSION_PATCH	18
+#  define CUPS_VERSION		1.0
 #  define CUPS_DATE_ANY		-1


@@ -78,97 +74,57 @@ enum					/* Not a typedef'd enum so we can OR */
  CUPS_PRINTER_SMALL = 0x1000,		/* Can do Letter/Legal/A4 */
  CUPS_PRINTER_MEDIUM = 0x2000,		/* Can do Tabloid/B/C/A3/A2 */
  CUPS_PRINTER_LARGE = 0x4000,		/* Can do D/E/A1/A0 */
-  CUPS_PRINTER_VARIABLE = 0x8000,	/* Can do variable sizes */
-  CUPS_PRINTER_IMPLICIT = 0x10000,	/* Implicit class */
-  CUPS_PRINTER_DEFAULT = 0x20000,	/* Default printer on network */
-  CUPS_PRINTER_OPTIONS = 0xfffc		/* ~(CLASS | REMOTE | IMPLICIT) */
+  CUPS_PRINTER_VARIABLE = 0x8000	/* Can do variable sizes */
 };

+
+/*
+ * Types & structures...
+ */
+
+typedef struct				/**** Printer Information ****/
+{
+  char		name[IPP_MAX_NAME],	/* Printer or class name */
+		uri[HTTP_MAX_URI];	/* Universal resource identifier */
+  unsigned char	info[IPP_MAX_NAME],	/* Printer or class info/description */
+		location[IPP_MAX_NAME];	/* Location text */
+  ipp_pstate_t	state;			/* Printer state */
+  unsigned char	message[IPP_MAX_NAME];	/* State text */
+  cups_ptype_t	type;			/* Printer type/capability codes */
+} cups_browse_t;
+
 typedef struct				/**** Printer Options ****/
 {
  char		*name;			/* Name of option */
  char		*value;			/* Value of option */
 } cups_option_t;

-typedef struct				/**** Destination ****/
-{
-  char		*name,			/* Printer or class name */
-		*instance;		/* Local instance name or NULL */
-  int		is_default;		/* Is this printer the default? */
-  int		num_options;		/* Number of options */
-  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...
 */

-extern int		cupsCancelJob(const char *printer, int job);
+extern int		cupsCancelJob(char *printer, int job);
 #define			cupsDoRequest(http,request,resource) cupsDoFileRequest((http),(request),(resource),NULL)
 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);
+			                   char *resource, char *filename);
 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 char		*cupsGetPPD(char *printer);
+extern char		*cupsGetDefault(void);
 extern int		cupsGetPrinters(char ***printers);
-extern ipp_status_t	cupsLastError(void);
-extern int		cupsPrintFile(const char *printer, const char *filename,
-			              const char *title, int num_options,
-				      cups_option_t *options);
-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		cupsPrintFile(char *printer, char *filename, char *title,
+			              int num_options, cups_option_t *options);

-extern int		cupsAddDest(const char *name, const char *instance,
-			            int num_dests, cups_dest_t **dests);
-extern void		cupsFreeDests(int num_dests, cups_dest_t *dests);
-extern cups_dest_t	*cupsGetDest(const char *name, const char *instance,
-			             int num_dests, cups_dest_t *dests);
-extern int		cupsGetDests(cups_dest_t **dests);
-extern void		cupsSetDests(int num_dests, cups_dest_t *dests);
-
-extern int		cupsAddOption(const char *name, const char *value,
-			              int num_options, cups_option_t **options);
-extern void		cupsEncodeOptions(ipp_t *ipp, int num_options,
-					  cups_option_t *options);
+extern int		cupsAddOption(char *name, char *value, int num_options,
+			              cups_option_t **options);
 extern void		cupsFreeOptions(int num_options, cups_option_t *options);
-extern const char	*cupsGetOption(const char *name, int num_options,
+extern char		*cupsGetOption(char *name, int num_options,
 			               cups_option_t *options);
-extern int		cupsParseOptions(const char *arg, int num_options,
+extern int		cupsParseOptions(char *arg, int num_options,
 			                 cups_option_t **options);
 extern int		cupsMarkOptions(ppd_file_t *ppd, int num_options,
 			                cups_option_t *options);

-extern const char	*cupsGetPassword(const char *prompt);
-extern const char	*cupsServer(void);
-extern void		cupsSetEncryption(http_encryption_t e);
-extern void		cupsSetPasswordCB(const char *(*cb)(const char *));
-extern void		cupsSetServer(const char *server);
-extern void		cupsSetUser(const char *user);
-extern const char	*cupsUser(void);
-
 #  ifdef __cplusplus
 }
 #  endif /* __cplusplus */
@@ -1,135 +0,0 @@
-"iso-8859-1",
-"OK",
-"Cancel",
-"Help",
-"Quit",
-"Close",
-"Yes",
-"No",
-"On",
-"Off",
-"Save",
-"Discard",
-"Default",
-"Options",
-"More Info",
-"Black",
-"Color",
-"Cyan",
-"Magenta",
-"Yellow",
-"Copyright 1993-2003 by Easy Software Products, All Rights Reserved.",
-"General",
-"Printer",
-"Image",
-"HP-GL/2",
-"Extra",
-"Document",
-"Other",
-"Print Pages: ",
-"Entire Document",
-"Page Range:",
-"Reverse Order: ",
-"Page Format: ",
-" 1-Up",
-" 2-Up",
-" 4-Up",
-"Image Scaling: ",
-"Use Natural Image Size",
-"Zoom by Percent",
-"Zoom by PPI",
-"Mirror Image: ",
-"Color Saturation: ",
-"Color Hue: ",
-"Fit to Page: ",
-"Shading: ",
-"Pen Width: ",
-"Gamma Correction: ",
-"Brightness: ",
-"Add",
-"Delete",
-"Modify",
-"Printer URI",
-"Printer Name",
-"Printer Location",
-"Printer Info",
-"Printer Make and Model",
-"Device URI",
-"Formatting Page",
-"Printing Page",
-"Initializing Printer",
-"Printer State",
-"Accepting Jobs",
-"Not Accepting Jobs",
-"Print Jobs",
-"Class",
-"Local",
-"Remote",
-"Duplexing",
-"Stapling",
-"Fast Copies",
-"Collated Copies",
-"Hole Punching",
-"Covering",
-"Binding",
-"Sorting",
-"Small (up to 9.5x14in)",
-"Medium (9.5x14in to 13x19in)",
-"Large (13x19in and larger)",
-"Custom Size",
-"Idle",
-"Processing",
-"Stopped",
-"All",
-"Odd",
-"Even",
-"Darker                     Lighter",
-"Media Size",
-"Media Type",
-"Media Source",
-"Orientation: ",
-"Portrait",
-"Landscape",
-"Job State",
-"Job Name",
-"User Name",
-"Priority",
-"Copies",
-"File Size",
-"Pending",
-"Output Mode",
-"Resolution",
-"Text",
-"Pretty Print",
-"Margins",
-"Left",
-"Right",
-"Bottom",
-"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.",
-"You don't have permission to access the resource on this server.",
-"The requested resource was not found on this server.",
-"The requested method is not allowed with the resource.",
-"An appropriate representation for the resource was not found on this server.",
-"You don't have permission to use this server as a proxy host.",
-"The request has taken too long to complete and has been aborted.",
-"The requested resource has more than one value.",
-"The requested resource is gone and has not been replaced.",
-"The requested method requires a valid Content-Length.",
-"The precondition on the request evaluated to false.",
-"The request is too large for this server to process.",
-"The request URI is too large for this server to process.",
-"The request format is not understood by this server.",
-"426 An upgrade to a secure connection is required. If you are seeing this message in a web browser then it does not support HTTP encryption upgrades.",
-"500 The server has detected an unrecoverable error and cannot process your request.",
-"The requested method is not implemented by this server.",
-"The proxy server received an invalid response from an upstream server.",
-"The requested resource is currently unavailable on this server.",
-"The proxy server has taken too long to respond to this server.",
-"This server does not support the HTTP version required by your browser.",
@@ -3,7 +3,7 @@
 *
 *   Debugging macros for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-1999 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -14,14 +14,12 @@
 *
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
+ *       44145 Airport View Drive, Suite 204
 *       Hollywood, Maryland 20636-3111 USA
 *
 *       Voice: (301) 373-9603
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
- *
- *   This file is subject to the Apple OS-Developed Software exception.
 */

 #ifndef _CUPS_DEBUG_H_
@@ -1,798 +0,0 @@
-/*
- * "$Id$"
- *
- *   User-defined destination (and option) support for the Common UNIX
- *   Printing System (CUPS).
- *
- *   Copyright 1997-2003 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   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.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "cups.h"
-#include "language.h"
-#include "string.h"
-#include <stdlib.h>
-#include <ctype.h>
-
-
-/*
- * Local functions...
- */
-
-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);
-
-
-/*
- * 'cupsAddDest()' - Add a destination to the list of destinations.
- */
-
-int					/* O - New number of destinations */
-cupsAddDest(const char  *name,		/* I - Name of destination */
-            const char	*instance,	/* I - Instance of destination */
-            int         num_dests,	/* I - Number of destinations */
-            cups_dest_t **dests)	/* IO - Destinations */
-{
-  int		i;			/* Looping var */
-  cups_dest_t	*dest;			/* Destination pointer */
-
-
-  if (name == NULL || dests == NULL)
-    return (0);
-
-  if ((dest = cupsGetDest(name, instance, num_dests, *dests)) != NULL)
-    return (num_dests);
-
- /*
-  * Add new destination...
-  */
-
-  if (num_dests == 0)
-    dest = malloc(sizeof(cups_dest_t));
-  else
-    dest = realloc(*dests, sizeof(cups_dest_t) * (num_dests + 1));
-
-  if (dest == NULL)
-    return (num_dests);
-
-  *dests = dest;
-
-  for (i = num_dests; i > 0; i --, dest ++)
-    if (strcasecmp(name, dest->name) < 0)
-      break;
-    else if (strcasecmp(name, dest->name) == 0 &&
-             instance != NULL && dest->instance != NULL &&
-             strcasecmp(instance, dest->instance) < 0)
-      break;
-
-  if (i > 0)
-    memmove(dest + 1, dest, i * sizeof(cups_dest_t));
-
-  dest->name        = strdup(name);
-  dest->is_default  = 0;
-  dest->num_options = 0;
-  dest->options     = (cups_option_t *)0;
-
-  if (instance == NULL)
-    dest->instance = NULL;
-  else
-    dest->instance = strdup(instance);
-
-  return (num_dests + 1);
-}
-
-
-/*
- * 'cupsFreeDests()' - Free the memory used by the list of destinations.
- */
-
-void
-cupsFreeDests(int         num_dests,	/* I - Number of destinations */
-              cups_dest_t *dests)	/* I - Destinations */
-{
-  int		i;			/* Looping var */
-  cups_dest_t	*dest;			/* Current destination */
-
-
-  if (num_dests == 0 || dests == NULL)
-    return;
-
-  for (i = num_dests, dest = dests; i > 0; i --, dest ++)
-  {
-    free(dest->name);
-
-    if (dest->instance)
-      free(dest->instance);
-
-    cupsFreeOptions(dest->num_options, dest->options);
-  }
-
-  free(dests);
-}
-
-
-/*
- * 'cupsGetDest()' - Get the named destination from the list.
- */
-
-cups_dest_t *				/* O - Destination pointer or NULL */
-cupsGetDest(const char  *name,		/* I - Name of destination */
-            const char	*instance,	/* I - Instance of destination */
-            int         num_dests,	/* I - Number of destinations */
-            cups_dest_t *dests)		/* I - Destinations */
-{
-  int	comp;				/* Result of comparison */
-
-
-  if (num_dests == 0 || dests == NULL)
-    return (NULL);
-
-  if (name == NULL)
-  {
-   /*
-    * NULL name for default printer.
-    */
-
-    while (num_dests > 0)
-    {
-      if (dests->is_default)
-        return (dests);
-
-      num_dests --;
-      dests ++;
-    }
-  }
-  else
-  {
-   /*
-    * Lookup name and optionally the instance...
-    */
-
-    while (num_dests > 0)
-    {
-      if ((comp = strcasecmp(name, dests->name)) < 0)
-	return (NULL);
-      else if (comp == 0)
-      {
-	if ((instance == NULL && dests->instance == NULL) ||
-            (instance != NULL && dests->instance != NULL &&
-	     strcasecmp(instance, dests->instance) == 0))
-	  return (dests);
-      }
-
-      num_dests --;
-      dests ++;
-    }
-  }
-
-  return (NULL);
-}
-
-
-/*
- * 'cupsGetDests()' - Get the list of destinations.
- */
-
-int					/* O - Number of destinations */
-cupsGetDests(cups_dest_t **dests)	/* O - Destinations */
-{
-  int		i;			/* Looping var */
-  int		num_dests;		/* Number of destinations */
-  cups_dest_t	*dest;			/* Destination pointer */
-  const char	*home;			/* HOME environment variable */
-  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 */
-
-
- /*
-  * Initialize destination array...
-  */
-
-  num_dests = 0;
-  *dests    = (cups_dest_t *)0;
-
- /*
-  * Grab the printers and classes...
-  */
-
-  num_dests = cups_get_sdests(CUPS_GET_PRINTERS, num_dests, dests);
-  num_dests = cups_get_sdests(CUPS_GET_CLASSES, num_dests, dests);
-
- /*
-  * Make a copy of the "real" queues for a later sanity check...
-  */
-
-  if (num_dests > 0)
-  {
-    num_reals = num_dests;
-    reals     = calloc(num_reals, sizeof(cups_dest_t));
-
-    if (reals)
-      memcpy(reals, *dests, num_reals * sizeof(cups_dest_t));
-    else
-      num_reals = 0;
-  }
-  else
-  {
-    num_reals = 0;
-    reals     = NULL;
-  }
-
- /*
-  * Grab the default destination...
-  */
-
-  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...
-  */
-
-  if ((home = getenv("CUPS_SERVERROOT")) != NULL)
-  {
-    snprintf(filename, sizeof(filename), "%s/lpoptions", home);
-    num_dests = cups_get_dests(filename, num_dests, dests);
-  }
-  else
-    num_dests = cups_get_dests(CUPS_SERVERROOT "/lpoptions", num_dests, dests);
-
-  if ((home = getenv("HOME")) != NULL)
-  {
-    snprintf(filename, sizeof(filename), "%s/.lpoptions", home);
-    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...
-  */
-
-  return (num_dests);
-}
-
-
-/*
- * 'cupsSetDests()' - Set the list of destinations.
- */
-
-void
-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 ((home = getenv("CUPS_SERVERROOT")) != NULL)
-    snprintf(filename, sizeof(filename), "%s/lpoptions", home);
-  else
-    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:
-  *
-  *    Dest name[/instance] options
-  *    Default name[/instance] options
-  */
-
-  for (i = num_dests, dest = dests; i > 0; i --, dest ++)
-    if (dest->instance != NULL || dest->num_options != 0 || dest->is_default)
-    {
-      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])
-	{
-	  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);
-      }
-
-      if (wrote)
-        fputs("\n", fp);
-    }
-
- /*
-  * Free the temporary destinations...
-  */
-
-  cupsFreeDests(num_temps, temps);
-
- /*
-  * Close the file and return...
-  */
-
-  fclose(fp);      
-}
-
-
-/*
- * 'cups_get_dests()' - Get destinations from a file.
- */
-
-static int				/* O - Number of destinations */
-cups_get_dests(const char  *filename,	/* I - File to read from */
-               int         num_dests,	/* I - Number of destinations */
-               cups_dest_t **dests)	/* IO - Destinations */
-{
-  int		i;			/* Looping var */
-  cups_dest_t	*dest;			/* Current destination */
-  FILE		*fp;			/* File pointer */
-  char		line[8192],		/* Line from file */
-		*lineptr,		/* Pointer into line */
-		*name,			/* Name of destination/option */
-		*instance;		/* Instance of destination */
-  const char	*printer;		/* PRINTER or LPDEST */
-
-
- /*
-  * Check environment variables...
-  */
-
-  if ((printer = getenv("LPDEST")) == NULL)
-    if ((printer = getenv("PRINTER")) != NULL)
-      if (strcmp(printer, "lp") == 0)
-        printer = NULL;
-
- /*
-  * Try to open the file...
-  */
-
-  if ((fp = fopen(filename, "r")) == NULL)
-    return (num_dests);
-
- /*
-  * Read each printer; each line looks like:
-  *
-  *    Dest name[/instance] options
-  *    Default name[/instance] options
-  */
-
-  while (fgets(line, sizeof(line), fp) != NULL)
-  {
-   /*
-    * See what type of line it is...
-    */
-
-    if (strncasecmp(line, "dest", 4) == 0 && isspace(line[4]))
-      lineptr = line + 4;
-    else if (strncasecmp(line, "default", 7) == 0 && isspace(line[7]))
-      lineptr = line + 7;
-    else
-      continue;
-
-   /*
-    * Skip leading whitespace...
-    */
-
-    while (isspace(*lineptr))
-      lineptr ++;
-
-    if (!*lineptr)
-      continue;
-
-    name = lineptr;
-
-   /*
-    * Search for an instance...
-    */
-
-    while (!isspace(*lineptr) && *lineptr && *lineptr != '/')
-      lineptr ++;
-
-    if (!*lineptr)
-      continue;
-
-    if (*lineptr == '/')
-    {
-     /*
-      * Found an instance...
-      */
-
-      *lineptr++ = '\0';
-      instance = lineptr;
-
-     /*
-      * Search for an instance...
-      */
-
-      while (!isspace(*lineptr) && *lineptr)
-	lineptr ++;
-    }
-    else
-      instance = NULL;
-
-    *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...
-    */
-
-    num_dests = cupsAddDest(name, instance, num_dests, dests);
-
-    if ((dest = cupsGetDest(name, instance, num_dests, *dests)) == NULL)
-    {
-     /*
-      * Out of memory!
-      */
-
-      fclose(fp);
-      return (num_dests);
-    }
-
-   /*
-    * Add options until we hit the end of the line...
-    */
-
-    dest->num_options = cupsParseOptions(lineptr, dest->num_options,
-                                         &(dest->options));
-
-   /*
-    * Set this as default if needed...
-    */
-
-    if (strncasecmp(line, "default", 7) == 0 && printer == NULL)
-    {
-      for (i = 0; i < num_dests; i ++)
-        (*dests)[i].is_default = 0;
-
-      dest->is_default = 1;
-    }
-  }
-
- /*
-  * Close the file and return...
-  */
-
-  fclose(fp);      
-
-  return (num_dests);
-}
-
-
-/*
- * '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-2003 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-1999 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -23,17 +23,10 @@
 *
 *   PostScript is a trademark of Adobe Systems, Inc.
 *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
 * Contents:
 *
- *   ppdCollect()       - Collect all marked options that reside in the
- *                        specified section.
- *   ppdEmit()          - Emit code for marked options to a file.
- *   ppdEmitFd()        - Emit code for marked options to a file.
- *   ppdEmitJCL()       - Emit code for JCL options to a file.
- *   ppd_handle_media() - Handle media selection...
- *   ppd_sort()         - Sort options by ordering numbers...
+ *   ppdEmit()     - Emit code for marked options to a file.
+ *   ppdEmitFd()   - Emit code for marked options to a file.
 */

 /*
@@ -55,28 +48,181 @@
 * Local functions...
 */

-static void	ppd_handle_media(ppd_file_t *ppd);
 static int	ppd_sort(ppd_choice_t **c1, ppd_choice_t **c2);
+static int	ppd_collect(ppd_file_t *ppd, ppd_section_t section,
+		            ppd_choice_t ***choices);


 /*
- * Local globals...
+ * 'ppdEmit()' - Emit code for marked options to a file.
 */

-static const char *ppd_custom_code =
-		"pop pop pop\n"
-		"<</PageSize[5 -2 roll]/ImagingBBox null>>setpagedevice\n";
+int					/* O - 0 on success, -1 on failure */
+ppdEmit(ppd_file_t    *ppd,		/* I - PPD file record */
+        FILE          *fp,		/* I - File to write to */
+        ppd_section_t section)		/* I - Section to write */
+{
+  int		i,			/* Looping var */
+		count;			/* Number of choices */
+  ppd_choice_t	**choices;		/* Choices */
+  ppd_size_t	*size;			/* Custom page size */
+
+
+  if ((count = ppd_collect(ppd, section, &choices)) == 0)
+    return (0);
+
+  for (i = 0; i < count; i ++)
+    if (section != PPD_ORDER_EXIT && section != PPD_ORDER_JCL)
+    {
+     /*
+      * Send DSC comments with option...
+      */
+
+      if (fprintf(fp, "%%%%BeginFeature: %s %s\n",
+                  ((ppd_option_t *)choices[i]->option)->keyword,
+		  choices[i]->choice) < 0)
+      {
+        free(choices);
+        return (-1);
+      }
+
+      if (strcmp(((ppd_option_t *)choices[i]->option)->keyword, "PageSize") == 0 &&
+          strcmp(choices[i]->choice, "Custom") == 0)
+      {
+       /*
+        * 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");
+        fprintf(fp, "%.0f %.0f 0 0 0\n", size->width, size->length);
+
+	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...
+	  */
+
+	  fputs("pop pop pop\n", fp);
+	  fputs("<</PageSize[7 -2 roll]/ImagingBBox null>>setpagedevice\n", fp);
+	}
+      }
+
+      if (choices[i]->code != NULL && choices[i]->code[0] != '\0')
+      {
+        if (fputs(choices[i]->code, fp) < 0)
+        {
+          free(choices);
+          return (-1);
+        }
+
+        if (choices[i]->code[strlen(choices[i]->code) - 1] != '\n')
+          putc('\n', fp);
+      }
+
+      if (fputs("%%EndFeature\n", fp) < 0)
+      {
+        free(choices);
+        return (-1);
+      }
+    }
+    else if (fputs(choices[i]->code, fp) < 0)
+    {
+      free(choices);
+      return (-1);
+    }
+
+  free(choices);
+  return (0);
+}


 /*
- * 'ppdCollect()' - Collect all marked options that reside in the specified
- *                  section.
+ * 'ppdEmitFd()' - Emit code for marked options to a file.
 */

-int					/* O - Number of options marked */
-ppdCollect(ppd_file_t    *ppd,		/* I - PPD file data */
-           ppd_section_t section,	/* I - Section to collect */
-           ppd_choice_t  ***choices)	/* O - Pointers to choices */
+int					/* O - 0 on success, -1 on failure */
+ppdEmitFd(ppd_file_t    *ppd,		/* I - PPD file record */
+          int           fd,		/* I - File to write to */
+          ppd_section_t section)	/* I - Section to write */
+{
+  int		i,			/* Looping var */
+		count;			/* Number of choices */
+  ppd_choice_t	**choices;		/* Choices */
+  char		buf[1024];		/* Output buffer for feature */
+
+
+  if ((count = ppd_collect(ppd, section, &choices)) == 0)
+    return (0);
+
+  for (i = 0; i < count; i ++)
+    if (section != PPD_ORDER_EXIT && section != PPD_ORDER_JCL)
+    {
+     /*
+      * Send DSC comments with option...
+      */
+
+      sprintf(buf, "%%%%BeginFeature: %s %s\n",
+              ((ppd_option_t *)choices[i]->option)->keyword, choices[i]->choice);
+
+      if (write(fd, buf, strlen(buf)) < 1)
+      {
+        free(choices);
+        return (-1);
+      }
+
+      if (write(fd, choices[i]->code, strlen(choices[i]->code)) < 1)
+      {
+        free(choices);
+        return (-1);
+      }
+
+      if (write(fd, "%%EndFeature\n", 13) < 1)
+      {
+        free(choices);
+        return (-1);
+      }
+    }
+    else if (write(fd, choices[i]->code, strlen(choices[i]->code)) < 1)
+    {
+      free(choices);
+      return (-1);
+    }
+
+  free(choices);
+  return (0);
+}
+
+
+/*
+ * 'ppd_sort()' - Sort options by ordering numbers...
+ */
+
+static int			/* O - -1 if c1 < c2, 0 if equal, 1 otherwise */
+ppd_sort(ppd_choice_t **c1,	/* I - First choice */
+         ppd_choice_t **c2)	/* I - Second choice */
+{
+  if (((ppd_option_t *)(*c1)->option)->order < ((ppd_option_t *)(*c2)->option)->order)
+    return (-1);
+  else if (((ppd_option_t *)(*c1)->option)->order > ((ppd_option_t *)(*c2)->option)->order)
+    return (1);
+  else
+    return (0);
+}
+
+
+/*
+ * 'ppd_collect()' - Collect all marked options that reside in the specified
+ *                   section.
+ */
+
+static int				/* O - Number of options marked */
+ppd_collect(ppd_file_t    *ppd,		/* I - PPD file data */
+            ppd_section_t section,	/* I - Section to collect */
+            ppd_choice_t  ***choices)	/* O - Pointers to choices */
 {
  int		i, j, k, m;		/* Looping vars */
  ppd_group_t	*g,			/* Current group */
@@ -150,399 +296,6 @@ ppdCollect(ppd_file_t    *ppd,		/* I - PPD file data */
 }


-/*
- * 'ppdEmit()' - Emit code for marked options to a file.
- */
-
-int					/* O - 0 on success, -1 on failure */
-ppdEmit(ppd_file_t    *ppd,		/* I - PPD file record */
-        FILE          *fp,		/* I - File to write to */
-        ppd_section_t section)		/* I - Section to write */
-{
-  int		i,			/* Looping var */
-		count;			/* Number of choices */
-  ppd_choice_t	**choices;		/* Choices */
-  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);
-
-  for (i = 0; i < count; i ++)
-    if (section != PPD_ORDER_EXIT && section != PPD_ORDER_JCL)
-    {
-     /*
-      * Send wrapper commands to prevent printer errors for unsupported
-      * options...
-      */
-
-      if (fputs("[{\n", fp) < 0)
-      {
-        free(choices);
-        return (-1);
-      }
-
-     /*
-      * Send DSC comments with option...
-      */
-
-      if (fprintf(fp, "%%%%BeginFeature: *%s %s\n",
-                  ((ppd_option_t *)choices[i]->option)->keyword,
-		  choices[i]->choice) < 0)
-      {
-        free(choices);
-        return (-1);
-      }
-
-      if ((strcasecmp(((ppd_option_t *)choices[i]->option)->keyword, "PageSize") == 0 ||
-           strcasecmp(((ppd_option_t *)choices[i]->option)->keyword, "PageRegion") == 0) &&
-          strcasecmp(choices[i]->choice, "Custom") == 0)
-      {
-       /*
-        * 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");
-        fprintf(fp, "%.0f %.0f 0 0 0\n", size->width, size->length);
-
-	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...
-	  */
-
-	  fputs(ppd_custom_code, fp);
-	}
-      }
-
-      if (choices[i]->code != NULL && choices[i]->code[0] != '\0')
-      {
-        if (fputs(choices[i]->code, fp) < 0)
-        {
-          free(choices);
-          return (-1);
-        }
-
-        if (choices[i]->code[strlen(choices[i]->code) - 1] != '\n')
-          putc('\n', fp);
-      }
-
-      if (fputs("%%EndFeature\n", fp) < 0)
-      {
-        free(choices);
-        return (-1);
-      }
-
-      if (fputs("} stopped cleartomark\n", fp) < 0)
-      {
-        free(choices);
-        return (-1);
-      }
-    }
-    else if (fputs(choices[i]->code, fp) < 0)
-    {
-      free(choices);
-      return (-1);
-    }
-
-  free(choices);
-  return (0);
-}
-
-
-/*
- * 'ppdEmitFd()' - Emit code for marked options to a file.
- */
-
-int					/* O - 0 on success, -1 on failure */
-ppdEmitFd(ppd_file_t    *ppd,		/* I - PPD file record */
-          int           fd,		/* I - File to write to */
-          ppd_section_t section)	/* I - Section to write */
-{
-  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);
-
-  for (i = 0; i < count; i ++)
-    if (section != PPD_ORDER_EXIT && section != PPD_ORDER_JCL)
-    {
-     /*
-      * Send wrapper commands to prevent printer errors for unsupported
-      * options...
-      */
-
-      if (write(fd, "[{\n", 3) < 1)
-      {
-        free(choices);
-        return (-1);
-      }
-
-     /*
-      * Send DSC comments with option...
-      */
-
-      snprintf(buf, sizeof(buf), "%%%%BeginFeature: *%s %s\n",
-               ((ppd_option_t *)choices[i]->option)->keyword,
-	       choices[i]->choice);
-
-      if (write(fd, buf, strlen(buf)) < 1)
-      {
-        free(choices);
-        return (-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)
-      {
-       /*
-        * 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)
-      {
-        free(choices);
-        return (-1);
-      }
-
-      if (write(fd, "} stopped cleartomark\n", 22) < 1)
-      {
-        free(choices);
-        return (-1);
-      }
-    }
-    else if (write(fd, choices[i]->code, strlen(choices[i]->code)) < 1)
-    {
-      free(choices);
-      return (-1);
-    }
-
-  free(choices);
-  return (0);
-}
-
-
-/*
- * '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...
- */
-
-static int			/* O - -1 if c1 < c2, 0 if equal, 1 otherwise */
-ppd_sort(ppd_choice_t **c1,	/* I - First choice */
-         ppd_choice_t **c2)	/* I - Second choice */
-{
-  if (((ppd_option_t *)(*c1)->option)->order < ((ppd_option_t *)(*c2)->option)->order)
-    return (-1);
-  else if (((ppd_option_t *)(*c1)->option)->order > ((ppd_option_t *)(*c2)->option)->order)
-    return (1);
-  else
-    return (0);
-}
-
-
 /*
 * End of "$Id$".
 */
@@ -1,381 +0,0 @@
-/*
- * "$Id$"
- *
- *   Option encoding routines for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 1997-2003 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-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 },
-			  { "mirror",			IPP_TAG_BOOLEAN },
-			  { "natural-scaling",		IPP_TAG_INTEGER },
-			  { "number-up",		IPP_TAG_INTEGER },
-			  { "orientation-requested",	IPP_TAG_ENUM },
-			  { "page-bottom",		IPP_TAG_INTEGER },
-			  { "page-left",		IPP_TAG_INTEGER },
-			  { "page-ranges",		IPP_TAG_RANGE },
-			  { "page-right",		IPP_TAG_INTEGER },
-			  { "page-top",			IPP_TAG_INTEGER },
-			  { "penwidth",			IPP_TAG_INTEGER },
-			  { "ppi",			IPP_TAG_INTEGER },
-			  { "prettyprint",		IPP_TAG_BOOLEAN },
-			  { "printer-resolution",	IPP_TAG_RESOLUTION },
-			  { "print-quality",		IPP_TAG_ENUM },
-			  { "saturation",		IPP_TAG_INTEGER },
-			  { "scaling",			IPP_TAG_INTEGER },
-			  { "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 (strcasecmp(options[i].value, "true") == 0 ||
-        strcasecmp(options[i].value, "false") == 0)
-      attr->value_tag = IPP_TAG_BOOLEAN;
-    else
-      attr->value_tag = IPP_TAG_NAME;
-
-    for (j = 0; j < (int)(sizeof(ipp_options) / sizeof(ipp_options[0])); j ++)
-      if (strcasecmp(options[i].name, ipp_options[j].name) == 0)
-      {
-        attr->value_tag = ipp_options[j].value_tag;
-	break;
-      }
-
-   /*
-    * Copy the name over...
-    */
-
-    if ((attr->name = strdup(options[i].name)) == NULL)
-    {
-     /*
-      * 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 (strcasecmp(val, "true") == 0)
-	    {
-	     /*
-	      * Boolean value - true...
-	      */
-
-	      attr->values[j].boolean = 1;
-
-              DEBUG_puts("cupsEncodeOptions: Added boolean true value...");
-	    }
-	    else
-	    {
-	     /*
-	      * Boolean value - false...
-	      */
-
-	      attr->values[j].boolean = 0;
-
-              DEBUG_puts("cupsEncodeOptions: Added boolean false value...");
-	    }
-            break;
-
-	case IPP_TAG_RANGE :
-	   /*
-	    * Range...
-	    */
-
-            if (*val == '-')
-	    {
-	      attr->values[j].range.lower = 1;
-	      s = val;
-	    }
-	    else
-	      attr->values[j].range.lower = strtol(val, &s, 0);
-
-	    if (*s == '-')
-	    {
-	      if (s[1])
-		attr->values[j].range.upper = strtol(s + 1, NULL, 0);
-	      else
-		attr->values[j].range.upper = 2147483647;
-            }
-	    else
-	      attr->values[j].range.upper = attr->values[j].range.lower;
-
-	    DEBUG_printf(("cupsEncodeOptions: Added range option value %d-%d...\n",
-                	  attr->values[j].range.lower,
-			  attr->values[j].range.upper));
-            break;
-
-	case IPP_TAG_RESOLUTION :
-	   /*
-	    * Resolution...
-	    */
-
-	    attr->values[j].resolution.xres = strtol(val, &s, 0);
-
-	    if (*s == 'x')
-	      attr->values[j].resolution.yres = strtol(s + 1, &s, 0);
-	    else
-	      attr->values[j].resolution.yres = attr->values[j].resolution.xres;
-
-	    if (strcasecmp(s, "dpc") == 0)
-              attr->values[j].resolution.units = IPP_RES_PER_CM;
-            else
-              attr->values[j].resolution.units = IPP_RES_PER_INCH;
-
-	    DEBUG_printf(("cupsEncodeOptions: Adding resolution option value %s...\n",
-                	  val));
-            break;
-
-	default :
-            if ((attr->values[j].string.text = strdup(val)) == NULL)
-	    {
-	     /*
-	      * 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$".
- */
@@ -3,7 +3,7 @@
 *
 *   File type conversion routines for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-1999 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
@@ -14,7 +14,7 @@
 *
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
+ *       44145 Airport View Drive, Suite 204
 *       Hollywood, Maryland 20636-3111 USA
 *
 *       Voice: (301) 373-9603
@@ -37,8 +37,7 @@
 #include <stdlib.h>
 #include <ctype.h>

-#include <cups/debug.h>
-#include <cups/string.h>
+#include "string.h"
 #include "mime.h"


@@ -59,7 +58,7 @@ mimeAddFilter(mime_t      *mime,	/* I - MIME database */
              mime_type_t *src,		/* I - Source type */
 	      mime_type_t *dst,		/* I - Destination type */
              int         cost,		/* I - Relative time/resource cost */
-	      const char  *filter)	/* I - Filter program to run */
+	      char        *filter)	/* I - Filter program to run */
 {
  mime_filter_t	*temp;			/* New filter */

@@ -89,7 +88,7 @@ mimeAddFilter(mime_t      *mime,	/* I - MIME database */
    if (temp->cost > cost)
    {
      temp->cost = cost;
-      strlcpy(temp->filter, filter, sizeof(temp->filter));
+      strcpy(temp->filter, filter);
    }
  }
  else
@@ -117,7 +116,7 @@ mimeAddFilter(mime_t      *mime,	/* I - MIME database */
    temp->src  = src;
    temp->dst  = dst;
    temp->cost = cost;
-    strlcpy(temp->filter, filter, sizeof(temp->filter));
+    strcpy(temp->filter, filter);

    if (mime->num_filters > 1)
      qsort(mime->filters, mime->num_filters, sizeof(mime_filter_t),
@@ -140,8 +139,7 @@ mime_filter_t *				/* O - Array of filters to run */
 mimeFilter(mime_t      *mime,		/* I - MIME database */
           mime_type_t *src,		/* I - Source file type */
 	   mime_type_t *dst,		/* I - Destination file type */
-           int         *num_filters,	/* O - Number of filters to run */
-	   int         max_depth)       /* I - Maximum depth of search */
+           int         *num_filters)	/* O - Number of filters to run */
 {
  int		i, j,			/* Looping vars */
 		num_temp,		/* Number of temporary filters */
@@ -150,20 +148,16 @@ mimeFilter(mime_t      *mime,		/* I - MIME database */
 		mincost;		/* Current minimum */
  mime_filter_t	*temp,			/* Temporary filter */
 		*mintemp,		/* Current minimum */
-		*current;		/* Current filter */
+		*mincurrent,		/* Current filter for minimum */
+		*current,		/* Current filter */
+		*filters;		/* Filters to use */


 /*
  * Range-check the input...
  */

-  DEBUG_printf(("mimeFilter(mime=%p, src=%p(%s/%s), dst=%p(%s/%s), num_filters=%p(%d))\n",
-        	mime, src, src ? src->super : "?", src ? src->type : "?",
-		dst, dst ? dst->super : "?", dst ? dst->type : "?",
-		num_filters, num_filters ? *num_filters : 0));
-
-  if (mime == NULL || src == NULL || dst == NULL || num_filters == NULL ||
-      max_depth <= 0)
+  if (mime == NULL || src == NULL || dst == NULL || num_filters == NULL)
    return (NULL);

  *num_filters = 0;
@@ -178,34 +172,22 @@ mimeFilter(mime_t      *mime,		/* I - MIME database */
    * Got a direct filter!
    */

-    if ((mintemp = (mime_filter_t *)malloc(sizeof(mime_filter_t))) == NULL)
+    if ((filters = (mime_filter_t *)malloc(sizeof(mime_filter_t))) == NULL)
      return (NULL);

-    memcpy(mintemp, temp, sizeof(mime_filter_t));
-    num_mintemp = 1;
-    mincost     = mintemp->cost;
-
-    DEBUG_puts("    Found direct filter:");
-    DEBUG_printf(("    %s (cost=%d)\n", mintemp->filter, mincost));
-  }
-  else
-  {
-   /*
-    * No direct filter...
-    */
-
-    mincost     = 9999999;
-    mintemp     = NULL;
-    num_mintemp = 0;
+    memcpy(filters, temp, sizeof(mime_filter_t));
+    *num_filters = 1;
+    return (filters);
  }

 /*
  * OK, now look for filters from the source type to any other type...
  */

-  for (i = mime->num_filters, current = mime->filters;
-       i > 0;
-       i --, current ++)
+  mincost = 9999999;
+  mintemp = NULL;
+
+  for (i = mime->num_filters, current = mime->filters; i > 0; i --, current ++)
    if (current->src == src)
    {
     /*
@@ -213,8 +195,7 @@ mimeFilter(mime_t      *mime,		/* I - MIME database */
      * of this filter to the final type...
      */

-      if ((temp = mimeFilter(mime, current->dst, dst, &num_temp,
-                             max_depth - 1)) == NULL)
+      if ((temp = mimeFilter(mime, current->dst, dst, &num_temp)) == NULL)
        continue;

     /*
@@ -223,32 +204,17 @@ mimeFilter(mime_t      *mime,		/* I - MIME database */
      */

      for (j = 0, cost = 0; j < num_temp; j ++)
-        cost += temp[j].cost;
+        cost += temp->cost;

      if (cost < mincost)
      {
        if (mintemp != NULL)
 	  free(mintemp);

-       /*
-	* Hey, we got a match!  Add the current filter to the beginning of the
-	* filter list...
-	*/
-
-	mintemp = (mime_filter_t *)realloc(temp, sizeof(mime_filter_t) *
-                                                 (num_temp + 1));
-
-	if (mintemp == NULL)
-	{
-	  *num_filters = 0;
-	  return (NULL);
-	}
-
-	memmove(mintemp + 1, mintemp, num_temp * sizeof(mime_filter_t));
-	memcpy(mintemp, current, sizeof(mime_filter_t));
-
-	num_mintemp = num_temp + 1;
 	mincost     = cost;
+	mintemp     = temp;
+	num_mintemp = num_temp;
+	mincurrent  = current;
      }
      else
        free(temp);
@@ -257,22 +223,27 @@ mimeFilter(mime_t      *mime,		/* I - MIME database */
  if (mintemp != NULL)
  {
   /*
-    * Hey, we got a match!
+    * Hey, we got a match!  Add the current filter to the beginning of the
+    * filter list...
    */

-    *num_filters = num_mintemp;
+    filters = (mime_filter_t *)realloc(mintemp, sizeof(mime_filter_t) *
+                                                (num_mintemp + 1));

-#ifdef DEBUG
-    printf("    Returning %d filters:\n", *num_filters);
-    for (i = 0; i < num_mintemp; i ++)
-      printf("    %s\n", mintemp[i].filter);
-#endif /* DEBUG */
+    if (filters == NULL)
+    {
+      *num_filters = 0;
+      return (NULL);
+    }

-    return (mintemp);
+    memmove(filters + 1, filters, num_mintemp * sizeof(mime_filter_t));
+    memcpy(filters, mincurrent, sizeof(mime_filter_t));
+
+    *num_filters = num_mintemp + 1;
+
+    return (filters);
  }

-  DEBUG_puts("    Returning zippo...");
-
  return (NULL);
 }

@@ -1,118 +0,0 @@
-/*
- * "$Id$"
- *
- *   HTTP host/address routines for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 1997-2003 by Easy Software Products, all rights reserved.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   httpGetHostByName() - Lookup a hostname or IP address, and return
- *                         address records for the specified name.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include "string.h"
-
-#include "http.h"
-
-
-/*
- * 'httpGetHostByName()' - Lookup a hostname or IP address, and return
- *                         address records for the specified name.
- */
-
-struct hostent *			/* O - Host entry */
-httpGetHostByName(const char *name)	/* I - Hostname or IP address */
-{
-  const char		*nameptr;	/* Pointer into name */
-  unsigned		ip[4];		/* IP address components */
-  static unsigned	packed_ip;	/* Packed IPv4 address */
-  static char		*packed_ptr[2];	/* Pointer to packed address */
-  static struct hostent	host_ip;	/* Host entry for IP address */
-
-#if defined(__APPLE__)
-  /* OS X hack to avoid it's ocassional long delay in lookupd */
-  static char sLoopback[] = "127.0.0.1";
-  if (strcmp(name, "localhost") == 0)
-    name = sLoopback;
-#endif /* __APPLE__ */
-
- /*
-  * This function is needed because some operating systems have a
-  * buggy implementation of httpGetHostByName() that does not support
-  * IP addresses.  If the first character of the name string is a
-  * number, then sscanf() is used to extract the IP components.
-  * We then pack the components into an IPv4 address manually,
-  * since the inet_aton() function is deprecated.  We use the
-  * htonl() macro to get the right byte order for the address.
-  */
-
-  for (nameptr = name; isdigit(*nameptr) || *nameptr == '.'; nameptr ++);
-
-  if (!*nameptr)
-  {
-   /*
-    * We have an IP address; break it up and provide the host entry
-    * to the caller.  Currently only supports IPv4 addresses, although
-    * it should be trivial to support IPv6 in CUPS 1.2.
-    */
-
-    if (sscanf(name, "%u.%u.%u.%u", ip, ip + 1, ip + 2, ip + 3) != 4)
-      return (NULL); /* Must have 4 numbers */
-
-    packed_ip = htonl(((((((ip[0] << 8) | ip[1]) << 8) | ip[2]) << 8) | ip[3]));
-
-   /*
-    * Fill in the host entry and return it...
-    */
-
-    host_ip.h_name      = (char *)name;
-    host_ip.h_aliases   = NULL;
-    host_ip.h_addrtype  = AF_INET;
-    host_ip.h_length    = 4;
-    host_ip.h_addr_list = packed_ptr;
-    packed_ptr[0]       = (char *)(&packed_ip);
-    packed_ptr[1]       = NULL;
-
-    return (&host_ip);
-  }
-  else
-  {
-   /*
-    * Use the gethostbyname() function to get the IP address for
-    * the name...
-    */
-
-    return (gethostbyname(name));
-  }
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -1,317 +0,0 @@
-/*
- * "$Id$"
- *
- *   HTTP support routines for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 1997-2003 by Easy Software Products, all rights reserved.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   httpSeparate() - Separate a Universal Resource Identifier into its
- *                    components.
- *   httpStatus()   - Return a short string describing a HTTP status code.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <ctype.h>
-#include "string.h"
-
-#include "http.h"
-#include "ipp.h"
-
-
-/*
- * 'httpSeparate()' - Separate a Universal Resource Identifier into its
- *                    components.
- */
-
-void
-httpSeparate(const char *uri,		/* I - Universal Resource Identifier */
-             char       *method,	/* O - Method [32] (http, https, etc.) */
-	     char       *username,	/* O - Username [32] */
-	     char       *host,		/* O - Hostname [32] */
-	     int        *port,		/* O - Port number to use */
-             char       *resource)	/* O - Resource/filename [1024] */
-{
-  char		*ptr;			/* Pointer into string... */
-  const char	*atsign,		/* @ sign */
-		*slash;			/* Separator */
-  char		safeuri[HTTP_MAX_URI];	/* "Safe" local copy of URI */
-  char		quoted;			/* Quoted character */
-
-
- /*
-  * Range check input...
-  */
-
-  if (uri == NULL || method == NULL || username == NULL || host == NULL ||
-      port == NULL || resource == NULL)
-    return;
-
- /*
-  * Copy the URL to a local string to make sure we don't have a URL
-  * longer than HTTP_MAX_URI characters long...
-  */
-
-  strlcpy(safeuri, uri, sizeof(safeuri));
-
-  uri = safeuri;
-
- /*
-  * Grab the method portion of the URI...
-  */
-
-  if (strncmp(uri, "//", 2) == 0)
-  {
-   /*
-    * Workaround for HP IPP client bug...
-    */
-
-    strcpy(method, "ipp");
-  }
-  else
-  {
-   /*
-    * Standard URI with method...
-    */
-
-    for (ptr = host; *uri != ':' && *uri != '\0'; uri ++)
-      if (ptr < (host + HTTP_MAX_URI - 1))
-        *ptr++ = *uri;
-
-    *ptr = '\0';
-    if (*uri == ':')
-      uri ++;
-
-   /*
-    * If the method contains a period or slash, then it's probably
-    * hostname/filename...
-    */
-
-    if (strchr(host, '.') != NULL || strchr(host, '/') != NULL || *uri == '\0')
-    {
-      if ((ptr = strchr(host, '/')) != NULL)
-      {
-	strlcpy(resource, ptr, HTTP_MAX_URI);
-	*ptr = '\0';
-      }
-      else
-	resource[0] = '\0';
-
-      if (isdigit(*uri))
-      {
-       /*
-	* OK, we have "hostname:port[/resource]"...
-	*/
-
-	*port = strtol(uri, (char **)&uri, 10);
-
-	if (*uri == '/')
-          strlcpy(resource, uri, HTTP_MAX_URI);
-      }
-      else
-	*port = 631;
-
-      strcpy(method, "http");
-      username[0] = '\0';
-      return;
-    }
-    else
-      strlcpy(method, host, 32);
-  }
-
- /*
-  * If the method starts with less than 2 slashes then it is a local resource...
-  */
-
-  if (strncmp(uri, "//", 2) != 0)
-  {
-    strlcpy(resource, uri, HTTP_MAX_URI);
-
-    username[0] = '\0';
-    host[0]     = '\0';
-    *port       = 0;
-    return;
-  }
-
- /*
-  * Grab the username, if any...
-  */
-
-  while (*uri == '/')
-    uri ++;
-
-  if ((slash = strchr(uri, '/')) == NULL)
-    slash = uri + strlen(uri);
-
-  if ((atsign = strchr(uri, '@')) != NULL && atsign < slash)
-  {
-   /*
-    * Got a username:password combo...
-    */
-
-    for (ptr = username; uri < atsign; uri ++)
-      if (ptr < (username + HTTP_MAX_URI - 1))
-      {
-        if (*uri == '%' && isxdigit(uri[1]) && isxdigit(uri[2]))
-	{
-	 /*
-	  * Grab a hex-encoded username and password...
-	  */
-
-          uri ++;
-	  if (isalpha(*uri))
-	    quoted = (tolower(*uri) - 'a' + 10) << 4;
-	  else
-	    quoted = (*uri - '0') << 4;
-
-          uri ++;
-	  if (isalpha(*uri))
-	    quoted |= tolower(*uri) - 'a' + 10;
-	  else
-	    quoted |= *uri - '0';
-
-          *ptr++ = quoted;
-	}
-	else
-	  *ptr++ = *uri;
-      }
-
-    *ptr = '\0';
-
-    uri = atsign + 1;
-  }
-  else
-    username[0] = '\0';
-
- /*
-  * Grab the hostname...
-  */
-
-  for (ptr = host; *uri != ':' && *uri != '/' && *uri != '\0'; uri ++)
-    if (ptr < (host + HTTP_MAX_URI - 1))
-      *ptr++ = *uri;
-
-  *ptr = '\0';
-
-  if (*uri != ':')
-  {
-    if (strcasecmp(method, "http") == 0)
-      *port = 80;
-    else if (strcasecmp(method, "https") == 0)
-      *port = 443;
-    else if (strcasecmp(method, "ipp") == 0)
-      *port = ippPort();
-    else if (strcasecmp(method, "socket") == 0)	/* Not registered yet... */
-      *port = 9100;
-    else
-      *port = 0;
-  }
-  else
-  {
-   /*
-    * Parse port number...
-    */
-
-    *port = 0;
-    uri ++;
-    while (isdigit(*uri))
-    {
-      *port = (*port * 10) + *uri - '0';
-      uri ++;
-    }
-  }
-
-  if (*uri == '\0')
-  {
-   /*
-    * Hostname but no port or path...
-    */
-
-    resource[0] = '/';
-    resource[1] = '\0';
-    return;
-  }
-
- /*
-  * The remaining portion is the resource string...
-  */
-
-  strlcpy(resource, uri, HTTP_MAX_URI);
-}
-
-
-/*
- * 'httpStatus()' - Return a short string describing a HTTP status code.
- */
-
-const char *				/* O - String or NULL */
-httpStatus(http_status_t status)	/* I - HTTP status code */
-{
-  switch (status)
-  {
-    case HTTP_CONTINUE :
-        return ("Continue");
-    case HTTP_SWITCHING_PROTOCOLS :
-        return ("Switching Protocols");
-    case HTTP_OK :
-        return ("OK");
-    case HTTP_CREATED :
-        return ("Created");
-    case HTTP_ACCEPTED :
-        return ("Accepted");
-    case HTTP_NO_CONTENT :
-        return ("No Content");
-    case HTTP_NOT_MODIFIED :
-        return ("Not Modified");
-    case HTTP_BAD_REQUEST :
-        return ("Bad Request");
-    case HTTP_UNAUTHORIZED :
-        return ("Unauthorized");
-    case HTTP_FORBIDDEN :
-        return ("Forbidden");
-    case HTTP_NOT_FOUND :
-        return ("Not Found");
-    case HTTP_REQUEST_TOO_LARGE :
-        return ("Request Entity Too Large");
-    case HTTP_URI_TOO_LONG :
-        return ("URI Too Long");
-    case HTTP_UPGRADE_REQUIRED :
-        return ("Upgrade Required");
-    case HTTP_NOT_IMPLEMENTED :
-        return ("Not Implemented");
-    case HTTP_NOT_SUPPORTED :
-        return ("Not Supported");
-    default :
-        return ("Unknown");
-  }
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -4,7 +4,7 @@
 *   Hyper-Text Transport Protocol definitions for the Common UNIX Printing
 *   System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-1999 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -15,14 +15,12 @@
 *
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
+ *       44145 Airport View Drive, Suite 204
 *       Hollywood, Maryland 20636-3111 USA
 *
 *       Voice: (301) 373-9603
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
- *
- *   This file is subject to the Apple OS-Developed Software exception.
 */

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

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


 /*
@@ -69,7 +63,7 @@ extern "C" {

 #  define HTTP_MAX_URI		1024	/* Max length of URI string */
 #  define HTTP_MAX_HOST		256	/* Max length of hostname string */
-#  define HTTP_MAX_BUFFER	2048	/* Max length of data buffer */
+#  define HTTP_MAX_BUFFER	8192	/* Max length of data buffer */
 #  define HTTP_MAX_VALUE	256	/* Max header field value length */


@@ -130,34 +124,6 @@ typedef enum
 } http_encoding_t;


-/*
- * HTTP encryption values...
- */
-
-typedef enum
-{
-  HTTP_ENCRYPT_IF_REQUESTED,	/* Encrypt if requested (TLS upgrade) */
-  HTTP_ENCRYPT_NEVER,		/* Never encrypt */
-  HTTP_ENCRYPT_REQUIRED,	/* Encryption is required (TLS upgrade) */
-  HTTP_ENCRYPT_ALWAYS		/* Always encrypt (SSL) */
-} http_encryption_t;
-
-
-/*
- * HTTP authentication types...
- */
-
-typedef enum
-{
-  HTTP_AUTH_NONE,		/* No authentication in use */
-  HTTP_AUTH_BASIC,		/* Basic authentication in use */
-  HTTP_AUTH_MD5,		/* Digest authentication in use */
-  HTTP_AUTH_MD5_SESS,		/* MD5-session authentication in use */
-  HTTP_AUTH_MD5_INT,		/* Digest authentication in use for body */
-  HTTP_AUTH_MD5_SESS_INT	/* MD5-session authentication in use for body */
-} http_auth_t;
-
-
 /*
 * HTTP status codes...
 */
@@ -165,9 +131,7 @@ typedef enum
 typedef enum
 {
  HTTP_ERROR = -1,		/* An error response from httpXxxx() */
-
-  HTTP_CONTINUE = 100,		/* Everything OK, keep going... */
-  HTTP_SWITCHING_PROTOCOLS,	/* HTTP upgrade to TLS/SSL */
+  HTTP_CONTINUE,		/* Everything OK, keep going... */

  HTTP_OK = 200,		/* OPTIONS/GET/HEAD/POST/TRACE command was successful */
  HTTP_CREATED,			/* PUT command was successful */
@@ -200,7 +164,6 @@ typedef enum
  HTTP_REQUEST_TOO_LARGE,	/* Request entity too large */
  HTTP_URI_TOO_LONG,		/* URI too long */
  HTTP_UNSUPPORTED_MEDIATYPE,	/* The requested media type is unsupported */
-  HTTP_UPGRADE_REQUIRED = 426,	/* Upgrade to SSL/TLS required */

  HTTP_SERVER_ERROR = 500,	/* Internal server error */
  HTTP_NOT_IMPLEMENTED,		/* Feature not implemented */
@@ -218,10 +181,18 @@ typedef enum
 typedef enum
 {
  HTTP_FIELD_UNKNOWN = -1,
+  HTTP_FIELD_ACCEPT = 0,
+  HTTP_FIELD_ACCEPT_CHARSET,
+  HTTP_FIELD_ACCEPT_ENCODING,
  HTTP_FIELD_ACCEPT_LANGUAGE,
  HTTP_FIELD_ACCEPT_RANGES,
+  HTTP_FIELD_AGE,
+  HTTP_FIELD_ALLOW,
+  HTTP_FIELD_ALTERNATES,
  HTTP_FIELD_AUTHORIZATION,
+  HTTP_FIELD_CACHE_CONTROL,
  HTTP_FIELD_CONNECTION,
+  HTTP_FIELD_CONTENT_BASE,
  HTTP_FIELD_CONTENT_ENCODING,
  HTTP_FIELD_CONTENT_LANGUAGE,
  HTTP_FIELD_CONTENT_LENGTH,
@@ -231,19 +202,38 @@ typedef enum
  HTTP_FIELD_CONTENT_TYPE,
  HTTP_FIELD_CONTENT_VERSION,
  HTTP_FIELD_DATE,
+  HTTP_FIELD_DERIVED_FROM,
+  HTTP_FIELD_ETAG,
+  HTTP_FIELD_EXPIRES,
+  HTTP_FIELD_FROM,
  HTTP_FIELD_HOST,
+  HTTP_FIELD_IF_MATCH,
  HTTP_FIELD_IF_MODIFIED_SINCE,
+  HTTP_FIELD_IF_NONE_MATCH,
+  HTTP_FIELD_IF_RANGE,
  HTTP_FIELD_IF_UNMODIFIED_SINCE,
  HTTP_FIELD_KEEP_ALIVE,
  HTTP_FIELD_LAST_MODIFIED,
  HTTP_FIELD_LINK,
  HTTP_FIELD_LOCATION,
+  HTTP_FIELD_MAX_FORWARDS,
+  HTTP_FIELD_MESSAGE_ID,
+  HTTP_FIELD_MIME_VERSION,
+  HTTP_FIELD_PRAGMA,
+  HTTP_FIELD_PROXY_AUTHENTICATE,
+  HTTP_FIELD_PROXY_AUTHORIZATION,
+  HTTP_FIELD_PUBLIC,
  HTTP_FIELD_RANGE,
  HTTP_FIELD_REFERER,
  HTTP_FIELD_RETRY_AFTER,
+  HTTP_FIELD_SERVER,
  HTTP_FIELD_TRANSFER_ENCODING,
  HTTP_FIELD_UPGRADE,
+  HTTP_FIELD_URI,
  HTTP_FIELD_USER_AGENT,
+  HTTP_FIELD_VARY,
+  HTTP_FIELD_VIA,
+  HTTP_FIELD_WARNING,
  HTTP_FIELD_WWW_AUTHENTICATE,
  HTTP_FIELD_MAX
 } http_field_t;
@@ -257,7 +247,6 @@ typedef struct
 {
  int			fd;		/* File descriptor for this socket */
  int			blocking;	/* To block or not to block */
-  int			error;		/* Last error on read */
  time_t		activity;	/* Time since last read/write */
  http_state_t		state;		/* State of client */
  http_status_t		status;		/* Status of last request */
@@ -274,13 +263,6 @@ typedef struct
  int			used;		/* Number of bytes used in buffer */
  char			buffer[HTTP_MAX_BUFFER];
 					/* Buffer for messages */
-  int			auth_type;	/* Authentication in use */
-  md5_state_t		md5_state;	/* MD5 state */
-  char			nonce[HTTP_MAX_VALUE];
-					/* Nonce value */
-  int			nonce_count;	/* Nonce count */
-  void			*tls;		/* TLS state information */
-  http_encryption_t	encryption;	/* Encryption requirements */
 } http_t;


@@ -289,54 +271,35 @@ typedef struct
 */

 #  define		httpBlocking(http,b)	(http)->blocking = (b)
-extern int		httpCheck(http_t *http);
 #  define		httpClearFields(http)	memset((http)->fields, 0, sizeof((http)->fields)),\
 						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)
+extern http_t		*httpConnect(char *host, int port);
+extern int		httpDelete(http_t *http, char *uri);
 extern void		httpFlush(http_t *http);
-extern int		httpGet(http_t *http, const char *uri);
+extern int		httpGet(http_t *http, char *uri);
 extern char		*httpGets(char *line, int length, http_t *http);
-extern const char	*httpGetDateString(time_t t);
-extern time_t		httpGetDateTime(const char *s);
+extern char		*httpGetDateString(time_t t);
+extern time_t		httpGetDateTime(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 int		httpHead(http_t *http, char *uri);
 extern void		httpInitialize(void);
-extern int		httpOptions(http_t *http, const char *uri);
-extern int		httpPost(http_t *http, const char *uri);
-extern int		httpPrintf(http_t *http, const char *format, ...)
-#  ifdef __GNUC__
-__attribute__ ((__format__ (__printf__, 2, 3)))
-#  endif /* __GNUC__ */
-;
-extern int		httpPut(http_t *http, const char *uri);
+extern int		httpOptions(http_t *http, char *uri);
+extern int		httpPost(http_t *http, char *uri);
+extern int		httpPrintf(http_t *http, const char *format, ...);
+extern int		httpPut(http_t *http, char *uri);
 extern int		httpRead(http_t *http, char *buffer, int length);
 extern int		httpReconnect(http_t *http);
-extern void		httpSeparate(const char *uri, char *method,
-			             char *username, char *host, int *port,
-				     char *resource);
-extern void		httpSetField(http_t *http, http_field_t field,
-			             const char *value);
-extern const char	*httpStatus(http_status_t status);
-extern int		httpTrace(http_t *http, const char *uri);
+extern void		httpSeparate(char *uri, char *method, char *username,
+			             char *host, int *port, char *resource);
+extern void		httpSetField(http_t *http, http_field_t field, char *value);
+extern char		*httpStatus(http_status_t status);
+extern int		httpTrace(http_t *http, char *uri);
 extern http_status_t	httpUpdate(http_t *http);
-extern int		httpWrite(http_t *http, const char *buffer, int length);
-extern char		*httpEncode64(char *out, const char *in);
-extern char		*httpDecode64(char *out, const char *in);
+extern int		httpWrite(http_t *http, char *buffer, int length);
+extern char		*httpEncode64(char *out, char *in);
+extern char		*httpDecode64(char *out, char *in);
 extern int		httpGetLength(http_t *http);
-extern char		*httpMD5(const char *, const char *, const char *,
-			         char [33]);
-extern char		*httpMD5Final(const char *, const char *, const char *,
-			              char [33]);
-extern char		*httpMD5String(const md5_byte_t *, char [33]);


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

 #ifndef _CUPS_IPP_H_
@@ -32,7 +30,7 @@
 * Include necessary headers...
 */

-#  include "http.h"
+#  include <cups/http.h>


 /*
@@ -48,7 +46,7 @@ extern "C" {
 * IPP version string...
 */

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

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

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


 /*
@@ -77,16 +75,11 @@ typedef enum			/**** Format tags for attribute formats... ****/
  IPP_TAG_JOB,
  IPP_TAG_END,
  IPP_TAG_PRINTER,
-  IPP_TAG_UNSUPPORTED_GROUP,
-  IPP_TAG_SUBSCRIPTION,
-  IPP_TAG_EVENT_NOTIFICATION,
-  IPP_TAG_UNSUPPORTED_VALUE = 0x10,
+  IPP_TAG_EXTENSION,
+  IPP_TAG_UNSUPPORTED = 0x10,
  IPP_TAG_DEFAULT,
  IPP_TAG_UNKNOWN,
  IPP_TAG_NOVALUE,
-  IPP_TAG_NOTSETTABLE = 0x15,
-  IPP_TAG_DELETEATTR,
-  IPP_TAG_ADMINDEFINE,
  IPP_TAG_INTEGER = 0x21,
  IPP_TAG_BOOLEAN,
  IPP_TAG_ENUM,
@@ -94,21 +87,16 @@ typedef enum			/**** Format tags for attribute formats... ****/
  IPP_TAG_DATE,
  IPP_TAG_RESOLUTION,
  IPP_TAG_RANGE,
-  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,
+  IPP_TAG_KEYWORD,
  IPP_TAG_URI,
  IPP_TAG_URISCHEME,
  IPP_TAG_CHARSET,
  IPP_TAG_LANGUAGE,
-  IPP_TAG_MIMETYPE,
-  IPP_TAG_MEMBERNAME,
-  IPP_TAG_MASK = 0x7fffffff,	/* Mask for copied attribute values */
-  IPP_TAG_COPY = -0x7fffffff-1	/* Bitflag for copied attribute values */
+  IPP_TAG_MIMETYPE
 } ipp_tag_t;

 typedef enum			/**** Resolution units... ****/
@@ -117,36 +105,21 @@ typedef enum			/**** Resolution units... ****/
  IPP_RES_PER_CM
 } ipp_res_t;

+typedef enum			/**** Multiple Document Handling ****/
+{
+  IPP_DOC_SINGLE,
+  IPP_DOC_UNCOLLATED,
+  IPP_DOC_COLLATED,
+  IPP_DOC_SEPARATE
+} ipp_doc_t;
+
 typedef enum			/**** Finishings... ****/
 {
-  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_NONE = 3,
+  IPP_FINISH_STAPLE,
+  IPP_FINISH_PUNCH,
+  IPP_FINISH_COVER,
+  IPP_FINISH_BIND
 } ipp_finish_t;

 typedef enum			/**** Orientation... ****/
@@ -170,7 +143,7 @@ typedef enum			/**** Job States.... */
  IPP_JOB_HELD,
  IPP_JOB_PROCESSING,
  IPP_JOB_STOPPED,
-  IPP_JOB_CANCELLED,
+  IPP_JOB_CANCELED,
  IPP_JOB_ABORTED,
  IPP_JOB_COMPLETED
 } ipp_jstate_t;
@@ -203,40 +176,12 @@ typedef enum			/**** IPP operations... ****/
  IPP_GET_JOB_ATTRIBUTES,
  IPP_GET_JOBS,
  IPP_GET_PRINTER_ATTRIBUTES,
-  IPP_HOLD_JOB,
+  IPP_HOLD_JOB = 0x000c,
  IPP_RELEASE_JOB,
  IPP_RESTART_JOB,
  IPP_PAUSE_PRINTER = 0x0010,
  IPP_RESUME_PRINTER,
  IPP_PURGE_JOBS,
-  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,
@@ -247,12 +192,7 @@ typedef enum			/**** IPP operations... ****/
  CUPS_DELETE_CLASS,
  CUPS_ACCEPT_JOBS,
  CUPS_REJECT_JOBS,
-  CUPS_SET_DEFAULT,
-  CUPS_GET_DEVICES,
-  CUPS_GET_PPDS,
-  CUPS_MOVE_JOB,
-  CUPS_ADD_DEVICE,
-  CUPS_DELETE_DEVICE
+  CUPS_SET_DEFAULT
 } ipp_op_t;

 typedef enum			/**** IPP status codes... ****/
@@ -260,11 +200,6 @@ 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,
@@ -280,27 +215,14 @@ typedef enum			/**** IPP status codes... ****/
  IPP_URI_SCHEME,
  IPP_CHARSET,
  IPP_CONFLICT,
-  IPP_COMPRESSION_NOT_SUPPORTED,
-  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,
  IPP_VERSION_NOT_SUPPORTED,
-  IPP_DEVICE_ERROR,
+  IPP_DEVICE_UNAVAILABLE,
  IPP_TEMPORARY_ERROR,
  IPP_NOT_ACCEPTING,
-  IPP_PRINTER_BUSY,
-  IPP_ERROR_JOB_CANCELLED,
-  IPP_MULTIPLE_JOBS_NOT_SUPPORTED,
-  IPP_PRINTER_IS_DEACTIVATED
+  IPP_PRINTER_BUSY
 } ipp_status_t;

 typedef unsigned char ipp_uchar_t;/**** Unsigned 8-bit integer/character ****/
@@ -356,17 +278,12 @@ typedef union			/**** Attribute Value ****/
    char	*charset;	/* Character set */
    char	*text;		/* String */
  }		string;		/* String with language value */
-
-  struct
-  {
-    int		length;		/* Length of attribute */
-    void	*data;		/* Data in attribute */
-  }		unknown;	/* Unknown attribute type */
 } ipp_value_t;

 typedef struct ipp_attribute_s	/**** Attribute ****/
 {
-  struct ipp_attribute_s *next;	/* Next attribute in list */
+  struct ipp_attribute_s	*next;
+  				/* Next atrtribute 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 */
@@ -389,36 +306,27 @@ typedef struct			/**** Request State ****/
 * Prototypes...
 */

-extern ipp_attribute_t	*ippAddBoolean(ipp_t *ipp, ipp_tag_t group, const char *name, char value);
-extern ipp_attribute_t	*ippAddBooleans(ipp_t *ipp, ipp_tag_t group, const char *name, int num_values, const char *values);
-extern ipp_attribute_t	*ippAddDate(ipp_t *ipp, ipp_tag_t group, const char *name, const ipp_uchar_t *value);
-extern ipp_attribute_t	*ippAddInteger(ipp_t *ipp, ipp_tag_t group, ipp_tag_t type, const char *name, int value);
-extern ipp_attribute_t	*ippAddIntegers(ipp_t *ipp, ipp_tag_t group, ipp_tag_t type, const char *name, int num_values, const int *values);
-extern ipp_attribute_t	*ippAddRange(ipp_t *ipp, ipp_tag_t group, const char *name, int lower, int upper);
-extern ipp_attribute_t	*ippAddRanges(ipp_t *ipp, ipp_tag_t group, const char *name, int num_values, const int *lower, const int *upper);
-extern ipp_attribute_t	*ippAddResolution(ipp_t *ipp, ipp_tag_t group, const char *name, ipp_res_t units, int xres, int yres);
-extern ipp_attribute_t	*ippAddResolutions(ipp_t *ipp, ipp_tag_t group, const char *name, int num_values, ipp_res_t units, const int *xres, const int *yres);
+extern time_t		ippDateToTime(ipp_uchar_t *date);
+extern ipp_attribute_t	*ippAddBoolean(ipp_t *ipp, ipp_tag_t group, char *name, char value);
+extern ipp_attribute_t	*ippAddBooleans(ipp_t *ipp, ipp_tag_t group, char *name, int num_values, char *values);
+extern ipp_attribute_t	*ippAddDate(ipp_t *ipp, ipp_tag_t group, char *name, ipp_uchar_t *value);
+extern ipp_attribute_t	*ippAddInteger(ipp_t *ipp, ipp_tag_t group, ipp_tag_t type, char *name, int value);
+extern ipp_attribute_t	*ippAddIntegers(ipp_t *ipp, ipp_tag_t group, ipp_tag_t type, char *name, int num_values, int *values);
+extern ipp_attribute_t	*ippAddRange(ipp_t *ipp, ipp_tag_t group, char *name, int lower, int upper);
+extern ipp_attribute_t	*ippAddRanges(ipp_t *ipp, ipp_tag_t group, char *name, int num_values, int *lower, int *upper);
+extern ipp_attribute_t	*ippAddResolution(ipp_t *ipp, ipp_tag_t group, char *name, ipp_res_t units, int xres, int yres);
+extern ipp_attribute_t	*ippAddResolutions(ipp_t *ipp, ipp_tag_t group, char *name, int num_values, ipp_res_t units, int *xres, int *yres);
 extern ipp_attribute_t	*ippAddSeparator(ipp_t *ipp);
-extern ipp_attribute_t	*ippAddString(ipp_t *ipp, ipp_tag_t group, ipp_tag_t type, const char *name, const char *charset, const char *value);
-extern ipp_attribute_t	*ippAddStrings(ipp_t *ipp, ipp_tag_t group, ipp_tag_t type, const char *name, int num_values, const char *charset, const char **values);
-extern time_t		ippDateToTime(const ipp_uchar_t *date);
+extern ipp_attribute_t	*ippAddString(ipp_t *ipp, ipp_tag_t group, ipp_tag_t type, char *name, char *charset, char *value);
+extern ipp_attribute_t	*ippAddStrings(ipp_t *ipp, ipp_tag_t group, ipp_tag_t type, char *name, int num_values, char *charset, char **values);
 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	*ippFindNextAttribute(ipp_t *ipp, const char *name,
-			                      ipp_tag_t type);
+extern ipp_attribute_t	*ippFindAttribute(ipp_t *ipp, 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);
-extern const ipp_uchar_t *ippTimeToDate(time_t t);
+extern ipp_uchar_t	*ippTimeToDate(time_t t);
 extern ipp_state_t	ippWrite(http_t *http, ipp_t *ipp);
 extern int		ippPort(void);
-extern void		ippSetPort(int p);
-
-extern ipp_attribute_t	*_ipp_add_attr(ipp_t *, int);
-extern void		_ipp_free_attr(ipp_attribute_t *);
-

 /*
 * C++ magic...
@@ -3,7 +3,7 @@
 *
 *   I18N/language support for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products.
+ *   Copyright 1997-1999 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -14,15 +14,13 @@
 *
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
+ *       44145 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:
 *
 *   cupsLangEncoding() - Return the character encoding (us-ascii, etc.)
@@ -52,32 +50,17 @@ static char		*lang_blank = "";	/* Blank constant string */
 static char		*lang_encodings[] =	/* Encoding strings */
 			{
 			  "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",
-			  "iso-8859-13",
-			  "iso-8859-14",
-			  "iso-8859-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"
+			  "iso8859-1",
+			  "iso8859-2",
+			  "iso8859-3",
+			  "iso8859-4",
+			  "iso8859-5",
+			  "iso8859-6",
+			  "iso8859-7",
+			  "iso8859-8",
+			  "iso8859-9",
+			  "iso8859-10",
+			  "utf8"
 			};
 static char		*lang_default[] =	/* Default POSIX locale */
 			{
@@ -144,13 +127,10 @@ cupsLangFree(cups_lang_t *lang)	/* I - Language to free */
 */

 cups_lang_t *			/* O - Language data */
-cupsLangGet(const char *language) /* I - Language or locale */
+cupsLangGet(char *language)	/* I - Language or locale */
 {
  int		i, count;	/* Looping vars */
-  char		langname[32],	/* Requested language name */
-		*langptr,	/* Pointer into language name */
-		real[32],	/* Real language name */
-		*realptr,	/* Pointer into real language name */
+  char		real[16],	/* Real language name */
 		filename[1024],	/* Filename for language locale file */
 		*localedir;	/* Directory for locale files */
  FILE		*fp;		/* Language locale file pointer */
@@ -163,111 +143,73 @@ cupsLangGet(const char *language) /* I - Language or locale */
 /*
  * Convert the language string passed in to a locale string. "C" is the
  * standard POSIX locale and is copied unchanged.  Otherwise the
-  * language string is converted from ll-cc (language-country) to ll_cc
+  * 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.
  */

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

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

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

 /*
-  * See if we already have this language loaded...
-  */
-
-  for (lang = lang_cache; lang != NULL; lang = lang->next)
-    if (strcmp(lang->language, langname) == 0)
-    {
-      lang->used ++;
-
-      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.
+  * 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;

-  for (fp = NULL; fp == NULL;)
-  {
-    snprintf(filename, sizeof(filename), "%s/%s/cups_%s", localedir,
-             real, real);
+  sprintf(filename, "%s/%s/cups_%s", localedir, real, real);

-    if ((fp = fopen(filename, "r")) == NULL)
+  if ((fp = fopen(filename, "r")) == NULL)
+    if (strlen(real) > 2)
    {
-      if ((realptr = strchr(real, '.')) != NULL)
-        *realptr = '\0';
-      else if ((realptr = strchr(real, '_')) != NULL)
-        *realptr = '\0';
-      else
-        break;
+     /*
+      * Nope, see if we can open a generic language file...
+      */
+
+      real[2] = '\0';
+      sprintf(filename, "%s/%s/cups_%s", localedir, real, real);
+      fp = fopen(filename, "r");
+    }
+
+ /*
+  * Then see if we already have this language loaded...
+  */
+
+  for (lang = lang_cache; lang != NULL; lang = lang->next)
+    if (strcmp(lang->language, language) == 0)
+    {
+      lang->used ++;
+
+      if (fp != NULL)
+        fclose(fp);
+
+      return (lang);
    }
-  }

 /*
  * OK, we have an open messages file; the first line will contain the
@@ -288,7 +230,7 @@ cupsLangGet(const char *language) /* I - Language or locale */
  */

  if (fp == NULL)
-    strlcpy(line, lang_default[0], sizeof(line));
+    strcpy(line, lang_default[0]);
  else if (fgets(line, sizeof(line), fp) == NULL)
  {
   /*
@@ -328,6 +270,7 @@ cupsLangGet(const char *language) /* I - Language or locale */
    lang_cache = lang;
  }

+
 /*
  * Free all old strings as needed...
  */
@@ -345,7 +288,7 @@ cupsLangGet(const char *language) /* I - Language or locale */
  */

  lang->used ++;
-  strlcpy(lang->language, langname, sizeof(lang->language));
+  strcpy(lang->language, language);

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

-      strlcpy(line, lang_default[count], sizeof(line));
+      strcpy(line, lang_default[count]);
    }
    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-2003 by Easy Software Products.
+ *   Copyright 1997-1999 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -14,14 +14,12 @@
 *
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
+ *       44145 Airport View Drive, Suite 204
 *       Hollywood, Maryland 20636-3111 USA
 *
 *       Voice: (301) 373-9603
 *       EMail: cups-info@cups.org
 *         WWW: http://www.cups.org
- *
- *   This file is subject to the Apple OS-Developed Software exception.
 */

 #ifndef _CUPS_LANGUAGE_H_
@@ -50,11 +48,13 @@ typedef enum			/**** Message Indices ****/
  CUPS_MSG_CLOSE,
  CUPS_MSG_YES,
  CUPS_MSG_NO,
+  CUPS_MSG_AUTO,
  CUPS_MSG_ON,
  CUPS_MSG_OFF,
  CUPS_MSG_SAVE,
  CUPS_MSG_DISCARD,
  CUPS_MSG_DEFAULT,
+  CUPS_MSG_USER_DEFINED,
  CUPS_MSG_OPTIONS,
  CUPS_MSG_MORE_INFO,
  CUPS_MSG_BLACK,
@@ -63,14 +63,18 @@ typedef enum			/**** Message Indices ****/
  CUPS_MSG_MAGENTA,
  CUPS_MSG_YELLOW,
  CUPS_MSG_COPYRIGHT,
+  CUPS_MSG_ALL_RIGHTS_RESERVED,
  CUPS_MSG_GENERAL,
  CUPS_MSG_PRINTER,
+  CUPS_MSG_POSTSCRIPT,
  CUPS_MSG_IMAGE,
-  CUPS_MSG_HPGL2,
-  CUPS_MSG_EXTRA,
-  CUPS_MSG_DOCUMENT,
-  CUPS_MSG_OTHER,
+  CUPS_MSG_TEXT,
+  CUPS_MSG_HPGL,
+  CUPS_MSG_ADVANCED,
+  CUPS_MSG_PRINT_BANNER_PAGE,
+  CUPS_MSG_VERBOSE_LOGGING,
  CUPS_MSG_PRINT_PAGES,
+  CUPS_MSG_DOCUMENT,
  CUPS_MSG_ENTIRE_DOCUMENT,
  CUPS_MSG_PAGE_RANGE,
  CUPS_MSG_REVERSE_ORDER,
@@ -83,16 +87,22 @@ typedef enum			/**** Message Indices ****/
  CUPS_MSG_ZOOM_BY_PERCENT,
  CUPS_MSG_ZOOM_BY_PPI,
  CUPS_MSG_MIRROR_IMAGE,
+  CUPS_MSG_ROTATE_IMAGE,
+  CUPS_MSG_BEST_FIT,
  CUPS_MSG_COLOR_SATURATION,
  CUPS_MSG_COLOR_HUE,
+  CUPS_MSG_NUMBER_OF_COLUMNS,
+  CUPS_MSG_MARGINS,
+  CUPS_MSG_WRAP_TEXT,
  CUPS_MSG_FIT_TO_PAGE,
  CUPS_MSG_SHADING,
  CUPS_MSG_DEFAULT_PEN_WIDTH,
  CUPS_MSG_GAMMA_CORRECTION,
  CUPS_MSG_BRIGHTNESS,
-  CUPS_MSG_ADD,
-  CUPS_MSG_DELETE,
-  CUPS_MSG_MODIFY,
+  CUPS_MSG_COLOR_PROFILE,
+  CUPS_MSG_ADD_PRINTER,
+  CUPS_MSG_DELETE_PRINTER,
+  CUPS_MSG_MODIFY_PRINTER,
  CUPS_MSG_PRINTER_URI,
  CUPS_MSG_PRINTER_NAME,
  CUPS_MSG_PRINTER_LOCATION,
@@ -124,36 +134,6 @@ typedef enum			/**** Message Indices ****/
  CUPS_MSG_IDLE,
  CUPS_MSG_PROCESSING,
  CUPS_MSG_STOPPED,
-  CUPS_MSG_ALL,
-  CUPS_MSG_ODD,
-  CUPS_MSG_EVEN_PAGES,
-  CUPS_MSG_DARKER_LIGHTER,
-  CUPS_MSG_MEDIA_SIZE,
-  CUPS_MSG_MEDIA_TYPE,
-  CUPS_MSG_MEDIA_SOURCE,
-  CUPS_MSG_ORIENTATION,
-  CUPS_MSG_PORTRAIT,
-  CUPS_MSG_LANDSCAPE,
-  CUPS_MSG_JOB_STATE,
-  CUPS_MSG_JOB_NAME,
-  CUPS_MSG_USER_NAME,
-  CUPS_MSG_PRIORITY,
-  CUPS_MSG_COPIES,
-  CUPS_MSG_FILE_SIZE,
-  CUPS_MSG_PENDING,
-  CUPS_MSG_OUTPUT_MODE,
-  CUPS_MSG_RESOLUTION,
-  CUPS_MSG_TEXT,
-  CUPS_MSG_PRETTYPRINT,
-  CUPS_MSG_MARGINS,
-  CUPS_MSG_LEFT,
-  CUPS_MSG_RIGHT,
-  CUPS_MSG_BOTTOM,
-  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
@@ -172,22 +152,7 @@ typedef enum			/**** Language Encodings ****/
  CUPS_ISO8859_8,
  CUPS_ISO8859_9,
  CUPS_ISO8859_10,
-  CUPS_UTF8,
-  CUPS_ISO8859_13,
-  CUPS_ISO8859_14,
-  CUPS_ISO8859_15,
-  CUPS_WINDOWS_874,
-  CUPS_WINDOWS_1250,
-  CUPS_WINDOWS_1251,
-  CUPS_WINDOWS_1252,
-  CUPS_WINDOWS_1253,
-  CUPS_WINDOWS_1254,
-  CUPS_WINDOWS_1255,
-  CUPS_WINDOWS_1256,
-  CUPS_WINDOWS_1257,
-  CUPS_WINDOWS_1258,
-  CUPS_KOI8_R,
-  CUPS_KOI8_U
+  CUPS_UTF8
 } cups_encoding_t;

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

-#  if defined(WIN32) || defined(__EMX__) || defined(__APPLE__)
-#    define		cupsLangDefault() cupsLangGet(setlocale(LC_ALL, ""))
-#  else
-#    define		cupsLangDefault() cupsLangGet(setlocale(LC_MESSAGES, ""))
-#  endif /* WIN32 || __EMX__ || __APPLE__ */
-
+#  define		cupsLangDefault() cupsLangGet(setlocale(LC_ALL, 0))
 extern char		*cupsLangEncoding(cups_lang_t *lang);
 extern void		cupsLangFlush(void);
 extern void		cupsLangFree(cups_lang_t *lang);
-extern cups_lang_t	*cupsLangGet(const char *language);
+extern cups_lang_t	*cupsLangGet(char *language);
 #  define		cupsLangString(lang,msg) (lang)->messages[(msg)]

 #  ifdef __cplusplus
@@ -3,7 +3,7 @@
 *
 *   Option marking routines for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2003 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-1999 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,8 +23,6 @@
 *
 *   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.
@@ -35,6 +33,7 @@
 *   ppdMarkDefaults()     - Mark all default options in the PPD file.
 *   ppdMarkOption()       - Mark an option in a PPD file.
 *   ppd_defaults()        - Set the defaults for this group and all sub-groups.
+ *   ppd_default()         - Set the default choice for an option.
 */

 /*
@@ -43,14 +42,14 @@

 #include "ppd.h"
 #include "string.h"
-#include "debug.h"


 /*
 * Local functions...
 */

-static void	ppd_defaults(ppd_file_t *ppd, ppd_group_t *g);
+static void	ppd_defaults(ppd_group_t *g);
+static void	ppd_default(ppd_option_t *o);


 /*
@@ -60,10 +59,9 @@ static void	ppd_defaults(ppd_file_t *ppd, ppd_group_t *g);
 int				/* O - Number of conflicts found */
 ppdConflicts(ppd_file_t *ppd)	/* I - PPD to check */
 {
-  int		i, j, k,	/* Looping variables */
+  int		i, j,		/* Looping variables */
 		conflicts;	/* Number of conflicts */
  ppd_const_t	*c;		/* Current constraint */
-  ppd_group_t	*g, *sg;	/* Groups */
  ppd_option_t	*o1, *o2;	/* Options */
  ppd_choice_t	*c1, *c2;	/* Choices */

@@ -71,22 +69,8 @@ ppdConflicts(ppd_file_t *ppd)	/* I - PPD to check */
  if (ppd == NULL)
    return (0);

- /*
-  * Clear all conflicts...
-  */
-
  conflicts = 0;

-  for (i = ppd->num_groups, g = ppd->groups; i > 0; i --, g ++)
-  {
-    for (j = g->num_options, o1 = g->options; j > 0; j --, o1 ++)
-      o1->conflicted = 0;
-
-    for (j = g->num_subgroups, sg = g->subgroups; j > 0; j --, sg ++)
-      for (k = sg->num_options, o1 = sg->options; k > 0; k --, o1 ++)
-        o1->conflicted = 0;
-  }
-
 /*
  * Loop through all of the UI constraints and flag any options
  * that conflict...
@@ -120,10 +104,7 @@ ppdConflicts(ppd_file_t *ppd)	/* I - PPD to check */
        if (c1->marked)
 	  break;

-      if (j == 0 ||
-          strcasecmp(c1->choice, "None") == 0 ||
-          strcasecmp(c1->choice, "Off") == 0 ||
-          strcasecmp(c1->choice, "False") == 0)
+      if (j == 0)
        c1 = NULL;
    }

@@ -153,10 +134,7 @@ ppdConflicts(ppd_file_t *ppd)	/* I - PPD to check */
        if (c2->marked)
 	  break;

-      if (j == 0 ||
-          strcasecmp(c2->choice, "None") == 0 ||
-          strcasecmp(c2->choice, "Off") == 0 ||
-          strcasecmp(c2->choice, "False") == 0)
+      if (j == 0)
        c2 = NULL;
    }

@@ -167,13 +145,15 @@ ppdConflicts(ppd_file_t *ppd)	/* I - PPD to check */
    if (c1 != NULL && c1->marked &&
        c2 != NULL && c2->marked)
    {
-      DEBUG_printf(("%s->%s conflicts with %s->%s (%s %s %s %s)\n",
-                    o1->keyword, c1->choice, o2->keyword, c2->choice,
-		    c->option1, c->choice1, c->option2, c->choice2));
      conflicts ++;
      o1->conflicted = 1;
      o2->conflicted = 1;
    }
+    else
+    {
+      o1->conflicted = 0;
+      o2->conflicted = 0;
+    }
  }

 /*
@@ -190,7 +170,7 @@ ppdConflicts(ppd_file_t *ppd)	/* I - PPD to check */

 ppd_choice_t *				/* O - Choice pointer or NULL */
 ppdFindChoice(ppd_option_t *o,		/* I - Pointer to option */
-              const char   *choice)	/* I - Name of choice */
+              char         *choice)	/* I - Name of choice */
 {
  int		i;		/* Looping var */
  ppd_choice_t	*c;		/* Current choice */
@@ -200,7 +180,7 @@ ppdFindChoice(ppd_option_t *o,		/* I - Pointer to option */
    return (NULL);

  for (i = o->num_choices, c = o->choices; i > 0; i --, c ++)
-    if (strcasecmp(c->choice, choice) == 0)
+    if (strcmp(c->choice, choice) == 0)
      return (c);

  return (NULL);
@@ -213,7 +193,7 @@ ppdFindChoice(ppd_option_t *o,		/* I - Pointer to option */

 ppd_choice_t *				/* O - Pointer to choice or NULL */
 ppdFindMarkedChoice(ppd_file_t *ppd,	/* I - PPD file */
-                    const char *option)	/* I - Keyword/option name */
+                    char       *option)	/* I - Keyword/option name */
 {
  int		i;		/* Looping var */
  ppd_option_t	*o;		/* Pointer to option */
@@ -237,7 +217,7 @@ ppdFindMarkedChoice(ppd_file_t *ppd,	/* I - PPD file */

 ppd_option_t *				/* O - Pointer to option or NULL */
 ppdFindOption(ppd_file_t *ppd,		/* I - PPD file data */
-              const char *option)	/* I - Option/Keyword name */
+              char       *option)	/* I - Option/Keyword name */
 {
  int		i, j, k;	/* Looping vars */
  ppd_option_t	*o;		/* Pointer to option */
@@ -251,12 +231,12 @@ ppdFindOption(ppd_file_t *ppd,		/* I - PPD file data */
  for (i = ppd->num_groups, g = ppd->groups; i > 0; i --, g ++)
  {
    for (j = g->num_options, o = g->options; j > 0; j --, o ++)
-      if (strcasecmp(o->keyword, option) == 0)
+      if (strcmp(o->keyword, option) == 0)
 	return (o);

    for (j = g->num_subgroups, sg = g->subgroups; j > 0; j --, sg ++)
      for (k = sg->num_options, o = sg->options; k > 0; k --, o ++)
-	if (strcasecmp(o->keyword, option) == 0)
+	if (strcmp(o->keyword, option) == 0)
 	  return (o);
  }

@@ -270,8 +250,8 @@ ppdFindOption(ppd_file_t *ppd,		/* I - PPD file data */

 int				/* O - Non-zero if option is marked */
 ppdIsMarked(ppd_file_t *ppd,	/* I - PPD file data */
-            const char *option,	/* I - Option/Keyword name */
-            const char *choice)	/* I - Choice name */
+            char       *option,	/* I - Option/Keyword name */
+            char       *choice)	/* I - Choice name */
 {
  ppd_option_t	*o;		/* Option pointer */
  ppd_choice_t	*c;		/* Choice pointer */
@@ -299,13 +279,19 @@ ppdMarkDefaults(ppd_file_t *ppd)/* I - PPD file record */
 {
  int		i;		/* Looping variables */
  ppd_group_t	*g;		/* Current group */
+  ppd_option_t	*o;		/* PageSize option */


  if (ppd == NULL)
    return;

  for (i = ppd->num_groups, g = ppd->groups; i > 0; i --, g ++)
-    ppd_defaults(ppd, g);
+    ppd_defaults(g);
+
+  o = ppdFindOption(ppd, "PageSize");
+
+  for (i = 0; i < ppd->num_sizes; i ++)
+    ppd->sizes[i].marked = strcmp(ppd->sizes[i].name, o->defchoice) == 0;
 }


@@ -320,8 +306,8 @@ ppdMarkDefaults(ppd_file_t *ppd)/* I - PPD file record */

 int					/* O - Number of conflicts */
 ppdMarkOption(ppd_file_t *ppd,		/* I - PPD file record */
-              const char *option,	/* I - Keyword */
-              const char *choice)	/* I - Option name */
+              char       *option,	/* I - Keyword */
+              char       *choice)	/* I - Option name */
 {
  int		i;		/* Looping var */
  ppd_option_t	*o;		/* Option pointer */
@@ -331,7 +317,7 @@ ppdMarkOption(ppd_file_t *ppd,		/* I - PPD file record */
  if (ppd == NULL)
    return (0);

-  if (strcasecmp(option, "PageSize") == 0 && strncasecmp(choice, "Custom.", 7) == 0)
+  if (strcmp(option, "PageSize") == 0 && strncmp(choice, "Custom.", 7) == 0)
  {
   /*
    * Handle variable page sizes...
@@ -345,67 +331,35 @@ ppdMarkOption(ppd_file_t *ppd,		/* I - PPD file record */
    return (0);

  for (i = o->num_choices, c = o->choices; i > 0; i --, c ++)
-    if (strcasecmp(c->choice, choice) == 0)
-      break;
+    if (strcmp(c->choice, choice) == 0)
+      c->marked = 1;
+    else if (o->ui != PPD_UI_PICKMANY)
+      c->marked = 0;

-  if (i)
+  if (strcmp(option, "PageSize") == 0 || strcmp(option, "PageRegion") == 0)
  {
   /*
-    * Option found; mark it and then handle unmarking any other options.
+    * Mark current page size...
    */

-    c->marked = 1;
+    for (i = 0; i < ppd->num_sizes; i ++)
+      ppd->sizes[i].marked = strcmp(ppd->sizes[i].name, choice) == 0;

-    if (o->ui != PPD_UI_PICKMANY)
-      for (i = o->num_choices, c = o->choices; i > 0; i --, c ++)
-	if (strcasecmp(c->choice, choice) != 0)
-          c->marked = 0;
+   /*
+    * Unmark the current PageSize or PageRegion setting, as appropriate...
+    */

-    if (strcasecmp(option, "PageSize") == 0 || strcasecmp(option, "PageRegion") == 0)
+    if (strcmp(option, "PageSize") == 0)
    {
-     /*
-      * Mark current page size...
-      */
-
-      for (i = 0; i < ppd->num_sizes; i ++)
-	ppd->sizes[i].marked = strcasecmp(ppd->sizes[i].name, choice) == 0;
-
-     /*
-      * Unmark the current PageSize or PageRegion setting, as appropriate...
-      */
-
-      if (strcasecmp(option, "PageSize") == 0)
-      {
-	if ((o = ppdFindOption(ppd, "PageRegion")) != NULL)
-	  for (i = 0; i < o->num_choices; i ++)
-            o->choices[i].marked = 0;
-      }
-      else
-      {
-	if ((o = ppdFindOption(ppd, "PageSize")) != NULL)
-	  for (i = 0; i < o->num_choices; i ++)
-            o->choices[i].marked = 0;
-      }
+      o = ppdFindOption(ppd, "PageRegion");
+      for (i = 0; i < o->num_choices; i ++)
+        o->choices[i].marked = 0;
    }
-    else if (strcasecmp(option, "InputSlot") == 0)
+    else
    {
-     /*
-      * Unmark ManualFeed option...
-      */
-
-      if ((o = ppdFindOption(ppd, "ManualFeed")) != NULL)
-	for (i = 0; i < o->num_choices; i ++)
-          o->choices[i].marked = 0;
-    }
-    else if (strcasecmp(option, "ManualFeed") == 0)
-    {
-     /*
-      * Unmark InputSlot option...
-      */
-
-      if ((o = ppdFindOption(ppd, "InputSlot")) != NULL)
-	for (i = 0; i < o->num_choices; i ++)
-          o->choices[i].marked = 0;
+      o = ppdFindOption(ppd, "PageSize");
+      for (i = 0; i < o->num_choices; i ++)
+        o->choices[i].marked = 0;
    }
  }

@@ -418,8 +372,7 @@ ppdMarkOption(ppd_file_t *ppd,		/* I - PPD file record */
 */

 static void
-ppd_defaults(ppd_file_t  *ppd,	/* I - PPD file */
-             ppd_group_t *g)	/* I - Group to default */
+ppd_defaults(ppd_group_t *g)	/* I - Group to default */
 {
  int		i;		/* Looping var */
  ppd_option_t	*o;		/* Current option */
@@ -430,11 +383,33 @@ ppd_defaults(ppd_file_t  *ppd,	/* I - PPD file */
    return;

  for (i = g->num_options, o = g->options; i > 0; i --, o ++)
-    if (strcasecmp(o->keyword, "PageRegion") != 0)
-      ppdMarkOption(ppd, o->keyword, o->defchoice);
+    if (strcmp(o->keyword, "PageRegion") != 0)
+      ppd_default(o);

  for (i = g->num_subgroups, sg = g->subgroups; i > 0; i --, sg ++)
-    ppd_defaults(ppd, sg);
+    ppd_defaults(sg);
+}
+
+
+/*
+ * 'ppd_default()' - Set the default choice for an option.
+ */
+
+static void
+ppd_default(ppd_option_t *o)	/* I - Option to default */
+{
+  int		i;		/* Looping var */
+  ppd_choice_t	*c;		/* Current choice */
+
+
+  if (o == NULL)
+    return;
+
+  for (i = o->num_choices, c = o->choices; i > 0; i --, c ++)
+    if (strcmp(c->choice, o->defchoice) == 0)
+      c->marked = 1;
+    else
+      c->marked = 0;
 }


@@ -1,392 +0,0 @@
-/*
-  Copyright (C) 1999 Aladdin Enterprises.  All rights reserved.
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  L. Peter Deutsch
-  ghost@aladdin.com
-
- */
-/*$Id$ */
-/*
-  Independent implementation of MD5 (RFC 1321).
-
-  This code implements the MD5 Algorithm defined in RFC 1321.
-  It is derived directly from the text of the RFC and not from the
-  reference implementation.
-
-  The original and principal author of md5.c is L. Peter Deutsch
-  <ghost@aladdin.com>.  Other authors are noted in the change history
-  that follows (in reverse chronological order):
-
-  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
-  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5).
-  1999-05-03 lpd Original version.
- */
-
-#include "md5.h"
-#include "string.h"
-
-#ifdef TEST
-/*
- * Compile with -DTEST to create a self-contained executable test program.
- * The test program should print out the same values as given in section
- * A.5 of RFC 1321, reproduced below.
- */
-main()
-{
-    static const char *const test[7] = {
-	"", /*d41d8cd98f00b204e9800998ecf8427e*/
-	"a", /*0cc175b9c0f1b6a831c399e269772661*/
-	"abc", /*900150983cd24fb0d6963f7d28e17f72*/
-	"message digest", /*f96b697d7cb7938d525a2f31aaf161d0*/
-	"abcdefghijklmnopqrstuvwxyz", /*c3fcd3d76192e4007dfb496cca67e13b*/
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
-				/*d174ab98d277d9f5a5611c2c9f419d9f*/
-	"12345678901234567890123456789012345678901234567890123456789012345678901234567890" /*57edf4a22be3c955ac49da2e2107b67a*/
-    };
-    int i;
-
-    for (i = 0; i < 7; ++i) {
-	md5_state_t state;
-	md5_byte_t digest[16];
-	int di;
-
-	md5_init(&state);
-	md5_append(&state, (const md5_byte_t *)test[i], strlen(test[i]));
-	md5_finish(&state, digest);
-	printf("MD5 (\"%s\") = ", test[i]);
-	for (di = 0; di < 16; ++di)
-	    printf("%02x", digest[di]);
-	printf("\n");
-    }
-    return 0;
-}
-#endif /* TEST */
-
-
-/*
- * For reference, here is the program that computed the T values.
- */
-#if 0
-#include <math.h>
-main()
-{
-    int i;
-    for (i = 1; i <= 64; ++i) {
-	unsigned long v = (unsigned long)(4294967296.0 * fabs(sin((double)i)));
-	printf("#define T%d 0x%08lx\n", i, v);
-    }
-    return 0;
-}
-#endif
-/*
- * End of T computation program.
- */
-#define T1 0xd76aa478
-#define T2 0xe8c7b756
-#define T3 0x242070db
-#define T4 0xc1bdceee
-#define T5 0xf57c0faf
-#define T6 0x4787c62a
-#define T7 0xa8304613
-#define T8 0xfd469501
-#define T9 0x698098d8
-#define T10 0x8b44f7af
-#define T11 0xffff5bb1
-#define T12 0x895cd7be
-#define T13 0x6b901122
-#define T14 0xfd987193
-#define T15 0xa679438e
-#define T16 0x49b40821
-#define T17 0xf61e2562
-#define T18 0xc040b340
-#define T19 0x265e5a51
-#define T20 0xe9b6c7aa
-#define T21 0xd62f105d
-#define T22 0x02441453
-#define T23 0xd8a1e681
-#define T24 0xe7d3fbc8
-#define T25 0x21e1cde6
-#define T26 0xc33707d6
-#define T27 0xf4d50d87
-#define T28 0x455a14ed
-#define T29 0xa9e3e905
-#define T30 0xfcefa3f8
-#define T31 0x676f02d9
-#define T32 0x8d2a4c8a
-#define T33 0xfffa3942
-#define T34 0x8771f681
-#define T35 0x6d9d6122
-#define T36 0xfde5380c
-#define T37 0xa4beea44
-#define T38 0x4bdecfa9
-#define T39 0xf6bb4b60
-#define T40 0xbebfbc70
-#define T41 0x289b7ec6
-#define T42 0xeaa127fa
-#define T43 0xd4ef3085
-#define T44 0x04881d05
-#define T45 0xd9d4d039
-#define T46 0xe6db99e5
-#define T47 0x1fa27cf8
-#define T48 0xc4ac5665
-#define T49 0xf4292244
-#define T50 0x432aff97
-#define T51 0xab9423a7
-#define T52 0xfc93a039
-#define T53 0x655b59c3
-#define T54 0x8f0ccc92
-#define T55 0xffeff47d
-#define T56 0x85845dd1
-#define T57 0x6fa87e4f
-#define T58 0xfe2ce6e0
-#define T59 0xa3014314
-#define T60 0x4e0811a1
-#define T61 0xf7537e82
-#define T62 0xbd3af235
-#define T63 0x2ad7d2bb
-#define T64 0xeb86d391
-
-static void
-md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
-{
-    md5_word_t
-	a = pms->abcd[0], b = pms->abcd[1],
-	c = pms->abcd[2], d = pms->abcd[3];
-    md5_word_t t;
-
-#ifndef ARCH_IS_BIG_ENDIAN
-# define ARCH_IS_BIG_ENDIAN 1	/* slower, default implementation */
-#endif
-#if ARCH_IS_BIG_ENDIAN
-
-    /*
-     * On big-endian machines, we must arrange the bytes in the right
-     * order.  (This also works on machines of unknown byte order.)
-     */
-    md5_word_t X[16];
-    const md5_byte_t *xp = data;
-    int i;
-
-    for (i = 0; i < 16; ++i, xp += 4)
-	X[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
-
-#else  /* !ARCH_IS_BIG_ENDIAN */
-
-    /*
-     * On little-endian machines, we can process properly aligned data
-     * without copying it.
-     */
-    md5_word_t xbuf[16];
-    const md5_word_t *X;
-
-    if (!((data - (const md5_byte_t *)0) & 3)) {
-	/* data are properly aligned */
-	X = (const md5_word_t *)data;
-    } else {
-	/* not aligned */
-	memcpy(xbuf, data, 64);
-	X = xbuf;
-    }
-#endif
-
-#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
-
-    /* Round 1. */
-    /* Let [abcd k s i] denote the operation
-       a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
-#define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + F(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-    /* Do the following 16 operations. */
-    SET(a, b, c, d,  0,  7,  T1);
-    SET(d, a, b, c,  1, 12,  T2);
-    SET(c, d, a, b,  2, 17,  T3);
-    SET(b, c, d, a,  3, 22,  T4);
-    SET(a, b, c, d,  4,  7,  T5);
-    SET(d, a, b, c,  5, 12,  T6);
-    SET(c, d, a, b,  6, 17,  T7);
-    SET(b, c, d, a,  7, 22,  T8);
-    SET(a, b, c, d,  8,  7,  T9);
-    SET(d, a, b, c,  9, 12, T10);
-    SET(c, d, a, b, 10, 17, T11);
-    SET(b, c, d, a, 11, 22, T12);
-    SET(a, b, c, d, 12,  7, T13);
-    SET(d, a, b, c, 13, 12, T14);
-    SET(c, d, a, b, 14, 17, T15);
-    SET(b, c, d, a, 15, 22, T16);
-#undef SET
-
-     /* Round 2. */
-     /* Let [abcd k s i] denote the operation
-          a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
-#define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + G(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
-    SET(a, b, c, d,  1,  5, T17);
-    SET(d, a, b, c,  6,  9, T18);
-    SET(c, d, a, b, 11, 14, T19);
-    SET(b, c, d, a,  0, 20, T20);
-    SET(a, b, c, d,  5,  5, T21);
-    SET(d, a, b, c, 10,  9, T22);
-    SET(c, d, a, b, 15, 14, T23);
-    SET(b, c, d, a,  4, 20, T24);
-    SET(a, b, c, d,  9,  5, T25);
-    SET(d, a, b, c, 14,  9, T26);
-    SET(c, d, a, b,  3, 14, T27);
-    SET(b, c, d, a,  8, 20, T28);
-    SET(a, b, c, d, 13,  5, T29);
-    SET(d, a, b, c,  2,  9, T30);
-    SET(c, d, a, b,  7, 14, T31);
-    SET(b, c, d, a, 12, 20, T32);
-#undef SET
-
-     /* Round 3. */
-     /* Let [abcd k s t] denote the operation
-          a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
-#define H(x, y, z) ((x) ^ (y) ^ (z))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + H(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
-    SET(a, b, c, d,  5,  4, T33);
-    SET(d, a, b, c,  8, 11, T34);
-    SET(c, d, a, b, 11, 16, T35);
-    SET(b, c, d, a, 14, 23, T36);
-    SET(a, b, c, d,  1,  4, T37);
-    SET(d, a, b, c,  4, 11, T38);
-    SET(c, d, a, b,  7, 16, T39);
-    SET(b, c, d, a, 10, 23, T40);
-    SET(a, b, c, d, 13,  4, T41);
-    SET(d, a, b, c,  0, 11, T42);
-    SET(c, d, a, b,  3, 16, T43);
-    SET(b, c, d, a,  6, 23, T44);
-    SET(a, b, c, d,  9,  4, T45);
-    SET(d, a, b, c, 12, 11, T46);
-    SET(c, d, a, b, 15, 16, T47);
-    SET(b, c, d, a,  2, 23, T48);
-#undef SET
-
-     /* Round 4. */
-     /* Let [abcd k s t] denote the operation
-          a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
-#define I(x, y, z) ((y) ^ ((x) | ~(z)))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + I(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
-    SET(a, b, c, d,  0,  6, T49);
-    SET(d, a, b, c,  7, 10, T50);
-    SET(c, d, a, b, 14, 15, T51);
-    SET(b, c, d, a,  5, 21, T52);
-    SET(a, b, c, d, 12,  6, T53);
-    SET(d, a, b, c,  3, 10, T54);
-    SET(c, d, a, b, 10, 15, T55);
-    SET(b, c, d, a,  1, 21, T56);
-    SET(a, b, c, d,  8,  6, T57);
-    SET(d, a, b, c, 15, 10, T58);
-    SET(c, d, a, b,  6, 15, T59);
-    SET(b, c, d, a, 13, 21, T60);
-    SET(a, b, c, d,  4,  6, T61);
-    SET(d, a, b, c, 11, 10, T62);
-    SET(c, d, a, b,  2, 15, T63);
-    SET(b, c, d, a,  9, 21, T64);
-#undef SET
-
-     /* Then perform the following additions. (That is increment each
-        of the four registers by the value it had before this block
-        was started.) */
-    pms->abcd[0] += a;
-    pms->abcd[1] += b;
-    pms->abcd[2] += c;
-    pms->abcd[3] += d;
-}
-
-void
-md5_init(md5_state_t *pms)
-{
-    pms->count[0] = pms->count[1] = 0;
-    pms->abcd[0] = 0x67452301;
-    pms->abcd[1] = 0xefcdab89;
-    pms->abcd[2] = 0x98badcfe;
-    pms->abcd[3] = 0x10325476;
-}
-
-void
-md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes)
-{
-    const md5_byte_t *p = data;
-    int left = nbytes;
-    int offset = (pms->count[0] >> 3) & 63;
-    md5_word_t nbits = (md5_word_t)(nbytes << 3);
-
-    if (nbytes <= 0)
-	return;
-
-    /* Update the message length. */
-    pms->count[1] += nbytes >> 29;
-    pms->count[0] += nbits;
-    if (pms->count[0] < nbits)
-	pms->count[1]++;
-
-    /* Process an initial partial block. */
-    if (offset) {
-	int copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
-
-	memcpy(pms->buf + offset, p, copy);
-	if (offset + copy < 64)
-	    return;
-	p += copy;
-	left -= copy;
-	md5_process(pms, pms->buf);
-    }
-
-    /* Process full blocks. */
-    for (; left >= 64; p += 64, left -= 64)
-	md5_process(pms, p);
-
-    /* Process a final partial block. */
-    if (left)
-	memcpy(pms->buf, p, left);
-}
-
-void
-md5_finish(md5_state_t *pms, md5_byte_t digest[16])
-{
-    static const md5_byte_t pad[64] = {
-	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    };
-    md5_byte_t data[8];
-    int i;
-
-    /* Save the length before padding. */
-    for (i = 0; i < 8; ++i)
-	data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
-    /* Pad to 56 bytes mod 64. */
-    md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
-    /* Append the length. */
-    md5_append(pms, data, 8);
-    for (i = 0; i < 16; ++i)
-	digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
-}
@@ -1,94 +0,0 @@
-/*
-  Copyright (C) 1999 Aladdin Enterprises.  All rights reserved.
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  L. Peter Deutsch
-  ghost@aladdin.com
-
- */
-/*$Id$ */
-/*
-  Independent implementation of MD5 (RFC 1321).
-
-  This code implements the MD5 Algorithm defined in RFC 1321.
-  It is derived directly from the text of the RFC and not from the
-  reference implementation.
-
-  The original and principal author of md5.h is L. Peter Deutsch
-  <ghost@aladdin.com>.  Other authors are noted in the change history
-  that follows (in reverse chronological order):
-
-  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
-  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
-	added conditionalization for C++ compilation from Martin
-	Purschke <purschke@bnl.gov>.
-  1999-05-03 lpd Original version.
- */
-
-#ifndef md5_INCLUDED
-#  define md5_INCLUDED
-
-/*
- * This code has some adaptations for the Ghostscript environment, but it
- * will compile and run correctly in any environment with 8-bit chars and
- * 32-bit ints.  Specifically, it assumes that if the following are
- * defined, they have the same meaning as in Ghostscript: P1, P2, P3,
- * ARCH_IS_BIG_ENDIAN.
- */
-
-typedef unsigned char md5_byte_t; /* 8-bit byte */
-typedef unsigned int md5_word_t; /* 32-bit word */
-
-/* Define the state of the MD5 Algorithm. */
-typedef struct md5_state_s {
-    md5_word_t count[2];	/* message length in bits, lsw first */
-    md5_word_t abcd[4];		/* digest buffer */
-    md5_byte_t buf[64];		/* accumulate block */
-} md5_state_t;
-
-#ifdef __cplusplus
-extern "C" 
-{
-#endif
-
-/* Initialize the algorithm. */
-#ifdef P1
-void md5_init(P1(md5_state_t *pms));
-#else
-void md5_init(md5_state_t *pms);
-#endif
-
-/* Append a string to the message. */
-#ifdef P3
-void md5_append(P3(md5_state_t *pms, const md5_byte_t *data, int nbytes));
-#else
-void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes);
-#endif
-
-/* Finish the message and return the digest. */
-#ifdef P2
-void md5_finish(P2(md5_state_t *pms, md5_byte_t digest[16]));
-#else
-void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
-#endif
-
-#ifdef __cplusplus
-}  /* end extern "C" */
-#endif
-
-#endif /* md5_INCLUDED */
--- a/Mostrar Mais
+++ b/Mostrar Mais