Import cups.org releases

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-1.1b5@4306 a1ca3aef-8c08-0410-bb20-df032aa958be

ENCRYPTION.txt

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

INSTALL.txt

@@ -1,157 +0,0 @@
-INSTALL - CUPS v1.1.7 - 05/01/2001
-----------------------------------
-
-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".
-
-
-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.
-
-
-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, and LDFLAGS
-environment variables prior to running configure:
-
-    setenv CFLAGS "-I/some/directory" ENTER
-    setenv CXXFLAGS "-I/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
-    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
-
-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:
-
-    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:
-
-    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 RPM 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, where <format> is one of the following:
-
-    epm      - Builds a portable shell script and tar file based
-               distribution.  This format will also backup your
-	       existing printing system if you decide to remove
-	       CUPS at some future time.
-    rpm      - Builds a RPM binary distribution.
-    deb      - Builds a Debian binary distribution.
-    depot    - Builds a HP-UX binary distribution.
-    pkg      - Builds a Solaris 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.

LICENSE.html

@@ -7,29 +7,29 @@
 
 <H2 ALIGN="CENTER">Common UNIX Printing System License Agreement</H2>
 
-<P ALIGN="CENTER">Copyright 1997-2001 by Easy Software Products<BR>
+<P ALIGN="CENTER">Copyright 1997-2000 by Easy Software Products<BR>
 44141 AIRPORT VIEW DR STE 204<BR>
 HOLLYWOOD, MARYLAND 20636-3111 USA<BR>
 <BR>
-Voice: +1.301.373.9600<BR>
+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>
 
 <H3>Introduction</H3>
 
-<P>The Common UNIX Printing System<SUP>TM</SUP>, ("CUPS<SUP>TM</SUP>"),
+<P>The Common UNIX Printing System<SUP>TM</SUP>, or CUPS<SUP>TM</SUP>,
 is provided under the GNU General Public License ("GPL") and GNU
 Library General Public License ("LGPL"), Version 2. A copy of these
 licenses follow this introduction.
 
 <P>The GNU LGPL applies to the CUPS API library, located in the "cups"
 subdirectory of the CUPS source distribution and in the
-"/usr/include/cups" directory and "libcups.a", "libcups.sl", or
-"libcups.so" files in the binary distributions.
+"/usr/include/cups" directory and "/usr/lib/libcups.so" or
+"/usr/lib32/libcups.so" files in the binary distributions.
 
 <P>The GNU GPL applies to the remainder of the CUPS distribution,
 including the "pstoraster" filter which is based upon GNU Ghostscript
-5.50 and the "pdftops" filter which is based upon Xpdf 0.90.
+5.50.
 
 <P>For those not familiar with the GNU GPL, the license basically
 allows you to:
@@ -44,16 +44,15 @@ allows you to:
 	<LI>Sell verbatim copies of the software for a media fee, or
 	sell support for the software.
 
-	<LI>Distribute or sell printer drivers and filters that use
-	CUPS so long as source code is made available under the GPL.
+	<LI>Distribute or sell printer drivers and filters that use the
+	CUPS API so long as source code is made available under the GPL.
 
 </UL>
 
 <P>What this license <B>does not</B> allow you to do is make changes or
 add features to CUPS and then sell a binary distribution without source
 code. You must provide source for any new drivers, changes, or
-additions to the software, and all code must be provided under the GPL
-or LGPL as appropriate.
+additions to the software, and all code must be provided under the GPL.
 
 <P>The GNU LGPL relaxes the "link-to" restriction, allowing you to
 develop applications that use the CUPS API library under other licenses
@@ -74,32 +73,22 @@ standards as the original.
 <P>Easy Software Products also sells rights to the CUPS source code
 under a binary distribution license for vendors that are unable to
 release source code for their drivers, additions, and modifications to
-CUPS under the GNU GPL and LGPL. For information please contact us at
+CUPS under the GNU GPL and LGPL. For pricing information please contact us at
 the address shown above.
 
 <P>The Common UNIX Printing System provides a "pstoraster" filter that
-utilizes the GNU GhostScript 5.50 core to convert PostScript files into
-a stream of raster images. For binary distribution licensing of this
-software, please contact:
+utilizes GNU GhostScript 5.50 to convert PostScript files into a stream
+of raster images. For binary distribution licensing of this software,
+please contact:
 
-<BLOCKQUOTE>
-Miles Jones<BR>
+<BLOCKQUOTE>Miles Jones<BR>
 Director of Marketing<BR>
 Artifex Software Inc.<BR>
 454 Las Gallinas Ave., Suite 108<BR>
 San Rafael, CA 94903 USA<BR>
 Voice: +1.415.492.9861<BR>
 Fax: +1.415.492.9862<BR>
-EMail: <A HREF="mailto:info@arsoft.com">info@arsoft.com</A>
-</BLOCKQUOTE>
-
-<P>The "pdftops" filter is based on the Xpdf 0.90 software. For binary
-distribution licensing of this software, please contact:
-
-<BLOCKQUOTE>
-Derek B. Noonburg<BR>
-Email: <A HREF="mailto:derekn@foolabs.com">derekn@foolabs.com</A><BR>
-WWW: <A HREF="http://www.foolabs.com/xpdf/">http://www.foolabs.com/xpdf/</A>
+EMail: info@arsoft.com
 </BLOCKQUOTE>
 
 <H3>Support</H3>

Makedefs.in

@@ -3,7 +3,7 @@
 #
 #   Common makefile definitions for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2000 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -31,7 +31,6 @@ AWK	=	@AWK@
 CC	=	@LIBTOOL@ @CC@
 CHMOD	=	@CHMOD@
 CP	=	@CP@
-CXX	=	@LIBTOOL@ @CXX@
 DSO	=	@DSO@
 HTMLDOC	=	@HTMLDOC@
 LIBTOOL	=	@LIBTOOL@
@@ -49,6 +48,7 @@ SHELL	=	/bin/sh
 #
 
 INSTALL_BIN	=	$(LIBTOOL) $(CP)
+INSTALL_CAT	=	@INSTALL_CAT@
 INSTALL_DATA	=	$(CP)
 INSTALL_LIB	=	$(LIBTOOL) $(CP)
 INSTALL_MAN	=	$(CP)
@@ -62,7 +62,6 @@ INSTALL_SYSV	=	@INSTALL_SYSV@
 LIBCUPS	=	@LIBCUPS@
 LIBCUPSIMAGE =	@LIBCUPSIMAGE@
 LIBJPEG	=	@LIBJPEG@
-LIBMALLOC =	@LIBMALLOC@
 LIBPNG	=	@LIBPNG@
 LIBTIFF	=	@LIBTIFF@
 LIBZ	=	@LIBZ@
@@ -76,9 +75,7 @@ LIBZ	=	@LIBZ@
 #
 
 ARFLAGS	=	crvs
-CFLAGS	=	@CFLAGS@ -I.. $(OPTIONS)
-CXXFLAGS =	@CXXFLAGS@ -I.. $(OPTIONS)
-DSOFLAGS =	@DSOFLAGS@
+CFLAGS	=	@CFLAGS@ $(OPTIM) -I.. $(OPTIONS)
 DSOLIBS	=	@DSOLIBS@
 IMGLIBS	=	@IMGLIBS@ -lm
 LDFLAGS	=	@LDFLAGS@ $(OPTIM)
@@ -88,7 +85,6 @@ LIBS	=	$(LINKCUPS) $(NETLIBS) @LIBS@
 NETLIBS	=	@NETLIBS@
 OPTIM	=	@OPTIM@
 OPTIONS	=
-SSLLIBS	=	@SSLLIBS@
 
 #
 # Directories...
@@ -119,13 +115,10 @@ srcdir		=	@srcdir@
 sysconfdir	=	@sysconfdir@
 top_srcdir	=	@top_srcdir@
 
-AMANDIR		=	@AMANDIR@
 BINDIR		=	@bindir@
 DATADIR		=	@CUPS_DATADIR@
 DOCDIR		=	@CUPS_DOCROOT@
 INCLUDEDIR	=	$(includedir)
-INITDIR		=	@INITDIR@
-INITDDIR	=	@INITDDIR@
 LIBDIR		=	$(libdir)
 LOCALEDIR	= 	@CUPS_LOCALEDIR@
 LOGDIR		= 	@CUPS_LOGDIR@
@@ -136,33 +129,19 @@ SBINDIR		=	@sbindir@
 SERVERBIN	= 	@CUPS_SERVERBIN@
 SERVERROOT	= 	@CUPS_SERVERROOT@
 
-CAT1EXT		=	@CAT1EXT@
-CAT5EXT		=	@CAT5EXT@
-CAT8EXT		=	@CAT8EXT@
-MAN8EXT		=	@MAN8EXT@
-
 #
 # Rules...
 #
 
 .SILENT:
-.SUFFIXES:	.a .c .cxx .h .man .o .0 .1 .1m .5 .8 .z
+.SUFFIXES:	.a .c .h .man .o .1 .5 .8
 .c.o:
 	echo Compiling $<...
-	$(CC) $(OPTIM) $(CFLAGS) -c $<
-.cxx.o:
-	echo Compiling $<...
-	$(CXX) $(OPTIM) $(CXXFLAGS) -c $<
-.man.0 .man.1 .man.1m .man.5 .man.8:
+	$(CC) $(CFLAGS) -c $<
+.man.1 .man.5 .man.8:
 	echo Formatting $<...
 	$(RM) $@
 	$(NROFF) -man $< >$@
-.man.z:
-	echo Formatting $<...
-	$(RM) $@ t.z
-	$(NROFF) -man $< >t
-	pack -f t
-	$(MV) t.z $@
 
 #
 # End of "$Id$"

Makefile

@@ -3,7 +3,7 @@
 #
 #   Top-level Makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2000 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -28,7 +28,7 @@ include Makedefs
 # Directories to make...
 #
 
-DIRS	=	cups backend berkeley cgi-bin filter man pdftops pstoraster \
+DIRS	=	cups backend berkeley cgi-bin filter man pstoraster \
 		scheduler systemv
 
 #
@@ -38,7 +38,7 @@ DIRS	=	cups backend berkeley cgi-bin filter man pdftops pstoraster \
 all:
 	for dir in $(DIRS); do\
 		echo Making all in $$dir... ;\
-		(cd $$dir ; $(MAKE) $(MFLAGS)) || exit 1;\
+		(cd $$dir ; $(MAKE) -$(MAKEFLAGS)) || exit 1;\
 	done
 
 #
@@ -48,7 +48,7 @@ all:
 clean:
 	for dir in $(DIRS); do\
 		echo Cleaning in $$dir... ;\
-		(cd $$dir; $(MAKE) $(MFLAGS) clean) || exit 1;\
+		(cd $$dir; $(MAKE) -$(MAKEFLAGS) clean) || exit 1;\
 	done
 
 #
@@ -58,89 +58,44 @@ clean:
 install:
 	for dir in $(DIRS); do\
 		echo Installing in $$dir... ;\
-		(cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\
+		(cd $$dir; $(MAKE) -$(MAKEFLAGS) install) || exit 1;\
 	done
 	echo Installing in conf...
-	(cd conf; $(MAKE) $(MFLAGS) install)
+	(cd conf; $(MAKE) -$(MAKEFLAGS) install)
 	echo Installing in data...
-	(cd data; $(MAKE) $(MFLAGS) install)
+	(cd data; $(MAKE) -$(MAKEFLAGS) install)
 	echo Installing in doc...
-	(cd doc; $(MAKE) $(MFLAGS) install)
+	(cd doc; $(MAKE) -$(MAKEFLAGS) install)
 	echo Installing in fonts...
-	(cd fonts; $(MAKE) $(MFLAGS) install)
+	(cd fonts; $(MAKE) -$(MAKEFLAGS) install)
+	(cd fonts; $(MAKE) -$(MAKEFLAGS) install)
 	echo Installing in locale...
-	(cd locale; $(MAKE) $(MFLAGS) install)
 	echo Installing in ppd...
-	(cd ppd; $(MAKE) $(MFLAGS) install)
+	(cd ppd; $(MAKE) -$(MAKEFLAGS) install)
 	echo Installing in templates...
-	(cd templates; $(MAKE) $(MFLAGS) install)
-	echo Installing startup script...
-	if test "x$(INITDIR)" != "x"; then \
-		$(MKDIR) $(prefix)/$(INITDIR)/init.d; \
-		$(RM) $(prefix)/$(INITDIR)/init.d/cups; \
-		$(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDIR)/init.d/cups; \
-		$(CHMOD) ugo+rx $(prefix)/$(INITDIR)/init.d/cups; \
-		$(MKDIR) $(prefix)/$(INITDIR)/rc0.d; \
-		$(RM) $(prefix)/$(INITDIR)/rc0.d/K00cups; \
-		ln -s $(INITDDIR)/cups $(prefix)/$(INITDIR)/rc0.d/K00cups; \
-		$(MKDIR) $(prefix)/$(INITDIR)/rc2.d; \
-		$(RM) $(prefix)/$(INITDIR)/rc2.d/S99cups; \
-		ln -s $(INITDDIR)/cups $(prefix)/$(INITDIR)/rc2.d/S99cups; \
-		$(MKDIR) $(prefix)/$(INITDIR)/rc3.d; \
-		$(RM) $(prefix)/$(INITDIR)/rc3.d/S99cups; \
-		ln -s $(INITDDIR)/cups $(prefix)/$(INITDIR)/rc3.d/S99cups; \
-		$(MKDIR) $(prefix)/$(INITDIR)/rc5.d; \
-		$(RM) $(prefix)/$(INITDIR)/rc5.d/S99cups; \
-		ln -s $(INITDDIR)/cups $(prefix)/$(INITDIR)/rc5.d/S99cups; \
-	fi
-	if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
-		$(MKDIR) $(prefix)/$(INITDDIR); \
-		$(RM) $(prefix)/$(INITDDIR)/cups; \
-		$(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDDIR)/cups; \
-		$(CHMOD) ugo+rx $(prefix)/$(INITDDIR)/cups; \
-	fi
-
+	(cd templates; $(MAKE) -$(MAKEFLAGS) install)
 
 #
-# Run the test suite...
+# Make a software distribution...
 #
 
-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 \
-			AMANDIR=$(AMANDIR) \
-			BINDIR=$(BINDIR) DATADIR=$(DATADIR) \
-			DOCDIR=$(DOCDIR) INCLUDEDIR=$(INCLUDEDIR) \
-			LIBDIR=$(LIBDIR) LOCALEDIR=$(LOCALEDIR) \
-			LOGDIR=$(LOGDIR) MANDIR=$(MANDIR) \
-			PAMDIR=$(PAMDIR) REQUESTS=$(REQUESTS) \
-			SBINDIR=$(SBINDIR) SERVERBIN=$(SERVERBIN) \
-			SERVERROOT=$(SERVERROOT)
-
 epm:
-	epm $(EPMFLAGS) cups
+	epm -v cups
 
 rpm:
-	epm $(EPMFLAGS) -f rpm cups
+	epm -v -f rpm cups
 
 deb:
-	epm $(EPMFLAGS) -f deb cups
+	epm -v -f deb cups
 
 depot:
-	epm $(EPMFLAGS) -f depot cups
+	epm -v -f depot cups
 
 pkg:
-	epm $(EPMFLAGS) -f pkg cups
+	epm -v -f pkg cups
 
 tardist:
-	epm $(EPMFLAGS) -f tardist cups
+	epm -v -f tardist cups
 
 #
 # End of "$Id$".

README.txt

@@ -1,59 +1,71 @@
-README - CUPS v1.1.8 - 05/22/2001
+README - CUPS v1.1b5 - 06/08/2000
 ---------------------------------
 
-Looking for compile instructions?  Read the file "INSTALL.txt"
-instead...
+************************************************************************
+************************************************************************
+****                                                                ****
+****     BETA SOFTWARE BETA SOFTWARE BETA SOFTWARE BETA SOFTWARE    ****
+****                                                                ****
+************************************************************************
+************************************************************************
+
+This is an official public beta release for the Common UNIX Printing
+System.  Since this is a beta release, we do not recommend that you
+use this software on a production system.  Instead, please use the
+current 1.0.x release for your production systems.
+
+Please report all problems in the CUPS 1.1 beta releases to
+"cups-beta@cups.org" or to the CUPS mailing list.
+
+Thanks for using CUPS!
 
 
 INTRODUCTION
 
-CUPS provides a portable printing layer for UNIX(r)-based
-operating systems.  It has been developed by Easy Software
-Products to promote a standard printing solution for all UNIX
-vendors and users.  CUPS provides the System V and Berkeley
-command-line interfaces.
+CUPS provides a portable printing layer for UNIX(r)-based operating
+systems.  It has been developed by Easy Software Products to promote a
+standard printing solution for all UNIX vendors and users.  CUPS
+provides the System V and Berkeley command-line interfaces.
 
-CUPS uses the Internet Printing Protocol ("IPP") as the basis
-for managing print jobs and queues.  The Line Printer Daemon
-("LPD") Server Message Block ("SMB"), and AppSocket (a.k.a.
-JetDirect) protocols are also supported with reduced
-functionality.  CUPS adds network printer browsing and
-PostScript Printer Description ("PPD") based printing options to
-support real-world printing under UNIX.
+CUPS uses the Internet Printing Protocol ("IPP") as the basis for
+managing print jobs and queues.  The Line Printer Daemon ("LPD") Server
+Message Block ("SMB"), and AppSocket (a.k.a. JetDirect) protocols are
+also supported with reduced functionality.  CUPS adds network printer
+browsing and PostScript Printer Description ("PPD") based printing
+options to support real-world printing under UNIX.
 
-CUPS also includes a customized version of GNU Ghostscript
-(currently based off GNU Ghostscript 5.50) and an image file RIP
-that are used to support non-PostScript printers.  Sample
-drivers for HP and EPSON printers are included that use these
-filters.
+CUPS also includes a customized version of GNU Ghostscript (currently
+based off GNU Ghostscript 5.50) and an image file RIP that are used to
+support non-PostScript printers.  Sample drivers for HP and EPSON
+printers are included that use these filters.
 
-Drivers for over 2300 printers are provided with our ESP Print
-Pro software, available at:
+Drivers for over 2300 printers are provided with our ESP Print Pro
+software, available at:
 
 	http://www.easysw.com/printpro
 
-CUPS is licensed under the GNU General Public License and GNU
-Library General Public License.  Please contact Easy Software
-Products for commercial support and "binary distribution"
-rights.
+CUPS is licensed under the GNU General Public License and GNU Library
+General Public License.  Please contact Easy Software Products for
+commercial support and "binary distribution" rights.
 
 
 SYSTEM REQUIREMENTS
 
-Binary distributions require a minimum of 10MB of free disk
-space. We do not recommend using CUPS on a workstation with less
-than 32MB of RAM or a PC with less than 16MB of RAM.
+Binary distributions require a minimum of 10MB of free disk space. We
+do not recommend using CUPS on a workstation with less than 32MB of RAM
+or a PC with less than 16MB of RAM.
 
-If you are installing from source you'll need ANSI-compliant C
-and C++ compilers and optionally one or more image file support
-libraries.  Complete source installation instructions can be
-found in the file "INSTALL.txt".
+If you are installing from source you'll need an ANSI-compliant C
+compiler and optionally one or more image file support libraries. 
+Complete source installation instructions can be found in the CUPS
+System Administrator's Manual in the files "doc/sam.html" or
+"doc/sam.pdf".
 
 
 SOFTWARE REQUIREMENTS
 
-The following operating system software is required to install
-one of the binary distributions from Easy Software Products:
+The following operating system software is required to install one of
+the binary distributions from Easy Software Products:
 
     - Digital UNIX (aka OSF1 aka Compaq Tru64 UNIX) 4.0 or higher
     - HP-UX 10.20 or higher
@@ -62,106 +74,67 @@ one of the binary distributions from Easy Software Products:
     - Solaris 2.5 or higher (SPARC or Intel)
 
 
-INSTALLING "PORTABLE" CUPS DISTRIBUTIONS
+INSTALLING CUPS
 
-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:
+We are currently distributing CUPS binary distributions in TAR format
+with installation and removal scripts generated by our ESP Package
+Manager (EPM) software, which is available from:
 
     http://www.easysw.com/epm
 
-WARNING: Installing CUPS will overwrite your existing printing
-system. Backup files are made by the installation script and
-restored by the removal script, so if you experience problems
-you should be able to remove the CUPS software to restore your
-previous configuration.  However, Easy Software Products makes
-no warranty for this and will not be liable for any lost
-revenues, etc.
+WARNING: Installing CUPS will overwrite your existing printing system.
+Backup files are made by the installation script and restored by the
+removal script, so if you experience problems you should be able to
+remove the CUPS software to restore your previous configuration. 
+However, Easy Software Products makes no warranty for this and will not
+be liable for any lost revenues, etc.
 
-To install the CUPS software you will need to be logged in as
-root (doing an "su" is good enough).  Once you are the root
-user, run the installation script with:
+To install the CUPS software you will need to be logged in as root
+(doing an "su" is good enough).  Once you are the root user, run the
+installation script with:
 
     ./cups.install ENTER
 
-After asking you a few yes/no questions the CUPS software will
-be installed and the scheduler will be started automatically.
-
-
-INSTALLING HOST-SPECIFIC (RPM, DEBIAN, ETC.) DISTRIBUTIONS
-
-The host-specific distributions use the operating system
-software installation tools.  To install a host-specific
-distribution please consult the CUPS Software Administrators
-Manual or your operating system documentation.
+After asking you a few yes/no questions the CUPS software will be
+installed and the scheduler will be started automatically.
 
 
 READING THE DOCUMENTATION
 
-Once you have installed the software you can access the
-documentation (and a bunch of other stuff) on-line at:
+Once you have installed the software you can access the documentation
+(and a bunch of other stuff) on-line at:
 
     http://localhost:631
 
-If you're having trouble getting that far, the documentation is
-located in the "/usr/share/doc/cups" directory in the binary
-distributions, and under the "doc" directory in the source
-archives.
+If you're having trouble getting that far, the documentation is located
+in the "/usr/share/doc/cups" directory in the binary distributions, and
+under the "doc" directory in the source archives.
 
 Please read the documentation before asking questions.
 
 
-GETTING SUPPORT AND OTHER RESOURCES
-
-If you have problems, READ THE DOCUMENTATION FIRST!
-
-You can subscribe to the CUPS mailing list by sending a message
-containing "subscribe cups" to majordomo@cups.org.  This list is
-provided to discuss problems, questions, and improvements to the
-CUPS software.  New releases of CUPS are announced to this list
-as well.
-
-Commercial support (with a guaranteed response time) is
-available from Easy Software Products.  For more information
-see:
-
-    http://www.easysw.com/cups
-
-See the CUPS web site at "http://www.cups.org" for other site
-links.
-
-
 SETTING UP PRINTER QUEUES USING YOUR WEB BROWSER
 
-CUPS 1.1 includes a new web-based administration tool that
-allows you to manage printers, classes, and jobs on your
-server.  To access the printer administration tools open the
-following URL in your browser:
+CUPS 1.1 includes a new web-based administration tool that allows you
+to manage printers, classes, and jobs on your server.  To access the
+printer administration tools open the following URL in your browser:
 
     http://localhost:631/admin
 
-You will be asked for the administration password (root or any
-other user in the sys/system/root group on your system) and then
-shown a menu of available functions.
-
-DO NOT use the hostname for your machine - it will not work with
-the default CUPS configuration.  To enable administration access
-on other addresses, consult the CUPS Software Administrators
-Manual.
+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.
 
 
 SETTING UP PRINTER QUEUES FROM THE COMMAND-LINE
 
-CUPS works best with PPD (PostScript Printer Description)
-files.  In a pinch you can also use System V style printer
-interface scripts.
+CUPS works best with PPD (PostScript Printer Description) files.  In a
+pinch you can also use System V style printer interface scripts.
 
-Six sample PPD files are provided with this distribution that
-utilize the PostScript and image file RIPs and the sample EPSON
-and HP printer drivers.  To add the sample DeskJet driver to the
-system for a printer connected to the parallel port, use one of
-the following commands:
+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:
 
@@ -197,67 +170,72 @@ Similarly, for the other sample drivers you can use:
     EPSON 9-pin Series          epson9.ppd
     EPSON 24-pin Series         epson24.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:
+These sample drivers provide basic printing capabilities, but generally
+do not exercise the full potential of the printers or CUPS.  For
+commercial printer drivers check out our ESP Print Pro software at:
 
     http://www.easysw.com/printpro
 
 
 PRINTING FILES
 
-CUPS provides both the System V "lp" and Berkeley "lpr" commands
-for printing:
+CUPS provides both the System V "lp" and Berkeley "lpr" commands for
+printing:
 
     lp filename
     lpr filename
 
-Both the "lp" and "lpr" commands support printing options for
-the driver:
+Both the "lp" and "lpr" commands support printing options for the
+driver:
 
     lp -omedia=A4 -oresolution=600dpi filename
     lpr -omedia=A4 -oresolution=600dpi filename
 
-CUPS recognizes many types of images files as well as PDF,
-PostScript, HP-GL/2, and text files, so you can print those
-files directly rather than through an application.
+CUPS recognizes many types of images files as well as PostScript, HP-GL/2,
+and text files, so you can print those files directly rather than through
+an application.
 
-If you have an application that generates output specifically
-for your printer then you need to use the "-oraw" or "-l"
-options:
+If you have an application that generates output specifically for your
+printer then you need to use the "-oraw" or "-l" options:
 
     lp -oraw filename
     lpr -l filename
 
-This will prevent the filters from misinterpreting your print
-file.
+This will prevent the filters from misinterpreting your print file.
+
+
+REPORTING PROBLEMS
+
+If you have problems, READ THE DOCUMENTATION FIRST!  If the
+documentation does not solve your problems please send an email to
+cups-support@cups.org.  Include your operating system and version,
+compiler and version, and any errors or problems you've run into.  If
+you are running a version of Linux, be sure to provide the Linux
+distribution you have, too.
+
+
+OTHER RESOURCES
+
+See the CUPS web site at "http://www.cups.org" for other site links.
+
+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-2001 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-2000 by Easy Software Products.  CUPS, the CUPS
+logo, and the Common UNIX Printing System are the trademark property of
+Easy Software Products.
 
-The MD5 Digest code is Copyright 1999 Aladdin Enterprises.
-
-The PostScript RIP software (pstoraster) is based on the GNU
-Ghostscript 5.50 core, Copyright 1986-1998 by Aladdin
-Enterprises.
-
-The PDF filter (pdftops) is based on the Xpdf 0.90 software,
-Copyright 1996-1999 by Derek B. Noonburg.
-
-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.
+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", "cups.license" file
+for more information.
 
 For commercial licensing information, please contact:
 
@@ -266,11 +244,10 @@ For commercial licensing information, please contact:
     44141 Airport View Drive, Suite 204
     Hollywood, Maryland 20636-3111 USA
 
-    Voice: +1.301.373.9600
+    Voice: +1.301.373.9603
     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.
+Note that commercial licensors may also require license from Artifex
+Software Inc. which handles commercial licensing of the Ghostscript
+software.

backend/Makefile

@@ -3,7 +3,7 @@
 #
 #   Backend makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2000 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -41,7 +41,7 @@ all:	$(TARGETS)
 #
 
 clean:
-	$(RM) $(OBJS) $(TARGETS) http
+	$(RM) $(OBJS) $(TARGETS)
 
 
 #
@@ -50,8 +50,6 @@ clean:
 
 install:
 	-$(MKDIR) $(SERVERBIN)/backend
-	$(CHMOD) ugo+rx $(SERVERBIN)
-	$(CHMOD) ugo+rx $(SERVERBIN)/backend
 	$(INSTALL_BIN) $(BACKENDS) $(SERVERBIN)/backend
 	$(RM) $(SERVERBIN)/backend/http
 	$(LN) ipp $(SERVERBIN)/backend/http

backend/betest.c

@@ -3,7 +3,7 @@
  *
  *   Backend test program for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal

backend/ipp.c

@@ -3,7 +3,7 @@
  *
  *   IPP backend for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -23,8 +23,7 @@
  *
  * Contents:
  *
- *   main()        - Send a file to the printer or server.
- *   password_cb() - Disable the password prompt for cupsDoFileRequest().
+ *   main() - Send a file to the printer or server.
  */
 
 /*
@@ -42,20 +41,6 @@
 #include <signal.h>
 
 
-/*
- * Local functions...
- */
-
-const char	*password_cb(const char *);
-
-
-/*
- * Local globals...
- */
-
-char	*password = NULL;
-
-
 /*
  * 'main()' - Send a file to the printer or server.
  *
@@ -69,6 +54,10 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
      char *argv[])	/* I - Command-line arguments */
 {
   int		i;		/* Looping var */
+  int		n, n2;		/* Attribute values */
+  char		*option,	/* Name of option */
+		*s;		/* Pointer into option value */
+  const char	*val;		/* Pointer to option value */
   int		num_options;	/* Number of printer options */
   cups_option_t	*options;	/* Printer options */
   char		method[255],	/* Method in URI */
@@ -77,42 +66,30 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 		resource[1024],	/* Resource info (printer name) */
 		filename[1024];	/* File to print */
   int		port;		/* Port number (not used) */
-  char		uri[HTTP_MAX_URI];/* Updated URI without user/pass */
+  char		password[255],	/* Password info */
+		uri[HTTP_MAX_URI];/* Updated URI without user/pass */
+  http_status_t	status;		/* Status of HTTP job */
   ipp_status_t	ipp_status;	/* Status of IPP request */
+  FILE		*fp;		/* File to print */
   http_t	*http;		/* HTTP connection */
   ipp_t		*request,	/* IPP request */
-		*response,	/* IPP response */
-		*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 */
+		*response;	/* IPP response */
+  ipp_attribute_t *job_id;	/* job-id attribute */
   ipp_attribute_t *copies_sup;	/* copies-supported attribute */
-  ipp_attribute_t *charset_sup;	/* charset-supported attribute */
-  ipp_attribute_t *format_sup;	/* document-format-supported attribute */
-  const char	*charset;	/* Character set to use */
   cups_lang_t	*language;	/* Default language */
+  struct stat	fileinfo;	/* File statistics */
+  size_t	nbytes,		/* Number of bytes written */
+		tbytes;		/* Total bytes written */
+  char		buffer[8192];	/* Output buffer */
   int		copies;		/* Number of copies remaining */
   const char	*content_type;	/* CONTENT_TYPE environment variable */
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
   struct sigaction action;	/* Actions for POSIX signals */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-  int		version;	/* IPP version */
 
 
- /*
-  * Make sure status messages are not buffered...
-  */
-
-  setbuf(stderr, NULL);
-
- /*
-  * Check command-line...
-  */
-
   if (argc == 1)
   {
-    char *s;
-
     if ((s = strrchr(argv[0], '/')) != NULL)
       s ++;
     else
@@ -140,27 +117,27 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
     * Copy stdin to a temporary file...
     */
 
-    int  fd;		/* Temporary file */
+    FILE *fp;		/* Temporary file */
     char buffer[8192];	/* Buffer for copying */
     int  bytes;		/* Number of bytes read */
 
 
-    if ((fd = cupsTempFd(filename, sizeof(filename))) < 0)
+    if ((fp = fopen(cupsTempFile(filename, sizeof(filename)), "w")) == NULL)
     {
       perror("ERROR: unable to create temporary file");
       return (1);
     }
 
     while ((bytes = fread(buffer, 1, sizeof(buffer), stdin)) > 0)
-      if (write(fd, buffer, bytes) < bytes)
+      if (fwrite(buffer, 1, bytes, fp) < bytes)
       {
         perror("ERROR: unable to write to temporary file");
-	close(fd);
+	fclose(fp);
 	unlink(filename);
 	return (1);
       }
 
-    close(fd);
+    fclose(fp);
   }
   else
   {
@@ -168,26 +145,24 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
     filename[sizeof(filename) - 1] = '\0';
   }
 
+ /*
+  * Open the print file...
+  */
+
+  if ((fp = fopen(filename, "rb")) == NULL)
+  {
+    perror("ERROR: Unable to open print file");
+    return (1);
+  }
+  else
+    stat(filename, &fileinfo);
+
  /*
   * 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...
   */
@@ -227,12 +202,8 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
   * don't support the copies attribute...
   */
 
-  language    = cupsLangDefault();
-  charset_sup = NULL;
-  copies_sup  = NULL;
-  format_sup  = NULL;
-  version     = 1;
-  supported   = NULL;
+  language   = cupsLangDefault();
+  copies_sup = NULL;
 
   do
   {
@@ -241,7 +212,6 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
     */
 
     request = ippNew();
-    request->request.op.version[1]   = version;
     request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
     request->request.op.request_id   = 1;
 
@@ -255,64 +225,129 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
         	 NULL, uri);
 
+   /*
+    * Now fill in the HTTP request stuff...
+    */
+
+    httpClearFields(http);
+    httpSetField(http, HTTP_FIELD_CONTENT_TYPE, "application/ipp");
+    if (username[0])
+    {
+      httpEncode64(password, username);
+      httpSetField(http, HTTP_FIELD_AUTHORIZATION, password);
+    }
+
+    sprintf(buffer, "%u", ippLength(request));
+    httpSetField(http, HTTP_FIELD_CONTENT_LENGTH, buffer);
+
    /*
     * Do the request...
     */
 
-    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 (supported)
-        ippDelete(supported);
-
-      if (ipp_status == IPP_PRINTER_BUSY ||
-	  ipp_status == IPP_SERVICE_UNAVAILABLE)
-      {
-	fputs("INFO: Printer busy; will retry in 10 seconds...\n", stderr);
-	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;
-      }
-      else
-	fprintf(stderr, "ERROR: Printer will not accept print file (%s)!\n",
-	        ippErrorString(ipp_status));
-    }
-    else if ((copies_sup = ippFindAttribute(supported, "copies-supported",
-	                                    IPP_TAG_RANGE)) != NULL)
+    for (;;)
     {
      /*
-      * Has the "copies-supported" attribute - does it have an upper
-      * bound > 1?
+      * POST the request, retrying as needed...
       */
 
-      if (copies_sup->values[0].range.upper <= 1)
-	copies_sup = NULL; /* No */
+      if (httpPost(http, resource))
+      {
+	fputs("INFO: Unable to POST get-printer-attributes request; retrying...\n", stderr);
+	sleep(10);
+	httpReconnect(http);
+	continue;
+      }
+
+      fputs("INFO: POST successful, sending IPP request...\n", stderr);
+
+     /*
+      * Send the IPP request...
+      */
+
+      request->state = IPP_IDLE;
+
+      if (ippWrite(http, request) == IPP_ERROR)
+      {
+	fputs("ERROR: Unable to send IPP request!\n", stderr);
+	status = HTTP_ERROR;
+	break;
+      }
+
+      fputs("INFO: IPP request sent, getting status...\n", stderr);
+
+     /*
+      * Finally, check the status from the HTTP server...
+      */
+
+      while ((status = httpUpdate(http)) == HTTP_CONTINUE);
+
+      if (status == HTTP_OK)
+      {
+	response = ippNew();
+	ippRead(http, response);
+
+	ipp_status = response->request.status.status_code;
+
+	if (ipp_status > IPP_OK_CONFLICT)
+	{
+	  if (ipp_status == IPP_PRINTER_BUSY ||
+	      ipp_status == IPP_SERVICE_UNAVAILABLE)
+	  {
+	    fputs("INFO: Printer busy; will retry in 10 seconds...\n", stderr);
+	    sleep(10);
+	  }
+	  else
+	  {
+	    fprintf(stderr, "ERROR: Printer will not accept print file (%x)!\n",
+	            ipp_status);
+            status = HTTP_ERROR;
+	  }
+	}
+	else if ((copies_sup = ippFindAttribute(response, "copies-supported",
+	                                        IPP_TAG_RANGE)) != NULL)
+        {
+	 /*
+	  * Has the "copies-supported" attribute - does it have an upper
+	  * bound > 1?
+	  */
+
+	  if (copies_sup->values[0].range.upper <= 1)
+	    copies_sup = NULL; /* No */
+        }
+
+	ippDelete(response);
+      }
+      else
+      {
+        response = NULL;
+
+	if (status == HTTP_ERROR)
+	{
+          fprintf(stderr, "WARNING: Did not receive the IPP response (%d)\n",
+	          errno);
+	  status     = HTTP_OK;
+	  ipp_status = IPP_PRINTER_BUSY;
+	}
+	else
+	{
+          fprintf(stderr, "ERROR: Validate request was not accepted (%d)!\n", status);
+	  ipp_status = IPP_FORBIDDEN;
+	}
+      }
+
+      httpFlush(http);
+
+      break;
     }
 
-    charset_sup = ippFindAttribute(supported, "charset-supported",
-	                           IPP_TAG_CHARSET);
-    format_sup  = ippFindAttribute(supported, "document-format-supported",
-	                           IPP_TAG_MIMETYPE);
-
-    if (format_sup)
+    if (status != HTTP_OK)
     {
-      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);
+      if (fp != stdin)
+	fclose(fp);
+
+      httpClose(http);
+
+      return (1);
     }
   }
   while (ipp_status > IPP_OK_CONFLICT);
@@ -344,43 +379,6 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
   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...
   */
@@ -392,12 +390,11 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
     */
 
     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);
+        	 "attributes-charset", NULL, "utf-8");
 
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
         	 "attributes-natural-language", NULL,
@@ -425,57 +422,245 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
     options     = NULL;
     num_options = cupsParseOptions(argv[5], 0, &options);
 
-    if ((content_type = getenv("CONTENT_TYPE")) != NULL && 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);
-    }
-
-    cupsEncodeOptions(request, num_options, options);
-    cupsFreeOptions(num_options, options);
+    if (cupsGetOption("raw", num_options, options) ||
+        ((content_type = getenv("CONTENT_TYPE")) != NULL &&
+         strcasecmp(content_type, "application/vnd.cups-raw") == 0))
+      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
+        	   NULL, "application/vnd.cups-raw");
+    else if ((val = cupsGetOption("document-format", num_options, options)) != NULL)
+      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
+        	   NULL, val);
+    else
+      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
+        	   NULL, "application/octet-stream");
 
     if (copies_sup)
       ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, "copies", atoi(argv[4]));
 
+    for (i = 0; i < num_options; i ++)
+    {
+     /*
+      * Skip the "raw" option - handled above...
+      */
+
+      if (strcasecmp(options[i].name, "raw") == 0 ||
+          strcasecmp(options[i].name, "document-format") == 0)
+	continue;
+
+     /*
+      * See what the option value is; for compatibility with older interface
+      * scripts, we have to support single-argument options as well as
+      * option=value, option=low-high, and option=MxN.
+      */
+
+      option = options[i].name;
+      val    = options[i].value;
+
+      if (*val == '\0')
+	val = NULL;
+
+      if (val != NULL)
+      {
+	if (strcasecmp(val, "true") == 0 ||
+            strcasecmp(val, "on") == 0 ||
+	    strcasecmp(val, "yes") == 0)
+	{
+	 /*
+	  * Boolean value - true...
+	  */
+
+	  n   = 1;
+	  val = "";
+	}
+	else if (strcasecmp(val, "false") == 0 ||
+        	 strcasecmp(val, "off") == 0 ||
+		 strcasecmp(val, "no") == 0)
+	{
+	 /*
+	  * Boolean value - false...
+	  */
+
+	  n   = 0;
+	  val = "";
+	}
+
+	n = strtol(val, &s, 0);
+      }
+      else
+      {
+	if (strncasecmp(option, "no", 2) == 0)
+	{
+	  option += 2;
+	  n      = 0;
+	}
+	else
+          n = 1;
+
+	s = "";
+      }
+
+      if (*s != '\0' && *s != '-' && (*s != 'x' || s == val))
+       /*
+	* String value(s)...
+	*/
+	ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, option, NULL, val);
+      else if (val != NULL)
+      {
+       /*
+	* Numeric value, range, or resolution...
+	*/
+
+	if (*s == '-')
+	{
+          n2 = strtol(s + 1, NULL, 0);
+          ippAddRange(request, IPP_TAG_JOB, option, n, n2);
+	}
+	else if (*s == 'x')
+	{
+          n2 = strtol(s + 1, &s, 0);
+
+	  if (strcasecmp(s, "dpc") == 0)
+            ippAddResolution(request, IPP_TAG_JOB, option, IPP_RES_PER_CM, n, n2);
+          else if (strcasecmp(s, "dpi") == 0)
+            ippAddResolution(request, IPP_TAG_JOB, option, IPP_RES_PER_INCH, n, n2);
+          else
+            ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, option, NULL, val);
+	}
+	else
+          ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, option, n);
+      }
+      else
+       /*
+	* Boolean value...
+	*/
+	ippAddBoolean(request, IPP_TAG_JOB, option, (char)n);
+    }
+
+   /*
+    * Now fill in the HTTP request stuff...
+    */
+
+    httpClearFields(http);
+    httpSetField(http, HTTP_FIELD_CONTENT_TYPE, "application/ipp");
+    if (username[0])
+    {
+      httpEncode64(password, username);
+      httpSetField(http, HTTP_FIELD_AUTHORIZATION, password);
+    }
+
+    sprintf(buffer, "%u", ippLength(request) + (size_t)fileinfo.st_size);
+    httpSetField(http, HTTP_FIELD_CONTENT_LENGTH, buffer);
+
    /*
     * 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)
+    for (;;)
     {
-      if (ipp_status == IPP_SERVICE_UNAVAILABLE ||
-	  ipp_status == IPP_PRINTER_BUSY)
+     /*
+      * POST the request, retrying as needed...
+      */
+
+      httpReconnect(http);
+
+      if (httpPost(http, resource))
       {
-	fputs("INFO: Printer is busy; retrying print job...\n", stderr);
+	fputs("INFO: Unable to POST print request; retrying...\n", stderr);
 	sleep(10);
+	continue;
+      }
+
+      fputs("INFO: POST successful, sending IPP request...\n", stderr);
+
+     /*
+      * Send the IPP request...
+      */
+
+      request->state = IPP_IDLE;
+
+      if (ippWrite(http, request) == IPP_ERROR)
+      {
+	fputs("ERROR: Unable to send IPP request!\n", stderr);
+	status = HTTP_ERROR;
+	break;
+      }
+
+      fputs("INFO: IPP request sent, sending print file...\n", stderr);
+
+     /*
+      * Then send the file...
+      */
+
+      rewind(fp);
+
+      tbytes = 0;
+      while ((nbytes = fread(buffer, 1, sizeof(buffer), fp)) > 0)
+      {
+	tbytes += nbytes;
+	fprintf(stderr, "INFO: Sending print file, %uk...\n", tbytes / 1024);
+
+	if (httpWrite(http, buffer, nbytes) < nbytes)
+	{
+          perror("ERROR: Unable to send print file to printer");
+	  status = HTTP_ERROR;
+          break;
+	}
+      }
+
+      fputs("INFO: Print file sent; checking status...\n", stderr);
+
+     /*
+      * Finally, check the status from the HTTP server...
+      */
+
+      while ((status = httpUpdate(http)) == HTTP_CONTINUE);
+
+      if (status == HTTP_OK)
+      {
+	response = ippNew();
+	ippRead(http, response);
+
+	if ((ipp_status = response->request.status.status_code) > IPP_OK_CONFLICT)
+	{
+          if (ipp_status == IPP_SERVICE_UNAVAILABLE ||
+	      ipp_status == IPP_PRINTER_BUSY)
+	  {
+	    fputs("INFO: Printer is busy; retrying print job...\n", stderr);
+	    sleep(10);
+	  }
+	  else
+            fprintf(stderr, "ERROR: Print file was not accepted (%04x)!\n",
+	            response->request.status.status_code);
+	}
+	else if ((job_id = ippFindAttribute(response, "job-id", IPP_TAG_INTEGER)) == NULL)
+          fputs("INFO: Print file accepted - job ID unknown.\n", stderr);
+	else
+          fprintf(stderr, "INFO: Print file accepted - job ID %d.\n",
+	          job_id->values[0].integer);
       }
       else
-        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);
+      {
+	response   = NULL;
+	ipp_status = IPP_PRINTER_BUSY;
+
+	if (status == HTTP_ERROR)
+	{
+          fprintf(stderr, "WARNING: Did not receive the IPP response (%d)\n",
+	          errno);
+	  status = HTTP_OK;
+	}
+	else
+          fprintf(stderr, "ERROR: Print request was not accepted (%d)!\n", status);
+      }
+
+      httpFlush(http);
+
+      break;
     }
 
-    if (response)
+    if (request != NULL)
+      ippDelete(request);
+    if (response != NULL)
       ippDelete(response);
 
     if (ipp_status <= IPP_OK_CONFLICT)
@@ -486,99 +671,6 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
     else if (ipp_status != IPP_SERVICE_UNAVAILABLE &&
 	     ipp_status != IPP_PRINTER_BUSY)
       break;
-
-   /*
-    * Wait for the job to complete...
-    */
-
-    if (!job_id)
-      continue;
-
-    fputs("INFO: Waiting for job to complete...\n", stderr);
-
-    for (;;)
-    {
-     /*
-      * Build an IPP_GET_JOB_ATTRIBUTES request...
-      */
-
-      request = ippNew();
-      request->request.op.version[1]   = version;
-      request->request.op.operation_id = IPP_GET_JOB_ATTRIBUTES;
-      request->request.op.request_id   = 1;
-
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-        	   "attributes-charset", NULL, charset);
-
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-        	   "attributes-natural-language", NULL,
-        	   language != NULL ? language->language : "en");
-
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
-        	   NULL, uri);
-
-      ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "job-id",
-        	    job_id);
-
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-                   "requested-attributes", NULL, "job-state");
-
-     /*
-      * Do the request...
-      */
-
-      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...
-	*/
-
-        if (job_state->values[0].integer > IPP_JOB_PROCESSING)
-	{
-	  ippDelete(response);
-	  break;
-	}
-      }
-
-     /*
-      * Wait 10 seconds before polling again...
-      */
-
-      if (response)
-	ippDelete(response);
-
-      sleep(10);
-    }
   }
 
  /*
@@ -587,13 +679,12 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 
   httpClose(http);
 
-  if (supported)
-    ippDelete(supported);
-
  /*
   * Close and remove the temporary file if necessary...
   */
 
+  fclose(fp);
+
   if (argc < 7)
     unlink(filename);
 
@@ -601,23 +692,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
   * Return the queue status...
   */
 
-  if (ipp_status <= IPP_OK_CONFLICT)
-    fputs("INFO: " CUPS_SVERSION " is 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);
+  return (status != HTTP_OK);
 }
 
 

backend/lpd.c

@@ -3,7 +3,7 @@
  *
  *   Line Printer Daemon backend for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -26,7 +26,6 @@
  *   main()        - Send a file to the printer or server.
  *   lpd_command() - Send an LPR command sequence and wait for a reply.
  *   lpd_queue()   - Queue a file using the Line Printer Daemon protocol.
- *   lpd_write()   - Write a buffer of data to an LPD server.
  */
 
 /*
@@ -37,7 +36,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#include <ctype.h>
 #include <cups/string.h>
 #include <errno.h>
 #include <sys/types.h>
@@ -53,20 +51,7 @@
 #  include <netdb.h>
 #endif /* WIN32 || __EMX__ */
 
-
-/*
- * The order for control and data files in LPD requests...
- */
-
-#define ORDER_CONTROL_DATA	0
-#define ORDER_DATA_CONTROL	1
-
-
-/*
- * It appears that rresvport() is never declared on most systems...
- */
-
-extern int	rresvport(int *port);
+extern int	rresvport(int *port);	/* Hello?  No prototype for this... */
 
 
 /*
@@ -75,9 +60,7 @@ extern int	rresvport(int *port);
 
 static int	lpd_command(int lpd_fd, char *format, ...);
 static int	lpd_queue(char *hostname, char *printer, char *filename,
-		          char *user, char *title, int copies, int banner,
-			  int format, int order);
-static int	lpd_write(int lpd_fd, char *buffer, int length);
+		          char *user, int copies);
 
 
 /*
@@ -96,29 +79,11 @@ 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 (printer name) */
-	*options,	/* Pointer to options */
-	name[255],	/* Name of option */
-	value[255],	/* Value of option */
-	*ptr,		/* Pointer into name or value */
-	filename[1024],	/* File to print */
-	title[256];	/* Title string */
+	filename[1024];	/* File to print */
   int	port;		/* Port number (not used) */
   int	status;		/* Status of LPD job */
-  int	banner;		/* Print banner page? */
-  int	format;		/* Print format */
-  int	order;		/* Order of control/data files */
 
 
- /*
-  * Make sure status messages are not buffered...
-  */
-
-  setbuf(stderr, NULL);
-
- /*
-  * Check command-line...
-  */
-
   if (argc == 1)
   {
     puts("network lpd \"Unknown\" \"LPD/LPR Host or Printer\"");
@@ -143,27 +108,27 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
     * Copy stdin to a temporary file...
     */
 
-    int  fd;		/* Temporary file */
+    FILE *fp;		/* Temporary file */
     char buffer[8192];	/* Buffer for copying */
     int  bytes;		/* Number of bytes read */
 
 
-    if ((fd = cupsTempFd(filename, sizeof(filename))) < 0)
+    if ((fp = fopen(cupsTempFile(filename, sizeof(filename)), "w")) == NULL)
     {
       perror("ERROR: unable to create temporary file");
       return (1);
     }
 
     while ((bytes = fread(buffer, 1, sizeof(buffer), stdin)) > 0)
-      if (write(fd, buffer, bytes) < bytes)
+      if (fwrite(buffer, 1, bytes, fp) < bytes)
       {
         perror("ERROR: unable to write to temporary file");
-	close(fd);
+	fclose(fp);
 	unlink(filename);
 	return (1);
       }
 
-    close(fd);
+    fclose(fp);
   }
   else
   {
@@ -177,108 +142,6 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 
   httpSeparate(argv[0], method, username, hostname, &port, resource);
 
- /*
-  * See if there are any options...
-  */
-
-  banner = 0;
-  format = 'l';
-  order  = ORDER_CONTROL_DATA;
-
-  if ((options = strchr(resource, '?')) != NULL)
-  {
-   /*
-    * Yup, terminate the device name string and move to the first
-    * character of the options...
-    */
-
-    *options++ = '\0';
-
-   /*
-    * Parse options...
-    */
-
-    while (*options)
-    {
-     /*
-      * Get the name...
-      */
-
-      for (ptr = name; *options && *options != '=';)
-        *ptr++ = *options++;
-      *ptr = '\0';
-
-      if (*options == '=')
-      {
-       /*
-        * Get the value...
-	*/
-
-        options ++;
-
-	for (ptr = value; *options && *options != '+';)
-          *ptr++ = *options++;
-	*ptr = '\0';
-
-	if (*options == '+')
-	  options ++;
-      }
-      else
-        value[0] = '\0';
-
-     /*
-      * Process the option...
-      */
-
-      if (strcasecmp(name, "banner") == 0)
-      {
-       /*
-        * Set the banner...
-	*/
-
-        banner = !value[0] ||
-	         strcasecmp(value, "on") == 0 ||
-		 strcasecmp(value, "yes") == 0 ||
-		 strcasecmp(value, "true") == 0;
-      }
-      else if (strcasecmp(name, "format") == 0 && value[0])
-      {
-       /*
-        * Set output format...
-	*/
-
-        if (strchr("cdfglnoprtv", value[0]) != NULL)
-	  format = value[0];
-	else
-	  fprintf(stderr, "ERROR: Unknown format character \"%c\"\n", value[0]);
-      }
-      else if (strcasecmp(name, "order") == 0 && value[0])
-      {
-       /*
-        * Set control/data order...
-	*/
-
-        if (strcasecmp(value, "control,data") == 0)
-	  order = ORDER_CONTROL_DATA;
-	else if (strcasecmp(value, "data,control") == 0)
-	  order = ORDER_DATA_CONTROL;
-	else
-	  fprintf(stderr, "ERROR: Unknown file order \"%s\"\n", value);
-      }
-    }
-  }
-
- /*
-  * Sanitize the document title...
-  */
-
-  strncpy(title, argv[3], sizeof(title) - 1);
-  title[sizeof(title) - 1] = '\0';
-
-  for (ptr = title; *ptr; ptr ++)
-    if (!isalnum(*ptr) && !isspace(*ptr))
-      *ptr = '_';
-
  /*
   * Queue the job...
   */
@@ -286,15 +149,14 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
   if (argc > 6)
   {
     status = lpd_queue(hostname, resource + 1, filename,
-                       argv[2] /* user */, title, atoi(argv[4]) /* copies */,
-		       banner, format, order);
+                       argv[2] /* user */, atoi(argv[4]) /* copies */);
 
     if (!status)
       fprintf(stderr, "PAGE: 1 %d\n", atoi(argv[4]));
   }
   else
     status = lpd_queue(hostname, resource + 1, filename,
-                       argv[2] /* user */, title, 1, banner, format, order);
+                       argv[2] /* user */, 1);
 
  /*
   * Remove the temporary file if necessary...
@@ -342,7 +204,7 @@ lpd_command(int  fd,		/* I - Socket connection to LPD host */
 
   fprintf(stderr, "DEBUG: Sending command string (%d bytes)...\n", bytes);
 
-  if (lpd_write(fd, buf, bytes) < bytes)
+  if (send(fd, buf, bytes, 0) < bytes)
     return (-1);
 
  /*
@@ -369,11 +231,7 @@ lpd_queue(char *hostname,	/* I - Host to connect to */
           char *printer,	/* I - Printer/queue name */
 	  char *filename,	/* I - File to print */
           char *user,		/* I - Requesting user */
-	  char *title,		/* I - Job title */
-	  int  copies,		/* I - Number of copies */
-	  int  banner,		/* I - Print LPD banner? */
-          int  format,		/* I - Format specifier */
-          int  order)		/* I - Order of data/control files */
+	  int  copies)		/* I - Number of copies */
 {
   FILE			*fp;		/* Job file */
   char			localhost[255];	/* Local host name */
@@ -415,31 +273,11 @@ lpd_queue(char *hostname,	/* I - Host to connect to */
 
   for (port = 732;;)
   {
-    if (getuid())
+    if ((fd = rresvport(&port)) < 0)
     {
-     /*
-      * We're running as a normal user, so just create a regular socket...
-      */
-
-      if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-      {
-        perror("ERROR: Unable to create socket");
-        return (1);
-      }
-    }
-    else
-    {
-     /*
-      * We're running as root, so comply with RFC 1179 and reserve a
-      * priviledged port between 721 and 732...
-      */
-
-      if ((fd = rresvport(&port)) < 0)
-      {
-	perror("ERROR: Unable to reserve port");
-	sleep(30);
-	continue;
-      }
+      perror("ERROR: Unable to reserve port");
+      sleep(30);
+      continue;
     }
 
     if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0)
@@ -470,7 +308,7 @@ lpd_queue(char *hostname,	/* I - Host to connect to */
       break;
   }
 
-  fprintf(stderr, "INFO: Connected from port %d...\n", port);
+  fprintf(stderr, "INFO: Connected on port %d...\n", port);
 
  /*
   * Now that we are "connected" to the port, ignore SIGTERM so that we
@@ -516,18 +354,13 @@ lpd_queue(char *hostname,	/* I - Host to connect to */
   gethostname(localhost, sizeof(localhost));
   localhost[31] = '\0'; /* RFC 1179, Section 7.2 - host name < 32 chars */
 
-  snprintf(control, sizeof(control), "H%s\nP%s\nJ%s\n", localhost, user, title);
+  snprintf(control, sizeof(control), "H%s\nP%s\n", localhost, user);
   cptr = control + strlen(control);
 
-  if (banner)
-  {
-    snprintf(cptr, sizeof(control) - (cptr - control), "L%s\n", user);
-    cptr   += strlen(cptr);
-  }
-
   while (copies > 0)
   {
-    snprintf(cptr, sizeof(control) - (cptr - control), "%cdfA%03d%s\n", format,
+    
+    snprintf(cptr, sizeof(control) - (cptr - control), "ldfA%03d%s\n",
              getpid() % 1000, localhost);
     cptr   += strlen(cptr);
     copies --;
@@ -540,36 +373,27 @@ lpd_queue(char *hostname,	/* I - Host to connect to */
 
   fprintf(stderr, "DEBUG: Control file is:\n%s", control);
 
-  if (order == ORDER_CONTROL_DATA)
+  lpd_command(fd, "\002%d cfA%03.3d%s\n", strlen(control), getpid() % 1000,
+              localhost);
+
+  fprintf(stderr, "INFO: Sending control file (%d bytes)\n", strlen(control));
+
+  if (send(fd, control, strlen(control) + 1, 0) < (strlen(control) + 1))
   {
-    lpd_command(fd, "\002%d cfA%03.3d%s\n", strlen(control), getpid() % 1000,
-        	localhost);
-
-    fprintf(stderr, "INFO: Sending control file (%d bytes)\n", strlen(control));
-
-    if (lpd_write(fd, control, strlen(control) + 1) < (strlen(control) + 1))
-    {
-      status = errno;
-      perror("ERROR: Unable to write control file");
-    }
-    else if (read(fd, &status, 1) < 1)
-      status = errno;
-
-    if (status != 0)
-      fprintf(stderr, "ERROR: Remote host did not accept control file (%d)\n",
-              status);
-    else
-      fputs("INFO: Control file sent successfully\n", stderr);
+    perror("ERROR: Unable to write control file");
+    status = 1;
   }
+  else if (read(fd, &status, 1) < 1 || status != 0)
+    fprintf(stderr, "ERROR: Remote host did not accept control file (%d)\n",
+            status);
   else
-    status = 0;
-
-  if (status == 0)
   {
    /*
     * Send the print file...
     */
 
+    fputs("INFO: Control file sent successfully\n", stderr);
+
     lpd_command(fd, "\003%u dfA%03.3d%s\n", (unsigned)filestats.st_size,
                 getpid() % 1000, localhost);
 
@@ -580,9 +404,9 @@ lpd_queue(char *hostname,	/* I - Host to connect to */
     while ((nbytes = fread(buffer, 1, sizeof(buffer), fp)) > 0)
     {
       fprintf(stderr, "INFO: Spooling LPR job, %u%% complete...\n",
-              (unsigned)(100.0f * tbytes / filestats.st_size));
+              (unsigned)(100 * tbytes / filestats.st_size));
 
-      if (lpd_write(fd, buffer, nbytes) < nbytes)
+      if (send(fd, buffer, nbytes, 0) < nbytes)
       {
         perror("ERROR: Unable to send print file to printer");
         break;
@@ -591,42 +415,17 @@ lpd_queue(char *hostname,	/* I - Host to connect to */
         tbytes += nbytes;
     }
 
-    if (tbytes < filestats.st_size)
-      status = errno;
-    else if (lpd_write(fd, "", 1) < 1)
-      status = errno;
-    else if (recv(fd, &status, 1, 0) < 1)
-      status = errno;
+    send(fd, "", 1, 0);
 
-    if (status != 0)
+    if (tbytes < filestats.st_size)
+      status = 1;
+    else if (recv(fd, &status, 1, 0) < 1 || status != 0)
       fprintf(stderr, "ERROR: Remote host did not accept data file (%d)\n",
               status);
     else
       fputs("INFO: Data file sent successfully\n", stderr);
   }
 
-  if (status == 0 && order == ORDER_DATA_CONTROL)
-  {
-    lpd_command(fd, "\002%d cfA%03.3d%s\n", strlen(control), getpid() % 1000,
-        	localhost);
-
-    fprintf(stderr, "INFO: Sending control file (%d bytes)\n", strlen(control));
-
-    if (lpd_write(fd, control, strlen(control) + 1) < (strlen(control) + 1))
-    {
-      status = errno;
-      perror("ERROR: Unable to write control file");
-    }
-    else if (read(fd, &status, 1) < 1)
-      status = errno;
-
-    if (status != 0)
-      fprintf(stderr, "ERROR: Remote host did not accept control file (%d)\n",
-              status);
-    else
-      fputs("INFO: Control file sent successfully\n", stderr);
-  }
-
  /*
   * Close the socket connection and input file and return...
   */
@@ -638,36 +437,6 @@ lpd_queue(char *hostname,	/* I - Host to connect to */
 }
 
 
-/*
- * 'lpd_write()' - Write a buffer of data to an LPD server.
- */
-
-static int			/* O - Number of bytes written or -1 on error */
-lpd_write(int  lpd_fd,		/* I - LPD socket */
-          char *buffer,		/* I - Buffer to write */
-	  int  length)		/* I - Number of bytes to write */
-{
-  int	bytes,			/* Number of bytes written */
-	total;			/* Total number of bytes written */
-
-
-  total = 0;
-  while ((bytes = send(lpd_fd, buffer, length - total, 0)) >= 0)
-  {
-    total  += bytes;
-    buffer += bytes;
-
-    if (total == length)
-      break;
-  }
-
-  if (bytes < 0)
-    return (-1);
-  else
-    return (length);
-}
-
-
 /*
  * End of "$Id$".
  */

backend/parallel.c

@@ -3,7 +3,7 @@
  *
  *   Parallel port backend for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -86,27 +86,15 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
   FILE		*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 */
+  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);
-
- /*
-  * Check command-line...
-  */
-
   if (argc == 1)
   {
     list_devices();
@@ -236,24 +224,13 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
       * Write the print data to the printer...
       */
 
-      tbytes += nbytes;
-      bufptr = buffer;
-
-      while (nbytes > 0)
+      if (write(fd, buffer, nbytes) < nbytes)
       {
-	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;
+	perror("ERROR: Unable to send print file to printer");
+	break;
       }
+      else
+	tbytes += nbytes;
 
       if (argc > 6)
 	fprintf(stderr, "INFO: Sending print file, %u bytes...\n", tbytes);
@@ -279,17 +256,13 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 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 */
+  char	device[255];		/* Device filename */
   FILE	*probe;			/* /proc/parport/n/autoprobe file */
   char	line[1024],		/* Line from file */
 	*delim,			/* Delimiter in file */
@@ -299,57 +272,9 @@ list_devices(void)
 
   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)
+    sprintf(device, "/proc/parport/%d/autoprobe", i);
+    if ((probe = fopen(device, "r")) != NULL)
     {
-      close(fd);
-      strcpy(basedevice, "/dev/parallel/");
-    }
-    else
-    {
-      sprintf(device, "/dev/lp%d", i);
-      if ((fd = open(device, O_WRONLY)) >= 0)
-      {
-	close(fd);
-	strcpy(basedevice, "/dev/lp");
-      }
-      else
-      {
-	sprintf(device, "/dev/par%d", i);
-	if ((fd = open(device, O_WRONLY)) >= 0)
-	{
-	  close(fd);
-	  strcpy(basedevice, "/dev/par");
-	}
-	else
-	  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");
@@ -380,19 +305,29 @@ list_devices(void)
       fclose(probe);
 
       if (make[0])
-	printf("direct parallel:%s%d \"%s %s\" \"Parallel Port #%d\"\n",
-	       basedevice, i, make, model, i + 1);
+	printf("direct parallel:/dev/lp%d \"%s %s\" \"Parallel Port #%d\"\n",
+	       i, make, model, i + 1);
       else
-	printf("direct parallel:%s%d \"%s\" \"Parallel Port #%d\"\n",
-	       basedevice, i, model, i + 1);
+	printf("direct parallel:/dev/lp%d \"%s\" \"Parallel Port #%d\"\n",
+	       i, model, i + 1);
     }
-    else if (fd >= 0)
+    else
     {
-     /*
-      * No probe file, but we know the port is there...
-      */
-
-      printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
+      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);
+      }
+      else
+      {
+	sprintf(device, "/dev/par%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(__sgi)
@@ -549,8 +484,7 @@ list_devices(void)
     {
       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);
+	printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d,%d\"\n", i, j);
     }
 
  /*
@@ -592,7 +526,7 @@ list_devices(void)
       printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
     }
   }
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#elif defined(FreeBSD) || defined(OpenBSD) || defined(NetBSD)
   int	i;			/* Looping var */
   int	fd;			/* File descriptor */
   char	device[255];		/* Device filename */
@@ -606,13 +540,6 @@ list_devices(void)
       close(fd);
       printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
     }
-
-    sprintf(device, "/dev/lpa%d", i);
-    if ((fd = open(device, O_WRONLY)) >= 0)
-    {
-      close(fd);
-      printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
-    }
   }
 #endif
 }

backend/serial.c

@@ -3,7 +3,7 @@
  *
  *   Serial port backend for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -38,19 +38,12 @@
 #include <cups/string.h>
 #include <signal.h>
 
-#ifdef __hpux
-#  include <sys/modem.h>
-#endif /* __hpux */
-
 #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 || __EMX__ */
 
 #ifdef __sgi
@@ -64,14 +57,6 @@
 #  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 */
-
 
 /*
  * Local functions...
@@ -104,29 +89,15 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
   FILE		*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 */
+  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 */
+  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);
-
- /*
-  * Check command-line...
-  */
-
   if (argc == 1)
   {
     list_devices();
@@ -213,9 +184,6 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 
   opts.c_lflag &= ~(ICANON | ECHO | ISIG);	/* Raw mode */
 
-  bufsize = 480;	/* 9600 baud / 10 bits/char / 2Hz */
-  dtrdsr  = 0;		/* No dtr/dsr flow control */
-
   if (options != NULL)
     while (*options)
     {
@@ -255,8 +223,6 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
         * Set the baud rate...
 	*/
 
-        bufsize = atoi(value) / 20;
-
 #if B19200 == 19200
         cfsetispeed(&opts, atoi(value));
 	cfsetospeed(&opts, atoi(value));
@@ -287,18 +253,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 */
           default :
 	      fprintf(stderr, "WARNING: Unsupported baud rate %s!\n", value);
 	      break;
@@ -345,36 +299,6 @@ 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);
@@ -401,9 +325,6 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
   * Finally, send the print file...
   */
 
-  if (bufsize > sizeof(buffer))
-    bufsize = sizeof(buffer);
-
   while (copies > 0)
   {
     copies --;
@@ -414,61 +335,20 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
       rewind(fp);
     }
 
-    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 = fread(buffer, 1, bufsize, fp)) > 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 (write(fd, buffer, nbytes) < nbytes)
       {
-	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;
+	perror("ERROR: Unable to send print file to printer");
+	break;
       }
+      else
+	tbytes += nbytes;
 
       if (argc > 6)
 	fprintf(stderr, "INFO: Sending print file, %u bytes...\n", tbytes);
@@ -494,10 +374,8 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 void
 list_devices(void)
 {
-#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__)
   static char	*funky_hex = "0123456789abcdefghijklmnopqrstuvwxyz";
 				/* Funky hex numbering used for some devices */
-#endif /* __hpux || __sgi || __sun || __FreeBSD__ || __OpenBSD__ */
 
 #ifdef __linux
   int	i;		/* Looping var */
@@ -505,7 +383,7 @@ list_devices(void)
   char	device[255];	/* Device filename */
 
 
-  for (i = 0; i < 100; i ++)
+  for (i = 0; i < 4; i ++)
   {
     sprintf(device, "/dev/ttyS%d", i);
     if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
@@ -542,7 +420,7 @@ list_devices(void)
         */
 
 	for (n = 0; n < 6; n ++)
-	  printf("serial serial:/dev/ttyd%d?baud=38400 \"Unknown\" \"CDSIO Board %d Serial Port #%d\"\n",
+	  printf("serial serial:/dev/ttyd%d?baud=19200 \"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)
@@ -557,7 +435,7 @@ list_devices(void)
           i = 41 + 4 * (int)inv->inv_controller;
 
 	for (n = 0; n < (int)inv->inv_state; n ++)
-	  printf("serial serial:/dev/ttyd%d?baud=38400 \"Unknown\" \"EPC Serial Port %d, Ebus slot %d\"\n",
+	  printf("serial serial:/dev/ttyd%d?baud=19200 \"Unknown\" \"EPC Serial Port %d, Ebus slot %d\"\n",
         	 n + i, n + 1, (int)inv->inv_controller);
       }
       else if (inv->inv_state > 1)
@@ -567,7 +445,7 @@ list_devices(void)
         */
 
 	for (n = 0; n < (int)inv->inv_state; n ++)
-	  printf("serial serial:/dev/ttyd%d?baud=38400 \"Unknown\" \"Onboard Serial Port %d\"\n",
+	  printf("serial serial:/dev/ttyd%d?baud=19200 \"Unknown\" \"Onboard Serial Port %d\"\n",
         	 n + (int)inv->inv_unit + 1, n + (int)inv->inv_unit + 1);
       }
       else
@@ -626,13 +504,8 @@ list_devices(void)
   {
     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 */
   }
 
  /*
@@ -728,7 +601,7 @@ list_devices(void)
       printf("serial serial:%s?baud=38400 \"Unknown\" \"Serial Port #%d\"\n",
              device, i + 1);
   }
-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
+#elif defined(FreeBSD) || defined(OpenBSD) || defined(NetBSD)
   int	i, j;		/* Looping vars */
   int	fd;		/* File descriptor */
   char	device[255];	/* Device filename */
@@ -810,43 +683,6 @@ list_devices(void)
              device, i + 1);
     }
   }
-#elif defined(__NetBSD__)
-  int	i, j;		/* Looping vars */
-  int	fd;		/* File descriptor */
-  char	device[255];	/* Device filename */
-
-
- /*
-  * Standard serial ports...
-  */
-
-  for (i = 0; i < 4; i ++)
-  {
-    sprintf(device, "/dev/tty%02d", i);
-    if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
-    {
-      close(fd);
-      printf("serial serial:%s?baud=115200 \"Unknown\" \"Serial Port #%d\"\n",
-             device, i + 1);
-    }
-  }
-
- /*
-  * Cyclades-Z ports...
-  */
-
-  for (i = 0; i < 16; i ++) /* Should be up to 65536 boards... */
-    for (j = 0; j < 64; j ++)
-    {
-      sprintf(device, "/dev/ttyCZ%02d%02d", i, j);
-      if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
-      {
-	close(fd);
-	printf("serial serial:%s?baud=115200 \"Unknown\" \"Cyclades #%d Serial Prt #%d\"\n",
-	       device, i, j + 1);
-      }
-    }
-
 #endif
 }
 

backend/socket.c

@@ -3,7 +3,7 @@
  *
  *   AppSocket backend for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -69,7 +69,6 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
   FILE		*fp;		/* Print file */
   int		copies;		/* Number of copies to print */
   int		port;		/* Port number */
-  int		delay;		/* Delay for retries... */
   int		fd;		/* AppSocket */
   int		error;		/* Error code (if any) */
   struct sockaddr_in addr;	/* Socket address */
@@ -86,16 +85,6 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
 
 
- /*
-  * Make sure status messages are not buffered...
-  */
-
-  setbuf(stderr, NULL);
-
- /*
-  * Check command-line...
-  */
-
   if (argc == 1)
   {
     puts("network socket \"Unknown\" \"AppSocket/HP JetDirect\"");
@@ -148,7 +137,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 
   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);
   }
@@ -163,7 +152,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 
   while (copies > 0)
   {
-    for (delay = 5;;)
+    for (;;)
     {
       if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
       {
@@ -179,16 +168,13 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 
 	if (error == ECONNREFUSED)
 	{
-	  fprintf(stderr, "INFO: Network host \'%s\' is busy; will retry in %d seconds...\n",
-                  hostname, delay);
-	  sleep(delay);
-
-	  if (delay < 30)
-	    delay += 5;
+	  fprintf(stderr, "INFO: Network host \'%s\' is busy; will retry in 30 seconds...\n",
+                  hostname);
+	  sleep(30);
 	}
 	else
 	{
-	  perror("ERROR: Unable to connect to printer (retrying in 30 seconds)");
+	  perror("ERROR: Unable to connect to printer");
 	  sleep(30);
 	}
       }
@@ -254,16 +240,11 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
       * Check for possible data coming back from the printer...
       */
 
-      timeout.tv_sec  = 0;
+      timeout.tv_sec = 0;
       timeout.tv_usec = 0;
-
       FD_ZERO(&input);
       FD_SET(fd, &input);
-#ifdef __hpux
-      if (select(fd + 1, (int *)&input, NULL, NULL, &timeout) > 0)
-#else
       if (select(fd + 1, &input, NULL, NULL, &timeout) > 0)
-#endif /* __hpux */
       {
        /*
 	* Grab the data coming back and spit it out to stderr...
@@ -277,47 +258,6 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 	fprintf(stderr, "INFO: Sending print file, %u bytes...\n", 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 %u bytes of back-channel data!\n",
-	          nbytes);
-        else
-	  break;
-      }
-      else
-        break;
-    }
-
    /*
     * Close the socket connection...
     */
@@ -332,8 +272,6 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
   if (fp != stdin)
     fclose(fp);
 
-  fputs("INFO: " CUPS_SVERSION " is ready to print.\n", stderr);
-
   return (0);
 }
 

backend/usb.c

@@ -3,7 +3,7 @@
  *
  *   USB port backend for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -75,27 +75,15 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
   FILE		*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 */
+  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);
-
- /*
-  * Check command-line...
-  */
-
   if (argc == 1)
   {
     list_devices();
@@ -225,24 +213,13 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
       * Write the print data to the printer...
       */
 
-      tbytes += nbytes;
-      bufptr = buffer;
-
-      while (nbytes > 0)
+      if (write(fd, buffer, nbytes) < nbytes)
       {
-	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;
+	perror("ERROR: Unable to send print file to printer");
+	break;
       }
+      else
+	tbytes += nbytes;
 
       if (argc > 6)
 	fprintf(stderr, "INFO: Sending print file, %u bytes...\n", tbytes);
@@ -272,35 +249,15 @@ list_devices(void)
   int	i;			/* Looping var */
   int	fd;			/* File descriptor */
   char	device[255];		/* Device filename */
-  FILE	*probe;			/* /proc/bus/usb/devices file */
+  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 */
 
 
- /*
-  * First try opening one of the USB devices to load the driver
-  * module as needed...
-  */
-
-  if ((fd = open("/dev/usb/lp0", O_WRONLY)) >= 0)
-    close(fd); /* 2.3.x and 2.4.x */
-  else if ((fd = open("/dev/usb/usblp0", O_WRONLY)) >= 0)
-    close(fd); /* Mandrake 7.x */
-  else if ((fd = open("/dev/usblp0", O_WRONLY)) >= 0)
-    close(fd); /* 2.2.x */
-
- /*
-  * Then look at the device list for the USB bus...
-  */
-
   if ((probe = fopen("/proc/bus/usb/devices", "r")) != NULL)
   {
-   /*
-    * Scan the device list...
-    */
-
     i = 0;
 
     memset(make, 0, sizeof(make));
@@ -335,25 +292,15 @@ list_devices(void)
 	  strncpy(model, line + 12, sizeof(model) - 1);
       }
       else if (strncmp(line, "I:", 2) == 0 &&
-               (strstr(line, "Driver=printer") != NULL ||
-	        strstr(line, "Driver=usblp") != NULL) &&
+               strstr(line, "Driver=printer") != NULL &&
 	       make[0] && model[0])
       {
        /*
         * We were processing a printer device; send the info out...
 	*/
 
-        sprintf(device, "/dev/usb/lp%d", i);
-	if (access(device, 0))
-	{
-	  sprintf(device, "/dev/usb/usblp%d", i);
-
-	  if (access(device, 0))
-	    sprintf(device, "/dev/usblp%d", i);
-	}
-
-	printf("direct usb:%s \"%s %s\" \"USB Printer #%d\"\n",
-	       device, make, model, i + 1);
+	printf("direct usb:/dev/usb/lp%d \"%s %s\" \"USB Printer #%d\"\n",
+	       i, make, model, i + 1);
 
 	i ++;
 
@@ -366,10 +313,6 @@ list_devices(void)
   }
   else
   {
-   /*
-    * Just probe manually for USB devices...
-    */
-
     for (i = 0; i < 8; i ++)
     {
       sprintf(device, "/dev/usb/lp%d", i);
@@ -379,13 +322,6 @@ list_devices(void)
 	printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
       }
 
-      sprintf(device, "/dev/usb/usblp%d", i);
-      if ((fd = open(device, O_WRONLY)) >= 0)
-      {
-	close(fd);
-	printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
-      }
-
       sprintf(device, "/dev/usblp%d", i);
       if ((fd = open(device, O_WRONLY)) >= 0)
       {
@@ -398,27 +334,11 @@ list_devices(void)
 #elif defined(__sun)
 #elif defined(__hpux)
 #elif defined(__osf)
-#elif defined(__FreeBSD__)
+#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/unlpt%d", i);
-    if ((fd = open(device, O_WRONLY)) >= 0)
-    {
-      close(fd);
-      printf("direct usb:%s \"Unknown\" \"USB Port #%d\"\n", device, i + 1);
-    }
-  }
-#elif defined(__NetBSD__) || defined(__OpenBSD__)
-  int   i;                      /* Looping var */
-  int   fd;                     /* File descriptor */
-  char  device[255];            /* Device filename */
-
-
   for (i = 0; i < 3; i ++)
   {
     sprintf(device, "/dev/ulpt%d", i);

berkeley/Makefile

@@ -3,7 +3,7 @@
 #
 #   Berkeley commands makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2000 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -49,10 +49,8 @@ clean:
 
 install:
 	-$(MKDIR) $(BINDIR)
-	$(CHMOD) ugo+rx $(BINDIR)
 	$(INSTALL_BIN) lpq lpr lprm $(BINDIR)
 	-$(MKDIR) $(SBINDIR)
-	$(CHMOD) ugo+rx $(SBINDIR)
 	$(INSTALL_BIN) lpc $(SBINDIR)
 
 

berkeley/lpc.c

@@ -3,7 +3,7 @@
  *
  *   "lpc" command for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products.
+ *   Copyright 1997-2000 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -69,7 +69,7 @@ main(int  argc,		/* I - Number of command-line arguments */
   * Connect to the scheduler...
   */
 
-  http = httpConnectEncrypt(cupsServer(), ippPort(), cupsEncryption());
+  http = httpConnect(cupsServer(), ippPort());
 
   if (argc > 1)
   {
@@ -178,7 +178,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");
 }
 
 
@@ -216,8 +216,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 */
@@ -229,13 +228,6 @@ 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));
@@ -258,15 +250,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...
@@ -424,16 +412,13 @@ show_status(http_t *http,	/* I - HTTP connection to server */
 
           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");
+	  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);

berkeley/lpq.c

@@ -3,7 +3,7 @@
  *
  *   "lpq" command for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products.
+ *   Copyright 1997-2000 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -39,7 +39,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include <config.h>
 #include <cups/cups.h>
 #include <cups/language.h>
 #include <cups/debug.h>
@@ -66,42 +65,26 @@ main(int  argc,		/* I - Number of command-line arguments */
   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 */
-  http_encryption_t encryption;	/* Encryption? */
-
 
  /*
   * Connect to the scheduler...
   */
 
-  if ((http = httpConnectEncrypt(cupsServer(), ippPort(),
-                                 cupsEncryption())) == NULL)
-  {
-    fputs("lpq: Unable to contact server!\n", stderr);
-    return (1);
-  }
+  http = httpConnect(cupsServer(), ippPort());
 
  /*
   * Check for command-line options...
   */
 
-  dest       = NULL;
+  dest       = cupsGetDefault();
   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);
@@ -109,18 +92,6 @@ main(int  argc,		/* I - Number of command-line arguments */
     {
       switch (argv[i][1])
       {
-        case 'E' : /* Encrypt */
-#ifdef HAVE_LIBSSL
-	    encryption = HTTP_ENCRYPT_REQUIRED;
-
-	    if (http)
-	      httpEncryption(http, encryption);
-#else
-            fprintf(stderr, "%s: Sorry, no encryption support compiled in!\n",
-	            argv[0]);
-#endif /* HAVE_LIBSSL */
-	    break;
-
         case 'P' : /* Printer */
 	    if (argv[i][2])
 	      dest = argv[i] + 2;
@@ -129,13 +100,6 @@ main(int  argc,		/* I - Number of command-line arguments */
 	      i ++;
 	      dest = argv[i];
 	    }
-
-	    if ((instance = strchr(dest, '/')) != NULL)
-	      *instance = '\0';
-	    break;
-
-	case 'a' : /* All printers */
-	    dest = NULL;
 	    break;
 
 	case 'l' : /* Long status */
@@ -144,8 +108,6 @@ main(int  argc,		/* I - Number of command-line arguments */
 
 	default :
 	    fputs("Usage: lpq [-P dest] [-l] [+interval]\n", stderr);
-	    httpClose(http);
-            cupsFreeDests(num_dests, dests);
 	    return (1);
       }
     }
@@ -178,7 +140,6 @@ main(int  argc,		/* I - Number of command-line arguments */
   * Close the connection to the server and return...
   */
 
-  cupsFreeDests(num_dests, dests);
   httpClose(http);
 
   return (0);
@@ -388,7 +349,7 @@ show_jobs(http_t     *http,	/* I - HTTP connection to server */
 #ifdef __osf__
 	puts("Rank   Owner      Pri  Job        Files                       Total Size");
 #else
-	puts("Rank    Owner   Job     File(s)                         Total Size");
+	puts("Rank   Owner      Job             Files                       Total Size");
 #endif /* __osf__ */
 
       jobcount ++;
@@ -401,7 +362,7 @@ show_jobs(http_t     *http,	/* I - HTTP connection to server */
 	strcpy(rankstr, "active");
       else
       {
-	snprintf(rankstr, sizeof(rankstr), "%d%s", rank, ranks[rank % 10]);
+	sprintf(rankstr, "%d%s", rank, ranks[rank % 10]);
 	rank ++;
       }
 
@@ -418,15 +379,15 @@ show_jobs(http_t     *http,	/* I - HTTP connection to server */
 	  namestr[sizeof(namestr) - 1] = '\0';
 	}
 
-        printf("%s: %-34.34s[job %d localhost]\n", jobuser, rankstr, jobid);
-        printf("        %-40.40s%d bytes\n", namestr, jobsize);
+        printf("%s: %-31s [job %d localhost]\n", jobuser, rankstr, jobid);
+        printf("        %-31.31s %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,
+        printf("%-6s %-10.10s %-15d %-27.27s %d bytes\n", rankstr, jobuser,
 	       jobid, jobname, jobsize);
 #endif /* __osf */
 
@@ -491,7 +452,7 @@ show_printer(http_t     *http,	/* I - HTTP connection to server */
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
                "attributes-natural-language", NULL, language->language);
 
-  snprintf(uri, sizeof(uri), "ipp://localhost/printers/%s", dest);
+  sprintf(uri, "ipp://localhost/printers/%s", dest);
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
                "printer-uri", NULL, uri);
 

berkeley/lpr.c

@@ -3,7 +3,7 @@
  *
  *   "lpr" command for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products.
+ *   Copyright 1997-2000 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -33,8 +33,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-
-#include <config.h>
 #include <cups/cups.h>
 
 
@@ -65,32 +63,24 @@ 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	*dest;		/* Destination printer */
   const char	*title;		/* Job title */
   int		num_copies;	/* Number of copies per file */
-  int		num_files;	/* Number of files to print */
-  const char	*files[1000];	/* Files to print */
-  int		num_dests;	/* Number of destinations */
-  cups_dest_t	*dests,		/* Destinations */
-		*dest;		/* Selected destination */
+  int		num_files;	/* Number of files printed */
   int		num_options;	/* Number of options */
   cups_option_t	*options;	/* Options */
   int		deletefile;	/* Delete file after print? */
   char		buffer[8192];	/* Copy buffer */
-  int		temp;		/* Temporary file descriptor */
-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
+  FILE		*temp;		/* Temporary file pointer */
+#ifdef HAVE_SIGACTION
   struct sigaction action;	/* Signal action */
-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
+#endif /* HAVE_SIGACTION */
 
 
   deletefile  = 0;
-  printer     = NULL;
-  num_dests   = 0;
-  dests       = NULL;
+  dest        = cupsGetDefault();
   num_options = 0;
   options     = NULL;
   num_files   = 0;
@@ -98,34 +88,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 */
@@ -134,7 +102,7 @@ main(int  argc,		/* I - Number of command-line arguments */
 	case 't' : /* Troff */
 	case 'v' : /* Raster image */
 	    fprintf(stderr, "Warning: \'%c\' format modifier not supported - output may not be correct!\n",
-	            ch);
+	            argv[i][1]);
 	    break;
 
 	case 'o' : /* Option */
@@ -143,28 +111,19 @@ main(int  argc,		/* I - Number of command-line arguments */
 	    else
 	    {
 	      i ++;
-	      if (i >= argc)
-	      {
-	        fputs("lpr: Expected option=value after -o option!\n", stderr);
-		return (1);
-	      }
-
 	      num_options = cupsParseOptions(argv[i], num_options, &options);
 	    }
 	    break;
 
 	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;
 
@@ -172,43 +131,17 @@ main(int  argc,		/* I - Number of command-line arguments */
 	    fputs("Warning: email notification is not supported!\n", stderr);
 	    break;
 
-	case 'q' : /* Queue file but don't print */
-            num_options = cupsAddOption("job-hold-until", "indefinite",
-	                                num_options, &options);
-	    break;
-
 	case 'r' : /* Remove file after printing */
 	    deletefile = 1;
 	    break;
 
         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;
 
@@ -218,12 +151,6 @@ 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]);
 	    }
 
@@ -245,101 +172,62 @@ 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...
       */
 
-      files[num_files] = argv[i];
-      num_files ++;
-
-      if (title == NULL)
+      if (dest == NULL)
       {
-        if ((title = strrchr(argv[i], '/')) != NULL)
-	  title ++;
-	else
-          title = argv[i];
+	fputs("lpr: error - no default destination available.\n", stderr);
+	return (1);
       }
+
+      num_files ++;
+      if (title)
+        job_id = cupsPrintFile(dest, argv[i], title, num_options, options);
+      else
+      {
+        char *filename;
+
+        if ((filename = strrchr(argv[i], '/')) != NULL)
+	  filename ++;
+	else
+	  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\' - %s.\n",
+	        argv[i], ippErrorString(cupsLastError()));
+	return (1);
+      }
+      else if (deletefile)
+        unlink(argv[i]);
     }
-    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)
@@ -360,37 +248,39 @@ main(int  argc,		/* I - Number of command-line arguments */
 #  endif
 #endif /* !WIN32 */
 
-    if ((temp = cupsTempFd(tempfile, sizeof(tempfile))) < 0)
+    temp = fopen(cupsTempFile(tempfile, sizeof(tempfile)), "w");
+
+    if (temp == NULL)
     {
       fputs("lpr: unable to create temporary file.\n", stderr);
       return (1);
     }
 
     while ((i = fread(buffer, 1, sizeof(buffer), stdin)) > 0)
-      write(temp, buffer, i);
+      fwrite(buffer, 1, i, temp);
 
-    i = lseek(temp, 0, SEEK_CUR);
-    close(temp);
+    i = ftell(temp);
+    fclose(temp);
 
     if (i == 0)
     {
-      fputs("lpr: stdin is empty, so no job has been sent.\n", stderr);
+      fputs("lpr: standard input is empty, so no job has been sent.\n", stderr);
       return (1);
     }
 
     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 standard input - %s.\n",
+              ippErrorString(cupsLastError()));
+      return (1);
+    }
   }
 
   return (0);

berkeley/lprm.c

@@ -3,7 +3,7 @@
  *
  *   "lprm" command for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products.
+ *   Copyright 1997-2000 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -50,42 +50,30 @@ main(int  argc,			/* I - Number of command-line arguments */
   int		i;		/* Looping var */
   int		job_id;		/* Job ID */
   const char	*dest;		/* Destination printer */
-  char		*instance;	/* Pointer to instance name */
   char		uri[1024];	/* Printer or job URI */
   ipp_t		*request;	/* IPP request */
   ipp_t		*response;	/* IPP response */
   ipp_op_t	op;		/* Operation */
   cups_lang_t	*language;	/* Language */
-  int		num_dests;	/* Number of destinations */
-  cups_dest_t	*dests;		/* Destinations */
-  http_encryption_t encryption;	/* Encryption? */
 
 
  /*
   * 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;
+  http     = NULL;
 
  /*
   * Open a connection to the server...
   */
 
-  if ((http = httpConnectEncrypt(cupsServer(), ippPort(), encryption)) == NULL)
+  if ((http = httpConnect(cupsServer(), ippPort())) == NULL)
   {
     fputs("lprm: Unable to contact server!\n", stderr);
-    cupsFreeDests(num_dests, dests);
     return (1);
   }
 
@@ -97,17 +85,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,15 +93,10 @@ main(int  argc,			/* I - Number of command-line arguments */
 	      i ++;
 	      dest = argv[i];
 	    }
-
-	    if ((instance = strchr(dest, '/')) != NULL)
-	      *instance = '\0';
 	    break;
 
 	default :
 	    fprintf(stderr, "lprm: Unknown option \'%c\'!\n", argv[i][1]);
-            cupsFreeDests(num_dests, dests);
-	    httpClose(http);
 	    return (1);
       }
     else
@@ -148,10 +120,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
@@ -222,21 +191,11 @@ main(int  argc,			/* I - Number of command-line arguments */
 	      break;
 	}
 
-        if (response->request.status.status_code > IPP_OK_CONFLICT)
-	{
-          ippDelete(response);
-          cupsFreeDests(num_dests, dests);
-          httpClose(http);
-	  return (1);
-	}
-
         ippDelete(response);
       }
       else
       {
         fputs("lprm: Unable to cancel job(s)!\n", stderr);
-        cupsFreeDests(num_dests, dests);
-        httpClose(http);
 	return (1);
       }
     }
@@ -250,14 +209,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);
 }
 

cgi-bin/Makefile

@@ -3,7 +3,7 @@
 #
 #   CGI makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2001 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
@@ -24,9 +24,8 @@
 
 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
+TARGETS	=	admin.cgi classes.cgi jobs.cgi printers.cgi
+LIBOBJS	=	abort.o email.o html.o ipp-var.o template.o var.o
 OBJS	=	$(LIBOBJS) admin.o classes.o jobs.o printers.o
 
 
@@ -42,7 +41,7 @@ all:	$(TARGETS)
 #
 
 clean:
-	$(RM) $(OBJS) $(TARGETS)
+	$(RM) $(OBJS) libcgi.a $(TARGETS)
 
 
 #
@@ -51,9 +50,7 @@ clean:
 
 install:
 	-$(MKDIR) $(SERVERBIN)/cgi-bin
-	$(CHMOD) ugo+rx $(SERVERBIN)
-	$(CHMOD) ugo+rx $(SERVERBIN)/cgi-bin
-	$(INSTALL_BIN) $(CGIS) $(SERVERBIN)/cgi-bin
+	$(INSTALL_BIN) $(TARGETS) $(SERVERBIN)/cgi-bin
 
 
 #
@@ -115,7 +112,6 @@ printers.o:	cgi.h ipp-var.h ../cups/cups.h ../cups/ipp.h ../cups/language.h
 
 $(OBJS):	../Makedefs
 
-
 #
 # End of "$Id$".
 #

cgi-bin/admin.c

@@ -3,7 +3,7 @@
  *
  *   Administration CGI for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products.
+ *   Copyright 1997-2000 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 "ipp-var.h"
 #include <ctype.h>
-#include <errno.h>
 
 
 /*
@@ -105,7 +104,7 @@ main(int  argc,			/* I - Number of command-line arguments */
     * Connect to the HTTP server...
     */
 
-    http = httpConnectEncrypt("localhost", ippPort(), cupsEncryption());
+    http = httpConnect("localhost", ippPort());
 
    /*
     * Do the operation...
@@ -202,8 +201,6 @@ do_am_class(http_t      *http,		/* I - HTTP connection */
   ipp_attribute_t *attr;		/* member-uris attribute */
   ipp_status_t	status;			/* Request status */
   char		uri[HTTP_MAX_URI];	/* Device or printer URI */
-  const char	*name,			/* Pointer to class name */
-		*ptr;			/* Pointer to CGI variable */
 
 
   if (cgiGetVariable("PRINTER_LOCATION") == NULL)
@@ -259,27 +256,8 @@ do_am_class(http_t      *http,		/* I - HTTP connection */
 
       cgiCopyTemplateLang(stdout, TEMPLATES, "add-class.tmpl", getenv("LANG"));
     }
-
-    return;
   }
-
-  name = cgiGetVariable("PRINTER_NAME");
-  if (isdigit(*name))
-    ptr = name;
-  else
-    for (ptr = name; *ptr; ptr ++)
-      if (!isalnum(*ptr) && *ptr != '_')
-	break;
-
-  if (*ptr || ptr == name)
-  {
-    cgiSetVariable("ERROR", "The class name may only contain letters, "
-                            "numbers, and the underscore.");
-    cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
-    return;
-  }
-
-  if (cgiGetVariable("MEMBER_URIS") == NULL)
+  else if (cgiGetVariable("MEMBER_URIS") == NULL)
   {
    /*
     * Build a CUPS_GET_PRINTERS request, which requires the
@@ -487,17 +465,13 @@ do_am_printer(http_t      *http,	/* I - HTTP connection */
   ipp_attribute_t *attr,		/* Current attribute */
 		*last;			/* Last attribute */
   ipp_t		*request,		/* IPP request */
-		*response,		/* IPP response */
-		*oldinfo;		/* Old printer information */
+		*response;		/* IPP response */
   ipp_status_t	status;			/* Request status */
   const char	*var;			/* CGI variable */
   char		uri[HTTP_MAX_URI],	/* Device or printer URI */
 		*uriptr;		/* Pointer into URI */
   int		maxrate;		/* Maximum baud rate */
   char		baudrate[255];		/* Baud rate string */
-  char		make[255];		/* Make string */
-  const char	*name,			/* Pointer to class name */
-		*ptr;			/* Pointer to CGI variable */
   static int	baudrates[] =		/* Baud rates */
 		{
 		  1200,
@@ -513,52 +487,48 @@ do_am_printer(http_t      *http,	/* I - HTTP connection */
 		};
 
 
-  if (modify)
-  {
-   /*
-    * 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;
-
-    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",
-             cgiGetVariable("PRINTER_NAME"));
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
-                 NULL, uri);
-
-   /*
-    * Do the request and get back a response...
-    */
-
-    oldinfo = cupsDoRequest(http, request, "/");
-  }
-  else
-    oldinfo = NULL;
-
-  if ((name = cgiGetVariable("PRINTER_NAME")) == NULL)
+  if (cgiGetVariable("PRINTER_LOCATION") == NULL)
   {
     if (modify)
     {
      /*
-      * Update the location and description of an existing printer...
+      * Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the
+      * following attributes:
+      *
+      *    attributes-charset
+      *    attributes-natural-language
+      *    printer-uri
       */
 
-      if (oldinfo)
-	ippSetCGIVars(oldinfo, NULL, NULL);
+      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);
+
+      snprintf(uri, sizeof(uri), "ipp://localhost/printers/%s",
+               cgiGetVariable("PRINTER_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, "/")) != NULL)
+      {
+	ippSetCGIVars(response, NULL, NULL);
+	ippDelete(response);
+      }
+
+     /*
+      * Update the location and description of an existing printer...
+      */
 
       cgiCopyTemplateLang(stdout, TEMPLATES, "modify-printer.tmpl", getenv("LANG"));
     }
@@ -570,29 +540,8 @@ do_am_printer(http_t      *http,	/* I - HTTP connection */
 
       cgiCopyTemplateLang(stdout, TEMPLATES, "add-printer.tmpl", getenv("LANG"));
     }
-
-    if (oldinfo)
-      ippDelete(oldinfo);
-
-    return;
   }
-
-  if (isdigit(*name))
-    ptr = name;
-  else
-    for (ptr = name; *ptr; ptr ++)
-      if (!isalnum(*ptr) && *ptr != '_')
-	break;
-
-  if (*ptr || ptr == name)
-  {
-    cgiSetVariable("ERROR", "The printer name may only contain letters, "
-                            "numbers, and the underscore.");
-    cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
-    return;
-  }
-
-  if ((var = cgiGetVariable("DEVICE_URI")) == NULL)
+  else if ((var = cgiGetVariable("DEVICE_URI")) == NULL)
   {
    /*
     * Build a CUPS_GET_DEVICES request, which requires the following
@@ -631,32 +580,10 @@ do_am_printer(http_t      *http,	/* I - HTTP connection */
     * Let the user choose...
     */
 
-    if (oldinfo &&
-        (attr = ippFindAttribute(oldinfo, "device-uri", IPP_TAG_URI)) != NULL)
-    {
-      strncpy(uri, attr->values[0].string.text, sizeof(uri) - 1);
-      uri[sizeof(uri) - 1] = '\0';
-      if ((uriptr = strchr(uri, ':')) != NULL && strncmp(uriptr, "://", 3) == 0)
-        *uriptr = '\0';
-
-      cgiSetVariable("CURRENT_DEVICE_URI", uri);
-    }
-
     cgiCopyTemplateLang(stdout, TEMPLATES, "choose-device.tmpl", getenv("LANG"));
   }
   else if (strchr(var, '/') == NULL)
   {
-    if (oldinfo &&
-        (attr = ippFindAttribute(oldinfo, "device-uri", IPP_TAG_URI)) != NULL)
-    {
-     /*
-      * Set the current device URI for the form to the old one...
-      */
-
-      if (strncmp(attr->values[0].string.text, var, strlen(var)) == 0)
-	cgiSetVariable("DEVICE_URI", attr->values[0].string.text);
-    }
-
    /*
     * User needs to set the full URI...
     */
@@ -688,49 +615,6 @@ do_am_printer(http_t      *http,	/* I - HTTP connection */
   }
   else if ((var = cgiGetVariable("PPD_NAME")) == NULL)
   {
-    if (modify)
-    {
-     /*
-      * Get the PPD file...
-      */
-
-      int		fd;			/* PPD file */
-      char		filename[1024];		/* PPD filename */
-      ppd_file_t	*ppd;			/* PPD information */
-      char		buffer[1024];		/* Buffer */
-      int		bytes;			/* Number of bytes */
-
-
-      snprintf(uri, sizeof(uri), "/printers/%s.ppd", name);
-
-      if (httpGet(http, uri))
-        httpGet(http, uri);
-
-      while (httpUpdate(http) == HTTP_CONTINUE);
-
-      if ((fd = cupsTempFd(filename, sizeof(filename))) >= 0)
-      {
-	while ((bytes = httpRead(http, buffer, sizeof(buffer))) > 0)
-          write(fd, buffer, bytes);
-
-	close(fd);
-
-        if ((ppd = ppdOpenFile(filename)) != NULL)
-	{
-	  if (ppd->manufacturer)
-	    cgiSetVariable("CURRENT_MAKE", ppd->manufacturer);
-	  if (ppd->nickname)
-	    cgiSetVariable("CURRENT_MAKE_AND_MODEL", ppd->nickname);
-
-          ppdClose(ppd);
-	}
-
-        unlink(filename);
-      }
-      else
-        httpFlush(http);
-    }
-
    /*
     * Build a CUPS_GET_PPDS request, which requires the following
     * attributes:
@@ -788,26 +672,14 @@ do_am_printer(http_t      *http,	/* I - HTTP connection */
 	* Let the user choose a model...
 	*/
 
-        strncpy(make, var, sizeof(make) - 1);
-	make[sizeof(make) - 1] = '\0';
-
-        ippSetCGIVars(response, "ppd-make", make);
+        ippSetCGIVars(response, "ppd-make", var);
 	cgiCopyTemplateLang(stdout, TEMPLATES, "choose-model.tmpl",
 	                    getenv("LANG"));
       }
 
       ippDelete(response);
     }
-    else
-    {
-      char message[1024];
 
-
-      snprintf(message, sizeof(message), "Unable to get list of printer drivers: %s",
-               ippErrorString(cupsLastError()));
-      cgiSetVariable("ERROR", message);
-      cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
-    }
   }
   else
   {
@@ -851,8 +723,7 @@ do_am_printer(http_t      *http,	/* I - HTTP connection */
     ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_NAME, "ppd-name",
                  NULL, cgiGetVariable("PPD_NAME"));
 
-    strncpy(uri, cgiGetVariable("DEVICE_URI"), sizeof(uri) - 1);
-    uri[sizeof(uri) - 1] = '\0';
+    strcpy(uri, cgiGetVariable("DEVICE_URI"));
     if (strncmp(uri, "serial:", 7) == 0)
     {
      /*
@@ -862,10 +733,9 @@ do_am_printer(http_t      *http,	/* I - HTTP connection */
       if ((uriptr = strchr(uri, '?')) == NULL)
         uriptr = uri + strlen(uri);
 
-      snprintf(uriptr, sizeof(uri) - (uriptr - uri),
-               "?baud=%s+bits=%s+parity=%s+flow=%s",
-               cgiGetVariable("BAUDRATE"), cgiGetVariable("BITS"),
-	       cgiGetVariable("PARITY"), cgiGetVariable("FLOW"));
+      sprintf(uriptr, "?baud=%s+bits=%s+parity=%s+flow=%s",
+              cgiGetVariable("BAUDRATE"), cgiGetVariable("BITS"),
+	      cgiGetVariable("PARITY"), cgiGetVariable("FLOW"));
     }
 
     ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_URI, "device-uri",
@@ -898,9 +768,6 @@ do_am_printer(http_t      *http,	/* I - HTTP connection */
     else
       cgiCopyTemplateLang(stdout, TEMPLATES, "printer-added.tmpl", getenv("LANG"));
   }
-
-  if (oldinfo)
-    ippDelete(oldinfo);
 }
 
 
@@ -916,7 +783,6 @@ do_config_printer(http_t      *http,	/* I - HTTP connection */
   int		have_options;		/* Have options? */
   ipp_t		*request,		/* IPP request */
 		*response;		/* IPP response */
-  ipp_attribute_t *attr;		/* IPP attribute */
   char		uri[HTTP_MAX_URI];	/* Job URI */
   const char	*var;			/* Variable value */
   const char	*printer;		/* Printer printer name */
@@ -925,7 +791,6 @@ do_config_printer(http_t      *http,	/* I - HTTP connection */
   char		tempfile[1024];		/* Temporary filename */
   FILE		*in,			/* Input file */
 		*out;			/* Output file */
-  int		outfd;			/* Output file descriptor */
   char		line[1024];		/* Line from PPD file */
   char		keyword[1024],		/* Keyword from Default line */
 		*keyptr;		/* Pointer into keyword... */
@@ -960,14 +825,8 @@ do_config_printer(http_t      *http,	/* I - HTTP connection */
 
   ppd = ppdOpenFile(filename);
 
-  if (cgiGetVariable("job_sheets_start") != NULL ||
-      cgiGetVariable("job_sheets_end") != NULL)
-    have_options = 1;
-  else
-    have_options = 0;
-
-  for (i = ppd->num_groups, group = ppd->groups;
-       i > 0 && !have_options;
+  for (have_options = 0, i = ppd->num_groups, group = ppd->groups;
+       i > 0;
        i --, group ++)
     for (j = group->num_options, option = group->options;
          j > 0;
@@ -1035,80 +894,6 @@ do_config_printer(http_t      *http,	/* I - HTTP connection */
                           getenv("LANG"));
     }
 
-   /*
-    * 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;
-
-    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",
-             cgiGetVariable("PRINTER_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, "/")) != NULL)
-    {
-      if ((attr = ippFindAttribute(response, "job-sheets-supported", IPP_TAG_ZERO)) != NULL)
-      {
-       /*
-	* Add the job sheets options...
-	*/
-
-	cgiSetVariable("GROUP", "Banners");
-	cgiCopyTemplateLang(stdout, TEMPLATES, "option-header.tmpl",
-                            getenv("LANG"));
-
-	cgiSetSize("CHOICES", attr->num_values);
-	cgiSetSize("TEXT", attr->num_values);
-	for (k = 0; k < attr->num_values; k ++)
-	{
-	  cgiSetArray("CHOICES", k, attr->values[k].string.text);
-	  cgiSetArray("TEXT", k, attr->values[k].string.text);
-	}
-
-        attr = ippFindAttribute(response, "job-sheets-default", IPP_TAG_ZERO);
-
-        cgiSetVariable("KEYWORD", "job_sheets_start");
-        cgiSetVariable("KEYTEXT", "Starting Banner");
-        cgiSetVariable("DEFCHOICE", attr == NULL ?
-	                            "" : attr->values[0].string.text);
-
-	cgiCopyTemplateLang(stdout, TEMPLATES, "option-pickone.tmpl",
-	                    getenv("LANG"));
-
-        cgiSetVariable("KEYWORD", "job_sheets_end");
-        cgiSetVariable("KEYTEXT", "Ending Banner");
-        cgiSetVariable("DEFCHOICE", attr == NULL && attr->num_values > 1 ?
-	                            "" : attr->values[1].string.text);
-
-	cgiCopyTemplateLang(stdout, TEMPLATES, "option-pickone.tmpl",
-	                    getenv("LANG"));
-
-	cgiCopyTemplateLang(stdout, TEMPLATES, "option-trailer.tmpl",
-                            getenv("LANG"));
-      }
-
-      ippDelete(response);
-    }
-
     cgiCopyTemplateLang(stdout, TEMPLATES, "config-printer2.tmpl",
                         getenv("LANG"));
   }
@@ -1118,17 +903,10 @@ do_config_printer(http_t      *http,	/* I - HTTP connection */
     * Set default options...
     */
 
-    outfd = cupsTempFd(tempfile, sizeof(tempfile));
-    in    = fopen(filename, "rb");
-    out   = fdopen(outfd, "wb");
+    cupsTempFile(tempfile, sizeof(tempfile));
 
-    if (outfd < 0 || in == NULL || out == NULL)
-    {
-      cgiSetVariable("ERROR", strerror(errno));
-      cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
-      unlink(filename);
-      return;
-    }
+    in  = fopen(filename, "rb");
+    out = fopen(tempfile, "wb");
 
     while (get_line(line, sizeof(line), in) != NULL)
     {
@@ -1140,8 +918,7 @@ do_config_printer(http_t      *http,	/* I - HTTP connection */
         * Get default option name...
 	*/
 
-        strncpy(keyword, line + 8, sizeof(keyword) - 1);
-	keyword[sizeof(keyword) - 1] = '\0';
+        strcpy(keyword, line + 8);
 
 	for (keyptr = keyword; *keyptr; keyptr ++)
 	  if (*keyptr == ':' || isspace(*keyptr))
@@ -1163,7 +940,6 @@ do_config_printer(http_t      *http,	/* I - HTTP connection */
 
     fclose(in);
     fclose(out);
-    close(outfd);
 
    /*
     * Build a CUPS_ADD_PRINTER request, which requires the following
@@ -1172,7 +948,6 @@ do_config_printer(http_t      *http,	/* I - HTTP connection */
     *    attributes-charset
     *    attributes-natural-language
     *    printer-uri
-    *    job-sheets-default
     *    [ppd file]
     */
 
@@ -1192,11 +967,6 @@ do_config_printer(http_t      *http,	/* I - HTTP connection */
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                  NULL, uri);
 
-    attr = ippAddStrings(request, IPP_TAG_PRINTER, IPP_TAG_NAME,
-                         "job-sheets-default", 2, NULL, NULL);
-    attr->values[0].string.text = strdup(cgiGetVariable("job_sheets_start"));
-    attr->values[1].string.text = strdup(cgiGetVariable("job_sheets_end"));
-
    /*
     * Do the request and get back a response...
     */

cgi-bin/cgi.h

@@ -3,7 +3,7 @@
  *
  *   CGI support library definitions.
  *
- *   Copyright 1997-2001 by Easy Software Products.
+ *   Copyright 1997-2000 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

cgi-bin/classes.c

@@ -3,7 +3,7 @@
  *
  *   Class status CGI for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products.
+ *   Copyright 1997-2000 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -46,7 +46,6 @@ main(int  argc,			/* I - Number of command-line arguments */
   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 */
@@ -71,7 +70,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...
@@ -99,64 +98,6 @@ main(int  argc,			/* I - Number of command-line arguments */
 
   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...
     */

cgi-bin/html.c

@@ -3,7 +3,7 @@
  *
  *   CGI HTML functions.
  *
- *   Copyright 1997-2001 by Easy Software Products.
+ *   Copyright 1997-2000 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

cgi-bin/ipp-var.c

@@ -3,7 +3,7 @@
  *
  *   IPP variable routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products.
+ *   Copyright 1997-2000 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -23,7 +23,6 @@
  *
  * Contents:
  *
- *   ippGetTemplateDir()   - Get the templates directory...
  *   ippSetServerVersion() - Set the server name and CUPS version...
  *   ippSetCGIVars()       - Set CGI variables from an IPP response.
  */
@@ -35,33 +34,6 @@
 #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...
  */
@@ -96,17 +68,11 @@ ippSetCGIVars(ipp_t      *response,	/* I - Response data to be copied... */
 			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 */
+  int			port;
 
 
   ippSetServerVersion();
 
-  server  = getenv("SERVER_NAME");
-  ishttps = getenv("HTTPS") != NULL;
-
   for (attr = response->attrs;
        attr && attr->group_tag == IPP_TAG_OPERATION;
        attr = attr->next);
@@ -123,10 +89,6 @@ ippSetCGIVars(ipp_t      *response,	/* I - Response data to be copied... */
            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;
 
@@ -158,33 +120,17 @@ ippSetCGIVars(ipp_t      *response,	/* I - Response data to be copied... */
 
       name[i] = '\0';
 
-     /*
-      * Add "job_printer_name" variable if we have a "job_printer_uri"
-      * attribute...
-      */
-
-      if (strcmp(name, "job_printer_uri") == 0)
-      {
-        if ((valptr = strrchr(attr->values[0].string.text, '/')) == NULL)
-	  valptr = "unknown";
-	else
-	  valptr ++;
-
-        cgiSetArray("job_printer_name", element, valptr);
-      }
-
      /*
       * Copy values...
       */
 
-      value[0]                 = '\0';	/* Initially an empty string */
-      value[sizeof(value) - 1] = '\0';	/* In case string gets full */
-      valptr                   = value; /* Start at the beginning */
+      value[0] = '\0';
+      valptr   = value;
 
       for (i = 0; i < attr->num_values; i ++)
       {
 	if (i)
-	  strncat(valptr, ",", sizeof(value) - (valptr - value) - 1);
+	  strcat(valptr, ",");
 
 	valptr += strlen(valptr);
 
@@ -192,79 +138,44 @@ ippSetCGIVars(ipp_t      *response,	/* I - Response data to be copied... */
 	{
 	  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);
+	      sprintf(valptr, "%d", attr->values[i].integer);
 	      break;
 
 	  case IPP_TAG_BOOLEAN :
-	      snprintf(valptr, sizeof(value) - (valptr - value),
-	               "%d", attr->values[i].boolean);
+	      sprintf(valptr, "%d", attr->values[i].boolean);
 	      break;
 
 	  case IPP_TAG_NOVALUE :
-	      strncat(valptr, "novalue", sizeof(value) - (valptr - value) - 1);
+	      strcat(valptr, "novalue");
 	      break;
 
 	  case IPP_TAG_RANGE :
-	      snprintf(valptr, sizeof(value) - (valptr - value),
-	               "%d-%d", attr->values[i].range.lower,
-		       attr->values[i].range.upper);
+	      sprintf(valptr, "%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");
+	      sprintf(valptr, "%dx%d%s", attr->values[i].resolution.xres,
+		      attr->values[i].resolution.yres,
+		      attr->values[i].resolution.units == IPP_RES_PER_INCH ?
+			  "dpi" : "dpc");
 	      break;
 
 	  case IPP_TAG_URI :
-	      if (strchr(attr->values[i].string.text, ':') != NULL)
+	      if (strncmp(attr->values[i].string.text, "ipp:", 4) == 0)
 	      {
-		httpSeparate(attr->values[i].string.text, method, username,
+	        httpSeparate(attr->values[i].string.text, method, username,
 		             hostname, &port, resource);
+	        if (username[0])
+		  snprintf(uri, sizeof(uri), "http://%s@%s:%d%s", username,
+		           hostname, port, resource);
+                else
+		  snprintf(uri, sizeof(uri), "http://%s:%d%s", hostname, port,
+		           resource);
 
-        	if (strcmp(method, "ipp") == 0 ||
-	            strcmp(method, "http") == 0)
-        	{
-        	 /*
-		  * Map localhost access to localhost and local port...
-		  */
-
-        	  if (strcasecmp(hostname, server) == 0 &&
-	              (strcmp(getenv("REMOTE_HOST"), "127.0.0.1") == 0 ||
-		       strcmp(getenv("REMOTE_HOST"), "localhost") == 0 ||
-		       strcmp(getenv("REMOTE_HOST"), server) == 0))
-		  {
-		    strcpy(hostname, "localhost");
-		    port = atoi(getenv("SERVER_PORT"));
-		  }
-
-        	 /*
-		  * Rewrite URI with HTTP address...
-		  */
-
-		  if (username[0])
-		    snprintf(uri, sizeof(uri), "%s://%s@%s:%d%s",
-		             ishttps ? "https" : "http",
-		             username, hostname, port, resource);
-        	  else
-		    snprintf(uri, sizeof(uri), "%s://%s:%d%s", 
-		             ishttps ? "https" : "http",
-			     hostname, port, resource);
-
-		  strncat(valptr, uri, sizeof(value) - (valptr - value) - 1);
-        	  break;
-        	}
-              }
+		strcat(valptr, uri);
+	        break;
+	      }
 
           case IPP_TAG_STRING :
 	  case IPP_TAG_TEXT :
@@ -272,8 +183,7 @@ ippSetCGIVars(ipp_t      *response,	/* I - Response data to be copied... */
 	  case IPP_TAG_KEYWORD :
 	  case IPP_TAG_CHARSET :
 	  case IPP_TAG_LANGUAGE :
-	      strncat(valptr, attr->values[i].string.text,
-	              sizeof(value) - (valptr - value) - 1);
+	      strcat(valptr, attr->values[i].string.text);
 	      break;
 
           default :

cgi-bin/ipp-var.h

@@ -3,7 +3,7 @@
  *
  *   IPP variable definitions for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products.
+ *   Copyright 1997-2000 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -38,14 +38,14 @@
  * Definitions...
  */
 
-#define TEMPLATES	ippGetTemplateDir()
+/*#define TEMPLATES	"/home/mike/c/cups/templates"*/
+#define TEMPLATES	CUPS_DATADIR "/templates"
 
 
 /*
  * Prototype...
  */
 
-extern char	*ippGetTemplateDir(void);
 extern void	ippSetServerVersion(void);
 extern void	ippSetCGIVars(ipp_t *, const char *, const char *);
 

cgi-bin/jobs.c

@@ -3,7 +3,7 @@
  *
  *   Job status CGI for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products.
+ *   Copyright 1997-2000 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -64,7 +64,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...

cgi-bin/printers.c

@@ -3,7 +3,7 @@
  *
  *   Printer status CGI for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products.
+ *   Copyright 1997-2000 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -46,7 +46,6 @@ main(int  argc,			/* I - Number of command-line arguments */
   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 */
@@ -71,7 +70,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...
@@ -99,64 +98,6 @@ main(int  argc,			/* I - Number of command-line arguments */
 
   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 printer info...
     */

cgi-bin/template.c

@@ -3,7 +3,7 @@
  *
  *   CGI template function.
  *
- *   Copyright 1997-2001 by Easy Software Products.
+ *   Copyright 1997-2000 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
@@ -110,14 +110,14 @@ cgiCopyTemplateLang(FILE       *out,		/* I - Output file */
   * See if we have a template file for this language...
   */
 
-  snprintf(filename, sizeof(filename), "%s/%s/%s", directory, locale, tmpl);
+  sprintf(filename, "%s/%s/%s", directory, locale, tmpl);
   if (access(filename, 0))
   {
     locale[2] = '\0';
 
-    snprintf(filename, sizeof(filename), "%s/%s/%s", directory, locale, tmpl);
+    sprintf(filename, "%s/%s/%s", directory, locale, tmpl);
     if (access(filename, 0))
-      snprintf(filename, sizeof(filename), "%s/%s", directory, tmpl);
+      sprintf(filename, "%s/%s", directory, tmpl);
   }
 
  /*
@@ -160,8 +160,7 @@ cgi_copy(FILE *out,		/* I - Output file */
 		*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 */
+  char		outval[1024],	/* Output string */
 		compare[1024];	/* Comparison string */
   int		result;		/* Result of comparison */
 
@@ -180,7 +179,7 @@ cgi_copy(FILE *out,		/* I - Output file */
       */
 
       for (s = name; (ch = getc(in)) != EOF;)
-        if (strchr("}]<>=! \t\n", ch))
+        if (strchr("}]<>=!", ch))
           break;
         else if (s > name && ch == '?')
 	  break;
@@ -189,17 +188,6 @@ cgi_copy(FILE *out,		/* I - Output file */
 
       *s = '\0';
 
-      if (s == name && isspace(ch))
-      {
-        if (out)
-	{
-          putc('{', out);
-	  putc(ch, out);
-        }
-
-	continue;
-      }
-
      /*
       * See if it has a value...
       */
@@ -215,20 +203,14 @@ cgi_copy(FILE *out,		/* I - Output file */
 	  *nameptr++ = '\0';
 
 	  if ((value = cgiGetArray(name + 1, atoi(nameptr) - 1)) != NULL)
-	    outptr = value;
+            strcpy(outval, value);
 	  else
-	  {
 	    outval[0] = '\0';
-	    outptr    = outval;
-	  }
 	}
         if ((value = cgiGetArray(name + 1, element)) != NULL)
-	  outptr = value;
+	  strcpy(outval, value);
 	else
-	{
 	  outval[0] = '\0';
-	  outptr    = outval;
-	}
       }
       else if (name[0] == '#')
       {
@@ -240,8 +222,6 @@ cgi_copy(FILE *out,		/* I - Output file */
           sprintf(outval, "%d", cgiGetSize(name + 1));
 	else
 	  sprintf(outval, "%d", element + 1);
-
-        outptr = outval;
       }
       else if (name[0] == '[')
       {
@@ -284,20 +264,14 @@ cgi_copy(FILE *out,		/* I - Output file */
 	{
 	  *nameptr++ = '\0';
 	  if ((value = cgiGetArray(name, atoi(nameptr) - 1)) == NULL)
-          {
-	    snprintf(outval, sizeof(outval), "{%s}", name);
-	    outptr = outval;
-	  }
+            sprintf(outval, "{%s}", name);
 	  else
-	    outptr = value;
+            strcpy(outval, value);
 	}
 	else if ((value = cgiGetArray(name, element)) == NULL)
-        {
-	  snprintf(outval, sizeof(outval), "{%s}", name);
-	  outptr = outval;
-	}
+          sprintf(outval, "{%s}", name);
 	else
-	  outptr = value;
+          strcpy(outval, value);
       }
 
      /*
@@ -311,7 +285,7 @@ cgi_copy(FILE *out,		/* I - Output file */
         */
 
 	if (out)
-	  cgi_puts(outptr, out);
+	  cgi_puts(outval, out);
 
         continue;
       }
@@ -345,8 +319,6 @@ cgi_copy(FILE *out,		/* I - Output file */
 	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);
@@ -373,28 +345,19 @@ cgi_copy(FILE *out,		/* I - Output file */
 	      if ((innerval = cgiGetArray(innername, atoi(innerptr) - 1)) == NULL)
 	        *s = '\0';
 	      else
-	      {
-	        strncpy(s, innerval, sizeof(compare) - (s - compare) - 1);
-		compare[sizeof(compare) - 1] = '\0';
-	      }
+	        strcpy(s, innerval);
 	    }
 	    else if (innername[0] == '?')
 	    {
 	      if ((innerval = cgiGetArray(innername + 1, element)) == NULL)
 		*s = '\0';
 	      else
-	      {
-	        strncpy(s, innerval, sizeof(compare) - (s - compare) - 1);
-		compare[sizeof(compare) - 1] = '\0';
-	      }
+		strcpy(s, innerval);
             }
 	    else if ((innerval = cgiGetArray(innername, element)) == NULL)
-	      snprintf(s, sizeof(s), "{%s}", innername);
+	      sprintf(s, "{%s}", innername);
 	    else
-	    {
-	      strncpy(s, innerval, sizeof(compare) - (s - compare) - 1);
-	      compare[sizeof(compare) - 1] = '\0';
-	    }
+	      strcpy(s, innerval);
 
             s += strlen(s);
 	  }
@@ -415,16 +378,16 @@ cgi_copy(FILE *out,		/* I - Output file */
         switch (op)
 	{
 	  case '<' :
-	      result = strcasecmp(outptr, compare) < 0;
+	      result = strcasecmp(outval, compare) < 0;
 	      break;
 	  case '>' :
-	      result = strcasecmp(outptr, compare) > 0;
+	      result = strcasecmp(outval, compare) > 0;
 	      break;
 	  case '=' :
-	      result = strcasecmp(outptr, compare) == 0;
+	      result = strcasecmp(outval, compare) == 0;
 	      break;
 	  case '!' :
-	      result = strcasecmp(outptr, compare) != 0;
+	      result = strcasecmp(outval, compare) != 0;
 	      break;
 	  default :
 	      result = 1;
@@ -460,13 +423,6 @@ cgi_copy(FILE *out,		/* I - Output file */
     }
     else if (out)
       putc(ch, out);
-
- /*
-  * Flush any pending output...
-  */
-
-  if (out)
-    fflush(out);
 }
 
 

cgi-bin/var.c

@@ -3,7 +3,7 @@
  *
  *   CGI form variable and array functions.
  *
- *   Copyright 1997-2001 by Easy Software Products.
+ *   Copyright 1997-2000 by Easy Software Products.
  *
  *   This program is free software; you can redistribute it and/or modify it
  *   under the terms of the GNU General Public License as published by the Free
@@ -39,8 +39,6 @@
 
 /*#define DEBUG*/
 #include "cgi.h"
-#include <errno.h>
-#include <syslog.h>
 
 
 /*
@@ -475,7 +473,7 @@ cgi_initialize_post(void)
   */
 
   content_length = getenv("CONTENT_LENGTH");
-  if (content_length == NULL || atoi(content_length) <= 0)
+  if (content_length == NULL || atoi(content_length) == 0)
     return (0);
 
  /*
@@ -485,20 +483,16 @@ cgi_initialize_post(void)
   length = atoi(content_length);
   data   = malloc(length + 1);
 
-  if (data == NULL)
-    return (0);
-
  /*
   * Read the data into the buffer...
   */
 
   for (tbytes = 0; tbytes < length; tbytes += nbytes)
     if ((nbytes = read(0, data + tbytes, length - tbytes)) < 0)
-      if (errno != EAGAIN)
-      {
-        free(data);
-        return (0);
-      }
+    {
+      free(data);
+      return (0);
+    }
 
   data[length] = '\0';
 
@@ -549,11 +543,11 @@ cgi_initialize_string(const char *data)	/* I - Form data string */
     * Get the variable name...
     */
 
-    for (s = name; *data != '\0'; data ++)
+    for (s = name; *data != '\0'; data ++, s ++)
       if (*data == '=')
         break;
-      else if (*data >= ' ' && s < (name + sizeof(name) - 1))
-        *s++ = *data;
+      else
+        *s = *data;
 
     *s = '\0';
     if (*data == '=')
@@ -565,44 +559,38 @@ cgi_initialize_string(const char *data)	/* I - Form data string */
     * Read the variable value...
     */
 
-    for (s = value, done = 0; !done && *data != '\0'; data ++)
+    for (s = value, done = 0; !done && *data != '\0'; data ++, s ++)
       switch (*data)
       {
 	case '&' :	/* End of data... */
             done = 1;
+            s --;
             break;
 
 	case '+' :	/* Escaped space character */
-            if (s < (value + sizeof(value) - 1))
-              *s++ = ' ';
+            *s = ' ';
             break;
 
 	case '%' :	/* Escaped control character */
 	   /*
-	    * Read the hex code...
+	    * Read the hex code from stdin...
 	    */
 
-            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 << 4;
 
-              data ++;
-              ch = *data - '0';
-              if (ch > 9)
-        	ch -= 7;
-              *s++ |= ch;
-            }
-	    else
-	      data += 2;
+            data ++;
+            ch = *data - '0';
+            if (ch > 9)
+              ch -= 7;
+            *s |= ch;
             break;
 
 	default :	/* Other characters come straight through */
-	    if (*data >= ' ' && s < (value + sizeof(value) - 1))
-              *s++ = *data;
+            *s = *data;
             break;
       }
 
@@ -612,9 +600,7 @@ cgi_initialize_string(const char *data)	/* I - Form data string */
     * Remove trailing whitespace...
     */
 
-    if (s > value)
-      s --;
-
+    s --;
     while (s >= value && *s == ' ')
       *s-- = '\0';
 
@@ -625,8 +611,7 @@ cgi_initialize_string(const char *data)	/* I - Form data string */
     if ((s = strrchr(name, '-')) != NULL && isdigit(s[1]))
     {
       *s++ = '\0';
-      if (value[0])
-        cgiSetArray(name, atoi(s) - 1, value);
+      cgiSetArray(name, atoi(s) - 1, value);
     }
     else if (cgiGetVariable(name) != NULL)
       cgiSetArray(name, cgiGetSize(name), value);
@@ -659,10 +644,9 @@ cgi_sort_variables(void)
         (int (*)(const void *, const void *))cgi_compare_variables);
 
 #ifdef DEBUG
-  puts("Sorted variable list is:");
+  puts("New 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]);
+    printf("%s = %s\n", form_vars[i].name, form_vars[i].value);
 #endif /* DEBUG */
 }
 

conf/Makefile

@@ -3,7 +3,7 @@
 #
 #   Configuration file makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1993-2001 by Easy Software Products.
+#   Copyright 1993-2000 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -52,7 +52,6 @@ clean:
 
 install:
 	-$(MKDIR) $(SERVERROOT)
-	$(CHMOD) ugo+rx $(SERVERROOT)
 	for file in $(KEEP); do \
 		if test -r $(SERVERROOT)/$$file ; then \
 			$(INSTALL_DATA) $$file $(SERVERROOT)/$$file.N ; \

conf/classes.conf

@@ -1,10 +1,10 @@
 #
-# "$Id: classes.conf 1605 2001-03-02 22:34:21Z andy $"
+# "$Id: classes.conf 969 2000-03-10 16:56:46Z mike $"
 #
 #   Sample class configuration file for the Common UNIX Printing System
 #   (CUPS) scheduler.
 #
-#   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2000 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -47,6 +47,12 @@
 
 #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.
 #
@@ -85,5 +91,5 @@
 #</Class>
 
 #
-# End of "$Id: classes.conf 1605 2001-03-02 22:34:21Z andy $".
+# End of "$Id: classes.conf 969 2000-03-10 16:56:46Z mike $".
 #

conf/client.conf

@@ -1,10 +1,10 @@
 #
-# "$Id: client.conf 1605 2001-03-02 22:34:21Z andy $"
+# "$Id: client.conf 969 2000-03-10 16:56:46Z mike $"
 #
 #   Sample client configuration file for the Common UNIX Printing System
 #   (CUPS).
 #
-#   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2000 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -27,39 +27,24 @@
 #                                                                      #
 # 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.                                         #
+# default printer.                                                     #
 #                                                                      #
 ########################################################################
 
 #
 # 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.
+# hostname of the system.
 #
 
 #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.
+# DefaultPrinter: the default printer (or class) that clients should use.
 #
 
-#Encryption Always
-#Encryption Never
-#Encryption Required
-#Encryption IfRequested
-
+#DefaultPrinter myprinter
+#DefaultPrinter myprinter@host
 
 #
-# End of "$Id: client.conf 1605 2001-03-02 22:34:21Z andy $".
+# End of "$Id: client.conf 969 2000-03-10 16:56:46Z mike $".
 #

conf/cupsd.conf

@@ -1,10 +1,10 @@
 #
-# "$Id: cupsd.conf 1631 2001-03-14 13:45:35Z mike $"
+# "$Id: cupsd.conf 1054 2000-05-08 21:13:37Z mike $"
 #
 #   Sample configuration file for the Common UNIX Printing System (CUPS)
 #   scheduler.
 #
-#   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2000 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -71,24 +71,6 @@
 
 #AccessLog /var/log/cups/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
-
-#
-# DataDir: the root directory for the CUPS data files.
-# By default /usr/share/cups.
-#
-
-#DataDir /usr/share/cups
-
 #
 # DefaultCharset: the default character set to use. If not specified,
 # defaults to utf-8.  Note that this can also be overridden in
@@ -109,7 +91,7 @@
 # By default the compiled in directory.
 #
 
-#DocumentRoot /usr/share/doc/cups
+#DocumentRoot /usr/share/cups/doc
 
 #
 # ErrorLog: the error log file; if this does not start with a leading /
@@ -122,19 +104,11 @@
 
 #ErrorLog /var/log/cups/error_log
 
-#
-# FontPath: the path to locate all font files (currently only for pstoraster)
-# By default /usr/share/cups/fonts.
-#
-
-#FontPath /usr/share/cups/fonts
-
 #
 # 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.
+#     debug	Log everything.
 #     info      Log all requests and state changes.
 #     warn      Log errors and warnings.
 #     error     Log only errors.
@@ -176,21 +150,7 @@ LogLevel info
 #PreserveJobFiles No
 
 #
-# AutoPurgeJobs: automatically purge jobs when not needed for quotas.
-# Default is No.
-#
-
-#AutoPurgeJobs No
-
-#
-# MaxJobs: maximum number of jobs to keep in memory (active and completed.)
-# Default is 0 (no limit.)
-#
-
-#MaxJobs 0
-
-#
-# Printcap: the name of the printcap file.  Default is /etc/printcap.
+# Printcap: the name of the printcap file.  Default is no filename.
 # Leave blank to disable printcap file generation.
 #
 
@@ -203,13 +163,6 @@ LogLevel info
 
 #RequestRoot /var/spool/cups
 
-#
-# 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 /usr/lib/cups or /usr/lib32/cups (IRIX 6.5).
@@ -225,25 +178,6 @@ LogLevel info
 #ServerRoot /etc/cups
 
 
-########
-######## Encryption Support
-########
-
-#
-# ServerCertificate: the file to read containing the server's certificate.
-# Defaults to "/etc/cups/ssl/server.crt".
-#
-
-#ServerCertificate /etc/cups/ssl/server.crt
-
-#
-# ServerKey: the file to read containing the server's key.
-# Defaults to "/etc/cups/ssl/server.key".
-#
-
-#ServerKey /etc/cups/ssl/server.key
-
-
 ########
 ######## Filter Options
 ########
@@ -272,22 +206,12 @@ LogLevel info
 
 #
 # TempDir: the directory to put temporary files in. This directory must be
-# writable by the user defined above!  Defaults to "/var/spool/cups/tmp" or
-# the value of the TMPDIR environment variable.
+# writable by the user defined above!  Defaults to "/var/tmp" or the value
+# of the TMPDIR environment variable.
 #
 
-#TempDir /var/spool/cups/tmp
+#TempDir /var/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
@@ -308,13 +232,8 @@ LogLevel info
 #    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
 
 #
@@ -364,37 +283,23 @@ Port 631
 ########
 
 #
-# Browsing: whether or not to broadcast and/or listen for CUPS printer
-# information on the network.  Enabled by default.
+# Browsing: whether or not to broadcast printer information to
+# other CUPS servers.  Enabled by default.
 #
 
 #Browsing On
 
 #
 # BrowseAddress: specifies a broadcast address to be used.  By
-# default browsing information is not sent!
+# default browsing information is broadcast to all active interfaces.
 #
-# 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.
+# 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
-#BrowseAddress 255.255.255.255
-
-#
-# 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
@@ -552,23 +457,8 @@ Port 631
 # The host and domain address require that you enable hostname lookups
 # with "HostNameLookups On" above.
 #
-# 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>
@@ -630,10 +520,8 @@ AuthClass System
 Order Deny,Allow
 Deny From All
 Allow From 127.0.0.1
-
-#Encryption Required
 </Location>
 
 #
-# End of "$Id: cupsd.conf 1631 2001-03-14 13:45:35Z mike $".
+# End of "$Id: cupsd.conf 1054 2000-05-08 21:13:37Z mike $".
 #

conf/mime.convs

@@ -1,9 +1,9 @@
 #
-# "$Id: mime.convs 1605 2001-03-02 22:34:21Z andy $"
+# "$Id: mime.convs 1019 2000-04-18 19:41:12Z mike $"
 #
 #   MIME converts file for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2001 by Easy Software Products.
+#   Copyright 1997-2000 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -41,38 +41,24 @@
 # PostScript filters
 #
 
-#application/msword	application/postscript	33	mswordtops
-application/pdf		application/postscript	33	pdftops
-application/postscript	application/vnd.cups-postscript	66	pstops
-application/vnd.hp-HPGL	application/postscript	66	hpgltops
-image/*			application/vnd.cups-postscript	66	imagetops
-#text/html		application/postscript	33	htmltops
-application/x-cshell	application/postscript	33	texttops
-application/x-perl	application/postscript	33	texttops
-application/x-shell	application/postscript	33	texttops
-text/html		application/postscript	33	texttops
-text/plain		application/postscript	33	texttops
-application/vnd.cups-form application/vnd.cups-postscript 33 formtops
+#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/html		application/postscript	50	texttops
+text/plain		application/postscript	50	texttops
+application/vnd.cups-form application/vnd.cups-postscript 50 formtops
 
 ########################################################################
 #
 # Raster filters...
 #
 
-image/*			application/vnd.cups-raster	100	imagetoraster
-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/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 1605 2001-03-02 22:34:21Z andy $".
+# End of "$Id: mime.convs 1019 2000-04-18 19:41:12Z mike $".
 #

conf/mime.types

@@ -1,9 +1,9 @@
 #
-# "$Id: mime.types 1681 2001-04-19 15:42:39Z mike $"
+# "$Id: mime.types 1042 2000-04-30 22:03:57Z mike $"
 #
 #   MIME types file for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2001 by Easy Software Products.
+#   Copyright 1997-2000 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -39,7 +39,7 @@
 #   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
@@ -60,7 +60,7 @@
 #   accepts 8-bit characters in the range 128-255.
 #
 #   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,13 +71,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,<201B>)\
-				string(0,BP;) string(0,IN;) string(0,DF;) \
-				string(0,BPINPS;) \
-				(string(0,<1B>%-12345X) + \
-				 (contains(9,512,"LANGUAGE=HPGL") \
-				  contains(9,512,"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;) 
 
 ########################################################################
 #
@@ -101,7 +97,7 @@ image/x-sgi-rgb			rgb sgi bw icon short(0,474)
 image/x-xbitmap			xbm
 image/x-xpixmap			xpm ascii(0,1024) + string(3,"XPM")
 image/x-xwindowdump		xwd
-image/x-sun-raster		ras string(0,<59a66a95>)
+image/x-sun-raster		ras
 
 #image/fpx			fpx
 image/x-alias			pix short(8,8) short(8,24)
@@ -114,13 +110,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,27 +118,10 @@ text/plain			txt printable(0,1024)
 #
 
 application/vnd.cups-form	string(0,"<CUPSFORM>")
-application/vnd.cups-postscript	string(0,<1B>%-12345X) + \
-				(contains(9,512,"LANGUAGE=POSTSCRIPT") \
-				 contains(9,512,"LANGUAGE = POSTSCRIPT"))
+application/vnd.cups-postscript	string(0,<1B>%-12345X)
 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>@) \
-				(string(0,<1B>%-12345X) + \
-				 (contains(9,512,"LANGUAGE=PCL") \
-				  contains(9,512,"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 1681 2001-04-19 15:42:39Z mike $".
+# End of "$Id: mime.types 1042 2000-04-30 22:03:57Z mike $".
 #

conf/printers.conf

@@ -1,10 +1,10 @@
 #
-# "$Id: printers.conf 1605 2001-03-02 22:34:21Z andy $"
+# "$Id: printers.conf 969 2000-03-10 16:56:46Z mike $"
 #
 #   Sample printer configuration file for the Common UNIX Printing System
 #   (CUPS) scheduler.
 #
-#   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2000 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -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.
 #
@@ -92,5 +98,5 @@
 #</Printer>
 
 #
-# End of "$Id: printers.conf 1605 2001-03-02 22:34:21Z andy $".
+# End of "$Id: printers.conf 969 2000-03-10 16:56:46Z mike $".
 #

config.h.in

@@ -5,7 +5,7 @@
  *
  *   @configure_input@
  *
- *   Copyright 1997-2001 by Easy Software Products.
+ *   Copyright 1997-2000 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -19,7 +19,7 @@
  *       44141 Airport View Drive, Suite 204
  *       Hollywood, Maryland 20636-3111 USA
  *
- *       Voice: (301) 373-9600
+ *       Voice: (301) 373-9603
  *       EMail: cups-info@cups.org
  *         WWW: http://www.cups.org
  */
@@ -28,7 +28,7 @@
  * Version of software...
  */
 
-#define CUPS_SVERSION	"CUPS v1.1.8"
+#define CUPS_SVERSION	"CUPS v1.1b5"
 
 /*
  * Where are files stored?
@@ -41,13 +41,7 @@
 #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
 
 /*
  * Do we have various image libraries?
@@ -93,13 +87,6 @@
 
 #undef HAVE_CRYPT_H
 
-/*
- * Use <string.h>, <strings.h>, or both?
- */
-
-#undef HAVE_STRING_H
-#undef HAVE_STRINGS_H
-
 /*
  * Do we have the strXXX() functions?
  */
@@ -135,25 +122,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 <sys/ioctl.h>?
- */
-
-#undef HAVE_SYS_IOCTL_H
-
 /*
  * End of "$Id$".
  */

configure.in

@@ -3,7 +3,7 @@ dnl "$Id$"
 dnl
 dnl   Configuration script for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2000 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
@@ -24,7 +24,7 @@ dnl
 
 AC_INIT(cups/cups.h)
 AC_CONFIG_HEADER(config.h)
-AC_PREFIX_DEFAULT(/)
+AC_PREFIX_DEFAULT(/usr)
 
 dnl Get the operating system and version number...
 
@@ -41,15 +41,11 @@ OPTIM=""
 AC_SUBST(OPTIM)
 PICFLAG=1
 CFLAGS="${CFLAGS:=}"
-CXXFLAGS="${CXXFLAGS:=}"
-DSOFLAGS="${DSOFLAGS:=}"
-AC_SUBST(DSOFLAGS)
 
 AC_ARG_ENABLE(debug, [  --enable-debug        turn on debugging [default=no]],[if eval "test x$enable_debug = xyes"; then
-	OPTIM="-g"
+	OPTIM="-g "
 fi])
 AC_ARG_ENABLE(shared, [  --enable-shared        turn on shared libraries [default=yes]])
-AC_ARG_ENABLE(ssl, [  --enable-ssl           turn on SSL/TLS support [default=no]])
 AC_ARG_ENABLE(libtool_unsupported, [  --enable-libtool-unsupported=LIBTOOL_PATH
                           turn on building with libtool (UNSUPPORTED!) [default=no]],[if eval "test x$enable_libtool_unsupported != xno"; then
 	LIBTOOL="$enable_libtool_unsupported"
@@ -66,48 +62,34 @@ if test "$enable_shared" != "no"; then
 		SunOS* | UNIX_S*)
 			LIBCUPS="libcups.so.2"
 			LIBCUPSIMAGE="libcupsimage.so.2"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-h,\$@ -G \$(OPTIM)"
+			DSO="\$(CC) -Wl,-h,\$@ -G \$(OPTIM) -o"
 			;;
 		HP-UX*)
 			LIBCUPS="libcups.sl.2"
 			LIBCUPSIMAGE="libcupsimage.sl.2"
-			DSO="ld"
-			DSOFLAGS="$DSOFLAGS -b -z +h \$@"
+			DSO="ld -b -z +h \$@ -o"
 			;;
 		FreeBSD* | NetBSD* | OpenBSD*)
 			LIBCUPS="libcups.so.2"
 			LIBCUPSIMAGE="libcupsimage.so.2"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-soname,\$@ -shared \$(OPTIM)"
+			DSO="\$(CC) -Wl,-soname,\$@ -shared \$(OPTIM) -o"
 			;;
 		OSF1* | Linux*)
 			LIBCUPS="libcups.so.2"
 			LIBCUPSIMAGE="libcupsimage.so.2"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-soname,\$@ -shared \$(OPTIM)"
+			DSO="\$(CC) -Wl,-soname,\$@ -shared \$(OPTIM) -o"
 			;;
 		IRIX*)
 			LIBCUPS="libcups.so.2"
 			LIBCUPSIMAGE="libcupsimage.so.2"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -soname \$@ -shared \$(OPTIM)"
-			;;
-		AIX*)
-			AC_MSG_WARN(Shared library support for AIX not available yet - defaulting to static)
-			enable_shared=no
-			PICFLAG=0
-			LIBCUPS="libcups.a"
-			LIBCUPSIMAGE="libcupsimage.a"
-			DSO=":"
+			DSO="\$(CC) -soname \$@ -shared \$(OPTIM) -o"
 			;;
 		*)
 			echo "Warning: shared libraries may not be supported.  Trying -shared"
 			echo "         option with compiler."
 			LIBCUPS="libcups.so.2"
 			LIBCUPSIMAGE="libcupsimage.so.2"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-soname,\$@ -shared \$(OPTIM)"
+			DSO="\$(CC) -Wl,-soname,\$@ -shared \$(OPTIM) -o"
 			;;
 	esac
 else
@@ -123,7 +105,6 @@ if test "$LIBTOOL" != ""; then
 	LINKCUPS="../cups/\$(LIBCUPS)"
 	LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)"
 	DSO=":"
-	DSOFLAGS=""
 else
 	LINKCUPS="-L../cups -lcups"
 	LINKCUPSIMAGE="-L../filter -lcupsimage"
@@ -131,25 +112,13 @@ fi
 
 AC_ARG_ENABLE(pam, [  --enable-pam        turn on PAM support [default=yes]])
 
-# Don't use PAM with AIX...
-if test $uname = AIX; then
-	enable_pam=no
-fi
-
-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 Checks for programs...
 AC_PROG_AWK
 AC_PROG_CC
-AC_PROG_CXX
 AC_PROG_CPP
 AC_PROG_RANLIB
 AC_PATH_PROG(AR,ar)
 AC_PATH_PROG(CHMOD,chmod)
-AC_PATH_PROG(CHOWN,chown)
 AC_PATH_PROG(CP,cp)
 AC_PATH_PROG(MV,mv)
 AC_PATH_PROG(NROFF,nroff)
@@ -170,32 +139,15 @@ dnl Architecture checks...
 AC_C_BIGENDIAN
 
 dnl Check for libraries...
-AC_CHECK_LIB(c,crypt,LIBS="$LIBS")
-if test "$ac_cv_lib_c_crypt" = "no"; then
-	AC_CHECK_LIB(crypt,crypt)
-fi
+AC_CHECK_LIB(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(gen,getspent)
-
-LIBMALLOC=""
-AC_CHECK_LIB(c,mallinfo,LIBS="$LIBS"; AC_DEFINE(HAVE_MALLINFO),LIBS="$LIBS")
-if test "$ac_cv_lib_c_mallinfo" = "no"; then
-	AC_CHECK_LIB(malloc,mallinfo,
-	             LIBS="$LIBS"
-		     LIBMALLOC="-lmalloc"
-		     AC_DEFINE(HAVE_MALLINFO),
-		     LIBS="$LIBS")
-fi
-AC_SUBST(LIBMALLOC)
-
 if test "$enable_pam" != "no"; then
 	OLDLIBS="$LIBS"
 	AC_CHECK_LIB(dl,dlopen)
 	AC_CHECK_LIB(pam,pam_start)
 	if test "$ac_cv_lib_pam_pam_start" != "no"; then
-		if test -d /etc/pam.d; then
-			PAMDIR="/etc/pam.d"
-		fi
+		PAMDIR="/etc/pam.d"
 	else
 		PAMDIR=""
 		LIBS="$OLDLIBS"
@@ -218,40 +170,6 @@ else
 	echo "Not using -lnsl since you are running IRIX."
 fi)
 
-dnl Encryption support...
-
-SSLLIBS=""
-AC_SUBST(SSLLIBS)
-
-if test "$enable_ssl" = "yes"; then
-	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
-
 dnl Save the current libraries since we don't want the image libraries
 dnl included with every program...
 SAVELIBS="$LIBS"
@@ -272,7 +190,7 @@ AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
     LIBJPEG="-ljpeg"
     LIBS="$LIBS -ljpeg")
 
-AC_CHECK_LIB(z, gzgets,
+AC_CHECK_LIB(z, deflate,
     AC_DEFINE(HAVE_LIBZ)
     LIBZ="-lz"
     LIBS="$LIBS -lz")
@@ -294,42 +212,14 @@ LIBS="$SAVELIBS"
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_DIRENT
-AC_CHECK_HEADER(crypt.h,AC_DEFINE(HAVE_CRYPT_H))
-AC_CHECK_HEADER(malloc.h,AC_DEFINE(HAVE_MALLOC_H))
 AC_CHECK_HEADER(shadow.h,AC_DEFINE(HAVE_SHADOW_H))
-AC_CHECK_HEADER(stddef.h,AC_DEFINE(HAVE_STDDEF_H))
-AC_CHECK_HEADER(stdlib.h,AC_DEFINE(HAVE_STDLIB_H))
-AC_CHECK_HEADER(string.h,AC_DEFINE(HAVE_STRING_H))
-AC_CHECK_HEADER(strings.h,AC_DEFINE(HAVE_STRINGS_H))
-AC_CHECK_HEADER(usersec.h,AC_DEFINE(HAVE_USERSEC_H))
-AC_CHECK_HEADER(sys/ioctl.h,AC_DEFINE(HAVE_SYS_IOCTL_H))
 
 dnl Checks for string functions.
 AC_CHECK_FUNCS(strdup)
 AC_CHECK_FUNCS(strcasecmp)
 AC_CHECK_FUNCS(strncasecmp)
-if test "$uname" = "HP-UX" -a "$uversion" = "1020"; then
-	echo Forcing snprintf emulation for HP-UX.
-else
-	AC_CHECK_FUNCS(snprintf)
-	AC_CHECK_FUNCS(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
+AC_CHECK_FUNCS(snprintf)
+AC_CHECK_FUNCS(vsnprintf)
 
 dnl Checks for vsyslog function.
 AC_CHECK_FUNCS(vsyslog)
@@ -347,10 +237,8 @@ AC_CHECK_FUNCS(wait3)
 
 dnl Update compiler options...
 if test -n "$GCC"; then
-	CXX="$CC"
-
 	if test -z "$OPTIM"; then
-	       	OPTIM="-O2"
+	       	OPTIM="-O2 -g3"
 	fi
 	if test $PICFLAG = 1; then
     		OPTIM="-fPIC $OPTIM"
@@ -358,44 +246,25 @@ if test -n "$GCC"; then
 	OPTIM="-Wall $OPTIM"
 else
 	case $uname in
-		AIX*)
-			if test -z "$OPTIM"; then
-				OPTIM="-O2 -qmaxmem=6000"
-			fi
-			;;
-		HP-UX*)
-			if test -z "$OPTIM"; then
-				OPTIM="+O2"
-			fi
-			CFLAGS="-Ae $CFLAGS"
-			OPTIM="+DAportable $OPTIM"
-			if test $PICFLAG = 1; then
-				OPTIM="+z $OPTIM"
-			fi
-			;;
         	IRIX*)
 			if test -z "$OPTIM"; then
-        			OPTIM="-O2"
+        			OPTIM="-O2 -g3"
 			fi
 			if test $uversion -ge 62; then
 				OPTIM="$OPTIM -n32 -mips3"
 			fi
 			OPTIM="-fullwarn $OPTIM"
 			;;
+		HP-UX*)
+			if test -z "$OPTIM"; then
+				OPTIM="+O2 -g3"
+			fi
+			OPTIM="-Ae $OPTIM"
+			;;
 		SunOS*)
 			# Solaris
 			if test -z "$OPTIM"; then
-				OPTIM="-xO4"
-			fi
-			OPTIM="$OPTIM -xarch=generic"
-			if test $PICFLAG = 1; then
-				OPTIM="-KPIC $OPTIM"
-			fi
-			;;
-		UNIX_SVR*)
-			# UnixWare
-			if test -z "$OPTIM"; then
-				OPTIM="-O"
+				OPTIM="-O -g3"
 			fi
 			if test $PICFLAG = 1; then
 				OPTIM="-KPIC $OPTIM"
@@ -418,34 +287,43 @@ if test "$DSO" != ":"; then
 	# 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)"
+	DSOLIBS="\$(LIBJPEG) \$(LIBPNG) \$(LIBTIFF) \$(LIBZ)"
 	IMGLIBS=""
 
 	# The *BSD, HP-UX, and Solaris run-time linkers need help when
 	# deciding where to find a DSO.  Add linker options to tell them
 	# where to find the DSO (usually in /usr/lib...  duh!)
 	case $uname in
-                HP-UX*)
-			# HP-UX
-                	DSOFLAGS="+b $libdir +fb $DSOFLAGS"
-                	LDFLAGS="$LDFLAGS -Wl,+b,$libdir,+fb"
-                	;;
-                SunOS*)
-                	# Solaris
-                	DSOFLAGS="-R$libdir $DSOFLAGS"
-                	LDFLAGS="$LDFLAGS -R$libdir"
-                	;;
-                FreeBSD* | NetBSD* | OpenBSD*)
-                        # *BSD
-                	DSOFLAGS="-Wl,-R$libdir $DSOFLAGS"
-                        LDFLAGS="$LDFLAGS -Wl,-R$libdir"
-                        ;;
+		HP-UX*)
+			LDFLAGS="$LDFLAGS -Wl,+b,$libdir,+fb"
+			;;
+		SunOS*)
+			# Solaris
+			LDFLAGS="$LDFLAGS -R$libdir"
+			;;
+		FreeBSD* | NetBSD* | OpenBSD*)
+			# *BSD
+			LDFLAGS="$LDFLAGS -Wl,-R$libdir"
+			;;
 	esac
 else
 	DSOLIBS=""
-	IMGLIBS="\$(LIBPNG) \$(LIBTIFF) \$(LIBJPEG) \$(LIBZ)"
+	IMGLIBS="\$(LIBJPEG) \$(LIBPNG) \$(LIBTIFF) \$(LIBZ)"
 fi
 
+# Figure out how to install "cat" pages...
+case "$uname" in
+	FreeBSD* | NetBSD* | OpenBSD*)
+		# *BSD
+		INSTALL_CAT="install-bsdcat"
+		;;
+	*)
+		# All others
+		INSTALL_CAT="install-cat"
+		;;
+esac
+AC_SUBST(INSTALL_CAT)
+
 AC_SUBST(DSO)
 AC_SUBST(DSOLIBS)
 AC_SUBST(IMGLIBS)
@@ -455,200 +333,33 @@ AC_SUBST(LIBTOOL)
 AC_SUBST(LINKCUPS)
 AC_SUBST(LINKCUPSIMAGE)
 
-dnl Fix "prefix" variable if it hasn't been specified...
-if test "$prefix" = "NONE"; then
-	prefix="/"
-fi
-
-dnl Fix "exec_prefix" variable if it hasn't been specified...
-if test "$exec_prefix" = "NONE"; then
-	if test "$prefix" = "/"; then
-		exec_prefix="/usr"
-	else
-		exec_prefix="$prefix"
-	fi
-fi
-
-dnl Fix "sharedstatedir" variable if it hasn't been specified...
-if test "$sharedstatedir" = "\${prefix}/com" -a "$prefix" = "/"; then
-	sharedstatedir="/usr/com"
-fi
-
-dnl Fix "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
+dnl Fix prefix as needed..
+if test "$prefix" = "NONE" ; then
+	prefix="/usr"
 fi
 
 dnl Fix "libdir" variable for IRIX 6.x...
-if test "$uname" = "IRIX" -a $uversion -ge 62; then
-	libdir="$exec_prefix/lib32"
+if test "$uname" = "IRIX" -a $uversion -ge 65; then
+	libdir="${prefix}/lib32"
 fi
 
-dnl Fix "mandir" variable...
-if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then
-	case "$uname" in
-        	FreeBSD* | NetBSD* | OpenBSD* | AIX*)
-        		# *BSD + AIX
-        		mandir="/usr/share/man"
-        		AMANDIR="/usr/share/man"
-        		;;
-        	IRIX*)
-        		# SGI IRIX
-        		mandir="/usr/share/catman/u_man"
-        		AMANDIR="/usr/share/catman/a_man"
-        		;;
-        	*)
-        		# All others
-        		mandir="/usr/man"
-        		AMANDIR="/usr/man"
-        		;;
-	esac
+dnl Need special attention for the default location...
+if test "$prefix" = "/usr" ; then
+	CUPS_SERVERROOT="/etc/cups"
+	CUPS_LOGDIR="/var/log/cups"
+	CUPS_REQUESTS="/var/spool/cups"
+
+	AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$CUPS_SERVERROOT")
+	AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$CUPS_LOGDIR")
+	AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$CUPS_REQUESTS")
 else
-	AMANDIR="$mandir"
-fi
+	CUPS_SERVERROOT='${prefix}/etc/cups'
+	CUPS_LOGDIR='${prefix}/log/cups'
+	CUPS_REQUESTS='${prefix}/spool/cups'
 
-AC_SUBST(AMANDIR)
-
-dnl Fix "fontpath" variable...
-if test "x$fontpath" = "x"; then
-	fontpath="$datadir/cups/fonts"
-fi
-
-dnl Setup manpage extensions...
-case "$uname" in
-	FreeBSD* | NetBSD* | OpenBSD*)
-		# *BSD
-		CAT1EXT=0
-		CAT5EXT=0
-		CAT8EXT=0
-		MAN8EXT=8
-		;;
-	IRIX*)
-		# SGI IRIX
-		CAT1EXT=z
-		CAT5EXT=z
-		CAT8EXT=z
-		MAN8EXT=1m
-		;;
-	SunOS* | HP-UX*)
-		# Solaris and HP-UX
-		CAT1EXT=1
-		CAT5EXT=5
-		CAT8EXT=1m
-		MAN8EXT=1m
-		;;
-	*)
-		# All others
-		CAT1EXT=1
-		CAT5EXT=5
-		CAT8EXT=8
-		MAN8EXT=8
-		;;
-esac
-
-AC_SUBST(CAT1EXT)
-AC_SUBST(CAT5EXT)
-AC_SUBST(CAT8EXT)
-AC_SUBST(MAN8EXT)
-
-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"
-			;;
-
-		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")
+	AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$prefix/etc/cups")
+	AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$prefix/log/cups")
+	AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$prefix/spool/cups")
 fi
 
 dnl See what directory to put server executables...
@@ -656,14 +367,14 @@ case "$uname" in
 	FreeBSD* | NetBSD* | OpenBSD*)
 		# *BSD
 		INSTALL_SYSV=""
-		CUPS_SERVERBIN='${exec_prefix}/libexec/cups'
-		AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$exec_prefix/libexec/cups")
+		CUPS_SERVERBIN='${prefix}/libexec/cups'
+		AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$prefix/libexec/cups")
 		;;
 	*)
 		# All others
 		INSTALL_SYSV="install-sysv"
-		CUPS_SERVERBIN='${exec_prefix}/lib/cups'
-		AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$exec_prefix/lib/cups")
+		CUPS_SERVERBIN='${prefix}/lib/cups'
+		AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$prefix/lib/cups")
 		;;
 esac
 
@@ -676,19 +387,19 @@ AC_SUBST(CUPS_REQUESTS)
 dnl Set the CUPS_LOCALE directory...
 case "$uname" in
 	Linux* | FreeBSD* | NetBSD* | OpenBSD*)
-		CUPS_LOCALEDIR='${datadir}/locale'
-		AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$datadir/locale")
+		CUPS_LOCALEDIR='${prefix}/share/locale'
+		AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$prefix/share/locale")
 		;;
 
-	OSF1* | AIX*)
-		CUPS_LOCALEDIR='${exec_prefix}/lib/nls/msg'
-		AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$exec_prefix/lib/nls/msg")
+	OSF1*)
+		CUPS_LOCALEDIR='${prefix}/lib/nls/msg'
+		AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$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")
+		CUPS_LOCALEDIR='${prefix}/lib/locale'
+		AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$prefix/lib/locale")
 		;;
 esac
 
@@ -696,24 +407,15 @@ AC_SUBST(CUPS_LOCALEDIR)
 
 dnl Set the CUPS_DATADIR directory...
 CUPS_DATADIR='${datadir}/cups'
-AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$datadir/cups")
+AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$prefix/share/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")
+CUPS_DOCROOT='${datadir}/doc/cups'
+AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$prefix/share/doc/cups")
 AC_SUBST(CUPS_DOCROOT)
 
-dnl Set the CUPS_FONTPATH directory...
-AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath")
-
-AC_OUTPUT(Makedefs cups.sh)
+AC_OUTPUT(Makedefs)
 
 dnl
 dnl End of "$Id$".

cups.dsw

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

cups.list

@@ -1,10 +1,10 @@
 #
-# "$Id: cups.list 1735 2001-05-21 21:39:39Z mike $"
+# "$Id: cups.list 1127 2000-06-08 20:00:41Z mike $"
 #
 #   ESP Package Manager (EPM) file list for the Common UNIX Printing
 #   System (CUPS).
 #
-#   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2000 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -23,298 +23,442 @@
 #         WWW: http://www.cups.org
 #
 
-# Product information
 %product Common UNIX Printing System
-%copyright 1993-2001 by Easy Software Products, All Rights Reserved.
+%copyright 1993-2000 by Easy Software Products, All Rights Reserved.
 %vendor Easy Software Products
 %license LICENSE.txt
 %readme README.txt
-%version 1.1.8
+%version 1.1b5
 %incompat printpro
 
-# Server programs
 %system all
 # Server files
-f 0555 root sys $SBINDIR/cupsd scheduler/cupsd
-
-d 0555 root sys $SERVERBIN -
-d 0555 root sys $SERVERBIN/backend -
-f 0555 root sys $SERVERBIN/backend/ipp backend/ipp
-l 0555 root sys $SERVERBIN/backend/http ipp
-f 0555 root sys $SERVERBIN/backend/lpd backend/lpd
-f 0555 root sys $SERVERBIN/backend/parallel backend/parallel
-f 0555 root sys $SERVERBIN/backend/serial backend/serial
-f 0555 root sys $SERVERBIN/backend/socket backend/socket
-f 0555 root sys $SERVERBIN/backend/usb backend/usb
-d 0555 root sys $SERVERBIN/cgi-bin -
-f 0555 root sys $SERVERBIN/cgi-bin/admin.cgi cgi-bin/admin.cgi
-f 0555 root sys $SERVERBIN/cgi-bin/classes.cgi cgi-bin/classes.cgi
-f 0555 root sys $SERVERBIN/cgi-bin/jobs.cgi cgi-bin/jobs.cgi
-f 0555 root sys $SERVERBIN/cgi-bin/printers.cgi cgi-bin/printers.cgi
-d 0555 root sys $SERVERBIN/daemon -
-f 0555 root sys $SERVERBIN/daemon/cups-lpd scheduler/cups-lpd
-f 0555 root sys $SERVERBIN/daemon/cups-polld scheduler/cups-polld
-d 0555 root sys $SERVERBIN/filter -
-f 0555 root sys $SERVERBIN/filter/pstoraster pstoraster/pstoraster
-f 0555 root sys $SERVERBIN/filter/pdftops pdftops/pdftops
-f 0555 root sys $SERVERBIN/filter/imagetops filter/imagetops
-f 0555 root sys $SERVERBIN/filter/pstops filter/pstops
-f 0555 root sys $SERVERBIN/filter/texttops filter/texttops
-f 0555 root sys $SERVERBIN/filter/rastertoepson filter/rastertoepson
-f 0555 root sys $SERVERBIN/filter/rastertohp filter/rastertohp
-f 0555 root sys $SERVERBIN/filter/hpgltops filter/hpgltops
-f 0555 root sys $SERVERBIN/filter/imagetoraster filter/imagetoraster
+f 0500 root sys /usr/sbin/cupsd scheduler/cupsd
+f 0555 root sys /usr/lib/cups/backend/ipp backend/ipp
+l 0555 root sys /usr/lib/cups/backend/http ipp
+f 0555 root sys /usr/lib/cups/backend/lpd backend/lpd
+f 0555 root sys /usr/lib/cups/backend/parallel backend/parallel
+f 0555 root sys /usr/lib/cups/backend/serial backend/serial
+f 0555 root sys /usr/lib/cups/backend/socket backend/socket
+f 0555 root sys /usr/lib/cups/backend/usb backend/usb
+f 0555 root sys /usr/lib/cups/cgi-bin/admin.cgi cgi-bin/admin.cgi
+f 0555 root sys /usr/lib/cups/cgi-bin/classes.cgi cgi-bin/classes.cgi
+f 0555 root sys /usr/lib/cups/cgi-bin/jobs.cgi cgi-bin/jobs.cgi
+f 0555 root sys /usr/lib/cups/cgi-bin/printers.cgi cgi-bin/printers.cgi
+f 0555 root sys /usr/lib/cups/daemon/cups-lpd scheduler/cups-lpd
+f 0555 root sys /usr/lib/cups/daemon/cups-polld scheduler/cups-polld
+f 0555 root sys /usr/lib/cups/filter/pstoraster pstoraster/pstoraster
+l 0555 root sys /usr/lib/cups/filter/pdftops pstoraster
+f 0555 root sys /usr/lib/cups/filter/imagetops filter/imagetops
+f 0555 root sys /usr/lib/cups/filter/pstops filter/pstops
+f 0555 root sys /usr/lib/cups/filter/texttops filter/texttops
+f 0555 root sys /usr/lib/cups/filter/rastertoepson filter/rastertoepson
+f 0555 root sys /usr/lib/cups/filter/rastertohp filter/rastertohp
+f 0555 root sys /usr/lib/cups/filter/hpgltops filter/hpgltops
+f 0555 root sys /usr/lib/cups/filter/imagetoraster filter/imagetoraster
 
 # Admin commands
-l 0555 root sys $BINDIR/disable $SBINDIR/accept
-l 0555 root sys $BINDIR/enable $SBINDIR/accept
-l 0555 root sys $LIBDIR/accept $SBINDIR/accept
-l 0555 root sys $LIBDIR/lpadmin $SBINDIR/lpadmin
-l 0555 root sys $LIBDIR/reject accept
-f 0555 root sys $SBINDIR/accept systemv/accept
-f 0555 root sys $SBINDIR/lpadmin systemv/lpadmin
-f 0555 root sys $SBINDIR/lpc berkeley/lpc
-f 0555 root sys $SBINDIR/lpinfo systemv/lpinfo
-f 0555 root sys $SBINDIR/lpmove systemv/lpmove
-l 0555 root sys $SBINDIR/reject accept
-
-%system irix
-l 0555 root sys /usr/etc/lpc $SBINDIR/lpc
-%system all
+l 0555 root sys /usr/bin/disable /usr/sbin/accept
+l 0555 root sys /usr/bin/enable /usr/sbin/accept
+l 0555 root sys /usr/lib/accept /usr/sbin/accept
+l 0555 root sys /usr/lib/lpadmin /usr/sbin/lpadmin
+l 0555 root sys /usr/lib/reject accept
+f 0555 root sys /usr/sbin/accept systemv/accept
+f 0555 root sys /usr/sbin/lpadmin systemv/lpadmin
+f 0555 root sys /usr/sbin/lpc berkeley/lpc
+f 0555 root sys /usr/sbin/lpinfo systemv/lpinfo
+f 0555 root sys /usr/sbin/lpmove systemv/lpmove
+l 0555 root sys /usr/sbin/reject accept
 
 # User commands
-f 0555 root sys $BINDIR/cancel systemv/cancel
-f 0555 root sys $BINDIR/lp systemv/lp
-f 0555 root sys $BINDIR/lpoptions systemv/lpoptions
-f 4555 root sys $BINDIR/lppasswd systemv/lppasswd
-f 0555 root sys $BINDIR/lpq berkeley/lpq
-f 0555 root sys $BINDIR/lpr berkeley/lpr
-f 0555 root sys $BINDIR/lprm berkeley/lprm
-f 0555 root sys $BINDIR/lpstat systemv/lpstat
-
-%system irix
-l 0555 root sys /usr/bsd/lpq $BINDIR/lpq
-l 0555 root sys /usr/bsd/lpr $BINDIR/lpr
-l 0555 root sys /usr/bsd/lprm $BINDIR/lprm
-%system all
+f 0555 root sys /usr/bin/cancel systemv/cancel
+f 0555 root sys /usr/bin/lp systemv/lp
+f 0555 root sys /usr/bin/lpoptions systemv/lpoptions
+f 4555 root sys /usr/bin/lppasswd systemv/lppasswd
+f 0555 root sys /usr/bin/lpq berkeley/lpq
+f 0555 root sys /usr/bin/lpr berkeley/lpr
+f 0555 root sys /usr/bin/lprm berkeley/lprm
+f 0555 root sys /usr/bin/lpstat systemv/lpstat
 
 # DSOs
 %system hpux
-f 0555 root sys $LIBDIR/libcups.sl.2 cups/libcups.sl.2
-l 0555 root sys $LIBDIR/libcups.sl libcups.sl.2
-f 0555 root sys $LIBDIR/libcupsimage.sl.2 filter/libcupsimage.sl.2
-l 0555 root sys $LIBDIR/libcupsimage.sl libcupsimage.sl.2
-%system !hpux
-f 0555 root sys $LIBDIR/libcups.so.2 cups/libcups.so.2
-l 0555 root sys $LIBDIR/libcups.so libcups.so.2
-f 0555 root sys $LIBDIR/libcupsimage.so.2 filter/libcupsimage.so.2
-l 0555 root sys $LIBDIR/libcupsimage.so libcupsimage.so.2
+f 0555 root sys /usr/lib/libcups.sl.2 cups/libcups.sl.2
+l 0555 root sys /usr/lib/libcups.sl libcups.sl.2
+f 0555 root sys /usr/lib/libcupsimage.sl.2 filter/libcupsimage.sl.2
+l 0555 root sys /usr/lib/libcupsimage.sl libcupsimage.sl.2
+%system irix-6.5
+f 0555 root sys /usr/lib32/libcups.so.2 cups/libcups.so.2
+l 0555 root sys /usr/lib32/libcups.so libcups.so.2
+f 0555 root sys /usr/lib32/libcupsimage.so.2 filter/libcupsimage.so.2
+l 0555 root sys /usr/lib32/libcupsimage.so libcupsimage.so.2
+%system !irix-6.5 !hpux
+f 0555 root sys /usr/lib/libcups.so.2 cups/libcups.so.2
+l 0555 root sys /usr/lib/libcups.so libcups.so.2
+f 0555 root sys /usr/lib/libcupsimage.so.2 filter/libcupsimage.so.2
+l 0555 root sys /usr/lib/libcupsimage.so libcupsimage.so.2
 %system all
 
 # Directories
-d 0755 root sys $LOGDIR -
-d 0700 lp sys $REQUESTS -
-d 1700 lp sys $REQUESTS/tmp -
+d 0711 root sys /etc/cups/certs
+d 0755 root sys /etc/cups/interfaces
+d 0755 root sys /etc/cups/ppd
+d 0755 root sys /var/log/cups
+d 0755 root sys /var/spool/cups
 
 # Data files
-f 0444 root sys $LOCALEDIR/C/cups_C locale/C/cups_C
-f 0444 root sys $LOCALEDIR/de/cups_de locale/de/cups_de
-f 0444 root sys $LOCALEDIR/en/cups_en locale/en/cups_en
-f 0444 root sys $LOCALEDIR/es/cups_es locale/es/cups_es
-f 0444 root sys $LOCALEDIR/fr/cups_fr locale/fr/cups_fr
-f 0444 root sys $LOCALEDIR/it/cups_it locale/it/cups_it
+%system linux
+f 0444 root sys /usr/share/locale/C/cups_C locale/C/cups_C
+f 0444 root sys /usr/share/locale/de/cups_de locale/de/cups_de
+f 0444 root sys /usr/share/locale/en/cups_en locale/en/cups_en
+f 0444 root sys /usr/share/locale/es/cups_es locale/es/cups_es
+f 0444 root sys /usr/share/locale/fr/cups_fr locale/fr/cups_fr
+f 0444 root sys /usr/share/locale/it/cups_it locale/it/cups_it
 
-d 0555 root sys $DATADIR -
+%system dunix
+f 0444 root sys /usr/lib/nls/msg/C/cups_C locale/C/cups_C
+f 0444 root sys /usr/lib/nls/msg/de/cups_de locale/de/cups_de
+f 0444 root sys /usr/lib/nls/msg/en/cups_en locale/en/cups_en
+f 0444 root sys /usr/lib/nls/msg/es/cups_es locale/es/cups_es
+f 0444 root sys /usr/lib/nls/msg/fr/cups_fr locale/fr/cups_fr
+f 0444 root sys /usr/lib/nls/msg/it/cups_it locale/it/cups_it
 
-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
+%system !linux dunix
+f 0444 root sys /usr/lib/locale/C/cups_C locale/C/cups_C
+f 0444 root sys /usr/lib/locale/de/cups_de locale/de/cups_de
+f 0444 root sys /usr/lib/locale/en/cups_en locale/en/cups_en
+f 0444 root sys /usr/lib/locale/es/cups_es locale/es/cups_es
+f 0444 root sys /usr/lib/locale/fr/cups_fr locale/fr/cups_fr
+f 0444 root sys /usr/lib/locale/it/cups_it locale/it/cups_it
 
-d 0555 root sys $DATADIR/charsets -
-f 0444 root sys $DATADIR/charsets/windows-874 data/windows-874
-f 0444 root sys $DATADIR/charsets/windows-1250 data/windows-1250
-f 0444 root sys $DATADIR/charsets/windows-1251 data/windows-1251
-f 0444 root sys $DATADIR/charsets/windows-1252 data/windows-1252
-f 0444 root sys $DATADIR/charsets/windows-1253 data/windows-1253
-f 0444 root sys $DATADIR/charsets/windows-1254 data/windows-1254
-f 0444 root sys $DATADIR/charsets/windows-1255 data/windows-1255
-f 0444 root sys $DATADIR/charsets/windows-1256 data/windows-1256
-f 0444 root sys $DATADIR/charsets/windows-1257 data/windows-1257
-f 0444 root sys $DATADIR/charsets/windows-1258 data/windows-1258
-f 0444 root sys $DATADIR/charsets/iso-8859-1 data/iso-8859-1
-f 0444 root sys $DATADIR/charsets/iso-8859-14 data/iso-8859-14
-f 0444 root sys $DATADIR/charsets/iso-8859-15 data/iso-8859-15
-f 0444 root sys $DATADIR/charsets/iso-8859-2 data/iso-8859-2
-f 0444 root sys $DATADIR/charsets/iso-8859-3 data/iso-8859-3
-f 0444 root sys $DATADIR/charsets/iso-8859-4 data/iso-8859-4
-f 0444 root sys $DATADIR/charsets/iso-8859-5 data/iso-8859-5
-f 0444 root sys $DATADIR/charsets/iso-8859-6 data/iso-8859-6
-f 0444 root sys $DATADIR/charsets/iso-8859-7 data/iso-8859-7
-f 0444 root sys $DATADIR/charsets/iso-8859-8 data/iso-8859-8
-f 0444 root sys $DATADIR/charsets/iso-8859-9 data/iso-8859-9
-f 0444 root sys $DATADIR/charsets/utf-8 data/utf-8
+%system all
+f 0444 root sys /usr/share/cups/banners/classified data/classified
+f 0444 root sys /usr/share/cups/banners/confidential data/confidential
+f 0444 root sys /usr/share/cups/banners/secret data/secret
+f 0444 root sys /usr/share/cups/banners/standard data/standard
+f 0444 root sys /usr/share/cups/banners/topsecret data/topsecret
+f 0444 root sys /usr/share/cups/banners/unclassified data/unclassified
 
-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
+f 0444 root sys /usr/share/cups/charsets/windows-874 data/windows-874
+f 0444 root sys /usr/share/cups/charsets/windows-1250 data/windows-1250
+f 0444 root sys /usr/share/cups/charsets/windows-1251 data/windows-1251
+f 0444 root sys /usr/share/cups/charsets/windows-1252 data/windows-1252
+f 0444 root sys /usr/share/cups/charsets/windows-1253 data/windows-1253
+f 0444 root sys /usr/share/cups/charsets/windows-1254 data/windows-1254
+f 0444 root sys /usr/share/cups/charsets/windows-1255 data/windows-1255
+f 0444 root sys /usr/share/cups/charsets/windows-1256 data/windows-1256
+f 0444 root sys /usr/share/cups/charsets/windows-1257 data/windows-1257
+f 0444 root sys /usr/share/cups/charsets/windows-1258 data/windows-1258
+f 0444 root sys /usr/share/cups/charsets/iso-8859-1 data/iso-8859-1
+f 0444 root sys /usr/share/cups/charsets/iso-8859-14 data/iso-8859-14
+f 0444 root sys /usr/share/cups/charsets/iso-8859-15 data/iso-8859-15
+f 0444 root sys /usr/share/cups/charsets/iso-8859-2 data/iso-8859-2
+f 0444 root sys /usr/share/cups/charsets/iso-8859-3 data/iso-8859-3
+f 0444 root sys /usr/share/cups/charsets/iso-8859-4 data/iso-8859-4
+f 0444 root sys /usr/share/cups/charsets/iso-8859-5 data/iso-8859-5
+f 0444 root sys /usr/share/cups/charsets/iso-8859-6 data/iso-8859-6
+f 0444 root sys /usr/share/cups/charsets/iso-8859-7 data/iso-8859-7
+f 0444 root sys /usr/share/cups/charsets/iso-8859-8 data/iso-8859-8
+f 0444 root sys /usr/share/cups/charsets/iso-8859-9 data/iso-8859-9
+f 0444 root sys /usr/share/cups/charsets/utf-8 data/utf-8
 
-d 0555 root sys $DATADIR/fonts -
-f 0444 root sys $DATADIR/fonts fonts/*
+f 0444 root sys /usr/share/cups/data/HPGLprolog data/HPGLprolog
+f 0444 root sys /usr/share/cups/data/psglyphs data/psglyphs
+f 0444 root sys /usr/share/cups/data/testprint.ps data/testprint.ps
 
-d 0555 root sys $DATADIR/pstoraster -
-f 0444 root sys $DATADIR/pstoraster/Fontmap pstoraster/Fontmap
-f 0444 root sys $DATADIR/pstoraster pstoraster/gs*.ps
+f 0444 root sys /usr/share/cups/fonts/AvantGarde-Book fonts/AvantGarde-Book
+f 0444 root sys /usr/share/cups/fonts/AvantGarde-BookOblique fonts/AvantGarde-BookOblique
+f 0444 root sys /usr/share/cups/fonts/AvantGarde-Demi fonts/AvantGarde-Demi
+f 0444 root sys /usr/share/cups/fonts/AvantGarde-DemiOblique fonts/AvantGarde-DemiOblique
+f 0444 root sys /usr/share/cups/fonts/Bookman-Demi fonts/Bookman-Demi
+f 0444 root sys /usr/share/cups/fonts/Bookman-DemiItalic fonts/Bookman-DemiItalic
+f 0444 root sys /usr/share/cups/fonts/Bookman-Light fonts/Bookman-Light
+f 0444 root sys /usr/share/cups/fonts/Bookman-LightItalic fonts/Bookman-LightItalic
+f 0444 root sys /usr/share/cups/fonts/Charter-Bold fonts/Charter-Bold
+f 0444 root sys /usr/share/cups/fonts/Charter-BoldItalic fonts/Charter-BoldItalic
+f 0444 root sys /usr/share/cups/fonts/Charter-Italic fonts/Charter-Italic
+f 0444 root sys /usr/share/cups/fonts/Charter-Roman fonts/Charter-Roman
+f 0444 root sys /usr/share/cups/fonts/Courier fonts/Courier
+f 0444 root sys /usr/share/cups/fonts/Courier-Bold fonts/Courier-Bold
+f 0444 root sys /usr/share/cups/fonts/Courier-BoldOblique fonts/Courier-BoldOblique
+f 0444 root sys /usr/share/cups/fonts/Courier-Oblique fonts/Courier-Oblique
+f 0444 root sys /usr/share/cups/fonts/Helvetica fonts/Helvetica
+f 0444 root sys /usr/share/cups/fonts/Helvetica-Bold fonts/Helvetica-Bold
+f 0444 root sys /usr/share/cups/fonts/Helvetica-BoldOblique fonts/Helvetica-BoldOblique
+f 0444 root sys /usr/share/cups/fonts/Helvetica-Narrow fonts/Helvetica-Narrow
+f 0444 root sys /usr/share/cups/fonts/Helvetica-Narrow-Bold fonts/Helvetica-Narrow-Bold
+f 0444 root sys /usr/share/cups/fonts/Helvetica-Narrow-BoldOblique fonts/Helvetica-Narrow-BoldOblique
+f 0444 root sys /usr/share/cups/fonts/Helvetica-Narrow-Oblique fonts/Helvetica-Narrow-Oblique
+f 0444 root sys /usr/share/cups/fonts/Helvetica-Oblique fonts/Helvetica-Oblique
+f 0444 root sys /usr/share/cups/fonts/NewCenturySchlbk-Bold fonts/NewCenturySchlbk-Bold
+f 0444 root sys /usr/share/cups/fonts/NewCenturySchlbk-BoldItalic fonts/NewCenturySchlbk-BoldItalic
+f 0444 root sys /usr/share/cups/fonts/NewCenturySchlbk-Italic fonts/NewCenturySchlbk-Italic
+f 0444 root sys /usr/share/cups/fonts/NewCenturySchlbk-Roman fonts/NewCenturySchlbk-Roman
+f 0444 root sys /usr/share/cups/fonts/Palatino-Bold fonts/Palatino-Bold
+f 0444 root sys /usr/share/cups/fonts/Palatino-BoldItalic fonts/Palatino-BoldItalic
+f 0444 root sys /usr/share/cups/fonts/Palatino-Italic fonts/Palatino-Italic
+f 0444 root sys /usr/share/cups/fonts/Palatino-Roman fonts/Palatino-Roman
+f 0444 root sys /usr/share/cups/fonts/Symbol fonts/Symbol
+f 0444 root sys /usr/share/cups/fonts/Times-Bold fonts/Times-Bold
+f 0444 root sys /usr/share/cups/fonts/Times-BoldItalic fonts/Times-BoldItalic
+f 0444 root sys /usr/share/cups/fonts/Times-Italic fonts/Times-Italic
+f 0444 root sys /usr/share/cups/fonts/Times-Roman fonts/Times-Roman
+f 0444 root sys /usr/share/cups/fonts/Utopia-Bold fonts/Utopia-Bold
+f 0444 root sys /usr/share/cups/fonts/Utopia-BoldItalic fonts/Utopia-BoldItalic
+f 0444 root sys /usr/share/cups/fonts/Utopia-Italic fonts/Utopia-Italic
+f 0444 root sys /usr/share/cups/fonts/Utopia-Regular fonts/Utopia-Regular
+f 0444 root sys /usr/share/cups/fonts/ZapfChancery-MediumItalic fonts/ZapfChancery-MediumItalic
+f 0444 root sys /usr/share/cups/fonts/ZapfDingbats fonts/ZapfDingbats
 
-d 0555 root sys $DATADIR/model -
-f 0444 root sys $DATADIR/model ppd/*.ppd
+f 0444 root sys /usr/share/cups/pstoraster/Fontmap pstoraster/Fontmap
+f 0444 root sys /usr/share/cups/pstoraster/gs_btokn.ps pstoraster/gs_btokn.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_ccfnt.ps pstoraster/gs_ccfnt.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_cff.ps pstoraster/gs_cff.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_cidfn.ps pstoraster/gs_cidfn.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_cmap.ps pstoraster/gs_cmap.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_cmdl.ps pstoraster/gs_cmdl.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_dbt_e.ps pstoraster/gs_dbt_e.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_diskf.ps pstoraster/gs_diskf.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_dpnxt.ps pstoraster/gs_dpnxt.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_dps1.ps pstoraster/gs_dps1.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_dps2.ps pstoraster/gs_dps2.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_dps.ps pstoraster/gs_dps.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_epsf.ps pstoraster/gs_epsf.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_fform.ps pstoraster/gs_fform.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_fonts.ps pstoraster/gs_fonts.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_init.ps pstoraster/gs_init.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_iso_e.ps pstoraster/gs_iso_e.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_kanji.ps pstoraster/gs_kanji.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_ksb_e.ps pstoraster/gs_ksb_e.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_l2img.ps pstoraster/gs_l2img.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_lev2.ps pstoraster/gs_lev2.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_ll3.ps pstoraster/gs_ll3.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_mex_e.ps pstoraster/gs_mex_e.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_mro_e.ps pstoraster/gs_mro_e.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_pdfwr.ps pstoraster/gs_pdfwr.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_pdf_e.ps pstoraster/gs_pdf_e.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_pfile.ps pstoraster/gs_pfile.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_res.ps pstoraster/gs_res.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_setpd.ps pstoraster/gs_setpd.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_statd.ps pstoraster/gs_statd.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_std_e.ps pstoraster/gs_std_e.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_sym_e.ps pstoraster/gs_sym_e.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_ttf.ps pstoraster/gs_ttf.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_typ32.ps pstoraster/gs_typ32.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_typ42.ps pstoraster/gs_typ42.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_type1.ps pstoraster/gs_type1.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_wan_e.ps pstoraster/gs_wan_e.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_wl1_e.ps pstoraster/gs_wl1_e.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_wl2_e.ps pstoraster/gs_wl2_e.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_wl5_e.ps pstoraster/gs_wl5_e.ps
+f 0444 root sys /usr/share/cups/pstoraster/pdf2dsc.ps pstoraster/pdf2dsc.ps
+f 0444 root sys /usr/share/cups/pstoraster/pdf_base.ps pstoraster/pdf_base.ps
+f 0444 root sys /usr/share/cups/pstoraster/pdf_draw.ps pstoraster/pdf_draw.ps
+f 0444 root sys /usr/share/cups/pstoraster/pdf_font.ps pstoraster/pdf_font.ps
+f 0444 root sys /usr/share/cups/pstoraster/pdf_main.ps pstoraster/pdf_main.ps
+f 0444 root sys /usr/share/cups/pstoraster/pdf_ops.ps pstoraster/pdf_ops.ps
+f 0444 root sys /usr/share/cups/pstoraster/pdf_sec.ps pstoraster/pdf_sec.ps
 
-d 0555 root sys $DATADIR/templates -
-f 0444 root sys $DATADIR/templates templates/*.tmpl
+f 0444 root sys /usr/share/cups/model/deskjet.ppd ppd/deskjet.ppd
+f 0444 root sys /usr/share/cups/model/laserjet.ppd ppd/laserjet.ppd
+#f 0444 root sys /usr/share/cups/model/epson9.ppd ppd/epson9.ppd
+#f 0444 root sys /usr/share/cups/model/epson24.ppd ppd/epson24.ppd
+f 0444 root sys /usr/share/cups/model/stcolor.ppd ppd/stcolor.ppd
+f 0444 root sys /usr/share/cups/model/stphoto.ppd ppd/stphoto.ppd
+
+f 0444 root sys /usr/share/cups/templates/add-class.tmpl templates/add-class.tmpl
+f 0444 root sys /usr/share/cups/templates/add-printer.tmpl templates/add-printer.tmpl
+f 0444 root sys /usr/share/cups/templates/admin-op.tmpl templates/admin-op.tmpl
+f 0444 root sys /usr/share/cups/templates/admin.tmpl templates/admin.tmpl
+f 0444 root sys /usr/share/cups/templates/choose-device.tmpl templates/choose-device.tmpl
+f 0444 root sys /usr/share/cups/templates/choose-make.tmpl templates/choose-make.tmpl
+f 0444 root sys /usr/share/cups/templates/choose-members.tmpl templates/choose-members.tmpl
+f 0444 root sys /usr/share/cups/templates/choose-model.tmpl templates/choose-model.tmpl
+f 0444 root sys /usr/share/cups/templates/choose-serial.tmpl templates/choose-serial.tmpl
+f 0444 root sys /usr/share/cups/templates/choose-uri.tmpl templates/choose-uri.tmpl
+f 0444 root sys /usr/share/cups/templates/class-added.tmpl templates/class-added.tmpl
+f 0444 root sys /usr/share/cups/templates/class-confirm.tmpl templates/class-confirm.tmpl
+f 0444 root sys /usr/share/cups/templates/class-deleted.tmpl templates/class-deleted.tmpl
+f 0444 root sys /usr/share/cups/templates/class-modified.tmpl templates/class-modified.tmpl
+f 0444 root sys /usr/share/cups/templates/classes.tmpl templates/classes.tmpl
+f 0444 root sys /usr/share/cups/templates/config-printer.tmpl templates/config-printer.tmpl
+f 0444 root sys /usr/share/cups/templates/config-printer2.tmpl templates/config-printer2.tmpl
+f 0444 root sys /usr/share/cups/templates/error.tmpl templates/error.tmpl
+f 0444 root sys /usr/share/cups/templates/job-cancel.tmpl templates/job-cancel.tmpl
+f 0444 root sys /usr/share/cups/templates/job-hold.tmpl templates/job-hold.tmpl
+f 0444 root sys /usr/share/cups/templates/job-release.tmpl templates/job-release.tmpl
+f 0444 root sys /usr/share/cups/templates/job-restart.tmpl templates/job-restart.tmpl
+f 0444 root sys /usr/share/cups/templates/jobs.tmpl templates/jobs.tmpl
+f 0444 root sys /usr/share/cups/templates/modify-class.tmpl templates/modify-class.tmpl
+f 0444 root sys /usr/share/cups/templates/modify-printer.tmpl templates/modify-printer.tmpl
+f 0444 root sys /usr/share/cups/templates/option-boolean.tmpl templates/option-boolean.tmpl
+f 0444 root sys /usr/share/cups/templates/option-header.tmpl templates/option-header.tmpl
+f 0444 root sys /usr/share/cups/templates/option-pickmany.tmpl templates/option-pickmany.tmpl
+f 0444 root sys /usr/share/cups/templates/option-pickone.tmpl templates/option-pickone.tmpl
+f 0444 root sys /usr/share/cups/templates/option-trailer.tmpl templates/option-trailer.tmpl
+f 0444 root sys /usr/share/cups/templates/printer-accept.tmpl templates/printer-accept.tmpl
+f 0444 root sys /usr/share/cups/templates/printer-added.tmpl templates/printer-added.tmpl
+f 0444 root sys /usr/share/cups/templates/printer-configured.tmpl templates/printer-configured.tmpl
+f 0444 root sys /usr/share/cups/templates/printer-confirm.tmpl templates/printer-confirm.tmpl
+f 0444 root sys /usr/share/cups/templates/printer-deleted.tmpl templates/printer-deleted.tmpl
+f 0444 root sys /usr/share/cups/templates/printer-modified.tmpl templates/printer-modified.tmpl
+f 0444 root sys /usr/share/cups/templates/printer-reject.tmpl templates/printer-reject.tmpl
+f 0444 root sys /usr/share/cups/templates/printer-start.tmpl templates/printer-start.tmpl
+f 0444 root sys /usr/share/cups/templates/printer-stop.tmpl templates/printer-stop.tmpl
+f 0444 root sys /usr/share/cups/templates/printers.tmpl templates/printers.tmpl
+f 0444 root sys /usr/share/cups/templates/test-page.tmpl templates/test-page.tmpl
+
+f 0444 root sys /usr/share/cups/templates/header.tmpl templates/header.tmpl
+f 0444 root sys /usr/share/cups/templates/trailer.tmpl templates/trailer.tmpl
 
 # Config files
-d 0555 root sys $SERVERROOT -
-d 0711 root sys $SERVERROOT/certs -
-d 0755 root sys $SERVERROOT/interfaces -
-d 0755 root sys $SERVERROOT/ppd -
-c 0644 root sys $SERVERROOT conf/*.conf
-f 0644 root sys $SERVERROOT/mime.convs conf/mime.convs
-f 0644 root sys $SERVERROOT/mime.types conf/mime.types
-
-%system linux
-d 0555 root sys $PAMDIR -
-c 0644 root sys $PAMDIR/cups data/cups.pam
-c 0644 root sys $PAMDIR/cups.suse data/cups.suse
-%install if test -f /lib/security/pam_unix.so; then
-%install     mv $PAMDIR/cups.suse $PAMDIR/cups
-%install fi
-%system all
+c 0644 root sys /etc/cups/classes.conf conf/classes.conf
+c 0644 root sys /etc/cups/cupsd.conf conf/cupsd.conf
+f 0644 root sys /etc/cups/mime.convs conf/mime.convs
+f 0644 root sys /etc/cups/mime.types conf/mime.types
+c 0644 root sys /etc/cups/printers.conf conf/printers.conf
+c 0644 root sys /etc/pam.d/cups data/cups.pam
 
 # Developer files
-d 0555 root sys $INCLUDEDIR/cups -
-f 0444 root sys $INCLUDEDIR/cups/cups.h cups/cups.h
-f 0444 root sys $INCLUDEDIR/cups/http.h cups/http.h
-f 0444 root sys $INCLUDEDIR/cups/image.h filter/image.h
-f 0444 root sys $INCLUDEDIR/cups/ipp.h cups/ipp.h
-f 0444 root sys $INCLUDEDIR/cups/language.h cups/language.h
-f 0444 root sys $INCLUDEDIR/cups/md5.h cups/md5.h
-f 0444 root sys $INCLUDEDIR/cups/ppd.h cups/ppd.h
-f 0444 root sys $INCLUDEDIR/cups/raster.h filter/raster.h
+f 0444 root sys /usr/include/cups/cups.h cups/cups.h
+f 0444 root sys /usr/include/cups/http.h cups/http.h
+f 0444 root sys /usr/include/cups/image.h filter/image.h
+f 0444 root sys /usr/include/cups/ipp.h cups/ipp.h
+f 0444 root sys /usr/include/cups/language.h cups/language.h
+f 0444 root sys /usr/include/cups/md5.h cups/md5.h
+f 0444 root sys /usr/include/cups/ppd.h cups/ppd.h
+f 0444 root sys /usr/include/cups/raster.h filter/raster.h
 
-f 0444 root sys $LIBDIR/libcups.a cups/libcups.a
+%system irix-6.5
+f 0444 root sys /usr/lib32/libcups.a cups/libcups.a
+%system !irix-6.5
+f 0444 root sys /usr/lib/libcups.a cups/libcups.a
+%system all
 
 # Documentation files
-d 0555 root sys $DOCDIR -
-f 0444 root sys $DOCDIR/cups.css doc/cups.css
-f 0444 root sys $DOCDIR doc/*.html
-f 0444 root sys $DOCDIR doc/*.pdf
-d 0555 root sys $DOCDIR/images -
-f 0444 root sys $DOCDIR/images doc/images/*.gif
+f 0444 root sys /usr/share/doc/cups/cups.css doc/cups.css
+f 0444 root sys /usr/share/doc/cups/documentation.html doc/documentation.html
+f 0444 root sys /usr/share/doc/cups/index.html doc/index.html
+
+f 0444 root sys /usr/share/doc/cups/images/accept-jobs.gif doc/images/accept-jobs.gif
+f 0444 root sys /usr/share/doc/cups/images/add-class.gif doc/images/add-class.gif
+f 0444 root sys /usr/share/doc/cups/images/add-printer.gif doc/images/add-printer.gif
+f 0444 root sys /usr/share/doc/cups/images/cancel-job.gif doc/images/cancel-job.gif
+f 0444 root sys /usr/share/doc/cups/images/cancel-jobs.gif doc/images/cancel-jobs.gif
+f 0444 root sys /usr/share/doc/cups/images/cancel.gif doc/images/cancel.gif
+f 0444 root sys /usr/share/doc/cups/images/classes.gif doc/images/classes.gif
+f 0444 root sys /usr/share/doc/cups/images/continue.gif doc/images/continue.gif
+f 0444 root sys /usr/share/doc/cups/images/config-printer.gif doc/images/config-printer.gif
+f 0444 root sys /usr/share/doc/cups/images/cups-bar.gif doc/images/cups-bar.gif
+f 0444 root sys /usr/share/doc/cups/images/cups-block-diagram.gif doc/images/cups-block-diagram.gif
+f 0444 root sys /usr/share/doc/cups/images/cups-large.gif doc/images/cups-large.gif
+f 0444 root sys /usr/share/doc/cups/images/cups-medium.gif doc/images/cups-medium.gif
+f 0444 root sys /usr/share/doc/cups/images/cups-small.gif doc/images/cups-small.gif
+f 0444 root sys /usr/share/doc/cups/images/delete-class.gif doc/images/delete-class.gif
+f 0444 root sys /usr/share/doc/cups/images/delete-printer.gif doc/images/delete-printer.gif
+f 0444 root sys /usr/share/doc/cups/images/hold-job.gif doc/images/hold-job.gif
+f 0444 root sys /usr/share/doc/cups/images/left.gif doc/images/left.gif
+f 0444 root sys /usr/share/doc/cups/images/logo.gif doc/images/logo.gif
+f 0444 root sys /usr/share/doc/cups/images/manage-classes.gif doc/images/manage-classes.gif
+f 0444 root sys /usr/share/doc/cups/images/manage-jobs.gif doc/images/manage-jobs.gif
+f 0444 root sys /usr/share/doc/cups/images/manage-printers.gif doc/images/manage-printers.gif
+f 0444 root sys /usr/share/doc/cups/images/modify-class.gif doc/images/modify-class.gif
+f 0444 root sys /usr/share/doc/cups/images/modify-printer.gif doc/images/modify-printer.gif
+f 0444 root sys /usr/share/doc/cups/images/navbar.gif doc/images/navbar.gif
+f 0444 root sys /usr/share/doc/cups/images/print-test-page.gif doc/images/print-test-page.gif
+f 0444 root sys /usr/share/doc/cups/images/printer-idle.gif doc/images/printer-idle.gif
+f 0444 root sys /usr/share/doc/cups/images/printer-processing.gif doc/images/printer-processing.gif
+f 0444 root sys /usr/share/doc/cups/images/printer-stopped.gif doc/images/printer-stopped.gif
+f 0444 root sys /usr/share/doc/cups/images/reject-jobs.gif doc/images/reject-jobs.gif
+f 0444 root sys /usr/share/doc/cups/images/release-job.gif doc/images/release-job.gif
+f 0444 root sys /usr/share/doc/cups/images/restart-job.gif doc/images/restart-job.gif
+f 0444 root sys /usr/share/doc/cups/images/right.gif doc/images/right.gif
+f 0444 root sys /usr/share/doc/cups/images/show-active.gif doc/images/show-active.gif
+f 0444 root sys /usr/share/doc/cups/images/show-completed.gif doc/images/show-completed.gif
+f 0444 root sys /usr/share/doc/cups/images/start-class.gif doc/images/start-class.gif
+f 0444 root sys /usr/share/doc/cups/images/start-printer.gif doc/images/start-printer.gif
+f 0444 root sys /usr/share/doc/cups/images/stop-class.gif doc/images/stop-class.gif
+f 0444 root sys /usr/share/doc/cups/images/stop-printer.gif doc/images/stop-printer.gif
+
+f 0444 root sys /usr/share/doc/cups/cmp.html doc/cmp.html
+f 0444 root sys /usr/share/doc/cups/cmp.pdf doc/cmp.pdf
+f 0444 root sys /usr/share/doc/cups/cupsdoc.css doc/cupsdoc.css
+f 0444 root sys /usr/share/doc/cups/idd.html doc/idd.html
+f 0444 root sys /usr/share/doc/cups/idd.pdf doc/idd.pdf
+f 0444 root sys /usr/share/doc/cups/ipp.html doc/ipp.html
+f 0444 root sys /usr/share/doc/cups/ipp.pdf doc/ipp.pdf
+f 0444 root sys /usr/share/doc/cups/overview.html doc/overview.html
+f 0444 root sys /usr/share/doc/cups/overview.pdf doc/overview.pdf
+f 0444 root sys /usr/share/doc/cups/sam.html doc/sam.html
+f 0444 root sys /usr/share/doc/cups/sam.pdf doc/sam.pdf
+f 0444 root sys /usr/share/doc/cups/sdd.html doc/sdd.html
+f 0444 root sys /usr/share/doc/cups/sdd.pdf doc/sdd.pdf
+f 0444 root sys /usr/share/doc/cups/spm.html doc/spm.html
+f 0444 root sys /usr/share/doc/cups/spm.pdf doc/spm.pdf
+f 0444 root sys /usr/share/doc/cups/ssr.html doc/ssr.html
+f 0444 root sys /usr/share/doc/cups/ssr.pdf doc/ssr.pdf
+f 0444 root sys /usr/share/doc/cups/sum.html doc/sum.html
+f 0444 root sys /usr/share/doc/cups/sum.pdf doc/sum.pdf
+f 0444 root sys /usr/share/doc/cups/svd.html doc/svd.html
+f 0444 root sys /usr/share/doc/cups/svd.pdf doc/svd.pdf
 
 # Man pages
 %system irix
-d 0555 root sys $AMANDIR -
-d 0555 root sys $AMANDIR/cat1 -
-d 0555 root sys $MANDIR -
-d 0555 root sys $MANDIR/cat1 -
-d 0555 root sys $MANDIR/cat5 -
-
-f 0444 root sys $AMANDIR/cat1/accept.z man/accept.z
-l 0444 root sys $AMANDIR/cat1/reject.z accept.z
-f 0444 root sys $MANDIR/cat1/backend.z man/backend.z
-f 0444 root sys $MANDIR/cat5/classes.conf.z man/classes.conf.z
-f 0444 root sys $AMANDIR/cat1/cups-lpd.z man/cups-lpd.z
-f 0444 root sys $AMANDIR/cat1/cups-polld.z man/cups-polld.z
-f 0444 root sys $MANDIR/cat5/cupsd.conf.z man/cupsd.conf.z
-f 0444 root sys $AMANDIR/cat1/cupsd.z man/cupsd.z
-f 0444 root sys $AMANDIR/cat1/enable.z man/enable.z
-l 0444 root sys $AMANDIR/cat1/disable.z enable.z
-f 0444 root sys $MANDIR/cat1/filter.z man/filter.z
-f 0444 root sys $AMANDIR/cat1/lpadmin.z man/lpadmin.z
-f 0444 root sys $AMANDIR/cat1/lpc.z man/lpc.z
-f 0444 root sys $AMANDIR/cat1/lpinfo.z man/lpinfo.z
-f 0444 root sys $AMANDIR/cat1/lpmove.z man/lpmove.z
-f 0444 root sys $MANDIR/cat1/lpoptions.z man/lpoptions.z
-f 0444 root sys $MANDIR/cat1/lpq.z man/lpq.z
-f 0444 root sys $MANDIR/cat1/lprm.z man/lprm.z
-f 0444 root sys $MANDIR/cat1/lpr.z man/lpr.z
-f 0444 root sys $MANDIR/cat1/lpstat.z man/lpstat.z
-f 0444 root sys $MANDIR/cat1/lp.z man/lp.z
-l 0444 root sys $MANDIR/cat1/cancel.z lp.z
-f 0444 root sys $MANDIR/cat5/mime.convs.z man/mime.convs.z
-f 0444 root sys $MANDIR/cat5/mime.types.z man/mime.types.z
-f 0444 root sys $MANDIR/cat5/printers.conf.z man/printers.conf.z
-
-%system solaris hpux
-d 0555 root sys $MANDIR/man1 -
-d 0555 root sys $MANDIR/man5 -
-d 0555 root sys $MANDIR/man1m -
-
-f 0444 root sys $MANDIR/man1m/accept.1m man/accept.man
-l 0444 root sys $MANDIR/man1m/reject.1m accept.1m
-f 0444 root sys $MANDIR/man1/backend.1 man/backend.man
-f 0444 root sys $MANDIR/man1/classes.conf.5 man/classes.conf.man
-f 0444 root sys $MANDIR/man1m/cups-lpd.1m man/cups-lpd.man
-f 0444 root sys $MANDIR/man1m/cups-polld.1m man/cups-polld.man
-f 0444 root sys $MANDIR/man1m/cupsd.1m man/cupsd.man
-f 0444 root sys $MANDIR/man5/cupsd.conf.5 man/cupsd.conf.man
-f 0444 root sys $MANDIR/man1m/enable.1m man/enable.man
-l 0444 root sys $MANDIR/man1m/disable.1m enable.1m
-f 0444 root sys $MANDIR/man1/filter.1 man/filter.man
-f 0444 root sys $MANDIR/man1m/lpadmin.1m man/lpadmin.man
-f 0444 root sys $MANDIR/man1m/lpc.1m man/lpc.man
-f 0444 root sys $MANDIR/man1m/lpinfo.1m man/lpinfo.man
-f 0444 root sys $MANDIR/man1m/lpmove.1m man/lpmove.man
-f 0444 root sys $MANDIR/man1/lpoptions.1 man/lpoptions.man
-f 0444 root sys $MANDIR/man1/lpq.1 man/lpq.man
-f 0444 root sys $MANDIR/man1/lprm.1 man/lprm.man
-f 0444 root sys $MANDIR/man1/lpr.1 man/lpr.man
-f 0444 root sys $MANDIR/man1/lpstat.1 man/lpstat.man
-f 0444 root sys $MANDIR/man1/lp.1 man/lp.man
-l 0444 root sys $MANDIR/man1/cancel.1 lp.1
-f 0444 root sys $MANDIR/man5/mime.convs.5 man/mime.convs.man
-f 0444 root sys $MANDIR/man5/mime.types.5 man/mime.types.man
-f 0444 root sys $MANDIR/man5/printers.conf.5 man/printers.conf.man
-
-%system !irix !solaris !hpux
-d 0555 root sys $MANDIR/man1 -
-d 0555 root sys $MANDIR/man5 -
-d 0555 root sys $MANDIR/man8 -
-
-f 0444 root sys $MANDIR/man8/accept.8 man/accept.man
-l 0444 root sys $MANDIR/man8/reject.8 accept.8
-f 0444 root sys $MANDIR/man1/backend.1 man/backend.man
-f 0444 root sys $MANDIR/man1/classes.conf.5 man/classes.conf.man
-f 0444 root sys $MANDIR/man8/cups-lpd.8 man/cups-lpd.man
-f 0444 root sys $MANDIR/man8/cups-polld.8 man/cups-polld.man
-f 0444 root sys $MANDIR/man8/cupsd.8 man/cupsd.man
-f 0444 root sys $MANDIR/man5/cupsd.conf.5 man/cupsd.conf.man
-f 0444 root sys $MANDIR/man8/enable.8 man/enable.man
-l 0444 root sys $MANDIR/man8/disable.8 enable.8
-f 0444 root sys $MANDIR/man1/filter.1 man/filter.man
-f 0444 root sys $MANDIR/man8/lpadmin.8 man/lpadmin.man
-f 0444 root sys $MANDIR/man8/lpc.8 man/lpc.man
-f 0444 root sys $MANDIR/man8/lpinfo.8 man/lpinfo.man
-f 0444 root sys $MANDIR/man8/lpmove.8 man/lpmove.man
-f 0444 root sys $MANDIR/man1/lpoptions.1 man/lpoptions.man
-f 0444 root sys $MANDIR/man1/lpq.1 man/lpq.man
-f 0444 root sys $MANDIR/man1/lprm.1 man/lprm.man
-f 0444 root sys $MANDIR/man1/lpr.1 man/lpr.man
-f 0444 root sys $MANDIR/man1/lpstat.1 man/lpstat.man
-f 0444 root sys $MANDIR/man1/lp.1 man/lp.man
-l 0444 root sys $MANDIR/man1/cancel.1 lp.1
-f 0444 root sys $MANDIR/man5/mime.convs.5 man/mime.convs.man
-f 0444 root sys $MANDIR/man5/mime.types.5 man/mime.types.man
-f 0444 root sys $MANDIR/man5/printers.conf.5 man/printers.conf.man
+f 0444 root sys /usr/share/catman/a_man/cat1/accept.1 man/accept.8
+l 0444 root sys /usr/share/catman/a_man/cat1/reject.1 accept.1
+f 0444 root sys /usr/share/catman/u_man/cat1/backend.1 man/backend.1
+f 0444 root sys /usr/share/catman/u_man/cat5/classes.conf.5 man/classes.conf.5
+f 0444 root sys /usr/share/catman/a_man/cat1/cups-lpd.1 man/cups-lpd.8
+f 0444 root sys /usr/share/catman/a_man/cat1/cups-polld.1 man/cups-polld.8
+f 0444 root sys /usr/share/catman/u_man/cat5/cupsd.conf.5 man/cupsd.conf.5
+f 0444 root sys /usr/share/catman/a_man/cat1/cupsd.1 man/cupsd.8
+f 0444 root sys /usr/share/catman/a_man/cat1/enable.1 man/enable.8
+l 0444 root sys /usr/share/catman/a_man/cat1/disable.1 enable.1
+f 0444 root sys /usr/share/catman/u_man/cat1/filter.1 man/filter.1
+f 0444 root sys /usr/share/catman/a_man/cat1/lpadmin.1 man/lpadmin.8
+f 0444 root sys /usr/share/catman/a_man/cat1/lpc.1 man/lpc.8
+f 0444 root sys /usr/share/catman/a_man/cat1/lpinfo.1 man/lpinfo.8
+f 0444 root sys /usr/share/catman/a_man/cat1/lpmove.1 man/lpmove.8
+f 0444 root sys /usr/share/catman/u_man/cat1/lpoptions.1 man/lpoptions.1
+f 0444 root sys /usr/share/catman/u_man/cat1/lpq.1 man/lpq.1
+f 0444 root sys /usr/share/catman/u_man/cat1/lprm.1 man/lprm.1
+f 0444 root sys /usr/share/catman/u_man/cat1/lpr.1 man/lpr.1
+f 0444 root sys /usr/share/catman/u_man/cat1/lpstat.1 man/lpstat.1
+f 0444 root sys /usr/share/catman/u_man/cat1/lp.1 man/lp.1
+l 0444 root sys /usr/share/catman/u_man/cat1/cancel.1 lp.1
+f 0444 root sys /usr/share/catman/u_man/cat5/mime.convs.5 man/mime.convs.5
+f 0444 root sys /usr/share/catman/u_man/cat5/mime.types.5 man/mime.types.5
+f 0444 root sys /usr/share/catman/u_man/cat5/printers.conf.5 man/printers.conf.5
+%system !irix
+f 0444 root sys /usr/man/man8/accept.8 man/accept.man
+l 0444 root sys /usr/man/man8/reject.8 accept.man
+f 0444 root sys /usr/man/man1/backend.1 man/backend.man
+f 0444 root sys /usr/man/man1/classes.conf.5 man/classes.conf.man
+f 0444 root sys /usr/man/man8/cups-lpd.8 man/cups-lpd.man
+f 0444 root sys /usr/man/man8/cups-polld.8 man/cups-polld.man
+f 0444 root sys /usr/man/man8/cupsd.8 man/cupsd.man
+f 0444 root sys /usr/man/man5/cupsd.conf.5 man/cupsd.conf.man
+f 0444 root sys /usr/man/man8/enable.8 man/enable.man
+l 0444 root sys /usr/man/man8/disable.8 enable.man
+f 0444 root sys /usr/man/man1/filter.1 man/filter.man
+f 0444 root sys /usr/man/man8/lpadmin.8 man/lpadmin.man
+f 0444 root sys /usr/man/man8/lpc.8 man/lpc.man
+f 0444 root sys /usr/man/man8/lpinfo.8 man/lpinfo.man
+f 0444 root sys /usr/man/man8/lpmove.8 man/lpmove.man
+f 0444 root sys /usr/man/man1/lpoptions.1 man/lpoptions.man
+f 0444 root sys /usr/man/man1/lpq.1 man/lpq.man
+f 0444 root sys /usr/man/man1/lprm.1 man/lprm.man
+f 0444 root sys /usr/man/man1/lpr.1 man/lpr.man
+f 0444 root sys /usr/man/man1/lpstat.1 man/lpstat.man
+f 0444 root sys /usr/man/man1/lp.1 man/lp.man
+l 0444 root sys /usr/man/man1/cancel.1 lp.man
+f 0444 root sys /usr/man/man5/mime.convs.5 man/mime.convs.man
+f 0444 root sys /usr/man/man5/mime.types.5 man/mime.types.man
+f 0444 root sys /usr/man/man5/printers.conf.5 man/printers.conf.man
 
 # Startup script
 %system all
 i 0555 root sys cups cups.sh
 
 #
-# End of "$Id: cups.list 1735 2001-05-21 21:39:39Z mike $".
+# End of "$Id: cups.list 1127 2000-06-08 20:00:41Z mike $".
 #

cups.sh

@@ -4,7 +4,13 @@
 #
 #   Startup/shutdown script for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+#   Linux chkconfig stuff:
+#
+#   chkconfig: 02345 99 00
+#   description: Startup/shutdown script for the Common UNIX \
+#                Printing System (CUPS).
+#
+#   Copyright 1997-2000 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -23,70 +29,34 @@
 #         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
+# See what program to use for configuration stuff...
 case "`uname`" in
 	IRIX*)
 		IS_ON=/sbin/chkconfig
 		;;
 
-	NetBSD*)
-        	IS_ON=:
-		;;
-
 	*)
 		IS_ON=/bin/true
 		;;
 esac
 
-#### OS-Independent Stuff
-
-#
 # The verbose flag controls the printing of the names of
-# daemons as they are started.  Currently always echos for
-# all but IRIX, which can configure verbose bootup messages.
-#
-
+# daemons as they are started.
 if $IS_ON verbose; then
 	ECHO=echo
 else
 	ECHO=:
 fi
 
-#
-# See if the CUPS server (cupsd) is running...
-#
-
+# See if the CUPS server is running...
 case "`uname`" in
-	IRIX* | HP-UX* | SunOS* | AIX* | SINIX*)
+	IRIX* | HP-UX | SunOS)
 		pid=`ps -e | awk '{print $1,$4}' | grep cupsd | awk '{print $1}'`
 		;;
-	UnixWare*)
-		pid=`ps -e | awk '{print $1,$6}' | grep cupsd | awk '{print $1}'`
-		. /etc/TIMEZONE
-		;;
-	OSF1*)
+	OSF1)
 		pid=`ps -e | awk '{print $1,$5}' | grep cupsd | awk '{print $1}'`
 		;;
-	Linux* | NetBSD*)
+	Linux)
 		pid=`ps ax | awk '{print $1,$5}' | grep cupsd | awk '{print $1}'`
 		;;
 	*)
@@ -94,23 +64,22 @@ case "`uname`" in
 		;;
 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
+		if test "$pid" != ""; then
+			if $IS_ON cups; then
 				kill -HUP $pid
+				$ECHO "cups: scheduler restarted."
 			else
-				prefix=@prefix@
-				exec_prefix=@exec_prefix@
-				@sbindir@/cupsd
+				kill $pid
+				$ECHO "cups: scheduler stopped."
 			fi
-			$ECHO "cups: scheduler ${1}ed."
 		else
-			$ECHO "cups: scheduler stopped."
+			if $IS_ON cups; then
+				/usr/sbin/cupsd
+				$ECHO "cups: scheduler started."
+			fi
 		fi
 		;;
 
@@ -135,10 +104,6 @@ case $1 in
 		;;
 esac
 
-#
-# Exit with no errors.
-#
-
 exit 0
 
 

cups.spec

@@ -1,11 +1,11 @@
 #
-# "$Id: cups.spec 1735 2001-05-21 21:39:39Z mike $"
+# "$Id: cups.spec 1127 2000-06-08 20:00:41Z mike $"
 #
 #   RPM "spec" file for the Common UNIX Printing System (CUPS).
 #
 #   Original version by Jason McMullan <jmcc@ontv.com>.
 #
-#   Copyright 1999-2001 by Easy Software Products, all rights reserved.
+#   Copyright 1999-2000 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -26,30 +26,22 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.1.8
-Release: 1
+Version: 1.1b5
+Release: 0
 Copyright: GPL
 Group: System Environment/Daemons
-Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.gz
+Source: ftp://ftp.easysw.com/pub/cups/beta/cups-1.1b5-source.tar.gz
 Url: http://www.cups.org
 Packager: Michael Sweet <mike@easysw.com>
 Vendor: Easy Software Products
 # use buildroot so as not to disturb the version already installed
-BuildRoot: /var/tmp/%{name}-root
-Conflicts: lpr, LPRng
-Provides: libcups.so.2
-Provides: libcupsimage.so.2
-Provides: cupsd
+BuildRoot: /tmp/rpmbuild
+Conflicts: lpr
 
 %package devel
 Summary: Common Unix Printing System - development environment
 Group: Development/Libraries
 
-%package pstoraster
-Summary: Common Unix Printing System - PostScript RIP
-Group: System Environment/Daemons
-Provides: pstoraster
-
 %description
 The Common UNIX Printing System provides a portable printing layer for 
 UNIX® operating systems. It has been developed by Easy Software Products 
@@ -61,11 +53,6 @@ The Common UNIX Printing System provides a portable printing layer for
 UNIX® operating systems. This is the development package for creating
 additional printer drivers, and other CUPS services.
 
-%description devel
-The Common UNIX Printing System provides a portable printing layer for 
-UNIX® operating systems. This is the PostScript RIP package for
-supporting non-PostScript printer drivers.
-
 %prep
 %setup
 
@@ -76,142 +63,44 @@ supporting non-PostScript printer drivers.
 make
 
 %install
-# Make sure the RPM_BUILD_ROOT directory exists.
+# these lines just make sure the directory structure in the
+# RPM_BUILD_ROOT exists
 rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 
-make	prefix=$RPM_BUILD_ROOT \
-	exec_prefix=$RPM_BUILD_ROOT/usr \
-	AMANDIR=$RPM_BUILD_ROOT/usr/man \
-	BINDIR=$RPM_BUILD_ROOT/usr/bin \
-	DATADIR=$RPM_BUILD_ROOT/usr/share/cups \
-	DOCDIR=$RPM_BUILD_ROOT/usr/share/doc/cups \
-	INCLUDEDIR=$RPM_BUILD_ROOT/usr/include \
-	LIBDIR=$RPM_BUILD_ROOT/usr/lib \
-	LOGDIR=$RPM_BUILD_ROOT/var/log/cups \
-	LOCALEDIR=$RPM_BUILD_ROOT/usr/share/locale \
-	MANDIR=$RPM_BUILD_ROOT/usr/man \
-	PAMDIR=$RPM_BUILD_ROOT/etc/pam.d \
+make prefix=$RPM_BUILD_ROOT/usr LOGDIR=$RPM_BUILD_ROOT/var/log/cups \
 	REQUESTS=$RPM_BUILD_ROOT/var/spool/cups \
-	SBINDIR=$RPM_BUILD_ROOT/usr/sbin \
-	SERVERBIN=$RPM_BUILD_ROOT/usr/lib/cups \
-	SERVERROOT=$RPM_BUILD_ROOT/etc/cups \
-	install
+	SERVERROOT=$RPM_BUILD_ROOT/etc/cups install
+
+install -m 755 -o root -g root cups.sh $RPM_BUILD_ROOT/etc/rc.d/init.d/cups
 
 %post
-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
+/sbin/chkconfig --add cups
+/sbin/chkconfig cups on
+/etc/rc.d/init.d/cups start
 
 %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
+/etc/rc.d/init.d/cups stop
+/sbin/chkconfig --del cups
 
 %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/*
-
+/etc/*
 /usr/bin/*
 /usr/lib/*.so*
-%dir /usr/lib/cups
-%dir /usr/lib/cups/backend
-/usr/lib/cups/backend/*
-%dir /usr/lib/cups/cgi-bin
-/usr/lib/cups/cgi-bin/*
-%dir /usr/lib/cups/filter
-/usr/lib/cups/filter/hpgltops
-/usr/lib/cups/filter/imagetops
-/usr/lib/cups/filter/imagetoraster
-/usr/lib/cups/filter/pdftops
-/usr/lib/cups/filter/pstops
-/usr/lib/cups/filter/rastertoepson
-/usr/lib/cups/filter/rastertohp
-/usr/lib/cups/filter/texttops
 /usr/man/*
 /usr/sbin/*
-%dir /usr/share/cups
-%dir /usr/share/cups/banners
-/usr/share/cups/banners/*
-%dir /usr/share/cups/charsets
-/usr/share/cups/charsets/*
-%dir /usr/share/cups/data
-/usr/share/cups/data/*
-%dir /usr/share/cups/model
-/usr/share/cups/model/*
-%dir /usr/share/cups/templates
-/usr/share/cups/templates/*
-%dir /usr/share/doc/cups
-/usr/share/doc/cups/*
-%dir /usr/share/locale
-/usr/share/locale/*
-%attr(0700,lp,root) %dir /var/spool/cups
-%attr(1700,lp,root) %dir /var/spool/cups/tmp
+/usr/share/*
+/usr/lib/cups/*
+/var/*
 
 %files devel
-%dir /usr/include/cups
 /usr/include/cups/*
 /usr/lib/*.a
 
-%files pstoraster
-%dir /usr/lib/cups/filter
-/usr/lib/cups/filter/pstoraster
-%dir /usr/share/cups/fonts
-/usr/share/cups/fonts/*
-%dir /usr/share/cups/pstoraster
-/usr/share/cups/pstoraster/*
-
 #
-# End of "$Id: cups.spec 1735 2001-05-21 21:39:39Z mike $".
+# End of "$Id: cups.spec 1127 2000-06-08 20:00:41Z mike $".
 #

cups/Makefile

@@ -3,7 +3,7 @@
 #
 #   Support library Makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2000 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -28,9 +28,8 @@ include ../Makedefs
 # Object files...
 #
 
-LIBOBJS	=	dest.o emit.o encode.o http.o ipp.o language.o mark.o md5.o \
-		md5passwd.o options.o page.o ppd.o snprintf.o string.o \
-		tempfile.o usersys.o util.o
+LIBOBJS	=	dest.o emit.o http.o ipp.o language.o mark.o md5.o md5passwd.o \
+		options.o page.o ppd.o snprintf.o string.o usersys.o util.o
 OBJS	=	$(LIBOBJS) testhttp.o testppd.o
 
 
@@ -60,7 +59,7 @@ all:	$(TARGETS)
 #
 
 clean:
-	$(RM) $(OBJS) $(TARGETS) `basename $(LIBCUPS) .2`
+	$(RM) $(OBJS) $(TARGETS)
 
 
 #
@@ -69,16 +68,13 @@ clean:
 
 install:	all
 	-$(MKDIR) $(INCLUDEDIR)/cups
-	$(CHMOD) ugo+rx $(INCLUDEDIR)
-	$(CHMOD) ugo+rx $(INCLUDEDIR)/cups
 	$(INSTALL_DATA) $(HEADERS) $(INCLUDEDIR)/cups
 	-$(MKDIR) $(LIBDIR)
-	$(CHMOD) ugo+rx $(LIBDIR)
 	$(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
 	if test $(LIBCUPS) != "libcups.a" -a $(LIBCUPS) != "libcups.la"; then \
 		$(INSTALL_LIB) libcups.a $(LIBDIR); \
-		$(RM) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
-		$(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
+		$(RM) `basename $(LIBCUPS) .2`; \
+		$(LN) $(LIBCUPS) `basename $(LIBCUPS) .2`; \
 	fi
 
 
@@ -88,7 +84,7 @@ install:	all
 
 libcups.so.2 libcups.sl.2:	$(LIBOBJS) ../Makedefs
 	echo Linking $@...
-	$(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS) $(SSLLIBS)
+	$(DSO) $@ $(LIBOBJS)
 	$(RM) `basename $@ .2`
 	$(LN) $@ `basename $@ .2`
 
@@ -99,8 +95,7 @@ libcups.so.2 libcups.sl.2:	$(LIBOBJS) ../Makedefs
 
 libcups.la:    $(LIBOBJS) ../Makedefs
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
-		-version-info 2:3 $(SSLLIBS)
+	$(CC) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) -version-info 2:0
 
 
 #
@@ -125,7 +120,6 @@ cups_C.h:	../locale/C/cups_C
 
 dest.o:		cups.h http.h ipp.h language.h string.h
 emit.o:		ppd.h
-encode.o:	cups.h ipp.h string.h
 http.o:		http.h ipp.h md5.h string.h
 ipp.o:		http.h ipp.h string.h language.h
 language.o:	cups_C.h language.h string.h
@@ -136,7 +130,6 @@ page.o:		ppd.h
 ppd.o:		language.h ppd.h
 snprintf.o:	string.h
 string.o:	string.h
-tempfile.o:	cups.h string.h
 usersys.o:	cups.h
 util.o:		cups.h http.h ipp.h
 
@@ -147,7 +140,7 @@ util.o:		cups.h http.h ipp.h
 
 testhttp:	testhttp.o libcups.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testhttp.o libcups.a $(NETLIBS) $(SSLLIBS)
+	$(CC) $(LDFLAGS) -o $@ testhttp.o libcups.a $(NETLIBS)
 
 testhttp.o:	http.h
 

cups/cups.dsp

@@ -85,11 +85,11 @@ LIB32=link.exe -lib
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=.\dest.c
+SOURCE=.\emit.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\emit.c
+SOURCE=.\filter.c
 # End Source File
 # Begin Source File
 
@@ -109,11 +109,7 @@ SOURCE=.\mark.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\md5.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\md5passwd.c
+SOURCE=.\mime.c
 # End Source File
 # Begin Source File
 
@@ -129,6 +125,10 @@ SOURCE=.\ppd.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\raster.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\snprintf.c
 # End Source File
 # Begin Source File
@@ -137,7 +137,7 @@ SOURCE=.\string.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\usersys.c
+SOURCE=.\type.c
 # End Source File
 # Begin Source File
 
@@ -153,14 +153,6 @@ 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
@@ -173,7 +165,7 @@ SOURCE=.\language.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\md5.h
+SOURCE=.\mime.h
 # End Source File
 # Begin Source File
 
@@ -181,7 +173,7 @@ SOURCE=.\ppd.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\string.h
+SOURCE=.\raster.h
 # End Source File
 # End Group
 # End Target

cups/cups.h

@@ -3,7 +3,7 @@
  *
  *   API definitions for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products.
+ *   Copyright 1997-2000 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -29,8 +29,8 @@
  * Include necessary headers...
  */
 
-#  include "ipp.h"
-#  include "ppd.h"
+#  include <cups/ipp.h>
+#  include <cups/ppd.h>
 
 
 /*
@@ -46,7 +46,7 @@ extern "C" {
  * Constants...
  */
 
-#  define CUPS_VERSION		1.0103
+#  define CUPS_VERSION		1.0100
 #  define CUPS_DATE_ANY		-1
 
 
@@ -75,7 +75,6 @@ enum					/* Not a typedef'd enum so we can OR */
   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) */
 };
 
@@ -94,22 +93,7 @@ typedef struct				/**** Destination ****/
   cups_option_t	*options;		/* Options */
 } cups_dest_t;
 
-typedef struct				/**** Job ****/
-{
-  int		id;			/* The job ID */
-  char		*dest,			/* Printer or class name */
-		*title,			/* Title/job name */
-		*user,			/* User the submitted the job */
-		*format;		/* Document format */
-  ipp_jstate_t	state;			/* Job state */
-  int		size,			/* Size in kilobytes */
-		priority;		/* Priority (1-100) */
-  time_t	completed_time,		/* Time the job was completed */
-		creation_time,		/* Time the job was created */
-		processing_time;	/* Time the job was processed */
-} cups_job_t;
-
-
+  
 /*
  * Functions...
  */
@@ -118,12 +102,8 @@ extern int		cupsCancelJob(const 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);
 extern int		cupsGetClasses(char ***classes);
 extern const char	*cupsGetDefault(void);
-extern int		cupsGetJobs(cups_job_t **jobs, const char *dest,
-			            int myjobs, int completed);
 extern const char	*cupsGetPPD(const char *printer);
 extern int		cupsGetPrinters(char ***printers);
 extern ipp_status_t	cupsLastError(void);
@@ -134,7 +114,6 @@ extern int		cupsPrintFiles(const char *printer, int num_files,
 			               const char **files, const char *title,
 				       int num_options, cups_option_t *options);
 extern char		*cupsTempFile(char *filename, int len);
-extern int		cupsTempFd(char *filename, int len);
 
 extern int		cupsAddDest(const char *name, const char *instance,
 			            int num_dests, cups_dest_t **dests);
@@ -146,8 +125,6 @@ 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 void		cupsFreeOptions(int num_options, cups_option_t *options);
 extern const char	*cupsGetOption(const char *name, int num_options,
 			               cups_option_t *options);
@@ -158,10 +135,6 @@ extern int		cupsMarkOptions(ppd_file_t *ppd, int num_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

cups/cups_C.h

@@ -18,7 +18,7 @@
 "Cyan",
 "Magenta",
 "Yellow",
-"Copyright 1993-2001 by Easy Software Products, All Rights Reserved.",
+"Copyright 1993-2000 by Easy Software Products, All Rights Reserved.",
 "General",
 "Printer",
 "Image",
@@ -124,7 +124,6 @@
 "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.",

cups/debug.h

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

cups/dest.c

@@ -4,7 +4,7 @@
  *   User-defined destination (and option) support for the Common UNIX
  *   Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products.
+ *   Copyright 1997-2000 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -87,8 +87,9 @@ cupsAddDest(const char  *name,		/* I - Name of destination */
   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 &&
+    else if (instance == NULL && dest->instance != NULL)
+      break;
+    else if (instance != NULL && dest->instance != NULL &&
              strcasecmp(instance, dest->instance) < 0)
       break;
 
@@ -210,9 +211,6 @@ cupsGetDests(cups_dest_t **dests)	/* O - 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 */
 
 
  /*
@@ -256,37 +254,14 @@ cupsGetDests(cups_dest_t **dests)	/* O - Destinations */
   * Grab the default destination...
   */
 
-  if ((defprinter = cupsGetDefault()) != NULL)
-  {
-   /*
-    * Grab printer and instance name...
-    */
-
-    strncpy(name, defprinter, sizeof(name) - 1);
-    name[sizeof(name) - 1] = '\0';
-
-    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;
-  }
+  if ((dest = cupsGetDest(cupsGetDefault(), NULL, num_dests, *dests)) != NULL)
+    dest->is_default = 1;
 
  /*
   * 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);
+  num_dests = cups_get_dests(CUPS_SERVERROOT "/lpoptions", num_dests, dests);
 
   if ((home = getenv("HOME")) != NULL)
   {
@@ -322,24 +297,12 @@ cupsSetDests(int         num_dests,	/* I - Number of destinations */
   * Figure out which file to write to...
   */
 
-#ifdef WIN32
-  if ((home = getenv("CUPS_SERVERROOT")) == NULL)
-    home = CUPS_SERVERROOT;
-
-  snprintf(filename, sizeof(filename), "%s/lpoptions", home);
-#else
   if (getuid() == 0)
-  {
-    if ((home = getenv("CUPS_SERVERROOT")) == NULL)
-      home = CUPS_SERVERROOT;
-
-    snprintf(filename, sizeof(filename), "%s/lpoptions", home);
-  }
+    strcpy(filename, CUPS_SERVERROOT "/lpoptions");
   else if ((home = getenv("HOME")) != NULL)
     snprintf(filename, sizeof(filename), "%s/.lpoptions", home);
   else
     return;
-#endif /* WIN32 */
 
  /*
   * Try to open the file...
@@ -365,12 +328,7 @@ cupsSetDests(int         num_dests,	/* I - Number of destinations */
 
       for (j = dest->num_options, option = dest->options; j > 0; j --, option ++)
         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);
-	}
+	  fprintf(fp, " %s=%s", option->name, option->value);
 	else
 	  fprintf(fp, " %s", option->name);
 
@@ -401,18 +359,8 @@ cups_get_dests(const char  *filename,	/* I - File to read from */
 		*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...
   */
@@ -522,7 +470,7 @@ cups_get_dests(const char  *filename,	/* I - File to read from */
     * Set this as default if needed...
     */
 
-    if (strncasecmp(line, "default", 7) == 0 && printer == NULL)
+    if (strncasecmp(line, "default", 7) == 0)
     {
       for (i = 0; i < num_dests; i ++)
         (*dests)[i].is_default = 0;

cups/emit.c

@@ -3,7 +3,7 @@
  *
  *   PPD code emission routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -25,11 +25,8 @@
  *
  * Contents:
  *
- *   ppdCollect() - Collect all marked options that reside in the specified
- *   ppdEmit()    - Emit code for marked options to a file.
- *   ppdEmitFd()  - Emit code for marked options to a file.
- *   ppdEmitJCL() - Emit code for JCL options to a file.
- *   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.
  */
 
 /*
@@ -52,17 +49,180 @@
  */
 
 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);
 
 
 /*
- * 'ppdCollect()' - Collect all marked options that reside in the specified
- *                  section.
+ * 'ppdEmit()' - 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 */
+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 (strcasecmp(((ppd_option_t *)choices[i]->option)->keyword, "PageSize") == 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("pop pop pop\n", fp);
+	  fputs("<</PageSize[5 -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);
+}
+
+
+/*
+ * '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 */
+  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 */
@@ -136,290 +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 */
-
-
-  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(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[5 -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);
-      }
-
-      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 */
-  char		buf[1024];		/* Output buffer for feature */
-
-
-  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 (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_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$".
  */

cups/encode.c

@@ -1,311 +0,0 @@
-/*
- * "$Id$"
- *
- *   Option encoding routines for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 1997-2001 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   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:
- *
- *   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"
-
-
-/*
- * 'cupsEncodeOptions()' - Encode printer options into IPP attributes.
- */
-
-void
-cupsEncodeOptions(ipp_t         *ipp,		/* I - Request to add to */
-        	  int           num_options,	/* I - Number of options */
-		  cups_option_t *options)	/* I - Options */
-{
-  int		i, j;			/* Looping vars */
-  int		count;			/* Number of values */
-  int		n;			/* Attribute value */
-  char		*s,			/* Pointer into option value */
-		*val,			/* Pointer to option value */
-		*copy,			/* Copy of option value */
-		*sep;			/* Option separator */
-  ipp_attribute_t *attr;		/* IPP job-id attribute */
-
-
-  DEBUG_printf(("cupsEncodeOptions(%p, %d, %p)\n", ipp, num_options, options));
-
-  if (ipp == NULL || num_options < 1 || options == NULL)
-    return;
-
- /*
-  * Handle the document format stuff first...
-  */
-
-  if ((val = (char *)cupsGetOption("document-format", num_options, options)) != NULL)
-    ippAddString(ipp, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
-        	 NULL, val);
-  else if (cupsGetOption("raw", num_options, options))
-    ippAddString(ipp, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
-        	 NULL, "application/vnd.cups-raw");
-  else
-    ippAddString(ipp, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
-        	 NULL, "application/octet-stream");
-
- /*
-  * Then add all other options...
-  */
-
-  for (i = 0; i < num_options; i ++)
-  {
-   /*
-    * Skip document format options - handled above...
-    */
-
-    if (strcasecmp(options[i].name, "raw") == 0 ||
-        strcasecmp(options[i].name, "document-format") == 0 ||
-	!options[i].name[0])
-      continue;
-
-   /*
-    * Count the number of values...
-    */
-
-    for (count = 1, sep = options[i].value;
-         (sep = strchr(sep + 1, ',')) != NULL;
-	 count ++);
-
-    DEBUG_printf(("cupsEncodeOptions: option = \'%s\', count = %d\n",
-                  options[i].name, count));
-
-    if ((attr = _ipp_add_attr(ipp, count)) == NULL)
-    {
-     /*
-      * Ran out of memory!
-      */
-
-      DEBUG_puts("cupsEncodeOptions: Ran out of memory for attributes!");
-      return;
-    }
-
-    attr->group_tag = IPP_TAG_JOB;
-
-    if ((attr->name = strdup(options[i].name)) == NULL)
-    {
-     /*
-      * Ran out of memory!
-      */
-
-      DEBUG_puts("cupsEncodeOptions: Ran out of memory for name!");
-      return;
-    }
-
-    if (count > 1)
-    {
-     /*
-      * Make a copy of the value we can fiddle with...
-      */
-
-      if ((copy = strdup(options[i].value)) == NULL)
-      {
-       /*
-	* Ran out of memory!
-	*/
-
-	DEBUG_puts("cupsEncodeOptions: Ran out of memory for value copy!");
-	return;
-      }
-
-      val = copy;
-    }
-    else
-    {
-     /*
-      * Since we have a single value, use the value directly...
-      */
-
-      val  = options[i].value;
-      copy = NULL;
-    }
-
-   /*
-    * See what the option value is; for compatibility with older interface
-    * scripts, we have to support single-argument options as well as
-    * option=value, option=low-high, option=MxN, and option=val1,val2,...,valN.
-    */
-
-    if (*val == '\0')
-    {
-     /*
-      * Old-style System V boolean value...
-      */
-
-      attr->value_tag = IPP_TAG_BOOLEAN;
-
-      if (strncasecmp(attr->name, "no", 2) == 0)
-      {
-        DEBUG_puts("cupsEncodeOptions: Added boolean false value...");
-        strcpy(attr->name, attr->name + 2);
-	attr->values[0].boolean = 0;
-      }
-      else
-      {
-        DEBUG_puts("cupsEncodeOptions: Added boolean true value...");
-	attr->values[0].boolean = 1;
-      }
-    }
-    else
-    {
-     /*
-      * Scan the value string for values...
-      */
-
-      for (j = 0; *val != '\0'; val = sep, j ++)
-      {
-       /*
-        * Find the end of this value and mark it if needed...
-	*/
-
-        if ((sep = strchr(val, ',')) != NULL)
-	  *sep++ = '\0';
-	else
-	  sep = val + strlen(val);
-
-       /*
-        * See what kind of value it is...
-	*/
-
-	if (strcasecmp(val, "true") == 0 ||
-            strcasecmp(val, "on") == 0 ||
-	    strcasecmp(val, "yes") == 0)
-	{
-	 /*
-	  * Boolean value - true...
-	  */
-
-          attr->value_tag         = IPP_TAG_BOOLEAN;
-	  attr->values[j].boolean = 1;
-
-          DEBUG_puts("cupsEncodeOptions: Added boolean true value...");
-	}
-	else if (strcasecmp(val, "false") == 0 ||
-        	 strcasecmp(val, "off") == 0 ||
-		 strcasecmp(val, "no") == 0)
-	{
-	 /*
-	  * Boolean value - false...
-	  */
-
-          attr->value_tag         = IPP_TAG_BOOLEAN;
-	  attr->values[j].boolean = 0;
-
-          DEBUG_puts("cupsEncodeOptions: Added boolean false value...");
-	}
-	else
-	{
-	 /*
-	  * Number, range, resolution, or string...
-	  */
-
-	  n = strtol(val, &s, 0);
-
-	  if (*s != '\0' && *s != '-' && (*s != 'x' || s == val))
-	  {
-	   /*
-	    * String value(s)...
-	    */
-
-            if ((attr->values[j].string.text = strdup(val)) == NULL)
-	    {
-	     /*
-	      * Ran out of memory!
-	      */
-
-	      DEBUG_puts("cupsEncodeOptions: Ran out of memory for string!");
-	      return;
-	    }
-
-            attr->value_tag = IPP_TAG_NAME;
-
-	    DEBUG_printf(("cupsEncodeOptions: Added string value \'%s\'...\n", val));
-	  }
-	  else if (*s == '-')
-	  {
-            attr->value_tag             = IPP_TAG_RANGE;
-	    attr->values[j].range.lower = n;
-	    attr->values[j].range.upper = strtol(s + 1, NULL, 0);
-
-	    DEBUG_printf(("cupsEncodeOptions: Added range option value %d-%d...\n",
-                	  n, attr->values[j].range.upper));
-	  }
-	  else if (*s == 'x')
-	  {
-            attr->value_tag                 = IPP_TAG_RESOLUTION;
-	    attr->values[j].resolution.xres = n;
-	    attr->values[j].resolution.yres = strtol(s + 1, &s, 0);
-
-	    if (strcasecmp(s, "dpc") == 0)
-              attr->values[j].resolution.units = IPP_RES_PER_CM;
-            else if (strcasecmp(s, "dpi") == 0)
-              attr->values[j].resolution.units = IPP_RES_PER_INCH;
-            else
-	    {
-              if ((attr->values[j].string.text = strdup(val)) == NULL)
-	      {
-	       /*
-		* Ran out of memory!
-		*/
-
-		DEBUG_puts("cupsEncodeOptions: Ran out of memory for string!");
-		return;
-	      }
-
-              attr->value_tag = IPP_TAG_NAME;
-
-	      DEBUG_printf(("cupsEncodeOptions: Added string value \'%s\'...\n", val));
-	      continue;
-            }
-
-	    DEBUG_printf(("cupsEncodeOptions: Adding resolution option value %s...\n",
-                	  val));
-	  }
-	  else
-	  {
-            attr->value_tag         = IPP_TAG_INTEGER;
-	    attr->values[j].integer = n;
-
-	    DEBUG_printf(("cupsEncodeOptions: Adding integer option value %d...\n", n));
-	  }
-        }
-      }
-    }
-  }
-}
-
-
-/*
- * End of "$Id$".
- */

cups/http.c

@@ -3,9 +3,9 @@
  *
  *   HTTP routines for the Common UNIX Printing System (CUPS) scheduler.
  *
- *   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
  *
- *   These coded instructions, statements, and computer programs are the
+ *   These statusd 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
@@ -23,42 +23,39 @@
  *
  * Contents:
  *
- *   httpInitialize()     - Initialize the HTTP interface library and set the
- *                          default HTTP proxy (if any).
- *   httpCheck()          - Check to see if there is a pending response from
- *                          the server.
- *   httpClose()          - Close an HTTP connection...
- *   httpConnect()        - Connect to a HTTP server.
- *   httpConnectEncrypt() - Connect to a HTTP server using encryption.
- *   httpEncryption()     - Set the required encryption on the link.
- *   httpReconnect()      - Reconnect to a HTTP server...
- *   httpSeparate()       - Separate a Universal Resource Identifier into its
- *                          components.
- *   httpSetField()       - Set the value of an HTTP header.
- *   httpDelete()         - Send a DELETE request to the server.
- *   httpGet()            - Send a GET request to the server.
- *   httpHead()           - Send a HEAD request to the server.
- *   httpOptions()        - Send an OPTIONS request to the server.
- *   httpPost()           - Send a POST request to the server.
- *   httpPut()            - Send a PUT request to the server.
- *   httpTrace()          - Send an TRACE request to the server.
- *   httpFlush()          - Flush data from a HTTP connection.
- *   httpRead()           - Read data from a HTTP connection.
- *   httpWrite()          - Write data to a HTTP connection.
- *   httpGets()           - Get a line of text from a HTTP connection.
- *   httpPrintf()         - Print a formatted string to a HTTP connection.
- *   httpStatus()         - Return a short string describing a HTTP status code.
- *   httpGetDateString()  - Get a formatted date/time string from a time value.
- *   httpGetDateTime()    - Get a time value from a formatted date/time string.
- *   httpUpdate()         - Update the current HTTP state for incoming data.
- *   httpDecode64()       - Base64-decode a string.
- *   httpEncode64()       - Base64-encode a string.
- *   httpGetLength()      - Get the amount of data remaining from the
- *                          content-length or transfer-encoding fields.
- *   http_field()         - Return the field index for a field name.
- *   http_send()          - Send a request with all fields and the trailing
- *                          blank line.
- *   http_upgrade()       - Force upgrade to TLS encryption.
+ *   httpInitialize()    - Initialize the HTTP interface library and set the
+ *                         default HTTP proxy (if any).
+ *   httpCheck()         - Check to see if there is a pending response from
+ *                         the server.
+ *   httpClose()         - Close an HTTP connection...
+ *   httpConnect()       - Connect to a HTTP server.
+ *   httpReconnect()     - Reconnect to a HTTP server...
+ *   httpSeparate()      - Separate a Universal Resource Identifier into its
+ *                         components.
+ *   httpSetField()      - Set the value of an HTTP header.
+ *   httpDelete()        - Send a DELETE request to the server.
+ *   httpGet()           - Send a GET request to the server.
+ *   httpHead()          - Send a HEAD request to the server.
+ *   httpOptions()       - Send an OPTIONS request to the server.
+ *   httpPost()          - Send a POST request to the server.
+ *   httpPut()           - Send a PUT request to the server.
+ *   httpTrace()         - Send an TRACE request to the server.
+ *   httpFlush()         - Flush data from a HTTP connection.
+ *   httpRead()          - Read data from a HTTP connection.
+ *   httpWrite()         - Write data to a HTTP connection.
+ *   httpGets()          - Get a line of text from a HTTP connection.
+ *   httpPrintf()        - Print a formatted string to a HTTP connection.
+ *   httpStatus()        - Return a short string describing a HTTP status code.
+ *   httpGetDateString() - Get a formatted date/time string from a time value.
+ *   httpGetDateTime()   - Get a time value from a formatted date/time string.
+ *   httpUpdate()        - Update the current HTTP state for incoming data.
+ *   httpDecode64()      - Base64-decode a string.
+ *   httpEncode64()      - Base64-encode a string.
+ *   httpGetLength()     - Get the amount of data remaining from the
+ *                         content-length or transfer-encoding fields.
+ *   http_field()        - Return the field index for a field name.
+ *   http_send()         - Send a request with all fields and the trailing
+ *                         blank line.
  */
 
 /*
@@ -81,13 +78,6 @@
 #  include <signal.h>
 #endif /* !WIN32 && !__EMX__ */
 
-#ifdef HAVE_LIBSSL
-#  include <openssl/err.h>
-#  include <openssl/rand.h>
-#  include <openssl/ssl.h>
-#endif /* HAVE_LIBSSL */
-
-
 /*
  * Some operating systems have done away with the Fxxxx constants for
  * the fcntl() call; this works around that "feature"...
@@ -105,9 +95,6 @@
 static http_field_t	http_field(const char *name);
 static int		http_send(http_t *http, http_state_t request,
 			          const char *uri);
-#ifdef HAVE_LIBSSL
-static int		http_upgrade(http_t *http);
-#endif /* HAVE_LIBSSL */
 
 
 /*
@@ -179,12 +166,6 @@ static const char	*months[12] =
 void
 httpInitialize(void)
 {
-#ifdef HAVE_LIBSSL
-  struct timeval	curtime;	/* Current time in microseconds */
-  int			i;		/* Looping var */
-  unsigned char		data[1024];	/* Seed data */
-#endif /* HAVE_LIBSSL */
-
 #if defined(WIN32) || defined(__EMX__)
   WSADATA	winsockdata;	/* WinSock data */
   static int	initialized = 0;/* Has WinSock been initialized? */
@@ -208,24 +189,6 @@ httpInitialize(void)
 #else
   signal(SIGPIPE, SIG_IGN);
 #endif /* WIN32 || __EMX__ */
-
-#ifdef HAVE_LIBSSL
-  SSL_load_error_strings();
-  SSL_library_init();
-
- /*
-  * Using the current time is a dubious random seed, but on some systems
-  * it is the best we can do (on others, this seed isn't even used...)
-  */
-
-  gettimeofday(&curtime, NULL);
-  srand(curtime.tv_sec + curtime.tv_usec);
-
-  for (i = 0; i < sizeof(data); i ++)
-    data[i] = rand(); /* Yes, this is a poor source of random data... */
-
-  RAND_seed(&data, sizeof(data));
-#endif /* HAVE_LIBSSL */
 }
 
 
@@ -271,29 +234,9 @@ httpCheck(http_t *http)		/* I - HTTP connection */
 void
 httpClose(http_t *http)		/* I - Connection to close */
 {
-#ifdef HAVE_LIBSSL
-  SSL_CTX	*context;	/* Context for encryption */
-  SSL		*conn;		/* Connection for encryption */
-#endif /* HAVE_LIBSSL */
-
-
-  if (!http)
+  if (http == NULL)
     return;
 
-#ifdef HAVE_LIBSSL
-  if (http->tls)
-  {
-    conn    = (SSL *)(http->tls);
-    context = SSL_get_SSL_CTX(conn);
-
-    SSL_shutdown(conn);
-    SSL_CTX_free(context);
-    SSL_free(conn);
-
-    http->tls = NULL;
-  }
-#endif /* HAVE_LIBSSL */
-
 #ifdef WIN32
   closesocket(http->fd);
 #else
@@ -311,32 +254,6 @@ httpClose(http_t *http)		/* I - Connection to close */
 http_t *			/* O - New HTTP connection */
 httpConnect(const char *host,	/* I - Host to connect to */
             int        port)	/* I - Port number */
-{
-  http_encryption_t	encrypt;/* Type of encryption to use */
-
-
- /*
-  * Set the default encryption status...
-  */
-
-  if (port == 443)
-    encrypt = HTTP_ENCRYPT_ALWAYS;
-  else
-    encrypt = HTTP_ENCRYPT_IF_REQUESTED;
-
-  return (httpConnectEncrypt(host, port, encrypt));
-}
-
-
-/*
- * 'httpConnectEncrypt()' - Connect to a HTTP server using encryption.
- */
-
-http_t *				/* O - New HTTP connection */
-httpConnectEncrypt(const char *host,	/* I - Host to connect to */
-                   int        port,	/* I - Port number */
-		   http_encryption_t encrypt)
-					/* I - Type of encryption to use */
 {
   http_t		*http;		/* New HTTP connection */
   struct hostent	*hostaddr;	/* Host address data */
@@ -352,23 +269,6 @@ httpConnectEncrypt(const char *host,	/* I - Host to connect to */
   */
 
   if ((hostaddr = gethostbyname(host)) == NULL)
-  {
-   /*
-    * This hack to make users that don't have a localhost entry in
-    * their hosts file or DNS happy...
-    */
-
-    if (strcasecmp(host, "localhost") != 0)
-      return (NULL);
-    else if ((hostaddr = gethostbyname("127.0.0.1")) == NULL)
-      return (NULL);
-  }
-
- /*
-  * Verify that it is an IPv4 address (IPv6 support will come in CUPS 1.2...)
-  */
-
-  if (hostaddr->h_addrtype != AF_INET || hostaddr->h_length != 4)
     return (NULL);
 
  /*
@@ -382,7 +282,6 @@ httpConnectEncrypt(const char *host,	/* I - Host to connect to */
   http->version  = HTTP_1_1;
   http->blocking = 1;
   http->activity = time(NULL);
-  http->fd       = -1;
 
  /*
   * Copy the hostname and port and then "reconnect"...
@@ -396,17 +295,6 @@ httpConnectEncrypt(const char *host,	/* I - Host to connect to */
 #else
   http->hostaddr.sin_port   = htons(port);
 #endif /* WIN32 */
-
- /*
-  * Set the encryption status...
-  */
-
-  http->encryption = encrypt;
-
- /*
-  * Connect to the remote system...
-  */
-
   if (httpReconnect(http))
   {
     free(http);
@@ -417,36 +305,6 @@ httpConnectEncrypt(const char *host,	/* I - Host to connect to */
 }
 
 
-/*
- * 'httpEncryption()' - Set the required encryption on the link.
- */
-
-int					/* O - -1 on error, 0 on success */
-httpEncryption(http_t            *http,	/* I - HTTP data */
-               http_encryption_t e)	/* I - New encryption preference */
-{
-#ifdef HAVE_LIBSSL
-  if (!http)
-    return (0);
-
-  http->encryption = e;
-
-  if ((http->encryption == HTTP_ENCRYPT_ALWAYS && !http->tls) ||
-      (http->encryption == HTTP_ENCRYPT_NEVER && http->tls))
-    return (httpReconnect(http));
-  else if (http->encryption == HTTP_ENCRYPT_REQUIRED && !http->tls)
-    return (http_upgrade(http));
-  else
-    return (0);
-#else
-  if (e == HTTP_ENCRYPT_ALWAYS || e == HTTP_ENCRYPT_REQUIRED)
-    return (-1);
-  else
-    return (0);
-#endif /* HAVE_LIBSSL */
-}
-
-
 /*
  * 'httpReconnect()' - Reconnect to a HTTP server...
  */
@@ -454,30 +312,14 @@ httpEncryption(http_t            *http,	/* I - HTTP data */
 int				/* O - 0 on success, non-zero on failure */
 httpReconnect(http_t *http)	/* I - HTTP data */
 {
-  int		val;		/* Socket option value */
-#ifdef HAVE_LIBSSL
-  SSL_CTX	*context;	/* Context for encryption */
-  SSL		*conn;		/* Connection for encryption */
+  int	val;			/* Socket option value */
 
 
-  if (http->tls)
-  {
-    conn    = (SSL *)(http->tls);
-    context = SSL_get_SSL_CTX(conn);
-
-    SSL_shutdown(conn);
-    SSL_CTX_free(context);
-    SSL_free(conn);
-
-    http->tls = NULL;
-  }
-#endif /* HAVE_LIBSSL */
-
  /*
   * Close any previously open socket...
   */
 
-  if (http->fd >= 0)
+  if (http->fd)
 #ifdef WIN32
     closesocket(http->fd);
 #else
@@ -532,52 +374,12 @@ httpReconnect(http_t *http)	/* I - HTTP data */
     close(http->fd);
 #endif
 
-    http->fd = -1;
-
     return (-1);
   }
 
   http->error  = 0;
   http->status = HTTP_CONTINUE;
 
-#ifdef HAVE_LIBSSL
-  if (http->encryption == HTTP_ENCRYPT_ALWAYS)
-  {
-   /*
-    * Always do encryption via SSL.
-    */
-
-    context = SSL_CTX_new(SSLv23_method());
-    conn    = SSL_new(context);
-
-    SSL_set_fd(conn, http->fd);
-    if (SSL_connect(conn) != 1)
-    {
-      SSL_CTX_free(context);
-      SSL_free(conn);
-
-#if defined(WIN32) || defined(__EMX__)
-      http->error  = WSAGetLastError();
-#else
-      http->error  = errno;
-#endif /* WIN32 || __EMX__ */
-      http->status = HTTP_ERROR;
-
-#ifdef WIN32
-      closesocket(http->fd);
-#else
-      close(http->fd);
-#endif
-
-      return (-1);
-    }
-
-    http->tls = conn;
-  }
-  else if (http->encryption == HTTP_ENCRYPT_REQUIRED)
-    return (http_upgrade(http));
-#endif /* HAVE_LIBSSL */
-
   return (0);
 }
 
@@ -595,30 +397,13 @@ httpSeparate(const char *uri,		/* I - Universal Resource Identifier */
 	     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	*ptr;			/* Pointer into string... */
 
 
- /*
-  * 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...
-  */
-
-  strncpy(safeuri, uri, sizeof(safeuri));
-  safeuri[sizeof(safeuri) - 1] = '\0';
-
-  uri = safeuri;
-
  /*
   * Grab the method portion of the URI...
   */
@@ -637,9 +422,9 @@ httpSeparate(const char *uri,		/* I - Universal Resource Identifier */
     * Standard URI with method...
     */
 
-    for (ptr = host; *uri != ':' && *uri != '\0'; uri ++)
-      if (ptr < (host + HTTP_MAX_URI - 1))
-        *ptr++ = *uri;
+    ptr = host;
+    while (*uri != ':' && *uri != '\0')
+      *ptr++ = *uri++;
 
     *ptr = '\0';
     if (*uri == ':')
@@ -654,7 +439,7 @@ httpSeparate(const char *uri,		/* I - Universal Resource Identifier */
     {
       if ((ptr = strchr(host, '/')) != NULL)
       {
-	strncpy(resource, ptr, HTTP_MAX_URI);
+	strncpy(resource, ptr, HTTP_MAX_URI - 1);
 	resource[HTTP_MAX_URI - 1] = '\0';
 	*ptr = '\0';
       }
@@ -671,7 +456,7 @@ httpSeparate(const char *uri,		/* I - Universal Resource Identifier */
 
 	if (*uri == '/')
 	{
-          strncpy(resource, uri, HTTP_MAX_URI);
+          strncpy(resource, uri, HTTP_MAX_URI - 1);
           resource[HTTP_MAX_URI - 1] = '\0';
 	}
       }
@@ -705,49 +490,44 @@ httpSeparate(const char *uri,		/* I - Universal Resource Identifier */
   }
 
  /*
-  * Grab the username, if any...
+  * Grab the hostname...
   */
 
   while (*uri == '/')
     uri ++;
 
-  if ((slash = strchr(uri, '/')) == NULL)
-    slash = uri + strlen(uri);
+  ptr = host;
+  while (!(*uri == ':' && isdigit(uri[1])) && *uri != '@' && *uri != '/' && *uri != '\0')
+    *ptr ++ = *uri ++;
 
-  if ((atsign = strchr(uri, '@')) != NULL && atsign < slash)
+  *ptr = '\0';
+
+  if (*uri == '@')
   {
    /*
-    * Got a username:password combo...
+    * Got a username...
     */
 
-    for (ptr = username; uri < atsign; uri ++)
-      if (ptr < (username + HTTP_MAX_URI - 1))
-	*ptr++ = *uri;
+    strncpy(username, host, 31);
+    username[31] = '\0';
+    
+    ptr = host;
+    uri ++;
+    while (*uri != ':' && *uri != '/' && *uri != '\0')
+      *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)
+    else if (strcasecmp(method, "ipp") == 0)	/* Not registered yet... */
       *port = ippPort();
     else if (strcasecmp(method, "socket") == 0)	/* Not registered yet... */
       *port = 9100;
@@ -784,7 +564,7 @@ httpSeparate(const char *uri,		/* I - Universal Resource Identifier */
   * The remaining portion is the resource string...
   */
 
-  strncpy(resource, uri, HTTP_MAX_URI);
+  strncpy(resource, uri, HTTP_MAX_URI - 1);
   resource[HTTP_MAX_URI - 1] = '\0';
 }
 
@@ -816,7 +596,7 @@ httpGetSubField(http_t       *http,	/* I - HTTP data */
     * Skip leading whitespace...
     */
 
-    while (isspace(*fptr))
+    while (isspace(*fptr));
       fptr ++;
 
     if (*fptr == ',')
@@ -851,7 +631,7 @@ httpGetSubField(http_t       *http,	/* I - HTTP data */
 
     fptr ++;
 
-    while (isspace(*fptr))
+    while (isspace(*fptr));
       fptr ++;
 
     if (*fptr == '\"')
@@ -1098,10 +878,6 @@ httpRead(http_t *http,			/* I - HTTP data */
     if (http->used > 0)
       memcpy(http->buffer, http->buffer + length, http->used);
   }
-#ifdef HAVE_LIBSSL
-  else if (http->tls)
-    bytes = SSL_read((SSL *)(http->tls), buffer, length);
-#endif /* HAVE_LIBSSL */
   else
   {
     DEBUG_printf(("httpRead: reading %d bytes from socket...\n", length));
@@ -1184,13 +960,7 @@ httpWrite(http_t     *http,		/* I - HTTP data */
 
   while (length > 0)
   {
-#ifdef HAVE_LIBSSL
-    if (http->tls)
-      bytes = SSL_write((SSL *)(http->tls), buffer, length);
-    else
-#endif /* HAVE_LIBSSL */
     bytes = send(http->fd, buffer, length, 0);
-
     if (bytes < 0)
     {
       DEBUG_puts("httpWrite: error writing data...\n");
@@ -1270,21 +1040,13 @@ httpGets(char   *line,			/* I - Line to read into */
       else
 	bufptr ++;
 
-    if (bufptr >= bufend && http->used < HTTP_MAX_BUFFER)
+    if (bufptr >= bufend)
     {
      /*
       * No newline; see if there is more data to be read...
       */
 
-#ifdef HAVE_LIBSSL
-      if (http->tls)
-        bytes = SSL_read((SSL *)(http->tls), bufend,
-	                 HTTP_MAX_BUFFER - http->used);
-      else
-#endif /* HAVE_LIBSSL */
-      bytes = recv(http->fd, bufend, HTTP_MAX_BUFFER - http->used, 0);
-
-      if (bytes < 0)
+      if ((bytes = recv(http->fd, bufend, HTTP_MAX_BUFFER - http->used, 0)) < 0)
       {
        /*
 	* Nope, can't get a line this time...
@@ -1326,7 +1088,7 @@ httpGets(char   *line,			/* I - Line to read into */
       bufend     += bytes;
     }
   }
-  while (bufptr >= bufend && http->used < HTTP_MAX_BUFFER);
+  while (bufptr >= bufend);
 
   http->activity = time(NULL);
 
@@ -1337,7 +1099,6 @@ httpGets(char   *line,			/* I - Line to read into */
   lineptr = line;
   bufptr  = http->buffer;
   bytes   = 0;
-  length --;
 
   while (bufptr < bufend && bytes < length)
   {
@@ -1346,7 +1107,14 @@ httpGets(char   *line,			/* I - Line to read into */
     if (*bufptr == 0x0a)
     {
       bufptr ++;
-      break;
+      *lineptr = '\0';
+
+      http->used -= bytes;
+      if (http->used > 0)
+	memcpy(http->buffer, bufptr, http->used);
+
+      DEBUG_printf(("httpGets(): Returning \"%s\"\n", line));
+      return (line);
     }
     else if (*bufptr == 0x0d)
       bufptr ++;
@@ -1354,18 +1122,6 @@ httpGets(char   *line,			/* I - Line to read into */
       *lineptr++ = *bufptr++;
   }
 
-  if (bytes > 0)
-  {
-    *lineptr = '\0';
-
-    http->used -= bytes;
-    if (http->used > 0)
-      memcpy(http->buffer, bufptr, http->used);
-
-    DEBUG_printf(("httpGets(): Returning \"%s\"\n", line));
-    return (line);
-  }
-
   DEBUG_puts("httpGets(): No new line available!");
 
   return (NULL);
@@ -1396,17 +1152,8 @@ httpPrintf(http_t     *http,		/* I - HTTP data */
   DEBUG_printf(("httpPrintf: %s", buf));
 
   for (tbytes = 0, bufptr = buf; tbytes < bytes; tbytes += nbytes, bufptr += nbytes)
-  {
-#ifdef HAVE_LIBSSL
-    if (http->tls)
-      nbytes = SSL_write((SSL *)(http->tls), bufptr, bytes - tbytes);
-    else
-#endif /* HAVE_LIBSSL */
-    nbytes = send(http->fd, bufptr, bytes - tbytes, 0);
-
-    if (nbytes < 0)
+    if ((nbytes = send(http->fd, bufptr, bytes - tbytes, 0)) < 0)
       return (-1);
-  }
 
   return (bytes);
 }
@@ -1421,10 +1168,6 @@ 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 :
@@ -1447,8 +1190,6 @@ httpStatus(http_status_t status)	/* I - HTTP status code */
         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 :
@@ -1471,9 +1212,9 @@ httpGetDateString(time_t t)		/* I - UNIX time */
 
 
   tdate = gmtime(&t);
-  snprintf(datetime, sizeof(datetime), "%s, %02d %s %d %02d:%02d:%02d GMT",
-           days[tdate->tm_wday], tdate->tm_mday, months[tdate->tm_mon],
-	   tdate->tm_year + 1900, tdate->tm_hour, tdate->tm_min, tdate->tm_sec);
+  sprintf(datetime, "%s, %02d %s %d %02d:%02d:%02d GMT",
+          days[tdate->tm_wday], tdate->tm_mday, months[tdate->tm_mon],
+	  tdate->tm_year + 1900, tdate->tm_hour, tdate->tm_min, tdate->tm_sec);
 
   return (datetime);
 }
@@ -1527,10 +1268,6 @@ httpUpdate(http_t *http)		/* I - HTTP data */
   http_field_t	field;			/* Field index */
   int		major, minor;		/* HTTP version numbers */
   http_status_t	status;			/* Authorization status */
-#ifdef HAVE_LIBSSL
-  SSL_CTX	*context;		/* Context for encryption */
-  SSL		*conn;			/* Connection for encryption */
-#endif /* HAVE_LIBSSL */
 
 
   DEBUG_printf(("httpUpdate(%08x)\n", http));
@@ -1564,43 +1301,6 @@ httpUpdate(http_t *http)		/* I - HTTP data */
       if (http->status == HTTP_CONTINUE)
         return (http->status);
 
-#ifdef HAVE_LIBSSL
-      if (http->status == HTTP_SWITCHING_PROTOCOLS && !http->tls)
-      {
-	context = SSL_CTX_new(SSLv23_method());
-	conn    = SSL_new(context);
-
-	SSL_set_fd(conn, http->fd);
-	if (SSL_connect(conn) != 1)
-	{
-	  SSL_CTX_free(context);
-	  SSL_free(conn);
-
-#if defined(WIN32) || defined(__EMX__)
-	  http->error  = WSAGetLastError();
-#else
-	  http->error  = errno;
-#endif /* WIN32 || __EMX__ */
-	  http->status = HTTP_ERROR;
-
-#ifdef WIN32
-	  closesocket(http->fd);
-#else
-	  close(http->fd);
-#endif
-
-	  return (HTTP_ERROR);
-	}
-
-	http->tls = conn;
-
-        return (HTTP_CONTINUE);
-      }
-      else if (http->status == HTTP_UPGRADE_REQUIRED &&
-               http->encryption != HTTP_ENCRYPT_NEVER)
-        http->encryption = HTTP_ENCRYPT_REQUIRED;
-#endif /* HAVE_LIBSSL */
-
       httpGetLength(http);
 
       switch (http->state)
@@ -1901,15 +1601,12 @@ http_send(http_t       *http,	/* I - HTTP data */
   * Encode the URI as needed...
   */
 
-  for (ptr = buf; *uri != '\0' && ptr < (buf + sizeof(buf) - 1); uri ++)
+  for (ptr = buf; *uri != '\0'; uri ++)
     if (*uri <= ' ' || *uri >= 127)
     {
-      if (ptr < (buf + sizeof(buf) - 1))
-        *ptr ++ = '%';
-      if (ptr < (buf + sizeof(buf) - 1))
-        *ptr ++ = hex[(*uri >> 4) & 15];
-      if (ptr < (buf + sizeof(buf) - 1))
-        *ptr ++ = hex[*uri & 15];
+      *ptr ++ = '%';
+      *ptr ++ = hex[(*uri >> 4) & 15];
+      *ptr ++ = hex[*uri & 15];
     }
     else
       *ptr ++ = *uri;
@@ -1933,14 +1630,6 @@ http_send(http_t       *http,	/* I - HTTP data */
 
   http->status = HTTP_CONTINUE;
 
-#ifdef HAVE_LIBSSL
-  if (http->encryption == HTTP_ENCRYPT_REQUIRED && !http->tls)
-  {
-    httpSetField(http, HTTP_FIELD_CONNECTION, "Upgrade");
-    httpSetField(http, HTTP_FIELD_UPGRADE, "TLS/1.0,SSL/2.0,SSL/3.0");
-  }
-#endif /* HAVE_LIBSSL */
-
   if (httpPrintf(http, "%s %s HTTP/1.1\r\n", codes[request], buf) < 1)
   {
     http->status = HTTP_ERROR;
@@ -1971,98 +1660,6 @@ http_send(http_t       *http,	/* I - HTTP data */
 }
 
 
-#ifdef HAVE_LIBSSL
-/*
- * 'http_upgrade()' - Force upgrade to TLS encryption.
- */
-
-static int			/* O - Status of connection */
-http_upgrade(http_t *http)	/* I - HTTP data */
-{
-  int		ret;		/* Return value */
-  http_t	myhttp;		/* Local copy of HTTP data */
-
-
-  DEBUG_printf(("http_upgrade(%p)\n", http));
-
- /*
-  * Copy the HTTP data to a local variable so we can do the OPTIONS
-  * request without interfering with the existing request data...
-  */
-
-  memcpy(&myhttp, http, sizeof(myhttp));
-
- /*
-  * Send an OPTIONS request to the server, requiring SSL or TLS
-  * encryption on the link...
-  */
-
-  httpClearFields(&myhttp);
-  httpSetField(&myhttp, HTTP_FIELD_CONNECTION, "upgrade");
-  httpSetField(&myhttp, HTTP_FIELD_UPGRADE, "TLS/1.0, SSL/2.0, SSL/3.0");
-
-  if ((ret = httpOptions(&myhttp, "*")) == 0)
-  {
-   /*
-    * Wait for the secure connection...
-    */
-
-    while (httpUpdate(&myhttp) == HTTP_CONTINUE);
-  }
-
-  httpFlush(&myhttp);
-
- /*
-  * Copy the HTTP data back over, if any...
-  */
-
-  http->fd         = myhttp.fd;
-  http->error      = myhttp.error;
-  http->activity   = myhttp.activity;
-  http->status     = myhttp.status;
-  http->version    = myhttp.version;
-  http->keep_alive = myhttp.keep_alive;
-  http->used       = myhttp.used;
-
-  if (http->used)
-    memcpy(http->buffer, myhttp.buffer, http->used);
-
-  http->auth_type   = myhttp.auth_type;
-  http->nonce_count = myhttp.nonce_count;
-
-  memcpy(http->nonce, myhttp.nonce, sizeof(http->nonce));
-
-  http->tls        = myhttp.tls;
-  http->encryption = myhttp.encryption;
-
- /*
-  * See if we actually went secure...
-  */
-
-  if (!http->tls)
-  {
-   /*
-    * Server does not support HTTP upgrade...
-    */
-
-    DEBUG_puts("Server does not support HTTP upgrade!");
-
-#ifdef WIN32
-    closesocket(http->fd);
-#else
-    close(http->fd);
-#endif
-
-    http->fd = -1;
-
-    return (-1);
-  }
-  else
-    return (ret);
-}
-#endif /* HAVE_LIBSSL */
-
-
 /*
  * End of "$Id$".
  */

cups/http.h

@@ -4,7 +4,7 @@
  *   Hyper-Text Transport Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -47,7 +47,7 @@
 #    include <netinet/tcp.h>
 #  endif /* WIN32 || __EMX__ */
 
-#  include "md5.h"
+#  include <cups/md5.h>
 
 
 /*
@@ -126,19 +126,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...
  */
@@ -163,7 +150,6 @@ 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_OK = 200,		/* OPTIONS/GET/HEAD/POST/TRACE command was successful */
   HTTP_CREATED,			/* PUT command was successful */
@@ -196,7 +182,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 */
@@ -276,7 +261,6 @@ typedef struct
 					/* Nonce value */
   int			nonce_count;	/* Nonce count */
   void			*tls;		/* TLS state information */
-  http_encryption_t	encryption;	/* Encryption requirements */
 } http_t;
 
 
@@ -290,10 +274,7 @@ extern int		httpCheck(http_t *http);
 						httpSetField((http), HTTP_FIELD_HOST, (http)->hostname)
 extern void		httpClose(http_t *http);
 extern http_t		*httpConnect(const char *host, int port);
-extern http_t		*httpConnectEncrypt(const char *host, int port,
-			                    http_encryption_t encrypt);
 extern int		httpDelete(http_t *http, const char *uri);
-extern int		httpEncryption(http_t *http, http_encryption_t e);
 #  define		httpError(http) ((http)->error)
 extern void		httpFlush(http_t *http);
 extern int		httpGet(http_t *http, const char *uri);

cups/ipp.c

@@ -4,7 +4,7 @@
  *   Internet Printing Protocol support functions for the Common UNIX
  *   Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -24,35 +24,30 @@
  *
  * Contents:
  *
- *   ippAddBoolean()        - Add a boolean attribute to an IPP request.
- *   ippAddBooleans()       - Add an array of boolean values.
- *   ippAddDate()           - Add a date attribute to an IPP request.
- *   ippAddInteger()        - Add a integer attribute to an IPP request.
- *   ippAddIntegers()       - Add an array of integer values.
- *   ippAddString()         - Add a language-encoded string to an IPP request.
- *   ippAddStrings()        - Add language-encoded strings to an IPP request.
- *   ippAddRange()          - Add a range of values to an IPP request.
- *   ippAddRanges()         - Add ranges of values to an IPP request.
- *   ippAddResolution()     - Add a resolution value to an IPP request.
- *   ippAddResolutions()    - Add resolution values to an IPP request.
- *   ippAddSeparator()      - Add a group separator to an IPP request.
- *   ippDateToTime()        - Convert from RFC 1903 Date/Time format to UNIX
- *                            time in seconds.
- *   ippDelete()            - Delete an IPP request.
- *   ippErrorString()       - Return a textual message for the given error
- *                            message.
- *   ippFindAttribute()     - Find a named attribute in a request...
- *   ippFindNextAttribute() - Find the next named attribute in a request...
- *   ippLength()            - Compute the length of an IPP request.
- *   ippNew()               - Allocate a new IPP request.
- *   ippPort()              - Return the default IPP port number.
- *   ippRead()              - Read data for an IPP request.
- *   ippSetPort()           - Set the default port number.
- *   ippTimeToDate()        - Convert from UNIX time to RFC 1903 format.
- *   ippWrite()             - Write data for an IPP request.
- *   _ipp_add_attr()        - Add a new attribute to the request.
- *   _ipp_free_attr()       - Free an attribute.
- *   ipp_read()             - Semi-blocking read on a HTTP connection...
+ *   ippAddBoolean()     - Add a boolean attribute to an IPP request.
+ *   ippAddBooleans()    - Add an array of boolean values.
+ *   ippAddDate()        - Add a date attribute to an IPP request.
+ *   ippAddInteger()     - Add a integer attribute to an IPP request.
+ *   ippAddIntegers()    - Add an array of integer values.
+ *   ippAddString()      - Add a language-encoded string to an IPP request.
+ *   ippAddStrings()     - Add language-encoded strings to an IPP request.
+ *   ippAddRange()       - Add a range of values to an IPP request.
+ *   ippAddRanges()      - Add ranges of values to an IPP request.
+ *   ippAddResolution()  - Add a resolution value to an IPP request.
+ *   ippAddResolutions() - Add resolution values to an IPP request.
+ *   ippAddSeparator()   - Add a group separator to an IPP request.
+ *   ippDateToTime()     - Convert from RFC 1903 Date/Time format to UNIX time
+ *   ippDelete()         - Delete an IPP request.
+ *   ippErrorString()    - Return a textual message for the given error message.
+ *   ippFindAttribute()  - Find a named attribute in a request...
+ *   ippLength()         - Compute the length of an IPP request.
+ *   ippPort()           - Return the default IPP port number.
+ *   ippRead()           - Read data for an IPP request.
+ *   ippTimeToDate()     - Convert from UNIX time to RFC 1903 format.
+ *   ippWrite()          - Write data for an IPP request.
+ *   _ipp_add_attr()     - Add a new attribute to the request.
+ *   _ipp_free_attr()    - Free an attribute.
+ *   ipp_read()          - Semi-blocking read on a HTTP connection...
  */
 
 /*
@@ -66,14 +61,6 @@
 
 #include "ipp.h"
 #include "debug.h"
-#include <ctype.h>
-
-
-/*
- * Local globals...
- */
-
-static int	ipp_port = 0;
 
 
 /*
@@ -96,7 +83,7 @@ ippAddBoolean(ipp_t      *ipp,		/* I - IPP request */
   ipp_attribute_t	*attr;		/* New attribute */
 
 
-  DEBUG_printf(("ippAddBoolean(%p, %02x, \'%s\', %d)\n", ipp, group, name, value));
+  DEBUG_printf(("ippAddBoolean(%08x, %02x, \'%s\', %d)\n", ipp, group, name, value));
 
   if (ipp == NULL || name == NULL)
     return (NULL);
@@ -128,7 +115,7 @@ ippAddBooleans(ipp_t      *ipp,		/* I - IPP request */
   ipp_attribute_t	*attr;		/* New attribute */
 
 
-  DEBUG_printf(("ippAddBooleans(%p, %02x, \'%s\', %d, %p)\n", ipp,
+  DEBUG_printf(("ippAddBooleans(%08x, %02x, \'%s\', %d, %08x)\n", ipp,
                 group, name, num_values, values));
 
   if (ipp == NULL || name == NULL)
@@ -162,7 +149,7 @@ ippAddDate(ipp_t             *ipp,	/* I - IPP request */
   ipp_attribute_t	*attr;		/* New attribute */
 
 
-  DEBUG_printf(("ippAddDate(%p, %02x, \'%s\', %p)\n", ipp, group, name,
+  DEBUG_printf(("ippAddDate(%08x, %02x, \'%s\', %08x)\n", ipp, group, name,
                 value));
 
   if (ipp == NULL || name == NULL || value == NULL)
@@ -194,7 +181,7 @@ ippAddInteger(ipp_t      *ipp,		/* I - IPP request */
   ipp_attribute_t	*attr;		/* New attribute */
 
 
-  DEBUG_printf(("ippAddInteger(%p, %d, \'%s\', %d)\n", ipp, group, name,
+  DEBUG_printf(("ippAddInteger(%08x, %d, \'%s\', %d)\n", ipp, group, name,
                 value));
 
   if (ipp == NULL || name == NULL)
@@ -271,24 +258,7 @@ ippAddString(ipp_t      *ipp,		/* I - IPP request */
   attr->group_tag                 = group;
   attr->value_tag                 = type;
   attr->values[0].string.charset  = charset ? strdup(charset) : NULL;
-  attr->values[0].string.text     = value ? strdup(value) : NULL;
-
-  if ((type == IPP_TAG_LANGUAGE || type == IPP_TAG_CHARSET) &&
-      attr->values[0].string.text)
-  {
-   /*
-    * Convert to lowercase and change _ to - as needed...
-    */
-
-    char *p;
-
-
-    for (p = attr->values[0].string.text; *p; p ++)
-      if (*p == '_')
-        *p = '-';
-      else
-        *p = tolower(*p);
-  }
+  attr->values[0].string.text     = strdup(value);
 
   return (attr);
 }
@@ -484,7 +454,7 @@ ippAddSeparator(ipp_t *ipp)		/* I - IPP request */
   ipp_attribute_t	*attr;		/* New attribute */
 
 
-  DEBUG_printf(("ippAddSeparator(%p)\n", ipp));
+  DEBUG_printf(("ippAddSeparator(%08x)\n", ipp));
 
   if (ipp == NULL)
     return (NULL);
@@ -501,7 +471,7 @@ ippAddSeparator(ipp_t *ipp)		/* I - IPP request */
 
 /*
  * 'ippDateToTime()' - Convert from RFC 1903 Date/Time format to UNIX time
- *                     in seconds.
+ *                      in seconds.
  */
 
 time_t					/* O - UNIX time value */
@@ -559,8 +529,6 @@ ippDelete(ipp_t *ipp)		/* I - IPP request */
 			*next;	/* Next attribute */
 
 
-  DEBUG_printf(("ippNew(): %p\n", ipp));
-
   if (ipp == NULL)
     return;
 
@@ -581,80 +549,75 @@ ippDelete(ipp_t *ipp)		/* I - IPP request */
 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"
-		};
+  static cups_lang_t	*language = 0;	/* Language info */
 
 
  /*
-  * See if the error code is a known value...
+  * Load the localized message file as needed...
   */
 
-  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]);
+  if (!language)
+    language = cupsLangDefault();
 
  /*
-  * No, build an "unknown-xxxx" error string...
+  * Return the appropriate message...
   */
 
-  sprintf(unknown, "unknown-%04x", error);
+  switch (error)
+  {
+    case IPP_OK :
+    case IPP_OK_SUBST :
+    case IPP_OK_CONFLICT :
+        return ("OK");
+
+    case IPP_BAD_REQUEST :
+        return (cupsLangString(language, HTTP_BAD_REQUEST));
+
+    case IPP_FORBIDDEN :
+        return (cupsLangString(language, HTTP_FORBIDDEN));
+
+    case IPP_NOT_AUTHENTICATED :
+    case IPP_NOT_AUTHORIZED :
+        return (cupsLangString(language, HTTP_UNAUTHORIZED));
+
+    case IPP_NOT_POSSIBLE :
+        return (cupsLangString(language, HTTP_METHOD_NOT_ALLOWED));
+
+    case IPP_TIMEOUT :
+        return (cupsLangString(language, HTTP_REQUEST_TIMEOUT));
+
+    case IPP_NOT_FOUND :
+        return (cupsLangString(language, HTTP_NOT_FOUND));
+
+    case IPP_GONE :
+        return (cupsLangString(language, HTTP_GONE));
+
+    case IPP_DOCUMENT_FORMAT :
+        return (cupsLangString(language, HTTP_UNSUPPORTED_MEDIATYPE));
+
+    case IPP_CONFLICT :
+        return (cupsLangString(language, HTTP_CONFLICT));
+
+    case IPP_INTERNAL_ERROR :
+        return (cupsLangString(language, HTTP_SERVER_ERROR));
+
+    case IPP_OPERATION_NOT_SUPPORTED :
+    case IPP_VERSION_NOT_SUPPORTED :
+        return (cupsLangString(language, HTTP_NOT_SUPPORTED));
+
+    case IPP_SERVICE_UNAVAILABLE :
+    case IPP_DEVICE_ERROR :
+    case IPP_TEMPORARY_ERROR :
+    case IPP_PRINTER_BUSY :
+        return (cupsLangString(language, HTTP_SERVICE_UNAVAILABLE));
+
+    case IPP_NOT_ACCEPTING :
+        return (cupsLangString(language, CUPS_MSG_NOT_ACCEPTING_JOBS));
+
+    default :
+        return ("ERROR");
+  }
 
-  return (unknown);
 }
 
 
@@ -667,68 +630,26 @@ ippFindAttribute(ipp_t      *ipp,	/* I - IPP request */
                  const char *name,	/* I - Name of attribute */
 		 ipp_tag_t  type)	/* I - Type of attribute */
 {
-  DEBUG_printf(("ippFindAttribute(%p, \'%s\')\n", ipp, name));
+  ipp_attribute_t	*attr;	/* Current atttribute */
+
+
+  DEBUG_printf(("ippFindAttribute(%08x, \'%s\')\n", ipp, name));
 
   if (ipp == NULL || name == NULL)
     return (NULL);
 
- /*
-  * Reset the current pointer...
-  */
-
-  ipp->current = NULL;
-
- /*
-  * Search for the attribute...
-  */
-
-  return (ippFindNextAttribute(ipp, name, type));
-}
-
-
-/*
- * 'ippFindNextAttribute()' - Find the next named attribute in a request...
- */
-
-ipp_attribute_t	*			/* O - Matching attribute */
-ippFindNextAttribute(ipp_t      *ipp,	/* I - IPP request */
-                     const char *name,	/* I - Name of attribute */
-		     ipp_tag_t  type)	/* I - Type of attribute */
-{
-  ipp_attribute_t	*attr;		/* Current atttribute */
-  ipp_tag_t		value_tag;	/* Value tag */
-
-
-  DEBUG_printf(("ippFindNextAttribute(%p, \'%s\')\n", ipp, name));
-
-  if (ipp == NULL || name == NULL)
-    return (NULL);
-
-  if (ipp->current)
-    attr = ipp->current->next;
-  else
-    attr = ipp->attrs;
-
-  for (; attr != NULL; attr = attr->next)
+  for (attr = ipp->attrs; attr != NULL; attr = attr->next)
   {
-    DEBUG_printf(("ippFindAttribute: attr = %p, name = \'%s\'\n", attr,
+    DEBUG_printf(("ippFindAttribute: attr = %08x, name = \'%s\'\n", attr,
                   attr->name));
 
-    value_tag = (ipp_tag_t)(attr->value_tag & IPP_TAG_MASK);
-
     if (attr->name != NULL && strcasecmp(attr->name, name) == 0 &&
-        (value_tag == type || type == IPP_TAG_ZERO ||
-	 (value_tag == IPP_TAG_TEXTLANG && type == IPP_TAG_TEXT) ||
-	 (value_tag == IPP_TAG_NAMELANG && type == IPP_TAG_NAME)))
-    {
-      ipp->current = attr;
-
+        (attr->value_tag == type || type == IPP_TAG_ZERO ||
+	 (attr->value_tag == IPP_TAG_TEXTLANG && type == IPP_TAG_TEXT) ||
+	 (attr->value_tag == IPP_TAG_NAMELANG && type == IPP_TAG_NAME)))
       return (attr);
-    }
   }
 
-  ipp->current = NULL;
-
   return (NULL);
 }
 
@@ -780,7 +701,7 @@ ippLength(ipp_t *ipp)		/* I - IPP request */
     bytes += 2 * attr->num_values;	/* Name lengths */
     bytes += 2 * attr->num_values;	/* Value lengths */
 
-    switch (attr->value_tag & ~IPP_TAG_COPY)
+    switch (attr->value_tag)
     {
       case IPP_TAG_INTEGER :
       case IPP_TAG_ENUM :
@@ -851,7 +772,7 @@ ippNew(void)
   ipp_t	*temp;			/* New IPP request */
 
 
-  if ((temp = (ipp_t *)calloc(1, sizeof(ipp_t))) != NULL)
+  if ((temp = (ipp_t *)calloc(sizeof(ipp_t), 1)) != NULL)
   {
    /*
     * Default to IPP 1.1...
@@ -861,8 +782,6 @@ ippNew(void)
     temp->request.any.version[1] = 1;
   }
 
-  DEBUG_printf(("ippNew(): %p\n", temp));
-
   return (temp);
 }
 
@@ -882,7 +801,7 @@ ippRead(http_t *http,		/* I - HTTP data */
   ipp_tag_t		tag;		/* Current tag */
 
 
-  DEBUG_printf(("ippRead(%p, %p)\n", http, ipp));
+  DEBUG_printf(("ippRead(%08x, %08x)\n", http, ipp));
 
   if (http == NULL || ipp == NULL)
     return (IPP_ERROR);
@@ -928,10 +847,6 @@ ippRead(http_t *http,		/* I - HTTP data */
 	ipp->current = NULL;
 	ipp->curtag  = IPP_TAG_ZERO;
 
-        DEBUG_printf(("ippRead: version=%d.%d\n", buffer[0], buffer[1]));
-	DEBUG_printf(("ippRead: op_status=%04x\n", ipp->request.any.op_status));
-	DEBUG_printf(("ippRead: request_id=%d\n", ipp->request.any.request_id));
-
        /*
         * If blocking is disabled, stop here...
 	*/
@@ -1001,32 +916,6 @@ ippRead(http_t *http,		/* I - HTTP data */
 
             attr = ipp->current;
 
-	   /*
-	    * Make sure we aren't adding a new value of a different
-	    * type...
-	    */
-
-	    if (attr->value_tag == IPP_TAG_STRING ||
-    		(attr->value_tag >= IPP_TAG_TEXTLANG &&
-		 attr->value_tag <= IPP_TAG_MIMETYPE))
-            {
-	     /*
-	      * String values can sometimes come across in different
-	      * forms; accept sets of differing values...
-	      */
-
-	      if (tag != IPP_TAG_STRING &&
-    		  (tag < IPP_TAG_TEXTLANG || tag > IPP_TAG_MIMETYPE))
-	        return (IPP_ERROR);
-            }
-	    else if (attr->value_tag != tag)
-	      return (IPP_ERROR);
-
-           /*
-	    * Finally, make sure we don't have too many elements in the
-	    * attribute array...
-	    */
-
 	    if (attr->num_values >= IPP_MAX_VALUES)
 	      return (IPP_ERROR);
 	  }
@@ -1292,10 +1181,6 @@ ippWrite(http_t *http,		/* I - HTTP data */
 	ipp->current = ipp->attrs;
 	ipp->curtag  = IPP_TAG_ZERO;
 
-        DEBUG_printf(("ippWrite: version=%d.%d\n", buffer[0], buffer[1]));
-	DEBUG_printf(("ippWrite: op_status=%04x\n", ipp->request.any.op_status));
-	DEBUG_printf(("ippWrite: request_id=%d\n", ipp->request.any.request_id));
-
        /*
         * If blocking is disabled, stop here...
 	*/
@@ -1330,8 +1215,7 @@ ippWrite(http_t *http,		/* I - HTTP data */
 	    *bufptr++ = attr->group_tag;
 	  }
 
-          if ((n = strlen(attr->name)) > (sizeof(buffer) - 3))
-	    return (IPP_ERROR);
+          n = strlen(attr->name);
 
           DEBUG_printf(("ippWrite: writing value tag = %x\n", attr->value_tag));
           DEBUG_printf(("ippWrite: writing name = %d, \'%s\'\n", n, attr->name));
@@ -1342,23 +1226,12 @@ ippWrite(http_t *http,		/* I - HTTP data */
 	  memcpy(bufptr, attr->name, n);
 	  bufptr += n;
 
-	  switch (attr->value_tag & ~IPP_TAG_COPY)
+	  switch (attr->value_tag)
 	  {
 	    case IPP_TAG_INTEGER :
 	    case IPP_TAG_ENUM :
 	        for (i = 0; i < attr->num_values; i ++)
 		{
-                  if ((sizeof(buffer) - (bufptr - buffer)) < 9)
-		  {
-                    if (httpWrite(http, (char *)buffer, bufptr - buffer) < 0)
-	            {
-	              DEBUG_puts("ippWrite: Could not write IPP attribute...");
-	              return (IPP_ERROR);
-	            }
-
-		    bufptr = buffer;
-		  }
-
 		  if (i)
 		  {
 		   /*
@@ -1383,17 +1256,6 @@ ippWrite(http_t *http,		/* I - HTTP data */
 	    case IPP_TAG_BOOLEAN :
 	        for (i = 0; i < attr->num_values; i ++)
 		{
-                  if ((sizeof(buffer) - (bufptr - buffer)) < 6)
-		  {
-                    if (httpWrite(http, (char *)buffer, bufptr - buffer) < 0)
-	            {
-	              DEBUG_puts("ippWrite: Could not write IPP attribute...");
-	              return (IPP_ERROR);
-	            }
-
-		    bufptr = buffer;
-		  }
-
 		  if (i)
 		  {
 		   /*
@@ -1434,17 +1296,6 @@ ippWrite(http_t *http,		/* I - HTTP data */
 		                  attr->value_tag));
         	    DEBUG_printf(("ippWrite: writing name = 0, \'\'\n"));
 
-                    if ((sizeof(buffer) - (bufptr - buffer)) < 3)
-		    {
-                      if (httpWrite(http, (char *)buffer, bufptr - buffer) < 0)
-	              {
-	        	DEBUG_puts("ippWrite: Could not write IPP attribute...");
-	        	return (IPP_ERROR);
-	              }
-
-		      bufptr = buffer;
-		    }
-
                     *bufptr++ = attr->value_tag;
 		    *bufptr++ = 0;
 		    *bufptr++ = 0;
@@ -1452,9 +1303,6 @@ ippWrite(http_t *http,		/* I - HTTP data */
 
                   n = strlen(attr->values[i].string.text);
 
-                  if (n > sizeof(buffer))
-		    return (IPP_ERROR);
-
                   DEBUG_printf(("ippWrite: writing string = %d, \'%s\'\n", n,
 		                attr->values[i].string.text));
 
@@ -1479,17 +1327,6 @@ ippWrite(http_t *http,		/* I - HTTP data */
 	    case IPP_TAG_DATE :
 	        for (i = 0; i < attr->num_values; i ++)
 		{
-                  if ((sizeof(buffer) - (bufptr - buffer)) < 16)
-		  {
-                    if (httpWrite(http, (char *)buffer, bufptr - buffer) < 0)
-	            {
-	              DEBUG_puts("ippWrite: Could not write IPP attribute...");
-	              return (IPP_ERROR);
-	            }
-
-		    bufptr = buffer;
-		  }
-
 		  if (i)
 		  {
 		   /*
@@ -1512,17 +1349,6 @@ ippWrite(http_t *http,		/* I - HTTP data */
 	    case IPP_TAG_RESOLUTION :
 	        for (i = 0; i < attr->num_values; i ++)
 		{
-                  if ((sizeof(buffer) - (bufptr - buffer)) < 14)
-		  {
-                    if (httpWrite(http, (char *)buffer, bufptr - buffer) < 0)
-	            {
-	              DEBUG_puts("ippWrite: Could not write IPP attribute...");
-	              return (IPP_ERROR);
-	            }
-
-		    bufptr = buffer;
-		  }
-
 		  if (i)
 		  {
 		   /*
@@ -1552,17 +1378,6 @@ ippWrite(http_t *http,		/* I - HTTP data */
 	    case IPP_TAG_RANGE :
 	        for (i = 0; i < attr->num_values; i ++)
 		{
-                  if ((sizeof(buffer) - (bufptr - buffer)) < 13)
-		  {
-                    if (httpWrite(http, (char *)buffer, bufptr - buffer) < 0)
-	            {
-	              DEBUG_puts("ippWrite: Could not write IPP attribute...");
-	              return (IPP_ERROR);
-	            }
-
-		    bufptr = buffer;
-		  }
-
 		  if (i)
 		  {
 		   /*
@@ -1599,17 +1414,6 @@ ippWrite(http_t *http,		/* I - HTTP data */
 		    * values with a zero-length name...
 		    */
 
-                    if ((sizeof(buffer) - (bufptr - buffer)) < 3)
-		    {
-                      if (httpWrite(http, (char *)buffer, bufptr - buffer) < 0)
-	              {
-	        	DEBUG_puts("ippWrite: Could not write IPP attribute...");
-	        	return (IPP_ERROR);
-	              }
-
-		      bufptr = buffer;
-		    }
-
                     *bufptr++ = attr->value_tag;
 		    *bufptr++ = 0;
 		    *bufptr++ = 0;
@@ -1617,10 +1421,7 @@ ippWrite(http_t *http,		/* I - HTTP data */
 
                   n = strlen(attr->values[i].string.charset) +
 		      strlen(attr->values[i].string.text) +
-		      4;
-
-                  if (n > sizeof(buffer))
-		    return (IPP_ERROR);
+		      2;
 
                   if ((sizeof(buffer) - (bufptr - buffer)) < (n + 2))
 		  {
@@ -1667,17 +1468,6 @@ ippWrite(http_t *http,		/* I - HTTP data */
 		    * values with a zero-length name...
 		    */
 
-                    if ((sizeof(buffer) - (bufptr - buffer)) < 3)
-		    {
-                      if (httpWrite(http, (char *)buffer, bufptr - buffer) < 0)
-	              {
-	        	DEBUG_puts("ippWrite: Could not write IPP attribute...");
-	        	return (IPP_ERROR);
-	              }
-
-		      bufptr = buffer;
-		    }
-
                     *bufptr++ = attr->value_tag;
 		    *bufptr++ = 0;
 		    *bufptr++ = 0;
@@ -1685,9 +1475,6 @@ ippWrite(http_t *http,		/* I - HTTP data */
 
                   n = attr->values[i].unknown.length;
 
-                  if (n > sizeof(buffer))
-		    return (IPP_ERROR);
-
                   if ((sizeof(buffer) - (bufptr - buffer)) < (n + 2))
 		  {
                     if (httpWrite(http, (char *)buffer, bufptr - buffer) < 0)
@@ -1772,25 +1559,12 @@ ippPort(void)
   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));
+  if ((server_port = getenv("IPP_PORT")) != NULL)
+    return (atoi(server_port));
   else if ((port = getservbyname("ipp", NULL)) == NULL)
-    return (ipp_port = IPP_PORT);
+    return (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;
+    return (ntohs(port->s_port));
 }
 
 
@@ -1805,7 +1579,7 @@ _ipp_add_attr(ipp_t *ipp,	/* I - IPP request */
   ipp_attribute_t	*attr;	/* New attribute */
 
 
-  DEBUG_printf(("_ipp_add_attr(%p, %d)\n", ipp, num_values));
+  DEBUG_printf(("_ipp_add_attr(%08x, %d)\n", ipp, num_values));
 
   if (ipp == NULL || num_values < 0)
     return (NULL);
@@ -1825,8 +1599,6 @@ _ipp_add_attr(ipp_t *ipp,	/* I - IPP request */
 
   ipp->last = attr;
 
-  DEBUG_printf(("_ipp_add_attr(): %p\n", attr));
-
   return (attr);
 }
 
@@ -1841,8 +1613,6 @@ _ipp_free_attr(ipp_attribute_t *attr)	/* I - Attribute to free */
   int	i;				/* Looping var */
 
 
-  DEBUG_printf(("_ipp_free_attr(): %p\n", attr));
-
   switch (attr->value_tag)
   {
     case IPP_TAG_TEXT :
@@ -1862,7 +1632,7 @@ _ipp_free_attr(ipp_attribute_t *attr)	/* I - Attribute to free */
     case IPP_TAG_NAMELANG :
         for (i = 0; i < attr->num_values; i ++)
 	{
-	  if (attr->values[i].string.charset && i == 0)
+	  if (attr->values[i].string.charset)
 	    free(attr->values[i].string.charset);
 	  free(attr->values[i].string.text);
 	}
@@ -1896,7 +1666,7 @@ ipp_read(http_t        *http,	/* I - Client connection */
   * Loop until all bytes are read...
   */
 
-  for (tbytes = 0, bytes = 0; tbytes < length; tbytes += bytes, buffer += bytes)
+  for (tbytes = 0; tbytes < length; tbytes += bytes, buffer += bytes)
     if ((bytes = httpRead(http, (char *)buffer, length - tbytes)) <= 0)
       break;
 
@@ -1904,10 +1674,7 @@ ipp_read(http_t        *http,	/* I - Client connection */
   * Return the number of bytes read...
   */
 
-  if (tbytes == 0 && bytes < 0)
-    return (-1);
-  else
-    return (tbytes);
+  return (tbytes);
 }
 
 

cups/ipp.h

@@ -4,7 +4,7 @@
  *   Internet Printing Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products.
+ *   Copyright 1997-2000 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -30,7 +30,7 @@
  * Include necessary headers...
  */
 
-#  include "http.h"
+#  include <cups/http.h>
 
 
 /*
@@ -76,15 +76,13 @@ typedef enum			/**** Format tags for attribute formats... ****/
   IPP_TAG_END,
   IPP_TAG_PRINTER,
   IPP_TAG_UNSUPPORTED_GROUP,
-  IPP_TAG_SUBSCRIPTION,
-  IPP_TAG_EVENT_NOTIFICATION,
   IPP_TAG_UNSUPPORTED_VALUE = 0x10,
   IPP_TAG_DEFAULT,
   IPP_TAG_UNKNOWN,
   IPP_TAG_NOVALUE,
   IPP_TAG_NOTSETTABLE = 0x15,
   IPP_TAG_DELETEATTR,
-  IPP_TAG_ADMINDEFINE,
+  IPP_TAG_ANYVALUE,
   IPP_TAG_INTEGER = 0x21,
   IPP_TAG_BOOLEAN,
   IPP_TAG_ENUM,
@@ -92,10 +90,9 @@ typedef enum			/**** Format tags for attribute formats... ****/
   IPP_TAG_DATE,
   IPP_TAG_RESOLUTION,
   IPP_TAG_RANGE,
-  IPP_TAG_BEGIN_COLLECTION,
+  IPP_TAG_COLLECTION,
   IPP_TAG_TEXTLANG,
   IPP_TAG_NAMELANG,
-  IPP_TAG_END_COLLECTION,
   IPP_TAG_TEXT = 0x41,
   IPP_TAG_NAME,
   IPP_TAG_KEYWORD = 0x44,
@@ -103,10 +100,7 @@ typedef enum			/**** Format tags for attribute formats... ****/
   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,34 +111,11 @@ typedef enum			/**** Resolution units... ****/
 
 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... ****/
@@ -210,31 +181,6 @@ typedef enum			/**** IPP operations... ****/
   IPP_SET_PRINTER_ATTRIBUTES,
   IPP_SET_JOB_ATTRIBUTES,
   IPP_GET_PRINTER_SUPPORTED_VALUES,
-  IPP_CREATE_PRINTER_SUBSCRIPTION,
-  IPP_CREATE_JOB_SUBSCRIPTION,
-  IPP_GET_SUBSCRIPTION_ATTRIBUTES,
-  IPP_GET_SUBSCRIPTIONS,
-  IPP_RENEW_SUBSCRIPTION,
-  IPP_CANCEL_SUBSCRIPTION,
-  IPP_GET_NOTIFICATIONS,
-  IPP_SEND_NOTIFICATIONS,
-  IPP_GET_PRINT_SUPPORT_FILES = 0x0021,
-  IPP_ENABLE_PRINTER,
-  IPP_DISABLE_PRINTER,
-  IPP_PAUSE_PRINTER_AFTER_CURRENT_JOB,
-  IPP_HOLD_NEW_JOBS,
-  IPP_RELEASE_HELD_NEW_JOBS,
-  IPP_DEACTIVATE_PRINTER,
-  IPP_ACTIVATE_PRINTER,
-  IPP_RESTART_PRINTER,
-  IPP_SHUTDOWN_PRINTER,
-  IPP_STARTUP_PRINTER,
-  IPP_REPROCESS_JOB,
-  IPP_CANCEL_CURRENT_JOB,
-  IPP_SUSPEND_CURRENT_JOB,
-  IPP_RESUME_JOB,
-  IPP_PROMOTE_JOB,
-  IPP_SCHEDULE_JOB_AFTER,
   IPP_PRIVATE = 0x4000,
   CUPS_GET_DEFAULT,
   CUPS_GET_PRINTERS,
@@ -248,9 +194,7 @@ typedef enum			/**** IPP operations... ****/
   CUPS_SET_DEFAULT,
   CUPS_GET_DEVICES,
   CUPS_GET_PPDS,
-  CUPS_MOVE_JOB,
-  CUPS_ADD_DEVICE,
-  CUPS_DELETE_DEVICE
+  CUPS_MOVE_JOB
 } ipp_op_t;
 
 typedef enum			/**** IPP status codes... ****/
@@ -258,11 +202,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,
@@ -282,12 +221,6 @@ typedef enum			/**** IPP status codes... ****/
   IPP_COMPRESSION_ERROR,
   IPP_DOCUMENT_FORMAT_ERROR,
   IPP_DOCUMENT_ACCESS_ERROR,
-  IPP_ATTRIBUTES_NOT_SETTABLE,
-  IPP_IGNORED_ALL_SUBSCRIPTIONS,
-  IPP_TOO_MANY_SUBSCRIPTIONS,
-  IPP_IGNORED_ALL_NOTIFICATIONS,
-  IPP_PRINT_SUPPORT_FILE_NOT_FOUND,
-
   IPP_INTERNAL_ERROR = 0x0500,
   IPP_OPERATION_NOT_SUPPORTED,
   IPP_SERVICE_UNAVAILABLE,
@@ -297,8 +230,7 @@ typedef enum			/**** IPP status codes... ****/
   IPP_NOT_ACCEPTING,
   IPP_PRINTER_BUSY,
   IPP_ERROR_JOB_CANCELLED,
-  IPP_MULTIPLE_JOBS_NOT_SUPPORTED,
-  IPP_PRINTER_IS_DEACTIVATED
+  IPP_MULTIPLE_JOBS_NOT_SUPPORTED
 } ipp_status_t;
 
 typedef unsigned char ipp_uchar_t;/**** Unsigned 8-bit integer/character ****/
@@ -403,17 +335,13 @@ extern ipp_attribute_t	*ippAddStrings(ipp_t *ipp, ipp_tag_t group, ipp_tag_t typ
 extern time_t		ippDateToTime(const ipp_uchar_t *date);
 extern void		ippDelete(ipp_t *ipp);
 extern const char	*ippErrorString(ipp_status_t error);
-extern ipp_attribute_t	*ippFindAttribute(ipp_t *ipp, const char *name,
-			                  ipp_tag_t type);
-extern ipp_attribute_t	*ippFindNextAttribute(ipp_t *ipp, const char *name,
-			                      ipp_tag_t type);
+extern ipp_attribute_t	*ippFindAttribute(ipp_t *ipp, const char *name, ipp_tag_t type);
 extern 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_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 *);

cups/language.c

@@ -3,7 +3,7 @@
  *
  *   I18N/language support for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products.
+ *   Copyright 1997-2000 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -263,10 +263,7 @@ cupsLangGet(const char *language) /* I - Language or locale */
   */
 
   if (fp == NULL)
-  {
-    strncpy(line, lang_default[0], sizeof(line) - 1);
-    line[sizeof(line) - 1] = '\0';
-  }
+    strcpy(line, lang_default[0]);
   else if (fgets(line, sizeof(line), fp) == NULL)
   {
    /*
@@ -323,8 +320,7 @@ cupsLangGet(const char *language) /* I - Language or locale */
   */
 
   lang->used ++;
-  strncpy(lang->language, langname, sizeof(lang->language) - 1);
-  lang->language[sizeof(lang->language) - 1] = '\0';
+  strcpy(lang->language, langname);
 
   for (i = 0; i < (sizeof(lang_encodings) / sizeof(lang_encodings[0])); i ++)
     if (strcmp(lang_encodings[i], line) == 0)
@@ -351,8 +347,7 @@ cupsLangGet(const char *language) /* I - Language or locale */
       if (lang_default[count] == NULL)
         break;
 
-      strncpy(line, lang_default[count], sizeof(line) - 1);
-      /* Already set last byte to 0 above... */
+      strcpy(line, lang_default[count]);
     }
     else if (fgets(line, sizeof(line), fp) == NULL)
       break;

cups/language.h

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

cups/mark.c

@@ -3,7 +3,7 @@
  *
  *   Option marking routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -118,9 +118,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 ||
+      if (j == 0 || strcasecmp(c1->choice, "None") == 0 ||
           strcasecmp(c1->choice, "False") == 0)
         c1 = NULL;
     }
@@ -151,9 +149,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 ||
+      if (j == 0 || strcasecmp(c2->choice, "None") == 0 ||
           strcasecmp(c2->choice, "False") == 0)
         c2 = NULL;
     }

cups/md5passwd.c

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

cups/options.c

@@ -3,7 +3,7 @@
  *
  *   Option routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products.
+ *   Copyright 1997-2000 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -38,7 +38,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include "string.h"
-#include "debug.h"
 
 
 /*
@@ -55,9 +54,8 @@ cupsAddOption(const char    *name,		/* I - Name of option */
   cups_option_t	*temp;				/* Pointer to new option */
 
 
-  if (name == NULL || !name[0] || value == NULL ||
-      options == NULL || num_options < 0)
-    return (num_options);
+  if (name == NULL || value == NULL || options == NULL)
+    return (0);
 
  /*
   * Look for an existing option with the same name...
@@ -113,7 +111,7 @@ cupsFreeOptions(int           num_options,	/* I - Number of options */
   int	i;					/* Looping var */
 
 
-  if (num_options <= 0 || options == NULL)
+  if (num_options == 0 || options == NULL)
     return;
 
   for (i = 0; i < num_options; i ++)
@@ -138,7 +136,7 @@ cupsGetOption(const char    *name,	/* I - Name of option */
   int	i;				/* Looping var */
 
 
-  if (name == NULL || num_options <= 0 || options == NULL)
+  if (name == NULL || num_options == 0 || options == NULL)
     return (NULL);
 
   for (i = 0; i < num_options; i ++)
@@ -164,7 +162,7 @@ cupsParseOptions(const char    *arg,		/* I - Argument to parse */
 	*value;					/* Pointer to value */
 
 
-  if (arg == NULL || options == NULL || num_options < 0)
+  if (arg == NULL || options == NULL)
     return (0);
 
  /*
@@ -174,17 +172,6 @@ cupsParseOptions(const char    *arg,		/* I - Argument to parse */
   copyarg     = strdup(arg);
   ptr         = copyarg;
 
- /*
-  * Skip leading spaces...
-  */
-
-  while (isspace(*ptr))
-    ptr ++;
-
- /*
-  * Loop through the string...
-  */
-
   while (*ptr != '\0')
   {
    /*
@@ -195,13 +182,6 @@ cupsParseOptions(const char    *arg,		/* I - Argument to parse */
     while (!isspace(*ptr) && *ptr != '=' && *ptr != '\0')
       ptr ++;
 
-   /*
-    * Avoid an empty name...
-    */
-
-    if (ptr == name)
-      break;
-
    /*
     * Skip trailing spaces...
     */
@@ -215,12 +195,7 @@ cupsParseOptions(const char    *arg,		/* I - Argument to parse */
       * Start of another option...
       */
 
-      if (strncasecmp(name, "no", 2) == 0)
-        num_options = cupsAddOption(name + 2, "false", num_options,
-	                            options);
-      else
-        num_options = cupsAddOption(name, "true", num_options, options);
-
+      num_options = cupsAddOption(name, "", num_options, options);
       continue;
     }
 
@@ -309,17 +284,6 @@ cupsMarkOptions(ppd_file_t    *ppd,		/* I - PPD file */
 	s[255];					/* Temporary string */
 
 
- /*
-  * Check arguments...
-  */
-
-  if (ppd == NULL || num_options <= 0 || options == NULL)
-    return (0);
-
- /*
-  * Mark options...
-  */
-
   conflict = 0;
 
   for (i = num_options; i > 0; i --, options ++)

cups/page.c

@@ -3,7 +3,7 @@
  *
  *   Page size functions for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal

cups/ppd.c

@@ -3,7 +3,7 @@
  *
  *   PPD file routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -108,7 +108,6 @@ ppdClose(ppd_file_t *ppd)	/* I - PPD file record */
   ppd_emul_t	*emul;		/* Current emulation */
   ppd_group_t	*group;		/* Current group */
   char		**font;		/* Current font */
-  char		**filter;	/* Current filter */
 
 
  /*
@@ -122,10 +121,6 @@ ppdClose(ppd_file_t *ppd)	/* I - PPD file record */
   * Free all strings at the top level...
   */
 
-  safe_free(ppd->patches);
-  safe_free(ppd->jcl_begin);
-  safe_free(ppd->jcl_ps);
-  safe_free(ppd->jcl_end);
   safe_free(ppd->lang_encoding);
   safe_free(ppd->lang_version);
   safe_free(ppd->modelname);
@@ -176,18 +171,6 @@ ppdClose(ppd_file_t *ppd)	/* I - PPD file record */
   if (ppd->num_consts > 0)
     safe_free(ppd->consts);
 
- /*
-  * Free any filters...
-  */
-
-  if (ppd->num_filters > 0)
-  {
-    for (i = ppd->num_filters, filter = ppd->filters; i > 0; i --, filter ++)
-      safe_free(*filter);
-
-    safe_free(ppd->filters);
-  }
-
  /*
   * Free any fonts...
   */
@@ -428,17 +411,12 @@ ppdOpen(FILE *fp)		/* I - File to read from */
   ppd_const_t	*constraint;	/* Current constraint */
   ppd_size_t	*size;		/* Current page size */
   int		mask;		/* Line data mask */
-  char		keyword[PPD_MAX_NAME],
-  				/* Keyword from file */
-		name[PPD_MAX_NAME],
-				/* Option from file */
-		text[PPD_MAX_TEXT],
-				/* Human-readable text from file */
+  char		keyword[41],	/* Keyword from file */
+		name[41],	/* Option from file */
+		text[81],	/* Human-readable text from file */
 		*string,	/* Code/text from file */
 		*sptr,		/* Pointer into string */
-		*nameptr,	/* Pointer into name */
-		*temp,		/* Temporary string pointer */
-		**tempfonts;	/* Temporary fonts pointer */
+		*nameptr;	/* Pointer into name */
   float		order;		/* Order dependency number */
   ppd_section_t	section;	/* Order dependency section */
   ppd_profile_t	*profile;	/* Pointer to color profile */
@@ -642,13 +620,6 @@ ppdOpen(FILE *fp)		/* I - File to read from */
       else
         filter = realloc(ppd->filters, sizeof(char *) * (ppd->num_filters + 1));
 
-      if (filter == NULL)
-      {
-        safe_free(filter);
-	ppdClose(ppd);
-	return (NULL);
-      }
-
       ppd->filters     = filter;
       filter           += ppd->num_filters;
       ppd->num_filters ++;
@@ -662,29 +633,6 @@ ppdOpen(FILE *fp)		/* I - File to read from */
     }
     else if (strcmp(keyword, "Throughput") == 0)
       ppd->throughput = atoi(string);
-    else if (strcmp(keyword, "Font") == 0)
-    {
-     /*
-      * Add this font to the list of available fonts...
-      */
-
-      if (ppd->num_fonts == 0)
-        tempfonts = (char **)malloc(sizeof(char *));
-      else
-        tempfonts = (char **)realloc(ppd->fonts,
-	                             sizeof(char *) * (ppd->num_fonts + 1));
-
-      if (tempfonts == NULL)
-      {
-        safe_free(string);
-        ppdClose(ppd);
-	return (NULL);
-      }
-      
-      ppd->fonts                 = tempfonts;
-      ppd->fonts[ppd->num_fonts] = strdup(name);
-      ppd->num_fonts ++;
-    }
     else if (strcmp(keyword, "VariablePaperSize") == 0 &&
              strcmp(string, "True") == 0 &&
 	     !ppd->variable_sizes)
@@ -847,11 +795,8 @@ ppdOpen(FILE *fp)		/* I - File to read from */
 
       for (i = 0, sptr = string; i < count; i ++)
       {
-        for (nameptr = ppd->emulations[i].name;
-	     *sptr != '\0' && *sptr != ' ';
-	     sptr ++)
-	  if (nameptr < (ppd->emulations[i].name + sizeof(ppd->emulations[i].name) - 1))
-	    *nameptr++ = *sptr;
+        for (nameptr = ppd->emulations[i].name; *sptr != '\0' && *sptr != ' ';)
+	  *nameptr ++ = *sptr ++;
 
 	*nameptr = '\0';
 
@@ -890,16 +835,8 @@ ppdOpen(FILE *fp)		/* I - File to read from */
       }
       else
       {
-        temp = realloc(ppd->patches, strlen(ppd->patches) +
-	                             strlen(string) + 1);
-        if (temp == NULL)
-	{
-	  safe_free(string);
-	  ppdClose(ppd);
-	  return (NULL);
-	}
-
-        ppd->patches = temp;
+        ppd->patches = realloc(ppd->patches, strlen(ppd->patches) +
+	                                     strlen(string) + 1);
 
         strcpy(ppd->patches + strlen(ppd->patches), string);
       }
@@ -1070,6 +1007,45 @@ ppdOpen(FILE *fp)		/* I - File to read from */
     }
     else if (strcmp(keyword, "CloseGroup") == 0)
       group = NULL;
+    else if (strcmp(keyword, "OpenSubGroup") == 0)
+    {
+     /*
+      * Open a new sub-group...
+      */
+
+      DEBUG_printf(("group = %p, subgroup = %p\n", group, subgroup));
+
+      if (group == NULL || subgroup != NULL)
+      {
+        ppdClose(ppd);
+	safe_free(string);
+	return (NULL);
+      }
+
+      if (group->num_subgroups == 0)
+	subgroup = malloc(sizeof(ppd_group_t));
+      else
+	subgroup = realloc(group->subgroups,
+	                   (group->num_subgroups + 1) * sizeof(ppd_group_t));
+
+      if (subgroup == NULL)
+      {
+	ppdClose(ppd);
+	safe_free(string);
+	return (NULL);
+      }
+
+      group->subgroups = subgroup;
+      subgroup += group->num_subgroups;
+      group->num_subgroups ++;
+
+      memset(subgroup, 0, sizeof(ppd_group_t));
+      ppd_decode(string);
+      ppd_fix(string);
+      strncpy(subgroup->text, string, sizeof(subgroup->text) - 1);
+    }
+    else if (strcmp(keyword, "CloseSubGroup") == 0)
+      subgroup = NULL;
     else if (strcmp(keyword, "OrderDependency") == 0 ||
              strcmp(keyword, "NonUIOrderDependency") == 0)
     {
@@ -1188,11 +1164,6 @@ ppdOpen(FILE *fp)		/* I - File to read from */
 	    break;
 
 	case 2 : /* Two options... */
-	   /*
-	    * The following strcpy's are safe, as optionN and
-	    * choiceN are all the same size (size defined by PPD spec...)
-	    */
-
 	    if (constraint->option1[0] == '*')
 	      strcpy(constraint->option1, constraint->option1 + 1);
 
@@ -1206,11 +1177,6 @@ ppdOpen(FILE *fp)		/* I - File to read from */
 	    break;
 	    
 	case 3 : /* Two options, one choice... */
-	   /*
-	    * The following strcpy's are safe, as optionN and
-	    * choiceN are all the same size (size defined by PPD spec...)
-	    */
-
 	    if (constraint->option1[0] == '*')
 	      strcpy(constraint->option1, constraint->option1 + 1);
 
@@ -1425,7 +1391,7 @@ ppdOpenFile(const char *filename) /* I - File to read from */
  * 'compare_strings()' - Compare two strings.
  */
 
-static int			/* O - Result of comparison */
+int				/* O - Result of comparison */
 compare_strings(char *s,	/* I - First string */
                 char *t)	/* I - Second string */
 {
@@ -1586,7 +1552,7 @@ ppd_read(FILE *fp,		/* I - File to read from */
 		*textptr,	/* Text pointer */
 		*strptr,	/* Pointer into string */
 		*lineptr,	/* Current position in line buffer */
-		line[65536];	/* Line buffer (64k) */
+		line[262144];	/* Line buffer (256k) */
 
 
  /*
@@ -1601,8 +1567,6 @@ ppd_read(FILE *fp,		/* I - File to read from */
   * Now loop until we have a valid line...
   */
 
-  *string = NULL;
-
   do
   {
    /*
@@ -1636,12 +1600,10 @@ ppd_read(FILE *fp,		/* I - File to read from */
 	    ungetc(ch, fp);
 	}
 
-	ch = '\n';
+	*lineptr++ = '\n';
 
 	if (!endquote)			/* Continue for multi-line text */
           break;
-
-	*lineptr++ = '\n';
       }
       else
       {
@@ -1652,72 +1614,10 @@ ppd_read(FILE *fp,		/* I - File to read from */
 	*lineptr++ = ch;
 
 	if (ch == '\"')
-        {
-	  endquote = !endquote;
-
-          if (!endquote)
-	  {
-	   /*
-	    * End of quoted string; ignore trailing characters...
-	    */
-
-	    while ((ch = getc(fp)) != EOF)
-	      if (ch == '\n')
-		break;
-	      else if (ch == '\r')
-	      {
-		ch = getc(fp);
-		if (ch != '\n')
-	          ungetc(ch, fp);
-		break;
-	      }
-
-            break;
-	  }
-	}
+          endquote = !endquote;
       }
     }
 
-    if (endquote)
-    {
-     /*
-      * Didn't finish this quoted string...
-      */
-
-      while ((ch = getc(fp)) != EOF)
-        if (ch == '\"')
-	  break;
-    }
-
-    if (ch != '\n')
-    {
-     /*
-      * Didn't finish this line...
-      */
-
-      while ((ch = getc(fp)) != EOF)
-	if (ch == '\r' || ch == '\n')
-	{
-	 /*
-	  * Line feed or carriage return...
-	  */
-
-	  if (ch == '\r')
-	  {
-	   /*
-            * Check for a trailing line feed...
-	    */
-
-	    if ((ch = getc(fp)) == EOF)
-	      break;
-	    if (ch != 0x0a)
-	      ungetc(ch, fp);
-	  }
-
-	  break;
-	}
-    }
-
     if (lineptr > line && lineptr[-1] == '\n')
       lineptr --;
 
@@ -1753,7 +1653,7 @@ ppd_read(FILE *fp,		/* I - File to read from */
     keyptr = keyword;
 
     while (*lineptr != '\0' && *lineptr != ':' && !isspace(*lineptr) &&
-	   (keyptr - keyword) < (PPD_MAX_NAME - 1))
+	   (keyptr - keyword) < 40)
       *keyptr++ = *lineptr++;
 
     *keyptr = '\0';
@@ -1788,7 +1688,7 @@ ppd_read(FILE *fp,		/* I - File to read from */
 	textptr = text;
 
 	while (*lineptr != '\0' && *lineptr != '\n' && *lineptr != ':' &&
-               (textptr - text) < (PPD_MAX_TEXT - 1))
+               (textptr - text) < 80)
 	  *textptr++ = *lineptr++;
 
 	*textptr = '\0';

cups/ppd.h

@@ -4,7 +4,7 @@
  *   PostScript Printer Description definitions for the Common UNIX Printing
  *   System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -58,15 +58,6 @@ extern "C" {
 #  define PPD_VERSION	4.3	/* Kept in sync with Adobe version number */
 
 
-/*
- * PPD size limits (defined in Adobe spec)
- */
-
-#  define PPD_MAX_NAME	41	/* Maximum size of name + 1 for nul */
-#  define PPD_MAX_TEXT	81	/* Maximum size of text + 1 for nul */
-#  define PPD_MAX_LINE	256	/* Maximum size of line + 1 for nul */
-
-
 /*
  * Types and structures...
  */
@@ -101,10 +92,8 @@ typedef enum			/**** Colorspaces ****/
 typedef struct			/**** Option choices ****/
 {
   char		marked,		/* 0 if not selected, 1 otherwise */
-		choice[PPD_MAX_NAME],
-				/* Computer-readable option name */
-		text[PPD_MAX_TEXT],
-				/* Human-readable option name */
+		choice[41],	/* Computer-readable option name */
+		text[81],	/* Human-readable option name */
 		*code;		/* Code to send for this option */
   void		*option;	/* Pointer to parent option structure */
 } ppd_choice_t;
@@ -112,12 +101,9 @@ typedef struct			/**** Option choices ****/
 typedef struct			/**** Options ****/
 {
   char		conflicted,	/* 0 if no conflicts exist, 1 otherwise */
-		keyword[PPD_MAX_NAME],
-				/* Option keyword name ("PageSize", etc.) */
-		defchoice[PPD_MAX_NAME],
-				/* Default option choice */
-		text[PPD_MAX_TEXT];
-				/* Human-readable text */
+		keyword[41],	/* Option keyword name ("PageSize", etc.) */
+		defchoice[41],	/* Default option choice */
+		text[81];	/* Human-readable text */
   ppd_ui_t	ui;		/* Type of UI option */
   ppd_section_t	section;	/* Section for command */
   float		order;		/* Order number */
@@ -127,8 +113,7 @@ typedef struct			/**** Options ****/
 
 typedef struct ppd_group_str	/**** Groups ****/
 {
-  char		text[PPD_MAX_TEXT];
-  				/* Human-readable group name */
+  char		text[81];	/* Human-readable group name */
   int		num_options;	/* Number of options */
   ppd_option_t	*options;	/* Options */
   int		num_subgroups;	/* Number of sub-groups */
@@ -138,21 +123,16 @@ typedef struct ppd_group_str	/**** Groups ****/
 
 typedef struct			/**** Constraints ****/
 {
-  char		option1[PPD_MAX_NAME],
-  				/* First keyword */
-		choice1[PPD_MAX_NAME],
-				/* First option/choice (blank for all) */
-		option2[PPD_MAX_NAME],
-				/* Second keyword */
-		choice2[PPD_MAX_NAME];
-				/* Second option/choice (blank for all) */
+  char		option1[41],	/* First keyword */
+		choice1[41],	/* First option/choice (blank for all) */
+		option2[41],	/* Second keyword */
+		choice2[41];	/* Second option/choice (blank for all) */
 } ppd_const_t;
 
 typedef struct			/**** Page Sizes ****/
 {
   int		marked;		/* Page size selected? */
-  char		name[PPD_MAX_NAME];
-  				/* Media size option */
+  char		name[41];	/* Media size option */
   float		width,		/* Width of media in points */
 		length,		/* Length of media in points */
 		left,		/* Left printable margin in points */
@@ -163,18 +143,15 @@ typedef struct			/**** Page Sizes ****/
 
 typedef struct			/**** Emulators ****/
 {
-  char		name[PPD_MAX_NAME],
-  				/* Emulator name */
+  char		name[41],	/* Emulator name */
 		*start,		/* Code to switch to this emulation */
 		*stop;		/* Code to stop this emulation */
 } ppd_emul_t;
 
 typedef struct			/**** sRGB Color Profiles ****/
 {
-  char		resolution[PPD_MAX_NAME],
-  				/* Resolution or "-" */
-		media_type[PPD_MAX_NAME];
-				/* Media type of "-" */
+  char		resolution[41],	/* Resolution or "-" */
+		media_type[41];	/* Media type of "-" */
   float		density,	/* Ink density to use */
 		gamma,		/* Gamma correction to use */
 		matrix[3][3];	/* Transform matrix */
@@ -230,15 +207,11 @@ typedef struct			/**** Files ****/
  */
 
 extern void		ppdClose(ppd_file_t *ppd);
-extern int		ppdCollect(ppd_file_t *ppd, ppd_section_t section,
-			           ppd_choice_t  ***choices);
 extern int		ppdConflicts(ppd_file_t *ppd);
 extern int		ppdEmit(ppd_file_t *ppd, FILE *fp,
 			        ppd_section_t section);
 extern int		ppdEmitFd(ppd_file_t *ppd, int fd,
 			          ppd_section_t section);
-extern int		ppdEmitJCL(ppd_file_t *ppd, FILE *fp, int job_id,
-			           const char *user, const char *title);
 extern int		ppdIsMarked(ppd_file_t *ppd, const char *keyword,
 			            const char *option);
 extern void		ppdMarkDefaults(ppd_file_t *ppd);

cups/snprintf.c

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

cups/string.c

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

cups/string.h

@@ -3,7 +3,7 @@
  *
  *   String definitions for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products.
+ *   Copyright 1997-2000 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -32,14 +32,7 @@
 #  include <stdio.h>
 #  include <stdarg.h>
 #  include <config.h>
-
-#  ifdef HAVE_STRING_H
-#    include <string.h>
-#  endif /* HAVE_STRING_H */
-
-#  ifdef HAVE_STRINGS_H
-#    include <strings.h>
-#  endif /* HAVE_STRINGS_H */
+#  include <string.h>
 
 
 /*

cups/tempfile.c

@@ -1,200 +0,0 @@
-/*
- * "$Id$"
- *
- *   Temp file utilities for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 1997-2001 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   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:
- *
- *   cupsTempFd()   - Create a temporary file.
- *   cupsTempFile() - Generate a temporary filename.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "cups.h"
-#include "string.h"
-#include "debug.h"
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#if defined(WIN32) || defined(__EMX__)
-#  include <io.h>
-#else
-#  include <unistd.h>
-#endif /* WIN32 || __EMX__ */
-
-
-/*
- * 'cupsTempFd()' - Create a temporary file.
- */
-
-int					/* O - New file descriptor */
-cupsTempFd(char *filename,		/* I - Pointer to buffer */
-           int  len)			/* I - Size of buffer */
-{
-  int		fd;			/* File descriptor for temp file */
-#ifdef WIN32
-  char		tmpdir[1024];		/* Windows temporary directory */
-  DWORD		curtime;		/* Current time */
-#else
-  char		*tmpdir;		/* TMPDIR environment var */
-  struct timeval curtime;		/* Current time */
-#endif /* WIN32 */
-  static char	buf[1024] = "";		/* Buffer if you pass in NULL and 0 */
-
-
- /*
-  * See if a filename was specified...
-  */
-
-  if (filename == NULL)
-  {
-    filename = buf;
-    len      = sizeof(buf);
-  }
-
- /*
-  * See if TMPDIR is defined...
-  */
-
-#ifdef WIN32
-  GetTempPath(sizeof(tmpdir), tmpdir);
-#else
-  if ((tmpdir = getenv("TMPDIR")) == NULL)
-  {
-   /*
-    * Put root temp files in restricted temp directory...
-    */
-
-    if (getuid() == 0)
-      tmpdir = CUPS_REQUESTS "/tmp";
-    else
-      tmpdir = "/var/tmp";
-  }
-#endif /* WIN32 */
-
- /*
-  * Make the temporary name using the specified directory...
-  */
-
-  do
-  {
-#ifdef WIN32
-   /*
-    * Get the current time of day...
-    */
-
-    curtime = GetTickCount();
-
-   /*
-    * Format a string using the hex time values...
-    */
-
-    snprintf(filename, len - 1, "%s/%08lx", tmpdir, curtime);
-#else
-   /*
-    * Get the current time of day...
-    */
-
-    gettimeofday(&curtime, NULL);
-
-   /*
-    * Format a string using the hex time values...
-    */
-
-    snprintf(filename, len - 1, "%s/%08lx%05lx", tmpdir,
-             curtime.tv_sec, curtime.tv_usec);
-#endif /* WIN32 */
-
-   /*
-    * Open the file in "exclusive" mode, making sure that we don't
-    * stomp on an existing file or someone's symlink crack...
-    */
-
-#ifdef O_NOFOLLOW
-    fd = open(filename, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW, 0600);
-#else
-    fd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600);
-#endif /* O_NOFOLLOW */
-
-    if (fd < 0 && errno == EPERM)
-      break; /* Stop immediately if permission denied! */
-  }
-  while (fd < 0);
-
- /*
-  * Return the file descriptor...
-  */
-
-  return (fd);
-}
-
-
-/*
- * 'cupsTempFile()' - Generate a temporary filename.
- */
-
-char *					/* O - Filename */
-cupsTempFile(char *filename,		/* I - Pointer to buffer */
-             int  len)			/* I - Size of buffer */
-{
-  int		fd;			/* File descriptor for temp file */
-  static char	buf[1024] = "";		/* Buffer if you pass in NULL and 0 */
-
-
- /*
-  * See if a filename was specified...
-  */
-
-  if (filename == NULL)
-  {
-    filename = buf;
-    len      = sizeof(buf);
-  }
-
- /*
-  * Create the temporary file...
-  */
-
-  if ((fd = cupsTempFd(filename, len)) < 0)
-    return (NULL);
-
- /*
-  * Close the temp file - it'll be reopened later as needed...
-  */
-
-  close(fd);
-
- /*
-  * Return the temp filename...
-  */
-
-  return (filename);
-}
-
-
-/*
- * End of "$Id$".
- */

cups/testhttp.c

@@ -3,7 +3,7 @@
  *
  *   HTTP test program for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products.
+ *   Copyright 1997-2000 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -45,20 +45,25 @@ main(int  argc,			/* I - Number of command-line arguments */
   int		i;		/* Looping var */
   http_t	*http;		/* HTTP connection */
   http_status_t	status;		/* Status of GET command */
-  char		buffer[8192];	/* Input buffer */
+  char		buffer[1024];	/* Input buffer */
   long		bytes;		/* Number of bytes read */
   FILE		*out;		/* Output file */
-  char		host[HTTP_MAX_URI],
-		method[HTTP_MAX_URI],
-		username[HTTP_MAX_URI],
-		resource[HTTP_MAX_URI];
-  int		port;
-  long		length, total;
-  time_t	start, current;
 
+#define HOST "dns.easysw.com"
+#define PORT 80
 
+  puts("Connecting to " HOST "...");
+
+  httpInitialize();
+  http = httpConnect(HOST, PORT);
+  if (http == NULL)
+  {
+    puts("Unable to connect to " HOST "!");
+    return (1);
+  }
+
+  puts("Connected to " HOST "...");
 
-  http = NULL;
   out = stdout;
 
   for (i = 1; i < argc; i ++)
@@ -70,42 +75,22 @@ main(int  argc,			/* I - Number of command-line arguments */
       continue;
     }
 
-    httpSeparate(argv[i], method, username, host, &port, resource);
-
-    http = httpConnect(host, port);
-    if (http == NULL)
-    {
-      perror(host);
-      continue;
-    }
-    printf("Requesting file \"%s\"...\n", resource);
+    printf("Requesting file \"%s\"...\n", argv[i]);
     httpClearFields(http);
     httpSetField(http, HTTP_FIELD_ACCEPT_LANGUAGE, "en");
-    httpGet(http, resource);
-    while ((status = httpUpdate(http)) == HTTP_CONTINUE);
+    httpGet(http, argv[i]);
+    status = httpUpdate(http);
 
     if (status == HTTP_OK)
       puts("GET OK:");
     else
       printf("GET failed with status %d...\n", status);
 
-
-    start = time(NULL);
-    length = atoi(httpGetField(http, HTTP_FIELD_CONTENT_LENGTH));
-    total  = 0;
-
     while ((bytes = httpRead(http, buffer, sizeof(buffer))) > 0)
     {
-      total += bytes;
       fwrite(buffer, bytes, 1, out);
       if (out != stdout)
-      {
-        current = time(NULL);
-        if (current == start) current ++;
-        printf("\r%ld/%ld bytes (%ld bytes/sec)      ", total, length,
-               total / (current - start));
-        fflush(stdout);
-      }
+        printf("Read %ld bytes, %ld total...\n", bytes, ftell(out));
     }
   }
 

cups/testppd.c

@@ -3,7 +3,7 @@
  *
  *   PPD test program for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -171,21 +171,6 @@ main(int  argc,			/* I - Number of command-line arguments */
       }
     }
 
-    printf("    num_profiles = %d\n", ppd->num_profiles);
-    for (j = 0; j < ppd->num_profiles; j ++)
-      printf("        profiles[%d] = %s/%s %.3f %.3f [ %.3f %.3f %.3f %.3f %.3f %.3f %.3f %.3f %.3f ]\n",
-             j, ppd->profiles[j].resolution, ppd->profiles[j].media_type,
-	     ppd->profiles[j].gamma, ppd->profiles[j].density,
-	     ppd->profiles[j].matrix[0][0], ppd->profiles[j].matrix[0][1],
-	     ppd->profiles[j].matrix[0][2], ppd->profiles[j].matrix[1][0],
-	     ppd->profiles[j].matrix[1][1], ppd->profiles[j].matrix[1][2],
-	     ppd->profiles[j].matrix[2][0], ppd->profiles[j].matrix[2][1],
-	     ppd->profiles[j].matrix[2][2]);
-
-    printf("    num_fonts = %d\n", ppd->num_fonts);
-    for (j = 0; j < ppd->num_fonts; j ++)
-      printf("        fonts[%d] = %s\n", j, ppd->fonts[j]);
-
     ppdClose(ppd);
   }
 

cups/usersys.c

@@ -4,7 +4,7 @@
  *   User, system, and password routines for the Common UNIX Printing
  *   System (CUPS).
  *
- *   Copyright 1997-2001 by Easy Software Products.
+ *   Copyright 1997-2000 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -24,16 +24,9 @@
  *
  * Contents:
  *
- *   cupsEncryption()    - Get the default encryption settings...
- *   cupsGetPassword()   - Get a password from the user...
- *   cupsServer()        - Return the hostname of the default server...
- *   cupsSetEncryption() - Set the encryption preference.
- *   cupsSetPasswordCB() - Set the password callback for CUPS.
- *   cupsSetServer()     - Set the default server name...
- *   cupsSetUser()       - Set the default user name...
- *   cupsUser()          - Return the current users name.
- *   cups_get_password() - Get a password from the user...
- *   cups_get_line()     - Get a line from a file...
+ *   cupsUser()        - Return the current users name.
+ *   cupsGetPassword() - Get a password from the user...
+ *   cupsServer()      - Return the hostname of the default server...
  */
 
 /*
@@ -41,279 +34,11 @@
  */
 
 #include "cups.h"
-#include "string.h"
+#include <config.h>
 #include <stdlib.h>
 #include <ctype.h>
 
 
-/*
- * Local functions...
- */
-
-static const char	*cups_get_password(const char *prompt);
-static char		*cups_get_line(char *buf, int buflen, FILE *fp);
-
-
-/*
- * Local globals...
- */
-
-static http_encryption_t cups_encryption = (http_encryption_t)-1;
-static char		cups_user[65] = "",
-			cups_server[256] = "";
-static const char	*(*cups_pwdcb)(const char *) = cups_get_password;
-
-
-/*
- * 'cupsEncryption()' - Get the default encryption settings...
- */
-
-http_encryption_t
-cupsEncryption(void)
-{
-  FILE		*fp;			/* client.conf file */
-  char		*encryption;		/* CUPS_ENCRYPTION variable */
-  const char	*home;			/* Home directory of user */
-  static char	line[1024];		/* Line from file */
-
-
- /*
-  * First see if we have already set the encryption stuff...
-  */
-
-  if (cups_encryption == (http_encryption_t)-1)
-  {
-   /*
-    * Then see if the CUPS_ENCRYPTION environment variable is set...
-    */
-
-    if ((encryption = getenv("CUPS_ENCRYPTION")) == NULL)
-    {
-     /*
-      * Next check to see if we have a $HOME/.cupsrc or client.conf file...
-      */
-
-      if ((home = getenv("HOME")) != NULL)
-      {
-	snprintf(line, sizeof(line), "%s/.cupsrc", home);
-	fp = fopen(line, "r");
-      }
-      else
-	fp = NULL;
-
-      if (fp == NULL)
-      {
-	if ((home = getenv("CUPS_SERVERROOT")) != NULL)
-	{
-	  snprintf(line, sizeof(line), "%s/client.conf", home);
-	  fp = fopen(line, "r");
-	}
-	else
-	  fp = fopen(CUPS_SERVERROOT "/client.conf", "r");
-      }
-
-      encryption = "IfRequested";
-
-      if (fp != NULL)
-      {
-       /*
-	* Read the config file and look for a ServerName line...
-	*/
-
-	while (cups_get_line(line, sizeof(line), fp) != NULL)
-	  if (strncmp(line, "Encryption ", 11) == 0)
-	  {
-	   /*
-	    * Got it!  Drop any trailing newline and find the name...
-	    */
-
-	    encryption = line + strlen(line) - 1;
-	    if (*encryption == '\n')
-              *encryption = '\0';
-
-	    for (encryption = line + 11; isspace(*encryption); encryption ++);
-	    break;
-	  }
-
-	fclose(fp);
-      }
-    }
-
-   /*
-    * Set the encryption preference...
-    */
-
-    if (strcasecmp(encryption, "never") == 0)
-      cups_encryption = HTTP_ENCRYPT_NEVER;
-    else if (strcasecmp(encryption, "always") == 0)
-      cups_encryption = HTTP_ENCRYPT_ALWAYS;
-    else if (strcasecmp(encryption, "required") == 0)
-      cups_encryption = HTTP_ENCRYPT_REQUIRED;
-    else
-      cups_encryption = HTTP_ENCRYPT_IF_REQUESTED;
-  }
-
-  return (cups_encryption);
-}
-
-
-/*
- * 'cupsGetPassword()' - Get a password from the user...
- */
-
-const char *				/* O - Password */
-cupsGetPassword(const char *prompt)	/* I - Prompt string */
-{
-  return ((*cups_pwdcb)(prompt));
-}
-
-
-/*
- * 'cupsSetEncryption()' - Set the encryption preference.
- */
-
-void
-cupsSetEncryption(http_encryption_t e)	/* I - New encryption preference */
-{
-  cups_encryption = e;
-}
-
-
-/*
- * 'cupsServer()' - Return the hostname of the default server...
- */
-
-const char *				/* O - Server name */
-cupsServer(void)
-{
-  FILE		*fp;			/* client.conf file */
-  char		*server;		/* Pointer to server name */
-  const char	*home;			/* Home directory of user */
-  static char	line[1024];		/* Line from file */
-
-
- /*
-  * First see if we have already set the server name...
-  */
-
-  if (!cups_server[0])
-  {
-   /*
-    * Then see if the CUPS_SERVER environment variable is set...
-    */
-
-    if ((server = getenv("CUPS_SERVER")) == NULL)
-    {
-     /*
-      * Next check to see if we have a $HOME/.cupsrc or client.conf file...
-      */
-
-      if ((home = getenv("HOME")) != NULL)
-      {
-	snprintf(line, sizeof(line), "%s/.cupsrc", home);
-	fp = fopen(line, "r");
-      }
-      else
-	fp = NULL;
-
-      if (fp == NULL)
-      {
-	if ((home = getenv("CUPS_SERVERROOT")) != NULL)
-	{
-	  snprintf(line, sizeof(line), "%s/client.conf", home);
-	  fp = fopen(line, "r");
-	}
-	else
-	  fp = fopen(CUPS_SERVERROOT "/client.conf", "r");
-      }
-
-      server = "localhost";
-
-      if (fp != NULL)
-      {
-       /*
-	* Read the config file and look for a ServerName line...
-	*/
-
-	while (cups_get_line(line, sizeof(line), fp) != NULL)
-	  if (strncmp(line, "ServerName ", 11) == 0)
-	  {
-	   /*
-	    * Got it!  Drop any trailing newline and find the name...
-	    */
-
-	    server = line + strlen(line) - 1;
-	    if (*server == '\n')
-              *server = '\0';
-
-	    for (server = line + 11; isspace(*server); server ++);
-	    break;
-	  }
-
-	fclose(fp);
-      }
-    }
-
-   /*
-    * Copy the server name over...
-    */
-
-    strncpy(cups_server, server, sizeof(cups_server) - 1);
-    cups_server[sizeof(cups_server) - 1] = '\0';
-  }
-
-  return (cups_server);
-}
-
-
-/*
- * 'cupsSetPasswordCB()' - Set the password callback for CUPS.
- */
-
-void
-cupsSetPasswordCB(const char *(*cb)(const char *))	/* I - Callback function */
-{
-  if (cb == (const char *(*)(const char *))0)
-    cups_pwdcb = cups_get_password;
-  else
-    cups_pwdcb = cb;
-}
-
-
-/*
- * 'cupsSetServer()' - Set the default server name...
- */
-
-void
-cupsSetServer(const char *server)	/* I - Server name */
-{
-  if (server)
-  {
-    strncpy(cups_server, server, sizeof(cups_server) - 1);
-    cups_server[sizeof(cups_server) - 1] = '\0';
-  }
-  else
-    cups_server[0] = '\0';
-}
-
-
-/*
- * 'cupsSetUser()' - Set the default user name...
- */
-
-void
-cupsSetUser(const char *user)		/* I - User name */
-{
-  if (user)
-  {
-    strncpy(cups_user, user, sizeof(cups_user) - 1);
-    cups_user[sizeof(cups_user) - 1] = '\0';
-  }
-  else
-    cups_user[0] = '\0';
-}
-
-
 #if defined(WIN32) || defined(__EMX__)
 /*
  * WIN32 and OS/2 username and password stuff...
@@ -326,19 +51,16 @@ cupsSetUser(const char *user)		/* I - User name */
 const char *				/* O - User name */
 cupsUser(void)
 {
-  if (!cups_user[0])
-    strcpy(cups_user, "WindowsUser");
-
-  return (cups_user);
+  return ("WindowsUser");
 }
 
 
 /*
- * 'cups_get_password()' - Get a password from the user...
+ * 'cupsGetPassword()' - Get a password from the user...
  */
 
-static const char *			/* O - Password */
-cups_get_password(const char *prompt)	/* I - Prompt string */
+const char *				/* O - Password */
+cupsGetPassword(const char *prompt)	/* I - Prompt string */
 {
   return (NULL);
 }
@@ -359,49 +81,35 @@ cupsUser(void)
   struct passwd	*pwd;			/* User/password entry */
 
 
-  if (!cups_user[0])
-  {
-   /*
-    * Rewind the password file...
-    */
+ /*
+  * Rewind the password file...
+  */
 
-    setpwent();
+  setpwent();
 
-   /*
-    * Lookup the password entry for the current user.
-    */
+ /*
+  * Lookup the password entry for the current user.
+  */
 
-    if ((pwd = getpwuid(getuid())) == NULL)
-      strcpy(cups_user, "unknown");	/* Unknown user! */
-    else
-    {
-     /*
-      * Copy the username...
-      */
+  if ((pwd = getpwuid(getuid())) == NULL)
+    return ("unknown");			/* Unknown user! */
 
-      setpwent();
+ /*
+  * Rewind the password file again and return the username...
+  */
 
-      strncpy(cups_user, pwd->pw_name, sizeof(cups_user) - 1);
-      cups_user[sizeof(cups_user) - 1] = '\0';
-    }
+  setpwent();
 
-   /*
-    * Rewind the password file again...
-    */
-
-    setpwent();
-  }
-
-  return (cups_user);
+  return (pwd->pw_name);
 }
 
 
 /*
- * 'cups_get_password()' - Get a password from the user...
+ * 'cupsGetPassword()' - Get a password from the user...
  */
 
-static const char *			/* O - Password */
-cups_get_password(const char *prompt)	/* I - Prompt string */
+const char *				/* O - Password */
+cupsGetPassword(const char *prompt)	/* I - Prompt string */
 {
   return (getpass(prompt));
 }
@@ -409,36 +117,74 @@ cups_get_password(const char *prompt)	/* I - Prompt string */
 
 
 /*
- * 'cups_get_line()' - Get a line from a file.
+ * 'cupsServer()' - Return the hostname of the default server...
  */
 
-static char *			/* O - Line from file */
-cups_get_line(char *buf,	/* I - Line buffer */
-              int  buflen,	/* I - Size of line buffer */
-	      FILE *fp)		/* I - File to read from */
+const char *				/* O - Server name */
+cupsServer(void)
 {
-  char	*bufptr;		/* Pointer to end of buffer */
+  FILE		*fp;			/* client.conf file */
+  char		*server;		/* Pointer to server name */
+  const char	*home;			/* Home directory of user */
+  static char	line[1024];		/* Line from file */
 
 
  /*
-  * Get the line from a file...
+  * First see if the CUPS_SERVER environment variable is set...
   */
 
-  if (fgets(buf, buflen, fp) == NULL)
-    return (NULL);
+  if ((server = getenv("CUPS_SERVER")) != NULL)
+    return (server);
 
  /*
-  * Remove all trailing whitespace...
+  * Next check to see if we have a $HOME/.cupsrc or client.conf file...
   */
 
-  bufptr = buf + strlen(buf) - 1;
-  if (bufptr < buf)
-    return (NULL);
+  if ((home = getenv("HOME")) != NULL)
+  {
+    snprintf(line, sizeof(line), "%s/.cupsrc", home);
+    fp = fopen(line, "r");
+  }
+  else
+    fp = NULL;
 
-  while (isspace(*bufptr) && bufptr >= buf)
-    *bufptr-- = '\0';
+  if (fp == NULL)
+    fp = fopen(CUPS_SERVERROOT "/client.conf", "r");
 
-  return (buf);
+  if (fp == NULL)
+    return ("localhost");
+
+ /*
+  * Read the config file and look for a ServerName line...
+  */
+
+  while (fgets(line, sizeof(line), fp) != NULL)
+    if (strncmp(line, "ServerName ", 11) == 0)
+    {
+     /*
+      * Got it!  Drop any trailing newline and find the name...
+      */
+
+      server = line + strlen(line) - 1;
+      if (*server == '\n')
+        *server = '\0';
+
+      for (server = line + 11; isspace(*server); server ++);
+
+      if (*server)
+      {
+        fclose(fp);
+        return (server);
+      }
+    }
+
+ /*
+  * Didn't see a ServerName line, so return "localhost"...
+  */
+
+  fclose(fp);
+
+  return ("localhost");
 }
 
 

data/HPGLprolog

@@ -1,6 +1,6 @@
 %%BeginResource: procset hpgltops 1.1 0
 %
-% "$Id: HPGLprolog 1605 2001-03-02 22:34:21Z andy $"
+% "$Id: HPGLprolog 932 2000-02-26 20:01:37Z mike $"
 %
 %   HP-GL/2 filter procset for the Common UNIX Printing System (CUPS).
 %
@@ -9,7 +9,7 @@
 %   should be called 'NP' (newpath), but GhostScript uses the 'NP' name
 %   for 'noaccess put' in some of its font files...
 %
-%   Copyright 1993-2001 Easy Software Products
+%   Copyright 1993-2000 Easy Software Products
 %
 %   These coded instructions, statements, and computer programs are the
 %   property of Easy Software Products and are protected by Federal

data/Makefile

@@ -3,7 +3,7 @@
 #
 #   Datafile makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1993-2001 by Easy Software Products.
+#   Copyright 1993-2000 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -81,24 +81,16 @@ clean:
 #
 
 install:
+	-$(MKDIR) $(DATADIR)
 	-$(MKDIR) $(DATADIR)/banners
-	$(CHMOD) ugo+rx $(DATADIR)
-	$(CHMOD) ugo+rx $(DATADIR)/banners
 	$(INSTALL_DATA) $(BANNERS) $(DATADIR)/banners
 	-$(MKDIR) $(DATADIR)/charsets
-	$(CHMOD) ugo+rx $(DATADIR)/charsets
 	$(INSTALL_DATA) $(CHARSETS) $(DATADIR)/charsets
 	-$(MKDIR) $(DATADIR)/data
-	$(CHMOD) ugo+rx $(DATADIR)/data
 	$(INSTALL_DATA) $(DATAFILES) $(DATADIR)/data
-	-if test x$(PAMDIR) != x; then \
+	-if test "$(PAMDIR)" != ""; then \
 		$(MKDIR) $(PAMDIR); \
-		$(CHMOD) ugo+rx $(PAMDIR); \
-		if test -f /lib/security/pam_unix.so; then \
-			$(INSTALL_DATA) cups.suse $(PAMDIR)/cups; \
-		else \
-			$(INSTALL_DATA) cups.pam $(PAMDIR)/cups; \
-		fi \
+		$(INSTALL_DATA) cups.pam $(PAMDIR)/cups; \
 	fi
 
 

data/classified

@@ -14,46 +14,36 @@
 %
 %   PostScript banner page for the Common UNIX Printing System ("CUPS").
 %
-%   Copyright 1993-2001 Easy Software Products
+%   Copyright 1993-2000 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:
+%   These coded instructions, statements, and computer programs contain
+%   unpublished proprietary information of Easy Software Products, and
+%   are protected by Federal copyright law. They may not be disclosed
+%   to third parties or copied or duplicated in any form, in whole or
+%   in part, without the prior written consent of Easy Software Products.
 %
-%       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
-%
-/CENTER {			% Draw centered text
+/CENTER \{			% Draw centered text
 				% (name) CENTER -
   dup stringwidth pop		% Get the width of the string
   0.5 mul neg 0 rmoveto		% Shift left 1/2 of the distance
   show				% Show the string
 } bind def
-/RIGHT {			% Draw right-justified text
+/RIGHT \{			% Draw right-justified text
 				% (name) RIGHT -
   dup stringwidth pop		% Get the width of the string
   neg 0 rmoveto			% Shift left the entire distance
   show				% Show the string
 } bind def
-/NUMBER {			% Draw a number
+/NUMBER \{			% Draw a number
 				% power n NUMBER -
-  1 index 1 eq {		% power == 1?
+  1 index 1 eq \{		% power == 1?
     round cvi exch pop		% Convert "n" to integer
-  } {
+  } \{
     1 index mul round exch div	% Truncate extra decimal places
   } ifelse
   100 string cvs show		% Convert to a string and show it...
 } bind def
-/CUPSLOGO {			% Draw the CUPS logo
+/CUPSLOGO \{			% Draw the CUPS logo
 				% height CUPSLOGO
   % Start with a big C...
   /Helvetica findfont 1 index scalefont setfont
@@ -71,14 +61,14 @@
   dup 1.2 mul moveto
   (System) show
 } bind def
-/ESPLOGO {			% Draw the ESP logo
+/ESPLOGO \{			% Draw the ESP logo
 				% height ESPLOGO
   % Compute the size of the logo...
   0 0
   2 index 1.5 mul 3 index
 
   % Do the "metallic" fill from 10% black to 40% black...
-  1 -0.001 0 {
+  1 -0.001 0 \{
     dup			% loopval
     -0.15 mul		% loopval * -0.15
     0.9 add		% 0.9 - loopval * 0.15
@@ -161,20 +151,14 @@ gsave
   /pageWidth pageRight pageLeft sub def	% pageWidth = pageRight - pageLeft
   /pageHeight pageTop pageBottom sub def% pageHeight = pageTop - pageBottom
 
-  /boxWidth				% width of text box
-  pageWidth pageHeight lt
-  { pageWidth 54 mul }
-  { pageHeight 42 mul }
-  ifelse def
-
   newpath				% Clear bounding path
 
   % Create fonts...
   /bigFont /Helvetica-Bold findfont	% bigFont = Helvetica-Bold
-  pageHeight 3 mul scalefont def	% size = pageHeight * 3 (nominally 33)
+  pageWidth 4 mul scalefont def		% size = pageWidth * 4 (nominally 34)
 
   /mediumFont /Helvetica findfont	% mediumFont = Helvetica
-  pageHeight 1.5 mul scalefont def	% size = pageHeight * 1.5 (nominally 16.5)
+  pageWidth 2 mul scalefont def		% size = pageWidth * 2 (nominally 17)
 
   % Offset page to account for lower-left margin...
   pageLeft 72 mul
@@ -186,30 +170,28 @@ gsave
 
   pageWidth 36 mul			% Center of page
   pageHeight 72 mul			% Top of page
-  pageWidth -7 mul add			% - 2 lines
+  pageWidth -9 mul add			% - 1 line
   moveto				% Position text
   bigFont setfont			% Font
   (Classified) CENTER			% Show text centered
 
   pageWidth 36 mul			% Center of page
-  pageHeight 6 mul			% Bottom of page
+  pageWidth 8 mul			% Bottom of page
   moveto				% Position text
   bigFont setfont			% Font
   (Classified) CENTER			% Show text centered
 
   % Job information box...
-  pageWidth 36 mul 9 add		% x = pageWidth * 1/2 * 72 + 9
-  boxWidth 0.5 mul sub			% x-= 1/2 box width
-  pageHeight 30 mul 9 sub		% y = pageHeight * 1/2 * 72 - 9
-  boxWidth				% w = box width
-  pageHeight 14 mul			% h = pageHeight * 1/2 * 72
+  pageWidth 18 mul 9 add		% x = pageWidth * 1/4 * 72 + 9
+  pageHeight 27 mul 9 sub		% y = pageHeight * 3/8 * 72 - 9
+  pageWidth 36 mul			% w = pageWidth * 1/2 * 72
+  pageHeight 18 mul			% h = pageHeight * 1/4 * 72
   0.5 setgray rectfill			% Draw a shadow
 
-  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
-  boxWidth 0.5 mul sub			% x-= 1/2 box width
-  pageHeight 30 mul			% y = pageHeight * 1/4 * 72
-  boxWidth				% w = box width
-  pageHeight 14 mul			% h = pageHeight * 1/2 * 72
+  pageWidth 18 mul			% x = pageWidth * 1/4 * 72
+  pageHeight 27 mul			% y = pageHeight * 3/8 * 72
+  pageWidth 36 mul			% w = pageWidth * 1/2 * 72
+  pageHeight 18 mul			% h = pageHeight * 1/4 * 72
 
   4 copy 1 setgray rectfill		% Clear the box to white
   0 setgray rectstroke			% Draw a black box around it...
@@ -219,7 +201,7 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight 5 mul add			% y += 2 lines
+  pageWidth 4 mul add			% y += 2 lines
   2 copy				% Copy X & Y
   moveto
   (Job ID: ) RIGHT
@@ -228,7 +210,7 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight 2 mul add			% y += 1 line
+  pageWidth 1 mul add			% y += 1 line
   2 copy				% Copy X & Y
   moveto
   (Title: ) RIGHT
@@ -237,7 +219,7 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight -1 mul add			% y -= 1 line
+  pageWidth -2 mul add			% y -= 1 line
   2 copy				% Copy X & Y
   moveto
   (Requesting User: ) RIGHT
@@ -246,7 +228,7 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight -4 mul add			% y -= 2 lines
+  pageWidth -5 mul add			% y -= 2 lines
   2 copy				% Copy X & Y
   moveto
   (Billing Info: ) RIGHT
@@ -272,6 +254,6 @@ gsave
 grestore
 showpage
 %
-% End of "$Id: classified 1646 2001-03-25 12:42:57Z mike $".
+% End of "$Id: classified 1075 2000-05-11 20:02:21Z mike $".
 %
 %%EOF

data/confidential

@@ -14,46 +14,36 @@
 %
 %   PostScript banner page for the Common UNIX Printing System ("CUPS").
 %
-%   Copyright 1993-2001 Easy Software Products
+%   Copyright 1993-2000 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:
+%   These coded instructions, statements, and computer programs contain
+%   unpublished proprietary information of Easy Software Products, and
+%   are protected by Federal copyright law. They may not be disclosed
+%   to third parties or copied or duplicated in any form, in whole or
+%   in part, without the prior written consent of Easy Software Products.
 %
-%       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
-%
-/CENTER {			% Draw centered text
+/CENTER \{			% Draw centered text
 				% (name) CENTER -
   dup stringwidth pop		% Get the width of the string
   0.5 mul neg 0 rmoveto		% Shift left 1/2 of the distance
   show				% Show the string
 } bind def
-/RIGHT {			% Draw right-justified text
+/RIGHT \{			% Draw right-justified text
 				% (name) RIGHT -
   dup stringwidth pop		% Get the width of the string
   neg 0 rmoveto			% Shift left the entire distance
   show				% Show the string
 } bind def
-/NUMBER {			% Draw a number
+/NUMBER \{			% Draw a number
 				% power n NUMBER -
-  1 index 1 eq {		% power == 1?
+  1 index 1 eq \{		% power == 1?
     round cvi exch pop		% Convert "n" to integer
-  } {
+  } \{
     1 index mul round exch div	% Truncate extra decimal places
   } ifelse
   100 string cvs show		% Convert to a string and show it...
 } bind def
-/CUPSLOGO {			% Draw the CUPS logo
+/CUPSLOGO \{			% Draw the CUPS logo
 				% height CUPSLOGO
   % Start with a big C...
   /Helvetica findfont 1 index scalefont setfont
@@ -71,14 +61,14 @@
   dup 1.2 mul moveto
   (System) show
 } bind def
-/ESPLOGO {			% Draw the ESP logo
+/ESPLOGO \{			% Draw the ESP logo
 				% height ESPLOGO
   % Compute the size of the logo...
   0 0
   2 index 1.5 mul 3 index
 
   % Do the "metallic" fill from 10% black to 40% black...
-  1 -0.001 0 {
+  1 -0.001 0 \{
     dup			% loopval
     -0.15 mul		% loopval * -0.15
     0.9 add		% 0.9 - loopval * 0.15
@@ -161,20 +151,14 @@ gsave
   /pageWidth pageRight pageLeft sub def	% pageWidth = pageRight - pageLeft
   /pageHeight pageTop pageBottom sub def% pageHeight = pageTop - pageBottom
 
-  /boxWidth				% width of text box
-  pageWidth pageHeight lt
-  { pageWidth 54 mul }
-  { pageHeight 42 mul }
-  ifelse def
-
   newpath				% Clear bounding path
 
   % Create fonts...
   /bigFont /Helvetica-Bold findfont	% bigFont = Helvetica-Bold
-  pageHeight 3 mul scalefont def	% size = pageHeight * 3 (nominally 33)
+  pageWidth 4 mul scalefont def		% size = pageWidth * 4 (nominally 34)
 
   /mediumFont /Helvetica findfont	% mediumFont = Helvetica
-  pageHeight 1.5 mul scalefont def	% size = pageHeight * 1.5 (nominally 16.5)
+  pageWidth 2 mul scalefont def		% size = pageWidth * 2 (nominally 17)
 
   % Offset page to account for lower-left margin...
   pageLeft 72 mul
@@ -186,30 +170,28 @@ gsave
 
   pageWidth 36 mul			% Center of page
   pageHeight 72 mul			% Top of page
-  pageWidth -7 mul add			% - 2 lines
+  pageWidth -9 mul add			% - 1 line
   moveto				% Position text
   bigFont setfont			% Font
   (Confidential) CENTER			% Show text centered
 
   pageWidth 36 mul			% Center of page
-  pageHeight 6 mul			% Bottom of page
+  pageWidth 8 mul			% Bottom of page
   moveto				% Position text
   bigFont setfont			% Font
   (Confidential) CENTER			% Show text centered
 
   % Job information box...
-  pageWidth 36 mul 9 add		% x = pageWidth * 1/2 * 72 + 9
-  boxWidth 0.5 mul sub			% x-= 1/2 box width
-  pageHeight 30 mul 9 sub		% y = pageHeight * 1/2 * 72 - 9
-  boxWidth				% w = box width
-  pageHeight 14 mul			% h = pageHeight * 1/2 * 72
+  pageWidth 18 mul 9 add		% x = pageWidth * 1/4 * 72 + 9
+  pageHeight 27 mul 9 sub		% y = pageHeight * 3/8 * 72 - 9
+  pageWidth 36 mul			% w = pageWidth * 1/2 * 72
+  pageHeight 18 mul			% h = pageHeight * 1/4 * 72
   0.5 setgray rectfill			% Draw a shadow
 
-  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
-  boxWidth 0.5 mul sub			% x-= 1/2 box width
-  pageHeight 30 mul			% y = pageHeight * 1/4 * 72
-  boxWidth				% w = box width
-  pageHeight 14 mul			% h = pageHeight * 1/2 * 72
+  pageWidth 18 mul			% x = pageWidth * 1/4 * 72
+  pageHeight 27 mul			% y = pageHeight * 3/8 * 72
+  pageWidth 36 mul			% w = pageWidth * 1/2 * 72
+  pageHeight 18 mul			% h = pageHeight * 1/4 * 72
 
   4 copy 1 setgray rectfill		% Clear the box to white
   0 setgray rectstroke			% Draw a black box around it...
@@ -219,7 +201,7 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight 5 mul add			% y += 2 lines
+  pageWidth 4 mul add			% y += 2 lines
   2 copy				% Copy X & Y
   moveto
   (Job ID: ) RIGHT
@@ -228,7 +210,7 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight 2 mul add			% y += 1 line
+  pageWidth 1 mul add			% y += 1 line
   2 copy				% Copy X & Y
   moveto
   (Title: ) RIGHT
@@ -237,7 +219,7 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight -1 mul add			% y -= 1 line
+  pageWidth -2 mul add			% y -= 1 line
   2 copy				% Copy X & Y
   moveto
   (Requesting User: ) RIGHT
@@ -246,7 +228,7 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight -4 mul add			% y -= 2 lines
+  pageWidth -5 mul add			% y -= 2 lines
   2 copy				% Copy X & Y
   moveto
   (Billing Info: ) RIGHT
@@ -272,6 +254,6 @@ gsave
 grestore
 showpage
 %
-% End of "$Id: confidential 1646 2001-03-25 12:42:57Z mike $".
+% End of "$Id: confidential 1075 2000-05-11 20:02:21Z mike $".
 %
 %%EOF

data/cups.suse

@@ -1,2 +0,0 @@
-auth	required	/lib/security/pam_unix.so nullok shadow
-account	required	/lib/security/pam_unix.so

data/secret

@@ -14,46 +14,36 @@
 %
 %   PostScript banner page for the Common UNIX Printing System ("CUPS").
 %
-%   Copyright 1993-2001 Easy Software Products
+%   Copyright 1993-2000 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:
+%   These coded instructions, statements, and computer programs contain
+%   unpublished proprietary information of Easy Software Products, and
+%   are protected by Federal copyright law. They may not be disclosed
+%   to third parties or copied or duplicated in any form, in whole or
+%   in part, without the prior written consent of Easy Software Products.
 %
-%       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
-%
-/CENTER {			% Draw centered text
+/CENTER \{			% Draw centered text
 				% (name) CENTER -
   dup stringwidth pop		% Get the width of the string
   0.5 mul neg 0 rmoveto		% Shift left 1/2 of the distance
   show				% Show the string
 } bind def
-/RIGHT {			% Draw right-justified text
+/RIGHT \{			% Draw right-justified text
 				% (name) RIGHT -
   dup stringwidth pop		% Get the width of the string
   neg 0 rmoveto			% Shift left the entire distance
   show				% Show the string
 } bind def
-/NUMBER {			% Draw a number
+/NUMBER \{			% Draw a number
 				% power n NUMBER -
-  1 index 1 eq {		% power == 1?
+  1 index 1 eq \{		% power == 1?
     round cvi exch pop		% Convert "n" to integer
-  } {
+  } \{
     1 index mul round exch div	% Truncate extra decimal places
   } ifelse
   100 string cvs show		% Convert to a string and show it...
 } bind def
-/CUPSLOGO {			% Draw the CUPS logo
+/CUPSLOGO \{			% Draw the CUPS logo
 				% height CUPSLOGO
   % Start with a big C...
   /Helvetica findfont 1 index scalefont setfont
@@ -71,14 +61,14 @@
   dup 1.2 mul moveto
   (System) show
 } bind def
-/ESPLOGO {			% Draw the ESP logo
+/ESPLOGO \{			% Draw the ESP logo
 				% height ESPLOGO
   % Compute the size of the logo...
   0 0
   2 index 1.5 mul 3 index
 
   % Do the "metallic" fill from 10% black to 40% black...
-  1 -0.001 0 {
+  1 -0.001 0 \{
     dup			% loopval
     -0.15 mul		% loopval * -0.15
     0.9 add		% 0.9 - loopval * 0.15
@@ -161,20 +151,14 @@ gsave
   /pageWidth pageRight pageLeft sub def	% pageWidth = pageRight - pageLeft
   /pageHeight pageTop pageBottom sub def% pageHeight = pageTop - pageBottom
 
-  /boxWidth				% width of text box
-  pageWidth pageHeight lt
-  { pageWidth 54 mul }
-  { pageHeight 42 mul }
-  ifelse def
-
   newpath				% Clear bounding path
 
   % Create fonts...
   /bigFont /Helvetica-Bold findfont	% bigFont = Helvetica-Bold
-  pageHeight 3 mul scalefont def	% size = pageHeight * 3 (nominally 33)
+  pageWidth 4 mul scalefont def		% size = pageWidth * 4 (nominally 34)
 
   /mediumFont /Helvetica findfont	% mediumFont = Helvetica
-  pageHeight 1.5 mul scalefont def	% size = pageHeight * 1.5 (nominally 16.5)
+  pageWidth 2 mul scalefont def		% size = pageWidth * 2 (nominally 17)
 
   % Offset page to account for lower-left margin...
   pageLeft 72 mul
@@ -186,30 +170,28 @@ gsave
 
   pageWidth 36 mul			% Center of page
   pageHeight 72 mul			% Top of page
-  pageWidth -7 mul add			% - 2 lines
+  pageWidth -9 mul add			% - 1 line
   moveto				% Position text
   bigFont setfont			% Font
   (Secret) CENTER			% Show text centered
 
   pageWidth 36 mul			% Center of page
-  pageHeight 6 mul			% Bottom of page
+  pageWidth 8 mul			% Bottom of page
   moveto				% Position text
   bigFont setfont			% Font
   (Secret) CENTER			% Show text centered
 
   % Job information box...
-  pageWidth 36 mul 9 add		% x = pageWidth * 1/2 * 72 + 9
-  boxWidth 0.5 mul sub			% x-= 1/2 box width
-  pageHeight 30 mul 9 sub		% y = pageHeight * 1/2 * 72 - 9
-  boxWidth				% w = box width
-  pageHeight 14 mul			% h = pageHeight * 1/2 * 72
+  pageWidth 18 mul 9 add		% x = pageWidth * 1/4 * 72 + 9
+  pageHeight 27 mul 9 sub		% y = pageHeight * 3/8 * 72 - 9
+  pageWidth 36 mul			% w = pageWidth * 1/2 * 72
+  pageHeight 18 mul			% h = pageHeight * 1/4 * 72
   0.5 setgray rectfill			% Draw a shadow
 
-  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
-  boxWidth 0.5 mul sub			% x-= 1/2 box width
-  pageHeight 30 mul			% y = pageHeight * 1/4 * 72
-  boxWidth				% w = box width
-  pageHeight 14 mul			% h = pageHeight * 1/2 * 72
+  pageWidth 18 mul			% x = pageWidth * 1/4 * 72
+  pageHeight 27 mul			% y = pageHeight * 3/8 * 72
+  pageWidth 36 mul			% w = pageWidth * 1/2 * 72
+  pageHeight 18 mul			% h = pageHeight * 1/4 * 72
 
   4 copy 1 setgray rectfill		% Clear the box to white
   0 setgray rectstroke			% Draw a black box around it...
@@ -219,7 +201,7 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight 5 mul add			% y += 2 lines
+  pageWidth 4 mul add			% y += 2 lines
   2 copy				% Copy X & Y
   moveto
   (Job ID: ) RIGHT
@@ -228,7 +210,7 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight 2 mul add			% y += 1 line
+  pageWidth 1 mul add			% y += 1 line
   2 copy				% Copy X & Y
   moveto
   (Title: ) RIGHT
@@ -237,7 +219,7 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight -1 mul add			% y -= 1 line
+  pageWidth -2 mul add			% y -= 1 line
   2 copy				% Copy X & Y
   moveto
   (Requesting User: ) RIGHT
@@ -246,7 +228,7 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight -4 mul add			% y -= 2 lines
+  pageWidth -5 mul add			% y -= 2 lines
   2 copy				% Copy X & Y
   moveto
   (Billing Info: ) RIGHT
@@ -272,6 +254,6 @@ gsave
 grestore
 showpage
 %
-% End of "$Id: secret 1646 2001-03-25 12:42:57Z mike $".
+% End of "$Id: secret 1075 2000-05-11 20:02:21Z mike $".
 %
 %%EOF

data/standard

@@ -14,46 +14,36 @@
 %
 %   PostScript banner page for the Common UNIX Printing System ("CUPS").
 %
-%   Copyright 1993-2001 Easy Software Products
+%   Copyright 1993-2000 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:
+%   These coded instructions, statements, and computer programs contain
+%   unpublished proprietary information of Easy Software Products, and
+%   are protected by Federal copyright law. They may not be disclosed
+%   to third parties or copied or duplicated in any form, in whole or
+%   in part, without the prior written consent of Easy Software Products.
 %
-%       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
-%
-/CENTER {			% Draw centered text
+/CENTER \{			% Draw centered text
 				% (name) CENTER -
   dup stringwidth pop		% Get the width of the string
   0.5 mul neg 0 rmoveto		% Shift left 1/2 of the distance
   show				% Show the string
 } bind def
-/RIGHT {			% Draw right-justified text
+/RIGHT \{			% Draw right-justified text
 				% (name) RIGHT -
   dup stringwidth pop		% Get the width of the string
   neg 0 rmoveto			% Shift left the entire distance
   show				% Show the string
 } bind def
-/NUMBER {			% Draw a number
+/NUMBER \{			% Draw a number
 				% power n NUMBER -
-  1 index 1 eq {		% power == 1?
+  1 index 1 eq \{		% power == 1?
     round cvi exch pop		% Convert "n" to integer
-  } {
+  } \{
     1 index mul round exch div	% Truncate extra decimal places
   } ifelse
   100 string cvs show		% Convert to a string and show it...
 } bind def
-/CUPSLOGO {			% Draw the CUPS logo
+/CUPSLOGO \{			% Draw the CUPS logo
 				% height CUPSLOGO
   % Start with a big C...
   /Helvetica findfont 1 index scalefont setfont
@@ -71,14 +61,14 @@
   dup 1.2 mul moveto
   (System) show
 } bind def
-/ESPLOGO {			% Draw the ESP logo
+/ESPLOGO \{			% Draw the ESP logo
 				% height ESPLOGO
   % Compute the size of the logo...
   0 0
   2 index 1.5 mul 3 index
 
   % Do the "metallic" fill from 10% black to 40% black...
-  1 -0.001 0 {
+  1 -0.001 0 \{
     dup			% loopval
     -0.15 mul		% loopval * -0.15
     0.9 add		% 0.9 - loopval * 0.15
@@ -161,39 +151,47 @@ gsave
   /pageWidth pageRight pageLeft sub def	% pageWidth = pageRight - pageLeft
   /pageHeight pageTop pageBottom sub def% pageHeight = pageTop - pageBottom
 
-  /boxWidth				% width of text box
-  pageWidth pageHeight lt
-  { pageWidth 54 mul }
-  { pageHeight 42 mul }
-  ifelse def
-
   newpath				% Clear bounding path
 
   % Create fonts...
   /bigFont /Helvetica-Bold findfont	% bigFont = Helvetica-Bold
-  pageHeight 3 mul scalefont def	% size = pageHeight * 3 (nominally 33)
+  pageWidth 4 mul scalefont def		% size = pageWidth * 4 (nominally 34)
 
   /mediumFont /Helvetica findfont	% mediumFont = Helvetica
-  pageHeight 1.5 mul scalefont def	% size = pageHeight * 1.5 (nominally 16.5)
+  pageWidth 2 mul scalefont def		% size = pageWidth * 2 (nominally 17)
 
   % Offset page to account for lower-left margin...
   pageLeft 72 mul
   pageBottom 72 mul
   translate
 
+  % Draw the label at the top and bottom...
+  0 setgray				% Color
+
+  pageWidth 36 mul			% Center of page
+  pageHeight 72 mul			% Top of page
+  pageWidth -9 mul add			% - 1 line
+  moveto				% Position text
+  bigFont setfont			% Font
+  (Banner) CENTER			% Show text centered
+
+  pageWidth 36 mul			% Center of page
+  pageWidth 8 mul			% Bottom of page
+  moveto				% Position text
+  bigFont setfont			% Font
+  (Banner) CENTER			% Show text centered
+
   % Job information box...
-  pageWidth 36 mul 9 add		% x = pageWidth * 1/2 * 72 + 9
-  boxWidth 0.5 mul sub			% x-= 1/2 box width
-  pageHeight 30 mul 9 sub		% y = pageHeight * 1/2 * 72 - 9
-  boxWidth				% w = box width
-  pageHeight 14 mul			% h = pageHeight * 1/2 * 72
+  pageWidth 18 mul 9 add		% x = pageWidth * 1/4 * 72 + 9
+  pageHeight 27 mul 9 sub		% y = pageHeight * 3/8 * 72 - 9
+  pageWidth 36 mul			% w = pageWidth * 1/2 * 72
+  pageHeight 18 mul			% h = pageHeight * 1/4 * 72
   0.5 setgray rectfill			% Draw a shadow
 
-  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
-  boxWidth 0.5 mul sub			% x-= 1/2 box width
-  pageHeight 30 mul			% y = pageHeight * 1/4 * 72
-  boxWidth				% w = box width
-  pageHeight 14 mul			% h = pageHeight * 1/2 * 72
+  pageWidth 18 mul			% x = pageWidth * 1/4 * 72
+  pageHeight 27 mul			% y = pageHeight * 3/8 * 72
+  pageWidth 36 mul			% w = pageWidth * 1/2 * 72
+  pageHeight 18 mul			% h = pageHeight * 1/4 * 72
 
   4 copy 1 setgray rectfill		% Clear the box to white
   0 setgray rectstroke			% Draw a black box around it...
@@ -203,7 +201,7 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight 5 mul add			% y += 2 lines
+  pageWidth 4 mul add			% y += 2 lines
   2 copy				% Copy X & Y
   moveto
   (Job ID: ) RIGHT
@@ -212,7 +210,7 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight 2 mul add			% y += 1 line
+  pageWidth 1 mul add			% y += 1 line
   2 copy				% Copy X & Y
   moveto
   (Title: ) RIGHT
@@ -221,7 +219,7 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight -1 mul add			% y -= 1 line
+  pageWidth -2 mul add			% y -= 1 line
   2 copy				% Copy X & Y
   moveto
   (Requesting User: ) RIGHT
@@ -230,7 +228,7 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight -4 mul add			% y -= 2 lines
+  pageWidth -5 mul add			% y -= 2 lines
   2 copy				% Copy X & Y
   moveto
   (Billing Info: ) RIGHT
@@ -256,6 +254,6 @@ gsave
 grestore
 showpage
 %
-% End of "$Id: standard 1646 2001-03-25 12:42:57Z mike $".
+% End of "$Id: standard 1075 2000-05-11 20:02:21Z mike $".
 %
 %%EOF

data/testprint.ps

@@ -14,23 +14,13 @@
 %
 %   PostScript test page for the Common UNIX Printing System ("CUPS").
 %
-%   Copyright 1993-2001 Easy Software Products
+%   Copyright 1993-2000 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
+%   These coded instructions, statements, and computer programs contain
+%   unpublished proprietary information of Easy Software Products, and
+%   are protected by Federal copyright law. They may not be disclosed
+%   to third parties or copied or duplicated in any form, in whole or
+%   in part, without the prior written consent of Easy Software Products.
 %
 /OCTANT {			% Draw a color wheel OCTANT...
 				% (name) radius r g b OCTANT -
@@ -223,22 +213,15 @@ gsave
   /yResolution exch abs def		% yResolution = abs(yres)
   /xResolution exch abs def		% xResolution = abs(xres)
 
-  % Figure out the sizes of things...
-  /wheelSize				% size of wheels
-  pageWidth pageHeight lt
-  { pageWidth 9 mul }
-  { pageHeight 7 mul }
-  ifelse def
-
   % Create fonts...
   /bigFont /Helvetica-Bold findfont	% bigFont = Helvetica-Bold
-  pageHeight 3 mul scalefont def	% size = pageHeight * 3 (nominally 33)
+  pageWidth 4 mul scalefont def		% size = pageWidth * 4 (nominally 34)
 
   /mediumFont /Helvetica findfont	% mediumFont = Helvetica
-  pageHeight 1.5 mul scalefont def	% size = pageHeight * 1.5 (nominally 16.5)
+  pageWidth 2 mul scalefont def		% size = pageWidth * 2 (nominally 17)
 
   /smallFont /Times-Roman findfont	% smallFont = Times-Roman
-  pageHeight scalefont def		% size = pageHeight (nominally 11)
+  pageWidth 1.5 mul scalefont def	% size = pageWidth * 1.5 (nominally 13)
 
   % Offset page to account for lower-left margin...
   pageLeft 72 mul
@@ -256,7 +239,7 @@ gsave
     translate
 
     % Size the wheel...
-    wheelSize
+    pageWidth 9 mul			% radius = pageWidth * 1/8 * 72
 
     % Draw the colors...
     dup (C) exch 0 1 1 OCTANT 45 rotate
@@ -285,7 +268,7 @@ gsave
     translate
 
     % Size the wheel...
-    wheelSize
+    pageWidth 9 mul			% radius = pageWidth * 1/8 * 72
 
     % Loop at 1 degree increments
     0 1 359 {
@@ -307,7 +290,7 @@ gsave
   (1 Degree Radial Lines) CENTER	% Show the text centered
 
   % Imageable area...
-  pageHeight 15 mul			% Height of imageable area
+  pageWidth 19.5 mul			% Height of imageable area
 
   pageWidth 4.5 mul			% x = pageWidth * 1/16 * 72
   pageHeight 35.5 mul			% y = pageHeight * 1/2 * 72
@@ -336,7 +319,7 @@ gsave
   smallFont setfont			% Font
   pageWidth 14 mul			% x = pageWidth * 3/16 * 72
   pageHeight 36 mul			% y = pageWidth * 1/2 * 72
-  pageHeight -2 mul add			% y -= 2 * smallFont height
+  pageWidth -3 mul add			% y -= 2 * smallFont height
 
   % Page Size inches
   2 copy moveto				% Move to x & y
@@ -347,7 +330,7 @@ gsave
   (in) show				% "in"
 
   % Page Size millimeters
-  pageHeight sub			% Move down...
+  pageWidth -1.5 mul add		% Move down...
 
   2 copy moveto				% Move to x & y
   10 pageWidth 25.4 mul NUMBER		% pageWidth
@@ -356,7 +339,7 @@ gsave
   (mm) show				% "mm"
 
   % Lower-left inches
-  pageHeight 2 mul sub			% Move down...
+  pageWidth -3 mul add			% Move down...
 
   2 copy moveto				% Move to x & y
   (Lower-Left: ) RIGHT			% Label
@@ -366,7 +349,7 @@ gsave
   (in) show				% "in"
 
   % Lower-left millimeters
-  pageHeight sub			% Move down...
+  pageWidth -1.5 mul add		% Move down...
 
   2 copy moveto				% Move to x & y
   10 pageLeft 25.4 mul NUMBER		% pageLeft
@@ -375,7 +358,7 @@ gsave
   (mm) show				% "mm"
 
   % Upper-right inches
-  pageHeight 2 mul sub			% Move down...
+  pageWidth -3 mul add			% Move down...
 
   2 copy moveto				% Move to x & y
   (Upper-Right: ) RIGHT			% Label
@@ -385,7 +368,7 @@ gsave
   (in) show				% "in"
 
   % Upper-right millimeters
-  pageHeight sub			% Move down...
+  pageWidth -1.5 mul add		% Move down...
 
   2 copy moveto				% Move to x & y
   10 pageRight 25.4 mul NUMBER		% pageRight
@@ -394,7 +377,7 @@ gsave
   (mm) show				% "mm"
 
   % Resolution dots-per-inch
-  pageHeight 2 mul sub			% Move down...
+  pageWidth -3 mul add			% Move down...
 
   2 copy moveto				% Move to x & y
   (Resolution: ) RIGHT			% Label
@@ -404,7 +387,7 @@ gsave
   (dpi) show				% "dpi"
 
   % Resolution dots-per-meter
-  pageHeight sub			% Move down...
+  pageWidth -1.5 mul add		% Move down...
 
   moveto				% Move to x & y
   1 xResolution 39.27 mul NUMBER	% xResolution
@@ -413,7 +396,7 @@ gsave
   (dpm) show				% "dpm"
 
   % Interpreter Information...
-  pageHeight 15 mul			% Height of interpreter information
+  pageWidth 19.5 mul			% Height of interpreter info
 
   pageWidth 40.5 mul			% x = pageWidth * 9/16 * 72
   pageHeight 35.5 mul			% y = pageHeight * 1/2 * 72
@@ -442,7 +425,7 @@ gsave
   smallFont setfont			% Font
   pageWidth 49 mul			% x = pageWidth * 11/16 * 72
   pageHeight 36 mul			% y = pageWidth * 1/2 * 72
-  pageHeight 2 mul sub			% y -= 2 * smallFont height
+  pageWidth -3 mul add			% y -= 2 * smallFont height
 
   % Language level
   2 copy moveto				% Move to x & y
@@ -451,7 +434,7 @@ gsave
   1 languagelevel NUMBER		% Language level
 
   % Version
-  pageHeight 2 mul sub			% Move down...
+  pageWidth -3 mul add			% Move down...
   2 copy moveto				% Move to x & y
   (Version: ) RIGHT			% Label
   version show				% Version
@@ -460,13 +443,13 @@ gsave
   (\)) show				% ")"
 
   % Product
-  pageHeight 2 mul sub			% Move down...
+  pageWidth -3 mul add			% Move down...
   2 copy moveto				% Move to x & y
   (Product: ) RIGHT			% Label
   product show				% Product name
 
   % Serial Number
-  pageHeight 2 mul sub			% Move down...
+  pageWidth -3 mul add			% Move down...
   2 copy moveto				% Move to x & y
   (Serial #: ) RIGHT			% Label
   1 serialnumber NUMBER			% S/N
@@ -480,28 +463,28 @@ gsave
 
   % Draw the copyright notice at the bottom...
   pageWidth 36 mul			% Center of page
-  pageHeight 10 mul			% Bottom of page
+  pageWidth 14 mul			% Bottom of page
   2 copy moveto				% Position text
-  (Printed Using CUPS v1.1.x) CENTER	% Show text centered
+  (Printed Using CUPS v1.1) CENTER	% Show text centered
 
-  pageHeight 2 mul sub			% Move down...
+  pageWidth 3 mul sub			% Move down...
   2 copy moveto				% Position text
   smallFont setfont			% Font
-  (Copyright 1993-2001 Easy Software Products, All Rights Reserved.) CENTER
-  pageHeight sub			% Move down...
+  (Copyright 1993-2000 Easy Software Products, All Rights Reserved.) CENTER
+  pageWidth 1.5 mul sub			% Move down...
   2 copy moveto				% Position text
   (CUPS, and the CUPS logo are the trademark property of) CENTER
-  pageHeight sub			% Move down...
+  pageWidth 1.5 mul sub			% Move down...
   2 copy moveto				% Position text
   (Easy Software Products, 44141 Airport View Drive, Suite 204,) CENTER
-  pageHeight sub			% Move down...
+  pageWidth 1.5 mul sub			% Move down...
   2 copy moveto				% Position text
   (Hollywood, Maryland, 20636-3111, USA.) CENTER
 
   % Then the CUPS logo....
   gsave
     pageWidth 4 mul
-    pageHeight 4 mul
+    pageWidth 6 mul
     translate
     pageWidth 9 mul CUPSLOGO
   grestore
@@ -509,7 +492,7 @@ gsave
   % And the ESP logo....
   gsave
     pageWidth 59 mul
-    pageHeight 4 mul
+    pageWidth 6 mul
     translate
     pageWidth 6 mul ESPLOGO
   grestore
@@ -517,6 +500,6 @@ gsave
 grestore
 showpage
 %
-% End of "$Id: testprint.ps 1646 2001-03-25 12:42:57Z mike $".
+% End of "$Id: testprint.ps 985 2000-03-13 18:55:00Z mike $".
 %
 %%EOF

data/topsecret

@@ -14,46 +14,36 @@
 %
 %   PostScript banner page for the Common UNIX Printing System ("CUPS").
 %
-%   Copyright 1993-2001 Easy Software Products
+%   Copyright 1993-2000 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:
+%   These coded instructions, statements, and computer programs contain
+%   unpublished proprietary information of Easy Software Products, and
+%   are protected by Federal copyright law. They may not be disclosed
+%   to third parties or copied or duplicated in any form, in whole or
+%   in part, without the prior written consent of Easy Software Products.
 %
-%       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
-%
-/CENTER {			% Draw centered text
+/CENTER \{			% Draw centered text
 				% (name) CENTER -
   dup stringwidth pop		% Get the width of the string
   0.5 mul neg 0 rmoveto		% Shift left 1/2 of the distance
   show				% Show the string
 } bind def
-/RIGHT {			% Draw right-justified text
+/RIGHT \{			% Draw right-justified text
 				% (name) RIGHT -
   dup stringwidth pop		% Get the width of the string
   neg 0 rmoveto			% Shift left the entire distance
   show				% Show the string
 } bind def
-/NUMBER {			% Draw a number
+/NUMBER \{			% Draw a number
 				% power n NUMBER -
-  1 index 1 eq {		% power == 1?
+  1 index 1 eq \{		% power == 1?
     round cvi exch pop		% Convert "n" to integer
-  } {
+  } \{
     1 index mul round exch div	% Truncate extra decimal places
   } ifelse
   100 string cvs show		% Convert to a string and show it...
 } bind def
-/CUPSLOGO {			% Draw the CUPS logo
+/CUPSLOGO \{			% Draw the CUPS logo
 				% height CUPSLOGO
   % Start with a big C...
   /Helvetica findfont 1 index scalefont setfont
@@ -71,14 +61,14 @@
   dup 1.2 mul moveto
   (System) show
 } bind def
-/ESPLOGO {			% Draw the ESP logo
+/ESPLOGO \{			% Draw the ESP logo
 				% height ESPLOGO
   % Compute the size of the logo...
   0 0
   2 index 1.5 mul 3 index
 
   % Do the "metallic" fill from 10% black to 40% black...
-  1 -0.001 0 {
+  1 -0.001 0 \{
     dup			% loopval
     -0.15 mul		% loopval * -0.15
     0.9 add		% 0.9 - loopval * 0.15
@@ -161,20 +151,14 @@ gsave
   /pageWidth pageRight pageLeft sub def	% pageWidth = pageRight - pageLeft
   /pageHeight pageTop pageBottom sub def% pageHeight = pageTop - pageBottom
 
-  /boxWidth				% width of text box
-  pageWidth pageHeight lt
-  { pageWidth 54 mul }
-  { pageHeight 42 mul }
-  ifelse def
-
   newpath				% Clear bounding path
 
   % Create fonts...
   /bigFont /Helvetica-Bold findfont	% bigFont = Helvetica-Bold
-  pageHeight 3 mul scalefont def	% size = pageHeight * 3 (nominally 33)
+  pageWidth 4 mul scalefont def		% size = pageWidth * 4 (nominally 34)
 
   /mediumFont /Helvetica findfont	% mediumFont = Helvetica
-  pageHeight 1.5 mul scalefont def	% size = pageHeight * 1.5 (nominally 16.5)
+  pageWidth 2 mul scalefont def		% size = pageWidth * 2 (nominally 17)
 
   % Offset page to account for lower-left margin...
   pageLeft 72 mul
@@ -186,30 +170,28 @@ gsave
 
   pageWidth 36 mul			% Center of page
   pageHeight 72 mul			% Top of page
-  pageWidth -7 mul add			% - 2 lines
+  pageWidth -9 mul add			% - 1 line
   moveto				% Position text
   bigFont setfont			% Font
   (Top Secret) CENTER			% Show text centered
 
   pageWidth 36 mul			% Center of page
-  pageHeight 6 mul			% Bottom of page
+  pageWidth 8 mul			% Bottom of page
   moveto				% Position text
   bigFont setfont			% Font
   (Top Secret) CENTER			% Show text centered
 
   % Job information box...
-  pageWidth 36 mul 9 add		% x = pageWidth * 1/2 * 72 + 9
-  boxWidth 0.5 mul sub			% x-= 1/2 box width
-  pageHeight 30 mul 9 sub		% y = pageHeight * 1/2 * 72 - 9
-  boxWidth				% w = box width
-  pageHeight 14 mul			% h = pageHeight * 1/2 * 72
+  pageWidth 18 mul 9 add		% x = pageWidth * 1/4 * 72 + 9
+  pageHeight 27 mul 9 sub		% y = pageHeight * 3/8 * 72 - 9
+  pageWidth 36 mul			% w = pageWidth * 1/2 * 72
+  pageHeight 18 mul			% h = pageHeight * 1/4 * 72
   0.5 setgray rectfill			% Draw a shadow
 
-  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
-  boxWidth 0.5 mul sub			% x-= 1/2 box width
-  pageHeight 30 mul			% y = pageHeight * 1/4 * 72
-  boxWidth				% w = box width
-  pageHeight 14 mul			% h = pageHeight * 1/2 * 72
+  pageWidth 18 mul			% x = pageWidth * 1/4 * 72
+  pageHeight 27 mul			% y = pageHeight * 3/8 * 72
+  pageWidth 36 mul			% w = pageWidth * 1/2 * 72
+  pageHeight 18 mul			% h = pageHeight * 1/4 * 72
 
   4 copy 1 setgray rectfill		% Clear the box to white
   0 setgray rectstroke			% Draw a black box around it...
@@ -219,7 +201,7 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight 5 mul add			% y += 2 lines
+  pageWidth 4 mul add			% y += 2 lines
   2 copy				% Copy X & Y
   moveto
   (Job ID: ) RIGHT
@@ -228,7 +210,7 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight 2 mul add			% y += 1 line
+  pageWidth 1 mul add			% y += 1 line
   2 copy				% Copy X & Y
   moveto
   (Title: ) RIGHT
@@ -237,7 +219,7 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight -1 mul add			% y -= 1 line
+  pageWidth -2 mul add			% y -= 1 line
   2 copy				% Copy X & Y
   moveto
   (Requesting User: ) RIGHT
@@ -246,7 +228,7 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight -4 mul add			% y -= 2 lines
+  pageWidth -5 mul add			% y -= 2 lines
   2 copy				% Copy X & Y
   moveto
   (Billing Info: ) RIGHT
@@ -272,6 +254,6 @@ gsave
 grestore
 showpage
 %
-% End of "$Id: topsecret 1646 2001-03-25 12:42:57Z mike $".
+% End of "$Id: topsecret 1075 2000-05-11 20:02:21Z mike $".
 %
 %%EOF

data/unclassified

@@ -14,46 +14,36 @@
 %
 %   PostScript banner page for the Common UNIX Printing System ("CUPS").
 %
-%   Copyright 1993-2001 Easy Software Products
+%   Copyright 1993-2000 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:
+%   These coded instructions, statements, and computer programs contain
+%   unpublished proprietary information of Easy Software Products, and
+%   are protected by Federal copyright law. They may not be disclosed
+%   to third parties or copied or duplicated in any form, in whole or
+%   in part, without the prior written consent of Easy Software Products.
 %
-%       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
-%
-/CENTER {			% Draw centered text
+/CENTER \{			% Draw centered text
 				% (name) CENTER -
   dup stringwidth pop		% Get the width of the string
   0.5 mul neg 0 rmoveto		% Shift left 1/2 of the distance
   show				% Show the string
 } bind def
-/RIGHT {			% Draw right-justified text
+/RIGHT \{			% Draw right-justified text
 				% (name) RIGHT -
   dup stringwidth pop		% Get the width of the string
   neg 0 rmoveto			% Shift left the entire distance
   show				% Show the string
 } bind def
-/NUMBER {			% Draw a number
+/NUMBER \{			% Draw a number
 				% power n NUMBER -
-  1 index 1 eq {		% power == 1?
+  1 index 1 eq \{		% power == 1?
     round cvi exch pop		% Convert "n" to integer
-  } {
+  } \{
     1 index mul round exch div	% Truncate extra decimal places
   } ifelse
   100 string cvs show		% Convert to a string and show it...
 } bind def
-/CUPSLOGO {			% Draw the CUPS logo
+/CUPSLOGO \{			% Draw the CUPS logo
 				% height CUPSLOGO
   % Start with a big C...
   /Helvetica findfont 1 index scalefont setfont
@@ -71,14 +61,14 @@
   dup 1.2 mul moveto
   (System) show
 } bind def
-/ESPLOGO {			% Draw the ESP logo
+/ESPLOGO \{			% Draw the ESP logo
 				% height ESPLOGO
   % Compute the size of the logo...
   0 0
   2 index 1.5 mul 3 index
 
   % Do the "metallic" fill from 10% black to 40% black...
-  1 -0.001 0 {
+  1 -0.001 0 \{
     dup			% loopval
     -0.15 mul		% loopval * -0.15
     0.9 add		% 0.9 - loopval * 0.15
@@ -161,20 +151,14 @@ gsave
   /pageWidth pageRight pageLeft sub def	% pageWidth = pageRight - pageLeft
   /pageHeight pageTop pageBottom sub def% pageHeight = pageTop - pageBottom
 
-  /boxWidth				% width of text box
-  pageWidth pageHeight lt
-  { pageWidth 54 mul }
-  { pageHeight 42 mul }
-  ifelse def
-
   newpath				% Clear bounding path
 
   % Create fonts...
   /bigFont /Helvetica-Bold findfont	% bigFont = Helvetica-Bold
-  pageHeight 3 mul scalefont def	% size = pageHeight * 3 (nominally 33)
+  pageWidth 4 mul scalefont def		% size = pageWidth * 4 (nominally 34)
 
   /mediumFont /Helvetica findfont	% mediumFont = Helvetica
-  pageHeight 1.5 mul scalefont def	% size = pageHeight * 1.5 (nominally 16.5)
+  pageWidth 2 mul scalefont def		% size = pageWidth * 2 (nominally 17)
 
   % Offset page to account for lower-left margin...
   pageLeft 72 mul
@@ -186,30 +170,28 @@ gsave
 
   pageWidth 36 mul			% Center of page
   pageHeight 72 mul			% Top of page
-  pageWidth -7 mul add			% - 2 lines
+  pageWidth -9 mul add			% - 1 line
   moveto				% Position text
   bigFont setfont			% Font
   (Unclassified) CENTER			% Show text centered
 
   pageWidth 36 mul			% Center of page
-  pageHeight 6 mul			% Bottom of page
+  pageWidth 8 mul			% Bottom of page
   moveto				% Position text
   bigFont setfont			% Font
   (Unclassified) CENTER			% Show text centered
 
   % Job information box...
-  pageWidth 36 mul 9 add		% x = pageWidth * 1/2 * 72 + 9
-  boxWidth 0.5 mul sub			% x-= 1/2 box width
-  pageHeight 30 mul 9 sub		% y = pageHeight * 1/2 * 72 - 9
-  boxWidth				% w = box width
-  pageHeight 14 mul			% h = pageHeight * 1/2 * 72
+  pageWidth 18 mul 9 add		% x = pageWidth * 1/4 * 72 + 9
+  pageHeight 27 mul 9 sub		% y = pageHeight * 3/8 * 72 - 9
+  pageWidth 36 mul			% w = pageWidth * 1/2 * 72
+  pageHeight 18 mul			% h = pageHeight * 1/4 * 72
   0.5 setgray rectfill			% Draw a shadow
 
-  pageWidth 36 mul			% x = pageWidth * 1/2 * 72
-  boxWidth 0.5 mul sub			% x-= 1/2 box width
-  pageHeight 30 mul			% y = pageHeight * 1/4 * 72
-  boxWidth				% w = box width
-  pageHeight 14 mul			% h = pageHeight * 1/2 * 72
+  pageWidth 18 mul			% x = pageWidth * 1/4 * 72
+  pageHeight 27 mul			% y = pageHeight * 3/8 * 72
+  pageWidth 36 mul			% w = pageWidth * 1/2 * 72
+  pageHeight 18 mul			% h = pageHeight * 1/4 * 72
 
   4 copy 1 setgray rectfill		% Clear the box to white
   0 setgray rectstroke			% Draw a black box around it...
@@ -219,7 +201,7 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight 5 mul add			% y += 2 lines
+  pageWidth 4 mul add			% y += 2 lines
   2 copy				% Copy X & Y
   moveto
   (Job ID: ) RIGHT
@@ -228,7 +210,7 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight 2 mul add			% y += 1 line
+  pageWidth 1 mul add			% y += 1 line
   2 copy				% Copy X & Y
   moveto
   (Title: ) RIGHT
@@ -237,7 +219,7 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight -1 mul add			% y -= 1 line
+  pageWidth -2 mul add			% y -= 1 line
   2 copy				% Copy X & Y
   moveto
   (Requesting User: ) RIGHT
@@ -246,7 +228,7 @@ gsave
 
   pageWidth 36 mul			% x = pageWidth * 1/2 * 72
   pageHeight 36 mul			% y = pageHeight * 1/2 * 72
-  pageHeight -4 mul add			% y -= 2 lines
+  pageWidth -5 mul add			% y -= 2 lines
   2 copy				% Copy X & Y
   moveto
   (Billing Info: ) RIGHT
@@ -272,6 +254,6 @@ gsave
 grestore
 showpage
 %
-% End of "$Id: unclassified 1646 2001-03-25 12:42:57Z mike $".
+% End of "$Id: unclassified 1075 2000-05-11 20:02:21Z mike $".
 %
 %%EOF

doc/Makefile

@@ -3,7 +3,7 @@
 #
 #   Documentation makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1993-2001 by Easy Software Products.
+#   Copyright 1993-2000 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -17,7 +17,7 @@
 #       44141 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
 #
@@ -47,8 +47,7 @@ include ../Makedefs
 #
 
 DOCUMENTS	=	cmp.shtml idd.shtml ipp.shtml sam.shtml sdd.shtml \
-			spm.shtml sps.shtml ssr.shtml stp.shtml sum.shtml \
-			svd.shtml
+			spm.shtml ssr.shtml stp.shtml sum.shtml svd.shtml
 DOCIMAGES	=	images/cups-block-diagram.gif images/cups-large.gif \
 			images/cups-medium.gif images/cups-small.gif
 WEBPAGES	=	cups.css cupsdoc.css index.html documentation.html
@@ -79,7 +78,6 @@ WEBIMAGES	=	images/accept-jobs.gif \
 			images/printer-stopped.gif \
 			images/reject-jobs.gif \
 			images/release-job.gif \
-			images/restart-job.gif \
 			images/right.gif \
 			images/show-active.gif \
 			images/show-completed.gif \
@@ -103,6 +101,14 @@ all:	$(DOCUMENTS:.shtml=.pdf) $(DOCUMENTS:.shtml=.html) overview.pdf
 ps:	$(DOCUMENTS:.shtml=.ps) overview.ps
 
 
+#
+# Make manuals for printing...
+#
+
+print:	sam-7x8.pdf spm-7x8.pdf sum-7x8.pdf \
+	sam-7x8.ps spm-7x8.ps sum-7x8.ps
+
+
 #
 # Remove all generated files...
 #
@@ -119,13 +125,11 @@ clean:
 
 install:
 	-$(MKDIR) $(DOCDIR)
-	$(CHMOD) ugo+rx $(DOCDIR)
 	$(INSTALL_MAN) $(WEBPAGES) $(DOCDIR)
 	$(INSTALL_MAN) overview.html overview.pdf $(DOCDIR)
 	$(INSTALL_MAN) $(DOCUMENTS:.shtml=.html) $(DOCDIR)
 	$(INSTALL_MAN) $(DOCUMENTS:.shtml=.pdf) $(DOCDIR)
 	-$(MKDIR) $(DOCDIR)/images
-	$(CHMOD) ugo+rx $(DOCDIR)/images
 	$(INSTALL_MAN) $(WEBIMAGES) $(DOCDIR)/images
 	$(INSTALL_MAN) $(DOCIMAGES) $(DOCDIR)/images
 
@@ -209,22 +213,6 @@ sum-7x8.ps:		sum.shtml
 		--size 7x8.5in --left 0.5in --right 0.25in \
 		--top 0.25in --bottom 0.25in --fontsize 10 --headfootsize 10 -f $@ sum.shtml
 
-$(DOCUMENTS:.shtml=.html): \
-		glossary.shtml printing-overview.shtml \
-		references.shtml system-overview.shtml \
-		../LICENSE.html
-
-$(DOCUMENTS:.shtml=.pdf): \
-		glossary.shtml printing-overview.shtml \
-		references.shtml system-overview.shtml \
-		../LICENSE.html
-
-$(DOCUMENTS:.shtml=.ps): \
-		glossary.shtml printing-overview.shtml \
-		references.shtml system-overview.shtml \
-		../LICENSE.html
-
-
 #
 # End of Makefile.
 #

doc/cmp.html

@@ -1,12 +1,12 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <HTML>
 <HEAD>
-<TITLE> CUPS Configuration Management Plan</TITLE>
-<META NAME="author" CONTENT="Easy Software Products">
-<META NAME="copyright" CONTENT="Copyright 1997-2001, All Rights Reserved">
-<META NAME="docnumber" CONTENT="CUPS-CMP-1.1">
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=iso-8859-1">
-<STYLE TYPE="text/css"><!--
+<TITLE>CUPS Configuration Management Plan</TITLE>
+<META NAME="AUTHOR" CONTENT="Easy Software Products">
+<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2000, All Rights Reserved">
+<META NAME="DOCNUMBER" CONTENT="CUPS-CMP-1.1">
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<STYLE>
 BODY { font-family: serif; font-size: 11.0pt }
 H1 { font-family: sans-serif; font-size: 20.0pt }
 H2 { font-family: sans-serif; font-size: 17.0pt }
@@ -17,14 +17,17 @@ H6 { font-family: sans-serif; font-size: 8.0pt }
 SUB { font-size: 8.0pt }
 SUP { font-size: 8.0pt }
 PRE { font-size: 9.0pt }
---></STYLE>
+A:link { text-decoration: underline }
+A:visited { text-decoration: underline }
+A:active { text-decoration: underline }
+</STYLE>
 </HEAD>
 <BODY>
-<CENTER><A HREF="#CONTENTS"><IMG SRC="images/cups-large.gif" BORDER="0" WIDTH="100%"><BR>
-<H1> CUPS Configuration Management Plan</H1></A><BR>
+<CENTER><A HREF="#CONTENTS"><IMG SRC="images/cups-large.gif" BORDER="0"><BR>
+<H1>CUPS Configuration Management Plan</H1></A><BR>
 CUPS-CMP-1.1<BR>
 Easy Software Products<BR>
-Copyright 1997-2001, All Rights Reserved<BR>
+Copyright 1997-2000, All Rights Reserved<BR>
 </CENTER>
 <HR>
 <H1 ALIGN="CENTER"><A NAME="CONTENTS">Table of Contents</A></H1>
@@ -117,24 +120,24 @@ Copyright 1997-2001, All Rights Reserved<BR>
 <H1><A NAME="1">1 Scope</A></H1>
 <H2><A NAME="1_1">1.1 Identification</A></H2>
  This configuration management plan document provides the guidelines 
-for development and maintenance of the Common UNIX Printing System 
+for development and maintainance of the Common UNIX Printing System 
 (&quot;CUPS&quot;) Version 1.1 software. 
 <H2><A NAME="1_2">1.2 System Overview</A></H2>
-<P>CUPS provides a portable printing layer for UNIX&reg;-based operating 
-systems. It has been developed by <A HREF="http://www.easysw.com">Easy 
-Software Products</A> to promote a standard printing solution for all 
-UNIX vendors and users. CUPS provides the System V and Berkeley 
+<P>The Common UNIX Printing System provides a portable printing layer 
+for  UNIX&reg; operating systems. It has been developed by <A HREF="http://www.easysw.com">
+Easy Software Products</A> to promote a standard printing solution for 
+all UNIX vendors and users. CUPS provides the System V and Berkeley 
 command-line interfaces. </P>
-<P>CUPS uses the Internet Printing Protocol (&quot;IPP&quot;) as the basis for 
-managing print jobs and queues. The Line Printer Daemon (&quot;LPD&quot;) Server 
-Message Block (&quot;SMB&quot;), and AppSocket (a.k.a. JetDirect) protocols are 
-also supported with reduced functionality. CUPS adds network printer 
-browsing and PostScript Printer Description (&quot;PPD&quot;) based printing 
-options to support real-world printing under UNIX. </P>
-<P>CUPS also includes a customized version of GNU Ghostscript 
-(currently based off GNU Ghostscript 5.50) and an image file RIP that 
-are used to support non-PostScript printers. Sample drivers for HP and 
-EPSON printers are included that use these filters. </P>
+<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>
+<P>CUPS adds network printer browsing and PostScript Printer 
+Description (&quot;PPD&quot;)-based printing options to support real world 
+applications under UNIX. </P>
+<P>CUPS also includes a customized version of GNU GhostScript 
+(currently based off GNU GhostScript 5.50) and an image file RIP that 
+is used to support non-PostScript printers. </P>
 <H2><A NAME="1_3">1.3 Document Overview</A></H2>
  This configuration management document is organized into the following 
 sections: 
@@ -153,47 +156,40 @@ sections:
 <UL>
 <LI>CUPS-CMP-1.1: CUPS Configuration Management Plan </LI>
 <LI>CUPS-IDD-1.1: CUPS System Interface Design Description </LI>
-<LI>CUPS-IPP-1.1: CUPS Implementation of IPP </LI>
+<LI>CUPS-IPP-1.1: CUPS Implmentation of IPP </LI>
 <LI>CUPS-SAM-1.1.x: CUPS Software Administrators Manual </LI>
 <LI>CUPS-SDD-1.1: CUPS Software Design Description </LI>
-<LI>CUPS-SPM-1.1.x: CUPS Software Programming Manual </LI>
+<LI>CUPS-SPM-1.1: CUPS Software Programming Manual </LI>
 <LI>CUPS-SSR-1.1: CUPS Software Security Report </LI>
 <LI>CUPS-STP-1.1: CUPS Software Test Plan </LI>
 <LI>CUPS-SUM-1.1.x: CUPS Software Users Manual </LI>
-<LI>CUPS-SVD-1.1: CUPS Software Version Description </LI>
+<LI>CUPS-SVD-1.1.x: CUPS Software Version Description </LI>
 </UL>
 <H2><A NAME="2_2">2.2 Other Documents</A></H2>
 <P>The following non-CUPS documents are referenced by this document: </P>
 <UL>
-<LI><A HREF="http://partners.adobe.com/asn/developer/PDFS/TN/5003.PPD_Spec_v4.3.pdf">
-Adobe  PostScript Printer Description File Format Specification, 
- Version 4.3.</A></LI>
-<LI><A HREF="http://partners.adobe.com/asn/developer/PDFS/TN/PLRM.pdf">
-Adobe  PostScript Language Reference, Third Edition.</A></LI>
+<LI>Adobe PostScript Printer Description File Format Specification, 
+ Version 4.3. </LI>
+<LI>Adobe PostScript Language Reference, Third Edition. </LI>
 <LI>IPP: Job and Printer Set Operations </LI>
 <LI>IPP/1.1: Encoding and Transport </LI>
 <LI>IPP/1.1: Implementers Guide </LI>
 <LI>IPP/1.1: Model and Semantics </LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc1179.txt">RFC 1179, Line 
-Printer Daemon Protocol</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2567.txt">RFC 2567, Design 
-Goals for an Internet Printing Protocol</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2568.txt">RFC 2568, Rationale 
-for the Structure of the Model and Protocol</A> for the Internet 
-Printing Protocol</LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2569.txt">RFC 2569, Mapping 
-between LPD and IPP Protocols</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2616.txt">RFC 2616, Hypertext 
-Transfer Protocol -- HTTP/1.1</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2617.txt">RFC 2617, HTTP 
-Authentication: Basic and Digest Access</A> Authentication </LI>
+<LI>RFC 1179, Line Printer Daemon Protocol </LI>
+<LI>RFC 2567, Design Goals for an Internet Printing Protocol </LI>
+<LI>RFC 2568, Rationale for the Structure of the Model and Protocol 
+ for the Internet Printing Protocol </LI>
+<LI>RFC 2569, Mapping between LPD and IPP Protocols </LI>
+<LI>RFC 2616, Hypertext Transfer Protocol -- HTTP/1.1 </LI>
+<LI>RFC 2617, HTTP Authentication: Basic and Digest Access 
+ Authentication </LI>
 </UL>
 <H1><A NAME="3">3 File Management</A></H1>
 <H2><A NAME="3_1">3.1 Directory Structure</A></H2>
  Each source file shall be placed a sub-directory corresponding to the 
-software sub-system it belongs to (&quot;scheduler&quot;, &quot;cups&quot;, etc.) To remain 
-compatible with older UNIX filesystems, directory names shall not 
-exceed 16 characters in length. 
+software sub-system it belongs to (&quot;scheduler&quot;, &quot;libcups&quot;, etc.) To 
+remain compatible with older UNIX filesystems, directory names shall 
+not exceed 16 characters in length. 
 <H2><A NAME="3_2">3.2 Source Files</A></H2>
  Source files shall be documented and formatted as described in 
 Appendix B, Coding Requirements. 
@@ -333,7 +329,7 @@ tests.
 <DT>HP-GL </DT>
 <DD>Hewlett-Packard Graphics Language </DD>
 <DT>HP-PCL </DT>
-<DD>Hewlett-Packard Page Control Language </DD>
+<DD>Hewlett-Packard Printer Control Language </DD>
 <DT>HP-PJL </DT>
 <DD>Hewlett-Packard Printer Job Language </DD>
 <DT>IETF </DT>
@@ -346,6 +342,8 @@ tests.
 <DD>Line Printer Daemon </DD>
 <DT>MIME </DT>
 <DD>Multimedia Internet Mail Exchange </DD>
+<DT>PCL </DT>
+<DD>Page Control Language </DD>
 <DT>PPD </DT>
 <DD>PostScript Printer Description </DD>
 <DT>SMB </DT>
@@ -372,11 +370,11 @@ name and revision information is provided by the CVS &quot;$Id$&quot; tag:
 <UL>
 <PRE>
 /*
- * &quot;$Id$&quot;
+ * &quot;36;Id$&quot;
  *
  *   Description of file contents.
  *
- *   Copyright 1997-2001 by Easy Software Products, all rights
+ *   Copyright 1997-2000 by Easy Software Products, all rights
  *   reserved.
  *
  *   These coded instructions, statements, and computer programs are
@@ -391,7 +389,7 @@ name and revision information is provided by the CVS &quot;$Id$&quot; tag:
  *       44141 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
  *
@@ -410,7 +408,7 @@ that code has been lost near the end of the file:
 <UL>
 <PRE>
 /*
- * End of &quot;$Id$&quot;.
+ * End of &quot;36;Id$&quot;.
  */
 </PRE>
 </UL>
@@ -659,19 +657,19 @@ for (i = sizeof(array) / sizeof(array[0]) - 1; i &gt;= 0; i --)
 <TR><TH ALIGN="RIGHT">Summary of Problem:</TH><TD ALIGN="LEFT">
 ________________________________________</TD></TR>
 <TR><TH ALIGN="RIGHT">Problem Severity:</TH><TD ALIGN="LEFT">__1=RFE 
-<BR> __2=Documentation-Error 
-<BR> __3=Unable-to-Print-a-File 
-<BR> __4=Unable-to-Print-to-a-Printer 
-<BR> __5=Unable-to-Print-at-All</TD></TR>
+<BR>__2=Documentation-Error 
+<BR>__3=Unable-to-Print-a-File 
+<BR>__4=Unable-to-Print-to-a-Printer 
+<BR>__5=Unable-to-Print-at-All</TD></TR>
 <TR><TH ALIGN="RIGHT">Problem Scope:</TH><TD ALIGN="LEFT">__1=Machine 
 __2=Operating-System __3=All</TD></TR>
 <TR><TH ALIGN="RIGHT" VALIGN="TOP">Detailed Description of Problem:</TH><TD
 ALIGN="LEFT">________________________________________ 
-<BR> ________________________________________ 
-<BR> ________________________________________ 
-<BR> ________________________________________ 
-<BR> ________________________________________ 
-<BR> ________________________________________</TD></TR>
+<BR>________________________________________ 
+<BR>________________________________________ 
+<BR>________________________________________ 
+<BR>________________________________________ 
+<BR>________________________________________</TD></TR>
 </TABLE>
 </CENTER>
 </BODY>

doc/cmp.shtml

@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 	<META NAME="DOCNUMBER" CONTENT="CUPS-CMP-1.1">
-	<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2001, All Rights Reserved">
+	<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2000, All Rights Reserved">
 	<META NAME="Author" CONTENT="Easy Software Products">
 	<TITLE>CUPS Configuration Management Plan</TITLE>
 </HEAD>
@@ -12,7 +12,7 @@
 <H2>Identification</H2>
 
 This configuration management plan document provides the guidelines for
-development and maintenance of the Common UNIX Printing System ("CUPS")
+development and maintainance of the Common UNIX Printing System ("CUPS")
 Version 1.1 software.
 
 <EMBED SRC="system-overview.shtml">
@@ -39,7 +39,7 @@ sections:
 <H2>Directory Structure</H2>
 
 Each source file shall be placed a sub-directory corresponding to the software
-sub-system it belongs to ("scheduler", "cups", etc.) To remain compatible
+sub-system it belongs to ("scheduler", "libcups", etc.) To remain compatible
 with older UNIX filesystems, directory names shall not exceed 16 characters
 in length.
 
@@ -221,7 +221,7 @@ information is provided by the CVS "&#36;Id$" tag:
  *
  *   Description of file contents.
  *
- *   Copyright 1997-2001 by Easy Software Products, all rights
+ *   Copyright 1997-2000 by Easy Software Products, all rights
  *   reserved.
  *
  *   These coded instructions, statements, and computer programs are
@@ -236,7 +236,7 @@ information is provided by the CVS "&#36;Id$" tag:
  *       44141 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
  *

doc/documentation.html

@@ -56,10 +56,6 @@ The following documentation for CUPS is available on this server:
 	<A HREF="sdd.html">HTML</A> |
 	<A HREF="sdd.pdf">PDF</A> )
 
-	<LI>Software Performance Specification (
-	<A HREF="sps.html">HTML</A> |
-	<A HREF="sps.pdf">PDF</A> )
-
 	<LI>Software Version Description (
 	<A HREF="svd.html">HTML</A> |
 	<A HREF="svd.pdf">PDF</A> )
@@ -74,7 +70,7 @@ The following documentation for CUPS is available on this server:
 
 <P>The Common UNIX Printing System, CUPS, and the CUPS logo are the
 trademark property of <A HREF="http://www.easysw.com">Easy Software
-Products</A>. CUPS is copyright 1997-2001 by Easy Software Products,
+Products</A>. CUPS is copyright 1997-2000 by Easy Software Products,
 All Rights Reserved.
 
 </BODY>

doc/glossary.shtml

@@ -41,7 +41,7 @@
 	<DD>Hewlett-Packard Graphics Language
 
 	<DT>HP-PCL
-	<DD>Hewlett-Packard Page Control Language
+	<DD>Hewlett-Packard Printer Control Language
 
 	<DT>HP-PJL
 	<DD>Hewlett-Packard Printer Job Language
@@ -61,6 +61,9 @@
 	<DT>MIME
 	<DD>Multimedia Internet Mail Exchange
 
+	<DT>PCL
+	<DD>Page Control Language
+
 	<DT>PPD
 	<DD>PostScript Printer Description
 

doc/idd.html

@@ -1,12 +1,12 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <HTML>
 <HEAD>
-<TITLE> CUPS Interface Design Description</TITLE>
-<META NAME="author" CONTENT="Easy Software Products">
-<META NAME="copyright" CONTENT="Copyright 1997-2001, All Rights Reserved">
-<META NAME="docnumber" CONTENT="CUPS-IDD-1.1">
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=iso-8859-1">
-<STYLE TYPE="text/css"><!--
+<TITLE>CUPS Interface Design Description</TITLE>
+<META NAME="AUTHOR" CONTENT="Easy Software Products">
+<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2000, All Rights Reserved">
+<META NAME="DOCNUMBER" CONTENT="CUPS-IDD-1.1">
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<STYLE>
 BODY { font-family: serif; font-size: 11.0pt }
 H1 { font-family: sans-serif; font-size: 20.0pt }
 H2 { font-family: sans-serif; font-size: 17.0pt }
@@ -17,14 +17,17 @@ H6 { font-family: sans-serif; font-size: 8.0pt }
 SUB { font-size: 8.0pt }
 SUP { font-size: 8.0pt }
 PRE { font-size: 9.0pt }
---></STYLE>
+A:link { text-decoration: underline }
+A:visited { text-decoration: underline }
+A:active { text-decoration: underline }
+</STYLE>
 </HEAD>
 <BODY>
-<CENTER><A HREF="#CONTENTS"><IMG SRC="images/cups-large.gif" BORDER="0" WIDTH="100%"><BR>
-<H1> CUPS Interface Design Description</H1></A><BR>
+<CENTER><A HREF="#CONTENTS"><IMG SRC="images/cups-large.gif" BORDER="0"><BR>
+<H1>CUPS Interface Design Description</H1></A><BR>
 CUPS-IDD-1.1<BR>
 Easy Software Products<BR>
-Copyright 1997-2001, All Rights Reserved<BR>
+Copyright 1997-2000, All Rights Reserved<BR>
 </CENTER>
 <HR>
 <H1 ALIGN="CENTER"><A NAME="CONTENTS">Table of Contents</A></H1>
@@ -32,8 +35,7 @@ Copyright 1997-2001, All Rights Reserved<BR>
 <BR><B><A HREF="#1">1 Scope</A></B>
 <UL>
 <LI><A HREF="#1_1">1.1 Identification</A></LI>
-<LI><A HREF="#1_2">1.2 System Overview</A></LI>
-<LI><A HREF="#1_3">1.3 Document Overview</A></LI>
+<LI><A HREF="#1_2">1.2 Document Overview</A></LI>
 </UL>
 <B><A HREF="#2">2 References</A></B>
 <UL>
@@ -94,23 +96,7 @@ Copyright 1997-2001, All Rights Reserved<BR>
 <P>This interface design description document provides detailed file 
 formats, message formats, and program conventions for the Common UNIX 
 Printing System (&quot;CUPS&quot;) Version 1.1. </P>
-<H2><A NAME="1_2">1.2 System Overview</A></H2>
-<P>CUPS provides a portable printing layer for UNIX&reg;-based operating 
-systems. It has been developed by <A HREF="http://www.easysw.com">Easy 
-Software Products</A> to promote a standard printing solution for all 
-UNIX vendors and users. CUPS provides the System V and Berkeley 
-command-line interfaces. </P>
-<P>CUPS uses the Internet Printing Protocol (&quot;IPP&quot;) as the basis for 
-managing print jobs and queues. The Line Printer Daemon (&quot;LPD&quot;) Server 
-Message Block (&quot;SMB&quot;), and AppSocket (a.k.a. JetDirect) protocols are 
-also supported with reduced functionality. CUPS adds network printer 
-browsing and PostScript Printer Description (&quot;PPD&quot;) based printing 
-options to support real-world printing under UNIX. </P>
-<P>CUPS also includes a customized version of GNU Ghostscript 
-(currently based off GNU Ghostscript 5.50) and an image file RIP that 
-are used to support non-PostScript printers. Sample drivers for HP and 
-EPSON printers are included that use these filters. </P>
-<H2><A NAME="1_3">1.3 Document Overview</A></H2>
+<H2><A NAME="1_2">1.2 Document Overview</A></H2>
 <P>This interface design description document is organized into the 
 following sections: </P>
 <UL>
@@ -127,40 +113,33 @@ following sections: </P>
 <UL>
 <LI>CUPS-CMP-1.1: CUPS Configuration Management Plan </LI>
 <LI>CUPS-IDD-1.1: CUPS System Interface Design Description </LI>
-<LI>CUPS-IPP-1.1: CUPS Implementation of IPP </LI>
+<LI>CUPS-IPP-1.1: CUPS Implmentation of IPP </LI>
 <LI>CUPS-SAM-1.1.x: CUPS Software Administrators Manual </LI>
 <LI>CUPS-SDD-1.1: CUPS Software Design Description </LI>
-<LI>CUPS-SPM-1.1.x: CUPS Software Programming Manual </LI>
+<LI>CUPS-SPM-1.1: CUPS Software Programming Manual </LI>
 <LI>CUPS-SSR-1.1: CUPS Software Security Report </LI>
 <LI>CUPS-STP-1.1: CUPS Software Test Plan </LI>
 <LI>CUPS-SUM-1.1.x: CUPS Software Users Manual </LI>
-<LI>CUPS-SVD-1.1: CUPS Software Version Description </LI>
+<LI>CUPS-SVD-1.1.x: CUPS Software Version Description </LI>
 </UL>
 <H2><A NAME="2_2">2.2 Other Documents</A></H2>
 <P>The following non-CUPS documents are referenced by this document: </P>
 <UL>
-<LI><A HREF="http://partners.adobe.com/asn/developer/PDFS/TN/5003.PPD_Spec_v4.3.pdf">
-Adobe  PostScript Printer Description File Format Specification, 
- Version 4.3.</A></LI>
-<LI><A HREF="http://partners.adobe.com/asn/developer/PDFS/TN/PLRM.pdf">
-Adobe  PostScript Language Reference, Third Edition.</A></LI>
+<LI>Adobe PostScript Printer Description File Format Specification, 
+ Version 4.3. </LI>
+<LI>Adobe PostScript Language Reference, Third Edition. </LI>
 <LI>IPP: Job and Printer Set Operations </LI>
 <LI>IPP/1.1: Encoding and Transport </LI>
 <LI>IPP/1.1: Implementers Guide </LI>
 <LI>IPP/1.1: Model and Semantics </LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc1179.txt">RFC 1179, Line 
-Printer Daemon Protocol</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2567.txt">RFC 2567, Design 
-Goals for an Internet Printing Protocol</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2568.txt">RFC 2568, Rationale 
-for the Structure of the Model and Protocol</A> for the Internet 
-Printing Protocol</LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2569.txt">RFC 2569, Mapping 
-between LPD and IPP Protocols</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2616.txt">RFC 2616, Hypertext 
-Transfer Protocol -- HTTP/1.1</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2617.txt">RFC 2617, HTTP 
-Authentication: Basic and Digest Access</A> Authentication </LI>
+<LI>RFC 1179, Line Printer Daemon Protocol </LI>
+<LI>RFC 2567, Design Goals for an Internet Printing Protocol </LI>
+<LI>RFC 2568, Rationale for the Structure of the Model and Protocol 
+ for the Internet Printing Protocol </LI>
+<LI>RFC 2569, Mapping between LPD and IPP Protocols </LI>
+<LI>RFC 2616, Hypertext Transfer Protocol -- HTTP/1.1 </LI>
+<LI>RFC 2617, HTTP Authentication: Basic and Digest Access 
+ Authentication </LI>
 </UL>
 <H1><A NAME="3">3 Internal Interfaces</A></H1>
 <H2><A NAME="3_1">3.1 Character Set Files</A></H2>
@@ -243,6 +222,16 @@ string &quot;cups_&quot; to the front of the language specifier (e.g. &quot;cups
 <P>The first line identifies the character set to be used for the 
 messages. The currently recognized values are: </P>
 <UL>
+<LI>cp874 </LI>
+<LI>cp1250 </LI>
+<LI>cp1251 </LI>
+<LI>cp1252 </LI>
+<LI>cp1253 </LI>
+<LI>cp1254 </LI>
+<LI>cp1255 </LI>
+<LI>cp1256 </LI>
+<LI>cp1257 </LI>
+<LI>cp1258 </LI>
 <LI>iso-8859-1 </LI>
 <LI>iso-8859-2 </LI>
 <LI>iso-8859-3 </LI>
@@ -258,16 +247,6 @@ messages. The currently recognized values are: </P>
 <LI>iso-8859-15 </LI>
 <LI>us-ascii </LI>
 <LI>utf-8 </LI>
-<LI>windows-874 </LI>
-<LI>windows-1250 </LI>
-<LI>windows-1251 </LI>
-<LI>windows-1252 </LI>
-<LI>windows-1253 </LI>
-<LI>windows-1254 </LI>
-<LI>windows-1255 </LI>
-<LI>windows-1256 </LI>
-<LI>windows-1257 </LI>
-<LI>windows-1258 </LI>
 </UL>
 <P>The second and succeeding lines define text messages. If the message 
 text is preceded by a number, then the current message number is 
@@ -314,12 +293,7 @@ of 1 or more lines of ASCII text. Comment lines start with the pound
 (&quot;super/type&quot;) representing the source and destination types. Following 
 the MIME types are a cost value (0 to 100) and the filter program to 
 use. If the filter program is not specified using the full path then it 
-must reside in the CUPS filter directory: </P>
-<UL>
-<PRE>
-super/type SP super/type2 SP cost SP program
-</PRE>
-</UL>
+must reside in the CUPS filter directory. </P>
 <H2><A NAME="3_4">3.4 Option Files</A></H2>
 <P>CUPS maintains user-defined printer and option files for each 
 printer and user on the system. The printers and options defined in the 
@@ -434,6 +408,8 @@ other files in a  job.</TD></TR>
 allowed to access the  class.</TD></TR>
 <TR><TD>Info</TD><TD>A textual description of the class.</TD></TR>
 <TR><TD>Location</TD><TD>A textual location of the class.</TD></TR>
+<TR><TD>MoreInfo</TD><TD>A URL pointing to additional information on 
+the class.</TD></TR>
 <TR><TD>Printer</TD><TD>Specifies a printer that is a member of the 
 class.</TD></TR>
 <TR><TD>State</TD><TD>Specifies the initial state of the class; can be 
@@ -482,16 +458,11 @@ use for browse packets.</TD></TR>
 <TR><TD>BrowseRelay</TD><TD>-</TD><TD>Specifies a source and 
 destination address for relaying browser  information from one subnet 
 to another.</TD></TR>
-<TR><TD>BrowseShortNames</TD><TD>yes</TD><TD>Specifies whether or not 
-to provide short names (without the  &quot;@server&quot; part) for remote 
-printers.</TD></TR>
 <TR><TD>BrowseTimeout</TD><TD>300</TD><TD>Specifies the number of 
 seconds to wait until remote destinations  are removed from the local 
 destination list.</TD></TR>
 <TR><TD>Browsing</TD><TD>On</TD><TD>Specifies whether or not printer 
 and class browsing is enabled; can  be &quot;On&quot; or &quot;Off&quot;.</TD></TR>
-<TR><TD>DataDir</TD><TD>/usr/share/cups</TD><TD>Specifies the directory 
-where CUPS data files are stored.</TD></TR>
 <TR><TD>DefaultCharset</TD><TD>iso-8859-1</TD><TD>Specifies the default 
 character set.</TD></TR>
 <TR><TD>DefaultLanguage</TD><TD>current locale</TD><TD>Specifies the 
@@ -595,6 +566,8 @@ allowed to access the  printer.</TD></TR>
 printer.</TD></TR>
 <TR><TD>Info</TD><TD>A textual description of the printer.</TD></TR>
 <TR><TD>Location</TD><TD>A textual location of the printer.</TD></TR>
+<TR><TD>MoreInfo</TD><TD>A URL pointing to additional information on 
+the printer.</TD></TR>
 <TR><TD>&lt;Printer name&gt;
 <BR> &lt;/Printer&gt;</TD><TD>Surrounds the printer definition.</TD></TR>
 <TR><TD>State</TD><TD>Specifies the initial state of the printer; can 
@@ -848,9 +821,10 @@ application/vnd.cups-postscript</CODE>. </P>
 <H2><A NAME="4_5">4.5 CUPS Raster File</A></H2>
 <P>CUPS raster files are device-dependent raster image files that 
 contain a PostScript page device dictionary and device-dependent raster 
-imagery for each page in the document. These files are used to transfer 
-raster data from the PostScript and image file RIPs to device-dependent 
-filters that convert the raster data to a printable format. </P>
+imagery for each page in the document.  These files are used to 
+transfer raster data from the PostScript and image file RIPs to 
+device-dependent filters that convert the raster data to a printable 
+format. </P>
 <P>A raster file begins with a four byte synchronization word: 
 0x52615374 (&quot;RaSt&quot;) for big-endian architectures and 0x74536152 
 (&quot;tSaR&quot;) for little-endian architectures.  The writer of the raster 
@@ -985,9 +959,7 @@ RFC 1179: Line Printer Daemon Protocol</A>. </P>
 <P>The Server Message Block (SMB) and related Common Internet File 
 System (CIFS) protocols are described at <A HREF="http://anu.samba.org/cifs">
 http://anu.samba.org/cifs</A>. </P>
-<P>The URI method name for SMB is &quot;smb&quot;. Support for this protocol is 
-provided via the SAMBA <CODE>smbspool(1)</CODE> program provided with 
-SAMBA 2.0.6 and higher. </P>
+<P>The URI method name for SMB is &quot;smb&quot;. </P>
 <H1><A NAME="5">5 Directories</A></H1>
 <DL>
 <DT>/etc/cups </DT>
@@ -1000,10 +972,8 @@ SAMBA 2.0.6 and higher. </P>
 <DD>This directory contains PPD files for each printer. </DD>
 <DT>/usr/bin </DT>
 <DD>The <CODE>cancel</CODE>, <CODE>lp</CODE>, <CODE>lpq</CODE>, <CODE>
- lpr</CODE>, <CODE>lprm</CODE>, and <CODE>lpstat</CODE> commands 
- reside here. </DD>
-<DT>/usr/lib, /usr/lib32 </DT>
-<DD>The shared libraries (DSOs) reside here. </DD>
+lpr</CODE>, <CODE>lprm</CODE>, and <CODE>lpstat</CODE> commands  reside 
+here. </DD>
 <DT>/usr/lib/cups/backend </DT>
 <DD>The backend filters reside here. </DD>
 <DT>/usr/lib/cups/cgi-bin </DT>
@@ -1013,7 +983,7 @@ SAMBA 2.0.6 and higher. </P>
 <DT>/usr/lib/cups/filter </DT>
 <DD>The file filters reside here. </DD>
 <DT>/usr/sbin </DT>
-<DD>The <CODE>accept</CODE>, <CODE>cupsd</CODE>, <CODE> lpadmin</CODE>, <CODE>
+<DD>The <CODE>accept</CODE>, <CODE>cupsd</CODE>, <CODE>lpadmin</CODE>, <CODE>
 lpc</CODE>, and <CODE>reject</CODE> commands reside here. </DD>
 <DT>/usr/share/cups </DT>
 <DD>This is the root directory of the CUPS static data. </DD>
@@ -1031,7 +1001,7 @@ lpc</CODE>, and <CODE>reject</CODE> commands reside here. </DD>
 <DD>The scheduler documentation files reside here. </DD>
 <DT>/var/log/cups </DT>
 <DD>The <CODE>access_log</CODE>, <CODE>error_log</CODE>, and <CODE>
- page_log</CODE> files reside here. </DD>
+page_log</CODE> files reside here. </DD>
 <DT>/var/spool/cups </DT>
 <DD>This directory contains print job files. </DD>
 </DL>
@@ -1062,7 +1032,7 @@ lpc</CODE>, and <CODE>reject</CODE> commands reside here. </DD>
 <DT>HP-GL </DT>
 <DD>Hewlett-Packard Graphics Language </DD>
 <DT>HP-PCL </DT>
-<DD>Hewlett-Packard Page Control Language </DD>
+<DD>Hewlett-Packard Printer Control Language </DD>
 <DT>HP-PJL </DT>
 <DD>Hewlett-Packard Printer Job Language </DD>
 <DT>IETF </DT>
@@ -1075,6 +1045,8 @@ lpc</CODE>, and <CODE>reject</CODE> commands reside here. </DD>
 <DD>Line Printer Daemon </DD>
 <DT>MIME </DT>
 <DD>Multimedia Internet Mail Exchange </DD>
+<DT>PCL </DT>
+<DD>Page Control Language </DD>
 <DT>PPD </DT>
 <DD>PostScript Printer Description </DD>
 <DT>SMB </DT>

doc/idd.shtml

@@ -1,6 +1,6 @@
 <HTML>
 <HEAD>
-	<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2001, All Rights Reserved">
+	<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2000, All Rights Reserved">
 	<META NAME="DOCNUMBER" CONTENT="CUPS-IDD-1.1">
 	<META NAME="Author" CONTENT="Easy Software Products">
 	<TITLE>CUPS Interface Design Description</TITLE>
@@ -129,6 +129,16 @@ file consists of two or more lines of ASCII text.
 The currently recognized values are:
 
 <UL>
+	<LI>cp874
+	<LI>cp1250
+	<LI>cp1251
+	<LI>cp1252
+	<LI>cp1253
+	<LI>cp1254
+	<LI>cp1255
+	<LI>cp1256
+	<LI>cp1257
+	<LI>cp1258
 	<LI>iso-8859-1
 	<LI>iso-8859-2
 	<LI>iso-8859-3
@@ -144,16 +154,6 @@ The currently recognized values are:
 	<LI>iso-8859-15
 	<LI>us-ascii
 	<LI>utf-8
-	<LI>windows-874
-	<LI>windows-1250
-	<LI>windows-1251
-	<LI>windows-1252
-	<LI>windows-1253
-	<LI>windows-1254
-	<LI>windows-1255
-	<LI>windows-1256
-	<LI>windows-1257
-	<LI>windows-1258
 </UL>
 
 <P>The second and succeeding lines define text messages. If the message text
@@ -208,11 +208,7 @@ of 1 or more lines of ASCII text. Comment lines start with the pound
 representing the source and destination types. Following the MIME types are
 a cost value (0 to 100) and the filter program to use. If the filter program
 is not specified using the full path then it must reside in the CUPS filter
-directory:
-
-<UL><PRE>
-super/type SP super/type2 SP cost SP program
-</PRE></UL>
+directory.
 
 <H2>Option Files</H2>
 
@@ -386,6 +382,10 @@ followed by its value. The following directives are understood:
 	<TD>Location</TD>
 	<TD>A textual location of the class.</TD>
 </TR>
+<TR>
+	<TD>MoreInfo</TD>
+	<TD>A URL pointing to additional information on the class.</TD>
+</TR>
 <TR>
 	<TD>Printer</TD>
 	<TD>Specifies a printer that is a member of the class.</TD>
@@ -488,12 +488,6 @@ followed by its value. The following directives are understood:
 	<TD>Specifies a source and destination address for relaying browser
 	information from one subnet to another.</TD>
 </TR>
-<TR>
-	<TD>BrowseShortNames</TD>
-	<TD>yes</TD>
-	<TD>Specifies whether or not to provide short names (without the
-	"@server" part) for remote printers.</TD>
-</TR>
 <TR>
 	<TD>BrowseTimeout</TD>
 	<TD>300</TD>
@@ -506,11 +500,6 @@ followed by its value. The following directives are understood:
 	<TD>Specifies whether or not printer and class browsing is enabled; can
 	be "On" or "Off".</TD>
 </TR>
-<TR>
-	<TD>DataDir</TD>
-	<TD>/usr/share/cups</TD>
-	<TD>Specifies the directory where CUPS data files are stored.</TD>
-</TR>
 <TR>
 	<TD>DefaultCharset</TD>
 	<TD>iso-8859-1</TD>
@@ -738,6 +727,10 @@ followed by its value. The following directives are understood:
 	<TD>Location</TD>
 	<TD>A textual location of the printer.</TD>
 </TR>
+<TR>
+	<TD>MoreInfo</TD>
+	<TD>A URL pointing to additional information on the printer.</TD>
+</TR>
 <TR>
 	<TD>&lt;Printer name&gt;<BR>
 	&lt;/Printer&gt;</TD>
@@ -1063,7 +1056,7 @@ Adobe PostScript Language Reference Manual, Third Edition</A>.
 
 <P>CUPS raster files are device-dependent raster image files that contain a
 PostScript page device dictionary and device-dependent raster imagery for
-each page in the document. These files are used to transfer raster data
+each page in the document.  These files are used to transfer raster data
 from the PostScript and image file RIPs to device-dependent filters that
 convert the raster data to a printable format.
 
@@ -1348,9 +1341,7 @@ Protocol</A>.
 System (CIFS) protocols are described at
 <A HREF="http://anu.samba.org/cifs">http://anu.samba.org/cifs</A>.
 
-<P>The URI method name for SMB is "smb". Support for this protocol is
-provided via the SAMBA <CODE>smbspool(1)</CODE> program provided with
-SAMBA 2.0.6 and higher.
+<P>The URI method name for SMB is "smb".
 
 <H1>Directories</H1>
 
@@ -1373,9 +1364,6 @@ SAMBA 2.0.6 and higher.
 	<CODE>lpr</CODE>, <CODE>lprm</CODE>, and <CODE>lpstat</CODE> commands
 	reside here.
 
-	<DT>/usr/lib, /usr/lib32
-	<DD>The shared libraries (DSOs) reside here.
-
 	<DT>/usr/lib/cups/backend
 	<DD>The backend filters reside here.
 

doc/index.html

@@ -29,7 +29,7 @@
 
 <P>The Common UNIX Printing System, CUPS, and the CUPS logo are the
 trademark property of <A HREF="http://www.easysw.com">Easy Software
-Products</A>. CUPS is copyright 1997-2001 by Easy Software Products,
+Products</A>. CUPS is copyright 1997-2000 by Easy Software Products,
 All Rights Reserved.
 
 </BODY>

doc/ipp.html

@@ -1,12 +1,12 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <HTML>
 <HEAD>
-<TITLE> CUPS Implementation of IPP</TITLE>
-<META NAME="author" CONTENT="Easy Software Products">
-<META NAME="copyright" CONTENT="Copyright 1997-2001 All Rights Reserved">
-<META NAME="docnumber" CONTENT="CUPS-IPP-1.1">
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=iso-8859-1">
-<STYLE TYPE="text/css"><!--
+<TITLE>CUPS Implementation of IPP</TITLE>
+<META NAME="AUTHOR" CONTENT="Easy Software Products">
+<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2000, All Rights Reserved">
+<META NAME="DOCNUMBER" CONTENT="CUPS-IPP-1.1">
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<STYLE>
 BODY { font-family: serif; font-size: 11.0pt }
 H1 { font-family: sans-serif; font-size: 20.0pt }
 H2 { font-family: sans-serif; font-size: 17.0pt }
@@ -17,14 +17,14 @@ H6 { font-family: sans-serif; font-size: 8.0pt }
 SUB { font-size: 8.0pt }
 SUP { font-size: 8.0pt }
 PRE { font-size: 9.0pt }
---></STYLE>
+</STYLE>
 </HEAD>
 <BODY>
-<CENTER><A HREF="#CONTENTS"><IMG SRC="images/cups-large.gif" BORDER="0" WIDTH="100%"><BR>
-<H1> CUPS Implementation of IPP</H1></A><BR>
+<CENTER><A HREF="#CONTENTS"><IMG SRC="images/cups-large.gif" BORDER="0"><BR>
+<H1>CUPS Implementation of IPP</H1></A><BR>
 CUPS-IPP-1.1<BR>
 Easy Software Products<BR>
-Copyright 1997-2001 All Rights Reserved<BR>
+Copyright 1997-2000, All Rights Reserved<BR>
 </CENTER>
 <HR>
 <H1 ALIGN="CENTER"><A NAME="CONTENTS">Table of Contents</A></H1>
@@ -150,21 +150,18 @@ Copyright 1997-2001 All Rights Reserved<BR>
 <LI><A HREF="#5_2_9">5.2.9 job-hold-until (keyword | name(MAX))</A></LI>
 <LI><A HREF="#5_2_10">5.2.10 job-sheets (1setof type3 keyword | 
 name(MAX))</A></LI>
-<LI><A HREF="#5_2_11">5.2.11 job-originating-host-name (name(MAX))</A></LI>
-<LI><A HREF="#5_2_12">5.2.12 lpi (type2 enum)</A></LI>
-<LI><A HREF="#5_2_13">5.2.13 page-bottom (integer(0:MAX))</A></LI>
-<LI><A HREF="#5_2_14">5.2.14 page-label (text(MAX))</A></LI>
-<LI><A HREF="#5_2_15">5.2.15 page-left (integer(0:MAX))</A></LI>
-<LI><A HREF="#5_2_16">5.2.16 page-right (integer(0:MAX))</A></LI>
-<LI><A HREF="#5_2_17">5.2.17 page-set (type2 keyword)</A></LI>
-<LI><A HREF="#5_2_18">5.2.18 page-top (integer(0:MAX))</A></LI>
-<LI><A HREF="#5_2_19">5.2.19 penwidth (integer(0:MAX))</A></LI>
-<LI><A HREF="#5_2_20">5.2.20 position (type2 keyword)</A></LI>
-<LI><A HREF="#5_2_21">5.2.21 ppi (integer(1:MAX))</A></LI>
-<LI><A HREF="#5_2_22">5.2.22 prettyprint (boolean)</A></LI>
-<LI><A HREF="#5_2_23">5.2.23 saturation (integer(0:200))</A></LI>
-<LI><A HREF="#5_2_24">5.2.24 scaling (integer(1:1000))</A></LI>
-<LI><A HREF="#5_2_25">5.2.25 wrap (boolean)</A></LI>
+<LI><A HREF="#5_2_11">5.2.11 lpi (type2 enum)</A></LI>
+<LI><A HREF="#5_2_12">5.2.12 page-bottom (integer(0:MAX))</A></LI>
+<LI><A HREF="#5_2_13">5.2.13 page-left (integer(0:MAX))</A></LI>
+<LI><A HREF="#5_2_14">5.2.14 page-right (integer(0:MAX))</A></LI>
+<LI><A HREF="#5_2_15">5.2.15 page-set (type2 keyword)</A></LI>
+<LI><A HREF="#5_2_16">5.2.16 page-top (integer(0:MAX))</A></LI>
+<LI><A HREF="#5_2_17">5.2.17 penwidth (integer(0:MAX))</A></LI>
+<LI><A HREF="#5_2_18">5.2.18 ppi (integer(1:MAX))</A></LI>
+<LI><A HREF="#5_2_19">5.2.19 prettyprint (boolean)</A></LI>
+<LI><A HREF="#5_2_20">5.2.20 saturation (integer(0:200))</A></LI>
+<LI><A HREF="#5_2_21">5.2.21 scaling (integer(1:1000))</A></LI>
+<LI><A HREF="#5_2_22">5.2.22 wrap (boolean)</A></LI>
 </UL>
 <LI><A HREF="#5_3">5.3 PPD Attributes</A></LI>
 <UL>
@@ -175,16 +172,15 @@ name(MAX))</A></LI>
 </UL>
 <LI><A HREF="#5_4">5.4 Printer Attributes</A></LI>
 <UL>
-<LI><A HREF="#5_4_1">5.4.1 job-k-limit (integer)</A></LI>
-<LI><A HREF="#5_4_2">5.4.2 job-page-limit (integer)</A></LI>
-<LI><A HREF="#5_4_3">5.4.3 job-quota-period (integer)</A></LI>
-<LI><A HREF="#5_4_4">5.4.4 job-sheets-supported (1setof type3 keyword | 
+<LI><A HREF="#5_4_1">5.4.1 job-sheets-default (1setof type3 keyword | 
 name(MAX))</A></LI>
-<LI><A HREF="#5_4_5">5.4.5 printer-type (type2 enum)</A></LI>
-<LI><A HREF="#5_4_6">5.4.6 printer-type-mask (type2 enum)</A></LI>
-<LI><A HREF="#5_4_7">5.4.7 requesting-user-name-allowed (1setof 
+<LI><A HREF="#5_4_2">5.4.2 job-sheets-supported (1setof type3 keyword | 
+name(MAX))</A></LI>
+<LI><A HREF="#5_4_3">5.4.3 printer-type (type2 enum)</A></LI>
+<LI><A HREF="#5_4_4">5.4.4 printer-type-mask (type2 enum)</A></LI>
+<LI><A HREF="#5_4_5">5.4.5 requesting-user-name-allowed (1setof 
 name(127))</A></LI>
-<LI><A HREF="#5_4_8">5.4.8 requesting-user-name-denied (1setof 
+<LI><A HREF="#5_4_6">5.4.6 requesting-user-name-denied (1setof 
 name(127))</A></LI>
 </UL>
 <LI><A HREF="#5_5">5.5 Printer Class Attributes</A></LI>
@@ -236,40 +232,33 @@ EPSON printers are included that use these filters. </P>
 <UL>
 <LI>CUPS-CMP-1.1: CUPS Configuration Management Plan </LI>
 <LI>CUPS-IDD-1.1: CUPS System Interface Design Description </LI>
-<LI>CUPS-IPP-1.1: CUPS Implementation of IPP </LI>
+<LI>CUPS-IPP-1.1: CUPS Implmentation of IPP </LI>
 <LI>CUPS-SAM-1.1.x: CUPS Software Administrators Manual </LI>
 <LI>CUPS-SDD-1.1: CUPS Software Design Description </LI>
-<LI>CUPS-SPM-1.1.x: CUPS Software Programming Manual </LI>
+<LI>CUPS-SPM-1.1: CUPS Software Programming Manual </LI>
 <LI>CUPS-SSR-1.1: CUPS Software Security Report </LI>
 <LI>CUPS-STP-1.1: CUPS Software Test Plan </LI>
 <LI>CUPS-SUM-1.1.x: CUPS Software Users Manual </LI>
-<LI>CUPS-SVD-1.1: CUPS Software Version Description </LI>
+<LI>CUPS-SVD-1.1.x: CUPS Software Version Description </LI>
 </UL>
 <H2><A NAME="2_2">2.2 Other Documents</A></H2>
 <P>The following non-CUPS documents are referenced by this document: </P>
 <UL>
-<LI><A HREF="http://partners.adobe.com/asn/developer/PDFS/TN/5003.PPD_Spec_v4.3.pdf">
-Adobe  PostScript Printer Description File Format Specification, 
- Version 4.3.</A></LI>
-<LI><A HREF="http://partners.adobe.com/asn/developer/PDFS/TN/PLRM.pdf">
-Adobe  PostScript Language Reference, Third Edition.</A></LI>
+<LI>Adobe PostScript Printer Description File Format Specification, 
+ Version 4.3. </LI>
+<LI>Adobe PostScript Language Reference, Third Edition. </LI>
 <LI>IPP: Job and Printer Set Operations </LI>
 <LI>IPP/1.1: Encoding and Transport </LI>
 <LI>IPP/1.1: Implementers Guide </LI>
 <LI>IPP/1.1: Model and Semantics </LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc1179.txt">RFC 1179, Line 
-Printer Daemon Protocol</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2567.txt">RFC 2567, Design 
-Goals for an Internet Printing Protocol</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2568.txt">RFC 2568, Rationale 
-for the Structure of the Model and Protocol</A> for the Internet 
-Printing Protocol</LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2569.txt">RFC 2569, Mapping 
-between LPD and IPP Protocols</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2616.txt">RFC 2616, Hypertext 
-Transfer Protocol -- HTTP/1.1</A></LI>
-<LI><A HREF="http://www.ietf.org/rfc/rfc2617.txt">RFC 2617, HTTP 
-Authentication: Basic and Digest Access</A> Authentication </LI>
+<LI>RFC 1179, Line Printer Daemon Protocol </LI>
+<LI>RFC 2567, Design Goals for an Internet Printing Protocol </LI>
+<LI>RFC 2568, Rationale for the Structure of the Model and Protocol 
+ for the Internet Printing Protocol </LI>
+<LI>RFC 2569, Mapping between LPD and IPP Protocols </LI>
+<LI>RFC 2616, Hypertext Transfer Protocol -- HTTP/1.1 </LI>
+<LI>RFC 2617, HTTP Authentication: Basic and Digest Access 
+ Authentication </LI>
 </UL>
 <H1><A NAME="3">3 Overview</A></H1>
 <P>CUPS 1.1 implements IPP/1.1 and the operations and attributes 
@@ -671,12 +660,13 @@ additional printer information. </P>
 <P>&quot;printer-state-message&quot; (text(MAX)): </P>
 <P>The client OPTIONALLY supplies this attribute indicating a  textual 
 reason for the current printer state. </P>
-<P>&quot;requesting-user-name-allowed&quot; (1setof name(127) | delete) </P>
+<P>&quot;requesting-user-name-allowed&quot; (1setof name(127)) </P>
 <P><I>OR</I></P>
-<P>&quot;requesting-user-name-denied&quot; (1setof name(127) | delete): </P>
+<P>&quot;requesting-user-name-denied&quot; (1setof name(127)): </P>
 <P>The client OPTIONALLY supplies one of these attributes to  specify 
-an access control list for incoming print jobs. To allow  all users 
-access to a printer, use the delete tag for the  attribute value. </P>
+an access control list for incoming print jobs. The  special name 
+&quot;ALLUSERS&quot; is reserved to indicate that all users  are allowed or 
+denied. </P>
 </UL>
 <P>The CUPS-Add-Printer request can optionally be followed by a PPD 
 file or System V interface script to be used for the printer. The 
@@ -798,29 +788,30 @@ CUPS-Add-Class request: </P>
 printers and printer classes that are part of the class. </P>
 <P>&quot;printer-is-accepting-jobs&quot; (boolean): </P>
 <P>The client OPTIONALLY supplies this boolean attribute  indicating 
-whether or not the class object should accept new jobs. </P>
+whether or not the printer object should accept new jobs. </P>
 <P>&quot;printer-info&quot; (text(127)): </P>
 <P>The client OPTIONALLY supplies this attribute indicating the 
  printer information string. </P>
 <P>&quot;printer-location&quot; (text(127)): </P>
 <P>The client OPTIONALLY supplies this attribute indicating a  textual 
-location of the class. </P>
+location of the printer. </P>
 <P>&quot;printer-more-info&quot; (uri): </P>
 <P>The client OPTIONALLY supplies this attribute indicating a  URI for 
-additional class information. </P>
+additional printer information. </P>
 <P>&quot;printer-state&quot; (type2 enum): </P>
 <P>The client OPTIONALLY supplies this attribute indicating the 
- initial/current state of the class. Only the &quot;idle&quot; and &quot;stopped&quot; 
+ initial/current state of the printer. Only the &quot;idle&quot; and &quot;stopped&quot; 
  enumerations are recognized. </P>
 <P>&quot;printer-state-message&quot; (text(MAX)): </P>
 <P>The client OPTIONALLY supplies this attribute indicating a  textual 
-reason for the current class state. </P>
+reason for the current printer state. </P>
 <P>&quot;requesting-user-name-allowed&quot; (1setof name(127)) </P>
 <P><I>OR</I></P>
 <P>&quot;requesting-user-name-denied&quot; (1setof name(127)): </P>
 <P>The client OPTIONALLY supplies one of these attributes to  specify 
-an access control list for incoming print jobs. To allow  all users 
-access to a class, use the delete tag for the  attribute value. </P>
+an access control list for incoming print jobs. The  special name 
+&quot;ALLUSERS&quot; is reserved to indicate that all users  are allowed or 
+denied. </P>
 </UL>
 <H3><A NAME="4_9_2">4.9.2 CUPS-Add-Class Response</A></H3>
 <P>The following groups of attributes are send as part of the 
@@ -1108,12 +1099,10 @@ of the device-class attribute: </P>
  &quot;method:/dev/filename&quot;, where method may be &quot;parallel&quot; or &quot;usb&quot;  in 
 the current implementation. </LI>
 <LI>&quot;serial&quot; - The device-uri will be of the form 
- &quot;serial:/dev/filename?baud=value+parity=value+flow=value&quot;.  The baud 
-value is the data rate in bits per second; the  supported values depend 
-on the underlying hardware.  The parity value can be one of &quot;none&quot;, 
-&quot;even&quot;, or &quot;odd&quot;.  The flow value can be one of &quot;none&quot;, &quot;soft&quot; 
-(XON/XOFF  handshaking), &quot;hard&quot; or &quot;rts/cts&quot; (RTS/CTS handshaking),  or 
-&quot;dtrdsr&quot; (DTR/DSR handshaking). </LI>
+ &quot;serial:/dev/filename?baud=value+parity=value+flow=value&quot;.  The parity 
+value can be one of &quot;none&quot;, &quot;even&quot;, or &quot;odd&quot;.  The flow value can be 
+one of &quot;none&quot;, &quot;soft&quot; (XON/XOFF  handshaking), or &quot;hard&quot; (CTS/RTS 
+handshaking). </LI>
 <P>The URI returned by CUPS-Get-Devices will contain the  maximum baud 
 rate supported by the device and the best  type of flow control 
 available (&quot;soft&quot; or &quot;hard&quot;). </P>
@@ -1186,84 +1175,51 @@ attribute. </P>
 <P>If only one value is supplied, the banner file is printed before the 
 job. If two values are supplied, the first value is used as the 
 starting banner file and the second as the ending banner file. </P>
-<H3><A NAME="5_2_11">5.2.11 job-originating-host-name (name(MAX))</A></H3>
-<P><I>(CUPS 1.1.5 and higher)</I></P>
-<P>The job-originating-host-name attribute specifies the host from 
-which the job was queued. The value will be the hostname or IP address 
-of the client depending on whether hostname resolution is enabled.  The 
-localhost address (127.0.0.1) is <B>always</B> resolved to the name 
-&quot;localhost&quot;. </P>
-<P>This attribute is read-only. </P>
-<H3><A NAME="5_2_12">5.2.12 lpi (type2 enum)</A></H3>
+<H3><A NAME="5_2_11">5.2.11 lpi (type2 enum)</A></H3>
 <P>The lpi attribute specifies the number of lines per inch when 
 printing text files. Only the values 6 and 8 are currently supported. 
 The default value is 6. </P>
-<H3><A NAME="5_2_13">5.2.13 page-bottom (integer(0:MAX))</A></H3>
+<H3><A NAME="5_2_12">5.2.12 page-bottom (integer(0:MAX))</A></H3>
 <P>The page-bottom attribute specifies the bottom margin in points (72 
 points equals 1 inch). The default value is the device physical margin. </P>
-<H3><A NAME="5_2_14">5.2.14 page-label (text(MAX))</A></H3>
-<P><I>(CUPS 1.1.7 and higher)</I></P>
-<P>The page-label attribute provides a text value to place in the 
-header and footer on each page. If a classification level is set on the 
-server, then this classification is printed before the page label. </P>
-<H3><A NAME="5_2_15">5.2.15 page-left (integer(0:MAX))</A></H3>
+<H3><A NAME="5_2_13">5.2.13 page-left (integer(0:MAX))</A></H3>
 <P>The page-left attribute specifies the left margin in points (72 
 points equals 1 inch). The default value is the device physical margin. </P>
-<H3><A NAME="5_2_16">5.2.16 page-right (integer(0:MAX))</A></H3>
+<H3><A NAME="5_2_14">5.2.14 page-right (integer(0:MAX))</A></H3>
 <P>The page-right attribute specifies the right margin in points (72 
 points equals 1 inch). The default value is the device physical margin. </P>
-<H3><A NAME="5_2_17">5.2.17 page-set (type2 keyword)</A></H3>
+<H3><A NAME="5_2_15">5.2.15 page-set (type2 keyword)</A></H3>
 <P>The page-set attribute specifies which pages to print in a file. The 
 supported keywords are &quot;all&quot;, &quot;even&quot;, and &quot;odd&quot;. The default value is 
 &quot;all&quot;. </P>
-<H3><A NAME="5_2_18">5.2.18 page-top (integer(0:MAX))</A></H3>
+<H3><A NAME="5_2_16">5.2.16 page-top (integer(0:MAX))</A></H3>
 <P>The page-top attribute specifies the top margin in points (72 points 
 equals 1 inch). The default value is the device physical margin. </P>
-<H3><A NAME="5_2_19">5.2.19 penwidth (integer(0:MAX))</A></H3>
+<H3><A NAME="5_2_17">5.2.17 penwidth (integer(0:MAX))</A></H3>
 <P>The penwidth attribute specifies the default pen width in 
 micrometers when printing HP-GL/2 plot files. The default value is 1000 
 (1 millimeter). </P>
-<H3><A NAME="5_2_20">5.2.20 position (type2 keyword)</A></H3>
-<P>The position attribute specifies the location of image files on the 
-media. The following keyword values are recognized: </P>
-<UL>
-<LI><CODE>center</CODE> - Center the image on the page (default) </LI>
-<LI><CODE>top</CODE> - Print the image centered at the top of the page </LI>
-<LI><CODE>left</CODE> - Print the image centered on the left of page </LI>
-<LI><CODE>right</CODE> - Print the image centered on the right of the 
-page </LI>
-<LI><CODE>top-left</CODE> - Print the image at the top left corner of 
- the page </LI>
-<LI><CODE>top-right</CODE> - Print the image at the top right corner of 
- the page </LI>
-<LI><CODE>bottom</CODE> - Print the image centered at the bottom of 
- the page </LI>
-<LI><CODE>bottom-left</CODE> - Print the image at the bottom left 
- corner of the page </LI>
-<LI><CODE>bottom-right</CODE> - Print the image at the bottom right 
- corner of the page </LI>
-</UL>
-<H3><A NAME="5_2_21">5.2.21 ppi (integer(1:MAX))</A></H3>
+<H3><A NAME="5_2_18">5.2.18 ppi (integer(1:MAX))</A></H3>
 <P>The ppi attribute specifies the resolution of an image file in 
 pixels per inch. The default value is the resolution included with the 
 file or 128 if no resolution information is available. </P>
-<H3><A NAME="5_2_22">5.2.22 prettyprint (boolean)</A></H3>
+<H3><A NAME="5_2_19">5.2.19 prettyprint (boolean)</A></H3>
 <P>The prettyprint attribute specifies whether text files should be 
 printed with a shaded header and keyword highlighting 
 (prettyprint=true) or without additional formatting 
 (prettyprint=false). The default value is false. </P>
-<H3><A NAME="5_2_23">5.2.23 saturation (integer(0:200))</A></H3>
+<H3><A NAME="5_2_20">5.2.20 saturation (integer(0:200))</A></H3>
 <P>The saturation attribute specifies the color saturation when 
 printing image files. A saturation of 100 is normal, while values of 50 
 and 200 will be half and twice as colorful, respectively. The default 
 value is 100. </P>
-<H3><A NAME="5_2_24">5.2.24 scaling (integer(1:1000))</A></H3>
+<H3><A NAME="5_2_21">5.2.21 scaling (integer(1:1000))</A></H3>
 <P>The scaling attribute specifies the scaling of image files with 
 respect to the selected media. A value of 100 specifies that the image 
 file should fit 100% of the page, or as much as possible given the 
 image dimensions. The default value is unspecified. </P>
 <P>The scaling attribute overrides the ppi attribute if specified. </P>
-<H3><A NAME="5_2_25">5.2.25 wrap (boolean)</A></H3>
+<H3><A NAME="5_2_22">5.2.22 wrap (boolean)</A></H3>
 <P>The wrap attribute specifies whether long lines should be wrapped 
 (wrap=true) or not (wrap=false) when printing text files. The default 
 value is true. </P>
@@ -1287,29 +1243,19 @@ or ShortNickName attributes are used instead. </P>
 relative to the model directory. The forward slash (/) is used to 
 delineate directories. </P>
 <H2><A NAME="5_4">5.4 Printer Attributes</A></H2>
-<H3><A NAME="5_4_1">5.4.1 job-k-limit (integer)</A></H3>
+<H3><A NAME="5_4_1">5.4.1 job-sheets-default (1setof type3 keyword | 
+name(MAX))</A></H3>
 <P><I>(CUPS 1.1 and higher)</I></P>
-<P>The job-k-limit attribute specifies the maximum number of kilobytes 
-that may be printed by a user, including banner files. The default 
-value of 0 specifies that there is no limit. </P>
-<H3><A NAME="5_4_2">5.4.2 job-page-limit (integer)</A></H3>
-<P><I>(CUPS 1.1 and higher)</I></P>
-<P>The job-page-limit attribute specifies the maximum number of pages 
-that may be printed by a user, including banner files. The default 
-value of 0 specifies that there is no limit. </P>
-<H3><A NAME="5_4_3">5.4.3 job-quota-period (integer)</A></H3>
-<P><I>(CUPS 1.1 and higher)</I></P>
-<P>The job-quota-period attribute specifies the time period used for 
-quota calculations, in seconds. The default value of 0 specifies that 
-the limits apply to all jobs that have been printed by a user that are 
-still known to the system. </P>
-<H3><A NAME="5_4_4">5.4.4 job-sheets-supported (1setof type3 keyword | 
+<P>The job-sheets-default attribute specifies the default banner 
+file(s) to print before and after each job. The value &quot;none&quot; specifies 
+that no banner should be printed. </P>
+<H3><A NAME="5_4_2">5.4.2 job-sheets-supported (1setof type3 keyword | 
 name(MAX))</A></H3>
 <P><I>(CUPS 1.1 and higher)</I></P>
 <P>The job-sheets-supported attribute specifies the available banner 
 files. There will always be at least one banner file available called 
 &quot;none&quot;. </P>
-<H3><A NAME="5_4_5">5.4.5 printer-type (type2 enum)</A></H3>
+<H3><A NAME="5_4_3">5.4.3 printer-type (type2 enum)</A></H3>
 <P>The printer-type attribute specifies printer type and capability 
 bits for the printer or class. The default value is computed from 
 internal state information and the PPD file for the printer. The 
@@ -1354,26 +1300,30 @@ user-defined media sizes.</TD></TR>
 </TABLE>
 </CENTER>
 </P>
-<H3><A NAME="5_4_6">5.4.6 printer-type-mask (type2 enum)</A></H3>
+<H3><A NAME="5_4_4">5.4.4 printer-type-mask (type2 enum)</A></H3>
 <P><I>(CUPS 1.1 and higher)</I></P>
 <P>The printer-type-mask attribute is used to choose printers or 
 classes with the CUPS-Get-Printers and CUPS-Get-Classes operations. The 
 bits are defined identically to the printer-type attribute and default 
 to all 1's. </P>
-<H3><A NAME="5_4_7">5.4.7 requesting-user-name-allowed (1setof 
+<H3><A NAME="5_4_5">5.4.5 requesting-user-name-allowed (1setof 
 name(127))</A></H3>
 <P><I>(CUPS 1.1 and higher)</I></P>
 <P>The requesting-user-name-allowed attribute lists all of the users 
 that are allowed to access a printer or class. Either this attribute or 
 the requesting-user-name-denied attribute will be defined, but not 
 both. </P>
-<H3><A NAME="5_4_8">5.4.8 requesting-user-name-denied (1setof name(127))</A>
+<P>The special name &quot;ALLUSERS&quot; is reserved to indicate that all users 
+are allowed. </P>
+<H3><A NAME="5_4_6">5.4.6 requesting-user-name-denied (1setof name(127))</A>
 </H3>
 <P><I>(CUPS 1.1 and higher)</I></P>
 <P>The requesting-user-name-denied attribute lists all of the users 
 that are not allowed to access a printer or class. Either this 
 attribute or the requesting-user-name-allowed attribute will be 
 defined, but not both. </P>
+<P>The special name &quot;ALLUSERS&quot; is reserved to indicate that all users 
+are denied. </P>
 <H2><A NAME="5_5">5.5 Printer Class Attributes</A></H2>
 <H3><A NAME="5_5_1">5.5.1 member-names (1setof name(127))</A></H3>
 <P>The member-names attribute specifies each of the printer-name 
@@ -1410,7 +1360,7 @@ the same element of the member-names attribute. </P>
 <DT>HP-GL </DT>
 <DD>Hewlett-Packard Graphics Language </DD>
 <DT>HP-PCL </DT>
-<DD>Hewlett-Packard Page Control Language </DD>
+<DD>Hewlett-Packard Printer Control Language </DD>
 <DT>HP-PJL </DT>
 <DD>Hewlett-Packard Printer Job Language </DD>
 <DT>IETF </DT>
@@ -1423,6 +1373,8 @@ the same element of the member-names attribute. </P>
 <DD>Line Printer Daemon </DD>
 <DT>MIME </DT>
 <DD>Multimedia Internet Mail Exchange </DD>
+<DT>PCL </DT>
+<DD>Page Control Language </DD>
 <DT>PPD </DT>
 <DD>PostScript Printer Description </DD>
 <DT>SMB </DT>

doc/ipp.shtml

@@ -1,6 +1,6 @@
 <HTML>
 <HEAD>
-	<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2001 All Rights Reserved">
+	<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2000, All Rights Reserved">
 	<META NAME="DOCNUMBER" CONTENT="CUPS-IPP-1.1">
 	<META NAME="Author" CONTENT="Easy Software Products">
 	<TITLE>CUPS Implementation of IPP</TITLE>
@@ -772,14 +772,14 @@ CUPS-Add-Printer request:
 	<P>The client OPTIONALLY supplies this attribute indicating a
 	textual reason for the current printer state.
 
-	<P>"requesting-user-name-allowed" (1setof name(127) | delete)
+	<P>"requesting-user-name-allowed" (1setof name(127))
 	<P><I>OR</I>
-	<P>"requesting-user-name-denied" (1setof name(127) | delete):
+	<P>"requesting-user-name-denied" (1setof name(127)):
 
 	<P>The client OPTIONALLY supplies one of these attributes to
-	specify an access control list for incoming print jobs. To allow
-	all users access to a printer, use the delete tag for the
-	attribute value.
+	specify an access control list for incoming print jobs. The
+	special name "ALLUSERS" is reserved to indicate that all users
+	are allowed or denied.
 
 </UL>
 
@@ -988,7 +988,7 @@ CUPS-Add-Class request:
 	<P>"printer-is-accepting-jobs" (boolean):
 
 	<P>The client OPTIONALLY supplies this boolean attribute
-	indicating whether or not the class object should accept new jobs.
+	indicating whether or not the printer object should accept new jobs.
 
 	<P>"printer-info" (text(127)):
 
@@ -998,32 +998,32 @@ CUPS-Add-Class request:
 	<P>"printer-location" (text(127)):
 
 	<P>The client OPTIONALLY supplies this attribute indicating a
-	textual location of the class.
+	textual location of the printer.
 
 	<P>"printer-more-info" (uri):
 
 	<P>The client OPTIONALLY supplies this attribute indicating a
-	URI for additional class information.
+	URI for additional printer information.
 
 	<P>"printer-state" (type2 enum):
 
 	<P>The client OPTIONALLY supplies this attribute indicating the
-	initial/current state of the class. Only the "idle" and "stopped"
+	initial/current state of the printer. Only the "idle" and "stopped"
 	enumerations are recognized.
 
 	<P>"printer-state-message" (text(MAX)):
 
 	<P>The client OPTIONALLY supplies this attribute indicating a
-	textual reason for the current class state.
+	textual reason for the current printer state.
 
 	<P>"requesting-user-name-allowed" (1setof name(127))
 	<P><I>OR</I>
 	<P>"requesting-user-name-denied" (1setof name(127)):
 
 	<P>The client OPTIONALLY supplies one of these attributes to
-	specify an access control list for incoming print jobs. To allow
-	all users access to a class, use the delete tag for the
-	attribute value.
+	specify an access control list for incoming print jobs. The
+	special name "ALLUSERS" is reserved to indicate that all users
+	are allowed or denied.
 
 </UL>
 
@@ -1508,12 +1508,9 @@ of the device-class attribute:
 
 	<LI>"serial" - The device-uri will be of the form
 	"serial:/dev/filename?baud=value+parity=value+flow=value".
-	The baud value is the data rate in bits per second; the
-	supported values depend on the underlying hardware.
 	The parity value can be one of "none", "even", or "odd".
 	The flow value can be one of "none", "soft" (XON/XOFF
-	handshaking), "hard" or "rts/cts" (RTS/CTS handshaking),
-	or "dtrdsr" (DTR/DSR handshaking).
+	handshaking), or "hard" (CTS/RTS handshaking).
 
 	<P>The URI returned by CUPS-Get-Devices will contain the
 	maximum baud rate supported by the device and the best
@@ -1615,18 +1612,6 @@ The default value is stored in the job-sheets-default attribute.
 If two values are supplied, the first value is used as the starting banner
 file and the second as the ending banner file.
 
-<H3>job-originating-host-name (name(MAX))</H3>
-
-<P><I>(CUPS 1.1.5 and higher)</I>
-
-<P>The job-originating-host-name attribute specifies the host
-from which the job was queued. The value will be the hostname or
-IP address of the client depending on whether hostname
-resolution is enabled.  The localhost address (127.0.0.1) is
-<B>always</B> resolved to the name "localhost".
-
-<P>This attribute is read-only.
-
 <H3>lpi (type2 enum)</H3>
 
 <P>The lpi attribute specifies the number of lines per inch when
@@ -1638,15 +1623,6 @@ The default value is 6.
 <P>The page-bottom attribute specifies the bottom margin in points (72 points
 equals 1 inch). The default value is the device physical margin.
 
-<H3>page-label (text(MAX))</H3>
-
-<P><I>(CUPS 1.1.7 and higher)</I>
-
-<P>The page-label attribute provides a text value to place in
-the header and footer on each page. If a classification level is
-set on the server, then this classification is printed before
-the page label.
-
 <H3>page-left (integer(0:MAX))</H3>
 
 <P>The page-left attribute specifies the left margin in points (72 points
@@ -1673,38 +1649,6 @@ equals 1 inch). The default value is the device physical margin.
 <P>The penwidth attribute specifies the default pen width in micrometers
 when printing HP-GL/2 plot files. The default value is 1000 (1 millimeter).
 
-<H3>position (type2 keyword)</H3>
-
-<P>The position attribute specifies the location of image files on the
-media. The following keyword values are recognized:
-
-<UL>
-
-	<LI><CODE>center</CODE> - Center the image on the page (default)
-
-	<LI><CODE>top</CODE> - Print the image centered at the top of the page
-
-	<LI><CODE>left</CODE> - Print the image centered on the left of page
-
-	<LI><CODE>right</CODE> - Print the image centered on the right of the page
-
-	<LI><CODE>top-left</CODE> - Print the image at the top left corner of
-	the page
-
-	<LI><CODE>top-right</CODE> - Print the image at the top right corner of
-	the page
-
-	<LI><CODE>bottom</CODE> - Print the image centered at the bottom of
-	the page
-
-	<LI><CODE>bottom-left</CODE> - Print the image at the bottom left
-	corner of the page
-
-	<LI><CODE>bottom-right</CODE> - Print the image at the bottom right
-	corner of the page
-
-</UL>
-
 <H3>ppi (integer(1:MAX))</H3>
 
 <P>The ppi attribute specifies the resolution of an image file in pixels
@@ -1769,30 +1713,13 @@ delineate directories.
 
 <H2>Printer Attributes</H2>
 
-<H3>job-k-limit (integer)</H3>
+<H3>job-sheets-default (1setof type3 keyword | name(MAX))</H3>
 
 <P><I>(CUPS 1.1 and higher)</I>
 
-<P>The job-k-limit attribute specifies the maximum number of kilobytes that
-may be printed by a user, including banner files. The default value of 0
-specifies that there is no limit.
-
-<H3>job-page-limit (integer)</H3>
-
-<P><I>(CUPS 1.1 and higher)</I>
-
-<P>The job-page-limit attribute specifies the maximum number of pages that
-may be printed by a user, including banner files. The default value of 0
-specifies that there is no limit.
-
-<H3>job-quota-period (integer)</H3>
-
-<P><I>(CUPS 1.1 and higher)</I>
-
-<P>The job-quota-period attribute specifies the time period used for quota
-calculations, in seconds. The default value of 0 specifies that the limits
-apply to all jobs that have been printed by a user that are still known to
-the system.
+<P>The job-sheets-default attribute specifies the default banner file(s) to
+print before and after each job. The value "none" specifies that no banner
+should be printed.
 
 <H3>job-sheets-supported (1setof type3 keyword | name(MAX))</H3>
 
@@ -1898,6 +1825,9 @@ identically to the printer-type attribute and default to all 1's.
 allowed to access a printer or class. Either this attribute or the
 requesting-user-name-denied attribute will be defined, but not both.
 
+<P>The special name "ALLUSERS" is reserved to indicate that all users
+are allowed.
+
 <H3>requesting-user-name-denied (1setof name(127))</H3>
 
 <P><I>(CUPS 1.1 and higher)</I>
@@ -1906,6 +1836,9 @@ requesting-user-name-denied attribute will be defined, but not both.
 not allowed to access a printer or class. Either this attribute or the
 requesting-user-name-allowed attribute will be defined, but not both.
 
+<P>The special name "ALLUSERS" is reserved to indicate that all users
+are denied.
+
 <H2>Printer Class Attributes</H2>
 
 <H3>member-names (1setof name(127))</H3>

doc/overview.html

@@ -8,13 +8,12 @@
 <TABLE WIDTH="100%">
 <TR VALIGN=TOP>
 	<TD><IMG SRC="images/cups-large.gif" WIDTH="103" HEIGHT="120"></TD>
-	<TD><H1 ALIGN="RIGHT">An Overview of the<BR>
-	Common UNIX Printing System,<BR>
-	Version 1.1</H1>
+	<TD><H1 ALIGN=right>An Overview of the<BR>
+	Common UNIX Printing System</H1></DIV>
 
-	<P ALIGN="RIGHT">July 10, 2000<BR>
+	<P ALIGN=right>October 4, 1999<BR>
 	Michael Sweet, Easy Software Products<BR>
-	Copyright 1998-2001, All Rights Reserved.</P>
+	Copyright 1998-1999, All Rights Reserved.</P>
 	</TD>
 </TR>
 </TABLE>
@@ -22,84 +21,124 @@
 <P>This whitepaper describes the Common UNIX Printing
 System<SUP>TM</SUP> ("CUPS<SUP>TM</SUP>"), a portable and extensible
 printing system for UNIX<SUP>&reg;</SUP>. CUPS is being developed by
-<A HREF="http://www.easysw.com">Easy Software Products</A>, a software
-firm located in Hollywood, Maryland that has been selling commercial
-software for UNIX since 1993 through more than 40 distributors serving
-over 80 countries worldwide.
+Easy Software Products, a software firm located in Hollywood, Maryland
+that has been selling commercial software for Silicon
+Graphics<SUP>&reg;</SUP>, Sun<SUP>&reg;</SUP>, and HP workstations
+since 1993 through more than 40 distributors serving over 80 countries
+worldwide.
 
 <P>Additional information on CUPS is available on the World Wide Web at
 "<A HREF="http://www.cups.org">http://www.cups.org</A>".
 
 <H2>Background</H2>
 
-<P>Printing within UNIX has historically been done using one of two
+Printing within UNIX has historically been done using one of two
 printing systems - the Berkeley Line Printer Daemon ("LPD") [RFC1179]
-and the AT&amp;T Line Printer system. These printing systems were
-designed in the 70's for printing text to line printers; vendors have
-since added varying levels of support for other types of printers.
-
-<P>Replacements for these printing systems have emerged [LPRng,
-Palladin, PLP], however none of the replacements change the fundamental
-capabilities of these systems.
+and the AT&amp;T Line Printer system. Replacements for these printing
+systems have emerged [LPRng, Palladin, PLP], however none of the
+replacements change the fundamental capabilities of these systems.
 
 <P>Over the last few years several attempts at developing a standard
 printing interface have been made, including the draft POSIX Printing
-standard developed by the Institute of Electrical and Electronics
-Engineers, Inc. ("IEEE") [IEEE-1387.4] and Internet Printing Protocol
-("IPP") developed by the Internet Engineering Task Force ("IETF")
-through the Printer Working Group ("PWG") [IETF-IPP]. The POSIX
-printing standard defines a common set of command-line tools as well as
-a C interface for printer administration and print jobs, but has been
-shelved by the IEEE.
+standard [IEEE-1387.4, last updated in 1994] and Internet Printing
+Protocol [IETF-IPP]. The POSIX printing standard defines a common set
+of command-line tools as well as a C interface for printer
+administration and print jobs. The Internet Printing Protocol defines
+extensions to the HyperText Transport Protocol 1.1 [RFC2068] to provide
+support for remote printing services.
 
-<P>The Internet Printing Protocol defines extensions to the HyperText
-Transport Protocol 1.1 [RFC2616] to provide support for remote printing
-services. IPP/1.0 was accepted by the IETF as an experimental Request
-For Comments [RFC] document in October of 1999. Since then the Printer
-Working Group has developed an updated set of specifications for
-IPP/1.1 which have been accepted by the IETF and are awaiting
-publication as proposed standards. Unlike POSIX Printing, IPP enjoys
-widespread industry support and is poised to become the standard
-network printing solution for all operating systems.
+<H2>Weaknesses in Existing Printing Systems</H2>
 
-<P>CUPS uses IPP/1.1 to provide a complete, modern printing system for
-UNIX that can be extended to support new printers, devices, and
-protocols while providing compatibility with existing UNIX
-applications. CUPS is free software provided under the terms of the
-GNU General Public License and GNU Library General Public License.
+Easy Software Products has identified several major weaknesses in
+the printing systems currently in use:
 
-<H2>History</H2>
+<OL>
 
-<P>The first production release of CUPS (based on IPP/1.0) was released
-in October of 1999. Since then, we have released several patch updates
-to the original CUPS 1.0 release that addressed security, portability,
-and bugs found, but no new functionality was added to improve the
-stability of the CUPS code.
+	<LI>Users must print text or Adobe<SUP>&reg;</SUP>
+	PostScript<SUP>TM</SUP> files; other formats <I>may</I> be
+	supported, but not universally.
 
-<P>CUPS 1.1 is based on IPP/1.1 and adds many of the functional
-enhancements that have been requested by our users. As with 1.0, CUPS
-1.1 will be followed by patch releases that address any problems found
-with the software but add no new features.
+	<LI>Lack of a standard command-line interface; each operating
+	system and driver package provides different command-line
+	options, e.g. setting the media size with one driver may
+	involve passing a single option ("letter") while another
+	requires two ("mediasize letter").
+
+	<LI>Lack of a standard application interface; most UNIX
+	applications either do not provide an interface for sending
+	printer options, or restrict the options to those in printer
+	description files supplied with the application.
+
+	<LI>Remote printing problems; no vendor seems to use the same
+	remote printing protocol (many use an "enhanced" version of the
+	LPD protocol with vendor-specific extensions).
+
+	<LI>Client printer administration hassles; most vendors
+	require that you install remote printers on each client by
+	hand, and many do not even provide the ability to browse
+	printers on the "server" system.
+
+	<LI>Drivers typically are hardcoded to handle printing to
+	parallel or serial printers; support for other types of
+	interfaces or networking protocols requires that a driver be
+	rewritten to support them.
+
+	<LI>Security, accounting, and quotas; most printing systems do
+	not support access control lists ("ACLs"), and printer
+	accounting and quotas are not well supported, if at all.
+
+</OL>
+
+<H2>Goals of CUPS</H2>
+
+The basic goals of CUPS are:
+
+<OL>
+
+	<LI>Provide standard support for text (US ASCII, UTF-8, and
+	ISO-8859-x), Adobe PostScript, PDF, HP-GL/2, TIFF, JPEG, PNG,
+	PBM, PGM, PPM, GIF, SGI RGB, Sun Raster, and Kodak
+	PhotoCD<SUP>TM</SUP> files.
+
+	<LI>Provide a standard command-line interface with a standard
+	minimum set of options (media size and so forth).
+
+	<LI>Provide a standard application interface.
+
+	<LI>Provide a common remote printing interface (IPP).
+
+	<LI>Provide a printer browsing interface and allow users to
+	print to remote printers using a "printer@server" notation
+	rather than adding the printer locally.
+
+	<LI>Provide a scheduler extension interface to support
+	different interfaces separate from the printer driver (e.g.
+	serial, parallel, lpd, tftp, ipp, etc.)
+
+	<LI>Provide a standard interface for ACLs, quotas, accounting,
+	and logging.
+
+</OL>
 
 <H2>Design Overview</H2>
 
-<P>Like most printing systems, CUPS is designed around a central print
+Like most printing systems, CUPS is designed around a central print
 scheduling process that dispatches print jobs, processes administrative
 commands, provides printer status information to local and remote
 programs, and informs users as needed. Figure 1 shows the basic
 organization of CUPS.
 
-<CENTER><IMG SRC="images/cups-block-diagram.gif" WIDTH="470" HEIGHT="170"></CENTER>
-<P ALIGN="CENTER">Figure 1 - CUPS Block Diagram</P>
+<P ALIGN=CENTER><IMG SRC="images/cups-block-diagram.gif" WIDTH="540" HEIGHT="200">
+<BR>Figure 1 - CUPS Block Diagram
 
 <H3>Scheduler</H3>
 
-<P>The scheduler is a HTTP/1.1 server application that handles HTTP
+The scheduler is a HTTP/1.1 server application that handles HTTP
 requests. Besides handling printer requests via IPP POST requests, the
-scheduler also acts as a full-featured web server for documentation,
-status monitoring, and administration.
+scheduler also acts as a full-featured web server for documentation and
+status monitoring.
 
-<P>The scheduler also manages a list of available printers on the LAN
+<P>The scheduler also monitors the LAN for printer browsing information
 and dispatches print jobs as needed using the appropriate filters and
 backends.
 
@@ -109,17 +148,17 @@ The configuration files consist of:
 
 <UL>
 
-	<LI>The HTTP server configuration file.
+	<LI>A HTTP server configuration file.
 
 	<LI>Printer and class definition files.
 
 	<LI>MIME type and conversion rule files.
 
-	<LI>PostScript Printer Description ("PPD") files.
+	<LI>PostScript Printer Description (PPD) files.
 
 </UL>
 
-<P>The HTTP server configuration file is purposely similar to the
+The HTTP server configuration file is purposely similar to the
 Apache server configuration file and defines all of the access control
 properties for the server.
 
@@ -132,323 +171,77 @@ class, round-robin fashion.
 application/postscript, etc.) and "magic" rules for automatically
 detecting the format of a file.  These are used by the HTTP server to
 determine the <I>Content-Type</I> field for <I>GET</I> and <I>HEAD</I>
-requests and by the IPP request handler to determine the file type
-when a <I>Print-Job</I> or <I>Send-File</I> request is received with a
+requests, and by the IPP request handler to determine the file type
+when a <I>Print-Job</I> request is received with a
 <I>document-format</I> of <I>application/octet-stream</I>.
 
-<P>The MIME conversion rule files list the available filters. The
-filters are used when a job is dispatched so that an application can
-send a convenient file format to the printing system which then
-converts the document into a printable format as needed. Each filter
-has a relative cost associated with it, and the filtering algorithm
-chooses the set of filters that will convert the file to the needed
-format with the lowest total "cost".
+<P>The MIME conversion rule files list the available filters. These
+files are augmented by <I>cupsFilter</I> entries in the printer PPD
+files. The filters are used when a job is dispatched so that an
+application can send a convenient file format to the printing system
+which then converts the document into a printable format as needed.
+Each filter has a relative cost associated with it, and the filtering
+algorithm chooses the set of filters that will convert the file to the
+needed format with the lowest total "cost".
 
-<P>The PPD files describe the capabilities of all printers, not just
-PostScript printers. There is one PPD file for each printer. PPD files
-for non-PostScript printers define additional filters through
-<I>cupsFilter</I> attributes to support printer drivers.
+<P>The PPD files describe the capabilities of PostScript printers. 
+There is one PPD file for each printer.
 
-<H3>CUPS API</H3>
+<H3>CUPS Interface Library</H3>
 
-<P>The CUPS API contains CUPS-specific convenience functions for queuing
-print jobs, getting printer information, accessing resources via HTTP
-and IPP, and manipulating PPD files. Unlike the rest of CUPS, the CUPS
-API is provided under the terms of the GNU LGPL so it may be used by
-non-GPL applications.
-
-<H3>Berkeley and System V Commands</H3>
-
-<P>CUPS provides the System V and Berkeley command-line interfaces for
-submitting jobs and checking the printer status. The
-<CODE>lpstat</CODE> and <CODE>lpc status</CODE> commands also show
-network printers ("printer@server") when printer browsing is enabled.
-
-<P>The System V administation commands are supplied for managing
-printers and classes. The Berkeley printer administration tool
-(<CODE>lpc</CODE>) is only supported in a "read-only" mode to check the
-current status of the printer queues and scheduler.
+The CUPS interface library contains CUPS-specific convenience functions
+for queuing print jobs, etc.  It also contains functions to access
+resources via HTTP and IPP, perform MIME typing and conversion, and
+manipulate PPD files.
 
 <H3>Filters</H3>
 
-<P>A filter program reads from the standard input or from a file if a
+A filter program reads from the standard input or from a file if a
 filename is supplied. All filters must support a common set of options
 including printer name, job ID, username, job title, number of copies,
 and job options. All output is sent to the standard output.
 
-<P>Filters are provided for many file formats and include image file
-and PostScript raster filters that support non-PostScript printers. Multiple
-filters are run in parallel to produce the required output format.
-
-<P>The PostScript raster filter is based on the GNU Ghostscript 5.50
-core. Instead of using the Ghostscript printer drivers and front-end,
-the CUPS filter uses a generic raster printer driver and CUPS-compliant
-front-end to support any kind of raster printer. This allows the same
-printer driver filter to be used for printing raster data from any
-filter.
-
-<H3>CUPS Imaging</H3>
-
-<P>The CUPS Imaging library provides functions for managing large
-images, doing colorspace conversion and color management, scaling
-images for printing, and managing raster page streams. It is used by
-the CUPS image file filters, the PostScript RIP, and all raster
-printers drivers.
-
 <H3>Backends</H3>
 
-<P>A backend program is a special filter that sends print data to a
-device or network connection. Backends for parallel, serial, USB, LPD, IPP,
-and AppSocket (JetDirect) connections are provided in CUPS 1.1.
-
-<P>SAMBA version 2.0.6 and higher includes a SMB backend
-(<CODE>smbspool(1)</CODE>) that can be used with CUPS 1.0 or 1.1 for
-printing to Windows.
-
-<H2>Network Printing</H2>
-
-<P>Traditionally, network printing has been one of the hardest things to
-get working under UNIX. One reason is because each vendor added their
-own extensions to the LPD protocol (the previous standard for network
-printing), making cross-platform printing difficult if not impossible.
-
-<P>Another reason is that you have to administer every network printer
-on every client machine. In some cases you can "clone" the printer
-configuration from a "master" client to each of the others, but even
-that can be time-consuming and error-prone. Something better is needed.
-
-<P>CUPS provides "printer browsing", which allows clients to
-automatically see and use printers from any server on a LAN. This means
-that you only need to configure the server and the clients will
-automatically see the printers and classes on it.
-
-<P>In addition, CUPS can automatically merge multiple identical network
-printers into "implicit classes". This allows clients to send jobs to
-the implicit class and have them print on the first available printer
-or server. In addition, failsafe and load-balancing functions are
-enabled simply by defining the same printer on multiple servers!
-
-<H2>New Features in CUPS 1.1</H2>
-
-<P>CUPS 1.1 includes many new features and capabilities:
-
-<OL>
-
-	<LI><A HREF="#BACKENDS">Backends</A>
-
-	<LI><A HREF="#BANNERS">Banner Page Support</A>
-
-	<LI><A HREF="#DIGEST">Digest Authentication</A>
-
-	<LI><A HREF="#DIRSVC">Directory Services</A>
-
-	<LI><A HREF="#FHS2">Directory Structure Changes</A>
-
-	<LI><A HREF="#DOCOS">Documentation</A>
-
-	<LI><A HREF="#DRIVERS">Drivers</A>
-
-	<LI><A HREF="#FILTERS">Filters</A>
-
-	<LI><A HREF="#IPP">IPP Support</A>
-
-	<LI><A HREF="#PERSISTENCE">Job Persistence</A>
-
-	<LI><A HREF="#LPD">LPD Client Support</A>
-
-	<LI><A HREF="#USEROPTS">User-Defined Printers and Options</A>
-
-	<LI><A HREF="#WEB">Web Administration Interface</A>
-
-</OL>
-
-<H3><A NAME="BACKENDS">1. Backends</A></H3>
-
-<P>CUPS 1.1 implements a new backend interface for retrieving a list of
-available devices for CUPS clients. This allows administration
-interfaces to query the CUPS scheduler for a list of available devices,
-automatically configure printers if the device identification
-information is available, and present the user with a list of available
-devices rather than relying on the user to know what devices are
-configured on the system.
-
-<P>The new release also includes a backend for USB printers under
-*BSD and Linux. Support for USB under Solaris 8 will be provided in
-a subsequent patch release.
-
-<H3><A NAME="BANNERS">2. Banner Page Support</A></H3>
-
-<P>CUPS 1.1 includes support for banner pages at the beginning and end
-of a job. Banner pages may be of any file format and support variable
-substitution for job titles, usernames, etc. Default banner pages are
-associated with each printer and can be overridden with command-line
-options by the user.
-
-<H3><A NAME="DIGEST">3. Digest Authentication</A></H3>
-
-<P>Digest authentication provides a more secure method of authenticating
-access to the printing system. Unlike Basic authentication, Digest
-authentication does not send passwords "in the clear" so it is more
-difficult to gain unauthorized access to your system.
-
-<P>CUPS 1.1 implements Digest authentication using a special MD5
-password file instead of the UNIX password file. This file is managed
-using the new <CODE>lppasswd</CODE> command.
-
-<H3><A NAME="DIRSVC">4. Directory Services</A></H3>
-
-<P>CUPS 1.1 adds new directory service ("printer browsing") features to
-make using CUPS on large LANs and WANs easier. You can now poll a
-remote server for printer information and relay it to the LAN as well
-as restrict what printer information is processed (e.g. to "hide"
-servers, domains, or networks that you don't want to see.)
-
-<H3><A NAME="FHS2">5. Directory Structure Changes</A></H3>
-
-<P>CUPS 1.1 now uses a directory structure that complies with the
-Filesystem Hierarchy Standard ("FHS"), version 2.0. This should make
-integration into existing Linux and *BSD distributions a lot easier.
-
-<H3><A NAME="DOCOS">6. Documentation</A></H3>
-
-<P>The CUPS 1.1 documentation has gone through many revisions,
-including a completely rewritten administrators manual, a new
-programmers manual, and an IPP implementation reference manual.
-
-<H3><A NAME="DRIVERS">7. Drivers</A></H3>
-
-<P>CUPS 1.1 includes drivers for EPSON dot-matrix and inkjet printers.
-As with the HP PCL drivers, the EPSON drivers don't necessarily provide
-the best possible output for each printer but should provide adequate
-printing quality for general day-to-day printing.
-
-<H3><A NAME="FILTERS">8. Filters</A></H3>
-
-<P>CUPS 1.1 includes new image, PostScript, PDF, and text filters. The image
-filters have been upgraded to support Windows BMP and Alias PIX files.
-
-<P>The PostScript filter is now based off GNU Ghostscript 5.50. The new
-filter provides much better performance with higher-resolution printers
-and supports most Level 3 PostScript language features.
-
-<P>The new PDF filter is based off the excellent Xpdf software from
-Derek Noonburg and supports automatic page scaling. The new filter is a
-faster, smaller, more reliable replacement for the GNU Ghostscript PDF
-filtering that was used in CUPS 1.0.
-
-<P>The new text filter now supports bidirectional text and can embed
-fonts as needed.
-
-<H3><A NAME="IPP">9. IPP Support</A></H3>
-
-<P>Probably the least visible portion of CUPS is the IPP support. CUPS
-1.1 implements all of the required IPP/1.1 operations and attributes
-and most of the optional ones. The optional Create-Job and Send-File
-operations are now implemented, allowing for better System V printing
-system compatibility (one job ID per <CODE>lp</CODE> command) and
-support for banner pages.
-
-<H3><A NAME="PERSISTENCE">10. Job Persistence</A></H3>
-
-<P>CUPS 1.1 supports job persistence. This means that jobs are preserved
-even after a reboot, a feature that was sorely missing from CUPS 1.0.
-
-<P>In addition, CUPS 1.1 allows you to keep job information after the
-job has printed. The basic post-job persistence mode provides a job
-history (number of pages printed, time job was printed, etc.) but does
-not preserve the actual job files. This can be changed to discard all
-information after a job is printed or keep the job files after printing
-so you can reprint a job at some later time.
-
-<H3><A NAME="LPD">11. LPD Client Support</A></H3>
-
-<P>By popular request, CUPS 1.1 supports LPD-based clients using a new
-mini-daemon that handles LPD requests and passes them on to the main
-server.
-
-<H3><A NAME="USEROPTS">12. User-Defined Printers and Options</A></H3>
-
-<P>CUPS 1.1 includes support for user-defined printers and options via
-a new <CODE>lpoptions</CODE> command. User-defined printers are special
-instances of the available printers (e.g. "printer/instance" or
-"printer@server/instance") that can have their own default options such
-as media size, resolution, and so forth. The <CODE>lpoptions</CODE>
-command can also be used to set a different default printer queue.
-
-<H3><A NAME="WEB">13. Web Administration Interface</A></H3>
-
-<P>CUPS 1.0 provided a simple class, job, and printer monitoring
-interface for web browsers. CUPS 1.1 replaces this interface with an
-enhanced administration interface that allows you to add, modify,
-delete, configure, and control classes, jobs, and printers.
-
-<H2>Software Using CUPS</H2>
-
-<P>A lot has happened since CUPS 1.0 came out, and many software packages
-are supporting CUPS. We have contributed code to the SAMBA team to support
-CUPS, and parts of that are already available in SAMBA 2.0.6 and 2.0.7.
-With any luck the final pieces that provide a complete integration with
-SAMBA will be available in the next release of SAMBA.
-
-<P>Two graphical interfaces have appeared on the scene that use CUPS as
-well. The KUPS project provides a KDE-based interface for CUPS and can be
-found at:
-
-<UL><PRE>
-<A HREF="http://kups.sourceforge.net">http://kups.sourceforge.net</A>
-</PRE></UL>
-
-<P>The X Printing Panel ("XPP") project provides a graphical printing
-panel for CUPS and can be found at:
-
-<UL><PRE>
-<A HREF="http://www.phy.uni-bayreuth.de/till/xpp">http://www.phy.uni-bayreuth.de/till/xpp/</A>
-</PRE></UL>
-
-<P>Numerous other filters, drivers, tutorials, etc. have been made available
-on the CUPS bazaar, available at:
-
-<UL><PRE>
-<A HREF="http://www.cups.org/bazaar.cgi">http://www.cups.org/bazaar.cgi</A>
-</PRE></UL>
-
-<P>Finally, our own ESP Print Pro software uses CUPS to provide drivers
-for thousands of printers and can be found at:
-
-<UL><PRE>
-<A HREF="http://www.easysw.com/printpro">http://www.easysw.com/printpro</A>
-</PRE></UL>
-
-<H2>Operating Systems Using CUPS</H2>
-
-<P>One of our goals has always been to get as many UNIX/Linux
-distributions using CUPS as possible. Debian is currently providing
-CUPS as part of its stable distribution, and many other distributions
-are considering it in their next releases.
+A backend program is a special filter that writes incoming data to a
+device or network connection. Backends for serial, parallel, LPD,
+IPP, SMB, and AppSocket (JetDirect) connections are provided in
+CUPS 1.0.
+
+<H2>Berkeley and System V Commands</H2>
+
+CUPS provides the System V and Berkeley command-line interfaces
+for submitting jobs and checking the printer status. The "lpstat" and
+"lpc status" commands also show network printers ("printer@hostname")
+when printer browsing is enabled.
+
+<P>The System V administation commands are supplied for managing
+printers local to the system. The Berkeley printer administration tool
+("lpc") is only supported in a "read-only" mode to check the current
+status of the printer queues and scheduler.
 
 <H2>Summary</H2>
 
-<P>The Common UNIX Printing System provides a modern printing interface
+The Common UNIX Printing System provides a modern printing interface
 for UNIX applications that is both flexible and user-friendly. The
 software provides System V and Berkeley compatible command-line
-interfaces to ensure compatibility with existing applications. CUPS 1.1
-adds many new features that make it an even better choice for printing
-under UNIX.
+interfaces to ensure compatibility with existing applications.
 
-<H2>Who to Contact</H2>
+<H2>Licensing</H2>
 
-<P>For more information on CUPS please contact us at:
+CUPS is available under the terms of the GNU General Public License
+which means that it is basically free except for binary-only
+distribution. Vendors wishing to license CUPS for their printing
+solution should contact Easy Software Products at:
 
-<UL><PRE>
-Attn: CUPS Information
-Easy Software Products
-44141 Airport View Drive Suite 204
+<UL>
+<P>Attn: CUPS Licensing<BR>
+Easy Software Products<BR>
+44141 Airport View Drive Suite 204<BR>
 Hollywood, Maryland 20636-3111 USA
-
-+1.301.373.9600
-
-<A HREF="mailto:cups-info@cups.org">cups-info@cups.org</A>
-</PRE></UL>
+<P>+1.301.373.9600<BR>
+cups-info@cups.org
+</UL>
 
 <H2>References</H2>
 
@@ -460,31 +253,30 @@ Hollywood, Maryland 20636-3111 USA
 
 	<DT><A HREF="http://www.pwg.org/ipp/index.html">IETF-IPP</A></DT>
 
-	<DD>Internet Printing Protocol/1.1</DD>
+	<DD>Internet Printing Protocol/1.0</DD>
 
 	<DT><A HREF="http://www.astart.com/lprng.html">LPRng</A></DT>
 
-	<DD>An enhanced, extended, and portable implementation of the
-	Berkeley LPR print spooler functionality</DD>
+	<DD>An enhanced, extended, and portable implementation of the Berkeley LPR
+	print spooler functionality</DD>
 
 	<DT>Palladin</DT>
 
-	<DD>A printing system developed at the Massachussetts Institute
-	of Technology</DD>
+	<DD>A printing system developed at the Massachussetts Institute of Technology</DD>
 
 	<DT><A HREF="http://www-usa.iona.com//hyplan/jmason/plp.html">PLP</A></DT>
 
 	<DD>The Portable Line Printer spooler system</DD>
 
-	<DT><A HREF="http://www.ietf.org/rfc/rfc1179.txt">RFC1179</A></DT>
+	<DT><A HREF="http://www.cis.ohio-state.edu/rfc/rfc1179.txt">RFC1179</A></DT>
 
 	<DD>Line Printer Daemon Protocol</DD>
 
-	<DT><A HREF="http://www.ietf.org/rfc/rfc2046.txt">RFC2046</A></DT>
+	<DT><A HREF="http://www.cis.ohio-state.edu/rfc/rfc2046.txt">RFC2046</A></DT>
 
 	<DD>Multipurpose Internet Mail Extensions (MIME) Part Two: Media Types</DD>
 
-	<DT><A HREF="http://www.ietf.org/rfc/rfc2616.txt">RFC2616</A></DT>
+	<DT><A HREF="http://www.cis.ohio-state.edu/rfc/rfc2068.txt">RFC2068</A></DT>
 
 	<DD>Hypertext Transfer Protocol -- HTTP/1.1</DD>
 
@@ -492,9 +284,9 @@ Hollywood, Maryland 20636-3111 USA
 
 <H2>Trademarks</H2>
 
-<P>The Common UNIX Printing System, CUPS, and the CUPS logo are the
-trademark property of Easy Software Products. All other trademarks are
-the property of their respective owners.
+The Common UNIX Printing System, CUPS, and the CUPS logo are
+trademarks of Easy Software Products. All other trademarks are the
+property of their respective owners.
 
 </BODY>
 </HTML>

doc/references.shtml

@@ -7,14 +7,14 @@
 <UL>
 	<LI>CUPS-CMP-1.1: CUPS Configuration Management Plan 
 	<LI>CUPS-IDD-1.1: CUPS System Interface Design Description 
-	<LI>CUPS-IPP-1.1: CUPS Implementation of IPP
+	<LI>CUPS-IPP-1.1: CUPS Implmentation of IPP
 	<LI>CUPS-SAM-1.1.x: CUPS Software Administrators Manual 
 	<LI>CUPS-SDD-1.1: CUPS Software Design Description 
-	<LI>CUPS-SPM-1.1.x: CUPS Software Programming Manual
+	<LI>CUPS-SPM-1.1: CUPS Software Programming Manual
 	<LI>CUPS-SSR-1.1: CUPS Software Security Report 
 	<LI>CUPS-STP-1.1: CUPS Software Test Plan 
 	<LI>CUPS-SUM-1.1.x: CUPS Software Users Manual 
-	<LI>CUPS-SVD-1.1: CUPS Software Version Description 
+	<LI>CUPS-SVD-1.1.x: CUPS Software Version Description 
 </UL>
 
 <H2>Other Documents</H2>
@@ -22,21 +22,19 @@
 <P>The following non-CUPS documents are referenced by this document:
 
 <UL>
-	<LI><A HREF="http://partners.adobe.com/asn/developer/PDFS/TN/5003.PPD_Spec_v4.3.pdf">Adobe
-	PostScript Printer Description File Format Specification,
-	Version 4.3.</A>
-	<LI><A HREF="http://partners.adobe.com/asn/developer/PDFS/TN/PLRM.pdf">Adobe
-	PostScript Language Reference, Third Edition.</A>
+	<LI>Adobe PostScript Printer Description File Format Specification,
+	Version 4.3.
+	<LI>Adobe PostScript Language Reference, Third Edition.
 	<LI>IPP: Job and Printer Set Operations
 	<LI>IPP/1.1: Encoding and Transport 
 	<LI>IPP/1.1: Implementers Guide
 	<LI>IPP/1.1: Model and Semantics
-	<LI><A HREF="http://www.ietf.org/rfc/rfc1179.txt">RFC 1179, Line Printer Daemon Protocol</A>
-	<LI><A HREF="http://www.ietf.org/rfc/rfc2567.txt">RFC 2567, Design Goals for an Internet Printing Protocol</A>
-	<LI><A HREF="http://www.ietf.org/rfc/rfc2568.txt">RFC 2568, Rationale for the Structure of the Model and Protocol</A>
-	for the Internet Printing Protocol</A>
-	<LI><A HREF="http://www.ietf.org/rfc/rfc2569.txt">RFC 2569, Mapping between LPD and IPP Protocols</A>
-	<LI><A HREF="http://www.ietf.org/rfc/rfc2616.txt">RFC 2616, Hypertext Transfer Protocol -- HTTP/1.1</A>
-	<LI><A HREF="http://www.ietf.org/rfc/rfc2617.txt">RFC 2617, HTTP Authentication: Basic and Digest Access</A>
+	<LI>RFC 1179, Line Printer Daemon Protocol 
+	<LI>RFC 2567, Design Goals for an Internet Printing Protocol
+	<LI>RFC 2568, Rationale for the Structure of the Model and Protocol
+	for the Internet Printing Protocol
+	<LI>RFC 2569, Mapping between LPD and IPP Protocols
+	<LI>RFC 2616, Hypertext Transfer Protocol -- HTTP/1.1
+	<LI>RFC 2617, HTTP Authentication: Basic and Digest Access
 	Authentication
 </UL>