Import cups.org releases

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-1.0.4@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

berkeley/lpr.c

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

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

config.h.in

@@ -28,7 +28,7 @@
  * Version of software...
  */
 
-#define CUPS_SVERSION	"CUPS v1.0.3"
+#define CUPS_SVERSION	"CUPS v1.0.4"
 
 /*
  * Where are files stored?

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,5 +1,5 @@
 #
-# "$Id: cups.list 823 1999-12-15 21:16:02Z mike $"
+# "$Id: cups.list 835 1999-12-29 17:27:56Z  $"
 #
 #   ESP Package Manager (EPM) file list for the Common UNIX Printing
 #   System (CUPS).
@@ -31,7 +31,7 @@
 %vendor Easy Software Products
 %license LICENSE.cups
 %readme README.cups
-%version 1.0.3
+%version 1.0.4
 %incompat printpro
 
 %system all
@@ -315,5 +315,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 835 1999-12-29 17:27:56Z  $".
 #

cups.spec

@@ -1,5 +1,5 @@
 #
-# "$Id: cups.spec 775 1999-11-04 13:35:01Z mike $"
+# "$Id: cups.spec 835 1999-12-29 17:27:56Z  $"
 #
 #   RPM "spec" file for the Common UNIX Printing System (CUPS).
 #
@@ -26,11 +26,11 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.0.2
+Version: 1.0.4
 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.4/cups-1.0.4-source.tar.gz
 Url: http://www.cups.org
 Packager: Michael Sweet <mike@easysw.com>
 Vendor: Easy Software Products
@@ -130,5 +130,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 835 1999-12-29 17:27:56Z  $".
 #

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

@@ -21,8 +21,8 @@
 "Copyright 1993-1999 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/http.c

@@ -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
@@ -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/ipp.c

@@ -54,7 +54,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include "string.h"
 
 #include "ipp.h"
 #include "debug.h"

cups/language.h

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

@@ -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/page.c

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

@@ -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/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.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/util.c

@@ -293,7 +293,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;
@@ -1022,7 +1026,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...

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="DOCNUMBER" CONTENT="CUPS-SAM-1.0.4">
 	<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/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/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

@@ -2,7 +2,7 @@
 <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="DOCNUMBER" CONTENT="CUPS-SUM-1.0.4">
 	<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.4.
 
 <H2>System Overview</H2>
 

filter/hpgl-config.c

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

filter/hpgl-prolog.c

@@ -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,8 +141,6 @@ Outputf(const char *format,	/* I - Printf-style string */
     PageDirty = 1;
     PageCount ++;
 
-    printf("%%%%Page: %d %d\n", PageCount, PageCount);
-
     if (PPD != NULL && !FitPlot)
     {
      /*
@@ -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"

filter/hpgltops.h

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

locale/C/cups_C

@@ -21,8 +21,8 @@ Yellow
 Copyright 1993-1999 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 @@ Processing
 Stopped
 All
 Odd
-Even Pages
+Even
 Darker                     Lighter
 Media Size
 Media Type
@@ -99,6 +99,15 @@ File Size
 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.

locale/de/cups_de

@@ -21,8 +21,8 @@ Gelb
 Copyright 1993-1999 durch Easy Software Products, alle Rechte vorbehalten. 
 Allgemein
 Drucker
-Bild Optionen
-HP-GL/2 Optionen
+Bild
+HP-GL/2
 Speziell
 Dokument
 Andere
@@ -82,7 +82,7 @@ In Arbeit
 Gestoppt 
 Alles 
 Ungerade 
-Gerade Seiten 
+Gerade
 Dunkler                    Heller
 Medien-Größe 
 Medium 
@@ -99,6 +99,15 @@ Dateigr
 In Warteposition
 Ausgabe-Modus
 Auflösung
+Text
+Spezieller Druck
+Seitenränder
+Links
+Recht
+Unterseite
+Oberseite
+Dateiname(s)
+Druker
 400 Der Server versteht die Anfrage Ihres Browsers nicht. 
 Der Server konnte nicht Ihre Berechtigung überprüfen, diese Ressource zu benutzen. 
 Sie müssen bezahlen, um auf diesen Server zuzugreifen. 

locale/en/cups_en

@@ -21,8 +21,8 @@ Yellow
 Copyright 1993-1999 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 @@ Processing
 Stopped
 All
 Odd
-Even Pages
+Even
 Darker                     Lighter
 Media Size
 Media Type
@@ -99,6 +99,15 @@ File Size
 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.

locale/es/cups_es

@@ -1,19 +1,19 @@
 iso-8859-1
 OK
-Cancelación 
-Ayuda 
-Salido 
-Cercano 
-Sí 
-No 
-En 
-De 
-Excepto 
-Descarte 
-Valor por defecto 
-Opciones 
-Más Info 
-Negro 
+Cancel
+Ayuda
+Salido
+Cercano
+Sí
+No
+En
+De
+Excepto
+Descarte
+Valor por defecto
+Opciones
+Más Info
+Negro
 Color 
 Ciánico 
 Magenta 
@@ -21,8 +21,8 @@ Amarillo
 El copyright 1993-1999 por Easy Software Products, todos endereza reservado. 
 General 
 Impresora 
-Opciones De la Imagen
-Opciones De HP-GL/2
+Imagen
+HP-GL/2
 Suplemento 
 Documento 
 Otro 
@@ -82,7 +82,7 @@ Procesando
 Parado 
 Todo 
 Impar 
-Uniformes Paginaciones 
+Par
 Más Oscuro       Más Brillante
 Talla De Media 
 Tipo De Media 
@@ -90,15 +90,24 @@ Fuente De los Media
 Orientación: 
 Retrato 
 Paisaje 
-Job State
-Job Name
-User Name
-Priority
-Copies
-File Size
-Pending
-Output Mode
-Resolution
+Estatus del trabajo
+Nombre del trabajo
+Nombre del utilizador
+Prioridad
+Copias
+Tamaño
+Pendiente
+Modo de impresión
+Resolución
+Texto
+Especial impresión
+Márgenes
+Izquierda
+La derecha
+Fondo
+Tapa
+Nombre(s)
+Impresión 
 400 Su browser envió una petición que este servidor no podría entender. 
 Este servidor no podría verificar que le autoricen a tener acceso al recurso. 
 Usted debe pagar tener acceso a este servidor. 

locale/fr/cups_fr

@@ -1,43 +1,43 @@
 iso-8859-1
 OK
-Annulation 
-Aide 
-Quitté 
+Annulation
+Aide
+Quitté
 Fermer
 Oui
 Non
 Oui
 Non
 Sauver
-Quitté 
-Défaut 
-Options 
-Plus d'information 
-Noir 
-Couleur 
-Cyan 
-Magenta 
-Jaune 
-Copyright 1993-1999 par Easy Software Products, tous droits réservés. 
-Général 
-Imprimante 
-Options d'Image
-Options d'HP-GL/2
-Options supplémentaires 
-Document 
-Autre 
+Quitté
+Défaut
+Options
+Plus d'information
+Noir
+Couleur
+Cyan
+Magenta
+Jaune
+Copyright 1993-1999 par Easy Software Products, tous droits réservés.
+Général
+Imprimante
+Image
+HP-GL/2
+Options supplémentaires
+Document
+Autre
 Pages d'impression: 
-Entier document 
-Chaîne de page 
+Entier document
+Chaîne de page
 Commande d'Inversion: 
 Pages par feuilles: 
- 1 
- 2 
- 4 
+ 1
+ 2
+ 4
 Graduation d'image: 
 Emploi taille normale d'image
-Zoom par pourcent 
-Zoom par PPI 
+Zoom par pourcent
+Zoom par PPI
 Image de miroir: 
 Saturation de couleur: 
 Teinture de couleur: 
@@ -46,50 +46,50 @@ Ombrageant:
 Largeur de crayon lecteur: 
 Correction de Gamma: 
 Éclat: 
-Ajoutez 
-Éffacer 
-Modifiez 
-URI de l'imprimante 
-Nom de l'imprimante 
-Emplacement de l'imprimante 
-Information de l'imprimante 
-Font et modèlent de l'imprimante 
+Ajoutez
+Éffacer
+Modifiez
+URI de l'imprimante
+Nom de l'imprimante
+Emplacement de l'imprimante
+Information de l'imprimante
+Font et modèlent de l'imprimante
 Dispositif de l'URI
 Formatage du page
-Imprimant la page 
-Initialisation de l'imprimante 
-État de l'Imprimante 
+Imprimant la page
+Initialisation de l'imprimante
+État de l'Imprimante
 Recevant les travaux
-Ne recevant pas Les Travaux 
-Tirages 
-Classe 
-Local 
+Ne recevant pas Les Travaux
+Tirages
+Classe
+Local
 Distant
-Duplexage 
-Agrafant 
-Copie Rapides 
+Duplexage
+Agrafant
+Copie Rapides
 Copies Assemblées
-Poinçon de trou 
-Bâche 
-Liant 
-Triant 
-Petit (jusqu'à 9.5x1pouce) 
-Moyen (9.5x1pouce à 13x19pouce) 
-Grand (13x19pouce et plus grand) 
+Poinçon de trou
+Bâche
+Liant
+Triant
+Petit (jusqu'à 9.5x1pouce)
+Moyen (9.5x1pouce à 13x19pouce)
+Grand (13x19pouce et plus grand)
 Taille faite sur commande
 Arrêter
-Traitant 
-Arrêté 
-Tout 
-Impair 
-Même Pages 
-Plus foncé       Plus Lumineux
+Traitant
+Arrêté
+Tout
+Impair
+Même
+Plus foncé    Plus Lumineux
 Dimension du medias
-Sorte de medias 
-Source du medias 
+Sorte de medias
+Source du medias
 Orientation: 
-Verticale 
-Horizontal 
+Verticale
+Horizontal
 État du travail
 Nom du travail
 Nom de l'utilisateur
@@ -99,6 +99,15 @@ Grandeur du fichier
 Imminent
 Method de sortie
 Resolution
+Texte
+Empreinte Spéciale
+Marge
+Gauche
+Droite
+Bas
+Haut
+Nom du ficher(s)
+Imprimer
 400 Votre browser a envoyé une demande que ce serveur ne pouvait pas comprendre. 
 Ce serveur ne pouvait pas vérifier que vous êtes autoriséz à accéder à la ressource. 
 Vous devez payer pour accéder à ce serveur. 

locale/it/cups_it

@@ -21,8 +21,8 @@ Giallo
 Copyright 1993-1999 di Easy Software Products, tutti i diritti riservati. 
 Generale
 Stampante 
-Opzioni per immagini
-Opzioni per HP-GL/2
+Immagini
+HP-GL/2
 Extra 
 Documento 
 Altro 
@@ -82,7 +82,7 @@ Elaborando
 Arrestato 
 Tutto 
 Dispari 
-Pagine pari
+Pari
 Più Scuro       Più Luminoso 
 Formato del supporto 
 Tipo del supporto 
@@ -90,15 +90,24 @@ Sorgente del supporto
 Orientamento: 
 Verticale 
 Orizzontale 
-Job State
-Job Name
-User Name
+Condizione di lavoro
+Nome di lavoro
+Nome dell' utente
 Priorita'
 Copie
 Dimensioni del file
 In attesa
-Output Mode
+Modo stampa
 Risoluzione
+Testo
+Speciale stampa 
+Margini
+Sinistra
+Destra
+Inferiore
+Superiore
+Nome(s)
+Stampa
 400 Il vostro browser ha trasmesso una richiesta che questo server non ha capito 
 Questo server non ha potuto verificare che siete autorizzati ad accedere alla risorsa. 
 Dovete pagare accedere a questo server. 

pstoraster/gdevcups.c

@@ -953,13 +953,18 @@ cups_print_pages(gx_device_printer *pdev,	/* I - Device info */
         break;
 
     case CUPS_ORDER_BANDED :
-        cups->header.cupsBytesPerLine = (cups->header.cupsBitsPerPixel *
-                                         cups->header.cupsWidth + 7) / 8 *
-				        cups->color_info.num_components;
+        if (cups->header.cupsColorSpace == CUPS_CSPACE_KCMYcm &&
+	    cups->header.cupsBitsPerColor == 1)
+          cups->header.cupsBytesPerLine = (cups->header.cupsBitsPerColor *
+                                           cups->header.cupsWidth + 7) / 8 * 6;
+        else
+          cups->header.cupsBytesPerLine = (cups->header.cupsBitsPerColor *
+                                           cups->header.cupsWidth + 7) / 8 *
+				          cups->color_info.num_components;
         break;
 
     case CUPS_ORDER_PLANAR :
-        cups->header.cupsBytesPerLine = (cups->header.cupsBitsPerPixel *
+        cups->header.cupsBytesPerLine = (cups->header.cupsBitsPerColor *
 	                                 cups->header.cupsWidth + 7) / 8;
         break;
   }
@@ -987,7 +992,7 @@ cups_print_pages(gx_device_printer *pdev,	/* I - Device info */
     * Need an output buffer, too...
     */
 
-    dst = (unsigned char *)gs_malloc(cups->header.cupsBytesPerLine, 1,
+    dst = (unsigned char *)gs_malloc(cups->header.cupsBytesPerLine, 2,
                                      "cups_print_pages");
 
     if (dst == NULL)	/* can't allocate working area */
@@ -1592,7 +1597,7 @@ cups_print_banded(gx_device_printer *pdev,	/* I - Printer device */
   * to separate each chunked color as needed...
   */
 
-  bandbytes = cups->header.cupsBytesPerLine / pdev->color_info.num_components;
+  bandbytes = (cups->header.cupsWidth * cups->header.cupsBitsPerColor + 7) / 8;
 
   for (y = 0; y < cups->height; y ++)
   {

scheduler/cupsd.dsp

@@ -0,0 +1,173 @@
+# Microsoft Developer Studio Project File - Name="cupsd" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=cupsd - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "cupsd.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "cupsd.mak" CFG="cupsd - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "cupsd - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "cupsd - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "cupsd - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
+
+!ELSEIF  "$(CFG)" == "cupsd - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../visualc" /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "cupsd - Win32 Release"
+# Name "cupsd - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\auth.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\classes.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\client.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\conf.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\dirsvc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ipp.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\job.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\listen.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\log.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\main.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\printers.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\auth.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\classes.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\client.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\conf.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\cupsd.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\dirsvc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\job.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\printers.h
+# End Source File
+# End Group
+# End Target
+# End Project

scheduler/job.c

@@ -742,9 +742,11 @@ StopJob(int id)
 
         if (current->status)
 	  SetPrinterState(current->printer, IPP_PRINTER_STOPPED);
-	else if (current->printer->state == IPP_PRINTER_BUSY)
+	else
 	  SetPrinterState(current->printer, IPP_PRINTER_IDLE);
 
+        DEBUG_printf(("StopJob: printer state is %d\n", current->printer->state));
+
 	current->state        = IPP_JOB_STOPPED;
         current->printer->job = NULL;
         current->printer      = NULL;
@@ -894,6 +896,7 @@ UpdateJob(job_t *job)		/* I - Job to check */
       job->printer->state_message[0] = '\0';
 
       CancelJob(job->id);
+      CheckJobs();
     }
   }
 }

systemv/lp.c

@@ -45,7 +45,7 @@
  * Local functions.
  */
 
-void	sighandler(void);
+void	sighandler(int);
 #endif /* !WIN32 */
 
 
@@ -77,6 +77,9 @@ main(int  argc,		/* I - Number of command-line arguments */
   char		buffer[8192];	/* Copy buffer */
   FILE		*temp;		/* Temporary file pointer */
   char		server[1024];	/* Server name */
+#ifdef HAVE_SIGACTION
+  struct sigaction action;	/* Signal action */
+#endif /* HAVE_SIGACTION */
 
 
   silent      = 0;
@@ -241,7 +244,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");
@@ -291,13 +309,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 */
 

visualc/config.h

@@ -0,0 +1,114 @@
+/*
+ * "$Id$"
+ *
+ *   Configuration file for the Common UNIX Printing System (CUPS) under WIN32.
+ *
+ *   Copyright 1997-1999 by Easy Software Products.
+ *
+ *   These coded instructions, statements, and computer programs are the
+ *   property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the file
+ *   "LICENSE.txt" which should have been included with this file.  If this
+ *   file is missing or damaged please contact Easy Software Products
+ *   at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ */
+
+/*
+ * Version of software...
+ */
+
+#define CUPS_SVERSION	"CUPS v1.0.3"
+
+/*
+ * Where are files stored?
+ */
+
+#define CUPS_LOCALEDIR	"C:/CUPS/locale"
+#define CUPS_SERVERROOT	"C:/CUPS/var"
+#define CUPS_DATADIR	"C:/CUPS/share"
+
+/*
+ * Do we have various image libraries?
+ */
+
+#undef HAVE_LIBPNG
+#undef HAVE_LIBZ
+#undef HAVE_LIBJPEG
+#undef HAVE_LIBTIFF
+
+/*
+ * Does this machine store words in big-endian (MSB-first) order?
+ */
+
+#undef WORDS_BIGENDIAN
+
+/*
+ * Which directory functions and headers do we use?
+ */
+
+#undef HAVE_DIRENT_H
+#undef HAVE_SYS_DIR_H
+#undef HAVE_SYS_NDIR_H
+#undef HAVE_NDIR_H
+
+/*
+ * Do we have PAM stuff?
+ */
+
+#ifndef HAVE_LIBPAM
+#define HAVE_LIBPAM 0
+#endif /* !HAVE_LIBPAM */
+
+/*
+ * Do we have <shadow.h>?
+ */
+
+#undef HAVE_SHADOW_H
+
+/*
+ * Do we have <crypt.h>?
+ */
+
+#undef HAVE_CRYPT_H
+
+/*
+ * Do we have the strXXX() functions?
+ */
+
+#define HAVE_STRDUP
+#define HAVE_STRCASECMP
+#define HAVE_STRNCASECMP
+
+/*
+ * Do we have the (v)snprintf() functions?
+ */
+
+#undef HAVE_SNPRINTF
+#undef HAVE_VSNPRINTF
+
+/*
+ * What signal functions to use?
+ */
+
+#undef HAVE_SIGSET
+#undef HAVE_SIGACTION
+
+/*
+ * What wait functions to use?
+ */
+
+#undef HAVE_WAITPID
+#undef HAVE_WAIT3
+
+/*
+ * End of "$Id$".
+ */