diff options
| author | jlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2006-06-23 01:40:35 +0000 |
|---|---|---|
| committer | jlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2006-06-23 01:40:35 +0000 |
| commit | f7faf1f5c3235dfa4f883522da7dc6446f028247 (patch) | |
| tree | 59d573df045d93a7681a9a165729bacb554df5e6 | |
| parent | c07d5b2daf136da7af01c48ff78135d06d2762fc (diff) | |
| download | cups-f7faf1f5c3235dfa4f883522da7dc6446f028247.tar.gz | |
Load cups into easysw/current.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@185 a1ca3aef-8c08-0410-bb20-df032aa958be
452 files changed, 2089 insertions, 3253 deletions
diff --git a/CHANGES-1.2.txt b/CHANGES-1.2.txt deleted file mode 100644 index a12e03065..000000000 --- a/CHANGES-1.2.txt +++ /dev/null @@ -1,701 +0,0 @@ -CHANGES-1.2.txt ---------------- - -CHANGES IN CUPS V1.2.2 - - - Sending raw jobs from a client system could cause the - client's scheduler to eventually crash (STR #1786) - - The scheduler now checks that the notifier exists prior - to accepting a new subscription request. - - The scheduler now reports the supported - notify-recipient schemes based on the contents of the - ServerBin/notifier directory. - - Event notifications did not include the - notify-sequence-number or other required attributes - (STR #1747) - - Allow/Deny addresses of the form "11.22.33.*" did not - work on Linux (STR #1769) - - cupsGetPPD() did not work if the scheduler was only - listening on a domain socket (STR #1766) - - The scheduler could crash advertising a class (STR - #1768) - - The scheduler could crash if the default printer was - deleted (STR #1776) - - Added a new default CUPS raster format (v3) which does - not compress the raster stream in order to provide the - same cupsRasterReadPixels() and cupsRasterWritePixels() - performance as CUPS 1.1.x. - - The cupsaddsmb man page listed the wrong files for the - CUPS driver. - - Some configure --with options did not work (STR #1746) - - "Allow @IF(name)" didn't work if "name" wasn't the - first network interface (STR #1758) - - The lpstat command did not use the correct character - set when reporting the date and time (STR #1751) - - The cupsaddsmb command and web interface did not update - the Windows PPD files properly, resulting in corrupt - PPD files for the Windows client to use (STR #1750) - - The cupsd.conf man page didn't describe the Listen - domain socket syntax (STR #1753) - - The scheduler no longer tries to support more than - FD_SETSIZE file descriptors. - - CDSA (encryption) support fixes for MacOS X. - - The lppasswd program needs to be setuid to root to - create and update the /etc/cups/passwd.md5 file (STR - #1735) - - 32/64-bit library installation was broken (STR #1741) - - The USB backend now reports a "no such device" error - when using the old filename-based USB URIs instead of - the "success" error. - - Increased the HTTP and IPP read timeouts to 10 seconds, - as 1 second was too short on congested networks (STR - #1719) - - The SNMP backend now uses the device description over - the printer-make-and-model attribute when the attribute - contains a generic name (STR #1728) - - Fixed another file descriptor leak when printing raw - files (STR #1736) - - Raw queues were not shared via LDAP (STR #1739) - - The pstops filter didn't always embed PageSetup - commands from the PPD file (STR #1740) - - "make install" didn't work if you disabled all of the - localizations. - - The scheduler didn't always choose the least costly - filter. - - Fixed parsing of IPv6 addresses in Allow, Deny, - BrowseAllow, BrowseDeny, and BrowseRelay directives - (STR #1713) - - Printers that were shared via LDAP did not get added to - the LDAP server properly (STR #1733) - - LDAP browsing would crash the scheduler if a required - value was missing (STR #1731) - - Special cases for the "localhost" hostname did not - work, causing printing to not work when the /etc/hosts - file did not contain a localhost entry (STR #1723) - - Updated the Spanish translation (STR #1720) - - Reverse-order page output was broken when N-up or - landscape orientations were used (STR #1725) - - The parallel, serial, socket, and USB backends needed - print data before they would report back-channel data, - causing problems with several new drivers (STR #1724) - - -CHANGES IN CUPS V1.2.1 - - - The web interface support programs crashed on Solaris - (STR #1699) - - cupstestppd incorrectly reported problems with - *1284DeviceID attributes (STR #1710) - - Browsing could get disabled after a restart (STR #1670) - - Custom page sizes were not parsed properly (STR #1709) - - The -U option wasn't supported by lpadmin (STR #1702) - - The -u option didn't work with lpadmin (STR #1703) - - The scheduler did not create non-blocking back-channel - pipes, which caused problems when the printer driver - did not read the back-channel data (STR #1705) - - The scheduler no longer uses chunking in responses to - clients - this caused problems with older versions of - CUPS like 1.1.17 (PR #6143) - - Automatic raw printing was broken (STR #1667) - - 6-up printing was broken (STR #1697) - - The pstops filter did not disable CTRL-D processing on - the printer/RIP. - - ppdOpen*() did not load custom options properly (STR - #1680) - - "Set Printer Options" in the web interface did not - update the DefaultImageableArea or - DefaultPaperDimension attributes in the PPD file (STR - #1689) - - Fixed compile errors (STR #1682, STR #1684, STR #1685, - STR #1690) - - The lpstat command displayed the wrong error message - for a missing destination (STR #1683) - - Revised and completed the Polish translation (STR - #1669) - - Stopped jobs did not show up in the list of active jobs - (STR #1676) - - The configure script did not use the GNU TLS - "libgnutls-config" script to find the proper compiler - and linker options. - - The imagetoraster filter did not correctly generate - several 1, 2, and 4-bit color modes. - - cupsRasterWritePixels() could lose track of the current - output row. - - cupsRasterReadPixels() did not automatically swap - 12/16-bit chunked pixel data. - - Moved the private _cups_raster_s structure out of the - public header. - - Updated the CUPS raster format specification to include - encoding rules and colorspace definitions. - - The Zebra PPD files had the wrong PostScript code for - the "default" option choices. - - The imagetoraster filter did not generate correct CIE - XYZ or Lab color data. - - The cups-config script did not work when invoked from a - source directory (STR #1673) - - The SNMP backend did not compile on systems that used - the getifaddrs emulation functions (STR #1668) - - -CHANGES IN CUPS V1.2 - - - Documentation updates (STR #1618, STR #1620, STR #1622, - STR #1637) - - Static file copy buffers reduced from 64k to 32k to - work around bogus MallocDebug library assumptions (STR - #1660) - - The scheduler did not decode the backend exit code - properly (STR #1648) - - The MacOS X USB backend did not report the 1284 device ID, - nor did it fix device IDs returned by HP printers. - - The scheduler started more slowly than 1.1.x with large - numbers of printers (STR #1653) - - cupsRasterInterpretPPD() didn't support the - cupsPreferredBitsPerColor attribute, and imagetoraster - didn't use the new API. - - The "make test" script did not create all of the necessary - subdirectories for testing (STR #1638) - - The scheduler did not prevent rotation of logs - redirected to /dev/null (STR #1651) - - "make test" did not include the SNMP backend in the - test environment (STR #1625) - - The EPM packaging files did not work (STR #1621) - - "Use Default Configuration" inserted a broken - configuration file (STR #1624) - - Redirects in the web interface did not always preserve - the encrypted status of a connection (STR #1603) - - Added the Apple "pap" backend. - - Added CUPS library to CUPS Image shared library - linkage to support Linux --as-needed linker option - (STR #1606) - - Fixed support for --enable-pie (STR #1609) - - The pdftops filter did not validate the length of the - encryption key (STR #1608) - - Updated the Polish localization. - - "Encryption Required" in the cupsd.conf file now only - requires encryption when the connection is not over the - loopback interface or domain socket. - - Printer names containing "+" were not quoted properly in - the web interface (STR #1600) - - The SNMP backend now reports the make and model in the - information string so that the auto-generated printer - name is more useful than just an IP address. - - -CHANGES IN CUPS V1.2rc3 - - - The cups-lpd program always did reverse lookups on the - client address, which could be a performance problem. - Added a "-n" option to disable lookups. - - When configured with SSL support, require encryption by - default when displaying the /admin location (STR #1592) - - The next job ID was not computed correctly if the job - cache file got out of sync with the spool directory - (STR #1582) - - The PNG image handling code used deprecated functions - from libpng (STR #1587) - - Added a Polish translation (STR #1584, STR #1586) - - More changes to the scheduler to improve battery life - on portable devices (STR #1583) - - Changed the default log level for status messages back - to "DEBUG" to be consistent with CUPS 1.1.x (STR #1579) - - The error string was not set properly when - cupsDoFileRequest() was given the name of a directory - (STR #1578) - - Fixed handling of job-hold-until (STR #1581) - - Added explicit notes to the cupsaddsmb man page - explaining that the driver filenames are case-sensitive - under UNIX and that they must be all lowercase (Windows - 2000) or all UPPERCASE (Windows 95/98/Me) to work (STR - #1568) - - The USB backend incorrectly split the manufacturer name - if it contained spaces (STR #1566) - - The scheduler would hang when listing PPD files for a - manufacturer whose name contained spaces (STR #1567) - - Added the SNMP backend for network printer discovery - (STR #1555) - - cupstestppd now fails PPD files with 1284DeviceId - instead of 1284DeviceID, and cups-driverd uses a - case-insensitive comparison when looking for it (STR - #1573) - - cupsDoFileRequest() and cupsDoRequest() now work - properly with non-blocking HTTP connections. - - Added Swedish translation (STR #1569) - - "make install" now installs the MIME files with world - read permissions (STR #1565) - - More CDSA encryption support fixes (STR #1563) - - Updated the default mime.types file to support printing - of files that do not have a locally-recognized MIME - media type to raw or System V queues. - - Updated the serial port detection code on Linux (STR - #1562) - - Added some more error checking to httpGetHostname() - (STR #1561) - - The title of some administration pages was not - localized (STR #1548) - - The edit-config.tmpl file was not generated or - installed for the Spanish or Japanese localizations - (STR #1547) - - The mimeDelete() function freed the types before the - filters, but the filters needed the type data (STR #1558) - - The scheduler didn't keep track of the status pipes - properly, leading to a bad select() for multi-file jobs - (STR #1559) - - The cupstestdsc program didn't validate the ordinal - page number value for %%Page: comments. - - -CHANGES IN CUPS V1.2rc2 - - - The scheduler was not always using the string pool, - causing random crashes. - - The lpmove and the web interface's Move Job button did - not work with stopped jobs (STR #1534) - - The PostScript filter did not handle the page-set - option properly with number-up printing (STR #1543) - - The scheduler now only warns about unsupported ACLs - once (STR #1532) - - The "fitplot" option did not work with output from - Mozilla (STR #1542) - - The imagetops filter did not work with Level 2 or 3 - printers (STR #1533) - - The scheduler now recognizes PostScript files with PJL - commands that do not include an ENTER LANGUAGE command. - - Added --with-printcap configure option. - - 64-bit SSL fixes for MacOS X. - - The scheduler didn't send some printer state change - events. - - The scheduler didn't send jobs to busy remote printers. - - Fixed some problems with the launchd support. - - Added new USB printer backend for MacOS X. - - The PostScript filter now handles files that start with - an incomplete PJL header (PR #6076) - - The web interface language selection code did not try - the generic language localization (STR #1531) - - The language cache, string pool, and transcoding caches - are now process global instead of per-thread to avoid - problems with GNOME and to allow for data sharing - between threads (STR #1530) - - Fixed a CUPS 1.1.x compatibility bug (STR #1528) - - The web interface redirection after certain printer - administration tasks was broken (STR #1516) - - Web interface authorization could get stuck (STR #1512) - - Localization updates (STR #1513, STR #1518, STR #1520) - - The pstops filter didn't work with some files (STR - #1523) - - "./configure --enable-static" didn't work (STR #1522) - - The scheduler was not using the configured default - Group (STR #1521) - - The web interface still did not show the localized time - and date for some locales and systems (STR #1509) - - httpAddrGetList() would crash on systems without - getaddrinfo(). - - Socket URIs without a trailing slash would cause the - port number to not be accepted (STR #1519) - - Local raw and System V printers were not advertised as - such for printer browsing (STR #1502) - - The RPM spec file incorrectly put duplicate copies of - the Japanese and Spanish web interface templates in the - main cups package (STR #1517) - - cupsSetDests() did not explicitly set the permissions - of the /etc/cups/lpoptions file (STR #1508) - - The lpq command crashed with the -h option (STR #1515) - - -CHANGES IN CUPS V1.2rc1 - - - Documentation updates (STR #1497, STR #1498) - - The scheduler now redirects browsers to https: URLs - when encryption is required. - - The scheduler would crash when printing with a banner - (STR #1500) - - cups-driverd did not use the LanguageEncoding attribute - in PPD files to convert the NickName to UTF-8 (STR - #1503) - - The lpadmin command could not set the - printer-error-policy attribute (STR #1504) - - The web interface did not show the time and date in the - correct format for the locale (STR #1505) - - CUPS no longer accepts print jobs if a printer does not - support the file format (STR #1501) - - Cleaned up the PostScript filter (pstops) so that it - properly supports %%IncludeFeature and page scaling - (STR #1453) - - Fixed the cupsFileRewind() and cupsFileSeek() functions - to work properly with uncompressed files. - - Added cupsFileGetLine(), cupsFileStderr(), - cupsFileStdin(), and cupsFileStdout() functions to the - CUPS library. - - Added a new cupstestdsc program to test the DSC - conformance of PostScript files. - - Added KDE/GNOME icons and a Manage Printers menu item. - - Added --enable-image and --enable-pdftops configure - options to control whether the image and PDF filters - are built and installed (default = yes for all - platforms but MacOS X) - - Fixed a minor memory leak in the PPD API. - - Fixed transcoding issues (STR #1493) - - The scheduler now enforces a minimum job cost of 100 - when doing FilterLimit checks. - - The scheduler would leak file descriptors when printing - to raw queues (STR #1491) - - The IPv6 support did not compile on Tru64 UNIX (STR - #1488) - - ppdOpen2() now converts the NickName and all UI text to - UTF-8 (STR #1475) - - The Set Allowed Users web page did not work (STR #1486) - - When the default policy was not set or set to a non- - existing policy, the scheduler did not set the default - policy name to "default" (STR #1484) - - The Zebra CPCL driver did not use the correct righthand - margin for the 4" wide label sizes. - - Fixed a problem with the parsing of fractional real - numbers in PPD files. - - Added Spanish localization files (STR #1480) - - Fixed localization of a few scheduler messages (STR - #1478) - - Fixed support for HEAD requests in the scheduler (STR - #1481) - - -CHANGES IN CUPS V1.2b2 - - - Updated the CUPS design description. - - Added --enable-32bit and --enable-64bit configure - options to allow building of separate 32/64-bit - libraries on systems that support both environments - (STR #1472) - - Various compiler warning fixes. - - Fixes for Solaris 10 builds against old GNU TLS and - LDAP libraries. - - Added a cupsArrayUserData() function to retrieve the - user data pointer for an array (useful for typing - arrays) - - The ppdEmitString() function did not compute the - required buffer size properly, leading to dropped - characters on the end of the printer commands in pstops - and imagetops (STR #1470) - - -CHANGES IN CUPS V1.2b1 - - - The serial backend now supports Equinox 8-port serial - hubs (STR #526) - - The IPP backend now supports a compression option to - compress print files as they are sent to the remote - server (STR #956) - - The CUPS browse protocol now supports passing of - default options and browse timeout values from the - server to the clients (STR #800) - - Implicit classes that timed out could cause the - scheduler to crash (STR #1439) - - Added DragonFly support in local device backends (STR - #1362) - - Added LDAP printer browsing support (STR #338) - - Added official support for printer maintenance commands - via the CUPS Command file format and hooks in the - printer-type and web interfaces (STR #932) - - The HP-GL/2 filter could get in an infinite loop trying - to convert HP-PCL files (STR #1415) - - CUPS now implements the HTTP/1.1 Expect header (STR - #1407) - - Options in PPD files are no longer automatically put in - an "Extra" group; rather, all options that are not - inside an Open/CloseGroup will be placed in the - "General" group (STR #1385) - - The scheduler now creates a job-uuid attribute that - uniquely identifies a job on a network (STR #1410) - - The init script now unsets the TMPDIR environment - variable to prevent user temporary directories from - being used by cupsd accidentally (STR #1424) - - Added support for launchd on MacOS X. - - Added support for notify_post on MacOS X. - - Added support for DBUS on Linux. - - All of the Berkeley (except for lpc) and System V - commands now support specification of user, host, and - port (STR #1028, STR #1029, STR #1087) - - The lpmove command now allows you to move all jobs for - a given queue (STR #56) - - The web interface now supports moving of a job or jobs - to another queue (STR #56) - - The web interface now provides searching, paging, and - changing of the sort/display order of classes, jobs, - and printers. - - cupsaddsmb now accepts a password on the command-line - and supports passwords with special characters (STR - #822, STR #1236) - - ppdLoad*() no longer tries to "fix" bad characters in - UI text (STR #1101) - - Printer names can now (reliably) contain Unicode - characters (STR #896) - - The lpstat command now shows the time and date of the - last printer state change instead of the hardcoded "Jan - 01 00:00" (STR #659) - - The scheduler now adds a job-actual-printer-uri - attribute to job objects when printing to a class (STR - #116) - - The scheduler now logs log file open errors to the - system log (STR #1289) - - The scheduler now sets the job-originating-user-name to - the authenticated username, if available (STR #1318) - - The scheduler now only updates the permissions of SSL - keys and certificates when they are under the - ServerRoot directory (STR #1324) - - The rastertodymo driver has been renamed to - rastertolabel (a symlink is installed so that existing - queues continue to work) and now also supports Zebra's - CPCL language. - - The lpstat command could show the wrong active job for - a printer (STR #1301) - - Fixed a potential crash problem in the scheduler when - aborting a CGI program (STR #1290) - - Added a "cancel all jobs" button to the class and - printer web interfaces (STR #1140) - - The add-printer web page now shows the - set-printer-options page after the printer has been - added (STR #690) - - The classes web page now provides links to each of the - member printers (STR #307) - - CUPS now handles HTTP request/response lines up to 32k - in length; this is mainly for better cookie support - (STR #1274) - - Added support for the Apache PassEnv and SetEnv - directives to cupsd.conf (STR #853) - - Added large file (64-bit) support (STR #541) - - Fixed a performance issue with the ippReadIO() - implementation (STR #1284) - - Fixed a performance issue with the scheduler's implicit - class implementation (STR #1283) - - The pdftops filter now adds the Title and Creator - fields from the PDF file to the PostScript document - comments section (STR #539, STR #830) - - Added a new cups_array_t and cupsArray*() functions to - the CUPS API to support sorted lists of data. - - Made the CUPS API library thread-safe (STR #1276) - - Added "media" option support for EFI EFMediaType option - (STR #902) - - Added write buffering to the HTTP code to improve - performance (STR #547) - - The scheduler now uses the attributes-natural-language - attribute to localize banner pages (STR #386) - - The scheduler now returns the address that was used to - connect to it (STR #1076) - - Fixed a problem with N-up printing and OpenOffice (STR - #576) - - Added support for the GCC position independent - executable options (STR #1209) - - Added new BrowseLocalProtocols and - BrowseRemoteProtocols directives to cupsd.conf, - allowing for different browse protocols for local and - remote printers (STR #877) - - PPD files can now contain strings up to 256k in length - (STR #1215) - - The pstops filter now supports the IncludeFeature DSC - comment (STR #1212) - - The pstops filter now disables the setpagedevice - procedure when doing N-up printing (STR #1161) - - The serial backend now supports "stop=1", "stop=2", - "parity=space", and "parity=mark" options (STR #1155) - - "make install" no longer overwrites an existing PAM - configuration file (STR #1064) - - The scheduler now closes all files on startup when run - in daemon mode (STR #1009) - - Added a new RGBW colorspace to the CUPS raster format - (STR #1071) - - The pdftops filter now sets the page size based on the - media box when not scaling the output (STR #912) - - The pdftops filter now supports masked images (STR - #281) - - The pdftops filter produced large output when rendering - PDF files containing lot of repeated images (STR #327) - - The pdftops filter now minimizes print processing of - PDF files when using the page-ranges option (STR #273) - - Updated pdftops filter to Xpdf 3.01. - - Added new cupsBackchannelRead() and - cupsBackchannelWrite() functions, as well as - backchannel support to the parallel, serial, socket, - and USB backends (STR #1252) - - The parallel and USB backends now treat a "no space - available" error as an out-of-paper condition (STR - #1225) - - The "lpc" command now supports the "status all" command - (STR #1004) - - ippReadIO() did not read collections properly (STR - #1249) - - The "make test" script now creates the test files in - "/tmp/cups-$USER" instead of "/tmp/$USER" (STR #981) - - All backends now abort on error when printing a job to - a class - this allows the next printer in the class to - print the job (STR #1084) - - The scheduler now verifies that a printer supports - Letter or A4 media sizes before setting them as the - initial default (STR #1250) - - The cupstestppd program now flags bad Resolution - options (STR #1269) - - The USB backend now retries printing when the printer - is disconnected or turned off (STR #1267) - - Added new httpGetHostname() function to CUPS API, and - use it instead of gethostname() so that the web - interface will work correctly on systems whose hostname - is not the FQDN (STR #1266) - - The scheduler now stops printers if the backend for the - queue is missing on startup (STR #1265) - - The configure script now supports "--disable-library" - to disable particular image file format support - libraries, even if they are available on the build - system (STR #1248) - - The IPP backend did not always report on the total - number of pages that were printed (STR #1251) - - The lpstat program could display garbage date and time - values for locales whose date format exceeded 31 - characters (STR #1263) - - The cupstestppd program would segfault when testing - certain broken PPD files (STR #1268) - - Dramatically reduced the overhead of implicit classes. - - Added new cupsDir*() functions to CUPS API. - - Printers can now be published individually for sharing. - - Fixed a bug in the scheduler's startup signalling code - which caused cupsd to send the SIGUSR1 signal to the - init process instead of the original parent process - (STR #1258) - - Added new on-line help CGI to web interface to provide - searchable help. - - Devices are now tracked dynamically, with each query - doing a new device scan. This eliminates a previous - startup delay caused by slow backends and allows new - printers to be seen without restarting the server, - however it limits the amount of device URI checking - that can be done (basically now the scheduler only - requires a URI with a method that is a listed backend) - - Added new printer auto-detection, server configuration, - and log file viewing to the administration web page. - - Added new "set allowed users" web interface to set the - list of allowed users for a printer or class. - - The scheduler, command-line, and web interfaces now - limit the list of printers and classes to those - accessible by a user. - - cupsMarkOptions() now handles more non-standard - duplexing options and choices (STR #915) - - cups-lpd now honors remote banner requests with the - "standard" banner whenever a printer does not have one - defined (STR #1220) - - The scheduler's denial-of-service checks did not work - properly with IPv6 addresses (STR #1134) - - The lp and lpr commands did not error out properly when - they were unable to write to a temporary file (STR - #1129) - - The pstops filter did not handle Adobe-specific - comments in Windows NT driver output (STR #1085) - - "lpstat -l -p" incorrectly reported the printer - interface (STR #936) - - The web interface now operates exclusively with the - UTF-8 encoding, and sends the appropriate character set - and header information to the web browser (STR #919, - STR #1007) - - Added a "set allowed users" interface to the web - interface so that you can set the list of allowed or - denied users/groups for a printer or class. - - Disallow the "#" character in printer names, since it - has special meaning in the shell, config files, and in - URIs (STR #917, STR #1202) - - Added a new application/x-csource MIME type, and - support for it to the texttops filter so that you can - pretty print plain text files without the C/C++ - keywords being highlighted. - - The pdftops filter did not compile with GCC 4.0 (STR - #1226) - - The texttops filter did not highlight preprocessor - directives followed by a tab properly. - - HP PJL output now uses both JOB DISPLAY and RDYMSG - commands to show the current job on the printer's - display (STR #1218) - - Local authentication certificates are now stored in - /var/run/cups/certs by default instead of - /etc/cups/certs (STR #1211) - - Backends now use "&" to separate options in device - URIs; "+" is still recognized but is deprecated (STR - #842) - - The USB backend no longer supports the usb:/dev/foo - format on systems that support device ID queries. - - Forced classification markings did not work when the - job-sheets parameters were "none,none". - - "lpstat -l -p" incorrectly showed all users as allowed, - even if the queue was restricted to certain users (STR - #801) - - The scheduler now automatically detects SSL/TLS clients - without using the SSLPort/SSLListen directives. - - The CUPS API and scheduler no longer support SSLv2- - encrypted connections. - - Updated the cupsaddsmb utility to correctly export the - CUPS driver for Windows. - - Fixed a signal-handling bug in httpRead() which - ultimately caused the server to print multiple copies - when it was busy (STR #1184) - - The cupsFile API now uses the O_APPEND option when - opening files in append mode (STR #990) - - The md5.h header and md5_* functions are now officially - private and have been renamed to avoid conflicts with - other implementations with the same name. - - The pdftops filter incorrectly embedded some Type1 - fonts (STR #1093) - - The scheduler didn't detect a closed connection in the - middle of an IPP request (STR #1153) - - The scheduler could block trying to read the job status - if there was input pending and the job was cancelled in - the same input cycle (STR #1157) - - The scheduler could crash when deleting a class due to - infinite recursion. - - Updated the Zebra ZPL label printer driver to use the - run-length encoding and support more options. - - Updated serial backend to scan for /dev/ttyC* as well - as /dev/ttyc* for Cyclades serial ports (STR #1049) - - The scheduler could hang reading the job status under - certain circumstances (STR #1068) - - The USB backend termination signal code was inverted - (STR #1046) - - Moved enable and disable commands to sbindir to be - consistent. - - Added new cupsRasterInterpretPPD() function for RIP - filters to setup the raster page header from - PostScript commands in a PPD file. - - The CUPS browsing protocol now offers a "delete" bit - to remove printers as soon as they are deleted on the - server or as soon as the server shuts down gracefully - (STR #793) - - The CUPS_SERVER and ServerName directives (client.conf - and ~/.cupsrc) may now contain names of the form - "server:port" and "/path/to/domain/socket". - - The "cancel -u user" command now works for ordinary - users (STR #751) - - Added test run support to "make test" target (STR #64) - - Added domain socket support (STR #656) - - Added BrowseLocalOptions directive to allow the - administrator to add printer URI options to the browse - URI, e.g. "encryption=required" (STR #732) - - Added BrowseRemoteOptions directive to allow the - administrator to add standard URI options to the - remote printer URI, e.g. "encryption=required" (STR - #732) - - Now put "-I.." compiler option in front of all others - to ensure that local CUPS headers are used before - installed headers (STR #437) - - New cupsLangPrintf() and cupsLangPuts() for localized - interfaces. - - Now support custom attributes and extended options in - PPD files. - - Now provide functions to save PPD files. - - New policy mechanism allows per-operation and - per-printer control over what users and groups are - allowed to do various IPP operations. - - New error policy mechanism to control how aborted - backend errors are handled by the scheduler - (abort-job, retry-job, requeue-job, stop-printer) - - Updated the printer test page with a better color - wheel and a separate grayscale ramp. - - A single backend process is now run to send all print - data for a job. - - Backends and filters can now send and receive - backchannel data over file descriptor 3. - - Updated the raster stream format to support more - user-defined attributes and to do compression of the - page data. diff --git a/CHANGES.txt b/CHANGES.txt index e78abe1a3..c866727c8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,11 +1,718 @@ -CHANGES.txt - 2006-06-06 +CHANGES.txt - 2006-06-21 ------------------------ -CHANGES IN CUPS V1.3 +CHANGES IN CUPS V1.2.2 - - Moved the definition of the (private) _http_s structure - to http-private.h; code that directly accesses the - http_t members will no longer compile! - - Added support for setting the document-format-default - attribute on a per-printer basis. - - Added support for IntelliBar label printers. + - Sending raw jobs from a client system could cause the + client's scheduler to eventually crash (STR #1786) + - The scheduler now checks that the notifier exists prior + to accepting a new subscription request. + - The scheduler now reports the supported + notify-recipient schemes based on the contents of the + ServerBin/notifier directory. + - Event notifications did not include the + notify-sequence-number or other required attributes + (STR #1747) + - Allow/Deny addresses of the form "11.22.33.*" did not + work on Linux (STR #1769) + - cupsGetPPD() did not work if the scheduler was only + listening on a domain socket (STR #1766) + - The scheduler could crash advertising a class (STR + #1768) + - The scheduler could crash if the default printer was + deleted (STR #1776) + - Added a new default CUPS raster format (v3) which does + not compress the raster stream in order to provide the + same cupsRasterReadPixels() and cupsRasterWritePixels() + performance as CUPS 1.1.x. + - The cupsaddsmb man page listed the wrong files for the + CUPS driver. + - Some configure --with options did not work (STR #1746) + - "Allow @IF(name)" didn't work if "name" wasn't the + first network interface (STR #1758) + - The lpstat command did not use the correct character + set when reporting the date and time (STR #1751) + - The cupsaddsmb command and web interface did not update + the Windows PPD files properly, resulting in corrupt + PPD files for the Windows client to use (STR #1750) + - The cupsd.conf man page didn't describe the Listen + domain socket syntax (STR #1753) + - The scheduler no longer tries to support more than + FD_SETSIZE file descriptors. + - CDSA (encryption) support fixes for MacOS X. + - The lppasswd program needs to be setuid to root to + create and update the /etc/cups/passwd.md5 file (STR + #1735) + - 32/64-bit library installation was broken (STR #1741) + - The USB backend now reports a "no such device" error + when using the old filename-based USB URIs instead of + the "success" error. + - Increased the HTTP and IPP read timeouts to 10 seconds, + as 1 second was too short on congested networks (STR + #1719) + - The SNMP backend now uses the device description over + the printer-make-and-model attribute when the attribute + contains a generic name (STR #1728) + - Fixed another file descriptor leak when printing raw + files (STR #1736) + - Raw queues were not shared via LDAP (STR #1739) + - The pstops filter didn't always embed PageSetup + commands from the PPD file (STR #1740) + - "make install" didn't work if you disabled all of the + localizations. + - The scheduler didn't always choose the least costly + filter. + - Fixed parsing of IPv6 addresses in Allow, Deny, + BrowseAllow, BrowseDeny, and BrowseRelay directives + (STR #1713) + - Printers that were shared via LDAP did not get added to + the LDAP server properly (STR #1733) + - LDAP browsing would crash the scheduler if a required + value was missing (STR #1731) + - Special cases for the "localhost" hostname did not + work, causing printing to not work when the /etc/hosts + file did not contain a localhost entry (STR #1723) + - Updated the Spanish translation (STR #1720, STR #1770) + - Reverse-order page output was broken when N-up or + landscape orientations were used (STR #1725) + - The parallel, serial, socket, and USB backends needed + print data before they would report back-channel data, + causing problems with several new drivers (STR #1724) + + +CHANGES IN CUPS V1.2.1 + + - The web interface did not handle reloads properly for + MSIE (STR #1716) + - The configure script no longer adds linker rpath + options when they are unnecessary. + - The scheduler could crash printing a debug message on + Solaris (STR #1714) + - The --enable-32bit and --enable-64bit configure options + did not always work. + - The password prompt showed the domain socket address + instead of "localhost" for local authentication (STR + #1706) + - The web interface filtered the list of printers even if + the user wasn't logged in (STR #1700) + - The IPP backend did not work reliably with some Xerox + printers (STR #1704) + - Trailing banners were not added when printing a single + file (STR #1698) + - The web interface support programs crashed on Solaris + (STR #1699) + - cupstestppd incorrectly reported problems with + *1284DeviceID attributes (STR #1710) + - Browsing could get disabled after a restart (STR #1670) + - Custom page sizes were not parsed properly (STR #1709) + - The -U option wasn't supported by lpadmin (STR #1702) + - The -u option didn't work with lpadmin (STR #1703) + - The scheduler did not create non-blocking back-channel + pipes, which caused problems when the printer driver + did not read the back-channel data (STR #1705) + - The scheduler no longer uses chunking in responses to + clients - this caused problems with older versions of + CUPS like 1.1.17 (PR #6143) + - Automatic raw printing was broken (STR #1667) + - 6-up printing was broken (STR #1697) + - The pstops filter did not disable CTRL-D processing on + the printer/RIP. + - ppdOpen*() did not load custom options properly (STR + #1680) + - "Set Printer Options" in the web interface did not + update the DefaultImageableArea or + DefaultPaperDimension attributes in the PPD file (STR + #1689) + - Fixed compile errors (STR #1682, STR #1684, STR #1685, + STR #1690) + - The lpstat command displayed the wrong error message + for a missing destination (STR #1683) + - Revised and completed the Polish translation (STR + #1669) + - Stopped jobs did not show up in the list of active jobs + (STR #1676) + - The configure script did not use the GNU TLS + "libgnutls-config" script to find the proper compiler + and linker options. + - The imagetoraster filter did not correctly generate + several 1, 2, and 4-bit color modes. + - cupsRasterWritePixels() could lose track of the current + output row. + - cupsRasterReadPixels() did not automatically swap + 12/16-bit chunked pixel data. + - Moved the private _cups_raster_s structure out of the + public header. + - Updated the CUPS raster format specification to include + encoding rules and colorspace definitions. + - The Zebra PPD files had the wrong PostScript code for + the "default" option choices. + - The imagetoraster filter did not generate correct CIE + XYZ or Lab color data. + - The cups-config script did not work when invoked from a + source directory (STR #1673) + - The SNMP backend did not compile on systems that used + the getifaddrs emulation functions (STR #1668) + + +CHANGES IN CUPS V1.2.0 + + - Documentation updates (STR #1618, STR #1620, STR #1622, + STR #1637) + - Static file copy buffers reduced from 64k to 32k to + work around bogus MallocDebug library assumptions (STR + #1660) + - The scheduler did not decode the backend exit code + properly (STR #1648) + - The MacOS X USB backend did not report the 1284 device ID, + nor did it fix device IDs returned by HP printers. + - The scheduler started more slowly than 1.1.x with large + numbers of printers (STR #1653) + - cupsRasterInterpretPPD() didn't support the + cupsPreferredBitsPerColor attribute, and imagetoraster + didn't use the new API. + - The "make test" script did not create all of the necessary + subdirectories for testing (STR #1638) + - The scheduler did not prevent rotation of logs + redirected to /dev/null (STR #1651) + - "make test" did not include the SNMP backend in the + test environment (STR #1625) + - The EPM packaging files did not work (STR #1621) + - "Use Default Configuration" inserted a broken + configuration file (STR #1624) + - Redirects in the web interface did not always preserve + the encrypted status of a connection (STR #1603) + - Added the Apple "pap" backend. + - Added CUPS library to CUPS Image shared library + linkage to support Linux --as-needed linker option + (STR #1606) + - Fixed support for --enable-pie (STR #1609) + - The pdftops filter did not validate the length of the + encryption key (STR #1608) + - Updated the Polish localization. + - "Encryption Required" in the cupsd.conf file now only + requires encryption when the connection is not over the + loopback interface or domain socket. + - Printer names containing "+" were not quoted properly in + the web interface (STR #1600) + - The SNMP backend now reports the make and model in the + information string so that the auto-generated printer + name is more useful than just an IP address. + + +CHANGES IN CUPS V1.2rc3 + + - The cups-lpd program always did reverse lookups on the + client address, which could be a performance problem. + Added a "-n" option to disable lookups. + - When configured with SSL support, require encryption by + default when displaying the /admin location (STR #1592) + - The next job ID was not computed correctly if the job + cache file got out of sync with the spool directory + (STR #1582) + - The PNG image handling code used deprecated functions + from libpng (STR #1587) + - Added a Polish translation (STR #1584, STR #1586) + - More changes to the scheduler to improve battery life + on portable devices (STR #1583) + - Changed the default log level for status messages back + to "DEBUG" to be consistent with CUPS 1.1.x (STR #1579) + - The error string was not set properly when + cupsDoFileRequest() was given the name of a directory + (STR #1578) + - Fixed handling of job-hold-until (STR #1581) + - Added explicit notes to the cupsaddsmb man page + explaining that the driver filenames are case-sensitive + under UNIX and that they must be all lowercase (Windows + 2000) or all UPPERCASE (Windows 95/98/Me) to work (STR + #1568) + - The USB backend incorrectly split the manufacturer name + if it contained spaces (STR #1566) + - The scheduler would hang when listing PPD files for a + manufacturer whose name contained spaces (STR #1567) + - Added the SNMP backend for network printer discovery + (STR #1555) + - cupstestppd now fails PPD files with 1284DeviceId + instead of 1284DeviceID, and cups-driverd uses a + case-insensitive comparison when looking for it (STR + #1573) + - cupsDoFileRequest() and cupsDoRequest() now work + properly with non-blocking HTTP connections. + - Added Swedish translation (STR #1569) + - "make install" now installs the MIME files with world + read permissions (STR #1565) + - More CDSA encryption support fixes (STR #1563) + - Updated the default mime.types file to support printing + of files that do not have a locally-recognized MIME + media type to raw or System V queues. + - Updated the serial port detection code on Linux (STR + #1562) + - Added some more error checking to httpGetHostname() + (STR #1561) + - The title of some administration pages was not + localized (STR #1548) + - The edit-config.tmpl file was not generated or + installed for the Spanish or Japanese localizations + (STR #1547) + - The mimeDelete() function freed the types before the + filters, but the filters needed the type data (STR #1558) + - The scheduler didn't keep track of the status pipes + properly, leading to a bad select() for multi-file jobs + (STR #1559) + - The cupstestdsc program didn't validate the ordinal + page number value for %%Page: comments. + + +CHANGES IN CUPS V1.2rc2 + + - The scheduler was not always using the string pool, + causing random crashes. + - The lpmove and the web interface's Move Job button did + not work with stopped jobs (STR #1534) + - The PostScript filter did not handle the page-set + option properly with number-up printing (STR #1543) + - The scheduler now only warns about unsupported ACLs + once (STR #1532) + - The "fitplot" option did not work with output from + Mozilla (STR #1542) + - The imagetops filter did not work with Level 2 or 3 + printers (STR #1533) + - The scheduler now recognizes PostScript files with PJL + commands that do not include an ENTER LANGUAGE command. + - Added --with-printcap configure option. + - 64-bit SSL fixes for MacOS X. + - The scheduler didn't send some printer state change + events. + - The scheduler didn't send jobs to busy remote printers. + - Fixed some problems with the launchd support. + - Added new USB printer backend for MacOS X. + - The PostScript filter now handles files that start with + an incomplete PJL header (PR #6076) + - The web interface language selection code did not try + the generic language localization (STR #1531) + - The language cache, string pool, and transcoding caches + are now process global instead of per-thread to avoid + problems with GNOME and to allow for data sharing + between threads (STR #1530) + - Fixed a CUPS 1.1.x compatibility bug (STR #1528) + - The web interface redirection after certain printer + administration tasks was broken (STR #1516) + - Web interface authorization could get stuck (STR #1512) + - Localization updates (STR #1513, STR #1518, STR #1520) + - The pstops filter didn't work with some files (STR + #1523) + - "./configure --enable-static" didn't work (STR #1522) + - The scheduler was not using the configured default + Group (STR #1521) + - The web interface still did not show the localized time + and date for some locales and systems (STR #1509) + - httpAddrGetList() would crash on systems without + getaddrinfo(). + - Socket URIs without a trailing slash would cause the + port number to not be accepted (STR #1519) + - Local raw and System V printers were not advertised as + such for printer browsing (STR #1502) + - The RPM spec file incorrectly put duplicate copies of + the Japanese and Spanish web interface templates in the + main cups package (STR #1517) + - cupsSetDests() did not explicitly set the permissions + of the /etc/cups/lpoptions file (STR #1508) + - The lpq command crashed with the -h option (STR #1515) + + +CHANGES IN CUPS V1.2rc1 + + - Documentation updates (STR #1497, STR #1498) + - The scheduler now redirects browsers to https: URLs + when encryption is required. + - The scheduler would crash when printing with a banner + (STR #1500) + - cups-driverd did not use the LanguageEncoding attribute + in PPD files to convert the NickName to UTF-8 (STR + #1503) + - The lpadmin command could not set the + printer-error-policy attribute (STR #1504) + - The web interface did not show the time and date in the + correct format for the locale (STR #1505) + - CUPS no longer accepts print jobs if a printer does not + support the file format (STR #1501) + - Cleaned up the PostScript filter (pstops) so that it + properly supports %%IncludeFeature and page scaling + (STR #1453) + - Fixed the cupsFileRewind() and cupsFileSeek() functions + to work properly with uncompressed files. + - Added cupsFileGetLine(), cupsFileStderr(), + cupsFileStdin(), and cupsFileStdout() functions to the + CUPS library. + - Added a new cupstestdsc program to test the DSC + conformance of PostScript files. + - Added KDE/GNOME icons and a Manage Printers menu item. + - Added --enable-image and --enable-pdftops configure + options to control whether the image and PDF filters + are built and installed (default = yes for all + platforms but MacOS X) + - Fixed a minor memory leak in the PPD API. + - Fixed transcoding issues (STR #1493) + - The scheduler now enforces a minimum job cost of 100 + when doing FilterLimit checks. + - The scheduler would leak file descriptors when printing + to raw queues (STR #1491) + - The IPv6 support did not compile on Tru64 UNIX (STR + #1488) + - ppdOpen2() now converts the NickName and all UI text to + UTF-8 (STR #1475) + - The Set Allowed Users web page did not work (STR #1486) + - When the default policy was not set or set to a non- + existing policy, the scheduler did not set the default + policy name to "default" (STR #1484) + - The Zebra CPCL driver did not use the correct righthand + margin for the 4" wide label sizes. + - Fixed a problem with the parsing of fractional real + numbers in PPD files. + - Added Spanish localization files (STR #1480) + - Fixed localization of a few scheduler messages (STR + #1478) + - Fixed support for HEAD requests in the scheduler (STR + #1481) + + +CHANGES IN CUPS V1.2b2 + + - Updated the CUPS design description. + - Added --enable-32bit and --enable-64bit configure + options to allow building of separate 32/64-bit + libraries on systems that support both environments + (STR #1472) + - Various compiler warning fixes. + - Fixes for Solaris 10 builds against old GNU TLS and + LDAP libraries. + - Added a cupsArrayUserData() function to retrieve the + user data pointer for an array (useful for typing + arrays) + - The ppdEmitString() function did not compute the + required buffer size properly, leading to dropped + characters on the end of the printer commands in pstops + and imagetops (STR #1470) + + +CHANGES IN CUPS V1.2b1 + + - The serial backend now supports Equinox 8-port serial + hubs (STR #526) + - The IPP backend now supports a compression option to + compress print files as they are sent to the remote + server (STR #956) + - The CUPS browse protocol now supports passing of + default options and browse timeout values from the + server to the clients (STR #800) + - Implicit classes that timed out could cause the + scheduler to crash (STR #1439) + - Added DragonFly support in local device backends (STR + #1362) + - Added LDAP printer browsing support (STR #338) + - Added official support for printer maintenance commands + via the CUPS Command file format and hooks in the + printer-type and web interfaces (STR #932) + - The HP-GL/2 filter could get in an infinite loop trying + to convert HP-PCL files (STR #1415) + - CUPS now implements the HTTP/1.1 Expect header (STR + #1407) + - Options in PPD files are no longer automatically put in + an "Extra" group; rather, all options that are not + inside an Open/CloseGroup will be placed in the + "General" group (STR #1385) + - The scheduler now creates a job-uuid attribute that + uniquely identifies a job on a network (STR #1410) + - The init script now unsets the TMPDIR environment + variable to prevent user temporary directories from + being used by cupsd accidentally (STR #1424) + - Added support for launchd on MacOS X. + - Added support for notify_post on MacOS X. + - Added support for DBUS on Linux. + - All of the Berkeley (except for lpc) and System V + commands now support specification of user, host, and + port (STR #1028, STR #1029, STR #1087) + - The lpmove command now allows you to move all jobs for + a given queue (STR #56) + - The web interface now supports moving of a job or jobs + to another queue (STR #56) + - The web interface now provides searching, paging, and + changing of the sort/display order of classes, jobs, + and printers. + - cupsaddsmb now accepts a password on the command-line + and supports passwords with special characters (STR + #822, STR #1236) + - ppdLoad*() no longer tries to "fix" bad characters in + UI text (STR #1101) + - Printer names can now (reliably) contain Unicode + characters (STR #896) + - The lpstat command now shows the time and date of the + last printer state change instead of the hardcoded "Jan + 01 00:00" (STR #659) + - The scheduler now adds a job-actual-printer-uri + attribute to job objects when printing to a class (STR + #116) + - The scheduler now logs log file open errors to the + system log (STR #1289) + - The scheduler now sets the job-originating-user-name to + the authenticated username, if available (STR #1318) + - The scheduler now only updates the permissions of SSL + keys and certificates when they are under the + ServerRoot directory (STR #1324) + - The rastertodymo driver has been renamed to + rastertolabel (a symlink is installed so that existing + queues continue to work) and now also supports Zebra's + CPCL language. + - The lpstat command could show the wrong active job for + a printer (STR #1301) + - Fixed a potential crash problem in the scheduler when + aborting a CGI program (STR #1290) + - Added a "cancel all jobs" button to the class and + printer web interfaces (STR #1140) + - The add-printer web page now shows the + set-printer-options page after the printer has been + added (STR #690) + - The classes web page now provides links to each of the + member printers (STR #307) + - CUPS now handles HTTP request/response lines up to 32k + in length; this is mainly for better cookie support + (STR #1274) + - Added support for the Apache PassEnv and SetEnv + directives to cupsd.conf (STR #853) + - Added large file (64-bit) support (STR #541) + - Fixed a performance issue with the ippReadIO() + implementation (STR #1284) + - Fixed a performance issue with the scheduler's implicit + class implementation (STR #1283) + - The pdftops filter now adds the Title and Creator + fields from the PDF file to the PostScript document + comments section (STR #539, STR #830) + - Added a new cups_array_t and cupsArray*() functions to + the CUPS API to support sorted lists of data. + - Made the CUPS API library thread-safe (STR #1276) + - Added "media" option support for EFI EFMediaType option + (STR #902) + - Added write buffering to the HTTP code to improve + performance (STR #547) + - The scheduler now uses the attributes-natural-language + attribute to localize banner pages (STR #386) + - The scheduler now returns the address that was used to + connect to it (STR #1076) + - Fixed a problem with N-up printing and OpenOffice (STR + #576) + - Added support for the GCC position independent + executable options (STR #1209) + - Added new BrowseLocalProtocols and + BrowseRemoteProtocols directives to cupsd.conf, + allowing for different browse protocols for local and + remote printers (STR #877) + - PPD files can now contain strings up to 256k in length + (STR #1215) + - The pstops filter now supports the IncludeFeature DSC + comment (STR #1212) + - The pstops filter now disables the setpagedevice + procedure when doing N-up printing (STR #1161) + - The serial backend now supports "stop=1", "stop=2", + "parity=space", and "parity=mark" options (STR #1155) + - "make install" no longer overwrites an existing PAM + configuration file (STR #1064) + - The scheduler now closes all files on startup when run + in daemon mode (STR #1009) + - Added a new RGBW colorspace to the CUPS raster format + (STR #1071) + - The pdftops filter now sets the page size based on the + media box when not scaling the output (STR #912) + - The pdftops filter now supports masked images (STR + #281) + - The pdftops filter produced large output when rendering + PDF files containing lot of repeated images (STR #327) + - The pdftops filter now minimizes print processing of + PDF files when using the page-ranges option (STR #273) + - Updated pdftops filter to Xpdf 3.01. + - Added new cupsBackchannelRead() and + cupsBackchannelWrite() functions, as well as + backchannel support to the parallel, serial, socket, + and USB backends (STR #1252) + - The parallel and USB backends now treat a "no space + available" error as an out-of-paper condition (STR + #1225) + - The "lpc" command now supports the "status all" command + (STR #1004) + - ippReadIO() did not read collections properly (STR + #1249) + - The "make test" script now creates the test files in + "/tmp/cups-$USER" instead of "/tmp/$USER" (STR #981) + - All backends now abort on error when printing a job to + a class - this allows the next printer in the class to + print the job (STR #1084) + - The scheduler now verifies that a printer supports + Letter or A4 media sizes before setting them as the + initial default (STR #1250) + - The cupstestppd program now flags bad Resolution + options (STR #1269) + - The USB backend now retries printing when the printer + is disconnected or turned off (STR #1267) + - Added new httpGetHostname() function to CUPS API, and + use it instead of gethostname() so that the web + interface will work correctly on systems whose hostname + is not the FQDN (STR #1266) + - The scheduler now stops printers if the backend for the + queue is missing on startup (STR #1265) + - The configure script now supports "--disable-library" + to disable particular image file format support + libraries, even if they are available on the build + system (STR #1248) + - The IPP backend did not always report on the total + number of pages that were printed (STR #1251) + - The lpstat program could display garbage date and time + values for locales whose date format exceeded 31 + characters (STR #1263) + - The cupstestppd program would segfault when testing + certain broken PPD files (STR #1268) + - Dramatically reduced the overhead of implicit classes. + - Added new cupsDir*() functions to CUPS API. + - Printers can now be published individually for sharing. + - Fixed a bug in the scheduler's startup signalling code + which caused cupsd to send the SIGUSR1 signal to the + init process instead of the original parent process + (STR #1258) + - Added new on-line help CGI to web interface to provide + searchable help. + - Devices are now tracked dynamically, with each query + doing a new device scan. This eliminates a previous + startup delay caused by slow backends and allows new + printers to be seen without restarting the server, + however it limits the amount of device URI checking + that can be done (basically now the scheduler only + requires a URI with a method that is a listed backend) + - Added new printer auto-detection, server configuration, + and log file viewing to the administration web page. + - Added new "set allowed users" web interface to set the + list of allowed users for a printer or class. + - The scheduler, command-line, and web interfaces now + limit the list of printers and classes to those + accessible by a user. + - cupsMarkOptions() now handles more non-standard + duplexing options and choices (STR #915) + - cups-lpd now honors remote banner requests with the + "standard" banner whenever a printer does not have one + defined (STR #1220) + - The scheduler's denial-of-service checks did not work + properly with IPv6 addresses (STR #1134) + - The lp and lpr commands did not error out properly when + they were unable to write to a temporary file (STR + #1129) + - The pstops filter did not handle Adobe-specific + comments in Windows NT driver output (STR #1085) + - "lpstat -l -p" incorrectly reported the printer + interface (STR #936) + - The web interface now operates exclusively with the + UTF-8 encoding, and sends the appropriate character set + and header information to the web browser (STR #919, + STR #1007) + - Added a "set allowed users" interface to the web + interface so that you can set the list of allowed or + denied users/groups for a printer or class. + - Disallow the "#" character in printer names, since it + has special meaning in the shell, config files, and in + URIs (STR #917, STR #1202) + - Added a new application/x-csource MIME type, and + support for it to the texttops filter so that you can + pretty print plain text files without the C/C++ + keywords being highlighted. + - The pdftops filter did not compile with GCC 4.0 (STR + #1226) + - The texttops filter did not highlight preprocessor + directives followed by a tab properly. + - HP PJL output now uses both JOB DISPLAY and RDYMSG + commands to show the current job on the printer's + display (STR #1218) + - Local authentication certificates are now stored in + /var/run/cups/certs by default instead of + /etc/cups/certs (STR #1211) + - Backends now use "&" to separate options in device + URIs; "+" is still recognized but is deprecated (STR + #842) + - The USB backend no longer supports the usb:/dev/foo + format on systems that support device ID queries. + - Forced classification markings did not work when the + job-sheets parameters were "none,none". + - "lpstat -l -p" incorrectly showed all users as allowed, + even if the queue was restricted to certain users (STR + #801) + - The scheduler now automatically detects SSL/TLS clients + without using the SSLPort/SSLListen directives. + - The CUPS API and scheduler no longer support SSLv2- + encrypted connections. + - Updated the cupsaddsmb utility to correctly export the + CUPS driver for Windows. + - Fixed a signal-handling bug in httpRead() which + ultimately caused the server to print multiple copies + when it was busy (STR #1184) + - The cupsFile API now uses the O_APPEND option when + opening files in append mode (STR #990) + - The md5.h header and md5_* functions are now officially + private and have been renamed to avoid conflicts with + other implementations with the same name. + - The pdftops filter incorrectly embedded some Type1 + fonts (STR #1093) + - The scheduler didn't detect a closed connection in the + middle of an IPP request (STR #1153) + - The scheduler could block trying to read the job status + if there was input pending and the job was cancelled in + the same input cycle (STR #1157) + - The scheduler could crash when deleting a class due to + infinite recursion. + - Updated the Zebra ZPL label printer driver to use the + run-length encoding and support more options. + - Updated serial backend to scan for /dev/ttyC* as well + as /dev/ttyc* for Cyclades serial ports (STR #1049) + - The scheduler could hang reading the job status under + certain circumstances (STR #1068) + - The USB backend termination signal code was inverted + (STR #1046) + - Moved enable and disable commands to sbindir to be + consistent. + - Added new cupsRasterInterpretPPD() function for RIP + filters to setup the raster page header from + PostScript commands in a PPD file. + - The CUPS browsing protocol now offers a "delete" bit + to remove printers as soon as they are deleted on the + server or as soon as the server shuts down gracefully + (STR #793) + - The CUPS_SERVER and ServerName directives (client.conf + and ~/.cupsrc) may now contain names of the form + "server:port" and "/path/to/domain/socket". + - The "cancel -u user" command now works for ordinary + users (STR #751) + - Added test run support to "make test" target (STR #64) + - Added domain socket support (STR #656) + - Added BrowseLocalOptions directive to allow the + administrator to add printer URI options to the browse + URI, e.g. "encryption=required" (STR #732) + - Added BrowseRemoteOptions directive to allow the + administrator to add standard URI options to the + remote printer URI, e.g. "encryption=required" (STR + #732) + - Now put "-I.." compiler option in front of all others + to ensure that local CUPS headers are used before + installed headers (STR #437) + - New cupsLangPrintf() and cupsLangPuts() for localized + interfaces. + - Now support custom attributes and extended options in + PPD files. + - Now provide functions to save PPD files. + - New policy mechanism allows per-operation and + per-printer control over what users and groups are + allowed to do various IPP operations. + - New error policy mechanism to control how aborted + backend errors are handled by the scheduler + (abort-job, retry-job, requeue-job, stop-printer) + - Updated the printer test page with a better color + wheel and a separate grayscale ramp. + - A single backend process is now run to send all print + data for a job. + - Backends and filters can now send and receive + backchannel data over file descriptor 3. + - Updated the raster stream format to support more + user-defined attributes and to do compression of the + page data. diff --git a/INSTALL.txt b/INSTALL.txt index 329409b37..df6022b46 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -1,5 +1,5 @@ -INSTALL - CUPS v1.2rc1 - 2006-03-24 ------------------------------------ +INSTALL - CUPS v1.2.0 - 2006-05-08 +---------------------------------- This file describes how to compile and install CUPS from source code. For more information on CUPS see the file called diff --git a/Makedefs.in b/Makedefs.in index 61891db1a..10198cc49 100644 --- a/Makedefs.in +++ b/Makedefs.in @@ -1,5 +1,5 @@ # -# "$Id: Makedefs.in 181 2006-06-22 20:01:18Z jlovell $" +# "$Id: Makedefs.in 5609 2006-05-30 20:31:10Z mike $" # # Common makefile definitions for the Common UNIX Printing System (CUPS). # @@ -265,5 +265,5 @@ DBUSDIR = @DBUSDIR@ # -# End of "$Id: Makedefs.in 181 2006-06-22 20:01:18Z jlovell $" +# End of "$Id: Makedefs.in 5609 2006-05-30 20:31:10Z mike $" # @@ -1,5 +1,5 @@ # -# "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: Makefile 5547 2006-05-19 12:44:29Z mike $" # # Top-level Makefile for the Common UNIX Printing System (CUPS). # @@ -239,5 +239,5 @@ epm: # -# End of "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: Makefile 5547 2006-05-19 12:44:29Z mike $". # diff --git a/README.txt b/README.txt index fc0a146b4..4595be8c4 100644 --- a/README.txt +++ b/README.txt @@ -1,5 +1,5 @@ -README - CUPS v1.2rc1 - 2006-03-24 ----------------------------------- +README - CUPS v1.2.0 - 2006-05-08 +--------------------------------- Looking for compile instructions? Read the file "INSTALL.txt" instead... diff --git a/backend/Makefile b/backend/Makefile index 88f8f1bc9..2f8025b6c 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 181 2006-06-22 20:01:18Z jlovell $" +# "$Id: Makefile 5591 2006-05-26 19:51:59Z mike $" # # Backend makefile for the Common UNIX Printing System (CUPS). # @@ -222,5 +222,5 @@ include Dependencies # -# End of "$Id: Makefile 181 2006-06-22 20:01:18Z jlovell $". +# End of "$Id: Makefile 5591 2006-05-26 19:51:59Z mike $". # diff --git a/backend/backend-private.h b/backend/backend-private.h index bdbe42783..f9384931c 100644 --- a/backend/backend-private.h +++ b/backend/backend-private.h @@ -1,5 +1,5 @@ /* - * "$Id: backend-private.h 5590 2006-05-26 19:48:26Z mike $" + * "$Id: backend-private.h 5592 2006-05-27 03:11:52Z mike $" * * Backend support definitions for the Common UNIX Printing System (CUPS). * @@ -69,5 +69,5 @@ extern ssize_t backendRunLoop(int print_fd, int device_fd, int use_bc); /* - * End of "$Id: backend-private.h 5590 2006-05-26 19:48:26Z mike $". + * End of "$Id: backend-private.h 5592 2006-05-27 03:11:52Z mike $". */ diff --git a/backend/betest.c b/backend/betest.c index 69c62f09d..f0ea6cdb2 100644 --- a/backend/betest.c +++ b/backend/betest.c @@ -1,5 +1,5 @@ /* - * "$Id: betest.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: betest.c 4494 2005-02-18 02:18:11Z mike $" * * Backend test program for the Common UNIX Printing System (CUPS). * @@ -83,5 +83,5 @@ main(int argc, /* I - Number of command-line arguments (7 or 8) */ /* - * End of "$Id: betest.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: betest.c 4494 2005-02-18 02:18:11Z mike $". */ diff --git a/backend/ieee1284.c b/backend/ieee1284.c index 1c5649f75..f564215e0 100644 --- a/backend/ieee1284.c +++ b/backend/ieee1284.c @@ -1,5 +1,5 @@ /* - * "$Id: ieee1284.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: ieee1284.c 5591 2006-05-26 19:51:59Z mike $" * * IEEE-1284 support functions for the Common UNIX Printing System (CUPS). * @@ -495,5 +495,5 @@ backendGetMakeModel( /* - * End of "$Id: ieee1284.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: ieee1284.c 5591 2006-05-26 19:51:59Z mike $". */ diff --git a/backend/ieee1394-linux.c b/backend/ieee1394-linux.c index b2446a735..b95e8204e 100644 --- a/backend/ieee1394-linux.c +++ b/backend/ieee1394-linux.c @@ -1,5 +1,5 @@ /* - * "$Id: ieee1394-linux.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: ieee1394-linux.c 4703 2005-09-26 19:33:58Z mike $" * * Linux IEEE-1394 glue for the Common UNIX Printing System (CUPS). * @@ -873,5 +873,5 @@ ieee1394_error(void) /* - * End of "$Id: ieee1394-linux.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: ieee1394-linux.c 4703 2005-09-26 19:33:58Z mike $". */ diff --git a/backend/ieee1394.c b/backend/ieee1394.c index d8498d20e..3d88c7a08 100644 --- a/backend/ieee1394.c +++ b/backend/ieee1394.c @@ -1,5 +1,5 @@ /* - * "$Id: ieee1394.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: ieee1394.c 5241 2006-03-07 22:07:44Z mike $" * * IEEE-1394 backend for the Common UNIX Printing System (CUPS). * @@ -263,5 +263,5 @@ list_devices(void) /* - * End of "$Id: ieee1394.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: ieee1394.c 5241 2006-03-07 22:07:44Z mike $". */ diff --git a/backend/ieee1394.h b/backend/ieee1394.h index 0fa30f9ce..19181c5c0 100644 --- a/backend/ieee1394.h +++ b/backend/ieee1394.h @@ -1,5 +1,5 @@ /* - * "$Id: ieee1394.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: ieee1394.h 4494 2005-02-18 02:18:11Z mike $" * * IEEE-1394 header for the Common UNIX Printing System (CUPS). * @@ -99,5 +99,5 @@ extern const char *ieee1394_error(void); /* - * End of "$Id: ieee1394.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: ieee1394.h 4494 2005-02-18 02:18:11Z mike $". */ diff --git a/backend/ipp.c b/backend/ipp.c index 256145708..4bcd3c794 100644 --- a/backend/ipp.c +++ b/backend/ipp.c @@ -1,5 +1,5 @@ /* - * "$Id: ipp.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: ipp.c 5686 2006-06-21 21:02:56Z mike $" * * IPP backend for the Common UNIX Printing System (CUPS). * @@ -1620,5 +1620,5 @@ sigterm_handler(int sig) /* I - Signal */ /* - * End of "$Id: ipp.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: ipp.c 5686 2006-06-21 21:02:56Z mike $". */ diff --git a/backend/lpd.c b/backend/lpd.c index 8884e1f9c..ef7ef05d3 100644 --- a/backend/lpd.c +++ b/backend/lpd.c @@ -1,5 +1,5 @@ /* - * "$Id: lpd.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: lpd.c 5495 2006-05-05 17:58:07Z mike $" * * Line Printer Daemon backend for the Common UNIX Printing System (CUPS). * @@ -1230,5 +1230,5 @@ sigterm_handler(int sig) /* I - Signal */ /* - * End of "$Id: lpd.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: lpd.c 5495 2006-05-05 17:58:07Z mike $". */ diff --git a/backend/pap.c b/backend/pap.c index f87d8ee28..f5eadae33 100644 --- a/backend/pap.c +++ b/backend/pap.c @@ -1,5 +1,5 @@ /* -* "$Id: pap.c 177 2006-06-21 00:20:03Z jlovell $" +* "$Id: pap.c 5480 2006-05-02 15:17:04Z mike $" * * © Copyright 2004 Apple Computer, Inc. All rights reserved. * diff --git a/backend/parallel.c b/backend/parallel.c index 542d338cd..3b8c9ba09 100644 --- a/backend/parallel.c +++ b/backend/parallel.c @@ -1,5 +1,5 @@ /* - * "$Id: parallel.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: parallel.c 5594 2006-05-27 03:14:03Z mike $" * * Parallel port backend for the Common UNIX Printing System (CUPS). * @@ -612,5 +612,5 @@ list_devices(void) /* - * End of "$Id: parallel.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: parallel.c 5594 2006-05-27 03:14:03Z mike $". */ diff --git a/backend/runloop.c b/backend/runloop.c index 4d247f1ed..6393ed507 100644 --- a/backend/runloop.c +++ b/backend/runloop.c @@ -1,5 +1,5 @@ /* - * "$Id: runloop.c 5593 2006-05-27 03:13:38Z mike $" + * "$Id: runloop.c 5594 2006-05-27 03:14:03Z mike $" * * Common run loop API for the Common UNIX Printing System (CUPS). * @@ -214,5 +214,5 @@ backendRunLoop(int print_fd, /* I - Print file descriptor */ /* - * End of "$Id: runloop.c 5593 2006-05-27 03:13:38Z mike $". + * End of "$Id: runloop.c 5594 2006-05-27 03:14:03Z mike $". */ diff --git a/backend/scsi-irix.c b/backend/scsi-irix.c index 0f0cd7e52..cec216e87 100644 --- a/backend/scsi-irix.c +++ b/backend/scsi-irix.c @@ -1,5 +1,5 @@ /* - * "$Id: scsi-irix.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: scsi-irix.c 5241 2006-03-07 22:07:44Z mike $" * * IRIX SCSI printer support for the Common UNIX Printing System (CUPS). * @@ -231,5 +231,5 @@ print_device(const char *resource, /* I - SCSI device */ /* - * End of "$Id: scsi-irix.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: scsi-irix.c 5241 2006-03-07 22:07:44Z mike $". */ diff --git a/backend/scsi-linux.c b/backend/scsi-linux.c index 6accdb719..75c9629dc 100644 --- a/backend/scsi-linux.c +++ b/backend/scsi-linux.c @@ -1,5 +1,5 @@ /* - * "$Id: scsi-linux.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: scsi-linux.c 5241 2006-03-07 22:07:44Z mike $" * * Linux SCSI printer support for the Common UNIX Printing System (CUPS). * @@ -249,5 +249,5 @@ print_device(const char *resource, /* I - SCSI device */ /* - * End of "$Id: scsi-linux.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: scsi-linux.c 5241 2006-03-07 22:07:44Z mike $". */ diff --git a/backend/scsi.c b/backend/scsi.c index 4bedf3492..06a088899 100644 --- a/backend/scsi.c +++ b/backend/scsi.c @@ -1,5 +1,5 @@ /* - * "$Id: scsi.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: scsi.c 5023 2006-01-29 14:39:44Z mike $" * * SCSI printer backend for the Common UNIX Printing System (CUPS). * @@ -220,5 +220,5 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */ /* - * End of "$Id: scsi.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: scsi.c 5023 2006-01-29 14:39:44Z mike $". */ diff --git a/backend/serial.c b/backend/serial.c index a8777e70d..f2a32719d 100644 --- a/backend/serial.c +++ b/backend/serial.c @@ -1,5 +1,5 @@ /* - * "$Id: serial.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: serial.c 5597 2006-05-30 14:29:12Z mike $" * * Serial port backend for the Common UNIX Printing System (CUPS). * @@ -1218,5 +1218,5 @@ list_devices(void) /* - * End of "$Id: serial.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: serial.c 5597 2006-05-30 14:29:12Z mike $". */ diff --git a/backend/snmp.c b/backend/snmp.c index faaf064fb..8ac2dea4f 100644 --- a/backend/snmp.c +++ b/backend/snmp.c @@ -1,5 +1,5 @@ /* - * "$Id: snmp.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: snmp.c 5663 2006-06-15 20:36:42Z mike $" * * SNMP discovery backend for the Common UNIX Printing System (CUPS). * @@ -2215,5 +2215,5 @@ update_cache(snmp_cache_t *device, /* I - Device */ /* - * End of "$Id: snmp.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: snmp.c 5663 2006-06-15 20:36:42Z mike $". */ diff --git a/backend/socket.c b/backend/socket.c index aff606448..266fe7781 100644 --- a/backend/socket.c +++ b/backend/socket.c @@ -1,5 +1,5 @@ /* - * "$Id: socket.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: socket.c 5591 2006-05-26 19:51:59Z mike $" * * AppSocket backend for the Common UNIX Printing System (CUPS). * @@ -387,5 +387,5 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */ /* - * End of "$Id: socket.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: socket.c 5591 2006-05-26 19:51:59Z mike $". */ diff --git a/backend/test1284.c b/backend/test1284.c index 88be3065f..dc1845e90 100644 --- a/backend/test1284.c +++ b/backend/test1284.c @@ -1,5 +1,5 @@ /* - * "$Id: test1284.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: test1284.c 5591 2006-05-26 19:51:59Z mike $" * * IEEE-1284 support functions test program for the Common UNIX Printing * System (CUPS). @@ -92,5 +92,5 @@ main(int argc, /* I - Number of command-line args */ /* - * End of "$Id: test1284.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: test1284.c 5591 2006-05-26 19:51:59Z mike $". */ diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c index 496a14219..03e0373ff 100644 --- a/backend/usb-darwin.c +++ b/backend/usb-darwin.c @@ -1,5 +1,5 @@ /* - * "$Id: usb-darwin.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: usb-darwin.c 5630 2006-06-05 18:42:53Z mike $" * * © Copyright 2005-2006 Apple Computer, Inc. All rights reserved. * @@ -1346,5 +1346,5 @@ static void *read_thread(void *reference) /* - * End of "$Id: usb-darwin.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: usb-darwin.c 5630 2006-06-05 18:42:53Z mike $". */ diff --git a/backend/usb-unix.c b/backend/usb-unix.c index ce8c2fe44..13b2dc049 100644 --- a/backend/usb-unix.c +++ b/backend/usb-unix.c @@ -1,5 +1,5 @@ /* - * "$Id: usb-unix.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: usb-unix.c 5628 2006-06-05 15:25:23Z mike $" * * USB port backend for the Common UNIX Printing System (CUPS). * @@ -525,5 +525,5 @@ open_device(const char *uri) /* I - Device URI */ /* - * End of "$Id: usb-unix.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: usb-unix.c 5628 2006-06-05 15:25:23Z mike $". */ diff --git a/backend/usb.c b/backend/usb.c index 83ff27f81..cee5d86ca 100644 --- a/backend/usb.c +++ b/backend/usb.c @@ -1,5 +1,5 @@ /* - * "$Id: usb.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: usb.c 5591 2006-05-26 19:51:59Z mike $" * * USB port backend for the Common UNIX Printing System (CUPS). * @@ -270,5 +270,5 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */ /* - * End of "$Id: usb.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: usb.c 5591 2006-05-26 19:51:59Z mike $". */ diff --git a/berkeley/Dependencies b/berkeley/Dependencies index 767d33e1c..d8db9344a 100644 --- a/berkeley/Dependencies +++ b/berkeley/Dependencies @@ -2,15 +2,13 @@ lpc.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h lpc.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -lpc.o: ../cups/i18n.h ../cups/transcode.h ../cups/debug.h ../cups/string.h -lpc.o: ../config.h +lpc.o: ../cups/i18n.h ../cups/debug.h ../cups/string.h ../config.h lpq.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h lpq.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h -lpq.o: ../cups/file.h ../cups/language.h ../cups/i18n.h ../cups/transcode.h -lpq.o: ../cups/debug.h +lpq.o: ../cups/file.h ../cups/language.h ../cups/i18n.h ../cups/debug.h lpr.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h lpr.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h -lpr.o: ../cups/file.h ../cups/language.h ../cups/i18n.h ../cups/transcode.h +lpr.o: ../cups/file.h ../cups/language.h ../cups/i18n.h lprm.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h lprm.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -lprm.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h +lprm.o: ../cups/i18n.h ../cups/string.h ../config.h diff --git a/berkeley/Makefile b/berkeley/Makefile index a7c87d59f..eb16d025c 100644 --- a/berkeley/Makefile +++ b/berkeley/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $" # # Berkeley commands makefile for the Common UNIX Printing System (CUPS). # @@ -121,5 +121,5 @@ include Dependencies # -# End of "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $". # diff --git a/berkeley/lpc.c b/berkeley/lpc.c index 81353b09a..271d60477 100644 --- a/berkeley/lpc.c +++ b/berkeley/lpc.c @@ -1,5 +1,5 @@ /* - * "$Id: lpc.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: lpc.c 5023 2006-01-29 14:39:44Z mike $" * * "lpc" command for the Common UNIX Printing System (CUPS). * @@ -518,5 +518,5 @@ show_status(http_t *http, /* I - HTTP connection to server */ /* - * End of "$Id: lpc.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: lpc.c 5023 2006-01-29 14:39:44Z mike $". */ diff --git a/berkeley/lpq.c b/berkeley/lpq.c index dbdcbab13..43f01c620 100644 --- a/berkeley/lpq.c +++ b/berkeley/lpq.c @@ -1,5 +1,5 @@ /* - * "$Id: lpq.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: lpq.c 5638 2006-06-06 20:08:13Z mike $" * * "lpq" command for the Common UNIX Printing System (CUPS). * @@ -675,5 +675,5 @@ usage(void) /* - * End of "$Id: lpq.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: lpq.c 5638 2006-06-06 20:08:13Z mike $". */ diff --git a/berkeley/lpr.c b/berkeley/lpr.c index 36369f382..f6b5fb3b7 100644 --- a/berkeley/lpr.c +++ b/berkeley/lpr.c @@ -1,5 +1,5 @@ /* - * "$Id: lpr.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: lpr.c 5235 2006-03-06 13:02:23Z mike $" * * "lpr" command for the Common UNIX Printing System (CUPS). * @@ -529,5 +529,5 @@ sighandler(int s) /* I - Signal number */ /* - * End of "$Id: lpr.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: lpr.c 5235 2006-03-06 13:02:23Z mike $". */ diff --git a/berkeley/lprm.c b/berkeley/lprm.c index 2abf68c16..67479b5a3 100644 --- a/berkeley/lprm.c +++ b/berkeley/lprm.c @@ -1,5 +1,5 @@ /* - * "$Id: lprm.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: lprm.c 5023 2006-01-29 14:39:44Z mike $" * * "lprm" command for the Common UNIX Printing System (CUPS). * @@ -283,5 +283,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: lprm.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: lprm.c 5023 2006-01-29 14:39:44Z mike $". */ diff --git a/cgi-bin/Dependencies b/cgi-bin/Dependencies index 7e976859d..a1e09d398 100644 --- a/cgi-bin/Dependencies +++ b/cgi-bin/Dependencies @@ -3,49 +3,47 @@ help-index.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h help-index.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h help-index.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h -help-index.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h -help-index.o: ../cups/dir.h +help-index.o: ../cups/i18n.h ../cups/string.h ../config.h ../cups/dir.h html.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h html.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h html.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h -html.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h +html.o: ../cups/i18n.h ../cups/string.h ../config.h ipp-var.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ipp-var.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h ipp-var.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h -ipp-var.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h +ipp-var.o: ../cups/i18n.h ../cups/string.h ../config.h search.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h search.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h search.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h -search.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h +search.o: ../cups/i18n.h ../cups/string.h ../config.h template.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h template.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h template.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h -template.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h +template.o: ../cups/i18n.h ../cups/string.h ../config.h var.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h var.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h var.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h -var.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h +var.o: ../cups/i18n.h ../cups/string.h ../config.h admin.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h admin.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h admin.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h -admin.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h -admin.o: ../cups/adminutil.h ../cups/cups.h ../cups/file.h +admin.o: ../cups/i18n.h ../cups/string.h ../config.h ../cups/file.h classes.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h classes.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h classes.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h -classes.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h +classes.o: ../cups/i18n.h ../cups/string.h ../config.h help.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h help.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h help.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h -help.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h +help.o: ../cups/i18n.h ../cups/string.h ../config.h jobs.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h jobs.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h jobs.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h -jobs.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h +jobs.o: ../cups/i18n.h ../cups/string.h ../config.h printers.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h printers.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h printers.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h -printers.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h +printers.o: ../cups/i18n.h ../cups/string.h ../config.h testcgi.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h testcgi.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h testcgi.o: ../cups/array.h help-index.h diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile index 1971fe164..9497bb59f 100644 --- a/cgi-bin/Makefile +++ b/cgi-bin/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $" # # CGI makefile for the Common UNIX Printing System (CUPS). # @@ -170,5 +170,5 @@ include Dependencies # -# End of "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $". # diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c index 1a62ab6f1..85142e3a0 100644 --- a/cgi-bin/admin.c +++ b/cgi-bin/admin.c @@ -1,5 +1,5 @@ /* - * "$Id: admin.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: admin.c 5572 2006-05-22 18:47:09Z mike $" * * Administration CGI for the Common UNIX Printing System (CUPS). * @@ -651,6 +651,8 @@ do_am_printer(http_t *http, /* I - HTTP connection */ * Do the request and get back a response... */ + fprintf(stderr, "DEBUG: http=%p (%s)\n", http, http->hostname); + if ((response = cupsDoRequest(http, request, "/")) != NULL) { fputs("DEBUG: Got device list!\n", stderr); @@ -2891,5 +2893,5 @@ match_string(const char *a, /* I - First string */ /* - * End of "$Id: admin.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: admin.c 5572 2006-05-22 18:47:09Z mike $". */ diff --git a/cgi-bin/cgi-private.h b/cgi-bin/cgi-private.h index 838a3328b..b2af6d715 100644 --- a/cgi-bin/cgi-private.h +++ b/cgi-bin/cgi-private.h @@ -1,5 +1,5 @@ /* - * "$Id: cgi-private.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: cgi-private.h 4921 2006-01-12 21:26:26Z mike $" * * Private CGI definitions for the Common UNIX Printing System (CUPS). * @@ -40,5 +40,5 @@ /* - * End of "$Id: cgi-private.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: cgi-private.h 4921 2006-01-12 21:26:26Z mike $". */ diff --git a/cgi-bin/cgi.h b/cgi-bin/cgi.h index 71f99cbdc..0ffe2950d 100644 --- a/cgi-bin/cgi.h +++ b/cgi-bin/cgi.h @@ -1,5 +1,5 @@ /* - * "$Id: cgi.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: cgi.h 4931 2006-01-14 20:37:40Z mike $" * * CGI support library definitions. * @@ -105,5 +105,5 @@ extern const char *cgiText(const char *message); #endif /* !_CUPS_CGI_H_ */ /* - * End of "$Id: cgi.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: cgi.h 4931 2006-01-14 20:37:40Z mike $". */ diff --git a/cgi-bin/classes.c b/cgi-bin/classes.c index f0a616378..f639525cc 100644 --- a/cgi-bin/classes.c +++ b/cgi-bin/classes.c @@ -1,5 +1,5 @@ /* - * "$Id: classes.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: classes.c 5572 2006-05-22 18:47:09Z mike $" * * Class status CGI for the Common UNIX Printing System (CUPS). * @@ -463,5 +463,5 @@ show_class(http_t *http, /* I - Connection to server */ /* - * End of "$Id: classes.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: classes.c 5572 2006-05-22 18:47:09Z mike $". */ diff --git a/cgi-bin/help-index.c b/cgi-bin/help-index.c index a647f8166..8daf99049 100644 --- a/cgi-bin/help-index.c +++ b/cgi-bin/help-index.c @@ -1,5 +1,5 @@ /* - * "$Id: help-index.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: help-index.c 5665 2006-06-16 00:59:10Z mike $" * * On-line help index routines for the Common UNIX Printing System (CUPS). * @@ -979,5 +979,5 @@ help_sort_by_score(help_node_t *n1, /* I - First node */ /* - * End of "$Id: help-index.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: help-index.c 5665 2006-06-16 00:59:10Z mike $". */ diff --git a/cgi-bin/help-index.h b/cgi-bin/help-index.h index c696cd371..d564663a0 100644 --- a/cgi-bin/help-index.h +++ b/cgi-bin/help-index.h @@ -1,5 +1,5 @@ /* - * "$Id: help-index.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: help-index.h 5143 2006-02-21 19:13:01Z mike $" * * On-line help index definitions for the Common UNIX Printing System (CUPS). * @@ -73,5 +73,5 @@ extern help_index_t *helpSearchIndex(help_index_t *hi, const char *query, #endif /* !_CUPS_HELP_INDEX_H_ */ /* - * End of "$Id: help-index.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: help-index.h 5143 2006-02-21 19:13:01Z mike $". */ diff --git a/cgi-bin/help.c b/cgi-bin/help.c index f31885b25..0d554de71 100644 --- a/cgi-bin/help.c +++ b/cgi-bin/help.c @@ -1,5 +1,5 @@ /* - * "$Id: help.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id$" * * On-line help CGI for the Common UNIX Printing System (CUPS). * @@ -383,5 +383,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: help.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id$". */ diff --git a/cgi-bin/html.c b/cgi-bin/html.c index 9f16e1a35..da5f7cd20 100644 --- a/cgi-bin/html.c +++ b/cgi-bin/html.c @@ -1,5 +1,5 @@ /* - * "$Id: html.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: html.c 5549 2006-05-19 19:39:28Z mike $" * * HTML support functions for the Common UNIX Printing System (CUPS). * @@ -183,5 +183,5 @@ cgi_null_passwd(const char *prompt) /* I - Prompt string (unused) */ /* - * End of "$Id: html.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: html.c 5549 2006-05-19 19:39:28Z mike $". */ diff --git a/cgi-bin/ipp-var.c b/cgi-bin/ipp-var.c index fb86975eb..0b515f123 100644 --- a/cgi-bin/ipp-var.c +++ b/cgi-bin/ipp-var.c @@ -1,5 +1,5 @@ /* - * "$Id: ipp-var.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: ipp-var.c 5572 2006-05-22 18:47:09Z mike $" * * CGI <-> IPP variable routines for the Common UNIX Printing System (CUPS). * @@ -1279,5 +1279,5 @@ cgiText(const char *message) /* I - Message */ /* - * End of "$Id: ipp-var.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: ipp-var.c 5572 2006-05-22 18:47:09Z mike $". */ diff --git a/cgi-bin/jobs.c b/cgi-bin/jobs.c index 3a14cc083..ed379b001 100644 --- a/cgi-bin/jobs.c +++ b/cgi-bin/jobs.c @@ -1,5 +1,5 @@ /* - * "$Id: jobs.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: jobs.c 5104 2006-02-15 03:21:04Z mike $" * * Job status CGI for the Common UNIX Printing System (CUPS). * @@ -199,5 +199,5 @@ do_job_op(http_t *http, /* I - HTTP connection */ /* - * End of "$Id: jobs.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: jobs.c 5104 2006-02-15 03:21:04Z mike $". */ diff --git a/cgi-bin/printers.c b/cgi-bin/printers.c index ae975f9ac..e8ec0d2b3 100644 --- a/cgi-bin/printers.c +++ b/cgi-bin/printers.c @@ -1,5 +1,5 @@ /* - * "$Id: printers.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: printers.c 5572 2006-05-22 18:47:09Z mike $" * * Printer status CGI for the Common UNIX Printing System (CUPS). * @@ -638,5 +638,5 @@ show_printer(http_t *http, /* I - Connection to server */ /* - * End of "$Id: printers.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: printers.c 5572 2006-05-22 18:47:09Z mike $". */ diff --git a/cgi-bin/search.c b/cgi-bin/search.c index dfd467415..4f1ea072a 100644 --- a/cgi-bin/search.c +++ b/cgi-bin/search.c @@ -1,5 +1,5 @@ /* - * "$Id: search.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: search.c 4859 2005-11-30 23:45:24Z mike $" * * Search routines for the Common UNIX Printing System (CUPS). * @@ -364,5 +364,5 @@ cgiFreeSearch(void *search) /* I - Search context */ /* - * End of "$Id: search.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: search.c 4859 2005-11-30 23:45:24Z mike $". */ diff --git a/cgi-bin/template.c b/cgi-bin/template.c index dc0169380..82cf0e45d 100644 --- a/cgi-bin/template.c +++ b/cgi-bin/template.c @@ -1,5 +1,5 @@ /* - * "$Id: template.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: template.c 5549 2006-05-19 19:39:28Z mike $" * * CGI template function. * @@ -670,5 +670,5 @@ cgi_puturi(const char *s, /* I - String to output */ /* - * End of "$Id: template.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: template.c 5549 2006-05-19 19:39:28Z mike $". */ diff --git a/cgi-bin/testcgi.c b/cgi-bin/testcgi.c index 7abe92c9c..e9300af87 100644 --- a/cgi-bin/testcgi.c +++ b/cgi-bin/testcgi.c @@ -1,5 +1,5 @@ /* - * "$Id: testcgi.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: testcgi.c 4869 2005-12-06 02:43:40Z mike $" * * CGI test program for the Common UNIX Printing System (CUPS). * @@ -80,5 +80,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: testcgi.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: testcgi.c 4869 2005-12-06 02:43:40Z mike $". */ diff --git a/cgi-bin/testhi.c b/cgi-bin/testhi.c index 6f09caeb8..dad5d70b7 100644 --- a/cgi-bin/testhi.c +++ b/cgi-bin/testhi.c @@ -1,5 +1,5 @@ /* - * "$Id: testhi.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: testhi.c 5143 2006-02-21 19:13:01Z mike $" * * Help index test program for the Common UNIX Printing System (CUPS). * @@ -114,5 +114,5 @@ list_nodes(const char *title, /* I - Title string */ /* - * End of "$Id: testhi.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: testhi.c 5143 2006-02-21 19:13:01Z mike $". */ diff --git a/cgi-bin/testtemplate.c b/cgi-bin/testtemplate.c index 746cc8d5c..fa4714a8a 100644 --- a/cgi-bin/testtemplate.c +++ b/cgi-bin/testtemplate.c @@ -1,5 +1,5 @@ /* - * "$Id: testtemplate.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: testtemplate.c 5111 2006-02-16 02:08:09Z mike $" * * CGI template test program for the Common UNIX Printing System (CUPS). * @@ -108,5 +108,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: testtemplate.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: testtemplate.c 5111 2006-02-16 02:08:09Z mike $". */ diff --git a/cgi-bin/var.c b/cgi-bin/var.c index 5c55af741..17d507756 100644 --- a/cgi-bin/var.c +++ b/cgi-bin/var.c @@ -1,5 +1,5 @@ /* - * "$Id: var.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: var.c 5549 2006-05-19 19:39:28Z mike $" * * CGI form variable and array functions. * @@ -1027,5 +1027,5 @@ cgi_unlink_file(void) /* - * End of "$Id: var.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: var.c 5549 2006-05-19 19:39:28Z mike $". */ diff --git a/conf/Makefile b/conf/Makefile index 5951bb7fb..968e66004 100644 --- a/conf/Makefile +++ b/conf/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: Makefile 5412 2006-04-17 14:30:53Z mike $" # # Configuration file makefile for the Common UNIX Printing System (CUPS). # @@ -102,5 +102,5 @@ uninstall: # -# End of "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: Makefile 5412 2006-04-17 14:30:53Z mike $". # diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in index 697f5d12d..21f43b2cc 100644 --- a/conf/cupsd.conf.in +++ b/conf/cupsd.conf.in @@ -1,5 +1,5 @@ # -# "$Id: cupsd.conf.in 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: cupsd.conf.in 5454 2006-04-23 21:46:38Z mike $" # # Sample configuration file for the Common UNIX Printing System (CUPS) # scheduler. See "man cupsd.conf" for a complete description of this @@ -73,5 +73,5 @@ DefaultAuthType Basic </Policy> # -# End of "$Id: cupsd.conf.in 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: cupsd.conf.in 5454 2006-04-23 21:46:38Z mike $". # diff --git a/conf/mime.convs b/conf/mime.convs index ebc02a5dd..f07342df8 100644 --- a/conf/mime.convs +++ b/conf/mime.convs @@ -1,5 +1,5 @@ # -# "$Id: mime.convs 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: mime.convs 5402 2006-04-14 19:21:03Z mike $" # # MIME converts file for the Common UNIX Printing System (CUPS). # @@ -114,5 +114,5 @@ image/x-sun-raster application/vnd.cups-raster 100 imagetoraster #application/octet-stream application/vnd.cups-raw 0 - # -# End of "$Id: mime.convs 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: mime.convs 5402 2006-04-14 19:21:03Z mike $". # diff --git a/conf/mime.types b/conf/mime.types index 5747b4d8d..6f3d0467a 100644 --- a/conf/mime.types +++ b/conf/mime.types @@ -1,5 +1,5 @@ # -# "$Id: mime.types 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: mime.types 5402 2006-04-14 19:21:03Z mike $" # # MIME types file for the Common UNIX Printing System (CUPS). # @@ -167,5 +167,5 @@ application/vnd.cups-raw (string(0,<1B>E) + !string(2,<1B>%0B)) \ application/octet-stream # -# End of "$Id: mime.types 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: mime.types 5402 2006-04-14 19:21:03Z mike $". # diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index 3a9d68d50..5495beaa0 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-common.m4 181 2006-06-22 20:01:18Z jlovell $" +dnl "$Id: cups-common.m4 5466 2006-04-26 19:52:27Z mike $" dnl dnl Common configuration stuff for the Common UNIX Printing System (CUPS). dnl @@ -29,7 +29,7 @@ dnl Set the name of the config header file... AC_CONFIG_HEADER(config.h) dnl Versio number information... -CUPS_VERSION="1.3svn" +CUPS_VERSION="1.2svn" CUPS_REVISION="" if test -z "$CUPS_REVISION" -a -d .svn; then CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`" @@ -265,5 +265,5 @@ AC_SUBST(DEFAULT_IPP_PORT) AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT) dnl -dnl End of "$Id: cups-common.m4 181 2006-06-22 20:01:18Z jlovell $". +dnl End of "$Id: cups-common.m4 5466 2006-04-26 19:52:27Z mike $". dnl diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4 index 22f285ba8..adbc1294f 100644 --- a/config-scripts/cups-compiler.m4 +++ b/config-scripts/cups-compiler.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-compiler.m4 181 2006-06-22 20:01:18Z jlovell $" +dnl "$Id: cups-compiler.m4 5643 2006-06-07 20:58:29Z mike $" dnl dnl Compiler stuff for the Common UNIX Printing System (CUPS). dnl @@ -465,5 +465,5 @@ if test $uname = HP-UX; then fi dnl -dnl End of "$Id: cups-compiler.m4 181 2006-06-22 20:01:18Z jlovell $". +dnl End of "$Id: cups-compiler.m4 5643 2006-06-07 20:58:29Z mike $". dnl diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4 index 5381c4b60..ea23bd5c3 100644 --- a/config-scripts/cups-defaults.m4 +++ b/config-scripts/cups-defaults.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-defaults.m4 181 2006-06-22 20:01:18Z jlovell $" +dnl "$Id: cups-defaults.m4 5643 2006-06-07 20:58:29Z mike $" dnl dnl Default cupsd configuration settings for the Common UNIX Printing System dnl (CUPS). @@ -248,5 +248,5 @@ fi AC_DEFINE_UNQUOTED(CUPS_DEFAULT_PRINTCAP, "$CUPS_DEFAULT_PRINTCAP") dnl -dnl End of "$Id: cups-defaults.m4 181 2006-06-22 20:01:18Z jlovell $". +dnl End of "$Id: cups-defaults.m4 5643 2006-06-07 20:58:29Z mike $". dnl diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 index bc26c3023..afbeba5aa 100644 --- a/config-scripts/cups-directories.m4 +++ b/config-scripts/cups-directories.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-directories.m4 177 2006-06-21 00:20:03Z jlovell $" +dnl "$Id: cups-directories.m4 5547 2006-05-19 12:44:29Z mike $" dnl dnl Directory stuff for the Common UNIX Printing System (CUPS). dnl @@ -302,5 +302,5 @@ AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$localstatedir/run/cups") AC_SUBST(CUPS_STATEDIR) dnl -dnl End of "$Id: cups-directories.m4 177 2006-06-21 00:20:03Z jlovell $". +dnl End of "$Id: cups-directories.m4 5547 2006-05-19 12:44:29Z mike $". dnl diff --git a/config-scripts/cups-image.m4 b/config-scripts/cups-image.m4 index 1565e81c5..22cb798f4 100644 --- a/config-scripts/cups-image.m4 +++ b/config-scripts/cups-image.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-image.m4 181 2006-06-22 20:01:18Z jlovell $" +dnl "$Id: cups-image.m4 5580 2006-05-23 19:30:23Z mike $" dnl dnl Image library/filter stuff for the Common UNIX Printing System (CUPS). dnl @@ -114,5 +114,5 @@ AC_SUBST(EXPORT_LIBZ) AC_CHECK_HEADER(stdlib.h,AC_DEFINE(HAVE_STDLIB_H)) dnl -dnl End of "$Id: cups-image.m4 181 2006-06-22 20:01:18Z jlovell $". +dnl End of "$Id: cups-image.m4 5580 2006-05-23 19:30:23Z mike $". dnl diff --git a/config-scripts/cups-largefile.m4 b/config-scripts/cups-largefile.m4 index ae1458fe9..25400ce2d 100644 --- a/config-scripts/cups-largefile.m4 +++ b/config-scripts/cups-largefile.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-largefile.m4 177 2006-06-21 00:20:03Z jlovell $" +dnl "$Id: cups-largefile.m4 4732 2005-09-30 23:23:25Z mike $" dnl dnl Large file support stuff for the Common UNIX Printing System (CUPS). dnl @@ -57,5 +57,5 @@ fi AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL)) dnl -dnl End of "$Id: cups-largefile.m4 177 2006-06-21 00:20:03Z jlovell $". +dnl End of "$Id: cups-largefile.m4 4732 2005-09-30 23:23:25Z mike $". dnl diff --git a/config-scripts/cups-launchd.m4 b/config-scripts/cups-launchd.m4 index daef80839..ded893b07 100644 --- a/config-scripts/cups-launchd.m4 +++ b/config-scripts/cups-launchd.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-launchd.m4 177 2006-06-21 00:20:03Z jlovell $" +dnl "$Id: cups-launchd.m4 5466 2006-04-26 19:52:27Z mike $" dnl dnl launchd stuff for the Common UNIX Printing System (CUPS). dnl @@ -49,5 +49,5 @@ AC_SUBST(DEFAULT_LAUNCHD_CONF) AC_SUBST(LAUNCHDLIBS) dnl -dnl End of "$Id: cups-launchd.m4 177 2006-06-21 00:20:03Z jlovell $". +dnl End of "$Id: cups-launchd.m4 5466 2006-04-26 19:52:27Z mike $". dnl diff --git a/config-scripts/cups-ldap.m4 b/config-scripts/cups-ldap.m4 index e2d1b7700..c78e17509 100644 --- a/config-scripts/cups-ldap.m4 +++ b/config-scripts/cups-ldap.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-ldap.m4 177 2006-06-21 00:20:03Z jlovell $" +dnl "$Id: cups-ldap.m4 5564 2006-05-22 00:59:11Z mike $" dnl dnl LDAP configuration stuff for the Common UNIX Printing System (CUPS). dnl @@ -46,5 +46,5 @@ AC_SUBST(LIBLDAP) dnl -dnl End of "$Id: cups-ldap.m4 177 2006-06-21 00:20:03Z jlovell $". +dnl End of "$Id: cups-ldap.m4 5564 2006-05-22 00:59:11Z mike $". dnl diff --git a/config-scripts/cups-libtool.m4 b/config-scripts/cups-libtool.m4 index 5aba46b39..5b68a7080 100644 --- a/config-scripts/cups-libtool.m4 +++ b/config-scripts/cups-libtool.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-libtool.m4 177 2006-06-21 00:20:03Z jlovell $" +dnl "$Id: cups-libtool.m4 5466 2006-04-26 19:52:27Z mike $" dnl dnl Libtool stuff for the Common UNIX Printing System (CUPS). dnl @@ -45,5 +45,5 @@ if test x$LIBTOOL != x; then fi dnl -dnl End of "$Id: cups-libtool.m4 177 2006-06-21 00:20:03Z jlovell $". +dnl End of "$Id: cups-libtool.m4 5466 2006-04-26 19:52:27Z mike $". dnl diff --git a/config-scripts/cups-manpages.m4 b/config-scripts/cups-manpages.m4 index 9bae22a7a..1e6ae44de 100644 --- a/config-scripts/cups-manpages.m4 +++ b/config-scripts/cups-manpages.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-manpages.m4 177 2006-06-21 00:20:03Z jlovell $" +dnl "$Id: cups-manpages.m4 5466 2006-04-26 19:52:27Z mike $" dnl dnl Manpage stuff for the Common UNIX Printing System (CUPS). dnl @@ -103,5 +103,5 @@ AC_SUBST(MAN8EXT) AC_SUBST(MAN8DIR) dnl -dnl End of "$Id: cups-manpages.m4 177 2006-06-21 00:20:03Z jlovell $". +dnl End of "$Id: cups-manpages.m4 5466 2006-04-26 19:52:27Z mike $". dnl diff --git a/config-scripts/cups-network.m4 b/config-scripts/cups-network.m4 index 7526192c9..d30f4b90b 100644 --- a/config-scripts/cups-network.m4 +++ b/config-scripts/cups-network.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-network.m4 177 2006-06-21 00:20:03Z jlovell $" +dnl "$Id: cups-network.m4 5634 2006-06-06 17:48:27Z mike $" dnl dnl Networking stuff for the Common UNIX Printing System (CUPS). dnl @@ -46,7 +46,7 @@ else maxfiles=4096 fi -AC_ARG_WITH(maxfiles, [ --with-maxfiles=N set maximum number of file descriptors for scheduler ], +AC_ARG_WITH(maxfiles, [ --with-maxfiles=N set maximum number of file descriptors for scheduler (deprecated) ], maxfiles=$withval) AC_DEFINE_UNQUOTED(CUPS_MAX_FDS, $maxfiles) @@ -85,5 +85,5 @@ AC_SUBST(CUPS_DEFAULT_DOMAINSOCKET) AC_SUBST(CUPS_LISTEN_DOMAINSOCKET) dnl -dnl End of "$Id: cups-network.m4 177 2006-06-21 00:20:03Z jlovell $". +dnl End of "$Id: cups-network.m4 5634 2006-06-06 17:48:27Z mike $". dnl diff --git a/config-scripts/cups-opsys.m4 b/config-scripts/cups-opsys.m4 index eab82c793..b47f473a7 100644 --- a/config-scripts/cups-opsys.m4 +++ b/config-scripts/cups-opsys.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-opsys.m4 177 2006-06-21 00:20:03Z jlovell $" +dnl "$Id: cups-opsys.m4 5466 2006-04-26 19:52:27Z mike $" dnl dnl Operating system stuff for the Common UNIX Printing System (CUPS). dnl @@ -39,5 +39,5 @@ case "$uname" in esac dnl -dnl "$Id: cups-opsys.m4 177 2006-06-21 00:20:03Z jlovell $" +dnl "$Id: cups-opsys.m4 5466 2006-04-26 19:52:27Z mike $" dnl diff --git a/config-scripts/cups-pam.m4 b/config-scripts/cups-pam.m4 index 3d5afbb56..df445a2b7 100644 --- a/config-scripts/cups-pam.m4 +++ b/config-scripts/cups-pam.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-pam.m4 177 2006-06-21 00:20:03Z jlovell $" +dnl "$Id: cups-pam.m4 5466 2006-04-26 19:52:27Z mike $" dnl dnl PAM stuff for the Common UNIX Printing System (CUPS). dnl @@ -94,5 +94,5 @@ AC_SUBST(PAMLIBS) AC_SUBST(PAMMOD) dnl -dnl End of "$Id: cups-pam.m4 177 2006-06-21 00:20:03Z jlovell $". +dnl End of "$Id: cups-pam.m4 5466 2006-04-26 19:52:27Z mike $". dnl diff --git a/config-scripts/cups-pap.m4 b/config-scripts/cups-pap.m4 index 11faeed08..2fbed6776 100644 --- a/config-scripts/cups-pap.m4 +++ b/config-scripts/cups-pap.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-pap.m4 177 2006-06-21 00:20:03Z jlovell $" +dnl "$Id: cups-pam.m4 5466 2006-04-26 19:52:27Z mike $" dnl dnl PAP (AppleTalk) stuff for the Common UNIX Printing System (CUPS). dnl @@ -33,5 +33,5 @@ fi AC_SUBST(PAP) dnl -dnl End of "$Id: cups-pap.m4 177 2006-06-21 00:20:03Z jlovell $". +dnl End of "$Id: cups-pam.m4 5466 2006-04-26 19:52:27Z mike $". dnl diff --git a/config-scripts/cups-pdf.m4 b/config-scripts/cups-pdf.m4 index 310d43bf4..f76974883 100644 --- a/config-scripts/cups-pdf.m4 +++ b/config-scripts/cups-pdf.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-pdf.m4 177 2006-06-21 00:20:03Z jlovell $" +dnl "$Id: cups-pdf.m4 5466 2006-04-26 19:52:27Z mike $" dnl dnl PDF filter configuration stuff for the Common UNIX Printing System (CUPS). dnl @@ -39,5 +39,5 @@ fi AC_SUBST(PDFTOPS) dnl -dnl End of "$Id: cups-pdf.m4 177 2006-06-21 00:20:03Z jlovell $". +dnl End of "$Id: cups-pdf.m4 5466 2006-04-26 19:52:27Z mike $". dnl diff --git a/config-scripts/cups-scripting.m4 b/config-scripts/cups-scripting.m4 index 306e85932..ee00b8a2e 100644 --- a/config-scripts/cups-scripting.m4 +++ b/config-scripts/cups-scripting.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-scripting.m4 177 2006-06-21 00:20:03Z jlovell $" +dnl "$Id: cups-scripting.m4 5466 2006-04-26 19:52:27Z mike $" dnl dnl Scripting configuration stuff for the Common UNIX Printing System (CUPS). dnl @@ -100,5 +100,5 @@ if test "x$CUPS_PYTHON" != x; then fi dnl -dnl End of "$Id: cups-scripting.m4 177 2006-06-21 00:20:03Z jlovell $". +dnl End of "$Id: cups-scripting.m4 5466 2006-04-26 19:52:27Z mike $". dnl diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4 index a39d1d300..86d93e1a1 100644 --- a/config-scripts/cups-sharedlibs.m4 +++ b/config-scripts/cups-sharedlibs.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-sharedlibs.m4 181 2006-06-22 20:01:18Z jlovell $" +dnl "$Id: cups-sharedlibs.m4 5582 2006-05-24 01:00:35Z mike $" dnl dnl Shared library support for the Common UNIX Printing System (CUPS). dnl @@ -173,5 +173,5 @@ AC_SUBST(IMGLIBS) AC_SUBST(EXPORT_LDFLAGS) dnl -dnl End of "$Id: cups-sharedlibs.m4 181 2006-06-22 20:01:18Z jlovell $". +dnl End of "$Id: cups-sharedlibs.m4 5582 2006-05-24 01:00:35Z mike $". dnl diff --git a/config-scripts/cups-slp.m4 b/config-scripts/cups-slp.m4 index e5cdbadc7..0afbbca31 100644 --- a/config-scripts/cups-slp.m4 +++ b/config-scripts/cups-slp.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-slp.m4 177 2006-06-21 00:20:03Z jlovell $" +dnl "$Id: cups-slp.m4 5466 2006-04-26 19:52:27Z mike $" dnl dnl OpenSLP configuration stuff for the Common UNIX Printing System (CUPS). dnl @@ -44,5 +44,5 @@ AC_SUBST(LIBSLP) dnl -dnl End of "$Id: cups-slp.m4 177 2006-06-21 00:20:03Z jlovell $". +dnl End of "$Id: cups-slp.m4 5466 2006-04-26 19:52:27Z mike $". dnl diff --git a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4 index 949a3e4f5..ce6ea0859 100644 --- a/config-scripts/cups-ssl.m4 +++ b/config-scripts/cups-ssl.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-ssl.m4 181 2006-06-22 20:01:18Z jlovell $" +dnl "$Id: cups-ssl.m4 5630 2006-06-05 18:42:53Z mike $" dnl dnl OpenSSL/GNUTLS stuff for the Common UNIX Printing System (CUPS). dnl @@ -115,5 +115,5 @@ AC_SUBST(EXPORT_SSLLIBS) dnl -dnl End of "$Id: cups-ssl.m4 181 2006-06-22 20:01:18Z jlovell $". +dnl End of "$Id: cups-ssl.m4 5630 2006-06-05 18:42:53Z mike $". dnl diff --git a/config-scripts/cups-threads.m4 b/config-scripts/cups-threads.m4 index a62cbd89e..47f76e2ae 100644 --- a/config-scripts/cups-threads.m4 +++ b/config-scripts/cups-threads.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-threads.m4 177 2006-06-21 00:20:03Z jlovell $" +dnl "$Id: cups-threads.m4 5466 2006-04-26 19:52:27Z mike $" dnl dnl Threading stuff for the Common UNIX Printing System (CUPS). dnl @@ -53,5 +53,5 @@ fi AC_SUBST(PTHREAD_FLAGS) dnl -dnl End of "$Id: cups-threads.m4 177 2006-06-21 00:20:03Z jlovell $". +dnl End of "$Id: cups-threads.m4 5466 2006-04-26 19:52:27Z mike $". dnl diff --git a/config.h.in b/config.h.in index 672f39b37..b4cd1b551 100644 --- a/config.h.in +++ b/config.h.in @@ -1,5 +1,5 @@ /* - * "$Id: config.h.in 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: config.h.in 5630 2006-06-05 18:42:53Z mike $" * * Configuration file for the Common UNIX Printing System (CUPS). * @@ -446,5 +446,5 @@ #endif /* !_CUPS_CONFIG_H_ */ /* - * End of "$Id: config.h.in 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: config.h.in 5630 2006-06-05 18:42:53Z mike $". */ diff --git a/configure.in b/configure.in index 6b97a0582..d9e4f6255 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl -dnl "$Id: configure.in 181 2006-06-22 20:01:18Z jlovell $" +dnl "$Id: configure.in 5609 2006-05-30 20:31:10Z mike $" dnl dnl Configuration script for the Common UNIX Printing System (CUPS). dnl @@ -75,5 +75,5 @@ AC_OUTPUT(Makedefs packaging/cups.list init/cups.sh init/cups-lpd cups-config chmod +x cups-config dnl -dnl End of "$Id: configure.in 181 2006-06-22 20:01:18Z jlovell $". +dnl End of "$Id: configure.in 5609 2006-05-30 20:31:10Z mike $". dnl diff --git a/cups-config.in b/cups-config.in index 3ea644bec..9b998736f 100755 --- a/cups-config.in +++ b/cups-config.in @@ -1,6 +1,6 @@ #! /bin/sh # -# "$Id: cups-config.in 181 2006-06-22 20:01:18Z jlovell $" +# "$Id: cups-config.in 5676 2006-06-19 20:28:05Z mike $" # # CUPS configuration utility. # @@ -24,7 +24,7 @@ # VERSION="@CUPS_VERSION@" -APIVERSION="1.3" +APIVERSION="1.2" prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -150,5 +150,5 @@ while test $# -gt 0; do done # -# End of "$Id: cups-config.in 181 2006-06-22 20:01:18Z jlovell $". +# End of "$Id: cups-config.in 5676 2006-06-19 20:28:05Z mike $". # diff --git a/cups/Dependencies b/cups/Dependencies index 012ef0b3b..4cb7cb37f 100644 --- a/cups/Dependencies +++ b/cups/Dependencies @@ -1,21 +1,18 @@ # DO NOT DELETE adminutil.o: adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h -adminutil.o: language.h globals.h string.h ../config.h http-private.h -adminutil.o: ipp-private.h i18n.h transcode.h debug.h +adminutil.o: language.h globals.h string.h ../config.h i18n.h transcode.h +adminutil.o: debug.h array.o: array.h string.h ../config.h debug.h attr.o: ppd.h array.h file.h debug.h string.h ../config.h -auth.o: globals.h string.h ../config.h http-private.h http.h md5.h -auth.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -auth.o: transcode.h debug.h +auth.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +auth.o: array.h file.h language.h i18n.h transcode.h debug.h backchannel.o: cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h backend.o: backend.h string.h ../config.h -custom.o: globals.h string.h ../config.h http-private.h http.h md5.h -custom.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -custom.o: transcode.h debug.h -dest.o: globals.h string.h ../config.h http-private.h http.h md5.h -dest.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -dest.o: transcode.h +custom.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +custom.o: array.h file.h language.h i18n.h transcode.h debug.h +dest.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +dest.o: array.h file.h language.h i18n.h transcode.h dir.o: dir.h string.h ../config.h debug.h emit.o: ppd.h array.h file.h string.h ../config.h encode.o: cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h @@ -24,68 +21,56 @@ file.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h file.o: string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h file.o: debug.h getifaddrs.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h -getputfile.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h -getputfile.o: cups.h ppd.h array.h file.h language.h string.h debug.h +getputfile.o: cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h +getputfile.o: string.h ../config.h debug.h globals.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.o: globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h globals.o: transcode.h debug.h http.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h http.o: string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h http.o: debug.h -http-addr.o: globals.h string.h ../config.h http-private.h http.h md5.h -http-addr.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -http-addr.o: i18n.h transcode.h debug.h +http-addr.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +http-addr.o: array.h file.h language.h i18n.h transcode.h debug.h http-addrlist.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h http-addrlist.o: globals.h string.h cups.h ppd.h array.h file.h language.h http-addrlist.o: i18n.h transcode.h debug.h -http-support.o: debug.h globals.h string.h ../config.h http-private.h http.h -http-support.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h -http-support.o: language.h i18n.h transcode.h +http-support.o: debug.h globals.h string.h ../config.h cups.h ipp.h http.h +http-support.o: md5.h ppd.h array.h file.h language.h i18n.h transcode.h ipp.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h ipp.o: string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h ipp.o: debug.h -ipp-support.o: globals.h string.h ../config.h http-private.h http.h md5.h -ipp-support.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -ipp-support.o: i18n.h transcode.h debug.h -langprintf.o: globals.h string.h ../config.h http-private.h http.h md5.h -langprintf.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -langprintf.o: i18n.h transcode.h -language.o: globals.h string.h ../config.h http-private.h http.h md5.h -language.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -language.o: transcode.h debug.h -localize.o: globals.h string.h ../config.h http-private.h http.h md5.h -localize.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -localize.o: transcode.h debug.h +ipp-support.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +ipp-support.o: array.h file.h language.h i18n.h transcode.h debug.h +langprintf.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +langprintf.o: array.h file.h language.h i18n.h transcode.h +language.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +language.o: array.h file.h language.h i18n.h transcode.h debug.h +localize.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +localize.o: array.h file.h language.h i18n.h transcode.h debug.h mark.o: cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h mark.o: ../config.h debug.h md5.o: md5.h string.h ../config.h md5passwd.o: http.h md5.h string.h ../config.h -notify.o: globals.h string.h ../config.h http-private.h http.h md5.h -notify.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -notify.o: transcode.h +notify.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +notify.o: array.h file.h language.h i18n.h transcode.h options.o: cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h options.o: ../config.h debug.h page.o: ppd.h array.h file.h string.h ../config.h -ppd.o: globals.h string.h ../config.h http-private.h http.h md5.h -ppd.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -ppd.o: transcode.h debug.h -request.o: globals.h string.h ../config.h http-private.h http.h md5.h -request.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -request.o: transcode.h debug.h +ppd.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h array.h +ppd.o: file.h language.h i18n.h transcode.h debug.h +request.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +request.o: array.h file.h language.h i18n.h transcode.h debug.h snprintf.o: string.h ../config.h string.o: array.h debug.h string.h ../config.h -tempfile.o: globals.h string.h ../config.h http-private.h http.h md5.h -tempfile.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -tempfile.o: transcode.h debug.h -transcode.o: globals.h string.h ../config.h http-private.h http.h md5.h -transcode.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -transcode.o: i18n.h transcode.h debug.h +tempfile.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +tempfile.o: array.h file.h language.h i18n.h transcode.h debug.h +transcode.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +transcode.o: array.h file.h language.h i18n.h transcode.h debug.h usersys.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h usersys.o: globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h usersys.o: transcode.h -util.o: globals.h string.h ../config.h http-private.h http.h md5.h -util.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -util.o: transcode.h debug.h +util.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +util.o: array.h file.h language.h i18n.h transcode.h debug.h testadmin.o: adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h testadmin.o: language.h string.h ../config.h testarray.o: ../cups/string.h ../config.h string.h array.h dir.h debug.h @@ -98,21 +83,18 @@ testppd.o: ../cups/string.h ../config.h string.h ppd.h array.h file.h # DO NOT DELETE adminutil.32.o: adminutil.c adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h -adminutil.32.o: adminutil.c language.h globals.h string.h ../config.h http-private.h -adminutil.32.o: adminutil.c ipp-private.h i18n.h transcode.h debug.h +adminutil.32.o: adminutil.c language.h globals.h string.h ../config.h i18n.h transcode.h +adminutil.32.o: adminutil.c debug.h array.32.o: array.c array.h string.h ../config.h debug.h attr.32.o: attr.c ppd.h array.h file.h debug.h string.h ../config.h -auth.32.o: auth.c globals.h string.h ../config.h http-private.h http.h md5.h -auth.32.o: auth.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -auth.32.o: auth.c transcode.h debug.h +auth.32.o: auth.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +auth.32.o: auth.c array.h file.h language.h i18n.h transcode.h debug.h backchannel.32.o: backchannel.c cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h backend.32.o: backend.c backend.h string.h ../config.h -custom.32.o: custom.c globals.h string.h ../config.h http-private.h http.h md5.h -custom.32.o: custom.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -custom.32.o: custom.c transcode.h debug.h -dest.32.o: dest.c globals.h string.h ../config.h http-private.h http.h md5.h -dest.32.o: dest.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -dest.32.o: dest.c transcode.h +custom.32.o: custom.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +custom.32.o: custom.c array.h file.h language.h i18n.h transcode.h debug.h +dest.32.o: dest.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +dest.32.o: dest.c array.h file.h language.h i18n.h transcode.h dir.32.o: dir.c dir.h string.h ../config.h debug.h emit.32.o: emit.c ppd.h array.h file.h string.h ../config.h encode.32.o: encode.c cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h @@ -121,68 +103,56 @@ file.32.o: file.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h g file.32.o: file.c string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h file.32.o: file.c debug.h getifaddrs.32.o: getifaddrs.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h -getputfile.32.o: getputfile.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h -getputfile.32.o: getputfile.c cups.h ppd.h array.h file.h language.h string.h debug.h +getputfile.32.o: getputfile.c cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h +getputfile.32.o: getputfile.c string.h ../config.h debug.h globals.32.o: globals.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.32.o: globals.c globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h globals.32.o: globals.c transcode.h debug.h http.32.o: http.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h http.32.o: http.c string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h http.32.o: http.c debug.h -http-addr.32.o: http-addr.c globals.h string.h ../config.h http-private.h http.h md5.h -http-addr.32.o: http-addr.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -http-addr.32.o: http-addr.c i18n.h transcode.h debug.h +http-addr.32.o: http-addr.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +http-addr.32.o: http-addr.c array.h file.h language.h i18n.h transcode.h debug.h http-addrlist.32.o: http-addrlist.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h http-addrlist.32.o: http-addrlist.c globals.h string.h cups.h ppd.h array.h file.h language.h http-addrlist.32.o: http-addrlist.c i18n.h transcode.h debug.h -http-support.32.o: http-support.c debug.h globals.h string.h ../config.h http-private.h http.h -http-support.32.o: http-support.c md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h -http-support.32.o: http-support.c language.h i18n.h transcode.h +http-support.32.o: http-support.c debug.h globals.h string.h ../config.h cups.h ipp.h http.h +http-support.32.o: http-support.c md5.h ppd.h array.h file.h language.h i18n.h transcode.h ipp.32.o: ipp.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h ipp.32.o: ipp.c string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h ipp.32.o: ipp.c debug.h -ipp-support.32.o: ipp-support.c globals.h string.h ../config.h http-private.h http.h md5.h -ipp-support.32.o: ipp-support.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -ipp-support.32.o: ipp-support.c i18n.h transcode.h debug.h -langprintf.32.o: langprintf.c globals.h string.h ../config.h http-private.h http.h md5.h -langprintf.32.o: langprintf.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -langprintf.32.o: langprintf.c i18n.h transcode.h -language.32.o: language.c globals.h string.h ../config.h http-private.h http.h md5.h -language.32.o: language.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -language.32.o: language.c transcode.h debug.h -localize.32.o: localize.c globals.h string.h ../config.h http-private.h http.h md5.h -localize.32.o: localize.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -localize.32.o: localize.c transcode.h debug.h +ipp-support.32.o: ipp-support.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +ipp-support.32.o: ipp-support.c array.h file.h language.h i18n.h transcode.h debug.h +langprintf.32.o: langprintf.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +langprintf.32.o: langprintf.c array.h file.h language.h i18n.h transcode.h +language.32.o: language.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +language.32.o: language.c array.h file.h language.h i18n.h transcode.h debug.h +localize.32.o: localize.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +localize.32.o: localize.c array.h file.h language.h i18n.h transcode.h debug.h mark.32.o: mark.c cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h mark.32.o: mark.c ../config.h debug.h md5.32.o: md5.c md5.h string.h ../config.h md5passwd.32.o: md5passwd.c http.h md5.h string.h ../config.h -notify.32.o: notify.c globals.h string.h ../config.h http-private.h http.h md5.h -notify.32.o: notify.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -notify.32.o: notify.c transcode.h +notify.32.o: notify.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +notify.32.o: notify.c array.h file.h language.h i18n.h transcode.h options.32.o: options.c cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h options.32.o: options.c ../config.h debug.h page.32.o: page.c ppd.h array.h file.h string.h ../config.h -ppd.32.o: ppd.c globals.h string.h ../config.h http-private.h http.h md5.h -ppd.32.o: ppd.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -ppd.32.o: ppd.c transcode.h debug.h -request.32.o: request.c globals.h string.h ../config.h http-private.h http.h md5.h -request.32.o: request.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -request.32.o: request.c transcode.h debug.h +ppd.32.o: ppd.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h array.h +ppd.32.o: ppd.c file.h language.h i18n.h transcode.h debug.h +request.32.o: request.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +request.32.o: request.c array.h file.h language.h i18n.h transcode.h debug.h snprintf.32.o: snprintf.c string.h ../config.h string.32.o: string.c array.h debug.h string.h ../config.h -tempfile.32.o: tempfile.c globals.h string.h ../config.h http-private.h http.h md5.h -tempfile.32.o: tempfile.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -tempfile.32.o: tempfile.c transcode.h debug.h -transcode.32.o: transcode.c globals.h string.h ../config.h http-private.h http.h md5.h -transcode.32.o: transcode.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -transcode.32.o: transcode.c i18n.h transcode.h debug.h +tempfile.32.o: tempfile.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +tempfile.32.o: tempfile.c array.h file.h language.h i18n.h transcode.h debug.h +transcode.32.o: transcode.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +transcode.32.o: transcode.c array.h file.h language.h i18n.h transcode.h debug.h usersys.32.o: usersys.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h usersys.32.o: usersys.c globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h usersys.32.o: usersys.c transcode.h -util.32.o: util.c globals.h string.h ../config.h http-private.h http.h md5.h -util.32.o: util.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -util.32.o: util.c transcode.h debug.h +util.32.o: util.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +util.32.o: util.c array.h file.h language.h i18n.h transcode.h debug.h testadmin.32.o: testadmin.c adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h testadmin.32.o: testadmin.c language.h string.h ../config.h testarray.32.o: testarray.c ../cups/string.h ../config.h string.h array.h dir.h debug.h @@ -195,21 +165,18 @@ testppd.32.o: testppd.c ../cups/string.h ../config.h string.h ppd.h array.h fil # DO NOT DELETE adminutil.64.o: adminutil.c adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h -adminutil.64.o: adminutil.c language.h globals.h string.h ../config.h http-private.h -adminutil.64.o: adminutil.c ipp-private.h i18n.h transcode.h debug.h +adminutil.64.o: adminutil.c language.h globals.h string.h ../config.h i18n.h transcode.h +adminutil.64.o: adminutil.c debug.h array.64.o: array.c array.h string.h ../config.h debug.h attr.64.o: attr.c ppd.h array.h file.h debug.h string.h ../config.h -auth.64.o: auth.c globals.h string.h ../config.h http-private.h http.h md5.h -auth.64.o: auth.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -auth.64.o: auth.c transcode.h debug.h +auth.64.o: auth.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +auth.64.o: auth.c array.h file.h language.h i18n.h transcode.h debug.h backchannel.64.o: backchannel.c cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h backend.64.o: backend.c backend.h string.h ../config.h -custom.64.o: custom.c globals.h string.h ../config.h http-private.h http.h md5.h -custom.64.o: custom.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -custom.64.o: custom.c transcode.h debug.h -dest.64.o: dest.c globals.h string.h ../config.h http-private.h http.h md5.h -dest.64.o: dest.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -dest.64.o: dest.c transcode.h +custom.64.o: custom.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +custom.64.o: custom.c array.h file.h language.h i18n.h transcode.h debug.h +dest.64.o: dest.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +dest.64.o: dest.c array.h file.h language.h i18n.h transcode.h dir.64.o: dir.c dir.h string.h ../config.h debug.h emit.64.o: emit.c ppd.h array.h file.h string.h ../config.h encode.64.o: encode.c cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h @@ -218,68 +185,56 @@ file.64.o: file.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h g file.64.o: file.c string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h file.64.o: file.c debug.h getifaddrs.64.o: getifaddrs.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h -getputfile.64.o: getputfile.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h -getputfile.64.o: getputfile.c cups.h ppd.h array.h file.h language.h string.h debug.h +getputfile.64.o: getputfile.c cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h +getputfile.64.o: getputfile.c string.h ../config.h debug.h globals.64.o: globals.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.64.o: globals.c globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h globals.64.o: globals.c transcode.h debug.h http.64.o: http.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h http.64.o: http.c string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h http.64.o: http.c debug.h -http-addr.64.o: http-addr.c globals.h string.h ../config.h http-private.h http.h md5.h -http-addr.64.o: http-addr.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -http-addr.64.o: http-addr.c i18n.h transcode.h debug.h +http-addr.64.o: http-addr.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +http-addr.64.o: http-addr.c array.h file.h language.h i18n.h transcode.h debug.h http-addrlist.64.o: http-addrlist.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h http-addrlist.64.o: http-addrlist.c globals.h string.h cups.h ppd.h array.h file.h language.h http-addrlist.64.o: http-addrlist.c i18n.h transcode.h debug.h -http-support.64.o: http-support.c debug.h globals.h string.h ../config.h http-private.h http.h -http-support.64.o: http-support.c md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h -http-support.64.o: http-support.c language.h i18n.h transcode.h +http-support.64.o: http-support.c debug.h globals.h string.h ../config.h cups.h ipp.h http.h +http-support.64.o: http-support.c md5.h ppd.h array.h file.h language.h i18n.h transcode.h ipp.64.o: ipp.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h ipp.64.o: ipp.c string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h ipp.64.o: ipp.c debug.h -ipp-support.64.o: ipp-support.c globals.h string.h ../config.h http-private.h http.h md5.h -ipp-support.64.o: ipp-support.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -ipp-support.64.o: ipp-support.c i18n.h transcode.h debug.h -langprintf.64.o: langprintf.c globals.h string.h ../config.h http-private.h http.h md5.h -langprintf.64.o: langprintf.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -langprintf.64.o: langprintf.c i18n.h transcode.h -language.64.o: language.c globals.h string.h ../config.h http-private.h http.h md5.h -language.64.o: language.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -language.64.o: language.c transcode.h debug.h -localize.64.o: localize.c globals.h string.h ../config.h http-private.h http.h md5.h -localize.64.o: localize.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -localize.64.o: localize.c transcode.h debug.h +ipp-support.64.o: ipp-support.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +ipp-support.64.o: ipp-support.c array.h file.h language.h i18n.h transcode.h debug.h +langprintf.64.o: langprintf.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +langprintf.64.o: langprintf.c array.h file.h language.h i18n.h transcode.h +language.64.o: language.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +language.64.o: language.c array.h file.h language.h i18n.h transcode.h debug.h +localize.64.o: localize.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +localize.64.o: localize.c array.h file.h language.h i18n.h transcode.h debug.h mark.64.o: mark.c cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h mark.64.o: mark.c ../config.h debug.h md5.64.o: md5.c md5.h string.h ../config.h md5passwd.64.o: md5passwd.c http.h md5.h string.h ../config.h -notify.64.o: notify.c globals.h string.h ../config.h http-private.h http.h md5.h -notify.64.o: notify.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -notify.64.o: notify.c transcode.h +notify.64.o: notify.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +notify.64.o: notify.c array.h file.h language.h i18n.h transcode.h options.64.o: options.c cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h options.64.o: options.c ../config.h debug.h page.64.o: page.c ppd.h array.h file.h string.h ../config.h -ppd.64.o: ppd.c globals.h string.h ../config.h http-private.h http.h md5.h -ppd.64.o: ppd.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -ppd.64.o: ppd.c transcode.h debug.h -request.64.o: request.c globals.h string.h ../config.h http-private.h http.h md5.h -request.64.o: request.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -request.64.o: request.c transcode.h debug.h +ppd.64.o: ppd.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h array.h +ppd.64.o: ppd.c file.h language.h i18n.h transcode.h debug.h +request.64.o: request.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +request.64.o: request.c array.h file.h language.h i18n.h transcode.h debug.h snprintf.64.o: snprintf.c string.h ../config.h string.64.o: string.c array.h debug.h string.h ../config.h -tempfile.64.o: tempfile.c globals.h string.h ../config.h http-private.h http.h md5.h -tempfile.64.o: tempfile.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -tempfile.64.o: tempfile.c transcode.h debug.h -transcode.64.o: transcode.c globals.h string.h ../config.h http-private.h http.h md5.h -transcode.64.o: transcode.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -transcode.64.o: transcode.c i18n.h transcode.h debug.h +tempfile.64.o: tempfile.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +tempfile.64.o: tempfile.c array.h file.h language.h i18n.h transcode.h debug.h +transcode.64.o: transcode.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +transcode.64.o: transcode.c array.h file.h language.h i18n.h transcode.h debug.h usersys.64.o: usersys.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h usersys.64.o: usersys.c globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h usersys.64.o: usersys.c transcode.h -util.64.o: util.c globals.h string.h ../config.h http-private.h http.h md5.h -util.64.o: util.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -util.64.o: util.c transcode.h debug.h +util.64.o: util.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +util.64.o: util.c array.h file.h language.h i18n.h transcode.h debug.h testadmin.64.o: testadmin.c adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h testadmin.64.o: testadmin.c language.h string.h ../config.h testarray.64.o: testarray.c ../cups/string.h ../config.h string.h array.h dir.h debug.h diff --git a/cups/Makefile b/cups/Makefile index 2f7955e97..1af69254f 100644 --- a/cups/Makefile +++ b/cups/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 181 2006-06-22 20:01:18Z jlovell $" +# "$Id: Makefile 5628 2006-06-05 15:25:23Z mike $" # # API library Makefile for the Common UNIX Printing System (CUPS). # @@ -449,5 +449,5 @@ include Dependencies # -# End of "$Id: Makefile 181 2006-06-22 20:01:18Z jlovell $". +# End of "$Id: Makefile 5628 2006-06-05 15:25:23Z mike $". # diff --git a/cups/adminutil.c b/cups/adminutil.c index 185b90d1d..6848538e2 100644 --- a/cups/adminutil.c +++ b/cups/adminutil.c @@ -1,5 +1,5 @@ /* - * "$Id: adminutil.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: adminutil.c 5638 2006-06-06 20:08:13Z mike $" * * Administration utility API definitions for the Common UNIX Printing * System (CUPS). @@ -1928,5 +1928,5 @@ write_option(cups_file_t *dstfp, /* I - PPD file */ /* - * End of "$Id: adminutil.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: adminutil.c 5638 2006-06-06 20:08:13Z mike $". */ diff --git a/cups/adminutil.h b/cups/adminutil.h index 5752e33f6..8b66d1b8d 100644 --- a/cups/adminutil.h +++ b/cups/adminutil.h @@ -1,5 +1,5 @@ /* - * "$Id: adminutil.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: adminutil.h 5235 2006-03-06 13:02:23Z mike $" * * Administration utility API definitions for the Common UNIX Printing * System (CUPS). @@ -85,5 +85,5 @@ extern int _cupsAdminSetServerSettings(http_t *http, #endif /* !_CUPS_ADMINUTIL_H_ */ /* - * End of "$Id: adminutil.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: adminutil.h 5235 2006-03-06 13:02:23Z mike $". */ diff --git a/cups/api-array.shtml b/cups/api-array.shtml index 7894029e9..433ce5d28 100644 --- a/cups/api-array.shtml +++ b/cups/api-array.shtml @@ -1,5 +1,5 @@ <!-- - "$Id: api-array.shtml 177 2006-06-21 00:20:03Z jlovell $" + "$Id: api-array.shtml 5138 2006-02-21 10:49:06Z mike $" Array API introduction for the Common UNIX Printing System (CUPS). diff --git a/cups/api-cups.shtml b/cups/api-cups.shtml index c35dd141c..e53b36ef7 100644 --- a/cups/api-cups.shtml +++ b/cups/api-cups.shtml @@ -1,5 +1,5 @@ <!-- - "$Id: api-cups.shtml 177 2006-06-21 00:20:03Z jlovell $" + "$Id: api-cups.shtml 5138 2006-02-21 10:49:06Z mike $" CUPS API introduction for the Common UNIX Printing System (CUPS). diff --git a/cups/api-filedir.shtml b/cups/api-filedir.shtml index 32ea7b8cb..3e6e94433 100644 --- a/cups/api-filedir.shtml +++ b/cups/api-filedir.shtml @@ -1,5 +1,5 @@ <!-- - "$Id: api-filedir.shtml 177 2006-06-21 00:20:03Z jlovell $" + "$Id: api-filedir.shtml 5138 2006-02-21 10:49:06Z mike $" File and directory API introduction for the Common UNIX Printing System (CUPS). diff --git a/cups/api-filter.shtml b/cups/api-filter.shtml index 16361025f..66f5e0a09 100644 --- a/cups/api-filter.shtml +++ b/cups/api-filter.shtml @@ -1,5 +1,5 @@ <!-- - "$Id: api-filter.shtml 177 2006-06-21 00:20:03Z jlovell $" + "$Id: api-filter.shtml 5138 2006-02-21 10:49:06Z mike $" Filter and backend API introduction for the Common UNIX Printing System (CUPS). diff --git a/cups/api-httpipp.shtml b/cups/api-httpipp.shtml index 7acd6b649..9b860bfd3 100644 --- a/cups/api-httpipp.shtml +++ b/cups/api-httpipp.shtml @@ -1,5 +1,5 @@ <!-- - "$Id: api-httpipp.shtml 177 2006-06-21 00:20:03Z jlovell $" + "$Id: api-httpipp.shtml 5138 2006-02-21 10:49:06Z mike $" HTTP and IPP API introduction for the Common UNIX Printing System (CUPS). diff --git a/cups/api-ppd.shtml b/cups/api-ppd.shtml index 0d5782ca3..4dcd74909 100644 --- a/cups/api-ppd.shtml +++ b/cups/api-ppd.shtml @@ -1,5 +1,5 @@ <!-- - "$Id: api-ppd.shtml 177 2006-06-21 00:20:03Z jlovell $" + "$Id: api-ppd.shtml 5138 2006-02-21 10:49:06Z mike $" PPD API introduction for the Common UNIX Printing System (CUPS). diff --git a/cups/array.c b/cups/array.c index 9bc1083ab..b05168031 100644 --- a/cups/array.c +++ b/cups/array.c @@ -1,5 +1,5 @@ /* - * "$Id: array.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: array.c 5493 2006-05-05 16:33:57Z mike $" * * Sorted array routines for the Common UNIX Printing System (CUPS). * @@ -962,5 +962,5 @@ cups_array_find(cups_array_t *a, /* I - Array */ /* - * End of "$Id: array.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: array.c 5493 2006-05-05 16:33:57Z mike $". */ diff --git a/cups/array.h b/cups/array.h index bda13c59e..137dd87a2 100644 --- a/cups/array.h +++ b/cups/array.h @@ -1,5 +1,5 @@ /* - * "$Id: array.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: array.h 5258 2006-03-09 15:40:56Z mike $" * * Sorted array definitions for the Common UNIX Printing System (CUPS). * @@ -81,5 +81,5 @@ extern void *cupsArrayUserData(cups_array_t *a); #endif /* !_CUPS_ARRAY_H_ */ /* - * End of "$Id: array.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: array.h 5258 2006-03-09 15:40:56Z mike $". */ diff --git a/cups/attr.c b/cups/attr.c index 76deb6ad3..96b89ea05 100644 --- a/cups/attr.c +++ b/cups/attr.c @@ -1,5 +1,5 @@ /* - * "$Id: attr.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: attr.c 5119 2006-02-16 15:52:06Z mike $" * * PPD model-specific attribute routines for the Common UNIX Printing System * (CUPS). @@ -129,5 +129,5 @@ ppdFindNextAttr(ppd_file_t *ppd, /* I - PPD file data */ /* - * End of "$Id: attr.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: attr.c 5119 2006-02-16 15:52:06Z mike $". */ diff --git a/cups/auth.c b/cups/auth.c index dbdac494a..8f515f8e0 100644 --- a/cups/auth.c +++ b/cups/auth.c @@ -1,5 +1,5 @@ /* - * "$Id: auth.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: auth.c 5559 2006-05-21 13:59:42Z mike $" * * Authentication functions for the Common UNIX Printing System (CUPS). * @@ -249,5 +249,5 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ /* - * End of "$Id: auth.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: auth.c 5559 2006-05-21 13:59:42Z mike $". */ diff --git a/cups/backchannel.c b/cups/backchannel.c index 98d660698..09833fe46 100644 --- a/cups/backchannel.c +++ b/cups/backchannel.c @@ -1,5 +1,5 @@ /* - * "$Id: backchannel.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: backchannel.c 5551 2006-05-19 20:20:32Z mike $" * * Backchannel functions for the Common UNIX Printing System (CUPS). * @@ -197,5 +197,5 @@ cups_setup(fd_set *set, /* I - Set for select() */ /* - * End of "$Id: backchannel.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: backchannel.c 5551 2006-05-19 20:20:32Z mike $". */ diff --git a/cups/backend.c b/cups/backend.c index 2d3ef9c17..68d234d12 100644 --- a/cups/backend.c +++ b/cups/backend.c @@ -1,5 +1,5 @@ /* - * "$Id: backend.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: backend.c 5024 2006-01-29 14:58:15Z mike $" * * Backend functions for the Common UNIX Printing System (CUPS). * @@ -63,5 +63,5 @@ cupsBackendDeviceURI(char **argv) /* I - Command-line arguments */ /* - * End of "$Id: backend.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: backend.c 5024 2006-01-29 14:58:15Z mike $". */ diff --git a/cups/backend.h b/cups/backend.h index f35d98c76..ca107c93f 100644 --- a/cups/backend.h +++ b/cups/backend.h @@ -1,5 +1,5 @@ /* - * "$Id: backend.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: backend.h 5023 2006-01-29 14:39:44Z mike $" * * Backend definitions for the Common UNIX Printing System (CUPS). * @@ -53,5 +53,5 @@ extern const char *cupsBackendDeviceURI(char **argv); #endif /* !_CUPS_BACKEND_H_ */ /* - * End of "$Id: backend.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: backend.h 5023 2006-01-29 14:39:44Z mike $". */ diff --git a/cups/cups.h b/cups/cups.h index 60de912ce..64b389a08 100644 --- a/cups/cups.h +++ b/cups/cups.h @@ -1,5 +1,5 @@ /* - * "$Id: cups.h 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: cups.h 5233 2006-03-06 03:39:28Z mike $" * * API definitions for the Common UNIX Printing System (CUPS). * @@ -61,9 +61,9 @@ extern "C" { * Constants... */ -# define CUPS_VERSION 1.0300 +# define CUPS_VERSION 1.0200 # define CUPS_VERSION_MAJOR 1 -# define CUPS_VERSION_MINOR 3 +# define CUPS_VERSION_MINOR 2 # define CUPS_VERSION_PATCH 0 # define CUPS_DATE_ANY -1 @@ -244,5 +244,5 @@ extern cups_file_t *cupsTempFile2(char *filename, int len); #endif /* !_CUPS_CUPS_H_ */ /* - * End of "$Id: cups.h 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: cups.h 5233 2006-03-06 03:39:28Z mike $". */ diff --git a/cups/custom.c b/cups/custom.c index bd7d16633..23008e93c 100644 --- a/cups/custom.c +++ b/cups/custom.c @@ -1,5 +1,5 @@ /* - * "$Id: custom.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: custom.c 5391 2006-04-14 12:26:50Z mike $" * * PPD custom option routines for the Common UNIX Printing System (CUPS). * @@ -123,5 +123,5 @@ ppdNextCustomParam(ppd_coption_t *opt) /* I - Custom option */ /* - * End of "$Id: custom.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: custom.c 5391 2006-04-14 12:26:50Z mike $". */ diff --git a/cups/debug.h b/cups/debug.h index f74358041..65b1fa224 100644 --- a/cups/debug.h +++ b/cups/debug.h @@ -1,5 +1,5 @@ /* - * "$Id: debug.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: debug.h 4493 2005-02-18 02:09:53Z mike $" * * Debugging macros for the Common UNIX Printing System (CUPS). * @@ -55,5 +55,5 @@ #endif /* !_CUPS_DEBUG_H_ */ /* - * End of "$Id: debug.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: debug.h 4493 2005-02-18 02:09:53Z mike $". */ diff --git a/cups/dest.c b/cups/dest.c index fde4b1b77..a91e39847 100644 --- a/cups/dest.c +++ b/cups/dest.c @@ -1,5 +1,5 @@ /* - * "$Id: dest.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: dest.c 5346 2006-03-28 16:05:19Z mike $" * * User-defined destination (and option) support for the Common UNIX * Printing System (CUPS). @@ -1008,5 +1008,5 @@ cups_get_sdests(http_t *http, /* I - HTTP connection */ /* - * End of "$Id: dest.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: dest.c 5346 2006-03-28 16:05:19Z mike $". */ diff --git a/cups/dir.c b/cups/dir.c index f74498b74..e06edea91 100644 --- a/cups/dir.c +++ b/cups/dir.c @@ -1,5 +1,5 @@ /* - * "$Id: dir.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id$" * * Public directory routines for the Common UNIX Printing System (CUPS). * @@ -433,5 +433,5 @@ cupsDirRewind(cups_dir_t *dp) /* I - Directory */ #endif /* WIN32 */ /* - * End of "$Id: dir.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id$". */ diff --git a/cups/dir.h b/cups/dir.h index caa05713e..0fd52e8f1 100644 --- a/cups/dir.h +++ b/cups/dir.h @@ -1,5 +1,5 @@ /* - * "$Id: dir.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id$" * * Public directory definitions for the Common UNIX Printing System (CUPS). * @@ -73,5 +73,5 @@ extern void cupsDirRewind(cups_dir_t *dp); #endif /* !_CUPS_DIR_H_ */ /* - * End of "$Id: dir.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id$". */ diff --git a/cups/emit.c b/cups/emit.c index 31de6960b..6f4dc78de 100644 --- a/cups/emit.c +++ b/cups/emit.c @@ -1,5 +1,5 @@ /* - * "$Id: emit.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: emit.c 5257 2006-03-09 15:27:27Z mike $" * * PPD code emission routines for the Common UNIX Printing System (CUPS). * @@ -917,5 +917,5 @@ ppd_sort(ppd_choice_t **c1, /* I - First choice */ /* - * End of "$Id: emit.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: emit.c 5257 2006-03-09 15:27:27Z mike $". */ diff --git a/cups/encode.c b/cups/encode.c index 9c8bffc0c..a00e2c52a 100644 --- a/cups/encode.c +++ b/cups/encode.c @@ -1,5 +1,5 @@ /* - * "$Id: encode.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: encode.c 5545 2006-05-18 21:00:56Z mike $" * * Option encoding routines for the Common UNIX Printing System (CUPS). * @@ -67,7 +67,6 @@ static const _ipp_option_t ipp_options[] = { "copies", IPP_TAG_INTEGER, IPP_TAG_JOB }, { "copies-default", IPP_TAG_INTEGER, IPP_TAG_PRINTER }, { "document-format", IPP_TAG_MIMETYPE, IPP_TAG_OPERATION }, - { "document-format-default", IPP_TAG_MIMETYPE, IPP_TAG_PRINTER }, { "finishings", IPP_TAG_ENUM, IPP_TAG_JOB }, { "finishings-default", IPP_TAG_ENUM, IPP_TAG_PRINTER }, { "fitplot", IPP_TAG_BOOLEAN, IPP_TAG_JOB }, @@ -89,7 +88,6 @@ static const _ipp_option_t ipp_options[] = { "natural-scaling-default", IPP_TAG_INTEGER, IPP_TAG_PRINTER }, { "notify-charset", IPP_TAG_CHARSET, IPP_TAG_SUBSCRIPTION }, { "notify-events", IPP_TAG_KEYWORD, IPP_TAG_SUBSCRIPTION }, - { "notify-events-default", IPP_TAG_KEYWORD, IPP_TAG_PRINTER }, { "notify-lease-time", IPP_TAG_INTEGER, IPP_TAG_SUBSCRIPTION }, { "notify-natural-language", IPP_TAG_LANGUAGE, IPP_TAG_SUBSCRIPTION }, { "notify-pull-method", IPP_TAG_KEYWORD, IPP_TAG_SUBSCRIPTION }, @@ -561,5 +559,5 @@ compare_ipp_options(_ipp_option_t *a, /* I - First option */ /* - * End of "$Id: encode.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: encode.c 5545 2006-05-18 21:00:56Z mike $". */ diff --git a/cups/file.c b/cups/file.c index 31fd2c233..a5c1372f5 100644 --- a/cups/file.c +++ b/cups/file.c @@ -1,5 +1,5 @@ /* - * "$Id: file.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: file.c 5324 2006-03-23 16:47:46Z mike $" * * File functions for the Common UNIX Printing System (CUPS). * @@ -2080,5 +2080,5 @@ cups_write(cups_file_t *fp, /* I - CUPS file */ /* - * End of "$Id: file.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: file.c 5324 2006-03-23 16:47:46Z mike $". */ diff --git a/cups/file.h b/cups/file.h index cbd2fd40d..24649147b 100644 --- a/cups/file.h +++ b/cups/file.h @@ -1,5 +1,5 @@ /* - * "$Id: file.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: file.h 5319 2006-03-21 15:28:29Z mike $" * * Public file definitions for the Common UNIX Printing System (CUPS). * @@ -109,5 +109,5 @@ extern ssize_t cupsFileWrite(cups_file_t *fp, const char *buf, size_t bytes); #endif /* !_CUPS_FILE_H_ */ /* - * End of "$Id: file.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: file.h 5319 2006-03-21 15:28:29Z mike $". */ diff --git a/cups/getifaddrs.c b/cups/getifaddrs.c index f500c6967..abfd0fac6 100644 --- a/cups/getifaddrs.c +++ b/cups/getifaddrs.c @@ -1,5 +1,5 @@ /* - * "$Id: getifaddrs.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: getifaddrs.c 5504 2006-05-10 18:57:46Z mike $" * * Network interface functions for the Common UNIX Printing System * (CUPS) scheduler. @@ -272,5 +272,5 @@ _cups_freeifaddrs(struct ifaddrs *addrs)/* I - Interface list to free */ /* - * End of "$Id: getifaddrs.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: getifaddrs.c 5504 2006-05-10 18:57:46Z mike $". */ diff --git a/cups/getputfile.c b/cups/getputfile.c index e69b74063..9dc7f7a9c 100644 --- a/cups/getputfile.c +++ b/cups/getputfile.c @@ -1,5 +1,5 @@ /* - * "$Id: getputfile.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: getputfile.c 5235 2006-03-06 13:02:23Z mike $" * * Get/put file functions for the Common UNIX Printing System (CUPS). * @@ -35,8 +35,8 @@ * Include necessary headers... */ -#include "http-private.h" #include "cups.h" +#include "ipp.h" #include "language.h" #include "string.h" #include "debug.h" @@ -488,5 +488,5 @@ cupsPutFile(http_t *http, /* I - HTTP connection to server */ /* - * End of "$Id: getputfile.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: getputfile.c 5235 2006-03-06 13:02:23Z mike $". */ diff --git a/cups/globals.c b/cups/globals.c index c622166b7..b7dbbf348 100644 --- a/cups/globals.c +++ b/cups/globals.c @@ -1,5 +1,5 @@ /* - * "$Id: globals.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: globals.c 5373 2006-04-06 20:03:32Z mike $" * * Global variable access routines for the Common UNIX Printing System (CUPS). * @@ -226,5 +226,5 @@ _cupsGlobals(void) /* - * End of "$Id: globals.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: globals.c 5373 2006-04-06 20:03:32Z mike $". */ diff --git a/cups/globals.h b/cups/globals.h index 8e8156816..819d2bd6f 100644 --- a/cups/globals.h +++ b/cups/globals.h @@ -1,5 +1,5 @@ /* - * "$Id: globals.h 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: globals.h 5366 2006-04-02 16:11:04Z mike $" * * Global variable definitions for the Common UNIX Printing System (CUPS). * @@ -32,7 +32,6 @@ */ # include "string.h" -# include "http-private.h" # include "cups.h" # include "i18n.h" @@ -152,5 +151,5 @@ extern void _cupsSetError(ipp_status_t status, const char *message); #endif /* !_CUPS_GLOBALS_H_ */ /* - * End of "$Id: globals.h 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: globals.h 5366 2006-04-02 16:11:04Z mike $". */ diff --git a/cups/http-addr.c b/cups/http-addr.c index 08e57c625..f0d5fb37e 100644 --- a/cups/http-addr.c +++ b/cups/http-addr.c @@ -1,5 +1,5 @@ /* - * "$Id: http-addr.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: http-addr.c 5443 2006-04-20 14:50:26Z mike $" * * HTTP address routines for the Common UNIX Printing System (CUPS). * @@ -562,5 +562,5 @@ httpGetHostname(http_t *http, /* I - HTTP connection or NULL */ /* - * End of "$Id: http-addr.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: http-addr.c 5443 2006-04-20 14:50:26Z mike $". */ diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c index b0fbb84c0..6700e567d 100644 --- a/cups/http-addrlist.c +++ b/cups/http-addrlist.c @@ -1,5 +1,5 @@ /* - * "$Id: http-addrlist.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: http-addrlist.c 5679 2006-06-20 14:45:15Z mike $" * * HTTP address list routines for the Common UNIX Printing System (CUPS). * @@ -605,5 +605,5 @@ httpAddrGetList(const char *hostname, /* I - Hostname, IP address, or NULL for p /* - * End of "$Id: http-addrlist.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: http-addrlist.c 5679 2006-06-20 14:45:15Z mike $". */ diff --git a/cups/http-private.h b/cups/http-private.h index e54d0dcec..bef934ed9 100644 --- a/cups/http-private.h +++ b/cups/http-private.h @@ -1,5 +1,5 @@ /* - * "$Id: http-private.h 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: http-private.h 5504 2006-05-10 18:57:46Z mike $" * * Private HTTP definitions for the Common UNIX Printing System (CUPS). * @@ -120,55 +120,6 @@ extern OSStatus _httpWriteCDSA(SSLConnectionRef connection, const void *data, size_t *dataLength); # endif /* HAVE_LIBSSL */ - -struct _http_s /**** HTTP connection structure. ****/ -{ - int fd; /* File descriptor for this socket */ - int blocking; /* To block or not to block */ - int error; /* Last error on read */ - time_t activity; /* Time since last read/write */ - http_state_t state; /* State of client */ - http_status_t status; /* Status of last request */ - http_version_t version; /* Protocol version */ - http_keepalive_t keep_alive; /* Keep-alive supported? */ - struct sockaddr_in _hostaddr; /* Address of connected host @deprecated@ */ - char hostname[HTTP_MAX_HOST], - /* Name of connected host */ - fields[HTTP_FIELD_MAX][HTTP_MAX_VALUE]; - /* Field values */ - char *data; /* Pointer to data buffer */ - http_encoding_t data_encoding; /* Chunked or not */ - int _data_remaining;/* Number of bytes left @deprecated@ */ - int used; /* Number of bytes used in buffer */ - char buffer[HTTP_MAX_BUFFER]; - /* Buffer for incoming data */ - int auth_type; /* Authentication in use */ - _cups_md5_state_t md5_state; /* MD5 state */ - char nonce[HTTP_MAX_VALUE]; - /* Nonce value */ - int nonce_count; /* Nonce count */ - void *tls; /* TLS state information */ - http_encryption_t encryption; /* Encryption requirements */ - /**** New in CUPS 1.1.19 ****/ - fd_set *input_set; /* select() set for httpWait() @since CUPS 1.1.19@ */ - http_status_t expect; /* Expect: header @since CUPS 1.1.19@ */ - char *cookie; /* Cookie value(s) @since CUPS 1.1.19@ */ - /**** New in CUPS 1.1.20 ****/ - char authstring[HTTP_MAX_VALUE], - /* Current Authentication value @since CUPS 1.1.20@ */ - userpass[HTTP_MAX_VALUE]; - /* Username:password string @since CUPS 1.1.20@ */ - int digest_tries; /* Number of tries for digest auth @since CUPS 1.1.20@ */ - /**** New in CUPS 1.2 ****/ - off_t data_remaining; /* Number of bytes left @since CUPS 1.2@ */ - http_addr_t *hostaddr; /* Current host address and port @since CUPS 1.2@ */ - http_addrlist_t *addrlist; /* List of valid addresses @since CUPS 1.2@ */ - char wbuffer[HTTP_MAX_BUFFER]; - /* Buffer for outgoing data */ - int wused; /* Write buffer bytes used @since CUPS 1.2@ */ -}; - - /* * Some OS's don't have hstrerror(), most notably Solaris... */ @@ -236,5 +187,5 @@ extern void _cups_freeifaddrs(struct ifaddrs *addrs); #endif /* !_CUPS_HTTP_PRIVATE_H_ */ /* - * End of "$Id: http-private.h 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: http-private.h 5504 2006-05-10 18:57:46Z mike $". */ diff --git a/cups/http-support.c b/cups/http-support.c index 674e0db2c..72bd4bde2 100644 --- a/cups/http-support.c +++ b/cups/http-support.c @@ -1,5 +1,5 @@ /* - * "$Id: http-support.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: http-support.c 5360 2006-03-30 17:02:17Z mike $" * * HTTP support routines for the Common UNIX Printing System (CUPS) scheduler. * @@ -1316,5 +1316,5 @@ http_copy_encode(char *dst, /* O - Destination buffer */ /* - * End of "$Id: http-support.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: http-support.c 5360 2006-03-30 17:02:17Z mike $". */ diff --git a/cups/http.c b/cups/http.c index 01706d264..e864c18c4 100644 --- a/cups/http.c +++ b/cups/http.c @@ -1,5 +1,5 @@ /* - * "$Id: http.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: http.c 5630 2006-06-05 18:42:53Z mike $" * * HTTP routines for the Common UNIX Printing System (CUPS). * @@ -2801,5 +2801,5 @@ http_write_ssl(http_t *http, /* I - HTTP connection */ /* - * End of "$Id: http.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: http.c 5630 2006-06-05 18:42:53Z mike $". */ diff --git a/cups/http.h b/cups/http.h index 426da806b..937b94fa0 100644 --- a/cups/http.h +++ b/cups/http.h @@ -1,5 +1,5 @@ /* - * "$Id: http.h 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: http.h 5632 2006-06-06 14:46:10Z mike $" * * Hyper-Text Transport Protocol definitions for the Common UNIX Printing * System (CUPS). @@ -320,7 +320,60 @@ typedef struct http_addrlist_s /**** Socket address list, which is http_addr_t addr; /* Address */ } http_addrlist_t; -typedef struct _http_s http_t; /**** HTTP connection type ****/ +typedef struct _http_s /**** HTTP connection structure. ****/ +{ + /* + * DO NOT ACCESS MEMBERS OF THIS STRUCTURE DIRECTLY; INSTEAD, USE THE + * PROVIDED APIS FOR ACCESSING THE VALUES INSTEAD. + * + * This structure definition will be removed from the public headers in + * CUPS 1.3. + */ + + int fd; /* File descriptor for this socket */ + int blocking; /* To block or not to block */ + int error; /* Last error on read */ + time_t activity; /* Time since last read/write */ + http_state_t state; /* State of client */ + http_status_t status; /* Status of last request */ + http_version_t version; /* Protocol version */ + http_keepalive_t keep_alive; /* Keep-alive supported? */ + struct sockaddr_in _hostaddr; /* Address of connected host @deprecated@ */ + char hostname[HTTP_MAX_HOST], + /* Name of connected host */ + fields[HTTP_FIELD_MAX][HTTP_MAX_VALUE]; + /* Field values */ + char *data; /* Pointer to data buffer */ + http_encoding_t data_encoding; /* Chunked or not */ + int _data_remaining;/* Number of bytes left @deprecated@ */ + int used; /* Number of bytes used in buffer */ + char buffer[HTTP_MAX_BUFFER]; + /* Buffer for incoming data */ + int auth_type; /* Authentication in use */ + _cups_md5_state_t md5_state; /* MD5 state */ + char nonce[HTTP_MAX_VALUE]; + /* Nonce value */ + int nonce_count; /* Nonce count */ + void *tls; /* TLS state information */ + http_encryption_t encryption; /* Encryption requirements */ + /**** New in CUPS 1.1.19 ****/ + fd_set *input_set; /* select() set for httpWait() @since CUPS 1.1.19@ */ + http_status_t expect; /* Expect: header @since CUPS 1.1.19@ */ + char *cookie; /* Cookie value(s) @since CUPS 1.1.19@ */ + /**** New in CUPS 1.1.20 ****/ + char authstring[HTTP_MAX_VALUE], + /* Current Authentication value @since CUPS 1.1.20@ */ + userpass[HTTP_MAX_VALUE]; + /* Username:password string @since CUPS 1.1.20@ */ + int digest_tries; /* Number of tries for digest auth @since CUPS 1.1.20@ */ + /**** New in CUPS 1.2 ****/ + off_t data_remaining; /* Number of bytes left @since CUPS 1.2@ */ + http_addr_t *hostaddr; /* Current host address and port @since CUPS 1.2@ */ + http_addrlist_t *addrlist; /* List of valid addresses @since CUPS 1.2@ */ + char wbuffer[HTTP_MAX_BUFFER]; + /* Buffer for outgoing data */ + int wused; /* Write buffer bytes used @since CUPS 1.2@ */ +} http_t; /* @@ -451,5 +504,5 @@ extern ssize_t httpWrite2(http_t *http, const char *buffer, #endif /* !_CUPS_HTTP_H_ */ /* - * End of "$Id: http.h 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: http.h 5632 2006-06-06 14:46:10Z mike $". */ diff --git a/cups/i18n.h b/cups/i18n.h index d3001065b..58de0eae5 100644 --- a/cups/i18n.h +++ b/cups/i18n.h @@ -1,5 +1,5 @@ /* - * "$Id: i18n.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: i18n.h 5366 2006-04-02 16:11:04Z mike $" * * (Private) localization support for the Common UNIX Printing System (CUPS). * @@ -113,5 +113,5 @@ extern const char *_cupsMessageLookup(cups_array_t *a, const char *m); #endif /* !_CUPS_I18N_H_ */ /* - * End of "$Id: i18n.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: i18n.h 5366 2006-04-02 16:11:04Z mike $". */ diff --git a/cups/ipp-private.h b/cups/ipp-private.h index 25eabecbe..af303f1da 100644 --- a/cups/ipp-private.h +++ b/cups/ipp-private.h @@ -1,5 +1,5 @@ /* - * "$Id: ipp-private.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: ipp-private.h 5230 2006-03-05 17:01:51Z mike $" * * Private IPP definitions for the Common UNIX Printing System (CUPS). * @@ -61,5 +61,5 @@ extern void _ippFreeAttr(ipp_attribute_t *); #endif /* !_CUPS_IPP_H_ */ /* - * End of "$Id: ipp-private.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: ipp-private.h 5230 2006-03-05 17:01:51Z mike $". */ diff --git a/cups/ipp-support.c b/cups/ipp-support.c index 585818fa2..fef06af1c 100644 --- a/cups/ipp-support.c +++ b/cups/ipp-support.c @@ -1,5 +1,5 @@ /* - * "$Id: ipp-support.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: ipp-support.c 5246 2006-03-08 13:22:09Z mike $" * * Internet Printing Protocol support functions for the Common UNIX * Printing System (CUPS). @@ -333,5 +333,5 @@ ippSetPort(int p) /* I - Port number to use */ /* - * End of "$Id: ipp-support.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: ipp-support.c 5246 2006-03-08 13:22:09Z mike $". */ diff --git a/cups/ipp.c b/cups/ipp.c index 3786b60d9..148fc702d 100644 --- a/cups/ipp.c +++ b/cups/ipp.c @@ -1,5 +1,5 @@ /* - * "$Id: ipp.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: ipp.c 5624 2006-06-02 15:15:23Z mike $" * * Internet Printing Protocol support functions for the Common UNIX * Printing System (CUPS). @@ -2824,5 +2824,5 @@ _ipp_free_attr(ipp_attribute_t *attr) /* I - Attribute to free */ /* - * End of "$Id: ipp.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: ipp.c 5624 2006-06-02 15:15:23Z mike $". */ diff --git a/cups/ipp.h b/cups/ipp.h index 11426a3de..6435a0eca 100644 --- a/cups/ipp.h +++ b/cups/ipp.h @@ -1,5 +1,5 @@ /* - * "$Id: ipp.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: ipp.h 5138 2006-02-21 10:49:06Z mike $" * * Internet Printing Protocol definitions for the Common UNIX Printing * System (CUPS). @@ -497,5 +497,5 @@ extern ipp_state_t ippWriteIO(void *dst, ipp_iocb_t cb, int blocking, #endif /* !_CUPS_IPP_H_ */ /* - * End of "$Id: ipp.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: ipp.h 5138 2006-02-21 10:49:06Z mike $". */ diff --git a/cups/langprintf.c b/cups/langprintf.c index f4fa589ca..4430c6792 100644 --- a/cups/langprintf.c +++ b/cups/langprintf.c @@ -1,5 +1,5 @@ /* - * "$Id: langprintf.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: langprintf.c 4924 2006-01-13 01:55:20Z mike $" * * Localized printf/puts functions for the Common UNIX Printing * System (CUPS). @@ -139,5 +139,5 @@ _cupsLangPuts(FILE *fp, /* I - File to write to */ /* - * End of "$Id: langprintf.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: langprintf.c 4924 2006-01-13 01:55:20Z mike $". */ diff --git a/cups/language.c b/cups/language.c index 0a2668225..6990d9127 100644 --- a/cups/language.c +++ b/cups/language.c @@ -1,5 +1,5 @@ /* - * "$Id: language.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: language.c 5373 2006-04-06 20:03:32Z mike $" * * I18N/language support for the Common UNIX Printing System (CUPS). * @@ -1295,5 +1295,5 @@ cups_unquote(char *d, /* O - Unquoted string */ /* - * End of "$Id: language.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: language.c 5373 2006-04-06 20:03:32Z mike $". */ diff --git a/cups/language.h b/cups/language.h index f21a59387..94f7bf81a 100644 --- a/cups/language.h +++ b/cups/language.h @@ -1,5 +1,5 @@ /* - * "$Id: language.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: language.h 5085 2006-02-06 13:27:53Z mike $" * * Multi-language support for the Common UNIX Printing System (CUPS). * @@ -119,5 +119,5 @@ extern cups_lang_t *cupsLangGet(const char *language); #endif /* !_CUPS_LANGUAGE_H_ */ /* - * End of "$Id: language.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: language.h 5085 2006-02-06 13:27:53Z mike $". */ diff --git a/cups/localize.c b/cups/localize.c index b738e4d36..b07609bbb 100644 --- a/cups/localize.c +++ b/cups/localize.c @@ -1,5 +1,5 @@ /* - * "$Id: localize.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: localize.c 5391 2006-04-14 12:26:50Z mike $" * * PPD custom option routines for the Common UNIX Printing System (CUPS). * @@ -185,5 +185,5 @@ ppd_text(ppd_file_t *ppd, /* I - PPD file */ /* - * End of "$Id: localize.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: localize.c 5391 2006-04-14 12:26:50Z mike $". */ diff --git a/cups/mark.c b/cups/mark.c index 274e13745..3b2226774 100644 --- a/cups/mark.c +++ b/cups/mark.c @@ -1,5 +1,5 @@ /* - * "$Id: mark.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: mark.c 5529 2006-05-15 20:06:46Z mike $" * * Option marking routines for the Common UNIX Printing System (CUPS). * @@ -679,5 +679,5 @@ ppd_defaults(ppd_file_t *ppd, /* I - PPD file */ /* - * End of "$Id: mark.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: mark.c 5529 2006-05-15 20:06:46Z mike $". */ diff --git a/cups/md5-apple.h b/cups/md5-apple.h index a49912e99..4284ad4ab 100644 --- a/cups/md5-apple.h +++ b/cups/md5-apple.h @@ -1,5 +1,5 @@ /* - * "$Id: md5-apple.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: md5-apple.h 5232 2006-03-05 17:59:19Z mike $" * * MD5 MacOS X compatibility header for the Common UNIX Printing * System (CUPS). @@ -35,5 +35,5 @@ void md5_finish(_cups_md5_state_t *pms, unsigned char digest[16]) { _cupsMD5Finish(pms, digest); } /* - * End of "$Id: md5-apple.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: md5-apple.h 5232 2006-03-05 17:59:19Z mike $". */ diff --git a/cups/md5.c b/cups/md5.c index 5c2b8488e..9a3fab987 100644 --- a/cups/md5.c +++ b/cups/md5.c @@ -26,7 +26,7 @@ ghost@aladdin.com */ -/*$Id: md5.c 177 2006-06-21 00:20:03Z jlovell $ */ +/*$Id: md5.c 5232 2006-03-05 17:59:19Z mike $ */ /* Independent implementation of MD5 (RFC 1321). diff --git a/cups/md5.h b/cups/md5.h index 407afdb20..3b0281c0f 100644 --- a/cups/md5.h +++ b/cups/md5.h @@ -26,7 +26,7 @@ ghost@aladdin.com */ -/*$Id: md5.h 177 2006-06-21 00:20:03Z jlovell $ */ +/*$Id: md5.h 5232 2006-03-05 17:59:19Z mike $ */ /* Independent implementation of MD5 (RFC 1321). diff --git a/cups/md5passwd.c b/cups/md5passwd.c index 29b288b96..df8a75881 100644 --- a/cups/md5passwd.c +++ b/cups/md5passwd.c @@ -1,5 +1,5 @@ /* - * "$Id: md5passwd.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: md5passwd.c 5232 2006-03-05 17:59:19Z mike $" * * MD5 password support for the Common UNIX Printing System (CUPS). * @@ -147,5 +147,5 @@ httpMD5String(const unsigned char *sum, /* I - MD5 sum data */ /* - * End of "$Id: md5passwd.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: md5passwd.c 5232 2006-03-05 17:59:19Z mike $". */ diff --git a/cups/notify.c b/cups/notify.c index cc40183f5..2a89aca3c 100644 --- a/cups/notify.c +++ b/cups/notify.c @@ -1,5 +1,5 @@ /* - * "$Id: notify.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: notify.c 4961 2006-01-20 22:19:13Z mike $" * * Notification routines for the Common UNIX Printing System (CUPS). * @@ -207,5 +207,5 @@ cupsNotifyText(cups_lang_t *lang, /* I - Language data */ /* - * End of "$Id: notify.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: notify.c 4961 2006-01-20 22:19:13Z mike $". */ diff --git a/cups/options.c b/cups/options.c index f90285656..e232caaad 100644 --- a/cups/options.c +++ b/cups/options.c @@ -1,5 +1,5 @@ /* - * "$Id: options.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: options.c 5151 2006-02-22 22:43:17Z mike $" * * Option routines for the Common UNIX Printing System (CUPS). * @@ -634,5 +634,5 @@ cupsRemoveOption( /* - * End of "$Id: options.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: options.c 5151 2006-02-22 22:43:17Z mike $". */ diff --git a/cups/page.c b/cups/page.c index 66036fc3f..f8b79832f 100644 --- a/cups/page.c +++ b/cups/page.c @@ -1,5 +1,5 @@ /* - * "$Id: page.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: page.c 5549 2006-05-19 19:39:28Z mike $" * * Page size functions for the Common UNIX Printing System (CUPS). * @@ -193,5 +193,5 @@ ppdPageLength(ppd_file_t *ppd, /* I - PPD file */ /* - * End of "$Id: page.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: page.c 5549 2006-05-19 19:39:28Z mike $". */ diff --git a/cups/ppd.c b/cups/ppd.c index ff68d4c77..540b14a8d 100644 --- a/cups/ppd.c +++ b/cups/ppd.c @@ -1,5 +1,5 @@ /* - * "$Id: ppd.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: ppd.c 5333 2006-03-24 00:52:21Z mike $" * * PPD file routines for the Common UNIX Printing System (CUPS). * @@ -2938,5 +2938,5 @@ ppd_read(cups_file_t *fp, /* I - File to read from */ /* - * End of "$Id: ppd.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: ppd.c 5333 2006-03-24 00:52:21Z mike $". */ diff --git a/cups/ppd.h b/cups/ppd.h index 8f1e3cb93..d7688c3d5 100644 --- a/cups/ppd.h +++ b/cups/ppd.h @@ -1,5 +1,5 @@ /* - * "$Id: ppd.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: ppd.h 5238 2006-03-07 04:41:42Z mike $" * * PostScript Printer Description definitions for the Common UNIX Printing * System (CUPS). @@ -405,5 +405,5 @@ extern ppd_file_t *ppdOpen2(cups_file_t *fp); #endif /* !_CUPS_PPD_H_ */ /* - * End of "$Id: ppd.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: ppd.h 5238 2006-03-07 04:41:42Z mike $". */ diff --git a/cups/request.c b/cups/request.c index ccdfc0e42..329cce881 100644 --- a/cups/request.c +++ b/cups/request.c @@ -1,5 +1,5 @@ /* - * "$Id: request.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: request.c 5555 2006-05-20 13:35:58Z mike $" * * IPP utilities for the Common UNIX Printing System (CUPS). * @@ -479,5 +479,5 @@ _cupsSetError(ipp_status_t status, /* I - IPP status code */ /* - * End of "$Id: request.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: request.c 5555 2006-05-20 13:35:58Z mike $". */ diff --git a/cups/snprintf.c b/cups/snprintf.c index 5a3cb764b..683551b05 100644 --- a/cups/snprintf.c +++ b/cups/snprintf.c @@ -1,5 +1,5 @@ /* - * "$Id: snprintf.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: snprintf.c 5529 2006-05-15 20:06:46Z mike $" * * snprintf functions for the Common UNIX Printing System (CUPS). * @@ -368,6 +368,6 @@ _cups_snprintf(char *buffer, /* O - Output buffer */ /* - * End of "$Id: snprintf.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: snprintf.c 5529 2006-05-15 20:06:46Z mike $". */ diff --git a/cups/string.c b/cups/string.c index a7fa441a1..733304a82 100644 --- a/cups/string.c +++ b/cups/string.c @@ -1,5 +1,5 @@ /* - * "$Id: string.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: string.c 5368 2006-04-02 19:23:50Z mike $" * * String functions for the Common UNIX Printing System (CUPS). * @@ -702,5 +702,5 @@ compare_sp_items(_cups_sp_item_t *a, /* I - First item */ /* - * End of "$Id: string.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: string.c 5368 2006-04-02 19:23:50Z mike $". */ diff --git a/cups/string.h b/cups/string.h index 76955c665..79ebd774b 100644 --- a/cups/string.h +++ b/cups/string.h @@ -1,5 +1,5 @@ /* - * "$Id: string.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: string.h 5466 2006-04-26 19:52:27Z mike $" * * String definitions for the Common UNIX Printing System (CUPS). * @@ -158,5 +158,5 @@ extern double _cupsStrScand(const char *buf, char **bufptr, #endif /* !_CUPS_STRING_H_ */ /* - * End of "$Id: string.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: string.h 5466 2006-04-26 19:52:27Z mike $". */ diff --git a/cups/tempfile.c b/cups/tempfile.c index 27c96b71b..0e64565b0 100644 --- a/cups/tempfile.c +++ b/cups/tempfile.c @@ -1,5 +1,5 @@ /* - * "$Id: tempfile.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: tempfile.c 4918 2006-01-12 05:14:40Z mike $" * * Temp file utilities for the Common UNIX Printing System (CUPS). * @@ -236,5 +236,5 @@ cupsTempFile2(char *filename, /* I - Pointer to buffer */ /* - * End of "$Id: tempfile.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: tempfile.c 4918 2006-01-12 05:14:40Z mike $". */ diff --git a/cups/test.ppd b/cups/test.ppd index bf3fa47eb..bdcdc9971 100644 --- a/cups/test.ppd +++ b/cups/test.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% -*% "$Id: test.ppd 177 2006-06-21 00:20:03Z jlovell $" +*% "$Id: test.ppd 5372 2006-04-05 18:25:34Z mike $" *% *% Test PPD file for the Common UNIX Printing System (CUPS). *% @@ -185,5 +185,5 @@ *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM *Font ZapfDingbats: Special "(001.004S)" Standard ROM *% -*% End of "$Id: test.ppd 177 2006-06-21 00:20:03Z jlovell $". +*% End of "$Id: test.ppd 5372 2006-04-05 18:25:34Z mike $". *% diff --git a/cups/testadmin.c b/cups/testadmin.c index 4a927a892..0f2e1d0c2 100644 --- a/cups/testadmin.c +++ b/cups/testadmin.c @@ -1,5 +1,5 @@ /* - * "$Id: testadmin.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: testadmin.c 5240 2006-03-07 21:55:29Z mike $" * * Admin function test program for the Common UNIX Printing System (CUPS). * @@ -125,5 +125,5 @@ show_settings( /* - * End of "$Id: testadmin.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: testadmin.c 5240 2006-03-07 21:55:29Z mike $". */ diff --git a/cups/testarray.c b/cups/testarray.c index 57d5d9d6a..912035d51 100644 --- a/cups/testarray.c +++ b/cups/testarray.c @@ -1,5 +1,5 @@ /* - * "$Id: testarray.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: testarray.c 5258 2006-03-09 15:40:56Z mike $" * * Array test program for the Common UNIX Printing System (CUPS). * @@ -525,5 +525,5 @@ load_words(const char *filename, /* I - File to load */ /* - * End of "$Id: testarray.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: testarray.c 5258 2006-03-09 15:40:56Z mike $". */ diff --git a/cups/testfile.c b/cups/testfile.c index 56f4d5a63..7bd0c2b14 100644 --- a/cups/testfile.c +++ b/cups/testfile.c @@ -1,5 +1,5 @@ /* - * "$Id: testfile.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: testfile.c 5194 2006-02-27 20:57:07Z mike $" * * File test program for the Common UNIX Printing System (CUPS). * @@ -444,5 +444,5 @@ read_write_tests(int compression) /* I - Use compression? */ /* - * End of "$Id: testfile.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: testfile.c 5194 2006-02-27 20:57:07Z mike $". */ diff --git a/cups/testhttp.c b/cups/testhttp.c index 10bb92145..1ef498e33 100644 --- a/cups/testhttp.c +++ b/cups/testhttp.c @@ -1,5 +1,5 @@ /* - * "$Id: testhttp.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: testhttp.c 5679 2006-06-20 14:45:15Z mike $" * * HTTP test program for the Common UNIX Printing System (CUPS). * @@ -531,5 +531,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: testhttp.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: testhttp.c 5679 2006-06-20 14:45:15Z mike $". */ diff --git a/cups/testi18n.c b/cups/testi18n.c index 8628ab2c0..0fc439793 100644 --- a/cups/testi18n.c +++ b/cups/testi18n.c @@ -1,5 +1,5 @@ /* - * "$Id: testi18n.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: testi18n.c 5444 2006-04-20 18:16:54Z mike $" * * Internationalization test for Common UNIX Printing System (CUPS). * @@ -556,5 +556,5 @@ print_utf8(const char *msg, /* I - Message String */ /* - * End of "$Id: testi18n.c 177 2006-06-21 00:20:03Z jlovell $" + * End of "$Id: testi18n.c 5444 2006-04-20 18:16:54Z mike $" */ diff --git a/cups/testipp.c b/cups/testipp.c index f8db35d1f..07bcdffc0 100644 --- a/cups/testipp.c +++ b/cups/testipp.c @@ -1,5 +1,5 @@ /* - * "$Id: testipp.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: testipp.c 5023 2006-01-29 14:39:44Z mike $" * * IPP test program for the Common UNIX Printing System (CUPS). * @@ -645,5 +645,5 @@ write_cb(void *data, /* I - Data */ /* - * End of "$Id: testipp.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: testipp.c 5023 2006-01-29 14:39:44Z mike $". */ diff --git a/cups/testlang.c b/cups/testlang.c index 9b12838d2..f41408b03 100644 --- a/cups/testlang.c +++ b/cups/testlang.c @@ -1,5 +1,5 @@ /* - * "$Id: testlang.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: testlang.c 4903 2006-01-10 20:02:46Z mike $" * * Localization test program for the Common UNIX Printing System (CUPS). * @@ -85,5 +85,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: testlang.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: testlang.c 4903 2006-01-10 20:02:46Z mike $". */ diff --git a/cups/testppd.c b/cups/testppd.c index 4fec1ce2d..7e59a4276 100644 --- a/cups/testppd.c +++ b/cups/testppd.c @@ -1,5 +1,5 @@ /* - * "$Id: testppd.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: testppd.c 5484 2006-05-02 20:38:12Z mike $" * * PPD test program for the Common UNIX Printing System (CUPS). * @@ -59,39 +59,6 @@ static const char *default_code = "%%BeginFeature: *InputSlot Tray\n" "InputSlot=Tray\n" "%%EndFeature\n" - "} stopped cleartomark\n" - "[{\n" - "%%BeginFeature: *IntOption None\n" - "%%EndFeature\n" - "} stopped cleartomark\n" - "[{\n" - "%%BeginFeature: *StringOption None\n" - "%%EndFeature\n" - "} stopped cleartomark\n"; - -static const char *custom_code = - "[{\n" - "%%BeginFeature: *CustomPageSize True\n" - "500\n" - "400\n" - "0\n" - "0\n" - "0\n" - "PageSize=Custom\n" - "%%EndFeature\n" - "} stopped cleartomark\n" - "[{\n" - "%%BeginFeature: *InputSlot Tray\n" - "InputSlot=Tray\n" - "%%EndFeature\n" - "} stopped cleartomark\n" - "[{\n" - "%%BeginFeature: *IntOption None\n" - "%%EndFeature\n" - "} stopped cleartomark\n" - "[{\n" - "%%BeginFeature: *StringOption None\n" - "%%EndFeature\n" "} stopped cleartomark\n"; @@ -140,7 +107,7 @@ main(int argc, /* I - Number of command-line arguments */ printf("FAIL (%d conflicts)\n", conflicts); } - fputs("ppdEmitString (defaults): ", stdout); + fputs("ppdEmitString: ", stdout); if ((s = ppdEmitString(ppd, PPD_ORDER_ANY, 0.0)) != NULL && !strcmp(s, default_code)) puts("PASS"); @@ -156,24 +123,6 @@ main(int argc, /* I - Number of command-line arguments */ if (s) free(s); - fputs("ppdEmitString (custom size): ", stdout); - ppdMarkOption(ppd, "PageSize", "Custom.400x500"); - - if ((s = ppdEmitString(ppd, PPD_ORDER_ANY, 0.0)) != NULL && - !strcmp(s, custom_code)) - puts("PASS"); - else - { - printf("FAIL (%d bytes instead of %d)\n", s ? (int)strlen(s) : 0, - (int)strlen(custom_code)); - - if (s) - puts(s); - } - - if (s) - free(s); - ppdClose(ppd); } else @@ -223,5 +172,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: testppd.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: testppd.c 5484 2006-05-02 20:38:12Z mike $". */ diff --git a/cups/transcode.c b/cups/transcode.c index 8bc4c1c02..c7384d9cb 100644 --- a/cups/transcode.c +++ b/cups/transcode.c @@ -1,5 +1,5 @@ /* - * "$Id: transcode.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: transcode.c 5373 2006-04-06 20:03:32Z mike $" * * Transcoding support for the Common UNIX Printing System (CUPS). * @@ -1585,5 +1585,5 @@ get_vbcs_charmap( /* - * End of "$Id: transcode.c 177 2006-06-21 00:20:03Z jlovell $" + * End of "$Id: transcode.c 5373 2006-04-06 20:03:32Z mike $" */ diff --git a/cups/transcode.h b/cups/transcode.h index dd8c1d13f..c867b37e2 100644 --- a/cups/transcode.h +++ b/cups/transcode.h @@ -1,5 +1,5 @@ /* - * "$Id: transcode.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: transcode.h 5294 2006-03-15 21:09:32Z mike $" * * Transcoding definitions for the Common UNIX Printing System (CUPS). * @@ -84,5 +84,5 @@ extern int cupsUTF32ToUTF8(cups_utf8_t *dest, /* - * End of "$Id: transcode.h 177 2006-06-21 00:20:03Z jlovell $" + * End of "$Id: transcode.h 5294 2006-03-15 21:09:32Z mike $" */ diff --git a/cups/usersys.c b/cups/usersys.c index 14141cc9c..b75dc3790 100644 --- a/cups/usersys.c +++ b/cups/usersys.c @@ -1,5 +1,5 @@ /* - * "$Id: usersys.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: usersys.c 5182 2006-02-26 04:10:27Z mike $" * * User, system, and password routines for the Common UNIX Printing * System (CUPS). @@ -484,5 +484,5 @@ cups_open_client_conf(void) /* - * End of "$Id: usersys.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: usersys.c 5182 2006-02-26 04:10:27Z mike $". */ diff --git a/cups/util.c b/cups/util.c index 42aa4622d..988a3e43d 100644 --- a/cups/util.c +++ b/cups/util.c @@ -1,5 +1,5 @@ /* - * "$Id: util.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: util.c 5663 2006-06-15 20:36:42Z mike $" * * Printing utilities for the Common UNIX Printing System (CUPS). * @@ -1652,5 +1652,5 @@ cups_get_printer_uri( /* - * End of "$Id: util.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: util.c 5663 2006-06-15 20:36:42Z mike $". */ diff --git a/data/HPGLprolog b/data/HPGLprolog index a942513ca..eed0a0487 100644 --- a/data/HPGLprolog +++ b/data/HPGLprolog @@ -1,6 +1,6 @@ %%BeginResource: procset hpgltops 1.1 0 % -% "$Id: HPGLprolog 177 2006-06-21 00:20:03Z jlovell $" +% "$Id: HPGLprolog 4494 2005-02-18 02:18:11Z mike $" % % HP-GL/2 filter procset for the Common UNIX Printing System (CUPS). % diff --git a/data/Makefile b/data/Makefile index b96663eaf..29a7aa0e7 100644 --- a/data/Makefile +++ b/data/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: Makefile 5310 2006-03-19 03:23:34Z mike $" # # Datafile makefile for the Common UNIX Printing System (CUPS). # @@ -180,5 +180,5 @@ uninstall: # -# End of "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: Makefile 5310 2006-03-19 03:23:34Z mike $". # diff --git a/data/classified b/data/classified index 334b0b1ca..3f8a1ab82 100644 --- a/data/classified +++ b/data/classified @@ -272,6 +272,6 @@ gsave grestore showpage % -% End of "$Id: classified 177 2006-06-21 00:20:03Z jlovell $". +% End of "$Id: classified 4494 2005-02-18 02:18:11Z mike $". % %%EOF diff --git a/data/confidential b/data/confidential index b3e22fe01..27d29fbcc 100644 --- a/data/confidential +++ b/data/confidential @@ -272,6 +272,6 @@ gsave grestore showpage % -% End of "$Id: confidential 177 2006-06-21 00:20:03Z jlovell $". +% End of "$Id: confidential 4494 2005-02-18 02:18:11Z mike $". % %%EOF diff --git a/data/secret b/data/secret index 8132edf00..998f59a92 100644 --- a/data/secret +++ b/data/secret @@ -272,6 +272,6 @@ gsave grestore showpage % -% End of "$Id: secret 177 2006-06-21 00:20:03Z jlovell $". +% End of "$Id: secret 4494 2005-02-18 02:18:11Z mike $". % %%EOF diff --git a/data/standard b/data/standard index 92df200d2..8fac59e5f 100644 --- a/data/standard +++ b/data/standard @@ -256,6 +256,6 @@ gsave grestore showpage % -% End of "$Id: standard 177 2006-06-21 00:20:03Z jlovell $". +% End of "$Id: standard 4494 2005-02-18 02:18:11Z mike $". % %%EOF diff --git a/data/testprint.ps b/data/testprint.ps index 9effbac54..c437ae212 100644 --- a/data/testprint.ps +++ b/data/testprint.ps @@ -631,6 +631,6 @@ gsave grestore showpage % -% End of "$Id: testprint.ps 177 2006-06-21 00:20:03Z jlovell $". +% End of "$Id: testprint.ps 4930 2006-01-14 16:54:03Z mike $". % %%EOF diff --git a/data/topsecret b/data/topsecret index deeed6a1a..389cbf105 100644 --- a/data/topsecret +++ b/data/topsecret @@ -272,6 +272,6 @@ gsave grestore showpage % -% End of "$Id: topsecret 177 2006-06-21 00:20:03Z jlovell $". +% End of "$Id: topsecret 4494 2005-02-18 02:18:11Z mike $". % %%EOF diff --git a/data/unclassified b/data/unclassified index 917372ace..804773e6e 100644 --- a/data/unclassified +++ b/data/unclassified @@ -272,6 +272,6 @@ gsave grestore showpage % -% End of "$Id: unclassified 177 2006-06-21 00:20:03Z jlovell $". +% End of "$Id: unclassified 4494 2005-02-18 02:18:11Z mike $". % %%EOF diff --git a/doc/Makefile b/doc/Makefile index 537d17d94..df0b76384 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 181 2006-06-22 20:01:18Z jlovell $" +# "$Id: Makefile 5609 2006-05-30 20:31:10Z mike $" # # Documentation makefile for the Common UNIX Printing System (CUPS). # @@ -167,7 +167,6 @@ HELPFILES = \ help/spec-command.html \ help/spec-design.html \ help/spec-ipp.html \ - help/spec-postscript.html \ help/spec-ppd.html \ help/spec-raster.html \ help/spec-stp.html \ diff --git a/doc/help/api-array.html b/doc/help/api-array.html index 699df84c4..6fbd8a3a1 100644 --- a/doc/help/api-array.html +++ b/doc/help/api-array.html @@ -16,7 +16,7 @@ </head> <body> <!-- - "$Id: api-array.html 177 2006-06-21 00:20:03Z jlovell $" + "$Id: api-array.shtml 5138 2006-02-21 10:49:06Z mike $" Array API introduction for the Common UNIX Printing System (CUPS). diff --git a/doc/help/api-cups.html b/doc/help/api-cups.html index 4d89eed07..42ffa2d1c 100644 --- a/doc/help/api-cups.html +++ b/doc/help/api-cups.html @@ -16,7 +16,7 @@ </head> <body> <!-- - "$Id: api-cups.html 177 2006-06-21 00:20:03Z jlovell $" + "$Id: api-cups.shtml 5138 2006-02-21 10:49:06Z mike $" CUPS API introduction for the Common UNIX Printing System (CUPS). diff --git a/doc/help/api-filedir.html b/doc/help/api-filedir.html index f2bea1599..fa862e96f 100644 --- a/doc/help/api-filedir.html +++ b/doc/help/api-filedir.html @@ -16,7 +16,7 @@ </head> <body> <!-- - "$Id: api-filedir.html 177 2006-06-21 00:20:03Z jlovell $" + "$Id: api-filedir.shtml 5138 2006-02-21 10:49:06Z mike $" File and directory API introduction for the Common UNIX Printing System (CUPS). diff --git a/doc/help/api-filter.html b/doc/help/api-filter.html index 034000e4f..63607f38b 100644 --- a/doc/help/api-filter.html +++ b/doc/help/api-filter.html @@ -16,7 +16,7 @@ </head> <body> <!-- - "$Id: api-filter.html 177 2006-06-21 00:20:03Z jlovell $" + "$Id: api-filter.shtml 5138 2006-02-21 10:49:06Z mike $" Filter and backend API introduction for the Common UNIX Printing System (CUPS). diff --git a/doc/help/api-httpipp.html b/doc/help/api-httpipp.html index d23da7c36..7a08b3352 100644 --- a/doc/help/api-httpipp.html +++ b/doc/help/api-httpipp.html @@ -16,7 +16,7 @@ </head> <body> <!-- - "$Id: api-httpipp.html 177 2006-06-21 00:20:03Z jlovell $" + "$Id: api-httpipp.shtml 5138 2006-02-21 10:49:06Z mike $" HTTP and IPP API introduction for the Common UNIX Printing System (CUPS). diff --git a/doc/help/api-ppd.html b/doc/help/api-ppd.html index 27f8483f7..a3949abea 100644 --- a/doc/help/api-ppd.html +++ b/doc/help/api-ppd.html @@ -16,7 +16,7 @@ </head> <body> <!-- - "$Id: api-ppd.html 177 2006-06-21 00:20:03Z jlovell $" + "$Id: api-ppd.shtml 5138 2006-02-21 10:49:06Z mike $" PPD API introduction for the Common UNIX Printing System (CUPS). diff --git a/doc/help/api-raster.html b/doc/help/api-raster.html index 57492985f..645d22164 100644 --- a/doc/help/api-raster.html +++ b/doc/help/api-raster.html @@ -16,7 +16,7 @@ </head> <body> <!-- - "$Id: api-raster.html 177 2006-06-21 00:20:03Z jlovell $" + "$Id$" Raster API introduction for the Common UNIX Printing System (CUPS). diff --git a/doc/help/spec-command.html b/doc/help/spec-command.html index a559a0975..8847203d2 100644 --- a/doc/help/spec-command.html +++ b/doc/help/spec-command.html @@ -8,7 +8,7 @@ </head> <body> <!-- - "$Id: spec-command.html 177 2006-06-21 00:20:03Z jlovell $" + "$Id$" CUPS command file format specification for the Common UNIX Printing System (CUPS). diff --git a/doc/help/spec-ipp.html b/doc/help/spec-ipp.html index 5e68cb724..47a2a5ac5 100644 --- a/doc/help/spec-ipp.html +++ b/doc/help/spec-ipp.html @@ -7,7 +7,7 @@ </head> <body> <!-- - "$Id: spec-ipp.html 177 2006-06-21 00:20:03Z jlovell $" + "$Id$" CUPS IPP specification for the Common UNIX Printing System (CUPS). diff --git a/doc/help/spec-pdf.html b/doc/help/spec-pdf.html deleted file mode 100644 index 862eb0cb6..000000000 --- a/doc/help/spec-pdf.html +++ /dev/null @@ -1,21 +0,0 @@ -<HTML> -<!-- SECTION: Specifications --> -<HEAD> - <TITLE>CUPS PDF Format</TITLE> - <LINK REL="STYLESHEET" TYPE="test/css" HREF="../cups.css"> -</HEAD> -<BODY> - -<P>CUPS PDF files (application/vnd.cups-pdf) are device-dependent -PDF/A files that contain a job ticket information. These files -are typically produced by the CUPS <CODE>pdftopdf</CODE> filter -which handles job ticket generation, imposition, page labeling, -scaling, and other formatting options requested by the user. CUPS -PDF files are intended for direct consumption by a PDF-capable -printer, PDF RIP, or the <CODE>pdftops</CODE> filter.</P> - -<P>More information will be posted here as the PDF workflow -filters are added to CUPS.</P> - -</BODY> -</HTML> diff --git a/doc/help/spec-postscript.html b/doc/help/spec-postscript.html deleted file mode 100644 index 7e9f9a802..000000000 --- a/doc/help/spec-postscript.html +++ /dev/null @@ -1,120 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> -<html> -<!-- SECTION: Specifications --> -<head> - <title>Generating PostScript for CUPS</title> - <meta name='keywords' content='Programming, PostScript, Document Structuring Conventions'> - <link rel='stylesheet' type='text/css' href='../cups.css'> -</head> -<body> -<!-- - "$Id$" - - CUPS PostScript file specification for the Common UNIX Printing System (CUPS). - - Copyright 2006 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 ---> - -<h2 class='title'><a name='INTRODUCTION'>Introduction</a></h2> - -<p>This document describes how to generate PostScript output for -CUPS and is largely based on the <a -href="http://partners.adobe.com/public/developer/en/ps/5001.DSC_Spec.pdf"> -Adobe TechNote #5001: PostScript Language Document Structuring -Conventions Specification Version 3.0</a>. While CUPS can -generally print any PostScript file, following the rules in the -Adobe TechNote and this document will ensure that your PostScript -output will work reliably.</p> - -<blockquote><b>Note:</b> While PostScript is currently the -defacto-standard print job file format/language for UNIX-based -applications, it is slowly being phased out in favor of Adobe's -Portable Document Format ("PDF") which offers many advantages -over PostScript. MacOS X uses PDF as the primary print job file -format, and we expect Linux to soon follow. Both PostScript and -PDF are complex formats, and we highly recommend using high-level -toolkits whenever possible.</blockquote> - -<h3>Anatomy of a PostScript File</h3> - -<p>PostScript files are ASCII text files starting with a header -line (<tt>%!PS-Adobe-3.0</tt>) followed by a combination of -comment lines starting with two percent signs (<tt>%%</tt>) and -PostScript code lines. The lines themselves should not exceed 255 -characters to conform to the DSC. The following short PostScript -file produces a box with a smiley face in it:</p> - -<pre class="command"> -%!PS-Adobe-3.0 -%%BoundingBox: 36 36 576 756 -%%Pages: 1 -%%LanguageLevel: 2 -%%EndComments -%%Page: (1) 1 -% Draw a black box around the page -0 setgray -1 setlinewidth -36 36 540 720 rectstroke - -% Draw a two inch blue circle in the middle of the page -0 0 1 setrgbcolor -306 396 144 0 360 arc closepath fill - -% Draw two half inch yellow circles for eyes -1 1 0 setrgbcolor -252 432 36 0 360 arc closepath fill -360 432 36 0 360 arc closepath fill - -% Draw the smile -1 setlinecap -18 setlinewidth -306 396 99 200 340 arc stroke - -% Print it! -showpage -%%EOF -</pre> - -<div class="figure"><table summary="Sample PostScript File Output"> -<caption>Figure 1: <a name="FIGURE_1">Sample PostScript File Output</a></caption> -<tr><td align="center"><img src="../images/smiley.jpg" -width="445" height="570" alt="Sample PostScript File Output"></td></tr> -</table></div> - - -<h2>Embedding Printer Options</h2> - - -<h2>Embedding Fonts and Text</h2> - - -<h2>Embedding Images</h2> - - -<blockquote><b>Note:</b> While some printers support arbitrary -binary data in PostScript files, we do not recommend this -practice because it does not work with all printers or -interfaces. In most cases, the Base-85 encoding and compression -filters can be used to embed images with very little, if any, -increase in data size.</blockquote> - - - -</body> -</html> diff --git a/doc/help/spec-ppd.html b/doc/help/spec-ppd.html index eb5451c1e..d6f8f0879 100644 --- a/doc/help/spec-ppd.html +++ b/doc/help/spec-ppd.html @@ -8,7 +8,7 @@ </head> <body> <!-- - "$Id: spec-ppd.html 177 2006-06-21 00:20:03Z jlovell $" + "$Id: spec-ppd.html 5496 2006-05-05 19:26:23Z mike $" CUPS PPD extensions specification for the Common UNIX Printing System (CUPS). diff --git a/doc/pl/images/button-accept-jobs.gif b/doc/pl/images/button-accept-jobs.gif Binary files differindex 8013e5de5..5b8cd5b21 100644 --- a/doc/pl/images/button-accept-jobs.gif +++ b/doc/pl/images/button-accept-jobs.gif diff --git a/doc/pl/images/button-add-class.gif b/doc/pl/images/button-add-class.gif Binary files differindex ca9b8c616..ce7ea6ccf 100644 --- a/doc/pl/images/button-add-class.gif +++ b/doc/pl/images/button-add-class.gif diff --git a/doc/pl/images/button-add-printer.gif b/doc/pl/images/button-add-printer.gif Binary files differindex 1e099e647..0f284487f 100644 --- a/doc/pl/images/button-add-printer.gif +++ b/doc/pl/images/button-add-printer.gif diff --git a/doc/pl/images/button-add-this-printer.gif b/doc/pl/images/button-add-this-printer.gif Binary files differindex 4fa4e4d4b..dc00856bd 100644 --- a/doc/pl/images/button-add-this-printer.gif +++ b/doc/pl/images/button-add-this-printer.gif diff --git a/doc/pl/images/button-cancel-all-jobs.gif b/doc/pl/images/button-cancel-all-jobs.gif Binary files differindex 093b3e7fd..84e724b25 100644 --- a/doc/pl/images/button-cancel-all-jobs.gif +++ b/doc/pl/images/button-cancel-all-jobs.gif diff --git a/doc/pl/images/button-cancel-job.gif b/doc/pl/images/button-cancel-job.gif Binary files differindex 1cc3be3af..2d122bac5 100644 --- a/doc/pl/images/button-cancel-job.gif +++ b/doc/pl/images/button-cancel-job.gif diff --git a/doc/pl/images/button-change-settings.gif b/doc/pl/images/button-change-settings.gif Binary files differindex 8abeb0774..73de99527 100644 --- a/doc/pl/images/button-change-settings.gif +++ b/doc/pl/images/button-change-settings.gif diff --git a/doc/pl/images/button-clean-print-heads.gif b/doc/pl/images/button-clean-print-heads.gif Binary files differindex 0daf9a9ac..2f45608d8 100644 --- a/doc/pl/images/button-clean-print-heads.gif +++ b/doc/pl/images/button-clean-print-heads.gif diff --git a/doc/pl/images/button-clear.gif b/doc/pl/images/button-clear.gif Binary files differindex 9e1c36d36..e15a4bb3d 100644 --- a/doc/pl/images/button-clear.gif +++ b/doc/pl/images/button-clear.gif diff --git a/doc/pl/images/button-continue.gif b/doc/pl/images/button-continue.gif Binary files differindex d0d291666..93f849041 100644 --- a/doc/pl/images/button-continue.gif +++ b/doc/pl/images/button-continue.gif diff --git a/doc/pl/images/button-delete-class.gif b/doc/pl/images/button-delete-class.gif Binary files differindex 38f69eca1..934b8d66b 100644 --- a/doc/pl/images/button-delete-class.gif +++ b/doc/pl/images/button-delete-class.gif diff --git a/doc/pl/images/button-delete-printer.gif b/doc/pl/images/button-delete-printer.gif Binary files differindex 7e5bf74ea..f7c698418 100644 --- a/doc/pl/images/button-delete-printer.gif +++ b/doc/pl/images/button-delete-printer.gif diff --git a/doc/pl/images/button-edit-configuration-file.gif b/doc/pl/images/button-edit-configuration-file.gif Binary files differindex e892aa1d9..89fd8a7d6 100644 --- a/doc/pl/images/button-edit-configuration-file.gif +++ b/doc/pl/images/button-edit-configuration-file.gif diff --git a/doc/pl/images/button-export-samba.gif b/doc/pl/images/button-export-samba.gif Binary files differindex 1fdbf67f0..c6c333619 100644 --- a/doc/pl/images/button-export-samba.gif +++ b/doc/pl/images/button-export-samba.gif diff --git a/doc/pl/images/button-help.gif b/doc/pl/images/button-help.gif Binary files differindex f5e239e0e..d2d4f8530 100644 --- a/doc/pl/images/button-help.gif +++ b/doc/pl/images/button-help.gif diff --git a/doc/pl/images/button-hold-job.gif b/doc/pl/images/button-hold-job.gif Binary files differindex 5219e6868..2ab556492 100644 --- a/doc/pl/images/button-hold-job.gif +++ b/doc/pl/images/button-hold-job.gif diff --git a/doc/pl/images/button-manage-classes.gif b/doc/pl/images/button-manage-classes.gif Binary files differindex 63a8f660d..c758f9802 100644 --- a/doc/pl/images/button-manage-classes.gif +++ b/doc/pl/images/button-manage-classes.gif diff --git a/doc/pl/images/button-manage-jobs.gif b/doc/pl/images/button-manage-jobs.gif Binary files differindex f8f6f0d8b..7aefeddaf 100644 --- a/doc/pl/images/button-manage-jobs.gif +++ b/doc/pl/images/button-manage-jobs.gif diff --git a/doc/pl/images/button-manage-printers.gif b/doc/pl/images/button-manage-printers.gif Binary files differindex 041efc215..f884f7f60 100644 --- a/doc/pl/images/button-manage-printers.gif +++ b/doc/pl/images/button-manage-printers.gif diff --git a/doc/pl/images/button-manage-server.gif b/doc/pl/images/button-manage-server.gif Binary files differindex cb6d76047..ba6e31cdc 100644 --- a/doc/pl/images/button-manage-server.gif +++ b/doc/pl/images/button-manage-server.gif diff --git a/doc/pl/images/button-modify-class.gif b/doc/pl/images/button-modify-class.gif Binary files differindex 38cce158f..fcf5f6d3e 100644 --- a/doc/pl/images/button-modify-class.gif +++ b/doc/pl/images/button-modify-class.gif diff --git a/doc/pl/images/button-modify-printer.gif b/doc/pl/images/button-modify-printer.gif Binary files differindex acbb6daac..e3d534663 100644 --- a/doc/pl/images/button-modify-printer.gif +++ b/doc/pl/images/button-modify-printer.gif diff --git a/doc/pl/images/button-move-job.gif b/doc/pl/images/button-move-job.gif Binary files differindex 585f48e8b..02ce3300d 100644 --- a/doc/pl/images/button-move-job.gif +++ b/doc/pl/images/button-move-job.gif diff --git a/doc/pl/images/button-move-jobs.gif b/doc/pl/images/button-move-jobs.gif Binary files differindex 4600b780f..36029ac30 100644 --- a/doc/pl/images/button-move-jobs.gif +++ b/doc/pl/images/button-move-jobs.gif diff --git a/doc/pl/images/button-print-self-test-page.gif b/doc/pl/images/button-print-self-test-page.gif Binary files differindex 1aa3349f1..bcea1ba01 100644 --- a/doc/pl/images/button-print-self-test-page.gif +++ b/doc/pl/images/button-print-self-test-page.gif diff --git a/doc/pl/images/button-print-test-page.gif b/doc/pl/images/button-print-test-page.gif Binary files differindex 8eb7ec398..57ac13be7 100644 --- a/doc/pl/images/button-print-test-page.gif +++ b/doc/pl/images/button-print-test-page.gif diff --git a/doc/pl/images/button-publish-printer.gif b/doc/pl/images/button-publish-printer.gif Binary files differindex 909702fb4..c12abe87e 100644 --- a/doc/pl/images/button-publish-printer.gif +++ b/doc/pl/images/button-publish-printer.gif diff --git a/doc/pl/images/button-reject-jobs.gif b/doc/pl/images/button-reject-jobs.gif Binary files differindex bcff45580..a81848bde 100644 --- a/doc/pl/images/button-reject-jobs.gif +++ b/doc/pl/images/button-reject-jobs.gif diff --git a/doc/pl/images/button-release-job.gif b/doc/pl/images/button-release-job.gif Binary files differindex a3d95ad37..d8a82f092 100644 --- a/doc/pl/images/button-release-job.gif +++ b/doc/pl/images/button-release-job.gif diff --git a/doc/pl/images/button-restart-job.gif b/doc/pl/images/button-restart-job.gif Binary files differindex 5d5a7c031..42b7568ec 100644 --- a/doc/pl/images/button-restart-job.gif +++ b/doc/pl/images/button-restart-job.gif diff --git a/doc/pl/images/button-save-changes.gif b/doc/pl/images/button-save-changes.gif Binary files differindex 5056b80be..2f1fee170 100644 --- a/doc/pl/images/button-save-changes.gif +++ b/doc/pl/images/button-save-changes.gif diff --git a/doc/pl/images/button-search.gif b/doc/pl/images/button-search.gif Binary files differindex 5f99760e6..1bc194527 100644 --- a/doc/pl/images/button-search.gif +++ b/doc/pl/images/button-search.gif diff --git a/doc/pl/images/button-set-allowed-users.gif b/doc/pl/images/button-set-allowed-users.gif Binary files differindex 728ced1ee..cd7709ef5 100644 --- a/doc/pl/images/button-set-allowed-users.gif +++ b/doc/pl/images/button-set-allowed-users.gif diff --git a/doc/pl/images/button-set-as-default.gif b/doc/pl/images/button-set-as-default.gif Binary files differindex b01c19122..203d09734 100644 --- a/doc/pl/images/button-set-as-default.gif +++ b/doc/pl/images/button-set-as-default.gif diff --git a/doc/pl/images/button-set-printer-options.gif b/doc/pl/images/button-set-printer-options.gif Binary files differindex ed026d57e..6610735e4 100644 --- a/doc/pl/images/button-set-printer-options.gif +++ b/doc/pl/images/button-set-printer-options.gif diff --git a/doc/pl/images/button-show-active.gif b/doc/pl/images/button-show-active.gif Binary files differindex ac9d4e05f..82751977d 100644 --- a/doc/pl/images/button-show-active.gif +++ b/doc/pl/images/button-show-active.gif diff --git a/doc/pl/images/button-show-all.gif b/doc/pl/images/button-show-all.gif Binary files differindex 0bd038822..0473ee626 100644 --- a/doc/pl/images/button-show-all.gif +++ b/doc/pl/images/button-show-all.gif diff --git a/doc/pl/images/button-show-completed.gif b/doc/pl/images/button-show-completed.gif Binary files differindex d27b3074c..5481f4d9a 100644 --- a/doc/pl/images/button-show-completed.gif +++ b/doc/pl/images/button-show-completed.gif diff --git a/doc/pl/images/button-show-next.gif b/doc/pl/images/button-show-next.gif Binary files differindex a584f885a..3fdf85798 100644 --- a/doc/pl/images/button-show-next.gif +++ b/doc/pl/images/button-show-next.gif diff --git a/doc/pl/images/button-show-previous.gif b/doc/pl/images/button-show-previous.gif Binary files differindex 64613b9ec..8a6f8c4cf 100644 --- a/doc/pl/images/button-show-previous.gif +++ b/doc/pl/images/button-show-previous.gif diff --git a/doc/pl/images/button-sort-ascending.gif b/doc/pl/images/button-sort-ascending.gif Binary files differindex 993cf6a93..5a88283f3 100644 --- a/doc/pl/images/button-sort-ascending.gif +++ b/doc/pl/images/button-sort-ascending.gif diff --git a/doc/pl/images/button-sort-descending.gif b/doc/pl/images/button-sort-descending.gif Binary files differindex fbc5e966d..61c85de29 100644 --- a/doc/pl/images/button-sort-descending.gif +++ b/doc/pl/images/button-sort-descending.gif diff --git a/doc/pl/images/button-start-class.gif b/doc/pl/images/button-start-class.gif Binary files differindex 834f8a125..85c098a38 100644 --- a/doc/pl/images/button-start-class.gif +++ b/doc/pl/images/button-start-class.gif diff --git a/doc/pl/images/button-start-printer.gif b/doc/pl/images/button-start-printer.gif Binary files differindex 7d86be593..cd1734cce 100644 --- a/doc/pl/images/button-start-printer.gif +++ b/doc/pl/images/button-start-printer.gif diff --git a/doc/pl/images/button-stop-class.gif b/doc/pl/images/button-stop-class.gif Binary files differindex c1f96cc85..8031731a4 100644 --- a/doc/pl/images/button-stop-class.gif +++ b/doc/pl/images/button-stop-class.gif diff --git a/doc/pl/images/button-stop-printer.gif b/doc/pl/images/button-stop-printer.gif Binary files differindex 34bf39da6..ce485f3a1 100644 --- a/doc/pl/images/button-stop-printer.gif +++ b/doc/pl/images/button-stop-printer.gif diff --git a/doc/pl/images/button-unpublish-printer.gif b/doc/pl/images/button-unpublish-printer.gif Binary files differindex fdb48f32d..2842a3e18 100644 --- a/doc/pl/images/button-unpublish-printer.gif +++ b/doc/pl/images/button-unpublish-printer.gif diff --git a/doc/pl/images/button-use-default-config.gif b/doc/pl/images/button-use-default-config.gif Binary files differindex 578cd05ac..47697cde8 100644 --- a/doc/pl/images/button-use-default-config.gif +++ b/doc/pl/images/button-use-default-config.gif diff --git a/doc/pl/images/button-view-access-log.gif b/doc/pl/images/button-view-access-log.gif Binary files differindex b6ffd0ab4..5d89af521 100644 --- a/doc/pl/images/button-view-access-log.gif +++ b/doc/pl/images/button-view-access-log.gif diff --git a/doc/pl/images/button-view-error-log.gif b/doc/pl/images/button-view-error-log.gif Binary files differindex bbdd548f4..c99078ad8 100644 --- a/doc/pl/images/button-view-error-log.gif +++ b/doc/pl/images/button-view-error-log.gif diff --git a/doc/pl/images/button-view-page-log.gif b/doc/pl/images/button-view-page-log.gif Binary files differindex 30b3a7e0c..ad49a2f4f 100644 --- a/doc/pl/images/button-view-page-log.gif +++ b/doc/pl/images/button-view-page-log.gif diff --git a/doc/pl/images/button-view-printable-version.gif b/doc/pl/images/button-view-printable-version.gif Binary files differindex 726cd3a74..27ae97c76 100644 --- a/doc/pl/images/button-view-printable-version.gif +++ b/doc/pl/images/button-view-printable-version.gif diff --git a/doc/robots.txt b/doc/robots.txt index a22a9c778..45dcdc221 100644 --- a/doc/robots.txt +++ b/doc/robots.txt @@ -1,5 +1,5 @@ # -# "$Id: robots.txt 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: robots.txt 3494 2003-03-19 15:37:44Z mike $" # # This file tells search engines not to index your CUPS server. # @@ -26,6 +26,6 @@ User-agent: * Disallow: / # -# End of "$Id: robots.txt 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: robots.txt 3494 2003-03-19 15:37:44Z mike $". # diff --git a/driver/testdriver.c b/driver/testdriver.c index 76141403c..eab00dffc 100644 --- a/driver/testdriver.c +++ b/driver/testdriver.c @@ -1,5 +1,5 @@ /* - * "$Id: testdriver.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: testdriver.c 5390 2006-04-10 19:29:44Z mike $" * * Sample/test driver interface program for the Common UNIX Printing * System (CUPS). @@ -175,5 +175,5 @@ list_ppds(const char *name) /* I - Program name */ /* - * End of "$Id: testdriver.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: testdriver.c 5390 2006-04-10 19:29:44Z mike $". */ diff --git a/filter/Makefile b/filter/Makefile index cb844994e..5d456d0a3 100644 --- a/filter/Makefile +++ b/filter/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 181 2006-06-22 20:01:18Z jlovell $" +# "$Id: Makefile 5649 2006-06-14 21:03:17Z mike $" # # Filter makefile for the Common UNIX Printing System (CUPS). # @@ -387,5 +387,5 @@ include Dependencies # -# End of "$Id: Makefile 181 2006-06-22 20:01:18Z jlovell $". +# End of "$Id: Makefile 5649 2006-06-14 21:03:17Z mike $". # diff --git a/filter/api-raster.shtml b/filter/api-raster.shtml index ea9ae1945..13c5044a8 100644 --- a/filter/api-raster.shtml +++ b/filter/api-raster.shtml @@ -1,5 +1,5 @@ <!-- - "$Id: api-raster.shtml 177 2006-06-21 00:20:03Z jlovell $" + "$Id$" Raster API introduction for the Common UNIX Printing System (CUPS). diff --git a/filter/common.c b/filter/common.c index 263971b28..9e3c391e0 100644 --- a/filter/common.c +++ b/filter/common.c @@ -1,5 +1,5 @@ /* - * "$Id: common.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: common.c 4494 2005-02-18 02:18:11Z mike $" * * Common filter routines for the Common UNIX Printing System (CUPS). * @@ -467,5 +467,5 @@ WriteLabels(int orient) /* I - Orientation of the page */ /* - * End of "$Id: common.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: common.c 4494 2005-02-18 02:18:11Z mike $". */ diff --git a/filter/common.h b/filter/common.h index 21ce4e6f3..1c40b4765 100644 --- a/filter/common.h +++ b/filter/common.h @@ -1,5 +1,5 @@ /* - * "$Id: common.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: common.h 4493 2005-02-18 02:09:53Z mike $" * * Common filter definitions for the Common UNIX Printing System (CUPS). * @@ -88,5 +88,5 @@ extern void WriteLabels(int orient); /* - * End of "$Id: common.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: common.h 4493 2005-02-18 02:09:53Z mike $". */ diff --git a/filter/form-main.c b/filter/form-main.c index c70302131..a7b95cc45 100644 --- a/filter/form-main.c +++ b/filter/form-main.c @@ -1,5 +1,5 @@ /* - * "$Id: form-main.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: form-main.c 4494 2005-02-18 02:18:11Z mike $" * * CUPS form main entry for the Common UNIX Printing System (CUPS). * @@ -58,5 +58,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: form-main.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: form-main.c 4494 2005-02-18 02:18:11Z mike $". */ diff --git a/filter/form-ps.c b/filter/form-ps.c index 044214d25..890100aa4 100644 --- a/filter/form-ps.c +++ b/filter/form-ps.c @@ -1,5 +1,5 @@ /* - * "$Id: form-ps.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: form-ps.c 4494 2005-02-18 02:18:11Z mike $" * * CUPS form PostScript routines for the Common UNIX Printing System (CUPS). * @@ -45,5 +45,5 @@ formWrite(tree_t *t) /* I - Document tree to write */ /* - * End of "$Id: form-ps.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: form-ps.c 4494 2005-02-18 02:18:11Z mike $". */ diff --git a/filter/form-tree.c b/filter/form-tree.c index b3dde330a..188a254b1 100644 --- a/filter/form-tree.c +++ b/filter/form-tree.c @@ -1,5 +1,5 @@ /* - * "$Id: form-tree.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: form-tree.c 4494 2005-02-18 02:18:11Z mike $" * * CUPS form document tree routines for the Common UNIX Printing * System (CUPS). @@ -620,5 +620,5 @@ parse_element(tree_t *t, /* I - Current tree node */ /* - * End of "$Id: form-tree.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: form-tree.c 4494 2005-02-18 02:18:11Z mike $". */ diff --git a/filter/form.h b/filter/form.h index 880fad669..39d7b7549 100644 --- a/filter/form.h +++ b/filter/form.h @@ -1,5 +1,5 @@ /* - * "$Id: form.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: form.h 4494 2005-02-18 02:18:11Z mike $" * * CUPS form header file for the Common UNIX Printing System (CUPS). * @@ -173,5 +173,5 @@ extern void formWrite(tree_t *p); /* - * End of "$Id: form.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: form.h 4494 2005-02-18 02:18:11Z mike $". */ diff --git a/filter/gziptoany.c b/filter/gziptoany.c index 4e2ad3336..b83082fb4 100644 --- a/filter/gziptoany.c +++ b/filter/gziptoany.c @@ -1,5 +1,5 @@ /* - * "$Id: gziptoany.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: gziptoany.c 4494 2005-02-18 02:18:11Z mike $" * * GZIP pre-filter for the Common UNIX Printing System (CUPS). * @@ -127,5 +127,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: gziptoany.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: gziptoany.c 4494 2005-02-18 02:18:11Z mike $". */ diff --git a/filter/hpgl-attr.c b/filter/hpgl-attr.c index fa956b5a8..5a645c1cb 100644 --- a/filter/hpgl-attr.c +++ b/filter/hpgl-attr.c @@ -1,5 +1,5 @@ /* - * "$Id: hpgl-attr.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: hpgl-attr.c 4494 2005-02-18 02:18:11Z mike $" * * HP-GL/2 attribute processing for the Common UNIX Printing System (CUPS). * @@ -450,5 +450,5 @@ WU_width_units(int num_params, /* I - Number of parameters */ /* - * End of "$Id: hpgl-attr.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: hpgl-attr.c 4494 2005-02-18 02:18:11Z mike $". */ diff --git a/filter/hpgl-char.c b/filter/hpgl-char.c index 75b4d9688..3b1f9d3d7 100644 --- a/filter/hpgl-char.c +++ b/filter/hpgl-char.c @@ -1,5 +1,5 @@ /* - * "$Id: hpgl-char.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: hpgl-char.c 4494 2005-02-18 02:18:11Z mike $" * * HP-GL/2 character processing for the Common UNIX Printing System (CUPS). * @@ -636,5 +636,5 @@ TD_transparent_data(int num_params, /* I - Number of parameters */ /* - * End of "$Id: hpgl-char.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: hpgl-char.c 4494 2005-02-18 02:18:11Z mike $". */ diff --git a/filter/hpgl-config.c b/filter/hpgl-config.c index f2fe850d7..6f6c7ce65 100644 --- a/filter/hpgl-config.c +++ b/filter/hpgl-config.c @@ -1,5 +1,5 @@ /* - * "$Id: hpgl-config.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: hpgl-config.c 4494 2005-02-18 02:18:11Z mike $" * * HP-GL/2 configuration routines for the Common UNIX Printing System (CUPS). * @@ -641,5 +641,5 @@ SC_scale(int num_params, /* I - Number of parameters */ /* - * End of "$Id: hpgl-config.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: hpgl-config.c 4494 2005-02-18 02:18:11Z mike $". */ diff --git a/filter/hpgl-input.c b/filter/hpgl-input.c index 773d005ba..abfb63310 100644 --- a/filter/hpgl-input.c +++ b/filter/hpgl-input.c @@ -1,5 +1,5 @@ /* - * "$Id: hpgl-input.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: hpgl-input.c 5150 2006-02-22 19:21:50Z mike $" * * HP-GL/2 input processing for the Common UNIX Printing System (CUPS). * @@ -269,5 +269,5 @@ FreeParameters(int num_params, /* I - Number of parameters */ /* - * End of "$Id: hpgl-input.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: hpgl-input.c 5150 2006-02-22 19:21:50Z mike $". */ diff --git a/filter/hpgl-main.c b/filter/hpgl-main.c index 7cf85ece0..98dc3a9b9 100644 --- a/filter/hpgl-main.c +++ b/filter/hpgl-main.c @@ -1,5 +1,5 @@ /* - * "$Id: hpgl-main.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: hpgl-main.c 4494 2005-02-18 02:18:11Z mike $" * * HP-GL/2 filter main entry for the Common UNIX Printing System (CUPS). * @@ -270,5 +270,5 @@ compare_names(const void *p1, /* I - First name */ /* - * End of "$Id: hpgl-main.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: hpgl-main.c 4494 2005-02-18 02:18:11Z mike $". */ diff --git a/filter/hpgl-polygon.c b/filter/hpgl-polygon.c index 5515fce16..328dcff50 100644 --- a/filter/hpgl-polygon.c +++ b/filter/hpgl-polygon.c @@ -1,5 +1,5 @@ /* - * "$Id: hpgl-polygon.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: hpgl-polygon.c 4494 2005-02-18 02:18:11Z mike $" * * HP-GL/2 polygon routines for the Common UNIX Printing System (CUPS). * @@ -390,5 +390,5 @@ WG_fill_wedge(int num_params, /* I - Number of parameters */ /* - * End of "$Id: hpgl-polygon.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: hpgl-polygon.c 4494 2005-02-18 02:18:11Z mike $". */ diff --git a/filter/hpgl-prolog.c b/filter/hpgl-prolog.c index 20352b598..5cf0ad315 100644 --- a/filter/hpgl-prolog.c +++ b/filter/hpgl-prolog.c @@ -1,5 +1,5 @@ /* - * "$Id: hpgl-prolog.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: hpgl-prolog.c 4680 2005-09-21 09:28:39Z mike $" * * HP-GL/2 prolog routines for for the Common UNIX Printing System (CUPS). * @@ -373,5 +373,5 @@ Outputf(const char *format, /* I - Printf-style string */ /* - * End of "$Id: hpgl-prolog.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: hpgl-prolog.c 4680 2005-09-21 09:28:39Z mike $". */ diff --git a/filter/hpgl-vector.c b/filter/hpgl-vector.c index 0d2864167..d285b0c14 100644 --- a/filter/hpgl-vector.c +++ b/filter/hpgl-vector.c @@ -1,5 +1,5 @@ /* - * "$Id: hpgl-vector.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: hpgl-vector.c 4494 2005-02-18 02:18:11Z mike $" * * HP-GL/2 vector routines for the Common UNIX Printing System (CUPS). * @@ -771,5 +771,5 @@ plot_points(int num_params, /* I - Number of parameters */ /* - * End of "$Id: hpgl-vector.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: hpgl-vector.c 4494 2005-02-18 02:18:11Z mike $". */ diff --git a/filter/hpgltops.h b/filter/hpgltops.h index c45630b99..db68bcd4e 100644 --- a/filter/hpgltops.h +++ b/filter/hpgltops.h @@ -1,5 +1,5 @@ /* - * "$Id: hpgltops.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: hpgltops.h 4494 2005-02-18 02:18:11Z mike $" * * HP-GL/2 to PostScript filter for the Common UNIX Printing System (CUPS). * @@ -237,5 +237,5 @@ extern void OutputTrailer(void); extern int Outputf(const char *format, ...); /* - * End of "$Id: hpgltops.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: hpgltops.h 4494 2005-02-18 02:18:11Z mike $". */ diff --git a/filter/image-bmp.c b/filter/image-bmp.c index 6e9d8459d..dab979a65 100644 --- a/filter/image-bmp.c +++ b/filter/image-bmp.c @@ -1,5 +1,5 @@ /* - * "$Id: image-bmp.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: image-bmp.c 5509 2006-05-11 11:41:36Z mike $" * * BMP image routines for the Common UNIX Printing System (CUPS). * @@ -535,5 +535,5 @@ read_long(FILE *fp) /* I - File to read from */ /* - * End of "$Id: image-bmp.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: image-bmp.c 5509 2006-05-11 11:41:36Z mike $". */ diff --git a/filter/image-colorspace.c b/filter/image-colorspace.c index c3c23c0d6..2cb4ced01 100644 --- a/filter/image-colorspace.c +++ b/filter/image-colorspace.c @@ -1,5 +1,5 @@ /* - * "$Id: image-colorspace.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: image-colorspace.c 5519 2006-05-12 15:06:42Z mike $" * * Colorspace conversions for the Common UNIX Printing System (CUPS). * @@ -1573,5 +1573,5 @@ zshear(float mat[3][3], /* I - Matrix */ /* - * End of "$Id: image-colorspace.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: image-colorspace.c 5519 2006-05-12 15:06:42Z mike $". */ diff --git a/filter/image-gif.c b/filter/image-gif.c index 663f9f393..b56dd0c88 100644 --- a/filter/image-gif.c +++ b/filter/image-gif.c @@ -1,5 +1,5 @@ /* - * "$Id: image-gif.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: image-gif.c 5509 2006-05-11 11:41:36Z mike $" * * GIF image routines for the Common UNIX Printing System (CUPS). * @@ -695,5 +695,5 @@ gif_read_lzw(FILE *fp, /* I - File to read from */ /* - * End of "$Id: image-gif.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: image-gif.c 5509 2006-05-11 11:41:36Z mike $". */ diff --git a/filter/image-jpeg.c b/filter/image-jpeg.c index 3fabe2151..7db80ae1f 100644 --- a/filter/image-jpeg.c +++ b/filter/image-jpeg.c @@ -1,5 +1,5 @@ /* - * "$Id: image-jpeg.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: image-jpeg.c 5509 2006-05-11 11:41:36Z mike $" * * JPEG image routines for the Common UNIX Printing System (CUPS). * @@ -320,5 +320,5 @@ _cupsImageReadJPEG( /* - * End of "$Id: image-jpeg.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: image-jpeg.c 5509 2006-05-11 11:41:36Z mike $". */ diff --git a/filter/image-photocd.c b/filter/image-photocd.c index a42e36d98..195f0da39 100644 --- a/filter/image-photocd.c +++ b/filter/image-photocd.c @@ -1,5 +1,5 @@ /* - * "$Id: image-photocd.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: image-photocd.c 5509 2006-05-11 11:41:36Z mike $" * * PhotoCD routines for the Common UNIX Printing System (CUPS). * @@ -313,5 +313,5 @@ _cupsImageReadPhotoCD( /* - * End of "$Id: image-photocd.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: image-photocd.c 5509 2006-05-11 11:41:36Z mike $". */ diff --git a/filter/image-pix.c b/filter/image-pix.c index ec33b766f..64e595623 100644 --- a/filter/image-pix.c +++ b/filter/image-pix.c @@ -1,5 +1,5 @@ /* - * "$Id: image-pix.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: image-pix.c 5509 2006-05-11 11:41:36Z mike $" * * Alias PIX image routines for the Common UNIX Printing System (CUPS). * @@ -232,5 +232,5 @@ read_short(FILE *fp) /* I - File to read from */ /* - * End of "$Id: image-pix.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: image-pix.c 5509 2006-05-11 11:41:36Z mike $". */ diff --git a/filter/image-png.c b/filter/image-png.c index 6ccf39afe..97cbfc13f 100644 --- a/filter/image-png.c +++ b/filter/image-png.c @@ -1,5 +1,5 @@ /* - * "$Id: image-png.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: image-png.c 5509 2006-05-11 11:41:36Z mike $" * * PNG image routines for the Common UNIX Printing System (CUPS). * @@ -280,5 +280,5 @@ _cupsImageReadPNG( /* - * End of "$Id: image-png.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: image-png.c 5509 2006-05-11 11:41:36Z mike $". */ diff --git a/filter/image-pnm.c b/filter/image-pnm.c index 0d768b2cc..54f6c7447 100644 --- a/filter/image-pnm.c +++ b/filter/image-pnm.c @@ -1,5 +1,5 @@ /* - * "$Id: image-pnm.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: image-pnm.c 5509 2006-05-11 11:41:36Z mike $" * * Portable Any Map file routines for the Common UNIX Printing System (CUPS). * @@ -301,5 +301,5 @@ _cupsImageReadPNM( /* - * End of "$Id: image-pnm.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: image-pnm.c 5509 2006-05-11 11:41:36Z mike $". */ diff --git a/filter/image-private.h b/filter/image-private.h index 0e69ca4f3..df7bed281 100644 --- a/filter/image-private.h +++ b/filter/image-private.h @@ -1,5 +1,5 @@ /* - * "$Id: image-private.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: image-private.h 5191 2006-02-27 02:47:56Z mike $" * * Private image library definitions for the Common UNIX Printing * System (CUPS). @@ -217,5 +217,5 @@ extern cups_izoom_t *_cupsImageZoomNew(cups_image_t *img, int xc0, int yc0, #endif /* !_CUPS_IMAGE_PRIVATE_H_ */ /* - * End of "$Id: image-private.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: image-private.h 5191 2006-02-27 02:47:56Z mike $". */ diff --git a/filter/image-sgi.c b/filter/image-sgi.c index dda0b3c7a..234868512 100644 --- a/filter/image-sgi.c +++ b/filter/image-sgi.c @@ -1,5 +1,5 @@ /* - * "$Id: image-sgi.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: image-sgi.c 5509 2006-05-11 11:41:36Z mike $" * * SGI image file routines for the Common UNIX Printing System (CUPS). * @@ -279,5 +279,5 @@ _cupsImageReadSGI( /* - * End of "$Id: image-sgi.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: image-sgi.c 5509 2006-05-11 11:41:36Z mike $". */ diff --git a/filter/image-sgi.h b/filter/image-sgi.h index 84ee513ed..41847e0af 100644 --- a/filter/image-sgi.h +++ b/filter/image-sgi.h @@ -1,5 +1,5 @@ /* - * "$Id: image-sgi.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: image-sgi.h 4741 2005-10-02 04:25:52Z mike $" * * SGI image file format library definitions for the Common UNIX Printing * System (CUPS). @@ -92,5 +92,5 @@ extern int sgiPutRow(sgi_t *sgip, unsigned short *row, int y, int z); #endif /* !_SGI_H_ */ /* - * End of "$Id: image-sgi.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: image-sgi.h 4741 2005-10-02 04:25:52Z mike $". */ diff --git a/filter/image-sgilib.c b/filter/image-sgilib.c index d093d7f69..5401c4a7b 100644 --- a/filter/image-sgilib.c +++ b/filter/image-sgilib.c @@ -1,5 +1,5 @@ /* - * "$Id: image-sgilib.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: image-sgilib.c 4741 2005-10-02 04:25:52Z mike $" * * SGI image file format library routines for the Common UNIX Printing * System (CUPS). @@ -855,5 +855,5 @@ write_rle16(FILE *fp, /* I - File to write to */ /* - * End of "$Id: image-sgilib.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: image-sgilib.c 4741 2005-10-02 04:25:52Z mike $". */ diff --git a/filter/image-sun.c b/filter/image-sun.c index 3c5fbb911..c6b0622db 100644 --- a/filter/image-sun.c +++ b/filter/image-sun.c @@ -1,5 +1,5 @@ /* - * "$Id: image-sun.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: image-sun.c 5509 2006-05-11 11:41:36Z mike $" * * Sun Raster image file routines for the Common UNIX Printing System (CUPS). * @@ -389,5 +389,5 @@ read_unsigned(FILE *fp) /* I - File to read from */ /* - * End of "$Id: image-sun.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: image-sun.c 5509 2006-05-11 11:41:36Z mike $". */ diff --git a/filter/image-tiff.c b/filter/image-tiff.c index 246301b99..223324bbf 100644 --- a/filter/image-tiff.c +++ b/filter/image-tiff.c @@ -1,5 +1,5 @@ /* - * "$Id: image-tiff.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: image-tiff.c 5509 2006-05-11 11:41:36Z mike $" * * TIFF file routines for the Common UNIX Printing System (CUPS). * @@ -1720,5 +1720,5 @@ _cupsImageReadTIFF( /* - * End of "$Id: image-tiff.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: image-tiff.c 5509 2006-05-11 11:41:36Z mike $". */ diff --git a/filter/image-zoom.c b/filter/image-zoom.c index 7ab827593..8dc67ec1e 100644 --- a/filter/image-zoom.c +++ b/filter/image-zoom.c @@ -1,5 +1,5 @@ /* - * "$Id: image-zoom.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: image-zoom.c 5191 2006-02-27 02:47:56Z mike $" * * cupsImage zoom routines for the Common UNIX Printing System (CUPS). * @@ -366,5 +366,5 @@ zoom_nearest(cups_izoom_t *z, /* I - Zoom record to fill */ /* - * End of "$Id: image-zoom.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: image-zoom.c 5191 2006-02-27 02:47:56Z mike $". */ diff --git a/filter/image.c b/filter/image.c index e96727fca..94bc96117 100644 --- a/filter/image.c +++ b/filter/image.c @@ -1,5 +1,5 @@ /* - * "$Id: image.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: image.c 4741 2005-10-02 04:25:52Z mike $" * * Base image support for the Common UNIX Printing System (CUPS). * @@ -841,5 +841,5 @@ get_tile(cups_image_t *img, /* I - Image */ /* - * End of "$Id: image.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: image.c 4741 2005-10-02 04:25:52Z mike $". */ diff --git a/filter/image.h b/filter/image.h index c00940bc6..b77e6ddc3 100644 --- a/filter/image.h +++ b/filter/image.h @@ -1,5 +1,5 @@ /* - * "$Id: image.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: image.h 5191 2006-02-27 02:47:56Z mike $" * * Image library definitions for the Common UNIX Printing System (CUPS). * @@ -135,5 +135,5 @@ extern void cupsImageWhiteToWhite(const cups_ib_t *in, #endif /* !_CUPS_IMAGE_H_ */ /* - * End of "$Id: image.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: image.h 5191 2006-02-27 02:47:56Z mike $". */ diff --git a/filter/imagetops.c b/filter/imagetops.c index 5e70c319a..4f512fc0d 100644 --- a/filter/imagetops.c +++ b/filter/imagetops.c @@ -1,5 +1,5 @@ /* - * "$Id: imagetops.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: imagetops.c 5379 2006-04-07 13:48:37Z mike $" * * Image file to PostScript filter for the Common UNIX Printing System (CUPS). * @@ -1063,5 +1063,5 @@ ps_ascii85(cups_ib_t *data, /* I - Data to print */ /* - * End of "$Id: imagetops.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: imagetops.c 5379 2006-04-07 13:48:37Z mike $". */ diff --git a/filter/imagetoraster.c b/filter/imagetoraster.c index ff3dbfb49..32bc9a7c7 100644 --- a/filter/imagetoraster.c +++ b/filter/imagetoraster.c @@ -1,5 +1,5 @@ /* - * "$Id: imagetoraster.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: imagetoraster.c 5522 2006-05-15 05:02:15Z mike $" * * Image file to raster filter for the Common UNIX Printing System (CUPS). * @@ -4310,5 +4310,5 @@ raster_cb( /* - * End of "$Id: imagetoraster.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: imagetoraster.c 5522 2006-05-15 05:02:15Z mike $". */ diff --git a/filter/interpret.c b/filter/interpret.c index 89bfc99d5..3e7b47be1 100644 --- a/filter/interpret.c +++ b/filter/interpret.c @@ -1,5 +1,5 @@ /* - * "$Id: interpret.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: interpret.c 5513 2006-05-11 18:07:25Z mike $" * * PPD command interpreter for the Common UNIX Printing System (CUPS). * @@ -608,5 +608,5 @@ exec_code( /* - * End of "$Id: interpret.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: interpret.c 5513 2006-05-11 18:07:25Z mike $". */ diff --git a/filter/pstops.c b/filter/pstops.c index cdd8ea446..544bff6b5 100644 --- a/filter/pstops.c +++ b/filter/pstops.c @@ -1,5 +1,5 @@ /* - * "$Id: pstops.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: pstops.c 5622 2006-06-01 23:43:21Z mike $" * * PostScript filter for the Common UNIX Printing System (CUPS). * @@ -2994,5 +2994,5 @@ write_labels(pstops_doc_t *doc, /* I - Document information */ /* - * End of "$Id: pstops.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: pstops.c 5622 2006-06-01 23:43:21Z mike $". */ diff --git a/filter/raster.c b/filter/raster.c index 4ce98e7cc..eeb4398b6 100644 --- a/filter/raster.c +++ b/filter/raster.c @@ -1,5 +1,5 @@ /* - * "$Id: raster.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: raster.c 5671 2006-06-16 11:17:39Z mike $" * * Raster file routines for the Common UNIX Printing System (CUPS). * @@ -50,7 +50,6 @@ * cups_raster_read_header() - Read a raster page header. * cups_raster_update() - Update the raster header and row count for the * current page. - * cups_raster_write() - Write a row of raster data... * cups_read() - Read bytes from a file. * cups_swap() - Swap bytes in raster data... * cups_write() - Write bytes to a file. @@ -106,7 +105,6 @@ static unsigned cups_raster_read_header(cups_raster_t *r); static int cups_raster_read(cups_raster_t *r, unsigned char *buf, int bytes); static void cups_raster_update(cups_raster_t *r); -static int cups_raster_write(cups_raster_t *r, const unsigned char *pixels); static int cups_read(int fd, unsigned char *buf, int bytes); static void cups_swap(unsigned char *buf, int bytes); static int cups_write(int fd, const unsigned char *buf, int bytes); @@ -147,7 +145,7 @@ cupsRasterOpen(int fd, /* I - File descriptor */ return (NULL); r->fd = fd; - r->mode = mode == CUPS_RASTER_WRITE_COMPRESSED ? CUPS_RASTER_WRITE : mode; + r->mode = mode; if (mode == CUPS_RASTER_READ) { @@ -187,13 +185,7 @@ cupsRasterOpen(int fd, /* I - File descriptor */ * Open for write - put sync word... */ - if (mode == CUPS_RASTER_WRITE_COMPRESSED) - { - r->compressed = 1; - r->sync = CUPS_RASTER_SYNCv2; - } - else - r->sync = CUPS_RASTER_SYNC; + r->sync = CUPS_RASTER_SYNC; if (cups_write(r->fd, (unsigned char *)&(r->sync), sizeof(r->sync)) < sizeof(r->sync)) @@ -539,10 +531,6 @@ cupsRasterWritePixels(cups_raster_t *r, /* I - Raster stream */ unsigned char *p, /* I - Bytes to write */ unsigned len)/* I - Number of bytes to write */ { - int bytes; /* Bytes read */ - unsigned remaining; /* Bytes remaining */ - - #ifdef DEBUG fprintf(stderr, "cupsRasterWritePixels(r=%p, p=%p, len=%u), remaining=%u\n", r, p, len, r->remaining); @@ -551,113 +539,13 @@ cupsRasterWritePixels(cups_raster_t *r, /* I - Raster stream */ if (r == NULL || r->mode != CUPS_RASTER_WRITE || r->remaining == 0) return (0); - if (!r->compressed) - { - /* - * Without compression, just write the raster data raw... - */ - - r->remaining -= len / r->header.cupsBytesPerLine; - - return (cups_write(r->fd, p, len)); - } - /* - * Otherwise, compress each line... + * No write compression, just write the raster data raw... */ - for (remaining = len; remaining > 0; remaining -= bytes, p += bytes) - { - /* - * Figure out the number of remaining bytes on the current line... - */ - - if ((bytes = remaining) > (r->pend - r->pcurrent)) - bytes = r->pend - r->pcurrent; - - if (r->count > 0) - { - /* - * Check to see if this line is the same as the previous line... - */ - - if (memcmp(p, r->pcurrent, bytes)) - { - if (!cups_raster_write(r, r->pixels)) - return (0); - - r->count = 0; - } - else - { - /* - * Mark more bytes as the same... - */ - - r->pcurrent += bytes; - - if (r->pcurrent >= r->pend) - { - /* - * Increase the repeat count... - */ - - r->count ++; - r->pcurrent = r->pixels; - - /* - * Flush out this line if it is the last one... - */ - - r->remaining --; - - if (r->remaining == 0) - return (cups_raster_write(r, r->pixels)); - else if (r->count == 256) - { - if (cups_raster_write(r, r->pixels) == 0) - return (0); - - r->count = 0; - } - } - - continue; - } - } - - if (r->count == 0) - { - /* - * Copy the raster data to the buffer... - */ - - memcpy(r->pcurrent, p, bytes); - - r->pcurrent += bytes; - - if (r->pcurrent >= r->pend) - { - /* - * Increase the repeat count... - */ - - r->count ++; - r->pcurrent = r->pixels; - - /* - * Flush out this line if it is the last one... - */ - - r->remaining --; + r->remaining -= len / r->header.cupsBytesPerLine; - if (r->remaining == 0) - return (cups_raster_write(r, r->pixels)); - } - } - } - - return (len); + return (cups_write(r->fd, p, len)); } @@ -959,120 +847,6 @@ cups_raster_update(cups_raster_t *r) /* I - Raster stream */ /* - * 'cups_raster_write()' - Write a row of compressed raster data... - */ - -static int /* O - Number of bytes written */ -cups_raster_write( - cups_raster_t *r, /* I - Raster stream */ - const unsigned char *pixels) /* I - Pixel data to write */ -{ - const unsigned char *start, /* Start of sequence */ - *ptr, /* Current pointer in sequence */ - *pend, /* End of raster buffer */ - *plast; /* Pointer to last pixel */ - unsigned char *wptr; /* Pointer into write buffer */ - int bpp, /* Bytes per pixel */ - count, /* Count */ - maxrun; /* Maximum run of 128 * bpp */ - - -#ifdef DEBUG - fprintf(stderr, "cups_raster_write(r=%p, pixels=%p)\n", r, pixels); -#endif /* DEBUG */ - - /* - * Allocate a write buffer as needed... - */ - - count = r->header.cupsBytesPerLine * 2; - if (count > r->bufsize) - { - if (r->buffer) - wptr = realloc(r->buffer, count); - else - wptr = malloc(count); - - if (!wptr) - return (-1); - - r->buffer = wptr; - r->bufsize = count; - } - - /* - * Write the row repeat count... - */ - - bpp = r->bpp; - pend = pixels + r->header.cupsBytesPerLine; - plast = pend - bpp; - wptr = r->buffer; - *wptr++ = r->count - 1; - maxrun = 128 * bpp; - - /* - * Write using a modified TIFF "packbits" compression... - */ - - for (ptr = pixels; ptr < pend;) - { - start = ptr; - ptr += bpp; - - if (ptr == pend) - { - /* - * Encode a single pixel at the end... - */ - - *wptr++ = 0; - for (count = bpp; count > 0; count --) - *wptr++ = *start++; - } - else if (!memcmp(start, ptr, bpp)) - { - /* - * Encode a sequence of repeating pixels... - */ - - for (count = 2; count < 128 && ptr < plast; count ++, ptr += bpp) - if (memcmp(ptr, ptr + bpp, bpp)) - break; - - *wptr++ = count - 1; - for (count = bpp; count > 0; count --) - *wptr++ = *ptr++; - } - else - { - /* - * Encode a sequence of non-repeating pixels... - */ - - for (count = 1; count < 127 && ptr < plast; count ++, ptr += bpp) - if (!memcmp(ptr, ptr + bpp, bpp)) - break; - - if (ptr >= plast && count < 128) - { - count ++; - ptr += bpp; - } - - *wptr++ = 257 - count; - - count *= bpp; - memcpy(wptr, start, count); - wptr += count; - } - } - - return (cups_write(r->fd, r->buffer, wptr - r->buffer)); -} - - -/* * 'cups_read()' - Read bytes from a file. */ @@ -1161,5 +935,5 @@ cups_write(int fd, /* I - File descriptor */ /* - * End of "$Id: raster.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: raster.c 5671 2006-06-16 11:17:39Z mike $". */ diff --git a/filter/raster.h b/filter/raster.h index 16e11f0d4..13423b483 100644 --- a/filter/raster.h +++ b/filter/raster.h @@ -1,5 +1,5 @@ /* - * "$Id: raster.h 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: raster.h 5671 2006-06-16 11:17:39Z mike $" * * Raster file definitions for the Common UNIX Printing System (CUPS). * @@ -86,8 +86,7 @@ extern "C" { typedef enum cups_mode_e /**** Raster modes ****/ { CUPS_RASTER_READ = 0, /* Open stream for reading */ - CUPS_RASTER_WRITE = 1, /* Open stream for writing */ - CUPS_RASTER_WRITE_COMPRESSED = 2 /* Open stream for compressed writing @since CUPS 1.3@ */ + CUPS_RASTER_WRITE = 1 /* Open stream for writing */ } cups_mode_t; typedef enum cups_bool_e /**** Boolean type ****/ @@ -346,5 +345,5 @@ extern unsigned cupsRasterWriteHeader2(cups_raster_t *r, #endif /* !_CUPS_RASTER_H_ */ /* - * End of "$Id: raster.h 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: raster.h 5671 2006-06-16 11:17:39Z mike $". */ diff --git a/filter/rasterbench.c b/filter/rasterbench.c index f954f63e0..b26836b4e 100644 --- a/filter/rasterbench.c +++ b/filter/rasterbench.c @@ -1,5 +1,5 @@ /* - * "$Id: rasterbench.c 5667 2006-06-16 10:21:49Z mike $" + * "$Id: rasterbench.c 5671 2006-06-16 11:17:39Z mike $" * * Raster benchmark program for the Common UNIX Printing System (CUPS). * @@ -351,5 +351,5 @@ write_test(int fd) /* I - File descriptor to write to */ /* - * End of "$Id: rasterbench.c 5667 2006-06-16 10:21:49Z mike $". + * End of "$Id: rasterbench.c 5671 2006-06-16 11:17:39Z mike $". */ diff --git a/filter/rastertoepson.c b/filter/rastertoepson.c index d2a963991..75d2352b1 100644 --- a/filter/rastertoepson.c +++ b/filter/rastertoepson.c @@ -1,5 +1,5 @@ /* - * "$Id: rastertoepson.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: rastertoepson.c 4494 2005-02-18 02:18:11Z mike $" * * EPSON ESC/P and ESC/P2 filter for the Common UNIX Printing System * (CUPS). @@ -1148,5 +1148,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: rastertoepson.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: rastertoepson.c 4494 2005-02-18 02:18:11Z mike $". */ diff --git a/filter/rastertohp.c b/filter/rastertohp.c index a380d8106..e36c5902d 100644 --- a/filter/rastertohp.c +++ b/filter/rastertohp.c @@ -1,5 +1,5 @@ /* - * "$Id: rastertohp.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: rastertohp.c 4493 2005-02-18 02:09:53Z mike $" * * Hewlett-Packard Page Control Language filter for the Common UNIX * Printing System (CUPS). @@ -884,5 +884,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: rastertohp.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: rastertohp.c 4493 2005-02-18 02:09:53Z mike $". */ diff --git a/filter/rastertolabel.c b/filter/rastertolabel.c index 1a4a2ee66..d5f403182 100644 --- a/filter/rastertolabel.c +++ b/filter/rastertolabel.c @@ -1,5 +1,5 @@ /* - * "$Id: rastertolabel.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: rastertolabel.c 5665 2006-06-16 00:59:10Z mike $" * * Label printer filter for the Common UNIX Printing System (CUPS). * @@ -30,7 +30,6 @@ * EndPage() - Finish a page of graphics. * CancelJob() - Cancel the current job... * OutputLine() - Output a line of graphics. - * PCLCompress() - Output a PCL (mode 3) compressed line. * ZPLCompress() - Output a run-length compression sequence. * main() - Main entry and processing of driver. */ @@ -49,20 +48,16 @@ /* - * This driver filter currently supports Dymo, Intellitech, and Zebra - * label printers. + * This driver filter currently supports Dymo and Zebra label printers. * * The Dymo portion of the driver has been tested with the 300, 330, - * and 330 Turbo label printers; it may also work with other models. + * and 330 Turbo label printers; it may also work with older models. * The Dymo printers support printing at 136, 203, and 300 DPI. * - * The Intellitech portion of the driver has been tested with the - * Intellibar 408, 412, and 808 and supports their PCL variant. - * - * The Zebra portion of the driver has been tested with the LP-2844, - * LP-2844Z, QL-320, and QL-420 label printers; it may also work with - * other models. The driver supports EPL line mode, EPL page mode, - * ZPL, and CPCL as defined in Zebra's on-line developer documentation. + * The Zebra portion of the driver has been tested with the LP-2844Z label + * printer; it may also work with other models. The driver supports EPL + * line mode, EPL page mode, ZPL, and CPCL as defined in Zebra's on-line + * developer documentation. */ /* @@ -76,15 +71,13 @@ #define ZEBRA_ZPL 0x12 /* Zebra ZPL-based printers */ #define ZEBRA_CPCL 0x13 /* Zebra CPCL-based printers */ -#define INTELLITECH_PCL 0x20 /* Intellitech PCL-based printers */ - /* * Globals... */ unsigned char *Buffer; /* Output buffer */ -unsigned char *CompBuffer; /* Compression buffer */ +char *CompBuffer; /* Compression buffer */ unsigned char *LastBuffer; /* Last buffer */ int LastSet; /* Number of repeat characters */ int ModelNumber, /* cupsModelNumber attribute */ @@ -102,7 +95,6 @@ void StartPage(ppd_file_t *ppd, cups_page_header_t *header); void EndPage(ppd_file_t *ppd, cups_page_header_t *header); void CancelJob(int sig); void OutputLine(ppd_file_t *ppd, cups_page_header_t *header, int y); -void PCLCompress(unsigned char *line, int length); void ZPLCompress(char repeat_char, int repeat_count); @@ -155,15 +147,6 @@ Setup(ppd_file_t *ppd) /* I - PPD file */ case ZEBRA_CPCL : break; - - case INTELLITECH_PCL : - /* - * Send a PCL reset sequence. - */ - - putchar(0x1b); - putchar('E'); - break; } } @@ -230,9 +213,6 @@ StartPage(ppd_file_t *ppd, /* I - PPD file */ fprintf(stderr, "DEBUG: cupsColorOrder = %d\n", header->cupsColorOrder); fprintf(stderr, "DEBUG: cupsColorSpace = %d\n", header->cupsColorSpace); fprintf(stderr, "DEBUG: cupsCompression = %d\n", header->cupsCompression); - fprintf(stderr, "DEBUG: cupsRowCount = %d\n", header->cupsRowCount); - fprintf(stderr, "DEBUG: cupsRowFeed = %d\n", header->cupsRowFeed); - fprintf(stderr, "DEBUG: cupsRowStep = %d\n", header->cupsRowStep); /* * Register a signal handler to eject the current page if the @@ -373,108 +353,6 @@ StartPage(ppd_file_t *ppd, /* I - PPD file */ header->HWResolution[1], header->cupsHeight, header->NumCopies); break; - - case INTELLITECH_PCL : - /* - * Set the media size... - */ - - printf("\033&l6D\033&k12H"); /* Set 6 LPI, 10 CPI */ - printf("\033&l0O"); /* Set portrait orientation */ - - switch (header->PageSize[1]) - { - case 540 : /* Monarch Envelope */ - printf("\033&l80A"); /* Set page size */ - break; - - case 624 : /* DL Envelope */ - printf("\033&l90A"); /* Set page size */ - break; - - case 649 : /* C5 Envelope */ - printf("\033&l91A"); /* Set page size */ - break; - - case 684 : /* COM-10 Envelope */ - printf("\033&l81A"); /* Set page size */ - break; - - case 756 : /* Executive */ - printf("\033&l1A"); /* Set page size */ - break; - - case 792 : /* Letter */ - printf("\033&l2A"); /* Set page size */ - break; - - case 842 : /* A4 */ - printf("\033&l26A"); /* Set page size */ - break; - - case 1008 : /* Legal */ - printf("\033&l3A"); /* Set page size */ - break; - - default : /* Custom size */ - printf("\033!f%dZ", header->PageSize[1] * 300 / 72); - break; - } - - 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 */ - printf("\033&l0L"); /* Turn off perforation skip */ - - /* - * Print settings... - */ - - if (Page == 1) - { - if (header->cupsRowFeed) /* inPrintRate */ - printf("\033!p%dS", header->cupsRowFeed); - - if (header->cupsCompression != ~0) - /* inPrintDensity */ - printf("\033&d%dA", 30 * header->cupsCompression / 100 - 15); - - if (header->cupsRowCount != ~0) - /* inTearInterval */ - printf("\033!n%dT", header->cupsRowCount); - - if (header->cupsRowStep != ~0) - /* inCutInterval */ - printf("\033!n%dC", header->cupsRowStep); - } - - /* - * Setup graphics... - */ - - printf("\033*t%dR", header->HWResolution[0]); - /* Set resolution */ - - printf("\033*r%dS", header->cupsWidth); - /* Set width */ - printf("\033*r%dT", header->cupsHeight); - /* Set height */ - - printf("\033&a0H"); /* Set horizontal position */ - printf("\033&a0V"); /* Set vertical position */ - printf("\033*r1A"); /* Start graphics */ - printf("\033*b3M"); /* Set compression */ - - /* - * Allocate compression buffers... - */ - - CompBuffer = malloc(2 * header->cupsBytesPerLine + 1); - LastBuffer = malloc(header->cupsBytesPerLine); - LastSet = 0; - break; } /* @@ -713,11 +591,6 @@ EndPage(ppd_file_t *ppd, /* I - PPD file */ puts("FORM\r"); puts("PRINT\r"); break; - - case INTELLITECH_PCL : - printf("\033*rB"); /* End GFX */ - printf("\014"); /* Eject current page */ - break; } fflush(stdout); @@ -915,164 +788,11 @@ OutputLine(ppd_file_t *ppd, /* I - PPD file */ fflush(stdout); } break; - - case INTELLITECH_PCL : - if (Buffer[0] || - memcmp(Buffer, Buffer + 1, header->cupsBytesPerLine - 1)) - { - if (Feed) - { - printf("\033*b%dY", Feed); - Feed = 0; - LastSet = 0; - } - - PCLCompress(Buffer, header->cupsBytesPerLine); - } - else - Feed ++; - break; } } /* - * 'PCLCompress()' - Output a PCL (mode 3) compressed line. - */ - -void -PCLCompress(unsigned char *line, /* I - Line to compress */ - int length) /* I - Length of line */ -{ - unsigned char *line_ptr, /* Current byte pointer */ - *line_end, /* End-of-line byte pointer */ - *comp_ptr, /* Pointer into compression buffer */ - *start, /* Start of compression sequence */ - *seed; /* Seed buffer pointer */ - int count, /* Count of bytes for output */ - offset; /* Offset of bytes for output */ - - - /* - * Do delta-row compression... - */ - - line_ptr = line; - line_end = line + length; - - comp_ptr = CompBuffer; - seed = LastBuffer; - - while (line_ptr < line_end) - { - /* - * Find the next non-matching sequence... - */ - - start = line_ptr; - - if (!LastSet) - { - /* - * The seed buffer is invalid, so do the next 8 bytes, max... - */ - - offset = 0; - - if ((count = line_end - line_ptr) > 8) - count = 8; - - line_ptr += count; - } - else - { - /* - * The seed buffer is valid, so compare against it... - */ - - while (*line_ptr == *seed && - line_ptr < line_end) - { - line_ptr ++; - seed ++; - } - - if (line_ptr == line_end) - break; - - offset = line_ptr - start; - - /* - * Find up to 8 non-matching bytes... - */ - - start = line_ptr; - count = 0; - while (*line_ptr != *seed && - line_ptr < line_end && - count < 8) - { - line_ptr ++; - seed ++; - count ++; - } - } - - /* - * Place mode 3 compression data in the buffer; see HP manuals - * for details... - */ - - if (offset >= 31) - { - /* - * Output multi-byte offset... - */ - - *comp_ptr++ = ((count - 1) << 5) | 31; - - offset -= 31; - while (offset >= 255) - { - *comp_ptr++ = 255; - offset -= 255; - } - - *comp_ptr++ = offset; - } - else - { - /* - * Output single-byte offset... - */ - - *comp_ptr++ = ((count - 1) << 5) | offset; - } - - memcpy(comp_ptr, start, count); - comp_ptr += count; - } - - line_ptr = CompBuffer; - line_end = comp_ptr; - - /* - * Set the length of the data and write it... - */ - - printf("\033*b%dW", comp_ptr - CompBuffer); - fwrite(CompBuffer, comp_ptr - CompBuffer, 1, stdout); - - /* - * Save this line as a "seed" buffer for the next... - */ - - memcpy(LastBuffer, line, length); - LastSet = 1; -} - - -/* * 'ZPLCompress()' - Output a run-length compression sequence. */ @@ -1153,7 +873,7 @@ main(int argc, /* I - Number of command-line arguments */ * and return. */ - fputs("ERROR: rastertolabel job-id user title copies options [file]\n", stderr); + fputs("ERROR: rastertodymo job-id user title copies options [file]\n", stderr); return (1); } @@ -1283,5 +1003,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: rastertolabel.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: rastertolabel.c 5665 2006-06-16 00:59:10Z mike $". */ diff --git a/filter/testimage.c b/filter/testimage.c index f1a44b7e5..ca5c31fb2 100644 --- a/filter/testimage.c +++ b/filter/testimage.c @@ -1,5 +1,5 @@ /* - * "$Id: testimage.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: testimage.c 4485 2005-01-03 19:30:00Z mike $" * * Image library test program for the Common UNIX Printing System (CUPS). * @@ -104,5 +104,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: testimage.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: testimage.c 4485 2005-01-03 19:30:00Z mike $". */ diff --git a/filter/testraster.c b/filter/testraster.c index cb563c265..bc35bb01a 100644 --- a/filter/testraster.c +++ b/filter/testraster.c @@ -1,5 +1,5 @@ /* - * "$Id: testraster.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: testraster.c 4545 2005-06-21 19:26:28Z mike $" * * Raster test program routines for the Common UNIX Printing System (CUPS). * @@ -206,5 +206,5 @@ main(void) /* - * End of "$Id: testraster.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: testraster.c 4545 2005-06-21 19:26:28Z mike $". */ diff --git a/filter/textcommon.c b/filter/textcommon.c index e01650150..66255e18a 100644 --- a/filter/textcommon.c +++ b/filter/textcommon.c @@ -1,5 +1,5 @@ /* - * "$Id: textcommon.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: textcommon.c 4559 2005-08-04 18:40:13Z mike $" * * Common text filter routines for the Common UNIX Printing System (CUPS). * @@ -1191,5 +1191,5 @@ getutf8(FILE *fp) /* I - File to read from */ /* - * End of "$Id: textcommon.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: textcommon.c 4559 2005-08-04 18:40:13Z mike $". */ diff --git a/filter/textcommon.h b/filter/textcommon.h index b14419e48..c11737019 100644 --- a/filter/textcommon.h +++ b/filter/textcommon.h @@ -1,5 +1,5 @@ /* - * "$Id: textcommon.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: textcommon.h 4559 2005-08-04 18:40:13Z mike $" * * Common text filter definitions for the Common UNIX Printing System (CUPS). * @@ -119,5 +119,5 @@ extern void WriteProlog(const char *title, const char *user, /* - * End of "$Id: textcommon.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: textcommon.h 4559 2005-08-04 18:40:13Z mike $". */ diff --git a/filter/texttops.c b/filter/texttops.c index fa4f9fb53..879672c95 100644 --- a/filter/texttops.c +++ b/filter/texttops.c @@ -1,5 +1,5 @@ /* - * "$Id: texttops.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: texttops.c 4680 2005-09-21 09:28:39Z mike $" * * Text to PostScript filter for the Common UNIX Printing System (CUPS). * @@ -1307,5 +1307,5 @@ write_text(const char *s) /* I - String to write */ /* - * End of "$Id: texttops.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: texttops.c 4680 2005-09-21 09:28:39Z mike $". */ diff --git a/fonts/Makefile b/fonts/Makefile index a790c36d5..b6c37c9e9 100644 --- a/fonts/Makefile +++ b/fonts/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $" # # Fonts makefile for the Common UNIX Printing System (CUPS). # @@ -76,5 +76,5 @@ uninstall: # -# End of "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $". # diff --git a/init/cups.sh.in b/init/cups.sh.in index 358488d8b..975af256c 100755 --- a/init/cups.sh.in +++ b/init/cups.sh.in @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id: cups.sh.in 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: cups.sh.in 5118 2006-02-16 14:29:53Z mike $" # # Startup/shutdown script for the Common UNIX Printing System (CUPS). # @@ -215,5 +215,5 @@ exit 0 # -# End of "$Id: cups.sh.in 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: cups.sh.in 5118 2006-02-16 14:29:53Z mike $". # diff --git a/locale/Makefile b/locale/Makefile index 569af9502..0d3a6f663 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 181 2006-06-22 20:01:18Z jlovell $" +# "$Id: Makefile 5609 2006-05-30 20:31:10Z mike $" # # Locale file makefile for the Common UNIX Printing System (CUPS). # @@ -112,5 +112,5 @@ translate.o: ../cups/http.h ../cups/i18n.h ../cups/language.h ../cups/string.h # -# End of "$Id: Makefile 181 2006-06-22 20:01:18Z jlovell $". +# End of "$Id: Makefile 5609 2006-05-30 20:31:10Z mike $". # diff --git a/locale/cups.pot b/locale/cups.pot index a74569ef5..1ca4004d7 100644 --- a/locale/cups.pot +++ b/locale/cups.pot @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.2\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2006-05-21 10:07-0400\n" +"POT-Creation-Date: 2006-05-21 10:08-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/locale/cups_ja.po b/locale/cups_ja.po index 464407aba..cf6d770a9 100644 --- a/locale/cups_ja.po +++ b/locale/cups_ja.po @@ -25,7 +25,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.2\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2006-05-21 10:07-0400\n" +"POT-Creation-Date: 2006-05-21 10:08-0400\n" "PO-Revision-Date: 2006-03-29 23:44+0900\n" "Last-Translator: Kenshi Muto <kmuto@debian.org>\n" "Language-Team: Japanese <LL@li.org>\n" diff --git a/locale/cups_pl.po b/locale/cups_pl.po index 49c815145..d10a852c4 100644 --- a/locale/cups_pl.po +++ b/locale/cups_pl.po @@ -25,7 +25,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.2\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2006-05-21 10:07-0400\n" +"POT-Creation-Date: 2006-05-21 10:08-0400\n" "PO-Revision-Date: 2006-05-09 17:20+0200\n" "Last-Translator: Piotr DrÄ…g <raven@pmail.pl>\n" "Language-Team: Polish <pl@li.org>\n" diff --git a/locale/cups_sv.po b/locale/cups_sv.po index a245aa813..21b3c0149 100644 --- a/locale/cups_sv.po +++ b/locale/cups_sv.po @@ -28,7 +28,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.2\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2006-05-21 10:07-0400\n" +"POT-Creation-Date: 2006-05-21 10:08-0400\n" "PO-Revision-Date: 2006-04-16 00:55+0100\n" "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" diff --git a/locale/translate.c b/locale/translate.c index 548295de6..e55890828 100644 --- a/locale/translate.c +++ b/locale/translate.c @@ -1,5 +1,5 @@ /* - * "$Id: translate.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: translate.c 5261 2006-03-09 20:47:49Z mike $" * * HTTP-based translation program for the Common UNIX Printing System (CUPS). * @@ -448,5 +448,5 @@ write_string(cups_file_t *fp, /* I - File to write to */ /* - * End of "$Id: translate.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: translate.c 5261 2006-03-09 20:47:49Z mike $". */ diff --git a/man/Makefile b/man/Makefile index 2ea1b305f..6071d57e0 100644 --- a/man/Makefile +++ b/man/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: Makefile 5472 2006-04-30 16:27:50Z mike $" # # Man page makefile for the Common UNIX Printing System (CUPS). # @@ -183,5 +183,5 @@ mantohtml: mantohtml.o # -# End of "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: Makefile 5472 2006-04-30 16:27:50Z mike $". # diff --git a/man/accept.man b/man/accept.man index 2de16ad30..331d41f5b 100644 --- a/man/accept.man +++ b/man/accept.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: accept.man 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: accept.man 5099 2006-02-13 02:46:10Z mike $" .\" .\" accept/reject man page for the Common UNIX Printing System (CUPS). .\" @@ -84,5 +84,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: accept.man 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: accept.man 5099 2006-02-13 02:46:10Z mike $". .\" diff --git a/man/backend.man b/man/backend.man index 1790ba72e..796a46f56 100644 --- a/man/backend.man +++ b/man/backend.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: backend.man 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: backend.man 5313 2006-03-20 15:29:09Z mike $" .\" .\" Backend man page for the Common UNIX Printing System (CUPS). .\" @@ -184,5 +184,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: backend.man 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: backend.man 5313 2006-03-20 15:29:09Z mike $". .\" diff --git a/man/cancel.man b/man/cancel.man index a7e69c87a..8bb0fc42d 100644 --- a/man/cancel.man +++ b/man/cancel.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: cancel.man 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id$" .\" .\" cancel man page for the Common UNIX Printing System (CUPS). .\" @@ -80,5 +80,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: cancel.man 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id$". .\" diff --git a/man/classes.conf.man b/man/classes.conf.man index c5436690a..eb38be57c 100644 --- a/man/classes.conf.man +++ b/man/classes.conf.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: classes.conf.man 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: classes.conf.man 5099 2006-02-13 02:46:10Z mike $" .\" .\" classes.conf man page for the Common UNIX Printing System (CUPS). .\" @@ -123,5 +123,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: classes.conf.man 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: classes.conf.man 5099 2006-02-13 02:46:10Z mike $". .\" diff --git a/man/client.conf.man.in b/man/client.conf.man.in index 7cc2e7671..55b4c8e46 100644 --- a/man/client.conf.man.in +++ b/man/client.conf.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: client.conf.man.in 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: client.conf.man.in 5182 2006-02-26 04:10:27Z mike $" .\" .\" client.conf man page for the Common UNIX Printing System (CUPS). .\" @@ -54,5 +54,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: client.conf.man.in 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: client.conf.man.in 5182 2006-02-26 04:10:27Z mike $". .\" diff --git a/man/cups-config.man b/man/cups-config.man index f71532a38..bf0840660 100644 --- a/man/cups-config.man +++ b/man/cups-config.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: cups-config.man 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: cups-config.man 5099 2006-02-13 02:46:10Z mike $" .\" .\" cups-config man page for the Common UNIX Printing System (CUPS). .\" @@ -115,5 +115,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: cups-config.man 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: cups-config.man 5099 2006-02-13 02:46:10Z mike $". .\" diff --git a/man/cups-deviced.man.in b/man/cups-deviced.man.in index 7d764180e..859a3970e 100644 --- a/man/cups-deviced.man.in +++ b/man/cups-deviced.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: cups-deviced.man.in 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: cups-deviced.man.in 5099 2006-02-13 02:46:10Z mike $" .\" .\" cups-deviced man page for the Common UNIX Printing System (CUPS). .\" @@ -49,5 +49,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: cups-deviced.man.in 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: cups-deviced.man.in 5099 2006-02-13 02:46:10Z mike $". .\" diff --git a/man/cups-driverd.man.in b/man/cups-driverd.man.in index f0a4c55ab..e9f1862bd 100644 --- a/man/cups-driverd.man.in +++ b/man/cups-driverd.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: cups-driverd.man.in 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: cups-driverd.man.in 5099 2006-02-13 02:46:10Z mike $" .\" .\" cups-driverd man page for the Common UNIX Printing System (CUPS). .\" @@ -110,5 +110,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: cups-driverd.man.in 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: cups-driverd.man.in 5099 2006-02-13 02:46:10Z mike $". .\" diff --git a/man/cups-lpd.man.in b/man/cups-lpd.man.in index 378d86acf..14cd8258d 100644 --- a/man/cups-lpd.man.in +++ b/man/cups-lpd.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: cups-lpd.man.in 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: cups-lpd.man.in 5455 2006-04-24 13:49:59Z mike $" .\" .\" cups-lpd man page for the Common UNIX Printing System (CUPS). .\" @@ -123,5 +123,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: cups-lpd.man.in 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: cups-lpd.man.in 5455 2006-04-24 13:49:59Z mike $". .\" diff --git a/man/cups-polld.man b/man/cups-polld.man index 4885dea74..f75dbbc40 100644 --- a/man/cups-polld.man +++ b/man/cups-polld.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: cups-polld.man 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: cups-polld.man 5099 2006-02-13 02:46:10Z mike $" .\" .\" cups-polld man page for the Common UNIX Printing System (CUPS). .\" @@ -43,5 +43,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: cups-polld.man 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: cups-polld.man 5099 2006-02-13 02:46:10Z mike $". .\" diff --git a/man/cups-snmp.conf.man b/man/cups-snmp.conf.man index 15a531fca..a0ad520e5 100644 --- a/man/cups-snmp.conf.man +++ b/man/cups-snmp.conf.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: cups-snmp.conf.man 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id$" .\" .\" snmp.conf man page for the Common UNIX Printing System (CUPS). .\" @@ -73,5 +73,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: cups-snmp.conf.man 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id$". .\" diff --git a/man/cupsaddsmb.man.in b/man/cupsaddsmb.man.in index 489986bbd..55cc91c85 100644 --- a/man/cupsaddsmb.man.in +++ b/man/cupsaddsmb.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: cupsaddsmb.man.in 181 2006-06-22 20:01:18Z jlovell $" +.\" "$Id: cupsaddsmb.man.in 5645 2006-06-13 19:20:58Z mike $" .\" .\" cupsaddsmb man page for the Common UNIX Printing System (CUPS). .\" @@ -210,5 +210,5 @@ http://www.cups.org/windows/ .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: cupsaddsmb.man.in 181 2006-06-22 20:01:18Z jlovell $". +.\" End of "$Id: cupsaddsmb.man.in 5645 2006-06-13 19:20:58Z mike $". .\" diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in index e4f1e7fe1..f17a4dcb3 100644 --- a/man/cupsd.conf.man.in +++ b/man/cupsd.conf.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: cupsd.conf.man.in 181 2006-06-22 20:01:18Z jlovell $" +.\" "$Id: cupsd.conf.man.in 5638 2006-06-06 20:08:13Z mike $" .\" .\" cupsd.conf man page for the Common UNIX Printing System (CUPS). .\" @@ -609,5 +609,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: cupsd.conf.man.in 181 2006-06-22 20:01:18Z jlovell $". +.\" End of "$Id: cupsd.conf.man.in 5638 2006-06-06 20:08:13Z mike $". .\" diff --git a/man/cupsd.man.in b/man/cupsd.man.in index 831890f97..cbcc0ea91 100644 --- a/man/cupsd.man.in +++ b/man/cupsd.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: cupsd.man.in 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: cupsd.man.in 5099 2006-02-13 02:46:10Z mike $" .\" .\" cupsd man page for the Common UNIX Printing System (CUPS). .\" @@ -74,5 +74,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: cupsd.man.in 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: cupsd.man.in 5099 2006-02-13 02:46:10Z mike $". .\" diff --git a/man/cupsenable.man b/man/cupsenable.man index f345e5d8f..e446991fc 100644 --- a/man/cupsenable.man +++ b/man/cupsenable.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: cupsenable.man 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: cupsenable.man 5099 2006-02-13 02:46:10Z mike $" .\" .\" cupsenable/cupsdisable man page for the Common UNIX Printing System .\" (CUPS). @@ -89,5 +89,5 @@ http://localhost:631/help Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: cupsenable.man 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: cupsenable.man 5099 2006-02-13 02:46:10Z mike $". .\" diff --git a/man/cupstestdsc.man b/man/cupstestdsc.man index 5c7136d6d..62db95e1f 100644 --- a/man/cupstestdsc.man +++ b/man/cupstestdsc.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: cupstestdsc.man 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: cupstestdsc.man 5099 2006-02-13 02:46:10Z mike $" .\" .\" cupstestdsc man page for the Common UNIX Printing System (CUPS). .\" @@ -55,5 +55,5 @@ Specification, Version 3.0. .SH COPYRIGHT Copyright 2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: cupstestdsc.man 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id$". .\" diff --git a/man/cupstestppd.man b/man/cupstestppd.man index b7d0768d5..149ddbf94 100644 --- a/man/cupstestppd.man +++ b/man/cupstestppd.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: cupstestppd.man 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: cupstestppd.man 5099 2006-02-13 02:46:10Z mike $" .\" .\" cupstestppd man page for the Common UNIX Printing System (CUPS). .\" @@ -111,5 +111,5 @@ Adobe PostScript Printer Description File Format Specification, Version 4.3. .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: cupstestppd.man 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: cupstestppd.man 5099 2006-02-13 02:46:10Z mike $". .\" diff --git a/man/filter.man b/man/filter.man index 4a2ab82dd..d3537d40a 100644 --- a/man/filter.man +++ b/man/filter.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: filter.man 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: filter.man 5327 2006-03-23 19:53:24Z mike $" .\" .\" filter man page for the Common UNIX Printing System (CUPS). .\" @@ -226,5 +226,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: filter.man 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: filter.man 5327 2006-03-23 19:53:24Z mike $". .\" diff --git a/man/lp.man b/man/lp.man index 8cb4c8612..87ff04e67 100644 --- a/man/lp.man +++ b/man/lp.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lp.man 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: lp.man 5327 2006-03-23 19:53:24Z mike $" .\" .\" lp man page for the Common UNIX Printing System (CUPS). .\" @@ -248,5 +248,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: lp.man 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: lp.man 5327 2006-03-23 19:53:24Z mike $". .\" diff --git a/man/lpadmin.man b/man/lpadmin.man index e17f0920f..28d747053 100644 --- a/man/lpadmin.man +++ b/man/lpadmin.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lpadmin.man 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: lpadmin.man 5327 2006-03-23 19:53:24Z mike $" .\" .\" lpadmin man page for the Common UNIX Printing System (CUPS). .\" @@ -182,5 +182,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: lpadmin.man 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: lpadmin.man 5327 2006-03-23 19:53:24Z mike $". .\" diff --git a/man/lpc.man b/man/lpc.man index f4afe1567..f183f3de6 100644 --- a/man/lpc.man +++ b/man/lpc.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lpc.man 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: lpc.man 5099 2006-02-13 02:46:10Z mike $" .\" .\" lpc man page for the Common UNIX Printing System (CUPS). .\" @@ -76,5 +76,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: lpc.man 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: lpc.man 5099 2006-02-13 02:46:10Z mike $". .\" diff --git a/man/lpinfo.man b/man/lpinfo.man index 26e14f65b..3d8fdfb99 100644 --- a/man/lpinfo.man +++ b/man/lpinfo.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lpinfo.man 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: lpinfo.man 5099 2006-02-13 02:46:10Z mike $" .\" .\" lpinfo man page for the Common UNIX Printing System (CUPS). .\" @@ -70,5 +70,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: lpinfo.man 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: lpinfo.man 5099 2006-02-13 02:46:10Z mike $". .\" diff --git a/man/lpmove.man b/man/lpmove.man index e5cd9866b..e2f05b99a 100644 --- a/man/lpmove.man +++ b/man/lpmove.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lpmove.man 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: lpmove.man 5099 2006-02-13 02:46:10Z mike $" .\" .\" lpmove man page for the Common UNIX Printing System (CUPS). .\" @@ -71,5 +71,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: lpmove.man 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: lpmove.man 5099 2006-02-13 02:46:10Z mike $". .\" diff --git a/man/lpoptions.man.in b/man/lpoptions.man.in index 397075183..6b88e737c 100644 --- a/man/lpoptions.man.in +++ b/man/lpoptions.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: lpoptions.man.in 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: lpoptions.man.in 5313 2006-03-20 15:29:09Z mike $" .\" .\" lpoptions man page for the Common UNIX Printing System (CUPS). .\" @@ -140,5 +140,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: lpoptions.man.in 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: lpoptions.man.in 5313 2006-03-20 15:29:09Z mike $". .\" diff --git a/man/lppasswd.man b/man/lppasswd.man index ab1d9b630..f1d8c79c5 100644 --- a/man/lppasswd.man +++ b/man/lppasswd.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lppasswd.man 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: lppasswd.man 5313 2006-03-20 15:29:09Z mike $" .\" .\" lpadmin man page for the Common UNIX Printing System (CUPS). .\" @@ -66,5 +66,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: lppasswd.man 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: lppasswd.man 5313 2006-03-20 15:29:09Z mike $". .\" diff --git a/man/lpq.man b/man/lpq.man index 7e08a939d..c59bf0b84 100644 --- a/man/lpq.man +++ b/man/lpq.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lpq.man 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: lpq.man 5099 2006-02-13 02:46:10Z mike $" .\" .\" lpq man page for the Common UNIX Printing System (CUPS). .\" @@ -77,5 +77,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: lpq.man 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: lpq.man 5099 2006-02-13 02:46:10Z mike $". .\" diff --git a/man/lpr.man b/man/lpr.man index ffc27574d..6f6798b14 100644 --- a/man/lpr.man +++ b/man/lpr.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lpr.man 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: lpr.man 5099 2006-02-13 02:46:10Z mike $" .\" .\" lpr man page for the Common UNIX Printing System (CUPS). .\" @@ -123,5 +123,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: lpr.man 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: lpr.man 5099 2006-02-13 02:46:10Z mike $". .\" diff --git a/man/lprm.man b/man/lprm.man index ec1ca62d0..723a00808 100644 --- a/man/lprm.man +++ b/man/lprm.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lprm.man 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: lprm.man 5099 2006-02-13 02:46:10Z mike $" .\" .\" lprm man page for the Common UNIX Printing System (CUPS). .\" @@ -70,5 +70,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: lprm.man 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: lprm.man 5099 2006-02-13 02:46:10Z mike $". .\" diff --git a/man/lpstat.man b/man/lpstat.man index 42629e9bb..239b8d5cd 100644 --- a/man/lpstat.man +++ b/man/lpstat.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lpstat.man 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: lpstat.man 5327 2006-03-23 19:53:24Z mike $" .\" .\" lpstat man page for the Common UNIX Printing System (CUPS). .\" @@ -144,5 +144,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: lpstat.man 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: lpstat.man 5327 2006-03-23 19:53:24Z mike $". .\" diff --git a/man/mantohtml.c b/man/mantohtml.c index 95544fae3..a583231ae 100644 --- a/man/mantohtml.c +++ b/man/mantohtml.c @@ -1,5 +1,5 @@ /* - * "$Id: mantohtml.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: mantohtml.c 5142 2006-02-21 14:52:34Z mike $" * * Man page to HTML conversion program. * @@ -725,5 +725,5 @@ strmove(char *d, /* I - Destination */ /* - * End of "$Id: mantohtml.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: mantohtml.c 5142 2006-02-21 14:52:34Z mike $". */ diff --git a/man/mime.convs.man b/man/mime.convs.man index 1dd55c3d2..37e765cb1 100644 --- a/man/mime.convs.man +++ b/man/mime.convs.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: mime.convs.man 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: mime.convs.man 5313 2006-03-20 15:29:09Z mike $" .\" .\" mime.convs man page for the Common UNIX Printing System (CUPS). .\" @@ -51,5 +51,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: mime.convs.man 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: mime.convs.man 5313 2006-03-20 15:29:09Z mike $". .\" diff --git a/man/mime.types.man b/man/mime.types.man index 8d64cc767..8b42b6c35 100644 --- a/man/mime.types.man +++ b/man/mime.types.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: mime.types.man 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: mime.types.man 5099 2006-02-13 02:46:10Z mike $" .\" .\" mime.types man page for the Common UNIX Printing System (CUPS). .\" @@ -99,5 +99,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: mime.types.man 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: mime.types.man 5099 2006-02-13 02:46:10Z mike $". .\" diff --git a/man/printers.conf.man b/man/printers.conf.man index 4bc4a2a51..45dedb85a 100644 --- a/man/printers.conf.man +++ b/man/printers.conf.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: printers.conf.man 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: printers.conf.man 5099 2006-02-13 02:46:10Z mike $" .\" .\" printers.conf man page for the Common UNIX Printing System (CUPS). .\" @@ -127,5 +127,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: printers.conf.man 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: printers.conf.man 5099 2006-02-13 02:46:10Z mike $". .\" diff --git a/man/subscriptions.conf.man b/man/subscriptions.conf.man index 43fe1d305..15223a105 100644 --- a/man/subscriptions.conf.man +++ b/man/subscriptions.conf.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: subscriptions.conf.man 177 2006-06-21 00:20:03Z jlovell $" +.\" "$Id: subscriptions.conf.man 5099 2006-02-13 02:46:10Z mike $" .\" .\" subscriptions.conf man page for the Common UNIX Printing System (CUPS). .\" @@ -94,5 +94,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 1997-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: subscriptions.conf.man 177 2006-06-21 00:20:03Z jlovell $". +.\" End of "$Id: subscriptions.conf.man 5099 2006-02-13 02:46:10Z mike $". .\" diff --git a/monitor/Makefile b/monitor/Makefile index 0fad819f8..e7ae20c7a 100644 --- a/monitor/Makefile +++ b/monitor/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $" # # Port monitor makefile for the Common UNIX Printing System (CUPS). # @@ -103,5 +103,5 @@ include Dependencies # -# End of "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $". # diff --git a/monitor/bcp.c b/monitor/bcp.c index e2c14a416..7b19e4b84 100644 --- a/monitor/bcp.c +++ b/monitor/bcp.c @@ -1,5 +1,5 @@ /* - * "$Id: bcp.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: bcp.c 5087 2006-02-07 03:43:29Z mike $" * * TBCP port monitor for the Common UNIX Printing System (CUPS). * @@ -282,5 +282,5 @@ pswrite(const char *buf, /* I - Buffer to write */ /* - * End of "$Id: bcp.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: bcp.c 5087 2006-02-07 03:43:29Z mike $". */ diff --git a/monitor/tbcp.c b/monitor/tbcp.c index a6791942a..400e1ce0b 100644 --- a/monitor/tbcp.c +++ b/monitor/tbcp.c @@ -1,5 +1,5 @@ /* - * "$Id: tbcp.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: tbcp.c 5087 2006-02-07 03:43:29Z mike $" * * TBCP port monitor for the Common UNIX Printing System (CUPS). * @@ -279,5 +279,5 @@ pswrite(const char *buf, /* I - Buffer to write */ /* - * End of "$Id: tbcp.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: tbcp.c 5087 2006-02-07 03:43:29Z mike $". */ diff --git a/notifier/Dependencies b/notifier/Dependencies index 4ee88b776..6867d6207 100644 --- a/notifier/Dependencies +++ b/notifier/Dependencies @@ -2,7 +2,7 @@ mailto.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h mailto.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h -mailto.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h +mailto.o: ../cups/i18n.h ../cups/string.h ../config.h testnotify.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h testnotify.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h testnotify.o: ../cups/language.h ../cups/string.h ../config.h diff --git a/notifier/Makefile b/notifier/Makefile index 064bd4df0..ecfd7a51f 100644 --- a/notifier/Makefile +++ b/notifier/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $" # # Notifier makefile for the Common UNIX Printing System (CUPS). # @@ -99,5 +99,5 @@ include Dependencies # -# End of "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $". # diff --git a/notifier/mailto.c b/notifier/mailto.c index 38489caf2..afa1a30d0 100644 --- a/notifier/mailto.c +++ b/notifier/mailto.c @@ -1,5 +1,5 @@ /* - * "$Id: mailto.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: mailto.c 5235 2006-03-06 13:02:23Z mike $" * * "mailto" notifier for the Common UNIX Printing System (CUPS). * @@ -795,5 +795,5 @@ print_attributes(ipp_t *ipp, /* I - IPP request */ /* - * End of "$Id: mailto.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: mailto.c 5235 2006-03-06 13:02:23Z mike $". */ diff --git a/notifier/testnotify.c b/notifier/testnotify.c index cba0a386f..d334a4a9e 100644 --- a/notifier/testnotify.c +++ b/notifier/testnotify.c @@ -1,5 +1,5 @@ /* - * "$Id: testnotify.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: testnotify.c 4829 2005-11-12 03:15:10Z mike $" * * Test notifier for the Common UNIX Printing System (CUPS). * @@ -281,5 +281,5 @@ print_attributes(ipp_t *ipp, /* I - IPP request */ /* - * End of "$Id: testnotify.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: testnotify.c 4829 2005-11-12 03:15:10Z mike $". */ diff --git a/packaging/WELCOME.rtf b/packaging/WELCOME.rtf index a949db828..832780032 100644 --- a/packaging/WELCOME.rtf +++ b/packaging/WELCOME.rtf @@ -10,7 +10,7 @@ \f1\b WARNING\ \f0\b0 \ -This is pre-release software and should not be used in production environments. Because MacOS X packages cannot be uninstalled, you will need to reinstall MacOS X to revert to the original CUPS 1.1.x software.\ +Because MacOS X packages cannot be uninstalled, you will need to reinstall MacOS X to revert to the original CUPS 1.1.x software.\ \ Please report all problems using the Bugs & Features page on the CUPS home page:\ \ diff --git a/packaging/cups.list.in b/packaging/cups.list.in index 91f940414..c6d7e8f1d 100644 --- a/packaging/cups.list.in +++ b/packaging/cups.list.in @@ -1,5 +1,5 @@ # -# "$Id: cups.list.in 181 2006-06-22 20:01:18Z jlovell $" +# "$Id: cups.list.in 5628 2006-06-05 15:25:23Z mike $" # # ESP Package Manager (EPM) file list for the Common UNIX Printing # System (CUPS). @@ -550,5 +550,5 @@ f 0644 root sys $AMANDIR/man$MAN8DIR/cups-lpd.$MAN8EXT man/cups-lpd.$MAN8EXT i 0755 root sys cups init/cups.sh # -# End of "$Id: cups.list.in 181 2006-06-22 20:01:18Z jlovell $". +# End of "$Id: cups.list.in 5628 2006-06-05 15:25:23Z mike $". # diff --git a/packaging/cups.readme b/packaging/cups.readme index c2f964832..958bd7b10 100644 --- a/packaging/cups.readme +++ b/packaging/cups.readme @@ -1,86 +1,21 @@ -README - CUPS v1.2.0b1 - 01/10/2006 ------------------------------------ - -***************************************************************** -***************************************************************** -**** **** -**** WARNING: THIS IS BETA RELEASE SOFTWARE AND MAY BE **** -**** TOTALLY UNSTABLE. DO NOT USE IN ENVIRONMENTS **** -**** WHERE RELIABLE SOFTWARE IS REQUIRED! **** -**** **** -***************************************************************** -***************************************************************** - -Looking for compile instructions? Read the file "INSTALL.txt" -instead... - -***************************************************************** -***************************************************************** -**** **** -**** IF YOU HAVE A NON-POSTSCRIPT PRINTER, YOU WILL ALSO **** -**** NEED TO INSTALL ESP GHOSTSCRIPT OR A PATCHED VERSION **** -**** OF A STANDARD GHOSTSCRIPT RELEASE. **** -**** **** -***************************************************************** -***************************************************************** - - -INTRODUCTION - -CUPS provides a portable printing layer for UNIX(r)-based -operating systems. It has been developed by Easy Software -Products to promote a standard printing solution for all UNIX -vendors and users. CUPS provides the System V and Berkeley -command-line interfaces. - -CUPS uses the Internet Printing Protocol ("IPP") as the basis -for managing print jobs and queues. The Line Printer Daemon -("LPD") Server Message Block ("SMB"), and AppSocket (a.k.a. -JetDirect) protocols are also supported with reduced -functionality. CUPS adds network printer browsing and -PostScript Printer Description ("PPD") based printing options to -support real-world printing under UNIX. - -CUPS includes an image file RIP that supports printing of image -files to non-PostScript printers. A customized version of GNU -Ghostscript for CUPS called ESP Ghostscript is available -separately to support printing of PostScript files within the -CUPS driver framework. Sample drivers for Dymo, EPSON, HP, and -OKIDATA printers are included that use these filters. - -Drivers for thousands of printers are provided with our ESP -Print Pro software, available at: - - http://www.easysw.com/printpro/ - -CUPS is licensed under the GNU General Public License and GNU -Library General Public License. Please contact Easy Software -Products for commercial support and "binary distribution" -rights. - - SYSTEM REQUIREMENTS Binary distributions require a minimum of 10MB of free disk space. We do not recommend using CUPS on a workstation with less than 32MB of RAM or a PC with less than 16MB of RAM. -If you are installing from source you'll need ANSI-compliant C -and C++ compilers and optionally one or more image file support -libraries. Complete source installation instructions can be -found in the file "INSTALL.txt". - SOFTWARE REQUIREMENTS The following operating system software is required to install one of the binary distributions from Easy Software Products: - - AIX 4.3 or higher + - AIX 5.2 or higher - 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) + - Linux 2.4 with glibc 2.3 or higher (LSB 3.1) + - MacOS X 10.4 or higher (PowerPC or Intel) + - Solaris 8 or higher (SPARC or Intel) INSTALLING "PORTABLE" CUPS DISTRIBUTIONS @@ -90,7 +25,7 @@ distributions in TAR format with installation and removal scripts generated by our ESP Package Manager (EPM) software, which is available from: - http://www.easysw.com/epm + http://www.easysw.com/epm/ WARNING: Installing CUPS will overwrite your existing printing system. Backup files are made by the installation script and @@ -112,10 +47,9 @@ be installed and the scheduler will be started automatically. INSTALLING HOST-SPECIFIC (RPM, DEBIAN, ETC.) DISTRIBUTIONS -The host-specific distributions use the operating system -software installation tools. To install a host-specific -distribution please consult the CUPS Software Administrators -Manual or your operating system documentation. +The host-specific distributions use the operating system software +installation tools. To install a host-specific distribution +please consult your operating system documentation. READING THE DOCUMENTATION @@ -164,93 +98,7 @@ shown a menu of available functions. DO NOT use the hostname for your machine - it will not work with the default CUPS configuration. To enable administration access -on other addresses, consult the CUPS Software Administrators -Manual. - - -SETTING UP PRINTER QUEUES FROM THE COMMAND-LINE - -CUPS works best with PPD (PostScript Printer Description) -files. In a pinch you can also use System V style printer -interface scripts. - -Six sample PPD files are provided with this distribution that -utilize the PostScript and image file RIPs and the sample EPSON -and HP printer drivers. To add the sample DeskJet driver to the -system for a printer connected to the parallel port, use one of -the following commands: - - HP-UX: - - /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/c2t0d0_lp -E - - IRIX: - - /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/plp -E - - Linux: - - /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/lp0 -E - /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/lp1 -E - /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/lp2 -E - - Solaris: - - /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/bpp0 -E - /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/ecpp0 -E - -Similarly, for the other sample drivers you can use: - - Driver PPD File - ----------------------------- ------------ - Dymo Label Printers dymo.ppd - EPSON Stylus Color Series stcolor.ppd - EPSON Stylus Photo Series stphoto.ppd - EPSON Stylus New Color Series stcolor2.ppd - EPSON Stylus New Photo Series stphoto2.ppd - EPSON 9-pin Series epson9.ppd - EPSON 24-pin Series epson24.ppd - HP DeskJet Series deskjet.ppd - HP New DeskJet Series deskjet2.ppd - HP LaserJet Series laserjet.ppd - OKIDATA 9-Pin Series okidata9.ppd - OKIDATA 24-Pin Series okidat24.ppd - -These sample drivers provide basic printing capabilities, but -generally do not exercise the full potential of the printers or -CUPS. For commercial printer drivers check out our ESP Print -Pro software at: - - http://www.easysw.com/printpro/ - - -PRINTING FILES - -CUPS provides both the System V "lp" and Berkeley "lpr" commands -for printing: - - lp filename - lpr filename - -Both the "lp" and "lpr" commands support printing options for -the driver: - - lp -omedia=A4 -oresolution=600dpi filename - lpr -omedia=A4 -oresolution=600dpi filename - -CUPS recognizes many types of images files as well as PDF, -PostScript, HP-GL/2, and text files, so you can print those -files directly rather than through an application. - -If you have an application that generates output specifically -for your printer then you need to use the "-oraw" or "-l" -options: - - lp -oraw filename - lpr -l filename - -This will prevent the filters from misinterpreting your print -file. +on other addresses, consult the on-line help. LEGAL STUFF diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in index f20d4ea8f..3f15b4a94 100644 --- a/packaging/cups.spec.in +++ b/packaging/cups.spec.in @@ -1,5 +1,5 @@ # -# "$Id: cups.spec.in 181 2006-06-22 20:01:18Z jlovell $" +# "$Id: cups.spec.in 5584 2006-05-24 11:17:55Z mike $" # # RPM "spec" file for the Common UNIX Printing System (CUPS). # @@ -419,5 +419,5 @@ rm -rf $RPM_BUILD_ROOT # -# End of "$Id: cups.spec.in 181 2006-06-22 20:01:18Z jlovell $". +# End of "$Id: cups.spec.in 5584 2006-05-24 11:17:55Z mike $". # diff --git a/pdftops/Dependencies b/pdftops/Dependencies index a36824a85..350408b56 100644 --- a/pdftops/Dependencies +++ b/pdftops/Dependencies @@ -91,6 +91,51 @@ PSTokenizer.o: ../config.h PSTokenizer.h gtypes.h SecurityHandler.o: ../config.h GString.h PDFDoc.h XRef.h gtypes.h Object.h SecurityHandler.o: gmem.h Array.h Dict.h Stream.h Catalog.h Page.h Decrypt.h SecurityHandler.o: Error.h GlobalParams.h CharTypes.h SecurityHandler.h +SplashBitmap.o: ../config.h gmem.h SplashErrorCodes.h SplashBitmap.h +SplashBitmap.o: SplashTypes.h gtypes.h +SplashClip.o: ../config.h gmem.h SplashErrorCodes.h SplashMath.h +SplashClip.o: SplashTypes.h gtypes.h SplashPath.h SplashXPath.h +SplashClip.o: SplashXPathScanner.h SplashClip.h +Splash.o: ../config.h gmem.h SplashErrorCodes.h SplashMath.h SplashTypes.h +Splash.o: gtypes.h SplashBitmap.h SplashState.h SplashPath.h SplashXPath.h +Splash.o: SplashXPathScanner.h SplashPattern.h SplashScreen.h SplashFont.h +Splash.o: SplashGlyphBitmap.h Splash.h SplashClip.h +SplashFont.o: ../config.h gmem.h SplashMath.h SplashTypes.h gtypes.h +SplashFont.o: SplashGlyphBitmap.h SplashFontFile.h SplashFont.h +SplashFontEngine.o: ../config.h gmem.h GString.h SplashT1FontEngine.h +SplashFontEngine.o: SplashFTFontEngine.h SplashFontFile.h gtypes.h +SplashFontEngine.o: SplashTypes.h SplashFontFileID.h SplashFont.h +SplashFontEngine.o: SplashFontEngine.h +SplashFontFile.o: ../config.h GString.h SplashFontFile.h gtypes.h +SplashFontFile.o: SplashTypes.h SplashFontFileID.h +SplashFontFileID.o: ../config.h SplashFontFileID.h gtypes.h +SplashFTFont.o: ../config.h +SplashFTFontEngine.o: ../config.h +SplashFTFontFile.o: ../config.h +SplashOutputDev.o: ../config.h gfile.h gtypes.h GlobalParams.h CharTypes.h +SplashOutputDev.o: Error.h Object.h gmem.h GString.h Array.h Dict.h Stream.h +SplashOutputDev.o: GfxFont.h Link.h CharCodeToUnicode.h FontEncodingTables.h +SplashOutputDev.o: FoFiTrueType.h FoFiBase.h SplashBitmap.h SplashTypes.h +SplashOutputDev.o: SplashGlyphBitmap.h SplashPattern.h SplashScreen.h +SplashOutputDev.o: SplashPath.h SplashState.h SplashErrorCodes.h +SplashOutputDev.o: SplashFontEngine.h SplashFont.h SplashFontFile.h +SplashOutputDev.o: SplashFontFileID.h Splash.h SplashClip.h SplashOutputDev.h +SplashOutputDev.o: OutputDev.h GfxState.h Function.h +SplashPath.o: ../config.h gmem.h SplashErrorCodes.h SplashPath.h +SplashPath.o: SplashTypes.h gtypes.h +SplashPattern.o: ../config.h SplashMath.h SplashTypes.h gtypes.h +SplashPattern.o: SplashScreen.h SplashPattern.h +SplashScreen.o: ../config.h gmem.h SplashMath.h SplashTypes.h gtypes.h +SplashScreen.o: SplashScreen.h +SplashState.o: ../config.h gmem.h SplashPattern.h SplashTypes.h gtypes.h +SplashState.o: SplashScreen.h SplashClip.h SplashState.h +SplashT1Font.o: ../config.h +SplashT1FontEngine.o: ../config.h +SplashT1FontFile.o: ../config.h +SplashXPath.o: ../config.h gmem.h SplashMath.h SplashTypes.h gtypes.h +SplashXPath.o: SplashPath.h SplashXPath.h +SplashXPathScanner.o: ../config.h gmem.h SplashMath.h SplashTypes.h gtypes.h +SplashXPathScanner.o: SplashXPath.h SplashXPathScanner.h Stream.o: ../config.h gmem.h gfile.h gtypes.h Error.h Object.h GString.h Stream.o: Array.h Dict.h Stream.h Lexer.h Decrypt.h GfxState.h Function.h Stream.o: JBIG2Stream.h JPXStream.h Stream-CCITT.h diff --git a/pdftops/Makefile b/pdftops/Makefile index 495ccf45f..1cc9e861a 100644 --- a/pdftops/Makefile +++ b/pdftops/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: Makefile 5491 2006-05-04 20:53:35Z mike $" # # pdftops filter Makefile for the Common UNIX Printing System (CUPS). # @@ -143,5 +143,5 @@ include Dependencies # -# End of "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: Makefile 5491 2006-05-04 20:53:35Z mike $". # diff --git a/pdftops/pdftops.cxx b/pdftops/pdftops.cxx index b28e68d30..b9459cfa9 100644 --- a/pdftops/pdftops.cxx +++ b/pdftops/pdftops.cxx @@ -1,5 +1,5 @@ // -// "$Id: pdftops.cxx 177 2006-06-21 00:20:03Z jlovell $" +// "$Id: pdftops.cxx 4906 2006-01-10 20:53:28Z mike $" // // PDF to PostScript filter front-end for the Common UNIX Printing // System (CUPS). @@ -341,5 +341,5 @@ main(int argc, // I - Number of command-line args // -// End of "$Id: pdftops.cxx 177 2006-06-21 00:20:03Z jlovell $". +// End of "$Id: pdftops.cxx 4906 2006-01-10 20:53:28Z mike $". // diff --git a/ppd/Makefile b/ppd/Makefile index f57fde4a8..0307dc54b 100644 --- a/ppd/Makefile +++ b/ppd/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $" # # PPD file makefile for the Common UNIX Printing System (CUPS). # @@ -79,5 +79,5 @@ uninstall: # -# End of "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $". # diff --git a/ppd/deskjet.ppd b/ppd/deskjet.ppd index 217ced864..4752f013a 100644 --- a/ppd/deskjet.ppd +++ b/ppd/deskjet.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% -*% "$Id: deskjet.ppd 177 2006-06-21 00:20:03Z jlovell $" +*% "$Id: deskjet.ppd 4880 2005-12-15 16:19:46Z mike $" *% *% Sample HP DeskJet driver PPD file for the Common UNIX Printing *% System (CUPS). @@ -195,5 +195,5 @@ *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM *Font ZapfDingbats: Special "(001.004S)" Standard ROM *% -*% End of "$Id: deskjet.ppd 177 2006-06-21 00:20:03Z jlovell $". +*% End of "$Id: deskjet.ppd 4880 2005-12-15 16:19:46Z mike $". *% diff --git a/ppd/deskjet2.ppd b/ppd/deskjet2.ppd index 9f819ff95..f583b08d6 100644 --- a/ppd/deskjet2.ppd +++ b/ppd/deskjet2.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% -*% "$Id: deskjet2.ppd 177 2006-06-21 00:20:03Z jlovell $" +*% "$Id: deskjet2.ppd 4880 2005-12-15 16:19:46Z mike $" *% *% Second sample HP DeskJet driver PPD file for the Common UNIX Printing *% System (CUPS). @@ -214,5 +214,5 @@ *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM *Font ZapfDingbats: Special "(001.004S)" Standard ROM *% -*% End of "$Id: deskjet2.ppd 177 2006-06-21 00:20:03Z jlovell $". +*% End of "$Id: deskjet2.ppd 4880 2005-12-15 16:19:46Z mike $". *% diff --git a/ppd/dymo.ppd b/ppd/dymo.ppd index f028e5041..69426a938 100644 --- a/ppd/dymo.ppd +++ b/ppd/dymo.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% -*% "$Id: dymo.ppd 177 2006-06-21 00:20:03Z jlovell $" +*% "$Id: dymo.ppd 5130 2006-02-17 20:25:33Z mike $" *% *% Sample DYMO label printer driver PPD file for the Common UNIX Printing *% System (CUPS). @@ -152,5 +152,5 @@ *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM *Font ZapfDingbats: Special "(001.004S)" Standard ROM *% -*% End of "$Id: dymo.ppd 177 2006-06-21 00:20:03Z jlovell $". +*% End of "$Id: dymo.ppd 5130 2006-02-17 20:25:33Z mike $". *% diff --git a/ppd/epson24.ppd b/ppd/epson24.ppd index c535601e7..689c2c368 100644 --- a/ppd/epson24.ppd +++ b/ppd/epson24.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% -*% "$Id: epson24.ppd 177 2006-06-21 00:20:03Z jlovell $" +*% "$Id: epson24.ppd 4880 2005-12-15 16:19:46Z mike $" *% *% Sample EPSON 24-Pin driver PPD file for the Common UNIX Printing *% System (CUPS). @@ -135,5 +135,5 @@ *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM *Font ZapfDingbats: Special "(001.004S)" Standard ROM *% -*% End of "$Id: epson24.ppd 177 2006-06-21 00:20:03Z jlovell $". +*% End of "$Id: epson24.ppd 4880 2005-12-15 16:19:46Z mike $". *% diff --git a/ppd/epson9.ppd b/ppd/epson9.ppd index f12c8884b..97470aa00 100644 --- a/ppd/epson9.ppd +++ b/ppd/epson9.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% -*% "$Id: epson9.ppd 177 2006-06-21 00:20:03Z jlovell $" +*% "$Id: epson9.ppd 4880 2005-12-15 16:19:46Z mike $" *% *% Sample EPSON 9-Pin driver PPD file for the Common UNIX Printing *% System (CUPS). @@ -133,5 +133,5 @@ *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM *Font ZapfDingbats: Special "(001.004S)" Standard ROM *% -*% End of "$Id: epson9.ppd 177 2006-06-21 00:20:03Z jlovell $". +*% End of "$Id: epson9.ppd 4880 2005-12-15 16:19:46Z mike $". *% diff --git a/ppd/intelbar.ppd b/ppd/intelbar.ppd deleted file mode 100644 index f2af1a3d5..000000000 --- a/ppd/intelbar.ppd +++ /dev/null @@ -1,219 +0,0 @@ -*PPD-Adobe: "4.3" -*% -*% "$Id$" -*% -*% Sample IntelliBar label printer driver PPD file for the Common UNIX -*% Printing System (CUPS). -*% -*% Copyright 2001-2006 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 -*% -*FormatVersion: "4.3" -*FileVersion: "1.2" -*LanguageVersion: English -*LanguageEncoding: ISOLatin1 -*PCFileName: "INTELBAR.PPD" -*Manufacturer: "Intellitech" -*Product: "(GNU Ghostscript)" -*Product: "(ESP Ghostscript)" -*cupsVersion: 1.2 -*cupsManualCopies: False -*cupsFilter: "application/vnd.cups-raster 0 rastertolabel" -*cupsModelNumber: 32 -*ModelName: "Intellitech IntelliBar Series Label Printer" -*ShortNickName: "Intellitech IntelliBar Series" -*NickName: "Intellitech IntelliBar Series Label Printer v1.2" -*PSVersion: "(3010.000) 81501" -*LanguageLevel: "3" -*ColorDevice: False -*DefaultColorSpace: Gray -*FileSystem: False -*Throughput: "8" -*LandscapeOrientation: Plus90 -*TTRasterizer: Type42 - -*OpenUI *PageSize/Media Size: PickOne -*OrderDependency: 10 AnySetup *PageSize -*DefaultPageSize: w288h432 -*PageSize w288h432/Label - 4.00x6.00": "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" -*CloseUI: *PageSize - -*OpenUI *PageRegion: PickOne -*OrderDependency: 10 AnySetup *PageRegion -*DefaultPageRegion: w288h432 -*PageRegion w288h432/Label - 4.00x6.00": "<</PageSize[288 432]/ImagingBBox null>>setpagedevice" -*CloseUI: *PageRegion - -*DefaultImageableArea: w288h432 -*ImageableArea w288h432/Label - 4.00x6.00": "0 5.76 288 426.24" - -*DefaultPaperDimension: w288h432 -*PaperDimension w288h432/Label - 4.00x6.00": "288 432" - -*MaxMediaWidth: "630" -*MaxMediaHeight: "7128" -*HWMargins: 0 5.76 0 5.76 -*CustomPageSize True: "pop pop pop <</PageSize[5 -2 roll]/ImagingBBox null>>setpagedevice" -*ParamCustomPageSize Width: 1 points 36 630 -*ParamCustomPageSize Height: 2 points 36 7128 -*ParamCustomPageSize WidthOffset: 3 points 0 0 -*ParamCustomPageSize HeightOffset: 4 points 0 0 -*ParamCustomPageSize Orientation: 5 int 0 0 - -*OpenUI *Resolution/Output Resolution: PickOne -*OrderDependency: 20 AnySetup *Resolution -*DefaultResolution: 300dpi -*Resolution 300dpi/300 DPI: "<</HWResolution[300 300]>>setpagedevice" -*CloseUI: *Resolution - -*OpenGroup: PrinterSettings/Printer Settings -*OpenUI *inPrintDensity/Print Density: PickOne -*OrderDependency: 20 DocumentSetup *inPrintDensity -*DefaultinPrintDensity: Default -*inPrintDensity Default/PrinterDefault: "<<cupsCompression -1>>setpagedevice" -*inPrintDensity -15: "<</cupsCompression 0>>setpagedevice" -*inPrintDensity -14: "<</cupsCompression 3>>setpagedevice" -*inPrintDensity -13: "<</cupsCompression 6>>setpagedevice" -*inPrintDensity -12: "<</cupsCompression 10>>setpagedevice" -*inPrintDensity -11: "<</cupsCompression 13>>setpagedevice" -*inPrintDensity -10: "<</cupsCompression 16>>setpagedevice" -*inPrintDensity -9: "<</cupsCompression 20>>setpagedevice" -*inPrintDensity -8: "<</cupsCompression 23>>setpagedevice" -*inPrintDensity -7: "<</cupsCompression 26>>setpagedevice" -*inPrintDensity -6: "<</cupsCompression 30>>setpagedevice" -*inPrintDensity -5: "<</cupsCompression 33>>setpagedevice" -*inPrintDensity -4: "<</cupsCompression 36>>setpagedevice" -*inPrintDensity -3: "<</cupsCompression 40>>setpagedevice" -*inPrintDensity -2: "<</cupsCompression 43>>setpagedevice" -*inPrintDensity -1: "<</cupsCompression 46>>setpagedevice" -*inPrintDensity 0: "<</cupsCompression 50>>setpagedevice" -*inPrintDensity 1: "<</cupsCompression 53>>setpagedevice" -*inPrintDensity 2: "<</cupsCompression 56>>setpagedevice" -*inPrintDensity 3: "<</cupsCompression 60>>setpagedevice" -*inPrintDensity 4: "<</cupsCompression 63>>setpagedevice" -*inPrintDensity 5: "<</cupsCompression 66>>setpagedevice" -*inPrintDensity 6: "<</cupsCompression 70>>setpagedevice" -*inPrintDensity 7: "<</cupsCompression 73>>setpagedevice" -*inPrintDensity 8: "<</cupsCompression 76>>setpagedevice" -*inPrintDensity 9: "<</cupsCompression 80>>setpagedevice" -*inPrintDensity 10: "<</cupsCompression 83>>setpagedevice" -*inPrintDensity 11: "<</cupsCompression 86>>setpagedevice" -*inPrintDensity 12: "<</cupsCompression 90>>setpagedevice" -*inPrintDensity 13: "<</cupsCompression 93>>setpagedevice" -*inPrintDensity 14: "<</cupsCompression 96>>setpagedevice" -*inPrintDensity 15: "<</cupsCompression 100>>setpagedevice" -*CloseUI: *inPrintDensity - -*OpenUI *inPrintRate/Print Speed: PickOne -*OrderDependency: 20 DocumentSetup *inPrintRate -*DefaultinPrintRate: Default -*inPrintRate Default/PrinterDefault: "<</cupsRowFeed 0>>setpagedevice" -*inPrintRate 15/15 mm/sec.: "<</cupsRowFeed 15>>setpagedevice" -*inPrintRate 20/20 mm/sec.: "<</cupsRowFeed 20>>setpagedevice" -*inPrintRate 30/30 mm/sec.: "<</cupsRowFeed 30>>setpagedevice" -*inPrintRate 40/40 mm/sec.: "<</cupsRowFeed 40>>setpagedevice" -*inPrintRate 60/60 mm/sec.: "<</cupsRowFeed 60>>setpagedevice" -*inPrintRate 80/80 mm/sec.: "<</cupsRowFeed 80>>setpagedevice" -*inPrintRate 100/100 mm/sec.: "<</cupsRowFeed 100>>setpagedevice" -*inPrintRate 120/120 mm/sec.: "<</cupsRowFeed 120>>setpagedevice" -*inPrintRate 150/150 mm/sec.: "<</cupsRowFeed 150>>setpagedevice" -*inPrintRate 200/200 mm/sec.: "<</cupsRowFeed 200>>setpagedevice" -*inPrintRate 250/250 mm/sec.: "<</cupsRowFeed 250>>setpagedevice" -*inPrintRate 300/300 mm/sec.: "<</cupsRowFeed 300>>setpagedevice" -*CloseUI: *inPrintRate - -*OpenUI *inTearInterval/Print and Tear: PickOne -*OrderDependency: 20 DocumentSetup *inTearInterval -*DefaultinTearInterval: Default -*inTearInterval Default/PrinterDefault: "<</cupsRowCount -1>>setpagedevice" -*inTearInterval None/Disabled: "<</cupsRowCount 0>>setpagedevice" -*inTearInterval 1/Every Label: "<</cupsRowCount 1>>setpagedevice" -*inTearInterval 2/Every 2 Labels: "<</cupsRowCount 2>>setpagedevice" -*inTearInterval 3/Every 3 Labels: "<</cupsRowCount 3>>setpagedevice" -*inTearInterval 4/Every 4 Labels: "<</cupsRowCount 4>>setpagedevice" -*inTearInterval 5/Every 5 Labels: "<</cupsRowCount 5>>setpagedevice" -*inTearInterval 6/Every 6 Labels: "<</cupsRowCount 6>>setpagedevice" -*inTearInterval 7/Every 7 Labels: "<</cupsRowCount 7>>setpagedevice" -*inTearInterval 8/Every 8 Labels: "<</cupsRowCount 8>>setpagedevice" -*inTearInterval 9/Every 9 Labels: "<</cupsRowCount 9>>setpagedevice" -*inTearInterval 10/Every 10 Labels: "<</cupsRowCount 10>>setpagedevice" -*CloseUI: *inTearInterval - -*CustominTearInterval True: "<</cupsRowCount 2 1 roll>>setpagedevice" -*ParamCustominTearInterval Interval: 1 int 1 99 - -*OpenUI *inCutInterval/Print and Cut: PickOne -*OrderDependency: 20 DocumentSetup *inCutInterval -*DefaultinCutInterval: Default -*inCutInterval Default/PrinterDefault: "<</cupsRowStep -1>>setpagedevice" -*inCutInterval None/Disabled: "<</cupsRowStep 0>>setpagedevice" -*inCutInterval 1/Every Label: "<</cupsRowStep 1>>setpagedevice" -*inCutInterval 2/Every 2 Labels: "<</cupsRowStep 2>>setpagedevice" -*inCutInterval 3/Every 3 Labels: "<</cupsRowStep 3>>setpagedevice" -*inCutInterval 4/Every 4 Labels: "<</cupsRowStep 4>>setpagedevice" -*inCutInterval 5/Every 5 Labels: "<</cupsRowStep 5>>setpagedevice" -*inCutInterval 6/Every 6 Labels: "<</cupsRowStep 6>>setpagedevice" -*inCutInterval 7/Every 7 Labels: "<</cupsRowStep 7>>setpagedevice" -*inCutInterval 8/Every 8 Labels: "<</cupsRowStep 8>>setpagedevice" -*inCutInterval 9/Every 9 Labels: "<</cupsRowStep 9>>setpagedevice" -*inCutInterval 10/Every 10 Labels: "<</cupsRowStep 10>>setpagedevice" -*CloseUI: *inCutInterval - -*CustominCutInterval True: "<</cupsRowStep 2 1 roll>>setpagedevice" -*ParamCustominCutInterval Interval: 1 int 1 99 -*CloseGroup: *PrinterSettings - -*DefaultFont: Courier -*Font AvantGarde-Book: Standard "(001.006S)" Standard ROM -*Font AvantGarde-BookOblique: Standard "(001.006S)" Standard ROM -*Font AvantGarde-Demi: Standard "(001.007S)" Standard ROM -*Font AvantGarde-DemiOblique: Standard "(001.007S)" Standard ROM -*Font Bookman-Demi: Standard "(001.004S)" Standard ROM -*Font Bookman-DemiItalic: Standard "(001.004S)" Standard ROM -*Font Bookman-Light: Standard "(001.004S)" Standard ROM -*Font Bookman-LightItalic: Standard "(001.004S)" Standard ROM -*Font Courier: Standard "(002.004S)" Standard ROM -*Font Courier-Bold: Standard "(002.004S)" Standard ROM -*Font Courier-BoldOblique: Standard "(002.004S)" Standard ROM -*Font Courier-Oblique: Standard "(002.004S)" Standard ROM -*Font Helvetica: Standard "(001.006S)" Standard ROM -*Font Helvetica-Bold: Standard "(001.007S)" Standard ROM -*Font Helvetica-BoldOblique: Standard "(001.007S)" Standard ROM -*Font Helvetica-Narrow: Standard "(001.006S)" Standard ROM -*Font Helvetica-Narrow-Bold: Standard "(001.007S)" Standard ROM -*Font Helvetica-Narrow-BoldOblique: Standard "(001.007S)" Standard ROM -*Font Helvetica-Narrow-Oblique: Standard "(001.006S)" Standard ROM -*Font Helvetica-Oblique: Standard "(001.006S)" Standard ROM -*Font NewCenturySchlbk-Bold: Standard "(001.009S)" Standard ROM -*Font NewCenturySchlbk-BoldItalic: Standard "(001.007S)" Standard ROM -*Font NewCenturySchlbk-Italic: Standard "(001.006S)" Standard ROM -*Font NewCenturySchlbk-Roman: Standard "(001.007S)" Standard ROM -*Font Palatino-Bold: Standard "(001.005S)" Standard ROM -*Font Palatino-BoldItalic: Standard "(001.005S)" Standard ROM -*Font Palatino-Italic: Standard "(001.005S)" Standard ROM -*Font Palatino-Roman: Standard "(001.005S)" Standard ROM -*Font Symbol: Special "(001.007S)" Special ROM -*Font Times-Bold: Standard "(001.007S)" Standard ROM -*Font Times-BoldItalic: Standard "(001.009S)" Standard ROM -*Font Times-Italic: Standard "(001.007S)" Standard ROM -*Font Times-Roman: Standard "(001.007S)" Standard ROM -*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM -*Font ZapfDingbats: Special "(001.004S)" Standard ROM -*% -*% End of "$Id: zebra.ppd 5130 2006-02-17 20:25:33Z mike $". -*% diff --git a/ppd/laserjet.ppd b/ppd/laserjet.ppd index 8e8626b2d..5c02dcecb 100644 --- a/ppd/laserjet.ppd +++ b/ppd/laserjet.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% -*% "$Id: laserjet.ppd 177 2006-06-21 00:20:03Z jlovell $" +*% "$Id: laserjet.ppd 4905 2006-01-10 20:07:15Z mike $" *% *% Sample HP LaserJet driver PPD file for the Common UNIX Printing *% System (CUPS). @@ -197,5 +197,5 @@ *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM *Font ZapfDingbats: Special "(001.004S)" Standard ROM *% -*% End of "$Id: laserjet.ppd 177 2006-06-21 00:20:03Z jlovell $". +*% End of "$Id: laserjet.ppd 4905 2006-01-10 20:07:15Z mike $". *% diff --git a/ppd/okidat24.ppd b/ppd/okidat24.ppd index 9cdb24c49..b60f0634d 100644 --- a/ppd/okidat24.ppd +++ b/ppd/okidat24.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% -*% "$Id: okidat24.ppd 177 2006-06-21 00:20:03Z jlovell $" +*% "$Id: okidat24.ppd 4880 2005-12-15 16:19:46Z mike $" *% *% Sample OKIDATA 24-Pin driver PPD file for the Common UNIX Printing *% System (CUPS). @@ -125,5 +125,5 @@ *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM *Font ZapfDingbats: Special "(001.004S)" Standard ROM *% -*% End of "$Id: okidat24.ppd 177 2006-06-21 00:20:03Z jlovell $". +*% End of "$Id: okidat24.ppd 4880 2005-12-15 16:19:46Z mike $". *% diff --git a/ppd/okidata9.ppd b/ppd/okidata9.ppd index fe3ea6df2..189c8db6d 100644 --- a/ppd/okidata9.ppd +++ b/ppd/okidata9.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% -*% "$Id: okidata9.ppd 177 2006-06-21 00:20:03Z jlovell $" +*% "$Id: okidata9.ppd 4880 2005-12-15 16:19:46Z mike $" *% *% Sample OKIDATA 9-Pin driver PPD file for the Common UNIX Printing *% System (CUPS). @@ -123,5 +123,5 @@ *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM *Font ZapfDingbats: Special "(001.004S)" Standard ROM *% -*% End of "$Id: okidata9.ppd 177 2006-06-21 00:20:03Z jlovell $". +*% End of "$Id: okidata9.ppd 4880 2005-12-15 16:19:46Z mike $". *% diff --git a/ppd/stcolor.ppd b/ppd/stcolor.ppd index 7966dc322..aba03926b 100644 --- a/ppd/stcolor.ppd +++ b/ppd/stcolor.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% -*% "$Id: stcolor.ppd 177 2006-06-21 00:20:03Z jlovell $" +*% "$Id: stcolor.ppd 4880 2005-12-15 16:19:46Z mike $" *% *% Sample EPSON Stylus Color driver PPD file for the Common UNIX Printing *% System (CUPS). @@ -129,5 +129,5 @@ *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM *Font ZapfDingbats: Special "(001.004S)" Standard ROM *% -*% End of "$Id: stcolor.ppd 177 2006-06-21 00:20:03Z jlovell $". +*% End of "$Id: stcolor.ppd 4880 2005-12-15 16:19:46Z mike $". *% diff --git a/ppd/stcolor2.ppd b/ppd/stcolor2.ppd index 202b46bdf..f66142b47 100644 --- a/ppd/stcolor2.ppd +++ b/ppd/stcolor2.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% -*% "$Id: stcolor2.ppd 177 2006-06-21 00:20:03Z jlovell $" +*% "$Id: stcolor2.ppd 4880 2005-12-15 16:19:46Z mike $" *% *% Sample EPSON Stylus Color driver PPD file for the Common UNIX Printing *% System (CUPS). @@ -129,5 +129,5 @@ *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM *Font ZapfDingbats: Special "(001.004S)" Standard ROM *% -*% End of "$Id: stcolor2.ppd 177 2006-06-21 00:20:03Z jlovell $". +*% End of "$Id: stcolor2.ppd 4880 2005-12-15 16:19:46Z mike $". *% diff --git a/ppd/stphoto.ppd b/ppd/stphoto.ppd index c28ae5b70..ce01eba5f 100644 --- a/ppd/stphoto.ppd +++ b/ppd/stphoto.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% -*% "$Id: stphoto.ppd 177 2006-06-21 00:20:03Z jlovell $" +*% "$Id: stphoto.ppd 4880 2005-12-15 16:19:46Z mike $" *% *% Sample EPSON Stylus Photo driver PPD file for the Common UNIX Printing *% System (CUPS). @@ -129,5 +129,5 @@ *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM *Font ZapfDingbats: Special "(001.004S)" Standard ROM *% -*% End of "$Id: stphoto.ppd 177 2006-06-21 00:20:03Z jlovell $". +*% End of "$Id: stphoto.ppd 4880 2005-12-15 16:19:46Z mike $". *% diff --git a/ppd/stphoto2.ppd b/ppd/stphoto2.ppd index c9e535b9f..f093582da 100644 --- a/ppd/stphoto2.ppd +++ b/ppd/stphoto2.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% -*% "$Id: stphoto2.ppd 177 2006-06-21 00:20:03Z jlovell $" +*% "$Id: stphoto2.ppd 4880 2005-12-15 16:19:46Z mike $" *% *% Sample EPSON Stylus Photo driver PPD file for the Common UNIX Printing *% System (CUPS). @@ -129,5 +129,5 @@ *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM *Font ZapfDingbats: Special "(001.004S)" Standard ROM *% -*% End of "$Id: stphoto2.ppd 177 2006-06-21 00:20:03Z jlovell $". +*% End of "$Id: stphoto2.ppd 4880 2005-12-15 16:19:46Z mike $". *% diff --git a/ppd/zebra.ppd b/ppd/zebra.ppd index d8ea5ba90..536896cb4 100644 --- a/ppd/zebra.ppd +++ b/ppd/zebra.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% -*% "$Id: zebra.ppd 177 2006-06-21 00:20:03Z jlovell $" +*% "$Id: zebra.ppd 5511 2006-05-11 17:43:12Z mike $" *% *% Sample Zebra label printer driver PPD file for the Common UNIX Printing *% System (CUPS). @@ -479,5 +479,5 @@ *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM *Font ZapfDingbats: Special "(001.004S)" Standard ROM *% -*% End of "$Id: zebra.ppd 177 2006-06-21 00:20:03Z jlovell $". +*% End of "$Id: zebra.ppd 5511 2006-05-11 17:43:12Z mike $". *% diff --git a/ppd/zebracpl.ppd b/ppd/zebracpl.ppd index a4776c636..db46f8d03 100644 --- a/ppd/zebracpl.ppd +++ b/ppd/zebracpl.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% -*% "$Id: zebracpl.ppd 177 2006-06-21 00:20:03Z jlovell $" +*% "$Id: zebra.ppd 4905 2006-01-10 20:07:15Z mike $" *% *% Sample Zebra label printer driver PPD file for the Common UNIX Printing *% System (CUPS). @@ -268,5 +268,5 @@ *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM *Font ZapfDingbats: Special "(001.004S)" Standard ROM *% -*% End of "$Id: zebracpl.ppd 177 2006-06-21 00:20:03Z jlovell $". +*% End of "$Id: zebra.ppd 4905 2006-01-10 20:07:15Z mike $". *% diff --git a/ppd/zebraep1.ppd b/ppd/zebraep1.ppd index 75f31ad3b..1e157654b 100644 --- a/ppd/zebraep1.ppd +++ b/ppd/zebraep1.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% -*% "$Id: zebraep1.ppd 177 2006-06-21 00:20:03Z jlovell $" +*% "$Id: zebra.ppd 4880 2005-12-15 16:19:46Z mike $" *% *% Sample Zebra label printer driver PPD file for the Common UNIX Printing *% System (CUPS). @@ -326,5 +326,5 @@ *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM *Font ZapfDingbats: Special "(001.004S)" Standard ROM *% -*% End of "$Id: zebraep1.ppd 177 2006-06-21 00:20:03Z jlovell $". +*% End of "$Id: zebra.ppd 4880 2005-12-15 16:19:46Z mike $". *% diff --git a/ppd/zebraep2.ppd b/ppd/zebraep2.ppd index 01f8eb0f5..6bd774713 100644 --- a/ppd/zebraep2.ppd +++ b/ppd/zebraep2.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% -*% "$Id: zebraep2.ppd 177 2006-06-21 00:20:03Z jlovell $" +*% "$Id: zebra.ppd 4880 2005-12-15 16:19:46Z mike $" *% *% Sample Zebra label printer driver PPD file for the Common UNIX Printing *% System (CUPS). @@ -338,5 +338,5 @@ *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM *Font ZapfDingbats: Special "(001.004S)" Standard ROM *% -*% End of "$Id: zebraep2.ppd 177 2006-06-21 00:20:03Z jlovell $". +*% End of "$Id: zebra.ppd 4880 2005-12-15 16:19:46Z mike $". *% diff --git a/scheduler/Dependencies b/scheduler/Dependencies index f6e2042a2..7ca0a4300 100644 --- a/scheduler/Dependencies +++ b/scheduler/Dependencies @@ -4,177 +4,169 @@ auth.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h auth.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h auth.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h auth.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h ../cups/file.h -auth.o: ../cups/http.h ../cups/i18n.h ../cups/transcode.h ../cups/debug.h -auth.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h -auth.o: classes.h job.h conf.h banners.h dirsvc.h network.h subscriptions.h +auth.o: ../cups/http.h ../cups/i18n.h ../cups/debug.h sysman.h statbuf.h +auth.o: cert.h auth.h client.h policy.h printers.h classes.h job.h conf.h +auth.o: banners.h dirsvc.h network.h subscriptions.h banners.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h banners.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h banners.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h banners.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h -banners.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/transcode.h -banners.o: ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h policy.h -banners.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h +banners.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/debug.h +banners.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h +banners.o: classes.h job.h conf.h banners.h dirsvc.h network.h banners.o: subscriptions.h ../cups/dir.h cert.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h cert.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h cert.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h cert.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h ../cups/file.h -cert.o: ../cups/http.h ../cups/i18n.h ../cups/transcode.h ../cups/debug.h -cert.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h -cert.o: classes.h job.h conf.h banners.h dirsvc.h network.h subscriptions.h +cert.o: ../cups/http.h ../cups/i18n.h ../cups/debug.h sysman.h statbuf.h +cert.o: cert.h auth.h client.h policy.h printers.h classes.h job.h conf.h +cert.o: banners.h dirsvc.h network.h subscriptions.h classes.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h classes.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h classes.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h classes.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h -classes.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/transcode.h -classes.o: ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h policy.h -classes.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h +classes.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/debug.h +classes.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h +classes.o: classes.h job.h conf.h banners.h dirsvc.h network.h classes.o: subscriptions.h client.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h client.o: ../cups/ipp-private.h ../cups/ipp.h cupsd.h ../cups/string.h client.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h client.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h -client.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/transcode.h -client.o: ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h policy.h -client.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h -client.o: subscriptions.h +client.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/debug.h +client.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h +client.o: classes.h job.h conf.h banners.h dirsvc.h network.h subscriptions.h conf.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h conf.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h conf.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h conf.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h ../cups/file.h -conf.o: ../cups/http.h ../cups/i18n.h ../cups/transcode.h ../cups/debug.h -conf.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h -conf.o: classes.h job.h conf.h banners.h dirsvc.h network.h subscriptions.h -conf.o: ../cups/dir.h +conf.o: ../cups/http.h ../cups/i18n.h ../cups/debug.h sysman.h statbuf.h +conf.o: cert.h auth.h client.h policy.h printers.h classes.h job.h conf.h +conf.o: banners.h dirsvc.h network.h subscriptions.h ../cups/dir.h dirsvc.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h dirsvc.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h dirsvc.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h dirsvc.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h -dirsvc.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/transcode.h -dirsvc.o: ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h policy.h -dirsvc.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h -dirsvc.o: subscriptions.h +dirsvc.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/debug.h +dirsvc.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h +dirsvc.o: classes.h job.h conf.h banners.h dirsvc.h network.h subscriptions.h env.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h env.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h env.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h env.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h ../cups/file.h -env.o: ../cups/http.h ../cups/i18n.h ../cups/transcode.h ../cups/debug.h -env.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h -env.o: classes.h job.h conf.h banners.h dirsvc.h network.h subscriptions.h +env.o: ../cups/http.h ../cups/i18n.h ../cups/debug.h sysman.h statbuf.h +env.o: cert.h auth.h client.h policy.h printers.h classes.h job.h conf.h +env.o: banners.h dirsvc.h network.h subscriptions.h main.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h main.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h main.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h main.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h ../cups/file.h -main.o: ../cups/http.h ../cups/i18n.h ../cups/transcode.h ../cups/debug.h -main.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h -main.o: classes.h job.h conf.h banners.h dirsvc.h network.h subscriptions.h +main.o: ../cups/http.h ../cups/i18n.h ../cups/debug.h sysman.h statbuf.h +main.o: cert.h auth.h client.h policy.h printers.h classes.h job.h conf.h +main.o: banners.h dirsvc.h network.h subscriptions.h ipp.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h ipp.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h ipp.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h ipp.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h ../cups/file.h -ipp.o: ../cups/http.h ../cups/i18n.h ../cups/transcode.h ../cups/debug.h -ipp.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h -ipp.o: classes.h job.h conf.h banners.h dirsvc.h network.h subscriptions.h +ipp.o: ../cups/http.h ../cups/i18n.h ../cups/debug.h sysman.h statbuf.h +ipp.o: cert.h auth.h client.h policy.h printers.h classes.h job.h conf.h +ipp.o: banners.h dirsvc.h network.h subscriptions.h listen.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h listen.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h listen.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h listen.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h -listen.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/transcode.h -listen.o: ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h policy.h -listen.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h -listen.o: subscriptions.h +listen.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/debug.h +listen.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h +listen.o: classes.h job.h conf.h banners.h dirsvc.h network.h subscriptions.h job.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h job.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h job.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h job.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h ../cups/file.h -job.o: ../cups/http.h ../cups/i18n.h ../cups/transcode.h ../cups/debug.h -job.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h -job.o: classes.h job.h conf.h banners.h dirsvc.h network.h subscriptions.h -job.o: ../cups/backend.h ../cups/dir.h +job.o: ../cups/http.h ../cups/i18n.h ../cups/debug.h sysman.h statbuf.h +job.o: cert.h auth.h client.h policy.h printers.h classes.h job.h conf.h +job.o: banners.h dirsvc.h network.h subscriptions.h ../cups/backend.h +job.o: ../cups/dir.h log.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h log.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h log.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h log.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h ../cups/file.h -log.o: ../cups/http.h ../cups/i18n.h ../cups/transcode.h ../cups/debug.h -log.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h -log.o: classes.h job.h conf.h banners.h dirsvc.h network.h subscriptions.h -network.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h -network.o: ../cups/ipp-private.h ../cups/ipp.h cupsd.h ../cups/string.h +log.o: ../cups/http.h ../cups/i18n.h ../cups/debug.h sysman.h statbuf.h +log.o: cert.h auth.h client.h policy.h printers.h classes.h job.h conf.h +log.o: banners.h dirsvc.h network.h subscriptions.h +network.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h +network.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h network.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h network.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h -network.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/transcode.h -network.o: ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h policy.h -network.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h +network.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/debug.h +network.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h +network.o: classes.h job.h conf.h banners.h dirsvc.h network.h network.o: subscriptions.h policy.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h policy.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h policy.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h policy.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h -policy.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/transcode.h -policy.o: ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h policy.h -policy.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h -policy.o: subscriptions.h +policy.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/debug.h +policy.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h +policy.o: classes.h job.h conf.h banners.h dirsvc.h network.h subscriptions.h printers.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h printers.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h printers.o: ../cups/string.h ../cups/array.h ../cups/cups.h ../cups/ppd.h printers.o: ../cups/array.h ../cups/file.h ../cups/language.h mime.h printers.o: ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h -printers.o: ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h -printers.o: auth.h client.h policy.h printers.h classes.h job.h conf.h -printers.o: banners.h dirsvc.h network.h subscriptions.h +printers.o: ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h +printers.o: policy.h printers.h classes.h job.h conf.h banners.h dirsvc.h +printers.o: network.h subscriptions.h ../cups/transcode.h process.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h process.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h process.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h process.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h -process.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/transcode.h -process.o: ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h policy.h -process.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h +process.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/debug.h +process.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h +process.o: classes.h job.h conf.h banners.h dirsvc.h network.h process.o: subscriptions.h quotas.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h quotas.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h quotas.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h quotas.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h -quotas.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/transcode.h -quotas.o: ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h policy.h -quotas.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h -quotas.o: subscriptions.h +quotas.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/debug.h +quotas.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h +quotas.o: classes.h job.h conf.h banners.h dirsvc.h network.h subscriptions.h server.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h server.o: ../cups/ipp-private.h ../cups/ipp.h cupsd.h ../cups/string.h server.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h server.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h -server.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/transcode.h -server.o: ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h policy.h -server.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h -server.o: subscriptions.h +server.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/debug.h +server.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h +server.o: classes.h job.h conf.h banners.h dirsvc.h network.h subscriptions.h statbuf.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h statbuf.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h statbuf.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h statbuf.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h -statbuf.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/transcode.h -statbuf.o: ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h policy.h -statbuf.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h +statbuf.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/debug.h +statbuf.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h +statbuf.o: classes.h job.h conf.h banners.h dirsvc.h network.h statbuf.o: subscriptions.h subscriptions.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h subscriptions.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h subscriptions.o: ../cups/string.h ../cups/array.h ../cups/cups.h subscriptions.o: ../cups/ppd.h ../cups/array.h ../cups/file.h subscriptions.o: ../cups/language.h mime.h ../cups/ipp.h ../cups/file.h -subscriptions.o: ../cups/http.h ../cups/i18n.h ../cups/transcode.h -subscriptions.o: ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h -subscriptions.o: policy.h printers.h classes.h job.h conf.h banners.h -subscriptions.o: dirsvc.h network.h subscriptions.h +subscriptions.o: ../cups/http.h ../cups/i18n.h ../cups/debug.h sysman.h +subscriptions.o: statbuf.h cert.h auth.h client.h policy.h printers.h +subscriptions.o: classes.h job.h conf.h banners.h dirsvc.h network.h +subscriptions.o: subscriptions.h sysman.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h sysman.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h sysman.o: ../cups/array.h ../cups/cups.h ../cups/ppd.h ../cups/array.h sysman.o: ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h -sysman.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/transcode.h -sysman.o: ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h policy.h -sysman.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h -sysman.o: subscriptions.h +sysman.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/debug.h +sysman.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h +sysman.o: classes.h job.h conf.h banners.h dirsvc.h network.h subscriptions.h filter.o: ../cups/debug.h ../cups/string.h ../config.h mime.h ../cups/array.h filter.o: ../cups/ipp.h ../cups/file.h -mime.o: ../cups/debug.h ../cups/dir.h ../cups/string.h ../config.h mime.h -mime.o: ../cups/array.h ../cups/ipp.h ../cups/file.h +mime.o: ../cups/dir.h ../cups/string.h ../config.h mime.h ../cups/array.h +mime.o: ../cups/ipp.h ../cups/file.h type.o: ../cups/string.h ../config.h mime.h ../cups/array.h ../cups/ipp.h type.o: ../cups/file.h ../cups/debug.h cups-deviced.o: util.h ../cups/cups.h ../cups/ipp.h ../cups/http.h @@ -184,7 +176,7 @@ cups-deviced.o: ../config.h ../cups/array.h ../cups/dir.h cups-driverd.o: util.h ../cups/cups.h ../cups/ipp.h ../cups/http.h cups-driverd.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h cups-driverd.o: ../cups/language.h ../cups/file.h ../cups/string.h -cups-driverd.o: ../config.h ../cups/dir.h ../cups/transcode.h +cups-driverd.o: ../config.h ../cups/dir.h cups-lpd.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h cups-lpd.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h ../cups/ppd.h cups-lpd.o: ../cups/array.h ../cups/file.h ../cups/language.h diff --git a/scheduler/Makefile b/scheduler/Makefile index f008fc456..403997bb9 100644 --- a/scheduler/Makefile +++ b/scheduler/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $" # # Scheduler Makefile for the Common UNIX Printing System (CUPS). # @@ -274,5 +274,5 @@ include Dependencies # -# End of "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $". # diff --git a/scheduler/auth.c b/scheduler/auth.c index da3c8347b..efae9914c 100644 --- a/scheduler/auth.c +++ b/scheduler/auth.c @@ -1,5 +1,5 @@ /* - * "$Id: auth.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: auth.c 5643 2006-06-07 20:58:29Z mike $" * * Authorization routines for the Common UNIX Printing System (CUPS). * @@ -2171,5 +2171,5 @@ to64(char *s, /* O - Output string */ /* - * End of "$Id: auth.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: auth.c 5643 2006-06-07 20:58:29Z mike $". */ diff --git a/scheduler/auth.h b/scheduler/auth.h index ee563a01a..87bd72cd9 100644 --- a/scheduler/auth.h +++ b/scheduler/auth.h @@ -1,5 +1,5 @@ /* - * "$Id: auth.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: auth.h 5305 2006-03-18 03:05:12Z mike $" * * Authorization definitions for the Common UNIX Printing System (CUPS) * scheduler. @@ -158,5 +158,5 @@ extern http_status_t cupsdIsAuthorized(cupsd_client_t *con, const char *owner); /* - * End of "$Id: auth.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: auth.h 5305 2006-03-18 03:05:12Z mike $". */ diff --git a/scheduler/banners.c b/scheduler/banners.c index 74e812cfb..d83540c87 100644 --- a/scheduler/banners.c +++ b/scheduler/banners.c @@ -1,5 +1,5 @@ /* - * "$Id: banners.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: banners.c 5305 2006-03-18 03:05:12Z mike $" * * Banner routines for the Common UNIX Printing System (CUPS). * @@ -215,5 +215,5 @@ free_banners(void) /* - * End of "$Id: banners.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: banners.c 5305 2006-03-18 03:05:12Z mike $". */ diff --git a/scheduler/banners.h b/scheduler/banners.h index 856891ec9..bff0e333f 100644 --- a/scheduler/banners.h +++ b/scheduler/banners.h @@ -1,5 +1,5 @@ /* - * "$Id: banners.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: banners.h 5305 2006-03-18 03:05:12Z mike $" * * Banner definitions for the Common UNIX Printing System (CUPS). * @@ -50,5 +50,5 @@ extern void cupsdLoadBanners(const char *d); /* - * End of "$Id: banners.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: banners.h 5305 2006-03-18 03:05:12Z mike $". */ diff --git a/scheduler/cert.c b/scheduler/cert.c index 54a697a05..8a0d7a161 100644 --- a/scheduler/cert.c +++ b/scheduler/cert.c @@ -1,5 +1,5 @@ /* - * "$Id: cert.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: cert.c 5381 2006-04-07 14:39:46Z mike $" * * Authentication certificate routines for the Common UNIX * Printing System (CUPS). @@ -426,5 +426,5 @@ cupsdInitCerts(void) /* - * End of "$Id: cert.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: cert.c 5381 2006-04-07 14:39:46Z mike $". */ diff --git a/scheduler/cert.h b/scheduler/cert.h index 4974f0dae..2da5a3b8b 100644 --- a/scheduler/cert.h +++ b/scheduler/cert.h @@ -1,5 +1,5 @@ /* - * "$Id: cert.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: cert.h 4719 2005-09-28 21:12:44Z mike $" * * Authentication certificate definitions for the Common UNIX * Printing System (CUPS). @@ -56,5 +56,5 @@ extern void cupsdInitCerts(void); /* - * End of "$Id: cert.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: cert.h 4719 2005-09-28 21:12:44Z mike $". */ diff --git a/scheduler/classes.c b/scheduler/classes.c index 1efab6e0f..749a1bda0 100644 --- a/scheduler/classes.c +++ b/scheduler/classes.c @@ -1,5 +1,5 @@ /* - * "$Id: classes.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: classes.c 5151 2006-02-22 22:43:17Z mike $" * * Printer class routines for the Common UNIX Printing System (CUPS). * @@ -864,5 +864,5 @@ cupsdUpdateImplicitClasses(void) /* - * End of "$Id: classes.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: classes.c 5151 2006-02-22 22:43:17Z mike $". */ diff --git a/scheduler/classes.h b/scheduler/classes.h index e34a68792..5b9968167 100644 --- a/scheduler/classes.h +++ b/scheduler/classes.h @@ -1,5 +1,5 @@ /* - * "$Id: classes.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: classes.h 4719 2005-09-28 21:12:44Z mike $" * * Printer class definitions for the Common UNIX Printing System (CUPS). * @@ -42,5 +42,5 @@ extern void cupsdUpdateImplicitClasses(void); /* - * End of "$Id: classes.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: classes.h 4719 2005-09-28 21:12:44Z mike $". */ diff --git a/scheduler/client.c b/scheduler/client.c index 3c506289c..23a74e50e 100644 --- a/scheduler/client.c +++ b/scheduler/client.c @@ -1,5 +1,5 @@ /* - * "$Id: client.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: client.c 5630 2006-06-05 18:42:53Z mike $" * * Client routines for the Common UNIX Printing System (CUPS) scheduler. * @@ -3833,5 +3833,5 @@ write_file(cupsd_client_t *con, /* I - Client connection */ /* - * End of "$Id: client.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: client.c 5630 2006-06-05 18:42:53Z mike $". */ diff --git a/scheduler/client.h b/scheduler/client.h index c150cd129..7a7b70cd7 100644 --- a/scheduler/client.h +++ b/scheduler/client.h @@ -1,5 +1,5 @@ /* - * "$Id: client.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: client.h 5305 2006-03-18 03:05:12Z mike $" * * Client definitions for the Common UNIX Printing System (CUPS) scheduler. * @@ -121,5 +121,5 @@ extern int cupsdWriteClient(cupsd_client_t *con); /* - * End of "$Id: client.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: client.h 5305 2006-03-18 03:05:12Z mike $". */ diff --git a/scheduler/conf.c b/scheduler/conf.c index db0369cd9..29a5b7d13 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -1,5 +1,5 @@ /* - * "$Id: conf.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: conf.c 5663 2006-06-15 20:36:42Z mike $" * * Configuration routines for the Common UNIX Printing System (CUPS). * @@ -3249,5 +3249,5 @@ read_policy(cups_file_t *fp, /* I - Configuration file */ /* - * End of "$Id: conf.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: conf.c 5663 2006-06-15 20:36:42Z mike $". */ diff --git a/scheduler/conf.h b/scheduler/conf.h index d53ac6cb3..7b6eea95c 100644 --- a/scheduler/conf.h +++ b/scheduler/conf.h @@ -1,5 +1,5 @@ /* - * "$Id: conf.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: conf.h 5216 2006-03-02 17:47:53Z mike $" * * Configuration file definitions for the Common UNIX Printing System (CUPS) * scheduler. @@ -210,5 +210,5 @@ extern int cupsdLogPage(cupsd_job_t *job, const char *page); /* - * End of "$Id: conf.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: conf.h 5216 2006-03-02 17:47:53Z mike $". */ diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c index 12dc45ad0..00ad8b860 100644 --- a/scheduler/cups-deviced.c +++ b/scheduler/cups-deviced.c @@ -1,5 +1,5 @@ /* - * "$Id: cups-deviced.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: cups-deviced.c 5244 2006-03-08 12:12:12Z mike $" * * Device scanning mini-daemon for the Common UNIX Printing System (CUPS). * @@ -500,5 +500,5 @@ sigalrm_handler(int sig) /* I - Signal number */ /* - * End of "$Id: cups-deviced.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: cups-deviced.c 5244 2006-03-08 12:12:12Z mike $". */ diff --git a/scheduler/cups-driverd.c b/scheduler/cups-driverd.c index 8cebb09e8..1e0b1e45b 100644 --- a/scheduler/cups-driverd.c +++ b/scheduler/cups-driverd.c @@ -1,5 +1,5 @@ /* - * "$Id: cups-driverd.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: cups-driverd.c 5422 2006-04-18 15:16:00Z mike $" * * PPD/driver support for the Common UNIX Printing System (CUPS). * @@ -1113,5 +1113,5 @@ load_drivers(void) /* - * End of "$Id: cups-driverd.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: cups-driverd.c 5422 2006-04-18 15:16:00Z mike $". */ diff --git a/scheduler/cups-lpd.c b/scheduler/cups-lpd.c index 880467d1b..60b68090f 100644 --- a/scheduler/cups-lpd.c +++ b/scheduler/cups-lpd.c @@ -1,5 +1,5 @@ /* - * "$Id: cups-lpd.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: cups-lpd.c 5455 2006-04-24 13:49:59Z mike $" * * Line Printer Daemon interface for the Common UNIX Printing System (CUPS). * @@ -1716,5 +1716,5 @@ smart_gets(char *s, /* I - Pointer to line buffer */ /* - * End of "$Id: cups-lpd.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: cups-lpd.c 5455 2006-04-24 13:49:59Z mike $". */ diff --git a/scheduler/cups-polld.c b/scheduler/cups-polld.c index 310c2aa4e..0a8b4c12a 100644 --- a/scheduler/cups-polld.c +++ b/scheduler/cups-polld.c @@ -1,5 +1,5 @@ /* - * "$Id: cups-polld.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: cups-polld.c 5305 2006-03-18 03:05:12Z mike $" * * Polling daemon for the Common UNIX Printing System (CUPS). * @@ -402,5 +402,5 @@ poll_server(http_t *http, /* I - HTTP connection */ /* - * End of "$Id: cups-polld.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: cups-polld.c 5305 2006-03-18 03:05:12Z mike $". */ diff --git a/scheduler/cupsd.h b/scheduler/cupsd.h index 94d610355..dbdca8bef 100644 --- a/scheduler/cupsd.h +++ b/scheduler/cupsd.h @@ -1,5 +1,5 @@ /* - * "$Id: cupsd.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: cupsd.h 5305 2006-03-18 03:05:12Z mike $" * * Main header file for the Common UNIX Printing System (CUPS) scheduler. * @@ -204,5 +204,5 @@ extern int cupsdStartProcess(const char *command, char *argv[], /* - * End of "$Id: cupsd.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: cupsd.h 5305 2006-03-18 03:05:12Z mike $". */ diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c index a707a2958..e26d20db7 100644 --- a/scheduler/dirsvc.c +++ b/scheduler/dirsvc.c @@ -1,5 +1,5 @@ /* - * "$Id: dirsvc.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: dirsvc.c 5663 2006-06-15 20:36:42Z mike $" * * Directory services routines for the Common UNIX Printing System (CUPS). * @@ -3149,5 +3149,5 @@ slp_url_callback( /* - * End of "$Id: dirsvc.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: dirsvc.c 5663 2006-06-15 20:36:42Z mike $". */ diff --git a/scheduler/dirsvc.h b/scheduler/dirsvc.h index edb60e0aa..171933f93 100644 --- a/scheduler/dirsvc.h +++ b/scheduler/dirsvc.h @@ -1,5 +1,5 @@ /* - * "$Id: dirsvc.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: dirsvc.h 5305 2006-03-18 03:05:12Z mike $" * * Directory services definitions for the Common UNIX Printing System * (CUPS) scheduler. @@ -180,5 +180,5 @@ extern void cupsdUpdateSLPBrowse(void); /* - * End of "$Id: dirsvc.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: dirsvc.h 5305 2006-03-18 03:05:12Z mike $". */ diff --git a/scheduler/env.c b/scheduler/env.c index cf75fdfb8..e6f84084c 100644 --- a/scheduler/env.c +++ b/scheduler/env.c @@ -1,5 +1,5 @@ /* - * "$Id: env.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: env.c 5373 2006-04-06 20:03:32Z mike $" * * Environment management routines for the Common UNIX Printing System (CUPS). * @@ -245,5 +245,5 @@ clear_env(void) /* - * End of "$Id: env.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: env.c 5373 2006-04-06 20:03:32Z mike $". */ diff --git a/scheduler/filter.c b/scheduler/filter.c index 38826e81f..25d3b651e 100644 --- a/scheduler/filter.c +++ b/scheduler/filter.c @@ -1,5 +1,5 @@ /* - * "$Id: filter.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: filter.c 5606 2006-05-30 19:40:34Z mike $" * * File type conversion routines for the Common UNIX Printing System (CUPS). * @@ -411,5 +411,5 @@ lookup(mime_t *mime, /* I - MIME database */ /* - * End of "$Id: filter.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: filter.c 5606 2006-05-30 19:40:34Z mike $". */ diff --git a/scheduler/ipp.c b/scheduler/ipp.c index 543eb84ec..7ed169a44 100644 --- a/scheduler/ipp.c +++ b/scheduler/ipp.c @@ -1,5 +1,5 @@ /* - * "$Id: ipp.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: ipp.c 5686 2006-06-21 21:02:56Z mike $" * * IPP routines for the Common UNIX Printing System (CUPS) scheduler. * @@ -126,7 +126,8 @@ static void accept_jobs(cupsd_client_t *con, ipp_attribute_t *uri); static void add_class(cupsd_client_t *con, ipp_attribute_t *uri); static int add_file(cupsd_client_t *con, cupsd_job_t *job, mime_type_t *filetype, int compression); -static cupsd_job_t *add_job(cupsd_client_t *con, cupsd_printer_t *printer, +static cupsd_job_t *add_job(cupsd_client_t *con, ipp_attribute_t *uri, + cupsd_printer_t **dprinter, mime_type_t *filetype); static void add_job_state_reasons(cupsd_client_t *con, cupsd_job_t *job); static void add_job_subscriptions(cupsd_client_t *con, cupsd_job_t *job); @@ -699,6 +700,12 @@ accept_jobs(cupsd_client_t *con, /* I - Client connection */ { http_status_t status; /* Policy status */ cups_ptype_t dtype; /* Destination type (printer or class) */ + char method[HTTP_MAX_URI], /* Method portion of URI */ + username[HTTP_MAX_URI], /* Username portion of URI */ + host[HTTP_MAX_URI], /* Host portion of URI */ + resource[HTTP_MAX_URI]; /* Resource portion of URI */ + int port; /* Port portion of URI */ + const char *name; /* Printer name */ cupsd_printer_t *printer; /* Printer data */ @@ -709,7 +716,11 @@ accept_jobs(cupsd_client_t *con, /* I - Client connection */ * Is the destination valid? */ - if (!cupsdValidateDest(uri->values[0].string.text, &dtype, &printer)) + httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method, + sizeof(method), username, sizeof(username), host, + sizeof(host), &port, resource, sizeof(resource)); + + if ((name = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL) { /* * Bad URI... @@ -740,19 +751,12 @@ accept_jobs(cupsd_client_t *con, /* I - Client connection */ cupsdAddPrinterHistory(printer); if (dtype & CUPS_PRINTER_CLASS) - { cupsdSaveAllClasses(); - - cupsdLogMessage(CUPSD_LOG_INFO, "Class \"%s\" now accepting jobs (\"%s\").", - printer->name, get_username(con)); - } else - { cupsdSaveAllPrinters(); - cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" now accepting jobs (\"%s\").", - printer->name, get_username(con)); - } + cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" now accepting jobs (\"%s\").", name, + get_username(con)); /* * Everything was ok, so return OK status... @@ -780,6 +784,7 @@ add_class(cupsd_client_t *con, /* I - Client connection */ cupsd_printer_t *pclass, /* Class */ *member; /* Member printer/class */ cups_ptype_t dtype; /* Destination type */ + const char *dest; /* Printer or class name */ ipp_attribute_t *attr; /* Printer attribute */ int modify; /* Non-zero if we just modified */ char newname[IPP_MAX_NAME]; /* New class name */ @@ -998,7 +1003,11 @@ add_class(cupsd_client_t *con, /* I - Client connection */ * Search for the printer or class URI... */ - if (!cupsdValidateDest(attr->values[i].string.text, &dtype, &member)) + httpSeparateURI(HTTP_URI_CODING_ALL, attr->values[i].string.text, method, + sizeof(method), username, sizeof(username), host, + sizeof(host), &port, resource, sizeof(resource)); + + if ((dest = cupsdValidateDest(host, resource, &dtype, &member)) == NULL) { /* * Bad URI... @@ -1135,24 +1144,54 @@ add_file(cupsd_client_t *con, /* I - Connection to client */ static cupsd_job_t * /* O - Job object */ add_job(cupsd_client_t *con, /* I - Client connection */ - cupsd_printer_t *printer, /* I - Destination printer */ + ipp_attribute_t *uri, /* I - printer-uri */ + cupsd_printer_t **dprinter, /* I - Destination printer */ mime_type_t *filetype) /* I - First print file type, if any */ { http_status_t status; /* Policy status */ ipp_attribute_t *attr; /* Current attribute */ + const char *dest; /* Destination */ + cups_ptype_t dtype; /* Destination type (printer or class) */ const char *val; /* Default option value */ int priority; /* Job priority */ char *title; /* Job name/title */ cupsd_job_t *job; /* Current job */ - char job_uri[HTTP_MAX_URI]; /* Job URI */ + char job_uri[HTTP_MAX_URI], /* Job URI */ + method[HTTP_MAX_URI], /* Method portion of URI */ + username[HTTP_MAX_URI], /* Username portion of URI */ + host[HTTP_MAX_URI], /* Host portion of URI */ + resource[HTTP_MAX_URI]; /* Resource portion of URI */ + int port; /* Port portion of URI */ + cupsd_printer_t *printer; /* Printer data */ int kbytes; /* Size of print file */ int i; /* Looping var */ int lowerpagerange; /* Page range bound */ - cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))", - con, con->http.fd, printer, printer->name, - filetype, filetype->super, filetype->type); + cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %s)", con, + con->http.fd, uri->values[0].string.text); + + /* + * Is the destination valid? + */ + + httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method, + sizeof(method), username, sizeof(username), host, + sizeof(host), &port, resource, sizeof(resource)); + + if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL) + { + /* + * Bad URI... + */ + + send_ipp_status(con, IPP_NOT_FOUND, + _("The printer or class was not found.")); + return (NULL); + } + + if (dprinter) + *dprinter = printer; /* * Check remote printing to non-shared printer... @@ -1190,7 +1229,7 @@ add_job(cupsd_client_t *con, /* I - Client connection */ { send_ipp_status(con, IPP_NOT_ACCEPTING, _("Destination \"%s\" is not accepting jobs."), - printer->name); + dest); return (NULL); } @@ -1257,7 +1296,7 @@ add_job(cupsd_client_t *con, /* I - Client connection */ if (MaxJobs && cupsArrayCount(Jobs) >= MaxJobs) cupsdCleanJobs(); - if (MaxJobs && cupsArrayCount(Jobs) >= MaxJobs) + if (cupsArrayCount(Jobs) >= MaxJobs && MaxJobs) { send_ipp_status(con, IPP_NOT_POSSIBLE, _("Too many active jobs.")); @@ -1299,13 +1338,11 @@ add_job(cupsd_client_t *con, /* I - Client connection */ if ((job = cupsdAddJob(priority, printer->name)) == NULL) { send_ipp_status(con, IPP_INTERNAL_ERROR, - _("Unable to add job for destination \"%s\"!"), - printer->name); + _("Unable to add job for destination \"%s\"!"), dest); return (NULL); } - job->dtype = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT | - CUPS_PRINTER_REMOTE); + job->dtype = dtype; job->attrs = con->request; con->request = NULL; @@ -2730,10 +2767,11 @@ cancel_all_jobs(cupsd_client_t *con, /* I - Client connection */ ipp_attribute_t *uri) /* I - Job or Printer URI */ { http_status_t status; /* Policy status */ + const char *dest; /* Destination */ cups_ptype_t dtype; /* Destination type */ - char scheme[HTTP_MAX_URI], /* Scheme portion of URI */ + char method[HTTP_MAX_URI], /* Method portion of URI */ userpass[HTTP_MAX_URI], /* Username portion of URI */ - hostname[HTTP_MAX_URI], /* Host portion of URI */ + host[HTTP_MAX_URI], /* Host portion of URI */ resource[HTTP_MAX_URI]; /* Resource portion of URI */ int port; /* Port portion of URI */ ipp_attribute_t *attr; /* Attribute in request */ @@ -2792,17 +2830,16 @@ cancel_all_jobs(cupsd_client_t *con, /* I - Client connection */ * And if the destination is valid... */ - if (!cupsdValidateDest(uri->values[0].string.text, &dtype, &printer)) + httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method, + sizeof(method), userpass, sizeof(userpass), host, + sizeof(host), &port, resource, sizeof(resource)); + + if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL) { /* * Bad URI? */ - httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, - scheme, sizeof(scheme), userpass, sizeof(userpass), - hostname, sizeof(hostname), &port, - resource, sizeof(resource)); - if ((!strncmp(resource, "/printers/", 10) && resource[10]) || (!strncmp(resource, "/classes/", 9) && resource[9])) { @@ -2810,6 +2847,13 @@ cancel_all_jobs(cupsd_client_t *con, /* I - Client connection */ _("The printer or class was not found.")); return; } + else if (strcmp(resource, "/printers/")) + { + send_ipp_status(con, IPP_NOT_FOUND, + _("The printer-uri \"%s\" is not valid."), + uri->values[0].string.text); + return; + } /* * Check policy... @@ -2836,8 +2880,7 @@ cancel_all_jobs(cupsd_client_t *con, /* I - Client connection */ * Check policy... */ - if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, - NULL)) != HTTP_OK) + if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, NULL)) != HTTP_OK) { send_http_error(con, status); return; @@ -2847,11 +2890,10 @@ cancel_all_jobs(cupsd_client_t *con, /* I - Client connection */ * Cancel all of the jobs on the named printer... */ - cupsdCancelJobs(printer->name, username, purge); + cupsdCancelJobs(dest, username, purge); cupsdLogMessage(CUPSD_LOG_INFO, "All jobs on \"%s\" were %s by \"%s\".", - printer->name, purge ? "purged" : "cancelled", - get_username(con)); + dest, purge ? "purged" : "cancelled", get_username(con)); } con->response->request.status.status_code = IPP_OK; @@ -2868,12 +2910,13 @@ cancel_job(cupsd_client_t *con, /* I - Client connection */ { ipp_attribute_t *attr; /* Current attribute */ int jobid; /* Job ID */ - char scheme[HTTP_MAX_URI], /* Scheme portion of URI */ + char method[HTTP_MAX_URI], /* Method portion of URI */ username[HTTP_MAX_URI], /* Username portion of URI */ host[HTTP_MAX_URI], /* Host portion of URI */ resource[HTTP_MAX_URI]; /* Resource portion of URI */ int port; /* Port portion of URI */ cupsd_job_t *job; /* Job information */ + const char *dest; /* Destination */ cups_ptype_t dtype; /* Destination type (printer or class) */ cupsd_printer_t *printer; /* Printer data */ @@ -2905,7 +2948,11 @@ cancel_job(cupsd_client_t *con, /* I - Client connection */ * Find the current job on the specified printer... */ - if (!cupsdValidateDest(uri->values[0].string.text, &dtype, &printer)) + httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method, + sizeof(method), username, sizeof(username), host, + sizeof(host), &port, resource, sizeof(resource)); + + if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL) { /* * Bad URI... @@ -2932,7 +2979,7 @@ cancel_job(cupsd_client_t *con, /* I - Client connection */ job; job = (cupsd_job_t *)cupsArrayNext(ActiveJobs)) if (job->state_value <= IPP_JOB_PROCESSING && - !strcasecmp(job->dest, printer->name)) + !strcasecmp(job->dest, dest)) break; if (job) @@ -2940,7 +2987,7 @@ cancel_job(cupsd_client_t *con, /* I - Client connection */ else { send_ipp_status(con, IPP_NOT_POSSIBLE, _("No active jobs on %s!"), - printer->name); + dest); return; } } @@ -2952,8 +2999,8 @@ cancel_job(cupsd_client_t *con, /* I - Client connection */ * Got a job URI; parse it to get the job ID... */ - httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, scheme, - sizeof(scheme), username, sizeof(username), host, + httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method, + sizeof(method), username, sizeof(username), host, sizeof(host), &port, resource, sizeof(resource)); if (strncmp(resource, "/jobs/", 6)) @@ -4412,33 +4459,17 @@ static void create_job(cupsd_client_t *con, /* I - Client connection */ ipp_attribute_t *uri) /* I - Printer URI */ { - cupsd_printer_t *printer; /* Printer */ - cupsd_job_t *job; /* New job */ + cupsd_job_t *job; /* New job */ cupsdLogMessage(CUPSD_LOG_DEBUG2, "create_job(%p[%d], %s)", con, con->http.fd, uri->values[0].string.text); /* - * Is the destination valid? - */ - - if (!cupsdValidateDest(uri->values[0].string.text, NULL, &printer)) - { - /* - * Bad URI... - */ - - send_ipp_status(con, IPP_NOT_FOUND, - _("The printer or class was not found.")); - return; - } - - /* * Create the job object... */ - if ((job = add_job(con, printer, NULL)) == NULL) + if ((job = add_job(con, uri, NULL, NULL)) == NULL) return; /* @@ -4709,8 +4740,7 @@ create_subscription( dtype = CUPS_PRINTER_CLASS; printer = NULL; } - else if ((dest = cupsdValidateDest(uri->values[0].string.text, &dtype, - &printer)) == NULL) + else if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL) { /* * Bad URI... @@ -4727,8 +4757,7 @@ create_subscription( if (printer) { - if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, - NULL)) != HTTP_OK) + if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, NULL)) != HTTP_OK) { send_http_error(con, status); return; @@ -4976,7 +5005,13 @@ delete_printer(cupsd_client_t *con, /* I - Client connection */ ipp_attribute_t *uri) /* I - URI of printer or class */ { http_status_t status; /* Policy status */ + const char *dest; /* Destination */ cups_ptype_t dtype; /* Destination type (printer or class) */ + char method[HTTP_MAX_URI], /* Method portion of URI */ + username[HTTP_MAX_URI], /* Username portion of URI */ + host[HTTP_MAX_URI], /* Host portion of URI */ + resource[HTTP_MAX_URI]; /* Resource portion of URI */ + int port; /* Port portion of URI */ cupsd_printer_t *printer; /* Printer/class */ char filename[1024]; /* Script/PPD filename */ @@ -4988,7 +5023,11 @@ delete_printer(cupsd_client_t *con, /* I - Client connection */ * Do we have a valid URI? */ - if (!cupsdValidateDest(uri->values[0].string.text, &dtype, &printer)) + httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method, + sizeof(method), username, sizeof(username), host, + sizeof(host), &port, resource, sizeof(resource)); + + if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL) { /* * Bad URI... @@ -5013,7 +5052,7 @@ delete_printer(cupsd_client_t *con, /* I - Client connection */ * Remove old jobs... */ - cupsdCancelJobs(printer->name, NULL, 1); + cupsdCancelJobs(dest, NULL, 1); /* * Remove old subscriptions and send a "deleted printer" event... @@ -5022,7 +5061,7 @@ delete_printer(cupsd_client_t *con, /* I - Client connection */ cupsdAddEvent(CUPSD_EVENT_PRINTER_DELETED, printer, NULL, "%s \"%s\" deleted by \"%s\".", (dtype & CUPS_PRINTER_CLASS) ? "Class" : "Printer", - printer->name, get_username(con)); + dest, get_username(con)); cupsdExpireSubscriptions(printer, NULL); @@ -5030,26 +5069,24 @@ delete_printer(cupsd_client_t *con, /* I - Client connection */ * Remove any old PPD or script files... */ - snprintf(filename, sizeof(filename), "%s/interfaces/%s", ServerRoot, - printer->name); + snprintf(filename, sizeof(filename), "%s/interfaces/%s", ServerRoot, dest); unlink(filename); - snprintf(filename, sizeof(filename), "%s/ppd/%s.ppd", ServerRoot, - printer->name); + snprintf(filename, sizeof(filename), "%s/ppd/%s.ppd", ServerRoot, dest); unlink(filename); if (dtype & CUPS_PRINTER_CLASS) { - cupsdLogMessage(CUPSD_LOG_INFO, "Class \"%s\" deleted by \"%s\".", - printer->name, get_username(con)); + cupsdLogMessage(CUPSD_LOG_INFO, "Class \"%s\" deleted by \"%s\".", dest, + get_username(con)); cupsdDeletePrinter(printer, 0); cupsdSaveAllClasses(); } else { - cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" deleted by \"%s\".", - printer->name, get_username(con)); + cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" deleted by \"%s\".", dest, + get_username(con)); cupsdDeletePrinter(printer, 0); cupsdSaveAllPrinters(); @@ -5292,7 +5329,7 @@ get_jobs(cupsd_client_t *con, /* I - Client connection */ const char *dest; /* Destination */ cups_ptype_t dtype; /* Destination type (printer or class) */ cups_ptype_t dmask; /* Destination type mask */ - char scheme[HTTP_MAX_URI], /* Scheme portion of URI */ + char method[HTTP_MAX_URI], /* Method portion of URI */ username[HTTP_MAX_URI], /* Username portion of URI */ host[HTTP_MAX_URI], /* Host portion of URI */ resource[HTTP_MAX_URI]; /* Resource portion of URI */ @@ -5314,8 +5351,8 @@ get_jobs(cupsd_client_t *con, /* I - Client connection */ * Is the destination valid? */ - httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, scheme, - sizeof(scheme), username, sizeof(username), host, + httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method, + sizeof(method), username, sizeof(username), host, sizeof(host), &port, resource, sizeof(resource)); if (!strcmp(resource, "/") || @@ -5340,8 +5377,7 @@ get_jobs(cupsd_client_t *con, /* I - Client connection */ dmask = CUPS_PRINTER_CLASS; printer = NULL; } - else if ((dest = cupsdValidateDest(uri->values[0].string.text, &dtype, - &printer)) == NULL) + else if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL) { /* * Bad URI... @@ -5360,8 +5396,7 @@ get_jobs(cupsd_client_t *con, /* I - Client connection */ if (printer) { - if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, - NULL)) != HTTP_OK) + if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, NULL)) != HTTP_OK) { send_http_error(con, status); return; @@ -5697,7 +5732,17 @@ get_printer_attrs(cupsd_client_t *con, /* I - Client connection */ ipp_attribute_t *uri) /* I - Printer URI */ { http_status_t status; /* Policy status */ + const char *dest; /* Destination */ cups_ptype_t dtype; /* Destination type (printer or class) */ + char method[HTTP_MAX_URI], + /* Method portion of URI */ + username[HTTP_MAX_URI], + /* Username portion of URI */ + host[HTTP_MAX_URI], + /* Host portion of URI */ + resource[HTTP_MAX_URI]; + /* Resource portion of URI */ + int port; /* Port portion of URI */ cupsd_printer_t *printer; /* Printer/class */ cups_array_t *ra; /* Requested attributes array */ @@ -5709,7 +5754,11 @@ get_printer_attrs(cupsd_client_t *con, /* I - Client connection */ * Is the destination valid? */ - if (!cupsdValidateDest(uri->values[0].string.text, &dtype, &printer)) + httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method, + sizeof(method), username, sizeof(username), host, + sizeof(host), &port, resource, sizeof(resource)); + + if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL) { /* * Bad URI... @@ -5972,8 +6021,8 @@ get_subscriptions(cupsd_client_t *con, /* I - Client connection */ cups_array_t *ra; /* Requested attributes array */ ipp_attribute_t *attr; /* Attribute */ cups_ptype_t dtype; /* Destination type (printer or class) */ - char scheme[HTTP_MAX_URI], - /* Scheme portion of URI */ + char method[HTTP_MAX_URI], + /* Method portion of URI */ username[HTTP_MAX_URI], /* Username portion of URI */ host[HTTP_MAX_URI], @@ -5993,8 +6042,8 @@ get_subscriptions(cupsd_client_t *con, /* I - Client connection */ * Is the destination valid? */ - httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, scheme, - sizeof(scheme), username, sizeof(username), host, + httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method, + sizeof(method), username, sizeof(username), host, sizeof(host), &port, resource, sizeof(resource)); if (!strcmp(resource, "/") || @@ -6017,7 +6066,7 @@ get_subscriptions(cupsd_client_t *con, /* I - Client connection */ return; } } - else if (!cupsdValidateDest(uri->values[0].string.text, &dtype, &printer)) + else if (!cupsdValidateDest(host, resource, &dtype, &printer)) { /* * Bad URI... @@ -6276,7 +6325,7 @@ move_job(cupsd_client_t *con, /* I - Client connection */ *dest; /* Destination */ cups_ptype_t stype, /* Source type (printer or class) */ dtype; /* Destination type (printer or class) */ - char scheme[HTTP_MAX_URI], /* Scheme portion of URI */ + char method[HTTP_MAX_URI], /* Method portion of URI */ username[HTTP_MAX_URI], /* Username portion of URI */ host[HTTP_MAX_URI], /* Host portion of URI */ resource[HTTP_MAX_URI]; /* Resource portion of URI */ @@ -6304,8 +6353,11 @@ move_job(cupsd_client_t *con, /* I - Client connection */ return; } - if ((dest = cupsdValidateDest(attr->values[0].string.text, &dtype, - &dprinter)) == NULL) + httpSeparateURI(HTTP_URI_CODING_ALL, attr->values[0].string.text, method, + sizeof(method), username, sizeof(username), host, + sizeof(host), &port, resource, sizeof(resource)); + + if ((dest = cupsdValidateDest(host, resource, &dtype, &dprinter)) == NULL) { /* * Bad URI... @@ -6320,8 +6372,7 @@ move_job(cupsd_client_t *con, /* I - Client connection */ * Check policy... */ - if ((status = cupsdCheckPolicy(dprinter->op_policy_ptr, con, - NULL)) != HTTP_OK) + if ((status = cupsdCheckPolicy(dprinter->op_policy_ptr, con, NULL)) != HTTP_OK) { send_http_error(con, status); return; @@ -6331,8 +6382,8 @@ move_job(cupsd_client_t *con, /* I - Client connection */ * See if we have a job URI or a printer URI... */ - httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, scheme, - sizeof(scheme), username, sizeof(username), host, + httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method, + sizeof(method), username, sizeof(username), host, sizeof(host), &port, resource, sizeof(resource)); if (!strcmp(uri->name, "printer-uri")) @@ -6348,8 +6399,7 @@ move_job(cupsd_client_t *con, /* I - Client connection */ * Move all jobs... */ - if ((src = cupsdValidateDest(uri->values[0].string.text, &stype, - &sprinter)) == NULL) + if ((src = cupsdValidateDest(host, resource, &stype, &sprinter)) == NULL) { /* * Bad URI... @@ -6647,7 +6697,6 @@ print_job(cupsd_client_t *con, /* I - Client connection */ { ipp_attribute_t *attr; /* Current attribute */ ipp_attribute_t *format; /* Document-format attribute */ - const char *default_format; /* document-format-default value */ cupsd_job_t *job; /* New job */ char filename[1024]; /* Job filename */ mime_type_t *filetype; /* Type of file */ @@ -6705,21 +6754,6 @@ print_job(cupsd_client_t *con, /* I - Client connection */ } /* - * Is the destination valid? - */ - - if (!cupsdValidateDest(uri->values[0].string.text, NULL, &printer)) - { - /* - * Bad URI... - */ - - send_ipp_status(con, IPP_NOT_FOUND, - _("The printer or class was not found.")); - return; - } - - /* * Is it a format we support? */ @@ -6730,8 +6764,7 @@ print_job(cupsd_client_t *con, /* I - Client connection */ * Grab format from client... */ - if (sscanf(format->values[0].string.text, "%15[^/]/%31[^;]", super, - type) != 2) + if (sscanf(format->values[0].string.text, "%15[^/]/%31[^;]", super, type) != 2) { send_ipp_status(con, IPP_BAD_REQUEST, _("Could not scan type \"%s\"!"), @@ -6739,26 +6772,10 @@ print_job(cupsd_client_t *con, /* I - Client connection */ return; } } - else if ((default_format = cupsGetOption("document-format", - printer->num_options, - printer->options)) != NULL) - { - /* - * Use default document format... - */ - - if (sscanf(default_format, "%15[^/]/%31[^;]", super, type) != 2) - { - send_ipp_status(con, IPP_BAD_REQUEST, - _("Could not scan type \"%s\"!"), - default_format); - return; - } - } else { /* - * Auto-type it! + * No document format attribute? Auto-type it! */ strcpy(super, "application"); @@ -6781,35 +6798,32 @@ print_job(cupsd_client_t *con, /* I - Client connection */ doc_name ? doc_name->values[0].string.text : NULL, &compression); - if (!filetype) - filetype = mimeType(MimeDatabase, super, type); - } - else - filetype = mimeType(MimeDatabase, super, type); - - if (filetype && - (!format || - (!strcmp(super, "application") && !strcmp(type, "octet-stream")))) - { - /* - * Replace the document-format attribute value with the auto-typed or - * default one. - */ + if (filetype) + { + /* + * Replace the document-format attribute value with the auto-typed one. + */ - snprintf(mimetype, sizeof(mimetype), "%s/%s", filetype->super, - filetype->type); + snprintf(mimetype, sizeof(mimetype), "%s/%s", filetype->super, + filetype->type); - if (format) - { - _cupsStrFree(format->values[0].string.text); + if (format) + { + _cupsStrFree(format->values[0].string.text); - format->values[0].string.text = _cupsStrAlloc(mimetype); + format->values[0].string.text = _cupsStrAlloc(mimetype); + } + else + ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_MIMETYPE, + "document-format", NULL, mimetype); } else - ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_MIMETYPE, - "document-format", NULL, mimetype); + filetype = mimeType(MimeDatabase, super, type); } - else if (!filetype) + else + filetype = mimeType(MimeDatabase, super, type); + + if (!filetype) { send_ipp_status(con, IPP_DOCUMENT_FORMAT, _("Unsupported format \'%s/%s\'!"), super, type); @@ -6838,7 +6852,7 @@ print_job(cupsd_client_t *con, /* I - Client connection */ * Create the job object... */ - if ((job = add_job(con, printer, filetype)) == NULL) + if ((job = add_job(con, uri, &printer, filetype)) == NULL) return; /* @@ -7103,6 +7117,12 @@ reject_jobs(cupsd_client_t *con, /* I - Client connection */ { http_status_t status; /* Policy status */ cups_ptype_t dtype; /* Destination type (printer or class) */ + char method[HTTP_MAX_URI], /* Method portion of URI */ + username[HTTP_MAX_URI], /* Username portion of URI */ + host[HTTP_MAX_URI], /* Host portion of URI */ + resource[HTTP_MAX_URI]; /* Resource portion of URI */ + int port; /* Port portion of URI */ + const char *name; /* Printer name */ cupsd_printer_t *printer; /* Printer data */ ipp_attribute_t *attr; /* printer-state-message text */ @@ -7114,7 +7134,11 @@ reject_jobs(cupsd_client_t *con, /* I - Client connection */ * Is the destination valid? */ - if (!cupsdValidateDest(uri->values[0].string.text, &dtype, &printer)) + httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method, + sizeof(method), username, sizeof(username), host, + sizeof(host), &port, resource, sizeof(resource)); + + if ((name = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL) { /* * Bad URI... @@ -7155,14 +7179,14 @@ reject_jobs(cupsd_client_t *con, /* I - Client connection */ cupsdSaveAllClasses(); cupsdLogMessage(CUPSD_LOG_INFO, "Class \"%s\" rejecting jobs (\"%s\").", - printer->name, get_username(con)); + name, get_username(con)); } else { cupsdSaveAllPrinters(); cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" rejecting jobs (\"%s\").", - printer->name, get_username(con)); + name, get_username(con)); } /* @@ -7618,7 +7642,6 @@ send_document(cupsd_client_t *con, /* I - Client connection */ { ipp_attribute_t *attr; /* Current attribute */ ipp_attribute_t *format; /* Document-format attribute */ - const char *default_format;/* document-format-default value */ int jobid; /* Job ID number */ cupsd_job_t *job; /* Current job */ char job_uri[HTTP_MAX_URI], @@ -7777,22 +7800,6 @@ send_document(cupsd_client_t *con, /* I - Client connection */ return; } } - else if ((default_format = cupsGetOption("document-format", - printer->num_options, - printer->options)) != NULL) - { - /* - * Use default document format... - */ - - if (sscanf(default_format, "%15[^/]/%31[^;]", super, type) != 2) - { - send_ipp_status(con, IPP_BAD_REQUEST, - _("Could not scan type \"%s\"!"), - default_format); - return; - } - } else { /* @@ -7819,35 +7826,31 @@ send_document(cupsd_client_t *con, /* I - Client connection */ doc_name ? doc_name->values[0].string.text : NULL, &compression); - if (!filetype) - filetype = mimeType(MimeDatabase, super, type); - } - else - filetype = mimeType(MimeDatabase, super, type); - - if (filetype && - (!format || - (!strcmp(super, "application") && !strcmp(type, "octet-stream")))) - { - /* - * Replace the document-format attribute value with the auto-typed or - * default one. - */ - - snprintf(mimetype, sizeof(mimetype), "%s/%s", filetype->super, - filetype->type); - - if (format) + if (filetype) { - _cupsStrFree(format->values[0].string.text); + /* + * Replace the document-format attribute value with the auto-typed one. + */ - format->values[0].string.text = _cupsStrAlloc(mimetype); + snprintf(mimetype, sizeof(mimetype), "%s/%s", filetype->super, + filetype->type); + + if (format) + { + _cupsStrFree(format->values[0].string.text); + format->values[0].string.text = _cupsStrAlloc(mimetype); + } + else + ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_MIMETYPE, + "document-format", NULL, mimetype); } else - ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_MIMETYPE, - "document-format", NULL, mimetype); + filetype = mimeType(MimeDatabase, super, type); } - else if (!filetype) + else + filetype = mimeType(MimeDatabase, super, type); + + if (!filetype) { send_ipp_status(con, IPP_DOCUMENT_FORMAT, _("Unsupported format \'%s/%s\'!"), super, type); @@ -8087,6 +8090,16 @@ set_default(cupsd_client_t *con, /* I - Client connection */ { http_status_t status; /* Policy status */ cups_ptype_t dtype; /* Destination type (printer or class) */ + char method[HTTP_MAX_URI], + /* Method portion of URI */ + username[HTTP_MAX_URI], + /* Username portion of URI */ + host[HTTP_MAX_URI], + /* Host portion of URI */ + resource[HTTP_MAX_URI]; + /* Resource portion of URI */ + int port; /* Port portion of URI */ + const char *name; /* Printer name */ cupsd_printer_t *printer; /* Printer */ @@ -8097,7 +8110,11 @@ set_default(cupsd_client_t *con, /* I - Client connection */ * Is the destination valid? */ - if (!cupsdValidateDest(uri->values[0].string.text, &dtype, &printer)) + httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method, + sizeof(method), username, sizeof(username), host, + sizeof(host), &port, resource, sizeof(resource)); + + if ((name = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL) { /* * Bad URI... @@ -8130,8 +8147,8 @@ set_default(cupsd_client_t *con, /* I - Client connection */ cupsdWritePrintcap(); cupsdLogMessage(CUPSD_LOG_INFO, - "Default destination set to \"%s\" by \"%s\".", - printer->name, get_username(con)); + "Default destination set to \"%s\" by \"%s\".", name, + get_username(con)); /* * Everything was ok, so return OK status... @@ -8633,7 +8650,8 @@ set_printer_defaults( attr->values[0].string.text); cupsdSetString(&printer->error_policy, attr->values[0].string.text); } - else if (!strcmp(attr->name, "notify-lease-duration-default") || + else if (!strcmp(attr->name, "document-format-default") || + !strcmp(attr->name, "notify-lease-duration-default") || !strcmp(attr->name, "notify-events-default")) continue; @@ -8736,6 +8754,16 @@ start_printer(cupsd_client_t *con, /* I - Client connection */ { http_status_t status; /* Policy status */ cups_ptype_t dtype; /* Destination type (printer or class) */ + char method[HTTP_MAX_URI], + /* Method portion of URI */ + username[HTTP_MAX_URI], + /* Username portion of URI */ + host[HTTP_MAX_URI], + /* Host portion of URI */ + resource[HTTP_MAX_URI]; + /* Resource portion of URI */ + int port; /* Port portion of URI */ + const char *name; /* Printer name */ cupsd_printer_t *printer; /* Printer data */ @@ -8746,7 +8774,11 @@ start_printer(cupsd_client_t *con, /* I - Client connection */ * Is the destination valid? */ - if (!cupsdValidateDest(uri->values[0].string.text, &dtype, &printer)) + httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method, + sizeof(method), username, sizeof(username), host, + sizeof(host), &port, resource, sizeof(resource)); + + if ((name = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL) { /* * Bad URI... @@ -8777,19 +8809,17 @@ start_printer(cupsd_client_t *con, /* I - Client connection */ if (dtype & CUPS_PRINTER_CLASS) { - cupsdLogMessage(CUPSD_LOG_INFO, "Class \"%s\" started by \"%s\".", - printer->name, get_username(con)); + cupsdLogMessage(CUPSD_LOG_INFO, "Class \"%s\" started by \"%s\".", name, + get_username(con)); cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED, printer, NULL, - "Class \"%s\" started by \"%s\".", printer->name, - get_username(con)); + "Class \"%s\" started by \"%s\".", name, get_username(con)); } else { - cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" started by \"%s\".", - printer->name, get_username(con)); + cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" started by \"%s\".", name, + get_username(con)); cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED, printer, NULL, - "Printer \"%s\" started by \"%s\".", printer->name, - get_username(con)); + "Printer \"%s\" started by \"%s\".", name, get_username(con)); } cupsdCheckJobs(); @@ -8812,6 +8842,16 @@ stop_printer(cupsd_client_t *con, /* I - Client connection */ { http_status_t status; /* Policy status */ cups_ptype_t dtype; /* Destination type (printer or class) */ + char method[HTTP_MAX_URI], + /* Method portion of URI */ + username[HTTP_MAX_URI], + /* Username portion of URI */ + host[HTTP_MAX_URI], + /* Host portion of URI */ + resource[HTTP_MAX_URI]; + /* Resource portion of URI */ + int port; /* Port portion of URI */ + const char *name; /* Printer name */ cupsd_printer_t *printer; /* Printer data */ ipp_attribute_t *attr; /* printer-state-message attribute */ @@ -8823,7 +8863,11 @@ stop_printer(cupsd_client_t *con, /* I - Client connection */ * Is the destination valid? */ - if (!cupsdValidateDest(uri->values[0].string.text, &dtype, &printer)) + httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method, + sizeof(method), username, sizeof(username), host, + sizeof(host), &port, resource, sizeof(resource)); + + if ((name = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL) { /* * Bad URI... @@ -8861,19 +8905,17 @@ stop_printer(cupsd_client_t *con, /* I - Client connection */ if (dtype & CUPS_PRINTER_CLASS) { - cupsdLogMessage(CUPSD_LOG_INFO, "Class \"%s\" stopped by \"%s\".", - printer->name, get_username(con)); + cupsdLogMessage(CUPSD_LOG_INFO, "Class \"%s\" stopped by \"%s\".", name, + get_username(con)); cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED, printer, NULL, - "Class \"%s\" stopped by \"%s\".", printer->name, - get_username(con)); + "Class \"%s\" stopped by \"%s\".", name, get_username(con)); } else { - cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" stopped by \"%s\".", - printer->name, get_username(con)); + cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" stopped by \"%s\".", name, + get_username(con)); cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED, printer, NULL, - "Printer \"%s\" stopped by \"%s\".", printer->name, - get_username(con)); + "Printer \"%s\" stopped by \"%s\".", name, get_username(con)); } /* @@ -9000,6 +9042,15 @@ validate_job(cupsd_client_t *con, /* I - Client connection */ ipp_attribute_t *attr; /* Current attribute */ ipp_attribute_t *format; /* Document-format attribute */ cups_ptype_t dtype; /* Destination type (printer or class) */ + char method[HTTP_MAX_URI], + /* Method portion of URI */ + username[HTTP_MAX_URI], + /* Username portion of URI */ + host[HTTP_MAX_URI], + /* Host portion of URI */ + resource[HTTP_MAX_URI]; + /* Resource portion of URI */ + int port; /* Port portion of URI */ char super[MIME_MAX_SUPER], /* Supertype of file */ type[MIME_MAX_TYPE]; @@ -9059,7 +9110,11 @@ validate_job(cupsd_client_t *con, /* I - Client connection */ * Is the destination valid? */ - if (!cupsdValidateDest(uri->values[0].string.text, &dtype, &printer)) + httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method, + sizeof(method), username, sizeof(username), host, + sizeof(host), &port, resource, sizeof(resource)); + + if (cupsdValidateDest(host, resource, &dtype, &printer) == NULL) { /* * Bad URI... @@ -9159,5 +9214,5 @@ validate_user(cupsd_job_t *job, /* I - Job */ /* - * End of "$Id: ipp.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: ipp.c 5686 2006-06-21 21:02:56Z mike $". */ diff --git a/scheduler/job.c b/scheduler/job.c index c113ec468..6c21ed07b 100644 --- a/scheduler/job.c +++ b/scheduler/job.c @@ -1,5 +1,5 @@ /* - * "$Id: job.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: job.c 5686 2006-06-21 21:02:56Z mike $" * * Job management routines for the Common UNIX Printing System (CUPS). * @@ -876,6 +876,13 @@ cupsdLoadJob(cupsd_job_t *job) /* I - Job */ cups_file_t *fp; /* Job file */ int fileid; /* Current file ID */ ipp_attribute_t *attr; /* Job attribute */ + char scheme[32], /* Scheme portion of URI */ + username[64], /* Username portion of URI */ + host[HTTP_MAX_HOST], + /* Host portion of URI */ + resource[HTTP_MAX_URI]; + /* Resource portion of URI */ + int port; /* Port portion of URI */ const char *dest; /* Destination */ mime_type_t **filetypes; /* New filetypes array */ int *compressions; /* New compressions array */ @@ -959,7 +966,11 @@ cupsdLoadJob(cupsd_job_t *job) /* I - Job */ return; } - if ((dest = cupsdValidateDest(attr->values[0].string.text, &(job->dtype), + httpSeparateURI(HTTP_URI_CODING_ALL, attr->values[0].string.text, scheme, + sizeof(scheme), username, sizeof(username), host, + sizeof(host), &port, resource, sizeof(resource)); + + if ((dest = cupsdValidateDest(host, resource, &(job->dtype), NULL)) == NULL) { cupsdLogMessage(CUPSD_LOG_ERROR, @@ -3422,5 +3433,5 @@ unload_job(cupsd_job_t *job) /* I - Job */ /* - * End of "$Id: job.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: job.c 5686 2006-06-21 21:02:56Z mike $". */ diff --git a/scheduler/job.h b/scheduler/job.h index 25aed68d6..93bb774b2 100644 --- a/scheduler/job.h +++ b/scheduler/job.h @@ -1,5 +1,5 @@ /* - * "$Id: job.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: job.h 5393 2006-04-14 18:17:18Z mike $" * * Print job definitions for the Common UNIX Printing System (CUPS) scheduler. * @@ -121,5 +121,5 @@ extern void cupsdUpdateJob(cupsd_job_t *job); /* - * End of "$Id: job.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: job.h 5393 2006-04-14 18:17:18Z mike $". */ diff --git a/scheduler/listen.c b/scheduler/listen.c index 985669ea8..467dcfdc8 100644 --- a/scheduler/listen.c +++ b/scheduler/listen.c @@ -1,5 +1,5 @@ /* - * "$Id: listen.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: listen.c 5083 2006-02-06 02:57:43Z mike $" * * Server listening routines for the Common UNIX Printing System (CUPS) * scheduler. @@ -439,5 +439,5 @@ cupsdStopListening(void) /* - * End of "$Id: listen.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: listen.c 5083 2006-02-06 02:57:43Z mike $". */ diff --git a/scheduler/log.c b/scheduler/log.c index d5b419649..a53029f55 100644 --- a/scheduler/log.c +++ b/scheduler/log.c @@ -1,5 +1,5 @@ /* - * "$Id: log.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: log.c 5493 2006-05-05 16:33:57Z mike $" * * Log file routines for the Common UNIX Printing System (CUPS). * @@ -546,5 +546,5 @@ check_log_file(cups_file_t **lf, /* IO - Log file */ /* - * End of "$Id: log.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: log.c 5493 2006-05-05 16:33:57Z mike $". */ diff --git a/scheduler/main.c b/scheduler/main.c index 0b8e34c9b..2806c26bc 100644 --- a/scheduler/main.c +++ b/scheduler/main.c @@ -1,5 +1,5 @@ /* - * "$Id: main.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: main.c 5634 2006-06-06 17:48:27Z mike $" * * Scheduler main loop for the Common UNIX Printing System (CUPS). * @@ -357,8 +357,8 @@ main(int argc, /* I - Number of command-line args */ getrlimit(RLIMIT_NOFILE, &limit); - if (limit.rlim_max > CUPS_MAX_FDS) - MaxFDs = CUPS_MAX_FDS; + if (limit.rlim_max > FD_SETSIZE) + MaxFDs = FD_SETSIZE; else MaxFDs = limit.rlim_max; @@ -2253,5 +2253,5 @@ usage(int status) /* O - Exit status */ /* - * End of "$Id: main.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: main.c 5634 2006-06-06 17:48:27Z mike $". */ diff --git a/scheduler/mime.c b/scheduler/mime.c index 031550991..2e98d0b3f 100644 --- a/scheduler/mime.c +++ b/scheduler/mime.c @@ -1,5 +1,5 @@ /* - * "$Id: mime.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: mime.c 5606 2006-05-30 19:40:34Z mike $" * * MIME database file routines for the Common UNIX Printing System (CUPS). * @@ -738,5 +738,5 @@ load_types(mime_t *mime, /* I - MIME database */ /* - * End of "$Id: mime.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: mime.c 5606 2006-05-30 19:40:34Z mike $". */ diff --git a/scheduler/mime.h b/scheduler/mime.h index cbd6b2924..9c5aa6448 100644 --- a/scheduler/mime.h +++ b/scheduler/mime.h @@ -1,5 +1,5 @@ /* - * "$Id: mime.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: mime.h 5487 2006-05-03 19:28:29Z mike $" * * MIME type/conversion database definitions for the Common UNIX Printing System (CUPS). * @@ -153,5 +153,5 @@ extern int mimeNumFilters(mime_t *mime); #endif /* !_CUPS_MIME_H_ */ /* - * End of "$Id: mime.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: mime.h 5487 2006-05-03 19:28:29Z mike $". */ diff --git a/scheduler/network.c b/scheduler/network.c index c9453ec96..eb89b1217 100644 --- a/scheduler/network.c +++ b/scheduler/network.c @@ -1,5 +1,5 @@ /* - * "$Id: network.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: network.c 5428 2006-04-18 20:45:30Z mike $" * * Network interface functions for the Common UNIX Printing System * (CUPS) scheduler. @@ -314,5 +314,5 @@ compare_netif(cupsd_netif_t *a, /* I - First network interface */ /* - * End of "$Id: network.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: network.c 5428 2006-04-18 20:45:30Z mike $". */ diff --git a/scheduler/network.h b/scheduler/network.h index d582fb286..21e810c3c 100644 --- a/scheduler/network.h +++ b/scheduler/network.h @@ -1,5 +1,5 @@ /* - * "$Id: network.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: network.h 5043 2006-02-01 18:55:16Z mike $" * * Network interface definitions for the Common UNIX Printing System * (CUPS) scheduler. @@ -57,5 +57,5 @@ extern void cupsdNetIFUpdate(void); /* - * End of "$Id: network.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: network.h 5043 2006-02-01 18:55:16Z mike $". */ diff --git a/scheduler/newselect.txt b/scheduler/newselect.txt deleted file mode 100644 index 5cb9ab4ba..000000000 --- a/scheduler/newselect.txt +++ /dev/null @@ -1,115 +0,0 @@ -Design Notes for New Poll/Select API in CUPSD - 2006-06-06 ----------------------------------------------------------- - -SUPPORTED APIS - - OS select poll epoll kqueue /dev/poll - -------------- ------ ------ ------ ------ --------- - AIX YES YES NO NO NO - FreeBSD YES YES NO YES NO - HP-UX YES YES NO NO NO - IRIX YES YES NO NO NO - Linux YES YES YES NO NO - MacOS X YES YES NO YES NO - NetBSD YES YES NO YES NO - OpenBSD YES YES NO YES NO - Solaris YES YES NO NO YES - Tru64 YES YES NO NO NO - Windows YES NO NO NO NO - - -HIGH-LEVEL API - - typedef void (*cupsd_selfunc_t)(void *data); - - void cupsdStartSelect(void); - void cupsdStopSelect(void); - void cupsdAddSelect(int fd, cupsd_selfunc_t read_cb, - cupsd_selfunc_t write_cb, void *data); - void cupsdRemoveSelect(int fd); - int cupsdDoSelect(int timeout); - - -IMPLEMENTATION STRATEGY - - 0. Common Stuff - a. CUPS array of file descriptor to callback functions - and data. - b. cupsdStartSelect() creates the array - c. cupsdStopSelect() destroys the array and all elements. - d. cupsdAddSelect() adds to the array and allocates a - new callback element. - e. cupsdRemoveSelect() removes from the array and frees - the callback element. - - 1. select() - a. Input/Output fd_set variables, copied to working - copies and then used with select(). - b. Loop through CUPS array, using FD_ISSET and calling - the read/ write callbacks as needed. - c. cupsdRemoveSelect() clears fd_set bit from main and - working sets. - d. cupsdStopSelect() frees all of the memory used by the - CUPS array and fd_set's. - - 2. poll() - a. Regular array of pollfd, sorted the same as the CUPS - array. - b. Loop through pollfd array, call the corresponding - read/write callbacks as needed. - c. cupsdAddSelect() adds first to CUPS array, then uses - current index to determine insertion point for pollfd - array. - d. cupsdRemoveSelect() needs to update cupsdDoSelect() - loop counter if <= current index. - e. cupsdStopSelect() frees all of the memory used by the - CUPS array and pollfd array. - - 3. epoll() - a. cupsdStartSelect() creates epoll file descriptor using - epoll_create() with the maximum fd count, and - allocates an events buffer for the maximum fd count. - b. cupsdAdd/RemoveSelect() uses epoll_ctl() to add - (EPOLL_CTL_ADD) or remove (EPOLL_CTL_DEL) a single - event using the level-triggered semantics. The event - user data field is a pointer to the new callback array - element. - c. cupsdDoSelect() uses epoll_wait() with the global event - buffer allocated in cupsdStartSelect() and then loops - through the events, using the user data field to find - the callback record. - d. cupsdStopSelect() closes the epoll file descriptor and - frees all of the memory used by the event buffer. - - 4. kqueue() - b. cupsdStartSelect() creates kqueue file descriptor - using kqyeue() function and allocates a global event - buffer. - c. cupsdAdd/RemoveSelect() uses EV_SET and kevent() to - register the changes. The event user data field is a - pointer to the new callback array element. - d. cupsdDoSelect() uses kevent() to poll for events and - loops through the events, using the user data field to - find the callback record. - e. cupsdStopSelect() closes the kqyeye() file descriptor - and frees all of the memory used by the event buffer. - - 5. /dev/poll - a. cupsdStartSelect() opens /dev/poll and allocates an - array of pollfd structs; on failure to open /dev/poll, - revert to poll() system call. - b. cupsdAddSelect() writes a single pollfd struct to - /dev/poll with the new file descriptor and the - POLLIN/POLLOUT flags. - c. cupsdRemoveSelect() writes a single pollfd struct to - /dev/poll with the file descriptor and the POLLREMOVE - flag. - d. cupsdDoSelect() uses the DP_POLL ioctl to retrieve - events from /dev/poll and then loops through the - returned pollfd array, looking up the file descriptors - as needed. - e. cupsdStopSelect() closes /dev/poll and frees the - pollfd array. - f. Need to benchmark to see if it is more efficient than - using poll() - this is the only mechanism that is O(n - log n), all of the others are O(n)... diff --git a/scheduler/policy.c b/scheduler/policy.c index d2c387a99..e869c48ee 100644 --- a/scheduler/policy.c +++ b/scheduler/policy.c @@ -1,5 +1,5 @@ /* - * "$Id: policy.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: policy.c 5247 2006-03-08 13:43:38Z mike $" * * Policy routines for the Common UNIX Printing System (CUPS). * @@ -330,5 +330,5 @@ cupsdFindPolicyOp(cupsd_policy_t *p, /* I - Policy */ /* - * End of "$Id: policy.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: policy.c 5247 2006-03-08 13:43:38Z mike $". */ diff --git a/scheduler/policy.h b/scheduler/policy.h index 63c5f5eb2..4f7165664 100644 --- a/scheduler/policy.h +++ b/scheduler/policy.h @@ -1,5 +1,5 @@ /* - * "$Id: policy.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: policy.h 4871 2005-12-07 00:41:11Z mike $" * * Policy definitions for the Common UNIX Printing System (CUPS) * scheduler. @@ -62,5 +62,5 @@ extern cupsd_location_t *cupsdFindPolicyOp(cupsd_policy_t *p, ipp_op_t op); /* - * End of "$Id: policy.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: policy.h 4871 2005-12-07 00:41:11Z mike $". */ diff --git a/scheduler/printers.c b/scheduler/printers.c index 2a6cb2cc5..c987f1605 100644 --- a/scheduler/printers.c +++ b/scheduler/printers.c @@ -1,5 +1,5 @@ /* - * "$Id: printers.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: printers.c 5686 2006-06-21 21:02:56Z mike $" * * Printer routines for the Common UNIX Printing System (CUPS). * @@ -412,6 +412,10 @@ cupsdCreateCommonData(void) /* copies-supported */ ippAddRange(CommonData, IPP_TAG_PRINTER, "copies-supported", 1, MaxCopies); + /* document-format-default */ + ippAddString(CommonData, IPP_TAG_PRINTER, IPP_TAG_MIMETYPE, + "document-format-default", NULL, "application/octet-stream"); + /* generated-natural-language-supported */ ippAddString(CommonData, IPP_TAG_PRINTER, IPP_TAG_LANGUAGE, "generated-natural-language-supported", NULL, DefaultLanguage); @@ -2427,25 +2431,18 @@ cupsdUpdatePrinters(void) const char * /* O - Printer or class name */ cupsdValidateDest( - const char *uri, /* I - Printer URI */ + const char *hostname, /* I - Host name */ + const char *resource, /* I - Resource name */ cups_ptype_t *dtype, /* O - Type (printer or class) */ cupsd_printer_t **printer) /* O - Printer pointer */ { cupsd_printer_t *p; /* Current printer */ char localname[1024],/* Localized hostname */ *lptr, /* Pointer into localized hostname */ - *sptr, /* Pointer into server name */ - *rptr, /* Pointer into resource */ - scheme[32], /* Scheme portion of URI */ - username[64], /* Username portion of URI */ - hostname[HTTP_MAX_HOST], - /* Host portion of URI */ - resource[HTTP_MAX_URI]; - /* Resource portion of URI */ - int port; /* Port portion of URI */ - - - DEBUG_printf(("cupsdValidateDest(uri=\"%s\", dtype=%p, printer=%p)\n", uri, + *sptr; /* Pointer into server name */ + + + DEBUG_printf(("cupsdValidateDest(\"%s\", \"%s\", %p, %p)\n", hostname, resource, dtype, printer)); /* @@ -2455,16 +2452,7 @@ cupsdValidateDest( if (printer) *printer = NULL; - if (dtype) - *dtype = (cups_ptype_t)0; - - /* - * Pull the hostname and resource from the URI... - */ - - httpSeparateURI(HTTP_URI_CODING_ALL, uri, scheme, sizeof(scheme), - username, sizeof(username), hostname, sizeof(hostname), - &port, resource, sizeof(resource)); + *dtype = (cups_ptype_t)0; /* * See if the resource is a class or printer... @@ -2476,7 +2464,7 @@ cupsdValidateDest( * Class... */ - rptr = resource + 9; + resource += 9; } else if (!strncmp(resource, "/printers/", 10)) { @@ -2484,7 +2472,7 @@ cupsdValidateDest( * Printer... */ - rptr = resource + 10; + resource += 10; } else { @@ -2499,19 +2487,17 @@ cupsdValidateDest( * See if the printer or class name exists... */ - p = cupsdFindDest(rptr); + p = cupsdFindDest(resource); - if (p == NULL && strchr(rptr, '@') == NULL) + if (p == NULL && strchr(resource, '@') == NULL) return (NULL); else if (p != NULL) { if (printer) *printer = p; - if (dtype) - *dtype = p->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT | - CUPS_PRINTER_REMOTE); - + *dtype = p->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT | + CUPS_PRINTER_REMOTE); return (p->name); } @@ -2520,7 +2506,7 @@ cupsdValidateDest( */ if (!strcasecmp(hostname, "localhost")) - strlcpy(hostname, ServerName, sizeof(hostname)); + hostname = ServerName; strlcpy(localname, hostname, sizeof(localname)); @@ -2562,15 +2548,13 @@ cupsdValidateDest( p; p = (cupsd_printer_t *)cupsArrayNext(Printers)) if (!strcasecmp(p->hostname, localname) && - !strcasecmp(p->name, rptr)) + !strcasecmp(p->name, resource)) { if (printer) *printer = p; - if (dtype) - *dtype = p->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT | - CUPS_PRINTER_REMOTE); - + *dtype = p->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT | + CUPS_PRINTER_REMOTE); return (p->name); } @@ -2819,10 +2803,6 @@ add_printer_defaults(cupsd_printer_t *p)/* I - Printer */ ippAddInteger(p->attrs, IPP_TAG_PRINTER, IPP_TAG_INTEGER, "copies-default", 1); - if (!cupsGetOption("document-format", p->num_options, p->options)) - ippAddString(CommonData, IPP_TAG_PRINTER, IPP_TAG_MIMETYPE, - "document-format-default", NULL, "application/octet-stream"); - if (!cupsGetOption("job-hold-until", p->num_options, p->options)) ippAddString(p->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD, "job-hold-until-default", NULL, "no-hold"); @@ -3327,5 +3307,5 @@ write_irix_state(cupsd_printer_t *p) /* I - Printer to update */ /* - * End of "$Id: printers.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: printers.c 5686 2006-06-21 21:02:56Z mike $". */ diff --git a/scheduler/printers.h b/scheduler/printers.h index 9b71939bd..ef8b34709 100644 --- a/scheduler/printers.h +++ b/scheduler/printers.h @@ -1,5 +1,5 @@ /* - * "$Id: printers.h 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: printers.h 5330 2006-03-23 21:07:20Z mike $" * * Printer definitions for the Common UNIX Printing System (CUPS) scheduler. * @@ -135,7 +135,8 @@ extern void cupsdStopPrinter(cupsd_printer_t *p, int update); extern void cupsdUpdatePrinters(void); extern cupsd_quota_t *cupsdUpdateQuota(cupsd_printer_t *p, const char *username, int pages, int k); -extern const char *cupsdValidateDest(const char *uri, +extern const char *cupsdValidateDest(const char *hostname, + const char *resource, cups_ptype_t *dtype, cupsd_printer_t **printer); extern void cupsdWritePrintcap(void); @@ -145,5 +146,5 @@ extern char *cupsdSanitizeURI(const char *uri, char *buffer, /* - * End of "$Id: printers.h 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: printers.h 5330 2006-03-23 21:07:20Z mike $". */ diff --git a/scheduler/process.c b/scheduler/process.c index b82692afb..5af7e5eef 100644 --- a/scheduler/process.c +++ b/scheduler/process.c @@ -1,5 +1,5 @@ /* - * "$Id: process.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: process.c 5376 2006-04-06 20:32:07Z mike $" * * Process management routines for the Common UNIX Printing System (CUPS). * @@ -344,5 +344,5 @@ compare_procs(cupsd_proc_t *a, /* I - First process */ /* - * End of "$Id: process.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: process.c 5376 2006-04-06 20:32:07Z mike $". */ diff --git a/scheduler/quotas.c b/scheduler/quotas.c index 4865092ce..db10d8677 100644 --- a/scheduler/quotas.c +++ b/scheduler/quotas.c @@ -1,5 +1,5 @@ /* - * "$Id: quotas.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: quotas.c 5305 2006-03-18 03:05:12Z mike $" * * Quota routines for the Common UNIX Printing System (CUPS). * @@ -230,5 +230,5 @@ find_quota(cupsd_printer_t *p, /* I - Printer */ /* - * End of "$Id: quotas.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: quotas.c 5305 2006-03-18 03:05:12Z mike $". */ diff --git a/scheduler/server.c b/scheduler/server.c index 5a458fce4..bcc3c71e6 100644 --- a/scheduler/server.c +++ b/scheduler/server.c @@ -1,5 +1,5 @@ /* - * "$Id: server.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: server.c 5493 2006-05-05 16:33:57Z mike $" * * Server start/stop routines for the Common UNIX Printing System (CUPS). * @@ -211,5 +211,5 @@ cupsdStopServer(void) /* - * End of "$Id: server.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: server.c 5493 2006-05-05 16:33:57Z mike $". */ diff --git a/scheduler/statbuf.c b/scheduler/statbuf.c index ef944c679..eb257d787 100644 --- a/scheduler/statbuf.c +++ b/scheduler/statbuf.c @@ -1,5 +1,5 @@ /* - * "$Id: statbuf.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: statbuf.c 5447 2006-04-21 20:07:51Z mike $" * * Status buffer routines for the Common UNIX Printing System (CUPS) * scheduler. @@ -330,5 +330,5 @@ cupsdStatBufUpdate(cupsd_statbuf_t *sb, /* I - Status buffer */ /* - * End of "$Id: statbuf.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: statbuf.c 5447 2006-04-21 20:07:51Z mike $". */ diff --git a/scheduler/statbuf.h b/scheduler/statbuf.h index 132a3839f..fc3601533 100644 --- a/scheduler/statbuf.h +++ b/scheduler/statbuf.h @@ -1,5 +1,5 @@ /* - * "$Id: statbuf.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: statbuf.h 4613 2005-08-30 12:41:48Z mike $" * * Status buffer definitions for the Common UNIX Printing System (CUPS) * scheduler. @@ -55,5 +55,5 @@ extern char *cupsdStatBufUpdate(cupsd_statbuf_t *sb, int *loglevel, /* - * End of "$Id: statbuf.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: statbuf.h 4613 2005-08-30 12:41:48Z mike $". */ diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c index 72ae19a5e..428841306 100644 --- a/scheduler/subscriptions.c +++ b/scheduler/subscriptions.c @@ -1,5 +1,5 @@ /* - * "$Id: subscriptions.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: subscriptions.c 5673 2006-06-16 21:04:45Z mike $" * * Subscription routines for the Common UNIX Printing System (CUPS) scheduler. * @@ -1591,5 +1591,5 @@ cupsd_start_notifier( /* - * End of "$Id: subscriptions.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: subscriptions.c 5673 2006-06-16 21:04:45Z mike $". */ diff --git a/scheduler/subscriptions.h b/scheduler/subscriptions.h index 14d1dd0c1..9671d937f 100644 --- a/scheduler/subscriptions.h +++ b/scheduler/subscriptions.h @@ -1,5 +1,5 @@ /* - * "$Id: subscriptions.h 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: subscriptions.h 5673 2006-06-16 21:04:45Z mike $" * * Subscription definitions for the Common UNIX Printing System (CUPS) scheduler. * @@ -168,5 +168,5 @@ extern void cupsdUpdateNotifierStatus(void); /* - * End of "$Id: subscriptions.h 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: subscriptions.h 5673 2006-06-16 21:04:45Z mike $". */ diff --git a/scheduler/sysman.c b/scheduler/sysman.c index 7590a205b..f83319853 100644 --- a/scheduler/sysman.c +++ b/scheduler/sysman.c @@ -1,5 +1,5 @@ /* - * "$Id: sysman.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: sysman.c 5305 2006-03-18 03:05:12Z mike $" * * System management definitions for the Common UNIX Printing System (CUPS). * @@ -727,5 +727,5 @@ sysEventTimerNotifier( /* - * End of "$Id: sysman.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: sysman.c 5305 2006-03-18 03:05:12Z mike $". */ diff --git a/scheduler/sysman.h b/scheduler/sysman.h index b8ed58641..3119b134b 100644 --- a/scheduler/sysman.h +++ b/scheduler/sysman.h @@ -1,5 +1,5 @@ /* - * "$Id: sysman.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: sysman.h 5007 2006-01-27 18:25:42Z mike $" * * System management definitions for the Common UNIX Printing System (CUPS). * @@ -45,5 +45,5 @@ extern void cupsdUpdateSystemMonitor(void); /* - * End of "$Id: sysman.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: sysman.h 5007 2006-01-27 18:25:42Z mike $". */ diff --git a/scheduler/testdirsvc.c b/scheduler/testdirsvc.c index 9d5958a2e..60378ebbe 100644 --- a/scheduler/testdirsvc.c +++ b/scheduler/testdirsvc.c @@ -1,5 +1,5 @@ /* - * "$Id: testdirsvc.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: testdirsvc.c 5301 2006-03-17 23:44:33Z mike $" * * Browsing test program for the Common UNIX Printing System (CUPS). * @@ -331,5 +331,5 @@ usage(void) /* - * End of "$Id: testdirsvc.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: testdirsvc.c 5301 2006-03-17 23:44:33Z mike $". */ diff --git a/scheduler/testmime.c b/scheduler/testmime.c index 4e248a794..460e1d587 100644 --- a/scheduler/testmime.c +++ b/scheduler/testmime.c @@ -1,5 +1,5 @@ /* - * "$Id: testmime.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: testmime.c 5606 2006-05-30 19:40:34Z mike $" * * MIME test program for the Common UNIX Printing System (CUPS). * @@ -331,5 +331,5 @@ type_dir(mime_t *mime, /* I - MIME database */ /* - * End of "$Id: testmime.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: testmime.c 5606 2006-05-30 19:40:34Z mike $". */ diff --git a/scheduler/testspeed.c b/scheduler/testspeed.c index 056906400..559dfa8e4 100644 --- a/scheduler/testspeed.c +++ b/scheduler/testspeed.c @@ -1,5 +1,5 @@ /* - * "$Id: testspeed.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: testspeed.c 5305 2006-03-18 03:05:12Z mike $" * * Scheduler speed test for the Common UNIX Printing System (CUPS). * @@ -303,5 +303,5 @@ usage(void) /* - * End of "$Id: testspeed.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: testspeed.c 5305 2006-03-18 03:05:12Z mike $". */ diff --git a/scheduler/type.c b/scheduler/type.c index e17085213..79f7a229b 100644 --- a/scheduler/type.c +++ b/scheduler/type.c @@ -1,5 +1,5 @@ /* - * "$Id: type.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: type.c 5180 2006-02-26 01:31:45Z mike $" * * MIME typing routines for the Common UNIX Printing System (CUPS). * @@ -1161,5 +1161,5 @@ patmatch(const char *s, /* I - String to match against */ /* - * End of "$Id: type.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: type.c 5180 2006-02-26 01:31:45Z mike $". */ diff --git a/scheduler/util.c b/scheduler/util.c index 2771f12a8..966c68250 100644 --- a/scheduler/util.c +++ b/scheduler/util.c @@ -1,5 +1,5 @@ /* - * "$Id: util.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: util.c 5305 2006-03-18 03:05:12Z mike $" * * Mini-daemon utility functions for the Common UNIX Printing System (CUPS). * @@ -277,5 +277,5 @@ cupsdSendIPPTrailer(void) /* - * End of "$Id: util.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: util.c 5305 2006-03-18 03:05:12Z mike $". */ diff --git a/scheduler/util.h b/scheduler/util.h index 111f3a342..e08a3d73d 100644 --- a/scheduler/util.h +++ b/scheduler/util.h @@ -1,5 +1,5 @@ /* - * "$Id: util.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: util.h 4598 2005-08-25 21:36:26Z mike $" * * Mini-daemon utility definitions for the Common UNIX Printing System (CUPS). * @@ -55,5 +55,5 @@ extern void cupsdSendIPPTrailer(void); #endif /* !_CUPSD_UTIL_H_ */ /* - * End of "$Id: util.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: util.h 4598 2005-08-25 21:36:26Z mike $". */ diff --git a/scripting/php/Makefile b/scripting/php/Makefile index 9b2b5c9cd..3960571b3 100644 --- a/scripting/php/Makefile +++ b/scripting/php/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: Makefile 3572 2003-04-08 19:56:25Z mike $" # # PHP Makefile for the Common UNIX Printing System (CUPS). # @@ -112,5 +112,5 @@ include Dependencies # -# End of "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: Makefile 3572 2003-04-08 19:56:25Z mike $". # diff --git a/scripting/php/phpcups.c b/scripting/php/phpcups.c index 651fc7be4..845177345 100644 --- a/scripting/php/phpcups.c +++ b/scripting/php/phpcups.c @@ -1,5 +1,5 @@ /* - * "$Id: phpcups.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: phpcups.c 5171 2006-02-25 08:44:43Z mike $" * * Printing utilities for the Common UNIX Printing System (CUPS). * @@ -454,5 +454,5 @@ PHP_FUNCTION(cups_print_files) /* - * End of "$Id: phpcups.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: phpcups.c 5171 2006-02-25 08:44:43Z mike $". */ diff --git a/scripting/php/phpcups.h b/scripting/php/phpcups.h index a67e02d62..a318dad6f 100644 --- a/scripting/php/phpcups.h +++ b/scripting/php/phpcups.h @@ -1,5 +1,5 @@ /* - * "$Id: phpcups.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: phpcups.h 5171 2006-02-25 08:44:43Z mike $" * * PHP module include file for the Common UNIX Printing System (CUPS). * @@ -75,5 +75,5 @@ PHP_FUNCTION(cups_print_files); /* - * End of "$Id: phpcups.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: phpcups.h 5171 2006-02-25 08:44:43Z mike $". */ diff --git a/standards/Makefile b/standards/Makefile index 954c8b64e..c7bd373fc 100644 --- a/standards/Makefile +++ b/standards/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: Makefile 5409 2006-04-15 11:45:38Z mike $" # # Standards makefile for the Common UNIX Printing System (CUPS). # @@ -117,5 +117,5 @@ rfctohtml: rfctohtml.o ../cups/libcups.a # -# End of "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: Makefile 5409 2006-04-15 11:45:38Z mike $". # diff --git a/standards/papi-1.0.pdf b/standards/papi-1.0.pdf Binary files differdeleted file mode 100644 index bea5be817..000000000 --- a/standards/papi-1.0.pdf +++ /dev/null diff --git a/standards/rfctohtml.c b/standards/rfctohtml.c index 7ef6c3509..64f6b4688 100644 --- a/standards/rfctohtml.c +++ b/standards/rfctohtml.c @@ -1,5 +1,5 @@ /* - * "$Id: rfctohtml.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: rfctohtml.c 5143 2006-02-21 19:13:01Z mike $" * * RFC file to HTML conversion program. * @@ -501,5 +501,5 @@ put_line(cups_file_t *fp, /* I - File */ /* - * End of "$Id: rfctohtml.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: rfctohtml.c 5143 2006-02-21 19:13:01Z mike $". */ diff --git a/systemv/Makefile b/systemv/Makefile index 11242ffa0..708e4f2db 100644 --- a/systemv/Makefile +++ b/systemv/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 181 2006-06-22 20:01:18Z jlovell $" +# "$Id: Makefile 5628 2006-06-05 15:25:23Z mike $" # # System V commands makefile for the Common UNIX Printing System (CUPS). # @@ -225,5 +225,5 @@ include Dependencies # -# End of "$Id: Makefile 181 2006-06-22 20:01:18Z jlovell $". +# End of "$Id: Makefile 5628 2006-06-05 15:25:23Z mike $". # diff --git a/systemv/accept.c b/systemv/accept.c index 6689eb6b5..14f7201d4 100644 --- a/systemv/accept.c +++ b/systemv/accept.c @@ -1,5 +1,5 @@ /* - * "$Id: accept.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: accept.c 5104 2006-02-15 03:21:04Z mike $" * * "accept", "disable", "enable", and "reject" commands for the Common * UNIX Printing System (CUPS). @@ -286,5 +286,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: accept.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: accept.c 5104 2006-02-15 03:21:04Z mike $". */ diff --git a/systemv/cancel.c b/systemv/cancel.c index ffe79a404..63c92fcfa 100644 --- a/systemv/cancel.c +++ b/systemv/cancel.c @@ -1,5 +1,5 @@ /* - * "$Id: cancel.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: cancel.c 5091 2006-02-08 18:39:56Z mike $" * * "cancel" command for the Common UNIX Printing System (CUPS). * @@ -387,5 +387,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: cancel.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: cancel.c 5091 2006-02-08 18:39:56Z mike $". */ diff --git a/systemv/cupsaddsmb.c b/systemv/cupsaddsmb.c index b99516050..a69e113f1 100644 --- a/systemv/cupsaddsmb.c +++ b/systemv/cupsaddsmb.c @@ -1,5 +1,5 @@ /* - * "$Id: cupsaddsmb.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: cupsaddsmb.c 5233 2006-03-06 03:39:28Z mike $" * * "cupsaddsmb" command for the Common UNIX Printing System (CUPS). * @@ -290,5 +290,5 @@ usage(void) /* - * End of "$Id: cupsaddsmb.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: cupsaddsmb.c 5233 2006-03-06 03:39:28Z mike $". */ diff --git a/systemv/cupstestdsc.c b/systemv/cupstestdsc.c index febd8976a..b9d5ac2d3 100644 --- a/systemv/cupstestdsc.c +++ b/systemv/cupstestdsc.c @@ -1,5 +1,5 @@ /* - * "$Id: cupstestdsc.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: cupstestdsc.c 5392 2006-04-14 17:50:39Z mike $" * * DSC test program for the Common UNIX Printing System (CUPS). * @@ -452,5 +452,5 @@ usage(void) /* - * End of "$Id: cupstestdsc.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: cupstestdsc.c 5392 2006-04-14 17:50:39Z mike $". */ diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c index 515744d11..20c3c0a34 100644 --- a/systemv/cupstestppd.c +++ b/systemv/cupstestppd.c @@ -1,5 +1,5 @@ /* - * "$Id: cupstestppd.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: cupstestppd.c 5549 2006-05-19 19:39:28Z mike $" * * PPD test program for the Common UNIX Printing System (CUPS). * @@ -1730,5 +1730,5 @@ usage(void) /* - * End of "$Id: cupstestppd.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: cupstestppd.c 5549 2006-05-19 19:39:28Z mike $". */ diff --git a/systemv/lp.c b/systemv/lp.c index 829c8d7f9..ee2ac802b 100644 --- a/systemv/lp.c +++ b/systemv/lp.c @@ -1,5 +1,5 @@ /* - * "$Id: lp.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: lp.c 5235 2006-03-06 13:02:23Z mike $" * * "lp" command for the Common UNIX Printing System (CUPS). * @@ -838,5 +838,5 @@ sighandler(int s) /* I - Signal number */ /* - * End of "$Id: lp.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: lp.c 5235 2006-03-06 13:02:23Z mike $". */ diff --git a/systemv/lpadmin.c b/systemv/lpadmin.c index 7864cb88a..c0467fa76 100644 --- a/systemv/lpadmin.c +++ b/systemv/lpadmin.c @@ -1,5 +1,5 @@ /* - * "$Id: lpadmin.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: lpadmin.c 5545 2006-05-18 21:00:56Z mike $" * * "lpadmin" command for the Common UNIX Printing System (CUPS). * @@ -1984,5 +1984,5 @@ validate_name(const char *name) /* I - Name to check */ /* - * End of "$Id: lpadmin.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: lpadmin.c 5545 2006-05-18 21:00:56Z mike $". */ diff --git a/systemv/lpinfo.c b/systemv/lpinfo.c index 62f9f606c..df8bef1aa 100644 --- a/systemv/lpinfo.c +++ b/systemv/lpinfo.c @@ -1,5 +1,5 @@ /* - * "$Id: lpinfo.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: lpinfo.c 4925 2006-01-13 02:52:47Z mike $" * * "lpinfo" command for the Common UNIX Printing System (CUPS). * @@ -434,5 +434,5 @@ show_models(http_t *http, /* I - HTTP connection to server */ /* - * End of "$Id: lpinfo.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: lpinfo.c 4925 2006-01-13 02:52:47Z mike $". */ diff --git a/systemv/lpmove.c b/systemv/lpmove.c index 49674014f..8f9fdefbf 100644 --- a/systemv/lpmove.c +++ b/systemv/lpmove.c @@ -1,5 +1,5 @@ /* - * "$Id: lpmove.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: lpmove.c 5023 2006-01-29 14:39:44Z mike $" * * "lpmove" command for the Common UNIX Printing System (CUPS). * @@ -233,5 +233,5 @@ move_job(http_t *http, /* I - HTTP connection to server */ /* - * End of "$Id: lpmove.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: lpmove.c 5023 2006-01-29 14:39:44Z mike $". */ diff --git a/systemv/lpoptions.c b/systemv/lpoptions.c index 42770ca6d..8e6441d8a 100644 --- a/systemv/lpoptions.c +++ b/systemv/lpoptions.c @@ -1,5 +1,5 @@ /* - * "$Id: lpoptions.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: lpoptions.c 4924 2006-01-13 01:55:20Z mike $" * * Printer option program for the Common UNIX Printing System (CUPS). * @@ -452,5 +452,5 @@ usage(void) /* - * End of "$Id: lpoptions.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: lpoptions.c 4924 2006-01-13 01:55:20Z mike $". */ diff --git a/systemv/lppasswd.c b/systemv/lppasswd.c index 00b2ff1d7..d9822a07e 100644 --- a/systemv/lppasswd.c +++ b/systemv/lppasswd.c @@ -1,5 +1,5 @@ /* - * "$Id: lppasswd.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: lppasswd.c 4924 2006-01-13 01:55:20Z mike $" * * MD5 password program for the Common UNIX Printing System (CUPS). * @@ -509,5 +509,5 @@ usage(FILE *fp) /* I - File to send usage to */ /* - * End of "$Id: lppasswd.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: lppasswd.c 4924 2006-01-13 01:55:20Z mike $". */ diff --git a/systemv/lpstat.c b/systemv/lpstat.c index 316617382..eeb1cb260 100644 --- a/systemv/lpstat.c +++ b/systemv/lpstat.c @@ -1,5 +1,5 @@ /* - * "$Id: lpstat.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: lpstat.c 5638 2006-06-06 20:08:13Z mike $" * * "lpstat" command for the Common UNIX Printing System (CUPS). * @@ -42,7 +42,6 @@ #include <stdio.h> #include <stdlib.h> #include <errno.h> -#include <cups/http-private.h> #include <cups/string.h> #include <cups/cups.h> #include <cups/i18n.h> @@ -2282,5 +2281,5 @@ show_scheduler(http_t *http) /* I - HTTP connection to server */ /* - * End of "$Id: lpstat.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: lpstat.c 5638 2006-06-06 20:08:13Z mike $". */ diff --git a/templates/Makefile b/templates/Makefile index 6100b7fa5..d2e4952ce 100644 --- a/templates/Makefile +++ b/templates/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 181 2006-06-22 20:01:18Z jlovell $" +# "$Id: Makefile 5609 2006-05-30 20:31:10Z mike $" # # Template makefile for the Common UNIX Printing System (CUPS). # @@ -155,5 +155,5 @@ uninstall-languages: # -# End of "$Id: Makefile 181 2006-06-22 20:01:18Z jlovell $". +# End of "$Id: Makefile 5609 2006-05-30 20:31:10Z mike $". # diff --git a/test/4.1-requests.test b/test/4.1-requests.test index 3e2e4d7c5..ca0c8d326 100644 --- a/test/4.1-requests.test +++ b/test/4.1-requests.test @@ -1,5 +1,5 @@ # -# "$Id: 4.1-requests.test 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: 4.1-requests.test 1595 2001-03-01 20:40:17Z mike $" # # Verify that the server requires the following attributes: # @@ -136,5 +136,5 @@ EXPECT attributes-natural-language } # -# End of "$Id: 4.1-requests.test 177 2006-06-21 00:20:03Z jlovell $" +# End of "$Id: 4.1-requests.test 1595 2001-03-01 20:40:17Z mike $" # diff --git a/test/4.2-cups-printer-ops.test b/test/4.2-cups-printer-ops.test index be311d966..54189002f 100644 --- a/test/4.2-cups-printer-ops.test +++ b/test/4.2-cups-printer-ops.test @@ -1,5 +1,5 @@ # -# "$Id: 4.2-cups-printer-ops.test 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: 4.2-cups-printer-ops.test 5493 2006-05-05 16:33:57Z mike $" # # Verify that the CUPS printer operations work. # @@ -258,5 +258,5 @@ } # -# End of "$Id: 4.2-cups-printer-ops.test 177 2006-06-21 00:20:03Z jlovell $" +# End of "$Id: 4.2-cups-printer-ops.test 5493 2006-05-05 16:33:57Z mike $" # diff --git a/test/4.3-job-ops.test b/test/4.3-job-ops.test index f9289f48d..fa1849b29 100644 --- a/test/4.3-job-ops.test +++ b/test/4.3-job-ops.test @@ -1,5 +1,5 @@ # -# "$Id: 4.3-job-ops.test 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: 4.3-job-ops.test 5493 2006-05-05 16:33:57Z mike $" # # Verify that the IPP job operations work. # @@ -297,5 +297,5 @@ } # -# End of "$Id: 4.3-job-ops.test 177 2006-06-21 00:20:03Z jlovell $" +# End of "$Id: 4.3-job-ops.test 5493 2006-05-05 16:33:57Z mike $" # diff --git a/test/4.4-subscription-ops.test b/test/4.4-subscription-ops.test index b8c074db4..c3098ef07 100644 --- a/test/4.4-subscription-ops.test +++ b/test/4.4-subscription-ops.test @@ -1,5 +1,5 @@ # -# "$Id: 4.4-subscription-ops.test 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: 4.4-subscription-ops.test 4840 2005-11-14 21:53:30Z mike $" # # Verify that the CUPS subscription operations work. # @@ -118,5 +118,5 @@ } # -# End of "$Id: 4.4-subscription-ops.test 177 2006-06-21 00:20:03Z jlovell $" +# End of "$Id: 4.4-subscription-ops.test 4840 2005-11-14 21:53:30Z mike $" # diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh index 6069901ec..d73b99293 100644 --- a/test/5.1-lpadmin.sh +++ b/test/5.1-lpadmin.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id: 5.1-lpadmin.sh 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: 5.1-lpadmin.sh 4494 2005-02-18 02:18:11Z mike $" # # Test the lpadmin command. # @@ -60,5 +60,5 @@ fi echo "" # -# End of "$Id: 5.1-lpadmin.sh 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: 5.1-lpadmin.sh 4494 2005-02-18 02:18:11Z mike $". # diff --git a/test/5.2-lpc.sh b/test/5.2-lpc.sh index 842331665..282b63cf1 100644 --- a/test/5.2-lpc.sh +++ b/test/5.2-lpc.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id: 5.2-lpc.sh 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: 5.2-lpc.sh 4494 2005-02-18 02:18:11Z mike $" # # Test the lpc command. # @@ -36,5 +36,5 @@ fi echo "" # -# End of "$Id: 5.2-lpc.sh 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: 5.2-lpc.sh 4494 2005-02-18 02:18:11Z mike $". # diff --git a/test/5.3-lpq.sh b/test/5.3-lpq.sh index 2b40bc71a..a77e4d65e 100644 --- a/test/5.3-lpq.sh +++ b/test/5.3-lpq.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id: 5.3-lpq.sh 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: 5.3-lpq.sh 4494 2005-02-18 02:18:11Z mike $" # # Test the lpq command. # @@ -36,5 +36,5 @@ fi echo "" # -# End of "$Id: 5.3-lpq.sh 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: 5.3-lpq.sh 4494 2005-02-18 02:18:11Z mike $". # diff --git a/test/5.4-lpstat.sh b/test/5.4-lpstat.sh index 84c1d50e8..9d1b1cc09 100644 --- a/test/5.4-lpstat.sh +++ b/test/5.4-lpstat.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id: 5.4-lpstat.sh 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: 5.4-lpstat.sh 4494 2005-02-18 02:18:11Z mike $" # # Test the lpstat command. # @@ -36,5 +36,5 @@ fi echo "" # -# End of "$Id: 5.4-lpstat.sh 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: 5.4-lpstat.sh 4494 2005-02-18 02:18:11Z mike $". # diff --git a/test/5.5-lp.sh b/test/5.5-lp.sh index e0033e8c2..7fd6e22aa 100644 --- a/test/5.5-lp.sh +++ b/test/5.5-lp.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id: 5.5-lp.sh 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: 5.5-lp.sh 4494 2005-02-18 02:18:11Z mike $" # # Test the lp command. # @@ -67,5 +67,5 @@ fi echo "" # -# End of "$Id: 5.5-lp.sh 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: 5.5-lp.sh 4494 2005-02-18 02:18:11Z mike $". # diff --git a/test/5.6-lpr.sh b/test/5.6-lpr.sh index 35dc43570..c16a121dc 100644 --- a/test/5.6-lpr.sh +++ b/test/5.6-lpr.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id: 5.6-lpr.sh 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: 5.6-lpr.sh 4494 2005-02-18 02:18:11Z mike $" # # Test the lpr command. # @@ -67,5 +67,5 @@ fi echo "" # -# End of "$Id: 5.6-lpr.sh 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: 5.6-lpr.sh 4494 2005-02-18 02:18:11Z mike $". # diff --git a/test/5.7-lprm.sh b/test/5.7-lprm.sh index 1557c6147..500c8f458 100644 --- a/test/5.7-lprm.sh +++ b/test/5.7-lprm.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id: 5.7-lprm.sh 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: 5.7-lprm.sh 4494 2005-02-18 02:18:11Z mike $" # # Test the lprm command. # @@ -48,5 +48,5 @@ fi echo "" # -# End of "$Id: 5.7-lprm.sh 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: 5.7-lprm.sh 4494 2005-02-18 02:18:11Z mike $". # diff --git a/test/5.8-cancel.sh b/test/5.8-cancel.sh index 10f9b1452..926bc9eb6 100644 --- a/test/5.8-cancel.sh +++ b/test/5.8-cancel.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id: 5.8-cancel.sh 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: 5.8-cancel.sh 5091 2006-02-08 18:39:56Z mike $" # # Test the cancel command. # @@ -48,5 +48,5 @@ fi echo "" # -# End of "$Id: 5.8-cancel.sh 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: 5.8-cancel.sh 5091 2006-02-08 18:39:56Z mike $". # diff --git a/test/5.9-lpinfo.sh b/test/5.9-lpinfo.sh index 495e3fefb..13a58ced4 100644 --- a/test/5.9-lpinfo.sh +++ b/test/5.9-lpinfo.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id: 5.9-lpinfo.sh 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: 5.9-lpinfo.sh 4494 2005-02-18 02:18:11Z mike $" # # Test the lpinfo command. # @@ -48,5 +48,5 @@ fi echo "" # -# End of "$Id: 5.9-lpinfo.sh 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: 5.9-lpinfo.sh 4494 2005-02-18 02:18:11Z mike $". # diff --git a/test/Makefile b/test/Makefile index c63e02194..de2fd5713 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $" # # IPP test makefile for the Common UNIX Printing System (CUPS). # @@ -80,5 +80,5 @@ include Dependencies # -# End of "$Id: Makefile 177 2006-06-21 00:20:03Z jlovell $". +# End of "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $". # diff --git a/test/get-job-attributes.test b/test/get-job-attributes.test index ba62bd7f3..35b241b06 100644 --- a/test/get-job-attributes.test +++ b/test/get-job-attributes.test @@ -15,7 +15,6 @@ ATTR charset attributes-charset utf-8 ATTR language attributes-natural-language en ATTR uri job-uri $uri -# ATTR keyword requested-attributes job-media-sheets-completed,job-state # What statuses are OK? #STATUS ok @@ -24,4 +23,5 @@ # What attributes do we expect? EXPECT job-uri EXPECT job-state + EXPECT bogus-attribute } diff --git a/test/get-jobs.test b/test/get-jobs.test deleted file mode 100644 index 2d2e5a7dd..000000000 --- a/test/get-jobs.test +++ /dev/null @@ -1,21 +0,0 @@ -# Get list of jobs -{ - # The name of the test... - NAME "Get-Jobs" - - # The resource to use for the POST - # RESOURCE /admin - - # The operation to use - OPERATION Get-Jobs - - # Attributes, starting in the operation group... - GROUP operation - ATTR charset attributes-charset utf-8 - ATTR language attributes-natural-language en - ATTR uri printer-uri $uri - ATTR keyword which-jobs completed - - # What statuses are OK? - STATUS successful-ok -} diff --git a/test/ipptest.c b/test/ipptest.c index dc1a64e3b..98843ff6c 100644 --- a/test/ipptest.c +++ b/test/ipptest.c @@ -1,5 +1,5 @@ /* - * "$Id: ipptest.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: ipptest.c 5414 2006-04-17 20:07:24Z mike $" * * IPP test command for the Common UNIX Printing System (CUPS). * @@ -897,5 +897,5 @@ usage(const char *option) /* I - Option string or NULL */ /* - * End of "$Id: ipptest.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: ipptest.c 5414 2006-04-17 20:07:24Z mike $". */ diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh index 659a68a3a..fe169ecda 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id: run-stp-tests.sh 177 2006-06-21 00:20:03Z jlovell $" +# "$Id: run-stp-tests.sh 5493 2006-05-05 16:33:57Z mike $" # # Perform the complete set of IPP compliance tests specified in the # CUPS Software Test Plan. @@ -595,5 +595,5 @@ echo "A HTML report was created in test/$strfile." echo "" # -# End of "$Id: run-stp-tests.sh 177 2006-06-21 00:20:03Z jlovell $" +# End of "$Id: run-stp-tests.sh 5493 2006-05-05 16:33:57Z mike $" # diff --git a/test/testfile.ps b/test/testfile.ps index f2b3049e9..01c4c08e7 100644 --- a/test/testfile.ps +++ b/test/testfile.ps @@ -589,6 +589,6 @@ gsave grestore showpage % -% End of "$Id: testfile.ps 179 2006-06-21 18:38:41Z jlovell $". +% End of "$Id: testfile.ps 4551 2005-07-28 13:45:00Z mike $". % %%EOF diff --git a/test/testhp.ppd b/test/testhp.ppd index 3b74931d8..3e3e10f53 100644 --- a/test/testhp.ppd +++ b/test/testhp.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% -*% "$Id: testhp.ppd 177 2006-06-21 00:20:03Z jlovell $" +*% "$Id: testhp.ppd 4494 2005-02-18 02:18:11Z mike $" *% *% Test HP PPD file for the Common UNIX Printing System (CUPS). *% @@ -191,5 +191,5 @@ *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM *Font ZapfDingbats: Special "(001.004S)" Standard ROM *% -*% End of "$Id: testhp.ppd 177 2006-06-21 00:20:03Z jlovell $". +*% End of "$Id: testhp.ppd 4494 2005-02-18 02:18:11Z mike $". *% diff --git a/test/testps.ppd b/test/testps.ppd index cbd7b64a0..9694923c2 100644 --- a/test/testps.ppd +++ b/test/testps.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% -*% "$Id: testps.ppd 177 2006-06-21 00:20:03Z jlovell $" +*% "$Id: testps.ppd 4494 2005-02-18 02:18:11Z mike $" *% *% Test PS PPD file for the Common UNIX Printing System (CUPS). *% @@ -188,5 +188,5 @@ *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM *Font ZapfDingbats: Special "(001.004S)" Standard ROM *% -*% End of "$Id: testps.ppd 177 2006-06-21 00:20:03Z jlovell $". +*% End of "$Id: testps.ppd 4494 2005-02-18 02:18:11Z mike $". *% diff --git a/tools/makesrcdist b/tools/makesrcdist index 1f3708311..a17e8013a 100755 --- a/tools/makesrcdist +++ b/tools/makesrcdist @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id: makesrcdist 181 2006-06-22 20:01:18Z jlovell $" +# "$Id: makesrcdist 5500 2006-05-08 20:32:27Z mike $" # # makesrcdist - make a source distribution of CUPS. # @@ -18,9 +18,9 @@ if test $# = 0; then echo Updating for snapshot... svn up rev=`svnversion . | sed -e '1,$s/[a-zA-Z]//g'` - version="1.3svn" + version="1.2svn" revision="-r$rev" - fileversion="1.3svn-r$rev" + fileversion="1.2svn-r$rev" fileurl="ftp://ftp.easysw.com/pub/cups/test/cups-$fileversion-source.tar." url="." else @@ -32,7 +32,7 @@ else fileurl="ftp://ftp.easysw.com/pub/cups/$version/cups-$fileversion-source.tar." url="https://svn.easysw.com/public/cups/tags/release-$version" - svn copy https://svn.easysw.com/public/cups/trunk "$url" \ + svn copy https://svn.easysw.com/public/cups/branches/branch-1.2 "$url" \ -m "Tag $version" || exit 1 fi @@ -81,5 +81,5 @@ rm -rf cups-$version echo "Done!" # -# End of "$Id: makesrcdist 181 2006-06-22 20:01:18Z jlovell $". +# End of "$Id: makesrcdist 5500 2006-05-08 20:32:27Z mike $". # diff --git a/tools/testosx b/tools/testosx index 4bc74b580..655853a3b 100755 --- a/tools/testosx +++ b/tools/testosx @@ -12,7 +12,7 @@ fi rev=`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[a-zA-Z]*//g'` if test $# = 0; then - version="1.3svn-r$rev" + version="1.2svn-r$rev" else version=$1 fi @@ -69,7 +69,7 @@ for file in packaging/cups-desc.plist packaging/cups-info.plist \ echo Updating $file... sed -e '1,$s/@CUPS_VERSION@/'$version'/g' \ -e '1,$s/@CUPS_REVISION@//g' \ - -e '1,$s/@CUPS_RELEASE@/1.3.'$rev'/g' \ + -e '1,$s/@CUPS_RELEASE@/1.2.'$rev'/g' \ <$file.in >$file done diff --git a/vcnet/config.h b/vcnet/config.h index 362a17311..c5f1752d0 100644 --- a/vcnet/config.h +++ b/vcnet/config.h @@ -1,5 +1,5 @@ /* - * "$Id: config.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: config.h 4828 2005-11-11 12:53:38Z mike $" * * Configuration file for the Common UNIX Printing System (CUPS). * @@ -348,5 +348,5 @@ #endif /* !_CUPS_CONFIG_H_ */ /* - * End of "$Id: config.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: config.h 4828 2005-11-11 12:53:38Z mike $". */ |
