Import cups.org releases

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-1.1b1@4306 a1ca3aef-8c08-0410-bb20-df032aa958be
2013-05-10 18:56:23 +00:00
@@ -0,0 +1,263 @@
+CHANGES.txt - 02/27/2000
+------------------------
+
+CHANGES IN CUPS v1.1b1
+
+	- NEW web-based administration interface.
+	- NEW EPSON printer drivers.
+	- NEW user-defined printers and options.
+	- NEW persistent jobs and job history
+	- NEW IPP/1.1 support
+	- NEW template-based web interfaces.
+	- NEW CUPS-get-devices and CUPS-get-ppds operations.
+	- NEW support for create-job and send-file operations.
+	- NEW certificate-based authentication for local
+	      administration.
+	- NEW USB backend.
+	- The lpr command now produces human-readable error messages.
+	- The lpq command now produces BSD standard format output
+	  instead of OSF/1 output.  This should resolve the SAMBA
+	  print queue problems that have been reported.
+	- The IPP backend did not always detect when the "raw" option
+	  was being used.
+	- The "lpstat -p" command would stop after the first active
+	  printer.
+	- The "lpstat -v" command would stop before the first remote
+	  printer.
+
+
+CHANGES IN CUPS v1.0.5
+
+	- The HP-GL/2 filter did not correctly set the pen color
+          for pens other than #1.
+	- The scheduler would only accept 26 simultaneous jobs
+          under some OS releases (mkstemp() limitation.)  It now
+          handles up to 2^32 simultaneous jobs.
+	- The PostScript filter loaded the printer's PPD file
+          twice.
+	- The PAM authentication code now uses pam_strerror() to
+          provide a textual error message in the error_log file.
+	- The scheduler now copies PPD and interface script
+          files instead of moving them; this fixes installations
+          with a separate requests directory.
+	- The PostScript RIP did not generate correct 6-color
+          output.
+	- Several filters were marking PPD options twice when
+          they didn't need to.
+	- The scheduler did not save the printer or class state
+          after an accept-jobs or reject-jobs operation.
+	- The cupsGetDefault() function now ignores the PRINTER
+          environment variable if it is set to "lp".
+	- New ippErrorString() function to get textual error
+          messages.
+	- Better error reporting in the System V commands.
+	- The lpadmin and lpstat commands always tried to
+          connect to the default server.
+	- The text filter didn't load the charset files from the
+          correct location.
+	- Wasn't sending a WWW-Authenticate: field to HTTP
+          clients when authentication was required.
+	- httpSeparate() didn't always set the default port
+          number for known methods.
+	- The HP-GL/2 filter now looks for "PSwidth,length"
+          instead of (the correct) "PSlength,width" as
+          documented by HP.  It appears that many major CAD
+          applications are broken and this change allows the
+          auto-rotation to work with them.
+	- The IPP "printer-resolution" option was not being
+          translated.
+	- The charset files did not include the Microsoft
+          "standard" characters from 128 to 159 (unused by the
+          ISO-8859-x charsets)
+	- The scheduler was chunking the Content-Type field from
+          CGI programs; this problem was most noticeable with
+          Microsoft Internet Explorer 5.
+	- By popular demand, the printers, jobs, and classes
+          CGIs no longer force a reload of the page every 10/30
+          seconds.
+	- The scheduler incorrectly required that the IPP client
+          provide a document-format attribute for the
+          validate-job operation.
+	- Clients that sent bad IPP requests without the
+          required attributes-natural-language and
+          attributes-charset attributes would crash the
+          scheduler.
+
+
+CHANGES IN CUPS v1.0.4
+
+	- Documentation updates.
+	- Jobs would get stuck in the queue and wouldn't print
+	  until you enabled the queue.
+	- The lp and lpr commands now catch SIGHUP and SIGINTR.
+	- The lp and lpr commands now use sigaction or sigset
+	  when available.
+	- CUPS library updates for WIN32/OS-2
+
+
+CHANGES IN CUPS v1.0.3
+
+	- Documentation updates.
+	- The lpq man page was missing.
+	- The configure script was not properly detecting the
+	  image libraries.
+	- The top-level makefile was calling "make" instead of
+	  "$(MAKE)".
+	- PostScript filter fixes for number-up, OutputOrder,
+	  and %Trailer.
+	- The imagetops filter didn't end the base-85 encoding
+	  properly if the image data was not a multiple of 4
+	  bytes in length.
+	- The imagetoraster filter didn't generate good banded
+	  RGB or CMY data (was dividing the line width by 4
+	  instead of 3...)
+	- The imagetoraster filter now records the bounding
+	  box of the image on the page.
+	- The CUPS image library cache code wasn't working as
+	  designed; images larger than the maximum RIP cache
+	  would eventually thrash using the same cache tile.
+	- The CUPS image library TIFF loading code didn't
+	  handle unknown resolution units properly; the fixed
+	  code uses a default resolution of 128 PPI.
+	- cupsGetClasses() and cupsGetPrinters() did not free
+	  existing strings if they ran out of memory.
+	- The scheduler logs incorrectly contained 3 digits for
+	  the timezone offset instead of 4.
+	- The scheduler now does a lookup for the default user
+	  and group ID; the previous hardcoded values caused
+	  problems with the LPD backend.
+	- The cancel-job operation now allows any user in the
+	  system group to cancel any job.
+	- The cancel-job operation stopped the print queue if
+	  the job was being printed.
+	- Now only stop printers if the backend fails. If the
+	  filter fails then the failure is noted in the
+	  error_log and printing continues with the next file in
+	  the queue.
+	- Now log whether a filter fails because of a signal
+	  or because it returned a non-zero exit status.
+	- The root user now always passes the system group test.
+	- Printers with an interface script and remote printers
+	  and classes didn't have a printer-make-and-model
+	  attribute.
+	- Added logging of lost/timed-out remote printers.
+	- The HP-GL/2 filter was scaling the pen width twice.
+	- Updated the HP-GL/2 filter to use a single SP (Set
+	  Pen) procedure.  This makes the output smaller and is
+	  more appropriate since the filter keeps track of the
+	  pen states already.
+	- The scheduler didn't handle passwords with spaces.
+	- The IPP backend now does multiple copies and retries
+	  if the destination server requires it (e.g. HP
+	  JetDirect.)
+	- The disable command didn't implement the "-c" option
+	  (cancel all jobs.)
+	- Changed the CMYK generation function for the image file
+	  and PostScript RIPs.
+	- The lp command didn't support the "-h" option as
+	  documented.
+	- The AppSocket, IPP, and LPD backends now retry on all
+	  network errors.  This should prevent stopped queues
+	  caused by a printer being disconnected from the
+	  network or powered off.
+	- The scheduler now restarts a job if the corresponding
+	  printer is modified.
+	- The image RIPs now rotate the image if needed to fit
+	  on the page.
+
+
+CHANGES IN CUPS v1.0.2
+
+	- The HP-GL/2 filter didn't always scale the output
+	  correctly.
+	- The HP-GL/2 filter now supports changing the page size
+	  automatically when the "fitplot" option is not used.
+	- The cancel-job operation was expecting a resource name
+	  of the form "/job/#" instead of "/jobs/#"; this
+	  prevented the cancel and lprm commands from working.
+	- The backends didn't log pages when files were printed
+	  using the "-oraw" option.
+	- The authorization code did not work with the Slackware
+	  long shadow password package because its crypt() can
+	  return NULL.
+	- The chunking code didn't work for reading the response
+	  of a POST request.
+	- cupsGetPPD() now does authentication as needed.
+	- The N-up code in the PostScript filter didn't work
+	  with some printers (grestoreall would restore the
+	  default blank page and device settings).
+	- The N-up code in the PostScript filter didn't scale
+	  the pages to fit within the imageable area of the
+	  page.
+	- Wasn't doing an fchown() on the request files.  This
+	  caused problems when the default root account group
+	  and CUPS group were not the same.
+
+
+CHANGES IN CUPS v1.0.1
+
+	- Documentation updates.
+
+	- Fixed a bunch of possible buffer-overflow conditions.
+
+	- The scheduler now supports authentication using PAM.
+
+	- Updated the Italian message file.
+
+	- httpEncode64() didn't add an extra "=" if there was
+	  only one byte in the last three-byte group.
+
+	- Now drop any trailing character set from the locale
+	  string (e.g. "en_US.ISO_8859-1" becomes "en_US")
+
+	- Fixed "timezone" vs "tm_gmtoff" usage for BSD-based
+	  operating systems.
+
+	- Updated IPP security so that "get" operations can be
+	  done from any resource name; this allows the CGIs to
+	  work with printer authentication enabled so long as
+	  authentication isn't turned on for the whole "site".
+
+	- The IPP code didn't properly handle the "unsupported"
+	  group; this caused problems with the HP JetDirect since
+	  it doesn't seem to support the "copies" attribute.
+
+	- The HTTP chunking code was missing a CR LF pair at the
+	  end of a 0-length chunk.
+
+	- The httpSeparate() function didn't handle embedded
+	  usernames and passwords in the URI properly.
+
+	- Doing "lpadmin -p printer -E" didn't restart printing
+	  if there were pending jobs.
+
+	- The cancel-job operation now requires either a
+	  requesting-user-name attribute or an authenticated
+	  username.
+
+	- The add-printer code did not report errors if the
+	  interface script or PPD file could not be renamed.
+
+	- Request files are now created without world read
+	  permissions.
+
+	- Added a cupsLastError() function to the CUPS API to
+	  retrieve the IPP error code from the last request.
+
+	- Options are now case-insensitive.
+
+	- The lpq command now provides 10 characters for the
+	  username instead of the original (Berkeley standard)
+	  7.
+
+	- The cancel command needed a local CUPS server to work
+	  (or the appropriate ServerName in cupsd.conf)
+
+	- The cancel and lprm commands didn't report the IPP
+	  error if the job could not be cancelled.
+
+	- The lp and lpr commands didn't intercept SIGTERM to
+	  remove temporary files when printing from stdin.
+
+	- The lp and lpr commands didn't report the IPP error if
+	  the job could not be printed.
@@ -0,0 +1,26 @@
+CREDITS.txt - 01/27/2000
+------------------------
+
+Few projects are completed by one person, and CUPS is no exception.  We'd
+like to thank the following individuals for their contributions:
+
+    Nathaniel Barbour   - Lots of testing and feedback.
+    N. Becker           - setsid().
+    Jean-Eric Cuendet   - GhostScript filters for CUPS.
+    Van Dang            - HTTP and IPP policeman.
+    Dr. ZP Han          - setgid()/setuid().
+    Guy Harris          - *BSD shared libraries and lots of other fixes.
+    Wang Jian           - CUPS RPM corrections.
+    Roderick Johnstone  - Beta tester of the millenium.
+    Sergey V. Kovalyov  - ESP Print Pro and CUPS beta tester.
+    Mark Lawrence       - Microsoft interoperability testing.
+    Jason McMullan      - Original CUPS RPM distributions.
+    Wes Morgan          - *BSD fixes.
+    Ulrich Oldendorf    - German locale.
+    Petter Reinholdtsen - HP-UX compiler stuff.
+    Stuart Stevens      - HP JetDirect IPP information.
+    Kiko                - Bug fixes.
+    L. Peter Deutsch    - MD5 code.
+
+If I've missed someone, please let me know by sending an email to
+"mike@easysw.com".
@@ -3,9 +3,7 @@
 #
 #   Common makefile definitions for the Common UNIX Printing System (CUPS).
 #
-#   @configure_input@
-#
-#   Copyright 1997-1999 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
@@ -37,13 +35,12 @@ DSO	=	@DSO@
 HTMLDOC	=	@HTMLDOC@
 LN	=	/bin/ln -sf
 MKDIR	=	@MKDIR@ -p
+MV	=	@MV@
 NROFF	=	@NROFF@
-PACK	=	@PACK@
 RANLIB	=	@RANLIB@
 RM	=	@RM@ -f
 SED	=	@SED@
 SHELL	=	/bin/sh
-SMBCLIENT =	@SMBCLIENT@

 #
 # Libraries...
@@ -74,12 +71,6 @@ NETLIBS	=	@NETLIBS@
 OPTIM	=	@OPTIM@
 OPTIONS	=

-#
-# Formatted man page extension...
-#
-
-CAT	=	@CAT@
-
 #
 # Directories...
 #
@@ -111,11 +102,15 @@ top_srcdir	=	@top_srcdir@

 BINDIR		=	@bindir@
 DATADIR		=	@CUPS_DATADIR@
+DOCDIR		=	@CUPS_DOCDIR@
 INCLUDEDIR	=	$(includedir)
 LIBDIR		=	$(libdir)
 LOCALEDIR	= 	@CUPS_LOCALEDIR@
+LOGDIR		= 	@CUPS_LOGDIR@
 MANDIR		=	@mandir@
+REQUESTS	= 	@CUPS_REQUESTS@
 SBINDIR		=	@sbindir@
+SERVERBIN	= 	@CUPS_SERVERBIN@
 SERVERROOT	= 	@CUPS_SERVERROOT@

 #
@@ -123,15 +118,14 @@ SERVERROOT	= 	@CUPS_SERVERROOT@
 #

 .SILENT:
-.SUFFIXES:	.a .c .gz .h .o .z .1 .5 .8
+.SUFFIXES:	.a .c .h .man .o .1 .5 .8
 .c.o:
 	echo Compiling $<...
 	$(CC) $(CFLAGS) -c $<
-.1.z .5.z .8.z .1.gz .5.gz .8.gz:
+.man.1 .man.5 .man.8:
 	echo Formatting $<...
-	$(NROFF) -man $< >t
-	$(PACK) t
-	-mv t.$(CAT) $@
+	$(RM) $@
+	$(NROFF) -man $< >$@

 #
 # End of "$Id$"
@@ -38,7 +38,7 @@ DIRS	=	cups backend berkeley cgi-bin filter man pstoraster \
 all:
 	for dir in $(DIRS); do\
 		echo Making all in $$dir... ;\
-		(cd $$dir; make);\
+		(cd $$dir; $(MAKE)) || break;\
 	done

 #
@@ -48,7 +48,7 @@ all:
 clean:
 	for dir in $(DIRS); do\
 		echo Cleaning in $$dir... ;\
-		(cd $$dir; make clean);\
+		(cd $$dir; $(MAKE) clean) || break;\
 	done

 #
@@ -58,18 +58,36 @@ clean:
 install:
 	for dir in $(DIRS); do\
 		echo Installing in $$dir... ;\
-		(cd $$dir; make install);\
+		(cd $$dir; $(MAKE) install) || break;\
 	done
 	echo Installing in conf...
-	(cd conf; make install)
+	(cd conf; $(MAKE) install)
 	echo Installing in data...
-	(cd data; make install)
+	(cd data; $(MAKE) install)
 	echo Installing in doc...
-	(cd doc; make install)
+	(cd doc; $(MAKE) install)
 	echo Installing in fonts...
-	(cd fonts; make install)
+	(cd fonts; $(MAKE) install)
 	echo Installing in ppd...
-	(cd ppd; make install)
+	(cd ppd; $(MAKE) install)
+	echo Installing in templates...
+	(cd templates; $(MAKE) install)
+
+#
+# Make a software distribution...
+#
+
+epm:
+	epm -v cups
+
+rpm:
+	epm -v -f rpm cups
+
+deb:
+	epm -v -f deb cups
+
+tardist:
+	epm -v -f tardist cups

 #
 # End of "$Id$".
@@ -1,14 +1,27 @@
-README - CUPS v1.0b6 - 07/30/1999
+README - CUPS v1.1b1 - 02/27/2000
 ---------------------------------

-BETA SOFTWARE BETA SOFTWARE BETA SOFTWARE BETA SOFTWARE BETA SOFTWARE
+************************************************************************
+************************************************************************
+****                                                                ****
+****     BETA SOFTWARE BETA SOFTWARE BETA SOFTWARE BETA SOFTWARE    ****
+****                                                                ****
+************************************************************************
+************************************************************************

-    WARNING - This is a BETA release of CUPS, which means that it may
-	      contain "bugs" that could prevent you from printing.  If
-	      you are concerned that this may cause you lost time or
-	      money, please STOP and do not install this 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.

-BETA SOFTWARE BETA SOFTWARE BETA SOFTWARE BETA SOFTWARE BETA SOFTWARE
+Also, currently we are only providing source code for the beta releases.
+As we approach a final production ("gold") release of CUPS 1.1 we will
+provide binary distributions as well.
+
+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
@@ -20,9 +33,8 @@ and users.  CUPS provides the System V and Berkeley command-line
 interfaces.

 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.
+managing print jobs and queues.  The Line Printer Daemon (LPD, RFC1179)
+and AppSocket protocols are also supported with reduced functionality.

 CUPS adds network printer browsing and PostScript Printer Description
 ("PPD")-based printing options to support real world applications under
@@ -32,7 +44,7 @@ CUPS also includes a customized version of GNU GhostScript (currently
 based off GNU GhostScript 4.03) and an image file RIP that can be used
 to support non-PostScript printers.

-CUPS is Copyright 1993-1999 by Easy Software Products, All Rights
+CUPS is Copyright 1993-2000 by Easy Software Products, All Rights
 Reserved.  CUPS is currently licensed under the terms of the GNU
 General Public License.  Please see the license file for details.

@@ -57,7 +69,7 @@ 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
    - IRIX 5.3 or higher
-    - Linux 2.0.36 with glibc2 or higher (tested with RedHat 5.2)
+    - Linux 2.0 with glibc2 or higher
    - Solaris 2.5 or higher (SPARC or Intel)


@@ -65,8 +77,9 @@ INSTALLING CUPS

 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 also included with the source
-distribution.
+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
@@ -85,15 +98,45 @@ After asking you a few yes/no questions the CUPS software will be
 installed and the scheduler will be started automatically.


-SETTING UP PRINTER QUEUES
+READING THE DOCUMENTATION
+
+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/cups/doc" directory in the binary distributions, and
+under the "doc" directory in the source archives.
+
+Please read the documentation before asking questions.
+
+
+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:
+
+    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.
+
+[note: adding, deleting, and modifying classes has not been implemented in
+       beta 1]
+
+
+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.

-Two sample PPD files are provided with this distribution that utilize
-the PostScript and image file RIPs and the sample HP printer driver. 
-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:

@@ -109,20 +152,31 @@ to the parallel port, use one of the following commands:

    Linux:

-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/par0 -E
-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/par1 -E
-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/par2 -E
+        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/lp0 -E
+        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/lp1 -E
+        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/lp2 -E

    Solaris:

        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/bpp0 -E
        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/ecpp0 -E

-Similarly, for the sample LaserJet driver you can use "LaserJet" and
-"laserjet.ppd".
+Similarly, for the other sample drivers you can use:

-For other printers and interfaces see the CUPS System Administator's
-Manual included with this software.
+    Driver                      PPD File
+    --------------------------  ------------
+    HP DeskJet Series           deskjet.ppd
+    HP LaserJet Series          laserjet.ppd
+    EPSON Stylus Color Series   stcolor.ppd
+    EPSON Stylus Photo Series   stphoto.ppd
+    EPSON 9-pin Series          epson9.ppd [not in beta 1]
+    EPSON 24-pin Series         epson24.ppd [not in beta 1]
+
+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
@@ -156,7 +210,8 @@ REPORTING PROBLEMS

 If you have problems, please send an email to cups-support@cups.org. 
 Include your operating system and version, compiler and version, and
-any errors or problems you've run into.
+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
@@ -171,7 +226,7 @@ software.  New releases of CUPS are announced to this list as well.

 LEGAL STUFF

-CUPS is Copyright 1993-1999 by Easy Software Products.  CUPS, the CUPS
+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.

@@ -188,8 +243,3 @@ licensing information, please contact:
    Voice: +1.301.373.9603
    Email: cups-info@cups.org
    WWW: http://www.cups.org
-
-If you're interested in a complete, commercial printing solution for
-UNIX, check out our ESP Print Pro software at:
-
-    http://www.easysw.com/printpro
@@ -3,7 +3,7 @@
 #
 #   Backend makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-1999 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,8 +24,10 @@

 include ../Makedefs

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

 #
 # Make all targets...
@@ -33,6 +35,7 @@ OBJS	=	ipp.o lpd.o parallel.o serial.o socket.o

 all:	$(TARGETS)

+
 #
 # Clean all object files...
 #
@@ -40,15 +43,27 @@ all:	$(TARGETS)
 clean:
 	rm -f $(OBJS) $(TARGETS)

+
 #
 # Install all targets...
 #

 install:
-	-$(MKDIR) $(SERVERROOT)/backend
-	$(CP) $(TARGETS) $(SERVERROOT)/backend
-	-$(LN) ipp $(SERVERROOT)/backend/http
-	$(CHMOD) u+s $(SERVERROOT)/backend/lpd
+	-$(MKDIR) $(SERVERBIN)/backend
+	$(CP) $(BACKENDS) $(SERVERBIN)/backend
+	-$(LN) ipp $(SERVERBIN)/backend/http
+
+
+#
+# betest
+#
+
+betest:	betest.o ../cups/$(LIBCUPS)
+	echo Linking $@...
+	$(CC) $(LDFLAGS) -o betest betest.o $(LIBS)
+
+betest.o:	../cups/string.h ../Makedefs
+

 #
 # ipp
@@ -61,6 +76,7 @@ ipp:	ipp.o ../cups/$(LIBCUPS)

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

+
 #
 # lpd
 #
@@ -71,6 +87,7 @@ lpd:	lpd.o ../cups/$(LIBCUPS)

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

+
 #
 # parallel
 #
@@ -81,6 +98,7 @@ parallel:	parallel.o ../cups/$(LIBCUPS)

 parallel.o:	../cups/cups.h ../Makedefs

+
 #
 # serial
 #
@@ -91,18 +109,6 @@ serial:	serial.o ../cups/$(LIBCUPS)

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

-#
-# smb
-#
-# Note: reading through these commands is a good way to get a headache... :)
-#
-
-smb:	smb.sh ../Makedefs
-	echo Generating $@...
-	$(RM) smb
-	sedcmd="1,\$$s/^SMBCLIENT=.\*/SMBCLIENT=`echo $(SMBCLIENT) | sed -e '1,$$s/\\//\\\\\\//g'`/" ;\
-	$(SED) -e "$$sedcmd" <smb.sh >smb
-	$(CHMOD) +x smb

 #
 # socket
@@ -114,6 +120,18 @@ socket:	socket.o ../cups/$(LIBCUPS)

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

+
+#
+# usb
+#
+
+usb:	usb.o ../cups/$(LIBCUPS)
+	echo Linking $@...
+	$(CC) $(LDFLAGS) -o usb usb.o $(LIBS)
+
+usb.o:	../cups/cups.h ../Makedefs
+
+
 #
 # End of "$Id$".
 #
@@ -0,0 +1,85 @@
+/*
+ * "$Id$"
+ *
+ *   Backend test program for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
+ *
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ *   main() - Run the named backend.
+ */
+
+/*
+ * Include necessary headers.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <cups/string.h>
+#include <unistd.h>
+
+
+/*
+ * 'main()' - Run the named backend.
+ *
+ * Usage:
+ *
+ *    betest device-uri job-id user title copies options [file]
+ */
+
+int			/* O - Exit status */
+main(int  argc,		/* I - Number of command-line arguments (7 or 8) */
+     char *argv[])	/* I - Command-line arguments */
+{
+  char		backend[255];	/* Method in URI */
+
+
+  if (argc < 7 || argc > 8)
+  {
+    fputs("Usage: betest device-uri job-id user title copies options [file]\n",
+          stderr);
+    return (1);
+  }
+
+ /*
+  * Extract the method from the device-uri - that's the program we want to
+  * execute.
+  */
+
+  if (sscanf(argv[1], "%254[^:]", backend) != 1)
+  {
+    fputs("betest: Bad device-uri - no colon!\n", stderr);
+    return (1);
+  }
+
+ /*
+  * Execute and return
+  */
+
+  execl(backend, argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7],
+        NULL);
+
+  return (1);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -3,7 +3,7 @@
 *
 *   IPP backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-1999 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
@@ -68,19 +68,33 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  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 */
  ipp_attribute_t *job_id;	/* job-id attribute */
+  ipp_attribute_t *copies_sup;	/* copies-supported attribute */
  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 (argc < 6 || argc > 7)
+  if (argc == 1)
+  {
+    if ((s = strrchr(argv[0], '/')) != NULL)
+      s ++;
+    else
+      s = argv[0];
+
+    printf("network %s \"Unknown\" \"Internet Printing Protocol\"\n", s);
+    return (0);
+  }
+  else if (argc < 6 || argc > 7)
  {
    fprintf(stderr, "Usage: %s job-id user title copies options [file]\n",
            argv[0]);
@@ -89,18 +103,55 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

 /*
  * If we have 7 arguments, print the file named on the command-line.
-  * Otherwise, print stdin...
+  * Otherwise, copy stdin to a temporary file and print the temporary
+  * file.
  */

  if (argc == 6)
-    fp = stdin;
-  else if ((fp = fopen(argv[6], "rb")) == NULL)
+  {
+   /*
+    * Copy stdin to a temporary file...
+    */
+
+    FILE *fp;		/* Temporary file */
+    char buffer[8192];	/* Buffer for copying */
+    int  bytes;		/* Number of bytes read */
+
+
+    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 (fwrite(buffer, 1, bytes, fp) < bytes)
+      {
+        perror("ERROR: unable to write to temporary file");
+	fclose(fp);
+	unlink(filename);
+	return (1);
+      }
+
+    fclose(fp);
+  }
+  else
+  {
+    strncpy(filename, argv[6], sizeof(filename) - 1);
+    filename[sizeof(filename) - 1] = '\0';
+  }
+
+ /*
+  * Open the print file...
+  */
+
+  if ((fp = fopen(filename, "rb")) == NULL)
  {
    perror("ERROR: Unable to open print file");
    return (1);
  }
  else
-    stat(argv[6], &fileinfo);
+    stat(filename, &fileinfo);

 /*
  * Extract the hostname and printer name from the URI...
@@ -112,16 +163,24 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  * Try connecting to the remote server...
  */

-  fprintf(stderr, "INFO: Connecting to %s...\n", hostname);
-
-  if ((http = httpConnect(hostname, port)) == NULL)
+  do
  {
-    perror("ERROR: Unable to connect to IPP host");
+    fprintf(stderr, "INFO: Connecting to %s...\n", hostname);

-    if (fp != stdin)
-      fclose(fp);
-    return (1);
+    if ((http = httpConnect(hostname, port)) == NULL)
+      if (errno == ECONNREFUSED)
+      {
+	fprintf(stderr, "INFO: Network host \'%s\' is busy; will retry in 30 seconds...",
+                hostname);
+	sleep(30);
+      }
+      else
+      {
+	perror("ERROR: Unable to connect to IPP host");
+	sleep(30);
+      }
  }
+  while (http == NULL);

 /*
  * Build a URI for the printer and fill the standard IPP attributes for
@@ -129,244 +188,456 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  * might contain username:password information...
  */

-  request = ippNew();
-  request->request.op.operation_id = IPP_PRINT_JOB;
-  request->request.op.request_id   = 1;
-
-  sprintf(uri, "%s://%s:%d%s", method, hostname, port, resource);
-
-  language = cupsLangDefault();
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-               "attributes-charset", NULL, cupsLangEncoding(language));
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-               "attributes-natural-language", NULL,
-               language != NULL ? language->language : "C");
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
-               NULL, uri);
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
-               NULL, argv[2]);
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name", NULL, argv[3]);
+  snprintf(uri, sizeof(uri), "%s://%s:%d%s", method, hostname, port, resource);

 /*
-  * Handle options on the command-line...
+  * First validate the destination and see if the device supports multiple
+  * copies.  We have to do this because some IPP servers (e.g. HP JetDirect)
+  * don't support the copies attribute...
  */

-  options     = NULL;
-  num_options = cupsParseOptions(argv[5], 0, &options);
+  language   = cupsLangDefault();
+  copies_sup = NULL;

-  if (cupsGetOption("raw", num_options, options))
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
-        	 NULL, "application/vnd.cups-raw");
-  else
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
-        	 NULL, "application/octet-stream");
-
-  ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, "copies", atoi(argv[4]));
-
-  for (i = 0; i < num_options; i ++)
+  do
  {
   /*
-    * Skip the "raw" option - handled above...
+    * Build the IPP request...
    */

-    if (strcmp(options[i].name, "raw") == 0)
-      continue;
+    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 != NULL ? language->language : "C");
+
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
+        	 NULL, uri);

   /*
-    * 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.
+    * Now fill in the HTTP request stuff...
    */

-    option = options[i].name;
-    val    = options[i].value;
-
-    if (*val == '\0')
-      val = NULL;
-
-    if (val != NULL)
+    httpClearFields(http);
+    httpSetField(http, HTTP_FIELD_CONTENT_TYPE, "application/ipp");
+    if (username[0])
    {
-      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 (strncmp(option, "no", 2) == 0)
-      {
-	option += 2;
-	n      = 0;
-      }
-      else
-        n = 1;
-
-      s = "";
+      httpEncode64(password, username);
+      httpSetField(http, HTTP_FIELD_AUTHORIZATION, password);
    }

-    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 (strcmp(s, "dpc") == 0)
-          ippAddResolution(request, IPP_TAG_JOB, option, IPP_RES_PER_CM, n, n2);
-        else if (strcmp(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");
-  httpEncode64(password, username);
-  httpSetField(http, HTTP_FIELD_AUTHORIZATION, password);
-
-  if (fp != stdin)
-  {
-    sprintf(buffer, "%u", ippLength(request) + (size_t)fileinfo.st_size);
+    sprintf(buffer, "%u", ippLength(request));
    httpSetField(http, HTTP_FIELD_CONTENT_LENGTH, buffer);
-  }
-  else
-    httpSetField(http, HTTP_FIELD_TRANSFER_ENCODING, "chunked");
-
- /*
-  * Do the request...
-  */
-
-  for (;;)
-  {
-   /*
-    * POST the request, retrying as needed...
-    */
-
-    if (httpPost(http, resource))
-    {
-      fputs("INFO: Unable to POST print request; retrying...\n", stderr);
-      sleep(10);
-      httpReconnect(http);
-      continue;
-    }
-
-    fputs("INFO: POST successful, sending IPP request...\n", stderr);

   /*
-    * Send the IPP request...
+    * Do the request...
    */

-    request->state = IPP_IDLE;
-
-    if (ippWrite(http, request) == IPP_ERROR)
+    for (;;)
    {
-      fputs("ERROR: Unable to send IPP request!\n", stderr);
-      status = HTTP_ERROR;
+     /*
+      * POST the request, retrying as needed...
+      */
+
+      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
+      {
+	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);
+      }
+
+      httpFlush(http);
+
      break;
    }

-    fputs("INFO: IPP request sent, sending print file...\n", stderr);
+    if (status != HTTP_OK)
+    {
+      if (fp != stdin)
+	fclose(fp);

+      httpClose(http);
+
+      return (1);
+    }
+  }
+  while (ipp_status > IPP_OK_CONFLICT);
+
+ /*
+  * See if the printer supports multiple copies...
+  */
+
+  if (copies_sup)
+    copies = 1;
+  else
+    copies = atoi(argv[4]);
+
+ /*
+  * Then issue the print-job request...
+  */
+
+  while (copies > 0)
+  {
   /*
-    * Then send the file...
+    * Build the IPP request...
    */

-    tbytes = 0;
-    while ((nbytes = fread(buffer, 1, sizeof(buffer), fp)) > 0)
-    {
-      tbytes += nbytes;
-      fprintf(stderr, "INFO: Sending print file, %uk...\n", tbytes / 1024);
+    request = ippNew();
+    request->request.op.operation_id = IPP_PRINT_JOB;
+    request->request.op.request_id   = 1;

-      if (httpWrite(http, buffer, nbytes) < nbytes)
-      {
-        perror("ERROR: Unable to send print file to printer");
-	status = HTTP_ERROR;
-        break;
-      }
-    }
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+        	 "attributes-charset", NULL, cupsLangEncoding(language));

-    fputs("INFO: Print file sent; checking status...\n", stderr);
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+        	 "attributes-natural-language", NULL,
+        	 language != NULL ? language->language : "C");
+
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
+        	 NULL, uri);
+
+    fprintf(stderr, "DEBUG: printer-uri = \"%s\"\n", uri);
+
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
+        	 NULL, argv[2]);
+
+    fprintf(stderr, "DEBUG: requesting-user-name = \"%s\"\n", argv[2]);
+
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name", NULL,
+        	 argv[3]);
+
+    fprintf(stderr, "DEBUG: job-name = \"%s\"\n", argv[3]);

   /*
-    * Finally, check the status from the HTTP server...
+    * Handle options on the command-line...
    */

-    while ((status = httpUpdate(http)) == HTTP_CONTINUE);
+    options     = NULL;
+    num_options = cupsParseOptions(argv[5], 0, &options);

-    if (status == HTTP_OK)
-    {
-      response = ippNew();
-      ippRead(http, response);
-
-      if (response->request.status.status_code > IPP_OK_CONFLICT)
-        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);
-    }
+    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
+      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 ++)
    {
-      response = NULL;
+     /*
+      * Skip the "raw" option - handled above...
+      */
+
+      if (strcasecmp(options[i].name, "raw") == 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...
+    */
+
+    for (;;)
+    {
+     /*
+      * POST the request, retrying as needed...
+      */
+
+      httpReconnect(http);
+
+      if (httpPost(http, resource))
+      {
+	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
+      {
+	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);

-      fprintf(stderr, "ERROR: Print request was not accepted (%d)!\n", status);
+      break;
    }

-    break;
+    if (request != NULL)
+      ippDelete(request);
+    if (response != NULL)
+      ippDelete(response);
+
+    if (ipp_status <= IPP_OK_CONFLICT)
+    {
+      fprintf(stderr, "PAGE: 1 %d\n", copies_sup ? atoi(argv[4]) : 1);
+      copies --;
+    }
+    else if (ipp_status != IPP_SERVICE_UNAVAILABLE &&
+	     ipp_status != IPP_PRINTER_BUSY)
+      break;
  }

 /*
@@ -374,17 +645,15 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  */

  httpClose(http);
-  if (request != NULL)
-    ippDelete(request);
-  if (response != NULL)
-    ippDelete(response);

 /*
-  * Close the print file as needed...
+  * Close and remove the temporary file if necessary...
  */

-  if (fp != stdin)
-    fclose(fp);
+  fclose(fp);
+
+  if (argc < 7)
+    unlink(filename);

 /*
  * Return the queue status...
@@ -3,7 +3,7 @@
 *
 *   Line Printer Daemon backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-1999 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
@@ -83,7 +83,12 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  int	status;		/* Status of LPD job */


-  if (argc < 6 || argc > 7)
+  if (argc == 1)
+  {
+    puts("network lpd \"Unknown\" \"LPD/LPR Host or Printer\"");
+    return (0);
+  }
+  else if (argc < 6 || argc > 7)
  {
    fprintf(stderr, "Usage: %s job-id user title copies options [file]\n",
            argv[0]);
@@ -125,7 +130,10 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
    fclose(fp);
  }
  else
-    strcpy(filename, argv[6]);
+  {
+    strncpy(filename, argv[6], sizeof(filename) - 1);
+    filename[sizeof(filename) - 1] = '\0';
+  }

 /*
  * Extract the hostname and printer name from the URI...
@@ -137,8 +145,17 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  * Queue the job...
  */

-  status = lpd_queue(hostname, resource + 1, filename,
-                     argv[2] /* user */, atoi(argv[4]) /* copies */);
+  if (argc > 6)
+  {
+    status = lpd_queue(hostname, resource + 1, filename,
+                       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 */, 1);

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

  va_start(ap, format);
-  bytes = vsprintf(buf, format, ap);
+  bytes = vsnprintf(buf, sizeof(buf), format, ap);
  va_end(ap);

  fprintf(stderr, "DEBUG: lpd_command %02.2x %s", buf[0], buf + 1);
@@ -250,8 +267,9 @@ lpd_queue(char *hostname,	/* I - Host to connect to */
  {
    if ((fd = rresvport(&port)) < 0)
    {
-      perror("ERROR: Unable to connect to printer");
-      return (1);
+      perror("ERROR: Unable to reserve port");
+      sleep(30);
+      continue;
    }

    if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0)
@@ -275,7 +293,7 @@ lpd_queue(char *hostname,	/* I - Host to connect to */
      else
      {
 	perror("ERROR: Unable to connect to printer");
-        return (1);
+        sleep(30);
      }
    }
    else
@@ -308,19 +326,22 @@ 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 */

-  sprintf(control, "H%s\nP%s\n", localhost, user);
+  snprintf(control, sizeof(control), "H%s\nP%s\n", localhost, user);
  cptr = control + strlen(control);

  while (copies > 0)
  {
-    sprintf(cptr, "ldfA%03.3d%s\n", getpid() % 1000, localhost);
+    
+    snprintf(cptr, sizeof(control) - (cptr - control), "ldfA%03.3d%s\n",
+             getpid() % 1000, localhost);
    cptr   += strlen(cptr);
    copies --;
  }

-  sprintf(cptr, "UdfA%03.3d%s\nNdfA%03.3d%s\n",
-          getpid() % 1000, localhost,
-          getpid() % 1000, localhost);
+  snprintf(cptr, sizeof(control) - (cptr - control),
+           "UdfA%03.3d%s\nNdfA%03.3d%s\n",
+           getpid() % 1000, localhost,
+           getpid() % 1000, localhost);

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

@@ -3,7 +3,7 @@
 *
 *   Parallel port backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-1999 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,7 +23,8 @@
 *
 * Contents:
 *
- *   main() - Send a file to the specified parallel port.
+ *   main()         - Send a file to the specified parallel port.
+ *   list_devices() - List all parallel devices.
 */

 /*
@@ -43,6 +44,24 @@
 #  include <termios.h>
 #endif /* WIN32 || __EMX__ */

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

 /*
 * 'main()' - Send a file to the specified parallel port.
@@ -63,6 +82,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 		*options;	/* Pointer to options */
  int		port;		/* Port number (not used) */
  FILE		*fp;		/* Print file */
+  int		copies;		/* Number of copies to print */
  int		fd;		/* Parallel device */
  int		error;		/* Error code (if any) */
  size_t	nbytes,		/* Number of bytes written */
@@ -71,7 +91,12 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  struct termios opts;		/* Parallel port options */


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

  if (argc == 6)
-    fp = stdin;
+  {
+    fp     = stdin;
+    copies = 1;
+  }
  else
  {
   /*
@@ -95,6 +123,8 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
      perror("ERROR: unable to open print file");
      return (1);
    }
+
+    copies = atoi(argv[4]);
  }

 /*
@@ -143,23 +173,34 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  * Finally, send the print file...
  */

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

-    if (write(fd, buffer, nbytes) < nbytes)
+    if (fp != stdin)
    {
-      perror("ERROR: Unable to send print file to printer");
-      break;
+      fputs("PAGE: 1 1\n", stderr);
+      rewind(fp);
    }
-    else
-      tbytes += nbytes;

-    if (argc > 6)
-      fprintf(stderr, "INFO: Sending print file, %u bytes...\n", tbytes);
+    tbytes = 0;
+    while ((nbytes = fread(buffer, 1, sizeof(buffer), fp)) > 0)
+    {
+     /*
+      * Write the print data to the printer...
+      */
+
+      if (write(fd, buffer, nbytes) < nbytes)
+      {
+	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);
+    }
  }

 /*
@@ -174,6 +215,301 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 }


+/*
+ * 'list_devices()' - List all parallel devices.
+ */
+
+void
+list_devices(void)
+{
+  static char	*funky_hex = "0123456789abcdefghijklmnopqrstuvwxyz";
+				/* Funky hex numbering used for some devices */
+
+#ifdef __linux
+  int	i;			/* Looping var */
+  int	fd;			/* File descriptor */
+  char	device[255];		/* Device filename */
+  FILE	*probe;			/* /proc/parport/n/autoprobe file */
+  char	line[1024],		/* Line from file */
+	*delim,			/* Delimiter in file */
+	make[IPP_MAX_NAME],	/* Make from file */
+	model[IPP_MAX_NAME];	/* Model from file */
+
+
+  for (i = 0; i < 4; i ++)
+  {
+    sprintf(device, "/proc/parport/%d/autoprobe", i);
+    if ((probe = fopen(device, "r")) != NULL)
+    {
+      memset(make, 0, sizeof(make));
+      memset(model, 0, sizeof(model));
+      strcpy(model, "Unknown");
+
+      while (fgets(line, sizeof(line), probe) != NULL)
+      {
+       /*
+        * Strip trailing ; and/or newline.
+	*/
+
+        if ((delim = strrchr(line, ';')) != NULL)
+	  *delim = '\0';
+	else if ((delim = strrchr(line, '\n')) != NULL)
+	  *delim = '\0';
+
+       /*
+        * Look for MODEL and MANUFACTURER lines...
+	*/
+
+        if (strncmp(line, "MODEL:", 6) == 0 &&
+	    strncmp(line, "MODEL:Unknown", 13) != 0)
+	  strncpy(model, line + 6, sizeof(model) - 1);
+	else if (strncmp(line, "MANUFACTURER:", 13) == 0 &&
+	         strncmp(line, "MANUFACTURER:Unknown", 20) != 0)
+	  strncpy(make, line + 13, sizeof(make) - 1);
+      }
+
+      fclose(probe);
+
+      if (make[0])
+	printf("direct parallel:/dev/lp%d \"%s %s\" \"Parallel Port #%d\"\n",
+	       i, make, model, i + 1);
+      else
+	printf("direct parallel:/dev/lp%d \"%s\" \"Parallel Port #%d\"\n",
+	       i, model, i + 1);
+    }
+    else
+    {
+      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)
+  int		i, j, n;	/* Looping vars */
+  char		device[255];	/* Device filename */
+  inventory_t	*inv;		/* Hardware inventory info */
+
+
+ /*
+  * IRIX maintains a hardware inventory of most devices...
+  */
+
+  setinvent();
+
+  while ((inv = getinvent()) != NULL)
+  {
+    if (inv->inv_class == INV_PARALLEL &&
+        (inv->inv_type == INV_ONBOARD_PLP ||
+         inv->inv_type == INV_EPP_ECP_PLP))
+    {
+     /*
+      * Standard parallel port...
+      */
+
+      puts("direct parallel:/dev/plp \"Unknown\" \"Onboard Parallel Port\"");
+    }
+    else if (inv->inv_class == INV_PARALLEL &&
+             inv->inv_type == INV_EPC_PLP)
+    {
+     /*
+      * EPC parallel port...
+      */
+
+      printf("direct parallel:/dev/plp%d \"Unknown\" \"Integral EPC parallel port, Ebus slot %d\"\n",
+             inv->inv_controller, inv->inv_controller);
+    }
+  }
+
+  endinvent();
+
+ /*
+  * Central Data makes serial and parallel "servers" that can be
+  * connected in a number of ways.  Look for ports...
+  */
+
+  for (i = 0; i < 10; i ++)
+    for (j = 0; j < 8; j ++)
+      for (n = 0; n < 32; n ++)
+      {
+        if (i == 8)		/* EtherLite */
+          sprintf(device, "/dev/lpn%d%c", j, funky_hex[n]);
+        else if (i == 9)	/* PCI */
+          sprintf(device, "/dev/lpp%d%c", j, funky_hex[n]);
+        else			/* SCSI */
+          sprintf(device, "/dev/lp%d%d%c", i, j, funky_hex[n]);
+
+	if (access(device, 0) == 0)
+	{
+	  if (i == 8)
+	    printf("direct parallel:%s \"Unknown\" \"Central Data EtherLite Parallel Port, ID %d, port %d\"\n",
+	           device, j, n);
+	  else if (i == 9)
+	    printf("direct parallel:%s \"Unknown\" \"Central Data PCI Parallel Port, ID %d, port %d\"\n",
+	           device, j, n);
+  	  else
+	    printf("direct parallel:%s \"Unknown\" \"Central Data SCSI Parallel Port, logical bus %d, ID %d, port %d\"\n",
+	           device, i, j, n);
+	}
+      }
+#elif defined(__sun)
+  int		i, j, n;	/* Looping vars */
+  char		device[255];	/* Device filename */
+  inventory_t	*inv;		/* Hardware inventory info */
+
+
+ /*
+  * Standard parallel ports...
+  */
+
+  for (i = 0; i < 10; i ++)
+  {
+    sprintf(device, "/dev/ecpp%d", i);
+    if (access(device, 0) == 0)
+      printf("direct parallel:%s \"Unknown\" \"Sun IEEE-1284 Parallel Port #%d\"\n",
+             device, i + 1);
+  }
+
+  for (i = 0; i < 10; i ++)
+  {
+    sprintf(device, "/dev/bpp%d", i);
+    if (access(device, 0) == 0)
+      printf("direct parallel:%s \"Unknown\" \"Sun Standard Parallel Port #%d\"\n",
+             device, i + 1);
+  }
+
+  for (i = 0; i < 3; i ++)
+  {
+    sprintf(device, "/dev/lp%d", i);
+
+    if (access(device, 0) == 0)
+      printf("direct parallel:%s \"Unknown\" \"PC Parallel Port #%d\"\n",
+             device, i + 1);
+  }
+
+ /*
+  * MAGMA parallel ports...
+  */
+
+  for (i = 0; i < 40; i ++)
+  {
+    sprintf(device, "/dev/pm%02d", i);
+    if (access(device, 0) == 0)
+      printf("direct parallel:%s \"Unknown\" \"MAGMA Parallel Board #%d Port #%d\"\n",
+             device, (i / 10) + 1, (i % 10) + 1);
+  }
+
+ /*
+  * Central Data parallel ports...
+  */
+
+  for (i = 0; i < 9; i ++)
+    for (j = 0; j < 8; j ++)
+      for (n = 0; n < 32; n ++)
+      {
+        if (i == 8)	/* EtherLite */
+          sprintf(device, "/dev/sts/lpN%d%c", j, funky_hex[n]);
+        else
+          sprintf(device, "/dev/sts/lp%c%d%c", i + 'C', j,
+                  funky_hex[n]);
+
+	if (access(device, 0) == 0)
+	{
+	  if (i == 8)
+	    printf("direct parallel:%s \"Unknown\" \"Central Data EtherLite Parallel Port, ID %d, port %d\"\n",
+	           device, j, n);
+  	  else
+	    printf("direct parallel:%s \"Unknown\" \"Central Data SCSI Parallel Port, logical bus %d, ID %d, port %d\"\n",
+	           device, i, j, n);
+	}
+      }
+#elif defined(__hpux)
+  int		i, j, n;	/* Looping vars */
+  char		device[255];	/* Device filename */
+
+
+ /*
+  * Standard parallel ports...
+  */
+
+  if (access("/dev/rlp", 0) == 0)
+    puts("direct parallel:/dev/rlp \"Unknown\" \"Standard Parallel Port (/dev/rlp)\"");
+
+  for (i = 0; i < 7; i ++)
+    for (j = 0; j < 7; j ++)
+    {
+      sprintf(device, "/dev/c%dt%dd0_lp", i, j);
+      if (access(device, 0) == 0)
+	printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d,%d\"\n", i, j);
+    }
+
+ /*
+  * Central Data parallel ports...
+  */
+
+  for (i = 0; i < 9; i ++)
+    for (j = 0; j < 8; j ++)
+      for (n = 0; n < 32; n ++)
+      {
+        if (i == 8)	/* EtherLite */
+          sprintf(device, "/dev/lpN%d%c", j, funky_hex[n]);
+        else
+          sprintf(device, "/dev/lp%c%d%c", i + 'C', j,
+                  funky_hex[n]);
+
+	if (access(device, 0) == 0)
+	{
+	  if (i == 8)
+	    printf("direct parallel:%s \"Unknown\" \"Central Data EtherLite Parallel Port, ID %d, port %d\"\n",
+	           device, j, n);
+  	  else
+	    printf("direct parallel:%s \"Unknown\" \"Central Data SCSI Parallel Port, logical bus %d, ID %d, port %d\"\n",
+	           device, i, j, n);
+	}
+      }
+#elif defined(__osf__)
+  int	i;			/* Looping var */
+  char	device[255];		/* Device filename */
+
+
+  for (i = 0; i < 3; i ++)
+  {
+    sprintf(device, "/dev/lp%d", i);
+    if ((fd = open(device, O_WRONLY)) >= 0)
+    {
+      close(fd);
+      printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
+    }
+  }
+#elif defined(FreeBSD) || defined(OpenBSD) || defined(NetBSD)
+  int	i;			/* Looping var */
+  char	device[255];		/* Device filename */
+
+
+  for (i = 0; i < 3; i ++)
+  {
+    sprintf(device, "/dev/lpt%d", i);
+    if ((fd = open(device, O_WRONLY)) >= 0)
+    {
+      close(fd);
+      printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
+    }
+  }
+#endif
+}
+
+
 /*
 * End of "$Id$".
 */
@@ -3,7 +3,7 @@
 *
 *   Serial port backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-1999 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
@@ -43,6 +43,24 @@
 #  include <termios.h>
 #endif /* WIN32 || __EMX__ */

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

 /*
 * 'main()' - Send a file to the printer or server.
@@ -66,6 +84,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 		*ptr;		/* Pointer into name or value */
  int		port;		/* Port number (not used) */
  FILE		*fp;		/* Print file */
+  int		copies;		/* Number of copies to print */
  int		fd;		/* Parallel device */
  int		error;		/* Error code (if any) */
  size_t	nbytes,		/* Number of bytes written */
@@ -74,7 +93,12 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  struct termios opts;		/* Parallel port options */


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

  if (argc == 6)
-    fp = stdin;
+  {
+    fp     = stdin;
+    copies = 1;
+  }
  else
  {
   /*
@@ -98,6 +125,8 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
      perror("ERROR: unable to open print file");
      return (1);
    }
+
+    copies = atoi(argv[4]);
  }

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

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

-  if ((fd = open(resource, O_WRONLY)) == -1)
+  if ((fd = open(resource, O_WRONLY | O_NOCTTY)) == -1)
  {
    perror("ERROR: Unable to open serial port device file");
    return (1);
@@ -261,23 +290,34 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  * Finally, send the print file...
  */

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

-    if (write(fd, buffer, nbytes) < nbytes)
+    if (fp != stdin)
    {
-      perror("ERROR: Unable to send print file to printer");
-      break;
+      fputs("PAGE: 1 1\n", stderr);
+      rewind(fp);
    }
-    else
-      tbytes += nbytes;

-    if (argc > 6)
-      fprintf(stderr, "INFO: Sending print file, %u bytes...\n", tbytes);
+    tbytes = 0;
+    while ((nbytes = fread(buffer, 1, sizeof(buffer), fp)) > 0)
+    {
+     /*
+      * Write the print data to the printer...
+      */
+
+      if (write(fd, buffer, nbytes) < nbytes)
+      {
+	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);
+    }
  }

 /*
@@ -292,6 +332,326 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 }


+/*
+ * 'list_devices()' - List all serial devices.
+ */
+
+void
+list_devices(void)
+{
+  static char	*funky_hex = "0123456789abcdefghijklmnopqrstuvwxyz";
+				/* Funky hex numbering used for some devices */
+
+#ifdef __linux
+  int	i;		/* Looping var */
+  int	fd;		/* File descriptor */
+  char	device[255];	/* Device filename */
+
+
+  for (i = 0; i < 4; i ++)
+  {
+    sprintf(device, "/dev/ttyS%d", i);
+    if ((fd = open(device, O_WRONLY | O_NOCTTY)) >= 0)
+    {
+      close(fd);
+      printf("serial serial:%s?baud=115200 \"Unknown\" \"Serial Port #%d\"\n",
+             device, i + 1);
+    }
+  }
+#elif defined(__sgi)
+  int		i, j, n;	/* Looping vars */
+  char		device[255];	/* Device filename */
+  inventory_t	*inv;		/* Hardware inventory info */
+
+
+ /*
+  * IRIX maintains a hardware inventory of most devices...
+  */
+
+  setinvent();
+
+  while ((inv = getinvent()) != NULL)
+  {
+    if (inv->inv_class == INV_SERIAL)
+    {
+     /*
+      * Some sort of serial port...
+      */
+
+      if (inv->inv_type == INV_CDSIO || inv->inv_type == INV_CDSIO_E)
+      {
+       /*
+        * CDSIO port...
+        */
+
+	for (n = 0; n < 6; n ++)
+	  printf("serial serial:/dev/ttyd%d?baud=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)
+      {
+       /*
+        * Everest serial port...
+        */
+
+	if (inv->inv_unit == 0)
+          i = 1;
+	else
+          i = 41 + 4 * inv->inv_controller;
+
+	for (n = 0; n < inv->inv_state; n ++)
+	  printf("serial serial:/dev/ttyd%d?baud=19200 \"Unknown\" \"EPC Serial Port %d, Ebus slot %d\"\n",
+        	 n + i, n + 1, inv->inv_controller);
+      }
+      else if (inv->inv_state > 1)
+      {
+       /*
+        * Standard serial port under IRIX 6.4 and earlier...
+        */
+
+	for (n = 0; n < inv->inv_state; n ++)
+	  printf("serial serial:/dev/ttyd%d?baud=19200 \"Unknown\" \"Onboard Serial Port %d\"\n",
+        	 n + inv->inv_unit + 1, n + inv->inv_unit + 1);
+      }
+      else
+      {
+       /*
+        * Standard serial port under IRIX 6.5 and beyond...
+        */
+
+	printf("serial serial:/dev/ttyd%d?baud=115200 \"Unknown\" \"Onboard Serial Port %d\"\n",
+               inv->inv_controller, inv->inv_controller);
+      }
+    }
+  }
+
+  endinvent();
+
+ /*
+  * Central Data makes serial and parallel "servers" that can be
+  * connected in a number of ways.  Look for ports...
+  */
+
+  for (i = 0; i < 10; i ++)
+    for (j = 0; j < 8; j ++)
+      for (n = 0; n < 32; n ++)
+      {
+        if (i == 8)		/* EtherLite */
+          sprintf(device, "/dev/ttydn%d%c", j, funky_hex[n]);
+        else if (i == 9)	/* PCI */
+          sprintf(device, "/dev/ttydp%d%c", j, funky_hex[n]);
+        else			/* SCSI */
+          sprintf(device, "/dev/ttyd%d%d%c", i, j, funky_hex[n]);
+
+	if (access(device, 0) == 0)
+	{
+	  if (i == 8)
+	    printf("serial serial:%s?baud=38400 \"Unknown\" \"Central Data EtherLite Serial Port, ID %d, port %d\"\n",
+  	           device, j, n);
+	  else if (i == 9)
+	    printf("serial serial:%s?baud=38400 \"Unknown\" \"Central Data PCI Serial Port, ID %d, port %d\"\n",
+  	           device, j, n);
+  	  else
+	    printf("serial serial:%s?baud=38400 \"Unknown\" \"Central Data SCSI Serial Port, logical bus %d, ID %d, port %d\"\n",
+  	           device, i, j, n);
+	}
+      }
+#elif defined(__sun)
+  int		i, j, n;	/* Looping vars */
+  char		device[255];	/* Device filename */
+
+
+ /*
+  * Standard serial ports...
+  */
+
+  for (i = 0; i < 26; i ++)
+  {
+    sprintf(device, "/dev/cua/%c", 'a' + i);
+    if (access(device, 0) == 0)
+      printf("serial serial:%s?baud=38400 \"Unknown\" \"Serial Port #%d\"\n",
+             device, i + 1);
+  }
+
+ /*
+  * MAGMA serial ports...
+  */
+
+  for (i = 0; i < 40; i ++)
+  {
+    sprintf(device, "/dev/term/%02d", i);
+    if (access(device, 0) == 0)
+      printf("serial serial:%s?baud=38400 \"Unknown\" \"MAGMA Serial Board #%d Port #%d\"\n",
+             device, (i / 10) + 1, (i % 10) + 1);
+  }
+
+ /*
+  * Central Data serial ports...
+  */
+
+  for (i = 0; i < 9; i ++)
+    for (j = 0; j < 8; j ++)
+      for (n = 0; n < 32; n ++)
+      {
+        if (i == 8)	/* EtherLite */
+          sprintf(device, "/dev/sts/ttyN%d%c", j, funky_hex[n]);
+        else
+          sprintf(device, "/dev/sts/tty%c%d%c", i + 'C', j,
+                  funky_hex[n]);
+
+	if (access(device, 0) == 0)
+	{
+	  if (i == 8)
+	    printf("serial serial:%s?baud=38400 \"Unknown\" \"Central Data EtherLite Serial Port, ID %d, port %d\"\n",
+  	           device, j, n);
+  	  else
+	    printf("serial serial:%s?baud=38400 \"Unknown\" \"Central Data SCSI Serial Port, logical bus %d, ID %d, port %d\"\n",
+  	           device, i, j, n);
+	}
+      }
+#elif defined(__hpux)
+  int		i, j, n;	/* Looping vars */
+  char		device[255];	/* Device filename */
+
+
+ /*
+  * Standard serial ports...
+  */
+
+  for (i = 0; i < 10; i ++)
+  {
+    sprintf(device, "/dev/tty%dp0", i);
+    if (access(device, 0) == 0)
+      printf("serial serial:%s?baud=38400 \"Unknown\" \"Serial Port #%d\"\n",
+             device, i + 1);
+  }
+
+ /*
+  * Central Data serial ports...
+  */
+
+  for (i = 0; i < 9; i ++)
+    for (j = 0; j < 8; j ++)
+      for (n = 0; n < 32; n ++)
+      {
+        if (i == 8)	/* EtherLite */
+          sprintf(device, "/dev/ttyN%d%c", j, funky_hex[n]);
+        else
+          sprintf(device, "/dev/tty%c%d%c", i + 'C', j,
+                  funky_hex[n]);
+
+	if (access(device, 0) == 0)
+	{
+	  if (i == 8)
+	    printf("serial serial:%s?baud=38400 \"Unknown\" \"Central Data EtherLite Serial Port, ID %d, port %d\"\n",
+  	           device, j, n);
+  	  else
+	    printf("serial serial:%s?baud=38400 \"Unknown\" \"Central Data SCSI Serial Port, logical bus %d, ID %d, port %d\"\n",
+  	           device, i, j, n);
+	}
+      }
+#elif defined(__osf__)
+  int		i;		/* Looping var */
+  char		device[255];	/* Device filename */
+
+
+ /*
+  * Standard serial ports...
+  */
+
+  for (i = 0; i < 100; i ++)
+  {
+    sprintf(device, "/dev/tty%02d", i);
+    if (access(device, 0) == 0)
+      printf("serial serial:%s?baud=38400 \"Unknown\" \"Serial Port #%d\"\n",
+             device, i + 1);
+  }
+#elif defined(FreeBSD) || defined(OpenBSD) || defined(NetBSD)
+  int	i, j;		/* Looping vars */
+  int	fd;		/* File descriptor */
+  char	device[255];	/* Device filename */
+
+
+ /*
+  * SIO ports...
+  */
+
+  for (i = 0; i < 32; i ++)
+  {
+    sprintf(device, "/dev/ttyd%c", funky_hex[i]);
+    if ((fd = open(device, O_WRONLY | O_NOCTTY)) >= 0)
+    {
+      close(fd);
+      printf("serial serial:%s?baud=115200 \"Unknown\" \"Standard Serial Port #%d\"\n",
+             device, i + 1);
+    }
+  }
+
+ /*
+  * Cyclades ports...
+  */
+
+  for (i = 0; i < 16; i ++) /* Should be up to 65536 boards... */
+    for (j = 0; j < 32; j ++)
+    {
+      sprintf(device, "/dev/ttyc%d%c", i, funky_hex[j]);
+      if ((fd = open(device, O_WRONLY | O_NOCTTY)) >= 0)
+      {
+	close(fd);
+	printf("serial serial:%s?baud=115200 \"Unknown\" \"Cyclades #%d Serial Port #%d\"\n",
+               device, i, j + 1);
+      }
+    }
+
+ /*
+  * Digiboard ports...
+  */
+
+  for (i = 0; i < 16; i ++) /* Should be up to 65536 boards... */
+    for (j = 0; j < 32; j ++)
+    {
+      sprintf(device, "/dev/ttyD%d%c", i, funky_hex[j]);
+      if ((fd = open(device, O_WRONLY | O_NOCTTY)) >= 0)
+      {
+	close(fd);
+	printf("serial serial:%s?baud=115200 \"Unknown\" \"Digiboard #%d Serial Port #%d\"\n",
+               device, i, j + 1);
+      }
+    }
+
+ /*
+  * Stallion ports...
+  */
+
+  for (i = 0; i < 32; i ++)
+  {
+    sprintf(device, "/dev/ttyE%c", funky_hex[i]);
+    if ((fd = open(device, O_WRONLY | O_NOCTTY)) >= 0)
+    {
+      close(fd);
+      printf("serial serial:%s?baud=115200 \"Unknown\" \"Stallion Serial Port #%d\"\n",
+             device, i + 1);
+    }
+  }
+
+ /*
+  * SX ports...
+  */
+
+  for (i = 0; i < 128; i ++)
+  {
+    sprintf(device, "/dev/ttyA%d", i + 1);
+    if ((fd = open(device, O_WRONLY | O_NOCTTY)) >= 0)
+    {
+      close(fd);
+      printf("serial serial:%s?baud=115200 \"Unknown\" \"SX Serial Port #%d\"\n",
+             device, i + 1);
+    }
+  }
+#endif
+}
+
+
 /*
 * End of "$Id$".
 */
@@ -1,88 +0,0 @@
-#!/bin/sh
-#
-# "$Id$"
-#
-#   SMB printing script for the Common UNIX Printing System (CUPS).
-#
-#   Copyright 1993-1999 by Easy Software Products, all rights reserved.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44145 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
-#
-#       Voice: (301) 373-9603
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
-#
-
-SMBCLIENT=/usr/local/samba/bin/smbclient
-
-#
-# Usage:
-#
-#     printer job user title copies options [filename]
-#
-
-if [ $# -lt 5 -o $# -gt 6 ]; then
-	# Too few or too many arguments
-	echo 'Usage: smb job-id user title copies options [file]' >&2
-	exit 1
-fi
-
-#
-# If "filename" is not on the command-line, then we read the print
-# data from stdin and write it to a temporary file.
-#
-
-if [ $# = 5 ]; then
-	# Collect all print data and put it in a temporary file...
-	if [ "$TMPDIR" = "" ]; then
-		TMPDIR=/var/tmp
-	fi
-
-	filename="$TMPDIR/$$.smb"
-	cat >$filename
-else
-	# Use the file on the command-line...
-	filename="$6"
-fi
-
-#
-# Take apart the URI in $0...
-#
-
-uri="$0"
-host=`echo $uri | awk -F/ '{print substr($3, index($3, "@") + 1)}'`
-user=`echo $uri | awk -F/ '{print substr($3, 0, index($3, "@") - 1)}'`
-if [ "$user" != "" ]; then
-	user="-U $user"
-fi
-printer=`echo $uri | awk -F/ '{print $4}'`
-
-#
-# Send the file to the remote system...
-#
-
-$SMBCLIENT //$host/$printer $user -P -N <<EOF
-print $filename
-EOF
-
-#
-# Lastly, remove the temporary file as needed...
-#
-
-if [ $# = 5 ]; then
-	rm -f $filename
-fi
-
-#
-# End of "$Id$".
-#
@@ -3,7 +3,7 @@
 *
 *   AppSocket backend for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-1999 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
@@ -66,6 +66,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 		username[255],	/* Username info (not used) */
 		resource[1024];	/* Resource info (not used) */
  FILE		*fp;		/* Print file */
+  int		copies;		/* Number of copies to print */
  int		port;		/* Port number */
  int		fd;		/* AppSocket */
  int		error;		/* Error code (if any) */
@@ -80,7 +81,12 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  fd_set	input;		/* Input set for select() */


-  if (argc < 6 || argc > 7)
+  if (argc == 1)
+  {
+    puts("network socket \"Unknown\" \"AppSocket/HP JetDirect\"");
+    return (0);
+  }
+  else if (argc < 6 || argc > 7)
  {
    fprintf(stderr, "Usage: %s job-id user title copies options [file]\n",
            argv[0]);
@@ -93,7 +99,10 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  */

  if (argc == 6)
-    fp = stdin;
+  {
+    fp     = stdin;
+    copies = 1;
+  }
  else
  {
   /*
@@ -105,6 +114,8 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
      perror("ERROR: unable to open print file");
      return (1);
    }
+
+    copies = atoi(argv[4]);
  }

 /*
@@ -135,91 +146,107 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  addr.sin_family = hostaddr->h_addrtype;
  addr.sin_port   = htons(port);

-  for (;;)
+  while (copies > 0)
  {
-    if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
+    for (;;)
    {
-      perror("ERROR: Unable to connect to printer");
-      return (1);
-    }
-
-    if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0)
-    {
-      error = errno;
-      close(fd);
-      fd = -1;
-
-      if (error == ECONNREFUSED)
+      if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
      {
-	fprintf(stderr, "INFO: Network host \'%s\' is busy; will retry in 30 seconds...\n",
-                hostname);
-	sleep(30);
+	perror("ERROR: Unable to create socket");
+	return (1);
+      }
+
+      if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0)
+      {
+	error = errno;
+	close(fd);
+	fd = -1;
+
+	if (error == ECONNREFUSED)
+	{
+	  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");
+	  sleep(30);
+	}
      }
      else
-      {
-	perror("ERROR: Unable to connect to printer");
-        return (1);
-      }
-    }
-    else
-      break;
-  }
-
- /*
-  * Finally, send the print file...
-  */
-
-  fputs("INFO: Connected to host, sending print job...\n", stderr);
-
-  tbytes = 0;
-  while ((nbytes = fread(buffer, 1, sizeof(buffer), fp)) > 0)
-  {
-   /*
-    * Write the print data to the printer...
-    */
-
-    tbytes += nbytes;
-    bufptr = buffer;
-
-    while (nbytes > 0)
-    {
-      if ((wbytes = send(fd, bufptr, nbytes, 0)) < 0)
-      {
-	perror("ERROR: Unable to send print file to printer");
 	break;
-      }
-
-      nbytes -= wbytes;
-      bufptr += wbytes;
    }

   /*
-    * Check for possible data coming back from the printer...
+    * Finally, send the print file...
    */

-    timeout.tv_sec = 0;
-    timeout.tv_usec = 0;
-    FD_ZERO(&input);
-    FD_SET(fd, &input);
-    if (select(fd + 1, &input, NULL, NULL, &timeout) > 0)
+    copies --;
+
+    if (fp != stdin)
+    {
+      fputs("PAGE: 1 1\n", stderr);
+      rewind(fp);
+    }
+
+    fputs("INFO: Connected to host, sending print job...\n", stderr);
+
+    tbytes = 0;
+    while ((nbytes = fread(buffer, 1, sizeof(buffer), fp)) > 0)
    {
     /*
-      * Grab the data coming back and spit it out to stderr...
+      * Write the print data to the printer...
      */

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

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

-  close(fd);
  if (fp != stdin)
    fclose(fp);

@@ -0,0 +1,303 @@
+/*
+ * "$Id$"
+ *
+ *   USB port backend for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
+ *
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ *   main()         - Send a file to the specified USB port.
+ *   list_devices() - List all USB devices.
+ */
+
+/*
+ * Include necessary headers.
+ */
+
+#include <cups/cups.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <cups/string.h>
+
+#if defined(WIN32) || defined(__EMX__)
+#  include <io.h>
+#else
+#  include <unistd.h>
+#  include <fcntl.h>
+#  include <termios.h>
+#endif /* WIN32 || __EMX__ */
+
+
+/*
+ * Local functions...
+ */
+
+void	list_devices(void);
+
+
+/*
+ * 'main()' - Send a file to the specified USB port.
+ *
+ * Usage:
+ *
+ *    printer-uri job-id user title copies options [file]
+ */
+
+int			/* O - Exit status */
+main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
+     char *argv[])	/* I - Command-line arguments */
+{
+  char		method[255],	/* Method in URI */
+		hostname[1024],	/* Hostname */
+		username[255],	/* Username info (not used) */
+		resource[1024],	/* Resource info (device and options) */
+		*options;	/* Pointer to options */
+  int		port;		/* Port number (not used) */
+  FILE		*fp;		/* Print file */
+  int		copies;		/* Number of copies to print */
+  int		fd;		/* Parallel device */
+  int		error;		/* Error code (if any) */
+  size_t	nbytes,		/* Number of bytes written */
+		tbytes;		/* Total number of bytes written */
+  char		buffer[8192];	/* Output buffer */
+  struct termios opts;		/* Parallel port options */
+
+
+  if (argc == 1)
+  {
+    list_devices();
+    return (0);
+  }
+  else if (argc < 6 || argc > 7)
+  {
+    fputs("Usage: USB job-id user title copies options [file]\n", stderr);
+    return (1);
+  }
+
+ /*
+  * If we have 7 arguments, print the file named on the command-line.
+  * Otherwise, send stdin instead...
+  */
+
+  if (argc == 6)
+  {
+    fp     = stdin;
+    copies = 1;
+  }
+  else
+  {
+   /*
+    * Try to open the print file...
+    */
+
+    if ((fp = fopen(argv[6], "rb")) == NULL)
+    {
+      perror("ERROR: unable to open print file");
+      return (1);
+    }
+
+    copies = atoi(argv[4]);
+  }
+
+ /*
+  * Extract the device name and options from the URI...
+  */
+
+  httpSeparate(argv[0], method, username, hostname, &port, resource);
+
+ /*
+  * See if there are any options...
+  */
+
+  if ((options = strchr(resource, '?')) != NULL)
+  {
+   /*
+    * Yup, terminate the device name string and move to the first
+    * character of the options...
+    */
+
+    *options++ = '\0';
+  }
+
+ /*
+  * Open the USB port device...
+  */
+
+  if ((fd = open(resource, O_WRONLY)) == -1)
+  {
+    perror("ERROR: Unable to open USB port device file");
+    return (1);
+  }
+
+ /*
+  * Set any options provided...
+  */
+
+  tcgetattr(fd, &opts);
+
+  opts.c_lflag &= ~(ICANON | ECHO | ISIG);	/* Raw mode */
+
+  /**** No options supported yet ****/
+
+  tcsetattr(fd, TCSANOW, &opts);
+
+ /*
+  * Finally, send the print file...
+  */
+
+  while (copies > 0)
+  {
+    copies --;
+
+    if (fp != stdin)
+    {
+      fputs("PAGE: 1 1\n", stderr);
+      rewind(fp);
+    }
+
+    tbytes = 0;
+    while ((nbytes = fread(buffer, 1, sizeof(buffer), fp)) > 0)
+    {
+     /*
+      * Write the print data to the printer...
+      */
+
+      if (write(fd, buffer, nbytes) < nbytes)
+      {
+	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);
+    }
+  }
+
+ /*
+  * Close the socket connection and input file and return...
+  */
+
+  close(fd);
+  if (fp != stdin)
+    fclose(fp);
+
+  return (0);
+}
+
+
+/*
+ * 'list_devices()' - List all USB devices.
+ */
+
+void
+list_devices(void)
+{
+#ifdef __linux
+  int	i;			/* Looping var */
+  int	fd;			/* File descriptor */
+  char	device[255];		/* Device filename */
+  FILE	*probe;			/* /proc/parport/n/autoprobe file */
+  char	line[1024],		/* Line from file */
+	*delim,			/* Delimiter in file */
+	make[IPP_MAX_NAME],	/* Make from file */
+	model[IPP_MAX_NAME];	/* Model from file */
+
+
+  if ((probe = fopen("/proc/bus/usb/devices", "r")) != NULL)
+  {
+    i = 0;
+
+    memset(make, 0, sizeof(make));
+    memset(model, 0, sizeof(model));
+
+    while (fgets(line, sizeof(line), probe) != NULL)
+    {
+     /*
+      * Strip trailing newline.
+      */
+
+      if ((delim = strrchr(line, '\n')) != NULL)
+	*delim = '\0';
+
+     /*
+      * See if it is a printer device ("P: ...")
+      */
+
+      if (strncmp(line, "S:", 2) == 0)
+      {
+       /*
+        * String attribute...
+	*/
+
+        if (strncmp(line, "S:  Manufacturer=", 17) == 0)
+	{
+	  strncpy(make, line + 17, sizeof(make) - 1);
+	  if (strcmp(make, "Hewlett-Packard") == 0)
+	    strcpy(make, "HP");
+	}
+        else if (strncmp(line, "S:  Product=", 12) == 0)
+	  strncpy(model, line + 12, sizeof(model) - 1);
+      }
+      else if (strncmp(line, "I:", 2) == 0 &&
+               strstr(line, "Driver=printer") != NULL &&
+	       make[0] && model[0])
+      {
+       /*
+        * We were processing a printer device; send the info out...
+	*/
+
+	printf("direct usb:/dev/usb/usblp%d \"%s %s\" \"USB Printer #%d\"\n",
+	       i, make, model, i + 1);
+
+	i ++;
+
+	memset(make, 0, sizeof(make));
+	memset(model, 0, sizeof(model));
+      }
+    }
+
+    fclose(probe);
+  }
+  else
+  {
+    for (i = 0; i < 8; i ++)
+    {
+      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);
+      }
+    }
+  }
+#elif defined(__sgi)
+#elif defined(__sun)
+#elif defined(__hpux)
+#elif defined(__osf)
+#elif defined(FreeBSD) || defined(OpenBSD) || defined(NetBSD)
+#endif
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -3,7 +3,7 @@
 #
 #   Berkeley commands makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-1999 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
@@ -46,8 +46,8 @@ clean:

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

 #
@@ -3,7 +3,7 @@
 *
 *   "lpc" command for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-1999 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
@@ -411,7 +411,8 @@ show_status(http_t *http,	/* I - HTTP connection to server */
                       "attributes-natural-language", NULL,
 		       language->language);

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

@@ -433,7 +434,15 @@ show_status(http_t *http,	/* I - HTTP connection to server */
 	if (strncmp(device, "file:", 5) == 0)
 	  printf("\tprinter is on device \'%s\' speed -1\n", device + 5);
 	else
+	{
+	 /*
+	  * Just show the method...
+	  */
+
+	  *strchr(device, ':') = '\0';
 	  printf("\tprinter is on device \'%s\' speed -1\n", device);
+	}
+
 	printf("\tqueuing is %sabled\n", accepting ? "en" : "dis");
 	printf("\tprinting is %sabled\n",
 	       pstate == IPP_PRINTER_STOPPED ? "dis" : "en");
@@ -3,7 +3,7 @@
 *
 *   "lpq" command for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-1999 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
@@ -49,6 +49,7 @@

 static int	show_jobs(http_t *, const char *, const char *, const int,
 		          const int);
+static void	show_printer(http_t *, const char *);


 /*
@@ -120,10 +121,16 @@ main(int  argc,		/* I - Number of command-line arguments */

  for (;;)
  {
+    if (dest)
+      show_printer(http, dest);
+
    i = show_jobs(http, dest, user, id, longstatus);

    if (i && interval)
+    {
+      fflush(stdout);
      sleep(interval);
+    }
    else
      break;
  }
@@ -161,8 +168,11 @@ show_jobs(http_t     *http,	/* I - HTTP connection to server */
 		jobsize,	/* job-k-octets */
 		jobpriority,	/* job-priority */
 		jobcount,	/* Number of jobs */
+		jobcopies,	/* Number of copies */
 		rank;		/* Rank of job */
  char		resource[1024];	/* Resource string */
+  char		rankstr[255];	/* Rank string */
+  char		namestr[1024];	/* Job name string */
  static const char *ranks[10] =/* Ranking strings */
 		{
 		  "th",
@@ -191,7 +201,6 @@ show_jobs(http_t     *http,	/* I - HTTP connection to server */
  *    attributes-charset
  *    attributes-natural-language
  *    job-uri or printer-uri
-  *    [
  */

  request = ippNew();
@@ -219,7 +228,7 @@ show_jobs(http_t     *http,	/* I - HTTP connection to server */
  }
  else
  {
-    sprintf(resource, "ipp://localhost/printers/%s", dest);
+    snprintf(resource, sizeof(resource), "ipp://localhost/printers/%s", dest);

    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri",
                 NULL, resource);
@@ -236,13 +245,18 @@ show_jobs(http_t     *http,	/* I - HTTP connection to server */
  * Do the request and get back a response...
  */

-  if (!longstatus)
-    puts("Rank\tPri   Owner  Job    Files              Total Size");
-
  jobcount = 0;

  if ((response = cupsDoRequest(http, request, "/jobs/")) != NULL)
  {
+    if (response->request.status.status_code > IPP_OK_CONFLICT)
+    {
+      fprintf(stderr, "lpq: get-jobs failed: %s\n",
+              ippErrorString(response->request.status.status_code));
+      ippDelete(response);
+      return (0);
+    }
+
    rank = 1;

   /*
@@ -272,6 +286,7 @@ show_jobs(http_t     *http,	/* I - HTTP connection to server */
      jobname     = "untitled";
      jobuser     = NULL;
      jobdest     = NULL;
+      jobcopies   = 1;

      while (attr != NULL && attr->group_tag == IPP_TAG_JOB)
      {
@@ -304,6 +319,10 @@ show_jobs(http_t     *http,	/* I - HTTP connection to server */
 	    attr->value_tag == IPP_TAG_NAME)
 	  jobname = attr->values[0].string.text;

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

@@ -319,51 +338,146 @@ show_jobs(http_t     *http,	/* I - HTTP connection to server */
          continue;
      }

+      if (!longstatus && jobcount == 0)
+	puts("Rank   Owner      Job          Files             Total Size");
+
      jobcount ++;

     /*
      * Display the job...
      */

+      if (jobstate == IPP_JOB_PROCESSING)
+	strcpy(rankstr, "active");
+      else
+      {
+	sprintf(rankstr, "%d%s\t", rank, ranks[rank % 10]);
+	rank ++;
+      }
+
      if (longstatus)
      {
        puts("");

-        if (jobstate == IPP_JOB_PROCESSING)
-	  printf("%s: active\t\t\t\t ", jobuser);
+        if (jobcopies > 1)
+	  sprintf(namestr, "%d copies of %s", jobcopies, jobname);
 	else
-	{
-	  printf("%s: %d%s\t\t\t\t ", jobuser, rank, ranks[rank % 10]);
-	  rank ++;
-	}
+	  strcpy(namestr, jobname);

-        printf("[job %03dlocalhost]\n", jobid);
-        printf("\t%-33s%d bytes\n", jobname, jobsize);
+        printf("%s: %-31s [job %d localhost]\n", jobuser, rankstr, jobid);
+        printf("        %-31.31s %d bytes\n", namestr, jobsize);
      }
      else
-      {
-        if (jobstate == IPP_JOB_PROCESSING)
-	  printf("active\t");
-	else
-	{
-	  printf("%d%s\t", rank, ranks[rank % 10]);
-	  rank ++;
-	}
+        printf("%-6s %-10.10s %-15d %-27.27s %d bytes\n", rankstr, jobuser,
+	       jobid, jobname, jobsize);

-        printf(" %-5d%-7.7s%-7d%-19s%d bytes\n", jobpriority, jobuser, jobid,
-	       jobname, jobsize);
-      }
      if (attr == NULL)
        break;
    }

    ippDelete(response);
  }
+  else
+  {
+    fprintf(stderr, "lpq: get-jobs failed: %s\n", ippErrorString(cupsLastError()));
+    return (0);
+  }
+
+  if (jobcount == 0)
+    puts("no entries");

  return (jobcount);
 }


+/*
+ * 'show_printer()' - Show printer status.
+ */
+
+static void
+show_printer(http_t     *http,	/* I - HTTP connection to server */
+             const char *dest)	/* I - Destination */
+{
+  ipp_t		*request,	/* IPP Request */
+		*response;	/* IPP Response */
+  ipp_attribute_t *attr;	/* Current attribute */
+  cups_lang_t	*language;	/* Default language */
+  const char	*printer,	/* Printer name */
+		*message;	/* Printer device URI */
+  ipp_pstate_t	state;		/* Printer state */
+  char		uri[HTTP_MAX_URI];
+				/* Printer URI */
+
+
+  if (http == NULL)
+    return;
+
+ /*
+  * Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the following
+  * attributes:
+  *
+  *    attributes-charset
+  *    attributes-natural-language
+  *    printer-uri
+  */
+
+  request = ippNew();
+
+  request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
+  request->request.op.request_id   = 1;
+
+  language = cupsLangDefault();
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+               "attributes-charset", NULL, cupsLangEncoding(language));
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+               "attributes-natural-language", NULL, language->language);
+
+  sprintf(uri, "ipp://localhost/printers/%s", dest);
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
+               "printer-uri", NULL, uri);
+
+ /*
+  * Do the request and get back a response...
+  */
+
+  if ((response = cupsDoRequest(http, request, "/")) != NULL)
+  {
+    if (response->request.status.status_code > IPP_OK_CONFLICT)
+    {
+      fprintf(stderr, "lpq: get-printer-attributes failed: %s\n",
+              ippErrorString(response->request.status.status_code));
+      ippDelete(response);
+      return;
+    }
+
+    if ((attr = ippFindAttribute(response, "printer-state", IPP_TAG_ENUM)) != NULL)
+      state = (ipp_pstate_t)attr->values[0].integer;
+    else
+      state = IPP_PRINTER_STOPPED;
+
+    switch (state)
+    {
+      case IPP_PRINTER_IDLE :
+          printf("%s is ready\n", dest);
+	  break;
+      case IPP_PRINTER_PROCESSING :
+          printf("%s is ready and printing\n", dest);
+	  break;
+      case IPP_PRINTER_STOPPED :
+          printf("%s is not ready\n", dest);
+	  break;
+    }
+
+    ippDelete(response);
+  }
+  else
+    fprintf(stderr, "lpq: get-printer-attributes failed: %s\n",
+            ippErrorString(cupsLastError()));
+}
+
+
 /*
 * End of "$Id$".
 */
@@ -3,7 +3,7 @@
 *
 *   "lpr" command for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-1999 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,8 @@
 *
 * Contents:
 *
- *   main() - Parse options and send files for printing.
+ *   main()       - Parse options and send files for printing.
+ *   sighandler() - Signal catcher for when we print from stdin...
 */

 /*
@@ -35,6 +36,25 @@
 #include <cups/cups.h>


+#ifndef WIN32
+#  include <signal.h>
+
+
+/*
+ * Local functions.
+ */
+
+void	sighandler(int);
+#endif /* !WIN32 */
+
+
+/*
+ * Globals...
+ */
+
+char	tempfile[1024];		/* Temporary file for printing from stdin */
+
+
 /*
 * 'main()' - Parse options and send files for printing.
 */
@@ -54,9 +74,11 @@ main(int  argc,		/* I - Number of command-line arguments */
  cups_option_t	*options;	/* Options */
  int		silent,		/* Silent or verbose output? */
 		deletefile;	/* Delete file after print? */
-  char		tempfile[1024];	/* Temporary file for printing from stdin */
  char		buffer[8192];	/* Copy buffer */
  FILE		*temp;		/* Temporary file pointer */
+#ifdef HAVE_SIGACTION
+  struct sigaction action;	/* Signal action */
+#endif /* HAVE_SIGACTION */


  silent      = 0;
@@ -190,7 +212,8 @@ main(int  argc,		/* I - Number of command-line arguments */

      if (job_id < 1)
      {
-	fprintf(stderr, "lpr: unable to print file \'%s\'.\n", argv[i]);
+	fprintf(stderr, "lpr: unable to print file \'%s\' - %s.\n",
+	        argv[i], ippErrorString(cupsLastError()));
 	return (1);
      }
      else if (deletefile)
@@ -209,6 +232,25 @@ main(int  argc,		/* I - Number of command-line arguments */
      return (1);
    }

+#ifndef WIN32
+#  if defined(HAVE_SIGSET)
+    sigset(SIGHUP, sighandler);
+    sigset(SIGINT, sighandler);
+    sigset(SIGTERM, sighandler);
+#  elif defined(HAVE_SIGACTION)
+    memset(&action, 0, sizeof(action));
+    action.sa_handler = sighandler;
+
+    sigaction(SIGHUP, &action, NULL);
+    sigaction(SIGINT, &action, NULL);
+    sigaction(SIGTERM, &action, NULL);
+#  else
+    signal(SIGHUP, sighandler);
+    signal(SIGINT, sighandler);
+    signal(SIGTERM, sighandler);
+#  endif
+#endif /* !WIN32 */
+
    temp = fopen(cupsTempFile(tempfile, sizeof(tempfile)), "w");

    if (temp == NULL)
@@ -238,7 +280,8 @@ main(int  argc,		/* I - Number of command-line arguments */

    if (job_id < 1)
    {
-      fputs("lpr: unable to print standard input.\n", stderr);
+      fprintf(stderr, "lpr: unable to print standard input - %s.\n",
+              ippErrorString(cupsLastError()));
      return (1);
    }
  }
@@ -247,6 +290,29 @@ main(int  argc,		/* I - Number of command-line arguments */
 }


+#ifndef WIN32
+/*
+ * 'sighandler()' - Signal catcher for when we print from stdin...
+ */
+
+void
+sighandler(int s)	/* I - Signal number */
+{
+ /*
+  * Remove the temporary file we're using to print from stdin...
+  */
+
+  unlink(tempfile);
+
+ /*
+  * Exit...
+  */
+
+  exit(s);
+}
+#endif /* !WIN32 */
+
+
 /*
 * End of "$Id$".
 */
@@ -3,7 +3,7 @@
 *
 *   "lprm" command for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-1999 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
@@ -65,6 +65,7 @@ main(int  argc,			/* I - Number of command-line arguments */
  job_id   = 0;
  dest     = cupsGetDefault();
  response = NULL;
+  http     = NULL;

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

      if (dest)
      {
-        sprintf(uri, "ipp://localhost/printers/%s", dest);
+        snprintf(uri, sizeof(uri), "ipp://localhost/printers/%s", dest);
 	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
 	             "printer-uri", NULL, uri);
 	ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "job-id",
@@ -159,6 +160,9 @@ main(int  argc,			/* I - Number of command-line arguments */
 	             uri);
      }

+      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+                   "requesting-user-name", NULL, cupsUser());
+
     /*
      * Do the request and get back a response...
      */
@@ -170,10 +174,22 @@ main(int  argc,			/* I - Number of command-line arguments */

      if (response != NULL)
      {
-        if (response->request.status.status_code == IPP_NOT_FOUND)
-          fputs("lprm: Job or printer not found!\n", stderr);
-        else if (response->request.status.status_code > IPP_OK_CONFLICT)
-          fputs("lprm: Unable to cancel job(s)!\n", stderr);
+        switch (response->request.status.status_code)
+	{
+	  case IPP_NOT_FOUND :
+              fputs("lprm: Job or printer not found!\n", stderr);
+	      break;
+	  case IPP_NOT_AUTHORIZED :
+              fputs("lprm: Not authorized to lprm job(s)!\n", stderr);
+	      break;
+	  case IPP_FORBIDDEN :
+              fprintf(stderr, "lprm: You don't own job ID %d!\n", job_id);
+	      break;
+	  default :
+              if (response->request.status.status_code > IPP_OK_CONFLICT)
+                fputs("lprm: Unable to lprm job(s)!\n", stderr);
+	      break;
+	}

        ippDelete(response);
      }
@@ -24,8 +24,10 @@

 include ../Makedefs

-TARGETS	=	classes.cgi jobs.cgi printers.cgi
-OBJS	=	classes.o jobs.o printers.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
+

 #
 # Make all targets...
@@ -33,50 +35,82 @@ OBJS	=	classes.o jobs.o printers.o

 all:	$(TARGETS)

+
 #
 # Clean all object files...
 #

 clean:
-	rm -f $(OBJS) $(TARGETS)
+	rm -f $(OBJS) libcgi.a $(TARGETS)
+

 #
 # Install all targets...
 #

 install:
-	-$(MKDIR) $(SERVERROOT)/cgi-bin
-	$(CP) $(TARGETS) $(SERVERROOT)/cgi-bin
+	-$(MKDIR) $(SERVERBIN)/cgi-bin
+	$(CP) $(TARGETS) $(SERVERBIN)/cgi-bin
+
+
+#
+# libcgi.a
+#
+
+libcgi.a:	$(LIBOBJS)
+	echo Archiving $@...
+	$(RM) $@
+	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
+	$(RANLIB) $@
+
+$(LIBOBJS):	cgi.h
+ipp-var.o:	ipp-var.h
+
+
+#
+# admin.cgi
+#
+
+admin.cgi:	admin.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
+	echo Linking $@...
+	$(CC) $(LDFLAGS) -o $@ admin.o libcgi.a $(LIBS)
+
+admin.o:	cgi.h ipp-var.h ../cups/cups.h ../cups/ipp.h ../cups/language.h
+

 #
 # classes.cgi
 #

-classes.cgi:	classes.o ../Makedefs ../cups/$(LIBCUPS)
+classes.cgi:	classes.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ classes.o $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ classes.o libcgi.a $(LIBS)
+
+classes.o:	cgi.h ipp-var.h ../cups/cups.h ../cups/ipp.h ../cups/language.h

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

 #
 # jobs.cgi
 #

-jobs.cgi:	jobs.o ../Makedefs ../cups/$(LIBCUPS)
+jobs.cgi:	jobs.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ jobs.o $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ jobs.o libcgi.a $(LIBS)
+
+jobs.o:	cgi.h ipp-var.h ../cups/cups.h ../cups/ipp.h ../cups/language.h

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

 #
 # printers.cgi
 #

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

-$(OBJS):	../Makedefs ../cups/cups.h ../cups/ipp.h ../cups/language.h
+printers.o:	cgi.h ipp-var.h ../cups/cups.h ../cups/ipp.h ../cups/language.h
+
+$(OBJS):	../Makedefs

 #
 # End of "$Id$".
@@ -0,0 +1,891 @@
+/*
+ * "$Id$"
+ *
+ *   Administration CGI for the Common UNIX Printing System (CUPS).
+ *
+ *   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
+ *   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:
+ *
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "ipp-var.h"
+
+
+/*
+ * Local functions...
+ */
+
+static void	do_am_class(http_t *http, cups_lang_t *language, int modify);
+static void	do_am_printer(http_t *http, cups_lang_t *language, int modify);
+static void	do_delete_class(http_t *http, cups_lang_t *language);
+static void	do_delete_printer(http_t *http, cups_lang_t *language);
+static void	do_job_op(http_t *http, cups_lang_t *language, ipp_op_t op);
+static void	do_printer_op(http_t *http, cups_lang_t *language, ipp_op_t op);
+static void	do_test_page(http_t *http, cups_lang_t *language);
+
+
+/*
+ * 'main()' - Main entry for CGI.
+ */
+
+int				/* O - Exit status */
+main(int  argc,			/* I - Number of command-line arguments */
+     char *argv[])		/* I - Command-line arguments */
+{
+  cups_lang_t	*language;	/* Language information */
+  http_t	*http;		/* Connection to the server */
+  const char	*op;		/* Operation name */
+
+
+ /*
+  * Get the request language...
+  */
+
+  language = cupsLangDefault();
+
+ /*
+  * Send a standard header...
+  */
+
+  printf("Content-Type: text/html;charset=%s\n\n", cupsLangEncoding(language));
+
+  cgiSetVariable("TITLE", "Admin");
+  cgiSetVariable("SERVER_NAME", getenv("SERVER_NAME"));
+  cgiSetVariable("REMOTE_USER", getenv("REMOTE_USER"));
+  cgiSetVariable("CUPS_VERSION", CUPS_SVERSION);
+
+  cgiCopyTemplateFile(stdout, TEMPLATES "/header.tmpl");
+
+ /*
+  * See if we have form data...
+  */
+
+  if (!cgiInitialize())
+  {
+   /*
+    * Nope, send the administration menu...
+    */
+
+    cgiCopyTemplateFile(stdout, TEMPLATES "/admin.tmpl");
+  }
+  else if ((op = cgiGetVariable("OP")) != NULL)
+  {
+   /*
+    * Connect to the HTTP server...
+    */
+
+    http = httpConnect("localhost", ippPort());
+
+   /*
+    * Do the operation...
+    */
+
+    if (strcmp(op, "cancel-job") == 0)
+      do_job_op(http, language, IPP_CANCEL_JOB);
+    else if (strcmp(op, "hold-job") == 0)
+      do_job_op(http, language, IPP_HOLD_JOB);
+    else if (strcmp(op, "release-job") == 0)
+      do_job_op(http, language, IPP_RELEASE_JOB);
+    else if (strcmp(op, "restart-job") == 0)
+      do_job_op(http, language, IPP_RESTART_JOB);
+    else if (strcmp(op, "start-printer") == 0)
+      do_printer_op(http, language, IPP_RESUME_PRINTER);
+    else if (strcmp(op, "stop-printer") == 0)
+      do_printer_op(http, language, IPP_PAUSE_PRINTER);
+    else if (strcmp(op, "accept-jobs") == 0)
+      do_printer_op(http, language, CUPS_ACCEPT_JOBS);
+    else if (strcmp(op, "reject-jobs") == 0)
+      do_printer_op(http, language, CUPS_REJECT_JOBS);
+    else if (strcmp(op, "print-test-page") == 0)
+      do_test_page(http, language);
+    else if (strcmp(op, "add-class") == 0)
+      do_am_class(http, language, 0);
+    else if (strcmp(op, "add-printer") == 0)
+      do_am_printer(http, language, 0);
+    else if (strcmp(op, "modify-class") == 0)
+      do_am_class(http, language, 1);
+    else if (strcmp(op, "modify-printer") == 0)
+      do_am_printer(http, language, 1);
+    else if (strcmp(op, "delete-class") == 0)
+      do_delete_class(http, language);
+    else if (strcmp(op, "delete-printer") == 0)
+      do_delete_printer(http, language);
+    else
+    {
+     /*
+      * Bad operation code...  Display an error...
+      */
+
+      cgiCopyTemplateFile(stdout, TEMPLATES "/admin-op.tmpl");
+    }
+
+   /*
+    * Close the HTTP server connection...
+    */
+
+    httpClose(http);
+  }
+  else
+  {
+   /*
+    * Form data but no operation code...  Display an error...
+    */
+
+    cgiCopyTemplateFile(stdout, TEMPLATES "/admin-op.tmpl");
+  }
+
+ /*
+  * Send the standard trailer...
+  */
+
+  cgiCopyTemplateFile(stdout, TEMPLATES "/trailer.tmpl");
+
+ /*
+  * Free the request language...
+  */
+
+  cupsLangFree(language);
+
+ /*
+  * Return with no errors...
+  */
+
+  return (0);
+}
+
+
+/*
+ * 'do_am_class()' - Add or modify a class.
+ */
+
+static void
+do_am_class(http_t      *http,		/* I - HTTP connection */
+            cups_lang_t *language,	/* I - Client's language */
+	    int         modify)		/* I - Modify the printer? */
+{
+}
+
+
+/*
+ * 'do_am_printer()' - Add or modify a printer.
+ */
+
+static void
+do_am_printer(http_t      *http,	/* I - HTTP connection */
+              cups_lang_t *language,	/* I - Client's language */
+	      int         modify)	/* I - Modify the printer? */
+{
+  int		i;			/* Looping var */
+  ipp_t		*request,		/* IPP request */
+		*response;		/* IPP response */
+  ipp_status_t	status;			/* Request status */
+  ipp_attribute_t *attr;		/* Response attribute */
+  int		num_strings;		/* Number of strings */
+  char		**strings;		/* Strings */
+  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 */
+  static int	baudrates[] =		/* Baud rates */
+		{
+		  1200,
+		  2400,
+		  4800,
+		  9600,
+		  19200,
+		  38400,
+		  57600,
+		  115200,
+		  230400,
+		  460800
+		};
+
+
+  if (cgiGetVariable("PRINTER_LOCATION") == NULL)
+  {
+    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...
+      */
+
+      if ((response = cupsDoRequest(http, request, "/")) != NULL)
+      {
+	ippSetCGIVars(response);
+	ippDelete(response);
+      }
+
+     /*
+      * Update the location and description of an existing printer...
+      */
+
+      cgiCopyTemplateFile(stdout, TEMPLATES "/modify-printer.tmpl");
+    }
+    else
+    {
+     /*
+      * Get the name, location, and description for a new printer...
+      */
+
+      cgiCopyTemplateFile(stdout, TEMPLATES "/add-printer.tmpl");
+    }
+  }
+  else if ((var = cgiGetVariable("DEVICE_URI")) == NULL)
+  {
+   /*
+    * Build a CUPS_GET_DEVICES request, which requires the following
+    * attributes:
+    *
+    *    attributes-charset
+    *    attributes-natural-language
+    *    printer-uri
+    */
+
+    request = ippNew();
+
+    request->request.op.operation_id = CUPS_GET_DEVICES;
+    request->request.op.request_id   = 1;
+
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+        	 "attributes-charset", NULL, cupsLangEncoding(language));
+
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+        	 "attributes-natural-language", NULL, language->language);
+
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
+                 NULL, "ipp://localhost/printers/");
+
+   /*
+    * Do the request and get back a response...
+    */
+
+    if ((response = cupsDoRequest(http, request, "/")) != NULL)
+    {
+      ippSetCGIVars(response);
+      ippDelete(response);
+    }
+
+   /*
+    * Let the user choose...
+    */
+
+    cgiCopyTemplateFile(stdout, TEMPLATES "/choose-device.tmpl");
+  }
+  else if (strchr(var, '/') == NULL)
+  {
+   /*
+    * User needs to set the full URI...
+    */
+
+    cgiCopyTemplateFile(stdout, TEMPLATES "/choose-uri.tmpl");
+  }
+  else if (strncmp(var, "serial:", 7) == 0 && cgiGetVariable("BAUDRATE") == NULL)
+  {
+   /*
+    * Need baud rate, parity, etc.
+    */
+
+    if ((var = strchr(var, '?')) != NULL &&
+        strncmp(var, "?baud=", 6) == 0)
+      maxrate = atoi(var + 6);
+    else
+      maxrate = 19200;
+
+    for (i = 0; i < 10; i ++)
+      if (baudrates[i] > maxrate)
+        break;
+      else
+      {
+        sprintf(baudrate, "%d", baudrates[i]);
+	cgiSetArray("BAUDRATES", i, baudrate);
+      }
+
+    cgiCopyTemplateFile(stdout, TEMPLATES "/choose-serial.tmpl");
+  }
+  else if ((var = cgiGetVariable("PPD_NAME")) == NULL)
+  {
+   /*
+    * Build a CUPS_GET_PPDS request, which requires the following
+    * attributes:
+    *
+    *    attributes-charset
+    *    attributes-natural-language
+    *    printer-uri
+    */
+
+    request = ippNew();
+
+    request->request.op.operation_id = CUPS_GET_PPDS;
+    request->request.op.request_id   = 1;
+
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+        	 "attributes-charset", NULL, cupsLangEncoding(language));
+
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+        	 "attributes-natural-language", NULL, language->language);
+
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
+                 NULL, "ipp://localhost/printers/");
+
+   /*
+    * Do the request and get back a response...
+    */
+
+    if ((response = cupsDoRequest(http, request, "/")) != NULL)
+    {
+      ippSetCGIVars(response);
+      ippDelete(response);
+    }
+
+   /*
+    * Let the user choose...
+    */
+
+    cgiCopyTemplateFile(stdout, TEMPLATES "/choose-model.tmpl");
+  }
+  else
+  {
+   /*
+    * Build a CUPS_ADD_PRINTER request, which requires the following
+    * attributes:
+    *
+    *    attributes-charset
+    *    attributes-natural-language
+    *    printer-uri
+    *    printer-location
+    *    printer-info
+    *    ppd-name
+    *    device-uri
+    *    printer-is-accepting-jobs
+    *    printer-state
+    */
+
+    request = ippNew();
+
+    request->request.op.operation_id = CUPS_ADD_PRINTER;
+    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);
+
+    ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_TEXT, "printer-location",
+                 NULL, cgiGetVariable("PRINTER_LOCATION"));
+
+    ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_TEXT, "printer-info",
+                 NULL, cgiGetVariable("PRINTER_INFO"));
+
+    ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_NAME, "ppd-name",
+                 NULL, cgiGetVariable("PPD_NAME"));
+
+    strcpy(uri, cgiGetVariable("DEVICE_URI"));
+    if (strncmp(uri, "serial:", 7) == 0)
+    {
+     /*
+      * Update serial port URI to include baud rate, etc.
+      */
+
+      if ((uriptr = strchr(uri, '?')) == NULL)
+        uriptr = uri + strlen(uri);
+
+      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",
+                 NULL, uri);
+
+    ippAddBoolean(request, IPP_TAG_PRINTER, "printer-is-accepting-jobs", 1);
+
+    ippAddInteger(request, IPP_TAG_PRINTER, IPP_TAG_ENUM, "printer-state",
+                  IPP_PRINTER_IDLE);
+
+   /*
+    * Do the request and get back a response...
+    */
+
+    if ((response = cupsDoRequest(http, request, "/admin/")) != NULL)
+    {
+      status = response->request.status.status_code;
+      ippDelete(response);
+    }
+    else
+      status = IPP_NOT_AUTHORIZED;
+
+    if (status > IPP_OK_CONFLICT)
+    {
+      cgiSetVariable("ERROR", ippErrorString(status));
+      cgiCopyTemplateFile(stdout, TEMPLATES "/error.tmpl");
+    }
+    else if (modify)
+      cgiCopyTemplateFile(stdout, TEMPLATES "/printer-modified.tmpl");
+    else
+      cgiCopyTemplateFile(stdout, TEMPLATES "/printer-added.tmpl");
+  }
+}
+
+
+/*
+ * 'do_delete_class()' - Delete a class...
+ */
+
+static void
+do_delete_class(http_t      *http,	/* I - HTTP connection */
+                cups_lang_t *language)	/* I - Client's language */
+{
+  ipp_t		*request,		/* IPP request */
+		*response;		/* IPP response */
+  char		uri[HTTP_MAX_URI];	/* Job URI */
+  const char	*pclass;		/* Printer class name */
+  ipp_status_t	status;			/* Operation status... */
+
+
+  if (cgiGetVariable("CONFIRM") == NULL)
+  {
+    cgiCopyTemplateFile(stdout, TEMPLATES "/class-confirm.tmpl");
+    return;
+  }
+
+  if ((pclass = cgiGetVariable("PRINTER_NAME")) != NULL)
+    snprintf(uri, sizeof(uri), "ipp://localhost/classes/%s", pclass);
+  else
+  {
+    cgiSetVariable("ERROR", ippErrorString(IPP_NOT_FOUND));
+    cgiCopyTemplateFile(stdout, TEMPLATES "/error.tmpl");
+    return;
+  }
+
+ /*
+  * Build a CUPS_DELETE_CLASS request, which requires the following
+  * attributes:
+  *
+  *    attributes-charset
+  *    attributes-natural-language
+  *    printer-uri
+  */
+
+  request = ippNew();
+
+  request->request.op.operation_id = CUPS_DELETE_CLASS;
+  request->request.op.request_id   = 1;
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+               "attributes-charset", NULL, cupsLangEncoding(language));
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+               "attributes-natural-language", NULL, language->language);
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
+               NULL, uri);
+
+ /*
+  * Do the request and get back a response...
+  */
+
+  if ((response = cupsDoRequest(http, request, "/admin/")) != NULL)
+  {
+    status = response->request.status.status_code;
+
+    ippDelete(response);
+  }
+  else
+    status = IPP_GONE;
+
+  if (status > IPP_OK_CONFLICT)
+  {
+    cgiSetVariable("ERROR", ippErrorString(status));
+    cgiCopyTemplateFile(stdout, TEMPLATES "/error.tmpl");
+  }
+  else
+    cgiCopyTemplateFile(stdout, TEMPLATES "/class-deleted.tmpl");
+}
+
+
+/*
+ * 'do_delete_printer()' - Delete a printer...
+ */
+
+static void
+do_delete_printer(http_t      *http,	/* I - HTTP connection */
+                  cups_lang_t *language)/* I - Client's language */
+{
+  ipp_t		*request,		/* IPP request */
+		*response;		/* IPP response */
+  char		uri[HTTP_MAX_URI];	/* Job URI */
+  const char	*printer;		/* Printer printer name */
+  ipp_status_t	status;			/* Operation status... */
+
+
+  if (cgiGetVariable("CONFIRM") == NULL)
+  {
+    cgiCopyTemplateFile(stdout, TEMPLATES "/printer-confirm.tmpl");
+    return;
+  }
+
+  if ((printer = cgiGetVariable("PRINTER_NAME")) != NULL)
+    snprintf(uri, sizeof(uri), "ipp://localhost/printers/%s", printer);
+  else
+  {
+    cgiSetVariable("ERROR", ippErrorString(IPP_NOT_FOUND));
+    cgiCopyTemplateFile(stdout, TEMPLATES "/error.tmpl");
+    return;
+  }
+
+ /*
+  * Build a CUPS_DELETE_PRINTER request, which requires the following
+  * attributes:
+  *
+  *    attributes-charset
+  *    attributes-natural-language
+  *    printer-uri
+  */
+
+  request = ippNew();
+
+  request->request.op.operation_id = CUPS_DELETE_PRINTER;
+  request->request.op.request_id   = 1;
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+               "attributes-charset", NULL, cupsLangEncoding(language));
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+               "attributes-natural-language", NULL, language->language);
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
+               NULL, uri);
+
+ /*
+  * Do the request and get back a response...
+  */
+
+  if ((response = cupsDoRequest(http, request, "/admin/")) != NULL)
+  {
+    status = response->request.status.status_code;
+
+    ippDelete(response);
+  }
+  else
+    status = IPP_GONE;
+
+  if (status > IPP_OK_CONFLICT)
+  {
+    cgiSetVariable("ERROR", ippErrorString(status));
+    cgiCopyTemplateFile(stdout, TEMPLATES "/error.tmpl");
+  }
+  else
+    cgiCopyTemplateFile(stdout, TEMPLATES "/printer-deleted.tmpl");
+}
+
+
+/*
+ * 'do_job_op()' - Do a job operation.
+ */
+
+static void
+do_job_op(http_t      *http,		/* I - HTTP connection */
+          cups_lang_t *language,	/* I - Client's language */
+	  ipp_op_t    op)		/* I - Operation to perform */
+{
+  ipp_t		*request,		/* IPP request */
+		*response;		/* IPP response */
+  char		uri[HTTP_MAX_URI];	/* Job URI */
+  const char	*job;			/* Job ID */
+  const char	*printer;		/* Printer name (purge-jobs) */
+  ipp_status_t	status;			/* Operation status... */
+
+
+  if ((job = cgiGetVariable("JOB_ID")) != NULL)
+    snprintf(uri, sizeof(uri), "ipp://localhost/jobs/%s", job);
+  else if ((printer = cgiGetVariable("PRINTER_NAME")) != NULL)
+    snprintf(uri, sizeof(uri), "ipp://localhost/printers/%s", printer);
+  else
+  {
+    cgiSetVariable("ERROR", ippErrorString(IPP_NOT_FOUND));
+    cgiCopyTemplateFile(stdout, TEMPLATES "/error.tmpl");
+    return;
+  }
+
+ /*
+  * Build a job request, which requires the following
+  * attributes:
+  *
+  *    attributes-charset
+  *    attributes-natural-language
+  *    job-uri or printer-uri (purge-jobs)
+  *    requesting-user-name
+  */
+
+  request = ippNew();
+
+  request->request.op.operation_id = op;
+  request->request.op.request_id   = 1;
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+               "attributes-charset", NULL, cupsLangEncoding(language));
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+               "attributes-natural-language", NULL, language->language);
+
+  if (job)
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri",
+                 NULL, uri);
+  else
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
+                 NULL, uri);
+
+  if (getenv("REMOTE_USER") != NULL)
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
+                 NULL, getenv("REMOTE_USER"));
+  else
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
+                 NULL, "root");
+
+ /*
+  * Do the request and get back a response...
+  */
+
+  if ((response = cupsDoRequest(http, request, "/jobs")) != NULL)
+  {
+    status = response->request.status.status_code;
+
+    ippDelete(response);
+  }
+  else
+    status = IPP_GONE;
+
+  if (status > IPP_OK_CONFLICT)
+  {
+    cgiSetVariable("ERROR", ippErrorString(status));
+    cgiCopyTemplateFile(stdout, TEMPLATES "/error.tmpl");
+  }
+  else if (op == IPP_CANCEL_JOB)
+    cgiCopyTemplateFile(stdout, TEMPLATES "/job-cancel.tmpl");
+  else if (op == IPP_HOLD_JOB)
+    cgiCopyTemplateFile(stdout, TEMPLATES "/job-hold.tmpl");
+  else if (op == IPP_RELEASE_JOB)
+    cgiCopyTemplateFile(stdout, TEMPLATES "/job-release.tmpl");
+}
+
+
+/*
+ * 'do_printer_op()' - Do a printer operation.
+ */
+
+static void
+do_printer_op(http_t      *http,	/* I - HTTP connection */
+              cups_lang_t *language,	/* I - Client's language */
+	      ipp_op_t    op)		/* I - Operation to perform */
+{
+  ipp_t		*request,		/* IPP request */
+		*response;		/* IPP response */
+  char		uri[HTTP_MAX_URI];	/* Printer URI */
+  const char	*printer;		/* Printer name (purge-jobs) */
+  ipp_status_t	status;			/* Operation status... */
+
+
+  if ((printer = cgiGetVariable("PRINTER_NAME")) != NULL)
+    snprintf(uri, sizeof(uri), "ipp://localhost/printers/%s", printer);
+  else
+  {
+    cgiSetVariable("ERROR", ippErrorString(IPP_NOT_FOUND));
+    cgiCopyTemplateFile(stdout, TEMPLATES "/error.tmpl");
+    return;
+  }
+
+ /*
+  * Build a printer request, which requires the following
+  * attributes:
+  *
+  *    attributes-charset
+  *    attributes-natural-language
+  *    printer-uri
+  */
+
+  request = ippNew();
+
+  request->request.op.operation_id = op;
+  request->request.op.request_id   = 1;
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+               "attributes-charset", NULL, cupsLangEncoding(language));
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+               "attributes-natural-language", NULL, language->language);
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
+               NULL, uri);
+
+ /*
+  * Do the request and get back a response...
+  */
+
+  if ((response = cupsDoRequest(http, request, "/admin/")) != NULL)
+  {
+    status = response->request.status.status_code;
+
+    ippDelete(response);
+  }
+  else
+    status = IPP_GONE;
+
+  if (status > IPP_OK_CONFLICT)
+  {
+    cgiSetVariable("ERROR", ippErrorString(status));
+    cgiCopyTemplateFile(stdout, TEMPLATES "/error.tmpl");
+  }
+  else if (op == IPP_PAUSE_PRINTER)
+    cgiCopyTemplateFile(stdout, TEMPLATES "/printer-stop.tmpl");
+  else if (op == IPP_RESUME_PRINTER)
+    cgiCopyTemplateFile(stdout, TEMPLATES "/printer-start.tmpl");
+  else if (op == CUPS_ACCEPT_JOBS)
+    cgiCopyTemplateFile(stdout, TEMPLATES "/printer-accept.tmpl");
+  else if (op == CUPS_REJECT_JOBS)
+    cgiCopyTemplateFile(stdout, TEMPLATES "/printer-reject.tmpl");
+}
+
+
+/*
+ * 'do_test_page()' - Send a test page.
+ */
+
+static void
+do_test_page(http_t      *http,		/* I - HTTP connection */
+             cups_lang_t *language)	/* I - Client's language */
+{
+  ipp_t		*request,		/* IPP request */
+		*response;		/* IPP response */
+  char		uri[HTTP_MAX_URI];	/* Job URI */
+  const char	*printer;		/* Printer name (purge-jobs) */
+  ipp_status_t	status;			/* Operation status... */
+
+
+  if ((printer = cgiGetVariable("PRINTER_NAME")) != NULL)
+    snprintf(uri, sizeof(uri), "ipp://localhost/printers/%s", printer);
+  else
+  {
+    cgiSetVariable("ERROR", ippErrorString(IPP_NOT_FOUND));
+    cgiCopyTemplateFile(stdout, TEMPLATES "/error.tmpl");
+    return;
+  }
+
+ /*
+  * Build an IPP_PRINT_JOB request, which requires the following
+  * attributes:
+  *
+  *    attributes-charset
+  *    attributes-natural-language
+  *    printer-uri
+  *    requesting-user-name
+  *    document-format
+  */
+
+  request = ippNew();
+
+  request->request.op.operation_id = IPP_PRINT_JOB;
+  request->request.op.request_id   = 1;
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+               "attributes-charset", NULL, cupsLangEncoding(language));
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+               "attributes-natural-language", NULL, language->language);
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
+               NULL, uri);
+
+  if (getenv("REMOTE_USER") != NULL)
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
+                 NULL, getenv("REMOTE_USER"));
+  else
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
+                 NULL, "root");
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name",
+               NULL, "Test Page");
+
+  ippAddString(request, IPP_TAG_JOB, IPP_TAG_MIMETYPE, "document-format",
+               NULL, "application/postscript");
+
+ /*
+  * Do the request and get back a response...
+  */
+
+  if ((response = cupsDoFileRequest(http, request, uri + 15,
+                                    CUPS_DATADIR "/data/testprint.ps")) != NULL)
+  {
+    status = response->request.status.status_code;
+    ippSetCGIVars(response);
+
+    ippDelete(response);
+  }
+  else
+    status = IPP_GONE;
+
+  if (status > IPP_OK_CONFLICT)
+  {
+    cgiSetVariable("ERROR", ippErrorString(status));
+    cgiCopyTemplateFile(stdout, TEMPLATES "/error.tmpl");
+  }
+  else
+    cgiCopyTemplateFile(stdout, TEMPLATES "/test-page.tmpl");
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,81 @@
+/*
+ * "$Id$"
+ *
+ *   CGI support library definitions.
+ *
+ *   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
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _CGI_H_
+#  define _CGI_H_
+
+#  include <stdio.h>
+#  include <stdlib.h>
+#  include <string.h>
+#  include <ctype.h>
+
+#  ifdef WIN32
+#    include <direct.h>
+#    include <io.h>
+#    include <malloc.h>
+#    define strcasecmp(s,t)	stricmp((s),(t))
+#    define strncasecmp(s,t,n)	strnicmp((s),(t),(n))
+#  else
+#    include <unistd.h>
+#  endif /* WIN32 */
+
+
+/*
+ * Prototypes...
+ */
+
+extern int		cgiInitialize(void);
+extern void		cgiAbort(const char *title, const char *stylesheet,
+			         const char *format, ...);
+extern int		cgiCheckVariables(const char *names);
+extern const char	*cgiGetArray(const char *name, int element);
+extern int		cgiGetSize(const char *name);
+extern void		cgiSetSize(const char *name, int size);
+extern const char	*cgiGetVariable(const char *name);
+extern void		cgiSetArray(const char *name, int element,
+			            const char *value);
+extern void		cgiSetVariable(const char *name, const char *value);
+extern void		cgiCopyTemplateFile(FILE *out, const char *template);
+
+extern void		cgiStartHTML(FILE *out, const char *author,
+			             const char *stylesheet,
+			             const char *keywords,
+			             const char *description,
+				     const char *title, ...);
+extern void		cgiEndHTML(FILE *out);
+
+extern FILE		*cgiEMailOpen(const char *from, const char *to,
+			              const char *cc, const char *subject,
+				      int multipart);
+extern void		cgiEMailPart(FILE *mail, const char *type,
+			             const char *charset, const char *encoding);
+extern void		cgiEMailClose(FILE *mail);
+
+
+#  define cgiGetUser()	getenv("REMOTE_USER")
+#  define cgiGetHost()	(getenv("REMOTE_HOST") == NULL ? getenv("REMOTE_ADDR") : getenv("REMOTE_HOST"))
+
+#endif /* !_CGI_H_ */
+
+/*
+ * End of "$Id$".
+ */
@@ -3,7 +3,7 @@
 *
 *   Class status CGI for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-1999 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,30 +23,14 @@
 *
 * Contents:
 *
- *   main()            - Main entry for CGI.
- *   show_class_list() - Show a list of classes...
- *   show_class_info() - Show class information.
+ *   main() - Main entry for CGI.
 */

 /*
 * Include necessary headers...
 */

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


 /*
@@ -58,9 +42,20 @@ main(int  argc,			/* I - Number of command-line arguments */
     char *argv[])		/* I - Command-line arguments */
 {
  cups_lang_t	*language;	/* Language information */
-  char		*name;		/* Class name */
+  char		*pclass;	/* Printer class name */
  http_t	*http;		/* Connection to the server */
+  ipp_t		*request,	/* IPP request */
+		*response;	/* IPP response */
+  char		uri[HTTP_MAX_URI];
+				/* Printer URI */
+  const char	*which_jobs;	/* Which jobs to show */
+ 

+ /*
+  * Get any form variables...
+  */
+
+  cgiInitialize();

 /*
  * Get the request language...
@@ -81,87 +76,130 @@ main(int  argc,			/* I - Number of command-line arguments */
  printf("Content-Type: text/html;charset=%s\n\n", cupsLangEncoding(language));

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

-  name = argv[0];
-  if (strcmp(name, "/") == 0 || strcmp(name, "classes.cgi") == 0)
-    name = NULL;
-
- /*
-  * Print the standard header...
-  */
-
-  puts("<HTML>");
-  puts("<HEAD>");
-  if (name)
-    puts("<META HTTP-EQUIV=\"Refresh\" CONTENT=\"10\">");
+  pclass = argv[0];
+  if (strcmp(pclass, "/") == 0 || strcmp(pclass, "classes.cgi") == 0)
+  {
+    pclass = NULL;
+    cgiSetVariable("TITLE", "Classes");
+  }
  else
-    puts("<META HTTP-EQUIV=\"Refresh\" CONTENT=\"30\">");
-  printf("<TITLE>%s on %s - Common UNIX Printing System</TITLE>\n",
-         name == NULL ? "Classes" : name, getenv("SERVER_NAME"));
-  puts("<LINK REL=STYLESHEET TYPE=\"text/css\" HREF=\"/cups.css\">");
-  puts("<MAP NAME=\"navbar\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"10,10,85,30\" HREF=\"/printers\" ALT=\"Current Printer Status\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"95,10,175,30\" HREF=\"/classes\" ALT=\"Current Printer Classes Status\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"185,10,235,30\" HREF=\"/jobs\" ALT=\"Current Jobs Status\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"245,10,395,30\" HREF=\"/documentation.html\" ALT=\"Read CUPS Documentation On-Line\">");
-#ifdef ESPPRINTPRO
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"405,10,490,30\" HREF=\"http://www.easysw.com/printpro/software.html\" ALT=\"Download the Current ESP Print Pro Software\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"505,10,585,30\" HREF=\"http://www.easysw.com/printpro/support.html\" ALT=\"Get Tech Support for Current ESP Print Pro\">");
-#else
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"405,10,490,30\" HREF=\"http://www.cups.org\" ALT=\"Download the Current CUPS Software\">");
-#endif /* ESPPRINTPRO */
-  puts("</MAP>");
-  puts("</HEAD>");
-  puts("<BODY>");
-  puts("<P ALIGN=CENTER>");
-  puts("<A HREF=\"http://www.easysw.com\" ALT=\"Easy Software Products Home Page\">");
-  puts("<IMG SRC=\"/images/logo.gif\" WIDTH=\"71\" HEIGHT=\"40\" BORDER=0 ALT=\"Easy Software Products Home Page\"></A>");
-#ifdef ESPPRINTPRO
-  puts("<IMG SRC=\"/images/navbar.gif\" WIDTH=\"600\" HEIGHT=\"40\" USEMAP=\"#navbar\" BORDER=0>");
-#else
-  puts("<IMG SRC=\"/images/navbar.gif\" WIDTH=\"540\" HEIGHT=\"40\" USEMAP=\"#navbar\" BORDER=0>");
-#endif /* ESPPRINTPRO */
-
-  printf("<H1>%s on %s</H1>\n", name == NULL ? "Classes" : name,
-         getenv("SERVER_NAME"));
-  fflush(stdout);
-
-  puts("<CENTER>");
-  puts("<TABLE WIDTH=\"90%\" BORDER=\"1\">");
-  puts("<TR>");
-  puts("<TH>Name</TH>");
-  puts("<TH WIDTH=\"50%\">Status</TH>");
-  puts("<TH WIDTH=\"25%\">Jobs</TH>");
-  puts("</TR>");
+    cgiSetVariable("TITLE", pclass);

 /*
-  * Show the information...
+  * Get the printer info...
  */

-  if (name == NULL)
-    show_class_list(http, language);
+  request = ippNew();
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+               "attributes-charset", NULL, cupsLangEncoding(language));
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+               "attributes-natural-language", NULL, language->language);
+
+  if (pclass == NULL)
+  {
+   /*
+    * Build a CUPS_GET_CLASSES request, which requires the following
+    * attributes:
+    *
+    *    attributes-charset
+    *    attributes-natural-language
+    */
+
+    request->request.op.operation_id = CUPS_GET_CLASSES;
+    request->request.op.request_id   = 1;
+  }
  else
-    show_class_info(http, language, name);
+  {
+   /*
+    * Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the following
+    * attributes:
+    *
+    *    attributes-charset
+    *    attributes-natural-language
+    *    printer-uri
+    */
+
+    request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
+    request->request.op.request_id   = 1;
+
+    snprintf(uri, sizeof(uri), "ipp://%s/classes/%s", getenv("SERVER_NAME"),
+             pclass);
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL,
+                 uri);
+  }

 /*
-  * Write a standard trailer...
+  * Do the request and get back a response...
  */

-  puts("</TABLE>");
-  puts("</CENTER>");
+  if ((response = cupsDoRequest(http, request, "/")) != NULL)
+  {
+    ippSetCGIVars(response);
+    ippDelete(response);
+  }

-  puts("<HR>");
+ /*
+  * Write the report...
+  */

-  puts("<P>The Common UNIX Printing System, CUPS, and the CUPS logo are the");
-  puts("trademark property of <A HREF=\"http://www.easysw.com\">Easy Software");
-  puts("Products</A>. CUPS is copyright 1997-1999 by Easy Software Products,");
-  puts("All Rights Reserved.");
+  cgiCopyTemplateFile(stdout, TEMPLATES "/header.tmpl");
+  cgiCopyTemplateFile(stdout, TEMPLATES "/classes.tmpl");

-  puts("</BODY>");
-  puts("</HTML>");
+ /*
+  * Get jobs for the specified class if a class has been chosen...
+  */
+
+  if (pclass != NULL)
+  {
+   /*
+    * Build an IPP_GET_JOBS request, which requires the following
+    * attributes:
+    *
+    *    attributes-charset
+    *    attributes-natural-language
+    *    printer-uri
+    */
+
+    request = ippNew();
+
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+        	 "attributes-charset", NULL, cupsLangEncoding(language));
+
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+        	 "attributes-natural-language", NULL, language->language);
+
+    request->request.op.operation_id = IPP_GET_JOBS;
+    request->request.op.request_id   = 1;
+
+    snprintf(uri, sizeof(uri), "ipp://%s/classes/%s", getenv("SERVER_NAME"),
+             pclass);
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL,
+                 uri);
+
+    if ((which_jobs = cgiGetVariable("which_jobs")) != NULL)
+      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "which-jobs",
+                   NULL, which_jobs);
+
+   /*
+    * Do the request and get back a response...
+    */
+
+    if ((response = cupsDoRequest(http, request, "/")) != NULL)
+    {
+      ippSetCGIVars(response);
+      ippDelete(response);
+
+      cgiCopyTemplateFile(stdout, TEMPLATES "/jobs.tmpl");
+    }
+  }
+
+  cgiCopyTemplateFile(stdout, TEMPLATES "/trailer.tmpl");

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


-/*
- * 'show_class_list()' - Show a list of classes...
- */
-
-static void
-show_class_list(http_t      *http,	/* I - HTTP connection */
-                  cups_lang_t *language)/* I - Client's language */
-{
-  ipp_t		*request,	/* IPP request */
-		*response;	/* IPP response */
-  ipp_attribute_t *attr;	/* IPP attribute */
-
-
- /*
-  * Build a CUPS_GET_CLASSES request, which requires the following
-  * attributes:
-  *
-  *    attributes-charset
-  *    attributes-natural-language
-  */
-
-  request = ippNew();
-
-  request->request.op.operation_id = CUPS_GET_CLASSES;
-  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);
-
- /*
-  * Do the request and get back a response...
-  */
-
-  if ((response = cupsDoRequest(http, request, "/classes/")) != NULL)
-  {
-   /*
-    * Loop through the classes returned in the list and display
-    * their devices...
-    */
-
-    for (attr = response->attrs; attr != NULL; attr = attr->next)
-    {
-     /*
-      * Skip leading attributes until we hit a job...
-      */
-
-      while (attr != NULL && attr->group_tag != IPP_TAG_PRINTER)
-        attr = attr->next;
-
-      if (attr == NULL)
-        break;
-
-     /*
-      * Show the class status for each class...
-      */
-
-      while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER)
-      {
-        if (strcmp(attr->name, "printer-name") == 0 &&
-	    attr->value_tag == IPP_TAG_NAME)
-	  show_class_info(http, language, attr->values[0].string.text);
-
-        attr = attr->next;
-      }
-
-      if (attr == NULL)
-        break;
-    }
-
-    ippDelete(response);
-  }
-}
-
-
-/*
- * 'show_class_info()' - Show class information.
- */
-
-static void
-show_class_info(http_t      *http,
-                  cups_lang_t *language,
-                  char        *name)
-{
-  ipp_t		*request,	/* IPP request */
-		*response,	/* IPP response */
-		*jobs;		/* IPP Get Jobs response */
-  int		jobcount;	/* Number of jobs */
-  ipp_attribute_t *attr;	/* IPP attribute */
-  char		*message;	/* Printer state message */
-  int		accepting;	/* Accepting requests? */
-  ipp_pstate_t	pstate;		/* Printer state */
-  char		uri[HTTP_MAX_URI];/* Printer URI */
-
-
- /*
-  * Build a IPP_GET_PRINTER_ATTRIBUTES request, which requires the following
-  * attributes:
-  *
-  *    attributes-charset
-  *    attributes-natural-language
-  *    printer-uri
-  */
-
-  request = ippNew();
-
-  request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
-  request->request.op.request_id   = 1;
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-               "attributes-charset", NULL, cupsLangEncoding(language));
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-               "attributes-natural-language", NULL, language->language);
-
-  sprintf(uri, "ipp://localhost/classes/%s", name);
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, uri);
-
- /*
-  * Do the request and get back a response...
-  */
-
-  if ((response = cupsDoRequest(http, request, uri + 15)) == NULL)
-  {
-    puts("<P>Unable to communicate with CUPS server!");
-    return;
-  }
-
-  if (response->request.status.status_code == IPP_NOT_FOUND)
-  {
-    puts("<P>Class does not exist.");
-    ippDelete(response);
-    return;
-  }
-
- /*
-  * Grab the needed class attributes...
-  */
-
-  if ((attr = ippFindAttribute(response, "printer-state", IPP_TAG_ENUM)) != NULL)
-    pstate = (ipp_pstate_t)attr->values[0].integer;
-  else
-    pstate = IPP_PRINTER_IDLE;
-
-  if ((attr = ippFindAttribute(response, "printer-state-message", IPP_TAG_TEXT)) != NULL)
-    message = attr->values[0].string.text;
-  else
-    message = NULL;
-
-  if ((attr = ippFindAttribute(response, "printer-is-accepting-jobs",
-                               IPP_TAG_BOOLEAN)) != NULL)
-    accepting = attr->values[0].boolean;
-  else
-    accepting = 1;
-
-  if ((attr = ippFindAttribute(response, "printer-uri-supported", IPP_TAG_URI)) != NULL)
-  {
-    strcpy(uri, "http:");
-    strcpy(uri + 5, strchr(attr->values[0].string.text, '/'));
-  }
-
- /*
-  * Display the class entry...
-  */
-
-  puts("<TR>");
-
-  printf("<TD VALIGN=TOP><A HREF=\"%s\">%s</A></TD>\n", uri, name);
-
-  puts("<TD VALIGN=TOP><IMG SRC=\"/images/classes.gif\" ALIGN=\"LEFT\">");
-
-  printf("%s: %s, %s<BR>\n",
-         cupsLangString(language, CUPS_MSG_PRINTER_STATE),
-         cupsLangString(language, pstate == IPP_PRINTER_IDLE ? CUPS_MSG_IDLE :
-	                          pstate == IPP_PRINTER_PROCESSING ?
-				  CUPS_MSG_PROCESSING : CUPS_MSG_STOPPED),
-         cupsLangString(language, accepting ? CUPS_MSG_ACCEPTING_JOBS :
-	                          CUPS_MSG_NOT_ACCEPTING_JOBS));
-
-  if (message)
-    printf("<BR CLEAR=ALL><I>\"%s\"</I>\n", message);
-  else if (!accepting || pstate == IPP_PRINTER_STOPPED)
-    puts("<BR CLEAR=ALL><I>\"Reason Unknown\"</I>");
-
-  puts("</TD>");
-
- /*
-  * Show a list of jobs as needed...
-  */
-
-  if (pstate != IPP_PRINTER_IDLE)
-  {
-   /*
-    * Build an IPP_GET_JOBS request, which requires the following
-    * attributes:
-    *
-    *    attributes-charset
-    *    attributes-natural-language
-    *    printer-uri
-    */
-
-    request = ippNew();
-
-    request->request.op.operation_id = IPP_GET_JOBS;
-    request->request.op.request_id   = 1;
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-              	 "attributes-charset", NULL,
-		 cupsLangEncoding(language));
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-                 "attributes-natural-language", NULL,
-		 language->language);
-
-    sprintf(uri, "ipp://localhost/printers/%s", name);
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
-	         "printer-uri", NULL, uri);
-
-    jobs = cupsDoRequest(http, request, uri + 15);
-  }
-  else
-    jobs = NULL;
-
-  puts("<TD VALIGN=\"TOP\">");
-  jobcount = 0;
-
-  if (jobs != NULL)
-  {
-    char	*username;	/* Pointer to job-originating-user-name */
-    int		jobid,		/* job-id */
-		size;		/* job-k-octets */
-
-
-    for (attr = jobs->attrs; attr != NULL; attr = attr->next)
-    {
-     /*
-      * Skip leading attributes until we hit a job...
-      */
-
-      while (attr != NULL && attr->group_tag != IPP_TAG_JOB)
-        attr = attr->next;
-
-      if (attr == NULL)
-        break;
-
-     /*
-      * Pull the needed attributes from this job...
-      */
-
-      jobid    = 0;
-      size     = 0;
-      username = NULL;
-
-      while (attr != NULL && attr->group_tag == IPP_TAG_JOB)
-      {
-        if (strcmp(attr->name, "job-id") == 0 &&
-	    attr->value_tag == IPP_TAG_INTEGER)
-	  jobid = attr->values[0].integer;
-
-        if (strcmp(attr->name, "job-k-octets") == 0 &&
-	    attr->value_tag == IPP_TAG_INTEGER)
-	  size = attr->values[0].integer;
-
-        if (strcmp(attr->name, "job-originating-user-name") == 0 &&
-	    attr->value_tag == IPP_TAG_NAME)
-	  username = attr->values[0].string.text;
-
-        attr = attr->next;
-      }
-
-     /*
-      * Display the job if it matches the current class...
-      */
-
-      if (username != NULL)
-      {
-	jobcount ++;
-	printf("<A HREF=\"/jobs/%d\">%s-%d %s %dk</A><BR>\n", jobid, name,
-	       jobid, username, size);
-      }
-
-      if (attr == NULL)
-        break;
-    }
-
-    ippDelete(jobs);
-  }
-
-  if (jobcount == 0)
-    puts("None");
-  puts("</TD>");
-  puts("</TR>");
-
-  ippDelete(response);
-}
-
-
 /*
 * End of "$Id$".
 */
@@ -0,0 +1,89 @@
+/*
+ * "$Id$"
+ *
+ *   CGI HTML functions.
+ *
+ *   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
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Contents:
+ *
+ *   cgiStartHTML() - Start an HTML document stream.
+ *   cgiEndHTML()   - End an HTML document stream.
+ */
+
+#include "cgi.h"
+#include <stdarg.h>
+
+
+/*
+ * 'cgiStartHTML()' - Start an HTML document stream.
+ */
+
+void
+cgiStartHTML(FILE       *out,		/* I - Output file to use */
+             const char *stylesheet,	/* I - Stylesheet to use */
+	     const char *author,	/* I - Author name */
+	     const char *keywords,	/* I - Search keywords */
+	     const char *description,	/* I - Description of document */
+             const char *title,		/* I - Title for page */
+             ...)			/* I - Any addition args for title */
+{
+  va_list	ap;			/* Argument pointer */
+
+
+  fputs("Content-type: text/html\n\n", out);
+  fputs("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" "
+        "\"http://www.w3.org/TR/REC-html40/loose.dtd\">\n", out);
+  fputs("<HTML>\n", out);
+  fputs("<HEAD>\n", out);
+
+  fputs("\t<TITLE>\n", out);
+    va_start(ap, title);
+    vfprintf(out, title, ap);
+    va_end(ap);
+  fputs("</TITLE>\n", out);
+
+  if (stylesheet)
+    fprintf(out, "\t<LINK REL=\"STYLESHEET\" TYPE=\"text/css\" HREF=\"%s\">\n",
+            stylesheet);
+  if (author)
+    fprintf(out, "\t<META NAME=\"AUTHOR\" CONTENT=\"%s\">\n", author);
+  if (keywords)
+    fprintf(out, "\t<META NAME=\"KEYWORDS\" CONTENT=\"%s\">\n", keywords);
+  if (description)
+    fprintf(out, "\t<META NAME=\"DESCRIPTION\" CONTENT=\"%s\">\n", description);
+
+  fputs("</HEAD>\n", out);
+  fputs("<BODY>\n", out);
+}
+
+
+/*
+ * 'cgiEndHTML()' - End an HTML document stream.
+ */
+
+void
+cgiEndHTML(FILE *out)	/* I - Output file to use */
+{
+  fputs("</BODY>\n", out);
+  fputs("</HTML>\n", out);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,175 @@
+/*
+ * "$Id$"
+ *
+ *   IPP variable routines for the Common UNIX Printing System (CUPS).
+ *
+ *   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
+ *   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:
+ *
+ *   ippSetCGIVars() - Set CGI variables from an IPP response.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "ipp-var.h"
+
+
+/*
+ * 'ippSetCGIVars()' - Set CGI variables from an IPP response.
+ */
+
+void
+ippSetCGIVars(ipp_t *response)		/* I - Response data to be copied... */
+{
+  int			element;	/* Element in CGI array */
+  ipp_attribute_t	*attr;		/* Attribute in response... */
+  int			i;		/* Looping var */
+  char			name[1024],	/* Name of attribute */
+			value[16384],	/* Value(s) */
+			*valptr;	/* Pointer into value */
+  char			method[HTTP_MAX_URI],
+			username[HTTP_MAX_URI],
+			hostname[HTTP_MAX_URI],
+			resource[HTTP_MAX_URI],
+			uri[HTTP_MAX_URI];
+  int			port;
+
+
+  cgiSetVariable("SERVER_NAME", getenv("SERVER_NAME"));
+  cgiSetVariable("REMOTE_USER", getenv("REMOTE_USER"));
+  cgiSetVariable("CUPS_VERSION", CUPS_SVERSION);
+
+  for (attr = response->attrs;
+       attr && attr->group_tag == IPP_TAG_OPERATION;
+       attr = attr->next);
+
+  for (element = 0; attr != NULL; attr = attr->next, element ++)
+  {
+   /*
+    * Copy attributes to a separator...
+    */
+
+/*    puts("<HR>");*/
+
+    for (; attr != NULL && attr->group_tag != IPP_TAG_ZERO; attr = attr->next)
+    {
+     /*
+      * Copy the attribute name, substituting "_" for "-"...
+      */
+
+      if (attr->name == NULL)
+        continue;
+
+/*      printf("<P>%s\n", attr->name);*/
+
+      for (i = 0; attr->name[i]; i ++)
+        if (attr->name[i] == '-')
+	  name[i] = '_';
+	else
+          name[i] = attr->name[i];
+
+      name[i] = '\0';
+
+     /*
+      * Copy values...
+      */
+
+      value[0] = '\0';
+      valptr   = value;
+
+      for (i = 0; i < attr->num_values; i ++)
+      {
+	if (i)
+	  strcat(valptr, ",");
+
+	valptr += strlen(valptr);
+
+	switch (attr->value_tag)
+	{
+	  case IPP_TAG_INTEGER :
+	  case IPP_TAG_ENUM :
+	      sprintf(valptr, "%d", attr->values[i].integer);
+	      break;
+
+	  case IPP_TAG_BOOLEAN :
+	      sprintf(valptr, "%d", attr->values[i].boolean);
+	      break;
+
+	  case IPP_TAG_NOVALUE :
+	      strcat(valptr, "novalue");
+	      break;
+
+	  case IPP_TAG_RANGE :
+	      sprintf(valptr, "%d-%d", attr->values[i].range.lower,
+		      attr->values[i].range.upper);
+	      break;
+
+	  case IPP_TAG_RESOLUTION :
+	      sprintf(valptr, "%dx%d%s", attr->values[i].resolution.xres,
+		      attr->values[i].resolution.yres,
+		      attr->values[i].resolution.units == IPP_RES_PER_INCH ?
+			  "dpi" : "dpc");
+	      break;
+
+	  case IPP_TAG_URI :
+	      if (strncmp(attr->values[i].string.text, "ipp:", 4) == 0)
+	      {
+	        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);
+
+		strcat(valptr, uri);
+	        break;
+	      }
+
+          case IPP_TAG_STRING :
+	  case IPP_TAG_TEXT :
+	  case IPP_TAG_NAME :
+	  case IPP_TAG_KEYWORD :
+	  case IPP_TAG_CHARSET :
+	  case IPP_TAG_LANGUAGE :
+	      strcat(valptr, attr->values[i].string.text);
+	      break;
+	}
+      }
+
+     /*
+      * Add the element...
+      */
+
+      cgiSetArray(name, element, value);
+    }
+
+    if (attr == NULL)
+      break;
+  }
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,54 @@
+/*
+ * "$Id$"
+ *
+ *   IPP variable definitions for the Common UNIX Printing System (CUPS).
+ *
+ *   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
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE.txt" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include <ctype.h>
+#include <cups/cups.h>
+#include <cups/debug.h>
+#include <cups/language.h>
+#include <cups/string.h>
+#include "cgi.h"
+
+
+/*
+ * Definitions...
+ */
+
+/*#define TEMPLATES	"/home/mike/c/cups/templates"*/
+#define TEMPLATES	CUPS_DATADIR "/templates"
+
+
+/*
+ * Prototype...
+ */
+
+extern void	ippSetCGIVars(ipp_t *response);
+
+
+/*
+ * End of "$Id$".
+ */
@@ -3,7 +3,7 @@
 *
 *   Job status CGI for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-1999 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,30 +23,14 @@
 *
 * Contents:
 *
- *   main()          - Main entry for CGI.
- *   show_job_list() - Show a list of jobs...
- *   show_job_info() - Show job information.
+ *   main() - Main entry for CGI.
 */

 /*
 * Include necessary headers...
 */

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


 /*
@@ -58,9 +42,17 @@ main(int  argc,			/* I - Number of command-line arguments */
     char *argv[])		/* I - Command-line arguments */
 {
  cups_lang_t	*language;	/* Language information */
-  char		*job;		/* Job name */
  http_t	*http;		/* Connection to the server */
+  const char	*which_jobs;	/* Which jobs to show */
+  ipp_t		*request,	/* IPP request */
+		*response;	/* IPP response */
+ 

+ /*
+  * Get any form variables...
+  */
+
+  cgiInitialize();

 /*
  * Get the request language...
@@ -80,75 +72,53 @@ main(int  argc,			/* I - Number of command-line arguments */

  printf("Content-Type: text/html;charset=%s\n\n", cupsLangEncoding(language));

- /*
-  * See if we need to show a list of jobs or the status of a
-  * single job...
-  */
+  cgiSetVariable("TITLE", "Jobs");
+  cgiSetVariable("SERVER_NAME", getenv("SERVER_NAME"));
+  cgiSetVariable("REMOTE_USER", getenv("REMOTE_USER"));
+  cgiSetVariable("CUPS_VERSION", CUPS_SVERSION);

-  job = argv[0];
-  if (strcmp(job, "/") == 0 || strcmp(job, "jobs.cgi") == 0)
-    job = NULL;
+  cgiCopyTemplateFile(stdout, TEMPLATES "/header.tmpl");

 /*
-  * Print the standard header...
+  * Build an IPP_GET_JOBS request, which requires the following
+  * attributes:
+  *
+  *    attributes-charset
+  *    attributes-natural-language
+  *    printer-uri
  */

-  puts("<HTML>");
-  puts("<HEAD>");
-  if (job)
-    puts("<META HTTP-EQUIV=\"Refresh\" CONTENT=\"10\">");
-  else
-    puts("<META HTTP-EQUIV=\"Refresh\" CONTENT=\"30\">");
-  printf("<TITLE>%s on %s - Common UNIX Printing System</TITLE>\n",
-         job == NULL ? "Jobs" : job, getenv("SERVER_NAME"));
-  puts("<LINK REL=STYLESHEET TYPE=\"text/css\" HREF=\"/cups.css\">");
-  puts("<MAP NAME=\"navbar\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"10,10,85,30\" HREF=\"/printers\" ALT=\"Current Printer Status\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"95,10,175,30\" HREF=\"/classes\" ALT=\"Current Printer Classes Status\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"185,10,235,30\" HREF=\"/jobs\" ALT=\"Current Jobs Status\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"245,10,395,30\" HREF=\"/documentation.html\" ALT=\"Read CUPS Documentation On-Line\">");
-#ifdef ESPPRINTPRO
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"405,10,490,30\" HREF=\"http://www.easysw.com/printpro/software.html\" ALT=\"Download the Current ESP Print Pro Software\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"505,10,585,30\" HREF=\"http://www.easysw.com/printpro/support.html\" ALT=\"Get Tech Support for Current ESP Print Pro\">");
-#else
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"405,10,490,30\" HREF=\"http://www.cups.org\" ALT=\"Download the Current CUPS Software\">");
-#endif /* ESPPRINTPRO */
-  puts("</MAP>");
-  puts("</HEAD>");
-  puts("<BODY>");
-  puts("<P ALIGN=CENTER>");
-  puts("<A HREF=\"http://www.easysw.com\" ALT=\"Easy Software Products Home Page\">");
-  puts("<IMG SRC=\"/images/logo.gif\" WIDTH=\"71\" HEIGHT=\"40\" BORDER=0 ALT=\"Easy Software Products Home Page\"></A>");
-#ifdef ESPPRINTPRO
-  puts("<IMG SRC=\"/images/navbar.gif\" WIDTH=\"600\" HEIGHT=\"40\" USEMAP=\"#navbar\" BORDER=0>");
-#else
-  puts("<IMG SRC=\"/images/navbar.gif\" WIDTH=\"540\" HEIGHT=\"40\" USEMAP=\"#navbar\" BORDER=0>");
-#endif /* ESPPRINTPRO */
+  request = ippNew();

-  fflush(stdout);
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+               "attributes-charset", NULL, cupsLangEncoding(language));
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+               "attributes-natural-language", NULL, language->language);
+
+  request->request.op.operation_id = IPP_GET_JOBS;
+  request->request.op.request_id   = 1;
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri", NULL,
+               "ipp://localhost/jobs");
+
+  if ((which_jobs = cgiGetVariable("which_jobs")) != NULL)
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "which-jobs",
+                 NULL, which_jobs);

 /*
-  * Show the information...
+  * Do the request and get back a response...
  */

-  if (job == NULL)
-    show_job_list(http, language);
-  else
-    show_job_info(http, language, job);
+  if ((response = cupsDoRequest(http, request, "/")) != NULL)
+  {
+    ippSetCGIVars(response);
+    ippDelete(response);

- /*
-  * Write a standard trailer...
-  */
+    cgiCopyTemplateFile(stdout, TEMPLATES "/jobs.tmpl");
+  }

-  puts("<HR>");
-
-  puts("<P>The Common UNIX Printing System, CUPS, and the CUPS logo are the");
-  puts("trademark property of <A HREF=\"http://www.easysw.com\">Easy Software");
-  puts("Products</A>. CUPS is copyright 1997-1999 by Easy Software Products,");
-  puts("All Rights Reserved.");
-
-  puts("</BODY>");
-  puts("</HTML>");
+  cgiCopyTemplateFile(stdout, TEMPLATES "/trailer.tmpl");

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


-/*
- * 'show_job_list()' - Show a list of jobs...
- */
-
-static void
-show_job_list(http_t      *http,	/* I - HTTP connection */
-              cups_lang_t *language)	/* I - Client's language */
-{
-  ipp_t		*request,	/* IPP request */
-		*response;	/* IPP response */
-  ipp_attribute_t *attr;	/* IPP attribute */
-  char		*job_uri,	/* job-uri */
-		*printer_uri,	/* job-printer-uri */
-		*job_name,	/* job-name */
-		*job_user;	/* job-originating-user-name */
-  int		job_id,		/* job-id */
-		job_priority,	/* job-priority */
-		job_k_octets,	/* job-k-octets */
-		copies;		/* copies */
-  ipp_jstate_t	job_state;	/* job-state */
-
-
-  printf("<H1>Jobs on %s</H1>\n", getenv("SERVER_NAME"));
-
- /*
-  * Build an IPP_GET_JOBS request, which requires the following
-  * attributes:
-  *
-  *    attributes-charset
-  *    attributes-natural-language
-  *    job-uri
-  */
-
-  request = ippNew();
-
-  request->request.op.operation_id = IPP_GET_JOBS;
-  request->request.op.request_id   = 1;
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-               "attributes-charset", NULL, cupsLangEncoding(language));
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-               "attributes-natural-language", NULL, language->language);
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri",
-               NULL, "ipp://localhost/jobs/");
-
- /*
-  * Do the request and get back a response...
-  */
-
-  if ((response = cupsDoRequest(http, request, "/jobs/")) != NULL)
-  {
-   /*
-    * Do a table for the jobs...
-    */
-
-    puts("<CENTER>");
-    puts("<TABLE WIDTH=\"90%\" BORDER=\"1\">");
-    puts("<TR>");
-    printf("<TH>%s</TH>\n", cupsLangString(language, CUPS_MSG_PRINT_JOBS));
-    printf("<TH>%s</TH>\n", cupsLangString(language, CUPS_MSG_JOB_STATE));
-    printf("<TH>%s</TH>\n", cupsLangString(language, CUPS_MSG_JOB_NAME));
-    printf("<TH>%s</TH>\n", cupsLangString(language, CUPS_MSG_USER_NAME));
-    printf("<TH>%s</TH>\n", cupsLangString(language, CUPS_MSG_PRIORITY));
-    printf("<TH>%s</TH>\n", cupsLangString(language, CUPS_MSG_COPIES));
-    printf("<TH>%s</TH>\n", cupsLangString(language, CUPS_MSG_FILE_SIZE));
-    puts("</TR>");
-
-   /*
-    * Loop through the jobs returned in the list and display
-    * their devices...
-    */
-
-    for (attr = response->attrs; attr != NULL; attr = attr->next)
-    {
-     /*
-      * Skip leading attributes until we hit a job...
-      */
-
-      while (attr != NULL && attr->group_tag != IPP_TAG_JOB)
-        attr = attr->next;
-
-      if (attr == NULL)
-        break;
-
-     /*
-      * Show the job status for each job...
-      */
-
-      job_uri      = NULL;
-      printer_uri  = NULL;
-      job_name     = "unknown";
-      job_user     = "unknown";
-      job_id       = 0;
-      job_priority = 50;
-      job_k_octets = 0;
-      copies       = 1;
-      job_state    = IPP_JOB_PENDING;
-
-      while (attr != NULL && attr->group_tag == IPP_TAG_JOB)
-      {
-        if (strcmp(attr->name, "job-uri") == 0 &&
-	    attr->value_tag == IPP_TAG_URI)
-	  job_uri = attr->values[0].string.text;
-
-        if (strcmp(attr->name, "job-printer-uri") == 0 &&
-	    attr->value_tag == IPP_TAG_URI)
-	  printer_uri = attr->values[0].string.text;
-
-        if (strcmp(attr->name, "job-name") == 0 &&
-	    attr->value_tag == IPP_TAG_NAME)
-	  job_name = attr->values[0].string.text;
-
-        if (strcmp(attr->name, "job-originating-user-name") == 0 &&
-	    attr->value_tag == IPP_TAG_NAME)
-	  job_user = attr->values[0].string.text;
-
-        if (strcmp(attr->name, "job-id") == 0 &&
-	    attr->value_tag == IPP_TAG_INTEGER)
-	  job_id = attr->values[0].integer;
-
-        if (strcmp(attr->name, "job-priority") == 0 &&
-	    attr->value_tag == IPP_TAG_INTEGER)
-	  job_priority = attr->values[0].integer;
-
-        if (strcmp(attr->name, "job-k-octets") == 0 &&
-	    attr->value_tag == IPP_TAG_INTEGER)
-	  job_k_octets = attr->values[0].integer;
-
-        if (strcmp(attr->name, "copies") == 0 &&
-	    attr->value_tag == IPP_TAG_INTEGER)
-	  copies = attr->values[0].integer;
-
-        if (strcmp(attr->name, "job-state") == 0 &&
-	    attr->value_tag == IPP_TAG_ENUM)
-	  job_state = (ipp_jstate_t)attr->values[0].integer;
-
-        attr = attr->next;
-      }
-
-     /*
-      * See if we have everything needed...
-      */
-
-      if (job_id && job_uri != NULL && printer_uri != NULL)
-      {
-	puts("<TR>");
-	printf("<TD><A HREF=\"http://%s:%s/jobs/%d\">%s-%d</A></TD>\n",
-	       getenv("SERVER_NAME"), getenv("SERVER_PORT"), job_id,
-	       strrchr(printer_uri, '/') + 1, job_id);
-	printf("<TD>%s</TD>\n", job_state == IPP_JOB_PROCESSING ?
-	       cupsLangString(language, CUPS_MSG_PROCESSING) :
-	       cupsLangString(language, CUPS_MSG_PENDING));
-	printf("<TD>%s</TD>\n", job_name);
-	printf("<TD>%s</TD>\n", job_user);
-	printf("<TD>%d</TD>\n", job_priority);
-	printf("<TD>%d</TD>\n", copies);
-	printf("<TD>%dk</TD>\n", job_k_octets);
-	puts("</TR>");
-      }
-
-      if (attr == NULL)
-        break;
-    }
-
-    ippDelete(response);
-
-    puts("</TABLE>");
-    puts("</CENTER>");
-  }
-  else
-    puts("<P>No jobs found.");
-}
-
-
-/*
- * 'show_job_info()' - Show job information.
- */
-
-static void
-show_job_info(http_t      *http,	/* I - Server connection */
-              cups_lang_t *language,	/* I - Language */
-              char        *name)	/* I - Job "name" */
-{
-  int		i;		/* Looping var */
-  ipp_t		*request,	/* IPP request */
-		*response;	/* IPP response */
-  ipp_attribute_t *attr;	/* IPP attribute */
-  char		uri[HTTP_MAX_URI];/* Real URI */
-  char		*job_uri,	/* job-uri */
-		*printer_uri,	/* job-printer-uri */
-		*job_name,	/* job-name */
-		*job_user;	/* job-originating-user-name */
-  int		job_id,		/* job-id */
-		job_priority,	/* job-priority */
-		job_k_octets;	/* job-k-octets */
-  ipp_jstate_t	job_state;	/* job-state */
-
-
- /*
-  * Build an IPP_GET_JOB_ATTRIBUTES request, which requires the following
-  * attributes:
-  *
-  *    attributes-charset
-  *    attributes-natural-language
-  *    job-uri
-  */
-
-  request = ippNew();
-
-  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, cupsLangEncoding(language));
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-               "attributes-natural-language", NULL, language->language);
-
-  sprintf(uri, "ipp://localhost/jobs/%s", name);
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri", NULL, uri);
-
- /*
-  * Do the request and get back a response...
-  */
-
-  if ((response = cupsDoRequest(http, request, uri + 15)) == NULL)
-  {
-    puts("<P>Unable to communicate with CUPS server!");
-    return;
-  }
-
-  if (response->request.status.status_code == IPP_NOT_FOUND)
-  {
-    puts("<P>Job does not exist or has completed.");
-    ippDelete(response);
-    return;
-  }
-
- /*
-  * Get the job status for this job...
-  */
-
-  if ((attr = ippFindAttribute(response, "job-uri", IPP_TAG_URI)) != NULL)
-    job_uri = attr->values[0].string.text;
-  else
-  {
-    puts("<P>Missing job-uri attribute!");
-    ippDelete(request);
-    return;
-  }
-
-  if ((attr = ippFindAttribute(response, "job-printer-uri", IPP_TAG_URI)) != NULL)
-    printer_uri = attr->values[0].string.text;
-  else
-  {
-    puts("<P>Missing job-printer-uri attribute!");
-    ippDelete(request);
-    return;
-  }
-
-  if ((attr = ippFindAttribute(response, "job-name", IPP_TAG_NAME)) != NULL)
-    job_name = attr->values[0].string.text;
-  else
-    job_name = "unknown";
-
-  if ((attr = ippFindAttribute(response, "job-originating-user-name",
-                               IPP_TAG_NAME)) != NULL)
-    job_user = attr->values[0].string.text;
-  else
-    job_user = "unknown";
-
-  if ((attr = ippFindAttribute(response, "job-id", IPP_TAG_INTEGER)) != NULL)
-    job_id = attr->values[0].integer;
-  else
-  {
-    puts("<P>Missing job-id attribute!");
-    ippDelete(request);
-    return;
-  }
-
-  if ((attr = ippFindAttribute(response, "job-priority", IPP_TAG_INTEGER)) != NULL)
-    job_priority = attr->values[0].integer;
-  else
-    job_priority = 50;
-
-  if ((attr = ippFindAttribute(response, "job-k-octets", IPP_TAG_INTEGER)) != NULL)
-    job_k_octets = attr->values[0].integer;
-  else
-    job_k_octets = 0;
-
-  if ((attr = ippFindAttribute(response, "job-state", IPP_TAG_ENUM)) != NULL)
-    job_state = (ipp_jstate_t)attr->values[0].integer;
-  else
-    job_state = IPP_JOB_PENDING;
-
- /*
-  * Do a table for the job...
-  */
-
-  printf("<H1><A HREF=\"http://%s:%s/printers/%s\">%s-%d</A></H1>\n",
-	 getenv("SERVER_NAME"), getenv("SERVER_PORT"),
-	 strrchr(printer_uri, '/') + 1, strrchr(printer_uri, '/') + 1, job_id);
-
-  puts("<CENTER>");
-  puts("<TABLE WIDTH=\"90%\" BORDER=\"1\">");
-
-  puts("<TR>");
-  printf("<TH>%s</TH>\n", cupsLangString(language, CUPS_MSG_JOB_STATE));
-  printf("<TD>%s</TD>\n", job_state == IPP_JOB_PROCESSING ?
-	 cupsLangString(language, CUPS_MSG_PROCESSING) :
-	 cupsLangString(language, CUPS_MSG_PENDING));
-  puts("</TR>");
-
-  puts("<TR>");
-  printf("<TH>%s</TH>\n", cupsLangString(language, CUPS_MSG_JOB_NAME));
-  printf("<TD>%s</TD>\n", job_name);
-  puts("</TR>");
-
-  puts("<TR>");
-  printf("<TH>%s</TH>\n", cupsLangString(language, CUPS_MSG_USER_NAME));
-  printf("<TD>%s</TD>\n", job_user);
-  puts("</TR>");
-
-  puts("<TR>");
-  printf("<TH>%s</TH>\n", cupsLangString(language, CUPS_MSG_PRIORITY));
-  printf("<TD>%d</TD>\n", job_priority);
-  puts("</TR>");
-
-  puts("<TR>");
-  printf("<TH>%s</TH>\n", cupsLangString(language, CUPS_MSG_FILE_SIZE));
-  printf("<TD>%dk</TD>\n", job_k_octets);
-  puts("</TR>");
-
-  puts("<TR VALIGN=\"TOP\">");
-  printf("<TH>%s</TH>\n", cupsLangString(language, CUPS_MSG_OPTIONS));
-  puts("<TD>");
-
-  for (attr = response->attrs; attr != NULL; attr = attr->next)
-  {
-    if (attr->group_tag != IPP_TAG_JOB &&
-        attr->group_tag != IPP_TAG_EXTENSION)
-      continue;
-
-    if (strcmp(attr->name, "job-uri") == 0 ||
-        strcmp(attr->name, "job-printer-uri") == 0 ||
-        strcmp(attr->name, "job-name") == 0 ||
-        strcmp(attr->name, "job-originating-user-name") == 0 ||
-        strcmp(attr->name, "job-id") == 0 ||
-        strcmp(attr->name, "job-priority") == 0 ||
-        strcmp(attr->name, "job-k-octets") == 0 ||
-        strcmp(attr->name, "job-state") == 0)
-      continue;
-
-    if (attr->value_tag != IPP_TAG_BOOLEAN)
-      printf("%s=", attr->name);
-
-    for (i = 0; i < attr->num_values; i ++)
-    {
-      if (i)
-	putchar(',');
-
-      switch (attr->value_tag)
-      {
-	case IPP_TAG_INTEGER :
-	case IPP_TAG_ENUM :
-	    printf("%d", attr->values[i].integer);
-	    break;
-
-	case IPP_TAG_BOOLEAN :
-	    if (!attr->values[i].boolean)
-	      printf("no");
-
-	case IPP_TAG_NOVALUE :
-	    fputs(attr->name, stdout);
-	    break;
-
-	case IPP_TAG_RANGE :
-	    printf("%d-%d", attr->values[i].range.lower,
-		   attr->values[i].range.upper);
-	    break;
-
-	case IPP_TAG_RESOLUTION :
-	    printf("%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_STRING :
-	case IPP_TAG_TEXT :
-	case IPP_TAG_NAME :
-	case IPP_TAG_KEYWORD :
-	case IPP_TAG_CHARSET :
-	case IPP_TAG_LANGUAGE :
-	case IPP_TAG_MIMETYPE :
-	case IPP_TAG_URI :
-	    printf("\"%s\"", attr->values[i].string.text);
-	    break;
-      }
-    }
-
-    puts("<BR>");
-  }
-
-  puts("</TD>");
-  puts("</TR>");
-  puts("</TABLE></CENTER>");
-
-  ippDelete(response);
-}
-
-
 /*
 * End of "$Id$".
 */
@@ -3,7 +3,7 @@
 *
 *   Printer status CGI for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-1999 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,30 +23,14 @@
 *
 * Contents:
 *
- *   main()              - Main entry for CGI.
- *   show_printer_list() - Show a list of printers...
- *   show_printer_info() - Show printer information.
+ *   main() - Main entry for CGI.
 */

 /*
 * Include necessary headers...
 */

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


 /*
@@ -60,7 +44,18 @@ main(int  argc,			/* I - Number of command-line arguments */
  cups_lang_t	*language;	/* Language information */
  char		*printer;	/* Printer name */
  http_t	*http;		/* Connection to the server */
+  ipp_t		*request,	/* IPP request */
+		*response;	/* IPP response */
+  char		uri[HTTP_MAX_URI];
+				/* Printer URI */
+  const char	*which_jobs;	/* Which jobs to show */
+ 

+ /*
+  * Get any form variables...
+  */
+
+  cgiInitialize();

 /*
  * Get the request language...
@@ -87,81 +82,124 @@ main(int  argc,			/* I - Number of command-line arguments */

  printer = argv[0];
  if (strcmp(printer, "/") == 0 || strcmp(printer, "printers.cgi") == 0)
+  {
    printer = NULL;
-
- /*
-  * Print the standard header...
-  */
-
-  puts("<HTML>");
-  puts("<HEAD>");
-  if (printer)
-    puts("<META HTTP-EQUIV=\"Refresh\" CONTENT=\"10\">");
+    cgiSetVariable("TITLE", "Printers");
+  }
  else
-    puts("<META HTTP-EQUIV=\"Refresh\" CONTENT=\"30\">");
-  printf("<TITLE>%s on %s - Common UNIX Printing System</TITLE>\n",
-         printer == NULL ? "Printers" : printer, getenv("SERVER_NAME"));
-  puts("<LINK REL=STYLESHEET TYPE=\"text/css\" HREF=\"/cups.css\">");
-  puts("<MAP NAME=\"navbar\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"10,10,85,30\" HREF=\"/printers\" ALT=\"Current Printer Status\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"95,10,175,30\" HREF=\"/classes\" ALT=\"Current Printer Classes Status\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"185,10,235,30\" HREF=\"/jobs\" ALT=\"Current Jobs Status\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"245,10,395,30\" HREF=\"/documentation.html\" ALT=\"Read CUPS Documentation On-Line\">");
-#ifdef ESPPRINTPRO
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"405,10,490,30\" HREF=\"http://www.easysw.com/printpro/software.html\" ALT=\"Download the Current ESP Print Pro Software\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"505,10,585,30\" HREF=\"http://www.easysw.com/printpro/support.html\" ALT=\"Get Tech Support for Current ESP Print Pro\">");
-#else
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"405,10,490,30\" HREF=\"http://www.cups.org\" ALT=\"Download the Current CUPS Software\">");
-#endif /* ESPPRINTPRO */
-  puts("</MAP>");
-  puts("</HEAD>");
-  puts("<BODY>");
-  puts("<P ALIGN=CENTER>");
-  puts("<A HREF=\"http://www.easysw.com\" ALT=\"Easy Software Products Home Page\">");
-  puts("<IMG SRC=\"/images/logo.gif\" WIDTH=\"71\" HEIGHT=\"40\" BORDER=0 ALT=\"Easy Software Products Home Page\"></A>");
-#ifdef ESPPRINTPRO
-  puts("<IMG SRC=\"/images/navbar.gif\" WIDTH=\"600\" HEIGHT=\"40\" USEMAP=\"#navbar\" BORDER=0>");
-#else
-  puts("<IMG SRC=\"/images/navbar.gif\" WIDTH=\"540\" HEIGHT=\"40\" USEMAP=\"#navbar\" BORDER=0>");
-#endif /* ESPPRINTPRO */
-
-  printf("<H1>%s on %s</H1>\n", printer == NULL ? "Printers" : printer,
-         getenv("SERVER_NAME"));
-  fflush(stdout);
-
-  puts("<CENTER>");
-  puts("<TABLE WIDTH=\"90%\" BORDER=\"1\">");
-  puts("<TR>");
-  puts("<TH>Name</TH>");
-  puts("<TH WIDTH=\"50%\">Status</TH>");
-  puts("<TH WIDTH=\"25%\">Jobs</TH>");
-  puts("</TR>");
+    cgiSetVariable("TITLE", printer);

 /*
-  * Show the information...
+  * Get the printer info...
  */

+  request = ippNew();
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+               "attributes-charset", NULL, cupsLangEncoding(language));
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+               "attributes-natural-language", NULL, language->language);
+
  if (printer == NULL)
-    show_printer_list(http, language);
+  {
+   /*
+    * Build a CUPS_GET_PRINTERS request, which requires the following
+    * attributes:
+    *
+    *    attributes-charset
+    *    attributes-natural-language
+    */
+
+    request->request.op.operation_id = CUPS_GET_PRINTERS;
+    request->request.op.request_id   = 1;
+  }
  else
-    show_printer_info(http, language, printer);
+  {
+   /*
+    * Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the following
+    * attributes:
+    *
+    *    attributes-charset
+    *    attributes-natural-language
+    *    printer-uri
+    */
+
+    request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
+    request->request.op.request_id   = 1;
+
+    snprintf(uri, sizeof(uri), "ipp://%s/printers/%s", getenv("SERVER_NAME"),
+             printer);
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL,
+                 uri);
+  }

 /*
-  * Write a standard trailer...
+  * Do the request and get back a response...
  */

-  puts("</TABLE>");
-  puts("</CENTER>");
+  if ((response = cupsDoRequest(http, request, "/")) != NULL)
+  {
+    ippSetCGIVars(response);
+    ippDelete(response);
+  }

-  puts("<HR>");
+ /*
+  * Write the report...
+  */

-  puts("<P>The Common UNIX Printing System, CUPS, and the CUPS logo are the");
-  puts("trademark property of <A HREF=\"http://www.easysw.com\">Easy Software");
-  puts("Products</A>. CUPS is copyright 1997-1999 by Easy Software Products,");
-  puts("All Rights Reserved.");
+  cgiCopyTemplateFile(stdout, TEMPLATES "/header.tmpl");
+  cgiCopyTemplateFile(stdout, TEMPLATES "/printers.tmpl");

-  puts("</BODY>");
-  puts("</HTML>");
+ /*
+  * Get jobs for the specified printer if a printer has been chosen...
+  */
+
+  if (printer != NULL)
+  {
+   /*
+    * Build an IPP_GET_JOBS request, which requires the following
+    * attributes:
+    *
+    *    attributes-charset
+    *    attributes-natural-language
+    *    printer-uri
+    */
+
+    request = ippNew();
+
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+        	 "attributes-charset", NULL, cupsLangEncoding(language));
+
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+        	 "attributes-natural-language", NULL, language->language);
+
+    request->request.op.operation_id = IPP_GET_JOBS;
+    request->request.op.request_id   = 1;
+
+    snprintf(uri, sizeof(uri), "ipp://%s/printers/%s", getenv("SERVER_NAME"),
+             printer);
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL,
+                 uri);
+
+    if ((which_jobs = cgiGetVariable("which_jobs")) != NULL)
+      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "which-jobs",
+                   NULL, which_jobs);
+
+   /*
+    * Do the request and get back a response...
+    */
+
+    if ((response = cupsDoRequest(http, request, "/")) != NULL)
+    {
+      ippSetCGIVars(response);
+      ippDelete(response);
+
+      cgiCopyTemplateFile(stdout, TEMPLATES "/jobs.tmpl");
+    }
+  }
+
+  cgiCopyTemplateFile(stdout, TEMPLATES "/trailer.tmpl");

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


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

 install:
-	-$(MKDIR) $(SERVERROOT)/conf
+	-$(MKDIR) $(SERVERROOT)
 	for file in $(KEEP); do \
-		if test -e $(SERVERROOT)/conf/$$file ; then \
-			$(CP) $$file $(SERVERROOT)/conf/$$file.N ; \
+		if test -r $(SERVERROOT)/$$file ; then \
+			$(CP) $$file $(SERVERROOT)/$$file.N ; \
 		else \
-			$(CP) $$file $(SERVERROOT)/conf ; \
+			$(CP) $$file $(SERVERROOT) ; \
 		fi ; \
 	done
 	for file in $(REPLACE); do \
-		if test -e $(SERVERROOT)/conf/$$file ; then \
-			$(MV) $(SERVERROOT)/conf/$$file $(SERVERROOT)/conf/$$file.O ; \
+		if test -r $(SERVERROOT)/$$file ; then \
+			$(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
 		fi ; \
-		$(CP) $$file $(SERVERROOT)/conf ; \
+		$(CP) $$file $(SERVERROOT) ; \
 	done
+	if test -r /etc/printcap -a ! -r /etc/printcap.O; then \
+		$(CP) /etc/printcap /etc/printcap.O ; \
+	fi

 #
 # End of "$Id$".
@@ -1,5 +1,5 @@
 #
-# "$Id: classes.conf 333 1999-05-17 18:03:40Z mike $"
+# "$Id: classes.conf 678 1999-09-22 18:10:55Z mike $"
 #
 #   Sample class configuration file for the Common UNIX Printing System
 #   (CUPS) scheduler.
@@ -59,6 +59,13 @@

 #Location Room 101 in the activities building

+#
+# Accepting: is the class accepting jobs?
+#
+#Accepting Yes
+#Accepting No
+#
+
 #
 # Printer: adds a printer to the class.
 #
@@ -68,5 +75,5 @@
 #</Class>

 #
-# End of "$Id: classes.conf 333 1999-05-17 18:03:40Z mike $".
+# End of "$Id: classes.conf 678 1999-09-22 18:10:55Z mike $".
 #
@@ -1,250 +0,0 @@
-#
-# "$Id: cupsd.conf-personal 407 1999-06-17 20:02:43Z mike $"
-#
-#   Scheduler configuration file for ESP Print Personal.
-#
-
-########################################################################
-#                                                                      #
-# This is the CUPS configuration file.  If you are familiar with       #
-# Apache or any of the other popular web servers, we've followed the   #
-# same format.  Any configuration variable used here has the same      #
-# semantics as the corresponding variable in Apache.  If we need       #
-# different functionality then a different name is used to avoid       #
-# confusion...                                                         #
-#                                                                      #
-########################################################################
-
-#
-# Ports/addresses that we listen to.  The default port 631 is reserved
-# for the Internet Printing Protocol (IPP) and is what we use here.
-#
-# You can have multiple Listen lines to listen to more than one
-# port:
-#
-#    Listen 127.0.0.1:80
-#    Listen 127.0.0.1:631
-# 
-# For ESP Print Personal, we can only listen on the local host...
-#
-
-#Listen 127.0.0.1:80
-Listen 127.0.0.1:631
-
-#
-# User/Group: the user and group the server runs under.  Normally this
-# must be lp and sys, however you can configure things for another user
-# or group as needed.
-#
-# Note: the server must be run initially as root to support the
-# default IPP port of 631.  It changes users whenever an external
-# program is run...
-#
-
-User lp
-Group sys
-
-#
-# SystemGroup: the group name for "System" (printer administration)
-# access.
-#
-
-SystemGroup sys
-
-#
-# ServerName: the hostname of your server, as advertised to the world.
-# By default CUPS will use the hostname of the system.
-#
-
-#ServerName myhost.domain.com
-
-#
-# ServerAdmin: the email address to send all complaints/problems to.
-# By default CUPS will use "root@hostname".
-#
-
-#ServerAdmin root@your.domain.com
-
-#
-# ServerRoot: the root directory for the scheduler.
-# By default the compiled-in value.
-#
-
-#ServerRoot /var/cups
-
-#
-# AccessLog: the access log file; if this does not start with a leading /
-# then it is assumed to be relative to ServerRoot.  By default set to
-# "logs/access_log"
-#
-
-#AccessLog logs/access_log
-
-#
-# ErrorLog: the error log file; if this does not start with a leading /
-# then it is assumed to be relative to ServerRoot.  By default set to
-# "logs/error_log"
-#
-
-#ErrorLog logs/error_log
-
-#
-# PageLog: the page log file; if this does not start with a leading /
-# then it is assumed to be relative to ServerRoot.  By default set to
-# "logs/page_log"
-#
-
-#PageLog logs/page_log
-
-#
-# LogLevel: controls the number of messages logged to the ErrorLog
-# file and can be one of the following:
-#
-#     debug	Log everything.
-#     info      Log all requests and state changes.
-#     warn      Log errors and warnings.
-#     error     Log only errors.
-#     none      Log nothing.
-#
-
-LogLevel info
-
-#
-# MaxLogSize: controls the maximum size of each log file before they are
-# rotated.  Defaults to 1048576 (1MB).  Set to 0 to disable log rotating.
-#
-
-#MaxLogSize 0
-
-#
-# MaxRequestSize: controls the maximum size of print files.  Set to 0 to
-# disable this feature (defaults to 0.)
-#
-
-#MaxRequestSize 0
-
-#
-# HostNameLookups: whether or not to do lookups on IP addresses to get a
-# fully-qualified hostname.  This defaults to Off for performance reasons...
-#
-
-#HostNameLookups On
-
-#
-# Timeout: the timeout before requests time out.  Default is 300 seconds.
-#
-
-#Timeout 300
-
-#
-# KeepAlive: whether or not to support the Keep-Alive connection
-# option.  Default is on.
-#
-
-#KeepAlive On
-
-#
-# KeepAliveTimeout: the timeout before Keep-Alive connections are
-# automatically closed.  Default is 60 seconds.
-#
-
-#KeepAliveTimeout 60
-
-#
-# Browsing: not available in ESP Print Personal.
-#
-
-Browsing Off
-
-#
-# DocumentRoot: the root directory for HTTP documents that are served.
-# By default the compiled in directory.
-#
-
-#DocumentRoot /usr/share/cups/doc
-
-#
-# DefaultLanguage: the default language if not specified by the browser.
-# If not specified, the current locale is used.
-#
-
-#DefaultLanguage en
-
-#
-# DefaultCharset: the default character set to use. If not specified,
-# defaults to iso-8859-1.  Note that this can also be overridden in
-# HTML documents...
-#
-
-#DefaultCharset iso-8859-1
-
-#
-# RIPCache: the amount of memory that each RIP should use to cache
-# bitmaps.  The value can be any real number followed by "k" for
-# kilobytes, "m" for megabytes, "g" for gigabytes, or "t" for tiles
-# (1 tile = 256x256 pixels.)  Defaults to "32m" (32 megabytes).
-#
-
-#RIPCache: 32m
-
-#
-# Access permissions for each directory served by the scheduler.
-# Locations are relative to DocumentRoot...
-#
-# AuthType: the authorization to use; currently only "Basic" authorization is
-# supported.
-#
-# AuthClass: the authorization class; currently only "Anonymous", "User",
-# "System" (valid user belonging to group SystemGroup), and "Group"
-# (valid user belonging to the specified group) are supported.
-#
-# AuthGroupName: the group name for "Group" authorization.
-#
-# Order: the order of Allow/Deny processing.
-#
-# Allow: allows access from the specified hostname, domain, IP address, or
-# network.
-#
-# Deny: denies access from the specified hostname, domain, IP address, or
-# network.
-#
-
-<Location />
-</Location>
-
-<Location /printers>
-#
-# You may wish to limit access to printers and classes, either with Allow
-# and Deny lines, or by requiring a username and password.
-#
-
-## Require a username and password
-#AuthType Basic
-#AuthClass User
-
-## Restrict access to local domain
-#Order Deny,Allow
-#Deny From All
-#Allow From .mydomain.com
-</Location>
-
-<Location /admin>
-#
-# You definitely will want to limit access to the administration tools.
-# The default configuration requires a local connection from a user who
-# is a member of group "sys" to do any admin tasks.  You can change the
-# group name using the SystemGroup directive.
-#
-
-AuthType Basic
-AuthClass System
-
-## Restrict access to local domain
-Order Deny,Allow
-Deny From All
-Allow From 127.0.0.1
-</Location>
-
-#
-# End of "$Id: cupsd.conf-personal 407 1999-06-17 20:02:43Z mike $".
-#
@@ -1,313 +0,0 @@
-#
-# "$Id: cupsd.conf-professional 407 1999-06-17 20:02:43Z mike $"
-#
-#   Scheduler configuration file for ESP Print Professional.
-#
-
-########################################################################
-#                                                                      #
-# This is the CUPS configuration file.  If you are familiar with       #
-# Apache or any of the other popular web servers, we've followed the   #
-# same format.  Any configuration variable used here has the same      #
-# semantics as the corresponding variable in Apache.  If we need       #
-# different functionality then a different name is used to avoid       #
-# confusion...                                                         #
-#                                                                      #
-########################################################################
-
-#
-# Ports/addresses that we listen to.  The default port 631 is reserved
-# for the Internet Printing Protocol (IPP) and is what we use here.
-#
-# You can have multiple Port/Listen lines to listen to more than one
-# port or address, or to restrict access:
-#
-#    Port 80
-#    Port 631
-#    Listen hostname
-#    Listen hostname:80
-#    Listen hostname:631
-#    Listen 1.2.3.4
-#    Listen 1.2.3.4:631
-# 
-
-#Port 80
-Port 631
-
-#
-# User/Group: the user and group the server runs under.  Normally this
-# must be lp and sys, however you can configure things for another user
-# or group as needed.
-#
-# Note: the server must be run initially as root to support the
-# default IPP port of 631.  It changes users whenever an external
-# program is run...
-#
-
-User lp
-Group sys
-
-#
-# SystemGroup: the group name for "System" (printer administration)
-# access.
-#
-
-SystemGroup sys
-
-#
-# ServerName: the hostname of your server, as advertised to the world.
-# By default CUPS will use the hostname of the system.
-#
-
-#ServerName myhost.domain.com
-
-#
-# ServerAdmin: the email address to send all complaints/problems to.
-# By default CUPS will use "root@hostname".
-#
-
-#ServerAdmin root@your.domain.com
-
-#
-# ServerRoot: the root directory for the scheduler.
-# By default the compiled-in value.
-#
-
-#ServerRoot /var/cups
-
-#
-# AccessLog: the access log file; if this does not start with a leading /
-# then it is assumed to be relative to ServerRoot.  By default set to
-# "logs/access_log"
-#
-
-#AccessLog logs/access_log
-
-#
-# ErrorLog: the error log file; if this does not start with a leading /
-# then it is assumed to be relative to ServerRoot.  By default set to
-# "logs/error_log"
-#
-
-#ErrorLog logs/error_log
-
-#
-# PageLog: the page log file; if this does not start with a leading /
-# then it is assumed to be relative to ServerRoot.  By default set to
-# "logs/page_log"
-#
-
-#PageLog logs/page_log
-
-#
-# LogLevel: controls the number of messages logged to the ErrorLog
-# file and can be one of the following:
-#
-#     debug	Log everything.
-#     info      Log all requests and state changes.
-#     warn      Log errors and warnings.
-#     error     Log only errors.
-#     none      Log nothing.
-#
-
-LogLevel info
-
-#
-# MaxLogSize: controls the maximum size of each log file before they are
-# rotated.  Defaults to 1048576 (1MB).  Set to 0 to disable log rotating.
-#
-
-#MaxLogSize 0
-
-#
-# MaxRequestSize: controls the maximum size of print files.  Set to 0 to
-# disable this feature (defaults to 0.)
-#
-
-#MaxRequestSize 0
-
-#
-# HostNameLookups: whether or not to do lookups on IP addresses to get a
-# fully-qualified hostname.  This defaults to Off for performance reasons...
-#
-
-#HostNameLookups On
-
-#
-# Timeout: the timeout before requests time out.  Default is 300 seconds.
-#
-
-#Timeout 300
-
-#
-# KeepAlive: whether or not to support the Keep-Alive connection
-# option.  Default is on.
-#
-
-#KeepAlive On
-
-#
-# KeepAliveTimeout: the timeout before Keep-Alive connections are
-# automatically closed.  Default is 60 seconds.
-#
-
-#KeepAliveTimeout 60
-
-#
-# ImplicitClasses: whether or not to use implicit classes.
-#
-# Printer classes can be specified explicitly in the classes.conf
-# file, implicitly based upon the printers available on the LAN, or
-# both.
-#
-# When ImplicitClasses is On, printers on the LAN with the same name
-# (e.g. Acme-LaserPrint-1000) will be put into a class with the same
-# name. This allows you to setup multiple redundant queues on a LAN
-# without a lot of administrative difficulties.  If a user sends a
-# job to Acme-LaserPrint-1000, the job will go to the first available
-# queue.
-#
-# Enabled by default.
-#
-
-#ImplicitClasses On
-
-#
-# Browsing: whether or not to broadcast printer information to
-# other CUPS servers.  Enabled by default.
-#
-
-#Browsing On
-
-#
-# BrowseInterval: the time between browsing updates in seconds.  Default
-# is 30 seconds.
-#
-# Note that browsing information is sent whenever a printer's state changes
-# as well, so this represents the maximum time between updates.
-#
-
-#BrowseInterval 30
-
-#
-# BrowseTimeout: the timeout for network printers - if we don't
-# get an update within this time the printer will be removed
-# from the printer list.  This number definitely should not be
-# less the BrowseInterval value for obvious reasons.  Defaults
-# to 300 seconds.
-#
-
-#BrowseTimeout 300
-
-#
-# BrowsePort: the port used for UDP broadcasts.  By default this is
-# the IPP port; if you change this you need to do it on all servers.
-# Only one BrowsePort is recognized.
-#
-
-#BrowsePort 631
-
-#
-# BrowseAddress: specifies a broadcast address to be used.  By
-# default browsing information is broadcast to all active interfaces.
-#
-# Note: HP-UX 10.20 and earlier do not properly handle broadcast unless
-# you have a Class A, B, C, or D netmask (i.e. no CIDR support).
-#
-
-#BrowseAddress x.y.z.255
-#BrowseAddress x.y.255.255
-#BrowseAddress x.255.255.255
-
-#
-# DocumentRoot: the root directory for HTTP documents that are served.
-# By default the compiled in directory.
-#
-
-#DocumentRoot /usr/share/cups/doc
-
-#
-# DefaultLanguage: the default language if not specified by the browser.
-# If not specified, the current locale is used.
-#
-
-#DefaultLanguage en
-
-#
-# DefaultCharset: the default character set to use. If not specified,
-# defaults to iso-8859-1.  Note that this can also be overridden in
-# HTML documents...
-#
-
-#DefaultCharset iso-8859-1
-
-#
-# RIPCache: the amount of memory that each RIP should use to cache
-# bitmaps.  The value can be any real number followed by "k" for
-# kilobytes, "m" for megabytes, "g" for gigabytes, or "t" for tiles
-# (1 tile = 256x256 pixels.)  Defaults to "32m" (32 megabytes).
-#
-
-#RIPCache: 32m
-
-#
-# Access permissions for each directory served by the scheduler.
-# Locations are relative to DocumentRoot...
-#
-# AuthType: the authorization to use; currently only "Basic" authorization is
-# supported.
-#
-# AuthClass: the authorization class; currently only "Anonymous", "User",
-# "System" (valid user belonging to group SystemGroup), and "Group"
-# (valid user belonging to the specified group) are supported.
-#
-# AuthGroupName: the group name for "Group" authorization.
-#
-# Order: the order of Allow/Deny processing.
-#
-# Allow: allows access from the specified hostname, domain, IP address, or
-# network.
-#
-# Deny: denies access from the specified hostname, domain, IP address, or
-# network.
-#
-
-<Location />
-</Location>
-
-<Location /printers>
-#
-# You may wish to limit access to printers and classes, either with Allow
-# and Deny lines, or by requiring a username and password.
-#
-
-## Require a username and password
-#AuthType Basic
-#AuthClass User
-
-## Restrict access to local domain
-#Order Deny,Allow
-#Deny From All
-#Allow From .mydomain.com
-</Location>
-
-<Location /admin>
-#
-# You definitely will want to limit access to the administration tools.
-# The default configuration requires a local connection from a user who
-# is a member of group "sys" to do any admin tasks.  You can change the
-# group name using the SystemGroup directive.
-#
-
-AuthType Basic
-AuthClass System
-
-## Restrict access to local domain
-Order Deny,Allow
-Deny From All
-Allow From 127.0.0.1
-</Location>
-
-#
-# End of "$Id: cupsd.conf-professional 407 1999-06-17 20:02:43Z mike $".
-#
@@ -0,0 +1,2 @@
+# This is a dummy printcap file that is automatically generated by the
+# CUPS software for old applications that rely on it.
@@ -1,5 +1,5 @@
 #
-# "$Id: printers.conf 334 1999-05-17 18:11:26Z mike $"
+# "$Id: printers.conf 678 1999-09-22 18:10:55Z mike $"
 #
 #   Sample printer configuration file for the Common UNIX Printing System
 #   (CUPS) scheduler.
@@ -77,13 +77,20 @@
 # State: sets the initial state of the printer.  Can be one of the
 # following:
 #
-#     Idle    - Printer is available to accept new jobs.
+#     Idle    - Printer is available to print new jobs.
 #     Stopped - Printer is disabled but accepting new jobs.
 #

 #State Idle
+
+#
+# Accepting: is the printer accepting jobs?
+#
+#Accepting Yes
+#Accepting No
+
 #</Printer>

 #
-# End of "$Id: printers.conf 334 1999-05-17 18:11:26Z mike $".
+# End of "$Id: printers.conf 678 1999-09-22 18:10:55Z mike $".
 #
@@ -5,7 +5,7 @@
 *
 *   @configure_input@
 *
- *   Copyright 1997-1999 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
@@ -28,15 +28,20 @@
 * Version of software...
 */

-#define CUPS_SVERSION	"CUPS v1.0"
+#define CUPS_SVERSION	"CUPS v1.1b1"

 /*
 * Where are files stored?
 */

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

 /*
 * Do we have various image libraries?
@@ -62,6 +67,14 @@
 #undef HAVE_SYS_NDIR_H
 #undef HAVE_NDIR_H

+/*
+ * Do we have PAM stuff?
+ */
+
+#ifndef HAVE_LIBPAM
+#define HAVE_LIBPAM 0
+#endif /* !HAVE_LIBPAM */
+
 /*
 * Do we have <shadow.h>?
 */
@@ -82,6 +95,13 @@
 #undef HAVE_STRCASECMP
 #undef HAVE_STRNCASECMP

+/*
+ * Do we have the (v)snprintf() functions?
+ */
+
+#undef HAVE_SNPRINTF
+#undef HAVE_VSNPRINTF
+
 /*
 * What signal functions to use?
 */
@@ -3,7 +3,7 @@ dnl "$Id$"
 dnl
 dnl   Configuration script for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-1999 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
@@ -29,7 +29,7 @@ AC_PREFIX_DEFAULT(/usr)
 dnl Get the operating system and version number...

 uname=`uname`
-uversion=`uname -r | sed -e '1,$s/\.//g'`
+uversion=`uname -r | sed -e '1,$s/[[^0-9]]//g'`
 if test "$uname" = "IRIX64"; then
    uname="IRIX"
 fi
@@ -42,37 +42,42 @@ AC_SUBST(OPTIM)
 PICFLAG=1
 CFLAGS="${CFLAGS:=}"

-AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging [default=no]],[if eval "test x$enable_debug = xyes"; then
+AC_ARG_ENABLE(debug, [  --enable-debug        turn on debugging [default=no]],[if eval "test x$enable_debug = xyes"; then
 	OPTIM="-g "
 fi])
-AC_ARG_ENABLE(shared, [  --disable-shared         turn off shared libraries [default=no]])
-if test "$disable_shared" != "yes"; then
+AC_ARG_ENABLE(shared, [  --enable-shared        turn on shared libraries [default=yes]])
+if test "$enable_shared" != "no"; then
 	case "$uname" in
 		SunOS* | UNIX_S*)
-			LIBCUPS="libcups.so.1"
-			LIBCUPSIMAGE="libcupsimage.so.1"
+			LIBCUPS="libcups.so.2"
+			LIBCUPSIMAGE="libcupsimage.so.2"
 			DSO="\$(CC) -Wl,-h,\$@ -G \$(OPTIM) -o"
 			;;
 		HP-UX*)
-			LIBCUPS="libcups.sl.1"
-			LIBCUPSIMAGE="libcupsimage.sl.1"
+			LIBCUPS="libcups.sl.2"
+			LIBCUPSIMAGE="libcupsimage.sl.2"
 			DSO="ld -b -z +h \$@ -o"
 			;;
-		OSF1* | Linux* | FreeBSD*)
-			LIBCUPS="libcups.so.1"
-			LIBCUPSIMAGE="libcupsimage.so.1"
+		FreeBSD* | NetBSD* | OpenBSD*)
+			LIBCUPS="libcups.so.2"
+			LIBCUPSIMAGE="libcupsimage.so.2"
+			DSO="\$(CC) -Wl,-soname,\$@ -shared \$(OPTIM) -o"
+			;;
+		OSF1* | Linux*)
+			LIBCUPS="libcups.so.2"
+			LIBCUPSIMAGE="libcupsimage.so.2"
 			DSO="\$(CC) -Wl,-soname,\$@ -shared \$(OPTIM) -o"
 			;;
 		IRIX*)
-			LIBCUPS="libcups.so.1"
-			LIBCUPSIMAGE="libcupsimage.so.1"
+			LIBCUPS="libcups.so.2"
+			LIBCUPSIMAGE="libcupsimage.so.2"
 			DSO="\$(CC) -soname \$@ -shared \$(OPTIM) -o"
 			;;
 		*)
 			echo "Warning: shared libraries may not be supported.  Trying -shared"
 			echo "         option with compiler."
-			LIBCUPS="libcups.so.1"
-			LIBCUPSIMAGE="libcupsimage.so.1"
+			LIBCUPS="libcups.so.2"
+			LIBCUPSIMAGE="libcupsimage.so.2"
 			DSO="\$(CC) -Wl,-soname,\$@ -shared \$(OPTIM) -o"
 			;;
 	esac
@@ -83,6 +88,8 @@ else
 	DSO=":"
 fi

+AC_ARG_ENABLE(pam, [  --enable-pam        turn on PAM support [default=yes]])
+
 dnl Checks for programs...
 AC_PROG_AWK
 AC_PROG_CC
@@ -91,6 +98,7 @@ AC_PROG_RANLIB
 AC_PATH_PROG(AR,ar)
 AC_PATH_PROG(CHMOD,chmod)
 AC_PATH_PROG(CP,cp)
+AC_PATH_PROG(MV,mv)
 AC_PATH_PROG(NROFF,nroff)
 if test "$NROFF" = ""; then
    AC_PATH_PROG(GROFF,groff)
@@ -102,29 +110,8 @@ if test "$NROFF" = ""; then
 fi
 AC_PATH_PROG(HTMLDOC,htmldoc)
 AC_PATH_PROG(MKDIR,mkdir)
-AC_PATH_PROG(PACK,pack)
-if test "$PACK" = ""; then
-    AC_PATH_PROG(PACK,gzip)
-    if test "$PACK" = ""; then
-        PACK="echo"
-	CAT="dummy"
-    else
-        PACK="$PACK -fv9"
-	CAT="gz"
-    fi
-else
-    PACK="$PACK -f"
-    CAT="z"
-fi
-AC_SUBST(CAT)
 AC_PATH_PROG(RM,rm)
 AC_PATH_PROG(SED,sed)
-AC_PATH_PROG(SMBCLIENT,smbclient)
-if test "$SMBCLIENT" = ""; then
-    echo "Looking for smbclient in standard locations..."
-    AC_PATH_PROG(SMBCLIENT,smbclient,samba_not_detected,
-	/usr/samba/bin:/usr/local/samba/bin:/usr/freeware/samba/bin:/opt/samba/bin)
-fi

 dnl Architecture checks...
 AC_C_BIGENDIAN
@@ -133,6 +120,10 @@ dnl Check for libraries...
 AC_CHECK_LIB(c,crypt,LIBS="$LIBS",AC_CHECK_LIB(crypt,crypt))
 AC_CHECK_HEADER(crypt.h, AC_DEFINE(HAVE_CRYPT_H))
 AC_CHECK_LIB(sec,getspent)
+if test "$enable_pam" != "no"; then
+	AC_CHECK_LIB(dl,dlopen)
+	AC_CHECK_LIB(pam,pam_start)
+fi

 NETLIBS=""
 AC_SUBST(NETLIBS)
@@ -149,6 +140,11 @@ else
 	echo "Not using -lnsl since you are running IRIX."
 fi)

+dnl Save the current libraries since we don't want the image libraries
+dnl included with every program...
+SAVELIBS="$LIBS"
+
+dnl Check for image libraries...
 LIBJPEG=""
 LIBPNG=""
 LIBTIFF=""
@@ -159,18 +155,29 @@ AC_SUBST(LIBPNG)
 AC_SUBST(LIBTIFF)
 AC_SUBST(LIBZ)

-AC_CHECK_HEADER(jpeglib.h,
+AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
    AC_DEFINE(HAVE_LIBJPEG)
-    LIBJPEG="-ljpeg")
-AC_CHECK_HEADER(png.h,
+    LIBJPEG="-ljpeg"
+    LIBS="$LIBS -ljpeg")
+
+AC_CHECK_LIB(z, deflate,
+    AC_DEFINE(HAVE_LIBZ)
+    LIBZ="-lz"
+    LIBS="$LIBS -lz")
+
+dnl PNG library uses math library functions...
+AC_CHECK_LIB(m, pow)
+
+AC_CHECK_LIB(png, png_read_info,
    AC_DEFINE(HAVE_LIBPNG)
    LIBPNG="-lpng")
-AC_CHECK_HEADER(tiff.h,
+
+AC_CHECK_LIB(tiff, TIFFReadScanline,
    AC_DEFINE(HAVE_LIBTIFF)
    LIBTIFF="-ltiff")
-AC_CHECK_HEADER(zlib.h,
-    AC_DEFINE(HAVE_LIBZ)
-    LIBZ="-lz")
+
+dnl Restore original LIBS settings...
+LIBS="$SAVELIBS"

 dnl Checks for header files.
 AC_HEADER_STDC
@@ -181,6 +188,8 @@ dnl Checks for string functions.
 AC_CHECK_FUNCS(strdup)
 AC_CHECK_FUNCS(strcasecmp)
 AC_CHECK_FUNCS(strncasecmp)
+AC_CHECK_FUNCS(snprintf)
+AC_CHECK_FUNCS(vsnprintf)

 dnl Checks for signal functions.
 AC_CHECK_FUNCS(sigset)
@@ -191,9 +200,9 @@ AC_CHECK_FUNCS(waitpid)
 AC_CHECK_FUNCS(wait3)

 dnl Update compiler options...
-if test -n "$GXX"; then
+if test -n "$GXX" -o $uname = Linux; then
 	if test -z "$OPTIM"; then
-        	OPTIM="-O2"
+	       	OPTIM="-O2 -g3"
 	fi
 	if test $PICFLAG = 1; then
    		OPTIM="-fPIC $OPTIM"
@@ -202,7 +211,7 @@ else
 	case $uname in
        	IRIX*)
 			if test -z "$OPTIM"; then
-        			OPTIM="-O2"
+        			OPTIM="-O2 -g3"
 			fi
 			if test $uversion -ge 62; then
 				OPTIM="$OPTIM -n32 -mips3"
@@ -210,14 +219,14 @@ else
 			;;
 		HP-UX*)
 			if test -z "$OPTIM"; then
-				OPTIM="+O2"
+				OPTIM="+O2 -g3"
 			fi
 			OPTIM="-Ae $OPTIM"
 			;;
 		SunOS*)
 			# Solaris
 			if test -z "$OPTIM"; then
-				OPTIM="-O"
+				OPTIM="-O -g3"
 			fi
 			if test $PICFLAG = 1; then
 				OPTIM="-KPIC $OPTIM"
@@ -266,49 +275,74 @@ AC_SUBST(IMGLIBS)
 AC_SUBST(LIBCUPS)
 AC_SUBST(LIBCUPSIMAGE)

-dnl Fix "prefix" variable if it hasn't been specified...
-if test "$prefix" = "NONE"; then
+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="/usr/lib32"
+if test "$uname" = "IRIX" -a $uversion -ge 65; then
+	libdir="${prefix}/lib32"
 fi

-dnl CUPS_SERVERROOT needs special attention for the default location...
-if test "$prefix" = "/usr"; then
-	CUPS_SERVERROOT="/var/cups"
+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
-	CUPS_SERVERROOT="$prefix/var/cups"
+	CUPS_SERVERROOT='${prefix}/etc/cups'
+	CUPS_LOGDIR='${prefix}/log/cups'
+	CUPS_REQUESTS='${prefix}/spool/cups'
+
+	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
-AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$CUPS_SERVERROOT")
+
+CUPS_SERVERBIN='${prefix}/lib/cups'
+AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$prefix/lib/cups")
+
 AC_SUBST(CUPS_SERVERROOT)
+AC_SUBST(CUPS_SERVERBIN)
+AC_SUBST(CUPS_LOGDIR)
+AC_SUBST(CUPS_REQUESTS)

 dnl Set the CUPS_LOCALE directory...
 case "$uname" in
 	Linux)
-		CUPS_LOCALEDIR="$prefix/share/locale"
+		CUPS_LOCALEDIR='${prefix}/share/locale'
+		AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$prefix/share/locale")
 		;;

 	OSF1)
-		CUPS_LOCALEDIR="$prefix/lib/nls/msg"
+		CUPS_LOCALEDIR='${prefix}/lib/nls/msg'
+		AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$prefix/lib/nls/msg")
 		;;

 	*)
 		# This is the standard System V location...
-		CUPS_LOCALEDIR="$prefix/lib/locale"
+		CUPS_LOCALEDIR='${prefix}/lib/locale'
+		AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$prefix/lib/locale")
 		;;
 esac

-AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR")
 AC_SUBST(CUPS_LOCALEDIR)

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

+dnl Set the CUPS_DOCDIR directory...
+CUPS_DOCDIR='${datadir}/doc/cups'
+AC_DEFINE_UNQUOTED(CUPS_DOCDIR, "$prefix/share/doc/cups")
+AC_SUBST(CUPS_DOCDIR)
+
 AC_OUTPUT(Makedefs)

 dnl
@@ -15,6 +15,21 @@ 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>
@@ -0,0 +1,414 @@
+#
+# "$Id: cups.list 937 2000-02-28 19:18:57Z mike $"
+#
+#   ESP Package Manager (EPM) file list for the Common UNIX Printing
+#   System (CUPS).
+#
+#   Copyright 1997-2000 by Easy Software Products, all rights reserved.
+#
+#   These coded instructions, statements, and computer programs are the
+#   property of Easy Software Products and are protected by Federal
+#   copyright law.  Distribution and use rights are outlined in the file
+#   "LICENSE.txt" which should have been included with this file.  If this
+#   file is missing or damaged please contact Easy Software Products
+#   at:
+#
+#       Attn: CUPS Licensing Information
+#       Easy Software Products
+#       44141 Airport View Drive, Suite 204
+#       Hollywood, Maryland 20636-3111 USA
+#
+#       Voice: (301) 373-9603
+#       EMail: cups-info@cups.org
+#         WWW: http://www.cups.org
+#
+
+%product Common UNIX Printing System
+%copyright 1993-2000 by Easy Software Products, All Rights Reserved.
+%vendor Easy Software Products
+%license LICENSE.txt
+%readme README.txt
+%version 1.1b1
+%incompat printpro
+
+%system all
+# Server files
+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 0500 root sys /usr/sbin/cupsd scheduler/cupsd
+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/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 /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
+l 0555 root sys /usr/sbin/reject accept
+
+# User commands
+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 /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 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
+%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
+
+%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
+
+%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
+
+%system all
+f 0444 root sys /usr/share/cups/charsets/cp874 data/cp874
+f 0444 root sys /usr/share/cups/charsets/cp1250 data/cp1250
+f 0444 root sys /usr/share/cups/charsets/cp1251 data/cp1251
+f 0444 root sys /usr/share/cups/charsets/cp1252 data/cp1252
+f 0444 root sys /usr/share/cups/charsets/cp1253 data/cp1253
+f 0444 root sys /usr/share/cups/charsets/cp1254 data/cp1254
+f 0444 root sys /usr/share/cups/charsets/cp1255 data/cp1255
+f 0444 root sys /usr/share/cups/charsets/cp1256 data/cp1256
+f 0444 root sys /usr/share/cups/charsets/cp1257 data/cp1257
+f 0444 root sys /usr/share/cups/charsets/cp1258 data/cp1258
+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
+
+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/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/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
+f 0444 root sys /usr/share/cups/pstoraster/Fontmap pstoraster/Fontmap
+f 0444 root sys /usr/share/cups/pstoraster/gs_l2img.ps pstoraster/gs_l2img.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_pfile.ps pstoraster/gs_pfile.ps
+f 0444 root sys /usr/share/cups/pstoraster/pfbtogs.ps pstoraster/pfbtogs.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/gs_wan_e.ps pstoraster/gs_wan_e.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_sym_e.ps pstoraster/gs_sym_e.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_dbt_e.ps pstoraster/gs_dbt_e.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_iso_e.ps pstoraster/gs_iso_e.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_ttf.ps pstoraster/gs_ttf.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_pdf.ps pstoraster/gs_pdf.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_ccfnt.ps pstoraster/gs_ccfnt.ps
+f 0444 root sys /usr/share/cups/pstoraster/pdf_sec.ps pstoraster/pdf_sec.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_res.ps pstoraster/gs_res.ps
+f 0444 root sys /usr/share/cups/pstoraster/pdf_base.ps pstoraster/pdf_base.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_btokn.ps pstoraster/gs_btokn.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_diskf.ps pstoraster/gs_diskf.ps
+f 0444 root sys /usr/share/cups/pstoraster/pdf_2ps.ps pstoraster/pdf_2ps.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_kanji.ps pstoraster/gs_kanji.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/gs_type1.ps pstoraster/gs_type1.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_statd.ps pstoraster/gs_statd.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_typ42.ps pstoraster/gs_typ42.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_cidfn.ps pstoraster/gs_cidfn.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_dps1.ps pstoraster/gs_dps1.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_cmap.ps pstoraster/gs_cmap.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_fform.ps pstoraster/gs_fform.ps
+f 0444 root sys /usr/share/cups/pstoraster/pdf_main.ps pstoraster/pdf_main.ps
+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/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-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/classes.tmpl templates/classes.tmpl
+f 0444 root sys /usr/share/cups/templates/error.tmpl templates/error.tmpl
+f 0444 root sys /usr/share/cups/templates/header.tmpl templates/header.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/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-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/trailer.tmpl templates/trailer.tmpl
+
+# Config files
+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
+
+# Dummy printcap file for Digital UNIX and Linux...
+%system dunix linux
+%format !rpm
+f 0644 root sys /etc/printcap conf/printcap
+%system all
+%format all
+
+# Developer files
+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/ppd.h cups/ppd.h
+f 0444 root sys /usr/include/cups/raster.h filter/raster.h
+
+%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
+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/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/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
+
+# Man pages
+%system irix
+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/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/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/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
+f 0444 root sys /usr/man/man8/esplicense.8 man/esplicense.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/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 937 2000-02-28 19:18:57Z mike $".
+#
@@ -6,11 +6,11 @@
 #
 #   Linux chkconfig stuff:
 #
-#   chkconfig: 2345 60 60
+#   chkconfig: 02345 99 00
 #   description: Startup/shutdown script for the Common UNIX \
 #                Printing System (CUPS).
 #
-#   Copyright 1997-1999 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,7 @@

 # See what program to use for configuration stuff...
 case "`uname`" in
-	IRIX*)
+	IRIX* | Linux*)
 		IS_ON=/sbin/chkconfig
 		;;

@@ -64,6 +64,11 @@ case "`uname`" in
 		;;
 esac

+# Change to the root directory first, in case we are being run from a
+# CD-ROM installation script...
+
+cd /
+
 # Start or stop the CUPS server based upon the first argument to the script.
 case $1 in
 	start | restart | reload)
@@ -0,0 +1,116 @@
+#
+# "$Id: cups.spec 904 2000-02-18 17:48:09Z mike $"
+#
+#   RPM "spec" file for the Common UNIX Printing System (CUPS).
+#
+#   Original version by Jason McMullan <jmcc@ontv.com>.
+#
+#   Copyright 1999-2000 by Easy Software Products, all rights reserved.
+#
+#   These coded instructions, statements, and computer programs are the
+#   property of Easy Software Products and are protected by Federal
+#   copyright law.  Distribution and use rights are outlined in the file
+#   "LICENSE.txt" which should have been included with this file.  If this
+#   file is missing or damaged please contact Easy Software Products
+#   at:
+#
+#       Attn: CUPS Licensing Information
+#       Easy Software Products
+#       44141 Airport View Drive, Suite 204
+#       Hollywood, Maryland 20636-3111 USA
+#
+#       Voice: (301) 373-9603
+#       EMail: cups-info@cups.org
+#         WWW: http://www.cups.org
+#
+
+Summary: Common Unix Printing System
+Name: cups
+Version: 1.1a8
+Release: 0
+Copyright: GPL
+Group: System Environment/Daemons
+Source: ftp://ftp.easysw.com/pub/cups/beta/cups-1.1a8-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: /tmp/rpmbuild
+Conflicts: lpr
+
+%package devel
+Summary: Common Unix Printing System - development environment
+Group: Development/Libraries
+
+%description
+The Common UNIX Printing System provides a portable printing layer for 
+UNIX® operating systems. It has been developed by Easy Software Products 
+to promote a standard printing solution for all UNIX vendors and users. 
+CUPS provides the System V and Berkeley command-line interfaces. 
+
+%description devel
+The Common UNIX Printing System provides a portable printing layer for 
+UNIX® operating systems. This is the development package for creating
+additional printer drivers, and other CUPS services.
+
+%prep
+%setup
+
+%build
+./configure
+
+# If we got this far, all prerequisite libraries must be here.
+make
+
+%install
+# these lines just make sure the directory structure in the
+# RPM_BUILD_ROOT exists
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
+
+make prefix=$RPM_BUILD_ROOT/usr LOGDIR=$RPM_BUILD_ROOT/var/log/cups \
+	REQUESTS=$RPM_BUILD_ROOT/var/spool/cups \
+	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
+/sbin/chkconfig --add cups
+
+%preun
+/sbin/chkconfig --del cups
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+/etc/rc.d/init.d/cups
+%config /etc/cups/*
+%dir /etc/cups/certs
+%dir /etc/cups/interfaces
+%dir /etc/cups/ppd
+/usr/bin/*
+%%attr(4555,root,root) /usr/bin/lppasswd
+/usr/lib/*
+/usr/man/*
+/usr/sbin/*
+%dir /usr/share/cups
+/usr/share/cups/*
+%dir /usr/share/doc/cups
+/usr/share/doc/cups/*
+%dir /var/cups
+/usr/lib/cups/backend/*
+/usr/lib/cups/cgi-bin/*
+/usr/lib/cups/filter/*
+%dir /var/spool/cups
+%dir /var/log/cups
+
+%files devel
+%dir /usr/include/cups
+/usr/include/cups/*
+/usr/lib/*.a
+
+#
+# End of "$Id: cups.spec 904 2000-02-18 17:48:09Z mike $".
+#
@@ -3,7 +3,7 @@
 #
 #   Support library Makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-1999 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,22 +28,21 @@ include ../Makedefs
 # Object files...
 #

-LIBOBJS	=	emit.o filter.o http.o ipp.o language.o mark.o mime.o \
-		options.o page.o ppd.o raster.o string.o type.o usersys.o \
-		util.o
-OBJS	=	$(LIBOBJS) testhttp.o testmime.o testppd.o
+LIBOBJS	=	dest.o emit.o http.o ipp.o language.o mark.o md5.o options.o \
+		page.o ppd.o snprintf.o string.o usersys.o util.o
+OBJS	=	$(LIBOBJS) testhttp.o testppd.o

 #
 # Header files to install...
 #

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

 #
 # Targets in this directory...
 #

-TARGETS	=	$(LIBCUPS) testhttp testmime testppd
+TARGETS	=	$(LIBCUPS) testhttp testppd

 #
 # Make all targets...
@@ -68,17 +67,18 @@ install:	all
 	-$(MKDIR) $(LIBDIR)
 	$(CP) $(LIBCUPS) $(LIBDIR)
 	if test $(LIBCUPS) != "libcups.a"; then \
-		$(LN) $(LIBCUPS) `basename $(LIBCUPS) .1`; \
+		$(RM) `basename $(LIBCUPS) .2`; \
+		$(LN) $(LIBCUPS) `basename $(LIBCUPS) .2`; \
 	fi

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

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

 #
 # libcups.a
@@ -99,21 +99,20 @@ cups_C.h:	../locale/C/cups_C
 	$(RM) cups_C.h
 	$(AWK) '{print "\"" $$0 "\","}' < ../locale/C/cups_C > cups_C.h

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

 #
 # testhttp (dependency on static CUPS library is intentional)
@@ -123,17 +122,7 @@ testhttp:	testhttp.o libcups.a
 	echo Linking $@...
 	$(CC) $(LDFLAGS) -o $@ testhttp.o libcups.a $(NETLIBS)

-testhttp.o:	http.h ../Makedefs
-
-#
-# testmime (dependency on static CUPS library is intentional)
-#
-
-testmime:	testmime.o libcups.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testmime.o libcups.a
-
-testmime.o:	mime.h ../Makedefs
+testhttp.o:	http.h

 #
 # testppd (dependency on static CUPS library is intentional)
@@ -143,7 +132,9 @@ testppd:	testppd.o libcups.a
 	echo Linking $@...
 	$(CC) $(LDFLAGS) -o $@ testppd.o libcups.a $(NETLIBS)

-testppd.o:	ppd.h ../Makedefs
+testppd.o:	ppd.h
+
+$(OBJS):	../Makedefs ../config.h

 #
 # End of "$Id$".
@@ -64,7 +64,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\visualc" /I ".." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\visualc" /I ".." /I "../visualc" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -129,6 +129,10 @@ SOURCE=.\raster.c
 # End Source File
 # Begin Source File

+SOURCE=.\snprintf.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\string.c
 # End Source File
 # Begin Source File
@@ -3,7 +3,7 @@
 *
 *   API definitions for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-1999 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,6 @@
 */

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


@@ -79,29 +78,22 @@ enum					/* Not a typedef'd enum so we can OR */
  CUPS_PRINTER_OPTIONS = 0xfffc		/* ~(CLASS | REMOTE | IMPLICIT) */
 };

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

+typedef struct				/**** Destination ****/
+{
+  char		*name,			/* Printer or class name */
+		*instance;		/* Local instance name */
+  int		is_default;		/* Is this printer the default? */
+  int		num_options;		/* Number of options */
+  cups_option_t	*options;		/* Options */
+} cups_dest_t;

+  
 /*
 * Functions...
 */
@@ -114,10 +106,20 @@ extern int		cupsGetClasses(char ***classes);
 extern const char	*cupsGetDefault(void);
 extern const char	*cupsGetPPD(const char *printer);
 extern int		cupsGetPrinters(char ***printers);
+extern ipp_status_t	cupsLastError(void);
 extern int		cupsPrintFile(const char *printer, const char *filename,
 			              const char *title, int num_options,
 				      cups_option_t *options);
 extern char		*cupsTempFile(char *filename, int len);
+
+extern int		cupsAddDest(const char *name, const char *instance,
+			            int num_dests, cups_dest_t **dests);
+extern void		cupsFreeDests(int num_dests, cups_dest_t *dests);
+extern cups_dest_t	*cupsGetDest(const char *name, const char *instance,
+			             int num_dests, cups_dest_t *dests);
+extern int		cupsGetDests(cups_dest_t **dests);
+extern void		cupsSetDests(int num_dests, cups_dest_t *dests);
+
 extern int		cupsAddOption(const char *name, const char *value,
 			              int num_options, cups_option_t **options);
 extern void		cupsFreeOptions(int num_options, cups_option_t *options);
@@ -18,11 +18,11 @@
 "Cyan",
 "Magenta",
 "Yellow",
-"Copyright 1993-1999 by Easy Software Products, All Rights Reserved.",
+"Copyright 1993-2000 by Easy Software Products, All Rights Reserved.",
 "General",
 "Printer",
-"Image Options",
-"HP-GL/2 Options",
+"Image",
+"HP-GL/2",
 "Extra",
 "Document",
 "Other",
@@ -82,7 +82,7 @@
 "Stopped",
 "All",
 "Odd",
-"Even Pages",
+"Even",
 "Darker                     Lighter",
 "Media Size",
 "Media Type",
@@ -99,6 +99,15 @@
 "Pending",
 "Output Mode",
 "Resolution",
+"Text",
+"Pretty Print",
+"Margins",
+"Left",
+"Right",
+"Bottom",
+"Top",
+"Filename(s)",
+"Print",
 "400 Your browser sent a request that this server could not understand.",
 "This server could not verify that you are authorized to access the resource.",
 "You must pay to access this server.",
@@ -3,7 +3,7 @@
 *
 *   Debugging macros for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-1999 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
@@ -0,0 +1,455 @@
+/*
+ * "$Id$"
+ *
+ *   User-defined destination (and option) support for the Common UNIX
+ *   Printing System (CUPS).
+ *
+ *   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
+ *   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:
+ *
+ *   cupsAddDest()   - Add a destination to the list of destinations.
+ *   cupsFreeDests() - Free the memory used by the list of destinations.
+ *   cupsGetDest()   - Get the named destination from the list.
+ *   cupsGetDests()  - Get the list of destinations.
+ *   cupsSetDests()  - Set the list of destinations.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "cups.h"
+#include "string.h"
+#include <stdlib.h>
+
+
+/*
+ * Local functions...
+ */
+
+static int	cups_get_dests(const char *filename, int num_dests,
+		               cups_dest_t **dests);
+
+
+/*
+ * 'cupsAddDest()' - Add a destination to the list of destinations.
+ */
+
+int					/* O - New number of destinations */
+cupsAddDest(const char  *name,		/* I - Name of destination */
+            const char	*instance,	/* I - Instance of destination */
+            int         num_dests,	/* I - Number of destinations */
+            cups_dest_t **dests)	/* IO - Destinations */
+{
+  int		i;			/* Looping var */
+  cups_dest_t	*dest;			/* Destination pointer */
+
+
+  if (name == NULL || dests == NULL)
+    return (0);
+
+  if ((dest = cupsGetDest(name, instance, num_dests, *dests)) != NULL)
+    return (num_dests);
+
+ /*
+  * Add new destination...
+  */
+
+  if (num_dests == 0)
+    dest = malloc(sizeof(cups_dest_t));
+  else
+    dest = realloc(*dests, sizeof(cups_dest_t) * (num_dests + 1));
+
+  if (dest == NULL)
+    return (num_dests);
+
+  *dests = dest;
+
+  for (i = num_dests; i > 0; i --, dest ++)
+    if (strcasecmp(name, dest->name) < 0)
+      break;
+    else if (instance == NULL && dest->instance != NULL)
+      break;
+    else if (instance != NULL && dest->instance == NULL &&
+             strcasecmp(instance, dest->instance) < 0)
+      break;
+
+  if (i > 0)
+    memmove(dest + 1, dest, i * sizeof(cups_dest_t));
+
+  dest->name        = strdup(name);
+  dest->is_default  = 0;
+  dest->num_options = 0;
+  dest->options     = (cups_option_t *)0;
+
+  if (instance == NULL)
+    dest->instance = NULL;
+  else
+    dest->instance = strdup(instance);
+
+  return (num_dests + 1);
+}
+
+
+/*
+ * 'cupsFreeDests()' - Free the memory used by the list of destinations.
+ */
+
+void
+cupsFreeDests(int         num_dests,	/* I - Number of destinations */
+              cups_dest_t *dests)	/* I - Destinations */
+{
+  int		i;			/* Looping var */
+  cups_dest_t	*dest;			/* Current destination */
+
+
+  if (num_dests == 0 || dests == NULL)
+    return;
+
+  for (i = num_dests, dest = dests; i > 0; i --, dest ++)
+  {
+    free(dest->name);
+
+    if (dest->instance)
+      free(dest->instance);
+
+    cupsFreeOptions(dest->num_options, dest->options);
+  }
+
+  free(dests);
+}
+
+
+/*
+ * 'cupsGetDest()' - Get the named destination from the list.
+ */
+
+cups_dest_t *				/* O - Destination pointer or NULL */
+cupsGetDest(const char  *name,		/* I - Name of destination */
+            const char	*instance,	/* I - Instance of destination */
+            int         num_dests,	/* I - Number of destinations */
+            cups_dest_t *dests)		/* I - Destinations */
+{
+  int	comp;				/* Result of comparison */
+
+
+  if (name == NULL || num_dests == 0 || dests == NULL)
+    return (NULL);
+
+  while (num_dests > 0)
+  {
+    if ((comp = strcasecmp(name, dests->name)) < 0)
+      return (NULL);
+    else if (comp == 0)
+    {
+      if ((instance == NULL && dests->instance == NULL) ||
+          (instance != NULL && dests->instance != NULL &&
+	   strcasecmp(instance, dests->instance) == 0))
+	return (dests);
+    }
+
+    num_dests --;
+    dests ++;
+  }
+
+  return (NULL);
+}
+
+
+/*
+ * 'cupsGetDests()' - Get the list of destinations.
+ */
+
+int					/* O - Number of destinations */
+cupsGetDests(cups_dest_t **dests)	/* O - Destinations */
+{
+  int		i;			/* Looping var */
+  int		num_dests;		/* Number of destinations */
+  int		count;			/* Number of printers/classes */
+  char		**names;		/* Printer/class names */
+  cups_dest_t	*dest;			/* Destination pointer */
+  const char	*home;			/* HOME environment variable */
+  char		filename[1024];		/* Local ~/.lpoptions file */
+
+
+ /*
+  * Initialize destination array...
+  */
+
+  num_dests = 0;
+  *dests    = (cups_dest_t *)0;
+
+ /*
+  * Grab all available printers...
+  */
+
+  if ((count = cupsGetPrinters(&names)) > 0)
+  {
+    for (i = 0; i < count; i ++)
+    {
+      num_dests = cupsAddDest(names[i], NULL, num_dests, dests);
+      free(names[i]);
+    }
+
+    free(names);
+  }
+
+ /*
+  * Grab all available classes...
+  */
+      
+  if ((count = cupsGetClasses(&names)) > 0)
+  {
+    for (i = 0; i < count; i ++)
+    {
+      num_dests = cupsAddDest(names[i], NULL, num_dests, dests);
+      free(names[i]);
+    }
+
+    free(names);
+  }
+
+ /*
+  * Grab the default destination...
+  */
+
+  if ((dest = cupsGetDest(cupsGetDefault(), NULL, num_dests, *dests)) != NULL)
+    dest->is_default = 1;
+
+ /*
+  * Load the /etc/cups/lpoptions and ~/.lpoptions files...
+  */
+
+  num_dests = cups_get_dests(CUPS_SERVERROOT "/lpoptions", num_dests, dests);
+
+  if ((home = getenv("HOME")) != NULL)
+  {
+    snprintf(filename, sizeof(filename), "%s/.lpoptions", home);
+    num_dests = cups_get_dests(filename, num_dests, dests);
+  }
+
+ /*
+  * Return the number of destinations...
+  */
+
+  return (num_dests);
+}
+
+
+/*
+ * 'cupsSetDests()' - Set the list of destinations.
+ */
+
+void
+cupsSetDests(int         num_dests,	/* I - Number of destinations */
+             cups_dest_t *dests)	/* I - Destinations */
+{
+  int		i, j;			/* Looping vars */
+  cups_dest_t	*dest;			/* Current destination */
+  cups_option_t	*option;		/* Current option */
+  FILE		*fp;			/* File pointer */
+  const char	*home;			/* HOME environment variable */
+  char		filename[1024];		/* lpoptions file */
+
+
+ /*
+  * Figure out which file to write to...
+  */
+
+  if (getuid() == 0)
+    strcpy(filename, CUPS_SERVERROOT "/lpoptions");
+  else if ((home = getenv("HOME")) != NULL)
+    snprintf(filename, sizeof(filename), "%s/.lpoptions", home);
+  else
+    return;
+
+ /*
+  * Try to open the file...
+  */
+
+  if ((fp = fopen(filename, "w")) == NULL)
+    return;
+
+ /*
+  * Write each printer; each line looks like:
+  *
+  *    Dest name[/instance] options
+  *    Default name[/instance] options
+  */
+
+  for (i = num_dests, dest = dests; i > 0; i --, dest ++)
+    if (dest->instance != NULL || dest->num_options != 0 || dest->is_default)
+    {
+      fprintf(fp, "%s %s", dest->is_default ? "Default" : "Dest",
+              dest->name);
+      if (dest->instance)
+	fprintf(fp, "/%s", dest->instance);
+
+      for (j = dest->num_options, option = dest->options; j > 0; j --, option ++)
+	fprintf(fp, " %s=%s", option->name, option->value);
+
+      fputs("\n", fp);
+    }
+
+ /*
+  * Close the file and return...
+  */
+
+  fclose(fp);      
+}
+
+
+/*
+ * 'cups_get_dests()' - Get destinations from a file.
+ */
+
+static int				/* O - Number of destinations */
+cups_get_dests(const char  *filename,	/* I - File to read from */
+               int         num_dests,	/* I - Number of destinations */
+               cups_dest_t **dests)	/* IO - Destinations */
+{
+  int		i;			/* Looping var */
+  cups_dest_t	*dest;			/* Current destination */
+  FILE		*fp;			/* File pointer */
+  char		line[8192],		/* Line from file */
+		*lineptr,		/* Pointer into line */
+		*name,			/* Name of destination/option */
+		*instance;		/* Instance of destination */
+
+
+ /*
+  * Try to open the file...
+  */
+
+  if ((fp = fopen(filename, "r")) == NULL)
+    return (num_dests);
+
+ /*
+  * Read each printer; each line looks like:
+  *
+  *    Dest name[/instance] options
+  *    Default name[/instance] options
+  */
+
+  while (fgets(line, sizeof(line), fp) != NULL)
+  {
+   /*
+    * See what type of line it is...
+    */
+
+    if (strncasecmp(line, "dest", 4) == 0 && isspace(line[4]))
+      lineptr = line + 4;
+    else if (strncasecmp(line, "default", 7) == 0 && isspace(line[7]))
+      lineptr = line + 7;
+    else
+      continue;
+
+   /*
+    * Skip leading whitespace...
+    */
+
+    while (isspace(*lineptr))
+      lineptr ++;
+
+    if (!*lineptr)
+      continue;
+
+    name = lineptr;
+
+   /*
+    * Search for an instance...
+    */
+
+    while (!isspace(*lineptr) && *lineptr && *lineptr != '/')
+      lineptr ++;
+
+    if (!*lineptr)
+      continue;
+
+    if (*lineptr == '/')
+    {
+     /*
+      * Found an instance...
+      */
+
+      *lineptr++ = '\0';
+      instance = lineptr;
+
+     /*
+      * Search for an instance...
+      */
+
+      while (!isspace(*lineptr) && *lineptr)
+	lineptr ++;
+    }
+    else
+      instance = NULL;
+
+    *lineptr++ = '\0';
+
+   /*
+    * Add the destination...
+    */
+
+    num_dests = cupsAddDest(name, instance, num_dests, dests);
+
+    if ((dest = cupsGetDest(name, instance, num_dests, *dests)) == NULL)
+    {
+     /*
+      * Out of memory!
+      */
+
+      fclose(fp);
+      return (num_dests);
+    }
+
+   /*
+    * Add options until we hit the end of the line...
+    */
+
+    dest->num_options = cupsParseOptions(lineptr, dest->num_options,
+                                         &(dest->options));
+
+   /*
+    * Set this as default if needed...
+    */
+
+    if (strncasecmp(line, "default", 7) == 0)
+    {
+      for (i = 0; i < num_dests; i ++)
+        (*dests)[i].is_default = 0;
+
+      dest->is_default = 1;
+    }
+  }
+
+ /*
+  * Close the file and return...
+  */
+
+  fclose(fp);      
+
+  return (num_dests);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -3,7 +3,7 @@
 *
 *   PPD code emission routines for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-1999 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,8 +86,8 @@ ppdEmit(ppd_file_t    *ppd,		/* I - PPD file record */
        return (-1);
      }

-      if (strcmp(((ppd_option_t *)choices[i]->option)->keyword, "PageSize") == 0 &&
-          strcmp(choices[i]->choice, "Custom") == 0)
+      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
@@ -107,7 +107,7 @@ ppdEmit(ppd_file_t    *ppd,		/* I - PPD file record */
 	  */

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

@@ -3,7 +3,7 @@
 *
 *   HTTP routines for the Common UNIX Printing System (CUPS) scheduler.
 *
- *   Copyright 1997-1999 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2000 by Easy Software Products, all rights reserved.
 *
 *   These statusd instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -284,8 +284,7 @@ httpConnect(const char *host,	/* I - Host to connect to */
  * Copy the hostname and port and then "reconnect"...
  */

-  strcpy(http->hostname, host);
-  memset((char *)&(http->hostaddr), 0, sizeof(http->hostaddr));
+  strncpy(http->hostname, host, sizeof(http->hostname) - 1);
  memcpy((char *)&(http->hostaddr.sin_addr), hostaddr->h_addr, hostaddr->h_length);
  http->hostaddr.sin_family = hostaddr->h_addrtype;
 #ifdef WIN32
@@ -329,7 +328,15 @@ httpReconnect(http_t *http)	/* I - HTTP data */
  */

  if ((http->fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
+  {
+#if defined(WIN32) || defined(__EMX__)
+    http->error  = WSAGetLastError();
+#else
+    http->error  = errno;
+#endif /* WIN32 || __EMX__ */
+    http->status = HTTP_ERROR;
    return (-1);
+  }

 #ifdef FD_CLOEXEC
  fcntl(http->fd, F_SETFD, FD_CLOEXEC);	/* Close this socket when starting *
@@ -351,6 +358,13 @@ httpReconnect(http_t *http)	/* I - HTTP data */
  if (connect(http->fd, (struct sockaddr *)&(http->hostaddr),
              sizeof(http->hostaddr)) < 0)
  {
+#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
@@ -360,6 +374,9 @@ httpReconnect(http_t *http)	/* I - HTTP data */
    return (-1);
  }

+  http->error  = 0;
+  http->status = HTTP_CONTINUE;
+
  return (0);
 }

@@ -371,11 +388,11 @@ httpReconnect(http_t *http)	/* I - HTTP data */

 void
 httpSeparate(const char *uri,		/* I - Universal Resource Identifier */
-             char       *method,	/* O - Method (http, https, etc.) */
-	     char       *username,	/* O - Username */
-	     char       *host,		/* O - Hostname */
+             char       *method,	/* O - Method [32] (http, https, etc.) */
+	     char       *username,	/* O - Username [32] */
+	     char       *host,		/* O - Hostname [32] */
 	     int        *port,		/* O - Port number to use */
-             char       *resource)	/* O - Resource/filename */
+             char       *resource)	/* O - Resource/filename [1024] */
 {
  char	*ptr;			/* Pointer into string... */

@@ -405,7 +422,8 @@ httpSeparate(const char *uri,		/* I - Universal Resource Identifier */
  {
    if ((ptr = strchr(host, '/')) != NULL)
    {
-      strcpy(resource, ptr);
+      strncpy(resource, ptr, HTTP_MAX_URI - 1);
+      resource[HTTP_MAX_URI - 1] = '\0';
      *ptr = '\0';
    }
    else
@@ -420,7 +438,10 @@ httpSeparate(const char *uri,		/* I - Universal Resource Identifier */
      *port = strtol(uri, (char **)&uri, 10);

      if (*uri == '/')
-        strcpy(resource, uri);
+      {
+        strncpy(resource, uri, HTTP_MAX_URI - 1);
+        resource[HTTP_MAX_URI - 1] = '\0';
+      }
    }
    else
      *port = 0;
@@ -430,7 +451,10 @@ httpSeparate(const char *uri,		/* I - Universal Resource Identifier */
    return;
  }
  else
-    strcpy(method, host);
+  {
+    strncpy(method, host, 31);
+    method[31] = '\0';
+  }

 /*
  * If the method starts with less than 2 slashes then it is a local resource...
@@ -438,7 +462,9 @@ httpSeparate(const char *uri,		/* I - Universal Resource Identifier */

  if (strncmp(uri, "//", 2) != 0)
  {
-    strcpy(resource, uri);
+    strncpy(resource, uri, 1023);
+    resource[1023] = '\0';
+
    username[0] = '\0';
    host[0]     = '\0';
    *port       = 0;
@@ -453,7 +479,7 @@ httpSeparate(const char *uri,		/* I - Universal Resource Identifier */
    uri ++;

  ptr = host;
-  while (*uri != ':' && *uri != '@' && *uri != '/' && *uri != '\0')
+  while (!(*uri == ':' && isdigit(uri[1])) && *uri != '@' && *uri != '/' && *uri != '\0')
    *ptr ++ = *uri ++;

  *ptr = '\0';
@@ -464,9 +490,11 @@ httpSeparate(const char *uri,		/* I - Universal Resource Identifier */
    * Got a username...
    */

-    strcpy(username, host);
+    strncpy(username, host, 31);
+    username[31] = '\0';
    
    ptr = host;
+    uri ++;
    while (*uri != ':' && *uri != '/' && *uri != '\0')
      *ptr ++ = *uri ++;

@@ -475,18 +503,20 @@ httpSeparate(const char *uri,		/* I - Universal Resource Identifier */
  else
    username[0] = '\0';

-  if (*uri == '\0')
+  if (*uri != ':')
  {
-   /*
-    * Hostname but no port or path...
-    */
-
-    *port = 0;
-    resource[0] = '/';
-    resource[1] = '\0';
-    return;
+    if (strcasecmp(method, "http") == 0)
+      *port = 80;
+    else if (strcasecmp(method, "https") == 0)
+      *port = 443;
+    else if (strcasecmp(method, "ipp") == 0)	/* Not registered yet... */
+      *port = ippPort();
+    else if (strcasecmp(method, "socket") == 0)	/* Not registered yet... */
+      *port = 9100;
+    else
+      *port = 0;
  }
-  else if (*uri == ':')
+  else
  {
   /*
    * Parse port number...
@@ -500,29 +530,24 @@ httpSeparate(const char *uri,		/* I - Universal Resource Identifier */
      uri ++;
    }
  }
-  else
+
+  if (*uri == '\0')
  {
   /*
-    * Figure out the default port number based on the method...
+    * Hostname but no port or path...
    */

-    if (strcasecmp(method, "http") == 0)
-      *port = 80;
-    else if (strcasecmp(method, "https") == 0)
-      *port = 443;
-    else if (strcasecmp(method, "ipp") == 0)	/* Not registered yet... */
-      *port = ippPort();
-    else if (strcasecmp(method, "socket") == 0)	/* Not registered yet... */
-      *port = 9100;
-    else
-      *port = 0;
+    resource[0] = '/';
+    resource[1] = '\0';
+    return;
  }

 /*
  * The remaining portion is the resource string...
  */

-  strcpy(resource, uri);
+  strncpy(resource, uri, HTTP_MAX_URI - 1);
+  resource[HTTP_MAX_URI - 1] = '\0';
 }


@@ -666,12 +691,15 @@ httpRead(http_t *http,			/* I - HTTP data */
    return (0);

  if (http->data_encoding == HTTP_ENCODE_CHUNKED &&
-      http->data_remaining <= 0 &&
-      (http->state == HTTP_GET_SEND || http->state == HTTP_POST_RECV ||
-       http->state == HTTP_POST_SEND || http->state == HTTP_PUT_RECV))
+      http->data_remaining <= 0)
  {
+    DEBUG_puts("httpRead: Getting chunk length...");
+
    if (httpGets(len, sizeof(len), http) == NULL)
+    {
+      DEBUG_puts("httpRead: Could not get length!");
      return (0);
+    }

    http->data_remaining = strtol(len, NULL, 16);
  }
@@ -685,6 +713,9 @@ httpRead(http_t *http,			/* I - HTTP data */
    * data, go idle...
    */

+    if (http->data_encoding == HTTP_ENCODE_CHUNKED)
+      httpGets(len, sizeof(len), http);
+
    if (http->state == HTTP_POST_RECV)
      http->state ++;
    else
@@ -719,13 +750,25 @@ httpRead(http_t *http,			/* I - HTTP data */

  if (bytes > 0)
    http->data_remaining -= bytes;
+  else if (bytes < 0)
+#if defined(WIN32) || defined(__EMX__)
+    http->error = WSAGetLastError();
+#else
+    http->error = errno;
+#endif /* WIN32 || __EMX__ */

-  if (http->data_remaining == 0 && http->data_encoding != HTTP_ENCODE_CHUNKED)
+  if (http->data_remaining == 0)
  {
-    if (http->state == HTTP_POST_RECV)
-      http->state ++;
-    else
-      http->state = HTTP_WAITING;
+    if (http->data_encoding == HTTP_ENCODE_CHUNKED)
+      httpGets(len, sizeof(len), http);
+
+    if (http->data_encoding != HTTP_ENCODE_CHUNKED)
+    {
+      if (http->state == HTTP_POST_RECV)
+	http->state ++;
+      else
+	http->state = HTTP_WAITING;
+    }
  }

  return (bytes);
@@ -741,9 +784,8 @@ httpWrite(http_t     *http,		/* I - HTTP data */
          const char *buffer,		/* I - Buffer for data */
 	  int        length)		/* I - Number of bytes to write */
 {
-  int		tbytes,			/* Total bytes sent */
-		bytes;			/* Bytes sent */
-  char		len[32];		/* Length string */
+  int	tbytes,				/* Total bytes sent */
+	bytes;				/* Bytes sent */


  if (http == NULL || buffer == NULL)
@@ -751,28 +793,30 @@ httpWrite(http_t     *http,		/* I - HTTP data */

  http->activity = time(NULL);

-  if (http->data_encoding == HTTP_ENCODE_CHUNKED &&
-      (http->state == HTTP_GET_SEND || http->state == HTTP_POST_RECV ||
-       http->state == HTTP_POST_SEND || http->state == HTTP_PUT_RECV))
+  if (http->data_encoding == HTTP_ENCODE_CHUNKED)
  {
-    sprintf(len, "%x\r\n", length);
-    if (send(http->fd, len, strlen(len), 0) < 3)
+    if (httpPrintf(http, "%x\r\n", length) < 0)
      return (-1);
-  }

-  if (length == 0)
-  {
-   /*
-    * A zero-length chunk ends a transfer; unless we are sending POST
-    * data, go idle...
-    */
+    if (length == 0)
+    {
+     /*
+      * A zero-length chunk ends a transfer; unless we are sending POST
+      * data, go idle...
+      */

-    if (http->state == HTTP_POST_RECV)
-      http->state ++;
-    else
-      http->state = HTTP_WAITING;
+      DEBUG_puts("httpWrite: changing states...");

-    return (0);
+      if (http->state == HTTP_POST_RECV)
+	http->state ++;
+      else
+	http->state = HTTP_WAITING;
+
+      if (httpPrintf(http, "\r\n") < 0)
+	return (-1);
+
+      return (0);
+    }
  }

  tbytes = 0;
@@ -794,12 +838,18 @@ httpWrite(http_t     *http,		/* I - HTTP data */
      http->data_remaining -= bytes;
  }

+  if (http->data_encoding == HTTP_ENCODE_CHUNKED)
+    if (httpPrintf(http, "\r\n") < 0)
+      return (-1);
+
  if (http->data_remaining == 0 && http->data_encoding == HTTP_ENCODE_LENGTH)
  {
   /*
    * Finished with the transfer; unless we are sending POST data, go idle...
    */

+    DEBUG_puts("httpWrite: changing states...");
+
    if (http->state == HTTP_POST_RECV)
      http->state ++;
    else
@@ -825,7 +875,6 @@ httpGets(char   *line,			/* I - Line to read into */
 	*bufptr,			/* Pointer into input buffer */
 	*bufend;			/* Pointer to end of buffer */
  int	bytes;				/* Number of bytes read */
-  int	lasterror;			/* Last error received */


  DEBUG_printf(("httpGets(%08x, %d, %08x)\n", line, length, http));
@@ -837,8 +886,11 @@ httpGets(char   *line,			/* I - Line to read into */
  * Pre-scan the buffer and see if there is a newline in there...
  */

-  lasterror = 0;
-  errno     = 0;
+#if defined(WIN32) || defined(__EMX__)
+  WSASetLastError(0);
+#else
+  errno = 0;
+#endif /* WIN32 || __EMX__ */

  do
  {
@@ -863,19 +915,33 @@ httpGets(char   *line,			/* I - Line to read into */
 	* Nope, can't get a line this time...
 	*/

-        if (errno != lasterror && errno != ECONNRESET &&
-	    errno != ECONNABORTED && errno != ENETRESET)
+#if defined(WIN32) || defined(__EMX__)
+        if (WSAGetLastError() != http->error)
 	{
-	  lasterror = errno;
+	  http->error = WSAGetLastError();
+	  continue;
+	}
+
+        DEBUG_printf(("httpGets(): recv() error %d!\n", WSAGetLastError()));
+#else
+        if (errno != http->error)
+	{
+	  http->error = errno;
 	  continue;
 	}

        DEBUG_printf(("httpGets(): recv() error %d!\n", errno));
+#endif /* WIN32 || __EMX__ */

        return (NULL);
      }
      else if (bytes == 0)
+      {
+        if (http->blocking)
+	  http->error = EPIPE;
+
        return (NULL);
+      }

     /*
      * Yup, update the amount used and the end pointer...
@@ -943,7 +1009,7 @@ httpPrintf(http_t     *http,		/* I - HTTP data */


  va_start(ap, format);
-  bytes = vsprintf(buf, format, ap);
+  bytes = vsnprintf(buf, sizeof(buf), format, ap);
  va_end(ap);

  DEBUG_printf(("httpPrintf: %s", buf));
@@ -1031,7 +1097,7 @@ httpGetDateTime(const char *s)		/* I - Date/time string */
  int		hour, min, sec;		/* Time */


-  if (sscanf(s, "%*s%d%s%d%d:%d:%d", &day, mon, &year, &hour, &min, &sec) < 6)
+  if (sscanf(s, "%*s%d%15s%d%d:%d:%d", &day, mon, &year, &hour, &min, &sec) < 6)
    return (0);

  for (i = 0; i < 12; i ++)
@@ -1151,15 +1217,21 @@ httpUpdate(http_t *http)		/* I - HTTP data */
      httpSetField(http, field, value);
    }
    else
+    {
+      http->status = HTTP_ERROR;
      return (HTTP_ERROR);
+    }
  }

 /*
  * See if there was an error...
  */

-  if (errno)
+  if (http->error)
+  {
+    http->status = HTTP_ERROR;
    return (HTTP_ERROR);
+  }

 /*
  * If we haven't already returned, then there is nothing new...
@@ -1269,7 +1341,10 @@ httpEncode64(char       *out,	/* I - String to write to */

    in ++;
    if (*in == '\0')
+    {
+      *outptr ++ = '=';
      break;
+    }

    *outptr ++ = base64[((in[0] << 2) | (in[1] >> 6)) & 63];

@@ -1299,14 +1374,18 @@ httpEncode64(char       *out,	/* I - String to write to */
 int				/* O - Content length */
 httpGetLength(http_t *http)	/* I - HTTP data */
 {
+  DEBUG_printf(("httpGetLength(%08x)\n", http));
+
  if (strcasecmp(http->fields[HTTP_FIELD_TRANSFER_ENCODING], "chunked") == 0)
  {
+    DEBUG_puts("httpGetLength: chunked request!");
+
    http->data_encoding  = HTTP_ENCODE_CHUNKED;
    http->data_remaining = 0;
  }
  else
  {
-    http->data_encoding  = HTTP_ENCODE_LENGTH;
+    http->data_encoding = HTTP_ENCODE_LENGTH;

   /*
    * The following is a hack for HTTP servers that don't send a
@@ -1320,6 +1399,8 @@ httpGetLength(http_t *http)	/* I - HTTP data */
      http->data_remaining = 2147483647;
    else
      http->data_remaining = atoi(http->fields[HTTP_FIELD_CONTENT_LENGTH]);
+
+    DEBUG_printf(("httpGetLength: content_length = %d\n", http->data_remaining));
  }

  return (http->data_remaining);
@@ -1395,6 +1476,13 @@ http_send(http_t       *http,	/* I - HTTP data */

  *ptr = '\0';

+ /*
+  * See if we had an error the last time around; if so, reconnect...
+  */
+
+  if (http->status == HTTP_ERROR || http->status >= HTTP_BAD_REQUEST)
+    httpReconnect(http);
+
 /*
  * Send the request header...
  */
@@ -1407,20 +1495,8 @@ http_send(http_t       *http,	/* I - HTTP data */

  if (httpPrintf(http, "%s %s HTTP/1.1\r\n", codes[request], buf) < 1)
  {
-   /*
-    * Might have lost connection; try to reconnect...
-    */
-
-    if (httpReconnect(http))
-      return (-1);
-
-   /*
-    * OK, we've reconnected, send the request again...
-    */
-
-    if (httpPrintf(http, "%s %s HTTP/%d.%d\r\n", codes[request], buf,
-                   http->version / 100, http->version % 100) < 1)
-      return (-1);
+    http->status = HTTP_ERROR;
+    return (-1);
  }

  for (i = 0; i < HTTP_FIELD_MAX; i ++)
@@ -1429,11 +1505,17 @@ http_send(http_t       *http,	/* I - HTTP data */
      DEBUG_printf(("%s: %s\n", http_fields[i], http->fields[i]));

      if (httpPrintf(http, "%s: %s\r\n", http_fields[i], http->fields[i]) < 1)
-        return (-1);
+      {
+	http->status = HTTP_ERROR;
+	return (-1);
+      }
    }

  if (httpPrintf(http, "\r\n") < 1)
+  {
+    http->status = HTTP_ERROR;
    return (-1);
+  }

  httpClearFields(http);

@@ -4,7 +4,7 @@
 *   Hyper-Text Transport Protocol definitions for the Common UNIX Printing
 *   System (CUPS).
 *
- *   Copyright 1997-1999 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,8 @@
 #    include <netinet/tcp.h>
 #  endif /* WIN32 || __EMX__ */

+#  include "md5.h"
+

 /*
 * C++ magic...
@@ -124,6 +126,21 @@ typedef enum
 } http_encoding_t;


+/*
+ * HTTP authentication types...
+ */
+
+typedef enum
+{
+  HTTP_AUTH_NONE,		/* No authentication in use */
+  HTTP_AUTH_BASIC,		/* Basic authentication in use */
+  HTTP_AUTH_MD5,		/* Digest authentication in use */
+  HTTP_AUTH_MD5_SESS,		/* MD5-session authentication in use */
+  HTTP_AUTH_MD5_INT,		/* Digest authentication in use for body */
+  HTTP_AUTH_MD5_SESS_INT	/* MD5-session authentication in use for body */
+} http_auth_t;
+
+
 /*
 * HTTP status codes...
 */
@@ -221,6 +238,7 @@ typedef struct
 {
  int			fd;		/* File descriptor for this socket */
  int			blocking;	/* To block or not to block */
+  int			error;		/* Last error on read */
  time_t		activity;	/* Time since last read/write */
  http_state_t		state;		/* State of client */
  http_status_t		status;		/* Status of last request */
@@ -237,6 +255,11 @@ typedef struct
  int			used;		/* Number of bytes used in buffer */
  char			buffer[HTTP_MAX_BUFFER];
 					/* Buffer for messages */
+  int			auth_type;	/* Authentication in use */
+  md5_state_t		md5_state;	/* MD5 state */
+  char			nonce[HTTP_MAX_VALUE];
+					/* Nonce value */
+  int			nonce_count;	/* Nonce count */
 } http_t;


@@ -251,6 +274,7 @@ extern int		httpCheck(http_t *http);
 extern void		httpClose(http_t *http);
 extern http_t		*httpConnect(const char *host, int port);
 extern int		httpDelete(http_t *http, const char *uri);
+#  define		httpError(http) ((http)->error)
 extern void		httpFlush(http_t *http);
 extern int		httpGet(http_t *http, const char *uri);
 extern char		*httpGets(char *line, int length, http_t *http);
@@ -4,7 +4,7 @@
 *   Internet Printing Protocol support functions for the Common UNIX
 *   Printing System (CUPS).
 *
- *   Copyright 1997-1999 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,13 +38,14 @@
 *   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.
- *   add_attr()          - Add a new attribute to the request.
+ *   _ipp_add_attr()          - Add a new attribute to the request.
 *   ipp_read()          - Semi-blocking read on a HTTP connection...
 */

@@ -54,7 +55,8 @@

 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include "string.h"
+#include "language.h"

 #include "ipp.h"
 #include "debug.h"
@@ -64,8 +66,7 @@
 * Local functions...
 */

-static ipp_attribute_t	*add_attr(ipp_t *ipp, int num_values);
-static int		ipp_read(http_t *http, unsigned char *buffer, int length);
+static int	ipp_read(http_t *http, unsigned char *buffer, int length);


 /*
@@ -86,7 +87,7 @@ ippAddBoolean(ipp_t      *ipp,		/* I - IPP request */
  if (ipp == NULL || name == NULL)
    return (NULL);

-  if ((attr = add_attr(ipp, 1)) == NULL)
+  if ((attr = _ipp_add_attr(ipp, 1)) == NULL)
    return (NULL);

  attr->name              = strdup(name);
@@ -119,7 +120,7 @@ ippAddBooleans(ipp_t      *ipp,		/* I - IPP request */
  if (ipp == NULL || name == NULL)
    return (NULL);

-  if ((attr = add_attr(ipp, num_values)) == NULL)
+  if ((attr = _ipp_add_attr(ipp, num_values)) == NULL)
    return (NULL);

  attr->name      = strdup(name);
@@ -153,7 +154,7 @@ ippAddDate(ipp_t             *ipp,	/* I - IPP request */
  if (ipp == NULL || name == NULL || value == NULL)
    return (NULL);

-  if ((attr = add_attr(ipp, 1)) == NULL)
+  if ((attr = _ipp_add_attr(ipp, 1)) == NULL)
    return (NULL);

  attr->name      = strdup(name);
@@ -185,7 +186,7 @@ ippAddInteger(ipp_t      *ipp,		/* I - IPP request */
  if (ipp == NULL || name == NULL)
    return (NULL);

-  if ((attr = add_attr(ipp, 1)) == NULL)
+  if ((attr = _ipp_add_attr(ipp, 1)) == NULL)
    return (NULL);

  attr->name              = strdup(name);
@@ -216,7 +217,7 @@ ippAddIntegers(ipp_t      *ipp,		/* I - IPP request */
  if (ipp == NULL || name == NULL)
    return (NULL);

-  if ((attr = add_attr(ipp, num_values)) == NULL)
+  if ((attr = _ipp_add_attr(ipp, num_values)) == NULL)
    return (NULL);

  attr->name      = strdup(name);
@@ -249,7 +250,7 @@ ippAddString(ipp_t      *ipp,		/* I - IPP request */
  if (ipp == NULL || name == NULL)
    return (NULL);

-  if ((attr = add_attr(ipp, 1)) == NULL)
+  if ((attr = _ipp_add_attr(ipp, 1)) == NULL)
    return (NULL);

  attr->name                      = strdup(name);
@@ -282,7 +283,7 @@ ippAddStrings(ipp_t      *ipp,		/* I - IPP request */
  if (ipp == NULL || name == NULL)
    return (NULL);

-  if ((attr = add_attr(ipp, num_values)) == NULL)
+  if ((attr = _ipp_add_attr(ipp, num_values)) == NULL)
    return (NULL);

  attr->name      = strdup(name);
@@ -321,7 +322,7 @@ ippAddRange(ipp_t      *ipp,		/* I - IPP request */
  if (ipp == NULL || name == NULL)
    return (NULL);

-  if ((attr = add_attr(ipp, 1)) == NULL)
+  if ((attr = _ipp_add_attr(ipp, 1)) == NULL)
    return (NULL);

  attr->name                  = strdup(name);
@@ -353,7 +354,7 @@ ippAddRanges(ipp_t      *ipp,		/* I - IPP request */
  if (ipp == NULL || name == NULL)
    return (NULL);

-  if ((attr = add_attr(ipp, num_values)) == NULL)
+  if ((attr = _ipp_add_attr(ipp, num_values)) == NULL)
    return (NULL);

  attr->name                  = strdup(name);
@@ -389,7 +390,7 @@ ippAddResolution(ipp_t      *ipp,	/* I - IPP request */
  if (ipp == NULL || name == NULL)
    return (NULL);

-  if ((attr = add_attr(ipp, 1)) == NULL)
+  if ((attr = _ipp_add_attr(ipp, 1)) == NULL)
    return (NULL);

  attr->name                       = strdup(name);
@@ -423,7 +424,7 @@ ippAddResolutions(ipp_t      *ipp,	/* I - IPP request */
  if (ipp == NULL || name == NULL)
    return (NULL);

-  if ((attr = add_attr(ipp, num_values)) == NULL)
+  if ((attr = _ipp_add_attr(ipp, num_values)) == NULL)
    return (NULL);

  attr->name                       = strdup(name);
@@ -457,7 +458,7 @@ ippAddSeparator(ipp_t *ipp)		/* I - IPP request */
  if (ipp == NULL)
    return (NULL);

-  if ((attr = add_attr(ipp, 0)) == NULL)
+  if ((attr = _ipp_add_attr(ipp, 0)) == NULL)
    return (NULL);

  attr->group_tag = IPP_TAG_ZERO;
@@ -512,8 +513,6 @@ ippDateToTime(const ipp_uchar_t *date)	/* I - RFC 1903 date info */
  else
    t -= date[9] * 3600 + date[10] * 60;

-  t -= timezone;
-
  return (t);
 }

@@ -573,6 +572,83 @@ ippDelete(ipp_t *ipp)		/* I - IPP request */
 }


+/*
+ * 'ippErrorString()' - Return a textual message for the given error message.
+ */
+
+const char *				/* O - Text string */
+ippErrorString(ipp_status_t error)	/* I - Error status */
+{
+  static cups_lang_t	*language = 0;	/* Language info */
+
+
+ /*
+  * Load the localized message file as needed...
+  */
+
+  if (!language)
+    language = cupsLangDefault();
+
+ /*
+  * Return the appropriate message...
+  */
+
+  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_UNAVAILABLE :
+    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));
+  }
+
+  return ("ERROR");
+}
+
+
 /*
 * 'ippFindAttribute()' - Find a named attribute in a request...
 */
@@ -595,7 +671,7 @@ ippFindAttribute(ipp_t      *ipp,	/* I - IPP request */
    DEBUG_printf(("ippFindAttribute: attr = %08x, name = \'%s\'\n", attr,
                  attr->name));

-    if (attr->name != NULL && strcmp(attr->name, name) == 0 &&
+    if (attr->name != NULL && strcasecmp(attr->name, name) == 0 &&
        (attr->value_tag == type ||
 	 (attr->value_tag == IPP_TAG_TEXTLANG && type == IPP_TAG_TEXT) ||
 	 (attr->value_tag == IPP_TAG_NAMELANG && type == IPP_TAG_NAME)))
@@ -709,10 +785,27 @@ ippLength(ipp_t *ipp)		/* I - IPP request */
 }


+/*
+ * 'ippNew()' - Allocate a new IPP request.
+ */
+
 ipp_t *				/* O - New IPP request */
 ippNew(void)
 {
-  return ((ipp_t *)calloc(sizeof(ipp_t), 1));
+  ipp_t	*temp;			/* New IPP request */
+
+
+  if ((temp = (ipp_t *)calloc(sizeof(ipp_t), 1)) != NULL)
+  {
+   /*
+    * Default to IPP 1.1...
+    */
+
+    temp->request.any.version[0] = 1;
+    temp->request.any.version[1] = 1;
+  }
+
+  return (temp);
 }


@@ -803,7 +896,7 @@ ippRead(http_t *http,		/* I - HTTP data */
 	    ipp->state = IPP_DATA;
 	    break;
 	  }
-          else if (tag <= IPP_TAG_UNSUPPORTED)
+          else if (tag < IPP_TAG_UNSUPPORTED_VALUE)
 	  {
 	   /*
 	    * Group tag...  Set the current group and continue...
@@ -863,7 +956,7 @@ ippRead(http_t *http,		/* I - HTTP data */
 	    buffer[n] = '\0';
 	    DEBUG_printf(("ippRead: name = \'%s\'\n", buffer));

-	    attr = ipp->current = add_attr(ipp, IPP_MAX_VALUES);
+	    attr = ipp->current = _ipp_add_attr(ipp, IPP_MAX_VALUES);

 	    attr->group_tag  = ipp->curtag;
 	    attr->value_tag  = tag;
@@ -1064,8 +1157,8 @@ ippWrite(http_t *http,		/* I - HTTP data */

        bufptr = buffer;

-	*bufptr++ = 1;
-	*bufptr++ = 0;
+	*bufptr++ = ipp->request.any.version[0];
+	*bufptr++ = ipp->request.any.version[1];
 	*bufptr++ = ipp->request.any.op_status >> 8;
 	*bufptr++ = ipp->request.any.op_status;
 	*bufptr++ = ipp->request.any.request_id >> 24;
@@ -1208,6 +1301,17 @@ ippWrite(http_t *http,		/* I - HTTP data */
                  DEBUG_printf(("ippWrite: writing string = %d, \'%s\'\n", n,
 		                attr->values[i].string.text));

+                  if ((sizeof(buffer) - (bufptr - buffer)) < (n + 2))
+		  {
+                    if (httpWrite(http, (char *)buffer, bufptr - buffer) < 0)
+	            {
+	              DEBUG_puts("ippWrite: Could not write IPP attribute...");
+	              return (IPP_ERROR);
+	            }
+
+		    bufptr = buffer;
+		  }
+
 	          *bufptr++ = n >> 8;
 		  *bufptr++ = n;
 		  memcpy(bufptr, attr->values[i].string.text, n);
@@ -1311,18 +1415,50 @@ ippWrite(http_t *http,		/* I - HTTP data */
 		  }

                  n = strlen(attr->values[i].string.charset);
+
+                  if ((sizeof(buffer) - (bufptr - buffer)) < (n + 2))
+		  {
+                    if (httpWrite(http, (char *)buffer, bufptr - buffer) < 0)
+	            {
+	              DEBUG_puts("ippWrite: Could not write IPP attribute...");
+	              return (IPP_ERROR);
+	            }
+
+		    bufptr = buffer;
+		  }
+
 	          *bufptr++ = n >> 8;
 		  *bufptr++ = n;
 		  memcpy(bufptr, attr->values[i].string.charset, n);
 		  bufptr += n;

                  n = strlen(attr->values[i].string.text);
+
+                  if ((sizeof(buffer) - (bufptr - buffer)) < (n + 2))
+		  {
+                    if (httpWrite(http, (char *)buffer, bufptr - buffer) < 0)
+	            {
+	              DEBUG_puts("ippWrite: Could not write IPP attribute...");
+	              return (IPP_ERROR);
+	            }
+
+		    bufptr = buffer;
+		  }
+
 	          *bufptr++ = n >> 8;
 		  *bufptr++ = n;
 		  memcpy(bufptr, attr->values[i].string.text, n);
 		  bufptr += n;
 		}
 		break;
+
+            case IPP_TAG_UNSUPPORTED_VALUE :
+	    case IPP_TAG_DEFAULT :
+	    case IPP_TAG_UNKNOWN :
+	    case IPP_TAG_NOVALUE :
+	        *bufptr++ = 0;
+		*bufptr++ = 0;
+		break;
 	  }

         /*
@@ -1391,17 +1527,17 @@ ippPort(void)


 /*
- * 'add_attr()' - Add a new attribute to the request.
+ * '_ipp_add_attr()' - Add a new attribute to the request.
 */

-static ipp_attribute_t *		/* O - New attribute */
-add_attr(ipp_t *ipp,			/* I - IPP request */
-         int   num_values)		/* I - Number of values */
+ipp_attribute_t *		/* O - New attribute */
+_ipp_add_attr(ipp_t *ipp,	/* I - IPP request */
+              int   num_values)	/* I - Number of values */
 {
-  ipp_attribute_t	*attr;		/* New attribute */
+  ipp_attribute_t	*attr;	/* New attribute */


-  DEBUG_printf(("add_attr(%08x, %d)\n", ipp, num_values));
+  DEBUG_printf(("_ipp_add_attr(%08x, %d)\n", ipp, num_values));

  if (ipp == NULL || num_values < 0)
    return (NULL);
@@ -4,7 +4,7 @@
 *   Internet Printing Protocol definitions for the Common UNIX Printing
 *   System (CUPS).
 *
- *   Copyright 1997-1999 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
@@ -75,8 +75,8 @@ typedef enum			/**** Format tags for attribute formats... ****/
  IPP_TAG_JOB,
  IPP_TAG_END,
  IPP_TAG_PRINTER,
-  IPP_TAG_EXTENSION,
-  IPP_TAG_UNSUPPORTED = 0x10,
+  IPP_TAG_UNSUPPORTED_GROUP,
+  IPP_TAG_UNSUPPORTED_VALUE = 0x10,
  IPP_TAG_DEFAULT,
  IPP_TAG_UNKNOWN,
  IPP_TAG_NOVALUE,
@@ -144,7 +144,7 @@ typedef enum			/**** Job States.... */
  IPP_JOB_HELD,
  IPP_JOB_PROCESSING,
  IPP_JOB_STOPPED,
-  IPP_JOB_CANCELED,
+  IPP_JOB_CANCELLED,
  IPP_JOB_ABORTED,
  IPP_JOB_COMPLETED
 } ipp_jstate_t;
@@ -177,7 +177,7 @@ typedef enum			/**** IPP operations... ****/
  IPP_GET_JOB_ATTRIBUTES,
  IPP_GET_JOBS,
  IPP_GET_PRINTER_ATTRIBUTES,
-  IPP_HOLD_JOB = 0x000c,
+  IPP_HOLD_JOB,
  IPP_RELEASE_JOB,
  IPP_RESTART_JOB,
  IPP_PAUSE_PRINTER = 0x0010,
@@ -193,7 +193,9 @@ typedef enum			/**** IPP operations... ****/
  CUPS_DELETE_CLASS,
  CUPS_ACCEPT_JOBS,
  CUPS_REJECT_JOBS,
-  CUPS_SET_DEFAULT
+  CUPS_SET_DEFAULT,
+  CUPS_GET_DEVICES,
+  CUPS_GET_PPDS
 } ipp_op_t;

 typedef enum			/**** IPP status codes... ****/
@@ -307,7 +309,6 @@ typedef struct			/**** Request State ****/
 * Prototypes...
 */

-extern time_t		ippDateToTime(const ipp_uchar_t *date);
 extern ipp_attribute_t	*ippAddBoolean(ipp_t *ipp, ipp_tag_t group, const char *name, char value);
 extern ipp_attribute_t	*ippAddBooleans(ipp_t *ipp, ipp_tag_t group, const char *name, int num_values, const char *values);
 extern ipp_attribute_t	*ippAddDate(ipp_t *ipp, ipp_tag_t group, const char *name, const ipp_uchar_t *value);
@@ -320,7 +321,9 @@ extern ipp_attribute_t	*ippAddResolutions(ipp_t *ipp, ipp_tag_t group, const cha
 extern ipp_attribute_t	*ippAddSeparator(ipp_t *ipp);
 extern ipp_attribute_t	*ippAddString(ipp_t *ipp, ipp_tag_t group, ipp_tag_t type, const char *name, const char *charset, const char *value);
 extern ipp_attribute_t	*ippAddStrings(ipp_t *ipp, ipp_tag_t group, ipp_tag_t type, const char *name, int num_values, const char *charset, const char **values);
+extern time_t		ippDateToTime(const ipp_uchar_t *date);
 extern 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 size_t		ippLength(ipp_t *ipp);
 extern ipp_t		*ippNew(void);
@@ -329,6 +332,9 @@ 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 ipp_attribute_t	*_ipp_add_attr(ipp_t *, int);
+
+
 /*
 * C++ magic...
 */
@@ -3,7 +3,7 @@
 *
 *   I18N/language support for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-1999 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
@@ -146,13 +146,29 @@ cupsLangGet(const char *language) /* I - Language or locale */
  * standard POSIX locale and is copied unchanged.  Otherwise the
  * language string is converted from ll-cc (language-country) to ll_CC
  * to match the file naming convention used by all POSIX-compliant
-  * operating systems.
+  * operating systems.  Any trailing character set specification is
+  * dropped.
  */

-  if (language == NULL || language[0] == '\0')
+  if (language == NULL || language[0] == '\0' ||
+      strcmp(language, "POSIX") == 0)
    strcpy(langname, "C");
  else
-    strcpy(langname, language);
+  {
+   /*
+    * Copy the locale string over safely...
+    */
+
+    strncpy(langname, language, sizeof(langname) - 1);
+    langname[sizeof(langname) - 1] = '\0';
+
+   /*
+    * Strip charset from "locale.charset"...
+    */
+
+    if ((text = strchr(langname, '.')) != NULL)
+      *text = '\0';
+  }

  if (strlen(langname) < 2)
    strcpy(real, "C");
@@ -185,7 +201,7 @@ cupsLangGet(const char *language) /* I - Language or locale */
  if ((localedir = getenv("LOCALEDIR")) == NULL)
    localedir = CUPS_LOCALEDIR;

-  sprintf(filename, "%s/%s/cups_%s", localedir, real, real);
+  snprintf(filename, sizeof(filename), "%s/%s/cups_%s", localedir, real, real);

  if ((fp = fopen(filename, "r")) == NULL)
    if (strlen(real) > 2)
@@ -195,7 +211,8 @@ cupsLangGet(const char *language) /* I - Language or locale */
      */

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

@@ -3,7 +3,7 @@
 *
 *   Multi-language support for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-1999 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
@@ -141,6 +141,15 @@ typedef enum			/**** Message Indices ****/
  CUPS_MSG_PENDING,
  CUPS_MSG_OUTPUT_MODE,
  CUPS_MSG_RESOLUTION,
+  CUPS_MSG_TEXT,
+  CUPS_MSG_PRETTYPRINT,
+  CUPS_MSG_MARGINS,
+  CUPS_MSG_LEFT,
+  CUPS_MSG_RIGHT,
+  CUPS_MSG_BOTTOM,
+  CUPS_MSG_TOP,
+  CUPS_MSG_FILENAME,
+  CUPS_MSG_PRINT,
  CUPS_MSG_HTTP_BASE = 200,
  CUPS_MSG_HTTP_END = 505,
  CUPS_MSG_MAX
@@ -177,7 +186,12 @@ typedef struct cups_lang_str	/**** Language Cache Structure ****/
 * Prototypes...
 */

-#  define		cupsLangDefault() cupsLangGet(setlocale(LC_ALL, ""))
+#  ifdef WIN32
+#    define		cupsLangDefault() cupsLangGet(setlocale(LC_ALL, ""))
+#  else /* This fix works around bugs in the Linux and HP-UX setlocale() */
+#    define		cupsLangDefault() cupsLangGet(getenv("LANG"))
+#  endif /* WIN32 */
+
 extern char		*cupsLangEncoding(cups_lang_t *lang);
 extern void		cupsLangFlush(void);
 extern void		cupsLangFree(cups_lang_t *lang);
@@ -3,7 +3,7 @@
 *
 *   Option marking routines for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-1999 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
@@ -117,7 +117,7 @@ ppdConflicts(ppd_file_t *ppd)	/* I - PPD to check */
        if (c1->marked)
 	  break;

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

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

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

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

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

  return (NULL);
@@ -239,12 +239,12 @@ ppdFindOption(ppd_file_t *ppd,		/* I - PPD file data */
  for (i = ppd->num_groups, g = ppd->groups; i > 0; i --, g ++)
  {
    for (j = g->num_options, o = g->options; j > 0; j --, o ++)
-      if (strcmp(o->keyword, option) == 0)
+      if (strcasecmp(o->keyword, option) == 0)
 	return (o);

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

@@ -287,7 +287,6 @@ ppdMarkDefaults(ppd_file_t *ppd)/* I - PPD file record */
 {
  int		i;		/* Looping variables */
  ppd_group_t	*g;		/* Current group */
-  ppd_option_t	*o;		/* PageSize option */


  if (ppd == NULL)
@@ -320,7 +319,7 @@ ppdMarkOption(ppd_file_t *ppd,		/* I - PPD file record */
  if (ppd == NULL)
    return (0);

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

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

  if (i)
@@ -347,33 +346,33 @@ ppdMarkOption(ppd_file_t *ppd,		/* I - PPD file record */

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

-    if (strcmp(option, "PageSize") == 0 || strcmp(option, "PageRegion") == 0)
+    if (strcasecmp(option, "PageSize") == 0 || strcasecmp(option, "PageRegion") == 0)
    {
     /*
      * Mark current page size...
      */

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

     /*
      * Unmark the current PageSize or PageRegion setting, as appropriate...
      */

-      if (strcmp(option, "PageSize") == 0)
+      if (strcasecmp(option, "PageSize") == 0)
      {
-	o = ppdFindOption(ppd, "PageRegion");
-	for (i = 0; i < o->num_choices; i ++)
-          o->choices[i].marked = 0;
+	if ((o = ppdFindOption(ppd, "PageRegion")) != NULL)
+	  for (i = 0; i < o->num_choices; i ++)
+            o->choices[i].marked = 0;
      }
      else
      {
-	o = ppdFindOption(ppd, "PageSize");
-	for (i = 0; i < o->num_choices; i ++)
-          o->choices[i].marked = 0;
+	if ((o = ppdFindOption(ppd, "PageSize")) != NULL)
+	  for (i = 0; i < o->num_choices; i ++)
+            o->choices[i].marked = 0;
      }
    }
  }
@@ -399,7 +398,7 @@ ppd_defaults(ppd_file_t  *ppd,	/* I - PPD file */
    return;

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

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

  for (i = 0, temp = *options; i < num_options; i ++, temp ++)
-    if (strcmp(temp->name, name) == 0)
+    if (strcasecmp(temp->name, name) == 0)
      break;

  if (i >= num_options)
@@ -140,7 +140,7 @@ cupsGetOption(const char    *name,	/* I - Name of option */
    return (NULL);

  for (i = 0; i < num_options; i ++)
-    if (strcmp(options[i].name, name) == 0)
+    if (strcasecmp(options[i].name, name) == 0)
      return (options[i].value);

  return (NULL);
@@ -287,7 +287,7 @@ cupsMarkOptions(ppd_file_t    *ppd,		/* I - PPD file */
  conflict = 0;

  for (i = num_options; i > 0; i --, options ++)
-    if (strcmp(options->name, "media") == 0)
+    if (strcasecmp(options->name, "media") == 0)
    {
     /*
      * Loop through the option string, separating it at commas and
@@ -324,9 +324,9 @@ cupsMarkOptions(ppd_file_t    *ppd,		/* I - PPD file */
 	    conflict = 1;
      }
    }
-    else if (strcmp(options->name, "sides") == 0)
+    else if (strcasecmp(options->name, "sides") == 0)
    {
-      if (strcmp(options->value, "one-sided") == 0)
+      if (strcasecmp(options->value, "one-sided") == 0)
      {
        if (ppdMarkOption(ppd, "Duplex", "None"))
 	  conflict = 1;
@@ -335,7 +335,7 @@ cupsMarkOptions(ppd_file_t    *ppd,		/* I - PPD file */
        if (ppdMarkOption(ppd, "KD03Duplex", "None"))	/* Kodak */
 	  conflict = 1;
      }
-      else if (strcmp(options->value, "two-sided-long-edge") == 0)
+      else if (strcasecmp(options->value, "two-sided-long-edge") == 0)
      {
        if (ppdMarkOption(ppd, "Duplex", "DuplexNoTumble"))
 	  conflict = 1;
@@ -344,7 +344,7 @@ cupsMarkOptions(ppd_file_t    *ppd,		/* I - PPD file */
        if (ppdMarkOption(ppd, "KD03Duplex", "DuplexNoTumble"))	/* Kodak */
 	  conflict = 1;
      }
-      else if (strcmp(options->value, "two-sided-short-edge") == 0)
+      else if (strcasecmp(options->value, "two-sided-short-edge") == 0)
      {
        if (ppdMarkOption(ppd, "Duplex", "DuplexTumble"))
 	  conflict = 1;
@@ -354,7 +354,8 @@ cupsMarkOptions(ppd_file_t    *ppd,		/* I - PPD file */
 	  conflict = 1;
      }
    }
-    else if (strcmp(options->name, "resolution") == 0)
+    else if (strcasecmp(options->name, "resolution") == 0 ||
+             strcasecmp(options->name, "printer-resolution") == 0)
    {
      if (ppdMarkOption(ppd, "Resolution", options->value))
        conflict = 1;
@@ -3,7 +3,7 @@
 *
 *   Page size functions for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-1999 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
@@ -80,35 +80,35 @@ ppdPageSize(ppd_file_t *ppd,	/* I - PPD file record */
      */

      units[0] = '\0';
-      if (sscanf(name + 7, "%fx%f%s", &w, &l, units) < 2)
+      if (sscanf(name + 7, "%fx%f%254s", &w, &l, units) < 2)
        return (NULL);

      if (strcasecmp(units, "in") == 0)
      {
-        ppd->sizes[i].width  = w * 72.0;
-	ppd->sizes[i].length = l * 72.0;
+        ppd->sizes[i].width  = w * 72.0f;
+	ppd->sizes[i].length = l * 72.0f;
 	ppd->sizes[i].left   = ppd->custom_margins[0];
 	ppd->sizes[i].bottom = ppd->custom_margins[1];
-	ppd->sizes[i].right  = w * 72.0 - ppd->custom_margins[2];
-	ppd->sizes[i].top    = l * 72.0 - ppd->custom_margins[3];
+	ppd->sizes[i].right  = w * 72.0f - ppd->custom_margins[2];
+	ppd->sizes[i].top    = l * 72.0f - ppd->custom_margins[3];
      }
      else if (strcasecmp(units, "cm") == 0)
      {
-        ppd->sizes[i].width  = w * 2.54 * 72.0;
-	ppd->sizes[i].length = l * 2.54 * 72.0;
+        ppd->sizes[i].width  = w / 2.54f * 72.0f;
+	ppd->sizes[i].length = l / 2.54f * 72.0f;
 	ppd->sizes[i].left   = ppd->custom_margins[0];
 	ppd->sizes[i].bottom = ppd->custom_margins[1];
-	ppd->sizes[i].right  = w * 2.54 * 72.0 - ppd->custom_margins[2];
-	ppd->sizes[i].top    = l * 2.54 * 72.0 - ppd->custom_margins[3];
+	ppd->sizes[i].right  = w / 2.54f * 72.0f - ppd->custom_margins[2];
+	ppd->sizes[i].top    = l / 2.54f * 72.0f - ppd->custom_margins[3];
      }
      else if (strcasecmp(units, "mm") == 0)
      {
-        ppd->sizes[i].width  = w * 25.4 * 72.0;
-	ppd->sizes[i].length = l * 25.4 * 72.0;
+        ppd->sizes[i].width  = w / 25.4f * 72.0f;
+	ppd->sizes[i].length = l / 25.4f * 72.0f;
 	ppd->sizes[i].left   = ppd->custom_margins[0];
 	ppd->sizes[i].bottom = ppd->custom_margins[1];
-	ppd->sizes[i].right  = w * 25.4 * 72.0 - ppd->custom_margins[2];
-	ppd->sizes[i].top    = l * 25.4 * 72.0 - ppd->custom_margins[3];
+	ppd->sizes[i].right  = w / 25.4f * 72.0f - ppd->custom_margins[2];
+	ppd->sizes[i].top    = l / 25.4f * 72.0f - ppd->custom_margins[3];
      }
      else
      {
@@ -3,7 +3,7 @@
 *
 *   PPD file routines for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-1999 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
@@ -456,6 +456,8 @@ ppdOpen(FILE *fp)		/* I - File to read from */
    return (NULL);
  }

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

 /*
@@ -627,8 +629,11 @@ ppdOpen(FILE *fp)		/* I - File to read from */
      *filter = string;
      string  = NULL;
    }
+    else if (strcmp(keyword, "Throughput") == 0)
+      ppd->throughput = atoi(string);
    else if (strcmp(keyword, "VariablePaperSize") == 0 &&
-             strcmp(string, "True") == 0)
+             strcmp(string, "True") == 0 &&
+	     !ppd->variable_sizes)
    {
      ppd->variable_sizes = 1;

@@ -671,9 +676,9 @@ ppdOpen(FILE *fp)		/* I - File to read from */
      option = NULL;
    }
    else if (strcmp(keyword, "MaxMediaWidth") == 0)
-      ppd->custom_max[0] = atof(string);
+      ppd->custom_max[0] = (float)atof(string);
    else if (strcmp(keyword, "MaxMediaHeight") == 0)
-      ppd->custom_max[1] = atof(string);
+      ppd->custom_max[1] = (float)atof(string);
    else if (strcmp(keyword, "ParamCustomPageSize") == 0)
    {
      if (strcmp(name, "Width") == 0)
@@ -688,9 +693,51 @@ ppdOpen(FILE *fp)		/* I - File to read from */
             ppd->custom_margins + 1, ppd->custom_margins + 2,
             ppd->custom_margins + 3);
    else if (strcmp(keyword, "CustomPageSize") == 0 &&
-             strcmp(name, "True") == 0 &&
-	     ppd->variable_sizes)
+             strcmp(name, "True") == 0)
    {
+      if (!ppd->variable_sizes)
+      {
+	ppd->variable_sizes = 1;
+
+       /*
+	* Add a "Custom" page size entry...
+	*/
+
+	ppd_add_size(ppd, "Custom");
+
+       /*
+	* Add a "Custom" page size option...
+	*/
+
+	if ((group = ppd_get_group(ppd,
+                                   cupsLangString(language,
+                                                  CUPS_MSG_GENERAL))) == NULL)
+	{
+          ppdClose(ppd);
+	  safe_free(string);
+	  return (NULL);
+	}
+
+	if ((option = ppd_get_option(group, "PageSize")) == NULL)
+	{
+          ppdClose(ppd);
+	  safe_free(string);
+	  return (NULL);
+	}
+
+	if ((choice = ppd_add_choice(option, "Custom")) == NULL)
+	{
+          ppdClose(ppd);
+	  safe_free(string);
+	  return (NULL);
+	}
+
+	strncpy(choice->text, cupsLangString(language, CUPS_MSG_VARIABLE),
+        	sizeof(choice->text) - 1);
+	group  = NULL;
+	option = NULL;
+      }
+
      if ((option = ppdFindOption(ppd, "PageSize")) == NULL)
      {
 	ppdClose(ppd);
@@ -983,7 +1030,7 @@ ppdOpen(FILE *fp)		/* I - File to read from */
    else if (strcmp(keyword, "OrderDependency") == 0 ||
             strcmp(keyword, "NonUIOrderDependency") == 0)
    {
-      if (sscanf(string, "%f%s%s", &order, name, keyword) != 3)
+      if (sscanf(string, "%f%40s%40s", &order, name, keyword) != 3)
      {
        ppdClose(ppd);
 	safe_free(string);
@@ -4,7 +4,7 @@
 *   PostScript Printer Description definitions for the Common UNIX Printing
 *   System (CUPS).
 *
- *   Copyright 1997-1999 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
@@ -166,7 +166,8 @@ typedef struct			/**** Files ****/
 		contone_only,	/* 1 = continuous tone only, 0 = not */
 		landscape,	/* -90 or 90 */
 		model_number,	/* Device-specific model number */
-		manual_copies;	/* 1 = Copies done manually, 0 = hardware */
+		manual_copies,	/* 1 = Copies done manually, 0 = hardware */
+		throughput;	/* Pages per minute */
  ppd_cs_t	colorspace;	/* Default colorspace */
  char		*patches;	/* Patch commands to be sent to printer */
  int		num_emulations;	/* Number of emulations supported */
@@ -0,0 +1,287 @@
+/*
+ * "$Id$"
+ *
+ *   snprintf functions for the Common UNIX Printing System (CUPS).
+ *
+ *   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
+ *   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:
+ *
+ *   vsnprintf() - Format a string into a fixed size buffer.
+ *   snprintf()  - Format a string into a fixed size buffer.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include <stdio.h>
+#include <ctype.h>
+#include "string.h"
+
+
+#ifndef HAVE_VSNPRINTF
+/*
+ * 'vsnprintf()' - Format a string into a fixed size buffer.
+ */
+
+int				/* O - Number of bytes formatted */
+vsnprintf(char       *buffer,	/* O - Output buffer */
+          size_t     bufsize,	/* O - Size of output buffer */
+	  const char *format,	/* I - printf-style format string */
+	  va_list    ap)	/* I - Pointer to additional arguments */
+{
+  char		*bufptr,	/* Pointer to position in buffer */
+		*bufend,	/* Pointer to end of buffer */
+		sign,		/* Sign of format width */
+		size,		/* Size character (h, l, L) */
+		type;		/* Format type character */
+  const char	*bufformat;	/* Start of format */
+  int		width,		/* Width of field */
+		prec;		/* Number of characters of precision */
+  char		tformat[100],	/* Temporary format string for sprintf() */
+		temp[1024];	/* Buffer for formatted numbers */
+  int		*chars;		/* Pointer to integer for %p */
+  char		*s;		/* Pointer to string */
+  int		slen;		/* Length of string */
+
+
+ /*
+  * Loop through the format string, formatting as needed...
+  */
+
+  bufptr = buffer;
+  bufend = buffer + bufsize - 1;
+
+  while (*format && bufptr < bufend)
+  {
+    if (*format == '%')
+    {
+      bufformat = format;
+      format ++;
+
+      if (*format == '%')
+      {
+        *bufptr++ = *format++;
+	continue;
+      }
+      else if (strchr(" -+#\'", *format))
+        sign = *format++;
+      else
+        sign = 0;
+
+      width = 0;
+      while (isdigit(*format))
+        width = width * 10 + *format++ - '0';
+
+      if (*format == '.')
+      {
+        format ++;
+	prec = 0;
+
+	while (isdigit(*format))
+          prec = prec * 10 + *format++ - '0';
+      }
+      else
+        prec = -1;
+
+      if (*format == 'l' && format[1] == 'l')
+      {
+        size = 'L';
+	format += 2;
+      }
+      else if (*format == 'h' || *format == 'l' || *format == 'L')
+        size = *format++;
+
+      if (!*format)
+        break;
+
+      type = *format++;
+
+      switch (type)
+      {
+	case 'E' : /* Floating point formats */
+	case 'G' :
+	case 'e' :
+	case 'f' :
+	case 'g' :
+	    if ((format - bufformat + 1) > sizeof(tformat) ||
+	        (width + 2) > sizeof(temp))
+	      break;
+
+	    strncpy(tformat, bufformat, format - bufformat);
+	    tformat[format - bufformat] = '\0';
+
+	    sprintf(temp, tformat, va_arg(ap, double));
+
+	    if ((bufptr + strlen(temp)) > bufend)
+	    {
+	      strncpy(bufptr, temp, bufend - bufptr);
+	      bufptr = bufend;
+	      break;
+	    }
+	    else
+	    {
+	      strcpy(bufptr, temp);
+	      bufptr += strlen(temp);
+	    }
+	    break;
+
+        case 'B' : /* Integer formats */
+	case 'X' :
+	case 'b' :
+        case 'd' :
+	case 'i' :
+	case 'o' :
+	case 'u' :
+	case 'x' :
+	    if ((format - bufformat + 1) > sizeof(tformat) ||
+	        (width + 2) > sizeof(temp))
+	      break;
+
+	    strncpy(tformat, bufformat, format - bufformat);
+	    tformat[format - bufformat] = '\0';
+
+	    sprintf(temp, tformat, va_arg(ap, int));
+
+	    if ((bufptr + strlen(temp)) > bufend)
+	    {
+	      strncpy(bufptr, temp, bufend - bufptr);
+	      bufptr = bufend;
+	      break;
+	    }
+	    else
+	    {
+	      strcpy(bufptr, temp);
+	      bufptr += strlen(temp);
+	    }
+	    break;
+	    
+	case 'p' : /* Pointer value */
+	    if ((chars = va_arg(ap, int *)) != NULL)
+	      *chars = bufptr - buffer;
+	    break;
+
+        case 'c' : /* Character or character array */
+	    if (width <= 1)
+	      *bufptr++ = va_arg(ap, int);
+	    else
+	    {
+	      if ((bufptr + width) > bufend)
+	        width = bufend - bufptr;
+
+	      memcpy(bufptr, va_arg(ap, char *), width);
+	      bufptr += width;
+	    }
+	    break;
+
+	case 's' : /* String */
+	    if ((s = va_arg(ap, char *)) == NULL)
+	      s = "(null)";
+
+	    slen = strlen(s);
+	    if (slen > width && prec != width)
+	      width = slen;
+
+	    if ((bufptr + width) > bufend)
+	      width = bufend - bufptr;
+
+            if (slen > width)
+	      slen = width;
+
+	    if (sign == '-')
+	    {
+	      strncpy(bufptr, s, slen);
+	      memset(bufptr + slen, ' ', width - slen);
+	    }
+	    else
+	    {
+	      memset(bufptr, ' ', width - slen);
+	      strncpy(bufptr + width - slen, s, slen);
+	    }
+
+	    bufptr += width;
+	    break;
+
+	case 'n' : /* Output number of chars so far */
+	    if ((format - bufformat + 1) > sizeof(tformat) ||
+	        (width + 2) > sizeof(temp))
+	      break;
+
+	    strncpy(tformat, bufformat, format - bufformat);
+	    tformat[format - bufformat] = '\0';
+
+	    sprintf(temp, tformat, va_arg(ap, int));
+
+	    if ((bufptr + strlen(temp)) > bufend)
+	    {
+	      strncpy(bufptr, temp, bufend - bufptr);
+	      bufptr = bufend;
+	      break;
+	    }
+	    else
+	    {
+	      strcpy(bufptr, temp);
+	      bufptr += strlen(temp);
+	    }
+	    break;
+      }
+    }
+    else
+      *bufptr++ = *format++;
+  }
+
+ /*
+  * Nul-terminate the string and return the number of characters in it.
+  */
+
+  *bufptr = '\0';
+  return (bufptr - buffer);
+}
+#endif /* !HAVE_VSNPRINT */
+
+
+#ifndef HAVE_SNPRINTF
+/*
+ * 'snprintf()' - Format a string into a fixed size buffer.
+ */
+
+int				/* O - Number of bytes formatted */
+snprintf(char       *buffer,	/* O - Output buffer */
+         size_t     bufsize,	/* O - Size of output buffer */
+         const char *format,	/* I - printf-style format string */
+	 ...)			/* I - Additional arguments as needed */
+{
+  int		bytes;		/* Number of bytes formatted */
+  va_list 	ap;		/* Pointer to additional arguments */
+
+
+  va_start(ap, format);
+  bytes = vsnprintf(buffer, bufsize, format, ap);
+  va_end(ap);
+
+  return (bytes);
+}
+#endif /* !HAVE_SNPRINTF */
+
+
+/*
+ * End of "$Id$".
+ */
+
@@ -3,7 +3,7 @@
 *
 *   String functions for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-1999 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
@@ -3,7 +3,7 @@
 *
 *   String definitions for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-1999 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,6 +29,8 @@
 * Include necessary headers...
 */

+#  include <stdio.h>
+#  include <stdarg.h>
 #  include <config.h>
 #  include <string.h>

@@ -43,6 +45,15 @@
 #  endif /* WIN32 || __EMX__ */


+/*
+ * C++ magic...
+ */
+
+#  ifdef __cplusplus
+extern "C" {
+#  endif /* __cplusplus */
+
+
 /*
 * Prototypes...
 */
@@ -59,6 +70,23 @@ extern int	strcasecmp(const char *, const char *);
 extern int	strncasecmp(const char *, const char *, size_t n);
 #  endif /* !HAVE_STRNCASECMP */

+#  ifndef HAVE_SNPRINTF
+extern int	snprintf(char *, size_t, const char *, ...);
+#  endif /* !HAVE_SNPRINTF */
+
+#  ifndef HAVE_VSNPRINTF
+extern int	vsnprintf(char *, size_t, const char *, va_list);
+#  endif /* !HAVE_VSNPRINTF */
+
+
+/*
+ * C++ magic...
+ */
+
+#  ifdef __cplusplus
+}
+#  endif /* __cplusplus */
+
 #endif /* !_CUPS_STRING_H_ */

 /*
@@ -3,7 +3,7 @@
 *
 *   HTTP test program for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-1999 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
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I ".." /I "../visualc" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -3,7 +3,7 @@
 *
 *   PPD test program for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-1999 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
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I ".." /I "../visualc" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -4,7 +4,7 @@
 *   User, system, and password routines for the Common UNIX Printing
 *   System (CUPS).
 *
- *   Copyright 1997-1999 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
@@ -3,7 +3,7 @@
 *
 *   Printing utilities for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-1999 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
@@ -31,6 +31,8 @@
 *   cupsGetPrinters()   - Get a list of printers.
 *   cupsPrintFile()     - Print a file to a printer or class.
 *   cups_connect()      - Connect to the specified host...
+ *   cups_local_auth()   - Get the local authorization certificate if
+ *                         available/applicable...
 */

 /*
@@ -57,7 +59,9 @@
 * Local globals...
 */

-static http_t	*cups_server = NULL;
+static http_t		*cups_server = NULL;	/* Current server connection */
+static ipp_status_t	last_error = IPP_OK;	/* Last IPP error */
+static char		authstring[255] = "";	/* Authorization string */


 /*
@@ -65,6 +69,7 @@ static http_t	*cups_server = NULL;
 */

 static char	*cups_connect(const char *name, char *printer, char *hostname);
+static int	cups_local_auth(http_t *http);


 /*
@@ -88,7 +93,10 @@ cupsCancelJob(const char *name,	/* I - Name of printer or class */
  */

  if (!cups_connect(name, printer, hostname))
+  {
+    last_error = IPP_SERVICE_UNAVAILABLE;
    return (0);
+  }

 /*
  * Build an IPP_CANCEL_JOB request, which requires the following
@@ -98,6 +106,7 @@ cupsCancelJob(const char *name,	/* I - Name of printer or class */
  *    attributes-natural-language
  *    printer-uri
  *    job-id
+  *    [requesting-user-name]
  */

  request = ippNew();
@@ -114,21 +123,31 @@ cupsCancelJob(const char *name,	/* I - Name of printer or class */
               "attributes-natural-language", NULL,
               language != NULL ? language->language : "C");

-  sprintf(uri, "ipp://%s:%d/printers/%s", hostname, ippPort(), printer);
+  snprintf(uri, sizeof(uri), "ipp://%s:%d/printers/%s", hostname, ippPort(), printer);
  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
               NULL, uri);

  ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "job-id", job);

+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
+               NULL, cupsUser());
+
 /*
  * Do the request...
  */

  if ((response = cupsDoRequest(cups_server, request, "/jobs/")) == NULL)
+  {
+    last_error = IPP_BAD_REQUEST;
    return (0);
+  }
+  else
+  {
+    last_error = response->request.status.status_code;
+    ippDelete(response);

-  ippDelete(response);
-  return (1);
+    return (1);
+  }
 }


@@ -152,8 +171,6 @@ cupsDoFileRequest(http_t     *http,	/* I - HTTP connection to server */
  const char	*password;	/* Password string */
  char		plain[255],	/* Plaintext username:password */
 		encode[255];	/* Encoded username:password */
-  static char	authstring[255] = "";
-				/* Authorization string */


  DEBUG_printf(("cupsDoFileRequest(%08x, %08s, \'%s\', \'%s\')\n",
@@ -172,6 +189,7 @@ cupsDoFileRequest(http_t     *http,	/* I - HTTP connection to server */
      */

      ippDelete(request);
+      last_error = IPP_NOT_FOUND;
      return (NULL);
    }

@@ -182,6 +200,7 @@ cupsDoFileRequest(http_t     *http,	/* I - HTTP connection to server */
      */

      ippDelete(request);
+      last_error = IPP_NOT_FOUND;
      return (NULL);
    }
  }
@@ -217,10 +236,7 @@ cupsDoFileRequest(http_t     *http,	/* I - HTTP connection to server */
    DEBUG_puts("cupsDoFileRequest: post...");

    if (httpPost(http, resource))
-    {
-      httpReconnect(http);
      continue;
-    }

   /*
    * Send the IPP data and wait for the response...
@@ -263,7 +279,21 @@ cupsDoFileRequest(http_t     *http,	/* I - HTTP connection to server */

      httpFlush(http);

-      if ((password = cupsGetPassword("Password:")) != NULL)
+     /*
+      * See if we can do local authentication...
+      */
+
+      if (cups_local_auth(http))
+        continue;
+
+     /*
+      * Nope - get a password from the user...
+      */
+
+      printf("Authentication required for %s on %s...\n", cupsUser(),
+             http->hostname);
+
+      if ((password = cupsGetPassword("UNIX Password: ")) != NULL)
      {
       /*
 	* Got a password; send it to the server...
@@ -271,17 +301,27 @@ cupsDoFileRequest(http_t     *http,	/* I - HTTP connection to server */

        if (!password[0])
          break;
-	sprintf(plain, "%s:%s", cupsUser(), password);
+	snprintf(plain, sizeof(plain), "%s:%s", cupsUser(), password);
 	httpEncode64(encode, plain);
-	sprintf(authstring, "Basic %s", encode);
+	snprintf(authstring, sizeof(authstring), "Basic %s", encode);

        continue;
      }
      else
        break;
    }
-
-    if (status != HTTP_OK)
+    else if (status == HTTP_ERROR)
+    {
+#if defined(WIN32) || defined(__EMX__)
+      if (http->error != WSAENETDOWN && http->error != WSAENETUNREACH)
+#else
+      if (http->error != ENETDOWN && http->error != ENETUNREACH)
+#endif /* WIN32 || __EMX__ */
+        continue;
+      else
+        break;
+    }
+    else if (status != HTTP_OK)
    {
      DEBUG_printf(("cupsDoFileRequest: error %d...\n", status));

@@ -311,6 +351,8 @@ cupsDoFileRequest(http_t     *http,	/* I - HTTP connection to server */
 	ippDelete(response);
 	response = NULL;

+        last_error = IPP_SERVICE_UNAVAILABLE;
+
       /*
 	* Flush any remaining data...
 	*/
@@ -334,6 +376,15 @@ cupsDoFileRequest(http_t     *http,	/* I - HTTP connection to server */
  
  ippDelete(request);

+  if (response)
+    last_error = response->request.status.status_code;
+  else if (status == HTTP_NOT_FOUND)
+    last_error = IPP_NOT_FOUND;
+  else if (status == HTTP_UNAUTHORIZED)
+    last_error = IPP_NOT_AUTHORIZED;
+  else if (status != HTTP_OK)
+    last_error = IPP_SERVICE_UNAVAILABLE;
+
  return (response);
 }

@@ -350,6 +401,7 @@ cupsGetClasses(char ***classes)	/* O - Classes */
 		*response;	/* IPP Response */
  ipp_attribute_t *attr;	/* Current attribute */
  cups_lang_t	*language;	/* Default language */
+  char		**temp;		/* Temporary pointer */


 /*
@@ -357,7 +409,10 @@ cupsGetClasses(char ***classes)	/* O - Classes */
  */

  if (!cups_connect("default", NULL, NULL))
+  {
+    last_error = IPP_SERVICE_UNAVAILABLE;
    return (0);
+  }

 /*
  * Build a CUPS_GET_CLASSES request, which requires the following
@@ -375,10 +430,10 @@ cupsGetClasses(char ***classes)	/* O - Classes */
  language = cupsLangDefault();

  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-                      "attributes-charset", NULL, cupsLangEncoding(language));
+               "attributes-charset", NULL, cupsLangEncoding(language));

  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-                      "attributes-natural-language", NULL, language->language);
+               "attributes-natural-language", NULL, language->language);

 /*
  * Do the request and get back a response...
@@ -387,29 +442,46 @@ cupsGetClasses(char ***classes)	/* O - Classes */
  n        = 0;
  *classes = NULL;

-  if ((response = cupsDoRequest(cups_server, request, "/classes/")) != NULL)
+  if ((response = cupsDoRequest(cups_server, request, "/")) != NULL)
  {
+    last_error = response->request.status.status_code;
+
    for (attr = response->attrs; attr != NULL; attr = attr->next)
-      if (strcmp(attr->name, "printer-name") == 0 &&
+      if (attr->name != NULL &&
+          strcasecmp(attr->name, "printer-name") == 0 &&
          attr->value_tag == IPP_TAG_NAME)
      {
        if (n == 0)
-	  *classes = malloc(sizeof(char *));
+	  temp = malloc(sizeof(char *));
 	else
-	  *classes = realloc(*classes, sizeof(char *) * (n + 1));
+	  temp = realloc(*classes, sizeof(char *) * (n + 1));

-	if (*classes == NULL)
+	if (temp == NULL)
 	{
+	 /*
+	  * Ran out of memory!
+	  */
+
+          while (n > 0)
+	  {
+	    n --;
+	    free((*classes)[n]);
+	  }
+
+	  free(*classes);
 	  ippDelete(response);
 	  return (0);
 	}

-        (*classes)[n] = strdup(attr->values[0].string.text);
+        *classes = temp;
+        temp[n]  = strdup(attr->values[0].string.text);
 	n ++;
      }

    ippDelete(response);
  }
+  else
+    last_error = IPP_BAD_REQUEST;

  return (n);
 }
@@ -426,25 +498,31 @@ cupsGetDefault(void)
 		*response;	/* IPP Response */
  ipp_attribute_t *attr;	/* Current attribute */
  cups_lang_t	*language;	/* Default language */
+  const char	*var;		/* Environment variable */
  static char	def_printer[64];/* Default printer */


 /*
  * First see if the LPDEST or PRINTER environment variables are
-  * set...
+  * set...  However, if PRINTER is set to "lp", ignore it to work
+  * around a "feature" in most Linux distributions - the default
+  * user login scripts set PRINTER to "lp"...
  */

-  if (getenv("LPDEST") != NULL)
-    return (getenv("LPDEST"));
-  else if (getenv("PRINTER") != NULL)
-    return (getenv("PRINTER"));
+  if ((var = getenv("LPDEST")) != NULL)
+    return (var);
+  else if ((var = getenv("PRINTER")) != NULL && strcmp(var, "lp") != 0)
+    return (var);

 /*
  * Try to connect to the server...
  */

  if (!cups_connect("default", NULL, NULL))
+  {
+    last_error = IPP_SERVICE_UNAVAILABLE;
    return (NULL);
+  }

 /*
  * Build a CUPS_GET_DEFAULT request, which requires the following
@@ -471,17 +549,22 @@ cupsGetDefault(void)
  * Do the request and get back a response...
  */

-  if ((response = cupsDoRequest(cups_server, request, "/printers/")) != NULL)
+  if ((response = cupsDoRequest(cups_server, request, "/")) != NULL)
  {
+    last_error = response->request.status.status_code;
+
    if ((attr = ippFindAttribute(response, "printer-name", IPP_TAG_NAME)) != NULL)
    {
-      strcpy(def_printer, attr->values[0].string.text);
+      strncpy(def_printer, attr->values[0].string.text, sizeof(def_printer) - 1);
+      def_printer[sizeof(def_printer) - 1] = '\0';
      ippDelete(response);
      return (def_printer);
    }

    ippDelete(response);
  }
+  else
+    last_error = IPP_BAD_REQUEST;

  return (NULL);
 }
@@ -500,8 +583,12 @@ cupsGetPPD(const char *name)	/* I - Printer name */
  char		printer[HTTP_MAX_URI],	/* Printer name */
 		hostname[HTTP_MAX_URI],	/* Hostname */
 		resource[HTTP_MAX_URI];	/* Resource name */
-  static char	filename[HTTP_MAX_URI];	/* Local filename */
  char		*tempdir;		/* Temporary file directory */
+  const char	*password;		/* Password string */
+  char		plain[255],		/* Plaintext username:password */
+		encode[255];		/* Encoded username:password */
+  http_status_t	status;			/* HTTP status from server */
+  static char	filename[HTTP_MAX_URI];	/* Local filename */


 /*
@@ -509,7 +596,10 @@ cupsGetPPD(const char *name)	/* I - Printer name */
  */

  if (!cups_connect(name, printer, hostname))
+  {
+    last_error = IPP_SERVICE_UNAVAILABLE;
    return (NULL);
+  }

 /*
  * Then check for the cache file...
@@ -518,31 +608,77 @@ cupsGetPPD(const char *name)	/* I - Printer name */
 #if defined(WIN32) || defined(__EMX__)
  tempdir = "C:/WINDOWS/TEMP";

-  sprintf(filename, "%s/%s.ppd", tempdir, printer);
+  snprintf(filename, sizeof(filename), "%s/%s.ppd", tempdir, printer);
 #else
  if ((tempdir = getenv("TMPDIR")) == NULL)
    tempdir = "/tmp";

-  sprintf(filename, "%s/%d.%s.ppd", tempdir, getuid(), printer);
+  snprintf(filename, sizeof(filename), "%s/%d.%s.ppd", tempdir, getuid(), printer);
 #endif /* WIN32 || __EMX__ */

 /*
  * And send a request to the HTTP server...
  */

-  sprintf(resource, "/printers/%s.ppd", printer);
+  snprintf(resource, sizeof(resource), "/printers/%s.ppd", printer);

-  httpClearFields(cups_server);
-  httpSetField(cups_server, HTTP_FIELD_HOST, hostname);
-  httpGet(cups_server, resource);
-
-  switch (httpUpdate(cups_server))
+  do
  {
-    case HTTP_OK : /* New file - get it! */
+    httpClearFields(cups_server);
+    httpSetField(cups_server, HTTP_FIELD_HOST, hostname);
+    httpSetField(cups_server, HTTP_FIELD_AUTHORIZATION, authstring);
+
+    if (httpGet(cups_server, resource))
+    {
+      status = HTTP_UNAUTHORIZED;
+      continue;
+    }
+
+    while ((status = httpUpdate(cups_server)) == HTTP_CONTINUE);
+
+    if (status == HTTP_UNAUTHORIZED)
+    {
+      DEBUG_puts("cupsGetPPD: unauthorized...");
+
+     /*
+      * Flush any error message...
+      */
+
+      httpFlush(cups_server);
+
+     /*
+      * See if we can do local authentication...
+      */
+
+      if (cups_local_auth(cups_server))
+        continue;
+
+     /*
+      * Nope, get a password from the user...
+      */
+
+      printf("Authentication required for %s on %s...\n", cupsUser(),
+             cups_server->hostname);
+
+      if ((password = cupsGetPassword("UNIX Password: ")) != NULL)
+      {
+       /*
+	* Got a password; send it to the server...
+	*/
+
+        if (!password[0])
+          break;
+	snprintf(plain, sizeof(plain), "%s:%s", cupsUser(), password);
+	httpEncode64(encode, plain);
+	snprintf(authstring, sizeof(authstring), "Basic %s", encode);
+
+        continue;
+      }
+      else
        break;
-    default :
-        return (NULL);
+    }
  }
+  while (status == HTTP_UNAUTHORIZED);

 /*
  * OK, we need to copy the file; open the file and copy it...
@@ -581,6 +717,7 @@ cupsGetPrinters(char ***printers)	/* O - Printers */
 		*response;	/* IPP Response */
  ipp_attribute_t *attr;	/* Current attribute */
  cups_lang_t	*language;	/* Default language */
+  char		**temp;		/* Temporary pointer */


 /*
@@ -588,7 +725,10 @@ cupsGetPrinters(char ***printers)	/* O - Printers */
  */

  if (!cups_connect("default", NULL, NULL))
+  {
+    last_error = IPP_SERVICE_UNAVAILABLE;
    return (0);
+  }

 /*
  * Build a CUPS_GET_PRINTERS request, which requires the following
@@ -606,10 +746,10 @@ cupsGetPrinters(char ***printers)	/* O - Printers */
  language = cupsLangDefault();

  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-                      "attributes-charset", NULL, cupsLangEncoding(language));
+               "attributes-charset", NULL, cupsLangEncoding(language));

  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-                      "attributes-natural-language", NULL, language->language);
+               "attributes-natural-language", NULL, language->language);

 /*
  * Do the request and get back a response...
@@ -618,34 +758,62 @@ cupsGetPrinters(char ***printers)	/* O - Printers */
  n         = 0;
  *printers = NULL;

-  if ((response = cupsDoRequest(cups_server, request, "/printers/")) != NULL)
+  if ((response = cupsDoRequest(cups_server, request, "/")) != NULL)
  {
+    last_error = response->request.status.status_code;
+
    for (attr = response->attrs; attr != NULL; attr = attr->next)
-      if (strcmp(attr->name, "printer-name") == 0 &&
+      if (attr->name != NULL &&
+          strcasecmp(attr->name, "printer-name") == 0 &&
          attr->value_tag == IPP_TAG_NAME)
      {
        if (n == 0)
-	  *printers = malloc(sizeof(char *));
+	  temp = malloc(sizeof(char *));
 	else
-	  *printers = realloc(*printers, sizeof(char *) * (n + 1));
+	  temp = realloc(*printers, sizeof(char *) * (n + 1));

-	if (*printers == NULL)
+	if (temp == NULL)
 	{
+	 /*
+	  * Ran out of memory!
+	  */
+
+	  while (n > 0)
+	  {
+	    n --;
+	    free((*printers)[n]);
+	  }
+
+	  free(*printers);
 	  ippDelete(response);
 	  return (0);
 	}

-        (*printers)[n] = strdup(attr->values[0].string.text);
+        *printers = temp;
+        temp[n]   = strdup(attr->values[0].string.text);
 	n ++;
      }

    ippDelete(response);
  }
+  else
+    last_error = IPP_BAD_REQUEST;

  return (n);
 }


+/*
+ * 'cupsLastError()' - Return the last IPP error that occurred.
+ */
+
+ipp_status_t		/* O - IPP error code */
+cupsLastError(void)
+{
+  return (last_error);
+}
+
+
 /*
 * 'cupsPrintFile()' - Print a file to a printer or class.
 */
@@ -689,6 +857,7 @@ cupsPrintFile(const char    *name,	/* I - Printer or class name */
  {
    DEBUG_printf(("cupsPrintFile: Unable to open connection - %s.\n",
                  strerror(errno)));
+    last_error = IPP_SERVICE_UNAVAILABLE;
    ippDelete(request);
    return (0);
  }
@@ -701,7 +870,7 @@ cupsPrintFile(const char    *name,	/* I - Printer or class name */
  request->request.op.operation_id = IPP_PRINT_JOB;
  request->request.op.request_id   = 1;

-  sprintf(uri, "ipp://%s:%d/printers/%s", hostname, ippPort(), printer);
+  snprintf(uri, sizeof(uri), "ipp://%s:%d/printers/%s", hostname, ippPort(), printer);

  language = cupsLangDefault();

@@ -742,7 +911,7 @@ cupsPrintFile(const char    *name,	/* I - Printer or class name */
    * Skip the "raw" option - handled above...
    */

-    if (strcmp(options[i].name, "raw") == 0)
+    if (strcasecmp(options[i].name, "raw") == 0)
      continue;

   /*
@@ -786,7 +955,7 @@ cupsPrintFile(const char    *name,	/* I - Printer or class name */
    }
    else
    {
-      if (strncmp(option, "no", 2) == 0)
+      if (strncasecmp(option, "no", 2) == 0)
      {
 	option += 2;
 	n      = 0;
@@ -826,9 +995,9 @@ cupsPrintFile(const char    *name,	/* I - Printer or class name */
      {
        n2 = strtol(s + 1, &s, 0);

-	if (strcmp(s, "dpc") == 0)
+	if (strcasecmp(s, "dpc") == 0)
          ippAddResolution(request, IPP_TAG_JOB, option, IPP_RES_PER_CM, n, n2);
-        else if (strcmp(s, "dpi") == 0)
+        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);
@@ -860,7 +1029,7 @@ cupsPrintFile(const char    *name,	/* I - Printer or class name */
  * Try printing the file...
  */

-  sprintf(uri, "/printers/%s", printer);
+  snprintf(uri, sizeof(uri), "/printers/%s", printer);

  if ((response = cupsDoFileRequest(cups_server, request, uri, filename)) == NULL)
    jobid = 0;
@@ -914,7 +1083,7 @@ cupsTempFile(char *filename,		/* I - Pointer to buffer */
  if ((tmpdir = getenv("TMPDIR")) == NULL)
    tmpdir = "/var/tmp";

-  if ((strlen(tmpdir) + 8) > len)
+  if ((int)(strlen(tmpdir) + 8) > len)
  {
   /*
    * The specified directory exceeds the size of the buffer; default it...
@@ -941,8 +1110,8 @@ cupsTempFile(char *filename,		/* I - Pointer to buffer */

 static char *				/* I - Printer name or NULL */
 cups_connect(const char *name,		/* I - Destination (printer[@host]) */
-	     char       *printer,	/* O - Printer name */
-             char       *hostname)	/* O - Hostname */
+	     char       *printer,	/* O - Printer name [HTTP_MAX_URI] */
+             char       *hostname)	/* O - Hostname [HTTP_MAX_URI] */
 {
  char		hostbuf[HTTP_MAX_URI];
 				/* Name of host */
@@ -951,18 +1120,30 @@ cups_connect(const char *name,		/* I - Destination (printer[@host]) */


  if (name == NULL)
+  {
+    last_error = IPP_BAD_REQUEST;
    return (NULL);
+  }

-  if (sscanf(name, "%[^@]@%s", printerbuf, hostbuf) == 1)
-    strcpy(hostbuf, cupsServer());
+  if (sscanf(name, "%1023[^@]@%1023s", printerbuf, hostbuf) == 1)
+  {
+    strncpy(hostbuf, cupsServer(), sizeof(hostbuf) - 1);
+    hostbuf[sizeof(hostbuf) - 1] = '\0';
+  }

  if (hostname != NULL)
-    strcpy(hostname, hostbuf);
+  {
+    strncpy(hostname, hostbuf, HTTP_MAX_URI - 1);
+    hostname[HTTP_MAX_URI - 1] = '\0';
+  }
  else
    hostname = hostbuf;

  if (printer != NULL)
-    strcpy(printer, printerbuf);
+  {
+    strncpy(printer, printerbuf, HTTP_MAX_URI - 1);
+    printer[HTTP_MAX_URI - 1] = '\0';
+  }
  else
    printer = printerbuf;

@@ -975,12 +1156,75 @@ cups_connect(const char *name,		/* I - Destination (printer[@host]) */
  }

  if ((cups_server = httpConnect(hostname, ippPort())) == NULL)
+  {
+    last_error = IPP_SERVICE_UNAVAILABLE;
    return (NULL);
+  }
  else
    return (printer);
 }


+/*
+ * 'cups_local_auth()' - Get the local authorization certificate if
+ *                       available/applicable...
+ */
+
+static int			/* O - 1 if available, 0 if not */
+cups_local_auth(http_t *http)	/* I - Connection */
+{
+#if defined(WIN32) || defined(__EMX__)
+ /*
+  * Currently WIN32 and OS-2 do not support the CUPS server...
+  */
+
+  return (0);
+#else
+  int	pid;			/* Current process ID */
+  FILE	*fp;			/* Certificate file */
+  char	filename[1024],		/* Certificate filename */
+	certificate[33];	/* Certificate string */
+
+
+ /*
+  * See if we are accessing localhost...
+  */
+
+  if (ntohl(http->hostaddr.sin_addr.s_addr) != 0x7f000001 &&
+      strcasecmp(http->hostname, "localhost") != 0)
+    return (0);
+
+ /*
+  * Try opening a certificate file for this PID.  If that fails,
+  * try the root certificate...
+  */
+
+  pid = getpid();
+  sprintf(filename, CUPS_SERVERROOT "/certs/%d", pid);
+  if ((fp = fopen(filename, "r")) == NULL && pid > 0)
+    fp = fopen(CUPS_SERVERROOT "/certs/0", "r");
+
+  if (fp == NULL)
+    return (0);
+
+ /*
+  * Read the certificate from the file...
+  */
+
+  fgets(certificate, sizeof(certificate), fp);
+  fclose(fp);
+
+ /*
+  * Set the authorization string and return...
+  */
+
+  sprintf(authstring, "Local %s", certificate);
+
+  return (1);
+#endif /* WIN32 || __EMX__ */
+}
+
+
 /*
 * End of "$Id$".
 */
@@ -0,0 +1,37 @@
+%%BeginResource: procset hpgltops 1.1 0
+%
+% "$Id: HPGLprolog 932 2000-02-26 20:01:37Z mike $"
+%
+%   HP-GL/2 filter procset for the Common UNIX Printing System (CUPS).
+%
+%   This procset contains the basic drawing commands that are used to
+%   reduce output size.  Note the 'MP' (make newpath) definition - this
+%   should be called 'NP' (newpath), but GhostScript uses the 'NP' name
+%   for 'noaccess put' in some of its font files...
+%
+%   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
+%
+/MO { moveto } bind def
+/LI { lineto } bind def
+/FI { fill } bind def
+/ST { stroke } bind def
+/CP { closepath } bind def
+/MP { newpath } bind def
+/SP { setlinewidth setrgbcolor } bind def
+%%EndResource
@@ -3,7 +3,7 @@
 #
 #   Datafile makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1993-1999 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
@@ -28,8 +28,32 @@ include ../Makedefs
 # Data files...
 #

-FILES	=	8859-1 8859-14 8859-15 8859-2 8859-3 8859-4 8859-5 \
-		8859-6 8859-7 8859-8 8859-9 HPGLprolog
+CHARSETS =	cp874 \
+		cp1250 \
+		cp1251 \
+		cp1252 \
+		cp1253 \
+		cp1254 \
+		cp1255 \
+		cp1256 \
+		cp1257 \
+		cp1258 \
+		iso-8859-1 \
+		iso-8859-2 \
+		iso-8859-3 \
+		iso-8859-4 \
+		iso-8859-5 \
+		iso-8859-6 \
+		iso-8859-7 \
+		iso-8859-8 \
+		iso-8859-9 \
+		iso-8859-10 \
+		iso-8859-13 \
+		iso-8859-14 \
+		iso-8859-15 \
+		utf-8
+DATAFILES =	HPGLprolog psglyphs
+

 #
 # Make everything...
@@ -37,19 +61,25 @@ FILES	=	8859-1 8859-14 8859-15 8859-2 8859-3 8859-4 8859-5 \

 all:

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

 clean:

+
 #
 # Install files...
 #

 install:
+	-$(MKDIR) $(DATADIR)
 	-$(MKDIR) $(DATADIR)/data
-	$(CP) $(FILES) $(DATADIR)/data
+	$(CP) $(DATAFILES) $(DATADIR)/data
+	-$(MKDIR) $(DATADIR)/charsets
+	$(CP) $(CHARSETS) $(DATADIR)/charsets
+

 #
 # End of "$Id$".
@@ -0,0 +1,251 @@
+charset 8bit
+
+#
+# This file defines the font and character mappings used for ISO-8859-1
+# (Latin1/West European) text printing.
+#
+# The first line consists of:
+#
+#   direction width normal bold italic bold-italic
+#
+# Direction is the string "ltor" or "rtol", indicating left-to-right or
+# right-to-left text.
+#
+# Width is the string "single" or "double"; double means that the glyphs
+# are twice as wide as ASCII characters in the Courier typeface.
+#
+# "Normal", "bold", "italic", and "bold-italic" are the typefaces to use
+# for each presentation.  If characters are only available in a single
+# style then only one typeface should be listed (e.g. "Symbol")
+#
+# Each font that is listed will be used (and downloaded if needed) when
+# printing.
+#
+
+ltor single Courier Courier-Bold Courier-Italic Courier-BoldItalic
+
+#
+# The following lines define the mapping from the 8-bit character set to
+# the Unicode glyphs for each character:
+#
+#   char glyph
+#
+# "Char" and "glyph" are hexadecimal values.
+#
+
+20 0020
+21 0021
+22 0022
+23 0023
+24 0024
+25 0025
+26 0026
+27 0027
+28 0028
+29 0029
+2A 002A
+2B 002B
+2C 002C
+2D 002D
+2E 002E
+2F 002F
+30 0030
+31 0031
+32 0032
+33 0033
+34 0034
+35 0035
+36 0036
+37 0037
+38 0038
+39 0039
+3A 003A
+3B 003B
+3C 003C
+3D 003D
+3E 003E
+3F 003F
+40 0040
+41 0041
+42 0042
+43 0043
+44 0044
+45 0045
+46 0046
+47 0047
+48 0048
+49 0049
+4A 004A
+4B 004B
+4C 004C
+4D 004D
+4E 004E
+4F 004F
+50 0050
+51 0051
+52 0052
+53 0053
+54 0054
+55 0055
+56 0056
+57 0057
+58 0058
+59 0059
+5A 005A
+5B 005B
+5C 005C
+5D 005D
+5E 005E
+5F 005F
+60 0060
+61 0061
+62 0062
+63 0063
+64 0064
+65 0065
+66 0066
+67 0067
+68 0068
+69 0069
+6A 006A
+6B 006B
+6C 006C
+6D 006D
+6E 006E
+6F 006F
+70 0070
+71 0071
+72 0072
+73 0073
+74 0074
+75 0075
+76 0076
+77 0077
+78 0078
+79 0079
+7A 007A
+7B 007B
+7C 007C
+7D 007D
+7E 007E
+80 20AC
+82 201A
+83 0192
+84 201E
+85 2026
+86 2020
+87 2021
+88 02C6
+89 2030
+8A 0160
+8B 2039
+8C 0152
+91 2018
+92 2019
+93 201C
+94 201D
+95 2022
+96 2013
+97 2014
+98 02DC
+99 2122
+9A 0161
+9B 203A
+9C 0153
+9F 0178
+A0 00A0
+A1 00A1
+A2 00A2
+A3 00A3
+A4 00A4
+A5 00A5
+A6 00A6
+A7 00A7
+A8 00A8
+A9 00A9
+AA 00AA
+AB 00AB
+AC 00AC
+AD 00AD
+AE 00AE
+AF 00AF
+B0 00B0
+B1 00B1
+B2 00B2
+B3 00B3
+B4 00B4
+B5 00B5
+B6 00B6
+B7 00B7
+B8 00B8
+B9 00B9
+BA 00BA
+BB 00BB
+BC 00BC
+BD 00BD
+BE 00BE
+BF 00BF
+C0 00C0
+C1 00C1
+C2 00C2
+C3 00C3
+C4 00C4
+C5 00C5
+C6 00C6
+C7 00C7
+C8 00C8
+C9 00C9
+CA 00CA
+CB 00CB
+CC 00CC
+CD 00CD
+CE 00CE
+CF 00CF
+D0 00D0
+D1 00D1
+D2 00D2
+D3 00D3
+D4 00D4
+D5 00D5
+D6 00D6
+D7 00D7
+D8 00D8
+D9 00D9
+DA 00DA
+DB 00DB
+DC 00DC
+DD 00DD
+DE 00DE
+DF 00DF
+E0 00E0
+E1 00E1
+E2 00E2
+E3 00E3
+E4 00E4
+E5 00E5
+E6 00E6
+E7 00E7
+E8 00E8
+E9 00E9
+EA 00EA
+EB 00EB
+EC 00EC
+ED 00ED
+EE 00EE
+EF 00EF
+F0 00F0
+F1 00F1
+F2 00F2
+F3 00F3
+F4 00F4
+F5 00F5
+F6 00F6
+F7 00F7
+F8 00F8
+F9 00F9
+FA 00FA
+FB 00FB
+FC 00FC
+FD 00FD
+FE 00FE
+FF 00FF
@@ -0,0 +1,251 @@
+charset 8bit
+
+#
+# This file defines the font and character mappings used for ISO-8859-10
+# (Latin6/Nordic) text printing.
+#
+# The first line consists of:
+#
+#   direction width normal bold italic bold-italic
+#
+# Direction is the string "ltor" or "rtol", indicating left-to-right or
+# right-to-left text.
+#
+# Width is the string "single" or "double"; double means that the glyphs
+# are twice as wide as ASCII characters in the Courier typeface.
+#
+# "Normal", "bold", "italic", and "bold-italic" are the typefaces to use
+# for each presentation.  If characters are only available in a single
+# style then only one typeface should be listed (e.g. "Symbol")
+#
+# Each font that is listed will be used (and downloaded if needed) when
+# printing.
+#
+
+ltor single Courier Courier-Bold Courier-Italic Courier-BoldItalic
+
+#
+# The following lines define the mapping from the 8-bit character set to
+# the Unicode glyphs for each character:
+#
+#   char glyph
+#
+# "Char" and "glyph" are hexadecimal values.
+#
+
+20 0020
+21 0021
+22 0022
+23 0023
+24 0024
+25 0025
+26 0026
+27 0027
+28 0028
+29 0029
+2A 002A
+2B 002B
+2C 002C
+2D 002D
+2E 002E
+2F 002F
+30 0030
+31 0031
+32 0032
+33 0033
+34 0034
+35 0035
+36 0036
+37 0037
+38 0038
+39 0039
+3A 003A
+3B 003B
+3C 003C
+3D 003D
+3E 003E
+3F 003F
+40 0040
+41 0041
+42 0042
+43 0043
+44 0044
+45 0045
+46 0046
+47 0047
+48 0048
+49 0049
+4A 004A
+4B 004B
+4C 004C
+4D 004D
+4E 004E
+4F 004F
+50 0050
+51 0051
+52 0052
+53 0053
+54 0054
+55 0055
+56 0056
+57 0057
+58 0058
+59 0059
+5A 005A
+5B 005B
+5C 005C
+5D 005D
+5E 005E
+5F 005F
+60 0060
+61 0061
+62 0062
+63 0063
+64 0064
+65 0065
+66 0066
+67 0067
+68 0068
+69 0069
+6A 006A
+6B 006B
+6C 006C
+6D 006D
+6E 006E
+6F 006F
+70 0070
+71 0071
+72 0072
+73 0073
+74 0074
+75 0075
+76 0076
+77 0077
+78 0078
+79 0079
+7A 007A
+7B 007B
+7C 007C
+7D 007D
+7E 007E
+80 20AC
+82 201A
+83 0192
+84 201E
+85 2026
+86 2020
+87 2021
+88 02C6
+89 2030
+8A 0160
+8B 2039
+8C 0152
+91 2018
+92 2019
+93 201C
+94 201D
+95 2022
+96 2013
+97 2014
+98 02DC
+99 2122
+9A 0161
+9B 203A
+9C 0153
+9F 0178
+A0 00A0
+A1 0104
+A2 0112
+A3 0122
+A4 012A
+A5 0128
+A6 0136
+A7 00A7
+A8 013B
+A9 0110
+AA 0160
+AB 0166
+AC 017D
+AD 00AD
+AE 016A
+AF 014A
+B0 00B0
+B1 0105
+B2 0113
+B3 0123
+B4 012B
+B5 0129
+B6 0137
+B7 00B7
+B8 013C
+B9 0111
+BA 0161
+BB 0167
+BC 017E
+BD 2015
+BE 016B
+BF 014B
+C0 0100
+C1 00C1
+C2 00C2
+C3 00C3
+C4 00C4
+C5 00C5
+C6 00C6
+C7 012E
+C8 010C
+C9 00C9
+CA 0118
+CB 00CB
+CC 0116
+CD 00CD
+CE 00CE
+CF 00CF
+D0 0110
+D1 0145
+D2 014C
+D3 00D3
+D4 00D4
+D5 00D5
+D6 00D6
+D7 0168
+D8 00D8
+D9 0172
+DA 00DA
+DB 00DB
+DC 00DC
+DD 00DD
+DE 00DE
+DF 00DF
+E0 0101
+E1 00E1
+E2 00E2
+E3 00E3
+E4 00E4
+E5 00E5
+E6 00E6
+E7 012F
+E8 010D
+E9 00E9
+EA 0119
+EB 00EB
+EC 0117
+ED 00ED
+EE 00EE
+EF 00EF
+F0 00F0
+F1 0146
+F2 014D
+F3 00F3
+F4 00F4
+F5 00F5
+F6 00F6
+F7 0169
+F8 00F8
+F9 0173
+FA 00FA
+FB 00FB
+FC 00FC
+FD 00FD
+FE 00FD
+FF 0138
@@ -0,0 +1,251 @@
+charset 8bit
+
+#
+# This file defines the font and character mappings used for ISO-8859-13
+# (Latin7/Baltic Rim) text printing.
+#
+# The first line consists of:
+#
+#   direction width normal bold italic bold-italic
+#
+# Direction is the string "ltor" or "rtol", indicating left-to-right or
+# right-to-left text.
+#
+# Width is the string "single" or "double"; double means that the glyphs
+# are twice as wide as ASCII characters in the Courier typeface.
+#
+# "Normal", "bold", "italic", and "bold-italic" are the typefaces to use
+# for each presentation.  If characters are only available in a single
+# style then only one typeface should be listed (e.g. "Symbol")
+#
+# Each font that is listed will be used (and downloaded if needed) when
+# printing.
+#
+
+ltor single Courier Courier-Bold Courier-Italic Courier-BoldItalic
+
+#
+# The following lines define the mapping from the 8-bit character set to
+# the Unicode glyphs for each character:
+#
+#   char glyph
+#
+# "Char" and "glyph" are hexadecimal values.
+#
+
+20 0020
+21 0021
+22 0022
+23 0023
+24 0024
+25 0025
+26 0026
+27 0027
+28 0028
+29 0029
+2A 002A
+2B 002B
+2C 002C
+2D 002D
+2E 002E
+2F 002F
+30 0030
+31 0031
+32 0032
+33 0033
+34 0034
+35 0035
+36 0036
+37 0037
+38 0038
+39 0039
+3A 003A
+3B 003B
+3C 003C
+3D 003D
+3E 003E
+3F 003F
+40 0040
+41 0041
+42 0042
+43 0043
+44 0044
+45 0045
+46 0046
+47 0047
+48 0048
+49 0049
+4A 004A
+4B 004B
+4C 004C
+4D 004D
+4E 004E
+4F 004F
+50 0050
+51 0051
+52 0052
+53 0053
+54 0054
+55 0055
+56 0056
+57 0057
+58 0058
+59 0059
+5A 005A
+5B 005B
+5C 005C
+5D 005D
+5E 005E
+5F 005F
+60 0060
+61 0061
+62 0062
+63 0063
+64 0064
+65 0065
+66 0066
+67 0067
+68 0068
+69 0069
+6A 006A
+6B 006B
+6C 006C
+6D 006D
+6E 006E
+6F 006F
+70 0070
+71 0071
+72 0072
+73 0073
+74 0074
+75 0075
+76 0076
+77 0077
+78 0078
+79 0079
+7A 007A
+7B 007B
+7C 007C
+7D 007D
+7E 007E
+80 20AC
+82 201A
+83 0192
+84 201E
+85 2026
+86 2020
+87 2021
+88 02C6
+89 2030
+8A 0160
+8B 2039
+8C 0152
+91 2018
+92 2019
+93 201C
+94 201D
+95 2022
+96 2013
+97 2014
+98 02DC
+99 2122
+9A 0161
+9B 203A
+9C 0153
+9F 0178
+A0 00A0
+A1 201D
+A2 00A2
+A3 00A3
+A4 00A4
+A5 201E
+A6 00A6
+A7 00A7
+A8 00D8
+A9 00A9
+AA 0156
+AB 00AB
+AC 00AC
+AD 00AD
+AE 00AE
+AF 00C6
+B0 00B0
+B1 00B1
+B2 00B2
+B3 00B3
+B4 201C
+B5 00B5
+B6 00B6
+B7 00B7
+B8 00F8
+B9 00B9
+BA 0157
+BB 00BB
+BC 00BC
+BD 00BD
+BE 00BE
+BF 00E6
+C0 0104
+C1 012E
+C2 0100
+C3 0106
+C4 00C4
+C5 00C5
+C6 0118
+C7 0112
+C8 010C
+C9 00C9
+CA 0179
+CB 0116
+CC 0122
+CD 0136
+CE 012A
+CF 013B
+D0 0160
+D1 0143
+D2 0145
+D3 00D3
+D4 014C
+D5 00D5
+D6 00D6
+D7 00D7
+D8 0172
+D9 0141
+DA 015A
+DB 016A
+DC 00DC
+DD 017B
+DE 017D
+DF 00DF
+E0 0105
+E1 012F
+E2 0101
+E3 0107
+E4 00E4
+E5 00E5
+E6 0119
+E7 0113
+E8 010D
+E9 00E9
+EA 017A
+EB 0117
+EC 0123
+ED 0137
+EE 012B
+EF 013C
+F0 0161
+F1 0144
+F2 0146
+F3 00F3
+F4 014D
+F5 00F5
+F6 00F6
+F7 00F7
+F8 0173
+F9 0142
+FA 015B
+FB 016B
+FC 00FC
+FD 017C
+FE 017E
+FF 2019
@@ -0,0 +1,251 @@
+charset 8bit
+
+#
+# This file defines the font and character mappings used for ISO-8859-14
+# (Latin8/Celtic) text printing.
+#
+# The first line consists of:
+#
+#   direction width normal bold italic bold-italic
+#
+# Direction is the string "ltor" or "rtol", indicating left-to-right or
+# right-to-left text.
+#
+# Width is the string "single" or "double"; double means that the glyphs
+# are twice as wide as ASCII characters in the Courier typeface.
+#
+# "Normal", "bold", "italic", and "bold-italic" are the typefaces to use
+# for each presentation.  If characters are only available in a single
+# style then only one typeface should be listed (e.g. "Symbol")
+#
+# Each font that is listed will be used (and downloaded if needed) when
+# printing.
+#
+
+ltor single Courier Courier-Bold Courier-Italic Courier-BoldItalic
+
+#
+# The following lines define the mapping from the 8-bit character set to
+# the Unicode glyphs for each character:
+#
+#   char glyph
+#
+# "Char" and "glyph" are hexadecimal values.
+#
+
+20 0020
+21 0021
+22 0022
+23 0023
+24 0024
+25 0025
+26 0026
+27 0027
+28 0028
+29 0029
+2A 002A
+2B 002B
+2C 002C
+2D 002D
+2E 002E
+2F 002F
+30 0030
+31 0031
+32 0032
+33 0033
+34 0034
+35 0035
+36 0036
+37 0037
+38 0038
+39 0039
+3A 003A
+3B 003B
+3C 003C
+3D 003D
+3E 003E
+3F 003F
+40 0040
+41 0041
+42 0042
+43 0043
+44 0044
+45 0045
+46 0046
+47 0047
+48 0048
+49 0049
+4A 004A
+4B 004B
+4C 004C
+4D 004D
+4E 004E
+4F 004F
+50 0050
+51 0051
+52 0052
+53 0053
+54 0054
+55 0055
+56 0056
+57 0057
+58 0058
+59 0059
+5A 005A
+5B 005B
+5C 005C
+5D 005D
+5E 005E
+5F 005F
+60 0060
+61 0061
+62 0062
+63 0063
+64 0064
+65 0065
+66 0066
+67 0067
+68 0068
+69 0069
+6A 006A
+6B 006B
+6C 006C
+6D 006D
+6E 006E
+6F 006F
+70 0070
+71 0071
+72 0072
+73 0073
+74 0074
+75 0075
+76 0076
+77 0077
+78 0078
+79 0079
+7A 007A
+7B 007B
+7C 007C
+7D 007D
+7E 007E
+80 20AC
+82 201A
+83 0192
+84 201E
+85 2026
+86 2020
+87 2021
+88 02C6
+89 2030
+8A 0160
+8B 2039
+8C 0152
+91 2018
+92 2019
+93 201C
+94 201D
+95 2022
+96 2013
+97 2014
+98 02DC
+99 2122
+9A 0161
+9B 203A
+9C 0153
+9F 0178
+A0 00A0
+A1 1E02
+A2 1E03
+A3 00A3
+A4 010A
+A5 010B
+A6 1E0A
+A7 00A7
+A8 1E80
+A9 00A9
+AA 1E82
+AB 1E0B
+AC 1EF2
+AD 00AD
+AE 00AE
+AF 0178
+B0 1E1E
+B1 1E1F
+B2 0120
+B3 0121
+B4 1E40
+B5 1E41
+B6 00B6
+B7 1E56
+B8 1E81
+B9 1E57
+BA 1E83
+BB 1E60
+BC 1EF3
+BD 1E84
+BE 1E85
+BF 1E61
+C0 00C0
+C1 00C1
+C2 00C2
+C3 00C3
+C4 00C4
+C5 00C5
+C6 00C6
+C7 00C7
+C8 00C8
+C9 00C9
+CA 00CA
+CB 00CB
+CC 00CC
+CD 00CD
+CE 00CE
+CF 00CF
+D0 0174
+D1 00D1
+D2 00D2
+D3 00D3
+D4 00D4
+D5 00D5
+D6 00D6
+D7 1E6A
+D8 00D8
+D9 00D9
+DA 00DA
+DB 00DB
+DC 00DC
+DD 00DD
+DE 0176
+DF 00DF
+E0 00E0
+E1 00E1
+E2 00E2
+E3 00E3
+E4 00E4
+E5 00E5
+E6 00E6
+E7 00E7
+E8 00E8
+E9 00E9
+EA 00EA
+EB 00EB
+EC 00EC
+ED 00ED
+EE 00EE
+EF 00EF
+F0 0175
+F1 00F1
+F2 00F2
+F3 00F3
+F4 00F4
+F5 00F5
+F6 00F6
+F7 1E6B
+F8 00F8
+F9 00F9
+FA 00FA
+FB 00FB
+FC 00FC
+FD 00FD
+FE 0177
+FF 00FF
@@ -0,0 +1,251 @@
+charset 8bit
+
+#
+# This file defines the font and character mappings used for ISO-8859-15
+# (Latin9/West Europe + Euro) text printing.
+#
+# The first line consists of:
+#
+#   direction width normal bold italic bold-italic
+#
+# Direction is the string "ltor" or "rtol", indicating left-to-right or
+# right-to-left text.
+#
+# Width is the string "single" or "double"; double means that the glyphs
+# are twice as wide as ASCII characters in the Courier typeface.
+#
+# "Normal", "bold", "italic", and "bold-italic" are the typefaces to use
+# for each presentation.  If characters are only available in a single
+# style then only one typeface should be listed (e.g. "Symbol")
+#
+# Each font that is listed will be used (and downloaded if needed) when
+# printing.
+#
+
+ltor single Courier Courier-Bold Courier-Italic Courier-BoldItalic
+
+#
+# The following lines define the mapping from the 8-bit character set to
+# the Unicode glyphs for each character:
+#
+#   char glyph
+#
+# "Char" and "glyph" are hexadecimal values.
+#
+
+20 0020
+21 0021
+22 0022
+23 0023
+24 0024
+25 0025
+26 0026
+27 0027
+28 0028
+29 0029
+2A 002A
+2B 002B
+2C 002C
+2D 002D
+2E 002E
+2F 002F
+30 0030
+31 0031
+32 0032
+33 0033
+34 0034
+35 0035
+36 0036
+37 0037
+38 0038
+39 0039
+3A 003A
+3B 003B
+3C 003C
+3D 003D
+3E 003E
+3F 003F
+40 0040
+41 0041
+42 0042
+43 0043
+44 0044
+45 0045
+46 0046
+47 0047
+48 0048
+49 0049
+4A 004A
+4B 004B
+4C 004C
+4D 004D
+4E 004E
+4F 004F
+50 0050
+51 0051
+52 0052
+53 0053
+54 0054
+55 0055
+56 0056
+57 0057
+58 0058
+59 0059
+5A 005A
+5B 005B
+5C 005C
+5D 005D
+5E 005E
+5F 005F
+60 0060
+61 0061
+62 0062
+63 0063
+64 0064
+65 0065
+66 0066
+67 0067
+68 0068
+69 0069
+6A 006A
+6B 006B
+6C 006C
+6D 006D
+6E 006E
+6F 006F
+70 0070
+71 0071
+72 0072
+73 0073
+74 0074
+75 0075
+76 0076
+77 0077
+78 0078
+79 0079
+7A 007A
+7B 007B
+7C 007C
+7D 007D
+7E 007E
+80 20AC
+82 201A
+83 0192
+84 201E
+85 2026
+86 2020
+87 2021
+88 02C6
+89 2030
+8A 0160
+8B 2039
+8C 0152
+91 2018
+92 2019
+93 201C
+94 201D
+95 2022
+96 2013
+97 2014
+98 02DC
+99 2122
+9A 0161
+9B 203A
+9C 0153
+9F 0178
+A0 00A0
+A1 00A1
+A2 00A2
+A3 00A3
+A4 20AC
+A5 00A5
+A6 0160
+A7 00A7
+A8 0161
+A9 00A9
+AA 00AA
+AB 00AB
+AC 00AC
+AD 00AD
+AE 00AE
+AF 00AF
+B0 00B0
+B1 00B1
+B2 00B2
+B3 00B3
+B4 017D
+B5 00B5
+B6 00B6
+B7 00B7
+B8 017E
+B9 00B9
+BA 00BA
+BB 00BB
+BC 0152
+BD 0153
+BE 0178
+BF 00BF
+C0 00C0
+C1 00C1
+C2 00C2
+C3 00C3
+C4 00C4
+C5 00C5
+C6 00C6
+C7 00C7
+C8 00C8
+C9 00C9
+CA 00CA
+CB 00CB
+CC 00CC
+CD 00CD
+CE 00CE
+CF 00CF
+D0 00D0
+D1 00D1
+D2 00D2
+D3 00D3
+D4 00D4
+D5 00D5
+D6 00D6
+D7 00D7
+D8 00D8
+D9 00D9
+DA 00DA
+DB 00DB
+DC 00DC
+DD 00DD
+DE 00DE
+DF 00DF
+E0 00E0
+E1 00E1
+E2 00E2
+E3 00E3
+E4 00E4
+E5 00E5
+E6 00E6
+E7 00E7
+E8 00E8
+E9 00E9
+EA 00EA
+EB 00EB
+EC 00EC
+ED 00ED
+EE 00EE
+EF 00EF
+F0 00F0
+F1 00F1
+F2 00F2
+F3 00F3
+F4 00F4
+F5 00F5
+F6 00F6
+F7 00F7
+F8 00F8
+F9 00F9
+FA 00FA
+FB 00FB
+FC 00FC
+FD 00FD
+FE 00FE
+FF 00FF
@@ -0,0 +1,253 @@
+charset 8bit
+
+#
+# This file defines the font and character mappings used for ISO-8859-2
+# (Latin2/East European) text printing.
+#
+# The first line consists of:
+#
+#   direction width normal bold italic bold-italic
+#
+# Direction is the string "ltor" or "rtol", indicating left-to-right or
+# right-to-left text.
+#
+# Width is the string "single" or "double"; double means that the glyphs
+# are twice as wide as ASCII characters in the Courier typeface.
+#
+# "Normal", "bold", "italic", and "bold-italic" are the typefaces to use
+# for each presentation.  If characters are only available in a single
+# style then only one typeface should be listed (e.g. "Symbol")
+#
+# Each font that is listed will be used (and downloaded if needed) when
+# printing.
+#
+
+ltor single Courier Courier-Bold Courier-Italic Courier-BoldItalic
+
+#
+# The following lines define the mapping from the 8-bit character set to
+# the Unicode glyphs for each character:
+#
+#   char glyph
+#
+# "Char" and "glyph" are hexadecimal values.
+#
+
+20 0020
+21 0021
+22 0022
+23 0023
+24 0024
+25 0025
+26 0026
+27 0027
+28 0028
+29 0029
+2A 002A
+2B 002B
+2C 002C
+2D 002D
+2E 002E
+2F 002F
+30 0030
+31 0031
+32 0032
+33 0033
+34 0034
+35 0035
+36 0036
+37 0037
+38 0038
+39 0039
+3A 003A
+3B 003B
+3C 003C
+3D 003D
+3E 003E
+3F 003F
+40 0040
+41 0041
+42 0042
+43 0043
+44 0044
+45 0045
+46 0046
+47 0047
+48 0048
+49 0049
+4A 004A
+4B 004B
+4C 004C
+4D 004D
+4E 004E
+4F 004F
+50 0050
+51 0051
+52 0052
+53 0053
+54 0054
+55 0055
+56 0056
+57 0057
+58 0058
+59 0059
+5A 005A
+5B 005B
+5C 005C
+5D 005D
+5E 005E
+5F 005F
+60 0060
+61 0061
+62 0062
+63 0063
+64 0064
+65 0065
+66 0066
+67 0067
+68 0068
+69 0069
+6A 006A
+6B 006B
+6C 006C
+6D 006D
+6E 006E
+6F 006F
+70 0070
+71 0071
+72 0072
+73 0073
+74 0074
+75 0075
+76 0076
+77 0077
+78 0078
+79 0079
+7A 007A
+7B 007B
+7C 007C
+7D 007D
+7E 007E
+80 20AC
+82 201A
+84 201E
+85 2026
+86 2020
+87 2021
+89 2030
+8A 0160
+8B 2039
+8C 015A
+8D 0164
+8E 017D
+8F 0179
+91 2018
+92 2019
+93 201C
+94 201D
+95 2022
+96 2013
+97 2014
+99 2122
+9A 0161
+9B 203A
+8C 015B
+8D 0165
+8E 017E
+8F 017A
+A0 00A0
+A1 0104
+A2 02D8
+A3 0141
+A4 00A4
+A5 013D
+A6 015A
+A7 00A7
+A8 00A8
+A9 0160
+AA 015E
+AB 0164
+AC 0179
+AD 00AD
+AE 017D
+AF 017B
+B0 00B0
+B1 0105
+B2 02DB
+B3 0142
+B4 00B4
+B5 013E
+B6 015B
+B7 02C7
+B8 00B8
+B9 0161
+BA 015F
+BB 0165
+BC 017A
+BD 02DD
+BE 017E
+BF 017C
+C0 0154
+C1 00C1
+C2 00C2
+C3 0102
+C4 00C4
+C5 0139
+C6 0106
+C7 00C7
+C8 010C
+C9 00C9
+CA 0118
+CB 00CB
+CC 011A
+CD 00CD
+CE 00CE
+CF 010E
+D0 0110
+D1 0143
+D2 0147
+D3 00D3
+D4 00D4
+D5 0150
+D6 00D6
+D7 00D7
+D8 0158
+D9 016E
+DA 00DA
+DB 0170
+DC 00DC
+DD 00DD
+DE 0162
+DF 00DF
+E0 0155
+E1 00E1
+E2 00E2
+E3 0103
+E4 00E4
+E5 013A
+E6 0107
+E7 00E7
+E8 010D
+E9 00E9
+EA 0119
+EB 00EB
+EC 011B
+ED 00ED
+EE 00EE
+EF 010F
+F0 0111
+F1 0144
+F2 0148
+F3 00F3
+F4 00F4
+F5 0151
+F6 00F6
+F7 00F7
+F8 0159
+F9 016F
+FA 00FA
+FB 0171
+FC 00FC
+FD 00FD
+FE 0163
+FF 02D9
@@ -0,0 +1,244 @@
+charset 8bit
+
+#
+# This file defines the font and character mappings used for ISO-8859-3
+# (Latin3/South European) text printing.
+#
+# The first line consists of:
+#
+#   direction width normal bold italic bold-italic
+#
+# Direction is the string "ltor" or "rtol", indicating left-to-right or
+# right-to-left text.
+#
+# Width is the string "single" or "double"; double means that the glyphs
+# are twice as wide as ASCII characters in the Courier typeface.
+#
+# "Normal", "bold", "italic", and "bold-italic" are the typefaces to use
+# for each presentation.  If characters are only available in a single
+# style then only one typeface should be listed (e.g. "Symbol")
+#
+# Each font that is listed will be used (and downloaded if needed) when
+# printing.
+#
+
+ltor single Courier Courier-Bold Courier-Italic Courier-BoldItalic
+
+#
+# The following lines define the mapping from the 8-bit character set to
+# the Unicode glyphs for each character:
+#
+#   char glyph
+#
+# "Char" and "glyph" are hexadecimal values.
+#
+
+20 0020
+21 0021
+22 0022
+23 0023
+24 0024
+25 0025
+26 0026
+27 0027
+28 0028
+29 0029
+2A 002A
+2B 002B
+2C 002C
+2D 002D
+2E 002E
+2F 002F
+30 0030
+31 0031
+32 0032
+33 0033
+34 0034
+35 0035
+36 0036
+37 0037
+38 0038
+39 0039
+3A 003A
+3B 003B
+3C 003C
+3D 003D
+3E 003E
+3F 003F
+40 0040
+41 0041
+42 0042
+43 0043
+44 0044
+45 0045
+46 0046
+47 0047
+48 0048
+49 0049
+4A 004A
+4B 004B
+4C 004C
+4D 004D
+4E 004E
+4F 004F
+50 0050
+51 0051
+52 0052
+53 0053
+54 0054
+55 0055
+56 0056
+57 0057
+58 0058
+59 0059
+5A 005A
+5B 005B
+5C 005C
+5D 005D
+5E 005E
+5F 005F
+60 0060
+61 0061
+62 0062
+63 0063
+64 0064
+65 0065
+66 0066
+67 0067
+68 0068
+69 0069
+6A 006A
+6B 006B
+6C 006C
+6D 006D
+6E 006E
+6F 006F
+70 0070
+71 0071
+72 0072
+73 0073
+74 0074
+75 0075
+76 0076
+77 0077
+78 0078
+79 0079
+7A 007A
+7B 007B
+7C 007C
+7D 007D
+7E 007E
+80 20AC
+82 201A
+83 0192
+84 201E
+85 2026
+86 2020
+87 2021
+88 02C6
+89 2030
+8A 0160
+8B 2039
+8C 0152
+91 2018
+92 2019
+93 201C
+94 201D
+95 2022
+96 2013
+97 2014
+98 02DC
+99 2122
+9A 0161
+9B 203A
+9C 0153
+9F 0178
+A0 00A0
+A1 0126
+A2 02D8
+A3 00A3
+A4 00A4
+A6 0124
+A7 00A7
+A8 00A8
+A9 0130
+AA 015E
+AB 011E
+AC 0134
+AD 00AD
+AF 017B
+B0 00B0
+B1 0127
+B2 00B2
+B3 00B3
+B4 00B4
+B5 00B5
+B6 0125
+B7 00B7
+B8 00B8
+B9 0131
+BA 015F
+BB 011F
+BC 0135
+BD 00BD
+BF 017C
+C0 00C0
+C1 00C1
+C2 00C2
+C4 00C4
+C5 010A
+C6 0108
+C7 00C7
+C8 00C8
+C9 00C9
+CA 00CA
+CB 00CB
+CC 00CC
+CD 00CD
+CE 00CE
+CF 00CF
+D1 00D1
+D2 00D2
+D3 00D3
+D4 00D4
+D5 0120
+D6 00D6
+D7 00D7
+D8 011C
+D9 00D9
+DA 00DA
+DB 00DB
+DC 00DC
+DD 016C
+DE 015C
+DF 00DF
+E0 00E0
+E1 00E1
+E2 00E2
+E4 00E4
+E5 010B
+E6 0109
+E7 00E7
+E8 00E8
+E9 00E9
+EA 00EA
+EB 00EB
+EC 00EC
+ED 00ED
+EE 00EE
+EF 00EF
+F1 00F1
+F2 00F2
+F3 00F3
+F4 00F4
+F5 0121
+F6 00F6
+F7 00F7
+F8 011D
+F9 00F9
+FA 00FA
+FB 00FB
+FC 00FC
+FD 016D
+FE 015D
+FF 02D9
@@ -0,0 +1,251 @@
+charset 8bit
+
+#
+# This file defines the font and character mappings used for ISO-8859-4
+# (Latin4/North European) text printing.
+#
+# The first line consists of:
+#
+#   direction width normal bold italic bold-italic
+#
+# Direction is the string "ltor" or "rtol", indicating left-to-right or
+# right-to-left text.
+#
+# Width is the string "single" or "double"; double means that the glyphs
+# are twice as wide as ASCII characters in the Courier typeface.
+#
+# "Normal", "bold", "italic", and "bold-italic" are the typefaces to use
+# for each presentation.  If characters are only available in a single
+# style then only one typeface should be listed (e.g. "Symbol")
+#
+# Each font that is listed will be used (and downloaded if needed) when
+# printing.
+#
+
+ltor single Courier Courier-Bold Courier-Italic Courier-BoldItalic
+
+#
+# The following lines define the mapping from the 8-bit character set to
+# the Unicode glyphs for each character:
+#
+#   char glyph
+#
+# "Char" and "glyph" are hexadecimal values.
+#
+
+20 0020
+21 0021
+22 0022
+23 0023
+24 0024
+25 0025
+26 0026
+27 0027
+28 0028
+29 0029
+2A 002A
+2B 002B
+2C 002C
+2D 002D
+2E 002E
+2F 002F
+30 0030
+31 0031
+32 0032
+33 0033
+34 0034
+35 0035
+36 0036
+37 0037
+38 0038
+39 0039
+3A 003A
+3B 003B
+3C 003C
+3D 003D
+3E 003E
+3F 003F
+40 0040
+41 0041
+42 0042
+43 0043
+44 0044
+45 0045
+46 0046
+47 0047
+48 0048
+49 0049
+4A 004A
+4B 004B
+4C 004C
+4D 004D
+4E 004E
+4F 004F
+50 0050
+51 0051
+52 0052
+53 0053
+54 0054
+55 0055
+56 0056
+57 0057
+58 0058
+59 0059
+5A 005A
+5B 005B
+5C 005C
+5D 005D
+5E 005E
+5F 005F
+60 0060
+61 0061
+62 0062
+63 0063
+64 0064
+65 0065
+66 0066
+67 0067
+68 0068
+69 0069
+6A 006A
+6B 006B
+6C 006C
+6D 006D
+6E 006E
+6F 006F
+70 0070
+71 0071
+72 0072
+73 0073
+74 0074
+75 0075
+76 0076
+77 0077
+78 0078
+79 0079
+7A 007A
+7B 007B
+7C 007C
+7D 007D
+7E 007E
+80 20AC
+82 201A
+83 0192
+84 201E
+85 2026
+86 2020
+87 2021
+88 02C6
+89 2030
+8A 0160
+8B 2039
+8C 0152
+91 2018
+92 2019
+93 201C
+94 201D
+95 2022
+96 2013
+97 2014
+98 02DC
+99 2122
+9A 0161
+9B 203A
+9C 0153
+9F 0178
+A0 00A0
+A1 0104
+A2 0138
+A3 0156
+A4 00A4
+A5 0128
+A6 013B
+A7 00A7
+A8 00A8
+A9 0160
+AA 0112
+AB 0122
+AC 0166
+AD 00AD
+AE 017D
+AF 00AF
+B0 00B0
+B1 0105
+B2 02DB
+B3 0157
+B4 00B4
+B5 0129
+B6 013C
+B7 02C7
+B8 00B8
+B9 0161
+BA 0113
+BB 0123
+BC 0167
+BD 014A
+BE 017E
+BF 014B
+C0 0100
+C1 00C1
+C2 00C2
+C3 00C3
+C4 00C4
+C5 00C5
+C6 00C6
+C7 012E
+C8 010C
+C9 00C9
+CA 0118
+CB 00CB
+CC 0116
+CD 00CD
+CE 00CE
+CF 012A
+D0 0110
+D1 0145
+D2 014C
+D3 0136
+D4 00D4
+D5 00D5
+D6 00D6
+D7 00D7
+D8 00D8
+D9 0172
+DA 00DA
+DB 00DB
+DC 00DC
+DD 0168
+DE 016A
+DF 00DF
+E0 0101
+E1 00E1
+E2 00E2
+E3 00E3
+E4 00E4
+E5 00E5
+E6 00E6
+E7 012F
+E8 010D
+E9 00E9
+EA 0119
+EB 00EB
+EC 0117
+ED 00ED
+EE 00EE
+EF 012B
+F0 0111
+F1 0146
+F2 014D
+F3 0137
+F4 00F4
+F5 00F5
+F6 00F6
+F7 00F7
+F8 00F8
+F9 0173
+FA 00FA
+FB 00FB
+FC 00FC
+FD 0169
+FE 016B
+FF 02D9
@@ -0,0 +1,251 @@
+charset 8bit
+
+#
+# This file defines the font and character mappings used for ISO-8859-5
+# (Cyrillic) text printing.
+#
+# The first line consists of:
+#
+#   direction width normal bold italic bold-italic
+#
+# Direction is the string "ltor" or "rtol", indicating left-to-right or
+# right-to-left text.
+#
+# Width is the string "single" or "double"; double means that the glyphs
+# are twice as wide as ASCII characters in the Courier typeface.
+#
+# "Normal", "bold", "italic", and "bold-italic" are the typefaces to use
+# for each presentation.  If characters are only available in a single
+# style then only one typeface should be listed (e.g. "Symbol")
+#
+# Each font that is listed will be used (and downloaded if needed) when
+# printing.
+#
+
+ltor single Courier Courier-Bold Courier-Italic Courier-BoldItalic
+
+#
+# The following lines define the mapping from the 8-bit character set to
+# the Unicode glyphs for each character:
+#
+#   char glyph
+#
+# "Char" and "glyph" are hexadecimal values.
+#
+
+20 0020
+21 0021
+22 0022
+23 0023
+24 0024
+25 0025
+26 0026
+27 0027
+28 0028
+29 0029
+2A 002A
+2B 002B
+2C 002C
+2D 002D
+2E 002E
+2F 002F
+30 0030
+31 0031
+32 0032
+33 0033
+34 0034
+35 0035
+36 0036
+37 0037
+38 0038
+39 0039
+3A 003A
+3B 003B
+3C 003C
+3D 003D
+3E 003E
+3F 003F
+40 0040
+41 0041
+42 0042
+43 0043
+44 0044
+45 0045
+46 0046
+47 0047
+48 0048
+49 0049
+4A 004A
+4B 004B
+4C 004C
+4D 004D
+4E 004E
+4F 004F
+50 0050
+51 0051
+52 0052
+53 0053
+54 0054
+55 0055
+56 0056
+57 0057
+58 0058
+59 0059
+5A 005A
+5B 005B
+5C 005C
+5D 005D
+5E 005E
+5F 005F
+60 0060
+61 0061
+62 0062
+63 0063
+64 0064
+65 0065
+66 0066
+67 0067
+68 0068
+69 0069
+6A 006A
+6B 006B
+6C 006C
+6D 006D
+6E 006E
+6F 006F
+70 0070
+71 0071
+72 0072
+73 0073
+74 0074
+75 0075
+76 0076
+77 0077
+78 0078
+79 0079
+7A 007A
+7B 007B
+7C 007C
+7D 007D
+7E 007E
+80 20AC
+82 201A
+83 0192
+84 201E
+85 2026
+86 2020
+87 2021
+88 02C6
+89 2030
+8A 0160
+8B 2039
+8C 0152
+91 2018
+92 2019
+93 201C
+94 201D
+95 2022
+96 2013
+97 2014
+98 02DC
+99 2122
+9A 0161
+9B 203A
+9C 0153
+9F 0178
+A0 00A0
+A1 0401
+A2 0402
+A3 0403
+A4 0404
+A5 0405
+A6 0406
+A7 0407
+A8 0408
+A9 0409
+AA 040A
+AB 040B
+AC 040C
+AD 00AD
+AE 040E
+AF 040F
+B0 0410
+B1 0411
+B2 0412
+B3 0413
+B4 0414
+B5 0415
+B6 0416
+B7 0417
+B8 0418
+B9 0419
+BA 041A
+BB 041B
+BC 041C
+BD 041D
+BE 041E
+BF 041F
+C0 0420
+C1 0421
+C2 0422
+C3 0423
+C4 0424
+C5 0425
+C6 0426
+C7 0427
+C8 0428
+C9 0429
+CA 042A
+CB 042B
+CC 042C
+CD 042D
+CE 042E
+CF 042F
+D0 0430
+D1 0431
+D2 0432
+D3 0433
+D4 0434
+D5 0435
+D6 0436
+D7 0437
+D8 0438
+D9 0439
+DA 043A
+DB 043B
+DC 043C
+DD 043D
+DE 043E
+DF 043F
+E0 0440
+E1 0441
+E2 0442
+E3 0443
+E4 0444
+E5 0445
+E6 0446
+E7 0447
+E8 0448
+E9 0449
+EA 044A
+EB 044B
+EC 044C
+ED 044D
+EE 044E
+EF 044F
+F0 2116
+F1 0451
+F2 0452
+F3 0453
+F4 0454
+F5 0455
+F6 0456
+F7 0457
+F8 0458
+F9 0459
+FA 045A
+FB 045B
+FC 045C
+FD 00A7
+FE 045E
+FF 045F
@@ -0,0 +1,206 @@
+charset 8bit
+
+#
+# This file defines the font and character mappings used for ISO-8859-6
+# (Arabic) text printing.
+#
+# The first line consists of:
+#
+#   direction width normal bold italic bold-italic
+#
+# Direction is the string "ltor" or "rtol", indicating left-to-right or
+# right-to-left text.
+#
+# Width is the string "single" or "double"; double means that the glyphs
+# are twice as wide as ASCII characters in the Courier typeface.
+#
+# "Normal", "bold", "italic", and "bold-italic" are the typefaces to use
+# for each presentation.  If characters are only available in a single
+# style then only one typeface should be listed (e.g. "Symbol")
+#
+# Each font that is listed will be used (and downloaded if needed) when
+# printing.
+#
+
+rtol single Courier Courier-Bold Courier-Italic Courier-BoldItalic
+
+#
+# The following lines define the mapping from the 8-bit character set to
+# the Unicode glyphs for each character:
+#
+#   char glyph
+#
+# "Char" and "glyph" are hexadecimal values.
+#
+
+20 0020
+21 0021
+22 0022
+23 0023
+24 0024
+25 0025
+26 0026
+27 0027
+28 0028
+29 0029
+2A 002A
+2B 002B
+2C 002C
+2D 002D
+2E 002E
+2F 002F
+30 0660
+31 0661
+32 0662
+33 0663
+34 0664
+35 0665
+36 0666
+37 0667
+38 0668
+39 0669
+3A 003A
+3B 003B
+3C 003C
+3D 003D
+3E 003E
+3F 003F
+40 0040
+41 0041
+42 0042
+43 0043
+44 0044
+45 0045
+46 0046
+47 0047
+48 0048
+49 0049
+4A 004A
+4B 004B
+4C 004C
+4D 004D
+4E 004E
+4F 004F
+50 0050
+51 0051
+52 0052
+53 0053
+54 0054
+55 0055
+56 0056
+57 0057
+58 0058
+59 0059
+5A 005A
+5B 005B
+5C 005C
+5D 005D
+5E 005E
+5F 005F
+60 0060
+61 0061
+62 0062
+63 0063
+64 0064
+65 0065
+66 0066
+67 0067
+68 0068
+69 0069
+6A 006A
+6B 006B
+6C 006C
+6D 006D
+6E 006E
+6F 006F
+70 0070
+71 0071
+72 0072
+73 0073
+74 0074
+75 0075
+76 0076
+77 0077
+78 0078
+79 0079
+7A 007A
+7B 007B
+7C 007C
+7D 007D
+7E 007E
+80 20AC
+82 201A
+83 0192
+84 201E
+85 2026
+86 2020
+87 2021
+88 02C6
+89 2030
+8A 0160
+8B 2039
+8C 0152
+91 2018
+92 2019
+93 201C
+94 201D
+95 2022
+96 2013
+97 2014
+98 02DC
+99 2122
+9A 0161
+9B 203A
+9C 0153
+9F 0178
+A0 00A0
+A4 00A4
+AC 060C
+AD 00AD
+BB 061B
+BF 061F
+C1 0621
+C2 0622
+C3 0623
+C4 0624
+C5 0625
+C6 0626
+C7 0627
+C8 0628
+C9 0629
+CA 062A
+CB 062B
+CC 062C
+CD 062D
+CE 062E
+CF 062F
+D0 0630
+D1 0631
+D2 0632
+D3 0633
+D4 0634
+D5 0635
+D6 0636
+D7 0637
+D8 0638
+D9 0639
+DA 063A
+E0 0640
+E1 0641
+E2 0642
+E3 0643
+E4 0644
+E5 0645
+E6 0646
+E7 0647
+E8 0648
+E9 0649
+EA 064A
+EB 064B
+EC 064C
+ED 064D
+EE 064E
+EF 064F
+F0 0650
+F1 0651
+F2 0652
@@ -0,0 +1,245 @@
+charset 8bit
+
+#
+# This file defines the font and character mappings used for ISO-8859-7
+# (Greek) text printing.
+#
+# The first line consists of:
+#
+#   direction width normal bold italic bold-italic
+#
+# Direction is the string "ltor" or "rtol", indicating left-to-right or
+# right-to-left text.
+#
+# Width is the string "single" or "double"; double means that the glyphs
+# are twice as wide as ASCII characters in the Courier typeface.
+#
+# "Normal", "bold", "italic", and "bold-italic" are the typefaces to use
+# for each presentation.  If characters are only available in a single
+# style then only one typeface should be listed (e.g. "Symbol")
+#
+# Each font that is listed will be used (and downloaded if needed) when
+# printing.
+#
+
+ltor single Courier Courier-Bold Courier-Italic Courier-BoldItalic
+
+#
+# The following lines define the mapping from the 8-bit character set to
+# the Unicode glyphs for each character:
+#
+#   char glyph
+#
+# "Char" and "glyph" are hexadecimal values.
+#
+
+20 0020
+21 0021
+22 0022
+23 0023
+24 0024
+25 0025
+26 0026
+27 0027
+28 0028
+29 0029
+2A 002A
+2B 002B
+2C 002C
+2D 002D
+2E 002E
+2F 002F
+30 0030
+31 0031
+32 0032
+33 0033
+34 0034
+35 0035
+36 0036
+37 0037
+38 0038
+39 0039
+3A 003A
+3B 003B
+3C 003C
+3D 003D
+3E 003E
+3F 003F
+40 0040
+41 0041
+42 0042
+43 0043
+44 0044
+45 0045
+46 0046
+47 0047
+48 0048
+49 0049
+4A 004A
+4B 004B
+4C 004C
+4D 004D
+4E 004E
+4F 004F
+50 0050
+51 0051
+52 0052
+53 0053
+54 0054
+55 0055
+56 0056
+57 0057
+58 0058
+59 0059
+5A 005A
+5B 005B
+5C 005C
+5D 005D
+5E 005E
+5F 005F
+60 0060
+61 0061
+62 0062
+63 0063
+64 0064
+65 0065
+66 0066
+67 0067
+68 0068
+69 0069
+6A 006A
+6B 006B
+6C 006C
+6D 006D
+6E 006E
+6F 006F
+70 0070
+71 0071
+72 0072
+73 0073
+74 0074
+75 0075
+76 0076
+77 0077
+78 0078
+79 0079
+7A 007A
+7B 007B
+7C 007C
+7D 007D
+7E 007E
+80 20AC
+82 201A
+83 0192
+84 201E
+85 2026
+86 2020
+87 2021
+88 02C6
+89 2030
+8A 0160
+8B 2039
+8C 0152
+91 2018
+92 2019
+93 201C
+94 201D
+95 2022
+96 2013
+97 2014
+98 02DC
+99 2122
+9A 0161
+9B 203A
+9C 0153
+9F 0178
+A0 00A0
+A1 02BD
+A2 02BC
+A3 00A3
+A6 00A6
+A7 00A7
+A8 00A8
+A9 00A9
+AB 00AB
+AC 00AC
+AD 00AD
+AF 2015
+B0 00B0
+B1 00B1
+B2 00B2
+B3 00B3
+B4 0384
+B5 0385
+B6 0386
+B7 00B7
+B8 0388
+B9 0389
+BA 038A
+BB 00BB
+BC 038C
+BD 00BD
+BE 038E
+BF 038F
+C0 0390
+C1 0391
+C2 0392
+C3 0393
+C4 0394
+C5 0395
+C6 0396
+C7 0397
+C8 0398
+C9 0399
+CA 039A
+CB 039B
+CC 039C
+CD 039D
+CE 039E
+CF 039F
+D0 03A0
+D1 03A1
+D3 03A3
+D4 03A4
+D5 03A5
+D6 03A6
+D7 03A7
+D8 03A8
+D9 03A9
+DA 03AA
+DB 03AB
+DC 03AC
+DD 03AD
+DE 03AE
+DF 03AF
+E0 03B0
+E1 03B1
+E2 03B2
+E3 03B3
+E4 03B4
+E5 03B5
+E6 03B6
+E7 03B7
+E8 03B8
+E9 03B9
+EA 03BA
+EB 03BB
+EC 03BC
+ED 03BD
+EE 03BE
+EF 03BF
+F0 03C0
+F1 03C1
+F2 03C2
+F3 03C3
+F4 03C4
+F5 03C5
+F6 03C6
+F7 03C7
+F8 03C8
+F9 03C9
+FA 03CA
+FB 03CB
+FC 03CC
+FD 03CD
+FE 03CE
@@ -0,0 +1,213 @@
+charset 8bit
+
+#
+# This file defines the font and character mappings used for ISO-8859-8
+# (Hebrew) text printing.
+#
+# The first line consists of:
+#
+#   direction width normal bold italic bold-italic
+#
+# Direction is the string "ltor" or "rtol", indicating left-to-right or
+# right-to-left text.
+#
+# Width is the string "single" or "double"; double means that the glyphs
+# are twice as wide as ASCII characters in the Courier typeface.
+#
+# "Normal", "bold", "italic", and "bold-italic" are the typefaces to use
+# for each presentation.  If characters are only available in a single
+# style then only one typeface should be listed (e.g. "Symbol")
+#
+# Each font that is listed will be used (and downloaded if needed) when
+# printing.
+#
+
+rtol single Courier Courier-Bold Courier-Italic Courier-BoldItalic
+
+#
+# The following lines define the mapping from the 8-bit character set to
+# the Unicode glyphs for each character:
+#
+#   char glyph
+#
+# "Char" and "glyph" are hexadecimal values.
+#
+
+20 0020
+21 0021
+22 0022
+23 0023
+24 0024
+25 0025
+26 0026
+27 0027
+28 0028
+29 0029
+2A 002A
+2B 002B
+2C 002C
+2D 002D
+2E 002E
+2F 002F
+30 0030
+31 0031
+32 0032
+33 0033
+34 0034
+35 0035
+36 0036
+37 0037
+38 0038
+39 0039
+3A 003A
+3B 003B
+3C 003C
+3D 003D
+3E 003E
+3F 003F
+40 0040
+41 0041
+42 0042
+43 0043
+44 0044
+45 0045
+46 0046
+47 0047
+48 0048
+49 0049
+4A 004A
+4B 004B
+4C 004C
+4D 004D
+4E 004E
+4F 004F
+50 0050
+51 0051
+52 0052
+53 0053
+54 0054
+55 0055
+56 0056
+57 0057
+58 0058
+59 0059
+5A 005A
+5B 005B
+5C 005C
+5D 005D
+5E 005E
+5F 005F
+60 0060
+61 0061
+62 0062
+63 0063
+64 0064
+65 0065
+66 0066
+67 0067
+68 0068
+69 0069
+6A 006A
+6B 006B
+6C 006C
+6D 006D
+6E 006E
+6F 006F
+70 0070
+71 0071
+72 0072
+73 0073
+74 0074
+75 0075
+76 0076
+77 0077
+78 0078
+79 0079
+7A 007A
+7B 007B
+7C 007C
+7D 007D
+7E 007E
+80 20AC
+82 201A
+83 0192
+84 201E
+85 2026
+86 2020
+87 2021
+88 02C6
+89 2030
+8A 0160
+8B 2039
+8C 0152
+91 2018
+92 2019
+93 201C
+94 201D
+95 2022
+96 2013
+97 2014
+98 02DC
+99 2122
+9A 0161
+9B 203A
+9C 0153
+9F 0178
+A0 00A0
+A2 00A2
+A3 00A3
+A4 00A4
+A5 00A5
+A6 00A6
+A7 00A7
+A8 00A8
+A9 00A9
+AA 00D7
+AB 00AB
+AC 00AC
+AD 00AD
+AE 00AE
+AF 203E
+B0 00B0
+B1 00B1
+B2 00B2
+B3 00B3
+B4 00B4
+B5 00B5
+B6 00B6
+B7 00B7
+B8 00B8
+B9 00B9
+BA 00F7
+BB 00BB
+BC 00BC
+BD 00BD
+BE 00BE
+DF 2017
+E0 05D0
+E1 05D1
+E2 05D2
+E3 05D3
+E4 05D4
+E5 05D5
+E6 05D6
+E7 05D7
+E8 05D8
+E9 05D9
+EA 05DA
+EB 05DB
+EC 05DC
+ED 05DD
+EE 05DE
+EF 05DF
+F0 05E0
+F1 05E1
+F2 05E2
+F3 05E3
+F4 05E4
+F5 05E5
+F6 05E6
+F7 05E7
+F8 05E8
+F9 05E9
+FA 05EA
@@ -0,0 +1,251 @@
+charset 8bit
+
+#
+# This file defines the font and character mappings used for ISO-8859-9
+# (Latin5/Turkish) text printing.
+#
+# The first line consists of:
+#
+#   direction width normal bold italic bold-italic
+#
+# Direction is the string "ltor" or "rtol", indicating left-to-right or
+# right-to-left text.
+#
+# Width is the string "single" or "double"; double means that the glyphs
+# are twice as wide as ASCII characters in the Courier typeface.
+#
+# "Normal", "bold", "italic", and "bold-italic" are the typefaces to use
+# for each presentation.  If characters are only available in a single
+# style then only one typeface should be listed (e.g. "Symbol")
+#
+# Each font that is listed will be used (and downloaded if needed) when
+# printing.
+#
+
+ltor single Courier Courier-Bold Courier-Italic Courier-BoldItalic
+
+#
+# The following lines define the mapping from the 8-bit character set to
+# the Unicode glyphs for each character:
+#
+#   char glyph
+#
+# "Char" and "glyph" are hexadecimal values.
+#
+
+20 0020
+21 0021
+22 0022
+23 0023
+24 0024
+25 0025
+26 0026
+27 0027
+28 0028
+29 0029
+2A 002A
+2B 002B
+2C 002C
+2D 002D
+2E 002E
+2F 002F
+30 0030
+31 0031
+32 0032
+33 0033
+34 0034
+35 0035
+36 0036
+37 0037
+38 0038
+39 0039
+3A 003A
+3B 003B
+3C 003C
+3D 003D
+3E 003E
+3F 003F
+40 0040
+41 0041
+42 0042
+43 0043
+44 0044
+45 0045
+46 0046
+47 0047
+48 0048
+49 0049
+4A 004A
+4B 004B
+4C 004C
+4D 004D
+4E 004E
+4F 004F
+50 0050
+51 0051
+52 0052
+53 0053
+54 0054
+55 0055
+56 0056
+57 0057
+58 0058
+59 0059
+5A 005A
+5B 005B
+5C 005C
+5D 005D
+5E 005E
+5F 005F
+60 0060
+61 0061
+62 0062
+63 0063
+64 0064
+65 0065
+66 0066
+67 0067
+68 0068
+69 0069
+6A 006A
+6B 006B
+6C 006C
+6D 006D
+6E 006E
+6F 006F
+70 0070
+71 0071
+72 0072
+73 0073
+74 0074
+75 0075
+76 0076
+77 0077
+78 0078
+79 0079
+7A 007A
+7B 007B
+7C 007C
+7D 007D
+7E 007E
+80 20AC
+82 201A
+83 0192
+84 201E
+85 2026
+86 2020
+87 2021
+88 02C6
+89 2030
+8A 0160
+8B 2039
+8C 0152
+91 2018
+92 2019
+93 201C
+94 201D
+95 2022
+96 2013
+97 2014
+98 02DC
+99 2122
+9A 0161
+9B 203A
+9C 0153
+9F 0178
+A0 00A0
+A1 00A1
+A2 00A2
+A3 00A3
+A4 00A4
+A5 00A5
+A6 00A6
+A7 00A7
+A8 00A8
+A9 00A9
+AA 00AA
+AB 00AB
+AC 00AC
+AD 00AD
+AE 00AE
+AF 00AF
+B0 00B0
+B1 00B1
+B2 00B2
+B3 00B3
+B4 00B4
+B5 00B5
+B6 00B6
+B7 00B7
+B8 00B8
+B9 00B9
+BA 00BA
+BB 00BB
+BC 00BC
+BD 00BD
+BE 00BE
+BF 00BF
+C0 00C0
+C1 00C1
+C2 00C2
+C3 00C3
+C4 00C4
+C5 00C5
+C6 00C6
+C7 00C7
+C8 00C8
+C9 00C9
+CA 00CA
+CB 00CB
+CC 00CC
+CD 00CD
+CE 00CE
+CF 00CF
+D0 011E
+D1 00D1
+D2 00D2
+D3 00D3
+D4 00D4
+D5 00D5
+D6 00D6
+D7 00D7
+D8 00D8
+D9 00D9
+DA 00DA
+DB 00DB
+DC 00DC
+DD 0130
+DE 015E
+DF 00DF
+E0 00E0
+E1 00E1
+E2 00E2
+E3 00E3
+E4 00E4
+E5 00E5
+E6 00E6
+E7 00E7
+E8 00E8
+E9 00E9
+EA 00EA
+EB 00EB
+EC 00EC
+ED 00ED
+EE 00EE
+EF 00EF
+F0 011F
+F1 00F1
+F2 00F2
+F3 00F3
+F4 00F4
+F5 00F5
+F6 00F6
+F7 00F7
+F8 00F8
+F9 00F9
+FA 00FA
+FB 00FB
+FC 00FC
+FD 0131
+FE 015F
+FF 00FF
@@ -0,0 +1,38 @@
+charset utf8
+
+#
+# This file defines the font mappings used for Unicode/UTF-8 text printing.
+#
+# Each line consists of:
+#
+#   first last direction width normal bold italic bold-italic
+#
+# First and last are the first and last glyphs in the font mapping
+# that correspond to that font; a maximum of 256 characters can be
+# mapped with each group, which a maximum of 256 mappings (this is a
+# PostScript limitation.) The glyph values are hexadecimal.
+#
+# Direction is the string "ltor" or "rtol", indicating left-to-right or
+# right-to-left text.
+#
+# Width is the string "single" or "double"; double means that the glyphs
+# are twice as wide as ASCII characters in the Courier typeface.
+#
+# "Normal", "bold", "italic", and "bold-italic" are the typefaces to use
+# for each presentation.  If characters are only available in a single
+# style then only one typeface should be listed (e.g. "Symbol")
+#
+# Each font that is listed will be used (and downloaded if needed) when
+# printing.
+#
+
+0000 00FF ltor single Courier Courier-Bold Courier-Italic Courier-Bold-Italic
+0100 01FF ltor single Courier Courier-Bold Courier-Italic Courier-Bold-Italic
+0200 02FF ltor single Courier Courier-Bold Courier-Italic Courier-Bold-Italic
+0300 03FF ltor single Symbol
+0400 04FF ltor single Courier-Cyrillic
+1E00 1EFF ltor single Courier Courier-Bold Courier-Italic Courier-Bold-Italic
+2000 20FF ltor single Courier Courier-Bold Courier-Italic Courier-Bold-Italic
+2100 21FF ltor single Courier Courier-Bold Courier-Italic Courier-Bold-Italic
+2200 22FF ltor single Symbol
+2300 23FF ltor single Symbol
@@ -3,7 +3,7 @@
 #
 #   Documentation makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1993-1999 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
@@ -31,24 +31,54 @@ include ../Makedefs
 .SUFFIXES:	.html .pdf .shtml
 .shtml.html:
 	echo Formatting $@...
-	htmldoc --title images/cups-large.gif --numbered -f $@ $<
+	htmldoc --titleimage images/cups-large.gif --numbered -f $@ $<
 .shtml.pdf:
 	echo Formatting $@...
-	htmldoc --title images/cups-large.gif --duplex --compression=9 \
+	htmldoc --titleimage images/cups-large.gif --duplex --compression=9 \
 		--numbered --jpeg -f $@ $<

 #
 # Document files...
 #

-DOCUMENTS	=	cmp.shtml idd.shtml sam.shtml sdd.shtml ssr.shtml \
-			stp.shtml sum.shtml svd.shtml
+DOCUMENTS	=	cmp.shtml idd.shtml sam.shtml sdd.shtml spm.shtml \
+			ssr.shtml stp.shtml sum.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
-WEBIMAGES	=	images/classes.gif images/logo.gif images/navbar.gif \
-			images/printer-idle.gif	images/printer-processing.gif \
-			images/printer-stopped.gif
+WEBIMAGES	=	images/accept-jobs.gif \
+			images/add-class.gif \
+			images/add-printer.gif \
+			images/cancel-job.gif \
+			images/cancel-jobs.gif \
+			images/cancel.gif \
+			images/classes.gif \
+			images/continue.gif \
+			images/delete-class.gif \
+			images/delete-printer.gif \
+			images/draft.gif \
+			images/hold-job.gif \
+			images/left.gif \
+			images/logo.gif \
+			images/manage-classes.gif \
+			images/manage-jobs.gif \
+			images/manage-printers.gif \
+			images/modify-class.gif \
+			images/modify-printer.gif \
+			images/navbar.gif \
+			images/print-test-page.gif \
+			images/printer-idle.gif \
+			images/printer-processing.gif \
+			images/printer-stopped.gif \
+			images/reject-jobs.gif \
+			images/release-job.gif \
+			images/right.gif \
+			images/show-active.gif \
+			images/show-completed.gif \
+			images/start-class.gif \
+			images/start-printer.gif \
+			images/stop-class.gif \
+			images/stop-printer.gif

 #
 #
@@ -71,37 +101,46 @@ clean:
 #

 install:
-	-$(MKDIR) $(DATADIR)/doc
-	$(CP) $(WEBPAGES) $(DATADIR)/doc
-	$(CP) overview.html overview.pdf $(DATADIR)/doc
-	$(CP) $(DOCUMENTS:.shtml=.html) $(DATADIR)/doc
-	$(CP) $(DOCUMENTS:.shtml=.pdf) $(DATADIR)/doc
-	-$(MKDIR) $(DATADIR)/doc/images
-	$(CP) $(WEBIMAGES) $(DATADIR)/doc/images
-	$(CP) $(DOCIMAGES) $(DATADIR)/doc/images
+	-$(MKDIR) $(DOCDIR)/doc
+	$(CP) $(WEBPAGES) $(DOCDIR)/doc
+	$(CP) overview.html overview.pdf $(DOCDIR)/doc
+	$(CP) $(DOCUMENTS:.shtml=.html) $(DOCDIR)/doc
+	$(CP) $(DOCUMENTS:.shtml=.pdf) $(DOCDIR)/doc
+	-$(MKDIR) $(DOCDIR)/doc/images
+	$(CP) $(WEBIMAGES) $(DOCDIR)/doc/images
+	$(CP) $(DOCIMAGES) $(DOCDIR)/doc/images

 #
-# The overview, admin guide, and user's guide get special attention...
+# The overview, admin manual, programmers manual, and users manual get
+# special attention...
 #

 overview.pdf:	overview.html
 	echo Formatting $@...
-	htmldoc --duplex --compression=9 --jpeg --webpage -f $@ $<
+	htmldoc --duplex --compression=9 --jpeg --webpage -f overview.pdf overview.html

 sam.html:	sam.shtml
 	echo Formatting $@...
-	htmldoc --title images/cups-large.gif -f $@ $<
+	htmldoc --titleimage images/cups-large.gif -f $@ $<
 sam.pdf:	sam.shtml
 	echo Formatting $@...
-	htmldoc --title images/cups-large.gif --duplex --compression=9 \
+	htmldoc --titleimage images/cups-large.gif --duplex --compression=9 \
+		--jpeg -f $@ $<
+
+spm.html:	spm.shtml
+	echo Formatting $@...
+	htmldoc --titleimage images/cups-large.gif -f $@ $<
+spm.pdf:	spm.shtml
+	echo Formatting $@...
+	htmldoc --titleimage images/cups-large.gif --duplex --compression=9 \
 		--jpeg -f $@ $<

 sum.html:	sum.shtml
 	echo Formatting $@...
-	htmldoc --title images/cups-large.gif -f $@ $<
+	htmldoc --titleimage images/cups-large.gif -f $@ $<
 sum.pdf:	sum.shtml
 	echo Formatting $@...
-	htmldoc --title images/cups-large.gif --duplex --compression=9 \
+	htmldoc --titleimage images/cups-large.gif --duplex --compression=9 \
 		--jpeg -f $@ $<

 #
@@ -1,111 +1,125 @@
+<!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-1999, All Rights Reserved">
 <META NAME="DOCNUMBER" CONTENT="CUPS-CMP-1.0">
+<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: 20.0pt }
+H3 { font-family: sans-serif; font-size: 20.0pt }
+H4 { font-family: sans-serif; font-size: 20.0pt }
+H5 { font-family: sans-serif; font-size: 20.0pt }
+H6 { font-family: sans-serif; font-size: 20.0pt }
+SUB { font-size: 8.0pt }
+SUP { font-size: 8.0pt }
+PRE { font-size: 9.0pt }
+</STYLE>
 </HEAD>
 <BODY>
-<CENTER><A HREF=#contents><IMG SRC="images/cups-large.gif" BORDER=0><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.0<BR>
 Easy Software Products<BR>
 Copyright 1997-1999, All Rights Reserved<BR>
 </CENTER>
 <HR>
-<H1 ALIGN=CENTER><A NAME=CONTENTS>Table of Contents</A></H1>
+<H1 ALIGN="CENTER"><A NAME="CONTENTS">Table of Contents</A></H1>
 <BR>
-<BR><B><A HREF=#1>1 Scope</A></B>
+<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_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>
 </UL>
-<B><A HREF=#2>2 References</A></B>
+<B><A HREF="#2">2 References</A></B>
 <UL>
-<LI><A HREF=#2_1>2.1 CUPS Documentation</A></LI>
-<LI><A HREF=#2_2>2.2 Other Documents</A></LI>
+<LI><A HREF="#2_1">2.1 CUPS Documentation</A></LI>
+<LI><A HREF="#2_2">2.2 Other Documents</A></LI>
 </UL>
-<B><A HREF=#3>3 File Management</A></B>
+<B><A HREF="#3">3 File Management</A></B>
 <UL>
-<LI><A HREF=#3_1>3.1 Directory Structure</A></LI>
-<LI><A HREF=#3_2>3.2 Source Files</A></LI>
-<LI><A HREF=#3_3>3.3 Configuration Management</A></LI>
+<LI><A HREF="#3_1">3.1 Directory Structure</A></LI>
+<LI><A HREF="#3_2">3.2 Source Files</A></LI>
+<LI><A HREF="#3_3">3.3 Configuration Management</A></LI>
 </UL>
-<B><A HREF=#4>4 Trouble Report Processing</A></B>
+<B><A HREF="#4">4 Trouble Report Processing</A></B>
 <UL>
-<LI><A HREF=#4_1>4.1 Classification</A></LI>
-<LI><A HREF=#4_2>4.2 Identification</A></LI>
-<LI><A HREF=#4_3>4.3 Correction</A></LI>
-<LI><A HREF=#4_4>4.4 Notification</A></LI>
+<LI><A HREF="#4_1">4.1 Classification</A></LI>
+<LI><A HREF="#4_2">4.2 Identification</A></LI>
+<LI><A HREF="#4_3">4.3 Correction</A></LI>
+<LI><A HREF="#4_4">4.4 Notification</A></LI>
 </UL>
-<B><A HREF=#5>5 Software Releases</A></B>
+<B><A HREF="#5">5 Software Releases</A></B>
 <UL>
-<LI><A HREF=#5_1>5.1 Version Numbering</A></LI>
-<LI><A HREF=#5_2>5.2 Generation</A></LI>
-<LI><A HREF=#5_3>5.3 Testing</A></LI>
-<LI><A HREF=#5_4>5.4 Release</A></LI>
+<LI><A HREF="#5_1">5.1 Version Numbering</A></LI>
+<LI><A HREF="#5_2">5.2 Generation</A></LI>
+<LI><A HREF="#5_3">5.3 Testing</A></LI>
+<LI><A HREF="#5_4">5.4 Release</A></LI>
 </UL>
-<B><A HREF=#6>A Glossary</A></B>
+<B><A HREF="#6">A Glossary</A></B>
 <UL>
-<LI><A HREF=#6_1>A.1 Terms</A></LI>
-<LI><A HREF=#6_2>A.2 Acronyms</A></LI>
+<LI><A HREF="#6_1">A.1 Terms</A></LI>
+<LI><A HREF="#6_2">A.2 Acronyms</A></LI>
 </UL>
-<B><A HREF=#7>B Coding Requirements</A></B>
+<B><A HREF="#7">B Coding Requirements</A></B>
 <UL>
-<LI><A HREF=#7_1>B.1 Source Files</A></LI>
+<LI><A HREF="#7_1">B.1 Source Files</A></LI>
 <UL>
-<LI><A HREF=#7_1_1>B.1.1 Naming</A></LI>
-<LI><A HREF=#7_1_2>B.1.2 Documentation</A></LI>
+<LI><A HREF="#7_1_1">B.1.1 Naming</A></LI>
+<LI><A HREF="#7_1_2">B.1.2 Documentation</A></LI>
 </UL>
-<LI><A HREF=#7_2>B.2 Functions</A></LI>
+<LI><A HREF="#7_2">B.2 Functions</A></LI>
 <UL>
-<LI><A HREF=#7_2_1>B.2.1 Naming</A></LI>
-<LI><A HREF=#7_2_2>B.2.2 Documentation</A></LI>
+<LI><A HREF="#7_2_1">B.2.1 Naming</A></LI>
+<LI><A HREF="#7_2_2">B.2.2 Documentation</A></LI>
 </UL>
-<LI><A HREF=#7_3>B.3 Methods</A></LI>
+<LI><A HREF="#7_3">B.3 Methods</A></LI>
 <UL>
-<LI><A HREF=#7_3_1>B.3.1 Naming</A></LI>
-<LI><A HREF=#7_3_2>B.3.2 Documentation</A></LI>
+<LI><A HREF="#7_3_1">B.3.1 Naming</A></LI>
+<LI><A HREF="#7_3_2">B.3.2 Documentation</A></LI>
 </UL>
-<LI><A HREF=#7_4>B.4 Variables</A></LI>
+<LI><A HREF="#7_4">B.4 Variables</A></LI>
 <UL>
-<LI><A HREF=#7_4_1>B.4.1 Naming</A></LI>
-<LI><A HREF=#7_4_2>B.4.2 Documentation</A></LI>
+<LI><A HREF="#7_4_1">B.4.1 Naming</A></LI>
+<LI><A HREF="#7_4_2">B.4.2 Documentation</A></LI>
 </UL>
-<LI><A HREF=#7_5>B.5 Types</A></LI>
+<LI><A HREF="#7_5">B.5 Types</A></LI>
 <UL>
-<LI><A HREF=#7_5_1>B.5.1 Naming</A></LI>
-<LI><A HREF=#7_5_2>B.5.2 Documentation</A></LI>
+<LI><A HREF="#7_5_1">B.5.1 Naming</A></LI>
+<LI><A HREF="#7_5_2">B.5.2 Documentation</A></LI>
 </UL>
-<LI><A HREF=#7_6>B.6 Structures</A></LI>
+<LI><A HREF="#7_6">B.6 Structures</A></LI>
 <UL>
-<LI><A HREF=#7_6_1>B.6.1 Naming</A></LI>
-<LI><A HREF=#7_6_2>B.6.2 Documentation</A></LI>
+<LI><A HREF="#7_6_1">B.6.1 Naming</A></LI>
+<LI><A HREF="#7_6_2">B.6.2 Documentation</A></LI>
 </UL>
-<LI><A HREF=#7_7>B.7 Classes</A></LI>
+<LI><A HREF="#7_7">B.7 Classes</A></LI>
 <UL>
-<LI><A HREF=#7_7_1>B.7.1 Naming</A></LI>
-<LI><A HREF=#7_7_2>B.7.2 Documentation</A></LI>
+<LI><A HREF="#7_7_1">B.7.1 Naming</A></LI>
+<LI><A HREF="#7_7_2">B.7.2 Documentation</A></LI>
 </UL>
-<LI><A HREF=#7_8>B.8 Constants</A></LI>
+<LI><A HREF="#7_8">B.8 Constants</A></LI>
 <UL>
-<LI><A HREF=#7_8_1>B.8.1 Naming</A></LI>
-<LI><A HREF=#7_8_2>B.8.2 Documentation</A></LI>
+<LI><A HREF="#7_8_1">B.8.1 Naming</A></LI>
+<LI><A HREF="#7_8_2">B.8.2 Documentation</A></LI>
 </UL>
-<LI><A HREF=#7_9>B.9 Code</A></LI>
+<LI><A HREF="#7_9">B.9 Code</A></LI>
 <UL>
-<LI><A HREF=#7_9_1>B.9.1 Documentation</A></LI>
-<LI><A HREF=#7_9_2>B.9.2 Style</A></LI>
+<LI><A HREF="#7_9_1">B.9.1 Documentation</A></LI>
+<LI><A HREF="#7_9_2">B.9.2 Style</A></LI>
 </UL>
 </UL>
-<B><A HREF=#8>C Software Trouble Report Form</A></B><HR>
-<H1><A NAME=1>1 Scope</A></H1>
-<H2><A NAME=1_1>1.1 Identification</A></H2>
+<B><A HREF="#8">C Software Trouble Report Form</A></B><HR>
+<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 maintainance of the Common UNIX Printing System 
 (&quot;CUPS&quot;) Version 1.0 software. 
-<H2><A NAME=1_2>1.2 System Overview</A></H2>
+<H2><A NAME="1_2">1.2 System Overview</A></H2>
 The Common UNIX Printing System provides a portable printing layer for 
 UNIX&reg; operating systems. It has been developed by Easy Software 
 Products to promote a standard printing solution for all UNIX vendors 
@@ -121,7 +135,7 @@ applications under UNIX. </P>
 <P>CUPS also includes a customized version of GNU GhostScript 
 (currently based off GNU GhostScript 4.03) and an image file RIP that 
 can be used to support non-PostScript printers. </P>
-<H2><A NAME=1_3>1.3 Document Overview</A></H2>
+<H2><A NAME="1_3">1.3 Document Overview</A></H2>
 This configuration management document is organized into the following 
 sections: 
 <UL>
@@ -133,8 +147,8 @@ sections:
 <LI>A - Glossary</LI>
 <LI>B - Coding Requirements</LI>
 </UL>
-<H1><A NAME=2>2 References</A></H1>
-<H2><A NAME=2_1>2.1 CUPS Documentation</A></H2>
+<H1><A NAME="2">2 References</A></H1>
+<H2><A NAME="2_1">2.1 CUPS Documentation</A></H2>
 The following CUPS documentation is referenced by this document: 
 <UL>
 <LI>CUPS-CMP-1.0: CUPS Configuration Management Plan </LI>
@@ -147,32 +161,32 @@ sections:
 <LI>CUPS-SUM-1.0.x: CUPS Software Users Manual </LI>
 <LI>CUPS-SVD-1.0.x: CUPS Software Version Description </LI>
 </UL>
-<H2><A NAME=2_2>2.2 Other Documents</A></H2>
+<H2><A NAME="2_2">2.2 Other Documents</A></H2>
 The following non-CUPS documents are referenced by this document: 
 <UL>
 <LI>IEEE 1387.4, System Administration: Printing (draft) </LI>
 <LI>IPP/1.0: Additional Optional Operations - Set 1 </LI>
-<LI>IPP/1.0: Encoding and Transport </LI>
-<LI>IPP/1.0: Implementers Guide </LI>
-<LI>IPP/1.0: Model and Semantics </LI>
 <LI>RFC 1179, Line Printer Daemon Protocol </LI>
+<LI>RFC 2565, IPP/1.0: Encoding and Transport </LI>
+<LI>RFC 2566, IPP/1.0: Model and Semantics </LI>
+<LI>RFC 2639, IPP/1.0: Implementers Guide </LI>
 </UL>
-<H1><A NAME=3>3 File Management</A></H1>
-<H2><A NAME=3_1>3.1 Directory Structure</A></H2>
+<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;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>
+<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. 
-<H2><A NAME=3_3>3.3 Configuration Management</A></H2>
+<H2><A NAME="3_3">3.3 Configuration Management</A></H2>
 Source files shall be placed under the control of the Concurrent 
 Versions System (&quot;CVS&quot;) software. Source files shall be &quot;checked in&quot; 
 with each change so that modifications can be tracked. 
 <P>Documentation on the CVS software is included with the whitepaper, 
 &quot;CVS II: Parallelizing Software Development&quot;. </P>
-<H1><A NAME=4>4 Trouble Report Processing</A></H1>
+<H1><A NAME="4">4 Trouble Report Processing</A></H1>
 A Software Trouble Report (&quot;STR&quot;) shall be submitted every time a user 
 or vendor experiences a problem with the CUPS software. Trouble reports 
 are maintained in a database with one of the following states: 
@@ -183,7 +197,7 @@ are maintained in a database with one of the following states:
 <LI>STR is pending (new STR or additional information available)</LI>
 </OL>
 Trouble reports shall be processed using the following steps. 
-<H2><A NAME=4_1>4.1 Classification</A></H2>
+<H2><A NAME="4_1">4.1 Classification</A></H2>
 When a trouble report is received it must be classified at one of the 
 following levels: 
 <OL>
@@ -199,7 +213,7 @@ following levels:
 <LI>Specific to an operating system</LI>
 <LI>Applies to all machines and operating systems</LI>
 </OL>
-<H2><A NAME=4_2>4.2 Identification</A></H2>
+<H2><A NAME="4_2">4.2 Identification</A></H2>
 Once the level and scope of the trouble report is determined the 
 software sub-system(s) involved with the problem are determined. This 
 may involve additional communication with the user or vendor to isolate 
@@ -207,16 +221,16 @@ the problem to a specific cause.
 <P>When the sub-system(s) involved have been identified, an engineer 
 will then determine the change(s) needed and estimate the time required 
 for the change(s). </P>
-<H2><A NAME=4_3>4.3 Correction</A></H2>
+<H2><A NAME="4_3">4.3 Correction</A></H2>
 Corrections are scheduled based upon the severity and complexity of 
 the problem. Once all changes have been made, documented, and tested 
 successfully a new software release snapshot is generated. Additional 
 tests are added as necessary for proper testing of the changes. 
-<H2><A NAME=4_4>4.4 Notification</A></H2>
+<H2><A NAME="4_4">4.4 Notification</A></H2>
 The user or vendor is notified when the fix is available or if the 
 problem was caused by user error. 
-<H1><A NAME=5>5 Software Releases</A></H1>
-<H2><A NAME=5_1>5.1 Version Numbering</A></H2>
+<H1><A NAME="5">5 Software Releases</A></H1>
+<H2><A NAME="5_1">5.1 Version Numbering</A></H2>
 CUPS uses a three-part version number separated by periods to 
 represent the major, minor, and patch release numbers: 
 <UL>
@@ -261,22 +275,22 @@ numbers reset to 0:
 2.0.0      Production release of 2.0.0
 </PRE>
 </UL>
-<H2><A NAME=5_2>5.2 Generation</A></H2>
+<H2><A NAME="5_2">5.2 Generation</A></H2>
 Software releases shall be generated for each successfully completed 
 software trouble report. All object and executable files shall be 
 deleted prior to performing a full build to ensure that source files 
 are recompiled. 
-<H2><A NAME=5_3>5.3 Testing</A></H2>
+<H2><A NAME="5_3">5.3 Testing</A></H2>
 Software testing shall be conducted according to the CUPS Software 
 Test Plan, CUPS-STP-1.0. Failed tests cause STRs to be generated to 
 correct the problems found. 
-<H2><A NAME=5_4>5.4 Release</A></H2>
+<H2><A NAME="5_4">5.4 Release</A></H2>
 When testing has been completed successfully a new distribution image 
 is created from the current CVS code &quot;snapshot&quot;. No production release 
 shall contain software that has not passed the appropriate software 
 tests. 
-<H1 TYPE=A VALUE=1><A NAME=6>A Glossary</A></H1>
-<H2><A NAME=6_1>A.1 Terms</A></H2>
+<H1 TYPE="A" VALUE="1"><A NAME="6">A Glossary</A></H1>
+<H2><A NAME="6_1">A.1 Terms</A></H2>
 <DL>
 <DT>C </DT>
 <DD>A computer language. </DD>
@@ -289,7 +303,7 @@ tests.
 <DT>socket </DT>
 <DD>A two-way network communications channel. </DD>
 </DL>
-<H2><A NAME=6_2>A.2 Acronyms</A></H2>
+<H2><A NAME="6_2">A.2 Acronyms</A></H2>
 <DL>
 <DT>ASCII </DT>
 <DD>American Standard Code for Information Interchange </DD>
@@ -324,23 +338,23 @@ tests.
 <DT>TFTP </DT>
 <DD>Trivial File Transfer Protocol </DD>
 </DL>
-<H1><A NAME=7>B Coding Requirements</A></H1>
+<H1><A NAME="7">B Coding Requirements</A></H1>
 These coding requirements provide detailed information on source file 
 formatting and documentation content. These guidelines shall be applied 
 to all C and C++ source files provided with CUPS. 
-<H2><A NAME=7_1>B.1 Source Files</A></H2>
-<H3><A NAME=7_1_1>B.1.1 Naming</A></H3>
+<H2><A NAME="7_1">B.1 Source Files</A></H2>
+<H3><A NAME="7_1_1">B.1.1 Naming</A></H3>
 All source files names shall be 16 characters or less in length to 
 ensure compatibility with older UNIX filesystems. Source files 
 containing functions shall have an extension of &quot;.c&quot; for ANSI C and 
 &quot;.cpp&quot; for C++ source files. All other &quot;include&quot; files shall have an 
 extension of &quot;.h&quot;. 
-<H3><A NAME=7_1_2>B.1.2 Documentation</A></H3>
+<H3><A NAME="7_1_2">B.1.2 Documentation</A></H3>
 The top of each source file shall contain a header giving the name of 
 the file, the purpose or nature of the source file, the copyright and 
 licensing notice, and the functions contained in the file.  The file 
 name and revision information is provided by the CVS &quot;$Id: cmp.shtml,v 
-1.3 1999/05/21 20:54:04 mike Exp $&quot; tag: 
+1.5 2000/01/04 13:45:38 mike Exp $&quot; tag: 
 <UL>
 <PRE>
 /*
@@ -348,7 +362,7 @@ name and revision information is provided by the CVS &quot;$Id: cmp.shtml,v
 *
 *   Description of file contents.
 *
- *   Copyright 1997-1999 by Easy Software Products, all rights
+ *   Copyright 1997-2000 by Easy Software Products, all rights
 *   reserved.
 *
 *   These coded instructions, statements, and computer programs are
@@ -376,7 +390,7 @@ name and revision information is provided by the CVS &quot;$Id: cmp.shtml,v
 </PRE>
 </UL>
 The bottom of each source file shall contain a trailer giving the name 
-of the file using the CVS &quot;$Id: cmp.shtml,v 1.3 1999/05/21 20:54:04 
+of the file using the CVS &quot;$Id: cmp.shtml,v 1.5 2000/01/04 13:45:38 
 mike Exp $&quot; tag. The primary purpose of this is to mark the end of a 
 source file; if the trailer is missing it is possible that code has 
 been lost near the end of the file: 
@@ -387,8 +401,8 @@ been lost near the end of the file:
 */
 </PRE>
 </UL>
-<H2><A NAME=7_2>B.2 Functions</A></H2>
-<H3><A NAME=7_2_1>B.2.1 Naming</A></H3>
+<H2><A NAME="7_2">B.2 Functions</A></H2>
+<H3><A NAME="7_2_1">B.2.1 Naming</A></H3>
 Functions with a global scope shall be capitalized (&quot;DoThis&quot;, 
 &quot;DoThat&quot;, &quot;DoSomethingElse&quot;, etc.) The only exception to this rule 
 shall be the CUPS interface library functions which may begin with a 
@@ -396,7 +410,7 @@ prefix word in lowercase (&quot;cupsDoThis&quot;, &quot;cupsDoThat&quot;, etc.)
 <P>Functions with a local scope shall be declared &quot;static&quot; and be 
 lowercase with underscores between words (&quot;do_this&quot;, &quot;do_that&quot;, 
 &quot;do_something_else&quot;, etc.) </P>
-<H3><A NAME=7_2_2>B.2.2 Documentation</A></H3>
+<H3><A NAME="7_2_2">B.2.2 Documentation</A></H3>
 Each function shall begin with a comment header describing what the 
 function does, the possible input limits (if any), and the possible 
 output values (if any), and any special information needed: 
@@ -416,11 +430,11 @@ do_this(float x) /* I - Power value (0.0 &lt;= x &lt;= 1.0) */
 }
 </PRE>
 </UL>
-<H2><A NAME=7_3>B.3 Methods</A></H2>
-<H3><A NAME=7_3_1>B.3.1 Naming</A></H3>
+<H2><A NAME="7_3">B.3 Methods</A></H2>
+<H3><A NAME="7_3_1">B.3.1 Naming</A></H3>
 Methods shall be in lowercase with underscores between words 
 (&quot;do_this&quot;, &quot;do_that&quot;, &quot;do_something_else&quot;, etc.) 
-<H3><A NAME=7_3_2>B.3.2 Documentation</A></H3>
+<H3><A NAME="7_3_2">B.3.2 Documentation</A></H3>
 Each method shall begin with a comment header describing what the 
 method does, the possible input limits (if any), and the possible 
 output values (if any), and any special information needed: 
@@ -440,8 +454,8 @@ class::do_this(float x) /* I - Power value (0.0 &lt;= x &lt;= 1.0) */
 }
 </PRE>
 </UL>
-<H2><A NAME=7_4>B.4 Variables</A></H2>
-<H3><A NAME=7_4_1>B.4.1 Naming</A></H3>
+<H2><A NAME="7_4">B.4 Variables</A></H2>
+<H3><A NAME="7_4_1">B.4.1 Naming</A></H3>
 Variables with a global scope shall be capitalized (&quot;ThisVariable&quot;, 
 &quot;ThatVariable&quot;, &quot;ThisStateVariable&quot;, etc.) The only exception to this 
 rule shall be the CUPS interface library global variables which must 
@@ -452,7 +466,7 @@ possible.
 between words (&quot;this_variable&quot;, &quot;that_variable&quot;, etc.) Any local 
 variables shared by functions within a source file shall be declared 
 &quot;static&quot;. </P>
-<H3><A NAME=7_4_2>B.4.2 Documentation</A></H3>
+<H3><A NAME="7_4_2">B.4.2 Documentation</A></H3>
 Each variable shall be declared on a separate line and shall be 
 immediately followed by a comment block describing the variable: 
 <UL>
@@ -461,12 +475,12 @@ int this_variable;   /* The current state of this */
 int that_variable;   /* The current state of that */
 </PRE>
 </UL>
-<H2><A NAME=7_5>B.5 Types</A></H2>
-<H3><A NAME=7_5_1>B.5.1 Naming</A></H3>
+<H2><A NAME="7_5">B.5 Types</A></H2>
+<H3><A NAME="7_5_1">B.5.1 Naming</A></H3>
 All type names shall be lowercase with underscores between words and 
 &quot;_t&quot; appended to the end of the name (&quot;this_type_t&quot;, &quot;that_type_t&quot;, 
 etc.) 
-<H3><A NAME=7_5_2>B.5.2 Documentation</A></H3>
+<H3><A NAME="7_5_2">B.5.2 Documentation</A></H3>
 Each type shall have a comment block immediately before the typedef: 
 <UL>
 <PRE>
@@ -476,12 +490,12 @@ etc.)
 typedef int cups_this_type_t;
 </PRE>
 </UL>
-<H2><A NAME=7_6>B.6 Structures</A></H2>
-<H3><A NAME=7_6_1>B.6.1 Naming</A></H3>
+<H2><A NAME="7_6">B.6 Structures</A></H2>
+<H3><A NAME="7_6_1">B.6.1 Naming</A></H3>
 All structure names shall be lowercase with underscores between words 
 and &quot;_str&quot; appended to the end of the name (&quot;this_struct_str&quot;, 
 &quot;that_struct_str&quot;, etc.) 
-<H3><A NAME=7_6_2>B.6.2 Documentation</A></H3>
+<H3><A NAME="7_6_2">B.6.2 Documentation</A></H3>
 Each structure shall have a comment block immediately before the 
 struct and each member shall be documented in accordance with the 
 variable naming policy above: 
@@ -497,11 +511,11 @@ struct cups_this_struct_str
 };
 </PRE>
 </UL>
-<H2><A NAME=7_7>B.7 Classes</A></H2>
-<H3><A NAME=7_7_1>B.7.1 Naming</A></H3>
+<H2><A NAME="7_7">B.7 Classes</A></H2>
+<H3><A NAME="7_7_1">B.7.1 Naming</A></H3>
 All class names shall be lowercase with underscores between words 
 (&quot;this_class&quot;, &quot;that_class&quot;, etc.) 
-<H3><A NAME=7_7_2>B.7.2 Documentation</A></H3>
+<H3><A NAME="7_7_2">B.7.2 Documentation</A></H3>
 Each class shall have a comment block immediately before the class and 
 each member shall be documented in accordance with the variable naming 
 policy above: 
@@ -517,15 +531,15 @@ class cups_this_class
 };
 </PRE>
 </UL>
-<H2><A NAME=7_8>B.8 Constants</A></H2>
-<H3><A NAME=7_8_1>B.8.1 Naming</A></H3>
+<H2><A NAME="7_8">B.8 Constants</A></H2>
+<H3><A NAME="7_8_1">B.8.1 Naming</A></H3>
 All constant names shall be uppercase with underscored between words 
 (&quot;THIS_CONSTANT&quot;, &quot;THAT_CONSTANT&quot;, etc.) Constants defined for the CUPS 
 interface library must begin with an uppercase prefix 
 (&quot;CUPS_THIS_CONSTANT&quot;, &quot;CUPS_THAT_CONSTANT&quot;, etc.) 
 <P>Typed enumerations shall be used whenever possible to allow for type 
 checking by the compiler. </P>
-<H3><A NAME=7_8_2>B.8.2 Documentation</A></H3>
+<H3><A NAME="7_8_2">B.8.2 Documentation</A></H3>
 Comment blocks shall immediately follow each constant: 
 <UL>
 <PRE>
@@ -536,8 +550,8 @@ enum
 };
 </PRE>
 </UL>
-<H2><A NAME=7_9>B.9 Code</A></H2>
-<H3><A NAME=7_9_1>B.9.1 Documentation</A></H3>
+<H2><A NAME="7_9">B.9 Code</A></H2>
+<H3><A NAME="7_9_1">B.9.1 Documentation</A></H3>
 All source code shall utilize block comments within functions to 
 describe the operations being performed by a group of statements: 
 <UL>
@@ -564,8 +578,8 @@ do
 } while (i == (sizeof(array) / sizeof(array[0])));
 </PRE>
 </UL>
-<H3><A NAME=7_9_2>B.9.2 Style</A></H3>
-<H4 TYPE=a>B.9.2.a Indentation</H4>
+<H3><A NAME="7_9_2">B.9.2 Style</A></H3>
+<H4 TYPE="a">B.9.2.a Indentation</H4>
 All code blocks enclosed by brackets shall begin with the opening 
 brace on a new line. The code then follows starting on a new line after 
 the brace and is indented 2 spaces. The closing brace is then placed on 
@@ -626,20 +640,20 @@ for (i = sizeof(array) / sizeof(array[0]) - 1; i &gt;= 0; i --)
  array[i] = STATE_IDLE;
 </PRE>
 </UL>
-<H1 ALIGN=RIGHT><A NAME=8>C Software Trouble Report Form</A></H1>
+<H1 ALIGN="RIGHT"><A NAME="8">C Software Trouble Report Form</A></H1>
 <CENTER>
-<TABLE WIDTH=80%>
-<TR><TH ALIGN=RIGHT>Summary of Problem:</TH><TD ALIGN=LEFT>
+<TABLE WIDTH="80%">
+<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 
+<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>
-<TR><TH ALIGN=RIGHT>Problem Scope:</TH><TD ALIGN=LEFT>__1=Machine 
+<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>
-________________________________________ 
+<TR><TH ALIGN="RIGHT" VALIGN="TOP">Detailed Description of Problem:</TH><TD
+ALIGN="LEFT">________________________________________ 
 <BR>________________________________________ 
 <BR>________________________________________ 
 <BR>________________________________________ 
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
-	<META NAME="DOCNUMBER" CONTENT="CUPS-CMP-1.0">
-	<META NAME="COPYRIGHT" CONTENT="Copyright 1997-1999, All Rights Reserved">
+	<META NAME="DOCNUMBER" CONTENT="CUPS-CMP-1.1">
+	<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2000, All Rights Reserved">
 	<META NAME="Author" CONTENT="Easy Software Products">
 	<TITLE>CUPS Configuration Management Plan</TITLE>
 </HEAD>
@@ -13,7 +13,7 @@

 This configuration management plan document provides the guidelines for
 development and maintainance of the Common UNIX Printing System ("CUPS")
-Version 1.0 software.
+Version 1.1 software.

 <H2>System Overview</H2>

@@ -57,15 +57,15 @@ sections:
 The following CUPS documentation is referenced by this document:

 <UL>
-	<LI>CUPS-CMP-1.0: CUPS Configuration Management Plan 
-	<LI>CUPS-IDD-1.0: CUPS System Interface Design Description 
-	<LI>CUPS-SAM-1.0.x: CUPS Software Administrators Manual 
-	<LI>CUPS-SDD-1.0: CUPS Software Design Description 
-	<LI>CUPS-SPM-1.0: CUPS Software Programming Manual
-	<LI>CUPS-SSR-1.0: CUPS Software Security Report 
-	<LI>CUPS-STP-1.0: CUPS Software Test Plan 
-	<LI>CUPS-SUM-1.0.x: CUPS Software Users Manual 
-	<LI>CUPS-SVD-1.0.x: CUPS Software Version Description 
+	<LI>CUPS-CMP-1.1: CUPS Configuration Management Plan 
+	<LI>CUPS-IDD-1.1: CUPS System Interface Design Description 
+	<LI>CUPS-SAM-1.1.x: CUPS Software Administrators Manual 
+	<LI>CUPS-SDD-1.1: CUPS Software Design Description 
+	<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.x: CUPS Software Version Description 
 </UL>

 <H2>Other Documents</H2>
@@ -75,10 +75,10 @@ The following non-CUPS documents are referenced by this document:
 <UL>
 	<LI>IEEE 1387.4, System Administration: Printing (draft) 
 	<LI>IPP/1.0: Additional Optional Operations - Set 1
-	<LI>IPP/1.0: Encoding and Transport 
-	<LI>IPP/1.0: Implementers Guide
-	<LI>IPP/1.0: Model and Semantics
 	<LI>RFC 1179, Line Printer Daemon Protocol 
+	<LI>RFC 2565, IPP/1.0: Encoding and Transport 
+	<LI>RFC 2566, IPP/1.0: Model and Semantics
+	<LI>RFC 2639, IPP/1.0: Implementers Guide
 </UL>

 <H1>File Management</H1>
@@ -173,7 +173,7 @@ the major, minor, and patch release numbers:
 <UL>
 <PRE>
 major.minor.patch
-1.0.0
+1.1.0
 </PRE>
 </UL>

@@ -183,7 +183,7 @@ the build number:
 <UL>
 <PRE>
 major.minor.patchbbuild
-1.0.0b1
+1.1.0b1
 </PRE>
 </UL>

@@ -206,13 +206,13 @@ be incremented and the minor and patch release numbers reset to 0:

 <UL>
 <PRE>
-1.0.0b1    First beta release
-1.0.0b2    Second beta release
-1.0.0      First production release
-1.0.1b1    First beta of 1.0.1
-1.0.1      Production release of 1.0.1
-1.1.0b1    First beta of 1.1.0
-1.1.0      Production release of 1.1.0
+1.1.0b1    First beta release
+1.1.0b2    Second beta release
+1.1.0      First production release
+1.1.1b1    First beta of 1.1.1
+1.1.1      Production release of 1.1.1
+1.1.1b1    First beta of 1.1.1
+1.1.1      Production release of 1.1.1
 2.0.0b1    First beta of 2.0.0
 2.0.0      Production release of 2.0.0
 </PRE>
@@ -227,7 +227,7 @@ to performing a full build to ensure that source files are recompiled.
 <H2>Testing</H2>

 Software testing shall be conducted according to the CUPS Software Test
-Plan, CUPS-STP-1.0. Failed tests cause STRs to be generated to correct
+Plan, CUPS-STP-1.1. Failed tests cause STRs to be generated to correct
 the problems found.

 <H2>Release</H2>
@@ -334,16 +334,16 @@ extension of ".h".
 The top of each source file shall contain a header giving the name of the
 file, the purpose or nature of the source file, the copyright and licensing
 notice, and the functions contained in the file.  The file name and revision
-information is provided by the CVS "$Id: cmp.shtml 351 1999-05-21 20:54:09Z mike $" tag:
+information is provided by the CVS "$Id: cmp.shtml 904 2000-02-18 17:48:09Z mike $" tag:

 <UL>
 <PRE>
 /*
- * "$Id: cmp.shtml 351 1999-05-21 20:54:09Z mike $"
+ * "$Id: cmp.shtml 904 2000-02-18 17:48:09Z mike $"
 *
 *   Description of file contents.
 *
- *   Copyright 1997-1999 by Easy Software Products, all rights
+ *   Copyright 1997-2000 by Easy Software Products, all rights
 *   reserved.
 *
 *   These coded instructions, statements, and computer programs are
@@ -355,7 +355,7 @@ information is provided by the CVS "$Id: cmp.shtml 351 1999-05-21 20:54:09Z mike
 *
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
- *       44145 Airport View Drive, Suite 204
+ *       44141 Airport View Drive, Suite 204
 *       Hollywood, Maryland 20636-3111 USA
 *
 *       Voice: (301) 373-9603
@@ -372,14 +372,14 @@ information is provided by the CVS "$Id: cmp.shtml 351 1999-05-21 20:54:09Z mike
 </UL>

 The bottom of each source file shall contain a trailer giving the name
-of the file using the CVS "$Id: cmp.shtml 351 1999-05-21 20:54:09Z mike $" tag. The primary purpose of this is to
+of the file using the CVS "$Id: cmp.shtml 904 2000-02-18 17:48:09Z mike $" tag. The primary purpose of this is to
 mark the end of a source file; if the trailer is missing it is possible
 that code has been lost near the end of the file:

 <UL>
 <PRE>
 /*
- * End of "$Id: cmp.shtml 351 1999-05-21 20:54:09Z mike $".
+ * End of "$Id: cmp.shtml 904 2000-02-18 17:48:09Z mike $".
 */
 </PRE>
 </UL>
@@ -411,8 +411,8 @@ does, the possible input limits (if any), and the possible output values
 * Notes: none.
 */

-static float     /* O - Inverse power value, 0.0 &lt;= y &lt;= 1.0 */
-do_this(float x) /* I - Power value (0.0 &lt;= x &lt;= 1.0) */
+static float     /* O - Inverse power value, 0.0 &lt;= y &lt;= 1.1 */
+do_this(float x) /* I - Power value (0.0 &lt;= x &lt;= 1.1) */
 {
 ...
 return (y);
@@ -1,4 +1,4 @@
 BODY { background-color: #cccc99 }
 H1 { font-family: sans-serif; }
 H2 { font-family: sans-serif; }
-TH { background-color: #999966 }
+TH { text-align: left }
@@ -3,19 +3,20 @@
 	<TITLE>Documentation - Common UNIX Printing System</TITLE>
 	<LINK REL=STYLESHEET TYPE="text/css" HREF="cups.css">
 	<MAP NAME="navbar">
-		<AREA SHAPE="RECT" COORDS="10,10,85,30" HREF="printers" ALT="Current Printer Status">
-		<AREA SHAPE="RECT" COORDS="95,10,175,30" HREF="classes" ALT="Current Printer Classes Status">
-		<AREA SHAPE="RECT" COORDS="185,10,235,30" HREF="jobs" ALT="Current Jobs Status">
-		<AREA SHAPE="RECT" COORDS="245,10,395,30" HREF="documentation.html" ALT="Read CUPS Documentation On-Line">
-		<AREA SHAPE="RECT" COORDS="405,10,490,30" HREF="http://www.cups.org" ALT="Download the Current CUPS Software">
+		<AREA SHAPE="RECT" COORDS="12,10,50,20" HREF="http://www.easysw.com" ALT="Easy Software Products Home Page">
+		<AREA SHAPE="RECT" COORDS="82,10,196,20" HREF="/admin" ALT="Do Administration Tasks">
+		<AREA SHAPE="RECT" COORDS="216,10,280,20" HREF="/classes" ALT="Manage Printer Classes Status">
+		<AREA SHAPE="RECT" COORDS="300,10,336,20" HREF="/documentation.html" ALT="On-Line Help">
+		<AREA SHAPE="RECT" COORDS="356,10,394,20" HREF="/jobs" ALT="Manage Jobs">
+		<AREA SHAPE="RECT" COORDS="414,10,476,20" HREF="/printers" ALT="Manage Printers">
+		<AREA SHAPE="RECT" COORDS="496,10,568,20" HREF="http://www.cups.org" ALT="Download the Current CUPS Software">
        </MAP>
 </HEAD>

 <BODY>
-<P ALIGN=CENTER>
-<A HREF="http://www.easysw.com" ALT="Easy Software Products Home Page">
-<IMG SRC="images/logo.gif" WIDTH="71" HEIGHT="40" BORDER=0 ALT="Easy Software Products Home Page"></A>
-<IMG SRC="images/navbar.gif" WIDTH="540" HEIGHT="40" USEMAP="#navbar" BORDER=0>
+<CENTER>
+<IMG SRC="/images/navbar.gif" WIDTH="583" HEIGHT="30" USEMAP="#navbar" BORDER="0">
+</CENTER>

 <H1>Documentation</H1>

@@ -35,6 +36,10 @@ The following documentation for CUPS is available on this server:
 	<A HREF="sam.html">HTML</A> |
 	<A HREF="sam.pdf">PDF</A> )

+	<LI>Software Programmers Manual (
+	<A HREF="spm.html">HTML</A> |
+	<A HREF="spm.pdf">PDF</A> )
+
 	<LI>Configuration Management Plan (
 	<A HREF="cmp.html">HTML</A> |
 	<A HREF="cmp.pdf">PDF</A> )
@@ -55,15 +60,13 @@ The following documentation for CUPS is available on this server:
 	<A HREF="ssr.html">HTML</A> |
 	<A HREF="ssr.pdf">PDF</A> )

-	<LI>Software Test Plan (Not Yet Available)
-
 </UL>

 <HR>

 <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-1999 by Easy Software Products,
+Products</A>. CUPS is copyright 1997-2000 by Easy Software Products,
 All Rights Reserved.

 </BODY>
@@ -1,93 +1,105 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <HTML>
 <HEAD>
-<TITLE>DRAFT - CUPS Interface Design Description</TITLE>
+<TITLE>CUPS Interface Design Description</TITLE>
 <META NAME="AUTHOR" CONTENT="Easy Software Products">
 <META NAME="COPYRIGHT" CONTENT="Copyright 1997-1999, All Rights Reserved">
 <META NAME="DOCNUMBER" CONTENT="CUPS-IDD-1.0">
+<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: 20.0pt }
+H3 { font-family: sans-serif; font-size: 20.0pt }
+H4 { font-family: sans-serif; font-size: 20.0pt }
+H5 { font-family: sans-serif; font-size: 20.0pt }
+H6 { font-family: sans-serif; font-size: 20.0pt }
+SUB { font-size: 8.0pt }
+SUP { font-size: 8.0pt }
+PRE { font-size: 9.0pt }
+</STYLE>
 </HEAD>
 <BODY>
-<CENTER><A HREF=#contents><IMG SRC="images/cups-large.gif" BORDER=0><BR>
-<H1>DRAFT - 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.0<BR>
 Easy Software Products<BR>
 Copyright 1997-1999, All Rights Reserved<BR>
 </CENTER>
 <HR>
-<H1 ALIGN=CENTER><A NAME=CONTENTS>Table of Contents</A></H1>
+<H1 ALIGN="CENTER"><A NAME="CONTENTS">Table of Contents</A></H1>
 <BR>
-<BR><B><A HREF=#1>1 Scope</A></B>
+<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_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>
 </UL>
-<B><A HREF=#2>2 References</A></B>
+<B><A HREF="#2">2 References</A></B>
 <UL>
-<LI><A HREF=#2_1>2.1 CUPS Documentation</A></LI>
-<LI><A HREF=#2_2>2.2 Other Documents</A></LI>
+<LI><A HREF="#2_1">2.1 CUPS Documentation</A></LI>
+<LI><A HREF="#2_2">2.2 Other Documents</A></LI>
 </UL>
-<B><A HREF=#3>3 Internal Interfaces</A></B>
+<B><A HREF="#3">3 Internal Interfaces</A></B>
 <UL>
-<LI><A HREF=#3_1>3.1 Character Set Files</A></LI>
-<LI><A HREF=#3_2>3.2 Language Files</A></LI>
-<LI><A HREF=#3_3>3.3 MIME Files</A></LI>
+<LI><A HREF="#3_1">3.1 Character Set Files</A></LI>
+<LI><A HREF="#3_2">3.2 Language Files</A></LI>
+<LI><A HREF="#3_3">3.3 MIME Files</A></LI>
 <UL>
-<LI><A HREF=#3_3_1>3.3.1 mime.types</A></LI>
-<LI><A HREF=#3_3_2>3.3.2 mime.convs</A></LI>
+<LI><A HREF="#3_3_1">3.3.1 mime.types</A></LI>
+<LI><A HREF="#3_3_2">3.3.2 mime.convs</A></LI>
 </UL>
-<LI><A HREF=#3_4>3.4 PostScript Printer Description Files</A></LI>
+<LI><A HREF="#3_4">3.4 PostScript Printer Description Files</A></LI>
 <UL>
-<LI><A HREF=#3_4_1>3.4.1 CUPS Extensions to PPD Files</A></LI>
+<LI><A HREF="#3_4_1">3.4.1 CUPS Extensions to PPD Files</A></LI>
 </UL>
-<LI><A HREF=#3_5>3.5 Scheduler Configuration Files</A></LI>
+<LI><A HREF="#3_5">3.5 Scheduler Configuration Files</A></LI>
 <UL>
-<LI><A HREF=#3_5_1>3.5.1 classes.conf</A></LI>
-<LI><A HREF=#3_5_2>3.5.2 cupsd.conf</A></LI>
-<LI><A HREF=#3_5_3>3.5.3 printers.conf</A></LI>
+<LI><A HREF="#3_5_1">3.5.1 classes.conf</A></LI>
+<LI><A HREF="#3_5_2">3.5.2 cupsd.conf</A></LI>
+<LI><A HREF="#3_5_3">3.5.3 printers.conf</A></LI>
 </UL>
 </UL>
-<B><A HREF=#4>4 External Interfaces</A></B>
+<B><A HREF="#4">4 External Interfaces</A></B>
 <UL>
-<LI><A HREF=#4_1>4.1 AppSocket Protocol</A></LI>
-<LI><A HREF=#4_2>4.2 CUPS Browsing Protocol</A></LI>
-<LI><A HREF=#4_3>4.3 CUPS PostScript File</A></LI>
-<LI><A HREF=#4_4>4.4 CUPS Raster File</A></LI>
-<LI><A HREF=#4_5>4.5 CUPS Raw Files</A></LI>
-<LI><A HREF=#4_6>4.6 File Transfer Protocol</A></LI>
-<LI><A HREF=#4_7>4.7 Internet Printing Protocol</A></LI>
+<LI><A HREF="#4_1">4.1 AppSocket Protocol</A></LI>
+<LI><A HREF="#4_2">4.2 CUPS Browsing Protocol</A></LI>
+<LI><A HREF="#4_3">4.3 CUPS PostScript File</A></LI>
+<LI><A HREF="#4_4">4.4 CUPS Raster File</A></LI>
+<LI><A HREF="#4_5">4.5 CUPS Raw Files</A></LI>
+<LI><A HREF="#4_6">4.6 Internet Printing Protocol</A></LI>
 <UL>
-<LI><A HREF=#4_7_1>4.7.1 Get Default Destination (CUPS_GET_DEFAULT = 
+<LI><A HREF="#4_6_1">4.6.1 Get Default Destination (CUPS_GET_DEFAULT = 
 0x4001)</A></LI>
-<LI><A HREF=#4_7_2>4.7.2 Get Printers (CUPS_GET_PRINTERS = 0x4002)</A></LI>
-<LI><A HREF=#4_7_3>4.7.3 Add Printer (CUPS_ADD_PRINTER = 0x4003)</A></LI>
-<LI><A HREF=#4_7_4>4.7.4 Delete Printer (CUPS_DELETE_PRINTER = 0x4004)</A>
+<LI><A HREF="#4_6_2">4.6.2 Get Printers (CUPS_GET_PRINTERS = 0x4002)</A></LI>
+<LI><A HREF="#4_6_3">4.6.3 Add Printer (CUPS_ADD_PRINTER = 0x4003)</A></LI>
+<LI><A HREF="#4_6_4">4.6.4 Delete Printer (CUPS_DELETE_PRINTER = 0x4004)</A>
 </LI>
-<LI><A HREF=#4_7_5>4.7.5 Get Classes (CUPS_GET_CLASSES = 0x4005)</A></LI>
-<LI><A HREF=#4_7_6>4.7.6 Add Class (CUPS_ADD_CLASS = 0x4006)</A></LI>
-<LI><A HREF=#4_7_7>4.7.7 Delete Class (CUPS_DELETE_CLASS = 0x4007)</A></LI>
-<LI><A HREF=#4_7_8>4.7.8 Accept Jobs (CUPS_ACCEPT_JOBS = 0x4008)</A></LI>
-<LI><A HREF=#4_7_9>4.7.9 Reject Jobs (CUPS_REJECT_JOBS = 0x4009)</A></LI>
-<LI><A HREF=#4_7_10>4.7.10 Set Default Destination (CUPS_SET_DEFAULT = 
-0x400A)</A></LI>
+<LI><A HREF="#4_6_5">4.6.5 Get Classes (CUPS_GET_CLASSES = 0x4005)</A></LI>
+<LI><A HREF="#4_6_6">4.6.6 Add Class (CUPS_ADD_CLASS = 0x4006)</A></LI>
+<LI><A HREF="#4_6_7">4.6.7 Delete Class (CUPS_DELETE_CLASS = 0x4007)</A></LI>
+<LI><A HREF="#4_6_8">4.6.8 Accept Jobs (CUPS_ACCEPT_JOBS = 0x4008)</A></LI>
+<LI><A HREF="#4_6_9">4.6.9 Reject Jobs (CUPS_REJECT_JOBS = 0x4009)</A></LI>
+<LI><A HREF="#4_6_10">4.6.10 Set Default Destination (CUPS_SET_DEFAULT 
+= 0x400A)</A></LI>
 </UL>
-<LI><A HREF=#4_8>4.8 Line Printer Daemon Protocol</A></LI>
-<LI><A HREF=#4_9>4.9 Server Message Block Protocol</A></LI>
-<LI><A HREF=#4_10>4.10 Trivial File Transfer Protocol</A></LI>
+<LI><A HREF="#4_7">4.7 Line Printer Daemon Protocol</A></LI>
+<LI><A HREF="#4_8">4.8 Server Message Block Protocol</A></LI>
 </UL>
-<B><A HREF=#5>5 5 - Directories</A></B>
+<B><A HREF="#5">5 5 - Directories</A></B>
 <BR>
-<BR><B><A HREF=#6>A Glossary</A></B>
+<BR><B><A HREF="#6">A Glossary</A></B>
 <UL>
-<LI><A HREF=#6_1>A.1 Terms</A></LI>
-<LI><A HREF=#6_2>A.2 Acronyms</A></LI>
+<LI><A HREF="#6_1">A.1 Terms</A></LI>
+<LI><A HREF="#6_2">A.2 Acronyms</A></LI>
 </UL>
 <HR>
-<H1><A NAME=1>1 Scope</A></H1>
-<H2><A NAME=1_1>1.1 Identification</A></H2>
+<H1><A NAME="1">1 Scope</A></H1>
+<H2><A NAME="1_1">1.1 Identification</A></H2>
 <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.0. </P>
-<H2><A NAME=1_2>1.2 System Overview</A></H2>
+<H2><A NAME="1_2">1.2 System Overview</A></H2>
 <P>The Common UNIX Printing System provides a portable printing layer 
 for  UNIX&reg; operating systems. It has been developed by Easy Software 
 Products to promote a standard printing solution for all UNIX vendors 
@@ -103,7 +115,7 @@ applications under UNIX. </P>
 <P>CUPS also includes a customized version of GNU GhostScript 
 (currently based off GNU GhostScript 4.03) and an image file RIP that 
 can be used to support non-PostScript printers. </P>
-<H2><A NAME=1_3>1.3 Document Overview</A></H2>
+<H2><A NAME="1_3">1.3 Document Overview</A></H2>
 <P>This interface design description document is organized into the 
 following sections: </P>
 <UL>
@@ -114,8 +126,8 @@ following sections: </P>
 <LI>5 - Directories </LI>
 <LI>A - Glossary </LI>
 </UL>
-<H1><A NAME=2>2 References</A></H1>
-<H2><A NAME=2_1>2.1 CUPS Documentation</A></H2>
+<H1><A NAME="2">2 References</A></H1>
+<H2><A NAME="2_1">2.1 CUPS Documentation</A></H2>
 <P>The following CUPS documentation is referenced by this document: </P>
 <UL>
 <LI>CUPS-CMP-1.0: CUPS Configuration Management Plan </LI>
@@ -128,18 +140,18 @@ following sections: </P>
 <LI>CUPS-SUM-1.0.x: CUPS Software Users Manual </LI>
 <LI>CUPS-SVD-1.0.x: CUPS Software Version Description </LI>
 </UL>
-<H2><A NAME=2_2>2.2 Other Documents</A></H2>
+<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>IEEE 1387.4, System Administration: Printing (draft) </LI>
 <LI>IPP/1.0: Additional Optional Operations - Set 1 </LI>
-<LI>IPP/1.0: Encoding and Transport </LI>
-<LI>IPP/1.0: Implementers Guide </LI>
-<LI>IPP/1.0: Model and Semantics </LI>
 <LI>RFC 1179, Line Printer Daemon Protocol </LI>
+<LI>RFC 2565, IPP/1.0: Encoding and Transport </LI>
+<LI>RFC 2566, IPP/1.0: Model and Semantics </LI>
+<LI>RFC 2639, IPP/1.0: Implementers Guide </LI>
 </UL>
-<H1><A NAME=3>3 Internal Interfaces</A></H1>
-<H2><A NAME=3_1>3.1 Character Set Files</A></H2>
+<H1><A NAME="3">3 Internal Interfaces</A></H1>
+<H2><A NAME="3_1">3.1 Character Set Files</A></H2>
 <P>The character set files define a mapping between 8-bit characters 
 and the Unicode character set. They are named using the ISO standard 
 number defined for the character set. Each file consists of up to 256 
@@ -147,7 +159,7 @@ lines of ASCII text. Each line consists of two hexadecimal numbers; the
 first number is the character number in the character set (0x00 to 
 0xff), and the second number is the Unicode character number (0x0000 to 
 0xffff). </P>
-<H2><A NAME=3_2>3.2 Language Files</A></H2>
+<H2><A NAME="3_2">3.2 Language Files</A></H2>
 <P>The language files define the default character set and a collection 
 of text messages in that language. They are named by prefixing the 
 string &quot;cups_&quot; to the front of the language specifier (e.g. &quot;cups_en&quot;, 
@@ -172,9 +184,9 @@ messages. The currently recognized values are: </P>
 <P>The second and succeeding lines define text messages. If the message 
 text is preceded by a number, then the current message number is 
 updated and the text after the number is used. </P>
-<H2><A NAME=3_3>3.3 MIME Files</A></H2>
+<H2><A NAME="3_3">3.3 MIME Files</A></H2>
 <P>CUPS uses two MIME files in its standard configuration. </P>
-<H3><A NAME=3_3_1>3.3.1 mime.types</A></H3>
+<H3><A NAME="3_3_1">3.3.1 mime.types</A></H3>
 <P>The mime.types file defines the recognized file types and consists 
 of 1 or more lines of ASCII text. Comment lines start with the pound 
 (&quot;#&quot;) character. The backslash (&quot;\&quot;) character can be used at the end 
@@ -205,7 +217,7 @@ operator := &quot;+&quot; |	[ logical AND ]
 <P>The <CODE>int</CODE> and <CODE>short</CODE> rules match look for 
 integers in network byte order (a.k.a. big-endian) with the 
 most-significant byte first. </P>
-<H3><A NAME=3_3_2>3.3.2 mime.convs</A></H3>
+<H3><A NAME="3_3_2">3.3.2 mime.convs</A></H3>
 <P>The mime.types file defines the recognized file filters and consists 
 of 1 or more lines of ASCII text. Comment lines start with the pound 
 (&quot;#&quot;) character. </P>
@@ -214,12 +226,12 @@ of 1 or more lines of ASCII text. Comment lines start with the pound
 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>
-<H2><A NAME=3_4>3.4 PostScript Printer Description Files</A></H2>
+<H2><A NAME="3_4">3.4 PostScript Printer Description Files</A></H2>
 <P>The PostScript Printer Description (PPD) file format is described in <A
-HREF=http://partners.adobe.com/supportservice/devrelations/PDFS/TN/5003.PPD_Spec_v4.3.pdf>
-Adobe TechNote #5003: PostScript Printer Description File Format 
+HREF="http://partners.adobe.com/supportservice/devrelations/PDFS/TN/5003.PPD_Spec_v4.3.pdf">
+ Adobe TechNote #5003: PostScript Printer Description File Format 
 Specification Version 4.3</A>. </P>
-<H3><A NAME=3_4_1>3.4.1 CUPS Extensions to PPD Files</A></H3>
+<H3><A NAME="3_4_1">3.4.1 CUPS Extensions to PPD Files</A></H3>
 <P>CUPS adds several new attributes that are described below. </P>
 <H4>3.4.1.1 cupsFilter</H4>
 <P>This string attribute provides a conversion rule of the form: </P>
@@ -263,7 +275,7 @@ after</I> the CMY transformation. </P>
 <P>This required attribute describes which version of the CUPS IDD was 
 used for the PPD file extensions. Currently it must be the string 
 &quot;1.0&quot;. </P>
-<H2><A NAME=3_5>3.5 Scheduler Configuration Files</A></H2>
+<H2><A NAME="3_5">3.5 Scheduler Configuration Files</A></H2>
 <P>The scheduler reads three configuration files that define the 
 available printers, classes, and services: </P>
 <DL>
@@ -275,101 +287,161 @@ the scheduler. </DD>
 <DT>printers.conf </DT>
 <DD>This file defines all of the printers known to the system. </DD>
 </DL>
-<H3><A NAME=3_5_1>3.5.1 classes.conf</A></H3>
+<H3><A NAME="3_5_1">3.5.1 classes.conf</A></H3>
 <P>The classes.conf file consists of 1 or more lines of ASCII text. 
 Comment lines start with the pound (&quot;#&quot;) character. </P>
 <P>Each non-blank line starts with the name of a configuration 
 directive followed by its value. The following directives are 
 understood: 
 <CENTER>
-<TABLE BORDER=1 WIDTH=90%>
-<TR><TH WIDTH=25%>Directive</TH><TH>Description</TH></TR>
+<TABLE BORDER="1" WIDTH="90%">
+<TR><TH WIDTH="25%">Directive</TH><TH>Description</TH></TR>
 <TR><TD>&lt;Class name&gt;
-<BR> &lt;/Class&gt;</TD><TD></TR>
+<BR> &lt;/Class&gt;</TD><TD>Surrounds a class definition.</TD></TR>
 <TR><TD>&lt;DefaultClass name&gt;
-<BR> &lt;/Class&gt;</TD><TD></TR>
-<TR><TD>Info</TD><TD></TR>
-<TR><TD>Location</TD><TD></TR>
-<TR><TD>MoreInfo</TD><TD></TR>
-<TR><TD>Printer</TD><TD></TR>
+<BR> &lt;/Class&gt;</TD><TD>Surrounds a class definition for the default 
+destination.</TD></TR>
+<TR><TD>Accepting</TD><TD>Specifies whether the class is accepting new 
+jobs. May be  the names &quot;Yes&quot; or &quot;No&quot;.</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>
 </TABLE>
 </CENTER>
 </P>
-<H3><A NAME=3_5_2>3.5.2 cupsd.conf</A></H3>
+<H3><A NAME="3_5_2">3.5.2 cupsd.conf</A></H3>
 <P>The cupsd.conf file consists of 1 or more lines of ASCII text. 
 Comment lines start with the pound (&quot;#&quot;) character. </P>
 <P>Each non-blank line starts with the name of a configuration 
 directive followed by its value. The following directives are 
 understood: 
 <CENTER>
-<TABLE BORDER=1 WIDTH=90%>
-<TR><TH WIDTH=25%>Directive</TH><TH>Default</TH><TH>Description</TH></TR>
-<TR><TD>AccessLog</TD><TD><TD>Specifies the location of the access log 
-file (default  &quot;logs/access_log&quot;).</TD></TR>
-<TR><TD>Allow</TD><TD><TD></TR>
-<TR><TD>AuthClass</TD><TD><TD></TR>
-<TR><TD>AuthType</TD><TD><TD></TR>
-<TR><TD>BrowseAddress</TD><TD><TD></TR>
-<TR><TD>BrowseInterval</TD><TD><TD></TR>
-<TR><TD>BrowsePort</TD><TD><TD></TR>
-<TR><TD>BrowseTimeout</TD><TD><TD></TR>
-<TR><TD>Browsing</TD><TD><TD></TR>
-<TR><TD>DefaultCharset</TD><TD><TD></TR>
-<TR><TD>DefaultLanguage</TD><TD><TD></TR>
-<TR><TD>Deny</TD><TD><TD></TR>
-<TR><TD>DocumentRoot</TD><TD><TD></TR>
-<TR><TD>ErrorLog</TD><TD><TD></TR>
-<TR><TD>Group</TD><TD><TD></TR>
-<TR><TD>HostNameLookups</TD><TD><TD></TR>
-<TR><TD>ImplicitClasses</TD><TD><TD></TR>
-<TR><TD>KeepAlive</TD><TD><TD></TR>
-<TR><TD>KeepAliveTimeout</TD><TD><TD></TR>
+<TABLE BORDER="1" WIDTH="90%">
+<TR><TH WIDTH="25%">Directive</TH><TH>Default</TH><TH>Description</TH></TR>
+<TR><TD>AccessLog</TD><TD>logs/access_log</TD><TD>Specifies the 
+location of the access log file.</TD></TR>
+<TR><TD>Allow</TD><TD>-</TD><TD>Allows connections from the specified 
+host, network, or  domain.</TD></TR>
+<TR><TD>AuthClass</TD><TD>-</TD><TD>Specifies what level of 
+authentication is required; may be either  &quot;User&quot;, &quot;System&quot;, or &quot;Group&quot;.</TD>
+</TR>
+<TR><TD>AuthType</TD><TD>None</TD><TD>Specifies the type of 
+authentication to perform; may be either  &quot;None&quot; or &quot;Basic&quot;.</TD></TR>
+<TR><TD>BrowseAddress</TD><TD>255.255.255.255</TD><TD>Specifies a 
+broadcast address to send CUPS browsing packets to.</TD></TR>
+<TR><TD>BrowseInterval</TD><TD>30</TD><TD>Specifies the number of 
+seconds between browsing updates.</TD></TR>
+<TR><TD>BrowsePort</TD><TD>631</TD><TD>Specifies the UDP port number to 
+use for browse packets.</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>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 
+default language.</TD></TR>
+<TR><TD>Deny</TD><TD>-</TD><TD>Refuses connections from the specified 
+host, network, or  domain.</TD></TR>
+<TR><TD>DocumentRoot</TD><TD>/usr/share/cups/doc</TD><TD>Specifies the 
+document data root directory.</TD></TR>
+<TR><TD>ErrorLog</TD><TD>logs/error_log</TD><TD>Specifies the error log 
+file location.</TD></TR>
+<TR><TD>Group</TD><TD>root, sys, system</TD><TD>Specifies the group 
+name or ID that is used when running  external programs.</TD></TR>
+<TR><TD>HostNameLookups</TD><TD>Off</TD><TD>Specifies whether or not to 
+perform reverse IP address lookups to  get the actual hostname; may be 
+&quot;On&quot; or &quot;Off&quot;. Hostname lookups can  significantly degrade the 
+performance of the CUPS server if one or  more DNS servers is not 
+functioning properly.</TD></TR>
+<TR><TD>ImplicitClasses</TD><TD>On</TD><TD>Specifies whether or not to 
+automatically create printer classes  when more than one printer or 
+class of the same name is detected on  the network; may be &quot;On&quot; or 
+&quot;Off&quot;.</TD></TR>
+<TR><TD>KeepAlive</TD><TD>On</TD><TD>Specifies whether or not to use 
+the HTTP Keep-Alive feature; may  be &quot;On&quot; or &quot;Off&quot;.</TD></TR>
+<TR><TD>KeepAliveTimeout</TD><TD>30</TD><TD>Specifies the amount of 
+time to keep the HTTP connection alive  before closing it.</TD></TR>
 <TR><TD>&lt;Location path&gt;
-<BR> &lt;/Location&gt;</TD><TD><TD></TR>
-<TR><TD>LogLevel</TD><TD><TD></TR>
-<TR><TD>MaxClients</TD><TD><TD></TR>
-<TR><TD>MaxLogSize</TD><TD><TD></TR>
-<TR><TD>MaxRequestSize</TD><TD><TD></TR>
-<TR><TD>Order</TD><TD><TD></TR>
-<TR><TD>PageLog</TD><TD><TD></TR>
-<TR><TD>Port</TD><TD><TD></TR>
-<TR><TD>RIPCache</TD><TD><TD></TR>
-<TR><TD>ServerAdmin</TD><TD><TD></TR>
-<TR><TD>ServerName</TD><TD><TD></TR>
-<TR><TD>ServerRoot</TD><TD><TD></TR>
-<TR><TD>SystemGroup</TD><TD><TD></TR>
-<TR><TD>TempDir</TD><TD><TD></TR>
-<TR><TD>Timeout</TD><TD><TD></TR>
-<TR><TD>User</TD><TD><TD></TR>
+<BR> &lt;/Location&gt;</TD><TD>-</TD><TD>Specifies a location to restrict 
+access to.</TD></TR>
+<TR><TD>LogLevel</TD><TD>info</TD><TD>Controls the amount of 
+information that is logged in the  error log file. Can be one of 
+&quot;debug&quot;, &quot;info&quot;, &quot;warn&quot;, &quot;error&quot;,  or &quot;none&quot;, in decreasing order or 
+verbosity.</TD></TR>
+<TR><TD>MaxClients</TD><TD>100</TD><TD>Specifies the maximum number of 
+simultaneous active clients.  This value is internally limited to 1/3 
+of the total number of  availabel file descriptors.</TD></TR>
+<TR><TD>MaxLogSize</TD><TD>0</TD><TD>Specifies the maximum size of the 
+access, error, and page  log files in bytes. If set to 0 then no 
+maximum size is set.  Log files are rotated automatically when this 
+size is  exceeded.</TD></TR>
+<TR><TD>MaxRequestSize</TD><TD>0</TD><TD>Specifies the maximum size of 
+HTTP requests in bytes. If set to 0  then there is no maximum.</TD></TR>
+<TR><TD>Order</TD><TD>Allow,Deny</TD><TD>Specifies the order of Allow 
+and Deny directive processing; can  be &quot;Deny,Allow&quot; to implicitly deny 
+hosts unless they are allowed by  an Allow line, or &quot;Allow,Deny&quot; to 
+implicitly allow hosts unless they  are denied by a Deny line.</TD></TR>
+<TR><TD>PageLog</TD><TD>logs/page_log</TD><TD>Specifies the location of 
+the page log file.</TD></TR>
+<TR><TD>Port</TD><TD>631</TD><TD>Specifies a port number to listen to 
+for HTTP connections.</TD></TR>
+<TR><TD>RIPCache</TD><TD>8m</TD><TD>Specifies the size of the memory 
+cache in bytes that is used by  RIP filters.</TD></TR>
+<TR><TD>ServerAdmin</TD><TD>root@ServerName</TD><TD>Specifies the 
+person to contact with problems.</TD></TR>
+<TR><TD>ServerName</TD><TD>hostname</TD><TD>Specifies the hostname that 
+is supplied to HTTP clients. This  is also used to determine the 
+default CUPS server for the CUPS IPP  client applications.</TD></TR>
+<TR><TD>ServerRoot</TD><TD>/var/cups</TD><TD>Specifies the root 
+directory for server data files.</TD></TR>
+<TR><TD>SystemGroup</TD><TD>root, sys, system</TD><TD>Specifies the 
+group name used for System class authentication.</TD></TR>
+<TR><TD>TempDir</TD><TD>/var/tmp</TD><TD>Specifies the temporary 
+directory to use.</TD></TR>
+<TR><TD>Timeout</TD><TD>300</TD><TD>The timeout in seconds before 
+client connections are closed  in the middle of a request.</TD></TR>
+<TR><TD>User</TD><TD>lp</TD><TD>Specifies the user that is used when 
+running external programs.</TD></TR>
 </TABLE>
 </CENTER>
 </P>
-<H3><A NAME=3_5_3>3.5.3 printers.conf</A></H3>
+<H3><A NAME="3_5_3">3.5.3 printers.conf</A></H3>
 <P>The printers.conf file consists of 1 or more lines of ASCII text. 
 Comment lines start with the pound (&quot;#&quot;) character. </P>
 <P>Each non-blank line starts with the name of a configuration 
 directive followed by its value. The following directives are 
 understood: 
 <CENTER>
-<TABLE BORDER=1 WIDTH=90%>
-<TR><TH WIDTH=25%>Directive</TH><TH>Description</TH></TR>
+<TABLE BORDER="1" WIDTH="90%">
+<TR><TH WIDTH="25%">Directive</TH><TH>Description</TH></TR>
+<TR><TD>Accepting</TD><TD>Specifies whether the printer is accepting 
+new jobs. May be  the names &quot;Yes&quot; or &quot;No&quot;.</TD></TR>
 <TR><TD>&lt;DefaultPrinter name&gt;
-<BR> &lt;/Printer&gt;</TD><TD></TR>
-<TR><TD>DeviceURI</TD><TD></TR>
-<TR><TD>Info</TD><TD></TR>
-<TR><TD>Location</TD><TD></TR>
-<TR><TD>MoreInfo</TD><TD></TR>
+<BR> &lt;/Printer&gt;</TD><TD>Surrounds the printer definition for a default 
+destination.</TD></TR>
+<TR><TD>DeviceURI</TD><TD>Specifies the device-uri attribute for the 
+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></TR>
-<TR><TD>State</TD><TD></TR>
+<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 
+be &quot;Idle&quot; or  &quot;Stopped&quot;.</TD></TR>
 </TABLE>
 </CENTER>
 </P>
-<H1><A NAME=4>4 External Interfaces</A></H1>
-<H2><A NAME=4_1>4.1 AppSocket Protocol</A></H2>
+<H1><A NAME="4">4 External Interfaces</A></H1>
+<H2><A NAME="4_1">4.1 AppSocket Protocol</A></H2>
 <P>The AppSocket protocol is an 8-bit clean TCP/IP socket connection. 
-The default IP service port is 9100. </P>
-<H2><A NAME=4_2>4.2 CUPS Browsing Protocol</A></H2>
+The default IP service port is 9100. The URI method name is &quot;socket&quot;. </P>
+<H2><A NAME="4_2">4.2 CUPS Browsing Protocol</A></H2>
 <P>The CUPS Browsing Protocol is a UDP/IP-based broadcast service. By 
 default this service operates on IP service port 631. </P>
 <P>Each broadcast packet describes the state of a single printer or 
@@ -385,8 +457,8 @@ printer-state</CODE> and <CODE>printer-uri-supported</CODE> attributes. </P>
 <P>The <I>type</I> value is a hexadecimal number string representing 
 capability/type bits: 
 <CENTER>
-<TABLE BORDER=1 WIDTH=40%>
-<TR><TH WIDTH=8%>Bit</TH><TH>Description</TH></TR>
+<TABLE BORDER="1" WIDTH="40%">
+<TR><TH WIDTH="8%">Bit</TH><TH>Description</TH></TR>
 <TR><TD>0</TD><TD>0 = printer
 <BR> 1 = class</TD></TR>
 <TR><TD>1</TD><TD>0 = local
@@ -409,13 +481,13 @@ capability/type bits:
 </TABLE>
 </CENTER>
 </P>
-<H2><A NAME=4_3>4.3 CUPS PostScript File</A></H2>
+<H2><A NAME="4_3">4.3 CUPS PostScript File</A></H2>
 <P>CUPS PostScript files are device-dependent Adobe PostScript program 
-files. The PostScript language is described in the <A HREF=http://partners.adobe.com/supportservice/devrelations/PDFS/TN/PLRM.pdf>
-Adobe PostScript Language Reference Manual, Third Edition</A>. </P>
+files. The PostScript language is described in the <A HREF="http://partners.adobe.com/supportservice/devrelations/PDFS/TN/PLRM.pdf">
+ Adobe PostScript Language Reference Manual, Third Edition</A>. </P>
 <P>The MIME type for CUPS PostScript files is <CODE>
 application/vnd.cups-postscript</CODE>. </P>
-<H2><A NAME=4_4>4.4 CUPS Raster File</A></H2>
+<H2><A NAME="4_4">4.4 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 
@@ -433,8 +505,8 @@ automatically. </P>
 Each page starts with a page device dictionary header and is followed 
 immediately by the raster data for that page. 
 <CENTER>
-<TABLE BORDER=1 WIDTH=80%>
-<TR><TH WIDTH=10%>Bytes</TH><TH WIDTH=20%>Description</TH><TH>Values</TH>
+<TABLE BORDER="1" WIDTH="80%">
+<TR><TH WIDTH="10%">Bytes</TH><TH WIDTH="20%">Description</TH><TH>Values</TH>
 </TR>
 <TR><TD>0-63</TD><TD>MediaClass</TD><TD>Nul-terminated ASCII string</TD></TR>
 <TR><TD>64-127</TD><TD>MediaColor</TD><TD>Nul-terminated ASCII string</TD>
@@ -541,42 +613,40 @@ CMYK CMYK)
 </P>
 <P>The MIME type for CUPS Raster files is <CODE>
 application/vnd.cups-raster</CODE>. </P>
-<H2><A NAME=4_5>4.5 CUPS Raw Files</A></H2>
+<H2><A NAME="4_5">4.5 CUPS Raw Files</A></H2>
 <P>Raw files are printer-dependent print files that are in a format 
 suitable to the destination printer (e.g. HP-PCL, HP-RTL, etc.) The 
 MIME type for CUPS Raw files is <CODE>application/vnd.cups-raw</CODE>. </P>
-<H2><A NAME=4_6>4.6 File Transfer Protocol</A></H2>
-<P>The File Transfer Protocol (FTP) is described by <A HREF=http://www.ietf.org/rfc/rfc959.txt>
-RFC 959: File Transfer Protocol</A>. </P>
-<H2><A NAME=4_7>4.7 Internet Printing Protocol</A></H2>
+<H2><A NAME="4_6">4.6 Internet Printing Protocol</A></H2>
 <P>The Internet Printing Protocol is described by the following RFCs: </P>
 <UL>
-<LI><A HREF=http://www.ietf.org/rfc/rfc2565.txt>RFC 2565: Internet 
+<LI><A HREF="http://www.ietf.org/rfc/rfc2565.txt"> RFC 2565: Internet 
 Printing Protocol/1.0: Encoding and Transport</A></LI>
-<LI><A HREF=http://www.ietf.org/rfc/rfc2566.txt>RFC 2566: Internet 
+<LI><A HREF="http://www.ietf.org/rfc/rfc2566.txt"> RFC 2566: Internet 
 Printing Protocol/1.0: Model and Semantics</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  for the Internet Printing 
+<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  for the Internet Printing 
 Protocol</A></LI>
-<LI><A HREF=http://www.ietf.org/rfc/rfc2569.txt>RFC 2569: Mapping 
+<LI><A HREF="http://www.ietf.org/rfc/rfc2569.txt"> RFC 2569: Mapping 
 between LPD and IPP Protocols</A></LI>
 </UL>
+<P>The URI method name for IPP is &quot;ipp&quot;. </P>
 <P>CUPS defines the following extension operations to IPP. </P>
-<H3><A NAME=4_7_1>4.7.1 Get Default Destination (CUPS_GET_DEFAULT = 
+<H3><A NAME="4_6_1">4.6.1 Get Default Destination (CUPS_GET_DEFAULT = 
 0x4001)</A></H3>
 <P>The get default destination operation returns the printer attributes 
 for the system default printer or class. The only required attributes 
 are <CODE>attributes-charset</CODE> and <CODE>
 attributes-natural-language</CODE>. </P>
 <P>Get default destination will only return <CODE>ipp-ok</CODE>. </P>
-<H3><A NAME=4_7_2>4.7.2 Get Printers (CUPS_GET_PRINTERS = 0x4002)</A></H3>
+<H3><A NAME="4_6_2">4.6.2 Get Printers (CUPS_GET_PRINTERS = 0x4002)</A></H3>
 <P>The get printers operation returns the printer attributes for all 
 printers known to the system. The only required attributes are <CODE>
 attributes-charset</CODE> and <CODE>attributes-natural-language</CODE>. </P>
 <P>Get printers will only return <CODE>ipp-ok</CODE>. </P>
-<H3><A NAME=4_7_3>4.7.3 Add Printer (CUPS_ADD_PRINTER = 0x4003)</A></H3>
+<H3><A NAME="4_6_3">4.6.3 Add Printer (CUPS_ADD_PRINTER = 0x4003)</A></H3>
 <P>The add printer operation adds or replaces the specified printer. 
 The <CODE>attributes-charset</CODE>, <CODE>attributes-natural-language</CODE>
 and <CODE>printer-uri</CODE> attributes are required. </P>
@@ -589,19 +659,19 @@ body. If a valid interface script or PPD file is not provided then the
 printer is treated as a generic PostScript device. </P>
 <P>Add printer will return <CODE>ipp-ok</CODE>, <CODE>ipp-not-authorized</CODE>
 , <CODE>ipp-bad-request</CODE>, or <CODE>ipp-attributes</CODE>. </P>
-<H3><A NAME=4_7_4>4.7.4 Delete Printer (CUPS_DELETE_PRINTER = 0x4004)</A>
+<H3><A NAME="4_6_4">4.6.4 Delete Printer (CUPS_DELETE_PRINTER = 0x4004)</A>
 </H3>
 <P>The delete printer operation removes the specified printer. The only 
 required attributes are <CODE>attributes-charset</CODE>, <CODE>
 attributes-natural-language</CODE>, and <CODE>printer-uri</CODE>. </P>
 <P>Delete printer will return <CODE>ipp-ok</CODE>, <CODE>ipp-not-found</CODE>
 , or <CODE>ipp-not-authorized</CODE>. </P>
-<H3><A NAME=4_7_5>4.7.5 Get Classes (CUPS_GET_CLASSES = 0x4005)</A></H3>
+<H3><A NAME="4_6_5">4.6.5 Get Classes (CUPS_GET_CLASSES = 0x4005)</A></H3>
 <P>The get classes operation returns the printer attributes for all 
 classes known to the system. The only required attributes are <CODE>
 attributes-charset</CODE> and <CODE>attributes-natural-language</CODE>. </P>
 <P>Get classes will only return <CODE>ipp-ok</CODE>. </P>
-<H3><A NAME=4_7_6>4.7.6 Add Class (CUPS_ADD_CLASS = 0x4006)</A></H3>
+<H3><A NAME="4_6_6">4.6.6 Add Class (CUPS_ADD_CLASS = 0x4006)</A></H3>
 <P>The add class operation adds or replaces the specified class. The <CODE>
 attributes-charset</CODE>, <CODE>attributes-natural-language</CODE>, 
 and <CODE>printer-uri</CODE> attributes are required. </P>
@@ -611,27 +681,27 @@ required when initially adding a printer and optional when modifying a
 printer. </P>
 <P>Add class will return <CODE>ipp-ok</CODE>, <CODE>ipp-not-authorized</CODE>
 , <CODE>ipp-bad-request</CODE>, or <CODE>ipp-attributes</CODE>. </P>
-<H3><A NAME=4_7_7>4.7.7 Delete Class (CUPS_DELETE_CLASS = 0x4007)</A></H3>
+<H3><A NAME="4_6_7">4.6.7 Delete Class (CUPS_DELETE_CLASS = 0x4007)</A></H3>
 <P>The delete class operation removes the specified class. The only 
 required attributes are <CODE>attributes-charset</CODE>, <CODE>
 attributes-natural-language</CODE>, and <CODE>printer-uri</CODE>. </P>
 <P>Delete class will return <CODE>ipp-ok</CODE>, <CODE>ipp-not-found</CODE>
 , or <CODE>ipp-not-authorized</CODE>. </P>
-<H3><A NAME=4_7_8>4.7.8 Accept Jobs (CUPS_ACCEPT_JOBS = 0x4008)</A></H3>
+<H3><A NAME="4_6_8">4.6.8 Accept Jobs (CUPS_ACCEPT_JOBS = 0x4008)</A></H3>
 <P>The accept jobs operation allows jobs to be accepted by the 
 specified destination. The only required attributes are <CODE>
 attributes-charset</CODE>, <CODE>attributes-natural-language</CODE>, 
 and <CODE>printer-uri</CODE>. </P>
 <P>Accept jobs will return <CODE>ipp-ok</CODE>, <CODE>ipp-not-found</CODE>
 , or <CODE>ipp-not-authorized</CODE>. </P>
-<H3><A NAME=4_7_9>4.7.9 Reject Jobs (CUPS_REJECT_JOBS = 0x4009)</A></H3>
+<H3><A NAME="4_6_9">4.6.9 Reject Jobs (CUPS_REJECT_JOBS = 0x4009)</A></H3>
 <P>The reject jobs operation prevents jobs from being accepted by the 
 specified destination. The only required attributes are <CODE>
 attributes-charset</CODE>, <CODE>attributes-natural-language</CODE>, 
 and <CODE>printer-uri</CODE>. </P>
 <P>Reject jobs will return <CODE>ipp-ok</CODE>, <CODE>ipp-not-found</CODE>
 , or <CODE>ipp-not-authorized</CODE>. </P>
-<H3><A NAME=4_7_10>4.7.10 Set Default Destination (CUPS_SET_DEFAULT = 
+<H3><A NAME="4_6_10">4.6.10 Set Default Destination (CUPS_SET_DEFAULT = 
 0x400A)</A></H3>
 <P>The set default destination operation returns the printer attributes 
 for the system default printer or class. The only required attributes 
@@ -640,27 +710,24 @@ are <CODE>attributes-charset</CODE>, <CODE>attributes-natural-language</CODE>
 <P>Set default destination will return <CODE>ipp-ok</CODE>, <CODE>
 ipp-not-authorized</CODE>, <CODE>ipp-bad-request</CODE>, or <CODE>
 ipp-not-found</CODE>. </P>
-<H2><A NAME=4_8>4.8 Line Printer Daemon Protocol</A></H2>
-<P>The Line Printer Daemon (LPD) protocol is described by <A HREF=http://www.ietf.org/rfc/rfc1179.txt>
+<H2><A NAME="4_7">4.7 Line Printer Daemon Protocol</A></H2>
+<P>The Line Printer Daemon (LPD) protocol is described by <A HREF="http://www.ietf.org/rfc/rfc1179.txt">
 RFC 1179: Line Printer Daemon Protocol</A>. </P>
-<H2><A NAME=4_9>4.9 Server Message Block Protocol</A></H2>
+<P>The URI method name for LPD is &quot;lpd&quot;. </P>
+<H2><A NAME="4_8">4.8 Server Message Block Protocol</A></H2>
 <P>The Server Message Block (SMB) and related Common Internet File 
-System (CIFS) protocols are described at <A HREF=http://anu.samba.org/cifs>
+System (CIFS) protocols are described at <A HREF="http://anu.samba.org/cifs">
 http://anu.samba.org/cifs</A>. </P>
-<H2><A NAME=4_10>4.10 Trivial File Transfer Protocol</A></H2>
-<P>The Trivial File Transfer Protocol (TFTP) is described by <A HREF=http://www.ietf.org/rfc/rfc1350.txt>
-RFC 1350: The TFTP Protocol (Revision 2)</A>. </P>
-<H1><A NAME=5>5 5 - Directories</A></H1>
+<P>The URI method name for SMB is &quot;smb&quot;. </P>
+<H1><A NAME="5">5 5 - Directories</A></H1>
 <DL>
 <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 </DT>
-<DD>The <CODE>accept</CODE>, <CODE>disable</CODE>, <CODE>enable</CODE>, <CODE>
-lpadmin</CODE>, and <CODE>reject</CODE> commands reside here. </DD>
 <DT>/usr/sbin </DT>
-<DD>The <CODE>lpc</CODE> and <CODE>cupsd</CODE> commands resize here. </DD>
+<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>
 <DT>/usr/share/cups/data </DT>
@@ -693,8 +760,8 @@ page_log</CODE> files reside here. </DD>
 <DT>/var/cups/requests </DT>
 <DD>This directory contains pending print job files. </DD>
 </DL>
-<H1 TYPE=A VALUE=1><A NAME=6>A Glossary</A></H1>
-<H2><A NAME=6_1>A.1 Terms</A></H2>
+<H1 TYPE="A" VALUE="1"><A NAME="6">A Glossary</A></H1>
+<H2><A NAME="6_1">A.1 Terms</A></H2>
 <DL>
 <DT>C </DT>
 <DD>A computer language. </DD>
@@ -707,7 +774,7 @@ page_log</CODE> files reside here. </DD>
 <DT>socket </DT>
 <DD>A two-way network communications channel. </DD>
 </DL>
-<H2><A NAME=6_2>A.2 Acronyms</A></H2>
+<H2><A NAME="6_2">A.2 Acronyms</A></H2>
 <DL>
 <DT>ASCII </DT>
 <DD>American Standard Code for Information Interchange </DD>
@@ -1,9 +1,9 @@
 <HTML>
 <HEAD>
-	<META NAME="COPYRIGHT" CONTENT="Copyright 1997-1999, All Rights Reserved">
-	<META NAME="DOCNUMBER" CONTENT="CUPS-IDD-1.0">
+	<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>DRAFT - CUPS Interface Design Description</TITLE>
+	<TITLE>CUPS Interface Design Description</TITLE>
 </HEAD>
 <BODY>

@@ -13,7 +13,7 @@

 <P>This interface design description document provides detailed file
 formats, message formats, and program conventions for the Common UNIX
-Printing System ("CUPS") Version 1.0.
+Printing System ("CUPS") Version 1.1.

 <H2>System Overview</H2>

@@ -56,15 +56,15 @@ sections:
 <P>The following CUPS documentation is referenced by this document:

 <UL>
-	<LI>CUPS-CMP-1.0: CUPS Configuration Management Plan 
-	<LI>CUPS-IDD-1.0: CUPS System Interface Design Description 
-	<LI>CUPS-SAM-1.0.x: CUPS Software Administrators Manual 
-	<LI>CUPS-SDD-1.0: CUPS Software Design Description 
-	<LI>CUPS-SPM-1.0: CUPS Software Programming Manual
-	<LI>CUPS-SSR-1.0: CUPS Software Security Report 
-	<LI>CUPS-STP-1.0: CUPS Software Test Plan 
-	<LI>CUPS-SUM-1.0.x: CUPS Software Users Manual 
-	<LI>CUPS-SVD-1.0.x: CUPS Software Version Description 
+	<LI>CUPS-CMP-1.1: CUPS Configuration Management Plan 
+	<LI>CUPS-IDD-1.1: CUPS System Interface Design Description 
+	<LI>CUPS-SAM-1.1.x: CUPS Software Administrators Manual 
+	<LI>CUPS-SDD-1.1: CUPS Software Design Description 
+	<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.x: CUPS Software Version Description 
 </UL>

 <H2>Other Documents</H2>
@@ -74,10 +74,10 @@ sections:
 <UL>
 	<LI>IEEE 1387.4, System Administration: Printing (draft) 
 	<LI>IPP/1.0: Additional Optional Operations - Set 1
-	<LI>IPP/1.0: Encoding and Transport 
-	<LI>IPP/1.0: Implementers Guide
-	<LI>IPP/1.0: Model and Semantics
 	<LI>RFC 1179, Line Printer Daemon Protocol 
+	<LI>RFC 2565, IPP/1.0: Encoding and Transport 
+	<LI>RFC 2566, IPP/1.0: Model and Semantics
+	<LI>RFC 2639, IPP/1.0: Implementers Guide
 </UL>

 <H1>Internal Interfaces</H1>
@@ -231,7 +231,7 @@ the CMY transformation.
 <H4>cupsVersion</H4>

 <P>This required attribute describes which version of the CUPS IDD was used
-for the PPD file extensions. Currently it must be the string "1.0".
+for the PPD file extensions. Currently it must be the string "1.1".

 <H2>Scheduler Configuration Files</H2>

@@ -269,28 +269,33 @@ followed by its value. The following directives are understood:
 <TR>
 	<TD>&lt;Class name&gt;<BR>
 	&lt;/Class&gt;</TD>
-	<TD></TD>
+	<TD>Surrounds a class definition.</TD>
 </TR>
 <TR>
 	<TD>&lt;DefaultClass name&gt;<BR>
 	&lt;/Class&gt;</TD>
-	<TD></TD>
+	<TD>Surrounds a class definition for the default destination.</TD>
+</TR>
+<TR>
+	<TD>Accepting</TD>
+	<TD>Specifies whether the class is accepting new jobs. May be
+	the names "Yes" or "No".</TD>
 </TR>
 <TR>
 	<TD>Info</TD>
-	<TD></TD>
+	<TD>A textual description of the class.</TD>
 </TR>
 <TR>
 	<TD>Location</TD>
-	<TD></TD>
+	<TD>A textual location of the class.</TD>
 </TR>
 <TR>
 	<TD>MoreInfo</TD>
-	<TD></TD>
+	<TD>A URL pointing to additional information on the class.</TD>
 </TR>
 <TR>
 	<TD>Printer</TD>
-	<TD></TD>
+	<TD>Specifies a printer that is a member of the class.</TD>
 </TR>
 </TABLE></CENTER>

@@ -310,180 +315,208 @@ followed by its value. The following directives are understood:
 </TR>
 <TR>
 	<TD>AccessLog</TD>
-	<TD></TD>
-	<TD>Specifies the location of the access log file (default
-	"logs/access_log").</TD>
+	<TD>logs/access_log</TD>
+	<TD>Specifies the location of the access log file.</TD>
 </TR>
 <TR>
 	<TD>Allow</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>-</TD>
+	<TD>Allows connections from the specified host, network, or
+	domain.</TD>
 </TR>
 <TR>
 	<TD>AuthClass</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>-</TD>
+	<TD>Specifies what level of authentication is required; may be either
+	"User", "System", or "Group".</TD>
 </TR>
 <TR>
 	<TD>AuthType</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>None</TD>
+	<TD>Specifies the type of authentication to perform; may be either
+	"None" or "Basic".</TD>
 </TR>
 <TR>
 	<TD>BrowseAddress</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>255.255.255.255</TD>
+	<TD>Specifies a broadcast address to send CUPS browsing packets to.</TD>
 </TR>
 <TR>
 	<TD>BrowseInterval</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>30</TD>
+	<TD>Specifies the number of seconds between browsing updates.</TD>
 </TR>
 <TR>
 	<TD>BrowsePort</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>631</TD>
+	<TD>Specifies the UDP port number to use for browse packets.</TD>
 </TR>
 <TR>
 	<TD>BrowseTimeout</TD>
-	<TD></TD>
-	<TD></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></TD>
-	<TD></TD>
+	<TD>On</TD>
+	<TD>Specifies whether or not printer and class browsing is enabled; can
+	be "On" or "Off".</TD>
 </TR>
 <TR>
 	<TD>DefaultCharset</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>iso-8859-1</TD>
+	<TD>Specifies the default character set.</TD>
 </TR>
 <TR>
 	<TD>DefaultLanguage</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>current locale</TD>
+	<TD>Specifies the default language.</TD>
 </TR>
 <TR>
 	<TD>Deny</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>-</TD>
+	<TD>Refuses connections from the specified host, network, or
+	domain.</TD>
 </TR>
 <TR>
 	<TD>DocumentRoot</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>/usr/share/cups/doc</TD>
+	<TD>Specifies the document data root directory.</TD>
 </TR>
 <TR>
 	<TD>ErrorLog</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>logs/error_log</TD>
+	<TD>Specifies the error log file location.</TD>
 </TR>
 <TR>
 	<TD>Group</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>root, sys, system</TD>
+	<TD>Specifies the group name or ID that is used when running
+	external programs.</TD>
 </TR>
 <TR>
 	<TD>HostNameLookups</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>Off</TD>
+	<TD>Specifies whether or not to perform reverse IP address lookups to
+	get the actual hostname; may be "On" or "Off". Hostname lookups can
+	significantly degrade the performance of the CUPS server if one or
+	more DNS servers is not functioning properly.</TD>
 </TR>
 <TR>
 	<TD>ImplicitClasses</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>On</TD>
+	<TD>Specifies whether or not to automatically create printer classes
+	when more than one printer or class of the same name is detected on
+	the network; may be "On" or "Off".</TD>
 </TR>
 <TR>
 	<TD>KeepAlive</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>On</TD>
+	<TD>Specifies whether or not to use the HTTP Keep-Alive feature; may
+	be "On" or "Off".</TD>
 </TR>
 <TR>
 	<TD>KeepAliveTimeout</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>30</TD>
+	<TD>Specifies the amount of time to keep the HTTP connection alive
+	before closing it.</TD>
 </TR>
 <TR>
 	<TD>&lt;Location path&gt;<BR>
 	&lt;/Location&gt;</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>-</TD>
+	<TD>Specifies a location to restrict access to.</TD>
 </TR>
 <TR>
 	<TD>LogLevel</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>info</TD>
+	<TD>Controls the amount of information that is logged in the
+	error log file. Can be one of "debug", "info", "warn", "error",
+	or "none", in decreasing order or verbosity.</TD>
 </TR>
 <TR>
 	<TD>MaxClients</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>100</TD>
+	<TD>Specifies the maximum number of simultaneous active clients.
+	This value is internally limited to 1/3 of the total number of
+	availabel file descriptors.</TD>
 </TR>
 <TR>
 	<TD>MaxLogSize</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>0</TD>
+	<TD>Specifies the maximum size of the access, error, and page
+	log files in bytes. If set to 0 then no maximum size is set.
+	Log files are rotated automatically when this size is
+	exceeded.</TD>
 </TR>
 <TR>
 	<TD>MaxRequestSize</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>0</TD>
+	<TD>Specifies the maximum size of HTTP requests in bytes. If set to 0
+	then there is no maximum.</TD>
 </TR>
 <TR>
 	<TD>Order</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>Allow,Deny</TD>
+	<TD>Specifies the order of Allow and Deny directive processing; can
+	be "Deny,Allow" to implicitly deny hosts unless they are allowed by
+	an Allow line, or "Allow,Deny" to implicitly allow hosts unless they
+	are denied by a Deny line.</TD>
 </TR>
 <TR>
 	<TD>PageLog</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>logs/page_log</TD>
+	<TD>Specifies the location of the page log file.</TD>
 </TR>
 <TR>
 	<TD>Port</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>631</TD>
+	<TD>Specifies a port number to listen to for HTTP connections.</TD>
 </TR>
 <TR>
 	<TD>RIPCache</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>8m</TD>
+	<TD>Specifies the size of the memory cache in bytes that is used by
+	RIP filters.</TD>
 </TR>
 <TR>
 	<TD>ServerAdmin</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>root@ServerName</TD>
+	<TD>Specifies the person to contact with problems.</TD>
 </TR>
 <TR>
 	<TD>ServerName</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>hostname</TD>
+	<TD>Specifies the hostname that is supplied to HTTP clients. This
+	is also used to determine the default CUPS server for the CUPS IPP
+	client applications.</TD>
 </TR>
 <TR>
 	<TD>ServerRoot</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>/var/cups</TD>
+	<TD>Specifies the root directory for server data files.</TD>
 </TR>
 <TR>
 	<TD>SystemGroup</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>root, sys, system</TD>
+	<TD>Specifies the group name used for System class authentication.</TD>
 </TR>
 <TR>
 	<TD>TempDir</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>/var/tmp</TD>
+	<TD>Specifies the temporary directory to use.</TD>
 </TR>
 <TR>
 	<TD>Timeout</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>300</TD>
+	<TD>The timeout in seconds before client connections are closed
+	in the middle of a request.</TD>
 </TR>
 <TR>
 	<TD>User</TD>
-	<TD></TD>
-	<TD></TD>
+	<TD>lp</TD>
+	<TD>Specifies the user that is used when running external programs.</TD>
 </TR>
 </TABLE></CENTER>

@@ -500,35 +533,41 @@ followed by its value. The following directives are understood:
 	<TH WIDTH="25%">Directive</TH>
 	<TH>Description</TH>
 </TR>
+<TR>
+	<TD>Accepting</TD>
+	<TD>Specifies whether the printer is accepting new jobs. May be
+	the names "Yes" or "No".</TD>
+</TR>
 <TR>
 	<TD>&lt;DefaultPrinter name&gt;<BR>
 	&lt;/Printer&gt;</TD>
-	<TD></TD>
+	<TD>Surrounds the printer definition for a default destination.</TD>
 </TR>
 <TR>
 	<TD>DeviceURI</TD>
-	<TD></TD>
+	<TD>Specifies the device-uri attribute for the printer.</TD>
 </TR>
 <TR>
 	<TD>Info</TD>
-	<TD></TD>
+	<TD>A textual description of the printer.</TD>
 </TR>
 <TR>
 	<TD>Location</TD>
-	<TD></TD>
+	<TD>A textual location of the printer.</TD>
 </TR>
 <TR>
 	<TD>MoreInfo</TD>
-	<TD></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></TD>
+	<TD>Surrounds the printer definition.</TD>
 </TR>
 <TR>
 	<TD>State</TD>
-	<TD></TD>
+	<TD>Specifies the initial state of the printer; can be "Idle" or
+	"Stopped".</TD>
 </TR>
 </TABLE></CENTER>

@@ -537,7 +576,7 @@ followed by its value. The following directives are understood:
 <H2>AppSocket Protocol</H2>

 <P>The AppSocket protocol is an 8-bit clean TCP/IP socket connection.
-The default IP service port is 9100.
+The default IP service port is 9100. The URI method name is "socket".

 <H2>CUPS Browsing Protocol</H2>

@@ -912,12 +951,6 @@ raster data for that page.
 to the destination printer (e.g. HP-PCL, HP-RTL, etc.) The MIME type for CUPS
 Raw files is <CODE>application/vnd.cups-raw</CODE>.

-<H2>File Transfer Protocol</H2>
-
-<P>The File Transfer Protocol (FTP) is described by
-<A HREF="http://www.ietf.org/rfc/rfc959.txt">RFC 959: File Transfer
-Protocol</A>.
-
 <H2>Internet Printing Protocol</H2>

 <P>The Internet Printing Protocol is described by the following RFCs:
@@ -942,6 +975,8 @@ Protocol</A>.

 </UL>

+<P>The URI method name for IPP is "ipp".
+
 <P>CUPS defines the following extension operations to IPP.

 <H3>Get Default Destination (CUPS_GET_DEFAULT = 0x4001)</H3>
@@ -1062,17 +1097,15 @@ are <CODE>attributes-charset</CODE>,
 <A HREF="http://www.ietf.org/rfc/rfc1179.txt">RFC 1179: Line Printer Daemon
 Protocol</A>.

+<P>The URI method name for LPD is "lpd".
+
 <H2>Server Message Block Protocol</H2>

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

-<H2>Trivial File Transfer Protocol</H2>
-
-<P>The Trivial File Transfer Protocol (TFTP) is described by
-<A HREF="http://www.ietf.org/rfc/rfc1350.txt">RFC 1350: The TFTP Protocol
-(Revision 2)</A>.
+<P>The URI method name for SMB is "smb".

 <H1>5 - Directories</H1>

@@ -1083,12 +1116,10 @@ System (CIFS) protocols are described at
 	<CODE>lpr</CODE>, <CODE>lprm</CODE>, and <CODE>lpstat</CODE> commands
 	reside here.

-	<DT>/usr/lib
-	<DD>The <CODE>accept</CODE>, <CODE>disable</CODE>, <CODE>enable</CODE>,
-	<CODE>lpadmin</CODE>, and <CODE>reject</CODE> commands reside here.
-
 	<DT>/usr/sbin
-	<DD>The <CODE>lpc</CODE> and <CODE>cupsd</CODE> commands resize here.
+	<DD>The <CODE>accept</CODE>, <CODE>cupsd</CODE>,
+	<CODE>lpadmin</CODE>, <CODE>lpc</CODE>, and <CODE>reject</CODE>
+	commands reside here.

 	<DT>/usr/share/cups
 	<DD>This is the root directory of the CUPS static data.
--- a/Mostrar Mais
+++ b/Mostrar Mais