-ENCRYPTION - CUPS v1.1.7 - 02/21/2001
--------------------------------------
+ENCRYPTION - CUPS v1.1.20 - 11/24/2003
+--------------------------------------
This file describes the encryption support provided by CUPS.
BEFORE USING THE ENCRYPTION SUPPORT, PLEASE VERIFY THAT IT IS
LEGAL TO DO SO IN YOUR COUNTRY. CUPS by itself doesn't include
-any encryption code, but it can link against the OpenSSL library
-which does.
+any encryption code, but it can link against the OpenSSL, GNU
+TLS, or CDSA libraries which do.
OVERVIEW OF ENCRYPTION SUPPORT IN CUPS
CUPS supports SSL/2.0, SSL/3.0, and TLS/1.0 encryption using
keys as large as 128-bits. Encryption support is provided via
-the OpenSSL library and some new hooks in the CUPS code.
+the OpenSSL, GNU TLS, or CDSA libraries and some new hooks in
+the CUPS code.
CUPS provides support for dedicated (https) and "upgrade" (TLS)
encryption of sessions. The "HTTP Upgrade" method is described
BEFORE YOU BEGIN
-You'll need the OpenSSL library from:
+You'll need the OpenSSL, GNU TLS, or CDSA libraries from:
- http://www.openssl.org
+ http://www.openssl.org/
+ http://www.gnutls.org/
+ http://www.intel.com/labs/archive/cdsa.htm
CONFIGURING WITH ENCRYPTION SUPPORT
-Once you have the OpenSSL library installed, you'll need to
-configure CUPS to use it with the "--enable-ssl" option:
+Once you have the OpenSSL, GNU TLS, or CDSA libraries installed,
+you'll need to configure CUPS to use it with the "--enable-ssl"
+option:
./configure --enable-ssl
-If the OpenSSL stuff is not in a standard location, make sure to
+If the library stuff is not in a standard location, make sure to
define the CFLAGS, CXXFLAGS, and LDFLAGS environment variables
with the appropriate compiler and linker options first.
<H2 ALIGN="CENTER">Common UNIX Printing System License Agreement</H2>
-<P ALIGN="CENTER">Copyright 1997-2004 by Easy Software Products<BR>
+<P ALIGN="CENTER">Copyright 1997-2005 by Easy Software Products<BR>
44141 AIRPORT VIEW DR STE 204<BR>
-HOLLYWOOD, MARYLAND 20636-3142 USA<BR>
+HOLLYWOOD, MARYLAND 20636 USA<BR>
<BR>
Voice: +1.301.373.9600<BR>
Email: <A HREF="mailto:cups-info@cups.org">cups-info@cups.org</A><BR>
<H4>END OF TERMS AND CONDITIONS</H4>
+<H4>How to Apply These Terms to Your New Programs</H4>
+
+<P>If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+<P>To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+<PRE>
+<VAR>one line to give the program's name and an idea of what it does.</VAR>
+Copyright (C) <VAR>yyyy</VAR> <VAR>name of author</VAR>
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</PRE>
+
+<P>Also add information on how to contact you by electronic and paper mail.
+
+<P>If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+<PRE>
+Gnomovision version 69, Copyright (C) <VAR>year</VAR> <VAR>name of author</VAR>
+Gnomovision comes with ABSOLUTELY NO WARRANTY; for details
+type `show w'. This is free software, and you are welcome
+to redistribute it under certain conditions; type `show c'
+for details.
+</PRE>
+
+<P>The hypothetical commands <SAMP>`show w'</SAMP> and <SAMP>`show c'</SAMP> should show
+the appropriate parts of the General Public License. Of course, the
+commands you use may be called something other than <SAMP>`show w'</SAMP> and
+<SAMP>`show c'</SAMP>; they could even be mouse-clicks or menu items--whatever
+suits your program.
+
+<P>You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+<PRE>
+Yoyodyne, Inc., hereby disclaims all copyright
+interest in the program `Gnomovision'
+(which makes passes at compilers) written
+by James Hacker.
+
+<VAR>signature of Ty Coon</VAR>, 1 April 1989
+Ty Coon, President of Vice
+</PRE>
+
<!-- NEW PAGE -->
<H2>GNU LIBRARY GENERAL PUBLIC LICENSE</H2>
<H4>END OF TERMS AND CONDITIONS</H4>
+<H4>How to Apply These Terms to Your New Libraries</H4>
+
+<P>If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+<P>To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+<PRE>
+<VAR>one line to give the library's name and an idea of what it does.</VAR>
+Copyright (C) <VAR>year</VAR> <VAR>name of author</VAR>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+</PRE>
+
+<P>Also add information on how to contact you by electronic and paper mail.
+
+<P>You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+<PRE>
+Yoyodyne, Inc., hereby disclaims all copyright interest in
+the library `Frob' (a library for tweaking knobs) written
+by James Random Hacker.
+
+<VAR>signature of Ty Coon</VAR>, 1 April 1990
+Ty Coon, President of Vice
+</PRE>
+
+<P>That's all there is to it!
+
</BODY>
</HTML>
Common UNIX Printing System License Agreement
- Copyright 1997-2004 by Easy Software Products
+ Copyright 1997-2005 by Easy Software Products
44141 AIRPORT VIEW DR STE 204
- HOLLYWOOD, MARYLAND 20636-3142 USA
+ HOLLYWOOD, MARYLAND 20636 USA
Voice: +1.301.373.9600
Email: cups-info@cups.org
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
+\f
+ Appendix: How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) 19yy <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) 19yy name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
\f
GNU LIBRARY GENERAL PUBLIC LICENSE
Version 2, June 1991
DAMAGES.
END OF TERMS AND CONDITIONS
+\f
+ Appendix: How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free
+ Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
#
-# "$Id: Makefile,v 1.31.2.14 2004/06/29 20:16:29 mike Exp $"
+# "$Id$"
#
# Top-level Makefile for the Common UNIX Printing System (CUPS).
#
(cd data; $(MAKE) $(MFLAGS) install)
echo Installing in doc...
(cd doc; $(MAKE) $(MFLAGS) install)
+ echo Installing in fonts...
+ (cd fonts; $(MAKE) $(MFLAGS) install)
echo Installing in locale...
(cd locale; $(MAKE) $(MFLAGS) install)
echo Installing in ppd...
epm $(EPMFLAGS) -f tardist cups
#
-# End of "$Id: Makefile,v 1.31.2.14 2004/06/29 20:16:29 mike Exp $".
+# End of "$Id$".
#
-README - CUPS v1.2.0a1 - 01/07/2003
+README - CUPS v1.2.0b1 - 02/17/2005
-----------------------------------
*****************************************************************
*****************************************************************
**** ****
-**** WARNING: THIS IS ALPHA RELEASE SOFTWARE AND MAY BE ****
+**** WARNING: THIS IS BETA RELEASE SOFTWARE AND MAY BE ****
**** TOTALLY UNSTABLE. DO NOT USE IN ENVIRONMENTS ****
**** WHERE RELIABLE SOFTWARE IS REQUIRED! ****
**** ****
one of the binary distributions from Easy Software Products:
- AIX 4.3 or higher
- - Compaq Tru64 UNIX (aka OSF1 aka Digital UNIX) 4.0 or higher
- - HP-UX 10.20 or higher
- - IRIX 5.3 or higher
- - Linux 2.0 with glibc2 or higher
- - Solaris 2.5 or higher (SPARC or Intel)
+ - HP-UX 11.00 or higher
+ - IRIX 6.5 or higher
+ - Linux 2.4 with glibc 2.2 or higher
+ - Solaris 7 or higher (SPARC or Intel)
INSTALLING "PORTABLE" CUPS DISTRIBUTIONS
system for a printer connected to the parallel port, use one of
the following commands:
- Digital UNIX:
-
- /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/lp0 -E
-
HP-UX:
/usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/c2t0d0_lp -E
LEGAL STUFF
-CUPS is Copyright 1993-2003 by Easy Software Products. CUPS,
+CUPS is Copyright 1993-2005 by Easy Software Products. CUPS,
the CUPS logo, and the Common UNIX Printing System are the
trademark property of Easy Software Products.
The MD5 Digest code is Copyright 1999 Aladdin Enterprises.
The PDF filter (pdftops) is based on the Xpdf software,
-Copyright 1996-2002 by Derek B. Noonburg.
+Copyright 1996-2005 by Derek B. Noonburg.
This software is based in part on the work of the Independent
JPEG Group.
Attn: CUPS Licensing Information
Easy Software Products
44141 Airport View Drive, Suite 204
- Hollywood, Maryland 20636-3111 USA
+ Hollywood, Maryland 20636 USA
Voice: +1.301.373.9600
Email: cups-info@cups.org
WWW: http://www.cups.org
Note that commercial licensors may also require a license from
-Artifex Software Inc. which handles commercial licensing of the
-Ghostscript software, and from Derek B. Noonburg who developed
-the Xpdf software used to print PDF files.
+Derek B. Noonburg who developed the Xpdf software used to print
+PDF files.
/*
- * "$Id: parallel.c,v 1.29.2.17 2004/06/29 13:15:08 mike Exp $"
+ * "$Id$"
*
* Parallel port backend for the Common UNIX Printing System (CUPS).
*
/*
* Now that we are "connected" to the port, ignore SIGTERM so that we
* can finish out any page data the driver sends (e.g. to eject the
- * current page...
+ * current page... Only ignore SIGTERM if we are printing data from
+ * stdin (otherwise you can't cancel raw jobs...)
*/
+ if (argc < 7)
+ {
#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
- sigset(SIGTERM, SIG_IGN);
+ sigset(SIGTERM, SIG_IGN);
#elif defined(HAVE_SIGACTION)
- memset(&action, 0, sizeof(action));
+ memset(&action, 0, sizeof(action));
- sigemptyset(&action.sa_mask);
- action.sa_handler = SIG_IGN;
- sigaction(SIGTERM, &action, NULL);
+ sigemptyset(&action.sa_mask);
+ action.sa_handler = SIG_IGN;
+ sigaction(SIGTERM, &action, NULL);
#else
- signal(SIGTERM, SIG_IGN);
+ signal(SIGTERM, SIG_IGN);
#endif /* HAVE_SIGSET */
+ }
/*
* Finally, send the print file...
/*
- * End of "$Id: parallel.c,v 1.29.2.17 2004/06/29 13:15:08 mike Exp $".
+ * End of "$Id$".
*/
/*
- * "$Id: scsi-linux.c,v 1.1.2.2 2004/05/13 15:13:52 mike Exp $"
+ * "$Id$"
*
* Linux SCSI printer support for the Common UNIX Printing System (CUPS).
*
- * Copyright 2003-2004 by Easy Software Products, all rights reserved.
+ * Copyright 2003-2005 by Easy Software Products, all rights reserved.
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the
#include <scsi/sg.h>
+/*
+ * We currently only support the Linux 2.4 generic SCSI interface.
+ */
+
+#ifndef SG_DXFER_TO_DEV
+/*
+ * Dummy functions that do nothing on unsupported platforms...
+ */
+void list_devices(void) {}
+int print_device(const char *resource, int fd, int copies) { return (1); }
+#else
+
+
/*
* 'list_devices()' - List the available SCSI printer devices.
*/
sg_io_hdr_t scsi_req; /* SCSI request */
char scsi_cmd[6], /* SCSI command data */
scsi_sense[32]; /* SCSI sense data */
-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
+# if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
struct sigaction action; /* Actions for POSIX signals */
-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
+# endif /* HAVE_SIGACTION && !HAVE_SIGSET */
/*
if (fd != 0)
{
-#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
+# ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
sigset(SIGTERM, SIG_IGN);
-#elif defined(HAVE_SIGACTION)
+# elif defined(HAVE_SIGACTION)
memset(&action, 0, sizeof(action));
sigemptyset(&action.sa_mask);
action.sa_handler = SIG_IGN;
sigaction(SIGTERM, &action, NULL);
-#else
+# else
signal(SIGTERM, SIG_IGN);
-#endif /* HAVE_SIGSET */
+# endif /* HAVE_SIGSET */
}
/*
return (0);
}
+#endif /* !SG_DXFER_TO_DEV */
/*
- * End of "$Id: scsi-linux.c,v 1.1.2.2 2004/05/13 15:13:52 mike Exp $".
+ * End of "$Id$".
*/
/*
- * "$Id: socket.c,v 1.17.2.18 2004/06/29 13:15:08 mike Exp $"
+ * "$Id$"
*
* AppSocket backend for the Common UNIX Printing System (CUPS).
*
- * Copyright 1997-2004 by Easy Software Products, all rights reserved.
+ * Copyright 1997-2005 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
* Attn: CUPS Licensing Information
* Easy Software Products
* 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636-3142 USA
+ * Hollywood, Maryland 20636 USA
*
* Voice: (301) 373-9600
* EMail: cups-info@cups.org
#endif /* WIN32 */
+/*
+ * Local functions...
+ */
+
+void print_backchannel(const unsigned char *buffer, int nbytes);
+
+
/*
* 'main()' - Send a file to the printer or server.
*
/*
* Now that we are "connected" to the port, ignore SIGTERM so that we
* can finish out any page data the driver sends (e.g. to eject the
- * current page...
+ * current page... Only ignore SIGTERM if we are printing data from
+ * stdin (otherwise you can't cancel raw jobs...)
*/
+ if (argc < 7)
+ {
#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
- sigset(SIGTERM, SIG_IGN);
+ sigset(SIGTERM, SIG_IGN);
#elif defined(HAVE_SIGACTION)
- memset(&action, 0, sizeof(action));
+ memset(&action, 0, sizeof(action));
- sigemptyset(&action.sa_mask);
- action.sa_handler = SIG_IGN;
- sigaction(SIGTERM, &action, NULL);
+ sigemptyset(&action.sa_mask);
+ action.sa_handler = SIG_IGN;
+ sigaction(SIGTERM, &action, NULL);
#else
- signal(SIGTERM, SIG_IGN);
+ signal(SIGTERM, SIG_IGN);
#endif /* HAVE_SIGSET */
+ }
/*
* Finally, send the print file...
*/
if ((nbytes = recv(fd, buffer, sizeof(buffer), 0)) > 0)
+ {
fprintf(stderr, "INFO: Received %d bytes of back-channel data!\n",
nbytes);
+ print_backchannel((unsigned char *)buffer, nbytes);
+ }
}
else if (argc > 6)
fprintf(stderr, "INFO: Sending print file, %lu bytes...\n",
*/
if ((nbytes = recv(fd, buffer, sizeof(buffer), 0)) > 0)
+ {
fprintf(stderr, "INFO: Received %d bytes of back-channel data!\n",
nbytes);
- else
+ print_backchannel((unsigned char *)buffer, nbytes);
+ }
+ else
break;
}
else
/*
- * End of "$Id: socket.c,v 1.17.2.18 2004/06/29 13:15:08 mike Exp $".
+ * 'print_backchannel()' - Print the contents of a back-channel buffer.
+ */
+
+void
+print_backchannel(const unsigned char *buffer, /* I - Data buffer */
+ int nbytes) /* I - Number of bytes */
+{
+ char line[255], /* Formatted line */
+ *lineptr; /* Pointer into line */
+
+
+ for (lineptr = line; nbytes > 0; buffer ++, nbytes --)
+ {
+ if (*buffer < 0x20 || *buffer >= 0x7f)
+ {
+ snprintf(lineptr, sizeof(line) - (lineptr - line), "<%02X>", *buffer);
+ lineptr += strlen(lineptr);
+ }
+ else
+ *lineptr++ = *buffer;
+
+ if ((lineptr - line) > 72)
+ {
+ *lineptr = '\0';
+ fprintf(stderr, "DEBUG: DATA: %s\n", line);
+ lineptr = line;
+ }
+ }
+
+ if (lineptr > line)
+ {
+ *lineptr = '\0';
+ fprintf(stderr, "DEBUG: DATA: %s\n", line);
+ }
+}
+
+
+/*
+ * End of "$Id$".
*/
#
-# "$Id: Makefile,v 1.13.2.6 2004/06/29 13:15:08 mike Exp $"
+# "$Id$"
#
# Berkeley commands makefile for the Common UNIX Printing System (CUPS).
#
#
# Dependencies...
#
-
+
include Dependencies
-
+
#
-# End of "$Id: Makefile,v 1.13.2.6 2004/06/29 13:15:08 mike Exp $".
+# End of "$Id$".
#
#
-# "$Id: Makefile,v 1.15.2.7 2004/06/29 13:15:08 mike Exp $"
+# "$Id$"
#
# CGI makefile for the Common UNIX Printing System (CUPS).
#
-# Copyright 1997-2004 by Easy Software Products.
+# Copyright 1997-2005 by Easy Software Products.
#
# These coded instructions, statements, and computer programs are the
# property of Easy Software Products and are protected by Federal
# Attn: CUPS Licensing Information
# Easy Software Products
# 44141 Airport View Drive, Suite 204
-# Hollywood, Maryland 20636-3142 USA
+# Hollywood, Maryland 20636 USA
#
# Voice: (301) 373-9600
# EMail: cups-info@cups.org
# admin.cgi
#
-admin.cgi: admin.o ../cups/$(LIBCUPS) libcgi.a
+admin.cgi: admin.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
echo Linking $@...
$(CC) $(LDFLAGS) -o $@ admin.o libcgi.a $(LIBS)
# classes.cgi
#
-classes.cgi: classes.o ../cups/$(LIBCUPS) libcgi.a
+classes.cgi: classes.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
echo Linking $@...
$(CC) $(LDFLAGS) -o $@ classes.o libcgi.a $(LIBS)
# jobs.cgi
#
-jobs.cgi: jobs.o ../cups/$(LIBCUPS) libcgi.a
+jobs.cgi: jobs.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
echo Linking $@...
$(CC) $(LDFLAGS) -o $@ jobs.o libcgi.a $(LIBS)
# printers.cgi
#
-printers.cgi: printers.o ../cups/$(LIBCUPS) libcgi.a
+printers.cgi: printers.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
echo Linking $@...
$(CC) $(LDFLAGS) -o $@ printers.o libcgi.a $(LIBS)
#
# Dependencies...
#
-
+
include Dependencies
-
+
#
-# End of "$Id: Makefile,v 1.15.2.7 2004/06/29 13:15:08 mike Exp $".
+# End of "$Id$".
#
/*
- * "$Id: admin.c,v 1.22.2.27 2004/06/29 13:15:08 mike Exp $"
+ * "$Id$"
*
* Administration CGI for the Common UNIX Printing System (CUPS).
*
- * Copyright 1997-2004 by Easy Software Products.
+ * Copyright 1997-2005 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
* property of Easy Software Products and are protected by Federal
* Attn: CUPS Licensing Information
* Easy Software Products
* 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636-3142 USA
+ * Hollywood, Maryland 20636 USA
*
* Voice: (301) 373-9600
* EMail: cups-info@cups.org
do_printer_op(http, language, CUPS_REJECT_JOBS);
else if (strcmp(op, "purge-jobs") == 0)
do_printer_op(http, language, IPP_PURGE_JOBS);
+ else if (strcmp(op, "set-as-default") == 0)
+ do_printer_op(http, language, CUPS_SET_DEFAULT);
else if (strcmp(op, "add-class") == 0)
do_am_class(http, language, 0);
else if (strcmp(op, "add-printer") == 0)
if (*ptr || ptr == name || strlen(name) > 127)
{
cgiSetVariable("ERROR", "The class name may only contain up to 127 printable "
- "characters.");
+ "characters and may not contain spaces.");
cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
return;
}
if (*ptr || ptr == name || strlen(name) > 127)
{
cgiSetVariable("ERROR", "The printer name may only contain up to 127 printable "
- "characters.");
+ "characters and may not contain spaces.");
cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
return;
}
i > 0;
i --, group ++)
{
- if (strcmp(group->name, "InstallableOptions") == 0)
+ if (strcmp(group->text, "InstallableOptions") == 0)
cgiSetVariable("GROUP",
cupsLangString(language, CUPS_MSG_OPTIONS_INSTALLED));
else
cgiCopyTemplateLang(stdout, TEMPLATES, "printer-reject.tmpl", getenv("LANG"));
else if (op == IPP_PURGE_JOBS)
cgiCopyTemplateLang(stdout, TEMPLATES, "printer-purge.tmpl", getenv("LANG"));
+ else if (op == CUPS_SET_DEFAULT)
+ cgiCopyTemplateLang(stdout, TEMPLATES, "printer-default.tmpl", getenv("LANG"));
}
/*
- * End of "$Id: admin.c,v 1.22.2.27 2004/06/29 13:15:08 mike Exp $".
+ * End of "$Id$".
*/
#
-# "$Id: cupsd.conf.in,v 1.2.2.16 2004/08/19 12:46:28 mike Exp $"
+# "$Id$"
#
# Sample configuration file for the Common UNIX Printing System (CUPS)
# scheduler.
#MaxJobs 500
+#
+# MaxJobsPerPrinter: maximum number of active jobs per printer. The default
+# is 0 for no limit.
+#
+
+#MaxJobsPerPrinter 0
+
+#
+# MaxJobsPerUser: maximum number of active jobs per user. The default
+# is 0 for no limit.
+#
+
+#MaxJobsPerUser 0
+
+#
+# MaxPrinterHistory: controls the maximum number of history collections
+# in the printer-state-history attribute. Set to 0 to disable history
+# data.
+#
+
+#MaxPrinterHistory 10
+
#
# Printcap: the name of the printcap file. Default is /etc/printcap.
# Leave blank to disable printcap file generation.
</Location>
#
-# End of "$Id: cupsd.conf.in,v 1.2.2.16 2004/08/19 12:46:28 mike Exp $".
+# End of "$Id$".
#
#!/bin/sh
#
-# "$Id: cups.sh.in,v 1.9.2.9 2004/06/29 13:15:08 mike Exp $"
+# "$Id$"
#
# Startup/shutdown script for the Common UNIX Printing System (CUPS).
#
-# Copyright 1997-2004 by Easy Software Products, all rights reserved.
+# Copyright 1997-2005 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
# Attn: CUPS Licensing Information
# Easy Software Products
# 44141 Airport View Drive, Suite 204
-# Hollywood, Maryland 20636-3142 USA
+# Hollywood, Maryland 20636 USA
#
# Voice: (301) 373-9600
# EMail: cups-info@cups.org
# See if the CUPS server (cupsd) is running...
#
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-cupsd=@sbindir@/cupsd
-
case "`uname`" in
HP-UX* | AIX* | SINIX*)
- awkstart='{if ($4 == "';
- awkend='") print $1}';
- awkcmd="$awkstart$cupsd$awkend"
- pid=`ps -e | awk "$awkcmd"`
+ pid=`ps -e | awk '{if (match($4, ".*/cupsd$") || $4 == "cupsd") print $1}'`
;;
IRIX* | SunOS*)
- awkstart='{if ($4 == "';
- awkend='") print $1}';
- awkcmd="$awkstart$cupsd$awkend"
- pid=`ps -e | nawk "$awkcmd"`
+ pid=`ps -e | nawk '{if (match($4, ".*/cupsd$") || $4 == "cupsd") print $1}'`
;;
UnixWare*)
- awkstart='{if ($6 == "';
- awkend='") print $1}';
- awkcmd="$awkstart$cupsd$awkend"
- pid=`ps -e | awk "$awkcmd"`
+ pid=`ps -e | awk '{if (match($6, ".*/cupsd$") || $6 == "cupsd") print $1}'`
. /etc/TIMEZONE
;;
OSF1*)
- awkstart='{if ($5 == "';
- awkend='") print $1}';
- awkcmd="$awkstart$cupsd$awkend"
- pid=`ps -e | awk "$awkcmd"`
+ pid=`ps -e | awk '{if (match($5, ".*/cupsd$") || $5 == "cupsd") print $1}'`
;;
Linux* | *BSD* | Darwin*)
- awkstart='{if ($5 == "';
- awkend='") print $1}';
- awkcmd="$awkstart$cupsd$awkend"
- pid=`ps ax | awk "$awkcmd"`
+ pid=`ps ax | awk '{if (match($5, ".*/cupsd$") || $5 == "cupsd") print $1}'`
;;
*)
pid=""
if test "$pid" != ""; then
kill -HUP $pid
else
- $cupsd
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ @sbindir@/cupsd
if test $? != 0; then
$ECHO_FAIL
$ECHO "cups: unable to $1 scheduler."
#
-# End of "$Id: cups.sh.in,v 1.9.2.9 2004/06/29 13:15:08 mike Exp $".
+# End of "$Id$".
#
#
-# "$Id: cups.spec,v 1.30.2.13 2004/05/27 15:37:47 mike Exp $"
+# "$Id$"
#
# RPM "spec" file for the Common UNIX Printing System (CUPS).
#
Provides: libcups1
%description
-The Common UNIX Printing System provides a portable printing
-layer for UNIX® operating systems. It has been developed by
-Easy Software Products to promote a standard printing solution
-for all UNIX vendors and users. CUPS provides the System V and
-Berkeley command-line interfaces.
+The Common UNIX Printing System provides a portable printing layer for
+UNIX® operating systems. It has been developed by Easy Software Products
+to promote a standard printing solution for all UNIX vendors and users.
+CUPS provides the System V and Berkeley command-line interfaces.
%description devel
-The Common UNIX Printing System provides a portable printing
-layer for UNIX® operating systems. This is the development
-package for creating additional printer drivers and other CUPS
-services.
+The Common UNIX Printing System provides a portable printing layer for
+UNIX® operating systems. This is the development package for creating
+additional printer drivers and other CUPS services.
%description libs
-The Common UNIX Printing System provides a portable printing
-layer for UNIX® operating systems. This package contains the
-CUPS shared libraries.
+The Common UNIX Printing System provides a portable printing layer for
+UNIX® operating systems. This package contains the CUPS shared libraries.
%prep
%setup
%dir /usr/share/man/cat8
/usr/share/man/cat8/*
%dir /usr/share/man/man1
-/usr/share/man/man1/backend.1
-/usr/share/man/man1/cupstestppd.1
-/usr/share/man/man1/filter.1
-/usr/share/man/man1/lp.1
-/usr/share/man/man1/lpoptions.1
-/usr/share/man/man1/lppasswd.1
-/usr/share/man/man1/lpq.1
-/usr/share/man/man1/lpr.1
-/usr/share/man/man1/lprm.1
-/usr/share/man/man1/lpstat.1
+/usr/share/man/man1/backend.1.gz
+/usr/share/man/man1/cupstestppd.1.gz
+/usr/share/man/man1/filter.1.gz
+/usr/share/man/man1/lp.1.gz
+/usr/share/man/man1/lpoptions.1.gz
+/usr/share/man/man1/lppasswd.1.gz
+/usr/share/man/man1/lpq.1.gz
+/usr/share/man/man1/lpr.1.gz
+/usr/share/man/man1/lprm.1.gz
+/usr/share/man/man1/lpstat.1.gz
%dir /usr/share/man/man5
/usr/share/man/man5/*
%dir /usr/share/man/man8
%files devel
%dir /usr/share/man/cat1
/usr/share/man/cat1/cups-config.1
-%dir /usr/share/man/fr/cat1
-/usr/share/man/fr/cat1/cups-config.1
%dir /usr/share/man/man1
-/usr/share/man/man1/cups-config.1
-%dir /usr/share/man/fr/man1
-/usr/share/man/fr/man1/cups-config.1
+/usr/share/man/man1/cups-config.1.gz
+
+%dir /usr/share/man/es/cat1
+/usr/share/man/es/cat1/cups-config.1
+%dir /usr/share/man/es/man1
+/usr/share/man/es/man1/cups-config.1.gz
+
/usr/bin/cups-config
%dir /usr/include/cups
/usr/include/cups/*
/usr/lib/*.so*
#
-# End of "$Id: cups.spec,v 1.30.2.13 2004/05/27 15:37:47 mike Exp $".
+# End of "$Id$".
#
/*
- * "$Id: debug.h,v 1.4.2.6 2004/06/29 13:15:08 mike Exp $"
+ * "$Id$"
*
* Debugging macros for the Common UNIX Printing System (CUPS).
*
- * Copyright 1997-2004 by Easy Software Products.
+ * Copyright 1997-2005 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
* property of Easy Software Products and are protected by Federal
* Attn: CUPS Licensing Information
* Easy Software Products
* 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636-3142 USA
+ * Hollywood, Maryland 20636 USA
*
* Voice: (301) 373-9600
* EMail: cups-info@cups.org
* This file is subject to the Apple OS-Developed Software exception.
*/
-#ifndef _IPP_DEBUG_H_
-# define _IPP_DEBUG_H_
+#ifndef _CUPS_DEBUG_H_
+# define _CUPS_DEBUG_H_
/*
* Include necessary headers...
# define DEBUG_printf(x)
# endif /* DEBUG */
-#endif /* !_IPP_DEBUG_H_ */
+#endif /* !_CUPS_DEBUG_H_ */
/*
- * End of "$Id: debug.h,v 1.4.2.6 2004/06/29 13:15:08 mike Exp $".
+ * End of "$Id$".
*/
/*
- * "$Id: emit.c,v 1.23.2.16 2004/09/08 20:31:30 mike Exp $"
+ * "$Id$"
*
* PPD code emission routines for the Common UNIX Printing System (CUPS).
*
- * Copyright 1997-2004 by Easy Software Products, all rights reserved.
+ * Copyright 1997-2005 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
* Attn: CUPS Licensing Information
* Easy Software Products
* 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636-3142 USA
+ * Hollywood, Maryland 20636 USA
*
* Voice: (301) 373-9600
* EMail: cups-info@cups.org
char temp[81]; /* Local title string */
+ /*
+ * Range check the input...
+ */
+
if (ppd == NULL || ppd->jcl_begin == NULL || ppd->jcl_ps == NULL)
return (0);
+ /*
+ * See if the printer supports HP PJL...
+ */
+
if (strncmp(ppd->jcl_begin, "\033%-12345X@", 10) == 0)
{
/*
ptr ++;
}
+ /*
+ * Eliminate any path info from the job title...
+ */
+
+ if ((ptr = strrchr(title, '/')) != NULL)
+ title = ptr + 1;
+
/*
* Replace double quotes with single quotes so that the title
* does not cause a PJL syntax error.
/*
- * End of "$Id: emit.c,v 1.23.2.16 2004/09/08 20:31:30 mike Exp $".
+ * End of "$Id$".
*/
/*
- * "$Id: http.h,v 1.33.2.25 2004/08/18 17:49:19 mike Exp $"
+ * "$Id$"
*
* Hyper-Text Transport Protocol definitions for the Common UNIX Printing
* System (CUPS).
* This file is subject to the Apple OS-Developed Software exception.
*/
-#ifndef _IPP_HTTP_H_
-# define _IPP_HTTP_H_
+#ifndef _CUPS_HTTP_H_
+# define _CUPS_HTTP_H_
/*
* Include necessary headers...
# ifdef __cplusplus
}
# endif /* __cplusplus */
-#endif /* !_IPP_HTTP_H_ */
+#endif /* !_CUPS_HTTP_H_ */
/*
- * End of "$Id: http.h,v 1.33.2.25 2004/08/18 17:49:19 mike Exp $".
+ * End of "$Id$".
*/
/*
- * "$Id: ipp.c,v 1.55.2.41 2004/06/29 13:15:08 mike Exp $"
+ * "$Id$"
*
* Internet Printing Protocol support functions for the Common UNIX
* Printing System (CUPS).
#include <ctype.h>
#include <errno.h>
+#ifdef WIN32
+# include <io.h>
+#endif // WIN32
+
/*
* Local functions...
DEBUG_printf(("ippWrite: writing string = %d, \'%s\'\n", n,
value->string.text));
- if ((sizeof(buffer) - (bufptr - buffer)) < (n + 2))
+ if ((int)(sizeof(buffer) - (bufptr - buffer)) < (n + 2))
{
if ((*cb)(dst, buffer, bufptr - buffer) < 0)
{
if (n > (sizeof(buffer) - 2))
return (IPP_ERROR);
- if ((sizeof(buffer) - (bufptr - buffer)) < (n + 2))
+ if ((int)(sizeof(buffer) - (bufptr - buffer)) < (n + 2))
{
if ((*cb)(dst, buffer, bufptr - buffer) < 0)
{
if (n > (sizeof(buffer) - 2))
return (IPP_ERROR);
- if ((sizeof(buffer) - (bufptr - buffer)) < (n + 2))
+ if ((int)(sizeof(buffer) - (bufptr - buffer)) < (n + 2))
{
if ((*cb)(dst, buffer, bufptr - buffer) < 0)
{
/*
- * End of "$Id: ipp.c,v 1.55.2.41 2004/06/29 13:15:08 mike Exp $".
+ * End of "$Id$".
*/
/*
- * "$Id: ppd.c,v 1.51.2.65 2004/06/29 13:15:08 mike Exp $"
+ * "$Id$"
*
* PPD file routines for the Common UNIX Printing System (CUPS).
*
* Line is too long...
*/
+ ppd_line = startline;
ppd_status = PPD_LINE_TOO_LONG;
return (0);
/*
- * End of "$Id: ppd.c,v 1.51.2.65 2004/06/29 13:15:08 mike Exp $".
+ * End of "$Id$".
*/
/*
- * "$Id: ppd.h,v 1.24.2.21 2004/06/29 13:15:09 mike Exp $"
+ * "$Id$"
*
* PostScript Printer Description definitions for the Common UNIX Printing
* System (CUPS).
int num_attrs; /* Number of attributes */
int cur_attr; /* Current attribute */
ppd_attr_t **attrs; /* Attributes */
+
+ /**** New in CUPS 1.2 ****/
int num_extended; /* Number of extended options */
ppd_ext_option_t **extended; /* Extended options */
} ppd_file_t;
extern ppd_attr_t *ppdFindNextAttr(ppd_file_t *ppd, const char *name,
const char *spec);
extern ppd_status_t ppdLastError(int *line);
+
+/**** New in CUPS 1.1.20 ****/
+extern void ppdSetConformance(ppd_conform_t c);
+
+/**** New in CUPS 1.2 ****/
extern ppd_ext_option_t *ppdFindExtOption(ppd_file_t *ppd, const char *keyword);
extern ppd_ext_param_t *ppdFindExtParam(ppd_ext_option_t *opt, const char *param);
extern int ppdMarkCurve(ppd_file_t *ppd, const char *keyword,
extern int ppdMarkXYArray(ppd_file_t *ppd, const char *keyword,
const char *param, int num_values,
const float *values);
-
-/**** New in CUPS 1.1.20 ****/
-extern void ppdSetConformance(ppd_conform_t c);
-
-/**** New in CUPS 1.2 ****/
extern int ppdSave(ppd_file_t *ppd, FILE *fp);
extern int ppdSaveFd(ppd_file_t *ppd, int fd);
extern int ppdSaveFile(ppd_file_t *ppd, const char *filename);
#endif /* !_CUPS_PPD_H_ */
/*
- * End of "$Id: ppd.h,v 1.24.2.21 2004/06/29 13:15:09 mike Exp $".
+ * End of "$Id$".
*/
/*
- * "$Id: snprintf.c,v 1.4.2.10 2004/06/29 13:15:09 mike Exp $"
+ * "$Id$"
*
* snprintf functions for the Common UNIX Printing System (CUPS).
*
- * Copyright 1997-2004 by Easy Software Products.
+ * Copyright 1997-2005 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
* property of Easy Software Products and are protected by Federal
* Attn: CUPS Licensing Information
* Easy Software Products
* 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636-3142 USA
+ * Hollywood, Maryland 20636 USA
*
* Voice: (301) 373-9600
* EMail: cups-info@cups.org
int /* O - Number of bytes formatted */
cups_vsnprintf(char *buffer, /* O - Output buffer */
- size_t bufsize, /* O - Size of output buffer */
- const char *format, /* I - printf-style format string */
- va_list ap) /* I - Pointer to additional arguments */
+ size_t bufsize, /* O - Size of output buffer */
+ const char *format, /* I - printf-style format string */
+ va_list ap) /* I - Pointer to additional arguments */
{
char *bufptr, /* Pointer to position in buffer */
*bufend, /* Pointer to end of buffer */
temp[1024]; /* Buffer for formatted numbers */
char *s; /* Pointer to string */
int slen; /* Length of string */
+ int bytes; /* Total number of bytes needed */
/*
bufptr = buffer;
bufend = buffer + bufsize - 1;
+ bytes = 0;
- while (*format && bufptr < bufend)
+ while (*format)
{
if (*format == '%')
{
sign = 0;
width = 0;
- while (isdigit(*format & 255))
+ while (isdigit(*format))
width = width * 10 + *format++ - '0';
if (*format == '.')
format ++;
prec = 0;
- while (isdigit(*format & 255))
+ while (isdigit(*format))
prec = prec * 10 + *format++ - '0';
}
else
sprintf(temp, tformat, va_arg(ap, double));
- if ((bufptr + strlen(temp)) > bufend)
- {
- strncpy(bufptr, temp, bufend - bufptr);
- bufptr = bufend;
- break;
- }
- else
+ bytes += strlen(temp);
+
+ if (bufptr)
{
- strcpy(bufptr, temp);
- bufptr += strlen(temp);
+ if ((bufptr + strlen(temp)) > bufend)
+ {
+ strncpy(bufptr, temp, bufend - bufptr);
+ bufptr = bufend;
+ break;
+ }
+ else
+ {
+ strcpy(bufptr, temp);
+ bufptr += strlen(temp);
+ }
}
break;
sprintf(temp, tformat, va_arg(ap, int));
- if ((bufptr + strlen(temp)) > bufend)
- {
- strncpy(bufptr, temp, bufend - bufptr);
- bufptr = bufend;
- break;
- }
- else
+ bytes += strlen(temp);
+
+ if (bufptr)
{
- strcpy(bufptr, temp);
- bufptr += strlen(temp);
+ if ((bufptr + strlen(temp)) > bufend)
+ {
+ strncpy(bufptr, temp, bufend - bufptr);
+ bufptr = bufend;
+ break;
+ }
+ else
+ {
+ strcpy(bufptr, temp);
+ bufptr += strlen(temp);
+ }
}
break;
sprintf(temp, tformat, va_arg(ap, void *));
- if ((bufptr + strlen(temp)) > bufend)
- {
- strncpy(bufptr, temp, bufend - bufptr);
- bufptr = bufend;
- break;
- }
- else
+ bytes += strlen(temp);
+
+ if (bufptr)
{
- strcpy(bufptr, temp);
- bufptr += strlen(temp);
+ if ((bufptr + strlen(temp)) > bufend)
+ {
+ strncpy(bufptr, temp, bufend - bufptr);
+ bufptr = bufend;
+ break;
+ }
+ else
+ {
+ strcpy(bufptr, temp);
+ bufptr += strlen(temp);
+ }
}
break;
case 'c' : /* Character or character array */
- if (width <= 1)
- *bufptr++ = va_arg(ap, int);
- else
- {
- if ((bufptr + width) > bufend)
- width = bufend - bufptr;
+ bytes += width;
- memcpy(bufptr, va_arg(ap, char *), width);
- bufptr += width;
+ if (bufptr)
+ {
+ if (width <= 1)
+ *bufptr++ = va_arg(ap, int);
+ else
+ {
+ if ((bufptr + width) > bufend)
+ width = bufend - bufptr;
+
+ memcpy(bufptr, va_arg(ap, char *), width);
+ bufptr += width;
+ }
}
break;
if (slen > width && prec != width)
width = slen;
- if ((bufptr + width) > bufend)
- width = bufend - bufptr;
+ bytes += width;
- if (slen > width)
- slen = width;
-
- if (sign == '-')
- {
- strncpy(bufptr, s, slen);
- memset(bufptr + slen, ' ', width - slen);
- }
- else
+ if (bufptr)
{
- memset(bufptr, ' ', width - slen);
- strncpy(bufptr + width - slen, s, slen);
- }
+ if ((bufptr + width) > bufend)
+ width = bufend - bufptr;
+
+ if (slen > width)
+ slen = width;
+
+ if (sign == '-')
+ {
+ strncpy(bufptr, s, slen);
+ memset(bufptr + slen, ' ', width - slen);
+ }
+ else
+ {
+ memset(bufptr, ' ', width - slen);
+ strncpy(bufptr + width - slen, s, slen);
+ }
- bufptr += width;
+ bufptr += width;
+ }
break;
case 'n' : /* Output number of chars so far */
sprintf(temp, tformat, va_arg(ap, int));
- if ((bufptr + strlen(temp)) > bufend)
- {
- strncpy(bufptr, temp, bufend - bufptr);
- bufptr = bufend;
- break;
- }
- else
+ bytes += strlen(temp);
+
+ if (bufptr)
{
- strcpy(bufptr, temp);
- bufptr += strlen(temp);
+ if ((bufptr + strlen(temp)) > bufend)
+ {
+ strncpy(bufptr, temp, bufend - bufptr);
+ bufptr = bufend;
+ break;
+ }
+ else
+ {
+ strcpy(bufptr, temp);
+ bufptr += strlen(temp);
+ }
}
break;
}
}
else
- *bufptr++ = *format++;
+ {
+ bytes ++;
+
+ if (bufptr && bufptr < bufend)
+ *bufptr++ = *format++;
+ }
}
/*
- * Nul-terminate the string and return the number of characters in it.
+ * Nul-terminate the string and return the number of characters needed.
*/
*bufptr = '\0';
- return (bufptr - buffer);
+
+ return (bytes);
}
#endif /* !HAVE_VSNPRINT */
int /* O - Number of bytes formatted */
cups_snprintf(char *buffer, /* O - Output buffer */
- size_t bufsize, /* O - Size of output buffer */
- const char *format, /* I - printf-style format string */
- ...) /* I - Additional arguments as needed */
+ size_t bufsize, /* O - Size of output buffer */
+ const char *format, /* I - printf-style format string */
+ ...) /* I - Additional arguments as needed */
{
int bytes; /* Number of bytes formatted */
va_list ap; /* Pointer to additional arguments */
/*
- * End of "$Id: snprintf.c,v 1.4.2.10 2004/06/29 13:15:09 mike Exp $".
+ * End of "$Id$".
*/
/*
- * "$Id: string.c,v 1.5.2.11 2004/06/29 13:15:09 mike Exp $"
+ * "$Id$"
*
* String functions for the Common UNIX Printing System (CUPS).
*
- * Copyright 1997-2004 by Easy Software Products.
+ * Copyright 1997-2005 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
* property of Easy Software Products and are protected by Federal
* Attn: CUPS Licensing Information
* Easy Software Products
* 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636-3142 USA
+ * Hollywood, Maryland 20636 USA
*
* Voice: (301) 373-9600
* EMail: cups-info@cups.org
* 'cups_strdup()' - Duplicate a string.
*/
-# ifndef HAVE_STRDUP
-char * /* O - New string pointer */
+#ifndef HAVE_STRDUP
+char * /* O - New string pointer */
cups_strdup(const char *s) /* I - String to duplicate */
{
char *t; /* New string pointer */
return (strcpy(t, s));
}
-# endif /* !HAVE_STRDUP */
+#endif /* !HAVE_STRDUP */
/*
* 'cups_strcasecmp()' - Do a case-insensitive comparison.
*/
-# ifndef HAVE_STRCASECMP
+#ifndef HAVE_STRCASECMP
int /* O - Result of comparison (-1, 0, or 1) */
cups_strcasecmp(const char *s, /* I - First string */
- const char *t) /* I - Second string */
+ const char *t) /* I - Second string */
{
while (*s != '\0' && *t != '\0')
{
else
return (-1);
}
-# endif /* !HAVE_STRCASECMP */
+#endif /* !HAVE_STRCASECMP */
/*
* 'cups_strncasecmp()' - Do a case-insensitive comparison on up to N chars.
*/
-# ifndef HAVE_STRNCASECMP
+#ifndef HAVE_STRNCASECMP
int /* O - Result of comparison (-1, 0, or 1) */
cups_strncasecmp(const char *s, /* I - First string */
- const char *t, /* I - Second string */
- size_t n) /* I - Maximum number of characters to compare */
+ const char *t, /* I - Second string */
+ size_t n) /* I - Maximum number of characters to compare */
{
while (*s != '\0' && *t != '\0' && n > 0)
{
/*
- * End of "$Id: string.c,v 1.5.2.11 2004/06/29 13:15:09 mike Exp $".
+ * End of "$Id$".
*/
/*
- * "$Id: string.h,v 1.7.2.13 2004/06/29 13:15:09 mike Exp $"
+ * "$Id$"
*
* String definitions for the Common UNIX Printing System (CUPS).
*
- * Copyright 1997-2004 by Easy Software Products.
+ * Copyright 1997-2005 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
* property of Easy Software Products and are protected by Federal
* Attn: CUPS Licensing Information
* Easy Software Products
* 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636-3142 USA
+ * Hollywood, Maryland 20636 USA
*
* Voice: (301) 373-9600
* EMail: cups-info@cups.org
* Include necessary headers...
*/
-# include "config.h"
+# include <config.h>
# include <stdio.h>
# include <stdarg.h>
#endif /* !_CUPS_STRING_H_ */
/*
- * End of "$Id: string.h,v 1.7.2.13 2004/06/29 13:15:09 mike Exp $".
+ * End of "$Id$".
*/
/*
- * "$Id: common.h,v 1.6.2.7 2004/06/29 13:15:09 mike Exp $"
+ * "$Id$"
*
* Common filter definitions for the Common UNIX Printing System (CUPS).
*
- * Copyright 1997-2004 by Easy Software Products.
+ * Copyright 1997-2005 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
* property of Easy Software Products and are protected by Federal
* Attn: CUPS Licensing Information
* Easy Software Products
* 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636-3142 USA
+ * Hollywood, Maryland 20636 USA
*
* Voice: (301) 373-9600
* EMail: cups-info@cups.org
#include <cups/string.h>
+/*
+ * C++ magic...
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
/*
* Globals...
*/
/*
- * End of "$Id: common.h,v 1.6.2.7 2004/06/29 13:15:09 mike Exp $".
+ * C++ magic...
+ */
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
+/*
+ * End of "$Id$".
*/
/*
- * "$Id: raster.c,v 1.2.2.12 2004/12/23 05:37:35 mike Exp $"
+ * "$Id$"
*
* Raster file routines for the Common UNIX Printing System (CUPS).
*
*
* This code and any derivative of it may be used and distributed
* freely under the terms of the GNU General Public License when
- * used with GNU Ghostscript or its derivatives. Use of the code
- * (or any derivative of it) with software other than GNU
+ * used with GNU/GPL Ghostscript or its derivatives. Use of the
+ * code (or any derivative of it) with software other than GNU/GPL
* GhostScript (or its derivatives) is governed by the CUPS license
* agreement.
*
/*
- * End of "$Id: raster.c,v 1.2.2.12 2004/12/23 05:37:35 mike Exp $".
+ * End of "$Id$".
*/
/*
- * "$Id: raster.h,v 1.2.2.12 2004/12/23 05:37:35 mike Exp $"
+ * "$Id$"
*
* Raster file definitions for the Common UNIX Printing System (CUPS).
*
*
* This code and any derivative of it may be used and distributed
* freely under the terms of the GNU General Public License when
- * used with GNU Ghostscript or its derivatives. Use of the code
- * (or any derivative of it) with software other than GNU
+ * used with GNU/GPL Ghostscript or its derivatives. Use of the
+ * code (or any derivative of it) with software other than GNU/GPL
* GhostScript (or its derivatives) is governed by the CUPS license
* agreement.
*
/*
* Every non-PostScript printer driver that supports raster images
* should use the application/vnd.cups-raster image file format.
- * Since both the PostScript RIP (pstoraster, based on GNU
+ * Since both the PostScript RIP (pstoraster, based on GNU/GPL
* Ghostscript) and Image RIP (imagetoraster, located in the filter
* directory) use it, using this format saves you a lot of work.
* Also, the PostScript RIP passes any printer options that are in
#endif /* !_CUPS_RASTER_H_ */
/*
- * End of "$Id: raster.h,v 1.2.2.12 2004/12/23 05:37:35 mike Exp $".
+ * End of "$Id$".
*/
/*
- * "$Id: rastertohp.c,v 1.15.2.8 2004/06/29 13:15:09 mike Exp $"
+ * "$Id$"
*
* Hewlett-Packard Page Control Language filter for the Common UNIX
* Printing System (CUPS).
*
- * Copyright 1993-2004 by Easy Software Products.
+ * Copyright 1993-2005 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
* property of Easy Software Products and are protected by Federal
* Attn: CUPS Licensing Information
* Easy Software Products
* 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636-3142 USA
+ * Hollywood, Maryland 20636 USA
*
* Voice: (301) 373-9600
* EMail: cups-info@cups.org
signal(SIGTERM, CancelJob);
#endif /* HAVE_SIGSET */
+ /*
+ * Show page device dictionary...
+ */
+
+ fprintf(stderr, "DEBUG: StartPage...\n");
+ fprintf(stderr, "DEBUG: MediaClass = \"%s\"\n", header->MediaClass);
+ fprintf(stderr, "DEBUG: MediaColor = \"%s\"\n", header->MediaColor);
+ fprintf(stderr, "DEBUG: MediaType = \"%s\"\n", header->MediaType);
+ fprintf(stderr, "DEBUG: OutputType = \"%s\"\n", header->OutputType);
+
+ fprintf(stderr, "DEBUG: AdvanceDistance = %d\n", header->AdvanceDistance);
+ fprintf(stderr, "DEBUG: AdvanceMedia = %d\n", header->AdvanceMedia);
+ fprintf(stderr, "DEBUG: Collate = %d\n", header->Collate);
+ fprintf(stderr, "DEBUG: CutMedia = %d\n", header->CutMedia);
+ fprintf(stderr, "DEBUG: Duplex = %d\n", header->Duplex);
+ fprintf(stderr, "DEBUG: HWResolution = [ %d %d ]\n", header->HWResolution[0],
+ header->HWResolution[1]);
+ fprintf(stderr, "DEBUG: ImagingBoundingBox = [ %d %d %d %d ]\n",
+ header->ImagingBoundingBox[0], header->ImagingBoundingBox[1],
+ header->ImagingBoundingBox[2], header->ImagingBoundingBox[3]);
+ fprintf(stderr, "DEBUG: InsertSheet = %d\n", header->InsertSheet);
+ fprintf(stderr, "DEBUG: Jog = %d\n", header->Jog);
+ fprintf(stderr, "DEBUG: LeadingEdge = %d\n", header->LeadingEdge);
+ fprintf(stderr, "DEBUG: Margins = [ %d %d ]\n", header->Margins[0],
+ header->Margins[1]);
+ fprintf(stderr, "DEBUG: ManualFeed = %d\n", header->ManualFeed);
+ fprintf(stderr, "DEBUG: MediaPosition = %d\n", header->MediaPosition);
+ fprintf(stderr, "DEBUG: MediaWeight = %d\n", header->MediaWeight);
+ fprintf(stderr, "DEBUG: MirrorPrint = %d\n", header->MirrorPrint);
+ fprintf(stderr, "DEBUG: NegativePrint = %d\n", header->NegativePrint);
+ fprintf(stderr, "DEBUG: NumCopies = %d\n", header->NumCopies);
+ fprintf(stderr, "DEBUG: Orientation = %d\n", header->Orientation);
+ fprintf(stderr, "DEBUG: OutputFaceUp = %d\n", header->OutputFaceUp);
+ fprintf(stderr, "DEBUG: PageSize = [ %d %d ]\n", header->PageSize[0],
+ header->PageSize[1]);
+ fprintf(stderr, "DEBUG: Separations = %d\n", header->Separations);
+ fprintf(stderr, "DEBUG: TraySwitch = %d\n", header->TraySwitch);
+ fprintf(stderr, "DEBUG: Tumble = %d\n", header->Tumble);
+ fprintf(stderr, "DEBUG: cupsWidth = %d\n", header->cupsWidth);
+ fprintf(stderr, "DEBUG: cupsHeight = %d\n", header->cupsHeight);
+ fprintf(stderr, "DEBUG: cupsMediaType = %d\n", header->cupsMediaType);
+ fprintf(stderr, "DEBUG: cupsBitsPerColor = %d\n", header->cupsBitsPerColor);
+ fprintf(stderr, "DEBUG: cupsBitsPerPixel = %d\n", header->cupsBitsPerPixel);
+ fprintf(stderr, "DEBUG: cupsBytesPerLine = %d\n", header->cupsBytesPerLine);
+ fprintf(stderr, "DEBUG: cupsColorOrder = %d\n", header->cupsColorOrder);
+ fprintf(stderr, "DEBUG: cupsColorSpace = %d\n", header->cupsColorSpace);
+ fprintf(stderr, "DEBUG: cupsCompression = %d\n", header->cupsCompression);
+
/*
* Setup printer/job attributes...
*/
Duplex = header->Duplex;
ColorBits = header->cupsBitsPerColor;
- if (!Duplex || (Page & 1))
+ if ((!Duplex || (Page & 1)) && header->MediaPosition)
+ printf("\033&l%dH", /* Set media position */
+ header->MediaPosition);
+
+ if (Duplex && ppd && ppd->model_number == 2)
+ {
+ /*
+ * Handle duplexing on new DeskJet printers...
+ */
+
+ printf("\033&l-2H"); /* Load media */
+
+ if (Page & 1)
+ printf("\033&l2S"); /* Set duplex mode */
+ }
+
+ if (!Duplex || (Page & 1) || (ppd && ppd->model_number == 2))
{
/*
- * Set the media type, position, and size...
+ * Set the media size...
*/
printf("\033&l6D\033&k12H"); /* Set 6 LPI, 10 CPI */
printf("\033&l%dP", /* Set page length */
header->PageSize[1] / 12);
printf("\033&l0E"); /* Set top margin to 0 */
+ }
- printf("\033&l%dX", header->NumCopies); /* Set number copies */
+ if (!Duplex || (Page & 1))
+ {
+ /*
+ * Set other job options...
+ */
- if (header->MediaPosition)
- printf("\033&l%dH", /* Set media position */
- header->MediaPosition);
+ printf("\033&l%dX", header->NumCopies); /* Set number copies */
- if (header->cupsMediaType)
+ if (header->cupsMediaType &&
+ (!ppd || ppd->model_number != 2 || header->HWResolution[0] == 600))
printf("\033&l%dM", /* Set media type */
header->cupsMediaType);
- if (header->Duplex)
- printf("\033&l%dS", /* Set duplex mode */
- header->Duplex + header->Tumble);
-
- printf("\033&l0L"); /* Turn off perforation skip */
+ if (!ppd || ppd->model_number != 2)
+ {
+ if (header->Duplex)
+ printf("\033&l%dS", /* Set duplex mode */
+ header->Duplex + header->Tumble);
- if (ppd && ppd->model_number == 2)
- printf("\033&l-2H"); /* Load media */
+ printf("\033&l0L"); /* Turn off perforation skip */
+ }
}
- else
+ else if (!ppd || ppd->model_number != 2)
printf("\033&a2G"); /* Set back side */
/*
* Set graphics mode...
*/
- printf("\033*t%dR", header->HWResolution[0]); /* Set resolution */
-
if (ppd->model_number == 2)
{
/*
else
NumPlanes = 1;
+ /*
+ * Set the resolution and top-of-form...
+ */
+
+ printf("\033&u%dD", header->HWResolution[0]);
+ /* Resolution */
+ printf("\033&l0e0L"); /* Reset top and don't skip */
+ printf("\033*p0Y\033*p0X"); /* Set top of form */
+
/*
* Send 26-byte configure image data command with horizontal and
* vertical resolutions as well as a color count...
putchar(header->HWResolution[1]);
putchar(0);
putchar(1 << ColorBits); /* # of yellow levels */
+
+ printf("\033&l0H"); /* Set media position */
}
else
{
+ printf("\033*t%dR", header->HWResolution[0]);
+ /* Set resolution */
+
if (header->cupsColorSpace == CUPS_CSPACE_KCMY)
{
NumPlanes = 4;
}
else
NumPlanes = 1; /* Black&white graphics */
- }
- /*
- * Set size and position of graphics...
- */
+ /*
+ * Set size and position of graphics...
+ */
- printf("\033*r%dS", header->cupsWidth); /* Set width */
- printf("\033*r%dT", header->cupsHeight); /* Set height */
+ printf("\033*r%dS", header->cupsWidth); /* Set width */
+ printf("\033*r%dT", header->cupsHeight); /* Set height */
- printf("\033&a0H"); /* Set horizontal position */
+ printf("\033&a0H"); /* Set horizontal position */
- if (ppd)
- printf("\033&a%.0fV", /* Set vertical position */
- 10.0 * (ppd->sizes[0].length - ppd->sizes[0].top));
- else
- printf("\033&a0V"); /* Set top-of-page */
+ if (ppd)
+ printf("\033&a%.0fV", /* Set vertical position */
+ 10.0 * (ppd->sizes[0].length - ppd->sizes[0].top));
+ else
+ printf("\033&a0V"); /* Set top-of-page */
+ }
printf("\033*r1A"); /* Start graphics */
main(int argc, /* I - Number of command-line arguments */
char *argv[]) /* I - Command-line arguments */
{
- int fd; /* Raster data file */
+ int fd; /* File descriptor */
cups_raster_t *ras; /* Raster stream for printing */
cups_page_header_t header; /* Page header from file */
int y; /* Current line */
if (argc == 7)
{
- if ((fd = open(argv[6], O_RDONLY)) < 0)
+ if ((fd = open(argv[6], O_RDONLY)) == -1)
{
perror("ERROR: Unable to open raster file - ");
sleep(1);
*/
cupsRasterClose(ras);
- if (fd)
+ if (fd != 0)
close(fd);
/*
/*
- * End of "$Id: rastertohp.c,v 1.15.2.8 2004/06/29 13:15:09 mike Exp $".
+ * End of "$Id$".
*/
--- /dev/null
+/*
+ * "$Id: testimage.c 4485 2005-01-03 19:30:00Z mike $"
+ *
+ * Image library test program for the Common UNIX Printing System (CUPS).
+ *
+ * Copyright 1993-2005 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 USA
+ *
+ * Voice: (301) 373-9600
+ * EMail: cups-info@cups.org
+ * WWW: http://www.cups.org
+ *
+ * This file is subject to the Apple OS-Developed Software exception.
+ *
+ * Contents:
+ *
+ * main() - Main entry...
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "image.h"
+
+
+/*
+ * 'main()' - Main entry...
+ */
+
+int /* O - Exit status */
+main(int argc, /* I - Number of command-line arguments */
+ char *argv[]) /* I - Command-line arguments */
+{
+ image_t *img; /* Image to print */
+ int primary; /* Primary image colorspace */
+ FILE *out; /* Output PPM/PGM file */
+ ib_t *line; /* Line from file */
+ int y; /* Current line */
+
+
+ if (argc != 3)
+ {
+ puts("Usage: testimage filename.ext filename.[ppm|pgm]");
+ return (1);
+ }
+
+ if (strstr(argv[2], ".ppm") != NULL)
+ primary = IMAGE_RGB;
+ else
+ primary = IMAGE_WHITE;
+
+ img = ImageOpen(argv[1], primary, IMAGE_WHITE, 100, 0, NULL);
+
+ if (!img)
+ {
+ perror(argv[1]);
+ return (1);
+ }
+
+ out = fopen(argv[2], "wb");
+
+ if (!out)
+ {
+ perror(argv[2]);
+ ImageClose(img);
+ return (1);
+ }
+
+ line = calloc(img->xsize, img->colorspace);
+
+ fprintf(out, "P%d\n%d\n%d\n255\n", img->colorspace == IMAGE_WHITE ? 5 : 6,
+ img->xsize, img->ysize);
+
+ for (y = 0; y < img->ysize; y ++)
+ {
+ ImageGetRow(img, 0, y, img->xsize, line);
+ fwrite(line, img->xsize, img->colorspace, out);
+ }
+
+ ImageClose(img);
+ fclose(out);
+
+ return (0);
+}
+
+
+/*
+ * End of "$Id: testimage.c 4485 2005-01-03 19:30:00Z mike $".
+ */
/*
- * "$Id: textcommon.h,v 1.6.2.6 2004/06/29 13:15:09 mike Exp $"
+ * "$Id$"
*
* Common text filter definitions for the Common UNIX Printing System (CUPS).
*
- * Copyright 1997-2004 by Easy Software Products.
+ * Copyright 1997-2005 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
* property of Easy Software Products and are protected by Federal
* Attn: CUPS Licensing Information
* Easy Software Products
* 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636-3142 USA
+ * Hollywood, Maryland 20636 USA
*
* Voice: (301) 373-9600
* EMail: cups-info@cups.org
#include "common.h"
+/*
+ * C++ magic...
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
/*
* Constants...
*/
/*
- * End of "$Id: textcommon.h,v 1.6.2.6 2004/06/29 13:15:09 mike Exp $".
+ * C++ magic...
+ */
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
+/*
+ * End of "$Id$".
*/
/*
- * "$Id: texttops.c,v 1.34.2.14 2004/06/29 13:15:09 mike Exp $"
+ * "$Id$"
*
* Text to PostScript filter for the Common UNIX Printing System (CUPS).
*
- * Copyright 1993-2004 by Easy Software Products.
+ * Copyright 1993-2005 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
* property of Easy Software Products and are protected by Federal
* Attn: CUPS Licensing Information
* Easy Software Products
* 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636-3142 USA
+ * Hollywood, Maryland 20636 USA
*
* Voice: (301) 373-9600
* EMail: cups-info@cups.org
else
j = 0;
- if (ppd != NULL && j >= ppd->num_fonts)
+ if ((ppd != NULL && j >= ppd->num_fonts) ||
+ strncmp(fonts[i], "Courier", 7) == 0 ||
+ strcmp(fonts[i], "Symbol") == 0)
{
/*
* Need to embed this font...
else
j = 0;
- if (ppd != NULL && j >= ppd->num_fonts)
+ if ((ppd != NULL && j >= ppd->num_fonts) ||
+ strncmp(fonts[i], "Courier", 7) == 0 ||
+ strcmp(fonts[i], "Symbol") == 0)
{
/*
* Need to embed this font...
printf("%%%%BeginResource: font %s\n", fonts[i]);
+ /**** MRS: Need to use CUPS_FONTPATH env var! ****/
+ /**** Also look for Fontmap file or name.pfa, name.pfb... ****/
snprintf(filename, sizeof(filename), "%s/fonts/%s", datadir, fonts[i]);
if ((fp = fopen(filename, "rb")) != NULL)
{
{
if (Glyphs[Codes[i * 256 + ch]])
printf("/%s", Glyphs[Codes[i * 256 + ch]]);
+ else if (Codes[i * 256 + ch] > 255)
+ printf("/uni%04X", Codes[i * 256 + ch]);
else
printf("/.notdef");
/*
- * End of "$Id: texttops.c,v 1.34.2.14 2004/06/29 13:15:09 mike Exp $".
+ * End of "$Id$".
*/
.\"
-.\" "$Id: accept.man,v 1.4.2.5 2004/06/29 13:15:10 mike Exp $"
+.\" "$Id$"
.\"
.\" accept/reject man page for the Common UNIX Printing System (CUPS).
.\"
-.\" Copyright 1997-2004 by Easy Software Products.
+.\" Copyright 1997-2005 by Easy Software Products.
.\"
.\" These coded instructions, statements, and computer programs are the
.\" property of Easy Software Products and are protected by Federal
.\" Attn: CUPS Licensing Information
.\" Easy Software Products
.\" 44141 Airport View Drive, Suite 204
-.\" Hollywood, Maryland 20636-3142 USA
+.\" Hollywood, Maryland 20636 USA
.\"
.\" Voice: (301) 373-9600
.\" EMail: cups-info@cups.org
CUPS Software Administrators Manual,
http://localhost:631/documentation.html
.SH COPYRIGHT
-Copyright 1993-2004 by Easy Software Products, All Rights Reserved.
+Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
.\"
-.\" End of "$Id: accept.man,v 1.4.2.5 2004/06/29 13:15:10 mike Exp $".
+.\" End of "$Id$".
.\"
.\"
-.\" "$Id: backend.man,v 1.6.2.6 2004/06/29 13:15:10 mike Exp $"
+.\" "$Id$"
.\"
.\" backend man page for the Common UNIX Printing System (CUPS).
.\"
-.\" Copyright 1997-2004 by Easy Software Products.
+.\" Copyright 1997-2005 by Easy Software Products.
.\"
.\" These coded instructions, statements, and computer programs are the
.\" property of Easy Software Products and are protected by Federal
.\" Attn: CUPS Licensing Information
.\" Easy Software Products
.\" 44141 Airport View Drive, Suite 204
-.\" Hollywood, Maryland 20636-3142 USA
+.\" Hollywood, Maryland 20636 USA
.\"
.\" Voice: (301) 373-9600
.\" EMail: cups-info@cups.org
.\" WWW: http://www.cups.org
.\"
-.TH backend 1 "Common UNIX Printing System" "22 June 2000" "Easy Software Products"
+.TH backend 1 "Common UNIX Printing System" "8 October 2004" "Easy Software Products"
.SH NAME
backend \- cups backend transmission interfaces
.SH SYNOPSIS
or from the standard input, copying the standard input to a temporary file
if required by the physical interface.
.LP
-The command name (argv[0]) is set to the device URI of the destination printer.
+The command name (argv[0]) is set to the device URI of the
+destination printer. Starting with CUPS 1.1.22, any
+authentication information in argv[0] will be removed, so
+backend developers are urged to use the DEVICE_URI environment
+variable whenever authentication information is required.
.SH ENVIRONMENT VARIABLES
The following environment variables are defined by the CUPS server when
executing the backend:
.TP 5
DEVICE_URI
.br
-The device-uri associated with the printer; this is provided for shell
-scripts which may not be able to get the passed argv[0] string.
+The device-uri associated with the printer; this is provided for
+shell scripts which may not be able to get the passed argv[0]
+string and for backends that require any authentication
+information which is not included in argv[0].
.TP 5
LANG
.br
CUPS Software Programmers Manual,
http://localhost:631/documentation.html
.SH COPYRIGHT
-Copyright 1993-2004 by Easy Software Products, All Rights Reserved.
+Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
.\"
-.\" End of "$Id: backend.man,v 1.6.2.6 2004/06/29 13:15:10 mike Exp $".
+.\" End of "$Id$".
.\"
.\"
-.\" "$Id: classes.conf.man,v 1.4.2.4 2004/06/29 13:15:10 mike Exp $"
+.\" "$Id$"
.\"
.\" classes.conf man page for the Common UNIX Printing System (CUPS).
.\"
-.\" Copyright 1997-2004 by Easy Software Products.
+.\" Copyright 1997-2005 by Easy Software Products.
.\"
.\" These coded instructions, statements, and computer programs are the
.\" property of Easy Software Products and are protected by Federal
.\" Attn: CUPS Licensing Information
.\" Easy Software Products
.\" 44141 Airport View Drive, Suite 204
-.\" Hollywood, Maryland 20636-3142 USA
+.\" Hollywood, Maryland 20636 USA
.\"
.\" Voice: (301) 373-9600
.\" EMail: cups-info@cups.org
CUPS Software Administrators Manual,
http://localhost:631/documentation.html
.SH COPYRIGHT
-Copyright 1993-2004 by Easy Software Products, All Rights Reserved.
+Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
.\"
-.\" End of "$Id: classes.conf.man,v 1.4.2.4 2004/06/29 13:15:10 mike Exp $".
+.\" End of "$Id$".
.\"
.\"
-.\" "$Id: cups-config.man,v 1.1.2.6 2004/06/29 13:15:10 mike Exp $"
+.\" "$Id$"
.\"
.\" cups-config man page for the Common UNIX Printing System (CUPS).
.\"
-.\" Copyright 1997-2004 by Easy Software Products.
+.\" Copyright 1997-2005 by Easy Software Products.
.\"
.\" These coded instructions, statements, and computer programs are the
.\" property of Easy Software Products and are protected by Federal
.\" Attn: CUPS Licensing Information
.\" Easy Software Products
.\" 44141 Airport View Drive, Suite 204
-.\" Hollywood, Maryland 20636-3142 USA
+.\" Hollywood, Maryland 20636 USA
.\"
.\" Voice: (301) 373-9600
.\" EMail: cups-info@cups.org
.\" WWW: http://www.cups.org
.\"
-.TH cups-config 1 "Common UNIX Printing System" "25 October 2001" "Easy Software Products"
+.TH cups-config 1 "Common UNIX Printing System" "27 May 2004" "Easy Software Products"
.SH NAME
cups-config \- get cups api, compiler, directory, and link information.
.SH SYNOPSIS
CUPS Software Programmers Manual,
http://localhost:631/documentation.html
.SH COPYRIGHT
-Copyright 1993-2004 by Easy Software Products, All Rights Reserved.
+Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
.\"
-.\" End of "$Id: cups-config.man,v 1.1.2.6 2004/06/29 13:15:10 mike Exp $".
+.\" End of "$Id$".
.\"
.\"
-.\" "$Id: cups-lpd.man,v 1.5.2.6 2004/08/11 13:49:01 mike Exp $"
+.\" "$Id$"
.\"
.\" cups-lpd man page for the Common UNIX Printing System (CUPS).
.\"
-.\" Copyright 1997-2004 by Easy Software Products.
+.\" Copyright 1997-2005 by Easy Software Products.
.\"
.\" These coded instructions, statements, and computer programs are the
.\" property of Easy Software Products and are protected by Federal
.\" Attn: CUPS Licensing Information
.\" Easy Software Products
.\" 44141 Airport View Drive, Suite 204
-.\" Hollywood, Maryland 20636-3142 USA
+.\" Hollywood, Maryland 20636 USA
.\"
.\" Voice: (301) 373-9600
.\" EMail: cups-info@cups.org
CUPS Software Administrators Manual,
http://localhost:631/documentation.html
.SH COPYRIGHT
-Copyright 1993-2004 by Easy Software Products, All Rights Reserved.
+Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
.\"
-.\" End of "$Id: cups-lpd.man,v 1.5.2.6 2004/08/11 13:49:01 mike Exp $".
+.\" End of "$Id$".
.\"
.\"
-.\" "$Id: cups-polld.man,v 1.3.2.4 2004/06/29 13:15:10 mike Exp $"
+.\" "$Id$"
.\"
.\" cups-polld man page for the Common UNIX Printing System (CUPS).
.\"
-.\" Copyright 1997-2004 by Easy Software Products.
+.\" Copyright 1997-2005 by Easy Software Products.
.\"
.\" These coded instructions, statements, and computer programs are the
.\" property of Easy Software Products and are protected by Federal
.\" Attn: CUPS Licensing Information
.\" Easy Software Products
.\" 44141 Airport View Drive, Suite 204
-.\" Hollywood, Maryland 20636-3142 USA
+.\" Hollywood, Maryland 20636 USA
.\"
.\" Voice: (301) 373-9600
.\" EMail: cups-info@cups.org
CUPS Software Administrators Manual,
http://localhost:631/documentation.html
.SH COPYRIGHT
-Copyright 1993-2004 by Easy Software Products, All Rights Reserved.
+Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
.\"
-.\" End of "$Id: cups-polld.man,v 1.3.2.4 2004/06/29 13:15:10 mike Exp $".
+.\" End of "$Id$".
.\"
.\"
-.\" "$Id: cupsaddsmb.man,v 1.2.2.7 2004/08/19 21:02:55 mike Exp $"
+.\" "$Id$"
.\"
.\" cupsaddsmb man page for the Common UNIX Printing System (CUPS).
.\"
-.\" Copyright 1997-2004 by Easy Software Products.
+.\" Copyright 1997-2005 by Easy Software Products.
.\"
.\" These coded instructions, statements, and computer programs are the
.\" property of Easy Software Products and are protected by Federal
CUPS Software Administrators Manual,
http://localhost:631/documentation.html
.SH COPYRIGHT
-Copyright 1993-2004 by Easy Software Products, All Rights Reserved.
+Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
.\"
-.\" End of "$Id: cupsaddsmb.man,v 1.2.2.7 2004/08/19 21:02:55 mike Exp $".
+.\" End of "$Id$".
.\"
.\"
-.\" "$Id: cupsd.conf.man,v 1.5.2.6 2004/08/19 12:46:28 mike Exp $"
+.\" "$Id$"
.\"
.\" cupsd.conf man page for the Common UNIX Printing System (CUPS).
.\"
-.\" Copyright 1997-2004 by Easy Software Products.
+.\" Copyright 1997-2005 by Easy Software Products.
.\"
.\" These coded instructions, statements, and computer programs are the
.\" property of Easy Software Products and are protected by Federal
.\" Attn: CUPS Licensing Information
.\" Easy Software Products
.\" 44141 Airport View Drive, Suite 204
-.\" Hollywood, Maryland 20636-3142 USA
+.\" Hollywood, Maryland 20636 USA
.\"
.\" Voice: (301) 373-9600
.\" EMail: cups-info@cups.org
.br
Specifies the authentication class (User, Group, System)
.TP 5
+AuthGroupName
+.br
+Specifies the authentication group.
+.TP 5
AuthType
.br
Specifies the authentication type (None, Basic, Digest)
.br
Specifies the error log filename.
.TP 5
+FaxRetryInterval
+.br
+Specifies the interval between retries of fax jobs in seconds.
+.TP 5
+FaxRetryLimit
+.br
+Specifies the number of retries that are done for fax jobs.
+.TP 5
+FileDevice
+.br
+Specifies whether the file pseudo-device can be used for new
+printer queues.
+.TP 5
FilterLimit
.br
Specifies the maximum cost of filters that are run concurrently.
Specifies whether or not to create implicit classes from identical
remote printers.
.TP 5
+Include
+.br
+Includes the named file.
+.TP 5
KeepAlive
.br
Specifies whether or not to support HTTP Keep-Alive.
.br
Specifies the maximum size of any print job request.
.TP 5
+Listen
+.br
+Listens to the specified address and port.
+.TP 5
<Location /path> ... </Location>
.br
Specifies access control for the named location.
.br
Specifies the maximum number of simultaneous clients to support.
.TP 5
+MaxClientsPerHost
+.br
+Specifies the maximum number of simultaneous clients to support from a
+single address.
+.TP 5
MaxCopies
.br
Specifies the maximum number of copies that a user can print of each job.
Specifies the filename for a printcap file that is updated automatically
with a list of available printers (needed for legacy applications)
.TP 5
+PrintcapFormat
+.br
+Specifies the format of the printcap file.
+.TP 5
PrintcapGUI
.br
Specifies whether to generate option panel definition files on some
Specifies what information is included in the Server header of HTTP
responses.
.TP 5
+SSLListen
+.br
+Listens on the specified address and port for encrypted connections.
+.TP 5
+SSLPort
+.br
+Listens on the specified port for encrypted connections.
+.TP 5
SystemGroup
.br
Specifies the group to use for System class authentication.
CUPS Software Administrators Manual,
http://localhost:631/documentation.html
.SH COPYRIGHT
-Copyright 1993-2004 by Easy Software Products, All Rights Reserved.
+Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
.\"
-.\" End of "$Id: cupsd.conf.man,v 1.5.2.6 2004/08/19 12:46:28 mike Exp $".
+.\" End of "$Id$".
.\"
.\"
-.\" "$Id: cupsd.man,v 1.5.2.6 2004/08/02 20:49:11 mike Exp $"
+.\" "$Id$"
.\"
.\" cupsd man page for the Common UNIX Printing System (CUPS).
.\"
-.\" Copyright 1997-2004 by Easy Software Products.
+.\" Copyright 1997-2005 by Easy Software Products.
.\"
.\" These coded instructions, statements, and computer programs are the
.\" property of Easy Software Products and are protected by Federal
.\" Attn: CUPS Licensing Information
.\" Easy Software Products
.\" 44141 Airport View Drive, Suite 204
-.\" Hollywood, Maryland 20636-3142 USA
+.\" Hollywood, Maryland 20636 USA
.\"
.\" Voice: (301) 373-9600
.\" EMail: cups-info@cups.org
CUPS Software Administrators Manual,
http://localhost:631/documentation.html
.SH COPYRIGHT
-Copyright 1993-2004 by Easy Software Products, All Rights Reserved.
+Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
.\"
-.\" End of "$Id: cupsd.man,v 1.5.2.6 2004/08/02 20:49:11 mike Exp $".
+.\" End of "$Id$".
.\"
.\"
-.\" "$Id: cupstestppd.man,v 1.1.2.5 2004/06/29 13:15:10 mike Exp $"
+.\" "$Id$"
.\"
.\" cupstestppd man page for the Common UNIX Printing System (CUPS).
.\"
-.\" Copyright 1997-2004 by Easy Software Products.
+.\" Copyright 1997-2005 by Easy Software Products.
.\"
.\" These coded instructions, statements, and computer programs are the
.\" property of Easy Software Products and are protected by Federal
.\" Attn: CUPS Licensing Information
.\" Easy Software Products
.\" 44141 Airport View Drive, Suite 204
-.\" Hollywood, Maryland 20636-3142 USA
+.\" Hollywood, Maryland 20636 USA
.\"
.\" Voice: (301) 373-9600
.\" EMail: cups-info@cups.org
.\" WWW: http://www.cups.org
.\"
-.TH cupstestppd 1 "Common UNIX Printing System" "14 February 2003" "Easy Software Products"
+.TH cupstestppd 1 "Common UNIX Printing System" "1 August 2003" "Easy Software Products"
.SH NAME
cupstestppd \- test conformance of ppd files
.SH SYNOPSIS
.B cupstestppd
-[ -q ] [ -v[v] ] filename.ppd[.gz] [ ... filenameN.ppd[.gz] ]
+[ -q ] [-r] [ -v[v] ] filename.ppd[.gz] [ ... filenameN.ppd[.gz] ]
.br
.B cupstestppd
-[ -q ] [ -v[v] ] -
+[ -q ] [-r] [ -v[v] ] -
.SH DESCRIPTION
\fIcupstestppd\fR tests the conformance of PPD files to the
Adobe PostScript Printer Description file format specification
.LP
The \fI-q\fR option specifies that no information should be displayed.
.LP
+The \fI-r\fR option relaxes the PPD conformance requirements so
+that common whitespace, control character, and formatting
+problems are not treated as hard errors.
+.LP
The \fI-v\fR option specifies that detailed conformance testing
results should be displayed rather than the concise PASS/FAIL/ERROR
status.
http://localhost:631/documentation.html,
Adobe PostScript Printer Description File Format Specification, Version 4.3.
.SH COPYRIGHT
-Copyright 1993-2004 by Easy Software Products, All Rights Reserved.
+Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
.\"
-.\" End of "$Id: cupstestppd.man,v 1.1.2.5 2004/06/29 13:15:10 mike Exp $".
+.\" End of "$Id$".
.\"
.\"
-.\" "$Id: enable.man,v 1.4.2.5 2004/06/29 13:15:10 mike Exp $"
+.\" "$Id$"
.\"
.\" enable/disable man page for the Common UNIX Printing System (CUPS).
.\"
-.\" Copyright 1997-2004 by Easy Software Products.
+.\" Copyright 1997-2005 by Easy Software Products.
.\"
.\" These coded instructions, statements, and computer programs are the
.\" property of Easy Software Products and are protected by Federal
.\" Attn: CUPS Licensing Information
.\" Easy Software Products
.\" 44141 Airport View Drive, Suite 204
-.\" Hollywood, Maryland 20636-3142 USA
+.\" Hollywood, Maryland 20636 USA
.\"
.\" Voice: (301) 373-9600
.\" EMail: cups-info@cups.org
CUPS Software Administrators Manual,
http://localhost:631/documentation.html
.SH COPYRIGHT
-Copyright 1993-2004 by Easy Software Products, All Rights Reserved.
+Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
.\"
-.\" End of "$Id: enable.man,v 1.4.2.5 2004/06/29 13:15:10 mike Exp $".
+.\" End of "$Id$".
.\"
.\"
-.\" "$Id: filter.man,v 1.6.2.5 2004/06/29 13:15:10 mike Exp $"
+.\" "$Id$"
.\"
.\" filter man page for the Common UNIX Printing System (CUPS).
.\"
-.\" Copyright 1997-2004 by Easy Software Products.
+.\" Copyright 1997-2005 by Easy Software Products.
.\"
.\" These coded instructions, statements, and computer programs are the
.\" property of Easy Software Products and are protected by Federal
.\" Attn: CUPS Licensing Information
.\" Easy Software Products
.\" 44141 Airport View Drive, Suite 204
-.\" Hollywood, Maryland 20636-3142 USA
+.\" Hollywood, Maryland 20636 USA
.\"
.\" Voice: (301) 373-9600
.\" EMail: cups-info@cups.org
.TP 5
USER
.br
-The user executing the filter (typically lp).
+The user executing the filter, typically lp; consult the cupsd.conf file for
+the current setting.
.SH COMPATIBILITY
While the filter interface is compatible with System V interface
scripts, it will only work with the System V interface script as the
CUPS Software Programmers Manual,
http://localhost:631/documentation.html
.SH COPYRIGHT
-Copyright 1993-2004 by Easy Software Products, All Rights Reserved.
+Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
.\"
-.\" End of "$Id: filter.man,v 1.6.2.5 2004/06/29 13:15:10 mike Exp $".
+.\" End of "$Id$".
.\"
.\"
-.\" "$Id: lp.man,v 1.6.2.6 2004/06/29 13:15:10 mike Exp $"
+.\" "$Id$"
.\"
.\" lp/cancel man page for the Common UNIX Printing System (CUPS).
.\"
-.\" Copyright 1997-2004 by Easy Software Products.
+.\" Copyright 1997-2005 by Easy Software Products.
.\"
.\" These coded instructions, statements, and computer programs are the
.\" property of Easy Software Products and are protected by Federal
.\" Attn: CUPS Licensing Information
.\" Easy Software Products
.\" 44141 Airport View Drive, Suite 204
-.\" Hollywood, Maryland 20636-3142 USA
+.\" Hollywood, Maryland 20636 USA
.\"
.\" Voice: (301) 373-9600
.\" EMail: cups-info@cups.org
.B cancel
[ \-a ] [ -h
.I server
+] [ -u
+.I username
] [
.I id
] [
.br
Sets the job name.
.TP 5
+\-u \fIusername\fR
+.br
+Cancels jobs owned by \fIusername\fR.
+.TP 5
\-H \fIhandling\fR
.br
Specifies when the job should be printed. A value of
\fIhold\fR will hold the job indefinitely, and a time value
(HH:MM) will hold the job until the specified time. Use a value
of \fIresume\fR with the \fI-i\fR option to resume a held job.
+Use a value of \fIrestart\fR with the \fI-i\fR option to restart
+a completed job.
.TP 5
\-P \fIpage-list\fR
.br
The "q" option accepts a different range of values than the
Solaris lp command, matching the IPP job priority values (1-100)
instead of the Solaris values (0-39).
+.SH NOTES
+Administrators wishing to prevent unauthorized cancellation of
+jobs via the \fI-u\fR option should password-protect the /jobs
+location in \fIcupsd.conf(5)\fR.
.SH SEE ALSO
lpstat(1),
CUPS Software Users Manual,
http://localhost:631/documentation.html
.SH COPYRIGHT
-Copyright 1993-2004 by Easy Software Products, All Rights Reserved.
+Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
.\"
-.\" End of "$Id: lp.man,v 1.6.2.6 2004/06/29 13:15:10 mike Exp $".
+.\" End of "$Id$".
.\"
.\"
-.\" "$Id: lpadmin.man,v 1.4.2.7 2004/06/29 13:15:10 mike Exp $"
+.\" "$Id$"
.\"
.\" lpadmin man page for the Common UNIX Printing System (CUPS).
.\"
-.\" Copyright 1997-2004 by Easy Software Products.
+.\" Copyright 1997-2005 by Easy Software Products.
.\"
.\" These coded instructions, statements, and computer programs are the
.\" property of Easy Software Products and are protected by Federal
.\" Attn: CUPS Licensing Information
.\" Easy Software Products
.\" 44141 Airport View Drive, Suite 204
-.\" Hollywood, Maryland 20636-3142 USA
+.\" Hollywood, Maryland 20636 USA
.\"
.\" Voice: (301) 373-9600
.\" EMail: cups-info@cups.org
.\" WWW: http://www.cups.org
.\"
-.TH lpadmin 8 "Common UNIX Printing System" "23 January 2001" "Easy Software Products"
+.TH lpadmin 8 "Common UNIX Printing System" "21 October 2002" "Easy Software Products"
.SH NAME
lpadmin \- configure cups printers and classes
.SH SYNOPSIS
] \-x
.I destination
.SH DESCRIPTION
-\fIlpadmin\fR configures printer and class queues provided by CUPS. It can also
-be used to set the system default printer or class.
+\fIlpadmin\fR configures printer and class queues provided by
+CUPS. It can also be used to set the server default printer or
+class.
.LP
When specified before the \fI-d\fR, \fI-p\fR, or \fI-x\fR options,
the \fI-E\fR option forces encryption when connecting to the server.
The first form of the command sets the default printer or class to
\fIdestination\fR. Subsequent print jobs submitted via the \fIlp(1)\fR or
\fIlpr(1)\fR commands will use this destination unless the user specifies
-otherwise.
+otherwise with the \fIlpoptions(1)\fR command.
.LP
The second form of the command configures the named printer. The additional
options are described below.
CUPS Software Administrators Manual,
http://localhost:631/documentation.html
.SH COPYRIGHT
-Copyright 1993-2004 by Easy Software Products, All Rights Reserved.
+Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
.\"
-.\" End of "$Id: lpadmin.man,v 1.4.2.7 2004/06/29 13:15:10 mike Exp $".
+.\" End of "$Id$".
.\"
.\"
-.\" "$Id: lpc.man,v 1.3.2.4 2004/06/29 13:15:10 mike Exp $"
+.\" "$Id$"
.\"
.\" lpc man page for the Common UNIX Printing System (CUPS).
.\"
-.\" Copyright 1997-2004 by Easy Software Products.
+.\" Copyright 1997-2005 by Easy Software Products.
.\"
.\" These coded instructions, statements, and computer programs are the
.\" property of Easy Software Products and are protected by Federal
.\" Attn: CUPS Licensing Information
.\" Easy Software Products
.\" 44141 Airport View Drive, Suite 204
-.\" Hollywood, Maryland 20636-3142 USA
+.\" Hollywood, Maryland 20636 USA
.\"
.\" Voice: (301) 373-9600
.\" EMail: cups-info@cups.org
CUPS Software Administrators Manual,
http://localhost:631/documentation.html
.SH COPYRIGHT
-Copyright 1993-2004 by Easy Software Products, All Rights Reserved.
+Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
.\"
-.\" End of "$Id: lpc.man,v 1.3.2.4 2004/06/29 13:15:10 mike Exp $".
+.\" End of "$Id$".
.\"
.\"
-.\" "$Id: lpinfo.man,v 1.5.2.4 2004/06/29 13:15:10 mike Exp $"
+.\" "$Id$"
.\"
.\" lpinfo man page for the Common UNIX Printing System (CUPS).
.\"
-.\" Copyright 1997-2004 by Easy Software Products.
+.\" Copyright 1997-2005 by Easy Software Products.
.\"
.\" These coded instructions, statements, and computer programs are the
.\" property of Easy Software Products and are protected by Federal
.\" Attn: CUPS Licensing Information
.\" Easy Software Products
.\" 44141 Airport View Drive, Suite 204
-.\" Hollywood, Maryland 20636-3142 USA
+.\" Hollywood, Maryland 20636 USA
.\"
.\" Voice: (301) 373-9600
.\" EMail: cups-info@cups.org
CUPS Software Administrators Manual,
http://localhost:631/documentation.html
.SH COPYRIGHT
-Copyright 1993-2004 by Easy Software Products, All Rights Reserved.
+Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
.\"
-.\" End of "$Id: lpinfo.man,v 1.5.2.4 2004/06/29 13:15:10 mike Exp $".
+.\" End of "$Id$".
.\"
.\"
-.\" "$Id: lpmove.man,v 1.5.2.4 2004/06/29 13:15:10 mike Exp $"
+.\" "$Id$"
.\"
.\" lpmove man page for the Common UNIX Printing System (CUPS).
.\"
-.\" Copyright 1997-2004 by Easy Software Products.
+.\" Copyright 1997-2005 by Easy Software Products.
.\"
.\" These coded instructions, statements, and computer programs are the
.\" property of Easy Software Products and are protected by Federal
.\" Attn: CUPS Licensing Information
.\" Easy Software Products
.\" 44141 Airport View Drive, Suite 204
-.\" Hollywood, Maryland 20636-3142 USA
+.\" Hollywood, Maryland 20636 USA
.\"
.\" Voice: (301) 373-9600
.\" EMail: cups-info@cups.org
CUPS Software Users Manual,
http://localhost:631/documentation.html
.SH COPYRIGHT
-Copyright 1993-2004 by Easy Software Products, All Rights Reserved.
+Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
.\"
-.\" End of "$Id: lpmove.man,v 1.5.2.4 2004/06/29 13:15:10 mike Exp $".
+.\" End of "$Id$".
.\"
.\"
-.\" "$Id: lpoptions.man,v 1.6.2.5 2004/06/29 13:15:10 mike Exp $"
+.\" "$Id$"
.\"
.\" lpoptions man page for the Common UNIX Printing System (CUPS).
.\"
-.\" Copyright 1997-2004 by Easy Software Products.
+.\" Copyright 1997-2005 by Easy Software Products.
.\"
.\" These coded instructions, statements, and computer programs are the
.\" property of Easy Software Products and are protected by Federal
.\" Attn: CUPS Licensing Information
.\" Easy Software Products
.\" 44141 Airport View Drive, Suite 204
-.\" Hollywood, Maryland 20636-3142 USA
+.\" Hollywood, Maryland 20636 USA
.\"
.\" Voice: (301) 373-9600
.\" EMail: cups-info@cups.org
.\" WWW: http://www.cups.org
.\"
-.TH lpoptions 1 "Common UNIX Printing System" "5 September 2000" "Easy Software Products"
+.TH lpoptions 1 "Common UNIX Printing System" "21 October 2002" "Easy Software Products"
.SH NAME
lpoptions \- display or set printer options and defaults
.SH SYNOPSIS
.B lpoptions
[ -h
.I server
-] [ -p
+] [ -E ] [ -p
.I dest[/instance]
] -l
.br
.B lpoptions
[ -h
.I server
-] [ -o
+] [ -E ] [ -o
.I option=value
] ... [ -o
.I option=value
.B lpoptions
[ -h
.I server
-] -x
+] [ -E ] -x
.I dest[/instance]
.SH DESCRIPTION
\fBlpoptions\fR displays or sets printer options and defaults.
\fBlpoptions\fR shows the default printer options when run with no
arguments. Other options include:
.TP 5
+\-E
+.br
+Enables encryption when communicating with the CUPS server.
+.TP 5
\-d \fIdest[/instance]\fR
.br
Sets the default printer to \fIdest\fR. If \fIinstance\fR is supplied then
.LP
Options set with the \fBlpoptions\fR command are used by the \fBlp(1)\fR
and \fBlpr(1)\fR commands when submitting jobs.
+.SH ROOT ACCOUNT OPTIONS
+When run by the root user, \fBlpoptions\fR gets and sets default
+options and instances for \fIall users\fR in the
+/etc/cups/lpoptions file.
.SH COMPATIBILITY
The \fBlpoptions\fR command is unique to CUPS.
+.SH FILES
+~/.lpoptions - user defaults and instances created by non-root users.
+.br
+/etc/cups/lpoptions - system-wide defaults and instances created by the root
+user.
.SH SEE ALSO
cancel(1), lp(1),
CUPS Software Users Manual,
http://localhost:631/documentation.html
.SH COPYRIGHT
-Copyright 1993-2004 by Easy Software Products, All Rights Reserved.
+Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
.\"
-.\" End of "$Id: lpoptions.man,v 1.6.2.5 2004/06/29 13:15:10 mike Exp $".
+.\" End of "$Id$".
.\"
.\"
-.\" "$Id: lppasswd.man,v 1.1.2.5 2004/06/29 13:15:10 mike Exp $"
+.\" "$Id$"
.\"
.\" lpadmin man page for the Common UNIX Printing System (CUPS).
.\"
-.\" Copyright 1997-2004 by Easy Software Products.
+.\" Copyright 1997-2005 by Easy Software Products.
.\"
.\" These coded instructions, statements, and computer programs are the
.\" property of Easy Software Products and are protected by Federal
.\" Attn: CUPS Licensing Information
.\" Easy Software Products
.\" 44141 Airport View Drive, Suite 204
-.\" Hollywood, Maryland 20636-3142 USA
+.\" Hollywood, Maryland 20636 USA
.\"
.\" Voice: (301) 373-9600
.\" EMail: cups-info@cups.org
CUPS Software Users Manual,
http://localhost:631/documentation.html
.SH COPYRIGHT
-Copyright 1993-2004 by Easy Software Products, All Rights Reserved.
+Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
.\"
-.\" End of "$Id: lppasswd.man,v 1.1.2.5 2004/06/29 13:15:10 mike Exp $".
+.\" End of "$Id$".
.\"
.\"
-.\" "$Id: lpq.man,v 1.5.2.4 2004/06/29 13:15:10 mike Exp $"
+.\" "$Id$"
.\"
.\" lpq man page for the Common UNIX Printing System (CUPS).
.\"
-.\" Copyright 1997-2004 by Easy Software Products.
+.\" Copyright 1997-2005 by Easy Software Products.
.\"
.\" These coded instructions, statements, and computer programs are the
.\" property of Easy Software Products and are protected by Federal
.\" Attn: CUPS Licensing Information
.\" Easy Software Products
.\" 44141 Airport View Drive, Suite 204
-.\" Hollywood, Maryland 20636-3142 USA
+.\" Hollywood, Maryland 20636 USA
.\"
.\" Voice: (301) 373-9600
.\" EMail: cups-info@cups.org
CUPS Software Users Manual,
http://localhost:631/documentation.html
.SH COPYRIGHT
-Copyright 1993-2004 by Easy Software Products, All Rights Reserved.
+Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
.\"
-.\" End of "$Id: lpq.man,v 1.5.2.4 2004/06/29 13:15:10 mike Exp $".
+.\" End of "$Id$".
.\"
.\"
-.\" "$Id: lpr.man,v 1.4.2.4 2004/06/29 13:15:10 mike Exp $"
+.\" "$Id$"
.\"
.\" lpr man page for the Common UNIX Printing System (CUPS).
.\"
-.\" Copyright 1997-2004 by Easy Software Products.
+.\" Copyright 1997-2005 by Easy Software Products.
.\"
.\" These coded instructions, statements, and computer programs are the
.\" property of Easy Software Products and are protected by Federal
.\" Attn: CUPS Licensing Information
.\" Easy Software Products
.\" 44141 Airport View Drive, Suite 204
-.\" Hollywood, Maryland 20636-3142 USA
+.\" Hollywood, Maryland 20636 USA
.\"
.\" Voice: (301) 373-9600
.\" EMail: cups-info@cups.org
.\" WWW: http://www.cups.org
.\"
-.TH lpr 1 "Common UNIX Printing System" "23 January 2001" "Easy Software Products"
+.TH lpr 1 "Common UNIX Printing System" "16 December 2004" "Easy Software Products"
.SH NAME
lpr \- print files
.SH SYNOPSIS
.B lpr
[ -E ] [ \-P
.I destination
+] [ \-U
+.I username
] [ \-#
.I num-copies
[ \-l ] [ \-o
.br
Sets the job name.
.TP 5
+\-U \fIusername\fR
+.br
+Sets the user name.
+.TP 5
\-l
.br
Specifies that the print file is already formatted for the destination and
CUPS Software Users Manual,
http://localhost:631/documentation.html
.SH COPYRIGHT
-Copyright 1993-2004 by Easy Software Products, All Rights Reserved.
+Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
.\"
-.\" End of "$Id: lpr.man,v 1.4.2.4 2004/06/29 13:15:10 mike Exp $".
+.\" End of "$Id$".
.\"
.\"
-.\" "$Id: lprm.man,v 1.4.2.4 2004/06/29 13:15:10 mike Exp $"
+.\" "$Id$"
.\"
.\" lprm man page for the Common UNIX Printing System (CUPS).
.\"
-.\" Copyright 1997-2004 by Easy Software Products.
+.\" Copyright 1997-2005 by Easy Software Products.
.\"
.\" These coded instructions, statements, and computer programs are the
.\" property of Easy Software Products and are protected by Federal
.\" Attn: CUPS Licensing Information
.\" Easy Software Products
.\" 44141 Airport View Drive, Suite 204
-.\" Hollywood, Maryland 20636-3142 USA
+.\" Hollywood, Maryland 20636 USA
.\"
.\" Voice: (301) 373-9600
.\" EMail: cups-info@cups.org
.\" WWW: http://www.cups.org
.\"
-.TH lprm 1 "Common UNIX Printing System" "23 January 2001" "Easy Software Products"
+.TH lprm 1 "Common UNIX Printing System" "16 December 2004" "Easy Software Products"
.SH NAME
lprm \- cancel print jobs
.SH SYNOPSIS
.B lprm
-[ -E ] [ - ] [ -P
+[ -E ] [ -P
.I destination
-] [
+] [ - ] [
.I job ID(s)
]
.SH DESCRIPTION
CUPS Software Users Manual,
http://localhost:631/documentation.html
.SH COPYRIGHT
-Copyright 1993-2004 by Easy Software Products, All Rights Reserved.
+Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
.\"
-.\" End of "$Id: lprm.man,v 1.4.2.4 2004/06/29 13:15:10 mike Exp $".
+.\" End of "$Id$".
.\"
.\"
-.\" "$Id: lpstat.man,v 1.5.2.4 2004/06/29 13:15:10 mike Exp $"
+.\" "$Id$"
.\"
.\" lpstat man page for the Common UNIX Printing System (CUPS).
.\"
-.\" Copyright 1997-2004 by Easy Software Products.
+.\" Copyright 1997-2005 by Easy Software Products.
.\"
.\" These coded instructions, statements, and computer programs are the
.\" property of Easy Software Products and are protected by Federal
.\" Attn: CUPS Licensing Information
.\" Easy Software Products
.\" 44141 Airport View Drive, Suite 204
-.\" Hollywood, Maryland 20636-3142 USA
+.\" Hollywood, Maryland 20636 USA
.\"
.\" Voice: (301) 373-9600
.\" EMail: cups-info@cups.org
.\" WWW: http://www.cups.org
.\"
-.TH lpstat 1 "Common UNIX Printing System" "23 January 2001" "Easy Software Products"
+.TH lpstat 1 "Common UNIX Printing System" "3 January 2005" "Easy Software Products"
.SH NAME
lpstat \- print cups status information
.SH SYNOPSIS
.B lpstat
-[ -E ] [ -a [
+[ -E ] [ -h
+.I server
+] [ -l ] [ -W
+.I which-jobs
+] [ -a [
.I destination(s)
] ] [ -c [
.I class(es)
-] [ -d ] [ -h
-.I server
-] [ -l ] [ -o [
+] [ -d ] [ -o [
.I destination(s)
] ] [ -p [
.I printer(s)
Shows a status summary, including the default destination, a
list of classes and their member printers, and a list of printers and
their associated devices. This is equivalent to using the "-d", "-c",
-and "-p" options.
+and "-v" options.
.TP 5
\-t
.br
Shows all status information. This is equivalent to using the "-r",
-"-d", "-c", "-d", "-v", "-a", "-p", and "-o" options.
+"-d", "-c", "-v", "-a", "-p", and "-o" options.
.TP 5
\-u [\fIuser(s)\fR]
.br
.br
Shows the printers and what device they are attached to. If no printers
are specified then all printers are listed.
+.TP 5
+\-W [\fIwhich-jobs\fR]
+.br
+Specifies which jobs to show, \fIcompleted\fR or
+\fInot-completed\fR (the default). This option \fBmust\fR appear
+before the \fI-o\fR option and/or any printer names, otherwise
+the default (not-completed) value will be used in the request to
+the scheduler.
.SH COMPATIBILITY
-Unlike the System V printing system, CUPS allows printer names to contain
-any printable character except SPACE and TAB. Also, printer and class names are
-\fBnot\fR case-sensitive.
+Unlike the System V printing system, CUPS allows printer names
+to contain any printable character except SPACE and TAB. Also,
+printer and class names are \fBnot\fR case-sensitive.
.LP
-The "-h" option is not a standard System V option.
+The "-h" and "-W" options are unique to CUPS.
.LP
The Solaris "-f", "-P", and "-S" options are silently ignored.
.SH SEE ALSO
CUPS Software Users Manual,
http://localhost:631/documentation.html
.SH COPYRIGHT
-Copyright 1993-2004 by Easy Software Products, All Rights Reserved.
+Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
.\"
-.\" End of "$Id: lpstat.man,v 1.5.2.4 2004/06/29 13:15:10 mike Exp $".
+.\" End of "$Id$".
.\"
.\"
-.\" "$Id: mime.convs.man,v 1.4.2.4 2004/06/29 13:15:10 mike Exp $"
+.\" "$Id$"
.\"
.\" mime.convs man page for the Common UNIX Printing System (CUPS).
.\"
-.\" Copyright 1997-2004 by Easy Software Products.
+.\" Copyright 1997-2005 by Easy Software Products.
.\"
.\" These coded instructions, statements, and computer programs are the
.\" property of Easy Software Products and are protected by Federal
.\" Attn: CUPS Licensing Information
.\" Easy Software Products
.\" 44141 Airport View Drive, Suite 204
-.\" Hollywood, Maryland 20636-3142 USA
+.\" Hollywood, Maryland 20636 USA
.\"
.\" Voice: (301) 373-9600
.\" EMail: cups-info@cups.org
CUPS Software Administrators Manual,
http://localhost:631/documentation.html
.SH COPYRIGHT
-Copyright 1993-2004 by Easy Software Products, All Rights Reserved.
+Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
.\"
-.\" End of "$Id: mime.convs.man,v 1.4.2.4 2004/06/29 13:15:10 mike Exp $".
+.\" End of "$Id$".
.\"
.\"
-.\" "$Id: mime.types.man,v 1.4.2.5 2004/06/29 13:15:10 mike Exp $"
+.\" "$Id$"
.\"
.\" mime.types man page for the Common UNIX Printing System (CUPS).
.\"
-.\" Copyright 1997-2004 by Easy Software Products.
+.\" Copyright 1997-2005 by Easy Software Products.
.\"
.\" These coded instructions, statements, and computer programs are the
.\" property of Easy Software Products and are protected by Federal
.\" Attn: CUPS Licensing Information
.\" Easy Software Products
.\" 44141 Airport View Drive, Suite 204
-.\" Hollywood, Maryland 20636-3142 USA
+.\" Hollywood, Maryland 20636 USA
.\"
.\" Voice: (301) 373-9600
.\" EMail: cups-info@cups.org
CUPS Software Administrators Manual,
http://localhost:631/documentation.html
.SH COPYRIGHT
-Copyright 1993-2004 by Easy Software Products, All Rights Reserved.
+Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
.\"
-.\" End of "$Id: mime.types.man,v 1.4.2.5 2004/06/29 13:15:10 mike Exp $".
+.\" End of "$Id$".
.\"
.\"
-.\" "$Id: printers.conf.man,v 1.4.2.4 2004/06/29 13:15:10 mike Exp $"
+.\" "$Id$"
.\"
.\" printers.conf man page for the Common UNIX Printing System (CUPS).
.\"
-.\" Copyright 1997-2004 by Easy Software Products.
+.\" Copyright 1997-2005 by Easy Software Products.
.\"
.\" These coded instructions, statements, and computer programs are the
.\" property of Easy Software Products and are protected by Federal
.\" Attn: CUPS Licensing Information
.\" Easy Software Products
.\" 44141 Airport View Drive, Suite 204
-.\" Hollywood, Maryland 20636-3142 USA
+.\" Hollywood, Maryland 20636 USA
.\"
.\" Voice: (301) 373-9600
.\" EMail: cups-info@cups.org
CUPS Interface Design Description,
http://localhost:631/documentation.html
.SH COPYRIGHT
-Copyright 1993-2004 by Easy Software Products, All Rights Reserved.
+Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
.\"
-.\" End of "$Id: printers.conf.man,v 1.4.2.4 2004/06/29 13:15:10 mike Exp $".
+.\" End of "$Id$".
.\"
#
-# "$Id: Makefile,v 1.8.2.5 2004/06/29 03:46:30 mike Exp $"
+# "$Id$"
#
# PPD file makefile for the Common UNIX Printing System (CUPS).
#
-# Copyright 1993-2004 by Easy Software Products.
+# Copyright 1993-2005 by Easy Software Products.
#
# These coded instructions, statements, and computer programs are the
# property of Easy Software Products and are protected by Federal
# Attn: CUPS Licensing Information
# Easy Software Products
# 44141 Airport View Drive, Suite 204
-# Hollywood, Maryland 20636-3142 USA
+# Hollywood, Maryland 20636 USA
#
# Voice: (301) 373-9600
# EMail: cups-info@cups.org
FILES = deskjet.ppd deskjet2.ppd dymo.ppd epson9.ppd epson24.ppd \
laserjet.ppd okidata9.ppd okidat24.ppd stcolor.ppd \
- stcolor2.ppd stphoto.ppd stphoto2.ppd
+ stcolor2.ppd stphoto.ppd stphoto2.ppd zebra.ppd
#
#
-# End of "$Id: Makefile,v 1.8.2.5 2004/06/29 03:46:30 mike Exp $".
+# End of "$Id$".
#
*PPD-Adobe: "4.3"
*%
-*% "$Id: deskjet.ppd,v 1.9.2.2 2002/01/02 18:04:55 mike Exp $"
+*% "$Id$"
*%
*% Sample HP DeskJet driver PPD file for the Common UNIX Printing
*% System (CUPS).
*%
-*% Copyright 1997-2002 by Easy Software Products.
+*% Copyright 1997-2005 by Easy Software Products.
*%
*% These coded instructions, statements, and computer programs are the
*% property of Easy Software Products and are protected by Federal
*% Attn: CUPS Licensing Information
*% Easy Software Products
*% 44141 Airport View Drive, Suite 204
-*% Hollywood, Maryland 20636-3111 USA
+*% Hollywood, Maryland 20636 USA
*%
-*% Voice: (301) 373-9603
+*% Voice: (301) 373-9600
*% EMail: cups-info@cups.org
*% WWW: http://www.cups.org
*%
*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
*Font ZapfDingbats: Special "(001.004S)" Standard ROM
*%
-*% End of "$Id: deskjet.ppd,v 1.9.2.2 2002/01/02 18:04:55 mike Exp $".
+*% End of "$Id$".
*%
*PPD-Adobe: "4.3"
*%
-*% "$Id: deskjet2.ppd,v 1.1.2.3 2002/01/02 18:04:55 mike Exp $"
+*% "$Id$"
*%
*% Second sample HP DeskJet driver PPD file for the Common UNIX Printing
*% System (CUPS).
*%
-*% Copyright 1997-2002 by Easy Software Products.
+*% Copyright 1997-2005 by Easy Software Products.
*%
*% These coded instructions, statements, and computer programs are the
*% property of Easy Software Products and are protected by Federal
*% Attn: CUPS Licensing Information
*% Easy Software Products
*% 44141 Airport View Drive, Suite 204
-*% Hollywood, Maryland 20636-3111 USA
+*% Hollywood, Maryland 20636 USA
*%
-*% Voice: (301) 373-9603
+*% Voice: (301) 373-9600
*% EMail: cups-info@cups.org
*% WWW: http://www.cups.org
*%
*DefaultOption1: False
*Option1 True/Installed: ""
*Option1 False/Not Installed: ""
-*CloseUI *Option1
+*CloseUI: *Option1
*CloseGroup: InstallableOptions
*DefaultFont: Courier
*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
*Font ZapfDingbats: Special "(001.004S)" Standard ROM
*%
-*% End of "$Id: deskjet2.ppd,v 1.1.2.3 2002/01/02 18:04:55 mike Exp $".
+*% End of "$Id$".
*%
*PPD-Adobe: "4.3"
*%
-*% "$Id: dymo.ppd,v 1.4.2.2 2002/01/02 18:04:55 mike Exp $"
+*% "$Id$"
*%
*% Sample DYMO label printer driver PPD file for the Common UNIX Printing
*% System (CUPS).
*%
-*% Copyright 2001-2002 by Easy Software Products.
+*% Copyright 2001-2005 by Easy Software Products.
*%
*% These coded instructions, statements, and computer programs are the
*% property of Easy Software Products and are protected by Federal
*% Attn: CUPS Licensing Information
*% Easy Software Products
*% 44141 Airport View Drive, Suite 204
-*% Hollywood, Maryland 20636-3111 USA
+*% Hollywood, Maryland 20636 USA
*%
-*% Voice: (301) 373-9603
+*% Voice: (301) 373-9600
*% EMail: cups-info@cups.org
*% WWW: http://www.cups.org
*%
*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
*Font ZapfDingbats: Special "(001.004S)" Standard ROM
*%
-*% End of "$Id: dymo.ppd,v 1.4.2.2 2002/01/02 18:04:55 mike Exp $".
+*% End of "$Id$".
*%
*PPD-Adobe: "4.3"
*%
-*% "$Id: epson24.ppd,v 1.3.2.2 2002/10/15 14:42:37 mike Exp $"
+*% "$Id$"
*%
*% Sample EPSON 24-Pin driver PPD file for the Common UNIX Printing
*% System (CUPS).
*%
-*% Copyright 1997-2002 by Easy Software Products.
+*% Copyright 1997-2005 by Easy Software Products.
*%
*% These coded instructions, statements, and computer programs are the
*% property of Easy Software Products and are protected by Federal
*% Attn: CUPS Licensing Information
*% Easy Software Products
*% 44141 Airport View Drive, Suite 204
-*% Hollywood, Maryland 20636-3111 USA
+*% Hollywood, Maryland 20636 USA
*%
-*% Voice: (301) 373-9603
+*% Voice: (301) 373-9600
*% EMail: cups-info@cups.org
*% WWW: http://www.cups.org
*%
*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
*Font ZapfDingbats: Special "(001.004S)" Standard ROM
*%
-*% End of "$Id: epson24.ppd,v 1.3.2.2 2002/10/15 14:42:37 mike Exp $".
+*% End of "$Id$".
*%
*PPD-Adobe: "4.3"
*%
-*% "$Id: epson9.ppd,v 1.3.2.2 2002/10/15 14:42:37 mike Exp $"
+*% "$Id$"
*%
*% Sample EPSON 9-Pin driver PPD file for the Common UNIX Printing
*% System (CUPS).
*%
-*% Copyright 1997-2002 by Easy Software Products.
+*% Copyright 1997-2005 by Easy Software Products.
*%
*% These coded instructions, statements, and computer programs are the
*% property of Easy Software Products and are protected by Federal
*% Attn: CUPS Licensing Information
*% Easy Software Products
*% 44141 Airport View Drive, Suite 204
-*% Hollywood, Maryland 20636-3111 USA
+*% Hollywood, Maryland 20636 USA
*%
-*% Voice: (301) 373-9603
+*% Voice: (301) 373-9600
*% EMail: cups-info@cups.org
*% WWW: http://www.cups.org
*%
*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
*Font ZapfDingbats: Special "(001.004S)" Standard ROM
*%
-*% End of "$Id: epson9.ppd,v 1.3.2.2 2002/10/15 14:42:37 mike Exp $".
+*% End of "$Id$".
*%
*PPD-Adobe: "4.3"
*%
-*% "$Id: laserjet.ppd,v 1.7.2.2 2002/01/02 18:04:56 mike Exp $"
+*% "$Id$"
*%
*% Sample HP LaserJet driver PPD file for the Common UNIX Printing
*% System (CUPS).
*%
-*% Copyright 1997-2002 by Easy Software Products.
+*% Copyright 1997-2005 by Easy Software Products.
*%
*% These coded instructions, statements, and computer programs are the
*% property of Easy Software Products and are protected by Federal
*% Attn: CUPS Licensing Information
*% Easy Software Products
*% 44141 Airport View Drive, Suite 204
-*% Hollywood, Maryland 20636-3111 USA
+*% Hollywood, Maryland 20636 USA
*%
-*% Voice: (301) 373-9603
+*% Voice: (301) 373-9600
*% EMail: cups-info@cups.org
*% WWW: http://www.cups.org
*%
*DefaultOption1: False
*Option1 True/Installed: ""
*Option1 False/Not Installed: ""
-*CloseUI *Option1
+*CloseUI: *Option1
*CloseGroup: InstallableOptions
*DefaultFont: Courier
*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
*Font ZapfDingbats: Special "(001.004S)" Standard ROM
*%
-*% End of "$Id: laserjet.ppd,v 1.7.2.2 2002/01/02 18:04:56 mike Exp $".
+*% End of "$Id$".
*%
*PPD-Adobe: "4.3"
*%
-*% "$Id: okidat24.ppd,v 1.2.2.1 2002/01/02 18:04:56 mike Exp $"
+*% "$Id$"
*%
*% Sample OKIDATA 24-Pin driver PPD file for the Common UNIX Printing
*% System (CUPS).
*%
-*% Copyright 1997-2002 by Easy Software Products.
+*% Copyright 1997-2005 by Easy Software Products.
*%
*% These coded instructions, statements, and computer programs are the
*% property of Easy Software Products and are protected by Federal
*% Attn: CUPS Licensing Information
*% Easy Software Products
*% 44141 Airport View Drive, Suite 204
-*% Hollywood, Maryland 20636-3111 USA
+*% Hollywood, Maryland 20636 USA
*%
-*% Voice: (301) 373-9603
+*% Voice: (301) 373-9600
*% EMail: cups-info@cups.org
*% WWW: http://www.cups.org
*%
*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
*Font ZapfDingbats: Special "(001.004S)" Standard ROM
*%
-*% End of "$Id: okidat24.ppd,v 1.2.2.1 2002/01/02 18:04:56 mike Exp $".
+*% End of "$Id$".
*%
*PPD-Adobe: "4.3"
*%
-*% "$Id: okidata9.ppd,v 1.2.2.1 2002/01/02 18:04:56 mike Exp $"
+*% "$Id$"
*%
*% Sample OKIDATA 9-Pin driver PPD file for the Common UNIX Printing
*% System (CUPS).
*%
-*% Copyright 1997-2002 by Easy Software Products.
+*% Copyright 1997-2005 by Easy Software Products.
*%
*% These coded instructions, statements, and computer programs are the
*% property of Easy Software Products and are protected by Federal
*% Attn: CUPS Licensing Information
*% Easy Software Products
*% 44141 Airport View Drive, Suite 204
-*% Hollywood, Maryland 20636-3111 USA
+*% Hollywood, Maryland 20636 USA
*%
-*% Voice: (301) 373-9603
+*% Voice: (301) 373-9600
*% EMail: cups-info@cups.org
*% WWW: http://www.cups.org
*%
*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
*Font ZapfDingbats: Special "(001.004S)" Standard ROM
*%
-*% End of "$Id: okidata9.ppd,v 1.2.2.1 2002/01/02 18:04:56 mike Exp $".
+*% End of "$Id$".
*%
*PPD-Adobe: "4.3"
*%
-*% "$Id: stcolor.ppd,v 1.6.2.1 2002/01/02 18:04:56 mike Exp $"
+*% "$Id$"
*%
*% Sample EPSON Stylus Color driver PPD file for the Common UNIX Printing
*% System (CUPS).
*%
-*% Copyright 1997-2002 by Easy Software Products.
+*% Copyright 1997-2005 by Easy Software Products.
*%
*% These coded instructions, statements, and computer programs are the
*% property of Easy Software Products and are protected by Federal
*% Attn: CUPS Licensing Information
*% Easy Software Products
*% 44141 Airport View Drive, Suite 204
-*% Hollywood, Maryland 20636-3111 USA
+*% Hollywood, Maryland 20636 USA
*%
-*% Voice: (301) 373-9603
+*% Voice: (301) 373-9600
*% EMail: cups-info@cups.org
*% WWW: http://www.cups.org
*%
*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
*Font ZapfDingbats: Special "(001.004S)" Standard ROM
*%
-*% End of "$Id: stcolor.ppd,v 1.6.2.1 2002/01/02 18:04:56 mike Exp $".
+*% End of "$Id$".
*%
*PPD-Adobe: "4.3"
*%
-*% "$Id: stcolor2.ppd,v 1.2.2.1 2002/04/20 19:40:12 mike Exp $"
+*% "$Id$"
*%
*% Sample EPSON Stylus Color driver PPD file for the Common UNIX Printing
*% System (CUPS).
*%
-*% Copyright 1997-2002 by Easy Software Products.
+*% Copyright 1997-2005 by Easy Software Products.
*%
*% These coded instructions, statements, and computer programs are the
*% property of Easy Software Products and are protected by Federal
*% Attn: CUPS Licensing Information
*% Easy Software Products
*% 44141 Airport View Drive, Suite 204
-*% Hollywood, Maryland 20636-3111 USA
+*% Hollywood, Maryland 20636 USA
*%
-*% Voice: (301) 373-9603
+*% Voice: (301) 373-9600
*% EMail: cups-info@cups.org
*% WWW: http://www.cups.org
*%
*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
*Font ZapfDingbats: Special "(001.004S)" Standard ROM
*%
-*% End of "$Id: stcolor2.ppd,v 1.2.2.1 2002/04/20 19:40:12 mike Exp $".
+*% End of "$Id$".
*%
*PPD-Adobe: "4.3"
*%
-*% "$Id: stphoto.ppd,v 1.6.2.1 2002/01/02 18:04:56 mike Exp $"
+*% "$Id$"
*%
*% Sample EPSON Stylus Photo driver PPD file for the Common UNIX Printing
*% System (CUPS).
*%
-*% Copyright 1997-2002 by Easy Software Products.
+*% Copyright 1997-2005 by Easy Software Products.
*%
*% These coded instructions, statements, and computer programs are the
*% property of Easy Software Products and are protected by Federal
*% Attn: CUPS Licensing Information
*% Easy Software Products
*% 44141 Airport View Drive, Suite 204
-*% Hollywood, Maryland 20636-3111 USA
+*% Hollywood, Maryland 20636 USA
*%
-*% Voice: (301) 373-9603
+*% Voice: (301) 373-9600
*% EMail: cups-info@cups.org
*% WWW: http://www.cups.org
*%
*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
*Font ZapfDingbats: Special "(001.004S)" Standard ROM
*%
-*% End of "$Id: stphoto.ppd,v 1.6.2.1 2002/01/02 18:04:56 mike Exp $".
+*% End of "$Id$".
*%
*PPD-Adobe: "4.3"
*%
-*% "$Id: stphoto2.ppd,v 1.2.2.1 2002/04/20 19:40:12 mike Exp $"
+*% "$Id$"
*%
*% Sample EPSON Stylus Photo driver PPD file for the Common UNIX Printing
*% System (CUPS).
*%
-*% Copyright 1997-2002 by Easy Software Products.
+*% Copyright 1997-2005 by Easy Software Products.
*%
*% These coded instructions, statements, and computer programs are the
*% property of Easy Software Products and are protected by Federal
*% Attn: CUPS Licensing Information
*% Easy Software Products
*% 44141 Airport View Drive, Suite 204
-*% Hollywood, Maryland 20636-3111 USA
+*% Hollywood, Maryland 20636 USA
*%
-*% Voice: (301) 373-9603
+*% Voice: (301) 373-9600
*% EMail: cups-info@cups.org
*% WWW: http://www.cups.org
*%
*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
*Font ZapfDingbats: Special "(001.004S)" Standard ROM
*%
-*% End of "$Id: stphoto2.ppd,v 1.2.2.1 2002/04/20 19:40:12 mike Exp $".
+*% End of "$Id$".
*%
*PPD-Adobe: "4.3"
*%
-*% "$Id: zebra.ppd,v 1.1.2.2 2004/05/12 19:32:07 mike Exp $"
+*% "$Id$"
*%
*% Sample Zebra label printer driver PPD file for the Common UNIX Printing
*% System (CUPS).
*%
-*% Copyright 2001-2003 by Easy Software Products.
+*% Copyright 2001-2005 by Easy Software Products.
*%
*% These coded instructions, statements, and computer programs are the
*% property of Easy Software Products and are protected by Federal
*% Attn: CUPS Licensing Information
*% Easy Software Products
*% 44141 Airport View Drive, Suite 204
-*% Hollywood, Maryland 20636-3111 USA
+*% Hollywood, Maryland 20636 USA
*%
-*% Voice: (301) 373-9603
+*% Voice: (301) 373-9600
*% EMail: cups-info@cups.org
*% WWW: http://www.cups.org
*%
*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
*Font ZapfDingbats: Special "(001.004S)" Standard ROM
*%
-*% End of "$Id: zebra.ppd,v 1.1.2.2 2004/05/12 19:32:07 mike Exp $".
+*% End of "$Id$".
*%
#
-# "$Id: cups.mak,v 1.1.2.4 2003/07/20 22:54:43 mike Exp $"
+# "$Id$"
#
# CUPS driver makefile for Ghostscript.
#
-# Copyright 2001-2003 by Easy Software Products.
+# Copyright 2001-2005 by Easy Software Products.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
install-cups:
-mkdir -p $(CUPSSERVER)/filter
$(INSTALL_PROGRAM) pstoraster/pstoraster $(CUPSSERVER)/filter
- $(INSTALL_PROGRAM) pstoraster/pstopcl6 $(CUPSSERVER)/filter
+ $(INSTALL_PROGRAM) pstoraster/pstopxl $(CUPSSERVER)/filter
-mkdir -p $(CUPSCONFIG)
$(INSTALL_DATA) pstoraster/pstoraster.convs $(CUPSCONFIG)
-mkdir -p $(CUPSDATA)/model
#
-# End of "$Id: cups.mak,v 1.1.2.4 2003/07/20 22:54:43 mike Exp $".
+# End of "$Id$".
#
/*
- * "$Id: gdevcups.c,v 1.43.2.23 2004/06/29 13:15:10 mike Exp $"
+ * "$Id$"
*
* GNU Ghostscript raster output driver for the Common UNIX Printing
* System (CUPS).
*
- * Copyright 1993-2004 by Easy Software Products.
+ * Copyright 1993-2005 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
* property of Easy Software Products and are protected by Federal
* Attn: CUPS Licensing Information
* Easy Software Products
* 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636-3142 USA
+ * Hollywood, Maryland 20636 USA
*
* Voice: (301) 373-9600
* EMail: cups-info@cups.org
private int
cups_close(gx_device *pdev) /* I - Device info */
{
+#ifdef DEBUG
fprintf(stderr, "DEBUG2: cups_close(%p)\n", pdev);
+#endif /* DEBUG */
if (cups->stream != NULL)
{
cups_get_matrix(gx_device *pdev, /* I - Device info */
gs_matrix *pmat) /* O - Physical transform matrix */
{
+#ifdef DEBUG
fprintf(stderr, "DEBUG2: cups_get_matrix(%p, %p)\n", pdev, pmat);
+#endif /* DEBUG */
/*
* Set the raster width and height...
bool b; /* Temporary boolean value */
+#ifdef DEBUG
fprintf(stderr, "DEBUG2: cups_get_params(%p, %p)\n", pdev, plist);
+#endif /* DEBUG */
/*
* First process the "standard" page device parameters...
*/
+#ifdef DEBUG
fputs("DEBUG2: before gdev_prn_get_params()\n", stderr);
+#endif /* DEBUG */
if ((code = gdev_prn_get_params(pdev, plist)) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: after gdev_prn_get_params()\n", stderr);
+#endif /* DEBUG */
/*
* Then write the CUPS parameters...
*/
+#ifdef DEBUG
fputs("DEBUG2: Adding MediaClass\n", stderr);
+#endif /* DEBUG */
param_string_from_string(s, cups->header.MediaClass);
if ((code = param_write_string(plist, "MediaClass", &s)) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: Adding AdvanceDistance\n", stderr);
+#endif /* DEBUG */
if ((code = param_write_int(plist, "AdvanceDistance",
(int *)&(cups->header.AdvanceDistance))) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: Adding AdvanceDistance\n", stderr);
+#endif /* DEBUG */
if ((code = param_write_int(plist, "AdvanceMedia",
(int *)&(cups->header.AdvanceMedia))) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: Adding Collate\n", stderr);
+#endif /* DEBUG */
b = cups->header.Collate;
if ((code = param_write_bool(plist, "Collate", &b)) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: Adding CutMedia\n", stderr);
+#endif /* DEBUG */
if ((code = param_write_int(plist, "CutMedia",
(int *)&(cups->header.CutMedia))) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: Adding InsertSheet\n", stderr);
+#endif /* DEBUG */
b = cups->header.InsertSheet;
if ((code = param_write_bool(plist, "InsertSheet", &b)) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: Adding Jog\n", stderr);
+#endif /* DEBUG */
if ((code = param_write_int(plist, "Jog",
(int *)&(cups->header.Jog))) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: Adding LeadingEdge\n", stderr);
+#endif /* DEBUG */
if ((code = param_write_int(plist, "LeadingEdge",
(int *)&(cups->header.LeadingEdge))) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: Adding ManualFeed\n", stderr);
+#endif /* DEBUG */
b = cups->header.ManualFeed;
if ((code = param_write_bool(plist, "ManualFeed", &b)) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: Adding MediaPosition\n", stderr);
+#endif /* DEBUG */
if ((code = param_write_int(plist, "MediaPosition",
(int *)&(cups->header.MediaPosition))) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: Adding MirrorPrint\n", stderr);
+#endif /* DEBUG */
b = cups->header.MirrorPrint;
if ((code = param_write_bool(plist, "MirrorPrint", &b)) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: Adding NegativePrint\n", stderr);
+#endif /* DEBUG */
b = cups->header.NegativePrint;
if ((code = param_write_bool(plist, "NegativePrint", &b)) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: Adding OutputFaceUp\n", stderr);
+#endif /* DEBUG */
b = cups->header.OutputFaceUp;
if ((code = param_write_bool(plist, "OutputFaceUp", &b)) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: Adding Separations\n", stderr);
+#endif /* DEBUG */
b = cups->header.Separations;
if ((code = param_write_bool(plist, "Separations", &b)) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: Adding TraySwitch\n", stderr);
+#endif /* DEBUG */
b = cups->header.TraySwitch;
if ((code = param_write_bool(plist, "TraySwitch", &b)) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: Adding Tumble\n", stderr);
+#endif /* DEBUG */
b = cups->header.Tumble;
if ((code = param_write_bool(plist, "Tumble", &b)) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: Adding cupsWidth\n", stderr);
+#endif /* DEBUG */
if ((code = param_write_int(plist, "cupsWidth",
(int *)&(cups->header.cupsWidth))) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: Adding cupsHeight\n", stderr);
+#endif /* DEBUG */
if ((code = param_write_int(plist, "cupsHeight",
(int *)&(cups->header.cupsHeight))) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: Adding cupsMediaType\n", stderr);
+#endif /* DEBUG */
if ((code = param_write_int(plist, "cupsMediaType",
(int *)&(cups->header.cupsMediaType))) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: Adding cupsBitsPerColor\n", stderr);
+#endif /* DEBUG */
if ((code = param_write_int(plist, "cupsBitsPerColor",
(int *)&(cups->header.cupsBitsPerColor))) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: Adding cupsBitsPerPixel\n", stderr);
+#endif /* DEBUG */
if ((code = param_write_int(plist, "cupsBitsPerPixel",
(int *)&(cups->header.cupsBitsPerPixel))) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: Adding cupsBytesPerLine\n", stderr);
+#endif /* DEBUG */
if ((code = param_write_int(plist, "cupsBytesPerLine",
(int *)&(cups->header.cupsBytesPerLine))) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: Adding cupsColorOrder\n", stderr);
+#endif /* DEBUG */
if ((code = param_write_int(plist, "cupsColorOrder",
(int *)&(cups->header.cupsColorOrder))) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: Adding cupsColorSpace\n", stderr);
+#endif /* DEBUG */
if ((code = param_write_int(plist, "cupsColorSpace",
(int *)&(cups->header.cupsColorSpace))) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: Adding cupsCompression\n", stderr);
+#endif /* DEBUG */
if ((code = param_write_int(plist, "cupsCompression",
(int *)&(cups->header.cupsCompression))) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: Adding cupsRowCount\n", stderr);
+#endif /* DEBUG */
if ((code = param_write_int(plist, "cupsRowCount",
(int *)&(cups->header.cupsRowCount))) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: Adding cupsRowFeed\n", stderr);
+#endif /* DEBUG */
if ((code = param_write_int(plist, "cupsRowFeed",
(int *)&(cups->header.cupsRowFeed))) < 0)
return (code);
+#ifdef DEBUG
fputs("DEBUG2: Adding cupsRowStep\n", stderr);
+#endif /* DEBUG */
if ((code = param_write_int(plist, "cupsRowStep",
(int *)&(cups->header.cupsRowStep))) < 0)
return (code);
#ifdef CUPS_RASTER_SYNCv1
+# ifdef DEBUG
fputs("DEBUG2: Adding cupsNumColors\n", stderr);
+# endif /* DEBUG */
if ((code = param_write_int(plist, "cupsNumColors",
(int *)&(cups->header.cupsNumColors))) < 0)
return (code);
+# ifdef DEBUG
fputs("DEBUG2: Adding cupsInteger\n", stderr);
+# endif /* DEBUG */
for (i = 0; i < 16; i ++)
{
return (code);
}
+# ifdef DEBUG
fputs("DEBUG2: Adding cupsReal\n", stderr);
+# endif /* DEBUG */
for (i = 0; i < 16; i ++)
{
return (code);
}
+# ifdef DEBUG
fputs("DEBUG2: Adding cupsString\n", stderr);
+# endif /* DEBUG */
for (i = 0; i < 16; i ++)
{
return (code);
}
+# ifdef DEBUG
fputs("DEBUG2: Adding cupsMarkerType\n", stderr);
+# endif /* DEBUG */
param_string_from_string(s, cups->header.cupsMarkerType);
if ((code = param_write_string(plist, "cupsMarkerType", &s)) < 0)
return (code);
+# ifdef DEBUG
fputs("DEBUG2: Adding cupsRenderingIntent\n", stderr);
+# endif /* DEBUG */
param_string_from_string(s, cups->header.cupsRenderingIntent);
if ((code = param_write_string(plist, "cupsRenderingIntent", &s)) < 0)
return (code);
#endif /* CUPS_RASTER_SYNCv1 */
+#ifdef DEBUG
fputs("DEBUG2: Leaving cups_get_params()\n", stderr);
+#endif /* DEBUG */
return (0);
}
cache_units[255]; /* Cache size units */
+#ifdef DEBUG
fprintf(stderr, "DEBUG2: cups_get_space_params(%p, %p)\n", pdev, space_params);
+#endif /* DEBUG */
if ((cache_env = getenv("RIP_MAX_CACHE")) != NULL)
{
ciel, ciea, cieb; /* CIE Lab colors */
+#ifdef DEBUG
fprintf(stderr, "DEBUG2: cups_map_cmyk(%p, %d, %d, %d, %d, %p)\n",
pdev, c, m, y, k, out);
+#endif /* DEBUG */
/*
* Convert the CMYK color to the destination colorspace...
{
default :
case 1 :
+#ifdef DEBUG
fprintf(stderr, "DEBUG2: \\=== COLOR %d\n", out[0]);
+#endif /* DEBUG */
break;
case 3 :
+#ifdef DEBUG
fprintf(stderr, "DEBUG2: \\=== COLOR %d, %d, %d\n",
out[0], out[1], out[2]);
+#endif /* DEBUG */
break;
case 4 :
+#ifdef DEBUG
fprintf(stderr, "DEBUG2: \\=== COLOR %d, %d, %d, %d\n",
out[0], out[1], out[2], out[3]);
+#endif /* DEBUG */
break;
}
}
frac g, /* I - Grayscale value */
frac *out) /* O - Device colors */
{
+#ifdef DEBUG
fprintf(stderr, "DEBUG2: cups_map_gray(%p, %d, %p)\n",
pdev, g, out);
+#endif /* DEBUG */
/*
* Just use the CMYK mapper...
int tc, tm, ty; /* Temporary color values */
+#ifdef DEBUG
fprintf(stderr, "DEBUG2: cups_map_rgb(%p, %p, %d, %d, %d, %p)\n",
pdev, pis, r, g, b, out);
+#endif /* DEBUG */
/*
* Compute CMYK values...
gx_color_value ic, im, iy, ik; /* Integral CMYK values */
+# ifdef DEBUG
fprintf(stderr, "DEBUG2: cups_map_cmyk_color(%p, %d, %d, %d, %d)\n", pdev,
c, m, y, k);
+# endif /* DEBUG */
/*
* Setup the color info data as needed...
break;
}
+# ifdef DEBUG
fprintf(stderr, "DEBUG2: CMYK (%d,%d,%d,%d) -> CMYK %08x (%d,%d,%d,%d)\n",
c, m, y, k, (unsigned)i, ic, im, iy, ik);
+# endif /* DEBUG */
/*
* Make sure we don't get a CMYK color of 255, 255, 255, 255...
gx_color_value k, divk; /* Black & divisor */
+# ifdef DEBUG
fprintf(stderr, "DEBUG2: cups_map_color_rgb(%p, %d, %p)\n", pdev,
(unsigned)color, prgb);
+# endif /* DEBUG */
/*
* Setup the color info data as needed...
if (pdev->color_info.num_components == 0)
cups_set_color_info(pdev);
+# ifdef DEBUG
fprintf(stderr, "DEBUG2: COLOR %08x = ", (unsigned)color);
+# endif /* DEBUG */
/*
* Extract the color components from the color index...
# endif /* CUPS_RASTER_HAVE_COLORIMETRIC */
}
+# ifdef DEBUG
fprintf(stderr, "%d,%d,%d\n", prgb[0], prgb[1], prgb[2]);
+# endif /* DEBUG */
return (0);
}
/* CIE Lab colors */
+# ifdef DEBUG
fprintf(stderr, "DEBUG2: cups_map_rgb_color(%p, %d, %d, %d)\n", pdev, r, g, b);
+# endif /* DEBUG */
/*
* Setup the color info data as needed...
break;
}
+# ifdef DEBUG
fprintf(stderr, "DEBUG2: CMY (%d,%d,%d) -> CMYK %08x (%d,%d,%d,%d)\n",
r, g, b, (unsigned)i, ic, im, iy, ik);
+# endif /* DEBUG */
break;
case CUPS_CSPACE_YMCK :
# endif /* CUPS_RASTER_HAVE_COLORIMETRIC */
}
+# ifdef DEBUG
fprintf(stderr, "DEBUG2: RGB %d,%d,%d = %08x\n", r, g, b, (unsigned)i);
+# endif /* DEBUG */
return (i);
}
int code; /* Return status */
+#ifdef DEBUG
fprintf(stderr, "DEBUG2: cups_open(%p)\n", pdev);
+#endif /* DEBUG */
cups->printer_procs.get_space_params = cups_get_space_params;
(void)fp; /* reference unused file pointer to prevent compiler warning */
+#ifdef DEBUG
fprintf(stderr, "DEBUG2: cups_print_pages(%p, %p, %d)\n", pdev, fp,
num_copies);
+#endif /* DEBUG */
/*
* Figure out the number of bytes per line...
srcbytes = gdev_prn_raster(pdev);
+#ifdef DEBUG
fprintf(stderr, "DEBUG2: cupsBitsPerPixel = %d, cupsWidth = %d, cupsBytesPerLine = %d, srcbytes = %d\n",
cups->header.cupsBitsPerPixel, cups->header.cupsWidth,
cups->header.cupsBytesPerLine, srcbytes);
+#endif /* DEBUG */
src = (unsigned char *)gs_malloc(srcbytes, 1, "cups_print_pages");
num_copies = 1;
}
+#ifdef DEBUG
fprintf(stderr, "DEBUG2: cupsWidth = %d, cupsHeight = %d, cupsBytesPerLine = %d\n",
cups->header.cupsWidth, cups->header.cupsHeight,
cups->header.cupsBytesPerLine);
+#endif /* DEBUG */
for (copy = num_copies; copy > 0; copy --)
{
height; /* New height of page */
+#ifdef DEBUG
fprintf(stderr, "DEBUG2: cups_put_params(%p, %p)\n", pdev, plist);
+#endif /* DEBUG */
/*
* Process other options for CUPS...
}
}
+#ifdef DEBUG
fprintf(stderr, "DEBUG2: ppd = %p\n", cupsPPD);
fprintf(stderr, "DEBUG2: PageSize = [ %.3f %.3f ]\n",
pdev->MediaSize[0], pdev->MediaSize[1]);
fprintf(stderr, "DEBUG2: HWMargins = [ %.3f %.3f %.3f %.3f ]\n",
pdev->HWMargins[0], pdev->HWMargins[1],
pdev->HWMargins[2], pdev->HWMargins[3]);
+#endif /* DEBUG */
return (0);
}
ppd_profile_t *profile; /* Color profile information */
+#ifdef DEBUG
fprintf(stderr, "DEBUG2: cups_set_color_info(%p)\n", pdev);
+#endif /* DEBUG */
switch (cups->header.cupsColorSpace)
{
cupsEncodeLUT[i] = (max_lut * i + gx_max_color_value / 2) /
gx_max_color_value;
+#ifdef DEBUG
if (i == 0 || cupsEncodeLUT[i] != cupsEncodeLUT[i - 1])
fprintf(stderr, "DEBUG2: cupsEncodeLUT[%d] = %d\n", i, cupsEncodeLUT[i]);
+#endif /* DEBUG */
}
for (i = 0; i < cups->color_info.dither_grays; i ++)
{
cupsMatrix[i][j][k] = (int)((float)k * m[i][j] + 0.5);
+#ifdef DEBUG
if ((k & 4095) == 0)
fprintf(stderr, "DEBUG2: cupsMatrix[%d][%d][%d] = %d\n",
i, j, k, cupsMatrix[i][j][k]);
+#endif /* DEBUG */
}
pow((float)k / (float)CUPS_MAX_VALUE, g) +
0.5);
+#ifdef DEBUG
if ((k & 4095) == 0)
fprintf(stderr, "DEBUG2: cupsDensity[%d] = %d\n", k, cupsDensity[k]);
+#endif /* DEBUG */
}
}
else
/*
- * End of "$Id: gdevcups.c,v 1.43.2.23 2004/06/29 13:15:10 mike Exp $".
+ * End of "$Id$".
*/
--- /dev/null
+#!/bin/sh
+#
+# "$Id: pstopxl 4076 2004-02-24 21:59:13Z mike $"
+#
+# CUPS PCL XL/PCL 6 filter script for Ghostscript.
+#
+# Copyright 2001-2003 by Easy Software Products.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+
+# Installation directories...
+prefix=/usr/local
+exec_prefix=${prefix}
+bindir=/usr/lib/cups/filter
+
+# Set the library/font path...
+GS_LIB="${CUPS_FONTPATH:=/usr/share/cups/fonts}"
+export GS_LIB
+
+# Determine the PCL XL/PCL 6 driver to use...
+if test "x$PPD" != x; then
+ colordevice=`grep '^*ColorDevice:' "$PPD" | awk -F: '{print $2}'`
+ case "$colordevice" in
+ *True* | *true*)
+ device="pxlcolor"
+ ;;
+ *)
+ device="pxlmono"
+ ;;
+ esac
+else
+ device="pxlmono"
+fi
+
+# Options we use with Ghostscript...
+gsopts="-dQUIET -dDEBUG -dPARANOIDSAFER -dNOPAUSE -dBATCH"
+gsopts="$gsopts -dNOMEDIAATTRS -sDEVICE=$device -sstdout=%stderr"
+
+# See if we have a filename on the command-line...
+if test -z "$6"; then
+ ifile="-"
+else
+ ifile="$6"
+fi
+
+echo INFO: Starting ESP Ghostscript 7.07.1... 1>&2
+echo DEBUG: Running $bindir/gsrip $gsopts -sOUTPUTFILE="%stdout" "$ifile" 1>&2
+
+# Now run Ghostscript...
+$bindir/gsrip $gsopts -sOUTPUTFILE="%stdout" "$ifile"
+
+#
+# End of "$Id: pstopxl 4076 2004-02-24 21:59:13Z mike $".
+#
#!/bin/sh
#
-# "$Id: pstopxl.in,v 1.1.2.2 2004/06/29 13:15:10 mike Exp $"
+# "$Id$"
#
# CUPS PCL XL/PCL 6 filter script for Ghostscript.
#
-# Copyright 2001-2004 by Easy Software Products.
+# Copyright 2001-2005 by Easy Software Products.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
$bindir/@GS@ $gsopts -sOUTPUTFILE="%stdout" "$ifile"
#
-# End of "$Id: pstopxl.in,v 1.1.2.2 2004/06/29 13:15:10 mike Exp $".
+# End of "$Id$".
#
#!/bin/sh
#
-# "$Id: pstoraster,v 1.1.2.4 2003/07/20 22:54:45 mike Exp $"
+# "$Id$"
#
# CUPS filter script for Ghostscript.
#
-# Copyright 2001-2003 by Easy Software Products.
+# Copyright 2001-2005 by Easy Software Products.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
$bindir/gs $gsopts -sOUTPUTFILE="%stdout" $profile $6
#
-# End of "$Id: pstoraster,v 1.1.2.4 2003/07/20 22:54:45 mike Exp $".
+# End of "$Id$".
#
#
-# "$Id: pstoraster.convs,v 1.1.2.3 2003/07/20 22:54:45 mike Exp $"
+# "$Id$"
#
# MIME converts file for Ghostscript.
#
-# Copyright 1997-2003 by Easy Software Products.
+# Copyright 1997-2005 by Easy Software Products.
#
# These coded instructions, statements, and computer programs are the
# property of Easy Software Products and are protected by Federal
# Attn: CUPS Licensing Information
# Easy Software Products
# 44141 Airport View Drive, Suite 204
-# Hollywood, Maryland 20636-3111 USA
+# Hollywood, Maryland 20636 USA
#
-# Voice: (301) 373-9603
+# Voice: (301) 373-9600
# EMail: cups-info@cups.org
# WWW: http://www.cups.org
#
application/vnd.cups-postscript application/vnd.cups-raster 100 pstoraster
#
-# End of "$Id: pstoraster.convs,v 1.1.2.3 2003/07/20 22:54:45 mike Exp $".
+# End of "$Id$".
#
#!/bin/sh
#
-# "$Id: pstoraster.in,v 1.3.2.4 2004/06/29 13:15:10 mike Exp $"
+# "$Id$"
#
# CUPS raster filter script for Ghostscript.
#
-# Copyright 2001-2004 by Easy Software Products.
+# Copyright 2001-2005 by Easy Software Products.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
$bindir/@GS@ $gsopts -sOUTPUTFILE="%stdout" -c"$profile" "$ifile"
#
-# End of "$Id: pstoraster.in,v 1.3.2.4 2004/06/29 13:15:10 mike Exp $".
+# End of "$Id$".
#
*PPD-Adobe: "4.3"
*%
-*% "$Id: pxlcolor.ppd,v 1.1.2.1 2003/07/20 22:54:45 mike Exp $"
+*% "$Id$"
*%
*% Sample color PCL XL/PCL 6 driver PPD file for the Common UNIX
*% Printing System (CUPS).
*%
-*% Copyright 1997-2003 by Easy Software Products.
+*% Copyright 1997-2005 by Easy Software Products.
*%
*% These coded instructions, statements, and computer programs are the
*% property of Easy Software Products and are protected by Federal
*% Attn: CUPS Licensing Information
*% Easy Software Products
*% 44141 Airport View Drive, Suite 204
-*% Hollywood, Maryland 20636-3111 USA
+*% Hollywood, Maryland 20636 USA
*%
-*% Voice: (301) 373-9603
+*% Voice: (301) 373-9600
*% EMail: cups-info@cups.org
*% WWW: http://www.cups.org
*%
*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
*Font ZapfDingbats: Special "(001.004S)" Standard ROM
*%
-*% End of "$Id: pxlcolor.ppd,v 1.1.2.1 2003/07/20 22:54:45 mike Exp $".
+*% End of "$Id$".
*%
*PPD-Adobe: "4.3"
*%
-*% "$Id: pxlmono.ppd,v 1.1.2.1 2003/07/20 22:54:45 mike Exp $"
+*% "$Id$"
*%
*% Sample monochrome PCL XL/PCL 6 driver PPD file for the Common UNIX
*% Printing System (CUPS).
*%
-*% Copyright 1997-2003 by Easy Software Products.
+*% Copyright 1997-2005 by Easy Software Products.
*%
*% These coded instructions, statements, and computer programs are the
*% property of Easy Software Products and are protected by Federal
*% Attn: CUPS Licensing Information
*% Easy Software Products
*% 44141 Airport View Drive, Suite 204
-*% Hollywood, Maryland 20636-3111 USA
+*% Hollywood, Maryland 20636 USA
*%
-*% Voice: (301) 373-9603
+*% Voice: (301) 373-9600
*% EMail: cups-info@cups.org
*% WWW: http://www.cups.org
*%
*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
*Font ZapfDingbats: Special "(001.004S)" Standard ROM
*%
-*% End of "$Id: pxlmono.ppd,v 1.1.2.1 2003/07/20 22:54:45 mike Exp $".
+*% End of "$Id$".
*%
/*
- * "$Id: auth.c,v 1.41.2.29 2004/10/11 19:31:19 mike Exp $"
+ * "$Id$"
*
* Authorization routines for the Common UNIX Printing System (CUPS).
*
};
- LogMessage(L_DEBUG2, "IsAuthorized: URI = %s", con->uri);
+ LogMessage(L_DEBUG2, "IsAuthorized: con->uri = \"%s\"", con->uri);
/*
* Find a matching location; if there is no match then access is
* Check the user's password...
*/
- pw = getpwnam(con->username); /* Get the current password */
- endpwent(); /* Close the password file */
-
- if (pw == NULL) /* No such user... */
- {
- LogMessage(L_WARN, "IsAuthorized: Unknown username \"%s\"; access denied.",
- con->username);
- return (HTTP_UNAUTHORIZED);
- }
-
LogMessage(L_DEBUG2, "IsAuthorized: Checking \"%s\", address = %x:%x:%x:%x, hostname = \"%s\"",
con->username, address[0], address[1], address[2],
address[3], con->http.hostname);
}
#endif /* HAVE_LIBPAM */
break;
+
case AUTH_DIGEST :
/*
* Do Digest authentication...
if (!md5[0])
{
- LogMessage(L_ERROR, "IsAuthorized: No matching user:group for \"%s\" in passwd.md5!",
+ LogMessage(L_DEBUG2, "IsAuthorized: No matching user:group for \"%s\" in passwd.md5!",
con->username);
return (HTTP_UNAUTHORIZED);
}
/*
- * End of "$Id: auth.c,v 1.41.2.29 2004/10/11 19:31:19 mike Exp $".
+ * End of "$Id$".
*/
/*
- * "$Id: classes.c,v 1.34.2.27 2004/10/04 19:48:56 mike Exp $"
+ * "$Id$"
*
* Printer class routines for the Common UNIX Printing System (CUPS).
*
AddPrinterToClass(printer_t *c, /* I - Class to add to */
printer_t *p) /* I - Printer to add */
{
+ int i; /* Looping var */
printer_t **temp; /* Pointer to printer array */
+ /*
+ * See if this printer is already a member of the class...
+ */
+
+ for (i = 0; i < c->num_printers; i ++)
+ if (c->printers[i] == p)
+ return;
+
/*
* Allocate memory as needed...
*/
* Set the initial queue state...
*/
- if (strcasecmp(value, "idle"))
+ if (!strcasecmp(value, "idle"))
p->state = IPP_PRINTER_IDLE;
- else if (strcasecmp(value, "stopped"))
+ else if (!strcasecmp(value, "stopped"))
p->state = IPP_PRINTER_STOPPED;
}
else if (!strcasecmp(name, "StateMessage"))
* Set the initial accepting state...
*/
- if (strcasecmp(value, "yes") ||
+ if (!strcasecmp(value, "yes") ||
!strcasecmp(value, "on") ||
!strcasecmp(value, "true"))
p->accepting = 1;
{
cups_file_t *fp; /* classes.conf file */
char temp[1024]; /* Temporary string */
+ char backup[1024]; /* classes.conf.O file */
printer_t *pclass; /* Current printer class */
int i; /* Looping var */
time_t curtime; /* Current time */
*/
snprintf(temp, sizeof(temp), "%s/classes.conf", ServerRoot);
+ snprintf(backup, sizeof(backup), "%s/classes.conf.O", ServerRoot);
+
+ if (rename(temp, backup))
+ LogMessage(L_ERROR, "Unable to backup classes.conf - %s", strerror(errno));
+
if ((fp = cupsFileOpen(temp, "w")) == NULL)
{
LogMessage(L_ERROR, "Unable to save classes.conf - %s", strerror(errno));
+
+ if (rename(backup, temp))
+ LogMessage(L_ERROR, "Unable to restore classes.conf - %s", strerror(errno));
return;
}
else
else
cupsFilePuts(fp, "Accepting No\n");
+ cupsFilePrintf(fp, "JobSheets %s %s\n", pclass->job_sheets[0],
+ pclass->job_sheets[1]);
+
for (i = 0; i < pclass->num_printers; i ++)
cupsFilePrintf(fp, "Printer %s\n", pclass->printers[i]->name);
/*
- * End of "$Id: classes.c,v 1.34.2.27 2004/10/04 19:48:56 mike Exp $".
+ * End of "$Id$".
*/
/*
- * "$Id: client.c,v 1.91.2.97 2005/01/03 18:48:04 mike Exp $"
+ * "$Id$"
*
* Client routines for the Common UNIX Printing System (CUPS) scheduler.
*
return;
}
-
+
/*
* Get the hostname or format the IP address as needed...
*/
val = 1;
setsockopt(con->http.fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val));
-#ifdef FD_CLOEXEC
/*
* Close this file on all execs...
*/
- fcntl(con->http.fd, F_SETFD, FD_CLOEXEC);
-#endif /* FD_CLOEXEC */
+ fcntl(con->http.fd, F_SETFD, fcntl(con->http.fd, F_GETFD) | FD_CLOEXEC);
/*
* Add the socket to the select() input mask.
httpPrintf(HTTP(con), "\r\n");
EncryptClient(con);
-
- status = IsAuthorized(con);
#else
if (!SendError(con, HTTP_NOT_IMPLEMENTED))
return (CloseClient(con));
#endif /* HAVE_SSL */
}
- if (status != HTTP_OK)
+ if ((status = IsAuthorized(con)) != HTTP_OK)
{
LogMessage(L_DEBUG2, "ReadClient: Unauthorized request for %s...\n",
con->uri);
SetStringf(&con->filename, "%s/%08x", RequestRoot, request_id ++);
con->file = open(con->filename, O_WRONLY | O_CREAT | O_TRUNC, 0640);
-#ifdef FD_CLOEXEC
- /*
- * Close this file when starting other processes...
- */
-
- fcntl(con->file, F_SETFD, FD_CLOEXEC);
-#endif /* FD_CLOEXEC */
-
LogMessage(L_DEBUG2, "ReadClient: %d REQUEST %s=%d", con->http.fd,
con->filename, con->file);
SetStringf(&con->filename, "%s/%08x", RequestRoot, request_id ++);
con->file = open(con->filename, O_WRONLY | O_CREAT | O_TRUNC, 0640);
-#ifdef FD_CLOEXEC
- /*
- * Close this file when starting other processes...
- */
-
- fcntl(con->file, F_SETFD, FD_CLOEXEC);
-#endif /* FD_CLOEXEC */
-
LogMessage(L_DEBUG2, "ReadClient: %d REQUEST %s=%d", con->http.fd,
con->filename, con->file);
if (con->file < 0)
return (0);
-#ifdef FD_CLOEXEC
- /*
- * Close this file when starting other processes...
- */
-
- fcntl(con->file, F_SETFD, FD_CLOEXEC);
-#endif /* FD_CLOEXEC */
+ fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
con->pipe_pid = 0;
con->file);
FD_CLR(con->file, InputSet);
}
-
+
if (con->pipe_pid)
kill(con->pipe_pid, SIGTERM);
- LogMessage(L_DEBUG2, "WriteClient() %d Closing data file %d.",
+ LogMessage(L_DEBUG2, "WriteClient: %d Closing data file %d.",
con->http.fd, con->file);
close(con->file);
if (con->filename)
{
- LogMessage(L_DEBUG2, "WriteClient() %d Removing temp file %s",
+ LogMessage(L_DEBUG2, "WriteClient: %d Removing temp file %s",
con->http.fd, con->filename);
unlink(con->filename);
ClearString(&con->filename);
* Get the username and password from the Digest attributes...
*/
- if (httpGetSubField(&(con->http), HTTP_FIELD_WWW_AUTHENTICATE, "username",
+ if (httpGetSubField(&(con->http), HTTP_FIELD_AUTHORIZATION, "username",
value))
strlcpy(con->username, value, sizeof(con->username));
- if (httpGetSubField(&(con->http), HTTP_FIELD_WWW_AUTHENTICATE, "response",
+ if (httpGetSubField(&(con->http), HTTP_FIELD_AUTHORIZATION, "response",
value))
- strlcpy(con->password, value, sizeof(con->password) - 1);
+ strlcpy(con->password, value, sizeof(con->password));
}
LogMessage(L_DEBUG2, "decode_auth: %d username=\"%s\"",
}
+/*
+ * 'get_file()' - Get a filename and state info.
+ */
+
static char * /* O - Real filename */
get_file(client_t *con, /* I - Client connection */
struct stat *filestats, /* O - File information */
locale_encodings[con->language->encoding]);
else
strcpy(lang, "LANG=C");
-
+
sprintf(ipp_port, "IPP_PORT=%d", LocalPort);
#ifdef AF_INET6
if (con->http.hostaddr.addr.sa_family == AF_INET6)
* Update stdin/stdout/stderr...
*/
- if (infile > 0)
+ if (infile)
{
close(0);
if (dup(infile) < 0)
/*
- * End of "$Id: client.c,v 1.91.2.97 2005/01/03 18:48:04 mike Exp $".
+ * End of "$Id$".
*/
/*
- * "$Id: conf.c,v 1.77.2.61 2004/08/23 18:01:56 mike Exp $"
+ * "$Id$"
*
* Configuration routines for the Common UNIX Printing System (CUPS).
*
/*
- * 'ReadConfiguration:' - Read the cupsd.conf file.
+ * 'ReadConfiguration()' - Read the cupsd.conf file.
*/
int /* O - 1 on success, 0 otherwise */
if (NumListeners > 0)
{
#ifdef HAVE_DOMAINSOCKETS
- int i; /* Looping var */
- listener_t *lis; /* Current listening socket */
+ int i; /* Looping var */
+ listener_t *lis; /* Current listening socket */
- for (i = NumListeners, lis = Listeners; i > 0; i --, lis ++)
- if (lis->address.sin_family == AF_LOCAL)
- ClearString((char **)&lis->address.sin_addr);
+ for (i = NumListeners, lis = Listeners; i > 0; i --, lis ++)
+ if (lis->address.sin_family == AF_LOCAL)
+ ClearString((char **)&lis->address.sin_addr);
#endif /* HAVE_DOMAINSOCKETS */
free(Listeners);
JobHistory = DEFAULT_HISTORY;
JobFiles = DEFAULT_FILES;
JobAutoPurge = 0;
- MaxJobs = 0;
+ MaxJobs = 500;
MaxActiveJobs = 0;
- MaxJobsPerPrinter = 0;
MaxJobsPerUser = 0;
+ MaxJobsPerPrinter = 0;
MaxCopies = 100;
ClearString(&DefaultPolicy);
if ((Clients = calloc(sizeof(client_t), MaxClients)) == NULL)
{
- LogMessage(L_ERROR, "Unable to allocate memory for %d clients: %s",
+ LogMessage(L_ERROR, "ReadConfiguration: Unable to allocate memory for %d clients: %s",
MaxClients, strerror(errno));
exit(1);
}
* Require user names
*/
- for (valptr = value; !isspace(*valptr & 255) && *valptr; valptr ++);
+ for (valptr = value;
+ !isspace(*valptr & 255) && *valptr != '>' && *valptr;
+ valptr ++);
if (*valptr)
*valptr++ = '\0';
/*
- * End of "$Id: conf.c,v 1.77.2.61 2004/08/23 18:01:56 mike Exp $".
+ * End of "$Id$".
*/
/*
- * "$Id: dirsvc.c,v 1.73.2.60 2004/10/04 19:48:56 mike Exp $"
+ * "$Id$"
*
* Directory services routines for the Common UNIX Printing System (CUPS).
*
# define SLP_CUPS_SRVTYPE "service:printer"
# define SLP_CUPS_SRVLEN 15
+
+/*
+ * Printer service URL structure
+ */
+
typedef struct _slpsrvurl
{
struct _slpsrvurl *next;
/*
- * End of "$Id: dirsvc.c,v 1.73.2.60 2004/10/04 19:48:56 mike Exp $".
+ * End of "$Id$".
*/
/*
- * "$Id: ipp.c,v 1.127.2.93 2004/10/04 20:24:16 mike Exp $"
+ * "$Id$"
*
* IPP routines for the Common UNIX Printing System (CUPS) scheduler.
*
ipp_attribute_t *username; /* requesting-user-name attr */
- DEBUG_printf(("ProcessIPPRequest(%08x)\n", con));
- DEBUG_printf(("ProcessIPPRequest: operation_id = %04x\n",
- con->request->request.op.operation_id));
+ LogMessage(L_DEBUG2, "ProcessIPPRequest(%p[%d]): operation_id = %04x",
+ con, con->http.fd, con->request->request.op.operation_id);
/*
* First build an empty response message for this request...
if (uri == NULL)
LogMessage(L_ERROR, "ProcessIPPRequest: missing printer-uri or job-uri attribute!");
+ LogMessage(L_DEBUG, "Request attributes follow...");
+
+ for (attr = con->request->attrs; attr != NULL; attr = attr->next)
+ LogMessage(L_DEBUG, "attr \"%s\": group_tag = %x, value_tag = %x",
+ attr->name ? attr->name : "(null)", attr->group_tag,
+ attr->value_tag);
+
+ LogMessage(L_DEBUG, "End of attributes...");
+
send_ipp_error(con, IPP_BAD_REQUEST);
}
else
printer_t *printer; /* Printer data */
- LogMessage(L_DEBUG2, "accept_jobs(%d, %s)\n", con->http.fd,
+ LogMessage(L_DEBUG2, "accept_jobs(%p[%d], %s)\n", con, con->http.fd,
uri->values[0].string.text);
/*
int modify; /* Non-zero if we just modified */
- LogMessage(L_DEBUG2, "add_class(%d, %s)\n", con->http.fd,
+ LogMessage(L_DEBUG2, "add_class(%p[%d], %s)\n", con, con->http.fd,
uri->values[0].string.text);
/*
return;
}
- DEBUG_printf(("add_class(%08x, %08x)\n", con, uri));
-
/*
* Do we have a valid URI?
*/
int modify; /* Non-zero if we are modifying */
- LogMessage(L_DEBUG2, "add_printer(%d, %s)\n", con->http.fd,
+ LogMessage(L_DEBUG2, "add_printer(%p[%d], %s)\n", con, con->http.fd,
uri->values[0].string.text);
/*
add_printer_state_reasons(client_t *con, /* I - Client connection */
printer_t *p) /* I - Printer info */
{
- LogMessage(L_DEBUG2, "add_printer_state_reasons(%d, %s)\n", con->http.fd,
- p->name);
+ LogMessage(L_DEBUG2, "add_printer_state_reasons(%p[%d], %p[%s])\n",
+ con, con->http.fd, p, p->name);
if (p->num_reasons == 0)
ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
int count; /* Number of jobs on destination */
- LogMessage(L_DEBUG2, "add_queued_job_count(%d, %s)\n", con->http.fd,
- p->name);
+ LogMessage(L_DEBUG2, "add_queued_job_count(%p[%d], %p[%s])\n",
+ con, con->http.fd, p, p->name);
count = GetPrinterJobCount(p->name);
printer_t *printer; /* Printer */
- LogMessage(L_DEBUG2, "cancel_all_jobs(%d, %s)\n", con->http.fd,
+ LogMessage(L_DEBUG2, "cancel_all_jobs(%p[%d], %s)\n", con, con->http.fd,
uri->values[0].string.text);
/*
if (strncmp(con->uri, "/admin/", 7) &&
strncmp(con->uri, "/jobs/", 7))
{
- LogMessage(L_ERROR, "cancel_all_jobs: request on bad resource \'%s\'!",
+ LogMessage(L_ERROR, "cancel_all_jobs: admin request on bad resource \'%s\'!",
con->uri);
send_ipp_error(con, IPP_NOT_AUTHORIZED);
return;
printer_t *printer; /* Printer data */
- LogMessage(L_DEBUG2, "cancel_job(%d, %s)\n", con->http.fd,
+ LogMessage(L_DEBUG2, "cancel_job(%p[%d], %s)\n", con, con->http.fd,
uri->values[0].string.text);
/*
struct group *grp; /* Group data */
- LogMessage(L_DEBUG2, "check_quotas(%d, %s)\n", con->http.fd, p->name);
+ LogMessage(L_DEBUG2, "check_quotas(%p[%d], %p[%s])\n",
+ con, con->http.fd, p, p->name);
/*
* Check input...
ipp_attribute_t *toattr; /* Destination attribute */
- LogMessage(L_DEBUG2, "copy_attribute(%p, %s)\n", to,
- attr->name ? attr->name : "(null)");
+ LogMessage(L_DEBUG2, "copy_attribute(%p, %p[%s,%x,%x])\n", to, attr,
+ attr->name ? attr->name : "(null)", attr->group_tag,
+ attr->value_tag);
switch (attr->value_tag & ~IPP_TAG_COPY)
{
ipp_attribute_t *attr; /* Attribute */
- LogMessage(L_DEBUG2, "copy_banner(%d, %d, %s)\n", con->http.fd, job->id,
- name);
+ LogMessage(L_DEBUG2, "copy_banner(%p[%d], %p[%d], %s)",
+ con, con->http.fd, job, job->id, name ? name : "(null)");
/*
* Find the banner; return if not found or "none"...
*/
- LogMessage(L_DEBUG, "copy_banner(%p, %d, \"%s\")", con, job->id,
- name ? name : "(null)");
-
if (name == NULL ||
strcmp(name, "none") == 0 ||
(banner = FindBanner(name)) == NULL)
int lowerpagerange; /* Page range bound */
- LogMessage(L_DEBUG2, "create_job(%d, %s)\n", con->http.fd,
+ LogMessage(L_DEBUG2, "create_job(%p[%d], %s)\n", con, con->http.fd,
uri->values[0].string.text);
/*
char filename[1024]; /* Script/PPD filename */
- LogMessage(L_DEBUG2, "delete_printer(%d, %s)\n", con->http.fd,
+ LogMessage(L_DEBUG2, "delete_printer(%p[%d], %s)\n", con, con->http.fd,
uri->values[0].string.text);
/*
return;
}
- DEBUG_printf(("delete_printer(%08x, %08x)\n", con, uri));
-
/*
* Do we have a valid URI?
*/
static void
get_devices(client_t *con) /* I - Client connection */
{
- LogMessage(L_DEBUG2, "get_devices(%d)\n", con->http.fd);
+ LogMessage(L_DEBUG2, "get_devices(%p[%d])\n", con, con->http.fd);
/*
* Check policy...
printer_t *printer; /* Printer */
- LogMessage(L_DEBUG2, "get_jobs(%d, %s)\n", con->http.fd,
+ LogMessage(L_DEBUG2, "get_jobs(%p[%d], %s)\n", con, con->http.fd,
uri->values[0].string.text);
/*
* Filter out jobs that don't match...
*/
- DEBUG_printf(("get_jobs: job->id = %d\n", job->id));
+ LogMessage(L_DEBUG2, "get_jobs: job->id = %d", job->id);
if ((dest != NULL && strcmp(job->dest, dest) != 0) &&
(job->printer == NULL || dest == NULL ||
count ++;
- DEBUG_printf(("get_jobs: count = %d\n", count));
+ LogMessage(L_DEBUG2, "get_jobs: count = %d", count);
/*
* Send the requested attributes for each job...
/* Job URI... */
- LogMessage(L_DEBUG2, "get_job_attrs(%d, %s)\n", con->http.fd,
+ LogMessage(L_DEBUG2, "get_job_attrs(%p[%d], %s)\n", con, con->http.fd,
uri->values[0].string.text);
/*
static void
get_ppds(client_t *con) /* I - Client connection */
{
- LogMessage(L_DEBUG2, "get_ppds(%d)\n", con->http.fd);
+ LogMessage(L_DEBUG2, "get_ppds(%p[%d])\n", con, con->http.fd);
/*
* Check policy...
int need_history; /* Need to send history collection? */
- LogMessage(L_DEBUG2, "get_printer_attrs(%d, %s)\n", con->http.fd,
+ LogMessage(L_DEBUG2, "get_printer_attrs(%p[%d], %s)\n", con, con->http.fd,
uri->values[0].string.text);
/*
printer_t *iclass; /* Implicit class */
- LogMessage(L_DEBUG2, "get_printers(%d, %x)\n", con->http.fd, type);
+ LogMessage(L_DEBUG2, "get_printers(%p[%d], %x)\n", con, con->http.fd, type);
/*
* Check policy...
job_t *job; /* Job information */
- LogMessage(L_DEBUG2, "hold_job(%d, %s)\n", con->http.fd,
+ LogMessage(L_DEBUG2, "hold_job(%p[%d], %s)\n", con, con->http.fd,
uri->values[0].string.text);
/*
printer_t *printer; /* Printer */
- LogMessage(L_DEBUG2, "move_job(%d, %s)\n", con->http.fd,
+ LogMessage(L_DEBUG2, "move_job(%p[%d], %s)\n", con, con->http.fd,
uri->values[0].string.text);
/*
int compression; /* Document compression */
- LogMessage(L_DEBUG2, "print_job(%d, %s)\n", con->http.fd,
+ LogMessage(L_DEBUG2, "print_job(%p[%d], %s)\n", con, con->http.fd,
uri->values[0].string.text);
/*
ipp_attribute_t *attr; /* printer-state-message text */
- LogMessage(L_DEBUG2, "reject_jobs(%d, %s)\n", con->http.fd,
+ LogMessage(L_DEBUG2, "reject_jobs(%p[%d], %s)\n", con, con->http.fd,
uri->values[0].string.text);
/*
job_t *job; /* Job information */
- LogMessage(L_DEBUG2, "release_job(%d, %s)\n", con->http.fd,
+ LogMessage(L_DEBUG2, "release_job(%p[%d], %s)\n", con, con->http.fd,
uri->values[0].string.text);
/*
job_t *job; /* Job information */
- LogMessage(L_DEBUG2, "restart_job(%d, %s)\n", con->http.fd,
+ LogMessage(L_DEBUG2, "restart_job(%p[%d], %s)\n", con, con->http.fd,
uri->values[0].string.text);
/*
int compression; /* Type of compression */
- LogMessage(L_DEBUG2, "send_document(%d, %s)\n", con->http.fd,
+ LogMessage(L_DEBUG2, "send_document(%p[%d], %s)\n", con, con->http.fd,
uri->values[0].string.text);
/*
send_ipp_error(client_t *con, /* I - Client connection */
ipp_status_t status) /* I - IPP status code */
{
- LogMessage(L_DEBUG2, "send_ipp_error(%d, %x)\n", con->http.fd, status);
+ LogMessage(L_DEBUG2, "send_ipp_error(%p[%d], %x)\n", con, con->http.fd,
+ status);
LogMessage(L_DEBUG, "Sending error: %s", ippErrorString(status));
printer_t *printer; /* Printer */
- LogMessage(L_DEBUG2, "set_default(%d, %s)\n", con->http.fd,
+ LogMessage(L_DEBUG2, "set_default(%p[%d], %s)\n", con, con->http.fd,
uri->values[0].string.text);
/*
int port; /* Port portion of URI */
- LogMessage(L_DEBUG2, "set_job_attrs(%d, %s)\n", con->http.fd,
+ LogMessage(L_DEBUG2, "set_job_attrs(%p[%d], %s)\n", con, con->http.fd,
uri->values[0].string.text);
/*
printer_t *printer; /* Printer data */
- LogMessage(L_DEBUG2, "start_printer(%d, %s)\n", con->http.fd,
+ LogMessage(L_DEBUG2, "start_printer(%p[%d], %s)\n", con, con->http.fd,
uri->values[0].string.text);
/*
ipp_attribute_t *attr; /* printer-state-message attribute */
- LogMessage(L_DEBUG2, "stop_printer(%d, %s)\n", con->http.fd,
+ LogMessage(L_DEBUG2, "stop_printer(%p[%d], %s)\n", con, con->http.fd,
uri->values[0].string.text);
/*
printer_t *printer; /* Printer */
- LogMessage(L_DEBUG2, "validate_job(%d, %s)\n", con->http.fd,
+ LogMessage(L_DEBUG2, "validate_job(%p[%d], %s)\n", con, con->http.fd,
uri->values[0].string.text);
/*
/*
- * End of "$Id: ipp.c,v 1.127.2.93 2004/10/04 20:24:16 mike Exp $".
+ * End of "$Id$".
*/
/*
- * "$Id: main.c,v 1.57.2.71 2005/02/07 00:14:32 mike Exp $"
+ * "$Id$"
*
* Scheduler main loop for the Common UNIX Printing System (CUPS).
*
if (status)
{
- if (WIFEXITED(status))
+ if (WIFSTOPPED(status))
+ LogMessage(L_ERROR, "PID %d crashed on signal %d!", pid,
+ WSTOPSIG(status));
+ else
LogMessage(L_ERROR, "PID %d stopped with status %d!", pid,
WEXITSTATUS(status));
- else
- LogMessage(L_ERROR, "PID %d crashed on signal %d!", pid,
- WTERMSIG(status));
if (LogLevel < L_DEBUG)
LogMessage(L_INFO, "Hint: Try setting the LogLevel to \"debug\" to find out more.");
/*
- * End of "$Id: main.c,v 1.57.2.71 2005/02/07 00:14:32 mike Exp $".
+ * End of "$Id$".
*/
/*
- * "$Id: printers.c,v 1.93.2.70 2004/12/06 19:43:17 mike Exp $"
+ * "$Id$"
*
* Printer routines for the Common UNIX Printing System (CUPS).
*
*/
#ifdef __sgi
+static void write_irix_config(printer_t *p);
static void write_irix_state(printer_t *p);
#endif /* __sgi */
i > 0;
i --, temptype ++)
if (((super[0] == '*' && strcasecmp((*temptype)->super, "printer") != 0) ||
- strcasecmp((*temptype)->super, super) == 0) &&
- (type[0] == '*' || strcasecmp((*temptype)->type, type) == 0))
+ !strcasecmp((*temptype)->super, super)) &&
+ (type[0] == '*' || !strcasecmp((*temptype)->type, type)))
{
LogMessage(L_DEBUG2, "Adding filter %s/%s %s/%s %d %s",
(*temptype)->super, (*temptype)->type,
* Set the default printer as needed...
*/
- if (strcasecmp(name, "<DefaultPrinter") == 0)
+ if (!strcasecmp(name, "<DefaultPrinter"))
DefaultPrinter = p;
}
else
AddPrinterFilter(p, filename);
}
else if (p->device_uri &&
- strncmp(p->device_uri, "ipp://", 6) == 0 &&
+ !strncmp(p->device_uri, "ipp://", 6) &&
(strstr(p->device_uri, "/printers/") != NULL ||
strstr(p->device_uri, "/classes/") != NULL))
{
* See if the resource is a class or printer...
*/
- if (strncmp(resource, "/classes/", 9) == 0)
+ if (!strncmp(resource, "/classes/", 9))
{
/*
* Class...
resource += 9;
}
- else if (strncmp(resource, "/printers/", 10) == 0)
+ else if (!strncmp(resource, "/printers/", 10))
{
/*
* Printer...
* Change localhost to the server name...
*/
- if (strcasecmp(hostname, "localhost") == 0)
+ if (!strcasecmp(hostname, "localhost"))
hostname = ServerName;
strlcpy(localname, hostname, sizeof(localname));
- if (strcasecmp(hostname, ServerName) != 0)
+ if (!strcasecmp(hostname, ServerName))
{
/*
* Localize the hostname...
while (lptr != NULL)
{
- if (strcasecmp(lptr, sptr) == 0)
+ if (!strcasecmp(lptr, sptr))
{
*lptr = '\0';
break;
*/
for (p = Printers; p != NULL; p = p->next)
- if (strcasecmp(p->hostname, localname) == 0 &&
- strcasecmp(p->name, resource) == 0)
+ if (!strcasecmp(p->hostname, localname) &&
+ !strcasecmp(p->name, resource))
{
if (printer)
*printer = p;
chmod(filename, 0664);
chown(filename, User, Group);
}
+}
/*
/*
- * End of "$Id: printers.c,v 1.93.2.70 2004/12/06 19:43:17 mike Exp $".
+ * End of "$Id$".
*/
#
-# "$Id: Makefile,v 1.23.2.10 2004/10/20 19:55:50 mike Exp $"
+# "$Id$"
#
# System V commands makefile for the Common UNIX Printing System (CUPS).
#
$(INSTALL_BIN) lpmove $(SBINDIR)
$(INSTALL_DIR) $(BINDIR)
$(INSTALL_BIN) cancel $(BINDIR)
- $(INSTALL_BIN) cupstestppd $(SBINDIR)
+ $(INSTALL_BIN) cupstestppd $(BINDIR)
$(RM) $(SBINDIR)/disable
$(LN) accept $(SBINDIR)/disable
$(RM) $(SBINDIR)/enable
$(INSTALL_BIN) lp $(BINDIR)
$(INSTALL_BIN) lpoptions $(BINDIR)
$(INSTALL_BIN) lpstat $(BINDIR)
- $(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR)
+ -$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR)
if test ! -x $(BINDIR)/lppasswd; then \
chmod 755 $(BINDIR)/lppasswd; \
fi
#
-# End of "$Id: Makefile,v 1.23.2.10 2004/10/20 19:55:50 mike Exp $".
+# End of "$Id$".
#
/*
- * "$Id: lpinfo.c,v 1.3.2.8 2004/06/29 13:15:11 mike Exp $"
+ * "$Id$"
*
* "lpinfo" command for the Common UNIX Printing System (CUPS).
*
* Local functions...
*/
-static void show_devices(http_t *, int);
-static void show_models(http_t *, int);
+static int show_devices(http_t *, int);
+static int show_models(http_t *, int);
/*
}
}
- show_models(http, long_status);
+ if (show_models(http, long_status))
+ return (1);
break;
case 'v' : /* Show available devices */
}
}
- show_devices(http, long_status);
+ if (show_devices(http, long_status))
+ return (1);
break;
case 'h' : /* Connect to host */
* 'show_devices()' - Show available devices.
*/
-static void
+static int /* O - 0 on success, 1 on failure */
show_devices(http_t *http, /* I - HTTP connection to server */
int long_status)/* I - Long status report? */
{
if (http == NULL)
- return;
+ return (1);
/*
* Build a CUPS_GET_DEVICES request, which requires the following
fprintf(stderr, "lpinfo: cups-get-devices failed: %s\n",
ippErrorString(response->request.status.status_code));
ippDelete(response);
- return;
+ return (1);
}
for (attr = response->attrs; attr != NULL; attr = attr->next)
ippDelete(response);
}
else
+ {
fprintf(stderr, "lpinfo: cups-get-devices failed: %s\n",
ippErrorString(cupsLastError()));
+ return (1);
+ }
+
+ return (0);
}
* 'show_models()' - Show available PPDs.
*/
-static void
+static int /* O - 0 on success, 1 on failure */
show_models(http_t *http, /* I - HTTP connection to server */
int long_status) /* I - Long status report? */
{
if (http == NULL)
- return;
+ return (1);
/*
* Build a CUPS_GET_PPDS request, which requires the following
fprintf(stderr, "lpinfo: cups-get-ppds failed: %s\n",
ippErrorString(response->request.status.status_code));
ippDelete(response);
- return;
+ return (1);
}
for (attr = response->attrs; attr != NULL; attr = attr->next)
ippDelete(response);
}
else
+ {
fprintf(stderr, "lpinfo: cups-get-ppds failed: %s\n",
ippErrorString(cupsLastError()));
+
+ return (1);
+ }
+
+ return (0);
}
/*
- * End of "$Id: lpinfo.c,v 1.3.2.8 2004/06/29 13:15:11 mike Exp $".
+ * End of "$Id$".
*/
<TD>Examples:
<PRE>
file:/path/to/filename.prn
+ http://hostname:631/ipp/
http://hostname:631/ipp/port1
+ ipp://hostname/ipp/
ipp://hostname/ipp/port1
lpd://hostname/queue
socket://hostname
<HR>
-<P>Copyright 1993-2002 Easy Software Products, All Rights Reserved.
+<P>Copyright 1993-2005 by Easy Software Products, All Rights Reserved.
The Common UNIX Printing System, CUPS, and the CUPS logo
are the trademark property of <A HREF="http://www.easysw.com">Easy Software Products</A>.
All other trademarks are the property of their respective owners.
#
-# "$Id: Makefile,v 1.2.2.6 2004/06/29 13:15:11 mike Exp $"
+# "$Id$"
#
# IPP test makefile for the Common UNIX Printing System (CUPS).
#
-# Copyright 1997-2004 by Easy Software Products, all rights reserved.
+# Copyright 1997-2005 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
# Attn: CUPS Licensing Information
# Easy Software Products
# 44141 Airport View Drive, Suite 204
-# Hollywood, Maryland 20636-3142 USA
+# Hollywood, Maryland 20636 USA
#
# Voice: (301) 373-9600
# EMail: cups-info@cups.org
$(RM) ipptest ipptest.o
+#
+# Update dependencies (without system header dependencies...)
+#
+
+depend:
+ makedepend -Y -I.. -fDependencies ipptest.c >/dev/null 2>&1
+
+
#
# Install all targets...
#
echo Linking $@...
$(CC) $(LDFLAGS) -o ipptest ipptest.o $(LIBS)
-ipptest.o: ../cups/cups.h
-
#
# purify target for doing tests on the CUPS API...
#
-# End of "$Id: Makefile,v 1.2.2.6 2004/06/29 13:15:11 mike Exp $".
+# Dependencies...
+#
+
+include Dependencies
+
+
+#
+# End of "$Id$".
#
/*
- * "$Id: ipptest.c,v 1.8.2.9 2004/10/27 14:16:50 mike Exp $"
+ * "$Id$"
*
* IPP test command for the Common UNIX Printing System (CUPS).
*
- * Copyright 1997-2004 by Easy Software Products.
+ * Copyright 1997-2005 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
* property of Easy Software Products and are protected by Federal
* Attn: CUPS Licensing Information
* Easy Software Products
* 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636-3142 USA
+ * Hollywood, Maryland 20636 USA
*
* Voice: (301) 373-9600
* EMail: cups-info@cups.org
const char *testfile) /* I - Test file to use */
{
int i; /* Looping var */
+ int version; /* IPP version number to use */
http_t *http; /* HTTP connection to server */
char method[HTTP_MAX_URI], /* URI method */
userpass[HTTP_MAX_URI], /* username:password */
*/
printf("\"%s\":\n", testfile);
- pass = 1;
- job_id = 0;
+ pass = 1;
+ job_id = 0;
+ version = 1;
while (get_token(fp, token, sizeof(token)) != NULL)
{
get_token(fp, name, sizeof(name));
}
+ else if (strcasecmp(token, "VERSION") == 0)
+ {
+ /*
+ * IPP version number for test...
+ */
+
+ get_token(fp, temp, sizeof(temp));
+ sscanf(temp, "%*d.%d", &version);
+ }
else if (strcasecmp(token, "RESOURCE") == 0)
{
/*
* Submit the IPP request...
*/
+ request->request.op.version[1] = version;
request->request.op.operation_id = op;
request->request.op.request_id = 1;
if (strcasecmp(name, ipp_ops[i]) == 0)
return ((ipp_op_t)i);
+ if (strcasecmp(name, "windows-ext") == 0)
+ return (IPP_PRIVATE);
+
for (i = 0; i < (sizeof(cups_ops) / sizeof(cups_ops[0])); i ++)
if (strcasecmp(name, cups_ops[i]) == 0)
return ((ipp_op_t)(i + 0x4001));
/*
- * End of "$Id: ipptest.c,v 1.8.2.9 2004/10/27 14:16:50 mike Exp $".
+ * End of "$Id$".
*/
#!/bin/sh
#
-# "$Id: run-stp-tests.sh,v 1.4.2.22 2004/06/30 21:18:32 mike Exp $"
+# "$Id$"
#
# Perform the complete set of IPP compliance tests specified in the
# CUPS Software Test Plan.
DYLD_LIBRARY_PATH="$root/cups:$root/filter:$DYLD_LIBRARY_PATH"
fi
-export SHLIB_PATH
+export DYLD_LIBRARY_PATH
if test "x$SHLIB_PATH" = x; then
SHLIB_PATH="$root/cups:$root/filter"
echo ""
#
-# End of "$Id: run-stp-tests.sh,v 1.4.2.22 2004/06/30 21:18:32 mike Exp $"
+# End of "$Id$"
#