Import cups.org releases

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

CHANGES.txt

@@ -1,6 +1,88 @@
 CHANGES.txt - 11/04/1999
 ------------------------
 
+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

README.txt

@@ -1,4 +1,4 @@
-README - CUPS v1.0.3 - 12/15/1999
+README - CUPS v1.0.4 - 12/30/1999
 ---------------------------------
 
 INTRODUCTION
@@ -21,7 +21,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.
 
@@ -181,7 +181,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.
 

backend/Makefile

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

backend/betest.c

@@ -3,7 +3,7 @@
  *
  *   Backend 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

backend/ipp.c

@@ -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
@@ -622,6 +622,9 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
       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;
   }
 
  /*

backend/lpd.c

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

backend/parallel.c

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

backend/serial.c

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

backend/socket.c

@@ -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
@@ -128,7 +128,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 
   if ((hostaddr = gethostbyname(hostname)) == NULL)
   {
-    fprintf(stderr, "ERROR: Unable to locate printer \'%s\' - %s",
+    fprintf(stderr, "ERROR: Unable to locate printer \'%s\' - %s\n",
             hostname, strerror(errno));
     return (1);
   }

berkeley/Makefile

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

berkeley/lpc.c

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

berkeley/lpq.c

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

berkeley/lpr.c

@@ -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
@@ -44,7 +44,7 @@
  * Local functions.
  */
 
-void	sighandler(void);
+void	sighandler(int);
 #endif /* !WIN32 */
 
 
@@ -76,6 +76,9 @@ main(int  argc,		/* I - Number of command-line arguments */
 		deletefile;	/* Delete file after print? */
   char		buffer[8192];	/* Copy buffer */
   FILE		*temp;		/* Temporary file pointer */
+#ifdef HAVE_SIGACTION
+  struct sigaction action;	/* Signal action */
+#endif /* HAVE_SIGACTION */
 
 
   silent      = 0;
@@ -230,7 +233,22 @@ main(int  argc,		/* I - Number of command-line arguments */
     }
 
 #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");
@@ -278,13 +296,19 @@ main(int  argc,		/* I - Number of command-line arguments */
  */
 
 void
-sighandler(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 */
 

berkeley/lprm.c

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

cgi-bin/Makefile

@@ -3,7 +3,7 @@
 #
 #   CGI makefile 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

cgi-bin/classes.c

@@ -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
@@ -96,10 +96,6 @@ main(int  argc,			/* I - Number of command-line arguments */
 
   puts("<HTML>");
   puts("<HEAD>");
-  if (name)
-    puts("<META HTTP-EQUIV=\"Refresh\" CONTENT=\"10\">");
-  else
-    puts("<META HTTP-EQUIV=\"Refresh\" CONTENT=\"30\">");
   printf("<TITLE>%s on %s - " CUPS_SVERSION "</TITLE>\n",
          name == NULL ? "Classes" : name, getenv("SERVER_NAME"));
   puts("<LINK REL=STYLESHEET TYPE=\"text/css\" HREF=\"/cups.css\">");
@@ -158,7 +154,7 @@ main(int  argc,			/* I - Number of command-line arguments */
 
   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("Products</A>. CUPS is copyright 1997-2000 by Easy Software Products,");
   puts("All Rights Reserved.");
 
   puts("</BODY>");

cgi-bin/jobs.c

@@ -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
@@ -96,10 +96,6 @@ main(int  argc,			/* I - Number of command-line arguments */
 
   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 - " CUPS_SVERSION "</TITLE>\n",
          job == NULL ? "Jobs" : job, getenv("SERVER_NAME"));
   puts("<LINK REL=STYLESHEET TYPE=\"text/css\" HREF=\"/cups.css\">");
@@ -145,7 +141,7 @@ main(int  argc,			/* I - Number of command-line arguments */
 
   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("Products</A>. CUPS is copyright 1997-2000 by Easy Software Products,");
   puts("All Rights Reserved.");
 
   puts("</BODY>");

cgi-bin/printers.c

@@ -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
@@ -96,10 +96,6 @@ main(int  argc,			/* I - Number of command-line arguments */
 
   puts("<HTML>");
   puts("<HEAD>");
-  if (printer)
-    puts("<META HTTP-EQUIV=\"Refresh\" CONTENT=\"10\">");
-  else
-    puts("<META HTTP-EQUIV=\"Refresh\" CONTENT=\"30\">");
   printf("<TITLE>%s on %s - " CUPS_SVERSION "</TITLE>\n",
          printer == NULL ? "Printers" : printer, getenv("SERVER_NAME"));
   puts("<LINK REL=STYLESHEET TYPE=\"text/css\" HREF=\"/cups.css\">");
@@ -158,7 +154,7 @@ main(int  argc,			/* I - Number of command-line arguments */
 
   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("Products</A>. CUPS is copyright 1997-2000 by Easy Software Products,");
   puts("All Rights Reserved.");
 
   puts("</BODY>");

conf/Makefile

@@ -3,7 +3,7 @@
 #
 #   Configuration file 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

conf/classes.conf

@@ -1,10 +1,10 @@
 #
-# "$Id: classes.conf 678 1999-09-22 18:10:55Z mike $"
+# "$Id: classes.conf 846 2000-01-19 22:17:50Z mike $"
 #
 #   Sample class configuration file 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 coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -75,5 +75,5 @@
 #</Class>
 
 #
-# End of "$Id: classes.conf 678 1999-09-22 18:10:55Z mike $".
+# End of "$Id: classes.conf 846 2000-01-19 22:17:50Z mike $".
 #

conf/cupsd.conf

@@ -1,10 +1,10 @@
 #
-# "$Id: cupsd.conf 628 1999-08-23 15:24:48Z mike $"
+# "$Id: cupsd.conf 846 2000-01-19 22:17:50Z mike $"
 #
 #   Sample configuration file 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 coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -365,5 +365,5 @@ Allow From 127.0.0.1
 </Location>
 
 #
-# End of "$Id: cupsd.conf 628 1999-08-23 15:24:48Z mike $".
+# End of "$Id: cupsd.conf 846 2000-01-19 22:17:50Z mike $".
 #

conf/cupsd.conf-personal

@@ -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 $".
-#

conf/cupsd.conf-professional

@@ -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 $".
-#

conf/mime.convs

@@ -1,9 +1,9 @@
 #
-# "$Id: mime.convs 575 1999-07-30 13:57:16Z mike $"
+# "$Id: mime.convs 846 2000-01-19 22:17:50Z mike $"
 #
 #   MIME converts file 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
@@ -58,5 +58,5 @@ image/*			application/vnd.cups-raster	50	imagetoraster
 application/vnd.cups-postscript	application/vnd.cups-raster	50	pstoraster
 
 #
-# End of "$Id: mime.convs 575 1999-07-30 13:57:16Z mike $".
+# End of "$Id: mime.convs 846 2000-01-19 22:17:50Z mike $".
 #

conf/mime.types

@@ -1,9 +1,9 @@
 #
-# "$Id: mime.types 575 1999-07-30 13:57:16Z mike $"
+# "$Id: mime.types 846 2000-01-19 22:17:50Z mike $"
 #
 #   MIME types file 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
@@ -118,5 +118,5 @@ application/vnd.cups-raster	string(0,"RaSt") string(0,"tSaR")
 application/vnd.cups-raw
 
 #
-# End of "$Id: mime.types 575 1999-07-30 13:57:16Z mike $".
+# End of "$Id: mime.types 846 2000-01-19 22:17:50Z mike $".
 #

conf/printers.conf

@@ -1,10 +1,10 @@
 #
-# "$Id: printers.conf 678 1999-09-22 18:10:55Z mike $"
+# "$Id: printers.conf 846 2000-01-19 22:17:50Z mike $"
 #
 #   Sample printer configuration file 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 coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -92,5 +92,5 @@
 #</Printer>
 
 #
-# End of "$Id: printers.conf 678 1999-09-22 18:10:55Z mike $".
+# End of "$Id: printers.conf 846 2000-01-19 22:17:50Z mike $".
 #

config.h.in

@@ -3,9 +3,7 @@
  *
  *   Configuration file for the Common UNIX Printing System (CUPS).
  *
- *   @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,7 +26,7 @@
  * Version of software...
  */
 
-#define CUPS_SVERSION	"CUPS v1.0.3"
+#define CUPS_SVERSION	"CUPS v1.0.5"
 
 /*
  * Where are files stored?

configure.in

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

cups.dsw

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

cups.list

@@ -1,13 +1,10 @@
 #
-# "$Id: cups.list 823 1999-12-15 21:16:02Z mike $"
+# "$Id: cups.list 909 2000-02-22 20:14:53Z  $"
 #
 #   ESP Package Manager (EPM) file list for the Common UNIX Printing
 #   System (CUPS).
 #
-#   EPM can be found in the "epm" subdirectory of this distribution.
-#   Please report problems and fixes to "epm@easysw.com".
-#
-#   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
@@ -27,11 +24,11 @@
 #
 
 %product Common UNIX Printing System
-%copyright 1993-1999 by Easy Software Products, All Rights Reserved.
+%copyright 1993-2000 by Easy Software Products, All Rights Reserved.
 %vendor Easy Software Products
 %license LICENSE.cups
 %readme README.cups
-%version 1.0.3
+%version 1.0.5
 %incompat printpro
 
 %system all
@@ -315,5 +312,5 @@ f 0444 root sys /usr/man/man5/printers.conf.5 man/printers.conf.5
 i 0555 root sys cups cups.sh
 
 #
-# End of "$Id: cups.list 823 1999-12-15 21:16:02Z mike $".
+# End of "$Id: cups.list 909 2000-02-22 20:14:53Z  $".
 #

cups.sh

@@ -10,7 +10,7 @@
 #   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

cups.spec

@@ -1,11 +1,11 @@
 #
-# "$Id: cups.spec 775 1999-11-04 13:35:01Z mike $"
+# "$Id: cups.spec 909 2000-02-22 20:14:53Z  $"
 #
 #   RPM "spec" file for the Common UNIX Printing System (CUPS).
 #
 #   Original version by Jason McMullan <jmcc@ontv.com>.
 #
-#   Copyright 1999 by Easy Software Products, all rights reserved.
+#   Copyright 1999-2000 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -26,11 +26,11 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.0.2
+Version: 1.0.5
 Release: 0
 Copyright: GPL
 Group: System Environment/Daemons
-Source: ftp://ftp.easysw.com/pub/cups/1.0.2/cups-1.0.2-source.tar.gz
+Source: ftp://ftp.easysw.com/pub/cups/1.0.5/cups-1.0.5-source.tar.gz
 Url: http://www.cups.org
 Packager: Michael Sweet <mike@easysw.com>
 Vendor: Easy Software Products
@@ -98,6 +98,7 @@ ln -sf /usr/sbin/lpadmin $RPM_BUILD_ROOT/usr/lib/lpadmin
 
 %post
 /sbin/chkconfig --add cups
+/sbin/chkconfig cups on
 
 %preun
 /sbin/chkconfig --del cups
@@ -130,5 +131,5 @@ rm -rf $RPM_BUILD_ROOT
 /usr/include/cups/*
 
 #
-# End of "$Id: cups.spec 775 1999-11-04 13:35:01Z mike $".
+# End of "$Id: cups.spec 909 2000-02-22 20:14:53Z  $".
 #

cups/Makefile

@@ -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
@@ -103,7 +103,7 @@ cups_C.h:	../locale/C/cups_C
 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
+ipp.o:		http.h ipp.h string.h language.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

cups/cups.dsp

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

cups/cups.h

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

cups/cups_C.h

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

cups/debug.h

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

cups/emit.c

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

cups/filter.c

@@ -3,7 +3,7 @@
  *
  *   File type conversion 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

cups/http.c

@@ -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
@@ -329,7 +329,11 @@ 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);
   }
@@ -354,7 +358,11 @@ 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
@@ -495,18 +503,7 @@ httpSeparate(const char *uri,		/* I - Universal Resource Identifier */
   else
     username[0] = '\0';
 
-  if (*uri == '\0')
-  {
-   /*
-    * Hostname but no port or path...
-    */
-
-    *port = 0;
-    resource[0] = '/';
-    resource[1] = '\0';
-    return;
-  }
-  else if (*uri == ':')
+  if (*uri == ':')
   {
    /*
     * Parse port number...
@@ -530,7 +527,7 @@ httpSeparate(const char *uri,		/* I - Universal Resource Identifier */
       *port = 80;
     else if (strcasecmp(method, "https") == 0)
       *port = 443;
-    else if (strcasecmp(method, "ipp") == 0)	/* Not registered yet... */
+    else if (strcasecmp(method, "ipp") == 0)
       *port = ippPort();
     else if (strcasecmp(method, "socket") == 0)	/* Not registered yet... */
       *port = 9100;
@@ -538,6 +535,17 @@ httpSeparate(const char *uri,		/* I - Universal Resource Identifier */
       *port = 0;
   }
 
+  if (*uri == '\0')
+  {
+   /*
+    * Hostname but no path...
+    */
+
+    resource[0] = '/';
+    resource[1] = '\0';
+    return;
+  }
+
  /*
   * The remaining portion is the resource string...
   */
@@ -747,7 +755,11 @@ 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)
   {
@@ -776,9 +788,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)
@@ -879,7 +890,11 @@ httpGets(char   *line,			/* I - Line to read into */
   * Pre-scan the buffer and see if there is a newline in there...
   */
 
+#if defined(WIN32) || defined(__EMX__)
+  WSASetLastError(0);
+#else
   errno = 0;
+#endif /* WIN32 || __EMX__ */
 
   do
   {
@@ -904,6 +919,15 @@ httpGets(char   *line,			/* I - Line to read into */
 	* Nope, can't get a line this time...
 	*/
 
+#if defined(WIN32) || defined(__EMX__)
+        if (WSAGetLastError() != http->error)
+	{
+	  http->error = WSAGetLastError();
+	  continue;
+	}
+
+        DEBUG_printf(("httpGets(): recv() error %d!\n", WSAGetLastError()));
+#else
         if (errno != http->error)
 	{
 	  http->error = errno;
@@ -911,6 +935,7 @@ httpGets(char   *line,			/* I - Line to read into */
 	}
 
         DEBUG_printf(("httpGets(): recv() error %d!\n", errno));
+#endif /* WIN32 || __EMX__ */
 
         return (NULL);
       }

cups/http.h

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

cups/ipp.c

@@ -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,6 +38,7 @@
  *   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.
@@ -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"
@@ -571,6 +573,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...
  */

cups/ipp.h

@@ -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
@@ -307,7 +307,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 +319,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);

cups/language.c

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

cups/language.h

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

cups/mark.c

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

cups/mime.c

@@ -3,7 +3,7 @@
  *
  *   MIME database 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
@@ -33,6 +33,20 @@
  * Revision History:
  *
  *   $Log: mime.c,v $
+ *   Revision 1.15.2.1  2000/01/19 22:17:11  mike
+ *   Mirror of 4.0.x baseline changes.
+ *
+ *   Y2k copyright updates.
+ *
+ *   Revision 1.15.4.1  2000/01/19 20:48:49  mike
+ *   Y2k copyright nonsense.
+ *
+ *   pstops memory leak fix
+ *
+ *   Now copy interface/PPD files instead of renaming them.
+ *
+ *   PAM errors now show the textual message via pam_strerror().
+ *
  *   Revision 1.15  1999/10/10 15:40:23  mike
  *   Scanf, strcpy, and sprintf security changes.
  *

cups/mime.h

@@ -3,7 +3,7 @@
  *
  *   MIME type/conversion database 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

cups/options.c

@@ -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
@@ -354,7 +354,8 @@ cupsMarkOptions(ppd_file_t    *ppd,		/* I - PPD file */
 	  conflict = 1;
       }
     }
-    else if (strcasecmp(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;

cups/page.c

@@ -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
@@ -85,30 +85,30 @@ ppdPageSize(ppd_file_t *ppd,	/* I - PPD file record */
 
       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
       {

cups/ppd.c

@@ -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
@@ -674,9 +674,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)

cups/ppd.h

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

cups/raster.c

@@ -3,7 +3,7 @@
  *
  *   Raster file 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

cups/raster.h

@@ -3,7 +3,7 @@
  *
  *   Raster file 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

cups/snprintf.c

@@ -3,7 +3,7 @@
  *
  *   snprintf 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

cups/string.c

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

cups/string.h

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

cups/testhttp.c

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

cups/testmime.c

@@ -3,7 +3,7 @@
  *
  *   MIME 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

cups/testmime.dsp

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

cups/testppd.c

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

cups/testppd.dsp

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

cups/type.c

@@ -3,7 +3,7 @@
  *
  *   MIME typing 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

cups/usersys.c

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

cups/util.c

@@ -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
@@ -90,7 +90,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
@@ -183,6 +186,7 @@ cupsDoFileRequest(http_t     *http,	/* I - HTTP connection to server */
       */
 
       ippDelete(request);
+      last_error = IPP_NOT_FOUND;
       return (NULL);
     }
 
@@ -193,6 +197,7 @@ cupsDoFileRequest(http_t     *http,	/* I - HTTP connection to server */
       */
 
       ippDelete(request);
+      last_error = IPP_NOT_FOUND;
       return (NULL);
     }
   }
@@ -293,7 +298,11 @@ cupsDoFileRequest(http_t     *http,	/* I - HTTP connection to server */
     }
     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;
@@ -328,6 +337,8 @@ cupsDoFileRequest(http_t     *http,	/* I - HTTP connection to server */
 	ippDelete(response);
 	response = NULL;
 
+        last_error = IPP_SERVICE_UNAVAILABLE;
+
        /*
 	* Flush any remaining data...
 	*/
@@ -351,6 +362,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);
 }
 
@@ -375,7 +395,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
@@ -461,25 +484,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
@@ -553,7 +582,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...
@@ -668,7 +700,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
@@ -797,6 +832,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);
   }
@@ -1022,7 +1058,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...

data/HPGLprolog

@@ -0,0 +1,37 @@
+%%BeginResource: procset hpgltops 1.0 0
+%
+% "$Id: HPGLprolog 800 1999-12-07 21:56:29Z 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-1999 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

data/Makefile

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

doc/Makefile

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

doc/cmp.shtml

@@ -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="COPYRIGHT" CONTENT="Copyright 1997-2000, All Rights Reserved">
 	<META NAME="Author" CONTENT="Easy Software Products">
 	<TITLE>CUPS Configuration Management Plan</TITLE>
 </HEAD>
@@ -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 679 1999-09-22 20:06:27Z mike $" tag:
+information is provided by the CVS "$Id: cmp.shtml 909 2000-02-22 20:14:53Z  $" tag:
 
 <UL>
 <PRE>
 /*
- * "$Id: cmp.shtml 679 1999-09-22 20:06:27Z mike $"
+ * "$Id: cmp.shtml 909 2000-02-22 20:14:53Z  $"
  *
  *   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
@@ -372,14 +372,14 @@ information is provided by the CVS "$Id: cmp.shtml 679 1999-09-22 20:06:27Z mike
 </UL>
 
 The bottom of each source file shall contain a trailer giving the name
-of the file using the CVS "$Id: cmp.shtml 679 1999-09-22 20:06:27Z mike $" tag. The primary purpose of this is to
+of the file using the CVS "$Id: cmp.shtml 909 2000-02-22 20:14:53Z  $" 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 679 1999-09-22 20:06:27Z mike $".
+ * End of "$Id: cmp.shtml 909 2000-02-22 20:14:53Z  $".
  */
 </PRE>
 </UL>

doc/idd.shtml

@@ -1,6 +1,6 @@
 <HTML>
 <HEAD>
-	<META NAME="COPYRIGHT" CONTENT="Copyright 1997-1999, All Rights Reserved">
+	<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2000, All Rights Reserved">
 	<META NAME="DOCNUMBER" CONTENT="CUPS-IDD-1.0">
 	<META NAME="Author" CONTENT="Easy Software Products">
 	<TITLE>CUPS Interface Design Description</TITLE>

doc/overview.html

@@ -13,7 +13,7 @@
 
 	<P ALIGN=right>October 4, 1999<BR>
 	Michael Sweet, Easy Software Products<BR>
-	Copyright 1998-1999, All Rights Reserved.</P>
+	Copyright 1998-2000, All Rights Reserved.</P>
 	</TD>
 </TR>
 </TABLE>

doc/sam.html

@@ -4,7 +4,7 @@
 <TITLE>CUPS Software Administrators Manual</TITLE>
 <META NAME="AUTHOR" CONTENT="Easy Software Products">
 <META NAME="COPYRIGHT" CONTENT="Copyright 1997-1999, All Rights Reserved">
-<META NAME="DOCNUMBER" CONTENT="CUPS-SAM-1.0.3">
+<META NAME="DOCNUMBER" CONTENT="CUPS-SAM-1.0.4">
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <STYLE>
 BODY { font-family: serif; font-size: 11.0pt }
@@ -21,7 +21,7 @@ PRE { font-size: 9.0pt }
 </HEAD>
 <BODY>
 <CENTER><A HREF="#CONTENTS"><H1>CUPS Software Administrators Manual</H1></A><BR>
-CUPS-SAM-1.0.3<BR>
+CUPS-SAM-1.0.4<BR>
 Easy Software Products<BR>
 Copyright 1997-1999, All Rights Reserved<BR>
 </CENTER>
@@ -200,7 +200,7 @@ j&sup2;F:&Aacute;.&ecirc;&AElig;&Ucirc;j&curren;&sup3;B&uacute;&icirc; &frac14;
 <HR>
 <H1 ALIGN="RIGHT"><A NAME="1">Preface</A></H1>
  This software administrators manual provides printer administration 
-information for the Common UNIX Printing System (&quot;CUPS&quot;) Version 1.0.3. 
+information for the Common UNIX Printing System (&quot;CUPS&quot;) Version 1.0.4. 
 <H2><A NAME="1_1">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 

doc/sam.pdf

@@ -1,6 +1,6 @@
 %PDF-1.2
 %âãÏÓ
-1 0 obj<</Producer(htmldoc 1.8.3 Copyright 1997-1999 Easy Software Products, All Rights Reserved.)/CreationDate(D:19991215143826Z)/Title(CUPS Software Administrators Manual)/Author(Easy Software Products)>>endobj
+1 0 obj<</Producer(htmldoc 1.8.3 Copyright 1997-1999 Easy Software Products, All Rights Reserved.)/CreationDate(D:19991229172348Z)/Title(CUPS Software Administrators Manual)/Author(Easy Software Products)>>endobj
 2 0 obj<</Type/Encoding/Differences[ 32/space/exclam/quotedbl/numbersign/dollar/percent/ampersand/quotesingle/parenleft/parenright/asterisk/plus/comma/minus/period/slash/zero/one/two/three/four/five/six/seven/eight/nine/colon/semicolon/less/equal/greater/question/at/A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R/S/T/U/V/W/X/Y/Z/bracketleft/backslash/bracketright/asciicircum/underscore/grave/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft/bar/braceright/asciitilde 130/quotesinglbase/florin/quotedblbase/ellipsis/dagger/daggerdbl/circumflex/perthousand/Scaron/guilsinglleft/OE 145/quoteleft/quoteright/quotedblleft/quotedblright/bullet/endash/emdash/tilde/trademark/scaron/guilsinglright/oe 159/Ydieresis/space/exclamdown/cent/sterling/currency/yen/brokenbar/section/dieresis/copyright/ordfeminine/guillemotleft/logicalnot/hyphen/registered/macron/degree/plusminus/twosuperior/threesuperior/acute/mu/paragraph/periodcentered/cedilla/onesuperior/ordmasculine/guillemotright/onequarter/onehalf/threequarters/questiondown/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla/Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis/multiply/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide/oslash/ugrave/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis]>>endobj
 3 0 obj<</Type/Font/Subtype/Type1/BaseFont/Courier/Encoding 2 0 R>>endobj
 4 0 obj<</Type/Font/Subtype/Type1/BaseFont/Courier-Oblique/Encoding 2 0 R>>endobj
@@ -431,9 +431,8 @@
 ]>>endobj
 240 0 obj<</Type/Page/Parent 239 0 R/Contents 241 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 5 0 R/F8 8 0 R/F9 9 0 R>>>>>>endobj
 241 0 obj<</Length 242 0 R/Filter/FlateDecode>>stream
-xÚEŽA
-Â0D÷9Å,LìobK–UêNPlÕJm5‰Š··UD>Ìb˜÷ø7Fˆú#¤1d‚ý…Í
-›.5â怙	dª„‚)G‹Ýº@ÑÂÓº
+xÚEŽA‚0D÷=Å,5±•Ò%Ü™¨Ô4€ŠAжj¼½ 1ä'³˜Ì{ùwFú#$!¢Å•-5›¯Âúˆ…1¢D
+	]NV‡mŽ¼;ú—±ÒòZ·µóÖøÎ:lLû0ÍT_z\‚hÀI8E"üÓ<O7œD ä0äJ$àaü³gƽGûÖvå£ðQÿÆ(êno[ŸÎ¤TÂûP3¤MƒýP:ì+WÙgUh¦ÙŽ}8'>áendstream
 endobj
 242 0 obj
 181
@@ -450,11 +449,7 @@ endobj
 endobj
 246 0 obj<</Type/Page/Parent 239 0 R/Contents 247 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 5 0 R/F8 8 0 R/F9 9 0 R>>>>>>endobj
 247 0 obj<</Length 248 0 R/Filter/FlateDecode>>stream
-247 0 obj<</Length 248 0 R/Filter/FlateDecode>>stream
-xÚmTMoÛ0½çW=%@ãÙ‰—�ãÒ/h7¯I‹rQlºQ+K®$'È~ýHÛmZ¯ðE–žÈ÷I½ö"é‹`:‚ñÒ¢·X÷¾]ÏaÂ:‡8Šƒ)L¦1¬³~b1)ÖÏ„ˆ!Š1l ÃñhŒµÞIÎäþ ,‚È
-©¥óVxcBWBAiÍ^fèh!µGû&�©sc‹fM+ð;„Sôûðsù‡„0ŒÆMÆ„ƒHý«£óXÀ¦vñ�¬Î6xDë8H„Á8h˜Ï!š2sŠ‡ÁŒ#´íÑî%>+$ÜhÄ�¶O< ›ù]—€ÒX/¶
-‰ŒQâHJYßÝŒ¾OÀ”ÈŠéÐÕ
\K;á:
-·ˆ2Ü£¢l�p%ÜVo.'ÖdUêxÃ
+xÚmTMoÛ0½çW=%@ãÙ‰—�ãÒ/h7¯I‹rQlºQ+K®$'È~ýHÛmZ¯ðE–žÈ÷I½ö"é‹`:‚ñÒ¢·X÷¾]ÏaÂ:‡8Šƒ)L¦1¬³~b1)ÖÏ„ˆ!Š1l ÃñhŒµÞIÎäþ ,‚È
 ©¥óVxcBWBAiÍ^fèh!µGû&�©sc‹fM+ð;„Sôûðsù‡„0ŒÆMÆ„ƒHý«£óXÀ¦vñ�¬Î6xDë8H„A4ÌçM™9EˆÃ`ÆÚ‹¿öh÷Ÿn4	âFÛ'ÐÍü®K@i¬[…�DÆ(q$¥,‡ïnFß'`JdÅtèê.€¥‡�p…[D
 îQÑ�¶G¸î«7—k²*õ¼a…ñä<8/t&lv¢àŒªÞMJ5*ö¨3.¡;y+GþÀnž´q1Z½�|h_PáR²†6†Jj„º°Ü/.h£¾¹X‡£ÐM¨%ã4ú“™¤Æ›Ô(*äòj}=\&	•R4ð­pÔ_ÌŸR‰'Æ×òàÙlk	ðZaEI�ŠÕ‘s˼’¶å.r7ýÛäòî¯/¢h:ßÎaEM@çwèœxBX(“¾lu·àSÎð£,W´IœË–*eæfWÎtRºªäN ¢¤ß�Eªýä•N¹BIüÒ‘eÈ–ƒ±/ïc²µæàX2³HŒó«ÔÊÒŸ4¡«7d-ì,I.i†d~hSŸs¯|Í•HÒˆR^•�(K%SÑ\¨t†Mó~͘ÔSÕSU5�VΛBþ¥ÜûvM7?àfw¢¾é§•µ¨½:BCÔäÿ£â o¾l‚ Ç¢à2å’fí~™P“)ío‘›,ã™xS¦�~°­µÕµÃì4ðQ8ë¼xñ,ætD»ÿ_­{¿{ÿöˆ³ªendstream
 endobj

doc/sam.shtml

@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
-	<META NAME="COPYRIGHT" CONTENT="Copyright 1997-1999, All Rights Reserved">
-	<META NAME="DOCNUMBER" CONTENT="CUPS-SAM-1.0.3">
+	<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2000, All Rights Reserved">
+	<META NAME="DOCNUMBER" CONTENT="CUPS-SAM-1.0.5">
 	<META NAME="Author" CONTENT="Easy Software Products">
 	<TITLE>CUPS Software Administrators Manual</TITLE>
 </HEAD>
@@ -10,7 +10,7 @@
 <H1 ALIGN=RIGHT>Preface</H1>
 
 This software administrators manual provides printer administration
-information for the Common UNIX Printing System ("CUPS") Version 1.0.3.
+information for the Common UNIX Printing System ("CUPS") Version 1.0.4.
 
 <H2>System Overview</H2>
 

doc/sdd.shtml

@@ -1,6 +1,6 @@
 <HTML>
 <HEAD>
-	<META NAME="COPYRIGHT" CONTENT="Copyright 1997-1999, All Rights Reserved">
+	<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2000, All Rights Reserved">
 	<META NAME="DOCNUMBER" CONTENT="CUPS-SDD-1.0">
 	<META NAME="Author" CONTENT="Easy Software Products">
 	<TITLE>CUPS Software Design Description</TITLE>

doc/spm.pdf

@@ -1,6 +1,6 @@
 %PDF-1.2
 %âãÏÓ
-1 0 obj<</Producer(htmldoc 1.8.3 Copyright 1997-1999 Easy Software Products, All Rights Reserved.)/CreationDate(D:19991214182633Z)/Title(DRAFT - CUPS Software Programmers Manual)/Author(Easy Software Products)>>endobj
+1 0 obj<</Producer(htmldoc 1.8.3 Copyright 1997-1999 Easy Software Products, All Rights Reserved.)/CreationDate(D:19991229172353Z)/Title(DRAFT - CUPS Software Programmers Manual)/Author(Easy Software Products)>>endobj
 2 0 obj<</Type/Encoding/Differences[ 32/space/exclam/quotedbl/numbersign/dollar/percent/ampersand/quotesingle/parenleft/parenright/asterisk/plus/comma/minus/period/slash/zero/one/two/three/four/five/six/seven/eight/nine/colon/semicolon/less/equal/greater/question/at/A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R/S/T/U/V/W/X/Y/Z/bracketleft/backslash/bracketright/asciicircum/underscore/grave/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft/bar/braceright/asciitilde 130/quotesinglbase/florin/quotedblbase/ellipsis/dagger/daggerdbl/circumflex/perthousand/Scaron/guilsinglleft/OE 145/quoteleft/quoteright/quotedblleft/quotedblright/bullet/endash/emdash/tilde/trademark/scaron/guilsinglright/oe 159/Ydieresis/space/exclamdown/cent/sterling/currency/yen/brokenbar/section/dieresis/copyright/ordfeminine/guillemotleft/logicalnot/hyphen/registered/macron/degree/plusminus/twosuperior/threesuperior/acute/mu/paragraph/periodcentered/cedilla/onesuperior/ordmasculine/guillemotright/onequarter/onehalf/threequarters/questiondown/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla/Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis/multiply/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide/oslash/ugrave/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis]>>endobj
 3 0 obj<</Type/Font/Subtype/Type1/BaseFont/Courier/Encoding 2 0 R>>endobj
 4 0 obj<</Type/Font/Subtype/Type1/BaseFont/Times-Roman/Encoding 2 0 R>>endobj

doc/spm.shtml

@@ -1,6 +1,6 @@
 <HTML>
 <HEAD>
-	<META NAME="COPYRIGHT" CONTENT="Copyright 1997-1999, All Rights Reserved">
+	<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2000, All Rights Reserved">
 	<META NAME="DOCNUMBER" CONTENT="CUPS-SPM-1.0b1">
 	<META NAME="Author" CONTENT="Easy Software Products">
 	<TITLE>DRAFT - CUPS Software Programmers Manual</TITLE>

doc/ssr.shtml

@@ -1,6 +1,6 @@
 <HTML>
 <HEAD>
-	<META NAME="COPYRIGHT" CONTENT="Copyright 1997-1999, All Rights Reserved">
+	<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2000, All Rights Reserved">
 	<META NAME="DOCNUMBER" CONTENT="CUPS-SSR-1.0">
 	<META NAME="Author" CONTENT="Easy Software Products">
 	<TITLE>DRAFT - CUPS Software Security Report</TITLE>

doc/stp.shtml

@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 	<META NAME="Description" CONTENT="Common UNIX Printing System Software Test Plan">
-	<META NAME="COPYRIGHT" CONTENT="Copyright 1997-1999, All Rights Reserved">
+	<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2000, All Rights Reserved">
 	<META NAME="DOCNUMBER" CONTENT="CUPS-STP-1.0">
 	<META NAME="Author" CONTENT="Easy Software Products">
 	<TITLE>DRAFT - CUPS Software Test Plan</TITLE>

doc/sum.html

@@ -4,7 +4,7 @@
 <TITLE>CUPS Software Users Manual</TITLE>
 <META NAME="AUTHOR" CONTENT="Easy Software Products">
 <META NAME="COPYRIGHT" CONTENT="Copyright 1997-1999, All Rights Reserved">
-<META NAME="DOCNUMBER" CONTENT="CUPS-SUM-1.0.3">
+<META NAME="DOCNUMBER" CONTENT="CUPS-SUM-1.0.4">
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <STYLE>
 BODY { font-family: serif; font-size: 11.0pt }
@@ -21,7 +21,7 @@ PRE { font-size: 9.0pt }
 </HEAD>
 <BODY>
 <CENTER><A HREF="#CONTENTS"><H1>CUPS Software Users Manual</H1></A><BR>
-CUPS-SUM-1.0.3<BR>
+CUPS-SUM-1.0.4<BR>
 Easy Software Products<BR>
 Copyright 1997-1999, All Rights Reserved<BR>
 </CENTER>
@@ -172,7 +172,7 @@ j&sup2;F:&Aacute;.&ecirc;&AElig;&Ucirc;j&curren;&sup3;B&uacute;&icirc; &frac14;
 <HR>
 <H1 ALIGN="RIGHT"><A NAME="1">Preface</A></H1>
  This software users manual describes how to use the Common UNIX 
-Printing System (&quot;CUPS&quot;) Version 1.0.3. 
+Printing System (&quot;CUPS&quot;) Version 1.0.4. 
 <H2><A NAME="1_1">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 

doc/sum.pdf

@@ -1,6 +1,6 @@
 %PDF-1.2
 %âãÏÓ
-1 0 obj<</Producer(htmldoc 1.8.3 Copyright 1997-1999 Easy Software Products, All Rights Reserved.)/CreationDate(D:19991214182638Z)/Title(CUPS Software Users Manual)/Author(Easy Software Products)>>endobj
+1 0 obj<</Producer(htmldoc 1.8.3 Copyright 1997-1999 Easy Software Products, All Rights Reserved.)/CreationDate(D:19991229172357Z)/Title(CUPS Software Users Manual)/Author(Easy Software Products)>>endobj
 2 0 obj<</Type/Encoding/Differences[ 32/space/exclam/quotedbl/numbersign/dollar/percent/ampersand/quotesingle/parenleft/parenright/asterisk/plus/comma/minus/period/slash/zero/one/two/three/four/five/six/seven/eight/nine/colon/semicolon/less/equal/greater/question/at/A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R/S/T/U/V/W/X/Y/Z/bracketleft/backslash/bracketright/asciicircum/underscore/grave/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft/bar/braceright/asciitilde 130/quotesinglbase/florin/quotedblbase/ellipsis/dagger/daggerdbl/circumflex/perthousand/Scaron/guilsinglleft/OE 145/quoteleft/quoteright/quotedblleft/quotedblright/bullet/endash/emdash/tilde/trademark/scaron/guilsinglright/oe 159/Ydieresis/space/exclamdown/cent/sterling/currency/yen/brokenbar/section/dieresis/copyright/ordfeminine/guillemotleft/logicalnot/hyphen/registered/macron/degree/plusminus/twosuperior/threesuperior/acute/mu/paragraph/periodcentered/cedilla/onesuperior/ordmasculine/guillemotright/onequarter/onehalf/threequarters/questiondown/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla/Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis/multiply/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide/oslash/ugrave/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis]>>endobj
 3 0 obj<</Type/Font/Subtype/Type1/BaseFont/Courier/Encoding 2 0 R>>endobj
 4 0 obj<</Type/Font/Subtype/Type1/BaseFont/Times-Roman/Encoding 2 0 R>>endobj
@@ -369,9 +369,8 @@
 ]>>endobj
 203 0 obj<</Type/Page/Parent 202 0 R/Contents 204 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 4 0 R/F8 7 0 R/F9 8 0 R>>>>>>endobj
 204 0 obj<</Length 205 0 R/Filter/FlateDecode>>stream
-xÚMŽË‚0E÷ýŠ»ÔÄVÚš.ÕàŽ¡|‘â#(JAÃßK5F3É,æÞs2wÂLád„ý…¬
-Yn5DSƒ‚iH²¦šmŠ4GÞÖý³ì,
-g;‡¤¼e37ç	Á¹Ç´b
+xÚMŽË‚0E÷ýŠ»ÔÄVZš.ÕàŽ¡|‘â#(JAÃßK5F3É,æÞs2wÂLáÂûY²Üjˆ¦Ó•d¦šmŠ4GÞÖý³ì,
+g;‡¤¼e37ç	“àÜcZ1ÊC&¾Í‹„r0é›Tû\Dk\ºñgM»¶ö½{÷dÈ¢?Q{»Óá؃k­è´ô«¦Aæ�™�>zØÊ£±!;ò®Ë;šendstream
 endobj
 205 0 obj
 175
@@ -388,7 +387,11 @@ endobj
 endobj
 209 0 obj<</Type/Page/Parent 202 0 R/Contents 210 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 4 0 R/F8 7 0 R/F9 8 0 R>>>>>>endobj
 210 0 obj<</Length 211 0 R/Filter/FlateDecode>>stream
-210 0 obj<</Length 211 0 R/Filter/FlateDecode>>stream
+xÚ}TKo£0¾çWŒzJ¤ÂBÂæqÜô¥Hm—-iµ.†Æ­±©mÑ_¿c J7[­8áÏ|�¿�Bèa1…Ùòj´ÞŽ¾]¯`À¶„(ŒüÌl‹q¬±d9N¶/”Aº¯OñfÓ…?uYÛ7`TiL#4µ�ŠÉ†	(Ðäšgh`§`•‹‚Ý!\¨ªRï7¿!Ö\Z.Ÿ!i�Å
+ÒñÙÅcœœ¥x¢Z\I /œõ
+C?ð#¿Gµ‚páPQ8
+ü¥e~îQï9þFOyÓ¹õ¸ÿ�£Öjω
0¨•¶,HgCŽ`-j(•îî¦ÓïsP5jÖMWÀø°±°cæ~†(I™=
+ºQ@ÖÂ3-$
 ÆZMn�Ó‹0TÊ"A0–É‚éâÁ(ÑXR§CÁ„èYìQŠ ì“¾�3>8m�Üœß'wÖ¨_Q`9ICžà�Z¢v³`ü¡ê‡Š]9*Ý—Ú¸<‰ö(&±±*W‚lÝ\m¯½M“±¬OϘ¡Ùqø©{vù=xQYG
Þl¨)�Y'tn®®
 qÉÐù˜ŽoãËsx¸¾ÃÅ*�œCBC@ñ;4†=#¬…Ê_)-¹[»¨ëð£®:$Ìõ•:“
 LuÒÒ4µ›2íÀí4’OôS62wF0Ámû¥>¬(�,¥_{†„)Óê`e‡"VÆ&´+µ=rê–§î,¦�ˆãKZ	�$ÃOC º¸›•¯±HÚCê+

doc/sum.shtml

@@ -1,8 +1,8 @@
 <HTML>
 <HEAD>
 	<META NAME="Description" CONTENT="Common UNIX Printing System Software Users Manual">
-	<META NAME="COPYRIGHT" CONTENT="Copyright 1997-1999, All Rights Reserved">
-	<META NAME="DOCNUMBER" CONTENT="CUPS-SUM-1.0.3">
+	<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2000, All Rights Reserved">
+	<META NAME="DOCNUMBER" CONTENT="CUPS-SUM-1.0.5">
 	<META NAME="Author" CONTENT="Easy Software Products">
 	<TITLE>CUPS Software Users Manual</TITLE>
 </HEAD>
@@ -11,7 +11,7 @@
 <H1 ALIGN=RIGHT>Preface</H1>
 
 This software users manual describes how to use the Common UNIX Printing
-System ("CUPS") Version 1.0.3.
+System ("CUPS") Version 1.0.5.
 
 <H2>System Overview</H2>
 

filter/Makefile

@@ -3,7 +3,7 @@
 #
 #   Filter makefile 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

filter/common.c

@@ -3,7 +3,7 @@
  *
  *   Common filter 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

filter/common.h

@@ -3,7 +3,7 @@
  *
  *   Common filter 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

filter/hpgl-attr.c

@@ -3,7 +3,7 @@
  *
  *   HP-GL/2 attribute processing 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

filter/hpgl-char.c

@@ -3,7 +3,7 @@
  *
  *   HP-GL/2 character processing 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

filter/hpgl-config.c

@@ -3,7 +3,7 @@
  *
  *   HP-GL/2 configuration routines 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
@@ -145,29 +145,6 @@ update_transform(void)
   if (width == 0 || height == 0)
     return;
 
- /*
-  * Rotate the plot as needed...
-  */
-
-  if (Rotation == 0 || Rotation == 180)
-  {
-    if ((width > height && page_width < page_height) ||
-        (width < height && page_width > page_height))
-    {
-      fputs("DEBUG: Automatically rotating the page...\n", stderr);
-      Rotation += 90;
-    }
-  }
-  else
-  {
-    if ((width > height && page_width > page_height) ||
-        (width < height && page_width < page_height))
-    {
-      fputs("DEBUG: Automatically rotating the page...\n", stderr);
-      Rotation = (Rotation + 90) % 360;
-    }
-  }
-
  /*
   * Scale the plot as needed...
   */
@@ -533,7 +510,7 @@ PS_plot_size(int     num_params,	/* I - Number of parameters */
 {
   switch (num_params)
   {
-    case 0 :
+    case 0 : /* PS ; */
         if (Rotation == 0 || Rotation == 180)
         {
           PlotSize[0] = PageWidth;
@@ -545,7 +522,7 @@ PS_plot_size(int     num_params,	/* I - Number of parameters */
           PlotSize[1] = PageWidth;
 	}
         break;
-    case 1 :
+    case 1 : /* PS length ; */
         if (Rotation == 0 || Rotation == 180)
         {
           PlotSize[1] = 72.0f * params[0].value.number / 1016.0f;
@@ -557,17 +534,31 @@ PS_plot_size(int     num_params,	/* I - Number of parameters */
           PlotSize[1] = 0.75f * PlotSize[0];
         }
         break;
-    case 2 :
+    case 2 : /* PS length, width ; */
+       /*
+        * Unfortunately, it appears that NO application correctly
+	* sends a two-argument PS command as documented in the
+	* HP-GL/2 Reference Manual from HP.  Instead, applications
+	* send the width before the length, which causes all sorts
+	* of problems.
+	*
+	* Rather than fight it, we now look for them as width,length
+	* instead of length,width.
+	*
+	* Don't like it?  Send mail to the folks that make Ideas, Pro/E,
+	* AutoCAD, etc.
+	*/
+
         if (Rotation == 0 || Rotation == 180)
-        {
-          PlotSize[0] = 72.0f * params[1].value.number / 1016.0f;
-          PlotSize[1] = 72.0f * params[0].value.number / 1016.0f;
-        }
-        else
         {
           PlotSize[0] = 72.0f * params[0].value.number / 1016.0f;
           PlotSize[1] = 72.0f * params[1].value.number / 1016.0f;
         }
+        else
+        {
+          PlotSize[0] = 72.0f * params[1].value.number / 1016.0f;
+          PlotSize[1] = 72.0f * params[0].value.number / 1016.0f;
+        }
         break;
   }
 

filter/hpgl-input.c

@@ -3,7 +3,7 @@
  *
  *   HP-GL/2 input processing 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

filter/hpgl-main.c

@@ -3,7 +3,7 @@
  *
  *   HP-GL/2 filter main entry 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

filter/hpgl-polygon.c

@@ -3,7 +3,7 @@
  *
  *   HP-GL/2 polygon routines 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

filter/hpgl-prolog.c

@@ -3,7 +3,7 @@
  *
  *   HP-GL/2 prolog routines for 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
@@ -106,7 +106,7 @@ OutputTrailer(void)
   if (PageDirty)
     PG_advance_page(0, NULL);
 
-  puts("%%BeginTrailer");
+  puts("%%Trailer");
   printf("%%%%Pages: %d\n", PageCount);
   puts("%%EOF");
 }
@@ -141,15 +141,13 @@ Outputf(const char *format,	/* I - Printf-style string */
     PageDirty = 1;
     PageCount ++;
 
-    printf("%%%%Page: %d %d\n", PageCount, PageCount);
-
     if (PPD != NULL && !FitPlot)
     {
      /*
       * Set the page size for this page...
       */
 
-      if (Rotation == 0 || Rotation == 180)
+      if (PageRotation == 0 || PageRotation == 180)
       {
 	width  = PlotSize[0];
 	length = PlotSize[1];
@@ -187,7 +185,7 @@ Outputf(const char *format,	/* I - Printf-style string */
 	option = ppdFindOption(PPD, "PageSize");
 	choice = ppdFindChoice(option, size->name);
 
-        puts("%%BeginPageSetup");
+        puts("%%BeginSetup");
         printf("%%%%BeginFeature: PageSize %s\n", size->name);
 
         if (strcasecmp(size->name, "custom") == 0)
@@ -261,7 +259,7 @@ Outputf(const char *format,	/* I - Printf-style string */
       }
     }
 
-    printf("/PenScaling %.3f def\n", PenScaling);
+    printf("%%%%Page: %d %d\n", PageCount, PageCount);
 
     printf("/SA {\n"
            "	/%s%s%s%s findfont\n"
@@ -312,13 +310,16 @@ Outputf(const char *format,	/* I - Printf-style string */
             printf("%.1f %.1f translate\n", PageWidth - PageRight, PageBottom);
 	    break;
 	case 1 :
+            printf("%.0f 0 translate 90 rotate\n", PageLength);
             printf("%.1f %.1f translate\n", PageLength - PageTop,
 	           PageWidth - PageRight);
 	    break;
 	case 2 :
+            printf("%.0f %.0f translate 180 rotate\n", PageWidth, PageLength);
             printf("%.1f %.1f translate\n", PageLeft, PageLength - PageTop);
 	    break;
 	case 3 :
+            printf("0 %.0f translate -90 rotate\n", PageWidth);
             printf("%.1f %.1f translate\n", PageBottom, PageLeft);
 	    break;
       }
@@ -329,13 +330,16 @@ Outputf(const char *format,	/* I - Printf-style string */
             printf("%.1f %.1f translate\n", PageLeft, PageBottom);
 	    break;
 	case 1 :
+            printf("%.0f 0 translate 90 rotate\n", PageLength);
             printf("%.1f %.1f translate\n", PageBottom, PageWidth - PageRight);
 	    break;
 	case 2 :
+            printf("%.0f %.0f translate 180 rotate\n", PageWidth, PageLength);
             printf("%.1f %.1f translate\n", PageWidth - PageRight,
 	            PageLength - PageTop);
 	    break;
 	case 3 :
+            printf("0 %.0f translate -90 rotate\n", PageWidth);
             printf("%.1f %.1f translate\n", PageLength - PageTop, PageLeft);
 	    break;
       }

filter/hpgl-vector.c

@@ -3,7 +3,7 @@
  *
  *   HP-GL/2 vector routines 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

filter/hpgltops.h

@@ -3,7 +3,7 @@
  *
  *   HP-GL/2 to PostScript filter 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
@@ -117,7 +117,7 @@ VAR int		PenMotion	VALUE(0), 	/* 0 = absolute, 1 = relative */
 		PenCount	VALUE(8),	/* Number of pens */
 		PenDown		VALUE(0),	/* 0 = pen up, 1 = pen down */
 		PolygonMode	VALUE(0),	/* Drawing polygons? */
-		PageCount	VALUE(1),	/* Number of pages in plot */
+		PageCount	VALUE(0),	/* Number of pages in plot */
 		PageDirty	VALUE(0),	/* Current page written on? */
 		WidthUnits	VALUE(0);	/* 0 = mm, 1 = proportionate */
 VAR float	PlotSize[2]	VALUE2(2592.0f, 3456.0f);

filter/image-colorspace.c

@@ -3,7 +3,7 @@
  *
  *   Colorspace conversions 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

filter/image-gif.c

@@ -3,7 +3,7 @@
  *
  *   GIF image routines 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

filter/image-jpeg.c

@@ -3,7 +3,7 @@
  *
  *   JPEG image routines 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

filter/image-photocd.c

@@ -3,7 +3,7 @@
  *
  *   PhotoCD routines 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

filter/image-png.c

@@ -3,7 +3,7 @@
  *
  *   PNG image routines 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