diff options
534 files changed, 1898 insertions, 3036 deletions
diff --git a/CHANGES-IPPTOOL.txt b/CHANGES-IPPTOOL.txt new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/CHANGES-IPPTOOL.txt diff --git a/CHANGES.txt b/CHANGES.txt index 972a98f9..9bf60a65 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,49 @@ -CHANGES.txt - 1.6.2 - 2013-03-18 +CHANGES.txt - 1.6.3 - 2013-07-11 -------------------------------- +CHANGES IN CUPS V1.6.3 + + - The configure script now prefers Clang over GCC. + - Fixed a compile problem on AIX (STR #4307) + - The default IPP version did not always get set before creating a new + IPP request message (<rdar://problem/14401718>) + - The lp, lpq, lpr, and lpstat now display an error message advising the + use of the /version=1.1 ServerName option (<rdar://problem/14290628>) + - Added documentation about the /version=1.1 option to ServerName in + client.conf (<rdar://problem/14216262>) + - httpStatus(HTTP_ERROR) did not return a useful error message + (<rdar://problem/14217326>) + - The lp, lpq, lpr, and lpstat commands incorrectly ignored the default + printer set in the lpoptions file (<rdar://problem/14216472>) + - Fixed a URI encoding issue for hostnames containing the ` (backquote) + character (<rdar://problem/14243133>) + - Added support for RFC 6874's IPv6 link local address format in URIs + (<rdar://problem/13979453>) + - The USB backend could crash on libusb-based systems if USB was + disabled in the BIOS (<rdar://problem/13875729>) + - Fixed a rounding error in the PWG media size mapping code + (<rdar://problem/13493241>) + - Fixed several ipptool test files that used old STATUS names. + - Kerberos credentials could get truncated when printing to a shared + printer. + - Printing using "ipps" URIs was not encrypted. + - Insecure ICC profiles prevented installation of user profiles for a + printer on OS X. + - Added more USB quirks for the libusb-based backend (STR #4311, + <rdar://problem/13736470>) + - The Russian web interface templates were broken (STR #4310) + - The scheduler no longer tries to do Kerberos authentication over the + loopback interface. + - The IPP backend could fail to pause a job for authentication + (STR #4298) + - Fixed a regression on the handling of auth keys on OS X if the + cups-files.conf was not present or did not contain a SystemAuthKey + value. + - The scheduler incorrectly did a reverse lookup of the server address + when HostNameLookups was turned off (STR #4302) + - The scheduler incorrectly computed the final content type value when + null filters were present. + CHANGES IN CUPS V1.6.2 diff --git a/INSTALL.txt b/INSTALL.txt index 25ab9603..948433cf 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -1,4 +1,4 @@ -INSTALL - CUPS v1.6.2 - 2013-03-18 +INSTALL - CUPS v1.6.3 - 2013-07-11 ---------------------------------- This file describes how to compile and install CUPS from source code. For more diff --git a/Makedefs.in b/Makedefs.in index 95ea1d48..41612af7 100644 --- a/Makedefs.in +++ b/Makedefs.in @@ -1,5 +1,5 @@ # -# "$Id: Makedefs.in 10497 2012-05-22 23:58:31Z mike $" +# "$Id: Makedefs.in 7900 2008-09-03 13:47:57Z mike $" # # Common makefile definitions for CUPS. # @@ -258,5 +258,5 @@ DBUSDIR = @DBUSDIR@ # -# End of "$Id: Makedefs.in 10497 2012-05-22 23:58:31Z mike $" +# End of "$Id: Makedefs.in 7900 2008-09-03 13:47:57Z mike $" # @@ -1,9 +1,9 @@ # -# "$Id: Makefile 10507 2012-05-23 22:39:50Z mike $" +# "$Id: Makefile 9391 2010-11-30 21:53:04Z mike $" # # Top-level Makefile for CUPS. # -# Copyright 2007-2012 by Apple Inc. +# Copyright 2007-2013 by Apple Inc. # Copyright 1997-2007 by Easy Software Products, all rights reserved. # # These coded instructions, statements, and computer programs are the @@ -99,8 +99,10 @@ clean: distclean: clean $(RM) Makedefs config.h config.log config.status $(RM) cups-config - $(RM) conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf - $(RM) doc/help/ref-cupsd-conf.html doc/help/standard.html doc/index.html + $(RM) conf/cups-files.conf conf/cupsd.conf + $(RM) conf/mime.convs conf/pam.std conf/snmp.conf + $(RM) doc/help/ref-cups-files-conf.html doc/help/ref-cupsd-conf.html + $(RM) doc/help/standard.html doc/index.html $(RM) man/client.conf.man $(RM) man/cups-deviced.man man/cups-driverd.man $(RM) man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man @@ -330,5 +332,5 @@ dist: all # -# End of "$Id: Makefile 10507 2012-05-23 22:39:50Z mike $". +# End of "$Id: Makefile 9391 2010-11-30 21:53:04Z mike $". # @@ -1,4 +1,4 @@ -README - CUPS v1.6.2 - 2013-03-18 +README - CUPS v1.6.3 - 2013-07-11 --------------------------------- Looking for compile instructions? Read the file "INSTALL.txt" instead... diff --git a/backend/Makefile b/backend/Makefile index a8dc8596..902bf6e8 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 10554 2012-07-27 17:57:49Z mike $" +# "$Id: Makefile 7924 2008-09-10 17:36:13Z mike $" # # Backend makefile for CUPS. # @@ -295,5 +295,5 @@ include Dependencies # -# End of "$Id: Makefile 10554 2012-07-27 17:57:49Z mike $". +# End of "$Id: Makefile 7924 2008-09-10 17:36:13Z mike $". # diff --git a/backend/backend-private.h b/backend/backend-private.h index fa829141..980b3e51 100644 --- a/backend/backend-private.h +++ b/backend/backend-private.h @@ -1,5 +1,5 @@ /* - * "$Id: backend-private.h 10329 2012-03-05 23:18:31Z mike $" + * "$Id: backend-private.h 7810 2008-07-29 01:11:15Z mike $" * * Backend support definitions for CUPS. * @@ -334,5 +334,5 @@ extern int backendWaitLoop(int snmp_fd, http_addr_t *addr, /* - * End of "$Id: backend-private.h 10329 2012-03-05 23:18:31Z mike $". + * End of "$Id: backend-private.h 7810 2008-07-29 01:11:15Z mike $". */ diff --git a/backend/dnssd.c b/backend/dnssd.c index 1d6eb7ea..b3c594d3 100644 --- a/backend/dnssd.c +++ b/backend/dnssd.c @@ -1,5 +1,5 @@ /* - * "$Id: dnssd.c 10489 2012-05-21 16:05:58Z mike $" + * "$Id: dnssd.c 3833 2012-05-23 22:51:18Z msweet $" * * DNS-SD discovery backend for CUPS. * @@ -1276,5 +1276,5 @@ unquote(char *dst, /* I - Destination buffer */ /* - * End of "$Id: dnssd.c 10489 2012-05-21 16:05:58Z mike $". + * End of "$Id: dnssd.c 3833 2012-05-23 22:51:18Z msweet $". */ diff --git a/backend/ieee1284.c b/backend/ieee1284.c index c95fbc7f..a837325f 100644 --- a/backend/ieee1284.c +++ b/backend/ieee1284.c @@ -1,5 +1,5 @@ /* - * "$Id: ieee1284.c 9828 2011-06-14 06:38:24Z mike $" + * "$Id: ieee1284.c 7687 2008-06-24 01:28:36Z mike $" * * IEEE-1284 support functions for CUPS. * @@ -487,5 +487,5 @@ backendGetMakeModel( /* - * End of "$Id: ieee1284.c 9828 2011-06-14 06:38:24Z mike $". + * End of "$Id: ieee1284.c 7687 2008-06-24 01:28:36Z mike $". */ diff --git a/backend/ipp.c b/backend/ipp.c index bc0e23a9..264405ae 100644 --- a/backend/ipp.c +++ b/backend/ipp.c @@ -1,9 +1,9 @@ /* - * "$Id: ipp.c 10890 2013-03-08 18:42:09Z mike $" + * "$Id: ipp.c 9759 2011-05-11 03:24:33Z mike $" * * IPP backend for CUPS. * - * Copyright 2007-2012 by Apple Inc. + * Copyright 2007-2013 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -100,8 +100,6 @@ static char username[256] = "", /* Username for device URI */ *password = NULL; /* Password for device URI */ -static int password_tries = 0; - /* Password tries */ static const char * const pattrs[] = /* Printer attributes we want */ { "copies-supported", @@ -166,7 +164,9 @@ static ipp_t *new_request(ipp_op_t op, int version, const char *uri, const char *format, _ppd_cache_t *pc, ipp_attribute_t *media_col_sup, ipp_attribute_t *doc_handling_sup); -static const char *password_cb(const char *); +static const char *password_cb(const char *prompt, http_t *http, + const char *method, const char *resource, + int *user_data); static void report_attr(ipp_attribute_t *attr); static void report_printer_state(ipp_t *ipp); #if defined(HAVE_GSSAPI) && defined(HAVE_XPC) @@ -203,6 +203,7 @@ main(int argc, /* I - Number of command-line args */ *name, /* Name of option */ *value, /* Value of option */ sep; /* Separator character */ + int password_tries = 0; /* Password tries */ http_addrlist_t *addrlist; /* Address of printer */ int snmp_enabled = 1; /* Is SNMP enabled? */ int snmp_fd, /* SNMP socket */ @@ -406,7 +407,7 @@ main(int argc, /* I - Number of command-line args */ if (!port) port = IPP_PORT; /* Default to port 631 */ - if (!strcmp(scheme, "https")) + if (!strcmp(scheme, "https") || !strcmp(scheme, "ipps")) cupsSetEncryption(HTTP_ENCRYPT_ALWAYS); else cupsSetEncryption(HTTP_ENCRYPT_IF_REQUESTED); @@ -607,7 +608,7 @@ main(int argc, /* I - Number of command-line args */ * Set the authentication info, if any... */ - cupsSetPasswordCB(password_cb); + cupsSetPasswordCB2((cups_password_cb2_t)password_cb, &password_tries); if (username[0]) { @@ -1896,6 +1897,9 @@ main(int argc, /* I - Number of command-line args */ ippDelete(response); + if (cupsLastError() <= IPP_OK_CONFLICT) + password_tries = 0; + /* * Wait before polling again... */ @@ -1919,6 +1923,9 @@ main(int argc, /* I - Number of command-line args */ check_printer_state(http, uri, resource, argv[2], version); + if (cupsLastError() <= IPP_OK_CONFLICT) + password_tries = 0; + /* * Collect the final page count as needed... */ @@ -2094,9 +2101,6 @@ check_printer_state( fprintf(stderr, "DEBUG: Get-Printer-Attributes: %s (%s)\n", ippErrorString(cupsLastError()), cupsLastErrorString()); - if (cupsLastError() <= IPP_OK_CONFLICT) - password_tries = 0; - /* * Return the printer-state value... */ @@ -2195,6 +2199,7 @@ monitor_printer( const char *job_name; /* Job name */ ipp_jstate_t job_state; /* Job state */ const char *job_user; /* Job originating user name */ + int password_tries = 0; /* Password tries */ /* @@ -2206,7 +2211,7 @@ monitor_printer( httpSetTimeout(http, 30.0, timeout_cb, NULL); if (username[0]) cupsSetUser(username); - cupsSetPasswordCB(password_cb); + cupsSetPasswordCB2((cups_password_cb2_t)password_cb, &password_tries); /* * Loop until the job is canceled, aborted, or completed. @@ -2230,6 +2235,8 @@ monitor_printer( monitor->resource, monitor->user, monitor->version); + if (cupsLastError() <= IPP_OK_CONFLICT) + password_tries = 0; /* * Check the status of the job itself... @@ -2698,12 +2705,20 @@ new_request( */ static const char * /* O - Password */ -password_cb(const char *prompt) /* I - Prompt (not used) */ +password_cb(const char *prompt, /* I - Prompt (not used) */ + http_t *http, /* I - Connection */ + const char *method, /* I - Request method (not used) */ + const char *resource, /* I - Resource path (not used) */ + int *password_tries) /* I - Password tries */ { - fprintf(stderr, "DEBUG: password_cb(prompt=\"%s\"), password=%p, " - "password_tries=%d\n", prompt, password, password_tries); + fprintf(stderr, "DEBUG: password_cb(prompt=\"%s\", http=%p, method=\"%s\", " + "resource=\"%s\", password_tries=%p(%d)), password=%p\n", + prompt, http, method, resource, password_tries, *password_tries, + password); (void)prompt; + (void)method; + (void)resource; /* * Remember that we need to authenticate... @@ -2711,9 +2726,9 @@ password_cb(const char *prompt) /* I - Prompt (not used) */ auth_info_required = "username,password"; - if (password && *password && password_tries < 3) + if (password && *password && *password_tries < 3) { - password_tries ++; + (*password_tries) ++; return (password); } @@ -3376,5 +3391,5 @@ update_reasons(ipp_attribute_t *attr, /* I - printer-state-reasons or NULL */ } /* - * End of "$Id: ipp.c 10890 2013-03-08 18:42:09Z mike $". + * End of "$Id: ipp.c 9759 2011-05-11 03:24:33Z mike $". */ diff --git a/backend/lpd.c b/backend/lpd.c index 37d6c87a..9d9e01b2 100644 --- a/backend/lpd.c +++ b/backend/lpd.c @@ -1,5 +1,5 @@ /* - * "$Id: lpd.c 10608 2012-09-15 19:42:21Z mike $" + * "$Id: lpd.c 7740 2008-07-14 23:58:05Z mike $" * * Line Printer Daemon backend for CUPS. * @@ -1331,5 +1331,5 @@ sigterm_handler(int sig) /* I - Signal */ /* - * End of "$Id: lpd.c 10608 2012-09-15 19:42:21Z mike $". + * End of "$Id: lpd.c 7740 2008-07-14 23:58:05Z mike $". */ diff --git a/backend/network.c b/backend/network.c index 387d5150..4227319c 100644 --- a/backend/network.c +++ b/backend/network.c @@ -1,5 +1,5 @@ /* - * "$Id: network.c 10389 2012-03-28 21:57:29Z mike $" + * "$Id: network.c 3755 2012-03-30 05:59:14Z msweet $" * * Common backend network APIs for CUPS. * @@ -322,5 +322,5 @@ backendNetworkSideCB( /* - * End of "$Id: network.c 10389 2012-03-28 21:57:29Z mike $". + * End of "$Id: network.c 3755 2012-03-30 05:59:14Z msweet $". */ diff --git a/backend/pseudo b/backend/pseudo index 3a82a522..3a82a522 100755..100644 --- a/backend/pseudo +++ b/backend/pseudo diff --git a/backend/runloop.c b/backend/runloop.c index 90bb9558..0b3f65f7 100644 --- a/backend/runloop.c +++ b/backend/runloop.c @@ -1,5 +1,5 @@ /* - * "$Id: runloop.c 10434 2012-04-23 21:47:41Z mike $" + * "$Id: runloop.c 9565 2011-02-23 00:08:08Z mike $" * * Common run loop APIs for CUPS backends. * @@ -539,5 +539,5 @@ backendWaitLoop( /* - * End of "$Id: runloop.c 10434 2012-04-23 21:47:41Z mike $". + * End of "$Id: runloop.c 9565 2011-02-23 00:08:08Z mike $". */ diff --git a/backend/snmp-supplies.c b/backend/snmp-supplies.c index 17128acc..7d20406b 100644 --- a/backend/snmp-supplies.c +++ b/backend/snmp-supplies.c @@ -1,9 +1,9 @@ /* - * "$Id: snmp-supplies.c 10493 2012-05-21 22:33:19Z mike $" + * "$Id: snmp-supplies.c 4298 2013-05-10 16:52:10Z msweet $" * * SNMP supplies functions for CUPS. * - * Copyright 2008-2012 by Apple Inc. + * Copyright 2008-2013 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -163,7 +163,7 @@ static const int prtMarkerSuppliesSupplyUnit[] = sizeof(prtMarkerSuppliesSupplyUnit[0])); /* Offset to supply index */ -static const backend_state_t const printer_states[] = +static const backend_state_t printer_states[] = { /* { CUPS_TC_lowPaper, "media-low-report" }, */ { CUPS_TC_noPaper | CUPS_TC_inputTrayEmpty, "media-empty-warning" }, @@ -180,7 +180,7 @@ static const backend_state_t const printer_states[] = { CUPS_TC_outputFull, "output-area-full-warning" } }; -static const backend_state_t const supply_states[] = +static const backend_state_t supply_states[] = { { CUPS_DEVELOPER_LOW, "developer-low-report" }, { CUPS_DEVELOPER_EMPTY, "developer-empty-warning" }, @@ -1073,5 +1073,5 @@ utf16_to_utf8( /* - * End of "$Id: snmp-supplies.c 10493 2012-05-21 22:33:19Z mike $". + * End of "$Id: snmp-supplies.c 4298 2013-05-10 16:52:10Z msweet $". */ diff --git a/backend/snmp.c b/backend/snmp.c index 4a887989..cffc7aaf 100644 --- a/backend/snmp.c +++ b/backend/snmp.c @@ -1,5 +1,5 @@ /* - * "$Id: snmp.c 10643 2012-10-09 03:02:49Z mike $" + * "$Id: snmp.c 7810 2008-07-29 01:11:15Z mike $" * * SNMP discovery backend for CUPS. * @@ -1391,5 +1391,5 @@ update_cache(snmp_cache_t *device, /* I - Device */ /* - * End of "$Id: snmp.c 10643 2012-10-09 03:02:49Z mike $". + * End of "$Id: snmp.c 7810 2008-07-29 01:11:15Z mike $". */ diff --git a/backend/socket.c b/backend/socket.c index 0c7fc75a..77255a39 100644 --- a/backend/socket.c +++ b/backend/socket.c @@ -1,5 +1,5 @@ /* - * "$Id: socket.c 10608 2012-09-15 19:42:21Z mike $" + * "$Id: socket.c 7881 2008-08-28 20:21:56Z mike $" * * AppSocket backend for CUPS. * @@ -535,5 +535,5 @@ wait_bc(int device_fd, /* I - Socket */ /* - * End of "$Id: socket.c 10608 2012-09-15 19:42:21Z mike $". + * End of "$Id: socket.c 7881 2008-08-28 20:21:56Z mike $". */ diff --git a/backend/test1284.c b/backend/test1284.c index 1080c195..b25bacb9 100644 --- a/backend/test1284.c +++ b/backend/test1284.c @@ -1,5 +1,5 @@ /* - * "$Id: test1284.c 9042 2010-03-24 00:45:34Z mike $" + * "$Id: test1284.c 7465 2008-04-18 16:20:11Z mike $" * * IEEE-1284 support functions test program for CUPS. * @@ -80,5 +80,5 @@ main(int argc, /* I - Number of command-line args */ /* - * End of "$Id: test1284.c 9042 2010-03-24 00:45:34Z mike $". + * End of "$Id: test1284.c 7465 2008-04-18 16:20:11Z mike $". */ diff --git a/backend/testbackend.c b/backend/testbackend.c index ad260701..bff39ebe 100644 --- a/backend/testbackend.c +++ b/backend/testbackend.c @@ -1,5 +1,5 @@ /* - * "$Id: testbackend.c 10389 2012-03-28 21:57:29Z mike $" + * "$Id: testbackend.c 3755 2012-03-30 05:59:14Z msweet $" * * Backend test program for CUPS. * @@ -672,5 +672,5 @@ walk_cb(const char *oid, /* I - OID */ /* - * End of "$Id: testbackend.c 10389 2012-03-28 21:57:29Z mike $". + * End of "$Id: testbackend.c 3755 2012-03-30 05:59:14Z msweet $". */ diff --git a/backend/testsupplies.c b/backend/testsupplies.c index 827cdf6f..0a300bc9 100644 --- a/backend/testsupplies.c +++ b/backend/testsupplies.c @@ -1,5 +1,5 @@ /* - * "$Id: testsupplies.c 9771 2011-05-12 05:21:56Z mike $" + * "$Id: testsupplies.c 3247 2011-05-12 06:22:31Z msweet $" * * SNMP supplies test program for CUPS. * @@ -79,5 +79,5 @@ main(int argc, /* I - Number of command-line args */ /* - * End of "$Id: testsupplies.c 9771 2011-05-12 05:21:56Z mike $". + * End of "$Id: testsupplies.c 3247 2011-05-12 06:22:31Z msweet $". */ diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c index fe2ec9f6..187bf3f5 100644 --- a/backend/usb-darwin.c +++ b/backend/usb-darwin.c @@ -1,5 +1,5 @@ /* -* "$Id: usb-darwin.c 10431 2012-04-23 19:19:19Z mike $" +* "$Id: usb-darwin.c 7953 2008-09-17 01:43:19Z mike $" * * Copyright 2005-2012 Apple Inc. All rights reserved. * @@ -2265,5 +2265,5 @@ static void get_device_id(cups_sc_status_t *status, /* - * End of "$Id: usb-darwin.c 10431 2012-04-23 19:19:19Z mike $". + * End of "$Id: usb-darwin.c 7953 2008-09-17 01:43:19Z mike $". */ diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c index e83d7097..9fe4a8c6 100644 --- a/backend/usb-libusb.c +++ b/backend/usb-libusb.c @@ -1,5 +1,5 @@ /* - * "$Id: usb-libusb.c 10908 2013-03-14 14:31:07Z mike $" + * "$Id: usb-libusb.c 10979 2013-05-13 17:39:19Z msweet $" * * LIBUSB interface code for CUPS. * @@ -142,8 +142,12 @@ static const struct quirk_printer_struct quirk_printers[] = { { 0x0409, 0xbef4, USBLP_QUIRK_BIDIR }, /* NEC Picty760 (HP OEM) */ { 0x0409, 0xf0be, USBLP_QUIRK_BIDIR }, /* NEC Picty920 (HP OEM) */ { 0x0409, 0xf1be, USBLP_QUIRK_BIDIR }, /* NEC Picty800 (HP OEM) */ + { 0x043d, 0x00f3, USBLP_QUIRK_NO_REATTACH }, /* Lexmark International, + Inc. (e250d), https://bugs.launchpad.net/bugs/1084164 */ { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */ + { 0x04a9, 0x1095, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP6000D + Printer, https://bugs.launchpad.net/bugs/1160638 */ { 0x04a9, 0x10a2, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4200 Printer, http://www.cups.org/str.php?L4155 */ { 0x04a9, 0x10b6, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4300 @@ -158,6 +162,8 @@ static const struct quirk_printer_struct quirk_printers[] = { Printer, http://www.cups.org/str.php?L4155 */ { 0x04a9, 0x173e, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP560 Printer, http://www.cups.org/str.php?L4155 */ + { 0x04a9, 0x26a3, USBLP_QUIRK_NO_REATTACH }, /* Canon, Inc. MF4150 + Printer, https://bugs.launchpad.net/bugs/1160638 */ { 0x04f9, 0x001a, USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd HL-1430 Laser Printer, https://bugs.launchpad.net/bugs/1038695 */ @@ -165,24 +171,33 @@ static const struct quirk_printer_struct quirk_printers[] = { USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd HL-1440 Laser Printer, https://bugs.launchpad.net/bugs/1000253 */ + { 0x04f9, 0x000e, USBLP_QUIRK_BIDIR | + USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd + HL-1450 Laser Printer, + https://bugs.launchpad.net/bugs/1000253 */ { 0x06bc, 0x000b, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp. Okipage 14ex Printer, https://bugs.launchpad.net/bugs/872483 */ { 0x06bc, 0x01c7, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp. B410d, https://bugs.launchpad.net/bugs/872483 */ - { 0x04b8, 0x0001, USBLP_QUIRK_BIDIR }, /* Seiko Epson Corp. Stylus Color 740 / Photo 750, + { 0x04b8, 0x0001, USBLP_QUIRK_BIDIR | + USBLP_QUIRK_NO_REATTACH }, /* Seiko Epson Corp. Stylus Color 740 / Photo 750, http://bugs.debian.org/697970 */ + { 0x04b8, 0x0005, USBLP_QUIRK_NO_REATTACH }, /* Seiko Epson Corp. Stylus Color 670, + https://bugs.launchpad.net/bugs/872483 */ { 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt Printer M129C */ { 0x067b, 0x2305, USBLP_QUIRK_BIDIR | USBLP_QUIRK_NO_REATTACH | USBLP_QUIRK_RESET }, + /* Prolific Technology, Inc. PL2305 Parallel Port + (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */ { 0x0924, 0x3ce9, USBLP_QUIRK_NO_REATTACH }, /* Xerox Phaser 3124 https://bugzilla.redhat.com/show_bug.cgi?id=867392 */ { 0x0924, 0x4293, USBLP_QUIRK_NO_REATTACH }, /* Xerox WorkCentre 3210 https://bugs.launchpad.net/bugs/1102470 */ - /* Prolific Technology, Inc. PL2305 Parallel Port - (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */ + { 0x1a86, 0x7584, USBLP_QUIRK_NO_REATTACH }, /* QinHeng Electronics + CH340S (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/1000253 */ { 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices, https://bugs.launchpad.net/bugs/1032456 */ { 0x0a5f, 0x0000, USBLP_QUIRK_BIDIR }, /* All Zebra devices, @@ -215,6 +230,7 @@ static const struct quirk_printer_struct quirk_printers[] = { { 0x04a9, 0x3256, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP810 */ { 0x04a9, 0x30F5, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP500 */ { 0x04a9, 0x31AF, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY ES3 */ + { 0x04a9, 0x31DD, USBLP_QUIRK_BLACKLIST }, /* Canon SELPHY CP780 */ /* MISSING PIDs: CP520, CP530, CP790 */ { 0, 0 } }; @@ -883,7 +899,8 @@ find_device(usb_cb_t cb, /* I - Callback function */ /* Pointer to current alternate setting */ const struct libusb_endpoint_descriptor *endpptr = NULL; /* Pointer to current endpoint */ - ssize_t numdevs, /* number of connected devices */ + ssize_t err = 0, /* Error code */ + numdevs, /* number of connected devices */ i = 0; uint8_t conf, /* Current configuration */ iface, /* Current interface */ @@ -902,7 +919,14 @@ find_device(usb_cb_t cb, /* I - Callback function */ * Initialize libusb... */ - libusb_init(NULL); + err = libusb_init(NULL); + if (err) + { + fprintf(stderr, "DEBUG: Unable to initialize USB access via libusb, " + "libusb error %i\n", err); + return (NULL); + } + numdevs = libusb_get_device_list(NULL, &list); fprintf(stderr, "DEBUG: libusb_get_device_list=%d\n", (int)numdevs); @@ -1072,7 +1096,8 @@ find_device(usb_cb_t cb, /* I - Callback function */ * Clean up .... */ - libusb_free_device_list(list, 1); + if (numdevs >= 0) + libusb_free_device_list(list, 1); libusb_exit(NULL); return (NULL); @@ -1957,6 +1982,6 @@ static void soft_reset(void) /* - * End of "$Id: usb-libusb.c 10908 2013-03-14 14:31:07Z mike $". + * End of "$Id: usb-libusb.c 10979 2013-05-13 17:39:19Z msweet $". */ diff --git a/backend/usb-unix.c b/backend/usb-unix.c index ea23c396..b06825f7 100644 --- a/backend/usb-unix.c +++ b/backend/usb-unix.c @@ -1,5 +1,5 @@ /* - * "$Id: usb-unix.c 10431 2012-04-23 19:19:19Z mike $" + * "$Id: usb-unix.c 7810 2008-07-29 01:11:15Z mike $" * * USB port backend for CUPS. * @@ -613,5 +613,5 @@ side_cb(int print_fd, /* I - Print file */ /* - * End of "$Id: usb-unix.c 10431 2012-04-23 19:19:19Z mike $". + * End of "$Id: usb-unix.c 7810 2008-07-29 01:11:15Z mike $". */ diff --git a/backend/usb.c b/backend/usb.c index 1cacb82a..2e024e61 100644 --- a/backend/usb.c +++ b/backend/usb.c @@ -1,5 +1,5 @@ /* - * "$Id: usb.c 10264 2012-02-12 07:18:31Z mike $" + * "$Id: usb.c 7687 2008-06-24 01:28:36Z mike $" * * USB port backend for CUPS. * @@ -260,5 +260,5 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */ /* - * End of "$Id: usb.c 10264 2012-02-12 07:18:31Z mike $". + * End of "$Id: usb.c 7687 2008-06-24 01:28:36Z mike $". */ diff --git a/berkeley/Makefile b/berkeley/Makefile index b9b0d517..8a154c50 100644 --- a/berkeley/Makefile +++ b/berkeley/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 10191 2012-01-20 19:00:32Z mike $" +# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $" # # Berkeley commands makefile for CUPS. # @@ -163,5 +163,5 @@ include Dependencies # -# End of "$Id: Makefile 10191 2012-01-20 19:00:32Z mike $". +# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $". # diff --git a/berkeley/lpc.c b/berkeley/lpc.c index 8ea68ed9..e1003b1b 100644 --- a/berkeley/lpc.c +++ b/berkeley/lpc.c @@ -1,5 +1,5 @@ /* - * "$Id: lpc.c 10378 2012-03-23 21:38:25Z mike $" + * "$Id: lpc.c 7079 2007-11-30 01:58:31Z mike $" * * "lpc" command for CUPS. * @@ -446,5 +446,5 @@ show_status(http_t *http, /* I - HTTP connection to server */ /* - * End of "$Id: lpc.c 10378 2012-03-23 21:38:25Z mike $". + * End of "$Id: lpc.c 7079 2007-11-30 01:58:31Z mike $". */ diff --git a/berkeley/lpq.c b/berkeley/lpq.c index cdc00147..1071817e 100644 --- a/berkeley/lpq.c +++ b/berkeley/lpq.c @@ -1,9 +1,9 @@ /* - * "$Id: lpq.c 10540 2012-07-16 16:50:32Z mike $" + * "$Id: lpq.c 7460 2008-04-16 02:19:54Z mike $" * * "lpq" command for CUPS. * - * Copyright 2007-2012 by Apple Inc. + * Copyright 2007-2013 by Apple Inc. * Copyright 1997-2006 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -60,8 +60,7 @@ main(int argc, /* I - Number of command-line arguments */ all, /* All printers */ interval, /* Reporting interval */ longstatus; /* Show file details */ - int num_dests; /* Number of destinations */ - cups_dest_t *dests; /* Destinations */ + cups_dest_t *named_dest; /* Named destination */ _cupsSetLocale(argv); @@ -77,8 +76,6 @@ main(int argc, /* I - Number of command-line arguments */ interval = 0; longstatus = 0; all = 0; - num_dests = 0; - dests = NULL; for (i = 1; i < argc; i ++) if (argv[i][0] == '+') @@ -127,7 +124,6 @@ main(int argc, /* I - Number of command-line arguments */ if (i >= argc) { httpClose(http); - cupsFreeDests(num_dests, dests); usage(); } @@ -140,12 +136,14 @@ main(int argc, /* I - Number of command-line arguments */ http = connect_server(argv[0], http); - if (num_dests == 0) - num_dests = cupsGetDests2(http, &dests); - - if (cupsGetDest(dest, instance, num_dests, dests) == NULL) + if ((named_dest = cupsGetNamedDest(http, dest, instance)) == NULL) { - if (instance) + if (cupsLastError() == IPP_BAD_REQUEST || + cupsLastError() == IPP_VERSION_NOT_SUPPORTED) + _cupsLangPrintf(stderr, + _("%s: Error - add '/version=1.1' to server " + "name."), argv[0]); + else if (instance) _cupsLangPrintf(stderr, _("%s: Error - unknown destination \"%s/%s\"."), argv[0], dest, instance); @@ -155,6 +153,8 @@ main(int argc, /* I - Number of command-line arguments */ return (1); } + + cupsFreeDests(1, named_dest); break; case 'a' : /* All printers */ @@ -192,7 +192,6 @@ main(int argc, /* I - Number of command-line arguments */ default : httpClose(http); - cupsFreeDests(num_dests, dests); usage(); break; @@ -207,15 +206,17 @@ main(int argc, /* I - Number of command-line arguments */ if (dest == NULL && !all) { - if (num_dests == 0) - num_dests = cupsGetDests2(http, &dests); - - for (i = 0; i < num_dests; i ++) - if (dests[i].is_default) - dest = dests[i].name; - - if (dest == NULL) + if ((named_dest = cupsGetNamedDest(http, NULL, NULL)) == NULL) { + if (cupsLastError() == IPP_BAD_REQUEST || + cupsLastError() == IPP_VERSION_NOT_SUPPORTED) + { + _cupsLangPrintf(stderr, + _("%s: Error - add '/version=1.1' to server name."), + argv[0]); + return (1); + } + val = NULL; if ((dest = getenv("LPDEST")) == NULL) @@ -231,7 +232,7 @@ main(int argc, /* I - Number of command-line arguments */ else val = "LPDEST"; - if (dest && !cupsGetDest(dest, NULL, num_dests, dests)) + if (dest && val) _cupsLangPrintf(stderr, _("%s: Error - %s environment variable names " "non-existent destination \"%s\"."), argv[0], val, @@ -241,9 +242,10 @@ main(int argc, /* I - Number of command-line arguments */ _("%s: Error - no default destination available."), argv[0]); httpClose(http); - cupsFreeDests(num_dests, dests); return (1); } + + dest = named_dest->name; } /* @@ -270,7 +272,6 @@ main(int argc, /* I - Number of command-line arguments */ * Close the connection to the server and return... */ - cupsFreeDests(num_dests, dests); httpClose(http); return (0); @@ -678,5 +679,5 @@ usage(void) /* - * End of "$Id: lpq.c 10540 2012-07-16 16:50:32Z mike $". + * End of "$Id: lpq.c 7460 2008-04-16 02:19:54Z mike $". */ diff --git a/berkeley/lpr.c b/berkeley/lpr.c index 842e9dc9..5f983748 100644 --- a/berkeley/lpr.c +++ b/berkeley/lpr.c @@ -1,9 +1,9 @@ /* - * "$Id: lpr.c 10494 2012-05-21 22:39:01Z mike $" + * "$Id: lpr.c 7720 2008-07-11 22:46:21Z mike $" * * "lpr" command for CUPS. * - * Copyright 2007-2012 by Apple Inc. + * Copyright 2007-2013 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -61,6 +61,7 @@ main(int argc, /* I - Number of command-line arguments */ for (i = 1; i < argc; i ++) if (argv[i][0] == '-') + { switch (ch = argv[i][1]) { case 'E' : /* Encrypt */ @@ -226,6 +227,14 @@ main(int argc, /* I - Number of command-line arguments */ dest->options[j].value, num_options, &options); } + else if (cupsLastError() == IPP_BAD_REQUEST || + cupsLastError() == IPP_VERSION_NOT_SUPPORTED) + { + _cupsLangPrintf(stderr, + _("%s: Error - add '/version=1.1' to server " + "name."), argv[0]); + return (1); + } break; case '#' : /* Number of copies */ @@ -275,6 +284,7 @@ main(int argc, /* I - Number of command-line arguments */ argv[i][1]); return (1); } + } else if (num_files < 1000) { /* @@ -320,6 +330,14 @@ main(int argc, /* I - Number of command-line arguments */ dest->options[j].value, num_options, &options); } + else if (cupsLastError() == IPP_BAD_REQUEST || + cupsLastError() == IPP_VERSION_NOT_SUPPORTED) + { + _cupsLangPrintf(stderr, + _("%s: Error - add '/version=1.1' to server " + "name."), argv[0]); + return (1); + } } if (printer == NULL) @@ -418,5 +436,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: lpr.c 10494 2012-05-21 22:39:01Z mike $". + * End of "$Id: lpr.c 7720 2008-07-11 22:46:21Z mike $". */ diff --git a/berkeley/lprm.c b/berkeley/lprm.c index 6d69a461..5e12c74f 100644 --- a/berkeley/lprm.c +++ b/berkeley/lprm.c @@ -1,5 +1,5 @@ /* - * "$Id: lprm.c 9384 2010-11-22 07:06:39Z mike $" + * "$Id: lprm.c 7261 2008-01-28 23:09:31Z mike $" * * "lprm" command for CUPS. * @@ -213,5 +213,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: lprm.c 9384 2010-11-22 07:06:39Z mike $". + * End of "$Id: lprm.c 7261 2008-01-28 23:09:31Z mike $". */ diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile index b86321fc..15260420 100644 --- a/cgi-bin/Makefile +++ b/cgi-bin/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 10191 2012-01-20 19:00:32Z mike $" +# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $" # # CGI makefile for CUPS. # @@ -378,5 +378,5 @@ include Dependencies # -# End of "$Id: Makefile 10191 2012-01-20 19:00:32Z mike $". +# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $". # diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c index dac10d48..d0f488e5 100644 --- a/cgi-bin/admin.c +++ b/cgi-bin/admin.c @@ -1,5 +1,5 @@ /* - * "$Id: admin.c 10431 2012-04-23 19:19:19Z mike $" + * "$Id: admin.c 8029 2008-10-08 21:07:45Z mike $" * * Administration CGI for CUPS. * @@ -4218,5 +4218,5 @@ get_points(double number, /* I - Original number */ /* - * End of "$Id: admin.c 10431 2012-04-23 19:19:19Z mike $". + * End of "$Id: admin.c 8029 2008-10-08 21:07:45Z mike $". */ diff --git a/cgi-bin/cgi-private.h b/cgi-bin/cgi-private.h index 3503ed12..412bdc39 100644 --- a/cgi-bin/cgi-private.h +++ b/cgi-bin/cgi-private.h @@ -1,5 +1,5 @@ /* - * "$Id: cgi-private.h 10097 2011-11-02 05:35:38Z mike $" + * "$Id: cgi-private.h 7940 2008-09-16 00:45:16Z mike $" * * Private CGI definitions for CUPS. * @@ -32,5 +32,5 @@ /* - * End of "$Id: cgi-private.h 10097 2011-11-02 05:35:38Z mike $". + * End of "$Id: cgi-private.h 7940 2008-09-16 00:45:16Z mike $". */ diff --git a/cgi-bin/cgi.h b/cgi-bin/cgi.h index c6562abe..bceb5f51 100644 --- a/cgi-bin/cgi.h +++ b/cgi-bin/cgi.h @@ -1,5 +1,5 @@ /* - * "$Id: cgi.h 8976 2010-02-02 07:12:05Z mike $" + * "$Id: cgi.h 6649 2007-07-11 21:46:42Z mike $" * * CGI support library definitions for CUPS. * @@ -115,5 +115,5 @@ extern const char *cgiText(const char *message); #endif /* !_CUPS_CGI_H_ */ /* - * End of "$Id: cgi.h 8976 2010-02-02 07:12:05Z mike $". + * End of "$Id: cgi.h 6649 2007-07-11 21:46:42Z mike $". */ diff --git a/cgi-bin/classes.c b/cgi-bin/classes.c index e7b9bf48..8d42e5cd 100644 --- a/cgi-bin/classes.c +++ b/cgi-bin/classes.c @@ -1,5 +1,5 @@ /* - * "$Id: classes.c 10608 2012-09-15 19:42:21Z mike $" + * "$Id: classes.c 7940 2008-09-16 00:45:16Z mike $" * * Class status CGI for CUPS. * @@ -554,5 +554,5 @@ show_class(http_t *http, /* I - Connection to server */ /* - * End of "$Id: classes.c 10608 2012-09-15 19:42:21Z mike $". + * End of "$Id: classes.c 7940 2008-09-16 00:45:16Z mike $". */ diff --git a/cgi-bin/help-index.c b/cgi-bin/help-index.c index 444928e9..c48ffeb4 100644 --- a/cgi-bin/help-index.c +++ b/cgi-bin/help-index.c @@ -1,5 +1,5 @@ /* - * "$Id: help-index.c 9950 2011-09-01 23:02:24Z mike $" + * "$Id: help-index.c 7717 2008-07-04 02:35:33Z mike $" * * Online help index routines for CUPS. * @@ -1324,5 +1324,5 @@ help_sort_words(help_word_t *w1, /* I - Second word */ /* - * End of "$Id: help-index.c 9950 2011-09-01 23:02:24Z mike $". + * End of "$Id: help-index.c 7717 2008-07-04 02:35:33Z mike $". */ diff --git a/cgi-bin/help-index.h b/cgi-bin/help-index.h index 253b5871..676be675 100644 --- a/cgi-bin/help-index.h +++ b/cgi-bin/help-index.h @@ -1,5 +1,5 @@ /* - * "$Id: help-index.h 9771 2011-05-12 05:21:56Z mike $" + * "$Id: help-index.h 7615 2008-05-25 07:17:07Z mike $" * * Online help index definitions for CUPS. * @@ -83,5 +83,5 @@ extern help_index_t *helpSearchIndex(help_index_t *hi, const char *query, #endif /* !_CUPS_HELP_INDEX_H_ */ /* - * End of "$Id: help-index.h 9771 2011-05-12 05:21:56Z mike $". + * End of "$Id: help-index.h 7615 2008-05-25 07:17:07Z mike $". */ diff --git a/cgi-bin/html.c b/cgi-bin/html.c index 98932983..ea2b3f70 100644 --- a/cgi-bin/html.c +++ b/cgi-bin/html.c @@ -1,5 +1,5 @@ /* - * "$Id: html.c 9449 2011-01-08 00:56:50Z mike $" + * "$Id: html.c 6649 2007-07-11 21:46:42Z mike $" * * HTML support functions for CUPS. * @@ -235,5 +235,5 @@ cgi_null_passwd(const char *prompt) /* I - Prompt string (unused) */ /* - * End of "$Id: html.c 9449 2011-01-08 00:56:50Z mike $". + * End of "$Id: html.c 6649 2007-07-11 21:46:42Z mike $". */ diff --git a/cgi-bin/ipp-var.c b/cgi-bin/ipp-var.c index 85c8195c..cc461967 100644 --- a/cgi-bin/ipp-var.c +++ b/cgi-bin/ipp-var.c @@ -1,5 +1,5 @@ /* - * "$Id: ipp-var.c 10608 2012-09-15 19:42:21Z mike $" + * "$Id: ipp-var.c 7940 2008-09-16 00:45:16Z mike $" * * CGI <-> IPP variable routines for CUPS. * @@ -554,8 +554,8 @@ cgiPrintCommand(http_t *http, /* I - Connection to server */ ipp_t *request, /* Get-Job-Attributes request */ *response; /* Get-Job-Attributes response */ ipp_attribute_t *attr; /* Current job attribute */ - static const char const *job_attrs[] =/* Job attributes we want */ - { + static const char * const job_attrs[] = + { /* Job attributes we want */ "job-state", "job-printer-state-message" }; @@ -1589,5 +1589,5 @@ cgiText(const char *message) /* I - Message */ /* - * End of "$Id: ipp-var.c 10608 2012-09-15 19:42:21Z mike $". + * End of "$Id: ipp-var.c 7940 2008-09-16 00:45:16Z mike $". */ diff --git a/cgi-bin/jobs.c b/cgi-bin/jobs.c index 893d1054..30aefa66 100644 --- a/cgi-bin/jobs.c +++ b/cgi-bin/jobs.c @@ -1,5 +1,5 @@ /* - * "$Id: jobs.c 10431 2012-04-23 19:19:19Z mike $" + * "$Id: jobs.c 7237 2008-01-22 01:38:39Z mike $" * * Job status CGI for CUPS. * @@ -210,5 +210,5 @@ do_job_op(http_t *http, /* I - HTTP connection */ /* - * End of "$Id: jobs.c 10431 2012-04-23 19:19:19Z mike $". + * End of "$Id: jobs.c 7237 2008-01-22 01:38:39Z mike $". */ diff --git a/cgi-bin/makedocset.c b/cgi-bin/makedocset.c index 4868b879..6be2797b 100644 --- a/cgi-bin/makedocset.c +++ b/cgi-bin/makedocset.c @@ -1,5 +1,5 @@ /* - * "$Id: makedocset.c 10507 2012-05-23 22:39:50Z mike $" + * "$Id: makedocset.c 3833 2012-05-23 22:51:18Z msweet $" * * Xcode documentation set generator. * @@ -482,5 +482,5 @@ write_nodes(const char *path, /* I - File to write */ /* - * End of "$Id: makedocset.c 10507 2012-05-23 22:39:50Z mike $". + * End of "$Id: makedocset.c 3833 2012-05-23 22:51:18Z msweet $". */ diff --git a/cgi-bin/printers.c b/cgi-bin/printers.c index ed9cb227..36e99202 100644 --- a/cgi-bin/printers.c +++ b/cgi-bin/printers.c @@ -1,5 +1,5 @@ /* - * "$Id: printers.c 10608 2012-09-15 19:42:21Z mike $" + * "$Id: printers.c 7940 2008-09-16 00:45:16Z mike $" * * Printer status CGI for CUPS. * @@ -574,5 +574,5 @@ show_printer(http_t *http, /* I - Connection to server */ /* - * End of "$Id: printers.c 10608 2012-09-15 19:42:21Z mike $". + * End of "$Id: printers.c 7940 2008-09-16 00:45:16Z mike $". */ diff --git a/cgi-bin/search.c b/cgi-bin/search.c index 75c47bd6..f8d6c797 100644 --- a/cgi-bin/search.c +++ b/cgi-bin/search.c @@ -1,5 +1,5 @@ /* - * "$Id: search.c 9793 2011-05-20 03:49:49Z mike $" + * "$Id: search.c 7720 2008-07-11 22:46:21Z mike $" * * Search routines for CUPS. * @@ -377,5 +377,5 @@ cgiFreeSearch(void *search) /* I - Search context */ /* - * End of "$Id: search.c 9793 2011-05-20 03:49:49Z mike $". + * End of "$Id: search.c 7720 2008-07-11 22:46:21Z mike $". */ diff --git a/cgi-bin/template.c b/cgi-bin/template.c index 8fb8b3f5..77bfbe3a 100644 --- a/cgi-bin/template.c +++ b/cgi-bin/template.c @@ -1,5 +1,5 @@ /* - * "$Id: template.c 9793 2011-05-20 03:49:49Z mike $" + * "$Id: template.c 7219 2008-01-14 22:00:02Z mike $" * * CGI template function. * @@ -729,5 +729,5 @@ cgi_puturi(const char *s, /* I - String to output */ /* - * End of "$Id: template.c 9793 2011-05-20 03:49:49Z mike $". + * End of "$Id: template.c 7219 2008-01-14 22:00:02Z mike $". */ diff --git a/cgi-bin/testcgi.c b/cgi-bin/testcgi.c index 0ed1269b..88fcce4f 100644 --- a/cgi-bin/testcgi.c +++ b/cgi-bin/testcgi.c @@ -1,5 +1,5 @@ /* - * "$Id: testcgi.c 9771 2011-05-12 05:21:56Z mike $" + * "$Id: testcgi.c 6649 2007-07-11 21:46:42Z mike $" * * CGI test program for CUPS. * @@ -71,5 +71,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: testcgi.c 9771 2011-05-12 05:21:56Z mike $". + * End of "$Id: testcgi.c 6649 2007-07-11 21:46:42Z mike $". */ diff --git a/cgi-bin/testhi.c b/cgi-bin/testhi.c index 93f1f632..3defe45e 100644 --- a/cgi-bin/testhi.c +++ b/cgi-bin/testhi.c @@ -1,5 +1,5 @@ /* - * "$Id: testhi.c 9771 2011-05-12 05:21:56Z mike $" + * "$Id: testhi.c 6649 2007-07-11 21:46:42Z mike $" * * Help index test program for CUPS. * @@ -109,5 +109,5 @@ list_nodes(const char *title, /* I - Title string */ /* - * End of "$Id: testhi.c 9771 2011-05-12 05:21:56Z mike $". + * End of "$Id: testhi.c 6649 2007-07-11 21:46:42Z mike $". */ diff --git a/cgi-bin/testtemplate.c b/cgi-bin/testtemplate.c index 6ced30cc..a257fc06 100644 --- a/cgi-bin/testtemplate.c +++ b/cgi-bin/testtemplate.c @@ -1,5 +1,5 @@ /* - * "$Id: testtemplate.c 9771 2011-05-12 05:21:56Z mike $" + * "$Id: testtemplate.c 6649 2007-07-11 21:46:42Z mike $" * * CGI template test program for CUPS. * @@ -99,5 +99,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: testtemplate.c 9771 2011-05-12 05:21:56Z mike $". + * End of "$Id: testtemplate.c 6649 2007-07-11 21:46:42Z mike $". */ diff --git a/cgi-bin/var.c b/cgi-bin/var.c index 088f3254..8b8c026c 100644 --- a/cgi-bin/var.c +++ b/cgi-bin/var.c @@ -1,5 +1,5 @@ /* - * "$Id: var.c 10346 2012-03-12 15:37:13Z mike $" + * "$Id: var.c 7460 2008-04-16 02:19:54Z mike $" * * CGI form variable and array functions for CUPS. * @@ -1307,5 +1307,5 @@ cgi_unlink_file(void) /* - * End of "$Id: var.c 10346 2012-03-12 15:37:13Z mike $". + * End of "$Id: var.c 7460 2008-04-16 02:19:54Z mike $". */ diff --git a/cgi-bin/websearch.c b/cgi-bin/websearch.c index f096ba2d..20d8d7e4 100644 --- a/cgi-bin/websearch.c +++ b/cgi-bin/websearch.c @@ -1,5 +1,5 @@ /* - * "$Id: websearch.c 8668 2009-05-21 00:21:27Z mike $" + * "$Id: websearch.c 1531 2009-05-22 21:50:50Z msweet $" * * Web search program for www.cups.org. * @@ -112,5 +112,5 @@ list_nodes(help_index_t *hi, /* I - Help index */ /* - * End of "$Id: websearch.c 8668 2009-05-21 00:21:27Z mike $". + * End of "$Id: websearch.c 1531 2009-05-22 21:50:50Z msweet $". */ diff --git a/conf/Makefile b/conf/Makefile index 7da088b1..a68a58b1 100644 --- a/conf/Makefile +++ b/conf/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 10710 2012-11-26 18:26:01Z mike $" +# "$Id: Makefile 7938 2008-09-11 23:53:59Z mike $" # # Configuration file makefile for CUPS. # @@ -139,5 +139,5 @@ uninstall: # -# End of "$Id: Makefile 10710 2012-11-26 18:26:01Z mike $". +# End of "$Id: Makefile 7938 2008-09-11 23:53:59Z mike $". # diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in index be5df620..ead92f53 100644 --- a/conf/cups-files.conf.in +++ b/conf/cups-files.conf.in @@ -1,5 +1,5 @@ # -# "$Id: cups-files.conf.in 10765 2012-12-13 20:36:17Z mike $" +# "$Id: cups-files.conf.in 4185 2013-02-20 02:19:13Z msweet $" # # Sample file/directory/user/group configuration file for the CUPS scheduler. # See "man cups-files.conf" for a complete description of this file. @@ -94,5 +94,5 @@ PageLog @CUPS_LOGDIR@/page_log #TempDir @CUPS_REQUESTS@/tmp # -# End of "$Id: cups-files.conf.in 10765 2012-12-13 20:36:17Z mike $". +# End of "$Id: cups-files.conf.in 4185 2013-02-20 02:19:13Z msweet $". # diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in index 256c1e21..5ae2c9f0 100644 --- a/conf/cupsd.conf.in +++ b/conf/cupsd.conf.in @@ -1,5 +1,5 @@ # -# "$Id: cupsd.conf.in 10710 2012-11-26 18:26:01Z mike $" +# "$Id: cupsd.conf.in 7888 2008-08-29 21:16:56Z mike $" # # Sample configuration file for the CUPS scheduler. See "man cupsd.conf" for a # complete description of this file. @@ -130,5 +130,5 @@ WebInterface @CUPS_WEBIF@ </Policy> # -# End of "$Id: cupsd.conf.in 10710 2012-11-26 18:26:01Z mike $". +# End of "$Id: cupsd.conf.in 7888 2008-08-29 21:16:56Z mike $". # diff --git a/conf/mime.convs.in b/conf/mime.convs.in index ecd127a6..533fd955 100644 --- a/conf/mime.convs.in +++ b/conf/mime.convs.in @@ -1,5 +1,5 @@ # -# "$Id: mime.convs.in 9926 2011-08-27 09:23:01Z mike $" +# "$Id: mime.convs.in 6761 2007-08-02 17:58:59Z mike $" # # DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW # VERSIONS OF CUPS. Instead, create a "local.convs" file that @@ -59,5 +59,5 @@ application/vnd.cups-raster image/pwg-raster 100 rastertopwg @DEFAULT_RAW_PRINTING@application/octet-stream application/vnd.cups-raw 0 - # -# End of "$Id: mime.convs.in 9926 2011-08-27 09:23:01Z mike $". +# End of "$Id: mime.convs.in 6761 2007-08-02 17:58:59Z mike $". # diff --git a/conf/mime.types b/conf/mime.types index 21ec3bd0..217d75be 100644 --- a/conf/mime.types +++ b/conf/mime.types @@ -1,5 +1,5 @@ # -# "$Id: mime.types 9871 2011-08-06 06:34:46Z mike $" +# "$Id: mime.types 7670 2008-06-17 22:42:08Z mike $" # # Base MIME types file for CUPS. # @@ -170,5 +170,5 @@ application/vnd.cups-raw (string(0,<1B>E) + !string(2,<1B>%0B)) \ application/octet-stream # -# End of "$Id: mime.types 9871 2011-08-06 06:34:46Z mike $". +# End of "$Id: mime.types 7670 2008-06-17 22:42:08Z mike $". # diff --git a/conf/snmp.conf.in b/conf/snmp.conf.in index 1e8dfbcb..43855ab6 100644 --- a/conf/snmp.conf.in +++ b/conf/snmp.conf.in @@ -1,5 +1,5 @@ # -# "$Id: snmp.conf.in 9045 2010-03-24 07:48:42Z mike $" +# "$Id$" # # Sample SNMP configuration file for CUPS. See "man cups-snmp.conf" for a # complete description of this file. @@ -9,5 +9,5 @@ @CUPS_SNMP_COMMUNITY@ # -# End of "$Id: snmp.conf.in 9045 2010-03-24 07:48:42Z mike $". +# End of "$Id$". # diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index fa9ef142..922e1190 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -1,9 +1,9 @@ dnl -dnl "$Id: cups-common.m4 10785 2013-01-08 16:29:26Z mike $" +dnl "$Id: cups-common.m4 8781 2009-08-28 17:34:54Z mike $" dnl dnl Common configuration stuff for CUPS. dnl -dnl Copyright 2007-2012 by Apple Inc. +dnl Copyright 2007-2013 by Apple Inc. dnl Copyright 1997-2007 by Easy Software Products, all rights reserved. dnl dnl These coded instructions, statements, and computer programs are the @@ -20,7 +20,7 @@ dnl Set the name of the config header file... AC_CONFIG_HEADER(config.h) dnl Version number information... -CUPS_VERSION=1.6.2 +CUPS_VERSION=1.6.3 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'`" @@ -44,9 +44,9 @@ LDFLAGS="${LDFLAGS:=}" dnl Checks for programs... AC_PROG_AWK -AC_PROG_CC +AC_PROG_CC(clang cc gcc) AC_PROG_CPP -AC_PROG_CXX +AC_PROG_CXX(clang++ c++ g++) AC_PROG_RANLIB AC_PATH_PROG(AR,ar) AC_PATH_PROG(CHMOD,chmod) @@ -337,6 +337,7 @@ AC_SUBST(DBUS_NOTIFIERLIBS) dnl Extra platform-specific libraries... CUPS_DEFAULT_PRINTOPERATOR_AUTH="@SYSTEM" +CUPS_DEFAULT_SYSTEM_AUTHKEY="" CUPS_SYSTEM_AUTHKEY="" INSTALLXPC="" @@ -384,10 +385,13 @@ case $uname in if test "x$default_adminkey" != xdefault; then CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey $default_adminkey" + CUPS_DEFAULT_SYSTEM_AUTHKEY="$default_adminkey" elif grep -q system.print.operator /etc/authorization; then CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.print.admin" + CUPS_DEFAULT_SYSTEM_AUTHKEY="system.print.admin" else CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.preferences" + CUPS_DEFAULT_SYSTEM_AUTHKEY="system.preferences" fi if test "x$default_operkey" != xdefault; then @@ -425,6 +429,7 @@ esac AC_SUBST(CUPS_DEFAULT_PRINTOPERATOR_AUTH) AC_DEFINE_UNQUOTED(CUPS_DEFAULT_PRINTOPERATOR_AUTH, "$CUPS_DEFAULT_PRINTOPERATOR_AUTH") +AC_DEFINE_UNQUOTED(CUPS_DEFAULT_SYSTEM_AUTHKEY, "$CUPS_DEFAULT_SYSTEM_AUTHKEY") AC_SUBST(CUPS_SYSTEM_AUTHKEY) AC_SUBST(INSTALLXPC) @@ -453,5 +458,5 @@ esac AC_SUBST(BUILDDIRS) dnl -dnl End of "$Id: cups-common.m4 10785 2013-01-08 16:29:26Z mike $". +dnl End of "$Id: cups-common.m4 8781 2009-08-28 17:34:54Z mike $". dnl diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4 index fc415c55..4286895c 100644 --- a/config-scripts/cups-compiler.m4 +++ b/config-scripts/cups-compiler.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-compiler.m4 10190 2012-01-20 16:22:58Z mike $" +dnl "$Id: cups-compiler.m4 7871 2008-08-27 21:12:43Z mike $" dnl dnl Compiler stuff for CUPS. dnl @@ -295,5 +295,5 @@ case $uname in esac dnl -dnl End of "$Id: cups-compiler.m4 10190 2012-01-20 16:22:58Z mike $". +dnl End of "$Id: cups-compiler.m4 7871 2008-08-27 21:12:43Z mike $". dnl diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4 index 4054eb7f..173cfeac 100644 --- a/config-scripts/cups-defaults.m4 +++ b/config-scripts/cups-defaults.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-defaults.m4 10710 2012-11-26 18:26:01Z mike $" +dnl "$Id: cups-defaults.m4 7959 2008-09-17 19:30:58Z mike $" dnl dnl Default cupsd configuration settings for CUPS. dnl @@ -400,5 +400,5 @@ AC_SUBST(CUPS_WEBIF) AC_DEFINE_UNQUOTED(CUPS_DEFAULT_WEBIF, $CUPS_DEFAULT_WEBIF) dnl -dnl End of "$Id: cups-defaults.m4 10710 2012-11-26 18:26:01Z mike $". +dnl End of "$Id: cups-defaults.m4 7959 2008-09-17 19:30:58Z mike $". dnl diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 index fa72b112..fe6e01e1 100644 --- a/config-scripts/cups-directories.m4 +++ b/config-scripts/cups-directories.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-directories.m4 10622 2012-10-01 01:55:23Z mike $" +dnl "$Id: cups-directories.m4 7799 2008-07-25 20:06:08Z mike $" dnl dnl Directory stuff for CUPS. dnl @@ -436,5 +436,5 @@ AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR") AC_SUBST(CUPS_STATEDIR) dnl -dnl End of "$Id: cups-directories.m4 10622 2012-10-01 01:55:23Z mike $". +dnl End of "$Id: cups-directories.m4 7799 2008-07-25 20:06:08Z mike $". dnl diff --git a/config-scripts/cups-dnssd.m4 b/config-scripts/cups-dnssd.m4 index b44938d4..426637a2 100644 --- a/config-scripts/cups-dnssd.m4 +++ b/config-scripts/cups-dnssd.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-dnssd.m4 10471 2012-05-16 22:57:03Z mike $" +dnl "$Id: cups-dnssd.m4 7890 2008-08-29 22:19:39Z mike $" dnl dnl DNS Service Discovery (aka Bonjour) stuff for CUPS. dnl @@ -72,5 +72,5 @@ AC_SUBST(DNSSDLIBS) AC_SUBST(DNSSD_BACKEND) dnl -dnl End of "$Id: cups-dnssd.m4 10471 2012-05-16 22:57:03Z mike $". +dnl End of "$Id: cups-dnssd.m4 7890 2008-08-29 22:19:39Z mike $". dnl diff --git a/config-scripts/cups-gssapi.m4 b/config-scripts/cups-gssapi.m4 index 161c6d05..d378bbfa 100644 --- a/config-scripts/cups-gssapi.m4 +++ b/config-scripts/cups-gssapi.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-gssapi.m4 10785 2013-01-08 16:29:26Z mike $" +dnl "$Id$" dnl dnl GSSAPI/Kerberos library detection for CUPS. dnl @@ -158,5 +158,5 @@ AC_SUBST(CUPS_DEFAULT_GSSSERVICENAME) AC_DEFINE_UNQUOTED(CUPS_DEFAULT_GSSSERVICENAME, "$CUPS_DEFAULT_GSSSERVICENAME") dnl -dnl End of "$Id: cups-gssapi.m4 10785 2013-01-08 16:29:26Z mike $". +dnl End of "$Id$". dnl diff --git a/config-scripts/cups-largefile.m4 b/config-scripts/cups-largefile.m4 index c4eab9a8..8243de78 100644 --- a/config-scripts/cups-largefile.m4 +++ b/config-scripts/cups-largefile.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-largefile.m4 9771 2011-05-12 05:21:56Z mike $" +dnl "$Id: cups-largefile.m4 6649 2007-07-11 21:46:42Z mike $" dnl dnl Large file support stuff for CUPS. dnl @@ -48,5 +48,5 @@ fi AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL)) dnl -dnl End of "$Id: cups-largefile.m4 9771 2011-05-12 05:21:56Z mike $". +dnl End of "$Id: cups-largefile.m4 6649 2007-07-11 21:46:42Z mike $". dnl diff --git a/config-scripts/cups-launchd.m4 b/config-scripts/cups-launchd.m4 index 5da5e077..23a22951 100644 --- a/config-scripts/cups-launchd.m4 +++ b/config-scripts/cups-launchd.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-launchd.m4 8983 2010-02-13 02:20:23Z mike $" +dnl "$Id: cups-launchd.m4 6649 2007-07-11 21:46:42Z mike $" dnl dnl launchd stuff for CUPS. dnl @@ -39,5 +39,5 @@ AC_SUBST(DEFAULT_LAUNCHD_CONF) AC_SUBST(LAUNCHDLIBS) dnl -dnl End of "$Id: cups-launchd.m4 8983 2010-02-13 02:20:23Z mike $". +dnl End of "$Id: cups-launchd.m4 6649 2007-07-11 21:46:42Z mike $". dnl diff --git a/config-scripts/cups-libtool.m4 b/config-scripts/cups-libtool.m4 index 5b95b399..d6026b24 100644 --- a/config-scripts/cups-libtool.m4 +++ b/config-scripts/cups-libtool.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-libtool.m4 9771 2011-05-12 05:21:56Z mike $" +dnl "$Id: cups-libtool.m4 6649 2007-07-11 21:46:42Z mike $" dnl dnl Libtool stuff for CUPS. dnl @@ -35,5 +35,5 @@ if test x$LIBTOOL != x; then fi dnl -dnl End of "$Id: cups-libtool.m4 9771 2011-05-12 05:21:56Z mike $". +dnl End of "$Id: cups-libtool.m4 6649 2007-07-11 21:46:42Z mike $". dnl diff --git a/config-scripts/cups-manpages.m4 b/config-scripts/cups-manpages.m4 index 67ab53e8..7420433c 100644 --- a/config-scripts/cups-manpages.m4 +++ b/config-scripts/cups-manpages.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-manpages.m4 10424 2012-04-23 17:26:57Z mike $" +dnl "$Id: cups-manpages.m4 6649 2007-07-11 21:46:42Z mike $" dnl dnl Manpage stuff for CUPS. dnl @@ -92,5 +92,5 @@ AC_SUBST(MAN8EXT) AC_SUBST(MAN8DIR) dnl -dnl End of "$Id: cups-manpages.m4 10424 2012-04-23 17:26:57Z mike $". +dnl End of "$Id: cups-manpages.m4 6649 2007-07-11 21:46:42Z mike $". dnl diff --git a/config-scripts/cups-network.m4 b/config-scripts/cups-network.m4 index 9b591ed1..b97fb4a4 100644 --- a/config-scripts/cups-network.m4 +++ b/config-scripts/cups-network.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-network.m4 9771 2011-05-12 05:21:56Z mike $" +dnl "$Id: cups-network.m4 7918 2008-09-08 22:03:01Z mike $" dnl dnl Networking stuff for CUPS. dnl @@ -70,5 +70,5 @@ AC_CHECK_HEADERS(AppleTalk/at_proto.h,AC_DEFINE(HAVE_APPLETALK_AT_PROTO_H),, [#include <netat/appletalk.h>]) dnl -dnl End of "$Id: cups-network.m4 9771 2011-05-12 05:21:56Z mike $". +dnl End of "$Id: cups-network.m4 7918 2008-09-08 22:03:01Z mike $". dnl diff --git a/config-scripts/cups-opsys.m4 b/config-scripts/cups-opsys.m4 index 0effd628..5b38975b 100644 --- a/config-scripts/cups-opsys.m4 +++ b/config-scripts/cups-opsys.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-opsys.m4 9771 2011-05-12 05:21:56Z mike $" +dnl "$Id: cups-opsys.m4 6649 2007-07-11 21:46:42Z mike $" dnl dnl Operating system stuff for CUPS. dnl @@ -31,5 +31,5 @@ case "$uname" in esac dnl -dnl "$Id: cups-opsys.m4 9771 2011-05-12 05:21:56Z mike $" +dnl "$Id: cups-opsys.m4 6649 2007-07-11 21:46:42Z mike $" dnl diff --git a/config-scripts/cups-pam.m4 b/config-scripts/cups-pam.m4 index f5d4d4da..72bf32fc 100644 --- a/config-scripts/cups-pam.m4 +++ b/config-scripts/cups-pam.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-pam.m4 10424 2012-04-23 17:26:57Z mike $" +dnl "$Id: cups-pam.m4 7960 2008-09-17 19:42:02Z mike $" dnl dnl PAM stuff for CUPS. dnl @@ -98,5 +98,5 @@ AC_SUBST(PAMMOD) AC_SUBST(PAMMODAUTH) dnl -dnl End of "$Id: cups-pam.m4 10424 2012-04-23 17:26:57Z mike $". +dnl End of "$Id: cups-pam.m4 7960 2008-09-17 19:42:02Z mike $". dnl diff --git a/config-scripts/cups-poll.m4 b/config-scripts/cups-poll.m4 index 46d1af5b..901068c2 100644 --- a/config-scripts/cups-poll.m4 +++ b/config-scripts/cups-poll.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-poll.m4 9771 2011-05-12 05:21:56Z mike $" +dnl "$Id$" dnl dnl Select/poll stuff for CUPS. dnl @@ -18,5 +18,5 @@ AC_CHECK_FUNC(epoll_create, AC_DEFINE(HAVE_EPOLL)) AC_CHECK_FUNC(kqueue, AC_DEFINE(HAVE_KQUEUE)) dnl -dnl End of "$Id: cups-poll.m4 9771 2011-05-12 05:21:56Z mike $". +dnl End of "$Id$". dnl diff --git a/config-scripts/cups-scripting.m4 b/config-scripts/cups-scripting.m4 index 75abd7e2..d4ed9885 100644 --- a/config-scripts/cups-scripting.m4 +++ b/config-scripts/cups-scripting.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-scripting.m4 9927 2011-08-27 09:28:30Z mike $" +dnl "$Id: cups-scripting.m4 7915 2008-09-07 22:18:29Z mike $" dnl dnl Scripting configuration stuff for CUPS. dnl @@ -85,5 +85,5 @@ if test "x$CUPS_PYTHON" != x; then fi dnl -dnl End of "$Id: cups-scripting.m4 9927 2011-08-27 09:28:30Z mike $". +dnl End of "$Id: cups-scripting.m4 7915 2008-09-07 22:18:29Z mike $". dnl diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4 index 09084c6f..13dde4be 100644 --- a/config-scripts/cups-sharedlibs.m4 +++ b/config-scripts/cups-sharedlibs.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-sharedlibs.m4 10190 2012-01-20 16:22:58Z mike $" +dnl "$Id: cups-sharedlibs.m4 7630 2008-06-09 22:31:44Z mike $" dnl dnl Shared library support for CUPS. dnl @@ -234,5 +234,5 @@ AC_SUBST(IMGLIBS) AC_SUBST(EXPORT_LDFLAGS) dnl -dnl End of "$Id: cups-sharedlibs.m4 10190 2012-01-20 16:22:58Z mike $". +dnl End of "$Id: cups-sharedlibs.m4 7630 2008-06-09 22:31:44Z mike $". dnl diff --git a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4 index 3ff0ca26..03f7530a 100644 --- a/config-scripts/cups-ssl.m4 +++ b/config-scripts/cups-ssl.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-ssl.m4 10710 2012-11-26 18:26:01Z mike $" +dnl "$Id: cups-ssl.m4 7241 2008-01-22 22:34:52Z mike $" dnl dnl OpenSSL/GNUTLS stuff for CUPS. dnl @@ -184,5 +184,5 @@ EXPORT_SSLLIBS="$SSLLIBS" AC_SUBST(EXPORT_SSLLIBS) dnl -dnl End of "$Id: cups-ssl.m4 10710 2012-11-26 18:26:01Z mike $". +dnl End of "$Id: cups-ssl.m4 7241 2008-01-22 22:34:52Z mike $". dnl diff --git a/config-scripts/cups-threads.m4 b/config-scripts/cups-threads.m4 index 0743e341..b95c79fa 100644 --- a/config-scripts/cups-threads.m4 +++ b/config-scripts/cups-threads.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-threads.m4 9771 2011-05-12 05:21:56Z mike $" +dnl "$Id: cups-threads.m4 6649 2007-07-11 21:46:42Z mike $" dnl dnl Threading stuff for CUPS. dnl @@ -50,5 +50,5 @@ fi AC_SUBST(PTHREAD_FLAGS) dnl -dnl End of "$Id: cups-threads.m4 9771 2011-05-12 05:21:56Z mike $". +dnl End of "$Id: cups-threads.m4 6649 2007-07-11 21:46:42Z mike $". dnl diff --git a/config.h.in b/config.h.in index 8f5f173d..83d067eb 100644 --- a/config.h.in +++ b/config.h.in @@ -1,5 +1,5 @@ /* - * "$Id: config.h.in 10776 2012-12-17 22:17:08Z mike $" + * "$Id: config.h.in 7918 2008-09-08 22:03:01Z mike $" * * Configuration file for CUPS. * @@ -32,6 +32,7 @@ #define CUPS_DEFAULT_GROUP "sys" #define CUPS_DEFAULT_SYSTEM_GROUPS "sys root system" #define CUPS_DEFAULT_PRINTOPERATOR_AUTH "@SYSTEM" +#define CUPS_DEFAULT_SYSTEM_AUTHKEY "system.print.admin" /* @@ -742,5 +743,5 @@ static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); } #endif /* !_CUPS_CONFIG_H_ */ /* - * End of "$Id: config.h.in 10776 2012-12-17 22:17:08Z mike $". + * End of "$Id: config.h.in 7918 2008-09-08 22:03:01Z mike $". */ @@ -2508,7 +2508,7 @@ esac ac_config_headers="$ac_config_headers config.h" -CUPS_VERSION=1.6.2 +CUPS_VERSION=1.6.3 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'`" @@ -2587,197 +2587,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe + for ac_prog in clang cc gcc do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -2821,7 +2631,7 @@ fi fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in cl.exe + for ac_prog in clang cc gcc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -2876,8 +2686,6 @@ esac fi fi -fi - test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -3518,7 +3326,7 @@ if test -z "$CXX"; then CXX=$CCC else if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + for ac_prog in clang++ c++ g++ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -3562,7 +3370,7 @@ fi fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + for ac_prog in clang++ c++ g++ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -5692,6 +5500,7 @@ fi CUPS_DEFAULT_PRINTOPERATOR_AUTH="@SYSTEM" +CUPS_DEFAULT_SYSTEM_AUTHKEY="" CUPS_SYSTEM_AUTHKEY="" INSTALLXPC="" @@ -5839,10 +5648,13 @@ if test "x$ac_cv_header_Security_Authorization_h" = xyes; then : if test "x$default_adminkey" != xdefault; then CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey $default_adminkey" + CUPS_DEFAULT_SYSTEM_AUTHKEY="$default_adminkey" elif grep -q system.print.operator /etc/authorization; then CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.print.admin" + CUPS_DEFAULT_SYSTEM_AUTHKEY="system.print.admin" else CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.preferences" + CUPS_DEFAULT_SYSTEM_AUTHKEY="system.preferences" fi if test "x$default_operkey" != xdefault; then @@ -5909,6 +5721,10 @@ cat >>confdefs.h <<_ACEOF #define CUPS_DEFAULT_PRINTOPERATOR_AUTH "$CUPS_DEFAULT_PRINTOPERATOR_AUTH" _ACEOF +cat >>confdefs.h <<_ACEOF +#define CUPS_DEFAULT_SYSTEM_AUTHKEY "$CUPS_DEFAULT_SYSTEM_AUTHKEY" +_ACEOF + diff --git a/configure.in b/configure.in index b6298483..3951e905 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl -dnl "$Id: configure.in 10913 2013-03-18 17:00:03Z mike $" +dnl "$Id: configure.in 7833 2008-08-04 20:55:13Z mike $" dnl dnl Configuration script for CUPS. dnl @@ -93,5 +93,5 @@ AC_OUTPUT(Makedefs chmod +x cups-config dnl -dnl End of "$Id: configure.in 10913 2013-03-18 17:00:03Z mike $". +dnl End of "$Id: configure.in 7833 2008-08-04 20:55:13Z mike $". dnl diff --git a/cups/Makefile b/cups/Makefile index e77d04b8..22bb191b 100644 --- a/cups/Makefile +++ b/cups/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 10580 2012-08-29 19:02:00Z mike $" +# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $" # # API library Makefile for CUPS. # @@ -193,6 +193,14 @@ depend: # +# Run oclint to check code coverage... +# + +oclint: + oclint -o=oclint.html -html $(LIBOBJS:.o=.c) -- $(ALL_CFLAGS) + + +# # Install all targets... # @@ -621,5 +629,5 @@ include Dependencies # -# End of "$Id: Makefile 10580 2012-08-29 19:02:00Z mike $". +# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $". # diff --git a/cups/adminutil.c b/cups/adminutil.c index 3539488e..440e443b 100644 --- a/cups/adminutil.c +++ b/cups/adminutil.c @@ -1,5 +1,5 @@ /* - * "$Id: adminutil.c 10586 2012-08-29 21:03:10Z mike $" + * "$Id: adminutil.c 7850 2008-08-20 00:07:25Z mike $" * * Administration utility API definitions for CUPS. * @@ -2337,5 +2337,5 @@ write_option(cups_file_t *dstfp, /* I - PPD file */ /* - * End of "$Id: adminutil.c 10586 2012-08-29 21:03:10Z mike $". + * End of "$Id: adminutil.c 7850 2008-08-20 00:07:25Z mike $". */ diff --git a/cups/adminutil.h b/cups/adminutil.h index 2fd87aff..82606157 100644 --- a/cups/adminutil.h +++ b/cups/adminutil.h @@ -1,5 +1,5 @@ /* - * "$Id: adminutil.h 10586 2012-08-29 21:03:10Z mike $" + * "$Id: adminutil.h 7026 2007-10-19 00:57:45Z mike $" * * Administration utility API definitions for CUPS. * @@ -77,5 +77,5 @@ extern int cupsAdminSetServerSettings(http_t *http, #endif /* !_CUPS_ADMINUTIL_H_ */ /* - * End of "$Id: adminutil.h 10586 2012-08-29 21:03:10Z mike $". + * End of "$Id: adminutil.h 7026 2007-10-19 00:57:45Z mike $". */ diff --git a/cups/api-array.header b/cups/api-array.header index 88e5341f..4d5acf0d 100644 --- a/cups/api-array.header +++ b/cups/api-array.header @@ -1,5 +1,5 @@ <!-- - "$Id: api-array.header 9771 2011-05-12 05:21:56Z mike $" + "$Id: api-array.header 7266 2008-01-29 02:15:29Z mike $" Array API header for CUPS. diff --git a/cups/api-array.shtml b/cups/api-array.shtml index 7406a0d4..7246a7bd 100644 --- a/cups/api-array.shtml +++ b/cups/api-array.shtml @@ -1,5 +1,5 @@ <!-- - "$Id: api-array.shtml 9727 2011-04-28 21:20:12Z mike $" + "$Id: api-array.shtml 7616 2008-05-28 00:34:13Z mike $" Array API introduction for CUPS. diff --git a/cups/api-cups.header b/cups/api-cups.header index 8e6d3c0b..ac781af4 100644 --- a/cups/api-cups.header +++ b/cups/api-cups.header @@ -1,5 +1,5 @@ <!-- - "$Id: api-cups.header 9771 2011-05-12 05:21:56Z mike $" + "$Id: api-cups.header 7279 2008-01-31 01:50:44Z mike $" CUPS API header for CUPS. diff --git a/cups/api-cups.shtml b/cups/api-cups.shtml index dcc4fe98..caa96b95 100644 --- a/cups/api-cups.shtml +++ b/cups/api-cups.shtml @@ -1,9 +1,9 @@ <!-- - "$Id: api-cups.shtml 9727 2011-04-28 21:20:12Z mike $" + "$Id: api-cups.shtml 7337 2008-02-22 04:44:04Z mike $" API introduction for CUPS. - Copyright 2007-2011 by Apple Inc. + Copyright 2007-2013 by Apple Inc. Copyright 1997-2006 by Easy Software Products, all rights reserved. These coded instructions, statements, and computer programs are the @@ -183,7 +183,7 @@ int num_options = 0; <a href='#cups_option_t'>cups_option_t</a> *options = NULL; <a href='#cups_dest_t'>cups_dest_t</a> *dest; -for (i = 0; i < dest->num_options; i ++) +for (i = 0; i < dest->num_options; i ++) num_options = <a href='#cupsAddOption'>cupsAddOption</a>(dest->options[i].name, dest->options[i].value, num_options, &options); </pre> @@ -235,7 +235,7 @@ job_id = <a href='#cupsPrintFiles'>cupsPrintFiles</a>(dest->name, 3, files, "Tes <p>Finally, the <a href='#cupsCreateJob'><code>cupsCreateJob</code></a> function creates a new job with no files in it. Files are added using the -<a href='#cupsStartDocument'><code>cupsStartDocument</code></a>, +<a href='#cupsStartDocument'><code>cupsStartDocument</code></a>, <a href='api-httpipp.html#cupsWriteRequestData'><code>cupsWriteRequestData</code></a>, and <a href='#cupsFinishDocument'><code>cupsFinishDocument</code></a> functions. The following example creates a job with 10 text files for printing:</p> @@ -299,7 +299,7 @@ int num_jobs; <a href='#cups_job_t'>cups_job_t</a> *jobs; int i; ipp_jstate_t job_state = IPP_JOB_PENDING; - + while (job_state < IPP_JOB_STOPPED) { /* Get my jobs (1) with any state (-1) */ diff --git a/cups/api-filedir.header b/cups/api-filedir.header index 63f62966..f9f52980 100644 --- a/cups/api-filedir.header +++ b/cups/api-filedir.header @@ -1,5 +1,5 @@ <!-- - "$Id: api-filedir.header 9771 2011-05-12 05:21:56Z mike $" + "$Id: api-filedir.header 7279 2008-01-31 01:50:44Z mike $" File and Directory API header for CUPS. diff --git a/cups/api-filedir.shtml b/cups/api-filedir.shtml index 4a4a16ff..96bf0fac 100644 --- a/cups/api-filedir.shtml +++ b/cups/api-filedir.shtml @@ -1,5 +1,5 @@ <!-- - "$Id: api-filedir.shtml 9727 2011-04-28 21:20:12Z mike $" + "$Id: api-filedir.shtml 7279 2008-01-31 01:50:44Z mike $" File and directory API introduction for CUPS. diff --git a/cups/api-filter.header b/cups/api-filter.header index 54e1d894..5b7ee181 100644 --- a/cups/api-filter.header +++ b/cups/api-filter.header @@ -1,5 +1,5 @@ <!-- - "$Id: api-filter.header 9771 2011-05-12 05:21:56Z mike $" + "$Id: api-filter.header 7616 2008-05-28 00:34:13Z mike $" Filter and backend programming header for CUPS. diff --git a/cups/api-filter.shtml b/cups/api-filter.shtml index a8e52919..3f912ba8 100644 --- a/cups/api-filter.shtml +++ b/cups/api-filter.shtml @@ -1,9 +1,9 @@ <!-- - "$Id: api-filter.shtml 10424 2012-04-23 17:26:57Z mike $" + "$Id: api-filter.shtml 7677 2008-06-19 23:22:19Z mike $" Filter and backend programming introduction for CUPS. - Copyright 2007-2012 by Apple Inc. + Copyright 2007-2013 by Apple Inc. Copyright 1997-2006 by Easy Software Products, all rights reserved. These coded instructions, statements, and computer programs are the @@ -488,7 +488,7 @@ from localizing the vendor-prefixed keyword in the PPD file - otherwise both the generic and vendor-specific keyword will be shown in the user interface.</p> -</blockquote></dd> +</blockquote> <h4><a name="REPORTING_SUPPLIES">Reporting Supply Levels</a></h4> @@ -613,7 +613,7 @@ datalen = sizeof(data) - 1; status = <a href="#cupsSideChannelDoRequest">cupsSideChannelDoRequest</a>(CUPS_SC_CMD_GET_DEVICE_ID, data, &datalen, 1.0); /* Use the returned value if OK was returned and the length is non-zero */ -if (status == CUPS_SC_STATUS_OK && datalen > 0) +if (status == CUPS_SC_STATUS_OK && datalen > 0) data[datalen] = '\0'; else data[0] = '\0'; diff --git a/cups/api-httpipp.header b/cups/api-httpipp.header index 42dffb1e..5f245d75 100644 --- a/cups/api-httpipp.header +++ b/cups/api-httpipp.header @@ -1,5 +1,5 @@ <!-- - "$Id: api-httpipp.header 9771 2011-05-12 05:21:56Z mike $" + "$Id: api-httpipp.header 7258 2008-01-28 00:15:05Z mike $" HTTP and IPP API header for CUPS. diff --git a/cups/api-httpipp.shtml b/cups/api-httpipp.shtml index a7217a5f..cd0fd53b 100644 --- a/cups/api-httpipp.shtml +++ b/cups/api-httpipp.shtml @@ -1,5 +1,5 @@ <!-- - "$Id: api-httpipp.shtml 10388 2012-03-26 21:15:41Z mike $" + "$Id: api-httpipp.shtml 7684 2008-06-23 16:47:38Z mike $" HTTP and IPP API introduction for CUPS. diff --git a/cups/api-ppd.header b/cups/api-ppd.header index 62d0a2b3..ef0d0512 100644 --- a/cups/api-ppd.header +++ b/cups/api-ppd.header @@ -1,5 +1,5 @@ <!-- - "$Id: api-ppd.header 10424 2012-04-23 17:26:57Z mike $" + "$Id: api-ppd.header 7616 2008-05-28 00:34:13Z mike $" PPD API header for CUPS. diff --git a/cups/api-ppd.shtml b/cups/api-ppd.shtml index 9b2a84f9..6319f23f 100644 --- a/cups/api-ppd.shtml +++ b/cups/api-ppd.shtml @@ -1,5 +1,5 @@ <!-- - "$Id: api-ppd.shtml 10424 2012-04-23 17:26:57Z mike $" + "$Id: api-ppd.shtml 7616 2008-05-28 00:34:13Z mike $" PPD API introduction for CUPS. diff --git a/cups/array-private.h b/cups/array-private.h index 453aa128..e5296948 100644 --- a/cups/array-private.h +++ b/cups/array-private.h @@ -1,5 +1,5 @@ /* - * "$Id: array-private.h 10034 2011-09-30 22:52:35Z mike $" + * "$Id: array-private.h 3448 2011-10-04 06:53:26Z msweet $" * * Private array definitions for CUPS. * @@ -47,5 +47,5 @@ extern cups_array_t *_cupsArrayNewStrings(const char *s) _CUPS_API_1_5; #endif /* !_CUPS_ARRAY_PRIVATE_H_ */ /* - * End of "$Id: array-private.h 10034 2011-09-30 22:52:35Z mike $". + * End of "$Id: array-private.h 3448 2011-10-04 06:53:26Z msweet $". */ diff --git a/cups/array.c b/cups/array.c index cc8fbd02..2fb7701c 100644 --- a/cups/array.c +++ b/cups/array.c @@ -1,5 +1,5 @@ /* - * "$Id: array.c 10424 2012-04-23 17:26:57Z mike $" + * "$Id: array.c 7616 2008-05-28 00:34:13Z mike $" * * Sorted array routines for CUPS. * @@ -1322,5 +1322,5 @@ cups_array_find(cups_array_t *a, /* I - Array */ /* - * End of "$Id: array.c 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: array.c 7616 2008-05-28 00:34:13Z mike $". */ diff --git a/cups/array.h b/cups/array.h index 30d9f1e5..466a2721 100644 --- a/cups/array.h +++ b/cups/array.h @@ -1,5 +1,5 @@ /* - * "$Id: array.h 9348 2010-11-02 21:37:38Z mike $" + * "$Id: array.h 7266 2008-01-29 02:15:29Z mike $" * * Sorted array definitions for CUPS. * @@ -88,5 +88,5 @@ extern void *cupsArrayUserData(cups_array_t *a) _CUPS_API_1_2; #endif /* !_CUPS_ARRAY_H_ */ /* - * End of "$Id: array.h 9348 2010-11-02 21:37:38Z mike $". + * End of "$Id: array.h 7266 2008-01-29 02:15:29Z mike $". */ diff --git a/cups/attr.c b/cups/attr.c index ebd41059..da7a7253 100644 --- a/cups/attr.c +++ b/cups/attr.c @@ -1,5 +1,5 @@ /* - * "$Id: attr.c 10424 2012-04-23 17:26:57Z mike $" + * "$Id: attr.c 7584 2008-05-16 22:55:53Z mike $" * * PPD model-specific attribute routines for CUPS. * @@ -331,5 +331,5 @@ _ppdNormalizeMakeAndModel( /* - * End of "$Id: attr.c 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: attr.c 7584 2008-05-16 22:55:53Z mike $". */ diff --git a/cups/auth.c b/cups/auth.c index 11a978f8..659d9185 100644 --- a/cups/auth.c +++ b/cups/auth.c @@ -1,5 +1,5 @@ /* - * "$Id: auth.c 10905 2013-03-13 16:26:25Z mike $" + * "$Id: auth.c 7720 2008-07-11 22:46:21Z mike $" * * Authentication functions for CUPS. * @@ -881,5 +881,5 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ /* - * End of "$Id: auth.c 10905 2013-03-13 16:26:25Z mike $". + * End of "$Id: auth.c 7720 2008-07-11 22:46:21Z mike $". */ diff --git a/cups/backchannel.c b/cups/backchannel.c index d5b5f82a..3ee1dbc9 100644 --- a/cups/backchannel.c +++ b/cups/backchannel.c @@ -1,5 +1,5 @@ /* - * "$Id: backchannel.c 10424 2012-04-23 17:26:57Z mike $" + * "$Id: backchannel.c 7616 2008-05-28 00:34:13Z mike $" * * Backchannel functions for CUPS. * @@ -195,5 +195,5 @@ cups_setup(fd_set *set, /* I - Set for select() */ /* - * End of "$Id: backchannel.c 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: backchannel.c 7616 2008-05-28 00:34:13Z mike $". */ diff --git a/cups/backend.c b/cups/backend.c index 404f0ca6..6f8a6b2e 100644 --- a/cups/backend.c +++ b/cups/backend.c @@ -1,5 +1,5 @@ /* - * "$Id: backend.c 10608 2012-09-15 19:42:21Z mike $" + * "$Id: backend.c 7810 2008-07-29 01:11:15Z mike $" * * Backend functions for CUPS. * @@ -150,5 +150,5 @@ quote_string(const char *s) /* I - String to write */ /* - * End of "$Id: backend.c 10608 2012-09-15 19:42:21Z mike $". + * End of "$Id: backend.c 7810 2008-07-29 01:11:15Z mike $". */ diff --git a/cups/backend.h b/cups/backend.h index 09fca223..d2e37ff8 100644 --- a/cups/backend.h +++ b/cups/backend.h @@ -1,5 +1,5 @@ /* - * "$Id: backend.h 9771 2011-05-12 05:21:56Z mike $" + * "$Id: backend.h 7810 2008-07-29 01:11:15Z mike $" * * Backend definitions for CUPS. * @@ -74,5 +74,5 @@ extern void cupsBackendReport(const char *device_scheme, #endif /* !_CUPS_BACKEND_H_ */ /* - * End of "$Id: backend.h 9771 2011-05-12 05:21:56Z mike $". + * End of "$Id: backend.h 7810 2008-07-29 01:11:15Z mike $". */ diff --git a/cups/conflicts.c b/cups/conflicts.c index 72dde337..f0d01b0c 100644 --- a/cups/conflicts.c +++ b/cups/conflicts.c @@ -1,5 +1,5 @@ /* - * "$Id: conflicts.c 10424 2012-04-23 17:26:57Z mike $" + * "$Id: conflicts.c 3794 2012-04-23 22:44:16Z msweet $" * * Option marking routines for CUPS. * @@ -1210,5 +1210,5 @@ ppd_test_constraints( /* - * End of "$Id: conflicts.c 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: conflicts.c 3794 2012-04-23 22:44:16Z msweet $". */ diff --git a/cups/cups-private.h b/cups/cups-private.h index 211de261..027d3a16 100644 --- a/cups/cups-private.h +++ b/cups/cups-private.h @@ -1,5 +1,5 @@ /* - * "$Id: cups-private.h 10814 2013-01-14 22:06:21Z mike $" + * "$Id: cups-private.h 9596 2011-03-11 18:26:36Z mike $" * * Private definitions for CUPS. * @@ -268,5 +268,5 @@ extern char *_cupsUserDefault(char *name, size_t namesize); #endif /* !_CUPS_CUPS_PRIVATE_H_ */ /* - * End of "$Id: cups-private.h 10814 2013-01-14 22:06:21Z mike $". + * End of "$Id: cups-private.h 9596 2011-03-11 18:26:36Z mike $". */ diff --git a/cups/cups.h b/cups/cups.h index 5bc98886..4edf3d03 100644 --- a/cups/cups.h +++ b/cups/cups.h @@ -1,9 +1,9 @@ /* - * "$Id: cups.h 10688 2012-11-09 03:24:57Z mike $" + * "$Id: cups.h 8781 2009-08-28 17:34:54Z mike $" * * API definitions for CUPS. * - * Copyright 2007-2012 by Apple Inc. + * Copyright 2007-2013 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -52,10 +52,10 @@ extern "C" { * Constants... */ -# define CUPS_VERSION 1.0602 +# define CUPS_VERSION 1.0603 # define CUPS_VERSION_MAJOR 1 # define CUPS_VERSION_MINOR 6 -# define CUPS_VERSION_PATCH 2 +# define CUPS_VERSION_PATCH 3 # define CUPS_BC_FD 3 /* Back-channel file descriptor for @@ -597,5 +597,5 @@ extern http_status_t cupsStartDestDocument(http_t *http, cups_dest_t *dest, #endif /* !_CUPS_CUPS_H_ */ /* - * End of "$Id: cups.h 10688 2012-11-09 03:24:57Z mike $". + * End of "$Id: cups.h 8781 2009-08-28 17:34:54Z mike $". */ diff --git a/cups/custom.c b/cups/custom.c index e61db475..4c4cc8ac 100644 --- a/cups/custom.c +++ b/cups/custom.c @@ -1,5 +1,5 @@ /* - * "$Id: custom.c 10424 2012-04-23 17:26:57Z mike $" + * "$Id: custom.c 6649 2007-07-11 21:46:42Z mike $" * * PPD custom option routines for CUPS. * @@ -118,5 +118,5 @@ ppdNextCustomParam(ppd_coption_t *opt) /* I - Custom option */ /* - * End of "$Id: custom.c 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: custom.c 6649 2007-07-11 21:46:42Z mike $". */ diff --git a/cups/debug-private.h b/cups/debug-private.h index 9c06372c..26c75a37 100644 --- a/cups/debug-private.h +++ b/cups/debug-private.h @@ -1,5 +1,5 @@ /* - * "$Id: debug-private.h 10200 2012-01-27 23:09:26Z mike $" + * "$Id$" * * Private debugging macros for CUPS. * @@ -113,5 +113,5 @@ extern int _cups_gettimeofday(struct timeval *tv, void *tz); #endif /* !_CUPS_DEBUG_PRIVATE_H_ */ /* - * End of "$Id: debug-private.h 10200 2012-01-27 23:09:26Z mike $". + * End of "$Id$". */ diff --git a/cups/debug.c b/cups/debug.c index 98303b17..dce94278 100644 --- a/cups/debug.c +++ b/cups/debug.c @@ -1,5 +1,5 @@ /* - * "$Id: debug.c 10224 2012-02-03 21:58:58Z mike $" + * "$Id: debug.c 3643 2012-02-13 16:35:48Z msweet $" * * Debugging functions for CUPS. * @@ -654,5 +654,5 @@ _cups_debug_set(const char *logfile, /* I - Log file or NULL */ /* - * End of "$Id: debug.c 10224 2012-02-03 21:58:58Z mike $". + * End of "$Id: debug.c 3643 2012-02-13 16:35:48Z msweet $". */ diff --git a/cups/dest-job.c b/cups/dest-job.c index 63ca4b2c..dc47f042 100644 --- a/cups/dest-job.c +++ b/cups/dest-job.c @@ -1,5 +1,5 @@ /* - * "$Id: dest-job.c 10503 2012-05-23 03:30:45Z mike $" + * "$Id: dest-job.c 3833 2012-05-23 22:51:18Z msweet $" * * Destination job support for CUPS. * @@ -354,5 +354,5 @@ cupsStartDestDocument( /* - * End of "$Id: dest-job.c 10503 2012-05-23 03:30:45Z mike $". + * End of "$Id: dest-job.c 3833 2012-05-23 22:51:18Z msweet $". */ diff --git a/cups/dest-localization.c b/cups/dest-localization.c index 9a86e04d..13980567 100644 --- a/cups/dest-localization.c +++ b/cups/dest-localization.c @@ -1,5 +1,5 @@ /* - * "$Id: dest-localization.c 10506 2012-05-23 20:17:12Z mike $" + * "$Id: dest-localization.c 3833 2012-05-23 22:51:18Z msweet $" * * Destination localization support for CUPS. * @@ -382,5 +382,5 @@ cups_scan_strings(char *buffer) /* I - Start of string */ /* - * End of "$Id: dest-localization.c 10506 2012-05-23 20:17:12Z mike $". + * End of "$Id: dest-localization.c 3833 2012-05-23 22:51:18Z msweet $". */ diff --git a/cups/dest-options.c b/cups/dest-options.c index abc89752..234dd135 100644 --- a/cups/dest-options.c +++ b/cups/dest-options.c @@ -1,5 +1,5 @@ /* - * "$Id: dest-options.c 10767 2012-12-13 21:10:03Z mike $" + * "$Id: dest-options.c 4185 2013-02-20 02:19:13Z msweet $" * * Destination option/media support for CUPS. * @@ -1759,5 +1759,5 @@ cups_test_constraints( /* - * End of "$Id: dest-options.c 10767 2012-12-13 21:10:03Z mike $". + * End of "$Id: dest-options.c 4185 2013-02-20 02:19:13Z msweet $". */ diff --git a/cups/dest.c b/cups/dest.c index 36ded80e..acd64e73 100644 --- a/cups/dest.c +++ b/cups/dest.c @@ -1,9 +1,9 @@ /* - * "$Id: dest.c 10814 2013-01-14 22:06:21Z mike $" + * "$Id: dest.c 9568 2011-02-25 06:13:56Z mike $" * * User-defined destination (and option) support for CUPS. * - * Copyright 2007-2012 by Apple Inc. + * Copyright 2007-2013 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -1657,7 +1657,6 @@ int /* O - Number of destinations */ cupsGetDests2(http_t *http, /* I - Connection to server or @code CUPS_HTTP_DEFAULT@ */ cups_dest_t **dests) /* O - Destinations */ { - int i; /* Looping var */ int num_dests; /* Number of destinations */ cups_dest_t *dest; /* Destination pointer */ const char *home; /* HOME environment variable */ @@ -1780,21 +1779,16 @@ cupsGetDests2(http_t *http, /* I - Connection to server or @code CUPS_HTTP_ * Have a default; see if it is real... */ - dest = cupsGetDest(dest->name, NULL, num_reals, reals); - } - - /* - * If dest is NULL, then no default (that exists) is set, so we - * need to set a default if one exists... - */ - - if (!dest && *dests && defprinter) - { - for (i = 0; i < num_dests; i ++) - (*dests)[i].is_default = 0; + if (!cupsGetDest(dest->name, NULL, num_reals, reals)) + { + /* + * Remove the non-real printer from the list, since we don't want jobs + * going to an unexpected printer... (<rdar://problem/14216472>) + */ - if ((dest = cupsGetDest(name, instance, num_dests, *dests)) != NULL) - dest->is_default = 1; + num_dests = cupsRemoveDest(dest->name, dest->instance, num_dests, + dests); + } } /* @@ -1909,18 +1903,7 @@ cupsGetNamedDest(http_t *http, /* I - Connection to server or @code CUPS_HTT */ if (!_cupsGetDests(http, op, name, &dest, 0, 0)) - { - if (op == CUPS_GET_DEFAULT || (name && !set_as_default)) - return (NULL); - - /* - * The default printer from environment variables or from a - * configuration file does not exist. Find out the real default. - */ - - if (!_cupsGetDests(http, CUPS_GET_DEFAULT, NULL, &dest, 0, 0)) - return (NULL); - } + return (NULL); if (instance) dest->instance = _cupsStrAlloc(instance); @@ -3904,5 +3887,5 @@ cups_make_string( /* - * End of "$Id: dest.c 10814 2013-01-14 22:06:21Z mike $". + * End of "$Id: dest.c 9568 2011-02-25 06:13:56Z mike $". */ @@ -1,5 +1,5 @@ /* - * "$Id: dir.c 10424 2012-04-23 17:26:57Z mike $" + * "$Id: dir.c 7279 2008-01-31 01:50:44Z mike $" * * Directory routines for CUPS. * @@ -468,5 +468,5 @@ cupsDirRewind(cups_dir_t *dp) /* I - Directory pointer */ #endif /* WIN32 */ /* - * End of "$Id: dir.c 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: dir.c 7279 2008-01-31 01:50:44Z mike $". */ @@ -1,5 +1,5 @@ /* - * "$Id: dir.h 9771 2011-05-12 05:21:56Z mike $" + * "$Id: dir.h 7026 2007-10-19 00:57:45Z mike $" * * Public directory definitions for CUPS. * @@ -65,5 +65,5 @@ extern void cupsDirRewind(cups_dir_t *dp) _CUPS_API_1_2; #endif /* !_CUPS_DIR_H_ */ /* - * End of "$Id: dir.h 9771 2011-05-12 05:21:56Z mike $". + * End of "$Id: dir.h 7026 2007-10-19 00:57:45Z mike $". */ diff --git a/cups/emit.c b/cups/emit.c index c9db6630..650e8479 100644 --- a/cups/emit.c +++ b/cups/emit.c @@ -1,5 +1,5 @@ /* - * "$Id: emit.c 10424 2012-04-23 17:26:57Z mike $" + * "$Id: emit.c 7863 2008-08-26 03:39:59Z mike $" * * PPD code emission routines for CUPS. * @@ -1225,5 +1225,5 @@ ppd_handle_media(ppd_file_t *ppd) /* I - PPD file */ /* - * End of "$Id: emit.c 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: emit.c 7863 2008-08-26 03:39:59Z mike $". */ diff --git a/cups/encode.c b/cups/encode.c index 8bf5f37f..17c0baeb 100644 --- a/cups/encode.c +++ b/cups/encode.c @@ -1,5 +1,5 @@ /* - * "$Id: encode.c 10618 2012-09-28 20:03:54Z mike $" + * "$Id: encode.c 7696 2008-06-26 00:54:42Z mike $" * * Option encoding routines for CUPS. * @@ -660,5 +660,5 @@ compare_ipp_options(_ipp_option_t *a, /* I - First option */ /* - * End of "$Id: encode.c 10618 2012-09-28 20:03:54Z mike $". + * End of "$Id: encode.c 7696 2008-06-26 00:54:42Z mike $". */ diff --git a/cups/file-private.h b/cups/file-private.h index b69557e8..bb83c40c 100644 --- a/cups/file-private.h +++ b/cups/file-private.h @@ -1,5 +1,5 @@ /* - * "$Id: file-private.h 9777 2011-05-13 23:04:16Z mike $" + * "$Id: file-private.h 3275 2011-05-20 07:26:13Z msweet $" * * Private file definitions for CUPS. * @@ -133,5 +133,5 @@ extern void _cupsFileCheckFilter(void *context, #endif /* !_CUPS_FILE_PRIVATE_H_ */ /* - * End of "$Id: file-private.h 9777 2011-05-13 23:04:16Z mike $". + * End of "$Id: file-private.h 3275 2011-05-20 07:26:13Z msweet $". */ diff --git a/cups/file.c b/cups/file.c index 4d1a84ea..1918ec5b 100644 --- a/cups/file.c +++ b/cups/file.c @@ -1,5 +1,5 @@ /* - * "$Id: file.c 10424 2012-04-23 17:26:57Z mike $" + * "$Id: file.c 7672 2008-06-18 22:03:02Z mike $" * * File functions for CUPS. * @@ -2710,5 +2710,5 @@ cups_write(cups_file_t *fp, /* I - CUPS file */ /* - * End of "$Id: file.c 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: file.c 7672 2008-06-18 22:03:02Z mike $". */ diff --git a/cups/file.h b/cups/file.h index ca2b987a..1428c576 100644 --- a/cups/file.h +++ b/cups/file.h @@ -1,5 +1,5 @@ /* - * "$Id: file.h 9950 2011-09-01 23:02:24Z mike $" + * "$Id: file.h 7460 2008-04-16 02:19:54Z mike $" * * Public file definitions for CUPS. * @@ -112,5 +112,5 @@ extern ssize_t cupsFileWrite(cups_file_t *fp, const char *buf, #endif /* !_CUPS_FILE_H_ */ /* - * End of "$Id: file.h 9950 2011-09-01 23:02:24Z mike $". + * End of "$Id: file.h 7460 2008-04-16 02:19:54Z mike $". */ diff --git a/cups/getdevices.c b/cups/getdevices.c index 9f34a28b..3416c5e7 100644 --- a/cups/getdevices.c +++ b/cups/getdevices.c @@ -1,5 +1,5 @@ /* - * "$Id: getdevices.c 10424 2012-04-23 17:26:57Z mike $" + * "$Id: getdevices.c 3794 2012-04-23 22:44:16Z msweet $" * * cupsGetDevices implementation for CUPS. * @@ -279,5 +279,5 @@ cupsGetDevices( /* - * End of "$Id: getdevices.c 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: getdevices.c 3794 2012-04-23 22:44:16Z msweet $". */ diff --git a/cups/getifaddrs.c b/cups/getifaddrs.c index 26c912ce..6c9cc554 100644 --- a/cups/getifaddrs.c +++ b/cups/getifaddrs.c @@ -1,5 +1,5 @@ /* - * "$Id: getifaddrs.c 9042 2010-03-24 00:45:34Z mike $" + * "$Id: getifaddrs.c 6649 2007-07-11 21:46:42Z mike $" * * Network interface functions for CUPS. * @@ -262,5 +262,5 @@ _cups_freeifaddrs(struct ifaddrs *addrs)/* I - Interface list to free */ /* - * End of "$Id: getifaddrs.c 9042 2010-03-24 00:45:34Z mike $". + * End of "$Id: getifaddrs.c 6649 2007-07-11 21:46:42Z mike $". */ diff --git a/cups/getputfile.c b/cups/getputfile.c index 63e79799..7e12fe9f 100644 --- a/cups/getputfile.c +++ b/cups/getputfile.c @@ -1,5 +1,5 @@ /* - * "$Id: getputfile.c 10424 2012-04-23 17:26:57Z mike $" + * "$Id: getputfile.c 7359 2008-02-29 19:01:35Z mike $" * * Get/put file functions for CUPS. * @@ -498,5 +498,5 @@ cupsPutFile(http_t *http, /* I - Connection to server or @code CUPS_HTTP_DE /* - * End of "$Id: getputfile.c 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: getputfile.c 7359 2008-02-29 19:01:35Z mike $". */ diff --git a/cups/globals.c b/cups/globals.c index 364c78fe..418452fc 100644 --- a/cups/globals.c +++ b/cups/globals.c @@ -1,5 +1,5 @@ /* - * "$Id: globals.c 10814 2013-01-14 22:06:21Z mike $" + * "$Id: globals.c 7870 2008-08-27 18:14:10Z mike $" * * Global variable access routines for CUPS. * @@ -215,7 +215,6 @@ cups_globals_alloc(void) cg->any_root = 1; cg->expired_certs = 1; cg->expired_root = 1; - cg->server_version = 20; /* * Then set directories as appropriate... @@ -381,5 +380,5 @@ cups_globals_init(void) /* - * End of "$Id: globals.c 10814 2013-01-14 22:06:21Z mike $". + * End of "$Id: globals.c 7870 2008-08-27 18:14:10Z mike $". */ diff --git a/cups/http-addr.c b/cups/http-addr.c index b3ee84ca..4b09d8ea 100644 --- a/cups/http-addr.c +++ b/cups/http-addr.c @@ -1,5 +1,5 @@ /* - * "$Id: http-addr.c 10471 2012-05-16 22:57:03Z mike $" + * "$Id: http-addr.c 7910 2008-09-06 00:25:17Z mike $" * * HTTP address routines for CUPS. * @@ -699,5 +699,5 @@ httpGetHostname(http_t *http, /* I - HTTP connection or NULL */ /* - * End of "$Id: http-addr.c 10471 2012-05-16 22:57:03Z mike $". + * End of "$Id: http-addr.c 7910 2008-09-06 00:25:17Z mike $". */ diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c index 3936a443..f9cd1f3e 100644 --- a/cups/http-addrlist.c +++ b/cups/http-addrlist.c @@ -1,5 +1,5 @@ /* - * "$Id: http-addrlist.c 10424 2012-04-23 17:26:57Z mike $" + * "$Id: http-addrlist.c 7910 2008-09-06 00:25:17Z mike $" * * HTTP address list routines for CUPS. * @@ -33,7 +33,7 @@ # include <poll.h> #endif /* HAVE_POLL */ #ifndef WIN32 -# include <sys/fcntl.h> +# include <fcntl.h> #endif /* WIN32 */ @@ -841,5 +841,5 @@ httpAddrGetList(const char *hostname, /* I - Hostname, IP address, or NULL for p /* - * End of "$Id: http-addrlist.c 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: http-addrlist.c 7910 2008-09-06 00:25:17Z mike $". */ diff --git a/cups/http-private.h b/cups/http-private.h index 584d2a70..ec58de0e 100644 --- a/cups/http-private.h +++ b/cups/http-private.h @@ -1,5 +1,5 @@ /* - * "$Id: http-private.h 10776 2012-12-17 22:17:08Z mike $" + * "$Id: http-private.h 7850 2008-08-20 00:07:25Z mike $" * * Private HTTP definitions for CUPS. * @@ -390,5 +390,5 @@ extern int _httpWait(http_t *http, int msec, int usessl); #endif /* !_CUPS_HTTP_PRIVATE_H_ */ /* - * End of "$Id: http-private.h 10776 2012-12-17 22:17:08Z mike $". + * End of "$Id: http-private.h 7850 2008-08-20 00:07:25Z mike $". */ diff --git a/cups/http-support.c b/cups/http-support.c index eb24a1a4..146719dc 100644 --- a/cups/http-support.c +++ b/cups/http-support.c @@ -1,9 +1,9 @@ /* - * "$Id: http-support.c 10899 2013-03-11 18:44:36Z mike $" + * "$Id: http-support.c 7952 2008-09-17 00:56:20Z mike $" * * HTTP support routines for CUPS. * - * Copyright 2007-2012 by Apple Inc. + * Copyright 2007-2013 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -238,6 +238,9 @@ httpAssembleURI( if (host) { + const char *hostptr; /* Pointer into hostname */ + int have_ipv6; /* Do we have an IPv6 address? */ + if (username && *username) { /* @@ -265,13 +268,23 @@ httpAssembleURI( * too... */ - if (host[0] != '[' && strchr(host, ':') && !strstr(host, "._tcp")) + for (hostptr = host, + have_ipv6 = strchr(host, ':') && !strstr(host, "._tcp"); + *hostptr && have_ipv6; + hostptr ++) + if (*hostptr != ':' && !isxdigit(*hostptr & 255)) + { + have_ipv6 = *hostptr == '%'; + break; + } + + if (have_ipv6) { /* * We have a raw IPv6 address... */ - if (strchr(host, '%')) + if (strchr(host, '%') && !(encoding & HTTP_URI_CODING_RFC6874)) { /* * We have a link-local address, add "[v1." prefix... @@ -290,7 +303,7 @@ httpAssembleURI( else { /* - * We have a normal address, add "[" prefix... + * We have a normal (or RFC 6874 link-local) address, add "[" prefix... */ if (ptr < end) @@ -306,8 +319,23 @@ httpAssembleURI( while (ptr < end && *host) { if (*host == '%') - { - *ptr++ = '+'; /* Convert zone separator */ + { + /* + * Convert/encode zone separator + */ + + if (encoding & HTTP_URI_CODING_RFC6874) + { + if (ptr >= (end - 2)) + goto assemble_overflow; + + *ptr++ = '%'; + *ptr++ = '2'; + *ptr++ = '5'; + } + else + *ptr++ = '+'; + host ++; } else @@ -325,9 +353,12 @@ httpAssembleURI( else { /* - * Otherwise, just copy the host string... + * Otherwise, just copy the host string (the extra chars are not in the + * "reg-name" ABNF rule; anything <= SP or >= DEL plus % gets automatically + * percent-encoded. */ - ptr = http_copy_encode(ptr, host, end, "<>{}|^:/?#[]@\\\"", NULL, + + ptr = http_copy_encode(ptr, host, end, "\"#/:<>?@[\\]^`{|}", NULL, encoding & HTTP_URI_CODING_HOSTNAME); if (!ptr) @@ -1083,8 +1114,25 @@ httpSeparateURI( */ uri ++; - if (!strncmp(uri, "v1.", 3)) - uri += 3; /* Skip IPvN leader... */ + if (*uri == 'v') + { + /* + * Skip IPvFuture ("vXXXX.") prefix... + */ + + uri ++; + + while (isxdigit(*uri & 255)) + uri ++; + + if (*uri != '.') + { + *host = '\0'; + return (HTTP_URI_BAD_HOSTNAME); + } + + uri ++; + } uri = http_copy_decode(host, uri, hostlen, "]", decoding & HTTP_URI_CODING_HOSTNAME); @@ -1117,6 +1165,14 @@ httpSeparateURI( *ptr = '%'; break; } + else if (*ptr == '%') + { + /* + * Stop at zone separator (RFC 6874) + */ + + break; + } else if (*ptr != ':' && *ptr != '.' && !isxdigit(*ptr & 255)) { *host = '\0'; @@ -1132,12 +1188,13 @@ httpSeparateURI( for (ptr = (char *)uri; *ptr; ptr ++) if (strchr(":?/", *ptr)) break; - else if (!strchr("abcdefghijklmnopqrstuvwxyz" - "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "0123456789" - "-._~" - "%" - "!$&'()*+,;=\\", *ptr)) + else if (!strchr("abcdefghijklmnopqrstuvwxyz" /* unreserved */ + "ABCDEFGHIJKLMNOPQRSTUVWXYZ" /* unreserved */ + "0123456789" /* unreserved */ + "-._~" /* unreserved */ + "%" /* pct-encoded */ + "!$&'()*+,;=" /* sub-delims */ + "\\", *ptr)) /* SMB domain */ { *host = '\0'; return (HTTP_URI_BAD_HOSTNAME); @@ -1230,8 +1287,9 @@ httpSeparateURI( char *resptr = resource + strlen(resource); - uri = http_copy_decode(resptr, uri, resourcelen - (int)(resptr - resource), - NULL, decoding & HTTP_URI_CODING_QUERY); + uri = http_copy_decode(resptr, uri, + resourcelen - (int)(resptr - resource), NULL, + decoding & HTTP_URI_CODING_QUERY); } } @@ -1268,6 +1326,9 @@ httpStatus(http_status_t status) /* I - HTTP status code */ switch (status) { + case HTTP_ERROR : + s = strerror(errno); + break; case HTTP_CONTINUE : s = _("Continue"); break; @@ -2299,5 +2360,5 @@ http_resolve_cb( /* - * End of "$Id: http-support.c 10899 2013-03-11 18:44:36Z mike $". + * End of "$Id: http-support.c 7952 2008-09-17 00:56:20Z mike $". */ diff --git a/cups/http.c b/cups/http.c index ff0adb3f..70509d75 100644 --- a/cups/http.c +++ b/cups/http.c @@ -1,5 +1,5 @@ /* - * "$Id: http.c 10905 2013-03-13 16:26:25Z mike $" + * "$Id: http.c 7850 2008-08-20 00:07:25Z mike $" * * HTTP routines for CUPS. * @@ -2992,8 +2992,11 @@ _httpWait(http_t *http, /* I - Connection to server */ pfd.fd = http->fd; pfd.events = POLLIN; - while ((nfds = poll(&pfd, 1, msec)) < 0 && - (errno == EINTR || errno == EAGAIN)); + do + { + nfds = poll(&pfd, 1, msec); + } + while (nfds < 0 && (errno == EINTR || errno == EAGAIN)); #else do @@ -4763,5 +4766,5 @@ http_write_ssl(http_t *http, /* I - Connection to server */ /* - * End of "$Id: http.c 10905 2013-03-13 16:26:25Z mike $". + * End of "$Id: http.c 7850 2008-08-20 00:07:25Z mike $". */ diff --git a/cups/http.h b/cups/http.h index 36ac25cd..3f259d3b 100644 --- a/cups/http.h +++ b/cups/http.h @@ -1,5 +1,5 @@ /* - * "$Id: http.h 10424 2012-04-23 17:26:57Z mike $" + * "$Id: http.h 7026 2007-10-19 00:57:45Z mike $" * * Hyper-Text Transport Protocol definitions for CUPS. * @@ -279,7 +279,8 @@ typedef enum http_uri_coding_e /**** URI en/decode flags ****/ HTTP_URI_CODING_RESOURCE = 4, /* En/decode the resource portion */ HTTP_URI_CODING_MOST = 7, /* En/decode all but the query */ HTTP_URI_CODING_QUERY = 8, /* En/decode the query portion */ - HTTP_URI_CODING_ALL = 15 /* En/decode everything */ + HTTP_URI_CODING_ALL = 15, /* En/decode everything */ + HTTP_URI_CODING_RFC6874 = 16 /* Use RFC 6874 address format */ } http_uri_coding_t; typedef enum http_version_e /**** HTTP version numbers ****/ @@ -482,5 +483,5 @@ extern int httpReconnect2(http_t *http, int msec, int *cancel) #endif /* !_CUPS_HTTP_H_ */ /* - * End of "$Id: http.h 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: http.h 7026 2007-10-19 00:57:45Z mike $". */ diff --git a/cups/ipp-private.h b/cups/ipp-private.h index e3a94d94..1d3003c3 100644 --- a/cups/ipp-private.h +++ b/cups/ipp-private.h @@ -1,5 +1,5 @@ /* - * "$Id: ipp-private.h 10380 2012-03-23 22:20:10Z mike $" + * "$Id: ipp-private.h 7259 2008-01-28 22:26:04Z mike $" * * Private IPP definitions for CUPS. * @@ -74,5 +74,5 @@ extern _ipp_option_t *_ippFindOption(const char *name); #endif /* !_CUPS_IPP_H_ */ /* - * End of "$Id: ipp-private.h 10380 2012-03-23 22:20:10Z mike $". + * End of "$Id: ipp-private.h 7259 2008-01-28 22:26:04Z mike $". */ diff --git a/cups/ipp-support.c b/cups/ipp-support.c index 5a44605e..96cd1490 100644 --- a/cups/ipp-support.c +++ b/cups/ipp-support.c @@ -1,5 +1,5 @@ /* - * "$Id: ipp-support.c 10767 2012-12-13 21:10:03Z mike $" + * "$Id: ipp-support.c 9371 2010-11-17 06:21:32Z mike $" * * Internet Printing Protocol support functions for CUPS. * @@ -1086,5 +1086,5 @@ ipp_col_string(ipp_t *col, /* I - Collection attribute */ /* - * End of "$Id: ipp-support.c 10767 2012-12-13 21:10:03Z mike $". + * End of "$Id: ipp-support.c 9371 2010-11-17 06:21:32Z mike $". */ @@ -1,5 +1,5 @@ /* - * "$Id: ipp.c 10814 2013-01-14 22:06:21Z mike $" + * "$Id: ipp.c 10102 2011-11-02 23:52:39Z mike $" * * Internet Printing Protocol functions for CUPS. * @@ -2340,6 +2340,9 @@ ippNew(void) * Set default version - usually 2.0... */ + if (cg->server_version == 0) + _cupsSetDefaults(); + temp->request.any.version[0] = cg->server_version / 10; temp->request.any.version[1] = cg->server_version % 10; temp->use = 1; @@ -5567,5 +5570,5 @@ ipp_write_file(int *fd, /* I - File descriptor */ /* - * End of "$Id: ipp.c 10814 2013-01-14 22:06:21Z mike $". + * End of "$Id: ipp.c 10102 2011-11-02 23:52:39Z mike $". */ @@ -1,5 +1,5 @@ /* - * "$Id: ipp.h 10424 2012-04-23 17:26:57Z mike $" + * "$Id: ipp.h 7847 2008-08-19 04:22:14Z mike $" * * Internet Printing Protocol definitions for CUPS. * @@ -667,5 +667,5 @@ extern int ippSetVersion(ipp_t *ipp, int major, int minor) #endif /* !_CUPS_IPP_H_ */ /* - * End of "$Id: ipp.h 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: ipp.h 7847 2008-08-19 04:22:14Z mike $". */ diff --git a/cups/langprintf.c b/cups/langprintf.c index 6c7d9462..1a9f8b78 100644 --- a/cups/langprintf.c +++ b/cups/langprintf.c @@ -1,5 +1,5 @@ /* - * "$Id: langprintf.c 9637 2011-03-21 23:03:22Z mike $" + * "$Id: langprintf.c 7802 2008-07-28 18:50:45Z mike $" * * Localized printf/puts functions for CUPS. * @@ -348,5 +348,5 @@ _cupsSetLocale(char *argv[]) /* IO - Command-line arguments */ /* - * End of "$Id: langprintf.c 9637 2011-03-21 23:03:22Z mike $". + * End of "$Id: langprintf.c 7802 2008-07-28 18:50:45Z mike $". */ diff --git a/cups/language-private.h b/cups/language-private.h index 94d8252a..cf5b482b 100644 --- a/cups/language-private.h +++ b/cups/language-private.h @@ -1,5 +1,5 @@ /* - * "$Id: language-private.h 10506 2012-05-23 20:17:12Z mike $" + * "$Id$" * * Private localization support for CUPS. * @@ -82,5 +82,5 @@ extern void _cupsSetLocale(char *argv[]); #endif /* !_CUPS_LANGUAGE_PRIVATE_H_ */ /* - * End of "$Id: language-private.h 10506 2012-05-23 20:17:12Z mike $". + * End of "$Id$". */ diff --git a/cups/language.c b/cups/language.c index 9e69a499..49f03823 100644 --- a/cups/language.c +++ b/cups/language.c @@ -1,5 +1,5 @@ /* - * "$Id: language.c 10530 2012-06-22 02:25:46Z mike $" + * "$Id: language.c 7558 2008-05-12 23:46:44Z mike $" * * I18N/language support for CUPS. * @@ -1563,5 +1563,5 @@ cups_unquote(char *d, /* O - Unquoted string */ /* - * End of "$Id: language.c 10530 2012-06-22 02:25:46Z mike $". + * End of "$Id: language.c 7558 2008-05-12 23:46:44Z mike $". */ diff --git a/cups/language.h b/cups/language.h index 03c8eb5d..91d2012b 100644 --- a/cups/language.h +++ b/cups/language.h @@ -1,5 +1,5 @@ /* - * "$Id: language.h 9771 2011-05-12 05:21:56Z mike $" + * "$Id: language.h 6649 2007-07-11 21:46:42Z mike $" * * Multi-language support for CUPS. * @@ -111,5 +111,5 @@ extern cups_lang_t *cupsLangGet(const char *language); #endif /* !_CUPS_LANGUAGE_H_ */ /* - * End of "$Id: language.h 9771 2011-05-12 05:21:56Z mike $". + * End of "$Id: language.h 6649 2007-07-11 21:46:42Z mike $". */ diff --git a/cups/localize.c b/cups/localize.c index 65faa149..7bb0fedd 100644 --- a/cups/localize.c +++ b/cups/localize.c @@ -1,5 +1,5 @@ /* - * "$Id: localize.c 10424 2012-04-23 17:26:57Z mike $" + * "$Id: localize.c 7679 2008-06-19 23:37:45Z mike $" * * PPD localization routines for CUPS. * @@ -775,5 +775,5 @@ ppd_ll_CC(char *ll_CC, /* O - Country-specific locale name */ /* - * End of "$Id: localize.c 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: localize.c 7679 2008-06-19 23:37:45Z mike $". */ diff --git a/cups/mark.c b/cups/mark.c index ecbfe0b4..dc2257f3 100644 --- a/cups/mark.c +++ b/cups/mark.c @@ -1,5 +1,5 @@ /* - * "$Id: mark.c 10424 2012-04-23 17:26:57Z mike $" + * "$Id: mark.c 9042 2010-03-24 00:45:34Z mike $" * * Option marking routines for CUPS. * @@ -1097,5 +1097,5 @@ ppd_mark_option(ppd_file_t *ppd, /* I - PPD file */ /* - * End of "$Id: mark.c 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: mark.c 9042 2010-03-24 00:45:34Z mike $". */ diff --git a/cups/md5-private.h b/cups/md5-private.h index 720ae34d..3667cf0b 100644 --- a/cups/md5-private.h +++ b/cups/md5-private.h @@ -1,5 +1,5 @@ /* - * "$Id: md5-private.h 9042 2010-03-24 00:45:34Z mike $" + * "$Id$" * * Private MD5 definitions for CUPS. * @@ -75,5 +75,5 @@ void _cupsMD5Finish(_cups_md5_state_t *pms, unsigned char digest[16]); #endif /* !_CUPS_MD5_PRIVATE_H_ */ /* - * End of "$Id: md5-private.h 9042 2010-03-24 00:45:34Z mike $". + * End of "$Id$". */ diff --git a/cups/md5passwd.c b/cups/md5passwd.c index 8b538979..777073a0 100644 --- a/cups/md5passwd.c +++ b/cups/md5passwd.c @@ -1,5 +1,5 @@ /* - * "$Id: md5passwd.c 9042 2010-03-24 00:45:34Z mike $" + * "$Id: md5passwd.c 6649 2007-07-11 21:46:42Z mike $" * * MD5 password support for CUPS. * @@ -138,5 +138,5 @@ httpMD5String(const unsigned char *sum, /* I - MD5 sum data */ /* - * End of "$Id: md5passwd.c 9042 2010-03-24 00:45:34Z mike $". + * End of "$Id: md5passwd.c 6649 2007-07-11 21:46:42Z mike $". */ diff --git a/cups/notify.c b/cups/notify.c index c174423a..9d520f17 100644 --- a/cups/notify.c +++ b/cups/notify.c @@ -1,5 +1,5 @@ /* - * "$Id: notify.c 10424 2012-04-23 17:26:57Z mike $" + * "$Id: notify.c 7337 2008-02-22 04:44:04Z mike $" * * Notification routines for CUPS. * @@ -198,5 +198,5 @@ cupsNotifyText(cups_lang_t *lang, /* I - Language data */ /* - * End of "$Id: notify.c 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: notify.c 7337 2008-02-22 04:44:04Z mike $". */ diff --git a/cups/options.c b/cups/options.c index 28f06e0f..8efe0b49 100644 --- a/cups/options.c +++ b/cups/options.c @@ -1,5 +1,5 @@ /* - * "$Id: options.c 10424 2012-04-23 17:26:57Z mike $" + * "$Id: options.c 8181 2008-12-10 17:29:57Z mike $" * * Option routines for CUPS. * @@ -707,5 +707,5 @@ cups_find_option( /* - * End of "$Id: options.c 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: options.c 8181 2008-12-10 17:29:57Z mike $". */ diff --git a/cups/page.c b/cups/page.c index 4ddd2fd3..b5c5e34c 100644 --- a/cups/page.c +++ b/cups/page.c @@ -1,5 +1,5 @@ /* - * "$Id: page.c 10440 2012-04-30 18:33:39Z mike $" + * "$Id: page.c 7791 2008-07-24 00:55:30Z mike $" * * Page size functions for CUPS. * @@ -392,5 +392,5 @@ ppdPageLength(ppd_file_t *ppd, /* I - PPD file */ /* - * End of "$Id: page.c 10440 2012-04-30 18:33:39Z mike $". + * End of "$Id: page.c 7791 2008-07-24 00:55:30Z mike $". */ diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c index d67a2ddc..ca1c7737 100644 --- a/cups/ppd-cache.c +++ b/cups/ppd-cache.c @@ -1,5 +1,5 @@ /* - * "$Id: ppd-cache.c 10728 2012-12-04 20:07:27Z mike $" + * "$Id: ppd-cache.c 4185 2013-02-20 02:19:13Z msweet $" * * PPD cache implementation for CUPS. * @@ -2631,5 +2631,5 @@ pwg_unppdize_name(const char *ppd, /* I - PPD keyword */ /* - * End of "$Id: ppd-cache.c 10728 2012-12-04 20:07:27Z mike $". + * End of "$Id: ppd-cache.c 4185 2013-02-20 02:19:13Z msweet $". */ diff --git a/cups/ppd-private.h b/cups/ppd-private.h index 413705de..b9d79c89 100644 --- a/cups/ppd-private.h +++ b/cups/ppd-private.h @@ -1,5 +1,5 @@ /* - * "$Id: ppd-private.h 10293 2012-02-15 23:10:05Z mike $" + * "$Id: ppd-private.h 3683 2012-02-16 22:03:53Z msweet $" * * Private PPD definitions for CUPS. * @@ -211,5 +211,5 @@ extern const char *_pwgPageSizeForMedia(_pwg_media_t *media, #endif /* !_CUPS_PPD_PRIVATE_H_ */ /* - * End of "$Id: ppd-private.h 10293 2012-02-15 23:10:05Z mike $". + * End of "$Id: ppd-private.h 3683 2012-02-16 22:03:53Z msweet $". */ @@ -1,5 +1,5 @@ /* - * "$Id: ppd.c 10424 2012-04-23 17:26:57Z mike $" + * "$Id: ppd.c 9900 2011-08-17 20:59:46Z mike $" * * PPD file routines for CUPS. * @@ -3394,5 +3394,5 @@ ppd_update_filters(ppd_file_t *ppd,/* I - PPD file */ /* - * End of "$Id: ppd.c 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: ppd.c 9900 2011-08-17 20:59:46Z mike $". */ @@ -1,5 +1,5 @@ /* - * "$Id: ppd.h 10424 2012-04-23 17:26:57Z mike $" + * "$Id: ppd.h 7791 2008-07-24 00:55:30Z mike $" * * PostScript Printer Description definitions for CUPS. * @@ -476,5 +476,5 @@ extern int ppdPageSizeLimits(ppd_file_t *ppd, #endif /* !_CUPS_PPD_H_ */ /* - * End of "$Id: ppd.h 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: ppd.h 7791 2008-07-24 00:55:30Z mike $". */ diff --git a/cups/pwg-media.c b/cups/pwg-media.c index 7a03abfa..0c563555 100644 --- a/cups/pwg-media.c +++ b/cups/pwg-media.c @@ -1,5 +1,5 @@ /* - * "$Id: pwg-media.c 10453 2012-05-04 23:38:53Z mike $" + * "$Id: pwg-media.c 10979 2013-05-13 17:39:19Z msweet $" * * PWG media name API implementation for CUPS. * @@ -794,13 +794,13 @@ _pwgMediaForPWG(const char *pwg) /* I - PWG size name */ if (!strcmp(ptr, "mm")) { - size->width = (int)(w * 100); - size->length = (int)(l * 100); + size->width = (int)(w * 100 + 0.5); + size->length = (int)(l * 100 + 0.5); } else { - size->width = (int)(w * 2540); - size->length = (int)(l * 2540); + size->width = (int)(w * 2540 + 0.5); + size->length = (int)(l * 2540 + 0.5); } strlcpy(cg->pwg_name, pwg, sizeof(cg->pwg_name)); @@ -924,5 +924,5 @@ pwg_compare_pwg(_pwg_media_t *a, /* I - First size */ /* - * End of "$Id: pwg-media.c 10453 2012-05-04 23:38:53Z mike $". + * End of "$Id: pwg-media.c 10979 2013-05-13 17:39:19Z msweet $". */ diff --git a/cups/pwg-private.h b/cups/pwg-private.h index 674e1110..3c7a1a7b 100644 --- a/cups/pwg-private.h +++ b/cups/pwg-private.h @@ -1,5 +1,5 @@ /* - * "$Id: pwg-private.h 10453 2012-05-04 23:38:53Z mike $" + * "$Id: pwg-private.h 3833 2012-05-23 22:51:18Z msweet $" * * Private PWG media API definitions for CUPS. * @@ -100,5 +100,5 @@ extern _pwg_media_t *_pwgMediaForSize(int width, int length); #endif /* !_CUPS_PWG_PRIVATE_H_ */ /* - * End of "$Id: pwg-private.h 10453 2012-05-04 23:38:53Z mike $". + * End of "$Id: pwg-private.h 3833 2012-05-23 22:51:18Z msweet $". */ diff --git a/cups/raster-private.h b/cups/raster-private.h index 07c01e1e..ebd5d721 100644 --- a/cups/raster-private.h +++ b/cups/raster-private.h @@ -1,5 +1,5 @@ /* - * "$Id: raster-private.h 10404 2012-04-13 18:01:35Z mike $" + * "$Id: raster-private.h 3794 2012-04-23 22:44:16Z msweet $" * * Private image library definitions for CUPS. * @@ -62,5 +62,5 @@ extern void _cupsRasterClearError(void); #endif /* !_CUPS_RASTER_PRIVATE_H_ */ /* - * End of "$Id: raster-private.h 10404 2012-04-13 18:01:35Z mike $". + * End of "$Id: raster-private.h 3794 2012-04-23 22:44:16Z msweet $". */ diff --git a/cups/raster.h b/cups/raster.h index d1bb3eaa..a0bbdda2 100644 --- a/cups/raster.h +++ b/cups/raster.h @@ -1,5 +1,5 @@ /* - * "$Id: raster.h 10424 2012-04-23 17:26:57Z mike $" + * "$Id: raster.h 3794 2012-04-23 22:44:16Z msweet $" * * Raster file definitions for CUPS. * @@ -401,5 +401,5 @@ extern cups_raster_t *cupsRasterOpenIO(cups_raster_iocb_t iocb, void *ctx, #endif /* !_CUPS_RASTER_H_ */ /* - * End of "$Id: raster.h 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: raster.h 3794 2012-04-23 22:44:16Z msweet $". */ diff --git a/cups/request.c b/cups/request.c index 1b7f2dde..59ac6dd2 100644 --- a/cups/request.c +++ b/cups/request.c @@ -1,5 +1,5 @@ /* - * "$Id: request.c 10762 2012-12-13 20:28:30Z mike $" + * "$Id: request.c 7946 2008-09-16 23:27:54Z mike $" * * IPP utilities for CUPS. * @@ -1164,5 +1164,5 @@ _cupsSetHTTPError(http_status_t status) /* I - HTTP status code */ /* - * End of "$Id: request.c 10762 2012-12-13 20:28:30Z mike $". + * End of "$Id: request.c 7946 2008-09-16 23:27:54Z mike $". */ diff --git a/cups/sidechannel.c b/cups/sidechannel.c index 3efbc4f0..7bd626ea 100644 --- a/cups/sidechannel.c +++ b/cups/sidechannel.c @@ -1,5 +1,5 @@ /* - * "$Id: sidechannel.c 10424 2012-04-23 17:26:57Z mike $" + * "$Id: sidechannel.c 7720 2008-07-11 22:46:21Z mike $" * * Side-channel API code for CUPS. * @@ -638,5 +638,5 @@ cupsSideChannelWrite( /* - * End of "$Id: sidechannel.c 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: sidechannel.c 7720 2008-07-11 22:46:21Z mike $". */ diff --git a/cups/sidechannel.h b/cups/sidechannel.h index dc9598b3..5f97257e 100644 --- a/cups/sidechannel.h +++ b/cups/sidechannel.h @@ -1,5 +1,5 @@ /* - * "$Id: sidechannel.h 10424 2012-04-23 17:26:57Z mike $" + * "$Id: sidechannel.h 7616 2008-05-28 00:34:13Z mike $" * * Side-channel API definitions for CUPS. * @@ -143,5 +143,5 @@ extern cups_sc_status_t cupsSideChannelSNMPWalk(const char *oid, double timeout, #endif /* !_CUPS_SIDECHANNEL_H_ */ /* - * End of "$Id: sidechannel.h 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: sidechannel.h 7616 2008-05-28 00:34:13Z mike $". */ diff --git a/cups/snmp-private.h b/cups/snmp-private.h index d4cda85e..9661243b 100644 --- a/cups/snmp-private.h +++ b/cups/snmp-private.h @@ -1,5 +1,5 @@ /* - * "$Id: snmp-private.h 10393 2012-03-31 05:05:49Z mike $" + * "$Id: snmp-private.h 3794 2012-04-23 22:44:16Z msweet $" * * Private SNMP definitions for CUPS. * @@ -142,5 +142,5 @@ extern int _cupsSNMPWrite(int fd, http_addr_t *address, int version, /* - * End of "$Id: snmp-private.h 10393 2012-03-31 05:05:49Z mike $". + * End of "$Id: snmp-private.h 3794 2012-04-23 22:44:16Z msweet $". */ diff --git a/cups/snmp.c b/cups/snmp.c index a503b701..0c0e5209 100644 --- a/cups/snmp.c +++ b/cups/snmp.c @@ -1,5 +1,5 @@ /* - * "$Id: snmp.c 10394 2012-04-05 16:59:07Z mike $" + * "$Id: snmp.c 3794 2012-04-23 22:44:16Z msweet $" * * SNMP functions for CUPS. * @@ -1733,5 +1733,5 @@ snmp_set_error(cups_snmp_t *packet, /* I - Packet */ /* - * End of "$Id: snmp.c 10394 2012-04-05 16:59:07Z mike $". + * End of "$Id: snmp.c 3794 2012-04-23 22:44:16Z msweet $". */ diff --git a/cups/snprintf.c b/cups/snprintf.c index 75e92cd0..fcebf895 100644 --- a/cups/snprintf.c +++ b/cups/snprintf.c @@ -1,5 +1,5 @@ /* - * "$Id: snprintf.c 9042 2010-03-24 00:45:34Z mike $" + * "$Id: snprintf.c 6649 2007-07-11 21:46:42Z mike $" * * snprintf functions for CUPS. * @@ -357,6 +357,6 @@ _cups_snprintf(char *buffer, /* O - Output buffer */ /* - * End of "$Id: snprintf.c 9042 2010-03-24 00:45:34Z mike $". + * End of "$Id: snprintf.c 6649 2007-07-11 21:46:42Z mike $". */ diff --git a/cups/sspi.c b/cups/sspi.c index 3ad3a017..ff79e5a6 100644 --- a/cups/sspi.c +++ b/cups/sspi.c @@ -1,5 +1,5 @@ /* - * "$Id: sspi.c 9771 2011-05-12 05:21:56Z mike $" + * "$Id: sspi.c 3247 2011-05-12 06:22:31Z msweet $" * * Windows SSPI SSL implementation for CUPS. * @@ -1481,5 +1481,5 @@ cleanup: /* - * End of "$Id: sspi.c 9771 2011-05-12 05:21:56Z mike $". + * End of "$Id: sspi.c 3247 2011-05-12 06:22:31Z msweet $". */ diff --git a/cups/string-private.h b/cups/string-private.h index bf103944..bef1aea8 100644 --- a/cups/string-private.h +++ b/cups/string-private.h @@ -1,5 +1,5 @@ /* - * "$Id: string-private.h 9950 2011-09-01 23:02:24Z mike $" + * "$Id$" * * Private string definitions for CUPS. * @@ -196,5 +196,5 @@ extern double _cupsStrScand(const char *buf, char **bufptr, #endif /* !_CUPS_STRING_H_ */ /* - * End of "$Id: string-private.h 9950 2011-09-01 23:02:24Z mike $". + * End of "$Id$". */ diff --git a/cups/string.c b/cups/string.c index 01bfbe34..538a2638 100644 --- a/cups/string.c +++ b/cups/string.c @@ -1,5 +1,5 @@ /* - * "$Id: string.c 9793 2011-05-20 03:49:49Z mike $" + * "$Id: string.c 7460 2008-04-16 02:19:54Z mike $" * * String functions for CUPS. * @@ -755,5 +755,5 @@ compare_sp_items(_cups_sp_item_t *a, /* I - First item */ /* - * End of "$Id: string.c 9793 2011-05-20 03:49:49Z mike $". + * End of "$Id: string.c 7460 2008-04-16 02:19:54Z mike $". */ diff --git a/cups/tempfile.c b/cups/tempfile.c index 72b85167..ac59d9f8 100644 --- a/cups/tempfile.c +++ b/cups/tempfile.c @@ -1,5 +1,5 @@ /* - * "$Id: tempfile.c 10424 2012-04-23 17:26:57Z mike $" + * "$Id: tempfile.c 7337 2008-02-22 04:44:04Z mike $" * * Temp file utilities for CUPS. * @@ -229,5 +229,5 @@ cupsTempFile2(char *filename, /* I - Pointer to buffer */ /* - * End of "$Id: tempfile.c 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: tempfile.c 7337 2008-02-22 04:44:04Z mike $". */ diff --git a/cups/test.ppd b/cups/test.ppd index b5de3440..fc453a64 100644 --- a/cups/test.ppd +++ b/cups/test.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% -*% "$Id: test.ppd 9314 2010-09-24 02:36:17Z mike $" +*% "$Id: test.ppd 7819 2008-08-01 00:27:24Z mike $" *% *% Test PPD file for CUPS. *% @@ -258,5 +258,5 @@ help:anchor='foo'%20bookID=Vendor%20Help *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM *Font ZapfDingbats: Special "(001.004S)" Standard ROM *% -*% End of "$Id: test.ppd 9314 2010-09-24 02:36:17Z mike $". +*% End of "$Id: test.ppd 7819 2008-08-01 00:27:24Z mike $". *% diff --git a/cups/test2.ppd b/cups/test2.ppd index 3f19bc3f..353afb6e 100644 --- a/cups/test2.ppd +++ b/cups/test2.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% -*% "$Id: test2.ppd 9771 2011-05-12 05:21:56Z mike $" +*% "$Id: test2.ppd 7791 2008-07-24 00:55:30Z mike $" *% *% Test PPD file #2 for CUPS. *% @@ -248,5 +248,5 @@ help:anchor='foo'%20bookID=Vendor%20Help *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM *Font ZapfDingbats: Special "(001.004S)" Standard ROM *% -*% End of "$Id: test2.ppd 9771 2011-05-12 05:21:56Z mike $". +*% End of "$Id: test2.ppd 7791 2008-07-24 00:55:30Z mike $". *% diff --git a/cups/testadmin.c b/cups/testadmin.c index c6946d4a..a16025c3 100644 --- a/cups/testadmin.c +++ b/cups/testadmin.c @@ -1,5 +1,5 @@ /* - * "$Id: testadmin.c 9042 2010-03-24 00:45:34Z mike $" + * "$Id: testadmin.c 7720 2008-07-11 22:46:21Z mike $" * * Admin function test program for CUPS. * @@ -116,5 +116,5 @@ show_settings( /* - * End of "$Id: testadmin.c 9042 2010-03-24 00:45:34Z mike $". + * End of "$Id: testadmin.c 7720 2008-07-11 22:46:21Z mike $". */ diff --git a/cups/testarray.c b/cups/testarray.c index 31d227c8..2e254c24 100644 --- a/cups/testarray.c +++ b/cups/testarray.c @@ -1,5 +1,5 @@ /* - * "$Id: testarray.c 9099 2010-04-11 07:16:05Z mike $" + * "$Id: testarray.c 6649 2007-07-11 21:46:42Z mike $" * * Array test program for CUPS. * @@ -476,5 +476,5 @@ load_words(const char *filename, /* I - File to load */ /* - * End of "$Id: testarray.c 9099 2010-04-11 07:16:05Z mike $". + * End of "$Id: testarray.c 6649 2007-07-11 21:46:42Z mike $". */ diff --git a/cups/testconflicts.c b/cups/testconflicts.c index 751a91e0..0ccca825 100644 --- a/cups/testconflicts.c +++ b/cups/testconflicts.c @@ -1,5 +1,5 @@ /* - * "$Id: testconflicts.c 10378 2012-03-23 21:38:25Z mike $" + * "$Id: testconflicts.c 3755 2012-03-30 05:59:14Z msweet $" * * PPD constraint test program for CUPS. * @@ -134,5 +134,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: testconflicts.c 10378 2012-03-23 21:38:25Z mike $". + * End of "$Id: testconflicts.c 3755 2012-03-30 05:59:14Z msweet $". */ diff --git a/cups/testcups.c b/cups/testcups.c index 58f886e0..18bb39cc 100644 --- a/cups/testcups.c +++ b/cups/testcups.c @@ -1,5 +1,5 @@ /* - * "$Id: testcups.c 10470 2012-05-16 22:33:31Z mike $" + * "$Id$" * * CUPS API test program for CUPS. * @@ -566,5 +566,5 @@ show_diffs(cups_dest_t *a, /* I - First destination */ /* - * End of "$Id: testcups.c 10470 2012-05-16 22:33:31Z mike $". + * End of "$Id$". */ diff --git a/cups/testfile.c b/cups/testfile.c index 2f76dfca..2aa3fb99 100644 --- a/cups/testfile.c +++ b/cups/testfile.c @@ -1,5 +1,5 @@ /* - * "$Id: testfile.c 9926 2011-08-27 09:23:01Z mike $" + * "$Id: testfile.c 7720 2008-07-11 22:46:21Z mike $" * * File test program for CUPS. * @@ -817,5 +817,5 @@ read_write_tests(int compression) /* I - Use compression? */ /* - * End of "$Id: testfile.c 9926 2011-08-27 09:23:01Z mike $". + * End of "$Id: testfile.c 7720 2008-07-11 22:46:21Z mike $". */ diff --git a/cups/testhttp.c b/cups/testhttp.c index d8f48464..10fb6245 100644 --- a/cups/testhttp.c +++ b/cups/testhttp.c @@ -1,5 +1,5 @@ /* - * "$Id: testhttp.c 10899 2013-03-11 18:44:36Z mike $" + * "$Id: testhttp.c 7742 2008-07-15 20:23:09Z mike $" * * HTTP test program for CUPS. * @@ -600,5 +600,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: testhttp.c 10899 2013-03-11 18:44:36Z mike $". + * End of "$Id: testhttp.c 7742 2008-07-15 20:23:09Z mike $". */ diff --git a/cups/testi18n.c b/cups/testi18n.c index fc056e09..725c01b2 100644 --- a/cups/testi18n.c +++ b/cups/testi18n.c @@ -1,5 +1,5 @@ /* - * "$Id: testi18n.c 9793 2011-05-20 03:49:49Z mike $" + * "$Id: testi18n.c 7560 2008-05-13 06:34:04Z mike $" * * Internationalization test for CUPS. * @@ -615,5 +615,5 @@ print_utf8(const char *msg, /* I - Message String */ /* - * End of "$Id: testi18n.c 9793 2011-05-20 03:49:49Z mike $" + * End of "$Id: testi18n.c 7560 2008-05-13 06:34:04Z mike $" */ diff --git a/cups/testipp.c b/cups/testipp.c index f4e5ff57..5655b6be 100644 --- a/cups/testipp.c +++ b/cups/testipp.c @@ -1,5 +1,5 @@ /* - * "$Id: testipp.c 10299 2012-02-16 00:33:54Z mike $" + * "$Id: testipp.c 6649 2007-07-11 21:46:42Z mike $" * * IPP test program for CUPS. * @@ -1001,5 +1001,5 @@ write_cb(_ippdata_t *data, /* I - Data */ /* - * End of "$Id: testipp.c 10299 2012-02-16 00:33:54Z mike $". + * End of "$Id: testipp.c 6649 2007-07-11 21:46:42Z mike $". */ diff --git a/cups/testlang.c b/cups/testlang.c index 4e80e4fc..2cec8b6b 100644 --- a/cups/testlang.c +++ b/cups/testlang.c @@ -1,5 +1,5 @@ /* - * "$Id: testlang.c 9042 2010-03-24 00:45:34Z mike $" + * "$Id: testlang.c 6649 2007-07-11 21:46:42Z mike $" * * Localization test program for CUPS. * @@ -110,5 +110,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: testlang.c 9042 2010-03-24 00:45:34Z mike $". + * End of "$Id: testlang.c 6649 2007-07-11 21:46:42Z mike $". */ diff --git a/cups/testoptions.c b/cups/testoptions.c index 424e00f6..d14b64f8 100644 --- a/cups/testoptions.c +++ b/cups/testoptions.c @@ -1,5 +1,5 @@ /* - * "$Id: testoptions.c 9042 2010-03-24 00:45:34Z mike $" + * "$Id: testoptions.c 1992 2010-03-24 14:32:08Z msweet $" * * Option test program for CUPS. * @@ -112,5 +112,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: testoptions.c 9042 2010-03-24 00:45:34Z mike $". + * End of "$Id: testoptions.c 1992 2010-03-24 14:32:08Z msweet $". */ diff --git a/cups/testppd.c b/cups/testppd.c index f54b2042..5e291ce8 100644 --- a/cups/testppd.c +++ b/cups/testppd.c @@ -1,5 +1,5 @@ /* - * "$Id: testppd.c 10149 2011-12-14 07:24:03Z mike $" + * "$Id: testppd.c 7897 2008-09-02 19:33:19Z mike $" * * PPD test program for CUPS. * @@ -1098,5 +1098,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: testppd.c 10149 2011-12-14 07:24:03Z mike $". + * End of "$Id: testppd.c 7897 2008-09-02 19:33:19Z mike $". */ diff --git a/cups/testpwg.c b/cups/testpwg.c index a2b9c986..ef3279f7 100644 --- a/cups/testpwg.c +++ b/cups/testpwg.c @@ -1,5 +1,5 @@ /* - * "$Id: testpwg.c 10404 2012-04-13 18:01:35Z mike $" + * "$Id: testpwg.c 3794 2012-04-23 22:44:16Z msweet $" * * PWG test program for CUPS. * @@ -521,5 +521,5 @@ test_ppd_cache(_ppd_cache_t *pc, /* I - PWG mapping data */ /* - * End of "$Id: testpwg.c 10404 2012-04-13 18:01:35Z mike $". + * End of "$Id: testpwg.c 3794 2012-04-23 22:44:16Z msweet $". */ diff --git a/cups/testsnmp.c b/cups/testsnmp.c index 1cfea838..b60c2b79 100644 --- a/cups/testsnmp.c +++ b/cups/testsnmp.c @@ -1,5 +1,5 @@ /* - * "$Id: testsnmp.c 9950 2011-09-01 23:02:24Z mike $" + * "$Id: testsnmp.c 3411 2011-09-07 22:31:27Z msweet $" * * SNMP test program for CUPS. * @@ -300,5 +300,5 @@ usage(void) /* - * End of "$Id: testsnmp.c 9950 2011-09-01 23:02:24Z mike $". + * End of "$Id: testsnmp.c 3411 2011-09-07 22:31:27Z msweet $". */ diff --git a/cups/thread-private.h b/cups/thread-private.h index ef6d4446..3409be44 100644 --- a/cups/thread-private.h +++ b/cups/thread-private.h @@ -1,5 +1,5 @@ /* - * "$Id: thread-private.h 10435 2012-04-23 21:49:48Z mike $" + * "$Id: thread-private.h 3794 2012-04-23 22:44:16Z msweet $" * * Private threading definitions for CUPS. * @@ -94,5 +94,5 @@ extern int _cupsThreadCreate(_cups_thread_func_t func, void *arg); #endif /* !_CUPS_THREAD_PRIVATE_H_ */ /* - * End of "$Id: thread-private.h 10435 2012-04-23 21:49:48Z mike $". + * End of "$Id: thread-private.h 3794 2012-04-23 22:44:16Z msweet $". */ diff --git a/cups/thread.c b/cups/thread.c index 44f54696..0f623298 100644 --- a/cups/thread.c +++ b/cups/thread.c @@ -1,5 +1,5 @@ /* - * "$Id: thread.c 10435 2012-04-23 21:49:48Z mike $" + * "$Id: thread.c 3794 2012-04-23 22:44:16Z msweet $" * * Threading primitives for CUPS. * @@ -332,5 +332,5 @@ _cupsThreadCreate( /* - * End of "$Id: thread.c 10435 2012-04-23 21:49:48Z mike $". + * End of "$Id: thread.c 3794 2012-04-23 22:44:16Z msweet $". */ diff --git a/cups/transcode.c b/cups/transcode.c index effc7ecc..8c58dab6 100644 --- a/cups/transcode.c +++ b/cups/transcode.c @@ -1,5 +1,5 @@ /* - * "$Id: transcode.c 9820 2011-06-10 22:06:26Z mike $" + * "$Id: transcode.c 9306 2010-09-16 21:43:57Z mike $" * * Transcoding support for CUPS. * @@ -716,5 +716,5 @@ cupsUTF32ToUTF8( /* - * End of "$Id: transcode.c 9820 2011-06-10 22:06:26Z mike $" + * End of "$Id: transcode.c 9306 2010-09-16 21:43:57Z mike $" */ diff --git a/cups/transcode.h b/cups/transcode.h index e4a42527..e2db9513 100644 --- a/cups/transcode.h +++ b/cups/transcode.h @@ -1,5 +1,5 @@ /* - * "$Id: transcode.h 9771 2011-05-12 05:21:56Z mike $" + * "$Id: transcode.h 7026 2007-10-19 00:57:45Z mike $" * * Transcoding definitions for CUPS. * @@ -77,5 +77,5 @@ extern int cupsUTF32ToUTF8(cups_utf8_t *dest, /* - * End of "$Id: transcode.h 9771 2011-05-12 05:21:56Z mike $" + * End of "$Id: transcode.h 7026 2007-10-19 00:57:45Z mike $" */ diff --git a/cups/usersys.c b/cups/usersys.c index fa02b149..3ef68536 100644 --- a/cups/usersys.c +++ b/cups/usersys.c @@ -1,5 +1,5 @@ /* - * "$Id: usersys.c 10903 2013-03-12 14:26:28Z mike $" + * "$Id: usersys.c 8498 2009-04-13 17:03:15Z mike $" * * User, system, and password routines for CUPS. * @@ -365,6 +365,8 @@ cupsSetServer(const char *server) /* I - Server name */ else if (!strcmp(options, "version=2.2")) cg->server_version = 22; } + else + cg->server_version = 20; if (cg->server[0] != '/' && (port = strrchr(cg->server, ':')) != NULL && !strchr(port, ']') && isdigit(port[1] & 255)) @@ -1055,5 +1057,5 @@ cups_read_client_conf( /* - * End of "$Id: usersys.c 10903 2013-03-12 14:26:28Z mike $". + * End of "$Id: usersys.c 8498 2009-04-13 17:03:15Z mike $". */ diff --git a/cups/util.c b/cups/util.c index 5ac73b8a..07a660d9 100644 --- a/cups/util.c +++ b/cups/util.c @@ -1,5 +1,5 @@ /* - * "$Id: util.c 10873 2013-02-20 02:16:13Z mike $" + * "$Id: util.c 7850 2008-08-20 00:07:25Z mike $" * * Printing utilities for CUPS. * @@ -1844,5 +1844,5 @@ cups_get_printer_uri( /* - * End of "$Id: util.c 10873 2013-02-20 02:16:13Z mike $". + * End of "$Id: util.c 7850 2008-08-20 00:07:25Z mike $". */ diff --git a/cups/versioning.h b/cups/versioning.h index b10476f9..ad2b5d2f 100644 --- a/cups/versioning.h +++ b/cups/versioning.h @@ -1,5 +1,5 @@ /* - * "$Id: versioning.h 10424 2012-04-23 17:26:57Z mike $" + * "$Id: versioning.h 3794 2012-04-23 22:44:16Z msweet $" * * API versioning definitions for CUPS. * @@ -86,5 +86,5 @@ #endif /* !_CUPS_VERSIONING_H_ */ /* - * End of "$Id: versioning.h 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: versioning.h 3794 2012-04-23 22:44:16Z msweet $". */ diff --git a/data/Makefile b/data/Makefile index 5ab96095..7df82609 100644 --- a/data/Makefile +++ b/data/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 9926 2011-08-27 09:23:01Z mike $" +# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $" # # Datafile makefile for CUPS. # @@ -146,5 +146,5 @@ uninstall: # -# End of "$Id: Makefile 9926 2011-08-27 09:23:01Z mike $". +# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $". # diff --git a/data/epson.h b/data/epson.h index 8f6d2c3e..1b0fe9fe 100644 --- a/data/epson.h +++ b/data/epson.h @@ -1,5 +1,5 @@ /* - * "$Id: epson.h 7304 2008-02-14 01:52:22Z mike $" + * "$Id: epson.h 624 2008-02-16 00:27:39Z msweet $" * * This file contains model number definitions for the CUPS sample * ESC/P driver. @@ -23,5 +23,5 @@ /* - * End of "$Id: epson.h 7304 2008-02-14 01:52:22Z mike $". + * End of "$Id: epson.h 624 2008-02-16 00:27:39Z msweet $". */ @@ -1,5 +1,5 @@ /* - * "$Id: hp.h 7304 2008-02-14 01:52:22Z mike $" + * "$Id: hp.h 624 2008-02-16 00:27:39Z msweet $" * * This file contains model number definitions for the CUPS sample * HP driver. @@ -20,5 +20,5 @@ /* - * End of "$Id: hp.h 7304 2008-02-14 01:52:22Z mike $". + * End of "$Id: hp.h 624 2008-02-16 00:27:39Z msweet $". */ diff --git a/data/label.h b/data/label.h index a23d9643..38cdc37b 100644 --- a/data/label.h +++ b/data/label.h @@ -1,5 +1,5 @@ /* - * "$Id: label.h 7304 2008-02-14 01:52:22Z mike $" + * "$Id: label.h 624 2008-02-16 00:27:39Z msweet $" * * This file contains model number definitions for the CUPS sample * label printer driver. @@ -24,5 +24,5 @@ #define INTELLITECH_PCL 0x20 /* Intellitech PCL-based printers */ /* - * End of "$Id: label.h 7304 2008-02-14 01:52:22Z mike $". + * End of "$Id: label.h 624 2008-02-16 00:27:39Z msweet $". */ diff --git a/desktop/Makefile b/desktop/Makefile index ed43bceb..c4fdd767 100644 --- a/desktop/Makefile +++ b/desktop/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 8844 2009-10-14 16:53:45Z mike $" +# "$Id: Makefile 1725 2009-10-15 18:50:47Z msweet $" # # Desktop makefile for CUPS. # @@ -131,5 +131,5 @@ uninstall: # -# End of "$Id: Makefile 8844 2009-10-14 16:53:45Z mike $". +# End of "$Id: Makefile 1725 2009-10-15 18:50:47Z msweet $". # diff --git a/doc/Makefile b/doc/Makefile index e599f759..ae010948 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 10752 2012-12-12 18:03:02Z mike $" +# "$Id: Makefile 7941 2008-09-16 00:46:13Z mike $" # # Documentation makefile for CUPS. # diff --git a/doc/help/api-array.html b/doc/help/api-array.html index 7211fd8a..0c1998ee 100644 --- a/doc/help/api-array.html +++ b/doc/help/api-array.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-array.html 10424 2012-04-23 17:26:57Z mike $" + "$Id: api-array.header 7266 2008-01-29 02:15:29Z mike $" Array API header for CUPS. @@ -413,7 +413,7 @@ div.contents ul.subcontents li { </ul></li> </ul> <!-- - "$Id: api-array.html 10424 2012-04-23 17:26:57Z mike $" + "$Id: api-array.shtml 7616 2008-05-28 00:34:13Z mike $" Array API introduction for CUPS. diff --git a/doc/help/api-cgi.html b/doc/help/api-cgi.html index 5c07e58a..82c740a8 100644 --- a/doc/help/api-cgi.html +++ b/doc/help/api-cgi.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-cgi.html 9740 2011-05-04 06:26:22Z mike $" + "$Id: api-array.header 8087 2008-10-27 21:37:05Z mike $" CGI API header for CUPS. @@ -437,7 +437,7 @@ by the template file.">cgiGetAttributes</a></li> </ul></li> </ul> <!-- - "$Id: api-cgi.html 9740 2011-05-04 06:26:22Z mike $" + "$Id: api-array.shtml 7616 2008-05-28 00:34:13Z mike $" CGI API introduction for CUPS. diff --git a/doc/help/api-cups.html b/doc/help/api-cups.html index 22e4f30f..de95e672 100644 --- a/doc/help/api-cups.html +++ b/doc/help/api-cups.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-cups.html 10584 2012-08-29 19:52:16Z mike $" + "$Id: api-cups.header 7279 2008-01-31 01:50:44Z mike $" CUPS API header for CUPS. @@ -524,11 +524,11 @@ constants">cups_ptype_e</a></li> </ul></li> </ul> <!-- - "$Id: api-cups.html 10584 2012-08-29 19:52:16Z mike $" + "$Id: api-cups.shtml 7337 2008-02-22 04:44:04Z mike $" API introduction for CUPS. - Copyright 2007-2011 by Apple Inc. + Copyright 2007-2013 by Apple Inc. Copyright 1997-2006 by Easy Software Products, all rights reserved. These coded instructions, statements, and computer programs are the @@ -708,7 +708,7 @@ int num_options = 0; <a href='#cups_option_t'>cups_option_t</a> *options = NULL; <a href='#cups_dest_t'>cups_dest_t</a> *dest; -for (i = 0; i < dest->num_options; i ++) +for (i = 0; i < dest->num_options; i ++) num_options = <a href='#cupsAddOption'>cupsAddOption</a>(dest->options[i].name, dest->options[i].value, num_options, &options); </pre> @@ -760,7 +760,7 @@ job_id = <a href='#cupsPrintFiles'>cupsPrintFiles</a>(dest->name, 3, files, "Tes <p>Finally, the <a href='#cupsCreateJob'><code>cupsCreateJob</code></a> function creates a new job with no files in it. Files are added using the -<a href='#cupsStartDocument'><code>cupsStartDocument</code></a>, +<a href='#cupsStartDocument'><code>cupsStartDocument</code></a>, <a href='api-httpipp.html#cupsWriteRequestData'><code>cupsWriteRequestData</code></a>, and <a href='#cupsFinishDocument'><code>cupsFinishDocument</code></a> functions. The following example creates a job with 10 text files for printing:</p> @@ -824,7 +824,7 @@ int num_jobs; <a href='#cups_job_t'>cups_job_t</a> *jobs; int i; ipp_jstate_t job_state = IPP_JOB_PENDING; - + while (job_state < IPP_JOB_STOPPED) { /* Get my jobs (1) with any state (-1) */ @@ -1025,7 +1025,7 @@ int cupsAddOption (<br> <h4 class="discussion">Discussion</h4> <p class="discussion">New option arrays can be initialized simply by passing 0 for the "num_options" parameter.</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsAdminCreateWindowsPPD">cupsAdminCreateWindowsPPD</a></h3> +<h3 class="function"><span class="info"> DEPRECATED </span><a name="cupsAdminCreateWindowsPPD">cupsAdminCreateWindowsPPD</a></h3> <p class="description">Create the Windows PPD file for a printer.</p> <p class="code"> char *cupsAdminCreateWindowsPPD (<br> @@ -1047,7 +1047,7 @@ char *cupsAdminCreateWindowsPPD (<br> </dl> <h4 class="returnvalue">Return Value</h4> <p class="description">PPD file or NULL</p> -<h3 class="function"><span class="info"> CUPS 1.2/OS X 10.5 </span><a name="cupsAdminExportSamba">cupsAdminExportSamba</a></h3> +<h3 class="function"><span class="info"> DEPRECATED </span><a name="cupsAdminExportSamba">cupsAdminExportSamba</a></h3> <p class="description">Export a printer to Samba.</p> <p class="code"> int cupsAdminExportSamba (<br> diff --git a/doc/help/api-driver.html b/doc/help/api-driver.html index 1a3ee3ae..d0e4a55e 100644 --- a/doc/help/api-driver.html +++ b/doc/help/api-driver.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-driver.html 9740 2011-05-04 06:26:22Z mike $" + "$Id$" Driver API header for CUPS. @@ -430,7 +430,7 @@ media, and resolution.">cupsFindAttr</a></li> </ul></li> </ul> <!-- - "$Id: api-driver.html 9740 2011-05-04 06:26:22Z mike $" + "$Id$" Driver API introduction for CUPS. diff --git a/doc/help/api-filedir.html b/doc/help/api-filedir.html index 8d31c7f4..fc7b72a4 100644 --- a/doc/help/api-filedir.html +++ b/doc/help/api-filedir.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-filedir.html 10424 2012-04-23 17:26:57Z mike $" + "$Id: api-filedir.header 7279 2008-01-31 01:50:44Z mike $" File and Directory API header for CUPS. @@ -424,7 +424,7 @@ file.">cupsFileRewind</a></li> </ul></li> </ul> <!-- - "$Id: api-filedir.html 10424 2012-04-23 17:26:57Z mike $" + "$Id: api-filedir.shtml 7279 2008-01-31 01:50:44Z mike $" File and directory API introduction for CUPS. diff --git a/doc/help/api-filter.html b/doc/help/api-filter.html index 9433c655..54280587 100644 --- a/doc/help/api-filter.html +++ b/doc/help/api-filter.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-filter.html 10424 2012-04-23 17:26:57Z mike $" + "$Id: api-filter.header 7616 2008-05-28 00:34:13Z mike $" Filter and backend programming header for CUPS. @@ -426,11 +426,11 @@ div.contents ul.subcontents li { </ul></li> </ul> <!-- - "$Id: api-filter.html 10424 2012-04-23 17:26:57Z mike $" + "$Id: api-filter.shtml 7677 2008-06-19 23:22:19Z mike $" Filter and backend programming introduction for CUPS. - Copyright 2007-2012 by Apple Inc. + Copyright 2007-2013 by Apple Inc. Copyright 1997-2006 by Easy Software Products, all rights reserved. These coded instructions, statements, and computer programs are the @@ -915,7 +915,7 @@ from localizing the vendor-prefixed keyword in the PPD file - otherwise both the generic and vendor-specific keyword will be shown in the user interface.</p> -</blockquote></dd> +</blockquote> <h4><a name="REPORTING_SUPPLIES">Reporting Supply Levels</a></h4> @@ -1040,7 +1040,7 @@ datalen = sizeof(data) - 1; status = <a href="#cupsSideChannelDoRequest">cupsSideChannelDoRequest</a>(CUPS_SC_CMD_GET_DEVICE_ID, data, &datalen, 1.0); /* Use the returned value if OK was returned and the length is non-zero */ -if (status == CUPS_SC_STATUS_OK && datalen > 0) +if (status == CUPS_SC_STATUS_OK && datalen > 0) data[datalen] = '\0'; else data[0] = '\0'; diff --git a/doc/help/api-httpipp.html b/doc/help/api-httpipp.html index d1ea823f..0e0591aa 100644 --- a/doc/help/api-httpipp.html +++ b/doc/help/api-httpipp.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-httpipp.html 10589 2012-08-30 23:01:44Z mike $" + "$Id: api-httpipp.header 7258 2008-01-28 00:15:05Z mike $" HTTP and IPP API header for CUPS. @@ -648,7 +648,7 @@ are server-oriented...">http_state_e</a></li> </ul></li> </ul> <!-- - "$Id: api-httpipp.html 10589 2012-08-30 23:01:44Z mike $" + "$Id: api-httpipp.shtml 7684 2008-06-23 16:47:38Z mike $" HTTP and IPP API introduction for CUPS. @@ -5023,6 +5023,8 @@ are server-oriented...</p> <dd class="description">En/decode the query portion</dd> <dt>HTTP_URI_CODING_RESOURCE </dt> <dd class="description">En/decode the resource portion</dd> +<dt>HTTP_URI_CODING_RFC6874 </dt> +<dd class="description">Use RFC 6874 address format</dd> <dt>HTTP_URI_CODING_USERNAME </dt> <dd class="description">En/decode the username portion</dd> </dl> diff --git a/doc/help/api-mime.html b/doc/help/api-mime.html index c2733764..22699278 100644 --- a/doc/help/api-mime.html +++ b/doc/help/api-mime.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-mime.html 9772 2011-05-12 05:46:30Z mike $" + "$Id: api-array.header 8087 2008-10-27 21:37:05Z mike $" MIME API header for CUPS. @@ -412,7 +412,7 @@ including file size.">mimeFilter2</a></li> </ul></li> </ul> <!-- - "$Id: api-mime.html 9772 2011-05-12 05:46:30Z mike $" + "$Id: api-array.shtml 7616 2008-05-28 00:34:13Z mike $" MIME API introduction for CUPS. diff --git a/doc/help/api-overview.html b/doc/help/api-overview.html index 278df7ca..a310f6e1 100644 --- a/doc/help/api-overview.html +++ b/doc/help/api-overview.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-overview.html 9772 2011-05-12 05:46:30Z mike $" + "$Id: api-cups.header 7279 2008-01-31 01:50:44Z mike $" Introduction to CUPS programming header for CUPS. @@ -403,7 +403,7 @@ div.contents ul.subcontents li { <li><a href="#WHERETOGO">Where to Go Next</a></li> </ul> <!-- - "$Id: api-overview.html 9772 2011-05-12 05:46:30Z mike $" + "$Id: api-cups.header 7279 2008-01-31 01:50:44Z mike $" Introduction to CUPS programming content for CUPS. diff --git a/doc/help/api-ppd.html b/doc/help/api-ppd.html index 1be3ed13..6530d4b9 100644 --- a/doc/help/api-ppd.html +++ b/doc/help/api-ppd.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-ppd.html 10441 2012-04-30 20:59:09Z mike $" + "$Id: api-ppd.header 7616 2008-05-28 00:34:13Z mike $" PPD API header for CUPS. @@ -486,7 +486,7 @@ conflicts.">ppdMarkOption</a></li> </ul></li> </ul> <!-- - "$Id: api-ppd.html 10441 2012-04-30 20:59:09Z mike $" + "$Id: api-ppd.shtml 7616 2008-05-28 00:34:13Z mike $" PPD API introduction for CUPS. diff --git a/doc/help/api-ppdc.html b/doc/help/api-ppdc.html index 25ccef40..484288e6 100644 --- a/doc/help/api-ppdc.html +++ b/doc/help/api-ppdc.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-ppdc.html 10356 2012-03-16 16:03:10Z mike $" + "$Id: api-array.header 8087 2008-10-27 21:37:05Z mike $" PPD Compiler API header for CUPS. @@ -414,7 +414,7 @@ div.contents ul.subcontents li { </ul></li> </ul> <!-- - "$Id: api-ppdc.html 10356 2012-03-16 16:03:10Z mike $" + "$Id: api-array.shtml 7616 2008-05-28 00:34:13Z mike $" PPD Compiler API introduction for CUPS. diff --git a/doc/help/api-raster.html b/doc/help/api-raster.html index 4a77da3c..f2dade43 100644 --- a/doc/help/api-raster.html +++ b/doc/help/api-raster.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-raster.html 10424 2012-04-23 17:26:57Z mike $" + "$Id$" Raster API documentation for CUPS. @@ -434,11 +434,11 @@ page header structure.">cupsRasterWriteHeader2</a></li> </ul></li> </ul> <!-- - "$Id: api-raster.html 10424 2012-04-23 17:26:57Z mike $" + "$Id$" Raster API introduction for CUPS. - Copyright 2007-2012 by Apple Inc. + Copyright 2007-2013 by Apple Inc. Copyright 1997-2006 by Easy Software Products, all rights reserved. These coded instructions, statements, and computer programs are the @@ -653,7 +653,7 @@ requested attributes cannot be supported.<br> <br> <code>cupsRasterInterpretPPD</code> supports a subset of the PostScript language. -Currently only the <code>[</code>, <code>]</code>, <code><<</code>, <code>>></code>, <code>{</code>, +Currently only the <code>[</code>, <code>]</code>, <code><<</code>, <code>>></code>, <code>{</code>, <code>}</code>, <code>cleartomark</code>, <code>copy</code>, <code>dup</code>, <code>index</code>, <code>pop</code>, <code>roll</code>, <code>setpagedevice</code>, and <code>stopped</code> operators are supported. diff --git a/doc/help/network.html b/doc/help/network.html index ebe1b5f9..e8c22194 100644 --- a/doc/help/network.html +++ b/doc/help/network.html @@ -94,10 +94,10 @@ page on the device.</P> <PRE> socket://<i>ip-address-or-hostname</i> socket://<i>ip-address-or-hostname</i>/?option=value -socket://<i>ip-address-or-hostname</i>/?option=value&option=value +socket://<i>ip-address-or-hostname</i>/?option=value&option=value socket://<i>ip-address-or-hostname</i>:<i>port-number</i> socket://<i>ip-address-or-hostname</i>:<i>port-number</i>/?option=value -socket://<i>ip-address-or-hostname</i>:<i>port-number</i>/?option=value&option=value +socket://<i>ip-address-or-hostname</i>:<i>port-number</i>/?option=value&option=value </PRE> <P>The "contimeout" option controls the number of seconds that the backend will wait to obtain a connection to the printer. The default is 1 week.</P> @@ -113,19 +113,19 @@ socket://<i>ip-address-or-hostname</i>:<i>port-number</i>/?option=value&option=v <PRE> http://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i> http://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i>?<i>option=value</i> -http://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i>?<i>option=value&option=value</i> +http://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i>?<i>option=value&option=value</i> ipp://<i>ip-address-or-hostname</i>/<i>resource</i> ipp://<i>ip-address-or-hostname</i>/<i>resource</i>?<i>option=value</i> -ipp://<i>ip-address-or-hostname</i>/<i>resource</i>?<i>option=value&option=value</i> +ipp://<i>ip-address-or-hostname</i>/<i>resource</i>?<i>option=value&option=value</i> ipp://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i> ipp://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i>?<i>option=value</i> -ipp://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i>?<i>option=value&option=value</i> +ipp://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i>?<i>option=value&option=value</i> ipps://<i>ip-address-or-hostname</i>/<i>resource</i> ipps://<i>ip-address-or-hostname</i>/<i>resource</i>?<i>option=value</i> -ipps://<i>ip-address-or-hostname</i>/<i>resource</i>?<i>option=value&option=value</i> +ipps://<i>ip-address-or-hostname</i>/<i>resource</i>?<i>option=value&option=value</i> ipps://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i> ipps://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i>?<i>option=value</i> -ipps://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i>?<i>option=value&option=value</i> +ipps://<i>ip-address-or-hostname</i>:<i>port-number</i>/<i>resource</i>?<i>option=value&option=value</i> </PRE> <P>The <tt>ipp</tt> backend supports many options, which are summarized in <A HREF="#TABLE2">Table 2</A>.</P> @@ -195,8 +195,8 @@ lpd://<i>ip-address-or-hostname</i>/<i>queue</i> lpd://<i>username@ip-address-or-hostname</i>/<i>queue</i> lpd://<i>ip-address-or-hostname</i>/<i>queue</i>?<i>option=value</i> lpd://<i>username@ip-address-or-hostname</i>/<i>queue</i>?<i>option=value</i> -lpd://<i>ip-address-or-hostname</i>/<i>queue</i>?<i>option=value&option=value</i> -lpd://<i>username@ip-address-or-hostname</i>/<i>queue</i>?<i>option=value&option=value</i> +lpd://<i>ip-address-or-hostname</i>/<i>queue</i>?<i>option=value&option=value</i> +lpd://<i>username@ip-address-or-hostname</i>/<i>queue</i>?<i>option=value&option=value</i> </PRE> <P><A HREF="#TABLE3">Table 3</A> summarizes the options supported by the <tt>lpd</tt> backend.</P> @@ -442,7 +442,7 @@ CUPS_DEBUG_LEVEL=2 /usr/lib/cups/backend/snmp 2>&1 | tee snmp.log <P>For C shell (/bin/csh) and TCsh (/bin/tcsh), use the following command instead:</P> <PRE CLASS="command"> -(setenv CUPS_DEBUG_LEVEL 2; /usr/lib/cups/backend/snmp) |& tee snmp.log +(setenv CUPS_DEBUG_LEVEL 2; /usr/lib/cups/backend/snmp) |& tee snmp.log </PRE> <P>On MacOS X you'll find the SNMP backend in /usr/libexec/cups/backend instead:</P> diff --git a/doc/help/postscript-driver.html b/doc/help/postscript-driver.html index 4f35374d..fde5890b 100644 --- a/doc/help/postscript-driver.html +++ b/doc/help/postscript-driver.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: postscript-driver.html 10424 2012-04-23 17:26:57Z mike $" + "$Id$" PostScript printer driver documentation for CUPS. diff --git a/doc/help/ppd-compiler.html b/doc/help/ppd-compiler.html index 576c9187..27decdbb 100644 --- a/doc/help/ppd-compiler.html +++ b/doc/help/ppd-compiler.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: ppd-compiler.html 10424 2012-04-23 17:26:57Z mike $" + "$Id$" PPD compiler documentation for CUPS. diff --git a/doc/help/raster-driver.html b/doc/help/raster-driver.html index 259ea184..0399f057 100644 --- a/doc/help/raster-driver.html +++ b/doc/help/raster-driver.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: raster-driver.html 10424 2012-04-23 17:26:57Z mike $" + "$Id$" Raster printer driver documentation for CUPS. diff --git a/doc/help/ref-client-conf.html b/doc/help/ref-client-conf.html index f17d5407..03d1ea04 100644 --- a/doc/help/ref-client-conf.html +++ b/doc/help/ref-client-conf.html @@ -56,6 +56,8 @@ GSSServiceName ipp ServerName foo.bar.com ServerName 11.22.33.44 ServerName foo.bar.com:8631 +<SPAN CLASS="info">CUPS 1.6</SPAN>ServerName foo.bar.com/version=1.1 +<SPAN CLASS="info">CUPS 1.6</SPAN>ServerName foo.bar.com:8631/version=1.1 </PRE> <H3>Description</H3> @@ -64,6 +66,8 @@ ServerName foo.bar.com:8631 <P>The default port number is 631 but can be overridden by adding a colon followed by the desired port number to the value.</P> +<P>By default, CUPS 1.6 and later use IPP/2.0 to communicate with the server. Add "/version=1.1" to force IPP/1.1 which is required for CUPS 1.3.12 and earlier.</P> + <P>The default is to use the local server ("<VAR>localhost</VAR>") or domain socket, if so configured.</P> <BLOCKQUOTE><B>Note:</B> diff --git a/doc/help/ref-subscriptions-conf.html b/doc/help/ref-subscriptions-conf.html index d4f4defc..06cfc72c 100644 --- a/doc/help/ref-subscriptions-conf.html +++ b/doc/help/ref-subscriptions-conf.html @@ -196,7 +196,7 @@ HREF="#Subscription"><CODE>Subscription</CODE></A> section.</P> <PRE CLASS="command"> <Subscription NNN> ... - LeaseDuration + LeaseDuration </Subscription> </PRE> @@ -335,17 +335,17 @@ unique (to the server) number starting at 1.</P> <PRE CLASS="command"> <Subscription NNN> ... - UserData mailto:bar<40>domain.com + UserData mailto:bar<40>example.com </Subscription> </PRE> <H3>Description</H3> <P>The <CODE>UserData</CODE> directive specifies the -<CODE>notify-user-data</CODE> value, which is normally the "from" +<CODE>notify-user-data</CODE> value, which is normally the "to" address used in <CODE>mailto</CODE> notifications. Binary values are introduced by encoding the bytes as hexadecimal values inside -angle brackets, e.g. "<1234>".</P> +angle brackets, e.g. "<1234>".</P> <P>The <CODE>UserData</CODE> directive must appear inside a <A HREF="#Subscription"><CODE>Subscription</CODE></A> section.</P> diff --git a/doc/help/security.html b/doc/help/security.html index c86151d1..3bd56425 100644 --- a/doc/help/security.html +++ b/doc/help/security.html @@ -48,7 +48,7 @@ authentication:</P> middle" and replay attacks from the same client.</P> <P><B>Recommendation:</B> Enable encryption to hide the - username and password information.</P></LI></LI> + username and password information.</P></LI> <LI>Local certificate authentication passes 128-bit "certificates" that identify an authenticated user. @@ -65,7 +65,7 @@ authentication:</P> socket.</P> <P><B>Recommendation:</B> Ensure that unauthorized users - are not added to the system group(s).</P></LI></LI> + are not added to the system group(s).</P></LI> </OL> diff --git a/doc/help/spec-banner.html b/doc/help/spec-banner.html index 2d22d9e8..65b09613 100644 --- a/doc/help/spec-banner.html +++ b/doc/help/spec-banner.html @@ -8,7 +8,7 @@ </head> <body> <!-- - "$Id: spec-banner.html 9727 2011-04-28 21:20:12Z mike $" + "$Id$" Banner file format specification for CUPS. diff --git a/doc/help/spec-browsing.html b/doc/help/spec-browsing.html index 33f60b62..3a291327 100644 --- a/doc/help/spec-browsing.html +++ b/doc/help/spec-browsing.html @@ -8,7 +8,7 @@ </head> <body> <!-- - "$Id: spec-browsing.html 10762 2012-12-13 20:28:30Z mike $" + "$Id$" CUPS Browse Protocol specification for CUPS. diff --git a/doc/help/spec-command.html b/doc/help/spec-command.html index af201cb5..06093574 100644 --- a/doc/help/spec-command.html +++ b/doc/help/spec-command.html @@ -8,7 +8,7 @@ </head> <body> <!-- - "$Id: spec-command.html 9727 2011-04-28 21:20:12Z mike $" + "$Id$" CUPS command file format specification for CUPS. diff --git a/doc/help/spec-ipp.html b/doc/help/spec-ipp.html index 27b8fca2..e06270c1 100644 --- a/doc/help/spec-ipp.html +++ b/doc/help/spec-ipp.html @@ -8,7 +8,7 @@ </head> <body> <!-- - "$Id: spec-ipp.html 10424 2012-04-23 17:26:57Z mike $" + "$Id$" CUPS IPP specification for CUPS. diff --git a/doc/help/spec-postscript.html b/doc/help/spec-postscript.html index 8a84273c..110c5a3c 100644 --- a/doc/help/spec-postscript.html +++ b/doc/help/spec-postscript.html @@ -8,7 +8,7 @@ </head> <body> <!-- - "$Id: spec-postscript.html 10424 2012-04-23 17:26:57Z mike $" + "$Id$" CUPS PostScript file specification for CUPS. diff --git a/doc/help/spec-ppd.html b/doc/help/spec-ppd.html index 21433684..75a927f1 100644 --- a/doc/help/spec-ppd.html +++ b/doc/help/spec-ppd.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: spec-ppd.html 10441 2012-04-30 20:59:09Z mike $" + "$Id$" PPD extension documentation for CUPS. @@ -971,7 +971,7 @@ option value is "1234" then CUPS will output the string "@PJL SET PASSCODE=1234" <p>The resulting dictionary sets the page device attributes that are sent to your raster driver in the page header.</p> -<h3>Custom Page Size Code</a></h3> +<h3>Custom Page Size Code</h3> <p>There are many possible implementations of the <tt>CustomPageSize</tt> code. For CUPS raster drivers, the following code is recommended:</p> @@ -984,7 +984,7 @@ option value is "1234" then CUPS will output the string "@PJL SET PASSCODE=1234" *CustomPageSize True: "pop pop pop <</PageSize[5 -2 roll]/ImagingBBox null>>setpagedevice" </pre> -<h3>Supported PostScript Operators</a></h3> +<h3>Supported PostScript Operators</h3> <p>CUPS supports the following PostScript operators in addition to the usual PostScript number, string (literal and hex-encoded), boolean, null, and name values:</p> @@ -1043,7 +1043,7 @@ PRE B { </blockquote> -<h3>Supported Page Device Attributes</a></h3> +<h3>Supported Page Device Attributes</h3> <p>Table 2 shows the supported page device attributes along with PostScript code examples.</p> @@ -2253,7 +2253,7 @@ the device.</p> <ul> - <li>Added <a href="#cupsPageSizeCategory"><tt>cupsPageSizeCategory</tt></a> keyword (originally defined in CUPS 1.4).</li> + <li>Added <a href="#cupsPageSizeCategory"><tt>cupsPageSizeCategory</tt></a> keyword (originally defined in CUPS 1.4).</li> <li>Added <a href="#cupsMaxCopies"><tt>cupsMaxCopies</tt></a> keyword.</li> diff --git a/doc/images/color-wheel.png b/doc/images/color-wheel.png Binary files differindex 301e3fd5..f55e69f8 100644 --- a/doc/images/color-wheel.png +++ b/doc/images/color-wheel.png diff --git a/doc/images/generic.png b/doc/images/generic.png Binary files differdeleted file mode 100644 index 2abe9de9..00000000 --- a/doc/images/generic.png +++ /dev/null diff --git a/doc/ru/index.html.in b/doc/ru/index.html.in index fda6cbcd..d1300e12 100644 --- a/doc/ru/index.html.in +++ b/doc/ru/index.html.in @@ -101,106 +101,3 @@ HEIGHT="128" ALT="CUPS"></A></TD> </TABLE> </BODY> </HTML> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<HTML> -<HEAD> - <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8"> - <TITLE>Начало - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE> - <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css"> - <LINK REL="SHORTCUT ICON" HREF="/images/cups-icon.png" TYPE="image/png"> -</HEAD> -<BODY> -<TABLE CLASS="page" SUMMARY="{title}"> -<TR><TD CLASS="body"> -<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" SUMMARY=""> -<TR HEIGHT="36"> -<TD><A HREF="http://www.cups.org/" TARGET="_blank"><IMG -SRC="/images/left.gif" WIDTH="64" HEIGHT="36" BORDER="0" ALT=""></A></TD> -<TD CLASS="sel"><A HREF="/"> Начало </A></TD> -<TD CLASS="unsel"><A HREF="/admin"> Администрирование </A></TD> -<TD CLASS="unsel"><A HREF="/classes/"> Группы </A></TD> -<TD CLASS="unsel"><A HREF="/help/"> Справка </A></TD> -<TD CLASS="unsel"><A HREF="/jobs/"> Задания </A></TD> -<TD CLASS="unsel"><A HREF="/printers/"> Принтеры </A></TD> -<TD CLASS="unsel" WIDTH="100%"><FORM ACTION="/help/" METHOD="GET"><INPUT -TYPE="SEARCH" NAME="QUERY" SIZE="20" PLACEHOLDER="Search Help" -AUTOSAVE="org.cups.help" RESULTS="20"></FORM></TD> -<TD><IMG SRC="/images/right.gif" WIDTH="4" HEIGHT="36" ALT=""></TD> -</TR> -</TABLE> - -<TABLE CLASS="indent" SUMMARY=""> -<TR><TD STYLE="padding-right: 20px;"> - -<H1>CUPS @CUPS_VERSION@</H1> - -<P>CUPS — поддерживающая большинство стандартов, свободная подсистема печати, разрабатываемая компанией <A HREF="http://www.apple.com/">Apple Inc.</A> для операционной системы Mac OS<SUP>®</SUP> X и других UNIX<SUP>®</SUP>-подобных операционных систем.</P> - -</TD> -<TD><A HREF="http://www.cups.org/"><IMG SRC="images/cups-icon.png" WIDTH="128" -HEIGHT="128" ALT="CUPS"></A></TD> -</TR> -</TABLE> - -<TABLE CLASS="indent" SUMMARY=""> -<TR><TD VALIGN="top" STYLE="border-right: dotted thin #cccccc; padding-right: 20px;"> - -<H2>CUPS для пользователей</H2> - -<P><A HREF="help/overview.html">Введение в CUPS</A></P> - -<P><A HREF="help/options.html">Печать из командной строки</A></P> - -<P><A HREF="help/whatsnew.html">Что нового в CUPS 1.6</A></P> - -<P><A HREF="http://www.cups.org/newsgroups.php?gcups.general">Форум пользователей</A></P> - -</TD><TD VALIGN="top" STYLE="border-right: dotted thin #cccccc; padding-left: 20px; padding-right: 20px;"> - -<H2>CUPS для администраторов</H2> - -<P><A HREF="admin">Добавление принтеров и групп</A></P> - -<P><A HREF="help/policies.html">Управление доступом</A></P> - -<P><A HREF="help/accounting.html">Использование ресурсов</A></P> - -<P><A HREF="help/security.html">Безопасность системы</A></P> - -<P><A HREF="help/kerberos.html">Использование аутентификации Kerberos</A></P> - -<P><A HREF="help/network.html">Использование сетевых принтеров</A></P> - -<P><A HREF="help/ref-cupsd-conf.html">Справочник по cupsd.conf</A></P> - -<P><A HREF="http://www.cups.org/ppd.php">Поиск драйверов принтера</A></P> - -</TD><TD VALIGN="top" STYLE="padding-left: 20px;"> - -<H2>CUPS для разработчиков</H2> - -<P><A HREF="help/api-overview.html">Введение в разработку CUPS</A></P> - -<P><A HREF="help/api-cups.html">CUPS API</A></P> - -<P><A HREF="help/api-filter.html">Разработка фильтров и модулей</A></P> - -<P><A HREF="help/api-httpipp.html">API доступа по HTTP и IPP</A></P> - -<P><A HREF="help/api-ppd.html">PPD API</A></P> - -<P><A HREF="help/api-raster.html">Raster API</A></P> - -<P><A HREF="help/ref-ppdcfile.html">Справочник по компилятору PPD</A></P> - -<P><A HREF="http://www.cups.org/newsgroups.php?gcups.development">Форум разработчиков</A></P> - -</TD></TR> -</TABLE> - -</TD></TR> -<TR><TD> </TD></TR> -<TR><TD CLASS="trailer">CUPS а также логотип CUPS являются зарегистрированными торговыми марками <A HREF="http://www.apple.com">Apple Inc.</A> Авторские права на CUPS принадлежат (2007-2013) компании Apple Inc. Все права защищены.</TD></TR> -</TABLE> -</BODY> -</HTML> diff --git a/doc/swish-e.config b/doc/swish-e.config new file mode 100644 index 00000000..662f9839 --- /dev/null +++ b/doc/swish-e.config @@ -0,0 +1,16 @@ +# Where to get things +IndexDir doc + +# Where to put things +IndexFile doc/swish-e.index + +# Ignore image and index files +FileRules filename contains .gif +FileRules filename contains .gz +FileRules filename contains .jpg +FileRules filename contains .png +FileRules filename contains .svg +FileRules filename contains swish-e +FileRules filename contains .tokens +FileRules filename is Makefile + diff --git a/examples/Makefile b/examples/Makefile index da9b5970..f4737a64 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 9771 2011-05-12 05:21:56Z mike $" +# "$Id: Makefile 3247 2011-05-12 06:22:31Z msweet $" # # PPD compiler example makefile for CUPS. # @@ -124,5 +124,5 @@ uninstall: # -# End of "$Id: Makefile 9771 2011-05-12 05:21:56Z mike $". +# End of "$Id: Makefile 3247 2011-05-12 06:22:31Z msweet $". # diff --git a/examples/ppdx.c b/examples/ppdx.c index d4a0f6b0..920f8db1 100644 --- a/examples/ppdx.c +++ b/examples/ppdx.c @@ -1,5 +1,5 @@ /* - * "$Id: ppdx.c 10459 2012-05-09 22:34:27Z mike $" + * "$Id: ppdx.c 3833 2012-05-23 22:51:18Z msweet $" * * Example code for encoding and decoding large amounts of data in a PPD file. * This would typically be used in a driver to save configuration/state @@ -310,5 +310,5 @@ ppdxWriteData(const char *name, /* I - Base name of keyword */ /* - * End of "$Id: ppdx.c 10459 2012-05-09 22:34:27Z mike $". + * End of "$Id: ppdx.c 3833 2012-05-23 22:51:18Z msweet $". */ diff --git a/examples/ppdx.h b/examples/ppdx.h index e6cc7786..14f34b34 100644 --- a/examples/ppdx.h +++ b/examples/ppdx.h @@ -1,5 +1,5 @@ /* - * "$Id: ppdx.h 10459 2012-05-09 22:34:27Z mike $" + * "$Id: ppdx.h 3833 2012-05-23 22:51:18Z msweet $" * * Header for PPD data encoding example code. * @@ -78,5 +78,5 @@ extern void ppdxWriteData(const char *name, const void *data, #endif /* !_PPDX_H */ /* - * End of "$Id: ppdx.h 10459 2012-05-09 22:34:27Z mike $". + * End of "$Id: ppdx.h 3833 2012-05-23 22:51:18Z msweet $". */ diff --git a/examples/testppdx.c b/examples/testppdx.c index b11317f5..372f3d55 100644 --- a/examples/testppdx.c +++ b/examples/testppdx.c @@ -1,5 +1,5 @@ /* - * "$Id: testppdx.c 10459 2012-05-09 22:34:27Z mike $" + * "$Id: testppdx.c 3833 2012-05-23 22:51:18Z msweet $" * * Test program for PPD data encoding example code. * @@ -113,5 +113,5 @@ main(void) /* - * End of "$Id: testppdx.c 10459 2012-05-09 22:34:27Z mike $". + * End of "$Id: testppdx.c 3833 2012-05-23 22:51:18Z msweet $". */ diff --git a/examples/testppdx.ppd b/examples/testppdx.ppd index 908f3e14..2e58df66 100644 --- a/examples/testppdx.ppd +++ b/examples/testppdx.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% -*% "$Id: testppdx.ppd 10459 2012-05-09 22:34:27Z mike $" +*% "$Id: testppdx.ppd 3833 2012-05-23 22:51:18Z msweet $" *% *% Test PPD file for data encoding example. *% @@ -109,7 +109,7 @@ *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM *Font ZapfDingbats: Special "(001.004S)" Standard ROM *% -*% End of "$Id: testppdx.ppd 10459 2012-05-09 22:34:27Z mike $". +*% End of "$Id: testppdx.ppd 3833 2012-05-23 22:51:18Z msweet $". *% *EXData0000: "eNqlVm1v2zYQ/hz/ipvWznLgl6T7siXrgCJ2AANBEyQpNmAtAlqiLG4SKZBU7LTIf9/dUW9Og32ZAFsieffcc88dKS2OR3AM0Zt1+ibCJxoA3EvnobJma0UJmbFwc7OEVHgBUicmVXoLci/KqpCAQznvHC9MWSmc3Smfn3WzdG2TBGYGPCJXVbqH2fIBQR+Wq5vb1cWH+9XyfRTBbNs" *EXData0001: "GcwTaG6zIqkrh7evgzDVk1Xb3MO7k9N3sHmCDxWRWeuk53KfSxf4paC087ZOvDLaTcF54WUptcdnoVO0KavaS9um7EBYCT6XAQhnK2n9E5hsEIc9yQ6XvUw8RkEelzKVVhQI2TAMEIXYzQGWClmoTU002L1GgmwVIpraF0ozXYoOGUkZXa0vVh/vVnO/91FA2+UqycHlpi5SyMWjhI0" diff --git a/filter/Makefile b/filter/Makefile index be588d7b..85f9d8a3 100644 --- a/filter/Makefile +++ b/filter/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 10191 2012-01-20 19:00:32Z mike $" +# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $" # # Filter makefile for CUPS. # @@ -396,5 +396,5 @@ include Dependencies # -# End of "$Id: Makefile 10191 2012-01-20 19:00:32Z mike $". +# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $". # diff --git a/filter/api-raster.header b/filter/api-raster.header index 201c799d..42c11d1e 100644 --- a/filter/api-raster.header +++ b/filter/api-raster.header @@ -1,5 +1,5 @@ <!-- - "$Id: api-raster.header 9344 2010-10-26 23:45:18Z mike $" + "$Id$" Raster API documentation for CUPS. diff --git a/filter/api-raster.shtml b/filter/api-raster.shtml index fff478dc..cb137d52 100644 --- a/filter/api-raster.shtml +++ b/filter/api-raster.shtml @@ -3,7 +3,7 @@ Raster API introduction for CUPS. - Copyright 2007-2012 by Apple Inc. + Copyright 2007-2013 by Apple Inc. Copyright 1997-2006 by Easy Software Products, all rights reserved. These coded instructions, statements, and computer programs are the diff --git a/filter/commandtops.c b/filter/commandtops.c index 93cc7b77..a75809c2 100644 --- a/filter/commandtops.c +++ b/filter/commandtops.c @@ -1,5 +1,5 @@ /* - * "$Id: commandtops.c 10431 2012-04-23 19:19:19Z mike $" + * "$Id: commandtops.c 3794 2012-04-23 22:44:16Z msweet $" * * PostScript command filter for CUPS. * @@ -534,5 +534,5 @@ report_levels(ppd_file_t *ppd, /* I - PPD file */ /* - * End of "$Id: commandtops.c 10431 2012-04-23 19:19:19Z mike $". + * End of "$Id: commandtops.c 3794 2012-04-23 22:44:16Z msweet $". */ diff --git a/filter/common.c b/filter/common.c index 67e440e5..689253cc 100644 --- a/filter/common.c +++ b/filter/common.c @@ -1,5 +1,5 @@ /* - * "$Id: common.c 9793 2011-05-20 03:49:49Z mike $" + * "$Id: common.c 6649 2007-07-11 21:46:42Z mike $" * * Common filter routines for CUPS. * @@ -531,5 +531,5 @@ WriteTextComment(const char *name, /* I - Comment name ("Title", etc.) */ /* - * End of "$Id: common.c 9793 2011-05-20 03:49:49Z mike $". + * End of "$Id: common.c 6649 2007-07-11 21:46:42Z mike $". */ diff --git a/filter/common.h b/filter/common.h index ffb782ce..3501085a 100644 --- a/filter/common.h +++ b/filter/common.h @@ -1,5 +1,5 @@ /* - * "$Id: common.h 9063 2010-04-01 17:01:09Z mike $" + * "$Id: common.h 6649 2007-07-11 21:46:42Z mike $" * * Common filter definitions for CUPS. * @@ -74,5 +74,5 @@ extern void WriteTextComment(const char *name, const char *value); /* - * End of "$Id: common.h 9063 2010-04-01 17:01:09Z mike $". + * End of "$Id: common.h 6649 2007-07-11 21:46:42Z mike $". */ diff --git a/filter/error.c b/filter/error.c index a4f9fe16..08edebb6 100644 --- a/filter/error.c +++ b/filter/error.c @@ -1,5 +1,5 @@ /* - * "$Id: error.c 10424 2012-04-23 17:26:57Z mike $" + * "$Id: error.c 7460 2008-04-16 02:19:54Z mike $" * * Raster error handling for CUPS. * @@ -282,5 +282,5 @@ get_error_buffer(void) /* - * End of "$Id: error.c 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: error.c 7460 2008-04-16 02:19:54Z mike $". */ diff --git a/filter/gziptoany.c b/filter/gziptoany.c index a5f379af..09a636b1 100644 --- a/filter/gziptoany.c +++ b/filter/gziptoany.c @@ -1,5 +1,5 @@ /* - * "$Id: gziptoany.c 10431 2012-04-23 19:19:19Z mike $" + * "$Id: gziptoany.c 6649 2007-07-11 21:46:42Z mike $" * * GZIP/raw pre-filter for CUPS. * @@ -108,5 +108,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: gziptoany.c 10431 2012-04-23 19:19:19Z mike $". + * End of "$Id: gziptoany.c 6649 2007-07-11 21:46:42Z mike $". */ diff --git a/filter/interpret.c b/filter/interpret.c index 5d099782..7723f656 100644 --- a/filter/interpret.c +++ b/filter/interpret.c @@ -1,5 +1,5 @@ /* - * "$Id: interpret.c 10424 2012-04-23 17:26:57Z mike $" + * "$Id: interpret.c 7852 2008-08-21 04:19:45Z mike $" * * PPD command interpreter for CUPS. * @@ -1684,5 +1684,5 @@ DEBUG_stack(_cups_ps_stack_t *st) /* I - Stack */ /* - * End of "$Id: interpret.c 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: interpret.c 7852 2008-08-21 04:19:45Z mike $". */ diff --git a/filter/postscript-driver.header b/filter/postscript-driver.header index f269a119..08e4c175 100644 --- a/filter/postscript-driver.header +++ b/filter/postscript-driver.header @@ -1,5 +1,5 @@ <!-- - "$Id: postscript-driver.header 10424 2012-04-23 17:26:57Z mike $" + "$Id$" PostScript printer driver documentation for CUPS. diff --git a/filter/ppd-compiler.header b/filter/ppd-compiler.header index 3301bc7a..2caf3aec 100644 --- a/filter/ppd-compiler.header +++ b/filter/ppd-compiler.header @@ -1,5 +1,5 @@ <!-- - "$Id: ppd-compiler.header 10307 2012-02-16 05:33:29Z mike $" + "$Id$" PPD compiler documentation for CUPS. diff --git a/filter/pstops.c b/filter/pstops.c index c0ed32d7..bcc8d2b4 100644 --- a/filter/pstops.c +++ b/filter/pstops.c @@ -1,5 +1,5 @@ /* - * "$Id: pstops.c 10431 2012-04-23 19:19:19Z mike $" + * "$Id: pstops.c 7977 2008-09-23 23:44:33Z mike $" * * PostScript filter for CUPS. * @@ -3429,5 +3429,5 @@ write_options( /* - * End of "$Id: pstops.c 10431 2012-04-23 19:19:19Z mike $". + * End of "$Id: pstops.c 7977 2008-09-23 23:44:33Z mike $". */ diff --git a/filter/raster-driver.header b/filter/raster-driver.header index 289bffb4..b15c50d9 100644 --- a/filter/raster-driver.header +++ b/filter/raster-driver.header @@ -1,5 +1,5 @@ <!-- - "$Id: raster-driver.header 10424 2012-04-23 17:26:57Z mike $" + "$Id$" Raster printer driver documentation for CUPS. diff --git a/filter/raster.c b/filter/raster.c index adede6db..1ecd90de 100644 --- a/filter/raster.c +++ b/filter/raster.c @@ -1,5 +1,5 @@ /* - * "$Id: raster.c 10629 2012-10-01 02:51:48Z mike $" + * "$Id: raster.c 7720 2008-07-11 22:46:21Z mike $" * * Raster file routines for CUPS. * @@ -1475,5 +1475,5 @@ cups_write_fd(void *ctx, /* I - File descriptor pointer */ /* - * End of "$Id: raster.c 10629 2012-10-01 02:51:48Z mike $". + * End of "$Id: raster.c 7720 2008-07-11 22:46:21Z mike $". */ diff --git a/filter/rasterbench.c b/filter/rasterbench.c index 660f451f..0e3c47af 100644 --- a/filter/rasterbench.c +++ b/filter/rasterbench.c @@ -1,5 +1,5 @@ /* - * "$Id: rasterbench.c 9771 2011-05-12 05:21:56Z mike $" + * "$Id: rasterbench.c 7376 2008-03-19 21:07:45Z mike $" * * Raster benchmark program for CUPS. * @@ -351,5 +351,5 @@ write_test(int fd, /* I - File descriptor to write to */ /* - * End of "$Id: rasterbench.c 9771 2011-05-12 05:21:56Z mike $". + * End of "$Id: rasterbench.c 7376 2008-03-19 21:07:45Z mike $". */ diff --git a/filter/rastertoepson.c b/filter/rastertoepson.c index 23d326fb..08135bcc 100644 --- a/filter/rastertoepson.c +++ b/filter/rastertoepson.c @@ -1,5 +1,5 @@ /* - * "$Id: rastertoepson.c 10430 2012-04-23 18:07:59Z mike $" + * "$Id: rastertoepson.c 7450 2008-04-14 19:39:02Z mike $" * * EPSON ESC/P and ESC/P2 filter for CUPS. * @@ -1153,5 +1153,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: rastertoepson.c 10430 2012-04-23 18:07:59Z mike $". + * End of "$Id: rastertoepson.c 7450 2008-04-14 19:39:02Z mike $". */ diff --git a/filter/rastertohp.c b/filter/rastertohp.c index 14f7b3ec..b7390c12 100644 --- a/filter/rastertohp.c +++ b/filter/rastertohp.c @@ -1,5 +1,5 @@ /* - * "$Id: rastertohp.c 10430 2012-04-23 18:07:59Z mike $" + * "$Id: rastertohp.c 7834 2008-08-04 21:02:09Z mike $" * * Hewlett-Packard Page Control Language filter for CUPS. * @@ -882,5 +882,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: rastertohp.c 10430 2012-04-23 18:07:59Z mike $". + * End of "$Id: rastertohp.c 7834 2008-08-04 21:02:09Z mike $". */ diff --git a/filter/rastertolabel.c b/filter/rastertolabel.c index 13ecd5bd..4c0860cc 100644 --- a/filter/rastertolabel.c +++ b/filter/rastertolabel.c @@ -1,5 +1,5 @@ /* - * "$Id: rastertolabel.c 10430 2012-04-23 18:07:59Z mike $" + * "$Id: rastertolabel.c 7720 2008-07-11 22:46:21Z mike $" * * Label printer filter for CUPS. * @@ -1308,5 +1308,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: rastertolabel.c 10430 2012-04-23 18:07:59Z mike $". + * End of "$Id: rastertolabel.c 7720 2008-07-11 22:46:21Z mike $". */ diff --git a/filter/rastertopwg.c b/filter/rastertopwg.c index 99837021..97dab1cb 100644 --- a/filter/rastertopwg.c +++ b/filter/rastertopwg.c @@ -1,5 +1,5 @@ /* - * "$Id: rastertopwg.c 10005 2011-09-20 18:36:23Z mike $" + * "$Id: rastertopwg.c 3427 2011-09-20 18:40:57Z msweet $" * * CUPS raster to PWG raster format filter for CUPS. * @@ -457,5 +457,5 @@ main(int argc, /* I - Number of command-line args */ /* - * End of "$Id: rastertopwg.c 10005 2011-09-20 18:36:23Z mike $". + * End of "$Id: rastertopwg.c 3427 2011-09-20 18:40:57Z msweet $". */ diff --git a/filter/spec-ppd.header b/filter/spec-ppd.header index c8793d37..40433aa5 100644 --- a/filter/spec-ppd.header +++ b/filter/spec-ppd.header @@ -1,5 +1,5 @@ <!-- - "$Id: spec-ppd.header 9680 2011-04-13 15:45:24Z mike $" + "$Id$" PPD extension documentation for CUPS. diff --git a/filter/spec-ppd.shtml b/filter/spec-ppd.shtml index 0f54d378..b6bdcc40 100644 --- a/filter/spec-ppd.shtml +++ b/filter/spec-ppd.shtml @@ -529,7 +529,7 @@ option value is "1234" then CUPS will output the string "@PJL SET PASSCODE=1234" <p>The resulting dictionary sets the page device attributes that are sent to your raster driver in the page header.</p> -<h3>Custom Page Size Code</a></h3> +<h3>Custom Page Size Code</h3> <p>There are many possible implementations of the <tt>CustomPageSize</tt> code. For CUPS raster drivers, the following code is recommended:</p> @@ -542,7 +542,7 @@ option value is "1234" then CUPS will output the string "@PJL SET PASSCODE=1234" *CustomPageSize True: "pop pop pop <</PageSize[5 -2 roll]/ImagingBBox null>>setpagedevice" </pre> -<h3>Supported PostScript Operators</a></h3> +<h3>Supported PostScript Operators</h3> <p>CUPS supports the following PostScript operators in addition to the usual PostScript number, string (literal and hex-encoded), boolean, null, and name values:</p> @@ -601,7 +601,7 @@ PRE B { </blockquote> -<h3>Supported Page Device Attributes</a></h3> +<h3>Supported Page Device Attributes</h3> <p>Table 2 shows the supported page device attributes along with PostScript code examples.</p> @@ -1811,7 +1811,7 @@ the device.</p> <ul> - <li>Added <a href="#cupsPageSizeCategory"><tt>cupsPageSizeCategory</tt></a> keyword (originally defined in CUPS 1.4).</li> + <li>Added <a href="#cupsPageSizeCategory"><tt>cupsPageSizeCategory</tt></a> keyword (originally defined in CUPS 1.4).</li> <li>Added <a href="#cupsMaxCopies"><tt>cupsMaxCopies</tt></a> keyword.</li> diff --git a/filter/testraster.c b/filter/testraster.c index 185170dc..4519aa25 100644 --- a/filter/testraster.c +++ b/filter/testraster.c @@ -1,5 +1,5 @@ /* - * "$Id: testraster.c 9926 2011-08-27 09:23:01Z mike $" + * "$Id: testraster.c 7376 2008-03-19 21:07:45Z mike $" * * Raster test program routines for CUPS. * @@ -1074,5 +1074,5 @@ print_changes( /* - * End of "$Id: testraster.c 9926 2011-08-27 09:23:01Z mike $". + * End of "$Id: testraster.c 7376 2008-03-19 21:07:45Z mike $". */ @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id: install-sh 10487 2012-05-21 15:33:01Z mike $" +# "$Id$" # # Install a program, script, or datafile. # diff --git a/locale/Makefile b/locale/Makefile index 45cfd76b..18049741 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 10424 2012-04-23 17:26:57Z mike $" +# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $" # # Locale file makefile for CUPS. # @@ -218,5 +218,5 @@ include Dependencies # -# End of "$Id: Makefile 10424 2012-04-23 17:26:57Z mike $". +# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $". # diff --git a/locale/checkpo.c b/locale/checkpo.c index 479fde8e..73cad3ca 100644 --- a/locale/checkpo.c +++ b/locale/checkpo.c @@ -1,5 +1,5 @@ /* - * "$Id: checkpo.c 9384 2010-11-22 07:06:39Z mike $" + * "$Id: checkpo.c 7223 2008-01-16 23:41:19Z mike $" * * Verify that translations in the .po file have the same number and type of * printf-style format strings. @@ -409,5 +409,5 @@ free_formats(cups_array_t *fmts) /* I - Array of format strings */ /* - * End of "$Id: checkpo.c 9384 2010-11-22 07:06:39Z mike $". + * End of "$Id: checkpo.c 7223 2008-01-16 23:41:19Z mike $". */ diff --git a/locale/cups.pot b/locale/cups.pot index 12a4da4b..dbeeec34 100644 --- a/locale/cups.pot +++ b/locale/cups.pot @@ -30,7 +30,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.6\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2013-03-08 13:25-0500\n" +"POT-Creation-Date: 2013-07-08 07:38-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" @@ -39,12 +39,12 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: systemv/lpstat.c:1876 systemv/lpstat.c:2001 +#: systemv/lpstat.c:1992 systemv/lpstat.c:2117 msgid "\t\t(all)" msgstr "" -#: systemv/lpstat.c:1879 systemv/lpstat.c:1882 systemv/lpstat.c:2004 -#: systemv/lpstat.c:2007 +#: systemv/lpstat.c:1995 systemv/lpstat.c:1998 systemv/lpstat.c:2120 +#: systemv/lpstat.c:2123 msgid "\t\t(none)" msgstr "" @@ -53,104 +53,104 @@ msgstr "" msgid "\t%d entries" msgstr "" -#: systemv/lpstat.c:756 systemv/lpstat.c:772 +#: systemv/lpstat.c:841 systemv/lpstat.c:857 #, c-format msgid "\t%s" msgstr "" -#: systemv/lpstat.c:1857 systemv/lpstat.c:1982 +#: systemv/lpstat.c:1973 systemv/lpstat.c:2098 msgid "\tAfter fault: continue" msgstr "" -#: systemv/lpstat.c:1481 systemv/lpstat.c:1826 systemv/lpstat.c:1952 +#: systemv/lpstat.c:1591 systemv/lpstat.c:1942 systemv/lpstat.c:2068 #, c-format msgid "\tAlerts: %s" msgstr "" -#: systemv/lpstat.c:1880 systemv/lpstat.c:2005 +#: systemv/lpstat.c:1996 systemv/lpstat.c:2121 msgid "\tBanner required" msgstr "" -#: systemv/lpstat.c:1881 systemv/lpstat.c:2006 +#: systemv/lpstat.c:1997 systemv/lpstat.c:2122 msgid "\tCharset sets:" msgstr "" -#: systemv/lpstat.c:1845 systemv/lpstat.c:1970 +#: systemv/lpstat.c:1961 systemv/lpstat.c:2086 msgid "\tConnection: direct" msgstr "" -#: systemv/lpstat.c:1836 systemv/lpstat.c:1962 +#: systemv/lpstat.c:1952 systemv/lpstat.c:2078 msgid "\tConnection: remote" msgstr "" -#: systemv/lpstat.c:1800 systemv/lpstat.c:1926 +#: systemv/lpstat.c:1916 systemv/lpstat.c:2042 msgid "\tContent types: any" msgstr "" -#: systemv/lpstat.c:1884 systemv/lpstat.c:2009 +#: systemv/lpstat.c:2000 systemv/lpstat.c:2125 msgid "\tDefault page size:" msgstr "" -#: systemv/lpstat.c:1883 systemv/lpstat.c:2008 +#: systemv/lpstat.c:1999 systemv/lpstat.c:2124 msgid "\tDefault pitch:" msgstr "" -#: systemv/lpstat.c:1885 systemv/lpstat.c:2010 +#: systemv/lpstat.c:2001 systemv/lpstat.c:2126 msgid "\tDefault port settings:" msgstr "" -#: systemv/lpstat.c:1806 systemv/lpstat.c:1932 +#: systemv/lpstat.c:1922 systemv/lpstat.c:2048 #, c-format msgid "\tDescription: %s" msgstr "" -#: systemv/lpstat.c:1799 systemv/lpstat.c:1925 +#: systemv/lpstat.c:1915 systemv/lpstat.c:2041 msgid "\tForm mounted:" msgstr "" -#: systemv/lpstat.c:1878 systemv/lpstat.c:2003 +#: systemv/lpstat.c:1994 systemv/lpstat.c:2119 msgid "\tForms allowed:" msgstr "" -#: systemv/lpstat.c:1840 systemv/lpstat.c:1966 +#: systemv/lpstat.c:1956 systemv/lpstat.c:2082 #, c-format msgid "\tInterface: %s.ppd" msgstr "" -#: systemv/lpstat.c:1849 systemv/lpstat.c:1974 +#: systemv/lpstat.c:1965 systemv/lpstat.c:2090 #, c-format msgid "\tInterface: %s/interfaces/%s" msgstr "" -#: systemv/lpstat.c:1853 systemv/lpstat.c:1978 +#: systemv/lpstat.c:1969 systemv/lpstat.c:2094 #, c-format msgid "\tInterface: %s/ppd/%s.ppd" msgstr "" -#: systemv/lpstat.c:1831 systemv/lpstat.c:1957 +#: systemv/lpstat.c:1947 systemv/lpstat.c:2073 #, c-format msgid "\tLocation: %s" msgstr "" -#: systemv/lpstat.c:1856 systemv/lpstat.c:1981 +#: systemv/lpstat.c:1972 systemv/lpstat.c:2097 msgid "\tOn fault: no alert" msgstr "" -#: systemv/lpstat.c:1801 systemv/lpstat.c:1927 +#: systemv/lpstat.c:1917 systemv/lpstat.c:2043 msgid "\tPrinter types: unknown" msgstr "" -#: systemv/lpstat.c:1462 +#: systemv/lpstat.c:1572 #, c-format msgid "\tStatus: %s" msgstr "" -#: systemv/lpstat.c:1861 systemv/lpstat.c:1875 systemv/lpstat.c:1986 -#: systemv/lpstat.c:2000 +#: systemv/lpstat.c:1977 systemv/lpstat.c:1991 systemv/lpstat.c:2102 +#: systemv/lpstat.c:2116 msgid "\tUsers allowed:" msgstr "" -#: systemv/lpstat.c:1868 systemv/lpstat.c:1993 +#: systemv/lpstat.c:1984 systemv/lpstat.c:2109 msgid "\tUsers denied:" msgstr "" @@ -175,7 +175,7 @@ msgstr "" msgid "\tprinting is enabled" msgstr "" -#: systemv/lpstat.c:1484 +#: systemv/lpstat.c:1594 #, c-format msgid "\tqueued for %s" msgstr "" @@ -188,7 +188,7 @@ msgstr "" msgid "\tqueuing is enabled" msgstr "" -#: systemv/lpstat.c:1792 systemv/lpstat.c:1918 +#: systemv/lpstat.c:1908 systemv/lpstat.c:2034 msgid "\treason unknown" msgstr "" @@ -250,7 +250,7 @@ msgstr "" msgid " REF: Pages 52-54, section 5.2." msgstr "" -#: berkeley/lpq.c:558 +#: berkeley/lpq.c:559 #, c-format msgid " %-39.39s %.0f bytes" msgstr "" @@ -1289,22 +1289,22 @@ msgstr "" msgid " PASS" msgstr "" -#: berkeley/lpq.c:564 +#: berkeley/lpq.c:565 #, c-format msgid "%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes" msgstr "" -#: berkeley/lpq.c:569 +#: berkeley/lpq.c:570 #, c-format msgid "%-7s %-7.7s %-7d %-31.31s %.0f bytes" msgstr "" -#: systemv/lpstat.c:750 +#: systemv/lpstat.c:835 #, c-format msgid "%s accepting requests since %s" msgstr "" -#: scheduler/ipp.c:10143 +#: scheduler/ipp.c:10166 #, c-format msgid "%s cannot be changed." msgstr "" @@ -1314,17 +1314,17 @@ msgstr "" msgid "%s is not implemented by the CUPS version of lpc." msgstr "" -#: berkeley/lpq.c:655 +#: berkeley/lpq.c:656 #, c-format msgid "%s is not ready" msgstr "" -#: berkeley/lpq.c:648 +#: berkeley/lpq.c:649 #, c-format msgid "%s is ready" msgstr "" -#: berkeley/lpq.c:651 +#: berkeley/lpq.c:652 #, c-format msgid "%s is ready and printing" msgstr "" @@ -1335,7 +1335,7 @@ msgstr "" msgid "%s job-id user title copies options [file]" msgstr "" -#: systemv/lpstat.c:754 +#: systemv/lpstat.c:839 #, c-format msgid "%s not accepting requests since %s -" msgstr "" @@ -1345,17 +1345,17 @@ msgstr "" msgid "%s not supported." msgstr "" -#: systemv/lpstat.c:765 +#: systemv/lpstat.c:850 #, c-format msgid "%s/%s accepting requests since %s" msgstr "" -#: systemv/lpstat.c:770 +#: systemv/lpstat.c:855 #, c-format msgid "%s/%s not accepting requests since %s -" msgstr "" -#: berkeley/lpq.c:556 +#: berkeley/lpq.c:557 #, c-format msgid "%s: %-33.33s [job %d localhost]" msgstr "" @@ -1379,52 +1379,63 @@ msgstr "" msgid "%s: Don't know what to do." msgstr "" -#: berkeley/lpq.c:236 berkeley/lpr.c:344 systemv/lp.c:591 +#: berkeley/lpq.c:237 berkeley/lpr.c:362 systemv/lp.c:608 #, c-format msgid "%s: Error - %s environment variable names non-existent destination \"%s\"." msgstr "" -#: systemv/lp.c:231 +#: berkeley/lpq.c:144 berkeley/lpq.c:215 berkeley/lpr.c:234 berkeley/lpr.c:337 +#: systemv/lp.c:163 systemv/lp.c:583 systemv/lp.c:703 systemv/lp.c:752 +#: systemv/lpstat.c:208 systemv/lpstat.c:286 systemv/lpstat.c:388 +#: systemv/lpstat.c:417 systemv/lpstat.c:441 systemv/lpstat.c:500 +#: systemv/lpstat.c:566 systemv/lpstat.c:627 systemv/lpstat.c:753 +#: systemv/lpstat.c:938 systemv/lpstat.c:1199 systemv/lpstat.c:1442 +#: systemv/lpstat.c:1701 +#, c-format +msgid "%s: Error - add '/version=1.1' to server name." +msgstr "" + +#: systemv/lp.c:240 #, c-format msgid "%s: Error - bad job ID." msgstr "" -#: systemv/lp.c:219 +#: systemv/lp.c:228 #, c-format msgid "%s: Error - cannot print files and alter jobs simultaneously." msgstr "" -#: systemv/lp.c:512 +#: systemv/lp.c:521 #, c-format msgid "%s: Error - cannot print from stdin if files or a job ID are provided." msgstr "" -#: systemv/lp.c:461 +#: systemv/lp.c:470 #, c-format msgid "%s: Error - expected character set after \"-S\" option." msgstr "" -#: systemv/lp.c:480 +#: systemv/lp.c:489 #, c-format msgid "%s: Error - expected content type after \"-T\" option." msgstr "" -#: berkeley/lpr.c:240 +#: berkeley/lpr.c:249 #, c-format msgid "%s: Error - expected copies after \"-#\" option." msgstr "" -#: systemv/lp.c:264 +#: systemv/lp.c:273 #, c-format msgid "%s: Error - expected copies after \"-n\" option." msgstr "" -#: berkeley/lpr.c:209 +#: berkeley/lpr.c:210 #, c-format msgid "%s: Error - expected destination after \"-P\" option." msgstr "" -#: systemv/lpstat.c:231 +#: systemv/lpstat.c:241 #, c-format msgid "%s: Error - expected destination after \"-b\" option." msgstr "" @@ -1434,48 +1445,48 @@ msgstr "" msgid "%s: Error - expected destination after \"-d\" option." msgstr "" -#: systemv/lp.c:168 +#: systemv/lp.c:177 #, c-format msgid "%s: Error - expected form after \"-f\" option." msgstr "" -#: systemv/lp.c:391 +#: systemv/lp.c:400 #, c-format msgid "%s: Error - expected hold name after \"-H\" option." msgstr "" -#: berkeley/lpr.c:103 +#: berkeley/lpr.c:104 #, c-format msgid "%s: Error - expected hostname after \"-H\" option." msgstr "" #: berkeley/lpq.c:180 berkeley/lprm.c:123 systemv/cancel.c:124 -#: systemv/cupsaccept.c:123 systemv/lp.c:189 systemv/lpstat.c:291 +#: systemv/cupsaccept.c:123 systemv/lp.c:198 systemv/lpstat.c:311 #, c-format msgid "%s: Error - expected hostname after \"-h\" option." msgstr "" -#: systemv/lp.c:371 +#: systemv/lp.c:380 #, c-format msgid "%s: Error - expected mode list after \"-y\" option." msgstr "" -#: berkeley/lpr.c:263 +#: berkeley/lpr.c:272 #, c-format msgid "%s: Error - expected name after \"-%c\" option." msgstr "" -#: berkeley/lpr.c:153 systemv/lp.c:288 +#: berkeley/lpr.c:154 systemv/lp.c:297 #, c-format msgid "%s: Error - expected option=value after \"-o\" option." msgstr "" -#: systemv/lp.c:441 +#: systemv/lp.c:450 #, c-format msgid "%s: Error - expected page list after \"-P\" option." msgstr "" -#: systemv/lp.c:308 +#: systemv/lp.c:317 #, c-format msgid "%s: Error - expected priority after \"-%c\" option." msgstr "" @@ -1485,12 +1496,12 @@ msgstr "" msgid "%s: Error - expected reason text after \"-r\" option." msgstr "" -#: systemv/lp.c:354 +#: systemv/lp.c:363 #, c-format msgid "%s: Error - expected title after \"-t\" option." msgstr "" -#: berkeley/lpq.c:111 berkeley/lpr.c:84 berkeley/lprm.c:104 +#: berkeley/lpq.c:108 berkeley/lpr.c:85 berkeley/lprm.c:104 #: systemv/cancel.c:94 systemv/cupsaccept.c:101 systemv/lp.c:116 #: systemv/lpadmin.c:438 systemv/lpstat.c:137 #, c-format @@ -1502,7 +1513,7 @@ msgstr "" msgid "%s: Error - expected username after \"-u\" option." msgstr "" -#: berkeley/lpr.c:125 +#: berkeley/lpr.c:126 #, c-format msgid "%s: Error - expected value after \"-%c\" option." msgstr "" @@ -1512,32 +1523,32 @@ msgstr "" msgid "%s: Error - need \"completed\", \"not-completed\", or \"all\" after \"-W\" option." msgstr "" -#: berkeley/lpq.c:241 berkeley/lpr.c:349 systemv/lp.c:596 +#: berkeley/lpq.c:242 berkeley/lpr.c:367 systemv/lp.c:613 #, c-format msgid "%s: Error - no default destination available." msgstr "" -#: systemv/lp.c:330 +#: systemv/lp.c:339 #, c-format msgid "%s: Error - priority must be between 1 and 100." msgstr "" -#: berkeley/lpr.c:352 systemv/lp.c:599 +#: berkeley/lpr.c:370 systemv/lp.c:616 #, c-format msgid "%s: Error - scheduler not responding." msgstr "" -#: berkeley/lpr.c:305 systemv/lp.c:544 +#: berkeley/lpr.c:315 systemv/lp.c:553 #, c-format msgid "%s: Error - too many files - \"%s\"." msgstr "" -#: berkeley/lpr.c:287 systemv/lp.c:527 +#: berkeley/lpr.c:297 systemv/lp.c:536 #, c-format msgid "%s: Error - unable to access \"%s\" - %s" msgstr "" -#: berkeley/lpr.c:395 systemv/lp.c:630 +#: berkeley/lpr.c:413 systemv/lp.c:647 #, c-format msgid "%s: Error - unable to queue from stdin - %s." msgstr "" @@ -1547,28 +1558,28 @@ msgstr "" msgid "%s: Error - unknown destination \"%s\"." msgstr "" -#: berkeley/lpq.c:150 +#: berkeley/lpq.c:148 #, c-format msgid "%s: Error - unknown destination \"%s/%s\"." msgstr "" -#: berkeley/lpr.c:274 berkeley/lprm.c:139 systemv/cancel.c:156 -#: systemv/cupsaccept.c:164 systemv/lp.c:503 systemv/lpstat.c:452 +#: berkeley/lpr.c:283 berkeley/lprm.c:139 systemv/cancel.c:156 +#: systemv/cupsaccept.c:164 systemv/lp.c:512 systemv/lpstat.c:512 #, c-format msgid "%s: Error - unknown option \"%c\"." msgstr "" -#: systemv/cupsaccept.c:157 systemv/lp.c:494 +#: systemv/cupsaccept.c:157 systemv/lp.c:503 #, c-format msgid "%s: Error - unknown option \"%s\"." msgstr "" -#: systemv/lp.c:208 +#: systemv/lp.c:217 #, c-format msgid "%s: Expected job ID after \"-i\" option." msgstr "" -#: systemv/lpstat.c:504 systemv/lpstat.c:543 +#: systemv/lpstat.c:570 systemv/lpstat.c:610 #, c-format msgid "%s: Invalid destination name in list \"%s\"." msgstr "" @@ -1578,7 +1589,7 @@ msgstr "" msgid "%s: Invalid filter string \"%s\"." msgstr "" -#: systemv/lp.c:418 +#: systemv/lp.c:427 #, c-format msgid "%s: Need job ID (\"-i jobid\") before \"-H restart\"." msgstr "" @@ -1593,7 +1604,7 @@ msgstr "" msgid "%s: Operation failed: %s" msgstr "" -#: berkeley/lpq.c:97 berkeley/lpr.c:70 berkeley/lprm.c:67 systemv/cancel.c:81 +#: berkeley/lpq.c:94 berkeley/lpr.c:71 berkeley/lprm.c:67 systemv/cancel.c:81 #: systemv/cupsaccept.c:88 systemv/cupsaddsmb.c:86 systemv/lp.c:102 #: systemv/lpadmin.c:239 systemv/lpinfo.c:88 systemv/lpmove.c:73 #: systemv/lpstat.c:102 test/ipptool.c:307 test/ipptool.c:324 @@ -1601,7 +1612,7 @@ msgstr "" msgid "%s: Sorry, no encryption support." msgstr "" -#: berkeley/lpq.c:295 scheduler/cupsfilter.c:1224 systemv/cancel.c:237 +#: berkeley/lpq.c:296 scheduler/cupsfilter.c:1224 systemv/cancel.c:237 #: systemv/cupsaddsmb.c:144 systemv/cupsaddsmb.c:171 #, c-format msgid "%s: Unable to connect to server." @@ -1632,7 +1643,7 @@ msgstr "" msgid "%s: Unable to read MIME database from \"%s\" or \"%s\"." msgstr "" -#: berkeley/lpq.c:153 systemv/lpstat.c:558 +#: berkeley/lpq.c:151 systemv/lpstat.c:631 #, c-format msgid "%s: Unknown destination \"%s\"." msgstr "" @@ -1652,27 +1663,27 @@ msgstr "" msgid "%s: Unknown source MIME type %s/%s." msgstr "" -#: berkeley/lpr.c:139 +#: berkeley/lpr.c:140 #, c-format msgid "%s: Warning - \"%c\" format modifier not supported - output may not be correct." msgstr "" -#: systemv/lp.c:468 +#: systemv/lp.c:477 #, c-format msgid "%s: Warning - character set option ignored." msgstr "" -#: systemv/lp.c:487 +#: systemv/lp.c:496 #, c-format msgid "%s: Warning - content type option ignored." msgstr "" -#: systemv/lp.c:175 +#: systemv/lp.c:184 #, c-format msgid "%s: Warning - form option ignored." msgstr "" -#: systemv/lp.c:378 +#: systemv/lp.c:387 #, c-format msgid "%s: Warning - mode option ignored." msgstr "" @@ -2631,7 +2642,7 @@ msgstr "" msgid "Accept Jobs" msgstr "" -#: cups/http-support.c:1284 +#: cups/http-support.c:1345 msgid "Accepted" msgstr "" @@ -2726,12 +2737,12 @@ msgstr "" msgid "B9" msgstr "" -#: scheduler/ipp.c:11068 +#: scheduler/ipp.c:11091 #, c-format msgid "Bad 'document-format' value \"%s\"." msgstr "" -#: cups/dest.c:1680 +#: cups/dest.c:1679 msgid "Bad NULL dests pointer" msgstr "" @@ -2760,7 +2771,7 @@ msgstr "" msgid "Bad PPD cache file." msgstr "" -#: cups/http-support.c:1299 +#: cups/http-support.c:1360 msgid "Bad Request" msgstr "" @@ -2781,22 +2792,22 @@ msgstr "" msgid "Bad custom parameter" msgstr "" -#: cups/http-support.c:1451 scheduler/ipp.c:2448 +#: cups/http-support.c:1512 scheduler/ipp.c:2467 #, c-format msgid "Bad device-uri \"%s\"." msgstr "" -#: scheduler/ipp.c:2489 +#: scheduler/ipp.c:2506 #, c-format msgid "Bad device-uri scheme \"%s\"." msgstr "" -#: scheduler/ipp.c:8322 scheduler/ipp.c:8338 scheduler/ipp.c:9552 +#: scheduler/ipp.c:8339 scheduler/ipp.c:8355 scheduler/ipp.c:9575 #, c-format msgid "Bad document-format \"%s\"." msgstr "" -#: scheduler/ipp.c:9568 +#: scheduler/ipp.c:9591 #, c-format msgid "Bad document-format-default \"%s\"." msgstr "" @@ -2817,7 +2828,7 @@ msgstr "" msgid "Bad job-name value: Wrong type or count." msgstr "" -#: scheduler/ipp.c:10158 +#: scheduler/ipp.c:10181 msgid "Bad job-priority value." msgstr "" @@ -2830,24 +2841,24 @@ msgstr "" msgid "Bad job-sheets value type." msgstr "" -#: scheduler/ipp.c:10188 +#: scheduler/ipp.c:10211 msgid "Bad job-state value." msgstr "" -#: scheduler/ipp.c:3072 scheduler/ipp.c:3524 scheduler/ipp.c:6176 -#: scheduler/ipp.c:6323 scheduler/ipp.c:7756 scheduler/ipp.c:8025 -#: scheduler/ipp.c:8873 scheduler/ipp.c:9099 scheduler/ipp.c:9448 -#: scheduler/ipp.c:10051 +#: scheduler/ipp.c:3089 scheduler/ipp.c:3541 scheduler/ipp.c:6193 +#: scheduler/ipp.c:6340 scheduler/ipp.c:7773 scheduler/ipp.c:8042 +#: scheduler/ipp.c:8890 scheduler/ipp.c:9116 scheduler/ipp.c:9471 +#: scheduler/ipp.c:10074 #, c-format msgid "Bad job-uri \"%s\"." msgstr "" -#: scheduler/ipp.c:2147 scheduler/ipp.c:5720 +#: scheduler/ipp.c:2147 scheduler/ipp.c:5737 #, c-format msgid "Bad notify-pull-method \"%s\"." msgstr "" -#: scheduler/ipp.c:2111 scheduler/ipp.c:5684 +#: scheduler/ipp.c:2111 scheduler/ipp.c:5701 #, c-format msgid "Bad notify-recipient-uri \"%s\"." msgstr "" @@ -2867,7 +2878,7 @@ msgstr "" msgid "Bad page-ranges values %d-%d." msgstr "" -#: scheduler/ipp.c:2532 +#: scheduler/ipp.c:2549 #, c-format msgid "Bad port-monitor \"%s\"." msgstr "" @@ -2876,7 +2887,7 @@ msgstr "" msgid "Bad printer URI." msgstr "" -#: scheduler/ipp.c:2593 +#: scheduler/ipp.c:2610 #, c-format msgid "Bad printer-state value %d." msgstr "" @@ -2928,11 +2939,11 @@ msgstr "" msgid "Cancel RSS Subscription" msgstr "" -#: backend/ipp.c:2020 +#: backend/ipp.c:2027 msgid "Canceling print job." msgstr "" -#: scheduler/ipp.c:2573 +#: scheduler/ipp.c:2590 msgid "Cannot share a remote Kerberized printer." msgstr "" @@ -2945,7 +2956,7 @@ msgstr "" msgid "Change Settings" msgstr "" -#: scheduler/ipp.c:2159 scheduler/ipp.c:5732 +#: scheduler/ipp.c:2159 scheduler/ipp.c:5749 #, c-format msgid "Character set \"%s\" not supported." msgstr "" @@ -2958,7 +2969,7 @@ msgstr "" msgid "Clean Print Heads" msgstr "" -#: scheduler/ipp.c:3976 +#: scheduler/ipp.c:3993 msgid "Close-Job doesn't support the job-uri attribute." msgstr "" @@ -2981,15 +2992,15 @@ msgstr "" msgid "Community name uses indefinite length" msgstr "" -#: backend/ipp.c:801 backend/lpd.c:888 backend/socket.c:409 +#: backend/ipp.c:802 backend/lpd.c:888 backend/socket.c:409 msgid "Connected to printer." msgstr "" -#: backend/ipp.c:706 backend/lpd.c:711 backend/socket.c:328 +#: backend/ipp.c:707 backend/lpd.c:711 backend/socket.c:328 msgid "Connecting to printer." msgstr "" -#: cups/http-support.c:1272 +#: cups/http-support.c:1333 msgid "Continue" msgstr "" @@ -3001,11 +3012,11 @@ msgstr "" msgid "Control file sent successfully." msgstr "" -#: backend/ipp.c:1260 backend/lpd.c:481 +#: backend/ipp.c:1261 backend/lpd.c:481 msgid "Copying print data." msgstr "" -#: cups/http-support.c:1281 +#: cups/http-support.c:1342 msgid "Created" msgstr "" @@ -3102,7 +3113,7 @@ msgstr "" msgid "Disabled" msgstr "" -#: scheduler/ipp.c:6225 +#: scheduler/ipp.c:6242 #, c-format msgid "Document #%d does not exist in job #%d." msgstr "" @@ -3431,7 +3442,7 @@ msgstr "" msgid "Executive" msgstr "" -#: cups/http-support.c:1327 +#: cups/http-support.c:1388 msgid "Expectation Failed" msgstr "" @@ -3490,7 +3501,7 @@ msgstr "" msgid "File Folder " msgstr "" -#: scheduler/ipp.c:2468 +#: scheduler/ipp.c:2485 #, c-format msgid "File device URIs have been disabled. To enable, see the FileDevice directive in \"%s/cups-files.conf\"." msgstr "" @@ -3505,7 +3516,7 @@ msgstr "" msgid "Folio" msgstr "" -#: cups/http-support.c:1306 +#: cups/http-support.c:1367 msgid "Forbidden" msgstr "" @@ -3525,10 +3536,10 @@ msgstr "" msgid "Glossy Paper" msgstr "" -#: scheduler/ipp.c:3050 scheduler/ipp.c:3450 scheduler/ipp.c:3988 -#: scheduler/ipp.c:6154 scheduler/ipp.c:6301 scheduler/ipp.c:7733 -#: scheduler/ipp.c:8851 scheduler/ipp.c:9077 scheduler/ipp.c:9426 -#: scheduler/ipp.c:10029 +#: scheduler/ipp.c:3067 scheduler/ipp.c:3467 scheduler/ipp.c:4005 +#: scheduler/ipp.c:6171 scheduler/ipp.c:6318 scheduler/ipp.c:7750 +#: scheduler/ipp.c:8868 scheduler/ipp.c:9094 scheduler/ipp.c:9449 +#: scheduler/ipp.c:10052 msgid "Got a printer-uri attribute but no job-id." msgstr "" @@ -3672,7 +3683,7 @@ msgstr "" msgid "Intellitech" msgstr "" -#: cups/http-support.c:1333 +#: cups/http-support.c:1394 msgid "Internal Server Error" msgstr "" @@ -3688,7 +3699,7 @@ msgstr "" msgid "Internet Postage 3-Part" msgstr "" -#: backend/ipp.c:309 +#: backend/ipp.c:310 msgid "Internet Printing Protocol" msgstr "" @@ -3761,52 +3772,52 @@ msgstr "" msgid "JIS B9" msgstr "" -#: scheduler/ipp.c:9149 +#: scheduler/ipp.c:9166 #, c-format msgid "Job #%d cannot be restarted - no files." msgstr "" -#: scheduler/ipp.c:3090 scheduler/ipp.c:3320 scheduler/ipp.c:3375 -#: scheduler/ipp.c:3552 scheduler/ipp.c:3998 scheduler/ipp.c:5818 -#: scheduler/ipp.c:6194 scheduler/ipp.c:6341 scheduler/ipp.c:6641 -#: scheduler/ipp.c:7580 scheduler/ipp.c:7602 scheduler/ipp.c:7774 -#: scheduler/ipp.c:7999 scheduler/ipp.c:8042 scheduler/ipp.c:8891 -#: scheduler/ipp.c:9117 scheduler/ipp.c:9466 scheduler/ipp.c:10069 +#: scheduler/ipp.c:3107 scheduler/ipp.c:3337 scheduler/ipp.c:3392 +#: scheduler/ipp.c:3569 scheduler/ipp.c:4015 scheduler/ipp.c:5835 +#: scheduler/ipp.c:6211 scheduler/ipp.c:6358 scheduler/ipp.c:6658 +#: scheduler/ipp.c:7597 scheduler/ipp.c:7619 scheduler/ipp.c:7791 +#: scheduler/ipp.c:8016 scheduler/ipp.c:8059 scheduler/ipp.c:8908 +#: scheduler/ipp.c:9134 scheduler/ipp.c:9489 scheduler/ipp.c:10092 #, c-format msgid "Job #%d does not exist." msgstr "" -#: scheduler/ipp.c:3584 +#: scheduler/ipp.c:3601 #, c-format msgid "Job #%d is already aborted - can't cancel." msgstr "" -#: scheduler/ipp.c:3578 +#: scheduler/ipp.c:3595 #, c-format msgid "Job #%d is already canceled - can't cancel." msgstr "" -#: scheduler/ipp.c:3590 +#: scheduler/ipp.c:3607 #, c-format msgid "Job #%d is already completed - can't cancel." msgstr "" -#: scheduler/ipp.c:7800 scheduler/ipp.c:8084 scheduler/ipp.c:10084 +#: scheduler/ipp.c:7817 scheduler/ipp.c:8101 scheduler/ipp.c:10107 #, c-format msgid "Job #%d is finished and cannot be altered." msgstr "" -#: scheduler/ipp.c:9131 +#: scheduler/ipp.c:9148 #, c-format msgid "Job #%d is not complete." msgstr "" -#: scheduler/ipp.c:3105 +#: scheduler/ipp.c:3122 #, c-format msgid "Job #%d is not held for authentication." msgstr "" -#: scheduler/ipp.c:8905 +#: scheduler/ipp.c:8922 #, c-format msgid "Job #%d is not held." msgstr "" @@ -3827,7 +3838,7 @@ msgstr "" msgid "Job Stopped" msgstr "" -#: scheduler/ipp.c:10166 +#: scheduler/ipp.c:10189 msgid "Job is completed and cannot be changed." msgstr "" @@ -3835,11 +3846,11 @@ msgstr "" msgid "Job operation failed" msgstr "" -#: scheduler/ipp.c:10202 scheduler/ipp.c:10221 scheduler/ipp.c:10232 +#: scheduler/ipp.c:10225 scheduler/ipp.c:10244 scheduler/ipp.c:10255 msgid "Job state cannot be changed." msgstr "" -#: scheduler/ipp.c:8997 +#: scheduler/ipp.c:9014 msgid "Job subscriptions cannot be renewed." msgstr "" @@ -3859,7 +3870,7 @@ msgstr "" msgid "Label Top" msgstr "" -#: scheduler/ipp.c:2168 scheduler/ipp.c:5741 +#: scheduler/ipp.c:2168 scheduler/ipp.c:5758 #, c-format msgid "Language \"%s\" not supported." msgstr "" @@ -3896,7 +3907,7 @@ msgstr "" msgid "Long-Edge (Portrait)" msgstr "" -#: cups/http-support.c:1559 +#: cups/http-support.c:1620 msgid "Looking for printer." msgstr "" @@ -3940,7 +3951,7 @@ msgstr "" msgid "Missing asterisk in column 1" msgstr "" -#: scheduler/ipp.c:6217 +#: scheduler/ipp.c:6234 msgid "Missing document-number attribute." msgstr "" @@ -3955,7 +3966,7 @@ msgstr "" msgid "Missing form variable" msgstr "" -#: scheduler/ipp.c:9520 +#: scheduler/ipp.c:9543 msgid "Missing last-document attribute in request." msgstr "" @@ -3967,7 +3978,7 @@ msgstr "" msgid "Missing media-size in media-col." msgstr "" -#: scheduler/ipp.c:6771 +#: scheduler/ipp.c:6788 msgid "Missing notify-subscription-ids attribute." msgstr "" @@ -3975,7 +3986,7 @@ msgstr "" msgid "Missing option keyword" msgstr "" -#: scheduler/ipp.c:3231 scheduler/ipp.c:3256 +#: scheduler/ipp.c:3248 scheduler/ipp.c:3273 msgid "Missing requesting-user-name attribute." msgstr "" @@ -4025,7 +4036,7 @@ msgstr "" msgid "Move Job" msgstr "" -#: cups/http-support.c:1290 +#: cups/http-support.c:1351 msgid "Moved Permanently" msgstr "" @@ -4057,7 +4068,7 @@ msgstr "" msgid "No" msgstr "" -#: cups/http-support.c:1287 +#: cups/http-support.c:1348 msgid "No Content" msgstr "" @@ -4077,7 +4088,7 @@ msgstr "" msgid "No active connection" msgstr "" -#: scheduler/ipp.c:3501 +#: scheduler/ipp.c:3518 #, c-format msgid "No active jobs on %s." msgstr "" @@ -4086,7 +4097,7 @@ msgstr "" msgid "No attributes in request." msgstr "" -#: scheduler/ipp.c:3132 +#: scheduler/ipp.c:3149 msgid "No authentication information provided." msgstr "" @@ -4094,11 +4105,11 @@ msgstr "" msgid "No community name" msgstr "" -#: scheduler/ipp.c:6017 +#: scheduler/ipp.c:6034 msgid "No default printer." msgstr "" -#: cgi-bin/ipp-var.c:436 scheduler/ipp.c:7346 +#: cgi-bin/ipp-var.c:436 scheduler/ipp.c:7363 msgid "No destinations added." msgstr "" @@ -4114,7 +4125,7 @@ msgstr "" msgid "No error-status" msgstr "" -#: scheduler/ipp.c:8288 scheduler/ipp.c:9534 +#: scheduler/ipp.c:8305 scheduler/ipp.c:9557 msgid "No file in print request." msgstr "" @@ -4143,7 +4154,7 @@ msgstr "" msgid "No printer-uri found for class" msgstr "" -#: scheduler/ipp.c:6420 +#: scheduler/ipp.c:6437 msgid "No printer-uri in request." msgstr "" @@ -4151,11 +4162,11 @@ msgstr "" msgid "No request-id" msgstr "" -#: scheduler/ipp.c:5626 +#: scheduler/ipp.c:5643 msgid "No subscription attributes in request." msgstr "" -#: scheduler/ipp.c:7673 +#: scheduler/ipp.c:7690 msgid "No subscriptions found." msgstr "" @@ -4179,11 +4190,11 @@ msgstr "" msgid "Normal" msgstr "" -#: cups/http-support.c:1309 +#: cups/http-support.c:1370 msgid "Not Found" msgstr "" -#: cups/http-support.c:1321 +#: cups/http-support.c:1382 msgid "Not Implemented" msgstr "" @@ -4191,15 +4202,15 @@ msgstr "" msgid "Not Installed" msgstr "" -#: cups/http-support.c:1296 +#: cups/http-support.c:1357 msgid "Not Modified" msgstr "" -#: cups/http-support.c:1324 +#: cups/http-support.c:1385 msgid "Not Supported" msgstr "" -#: scheduler/ipp.c:1554 scheduler/ipp.c:10764 +#: scheduler/ipp.c:1554 scheduler/ipp.c:10787 msgid "Not allowed to print." msgstr "" @@ -4211,7 +4222,7 @@ msgstr "" msgid "Note: this program only validates the DSC comments, not the PostScript itself." msgstr "" -#: cups/http-support.c:1278 cups/ppd.c:338 +#: cups/http-support.c:1339 cups/ppd.c:338 msgid "OK" msgstr "" @@ -4272,22 +4283,22 @@ msgstr "" msgid "Output Mode" msgstr "" -#: systemv/lpstat.c:1191 systemv/lpstat.c:1195 +#: systemv/lpstat.c:1295 systemv/lpstat.c:1299 #, c-format msgid "Output for printer %s is sent to %s" msgstr "" -#: systemv/lpstat.c:1185 +#: systemv/lpstat.c:1289 #, c-format msgid "Output for printer %s is sent to remote printer %s on %s" msgstr "" -#: systemv/lpstat.c:1209 systemv/lpstat.c:1213 +#: systemv/lpstat.c:1313 systemv/lpstat.c:1317 #, c-format msgid "Output for printer %s/%s is sent to %s" msgstr "" -#: systemv/lpstat.c:1203 +#: systemv/lpstat.c:1307 #, c-format msgid "Output for printer %s/%s is sent to remote printer %s on %s" msgstr "" @@ -4438,12 +4449,12 @@ msgstr "" msgid "Print and Tear" msgstr "" -#: backend/ipp.c:1574 +#: backend/ipp.c:1575 #, c-format msgid "Print file accepted - job ID %d." msgstr "" -#: backend/ipp.c:1564 +#: backend/ipp.c:1565 msgid "Print file accepted - job ID unknown." msgstr "" @@ -4451,15 +4462,15 @@ msgstr "" msgid "Print file sent." msgstr "" -#: backend/ipp.c:1525 +#: backend/ipp.c:1526 msgid "Print file was not accepted." msgstr "" -#: backend/ipp.c:1994 +#: backend/ipp.c:2001 msgid "Print job canceled at printer." msgstr "" -#: backend/ipp.c:1989 +#: backend/ipp.c:1996 msgid "Print job too large." msgstr "" @@ -4487,7 +4498,7 @@ msgstr "" msgid "Printer Settings" msgstr "" -#: backend/ipp.c:1992 +#: backend/ipp.c:1999 msgid "Printer cannot print supplied content." msgstr "" @@ -4513,16 +4524,16 @@ msgstr "" msgid "Quarto" msgstr "" -#: scheduler/ipp.c:1549 scheduler/ipp.c:10759 +#: scheduler/ipp.c:1549 scheduler/ipp.c:10782 msgid "Quota limit reached." msgstr "" -#: berkeley/lpq.c:519 +#: berkeley/lpq.c:520 msgid "Rank Owner Job File(s) Total Size" msgstr "" #. TRANSLATORS: Pri is job priority. -#: berkeley/lpq.c:515 +#: berkeley/lpq.c:516 msgid "Rank Owner Pri Job Files Total Size" msgstr "" @@ -4544,7 +4555,7 @@ msgstr "" msgid "Reprint After Error" msgstr "" -#: cups/http-support.c:1312 +#: cups/http-support.c:1373 msgid "Request Entity Too Large" msgstr "" @@ -4577,15 +4588,15 @@ msgstr "" msgid "SEQUENCE uses indefinite length" msgstr "" -#: cups/http-support.c:1336 +#: cups/http-support.c:1397 msgid "SSL/TLS Negotiation Error" msgstr "" -#: cups/http-support.c:1293 +#: cups/http-support.c:1354 msgid "See Other" msgstr "" -#: backend/usb-darwin.c:543 backend/usb-libusb.c:441 +#: backend/usb-darwin.c:543 backend/usb-libusb.c:459 msgid "Sending data to printer." msgstr "" @@ -4605,7 +4616,7 @@ msgstr "" msgid "Server Stopped" msgstr "" -#: cups/http-support.c:1330 +#: cups/http-support.c:1391 msgid "Service Unavailable" msgstr "" @@ -4674,8 +4685,8 @@ msgstr "" msgid "Stylus Photo Series" msgstr "" -#: scheduler/ipp.c:3647 scheduler/ipp.c:6787 scheduler/ipp.c:7486 -#: scheduler/ipp.c:8985 +#: scheduler/ipp.c:3664 scheduler/ipp.c:6804 scheduler/ipp.c:7503 +#: scheduler/ipp.c:9002 #, c-format msgid "Subscription #%d does not exist." msgstr "" @@ -4692,7 +4703,7 @@ msgstr "" msgid "Super B/A3" msgstr "" -#: cups/http-support.c:1275 +#: cups/http-support.c:1336 msgid "Switching Protocols" msgstr "" @@ -4720,8 +4731,8 @@ msgstr "" msgid "Tear-Off Adjust Position" msgstr "" -#: scheduler/ipp.c:6491 scheduler/ipp.c:6569 scheduler/ipp.c:6585 -#: scheduler/ipp.c:6603 +#: scheduler/ipp.c:6508 scheduler/ipp.c:6586 scheduler/ipp.c:6602 +#: scheduler/ipp.c:6620 #, c-format msgid "The %s attribute cannot be provided with job-ids." msgstr "" @@ -4731,17 +4742,17 @@ msgstr "" msgid "The '%s' Job Description attribute cannot be supplied in a job creation request." msgstr "" -#: scheduler/ipp.c:5216 +#: scheduler/ipp.c:5233 #, c-format msgid "The '%s' operation attribute cannot be supplied in a Create-Job request." msgstr "" -#: scheduler/ipp.c:7017 +#: scheduler/ipp.c:7034 #, c-format msgid "The PPD file \"%s\" could not be found." msgstr "" -#: scheduler/ipp.c:7004 +#: scheduler/ipp.c:7021 #, c-format msgid "The PPD file \"%s\" could not be opened: %s" msgstr "" @@ -4775,7 +4786,7 @@ msgstr "" msgid "The notify-lease-duration attribute cannot be used with job subscriptions." msgstr "" -#: scheduler/ipp.c:2178 scheduler/ipp.c:5751 +#: scheduler/ipp.c:2178 scheduler/ipp.c:5768 #, c-format msgid "The notify-user-data value is too large (%d > 63 octets)." msgstr "" @@ -4816,7 +4827,7 @@ msgstr "" msgid "The paper tray needs to be filled." msgstr "" -#: backend/ipp.c:924 +#: backend/ipp.c:925 msgid "The printer URI is incorrect or no longer exists." msgstr "" @@ -4824,13 +4835,13 @@ msgstr "" msgid "The printer did not respond." msgstr "" -#: backend/ipp.c:907 backend/ipp.c:914 +#: backend/ipp.c:908 backend/ipp.c:915 #, c-format msgid "The printer does not support IPP/%d.%d, trying IPP/%s." msgstr "" -#: backend/ipp.c:772 backend/ipp.c:889 backend/ipp.c:1001 backend/ipp.c:1351 -#: backend/ipp.c:1502 backend/lpd.c:845 backend/socket.c:388 +#: backend/ipp.c:773 backend/ipp.c:890 backend/ipp.c:1002 backend/ipp.c:1352 +#: backend/ipp.c:1503 backend/lpd.c:845 backend/socket.c:388 #: backend/usb-unix.c:131 backend/usb-unix.c:424 backend/usb-unix.c:507 msgid "The printer is in use." msgstr "" @@ -4839,7 +4850,7 @@ msgstr "" msgid "The printer is not connected." msgstr "" -#: backend/ipp.c:750 backend/ipp.c:783 backend/ipp.c:885 backend/lpd.c:824 +#: backend/ipp.c:751 backend/ipp.c:784 backend/ipp.c:886 backend/lpd.c:824 #: backend/lpd.c:865 backend/socket.c:367 backend/socket.c:400 msgid "The printer is not responding." msgstr "" @@ -4864,7 +4875,7 @@ msgstr "" msgid "The printer is running low on toner." msgstr "" -#: backend/ipp.c:765 backend/lpd.c:838 backend/socket.c:381 +#: backend/ipp.c:766 backend/lpd.c:838 backend/socket.c:381 msgid "The printer is unreachable at this time." msgstr "" @@ -4876,7 +4887,7 @@ msgstr "" msgid "The printer may be out of toner." msgstr "" -#: backend/ipp.c:759 backend/lpd.c:832 backend/socket.c:375 +#: backend/ipp.c:760 backend/lpd.c:832 backend/socket.c:375 msgid "The printer may not exist or is unavailable at this time." msgstr "" @@ -4884,14 +4895,14 @@ msgstr "" msgid "The printer name may only contain up to 127 printable characters and may not contain spaces, slashes (/), or the pound sign (#)." msgstr "" -#: scheduler/ipp.c:876 scheduler/ipp.c:1136 scheduler/ipp.c:3296 -#: scheduler/ipp.c:3467 scheduler/ipp.c:5199 scheduler/ipp.c:5585 -#: scheduler/ipp.c:5899 scheduler/ipp.c:6457 scheduler/ipp.c:7222 -#: scheduler/ipp.c:7278 scheduler/ipp.c:7592 scheduler/ipp.c:7858 -#: scheduler/ipp.c:7947 scheduler/ipp.c:7980 scheduler/ipp.c:8303 -#: scheduler/ipp.c:8696 scheduler/ipp.c:8777 scheduler/ipp.c:9938 -#: scheduler/ipp.c:10392 scheduler/ipp.c:10722 scheduler/ipp.c:10804 -#: scheduler/ipp.c:11178 +#: scheduler/ipp.c:876 scheduler/ipp.c:1136 scheduler/ipp.c:3313 +#: scheduler/ipp.c:3484 scheduler/ipp.c:5216 scheduler/ipp.c:5602 +#: scheduler/ipp.c:5916 scheduler/ipp.c:6474 scheduler/ipp.c:7239 +#: scheduler/ipp.c:7295 scheduler/ipp.c:7609 scheduler/ipp.c:7875 +#: scheduler/ipp.c:7964 scheduler/ipp.c:7997 scheduler/ipp.c:8320 +#: scheduler/ipp.c:8713 scheduler/ipp.c:8794 scheduler/ipp.c:9961 +#: scheduler/ipp.c:10415 scheduler/ipp.c:10745 scheduler/ipp.c:10827 +#: scheduler/ipp.c:11201 msgid "The printer or class does not exist." msgstr "" @@ -4924,7 +4935,7 @@ msgstr "" msgid "The printer-uri \"%s\" contains invalid characters." msgstr "" -#: scheduler/ipp.c:3273 +#: scheduler/ipp.c:3290 msgid "The printer-uri attribute is required." msgstr "" @@ -4944,12 +4955,12 @@ msgstr "" msgid "The web interface is currently disabled. Run \"cupsctl WebInterface=yes\" to enable it." msgstr "" -#: scheduler/ipp.c:6552 +#: scheduler/ipp.c:6569 #, c-format msgid "The which-jobs value \"%s\" is not supported." msgstr "" -#: scheduler/ipp.c:5829 +#: scheduler/ipp.c:5846 msgid "There are too many subscriptions." msgstr "" @@ -4958,7 +4969,7 @@ msgid "There is a paper jam." msgstr "" #: backend/usb-darwin.c:379 backend/usb-darwin.c:438 backend/usb-darwin.c:505 -#: backend/usb-darwin.c:526 backend/usb-libusb.c:366 backend/usb-libusb.c:420 +#: backend/usb-darwin.c:526 backend/usb-libusb.c:384 backend/usb-libusb.c:438 msgid "There was an unrecoverable USB error." msgstr "" @@ -4975,7 +4986,7 @@ msgstr "" msgid "Too many job-sheets values (%d > 2)." msgstr "" -#: scheduler/ipp.c:2627 +#: scheduler/ipp.c:2644 #, c-format msgid "Too many printer-state-reasons values (%d > %d)." msgstr "" @@ -5004,7 +5015,7 @@ msgstr "" msgid "Tray 4" msgstr "" -#: cups/http-support.c:1315 +#: cups/http-support.c:1376 msgid "URI Too Long" msgstr "" @@ -5056,7 +5067,7 @@ msgstr "" msgid "Unable to add class" msgstr "" -#: backend/ipp.c:1676 +#: backend/ipp.c:1677 msgid "Unable to add document to print job." msgstr "" @@ -5085,7 +5096,7 @@ msgstr "" msgid "Unable to cancel RSS subscription" msgstr "" -#: backend/ipp.c:2041 +#: backend/ipp.c:2048 msgid "Unable to cancel print job." msgstr "" @@ -5109,7 +5120,7 @@ msgstr "" msgid "Unable to connect to host." msgstr "" -#: backend/ipp.c:728 backend/ipp.c:1165 backend/lpd.c:804 backend/socket.c:347 +#: backend/ipp.c:729 backend/ipp.c:1166 backend/lpd.c:804 backend/socket.c:347 #: backend/usb-unix.c:117 msgid "Unable to contact printer, queuing on next printer in class." msgstr "" @@ -5129,12 +5140,12 @@ msgstr "" msgid "Unable to copy CUPS printer driver files (%d)." msgstr "" -#: scheduler/ipp.c:2747 +#: scheduler/ipp.c:2764 #, c-format msgid "Unable to copy PPD file - %s" msgstr "" -#: scheduler/ipp.c:2802 +#: scheduler/ipp.c:2819 msgid "Unable to copy PPD file." msgstr "" @@ -5148,12 +5159,12 @@ msgstr "" msgid "Unable to copy Windows 9x printer driver files (%d)." msgstr "" -#: scheduler/ipp.c:2724 +#: scheduler/ipp.c:2741 #, c-format msgid "Unable to copy interface script - %s" msgstr "" -#: backend/ipp.c:2133 +#: backend/ipp.c:2137 msgid "Unable to create compressed print file" msgstr "" @@ -5181,35 +5192,35 @@ msgstr "" msgid "Unable to edit cupsd.conf files larger than 1MB" msgstr "" -#: cups/http.c:4259 +#: cups/http.c:4261 msgid "Unable to establish a secure connection to host (certificate chain invalid)." msgstr "" -#: cups/http.c:4249 +#: cups/http.c:4251 msgid "Unable to establish a secure connection to host (certificate not yet valid)." msgstr "" -#: cups/http.c:4244 +#: cups/http.c:4246 msgid "Unable to establish a secure connection to host (expired certificate)." msgstr "" -#: cups/http.c:4254 +#: cups/http.c:4256 msgid "Unable to establish a secure connection to host (host name mismatch)." msgstr "" -#: cups/http.c:4264 +#: cups/http.c:4266 msgid "Unable to establish a secure connection to host (peer dropped connection before responding)." msgstr "" -#: cups/http.c:4239 +#: cups/http.c:4241 msgid "Unable to establish a secure connection to host (self-signed certificate)." msgstr "" -#: cups/http.c:4234 +#: cups/http.c:4236 msgid "Unable to establish a secure connection to host (untrusted certificate)." msgstr "" -#: cups/http.c:3993 cups/http.c:4291 cups/http.c:4324 cups/http.c:4341 +#: cups/http.c:3995 cups/http.c:4293 cups/http.c:4326 cups/http.c:4343 msgid "Unable to establish a secure connection to host." msgstr "" @@ -5217,15 +5228,15 @@ msgstr "" msgid "Unable to find destination for job" msgstr "" -#: cups/http-support.c:1749 +#: cups/http-support.c:1810 msgid "Unable to find printer." msgstr "" -#: backend/ipp.c:2155 +#: backend/ipp.c:2159 msgid "Unable to generate compressed print file" msgstr "" -#: backend/ipp.c:3107 +#: backend/ipp.c:3122 msgid "Unable to get backend exit status." msgstr "" @@ -5253,7 +5264,7 @@ msgstr "" msgid "Unable to get printer status" msgstr "" -#: backend/ipp.c:948 +#: backend/ipp.c:949 msgid "Unable to get printer status." msgstr "" @@ -5271,12 +5282,12 @@ msgstr "" msgid "Unable to load help index." msgstr "" -#: backend/ipp.c:654 backend/lpd.c:435 backend/socket.c:286 +#: backend/ipp.c:655 backend/lpd.c:435 backend/socket.c:286 #, c-format msgid "Unable to locate printer \"%s\"." msgstr "" -#: backend/dnssd.c:781 backend/ipp.c:326 backend/lpd.c:205 +#: backend/dnssd.c:781 backend/ipp.c:327 backend/lpd.c:205 #: backend/socket.c:172 msgid "Unable to locate printer." msgstr "" @@ -5301,7 +5312,7 @@ msgstr "" msgid "Unable to open PPD file" msgstr "" -#: backend/ipp.c:2139 +#: backend/ipp.c:2143 msgid "Unable to open compressed print file" msgstr "" @@ -5313,7 +5324,7 @@ msgstr "" msgid "Unable to open device file" msgstr "" -#: scheduler/ipp.c:6238 +#: scheduler/ipp.c:6255 #, c-format msgid "Unable to open document #%d in job #%d." msgstr "" @@ -5322,7 +5333,7 @@ msgstr "" msgid "Unable to open help file." msgstr "" -#: backend/ipp.c:367 backend/ipp.c:1436 backend/ipp.c:1635 backend/ipp.c:2145 +#: backend/ipp.c:368 backend/ipp.c:1437 backend/ipp.c:1636 backend/ipp.c:2149 #: backend/lpd.c:505 backend/socket.c:159 backend/usb.c:237 #: filter/gziptoany.c:71 filter/pstops.c:300 msgid "Unable to open print file" @@ -5338,11 +5349,11 @@ msgid "Unable to print test page" msgstr "" #: backend/runloop.c:96 backend/runloop.c:325 backend/usb-darwin.c:613 -#: backend/usb-darwin.c:657 backend/usb-libusb.c:511 backend/usb-libusb.c:546 +#: backend/usb-darwin.c:657 backend/usb-libusb.c:529 backend/usb-libusb.c:564 msgid "Unable to read print data." msgstr "" -#: cups/dest.c:3406 +#: cups/dest.c:3389 msgid "Unable to resolve printer URI." msgstr "" @@ -5359,7 +5370,7 @@ msgstr "" msgid "Unable to send command to printer driver" msgstr "" -#: backend/usb-darwin.c:735 backend/usb-libusb.c:622 +#: backend/usb-darwin.c:735 backend/usb-libusb.c:640 msgid "Unable to send data to printer." msgstr "" @@ -5376,7 +5387,7 @@ msgstr "" msgid "Unable to set server default" msgstr "" -#: backend/ipp.c:2966 backend/ipp.c:3043 backend/ipp.c:3051 +#: backend/ipp.c:2981 backend/ipp.c:3058 backend/ipp.c:3066 msgid "Unable to start backend process." msgstr "" @@ -5397,7 +5408,7 @@ msgstr "" msgid "Unable to write uncompressed print data: %s" msgstr "" -#: cups/http-support.c:1303 +#: cups/http-support.c:1364 msgid "Unauthorized" msgstr "" @@ -5405,7 +5416,7 @@ msgstr "" msgid "Units" msgstr "" -#: cups/http-support.c:1343 cups/ppd.c:366 +#: cups/http-support.c:1404 cups/ppd.c:366 msgid "Unknown" msgstr "" @@ -5414,7 +5425,7 @@ msgstr "" msgid "Unknown choice \"%s\" for option \"%s\"." msgstr "" -#: backend/ipp.c:509 +#: backend/ipp.c:510 #, c-format msgid "Unknown encryption option value: \"%s\"." msgstr "" @@ -5433,7 +5444,7 @@ msgstr "" msgid "Unknown media size name." msgstr "" -#: backend/ipp.c:566 +#: backend/ipp.c:567 #, c-format msgid "Unknown option \"%s\" with value \"%s\"." msgstr "" @@ -5448,12 +5459,12 @@ msgstr "" msgid "Unknown print mode: \"%s\"." msgstr "" -#: scheduler/ipp.c:10594 +#: scheduler/ipp.c:10617 #, c-format msgid "Unknown printer-error-policy \"%s\"." msgstr "" -#: scheduler/ipp.c:10577 +#: scheduler/ipp.c:10600 #, c-format msgid "Unknown printer-op-policy \"%s\"." msgstr "" @@ -5462,22 +5473,22 @@ msgstr "" msgid "Unknown service name." msgstr "" -#: backend/ipp.c:538 +#: backend/ipp.c:539 #, c-format msgid "Unknown version option value: \"%s\"." msgstr "" -#: scheduler/ipp.c:11049 +#: scheduler/ipp.c:11072 #, c-format msgid "Unsupported 'compression' value \"%s\"." msgstr "" -#: scheduler/ipp.c:11079 +#: scheduler/ipp.c:11102 #, c-format msgid "Unsupported 'document-format' value \"%s\"." msgstr "" -#: scheduler/ipp.c:11154 +#: scheduler/ipp.c:11177 msgid "Unsupported 'job-name' value." msgstr "" @@ -5486,17 +5497,17 @@ msgstr "" msgid "Unsupported character set \"%s\"." msgstr "" -#: scheduler/ipp.c:8269 scheduler/ipp.c:9499 +#: scheduler/ipp.c:8286 scheduler/ipp.c:9522 #, c-format msgid "Unsupported compression \"%s\"." msgstr "" -#: scheduler/ipp.c:8403 scheduler/ipp.c:9649 +#: scheduler/ipp.c:8420 scheduler/ipp.c:9672 #, c-format msgid "Unsupported document-format \"%s\"." msgstr "" -#: scheduler/ipp.c:9632 +#: scheduler/ipp.c:9655 #, c-format msgid "Unsupported document-format \"%s/%s\"." msgstr "" @@ -5537,7 +5548,7 @@ msgstr "" msgid "Unsupported value type" msgstr "" -#: cups/http-support.c:1318 +#: cups/http-support.c:1379 msgid "Upgrade Required" msgstr "" @@ -5553,7 +5564,7 @@ msgid "" " [-u allow:user,user] [-u deny:user,user]" msgstr "" -#: backend/dnssd.c:241 backend/ipp.c:315 backend/lpd.c:192 +#: backend/dnssd.c:241 backend/ipp.c:316 backend/lpd.c:192 #: backend/socket.c:136 backend/usb.c:183 filter/commandtops.c:74 #: filter/gziptoany.c:50 filter/pstops.c:264 monitor/bcp.c:62 #: monitor/tbcp.c:61 @@ -5612,7 +5623,7 @@ msgid "" " lppasswd [-g groupname] -x [username]" msgstr "" -#: berkeley/lpq.c:674 +#: berkeley/lpq.c:675 msgid "Usage: lpq [-P dest] [-U username] [-h hostname[:port]] [-l] [+interval]" msgstr "" @@ -5652,11 +5663,11 @@ msgstr "" msgid "Version uses indefinite length" msgstr "" -#: backend/ipp.c:1773 +#: backend/ipp.c:1774 msgid "Waiting for job to complete." msgstr "" -#: backend/usb-darwin.c:457 backend/usb-libusb.c:318 +#: backend/usb-darwin.c:457 backend/usb-libusb.c:336 msgid "Waiting for printer to become available." msgstr "" @@ -5668,7 +5679,7 @@ msgstr "" msgid "Warning, no Windows 2000 printer drivers are installed." msgstr "" -#: cups/http-support.c:1339 +#: cups/http-support.c:1400 msgid "Web Interface is Disabled" msgstr "" @@ -5705,11 +5716,11 @@ msgstr "" msgid "completed" msgstr "" -#: scheduler/ipp.c:6110 +#: scheduler/ipp.c:6127 msgid "cups-deviced failed to execute." msgstr "" -#: scheduler/ipp.c:6940 scheduler/ipp.c:7189 +#: scheduler/ipp.c:6957 scheduler/ipp.c:7206 msgid "cups-driverd failed to execute." msgstr "" @@ -5798,12 +5809,12 @@ msgstr "" msgid "cupstestppd: The -v option is incompatible with the -q option." msgstr "" -#: systemv/lpstat.c:1231 systemv/lpstat.c:1234 systemv/lpstat.c:1237 +#: systemv/lpstat.c:1335 systemv/lpstat.c:1338 systemv/lpstat.c:1341 #, c-format msgid "device for %s/%s: %s" msgstr "" -#: systemv/lpstat.c:1218 systemv/lpstat.c:1221 systemv/lpstat.c:1224 +#: systemv/lpstat.c:1322 systemv/lpstat.c:1325 systemv/lpstat.c:1328 #, c-format msgid "device for %s: %s" msgstr "" @@ -5883,7 +5894,7 @@ msgstr "" msgid "ipptool: Unknown option \"-%c\"." msgstr "" -#: scheduler/ipp.c:7936 +#: scheduler/ipp.c:7953 msgid "job-printer-uri attribute missing." msgstr "" @@ -6171,34 +6182,34 @@ msgstr "" msgid "lppasswd: user \"%s\" and group \"%s\" do not exist." msgstr "" -#: systemv/lpstat.c:1039 +#: systemv/lpstat.c:1132 #, c-format msgid "lpstat: error - %s environment variable names non-existent destination \"%s\"." msgstr "" -#: systemv/lpstat.c:970 +#: systemv/lpstat.c:1068 #, c-format msgid "members of class %s:" msgstr "" -#: berkeley/lpq.c:586 +#: berkeley/lpq.c:587 msgid "no entries" msgstr "" -#: systemv/lpstat.c:1043 +#: systemv/lpstat.c:1136 msgid "no system default destination" msgstr "" -#: scheduler/ipp.c:5800 +#: scheduler/ipp.c:5817 msgid "notify-events not specified." msgstr "" -#: scheduler/ipp.c:2132 scheduler/ipp.c:5705 +#: scheduler/ipp.c:2132 scheduler/ipp.c:5722 #, c-format msgid "notify-recipient-uri URI \"%s\" is already used." msgstr "" -#: scheduler/ipp.c:2122 scheduler/ipp.c:5695 +#: scheduler/ipp.c:2122 scheduler/ipp.c:5712 #, c-format msgid "notify-recipient-uri URI \"%s\" uses unknown scheme." msgstr "" @@ -6680,32 +6691,32 @@ msgstr "" msgid "ppdmerge: Unable to backup %s to %s - %s" msgstr "" -#: systemv/lpstat.c:1784 +#: systemv/lpstat.c:1900 #, c-format msgid "printer %s disabled since %s -" msgstr "" -#: systemv/lpstat.c:1773 +#: systemv/lpstat.c:1889 #, c-format msgid "printer %s is idle. enabled since %s" msgstr "" -#: systemv/lpstat.c:1778 +#: systemv/lpstat.c:1894 #, c-format msgid "printer %s now printing %s-%d. enabled since %s" msgstr "" -#: systemv/lpstat.c:1909 +#: systemv/lpstat.c:2025 #, c-format msgid "printer %s/%s disabled since %s -" msgstr "" -#: systemv/lpstat.c:1895 +#: systemv/lpstat.c:2011 #, c-format msgid "printer %s/%s is idle. enabled since %s" msgstr "" -#: systemv/lpstat.c:1902 +#: systemv/lpstat.c:2018 #, c-format msgid "printer %s/%s now printing %s-%d. enabled since %s" msgstr "" @@ -6714,7 +6725,7 @@ msgstr "" msgid "processing" msgstr "" -#: systemv/lp.c:651 +#: systemv/lp.c:668 #, c-format msgid "request id is %s-%d (%d file(s))" msgstr "" @@ -6723,11 +6734,11 @@ msgstr "" msgid "request-id uses indefinite length" msgstr "" -#: systemv/lpstat.c:2048 +#: systemv/lpstat.c:2159 msgid "scheduler is not running" msgstr "" -#: systemv/lpstat.c:2044 +#: systemv/lpstat.c:2155 msgid "scheduler is running" msgstr "" @@ -6744,12 +6755,12 @@ msgstr "" msgid "stopped" msgstr "" -#: systemv/lpstat.c:1017 +#: systemv/lpstat.c:1110 #, c-format msgid "system default destination: %s" msgstr "" -#: systemv/lpstat.c:1014 +#: systemv/lpstat.c:1107 #, c-format msgid "system default destination: %s/%s" msgstr "" diff --git a/locale/cups.strings b/locale/cups.strings index 7ce8b5ac..c0ad8a54 100644 --- a/locale/cups.strings +++ b/locale/cups.strings @@ -261,6 +261,7 @@ "%s: %s failed: %s" = "%s: %s failed: %s"; "%s: Don't know what to do." = "%s: Don't know what to do."; "%s: Error - %s environment variable names non-existent destination \"%s\"." = "%s: Error - %s environment variable names non-existent destination \"%s\"."; +"%s: Error - add '/version=1.1' to server name." = "%s: Error - add '/version=1.1' to server name."; "%s: Error - bad job ID." = "%s: Error - bad job ID."; "%s: Error - cannot print files and alter jobs simultaneously." = "%s: Error - cannot print files and alter jobs simultaneously."; "%s: Error - cannot print from stdin if files or a job ID are provided." = "%s: Error - cannot print from stdin if files or a job ID are provided."; diff --git a/locale/cups_ca.po b/locale/cups_ca.po index 885d4345..5d99bd20 100644 --- a/locale/cups_ca.po +++ b/locale/cups_ca.po @@ -32,7 +32,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.4.6\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2013-03-08 13:25-0500\n" +"POT-Creation-Date: 2013-07-08 07:38-0400\n" "PO-Revision-Date: 2012-09-29 11:21+0200\n" "Last-Translator: Àngel Mompó <mecatxis@gmail.com>\n" "Language-Team: Catalan <ca@dodds.net>\n" @@ -1247,6 +1247,10 @@ msgstr "" "«%s»." #, c-format +msgid "%s: Error - add '/version=1.1' to server name." +msgstr "" + +#, c-format msgid "%s: Error - bad job ID." msgstr "%s: error - ID de la feina incorrecte." diff --git a/locale/cups_es.po b/locale/cups_es.po index 7167fa5a..b5e7b0ab 100644 --- a/locale/cups_es.po +++ b/locale/cups_es.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.6\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2013-03-08 13:25-0500\n" +"POT-Creation-Date: 2013-07-08 07:38-0400\n" "PO-Revision-Date: 2012-07-01 20:21+0100\n" "Last-Translator: Juan Pablo González Riopedre <riopedre13@yahoo.es>\n" "Language-Team: Spanish\n" @@ -1235,6 +1235,10 @@ msgstr "" "%s: Error - %s nombres de variables de entorno no existen en destino \"%s\"." #, c-format +msgid "%s: Error - add '/version=1.1' to server name." +msgstr "" + +#, c-format msgid "%s: Error - bad job ID." msgstr "%s: Error - ID de trabajo incorrecta." diff --git a/locale/cups_fr.po b/locale/cups_fr.po index ba461bf4..72412840 100644 --- a/locale/cups_fr.po +++ b/locale/cups_fr.po @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.6\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2013-03-08 13:25-0500\n" +"POT-Creation-Date: 2013-07-08 07:38-0400\n" "PO-Revision-Date: 2012-12-12 11:12+0100\n" "Last-Translator: denis meramdjougoma <dcmeram@libertysurf.fr>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1067,6 +1067,10 @@ msgid "" msgstr "" #, c-format +msgid "%s: Error - add '/version=1.1' to server name." +msgstr "" + +#, c-format msgid "%s: Error - bad job ID." msgstr "" diff --git a/locale/cups_ja.po b/locale/cups_ja.po index 70bbe642..9f6cef46 100644 --- a/locale/cups_ja.po +++ b/locale/cups_ja.po @@ -28,7 +28,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.6\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2013-03-08 13:25-0500\n" +"POT-Creation-Date: 2013-07-08 07:38-0400\n" "PO-Revision-Date: 2012-06-13 01:20+0900\n" "Last-Translator: OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n" "Language-Team: OPFC TRANSCUPS <opfc-transcups@sourceforge.jp>\n" @@ -1231,6 +1231,10 @@ msgid "" msgstr "%s: エラー - 環境変数 %s が存在しない宛先 \"%s\" を指しています。" #, c-format +msgid "%s: Error - add '/version=1.1' to server name." +msgstr "" + +#, c-format msgid "%s: Error - bad job ID." msgstr "%s: エラー - 不正なジョブ ID です。" diff --git a/locale/cups_ru.po b/locale/cups_ru.po index 24026beb..517c1a45 100644 --- a/locale/cups_ru.po +++ b/locale/cups_ru.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: CUPS 1.4\n" "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n" -"POT-Creation-Date: 2013-03-08 13:25-0500\n" +"POT-Creation-Date: 2013-07-08 07:38-0400\n" "PO-Revision-Date: 2009-02-16 12:00-0800\n" "Last-Translator: Apple Inc.\n" "Language-Team: Apple Inc.\n" @@ -1040,6 +1040,10 @@ msgid "" msgstr "" #, c-format +msgid "%s: Error - add '/version=1.1' to server name." +msgstr "" + +#, c-format msgid "%s: Error - bad job ID." msgstr "" diff --git a/locale/po2strings.c b/locale/po2strings.c index 7bb31f79..0b7d1f32 100644 --- a/locale/po2strings.c +++ b/locale/po2strings.c @@ -1,5 +1,5 @@ /* - * "$Id: po2strings.c 10378 2012-03-23 21:38:25Z mike $" + * "$Id: po2strings.c 6921 2007-09-06 13:38:37Z mike $" * * Convert a GNU gettext .po file to an Apple .strings file. * @@ -290,5 +290,5 @@ main(int argc, /* I - Number of command-line args */ /* - * End of "$Id: po2strings.c 10378 2012-03-23 21:38:25Z mike $". + * End of "$Id: po2strings.c 6921 2007-09-06 13:38:37Z mike $". */ diff --git a/locale/translate.c b/locale/translate.c index 2352ebe7..53f79991 100644 --- a/locale/translate.c +++ b/locale/translate.c @@ -1,5 +1,5 @@ /* - * "$Id: translate.c 9048 2010-03-24 08:07:15Z mike $" + * "$Id: translate.c 7922 2008-09-10 15:56:47Z mike $" * * HTTP-based translation program for CUPS. * @@ -435,5 +435,5 @@ write_string(cups_file_t *fp, /* I - File to write to */ /* - * End of "$Id: translate.c 9048 2010-03-24 08:07:15Z mike $". + * End of "$Id: translate.c 7922 2008-09-10 15:56:47Z mike $". */ diff --git a/man/Makefile b/man/Makefile index 572bb99b..f7930411 100644 --- a/man/Makefile +++ b/man/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 10710 2012-11-26 18:26:01Z mike $" +# "$Id: Makefile 7930 2008-09-10 22:25:54Z mike $" # # Man page makefile for CUPS. # @@ -237,5 +237,5 @@ mantohtml: mantohtml.o # -# End of "$Id: Makefile 10710 2012-11-26 18:26:01Z mike $". +# End of "$Id: Makefile 7930 2008-09-10 22:25:54Z mike $". # diff --git a/man/backend.man b/man/backend.man index c1f156e5..b97ab4ae 100644 --- a/man/backend.man +++ b/man/backend.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: backend.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: backend.man 7810 2008-07-29 01:11:15Z mike $" .\" .\" Backend man page for CUPS. .\" @@ -168,5 +168,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: backend.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: backend.man 7810 2008-07-29 01:11:15Z mike $". .\" diff --git a/man/cancel.man b/man/cancel.man index c3833ac2..5134d1fe 100644 --- a/man/cancel.man +++ b/man/cancel.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: cancel.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: cancel.man 7600 2008-05-20 21:06:23Z mike $" .\" .\" cancel man page for CUPS. .\" @@ -71,5 +71,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cancel.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: cancel.man 7600 2008-05-20 21:06:23Z mike $". .\" diff --git a/man/classes.conf.man b/man/classes.conf.man index 6d7eebbb..8149d153 100644 --- a/man/classes.conf.man +++ b/man/classes.conf.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: classes.conf.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: classes.conf.man 7600 2008-05-20 21:06:23Z mike $" .\" .\" classes.conf man page for CUPS. .\" @@ -106,5 +106,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: classes.conf.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: classes.conf.man 7600 2008-05-20 21:06:23Z mike $". .\" diff --git a/man/client.conf.man.in b/man/client.conf.man.in index d1da5d66..14eecb0e 100644 --- a/man/client.conf.man.in +++ b/man/client.conf.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: client.conf.man.in 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: client.conf.man.in 6649 2007-07-11 21:46:42Z mike $" .\" .\" client.conf man page for CUPS. .\" @@ -12,7 +12,7 @@ .\" which should have been included with this file. If this file is .\" file is missing or damaged, see the license at "http://www.cups.org/". .\" -.TH client.conf 5 "CUPS" "23 April 2012" "Apple Inc." +.TH client.conf 5 "CUPS" "25 June 2013" "Apple Inc." .SH NAME client.conf \- client configuration file for cups .SH DESCRIPTION @@ -47,6 +47,12 @@ ServerName /domain/socket Specifies the address and optionally the port to use when connecting to the server. \fBNote: Not supported on OS X 10.7 or later.\fR .TP 5 +ServerName hostname-or-ip-address[:port]/version=1.1 +.br +Specifies the address and optionally the port to use when connecting to a +server running CUPS 1.3.12 and earlier. \fBNote: Not supported on OS X 10.7 or +later.\fR +.TP 5 User name .br Specifies the default user name to use for requests. @@ -55,5 +61,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: client.conf.man.in 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: client.conf.man.in 6649 2007-07-11 21:46:42Z mike $". .\" diff --git a/man/cups-config.man b/man/cups-config.man index 3c75f732..c13e9357 100644 --- a/man/cups-config.man +++ b/man/cups-config.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: cups-config.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: cups-config.man 7646 2008-06-16 17:26:20Z mike $" .\" .\" cups-config man page for CUPS. .\" @@ -113,5 +113,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cups-config.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: cups-config.man 7646 2008-06-16 17:26:20Z mike $". .\" diff --git a/man/cups-deviced.man.in b/man/cups-deviced.man.in index 209380e4..ab9a871a 100644 --- a/man/cups-deviced.man.in +++ b/man/cups-deviced.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: cups-deviced.man.in 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: cups-deviced.man.in 7646 2008-06-16 17:26:20Z mike $" .\" .\" cups-deviced man page for CUPS. .\" @@ -40,5 +40,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cups-deviced.man.in 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: cups-deviced.man.in 7646 2008-06-16 17:26:20Z mike $". .\" diff --git a/man/cups-driverd.man.in b/man/cups-driverd.man.in index a2ebe445..3f015a43 100644 --- a/man/cups-driverd.man.in +++ b/man/cups-driverd.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: cups-driverd.man.in 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: cups-driverd.man.in 7662 2008-06-17 14:34:20Z mike $" .\" .\" cups-driverd man page for CUPS. .\" @@ -118,5 +118,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cups-driverd.man.in 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: cups-driverd.man.in 7662 2008-06-17 14:34:20Z mike $". .\" diff --git a/man/cups-files.conf.man.in b/man/cups-files.conf.man.in index d7658034..4d34e169 100644 --- a/man/cups-files.conf.man.in +++ b/man/cups-files.conf.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: cups-files.conf.man.in 10818 2013-01-16 17:41:27Z mike $" +.\" "$Id: cups-files.conf.man.in 4185 2013-02-20 02:19:13Z msweet $" .\" .\" cupsd.conf man page for CUPS. .\" @@ -142,5 +142,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cups-files.conf.man.in 10818 2013-01-16 17:41:27Z mike $". +.\" End of "$Id: cups-files.conf.man.in 4185 2013-02-20 02:19:13Z msweet $". .\" diff --git a/man/cups-lpd.man.in b/man/cups-lpd.man.in index 103b7295..4289962b 100644 --- a/man/cups-lpd.man.in +++ b/man/cups-lpd.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: cups-lpd.man.in 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: cups-lpd.man.in 7835 2008-08-09 06:37:04Z mike $" .\" .\" cups-lpd man page for CUPS. .\" @@ -120,5 +120,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cups-lpd.man.in 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: cups-lpd.man.in 7835 2008-08-09 06:37:04Z mike $". .\" diff --git a/man/cups-snmp.conf.man b/man/cups-snmp.conf.man index e1d13ac6..608a2b5b 100644 --- a/man/cups-snmp.conf.man +++ b/man/cups-snmp.conf.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: cups-snmp.conf.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: cups-snmp.conf.man 7600 2008-05-20 21:06:23Z mike $" .\" .\" snmp.conf man page for CUPS. .\" @@ -74,5 +74,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cups-snmp.conf.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: cups-snmp.conf.man 7600 2008-05-20 21:06:23Z mike $". .\" diff --git a/man/cups-snmp.man.in b/man/cups-snmp.man.in index c8f8d091..cbe3bb13 100644 --- a/man/cups-snmp.man.in +++ b/man/cups-snmp.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: cups-snmp.man.in 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: cups-snmp.man.in 4185 2013-02-20 02:19:13Z msweet $" .\" .\" SNMP backend man page for CUPS. .\" @@ -55,5 +55,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cups-snmp.man.in 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: cups-snmp.man.in 4185 2013-02-20 02:19:13Z msweet $". .\" diff --git a/man/cupsaccept.man b/man/cupsaccept.man index 6ee5cc31..0c8ba03b 100644 --- a/man/cupsaccept.man +++ b/man/cupsaccept.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: cupsaccept.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: cupsaccept.man 7930 2008-09-10 22:25:54Z mike $" .\" .\" accept/reject man page for CUPS. .\" @@ -75,5 +75,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cupsaccept.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: cupsaccept.man 7930 2008-09-10 22:25:54Z mike $". .\" diff --git a/man/cupsaddsmb.man.in b/man/cupsaddsmb.man.in index eac6c676..75598ab6 100644 --- a/man/cupsaddsmb.man.in +++ b/man/cupsaddsmb.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: cupsaddsmb.man.in 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: cupsaddsmb.man.in 7600 2008-05-20 21:06:23Z mike $" .\" .\" cupsaddsmb man page for CUPS. .\" @@ -210,5 +210,5 @@ http://www.cups.org/windows/ .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cupsaddsmb.man.in 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: cupsaddsmb.man.in 7600 2008-05-20 21:06:23Z mike $". .\" diff --git a/man/cupsctl.man b/man/cupsctl.man index 33bb7b6b..8dc01b07 100644 --- a/man/cupsctl.man +++ b/man/cupsctl.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: cupsctl.man 10807 2013-01-11 21:50:12Z mike $" +.\" "$Id: cupsctl.man 7600 2008-05-20 21:06:23Z mike $" .\" .\" cupsctl man page for CUPS. .\" @@ -93,5 +93,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cupsctl.man 10807 2013-01-11 21:50:12Z mike $". +.\" End of "$Id: cupsctl.man 7600 2008-05-20 21:06:23Z mike $". .\" diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in index 43ab8b79..a29d36c1 100644 --- a/man/cupsd.conf.man.in +++ b/man/cupsd.conf.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: cupsd.conf.man.in 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: cupsd.conf.man.in 7935 2008-09-11 01:54:11Z mike $" .\" .\" cupsd.conf man page for CUPS. .\" @@ -521,5 +521,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cupsd.conf.man.in 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: cupsd.conf.man.in 7935 2008-09-11 01:54:11Z mike $". .\" diff --git a/man/cupsd.man.in b/man/cupsd.man.in index 4d1edb18..3ab21e72 100644 --- a/man/cupsd.man.in +++ b/man/cupsd.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: cupsd.man.in 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: cupsd.man.in 7600 2008-05-20 21:06:23Z mike $" .\" .\" cupsd man page for CUPS. .\" @@ -68,5 +68,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cupsd.man.in 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: cupsd.man.in 7600 2008-05-20 21:06:23Z mike $". .\" diff --git a/man/cupsenable.man b/man/cupsenable.man index 8e774119..482a1e32 100644 --- a/man/cupsenable.man +++ b/man/cupsenable.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: cupsenable.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: cupsenable.man 7600 2008-05-20 21:06:23Z mike $" .\" .\" cupsenable/cupsdisable man page for CUPS. .\" @@ -89,5 +89,5 @@ http://localhost:631/help Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cupsenable.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: cupsenable.man 7600 2008-05-20 21:06:23Z mike $". .\" diff --git a/man/cupsfilter.man b/man/cupsfilter.man index c8ae719f..5a67e4da 100644 --- a/man/cupsfilter.man +++ b/man/cupsfilter.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: cupsfilter.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: cupsfilter.man 7936 2008-09-11 03:12:59Z mike $" .\" .\" cupsfilter man page for CUPS. .\" @@ -105,5 +105,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cupsfilter.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: cupsfilter.man 7936 2008-09-11 03:12:59Z mike $". .\" diff --git a/man/cupstestdsc.man b/man/cupstestdsc.man index 27cd9134..ec08797a 100644 --- a/man/cupstestdsc.man +++ b/man/cupstestdsc.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: cupstestdsc.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: cupstestdsc.man 7600 2008-05-20 21:06:23Z mike $" .\" .\" cupstestdsc man page for CUPS. .\" @@ -46,5 +46,5 @@ Specification, Version 3.0. .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cupstestdsc.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: cupstestdsc.man 7600 2008-05-20 21:06:23Z mike $". .\" diff --git a/man/cupstestppd.man b/man/cupstestppd.man index 56913935..2d66116f 100644 --- a/man/cupstestppd.man +++ b/man/cupstestppd.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: cupstestppd.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: cupstestppd.man 7600 2008-05-20 21:06:23Z mike $" .\" .\" cupstestppd man page for CUPS. .\" @@ -161,5 +161,5 @@ Adobe PostScript Printer Description File Format Specification, Version 4.3. .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: cupstestppd.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: cupstestppd.man 7600 2008-05-20 21:06:23Z mike $". .\" diff --git a/man/filter.man b/man/filter.man index 99550537..9a79dbd2 100644 --- a/man/filter.man +++ b/man/filter.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: filter.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: filter.man 7600 2008-05-20 21:06:23Z mike $" .\" .\" filter man page for CUPS. .\" @@ -234,5 +234,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: filter.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: filter.man 7600 2008-05-20 21:06:23Z mike $". .\" diff --git a/man/ipptool.man b/man/ipptool.man index d7ae869b..16b12764 100644 --- a/man/ipptool.man +++ b/man/ipptool.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: ipptool.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id$" .\" .\" ipptool man page for CUPS. .\" @@ -139,5 +139,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: ipptool.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id$". .\" diff --git a/man/ipptoolfile.man b/man/ipptoolfile.man index e03ef929..a82e7396 100644 --- a/man/ipptoolfile.man +++ b/man/ipptoolfile.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: ipptoolfile.man 10789 2013-01-10 16:51:10Z mike $" +.\" "$Id$" .\" .\" ipptoolfile man page for CUPS. .\" @@ -570,5 +570,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: ipptoolfile.man 10789 2013-01-10 16:51:10Z mike $". +.\" End of "$Id$". .\" @@ -1,5 +1,5 @@ .\" -.\" "$Id: lp.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: lp.man 7889 2008-08-29 22:03:35Z mike $" .\" .\" lp man page for CUPS. .\" @@ -248,5 +248,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: lp.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: lp.man 7889 2008-08-29 22:03:35Z mike $". .\" diff --git a/man/lpadmin.man b/man/lpadmin.man index 3a8d3966..0ec81b01 100644 --- a/man/lpadmin.man +++ b/man/lpadmin.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lpadmin.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: lpadmin.man 7600 2008-05-20 21:06:23Z mike $" .\" .\" lpadmin man page for CUPS. .\" @@ -223,5 +223,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: lpadmin.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: lpadmin.man 7600 2008-05-20 21:06:23Z mike $". .\" diff --git a/man/lpc.man b/man/lpc.man index d60bc6c3..8d5245c6 100644 --- a/man/lpc.man +++ b/man/lpc.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lpc.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: lpc.man 7600 2008-05-20 21:06:23Z mike $" .\" .\" lpc man page for CUPS. .\" @@ -67,5 +67,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: lpc.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: lpc.man 7600 2008-05-20 21:06:23Z mike $". .\" diff --git a/man/lpinfo.man b/man/lpinfo.man index 08aa5af2..e45a7f35 100644 --- a/man/lpinfo.man +++ b/man/lpinfo.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lpinfo.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: lpinfo.man 7600 2008-05-20 21:06:23Z mike $" .\" .\" lpinfo man page for CUPS. .\" @@ -111,5 +111,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: lpinfo.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: lpinfo.man 7600 2008-05-20 21:06:23Z mike $". .\" diff --git a/man/lpmove.man b/man/lpmove.man index 3507c416..23ea0987 100644 --- a/man/lpmove.man +++ b/man/lpmove.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lpmove.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: lpmove.man 7600 2008-05-20 21:06:23Z mike $" .\" .\" lpmove man page for CUPS. .\" @@ -62,5 +62,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: lpmove.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: lpmove.man 7600 2008-05-20 21:06:23Z mike $". .\" diff --git a/man/lpoptions.man.in b/man/lpoptions.man.in index 6de7db91..6007071c 100644 --- a/man/lpoptions.man.in +++ b/man/lpoptions.man.in @@ -1,5 +1,5 @@ .\" -.\" "$Id: lpoptions.man.in 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: lpoptions.man.in 7889 2008-08-29 22:03:35Z mike $" .\" .\" lpoptions man page for CUPS. .\" @@ -131,5 +131,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: lpoptions.man.in 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: lpoptions.man.in 7889 2008-08-29 22:03:35Z mike $". .\" diff --git a/man/lppasswd.man b/man/lppasswd.man index 81d8b0fa..1edb0d8b 100644 --- a/man/lppasswd.man +++ b/man/lppasswd.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lppasswd.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: lppasswd.man 7600 2008-05-20 21:06:23Z mike $" .\" .\" lpadmin man page for CUPS. .\" @@ -64,5 +64,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: lppasswd.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: lppasswd.man 7600 2008-05-20 21:06:23Z mike $". .\" diff --git a/man/lpq.man b/man/lpq.man index 561537af..97630e91 100644 --- a/man/lpq.man +++ b/man/lpq.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lpq.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: lpq.man 7646 2008-06-16 17:26:20Z mike $" .\" .\" lpq man page for CUPS. .\" @@ -68,5 +68,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: lpq.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: lpq.man 7646 2008-06-16 17:26:20Z mike $". .\" diff --git a/man/lpr.man b/man/lpr.man index 4e35c401..c6392c77 100644 --- a/man/lpr.man +++ b/man/lpr.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lpr.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: lpr.man 7889 2008-08-29 22:03:35Z mike $" .\" .\" lpr man page for CUPS. .\" @@ -118,5 +118,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: lpr.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: lpr.man 7889 2008-08-29 22:03:35Z mike $". .\" diff --git a/man/lprm.man b/man/lprm.man index 76661217..3d3f30f2 100644 --- a/man/lprm.man +++ b/man/lprm.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lprm.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: lprm.man 7600 2008-05-20 21:06:23Z mike $" .\" .\" lprm man page for CUPS. .\" @@ -61,5 +61,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: lprm.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: lprm.man 7600 2008-05-20 21:06:23Z mike $". .\" diff --git a/man/lpstat.man b/man/lpstat.man index 047fdfde..37c39d76 100644 --- a/man/lpstat.man +++ b/man/lpstat.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: lpstat.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: lpstat.man 7921 2008-09-10 15:42:24Z mike $" .\" .\" lpstat man page for CUPS. .\" @@ -139,5 +139,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: lpstat.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: lpstat.man 7921 2008-09-10 15:42:24Z mike $". .\" diff --git a/man/mailto.conf.man b/man/mailto.conf.man index d8bd046f..aa603868 100644 --- a/man/mailto.conf.man +++ b/man/mailto.conf.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: mailto.conf.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: mailto.conf.man 7600 2008-05-20 21:06:23Z mike $" .\" .\" mailto.conf man page for CUPS. .\" @@ -56,5 +56,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: mailto.conf.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: mailto.conf.man 7600 2008-05-20 21:06:23Z mike $". .\" diff --git a/man/mantohtml.c b/man/mantohtml.c index d9b0acb4..3c18e82a 100644 --- a/man/mantohtml.c +++ b/man/mantohtml.c @@ -1,5 +1,5 @@ /* - * "$Id: mantohtml.c 9226 2010-08-06 12:15:50Z mike $" + * "$Id: mantohtml.c 7720 2008-07-11 22:46:21Z mike $" * * Man page to HTML conversion program. * @@ -716,5 +716,5 @@ strmove(char *d, /* I - Destination */ /* - * End of "$Id: mantohtml.c 9226 2010-08-06 12:15:50Z mike $". + * End of "$Id: mantohtml.c 7720 2008-07-11 22:46:21Z mike $". */ diff --git a/man/mime.convs.man b/man/mime.convs.man index 0461498e..311353a6 100644 --- a/man/mime.convs.man +++ b/man/mime.convs.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: mime.convs.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: mime.convs.man 7600 2008-05-20 21:06:23Z mike $" .\" .\" mime.convs man page for CUPS. .\" @@ -42,5 +42,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: mime.convs.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: mime.convs.man 7600 2008-05-20 21:06:23Z mike $". .\" diff --git a/man/mime.types.man b/man/mime.types.man index 3e35698c..bf1dd9b7 100644 --- a/man/mime.types.man +++ b/man/mime.types.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: mime.types.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: mime.types.man 7670 2008-06-17 22:42:08Z mike $" .\" .\" mime.types man page for CUPS. .\" @@ -111,5 +111,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: mime.types.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: mime.types.man 7670 2008-06-17 22:42:08Z mike $". .\" diff --git a/man/notifier.man b/man/notifier.man index 1db0da94..41128786 100644 --- a/man/notifier.man +++ b/man/notifier.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: notifier.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id$" .\" .\" notifier man page for CUPS. .\" @@ -153,5 +153,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: notifier.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id$". .\" diff --git a/man/ppdc.man b/man/ppdc.man index 5436f94f..933e7d11 100644 --- a/man/ppdc.man +++ b/man/ppdc.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: ppdc.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: ppdc.man 7600 2008-05-20 21:06:23Z mike $" .\" .\" ppdc man page for CUPS. .\" @@ -77,5 +77,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: ppdc.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: ppdc.man 7600 2008-05-20 21:06:23Z mike $". .\" diff --git a/man/ppdcfile.man b/man/ppdcfile.man index 57e5d08e..a7a56a8d 100644 --- a/man/ppdcfile.man +++ b/man/ppdcfile.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: ppdcfile.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: ppdcfile.man 7607 2008-05-21 01:06:23Z mike $" .\" .\" ppdcfile man page for CUPS. .\" @@ -166,5 +166,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: ppdcfile.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: ppdcfile.man 7607 2008-05-21 01:06:23Z mike $". .\" diff --git a/man/ppdhtml.man b/man/ppdhtml.man index fe869742..78df7d39 100644 --- a/man/ppdhtml.man +++ b/man/ppdhtml.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: ppdhtml.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: ppdhtml.man 7600 2008-05-20 21:06:23Z mike $" .\" .\" ppdhtml man page for CUPS. .\" @@ -42,5 +42,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: ppdhtml.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: ppdhtml.man 7600 2008-05-20 21:06:23Z mike $". .\" diff --git a/man/ppdi.man b/man/ppdi.man index 65cf2ad1..38658e02 100644 --- a/man/ppdi.man +++ b/man/ppdi.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: ppdi.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: ppdi.man 7600 2008-05-20 21:06:23Z mike $" .\" .\" ppdi man page for CUPS. .\" @@ -42,5 +42,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: ppdi.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: ppdi.man 7600 2008-05-20 21:06:23Z mike $". .\" diff --git a/man/ppdmerge.man b/man/ppdmerge.man index 9df39a90..397314ec 100644 --- a/man/ppdmerge.man +++ b/man/ppdmerge.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: ppdmerge.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: ppdmerge.man 7600 2008-05-20 21:06:23Z mike $" .\" .\" ppdmerge man page for CUPS. .\" @@ -43,5 +43,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: ppdmerge.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: ppdmerge.man 7600 2008-05-20 21:06:23Z mike $". .\" diff --git a/man/ppdpo.man b/man/ppdpo.man index 9b544a56..c6378bc4 100644 --- a/man/ppdpo.man +++ b/man/ppdpo.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: ppdpo.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: ppdpo.man 7600 2008-05-20 21:06:23Z mike $" .\" .\" ppdpo man page for CUPS. .\" @@ -48,5 +48,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: ppdpo.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: ppdpo.man 7600 2008-05-20 21:06:23Z mike $". .\" diff --git a/man/printers.conf.man b/man/printers.conf.man index 82b9a787..6d8609fc 100644 --- a/man/printers.conf.man +++ b/man/printers.conf.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: printers.conf.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: printers.conf.man 7600 2008-05-20 21:06:23Z mike $" .\" .\" printers.conf man page for CUPS. .\" @@ -120,5 +120,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: printers.conf.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: printers.conf.man 7600 2008-05-20 21:06:23Z mike $". .\" diff --git a/man/subscriptions.conf.man b/man/subscriptions.conf.man index 68e1d70f..5531c6a5 100644 --- a/man/subscriptions.conf.man +++ b/man/subscriptions.conf.man @@ -1,5 +1,5 @@ .\" -.\" "$Id: subscriptions.conf.man 10791 2013-01-10 16:58:21Z mike $" +.\" "$Id: subscriptions.conf.man 7600 2008-05-20 21:06:23Z mike $" .\" .\" subscriptions.conf man page for CUPS. .\" @@ -85,5 +85,5 @@ http://localhost:631/help .SH COPYRIGHT Copyright 2007-2013 by Apple Inc. .\" -.\" End of "$Id: subscriptions.conf.man 10791 2013-01-10 16:58:21Z mike $". +.\" End of "$Id: subscriptions.conf.man 7600 2008-05-20 21:06:23Z mike $". .\" diff --git a/monitor/Makefile b/monitor/Makefile index 4c0392da..7e42112a 100644 --- a/monitor/Makefile +++ b/monitor/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 10191 2012-01-20 19:00:32Z mike $" +# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $" # # Port monitor makefile for CUPS. # @@ -142,5 +142,5 @@ include Dependencies # -# End of "$Id: Makefile 10191 2012-01-20 19:00:32Z mike $". +# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $". # diff --git a/monitor/bcp.c b/monitor/bcp.c index e70c7314..ffd32d57 100644 --- a/monitor/bcp.c +++ b/monitor/bcp.c @@ -1,5 +1,5 @@ /* - * "$Id: bcp.c 9900 2011-08-17 20:59:46Z mike $" + * "$Id: bcp.c 6800 2007-08-16 18:28:44Z mike $" * * TBCP port monitor for CUPS. * @@ -288,5 +288,5 @@ pswrite(const char *buf, /* I - Buffer to write */ /* - * End of "$Id: bcp.c 9900 2011-08-17 20:59:46Z mike $". + * End of "$Id: bcp.c 6800 2007-08-16 18:28:44Z mike $". */ diff --git a/monitor/tbcp.c b/monitor/tbcp.c index 481121dd..4170d493 100644 --- a/monitor/tbcp.c +++ b/monitor/tbcp.c @@ -1,5 +1,5 @@ /* - * "$Id: tbcp.c 9384 2010-11-22 07:06:39Z mike $" + * "$Id: tbcp.c 6800 2007-08-16 18:28:44Z mike $" * * TBCP port monitor for CUPS. * @@ -281,5 +281,5 @@ pswrite(const char *buf, /* I - Buffer to write */ /* - * End of "$Id: tbcp.c 9384 2010-11-22 07:06:39Z mike $". + * End of "$Id: tbcp.c 6800 2007-08-16 18:28:44Z mike $". */ diff --git a/notifier/Makefile b/notifier/Makefile index 64aa5756..5587c208 100644 --- a/notifier/Makefile +++ b/notifier/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 10191 2012-01-20 19:00:32Z mike $" +# "$Id: Makefile 7920 2008-09-10 01:04:10Z mike $" # # Notifier makefile for CUPS. # @@ -158,5 +158,5 @@ include Dependencies # -# End of "$Id: Makefile 10191 2012-01-20 19:00:32Z mike $". +# End of "$Id: Makefile 7920 2008-09-10 01:04:10Z mike $". # diff --git a/notifier/dbus.c b/notifier/dbus.c index 597a218b..baf4f99a 100644 --- a/notifier/dbus.c +++ b/notifier/dbus.c @@ -1,5 +1,5 @@ /* - * "$Id: dbus.c 10191 2012-01-20 19:00:32Z mike $" + * "$Id: dbus.c 3643 2012-02-13 16:35:48Z msweet $" * * D-Bus notifier for CUPS. * @@ -623,5 +623,5 @@ main(void) /* - * End of "$Id: dbus.c 10191 2012-01-20 19:00:32Z mike $". + * End of "$Id: dbus.c 3643 2012-02-13 16:35:48Z msweet $". */ diff --git a/notifier/mailto.c b/notifier/mailto.c index aaca9184..da2db951 100644 --- a/notifier/mailto.c +++ b/notifier/mailto.c @@ -1,5 +1,5 @@ /* - * "$Id: mailto.c 10097 2011-11-02 05:35:38Z mike $" + * "$Id: mailto.c 7460 2008-04-16 02:19:54Z mike $" * * "mailto" notifier for CUPS. * @@ -642,5 +642,5 @@ print_attributes(ipp_t *ipp, /* I - IPP request */ /* - * End of "$Id: mailto.c 10097 2011-11-02 05:35:38Z mike $". + * End of "$Id: mailto.c 7460 2008-04-16 02:19:54Z mike $". */ diff --git a/notifier/rss.c b/notifier/rss.c index ac42aa3c..deee6b5b 100644 --- a/notifier/rss.c +++ b/notifier/rss.c @@ -1,5 +1,5 @@ /* - * "$Id: rss.c 10378 2012-03-23 21:38:25Z mike $" + * "$Id: rss.c 7824 2008-08-01 21:11:55Z mike $" * * RSS notifier for CUPS. * @@ -737,5 +737,5 @@ xml_escape(const char *s) /* I - String to escape */ /* - * End of "$Id: rss.c 10378 2012-03-23 21:38:25Z mike $". + * End of "$Id: rss.c 7824 2008-08-01 21:11:55Z mike $". */ diff --git a/notifier/testnotify.c b/notifier/testnotify.c index 880b51d9..faa846d0 100644 --- a/notifier/testnotify.c +++ b/notifier/testnotify.c @@ -1,5 +1,5 @@ /* - * "$Id: testnotify.c 10097 2011-11-02 05:35:38Z mike $" + * "$Id: testnotify.c 6649 2007-07-11 21:46:42Z mike $" * * Test notifier for CUPS. * @@ -123,5 +123,5 @@ print_attributes(ipp_t *ipp, /* I - IPP request */ /* - * End of "$Id: testnotify.c 10097 2011-11-02 05:35:38Z mike $". + * End of "$Id: testnotify.c 6649 2007-07-11 21:46:42Z mike $". */ diff --git a/packaging/cups.list.in b/packaging/cups.list.in index 9ff8dc49..0c4ba904 100644 --- a/packaging/cups.list.in +++ b/packaging/cups.list.in @@ -1,5 +1,5 @@ # -# "$Id: cups.list.in 10710 2012-11-26 18:26:01Z mike $" +# "$Id: cups.list.in 7930 2008-09-10 22:25:54Z mike $" # # ESP Package Manager (EPM) file list for CUPS. # @@ -736,5 +736,5 @@ f 0444 root sys $XINETD/cups-lpd scheduler/cups-lpd.xinetd %subpackage # -# End of "$Id: cups.list.in 10710 2012-11-26 18:26:01Z mike $". +# End of "$Id: cups.list.in 7930 2008-09-10 22:25:54Z mike $". # diff --git a/packaging/cups.spec b/packaging/cups.spec index 42f930bb..4a13fe92 100644 --- a/packaging/cups.spec +++ b/packaging/cups.spec @@ -1,5 +1,5 @@ # -# "$Id: cups.spec.in 10913 2013-03-18 17:00:03Z mike $" +# "$Id: cups.spec.in 7718 2008-07-10 23:04:22Z mike $" # # RPM "spec" file for CUPS. # @@ -35,12 +35,12 @@ Summary: CUPS Name: cups -Version: 1.6.2 +Version: 1.6.3 Release: 1 Epoch: 1 License: GPL Group: System Environment/Daemons -Source: http://ftp.easysw.com/pub/cups/1.6.2/cups-1.6.2-source.tar.bz2 +Source: http://www.cups.org/software/1.6.3/cups-1.6.3-source.tar.bz2 Url: http://www.cups.org Packager: Anonymous <anonymous@foo.com> Vendor: Apple Inc. @@ -361,5 +361,5 @@ rm -rf $RPM_BUILD_ROOT # -# End of "$Id: cups.spec.in 10913 2013-03-18 17:00:03Z mike $". +# End of "$Id: cups.spec.in 7718 2008-07-10 23:04:22Z mike $". # diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in index 45b45317..3f9cc787 100644 --- a/packaging/cups.spec.in +++ b/packaging/cups.spec.in @@ -1,5 +1,5 @@ # -# "$Id: cups.spec.in 10913 2013-03-18 17:00:03Z mike $" +# "$Id: cups.spec.in 7718 2008-07-10 23:04:22Z mike $" # # RPM "spec" file for CUPS. # @@ -361,5 +361,5 @@ rm -rf $RPM_BUILD_ROOT # -# End of "$Id: cups.spec.in 10913 2013-03-18 17:00:03Z mike $". +# End of "$Id: cups.spec.in 7718 2008-07-10 23:04:22Z mike $". # diff --git a/ppdc/Makefile b/ppdc/Makefile index 1c1ce2aa..8d8668ed 100644 --- a/ppdc/Makefile +++ b/ppdc/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 10191 2012-01-20 19:00:32Z mike $" +# "$Id: Makefile 3643 2012-02-13 16:35:48Z msweet $" # # Makefile for the CUPS PPD Compiler. # @@ -400,5 +400,5 @@ include Dependencies # -# End of "$Id: Makefile 10191 2012-01-20 19:00:32Z mike $". +# End of "$Id: Makefile 3643 2012-02-13 16:35:48Z msweet $". # diff --git a/ppdc/foo.drv b/ppdc/foo.drv index 8eb3b124..36599058 100644 --- a/ppdc/foo.drv +++ b/ppdc/foo.drv @@ -1,5 +1,5 @@ // -// "$Id: foo.drv 361 2007-10-01 20:03:46Z mike $" +// "$Id: foo.drv 3247 2011-05-12 06:22:31Z msweet $" // // PPD file compiler test data file for CUPS. // @@ -543,5 +543,5 @@ Attribute cupsIPPReason "com.foo-serious-error/A Serious Error" "http://foo.com/ // -// End of "$Id: foo.drv 361 2007-10-01 20:03:46Z mike $". +// End of "$Id: foo.drv 3247 2011-05-12 06:22:31Z msweet $". // diff --git a/ppdc/genstrings.cxx b/ppdc/genstrings.cxx index 616e3b17..dee4b558 100644 --- a/ppdc/genstrings.cxx +++ b/ppdc/genstrings.cxx @@ -1,5 +1,5 @@ // -// "$Id: genstrings.cxx 9793 2011-05-20 03:49:49Z mike $" +// "$Id: genstrings.cxx 3275 2011-05-20 07:26:13Z msweet $" // // GNU gettext message generator for the CUPS PPD Compiler. // @@ -211,5 +211,5 @@ write_cstring(const char *s) /* I - String to write */ // -// End of "$Id: genstrings.cxx 9793 2011-05-20 03:49:49Z mike $". +// End of "$Id: genstrings.cxx 3275 2011-05-20 07:26:13Z msweet $". // diff --git a/ppdc/ppdc-array.cxx b/ppdc/ppdc-array.cxx index b5060c03..fcef51b2 100644 --- a/ppdc/ppdc-array.cxx +++ b/ppdc/ppdc-array.cxx @@ -1,5 +1,5 @@ // -// "$Id: ppdc-array.cxx 8484 2009-04-03 17:35:17Z mike $" +// "$Id: ppdc-array.cxx 1378 2009-04-08 03:17:45Z msweet $" // // Array class for the CUPS PPD Compiler. // @@ -164,5 +164,5 @@ ppdcArray::remove(ppdcShared *d) // I - Data element // -// End of "$Id: ppdc-array.cxx 8484 2009-04-03 17:35:17Z mike $". +// End of "$Id: ppdc-array.cxx 1378 2009-04-08 03:17:45Z msweet $". // diff --git a/ppdc/ppdc-attr.cxx b/ppdc/ppdc-attr.cxx index 64b2a599..4570f106 100644 --- a/ppdc/ppdc-attr.cxx +++ b/ppdc/ppdc-attr.cxx @@ -1,5 +1,5 @@ // -// "$Id: ppdc-attr.cxx 8484 2009-04-03 17:35:17Z mike $" +// "$Id: ppdc-attr.cxx 1378 2009-04-08 03:17:45Z msweet $" // // Attribute class for the CUPS PPD Compiler. // @@ -62,5 +62,5 @@ ppdcAttr::~ppdcAttr() // -// End of "$Id: ppdc-attr.cxx 8484 2009-04-03 17:35:17Z mike $". +// End of "$Id: ppdc-attr.cxx 1378 2009-04-08 03:17:45Z msweet $". // diff --git a/ppdc/ppdc-catalog.cxx b/ppdc/ppdc-catalog.cxx index 5059ce52..ecf7678c 100644 --- a/ppdc/ppdc-catalog.cxx +++ b/ppdc/ppdc-catalog.cxx @@ -1,5 +1,5 @@ // -// "$Id: ppdc-catalog.cxx 10424 2012-04-23 17:26:57Z mike $" +// "$Id: ppdc-catalog.cxx 3794 2012-04-23 22:44:16Z msweet $" // // Shared message catalog class for the CUPS PPD Compiler. // @@ -893,5 +893,5 @@ put_utf16(cups_file_t *fp, // I - File to write to // -// End of "$Id: ppdc-catalog.cxx 10424 2012-04-23 17:26:57Z mike $". +// End of "$Id: ppdc-catalog.cxx 3794 2012-04-23 22:44:16Z msweet $". // diff --git a/ppdc/ppdc-choice.cxx b/ppdc/ppdc-choice.cxx index e3d0dff9..e9937feb 100644 --- a/ppdc/ppdc-choice.cxx +++ b/ppdc/ppdc-choice.cxx @@ -1,5 +1,5 @@ // -// "$Id: ppdc-choice.cxx 8484 2009-04-03 17:35:17Z mike $" +// "$Id: ppdc-choice.cxx 1378 2009-04-08 03:17:45Z msweet $" // // Option choice class for the CUPS PPD Compiler. // @@ -57,5 +57,5 @@ ppdcChoice::~ppdcChoice() // -// End of "$Id: ppdc-choice.cxx 8484 2009-04-03 17:35:17Z mike $". +// End of "$Id: ppdc-choice.cxx 1378 2009-04-08 03:17:45Z msweet $". // diff --git a/ppdc/ppdc-constraint.cxx b/ppdc/ppdc-constraint.cxx index aecd5f0a..c0609798 100644 --- a/ppdc/ppdc-constraint.cxx +++ b/ppdc/ppdc-constraint.cxx @@ -1,5 +1,5 @@ // -// "$Id: ppdc-constraint.cxx 8484 2009-04-03 17:35:17Z mike $" +// "$Id: ppdc-constraint.cxx 1378 2009-04-08 03:17:45Z msweet $" // // Contraint class for the CUPS PPD Compiler. // @@ -60,5 +60,5 @@ ppdcConstraint::~ppdcConstraint() // -// End of "$Id: ppdc-constraint.cxx 8484 2009-04-03 17:35:17Z mike $". +// End of "$Id: ppdc-constraint.cxx 1378 2009-04-08 03:17:45Z msweet $". // diff --git a/ppdc/ppdc-driver.cxx b/ppdc/ppdc-driver.cxx index 6714ab14..dbc8718a 100644 --- a/ppdc/ppdc-driver.cxx +++ b/ppdc/ppdc-driver.cxx @@ -1,5 +1,5 @@ // -// "$Id: ppdc-driver.cxx 10803 2013-01-11 20:59:59Z mike $" +// "$Id: ppdc-driver.cxx 4185 2013-02-20 02:19:13Z msweet $" // // PPD file compiler definitions for the CUPS PPD Compiler. // @@ -1344,5 +1344,5 @@ ppdcDriver::write_ppd_file( // -// End of "$Id: ppdc-driver.cxx 10803 2013-01-11 20:59:59Z mike $". +// End of "$Id: ppdc-driver.cxx 4185 2013-02-20 02:19:13Z msweet $". // diff --git a/ppdc/ppdc-file.cxx b/ppdc/ppdc-file.cxx index af47b8e7..0a24827f 100644 --- a/ppdc/ppdc-file.cxx +++ b/ppdc/ppdc-file.cxx @@ -1,5 +1,5 @@ // -// "$Id: ppdc-file.cxx 10335 2012-03-07 05:58:19Z mike $" +// "$Id: ppdc-file.cxx 3755 2012-03-30 05:59:14Z msweet $" // // File class for the CUPS PPD Compiler. // @@ -106,5 +106,5 @@ ppdcFile::peek() // -// End of "$Id: ppdc-file.cxx 10335 2012-03-07 05:58:19Z mike $". +// End of "$Id: ppdc-file.cxx 3755 2012-03-30 05:59:14Z msweet $". // diff --git a/ppdc/ppdc-filter.cxx b/ppdc/ppdc-filter.cxx index 06a164c0..cc1ae00f 100644 --- a/ppdc/ppdc-filter.cxx +++ b/ppdc/ppdc-filter.cxx @@ -1,5 +1,5 @@ // -// "$Id: ppdc-filter.cxx 8484 2009-04-03 17:35:17Z mike $" +// "$Id: ppdc-filter.cxx 1378 2009-04-08 03:17:45Z msweet $" // // Filter class for the CUPS PPD Compiler. // @@ -56,5 +56,5 @@ ppdcFilter::~ppdcFilter() // -// End of "$Id: ppdc-filter.cxx 8484 2009-04-03 17:35:17Z mike $". +// End of "$Id: ppdc-filter.cxx 1378 2009-04-08 03:17:45Z msweet $". // diff --git a/ppdc/ppdc-font.cxx b/ppdc/ppdc-font.cxx index 909b83cf..c5dad4d8 100644 --- a/ppdc/ppdc-font.cxx +++ b/ppdc/ppdc-font.cxx @@ -1,5 +1,5 @@ // -// "$Id: ppdc-font.cxx 8484 2009-04-03 17:35:17Z mike $" +// "$Id: ppdc-font.cxx 1378 2009-04-08 03:17:45Z msweet $" // // Shared font class for the CUPS PPD Compiler. // @@ -62,5 +62,5 @@ ppdcFont::~ppdcFont() // -// End of "$Id: ppdc-font.cxx 8484 2009-04-03 17:35:17Z mike $". +// End of "$Id: ppdc-font.cxx 1378 2009-04-08 03:17:45Z msweet $". // diff --git a/ppdc/ppdc-group.cxx b/ppdc/ppdc-group.cxx index 5db59c86..00d0a7cb 100644 --- a/ppdc/ppdc-group.cxx +++ b/ppdc/ppdc-group.cxx @@ -1,5 +1,5 @@ // -// "$Id: ppdc-group.cxx 9793 2011-05-20 03:49:49Z mike $" +// "$Id: ppdc-group.cxx 3275 2011-05-20 07:26:13Z msweet $" // // Group class for the CUPS PPD Compiler. // @@ -99,5 +99,5 @@ ppdcGroup::find_option(const char *n) // I - Name of option // -// End of "$Id: ppdc-group.cxx 9793 2011-05-20 03:49:49Z mike $". +// End of "$Id: ppdc-group.cxx 3275 2011-05-20 07:26:13Z msweet $". // diff --git a/ppdc/ppdc-import.cxx b/ppdc/ppdc-import.cxx index 1bf9b03b..d41cbb98 100644 --- a/ppdc/ppdc-import.cxx +++ b/ppdc/ppdc-import.cxx @@ -1,5 +1,5 @@ // -// "$Id: ppdc-import.cxx 9793 2011-05-20 03:49:49Z mike $" +// "$Id: ppdc-import.cxx 3275 2011-05-20 07:26:13Z msweet $" // // PPD file import methods for the CUPS PPD Compiler. // @@ -339,5 +339,5 @@ ppdcSource::import_ppd(const char *f) // I - Filename // -// End of "$Id: ppdc-import.cxx 9793 2011-05-20 03:49:49Z mike $". +// End of "$Id: ppdc-import.cxx 3275 2011-05-20 07:26:13Z msweet $". // diff --git a/ppdc/ppdc-mediasize.cxx b/ppdc/ppdc-mediasize.cxx index 90831da5..48afd381 100644 --- a/ppdc/ppdc-mediasize.cxx +++ b/ppdc/ppdc-mediasize.cxx @@ -1,5 +1,5 @@ // -// "$Id: ppdc-mediasize.cxx 8484 2009-04-03 17:35:17Z mike $" +// "$Id: ppdc-mediasize.cxx 1378 2009-04-08 03:17:45Z msweet $" // // Shared media size class for the CUPS PPD Compiler. // @@ -81,5 +81,5 @@ ppdcMediaSize::~ppdcMediaSize() // -// End of "$Id: ppdc-mediasize.cxx 8484 2009-04-03 17:35:17Z mike $". +// End of "$Id: ppdc-mediasize.cxx 1378 2009-04-08 03:17:45Z msweet $". // diff --git a/ppdc/ppdc-message.cxx b/ppdc/ppdc-message.cxx index a0c9ad6b..fbbe40c3 100644 --- a/ppdc/ppdc-message.cxx +++ b/ppdc/ppdc-message.cxx @@ -1,5 +1,5 @@ // -// "$Id: ppdc-message.cxx 8484 2009-04-03 17:35:17Z mike $" +// "$Id: ppdc-message.cxx 1378 2009-04-08 03:17:45Z msweet $" // // Shared message class for the CUPS PPD Compiler. // @@ -54,5 +54,5 @@ ppdcMessage::~ppdcMessage() // -// End of "$Id: ppdc-message.cxx 8484 2009-04-03 17:35:17Z mike $". +// End of "$Id: ppdc-message.cxx 1378 2009-04-08 03:17:45Z msweet $". // diff --git a/ppdc/ppdc-option.cxx b/ppdc/ppdc-option.cxx index 12897feb..3fdc296a 100644 --- a/ppdc/ppdc-option.cxx +++ b/ppdc/ppdc-option.cxx @@ -1,5 +1,5 @@ // -// "$Id: ppdc-option.cxx 9793 2011-05-20 03:49:49Z mike $" +// "$Id: ppdc-option.cxx 3275 2011-05-20 07:26:13Z msweet $" // // Option class for the CUPS PPD Compiler. // @@ -125,5 +125,5 @@ ppdcOption::set_defchoice(ppdcChoice *c) // I - Choice // -// End of "$Id: ppdc-option.cxx 9793 2011-05-20 03:49:49Z mike $". +// End of "$Id: ppdc-option.cxx 3275 2011-05-20 07:26:13Z msweet $". // diff --git a/ppdc/ppdc-private.h b/ppdc/ppdc-private.h index b862c589..2fea4388 100644 --- a/ppdc/ppdc-private.h +++ b/ppdc/ppdc-private.h @@ -1,5 +1,5 @@ // -// "$Id: ppdc-private.h 9042 2010-03-24 00:45:34Z mike $" +// "$Id: ppdc-private.h 1992 2010-03-24 14:32:08Z msweet $" // // Private definitions for the CUPS PPD Compiler. // @@ -36,5 +36,5 @@ #endif // !_PPDC_PRIVATE_H_ // -// End of "$Id: ppdc-private.h 9042 2010-03-24 00:45:34Z mike $". +// End of "$Id: ppdc-private.h 1992 2010-03-24 14:32:08Z msweet $". // diff --git a/ppdc/ppdc-profile.cxx b/ppdc/ppdc-profile.cxx index 2cbe7eb8..244e34f4 100644 --- a/ppdc/ppdc-profile.cxx +++ b/ppdc/ppdc-profile.cxx @@ -1,5 +1,5 @@ // -// "$Id: ppdc-profile.cxx 8484 2009-04-03 17:35:17Z mike $" +// "$Id: ppdc-profile.cxx 1378 2009-04-08 03:17:45Z msweet $" // // Color profile class for the CUPS PPD Compiler. // @@ -61,5 +61,5 @@ ppdcProfile::~ppdcProfile() // -// End of "$Id: ppdc-profile.cxx 8484 2009-04-03 17:35:17Z mike $". +// End of "$Id: ppdc-profile.cxx 1378 2009-04-08 03:17:45Z msweet $". // diff --git a/ppdc/ppdc-shared.cxx b/ppdc/ppdc-shared.cxx index 64a4cc78..e6b6167a 100644 --- a/ppdc/ppdc-shared.cxx +++ b/ppdc/ppdc-shared.cxx @@ -1,5 +1,5 @@ // -// "$Id: ppdc-shared.cxx 8694 2009-06-05 16:47:19Z mike $" +// "$Id: ppdc-shared.cxx 1556 2009-06-10 19:02:58Z msweet $" // // Shared data class for the CUPS PPD Compiler. // @@ -84,5 +84,5 @@ ppdcShared::retain() // -// End of "$Id: ppdc-shared.cxx 8694 2009-06-05 16:47:19Z mike $". +// End of "$Id: ppdc-shared.cxx 1556 2009-06-10 19:02:58Z msweet $". // diff --git a/ppdc/ppdc-source.cxx b/ppdc/ppdc-source.cxx index 91e823c8..518fdb92 100644 --- a/ppdc/ppdc-source.cxx +++ b/ppdc/ppdc-source.cxx @@ -1,5 +1,5 @@ // -// "$Id: ppdc-source.cxx 10378 2012-03-23 21:38:25Z mike $" +// "$Id: ppdc-source.cxx 3755 2012-03-30 05:59:14Z msweet $" // // Source class for the CUPS PPD Compiler. // @@ -3847,5 +3847,5 @@ ppdcSource::write_file(const char *f) // I - File to write // -// End of "$Id: ppdc-source.cxx 10378 2012-03-23 21:38:25Z mike $". +// End of "$Id: ppdc-source.cxx 3755 2012-03-30 05:59:14Z msweet $". // diff --git a/ppdc/ppdc-string.cxx b/ppdc/ppdc-string.cxx index 6f8ef1f9..32707ab5 100644 --- a/ppdc/ppdc-string.cxx +++ b/ppdc/ppdc-string.cxx @@ -1,5 +1,5 @@ // -// "$Id: ppdc-string.cxx 8698 2009-06-05 20:49:06Z mike $" +// "$Id: ppdc-string.cxx 1556 2009-06-10 19:02:58Z msweet $" // // Shared string class for the CUPS PPD Compiler. // @@ -58,5 +58,5 @@ ppdcString::~ppdcString() // -// End of "$Id: ppdc-string.cxx 8698 2009-06-05 20:49:06Z mike $". +// End of "$Id: ppdc-string.cxx 1556 2009-06-10 19:02:58Z msweet $". // diff --git a/ppdc/ppdc-variable.cxx b/ppdc/ppdc-variable.cxx index c8ecd3be..d60ef72f 100644 --- a/ppdc/ppdc-variable.cxx +++ b/ppdc/ppdc-variable.cxx @@ -1,5 +1,5 @@ // -// "$Id: ppdc-variable.cxx 8484 2009-04-03 17:35:17Z mike $" +// "$Id: ppdc-variable.cxx 1378 2009-04-08 03:17:45Z msweet $" // // Variable class for the CUPS PPD Compiler. // @@ -67,5 +67,5 @@ ppdcVariable::set_value(const char *v) // -// End of "$Id: ppdc-variable.cxx 8484 2009-04-03 17:35:17Z mike $". +// End of "$Id: ppdc-variable.cxx 1378 2009-04-08 03:17:45Z msweet $". // diff --git a/ppdc/ppdc.cxx b/ppdc/ppdc.cxx index 7cff4cad..6cb6bed2 100644 --- a/ppdc/ppdc.cxx +++ b/ppdc/ppdc.cxx @@ -1,5 +1,5 @@ // -// "$Id: ppdc.cxx 10431 2012-04-23 19:19:19Z mike $" +// "$Id: ppdc.cxx 3794 2012-04-23 22:44:16Z msweet $" // // PPD file compiler main entry for the CUPS PPD Compiler. // @@ -464,5 +464,5 @@ usage(void) // -// End of "$Id: ppdc.cxx 10431 2012-04-23 19:19:19Z mike $". +// End of "$Id: ppdc.cxx 3794 2012-04-23 22:44:16Z msweet $". // diff --git a/ppdc/ppdc.h b/ppdc/ppdc.h index a87b8625..0aad1255 100644 --- a/ppdc/ppdc.h +++ b/ppdc/ppdc.h @@ -1,5 +1,5 @@ // -// "$Id: ppdc.h 10335 2012-03-07 05:58:19Z mike $" +// "$Id: ppdc.h 3755 2012-03-30 05:59:14Z msweet $" // // Definitions for the CUPS PPD Compiler. // @@ -529,5 +529,5 @@ class ppdcSource //// Source File #endif // !_PPDC_H_ // -// End of "$Id: ppdc.h 10335 2012-03-07 05:58:19Z mike $". +// End of "$Id: ppdc.h 3755 2012-03-30 05:59:14Z msweet $". // diff --git a/ppdc/ppdhtml.cxx b/ppdc/ppdhtml.cxx index 05ddc41b..da2167b8 100644 --- a/ppdc/ppdhtml.cxx +++ b/ppdc/ppdhtml.cxx @@ -1,5 +1,5 @@ // -// "$Id: ppdhtml.cxx 9636 2011-03-21 22:02:00Z mike $" +// "$Id: ppdhtml.cxx 3071 2011-03-23 00:05:29Z msweet $" // // PPD to HTML utility for the CUPS PPD Compiler. // @@ -182,5 +182,5 @@ usage(void) // -// End of "$Id: ppdhtml.cxx 9636 2011-03-21 22:02:00Z mike $". +// End of "$Id: ppdhtml.cxx 3071 2011-03-23 00:05:29Z msweet $". // diff --git a/ppdc/ppdi.cxx b/ppdc/ppdi.cxx index 7ca202d4..cbc728b9 100644 --- a/ppdc/ppdi.cxx +++ b/ppdc/ppdi.cxx @@ -1,5 +1,5 @@ // -// "$Id: ppdi.cxx 9636 2011-03-21 22:02:00Z mike $" +// "$Id: ppdi.cxx 3071 2011-03-23 00:05:29Z msweet $" // // PPD file import utility for the CUPS PPD Compiler. // @@ -138,5 +138,5 @@ usage(void) // -// End of "$Id: ppdi.cxx 9636 2011-03-21 22:02:00Z mike $". +// End of "$Id: ppdi.cxx 3071 2011-03-23 00:05:29Z msweet $". // diff --git a/ppdc/ppdmerge.cxx b/ppdc/ppdmerge.cxx index c2126a54..63966c0e 100644 --- a/ppdc/ppdmerge.cxx +++ b/ppdc/ppdmerge.cxx @@ -1,5 +1,5 @@ // -// "$Id: ppdmerge.cxx 9793 2011-05-20 03:49:49Z mike $" +// "$Id: ppdmerge.cxx 3275 2011-05-20 07:26:13Z msweet $" // // PPD file merge utility for the CUPS PPD Compiler. // @@ -375,5 +375,5 @@ usage(void) // -// End of "$Id: ppdmerge.cxx 9793 2011-05-20 03:49:49Z mike $". +// End of "$Id: ppdmerge.cxx 3275 2011-05-20 07:26:13Z msweet $". // diff --git a/ppdc/ppdpo.cxx b/ppdc/ppdpo.cxx index 85761548..65032a43 100644 --- a/ppdc/ppdpo.cxx +++ b/ppdc/ppdpo.cxx @@ -1,5 +1,5 @@ // -// "$Id: ppdpo.cxx 10431 2012-04-23 19:19:19Z mike $" +// "$Id: ppdpo.cxx 3794 2012-04-23 22:44:16Z msweet $" // // PPD file message catalog program for the CUPS PPD Compiler. // @@ -263,5 +263,5 @@ usage(void) // -// End of "$Id: ppdpo.cxx 10431 2012-04-23 19:19:19Z mike $". +// End of "$Id: ppdpo.cxx 3794 2012-04-23 22:44:16Z msweet $". // diff --git a/ppdc/sample.drv b/ppdc/sample.drv index dc30255a..ec808d22 100644 --- a/ppdc/sample.drv +++ b/ppdc/sample.drv @@ -1,5 +1,5 @@ // -// "$Id: sample.drv 10431 2012-04-23 19:19:19Z mike $" +// "$Id: sample.drv 3794 2012-04-23 22:44:16Z msweet $" // // Driver info file for CUPS-supplied PPDs. // @@ -1241,5 +1241,5 @@ Version "1.5" } // -// End of "$Id: sample.drv 10431 2012-04-23 19:19:19Z mike $". +// End of "$Id: sample.drv 3794 2012-04-23 22:44:16Z msweet $". // diff --git a/ppdc/testcatalog.cxx b/ppdc/testcatalog.cxx index da64b8ee..0943dcc4 100644 --- a/ppdc/testcatalog.cxx +++ b/ppdc/testcatalog.cxx @@ -1,5 +1,5 @@ // -// "$Id: testcatalog.cxx 8487 2009-04-03 23:58:57Z mike $" +// "$Id: testcatalog.cxx 1378 2009-04-08 03:17:45Z msweet $" // // Test program for message catalog class. // @@ -59,5 +59,5 @@ main(int argc, // I - Number of command-line arguments // -// End of "$Id: testcatalog.cxx 8487 2009-04-03 23:58:57Z mike $". +// End of "$Id: testcatalog.cxx 1378 2009-04-08 03:17:45Z msweet $". // diff --git a/scheduler/Makefile b/scheduler/Makefile index 8c791040..f8a66f71 100644 --- a/scheduler/Makefile +++ b/scheduler/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 10490 2012-05-21 17:40:22Z mike $" +# "$Id: Makefile 7875 2008-08-27 22:53:31Z mike $" # # Scheduler Makefile for CUPS. # @@ -127,6 +127,14 @@ depend: # +# Run oclint to check code coverage... +# + +oclint: + oclint -o=oclint.html -html $(CUPSDOBJS:.o=.c) $(LIBOBJS:.o=.c) -- $(ALL_CFLAGS) + + +# # Install all targets... # @@ -551,5 +559,5 @@ include Dependencies # -# End of "$Id: Makefile 10490 2012-05-21 17:40:22Z mike $". +# End of "$Id: Makefile 7875 2008-08-27 22:53:31Z mike $". # diff --git a/scheduler/auth.c b/scheduler/auth.c index a82a605e..42a29d43 100644 --- a/scheduler/auth.c +++ b/scheduler/auth.c @@ -1,5 +1,5 @@ /* - * "$Id: auth.c 10776 2012-12-17 22:17:08Z mike $" + * "$Id: auth.c 7830 2008-08-04 20:38:50Z mike $" * * Authorization routines for the CUPS scheduler. * @@ -513,18 +513,37 @@ cupsdAuthorize(cupsd_client_t *con) /* I - Client connection */ socklen_t peersize; /* Size of peer credentials */ #ifdef HAVE_AUTHORIZATION_H const char *name; /* Authorizing name */ + int no_peer = 0; /* Don't allow peer credentials? */ + + /* + * See if we should allow peer credentials... + */ for (name = (char *)cupsArrayFirst(con->best->names); name; name = (char *)cupsArrayNext(con->best->names)) + { if (!_cups_strncasecmp(name, "@AUTHKEY(", 9) || !_cups_strcasecmp(name, "@SYSTEM")) { - cupsdLogMessage(CUPSD_LOG_ERROR, - "[Client %d] PeerCred authentication not allowed for " - "resource.", con->http.fd); - return; + /* Normally don't want peer credentials if we need an auth key... */ + no_peer = 1; } + else if (!_cups_strcasecmp(name, "@OWNER")) + { + /* but if @OWNER is present then we allow it... */ + no_peer = 0; + break; + } + } + + if (no_peer) + { + cupsdLogMessage(CUPSD_LOG_ERROR, + "[Client %d] PeerCred authentication not allowed for " + "resource per AUTHKEY policy.", con->http.fd); + return; + } #endif /* HAVE_AUTHORIZATION_H */ if ((pwd = getpwnam(authorization + 9)) == NULL) @@ -2588,5 +2607,5 @@ to64(char *s, /* O - Output string */ /* - * End of "$Id: auth.c 10776 2012-12-17 22:17:08Z mike $". + * End of "$Id: auth.c 7830 2008-08-04 20:38:50Z mike $". */ diff --git a/scheduler/auth.h b/scheduler/auth.h index c6865156..fecee62d 100644 --- a/scheduler/auth.h +++ b/scheduler/auth.h @@ -1,5 +1,5 @@ /* - * "$Id: auth.h 10131 2011-11-30 23:11:23Z mike $" + * "$Id: auth.h 7317 2008-02-15 22:29:27Z mike $" * * Authorization definitions for the CUPS scheduler. * @@ -147,5 +147,5 @@ extern cupsd_location_t *cupsdNewLocation(const char *location); /* - * End of "$Id: auth.h 10131 2011-11-30 23:11:23Z mike $". + * End of "$Id: auth.h 7317 2008-02-15 22:29:27Z mike $". */ diff --git a/scheduler/banners.c b/scheduler/banners.c index 7a4987fa..a4597964 100644 --- a/scheduler/banners.c +++ b/scheduler/banners.c @@ -1,5 +1,5 @@ /* - * "$Id: banners.c 9793 2011-05-20 03:49:49Z mike $" + * "$Id: banners.c 7221 2008-01-16 22:20:08Z mike $" * * Banner routines for the CUPS scheduler. * @@ -220,5 +220,5 @@ free_banners(void) /* - * End of "$Id: banners.c 9793 2011-05-20 03:49:49Z mike $". + * End of "$Id: banners.c 7221 2008-01-16 22:20:08Z mike $". */ diff --git a/scheduler/banners.h b/scheduler/banners.h index 2578cdd0..b215fe6a 100644 --- a/scheduler/banners.h +++ b/scheduler/banners.h @@ -1,5 +1,5 @@ /* - * "$Id: banners.h 9350 2010-11-04 23:23:25Z mike $" + * "$Id: banners.h 6649 2007-07-11 21:46:42Z mike $" * * Banner definitions for the CUPS scheduler. * @@ -41,5 +41,5 @@ extern void cupsdLoadBanners(const char *d); /* - * End of "$Id: banners.h 9350 2010-11-04 23:23:25Z mike $". + * End of "$Id: banners.h 6649 2007-07-11 21:46:42Z mike $". */ diff --git a/scheduler/cert.c b/scheduler/cert.c index 5e0f06e1..fa956034 100644 --- a/scheduler/cert.c +++ b/scheduler/cert.c @@ -1,5 +1,5 @@ /* - * "$Id: cert.c 10776 2012-12-17 22:17:08Z mike $" + * "$Id: cert.c 7673 2008-06-18 22:31:26Z mike $" * * Authentication certificate routines for the CUPS scheduler. * @@ -436,5 +436,5 @@ cupsdInitCerts(void) /* - * End of "$Id: cert.c 10776 2012-12-17 22:17:08Z mike $". + * End of "$Id: cert.c 7673 2008-06-18 22:31:26Z mike $". */ diff --git a/scheduler/cert.h b/scheduler/cert.h index fbec27c8..d479b2ec 100644 --- a/scheduler/cert.h +++ b/scheduler/cert.h @@ -1,5 +1,5 @@ /* - * "$Id: cert.h 10776 2012-12-17 22:17:08Z mike $" + * "$Id: cert.h 7383 2008-03-20 20:58:07Z mike $" * * Authentication certificate definitions for the CUPS scheduler. * @@ -49,5 +49,5 @@ extern void cupsdInitCerts(void); /* - * End of "$Id: cert.h 10776 2012-12-17 22:17:08Z mike $". + * End of "$Id: cert.h 7383 2008-03-20 20:58:07Z mike $". */ diff --git a/scheduler/classes.h b/scheduler/classes.h index d050a183..0170b97e 100644 --- a/scheduler/classes.h +++ b/scheduler/classes.h @@ -1,5 +1,5 @@ /* - * "$Id: classes.h 10104 2011-11-04 06:37:03Z mike $" + * "$Id: classes.h 6649 2007-07-11 21:46:42Z mike $" * * Printer class definitions for the CUPS scheduler. * @@ -31,5 +31,5 @@ extern void cupsdSaveAllClasses(void); /* - * End of "$Id: classes.h 10104 2011-11-04 06:37:03Z mike $". + * End of "$Id: classes.h 6649 2007-07-11 21:46:42Z mike $". */ diff --git a/scheduler/client.c b/scheduler/client.c index 75ed7578..6be75833 100644 --- a/scheduler/client.c +++ b/scheduler/client.c @@ -1,5 +1,5 @@ /* - * "$Id: client.c 10834 2013-01-21 15:29:47Z mike $" + * "$Id: client.c 7950 2008-09-17 00:21:59Z mike $" * * Client routines for the CUPS scheduler. * @@ -406,7 +406,7 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener socket */ { if (httpAddrLocalhost(&temp)) strlcpy(con->servername, "localhost", sizeof(con->servername)); - else if (HostNameLookups || RemotePort) + else if (HostNameLookups) httpAddrLookup(&temp, con->servername, sizeof(con->servername)); else httpAddrString(&temp, con->servername, sizeof(con->servername)); @@ -2581,7 +2581,14 @@ cupsdSendHeader( con->http.hostname); #ifdef HAVE_GSSAPI else if (auth_type == CUPSD_AUTH_NEGOTIATE) + { +# ifdef AF_LOCAL + if (_httpAddrFamily(con->http.hostaddr) == AF_LOCAL) + strlcpy(auth_str, "Basic realm=\"CUPS\"", sizeof(auth_str)); + else +# endif /* AF_LOCAL */ strlcpy(auth_str, "Negotiate", sizeof(auth_str)); + } #endif /* HAVE_GSSAPI */ if (con->best && auth_type != CUPSD_AUTH_NEGOTIATE && @@ -4218,5 +4225,5 @@ write_pipe(cupsd_client_t *con) /* I - Client connection */ /* - * End of "$Id: client.c 10834 2013-01-21 15:29:47Z mike $". + * End of "$Id: client.c 7950 2008-09-17 00:21:59Z mike $". */ diff --git a/scheduler/client.h b/scheduler/client.h index 17c05d02..3f5475f0 100644 --- a/scheduler/client.h +++ b/scheduler/client.h @@ -1,5 +1,5 @@ /* - * "$Id: client.h 10374 2012-03-22 20:30:20Z mike $" + * "$Id: client.h 7935 2008-09-11 01:54:11Z mike $" * * Client definitions for the CUPS scheduler. * @@ -140,5 +140,5 @@ extern int cupsdStartTLS(cupsd_client_t *con); /* - * End of "$Id: client.h 10374 2012-03-22 20:30:20Z mike $". + * End of "$Id: client.h 7935 2008-09-11 01:54:11Z mike $". */ diff --git a/scheduler/colorman.c b/scheduler/colorman.c index acbc1f97..ee3d5a3a 100644 --- a/scheduler/colorman.c +++ b/scheduler/colorman.c @@ -1,5 +1,5 @@ /* - * "$Id: colorman.c 10869 2013-02-19 23:53:01Z mike $" + * "$Id: colorman.c 4298 2013-05-10 16:52:10Z msweet $" * * Color management routines for the CUPS scheduler. * @@ -40,6 +40,25 @@ * * Contents: * + * cupsdRegisterColor() - Register vendor color profiles in a PPD + * file. + * cupsdStartColor() - Initialize color management. + * cupsdStopColor() - Shutdown color management. + * cupsdUnregisterColor() - Unregister vendor color profiles in a PPD + * file. + * apple_init_profile() - Initialize a color profile. + * apple_register_profiles() - Register color profiles for a printer. + * apple_unregister_profiles() - Remove color profiles for the specified + * printer. + * colord_create_device() - Create a device and register profiles. + * colord_create_profile() - Create a color profile for a printer. + * colord_delete_device() - Delete a device + * colord_device_add_profile() - Assign a profile to a device. + * colord_dict_add_strings() - Add two strings to a dictionary. + * colord_find_device() - Finds a device + * colord_get_qualifier_format() - Get the qualifier format. + * colord_register_printer() - Register profiles for a printer. + * colord_unregister_printer() - Unregister profiles for a printer. */ /* @@ -307,7 +326,7 @@ apple_init_profile( * Fill in the profile data... */ - if (iccfile) + if (iccfile && *iccfile) { url = CFURLCreateFromFileSystemRepresentation(kCFAllocatorDefault, (const UInt8 *)iccfile, @@ -497,7 +516,7 @@ apple_register_profiles( if (_cupsFileCheck(iccfile, _CUPS_FILE_CHECK_FILE, !RunUser, cupsdLogFCMessage, p)) - continue; + iccfile[0] = '\0'; cupsArraySave(ppd->sorted_attrs); @@ -1505,5 +1524,5 @@ colord_unregister_printer( /* - * End of "$Id: colorman.c 10869 2013-02-19 23:53:01Z mike $". + * End of "$Id: colorman.c 4298 2013-05-10 16:52:10Z msweet $". */ diff --git a/scheduler/colorman.h b/scheduler/colorman.h index 1a8493c5..3360fd4e 100644 --- a/scheduler/colorman.h +++ b/scheduler/colorman.h @@ -1,5 +1,5 @@ /* - * "$Id: colorman.h 10490 2012-05-21 17:40:22Z mike $" + * "$Id: colorman.h 3833 2012-05-23 22:51:18Z msweet $" * * Color management definitions for the CUPS scheduler. * @@ -24,5 +24,5 @@ extern void cupsdUnregisterColor(cupsd_printer_t *p); /* - * End of "$Id: colorman.h 10490 2012-05-21 17:40:22Z mike $". + * End of "$Id: colorman.h 3833 2012-05-23 22:51:18Z msweet $". */ diff --git a/scheduler/conf.c b/scheduler/conf.c index e319a2ca..f04acf93 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -1,5 +1,5 @@ /* - * "$Id: conf.c 10824 2013-01-18 19:58:41Z mike $" + * "$Id: conf.c 9352 2010-11-06 04:55:26Z mike $" * * Configuration routines for the CUPS scheduler. * @@ -705,7 +705,7 @@ cupsdReadConfiguration(void) AccessLogLevel = CUPSD_ACCESSLOG_ACTIONS; ConfigFilePerm = CUPS_DEFAULT_CONFIG_FILE_PERM; FatalErrors = parse_fatal_errors(CUPS_DEFAULT_FATAL_ERRORS); - default_auth_type = CUPSD_AUTH_BASIC; + default_auth_type = CUPSD_AUTH_BASIC; #ifdef HAVE_SSL DefaultEncryption = HTTP_ENCRYPT_REQUIRED; SSLOptions = CUPSD_SSL_NONE; @@ -767,7 +767,7 @@ cupsdReadConfiguration(void) cupsdClearString(&DefaultPolicy); #ifdef HAVE_AUTHORIZATION_H - cupsdClearString(&SystemGroupAuthKey); + cupsdSetString(&SystemGroupAuthKey, CUPS_DEFAULT_SYSTEM_AUTHKEY); #endif /* HAVE_AUTHORIZATION_H */ MaxSubscriptions = 100; @@ -3350,7 +3350,7 @@ read_cupsd_conf(cups_file_t *fp) /* I - File to read from */ !_cups_strcasecmp(line, "TempDir") || !_cups_strcasecmp(line, "User")) { - cupsdLogMessage(CUPSD_LOG_WARN, + cupsdLogMessage(CUPSD_LOG_INFO, "Please move \"%s%s%s\" on line %d of %s to the %s file; " "this will become an error in a future release.", line, value ? " " : "", value ? value : "", linenum, @@ -4080,5 +4080,5 @@ set_policy_defaults(cupsd_policy_t *pol)/* I - Policy */ /* - * End of "$Id: conf.c 10824 2013-01-18 19:58:41Z mike $". + * End of "$Id: conf.c 9352 2010-11-06 04:55:26Z mike $". */ diff --git a/scheduler/conf.h b/scheduler/conf.h index 5ee713ca..88af4a23 100644 --- a/scheduler/conf.h +++ b/scheduler/conf.h @@ -1,5 +1,5 @@ /* - * "$Id: conf.h 10710 2012-11-26 18:26:01Z mike $" + * "$Id: conf.h 7935 2008-09-11 01:54:11Z mike $" * * Configuration file definitions for the CUPS scheduler. * @@ -296,5 +296,5 @@ extern int cupsdWriteErrorLog(int level, const char *message); /* - * End of "$Id: conf.h 10710 2012-11-26 18:26:01Z mike $". + * End of "$Id: conf.h 7935 2008-09-11 01:54:11Z mike $". */ diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c index aa06ed3c..1a1dbb26 100644 --- a/scheduler/cups-deviced.c +++ b/scheduler/cups-deviced.c @@ -1,5 +1,5 @@ /* - * "$Id: cups-deviced.c 9793 2011-05-20 03:49:49Z mike $" + * "$Id: cups-deviced.c 7816 2008-07-30 20:53:31Z mike $" * * Device scanning mini-daemon for CUPS. * @@ -806,5 +806,5 @@ start_backend(const char *name, /* I - Backend to run */ /* - * End of "$Id: cups-deviced.c 9793 2011-05-20 03:49:49Z mike $". + * End of "$Id: cups-deviced.c 7816 2008-07-30 20:53:31Z mike $". */ diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx index b2aca641..cbd2f115 100644 --- a/scheduler/cups-driverd.cxx +++ b/scheduler/cups-driverd.cxx @@ -1,5 +1,5 @@ /* - * "$Id: cups-driverd.cxx 10489 2012-05-21 16:05:58Z mike $" + * "$Id: cups-driverd.cxx 3833 2012-05-23 22:51:18Z msweet $" * * PPD/driver support for CUPS. * @@ -2947,5 +2947,5 @@ regex_string(const char *s) /* I - String to compare */ /* - * End of "$Id: cups-driverd.cxx 10489 2012-05-21 16:05:58Z mike $". + * End of "$Id: cups-driverd.cxx 3833 2012-05-23 22:51:18Z msweet $". */ diff --git a/scheduler/cups-exec.c b/scheduler/cups-exec.c index d24bdc11..beac46ea 100644 --- a/scheduler/cups-exec.c +++ b/scheduler/cups-exec.c @@ -1,5 +1,5 @@ /* - * "$Id: cups-exec.c 10523 2012-06-20 15:01:07Z mike $" + * "$Id: cups-exec.c 4298 2013-05-10 16:52:10Z msweet $" * * Sandbox helper for CUPS. * @@ -31,6 +31,7 @@ # ifndef SANDBOX_NAMED_EXTERNAL # define SANDBOX_NAMED_EXTERNAL 0x0003 # endif /* !SANDBOX_NAMED_EXTERNAL */ +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif /* HAVE_SANDBOX_H */ @@ -60,7 +61,6 @@ main(int argc, /* I - Number of command-line args */ } #ifdef HAVE_SANDBOX_H -# pragma GCC diagnostic ignored "-Wdeprecated-declarations" /* * Run in a separate security profile... */ @@ -105,5 +105,5 @@ main(int argc, /* I - Number of command-line args */ /* - * End of "$Id: cups-exec.c 10523 2012-06-20 15:01:07Z mike $". + * End of "$Id: cups-exec.c 4298 2013-05-10 16:52:10Z msweet $". */ diff --git a/scheduler/cups-lpd.c b/scheduler/cups-lpd.c index ba4c4fac..11bcd4df 100644 --- a/scheduler/cups-lpd.c +++ b/scheduler/cups-lpd.c @@ -1,5 +1,5 @@ /* - * "$Id: cups-lpd.c 10524 2012-06-20 15:13:33Z mike $" + * "$Id: cups-lpd.c 7899 2008-09-03 12:57:17Z mike $" * * Line Printer Daemon interface for CUPS. * @@ -1622,5 +1622,5 @@ smart_gets(char *s, /* I - Pointer to line buffer */ /* - * End of "$Id: cups-lpd.c 10524 2012-06-20 15:13:33Z mike $". + * End of "$Id: cups-lpd.c 7899 2008-09-03 12:57:17Z mike $". */ diff --git a/scheduler/cups.sh.in b/scheduler/cups.sh.in index 49cf909a..a1aaf8b9 100644 --- a/scheduler/cups.sh.in +++ b/scheduler/cups.sh.in @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id: cups.sh.in 9945 2011-08-31 04:57:08Z mike $" +# "$Id: cups.sh.in 3411 2011-09-07 22:31:27Z msweet $" # # Startup/shutdown script for CUPS. # @@ -233,5 +233,5 @@ exit 0 # -# End of "$Id: cups.sh.in 9945 2011-08-31 04:57:08Z mike $". +# End of "$Id: cups.sh.in 3411 2011-09-07 22:31:27Z msweet $". # diff --git a/scheduler/cups.xml.in b/scheduler/cups.xml.in index ba614ceb..ac635850 100644 --- a/scheduler/cups.xml.in +++ b/scheduler/cups.xml.in @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> <!-- - $Id: cups.xml.in 9197 2010-07-08 17:23:08Z mike $ + $Id: cups.xml.in 2309 2010-07-08 20:45:48Z msweet $ Service manifest for CUPS. diff --git a/scheduler/cupsd.h b/scheduler/cupsd.h index 6df5d175..8a6ffd97 100644 --- a/scheduler/cupsd.h +++ b/scheduler/cupsd.h @@ -1,5 +1,5 @@ /* - * "$Id: cupsd.h 10776 2012-12-17 22:17:08Z mike $" + * "$Id: cupsd.h 7928 2008-09-10 22:14:22Z mike $" * * Main header file for the CUPS scheduler. * @@ -230,5 +230,5 @@ extern void cupsdStopServer(void); /* - * End of "$Id: cupsd.h 10776 2012-12-17 22:17:08Z mike $". + * End of "$Id: cupsd.h 7928 2008-09-10 22:14:22Z mike $". */ diff --git a/scheduler/cupsfilter.c b/scheduler/cupsfilter.c index 0761cde9..531a483b 100644 --- a/scheduler/cupsfilter.c +++ b/scheduler/cupsfilter.c @@ -1,5 +1,5 @@ /* - * "$Id: cupsfilter.c 10869 2013-02-19 23:53:01Z mike $" + * "$Id: cupsfilter.c 7952 2008-09-17 00:56:20Z mike $" * * Filtering program for CUPS. * @@ -1459,5 +1459,5 @@ usage(const char *opt) /* I - Incorrect option, if any */ /* - * End of "$Id: cupsfilter.c 10869 2013-02-19 23:53:01Z mike $". + * End of "$Id: cupsfilter.c 7952 2008-09-17 00:56:20Z mike $". */ diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c index e491d94d..6dfdb136 100644 --- a/scheduler/dirsvc.c +++ b/scheduler/dirsvc.c @@ -1,5 +1,5 @@ /* - * "$Id: dirsvc.c 10641 2012-10-03 14:17:41Z mike $" + * "$Id: dirsvc.c 7933 2008-09-11 00:44:58Z mike $" * * Directory services routines for the CUPS scheduler. * @@ -1666,5 +1666,5 @@ update_smb(int onoff) /* I - 1 = turn on, 0 = turn off */ /* - * End of "$Id: dirsvc.c 10641 2012-10-03 14:17:41Z mike $". + * End of "$Id: dirsvc.c 7933 2008-09-11 00:44:58Z mike $". */ diff --git a/scheduler/dirsvc.h b/scheduler/dirsvc.h index a4ffdbef..39b74ce9 100644 --- a/scheduler/dirsvc.h +++ b/scheduler/dirsvc.h @@ -1,5 +1,5 @@ /* - * "$Id: dirsvc.h 10415 2012-04-16 23:26:18Z mike $" + * "$Id: dirsvc.h 7933 2008-09-11 00:44:58Z mike $" * * Directory services definitions for the CUPS scheduler. * @@ -80,5 +80,5 @@ extern void cupsdUpdateDNSSDName(void); /* - * End of "$Id: dirsvc.h 10415 2012-04-16 23:26:18Z mike $". + * End of "$Id: dirsvc.h 7933 2008-09-11 00:44:58Z mike $". */ diff --git a/scheduler/env.c b/scheduler/env.c index 9ee83bcd..5fbe52c5 100644 --- a/scheduler/env.c +++ b/scheduler/env.c @@ -1,5 +1,5 @@ /* - * "$Id: env.c 10485 2012-05-18 20:17:41Z mike $" + * "$Id: env.c 9459 2011-01-11 03:48:42Z mike $" * * Environment management routines for the CUPS scheduler. * @@ -269,5 +269,5 @@ find_env(const char *name) /* I - Variable name */ /* - * End of "$Id: env.c 10485 2012-05-18 20:17:41Z mike $". + * End of "$Id: env.c 9459 2011-01-11 03:48:42Z mike $". */ diff --git a/scheduler/file.c b/scheduler/file.c index 4dcf54da..e703de4f 100644 --- a/scheduler/file.c +++ b/scheduler/file.c @@ -1,5 +1,5 @@ /* - * "$Id: file.c 9766 2011-05-11 22:17:34Z mike $" + * "$Id: file.c 3247 2011-05-12 06:22:31Z msweet $" * * File functions for the CUPS scheduler. * @@ -446,5 +446,5 @@ overwrite_data(int fd, /* I - File descriptor */ /* - * End of "$Id: file.c 9766 2011-05-11 22:17:34Z mike $". + * End of "$Id: file.c 3247 2011-05-12 06:22:31Z msweet $". */ diff --git a/scheduler/filter.c b/scheduler/filter.c index 5cde777e..b708fa36 100644 --- a/scheduler/filter.c +++ b/scheduler/filter.c @@ -1,5 +1,5 @@ /* - * "$Id: filter.c 9705 2011-04-22 04:38:28Z mike $" + * "$Id: filter.c 7694 2008-06-26 00:23:20Z mike $" * * File type conversion routines for CUPS. * @@ -500,5 +500,5 @@ mime_find_filters( /* - * End of "$Id: filter.c 9705 2011-04-22 04:38:28Z mike $". + * End of "$Id: filter.c 7694 2008-06-26 00:23:20Z mike $". */ diff --git a/scheduler/ipp.c b/scheduler/ipp.c index 2c318404..637c717b 100644 --- a/scheduler/ipp.c +++ b/scheduler/ipp.c @@ -1,5 +1,5 @@ /* - * "$Id: ipp.c 10899 2013-03-11 18:44:36Z mike $" + * "$Id: ipp.c 7944 2008-09-16 22:32:42Z mike $" * * IPP routines for the CUPS scheduler. * @@ -9279,7 +9279,7 @@ save_auth_info( fchown(cupsFileNumber(fp), 0, 0); fchmod(cupsFileNumber(fp), 0400); - cupsFilePuts(fp, "CUPSD-AUTH-V2\n"); + cupsFilePuts(fp, "CUPSD-AUTH-V3\n"); for (i = 0; i < (int)(sizeof(job->auth_env) / sizeof(job->auth_env[0])); @@ -9297,9 +9297,15 @@ save_auth_info( i < (int)(sizeof(job->auth_env) / sizeof(job->auth_env[0])); i ++) { - httpEncode64_2(line, sizeof(line), auth_info->values[i].string.text, - strlen(auth_info->values[i].string.text)); - cupsFilePutConf(fp, dest->auth_info_required[i], line); + if (strcmp(dest->auth_info_required[i], "negotiate")) + { + httpEncode64_2(line, sizeof(line), auth_info->values[i].string.text, + strlen(auth_info->values[i].string.text)); + cupsFilePutConf(fp, dest->auth_info_required[i], line); + } + else + cupsFilePutConf(fp, dest->auth_info_required[i], + auth_info->values[i].string.text); if (!strcmp(dest->auth_info_required[i], "username")) cupsdSetStringf(job->auth_env + i, "AUTH_USERNAME=%s", @@ -11306,5 +11312,5 @@ validate_user(cupsd_job_t *job, /* I - Job */ /* - * End of "$Id: ipp.c 10899 2013-03-11 18:44:36Z mike $". + * End of "$Id: ipp.c 7944 2008-09-16 22:32:42Z mike $". */ diff --git a/scheduler/job.c b/scheduler/job.c index 3b3964b9..3b662b95 100644 --- a/scheduler/job.c +++ b/scheduler/job.c @@ -1,5 +1,5 @@ /* - * "$Id: job.c 10776 2012-12-17 22:17:08Z mike $" + * "$Id: job.c 7902 2008-09-03 14:20:17Z mike $" * * Job management routines for the CUPS scheduler. * @@ -560,7 +560,7 @@ cupsdContinueJob(cupsd_job_t *job) /* I - Job */ /* CONTENT_TYPE env variable */ device_uri[1024], /* DEVICE_URI env variable */ - final_content_type[1024], + final_content_type[1024] = "", /* FINAL_CONTENT_TYPE env variable */ lang[255], /* LANG env variable */ #ifdef __APPLE__ @@ -637,6 +637,44 @@ cupsdContinueJob(cupsd_job_t *job) /* I - Job */ } /* + * Figure out the final content type... + */ + + cupsdLogJob(job, CUPSD_LOG_DEBUG, "%d filters for job:", + cupsArrayCount(filters)); + for (filter = (mime_filter_t *)cupsArrayFirst(filters); + filter; + filter = (mime_filter_t *)cupsArrayNext(filters)) + cupsdLogJob(job, CUPSD_LOG_DEBUG, "%s (%s/%s to %s/%s, cost %d)", + filter->filter, + filter->src ? filter->src->super : "???", + filter->src ? filter->src->type : "???", + filter->dst ? filter->dst->super : "???", + filter->dst ? filter->dst->type : "???", + filter->cost); + + if (!job->printer->remote) + { + for (filter = (mime_filter_t *)cupsArrayLast(filters); + filter && filter->dst; + filter = (mime_filter_t *)cupsArrayPrev(filters)) + if (strcmp(filter->dst->super, "printer") || + strcmp(filter->dst->type, job->printer->name)) + break; + + if (filter && filter->dst) + { + if ((ptr = strchr(filter->dst->type, '/')) != NULL) + snprintf(final_content_type, sizeof(final_content_type), + "FINAL_CONTENT_TYPE=%s", ptr + 1); + else + snprintf(final_content_type, sizeof(final_content_type), + "FINAL_CONTENT_TYPE=%s/%s", filter->dst->super, + filter->dst->type); + } + } + + /* * Remove NULL ("-") filters... */ @@ -1033,25 +1071,8 @@ cupsdContinueJob(cupsd_job_t *job) /* I - Job */ envp[envc ++] = banner_page ? "CUPS_FILETYPE=job-sheet" : "CUPS_FILETYPE=document"; - if (!job->printer->remote && !job->printer->raw) - { - filter = (mime_filter_t *)cupsArrayLast(filters); - - if (job->printer->port_monitor) - filter = (mime_filter_t *)cupsArrayPrev(filters); - - if (filter && filter->dst) - { - if ((ptr = strchr(filter->dst->type, '/')) != NULL) - snprintf(final_content_type, sizeof(final_content_type), - "FINAL_CONTENT_TYPE=%s", ptr + 1); - else - snprintf(final_content_type, sizeof(final_content_type), - "FINAL_CONTENT_TYPE=%s/%s", filter->dst->super, - filter->dst->type); - envp[envc ++] = final_content_type; - } - } + if (final_content_type[0]) + envp[envc ++] = final_content_type; if (Classification && !banner_page) { @@ -1940,7 +1961,7 @@ cupsdLoadJob(cupsd_job_t *job) /* I - Job */ if (cupsFileGets(fp, line, sizeof(line)) && - !strcmp(line, "CUPSD-AUTH-V2")) + !strcmp(line, "CUPSD-AUTH-V3")) { i = 0; while (cupsFileGetConf(fp, line, sizeof(line), &value, &linenum)) @@ -1949,8 +1970,11 @@ cupsdLoadJob(cupsd_job_t *job) /* I - Job */ * Decode value... */ - bytes = sizeof(data); - httpDecode64_2(data, &bytes, value); + if (strcmp(line, "negotiate") && strcmp(line, "uid")) + { + bytes = sizeof(data); + httpDecode64_2(data, &bytes, value); + } /* * Assign environment variables... @@ -1971,7 +1995,7 @@ cupsdLoadJob(cupsd_job_t *job) /* I - Job */ else if (!strcmp(line, "password")) cupsdSetStringf(job->auth_env + i, "AUTH_PASSWORD=%s", data); else if (!strcmp(line, "negotiate")) - cupsdSetStringf(job->auth_env + i, "AUTH_NEGOTIATE=%s", data); + cupsdSetStringf(job->auth_env + i, "AUTH_NEGOTIATE=%s", value); else continue; @@ -5097,5 +5121,5 @@ update_job_attrs(cupsd_job_t *job, /* I - Job to update */ /* - * End of "$Id: job.c 10776 2012-12-17 22:17:08Z mike $". + * End of "$Id: job.c 7902 2008-09-03 14:20:17Z mike $". */ diff --git a/scheduler/job.h b/scheduler/job.h index 9c5db0c6..e0250afe 100644 --- a/scheduler/job.h +++ b/scheduler/job.h @@ -1,5 +1,5 @@ /* - * "$Id: job.h 10502 2012-05-23 01:36:50Z mike $" + * "$Id: job.h 7883 2008-08-28 20:38:13Z mike $" * * Print job definitions for the CUPS scheduler. * @@ -171,5 +171,5 @@ extern void cupsdUpdateJobs(void); /* - * End of "$Id: job.h 10502 2012-05-23 01:36:50Z mike $". + * End of "$Id: job.h 7883 2008-08-28 20:38:13Z mike $". */ diff --git a/scheduler/listen.c b/scheduler/listen.c index ce7a26d0..16528b9d 100644 --- a/scheduler/listen.c +++ b/scheduler/listen.c @@ -1,5 +1,5 @@ /* - * "$Id: listen.c 9691 2011-04-15 23:38:13Z mike $" + * "$Id: listen.c 7918 2008-09-08 22:03:01Z mike $" * * Server listening routines for the CUPS scheduler. * @@ -427,5 +427,5 @@ cupsdStopListening(void) /* - * End of "$Id: listen.c 9691 2011-04-15 23:38:13Z mike $". + * End of "$Id: listen.c 7918 2008-09-08 22:03:01Z mike $". */ diff --git a/scheduler/log.c b/scheduler/log.c index 1ab483d1..17e4c267 100644 --- a/scheduler/log.c +++ b/scheduler/log.c @@ -1,5 +1,5 @@ /* - * "$Id: log.c 10752 2012-12-12 18:03:02Z mike $" + * "$Id: log.c 7918 2008-09-08 22:03:01Z mike $" * * Log file routines for the CUPS scheduler. * @@ -1103,5 +1103,5 @@ format_log_line(const char *message, /* I - Printf-style format string */ /* - * End of "$Id: log.c 10752 2012-12-12 18:03:02Z mike $". + * End of "$Id: log.c 7918 2008-09-08 22:03:01Z mike $". */ diff --git a/scheduler/main.c b/scheduler/main.c index 58776fea..fa9f8896 100644 --- a/scheduler/main.c +++ b/scheduler/main.c @@ -1,5 +1,5 @@ /* - * "$Id: main.c 10777 2012-12-17 22:18:10Z mike $" + * "$Id: main.c 7925 2008-09-10 17:47:26Z mike $" * * Main loop for the CUPS scheduler. * @@ -1326,7 +1326,7 @@ cupsdSetStringf(char **s, /* O - New string */ const char *f, /* I - Printf-style format string */ ...) /* I - Additional args as needed */ { - char v[4096]; /* Formatting string value */ + char v[65536 + 64]; /* Formatting string value */ va_list ap; /* Argument pointer */ char *olds; /* Old string */ @@ -2066,5 +2066,5 @@ usage(int status) /* O - Exit status */ /* - * End of "$Id: main.c 10777 2012-12-17 22:18:10Z mike $". + * End of "$Id: main.c 7925 2008-09-10 17:47:26Z mike $". */ diff --git a/scheduler/mime-private.h b/scheduler/mime-private.h index 54648847..078953db 100644 --- a/scheduler/mime-private.h +++ b/scheduler/mime-private.h @@ -1,5 +1,5 @@ /* - * "$Id: mime-private.h 9950 2011-09-01 23:02:24Z mike $" + * "$Id: mime-private.h 3411 2011-09-07 22:31:27Z msweet $" * * Private MIME type/conversion database definitions for CUPS. * @@ -41,5 +41,5 @@ extern void _mimeError(mime_t *mime, const char *format, ...) #endif /* !_CUPS_MIME_PRIVATE_H_ */ /* - * End of "$Id: mime-private.h 9950 2011-09-01 23:02:24Z mike $". + * End of "$Id: mime-private.h 3411 2011-09-07 22:31:27Z msweet $". */ diff --git a/scheduler/mime.h b/scheduler/mime.h index c9e21473..4842c837 100644 --- a/scheduler/mime.h +++ b/scheduler/mime.h @@ -1,5 +1,5 @@ /* - * "$Id: mime.h 9750 2011-05-06 22:53:53Z mike $" + * "$Id: mime.h 7694 2008-06-26 00:23:20Z mike $" * * MIME type/conversion database definitions for CUPS. * @@ -158,5 +158,5 @@ extern void mimeSetErrorCallback(mime_t *mime, mime_error_cb_t cb, #endif /* !_CUPS_MIME_H_ */ /* - * End of "$Id: mime.h 9750 2011-05-06 22:53:53Z mike $". + * End of "$Id: mime.h 7694 2008-06-26 00:23:20Z mike $". */ diff --git a/scheduler/network.c b/scheduler/network.c index b6eea613..87e660ce 100644 --- a/scheduler/network.c +++ b/scheduler/network.c @@ -1,5 +1,5 @@ /* - * "$Id: network.c 10378 2012-03-23 21:38:25Z mike $" + * "$Id: network.c 7861 2008-08-26 03:15:14Z mike $" * * Network interface functions for the CUPS scheduler. * @@ -296,5 +296,5 @@ compare_netif(cupsd_netif_t *a, /* I - First network interface */ /* - * End of "$Id: network.c 10378 2012-03-23 21:38:25Z mike $". + * End of "$Id: network.c 7861 2008-08-26 03:15:14Z mike $". */ diff --git a/scheduler/network.h b/scheduler/network.h index f16a06b0..95b6badc 100644 --- a/scheduler/network.h +++ b/scheduler/network.h @@ -1,5 +1,5 @@ /* - * "$Id: network.h 9350 2010-11-04 23:23:25Z mike $" + * "$Id: network.h 6649 2007-07-11 21:46:42Z mike $" * * Network interface definitions for the CUPS scheduler. * @@ -48,5 +48,5 @@ extern void cupsdNetIFUpdate(void); /* - * End of "$Id: network.h 9350 2010-11-04 23:23:25Z mike $". + * End of "$Id: network.h 6649 2007-07-11 21:46:42Z mike $". */ diff --git a/scheduler/policy.c b/scheduler/policy.c index fb29ce05..1e6e45e2 100644 --- a/scheduler/policy.c +++ b/scheduler/policy.c @@ -1,5 +1,5 @@ /* - * "$Id: policy.c 9793 2011-05-20 03:49:49Z mike $" + * "$Id: policy.c 7673 2008-06-18 22:31:26Z mike $" * * Policy routines for the CUPS scheduler. * @@ -513,5 +513,5 @@ hash_op(cupsd_location_t *op) /* I - Operation */ /* - * End of "$Id: policy.c 9793 2011-05-20 03:49:49Z mike $". + * End of "$Id: policy.c 7673 2008-06-18 22:31:26Z mike $". */ diff --git a/scheduler/policy.h b/scheduler/policy.h index f718777d..897b011f 100644 --- a/scheduler/policy.h +++ b/scheduler/policy.h @@ -1,5 +1,5 @@ /* - * "$Id: policy.h 9352 2010-11-06 04:55:26Z mike $" + * "$Id: policy.h 6895 2007-08-30 00:09:27Z mike $" * * Policy definitions for the CUPS scheduler. * @@ -59,5 +59,5 @@ extern cups_array_t *cupsdGetPrivateAttrs(cupsd_policy_t *p, /* - * End of "$Id: policy.h 9352 2010-11-06 04:55:26Z mike $". + * End of "$Id: policy.h 6895 2007-08-30 00:09:27Z mike $". */ diff --git a/scheduler/printers.c b/scheduler/printers.c index b56018d5..f581b32a 100644 --- a/scheduler/printers.c +++ b/scheduler/printers.c @@ -1,5 +1,5 @@ /* - * "$Id: printers.c 10762 2012-12-13 20:28:30Z mike $" + * "$Id: printers.c 7968 2008-09-19 23:03:01Z mike $" * * Printer routines for the CUPS scheduler. * @@ -5317,5 +5317,5 @@ write_xml_string(cups_file_t *fp, /* I - File to write to */ /* - * End of "$Id: printers.c 10762 2012-12-13 20:28:30Z mike $". + * End of "$Id: printers.c 7968 2008-09-19 23:03:01Z mike $". */ diff --git a/scheduler/printers.h b/scheduler/printers.h index 4a0089a1..2242ddd1 100644 --- a/scheduler/printers.h +++ b/scheduler/printers.h @@ -1,5 +1,5 @@ /* - * "$Id: printers.h 10467 2012-05-16 03:35:54Z mike $" + * "$Id: printers.h 7564 2008-05-15 00:57:43Z mike $" * * Printer definitions for the CUPS scheduler. * @@ -189,5 +189,5 @@ extern void cupsdWritePrintcap(void); /* - * End of "$Id: printers.h 10467 2012-05-16 03:35:54Z mike $". + * End of "$Id: printers.h 7564 2008-05-15 00:57:43Z mike $". */ diff --git a/scheduler/process.c b/scheduler/process.c index 292a0d9e..17820641 100644 --- a/scheduler/process.c +++ b/scheduler/process.c @@ -1,5 +1,5 @@ /* - * "$Id: process.c 10424 2012-04-23 17:26:57Z mike $" + * "$Id: process.c 7256 2008-01-25 00:48:54Z mike $" * * Process management routines for the CUPS scheduler. * @@ -652,5 +652,5 @@ cupsd_requote(char *dst, /* I - Destination buffer */ /* - * End of "$Id: process.c 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: process.c 7256 2008-01-25 00:48:54Z mike $". */ diff --git a/scheduler/quotas.c b/scheduler/quotas.c index 5051756c..e41c1cc1 100644 --- a/scheduler/quotas.c +++ b/scheduler/quotas.c @@ -1,5 +1,5 @@ /* - * "$Id: quotas.c 9793 2011-05-20 03:49:49Z mike $" + * "$Id: quotas.c 6947 2007-09-12 21:09:49Z mike $" * * Quota routines for the CUPS scheduler. * @@ -240,5 +240,5 @@ compare_quotas(const cupsd_quota_t *q1, /* I - First quota record */ /* - * End of "$Id: quotas.c 9793 2011-05-20 03:49:49Z mike $". + * End of "$Id: quotas.c 6947 2007-09-12 21:09:49Z mike $". */ diff --git a/scheduler/select.c b/scheduler/select.c index a2bac8a4..4510d7c2 100644 --- a/scheduler/select.c +++ b/scheduler/select.c @@ -1,5 +1,5 @@ /* - * "$Id: select.c 10142 2011-12-02 20:02:15Z mike $" + * "$Id: select.c 7720 2008-07-11 22:46:21Z mike $" * * Select abstraction functions for the CUPS scheduler. * @@ -947,5 +947,5 @@ find_fd(int fd) /* I - File descriptor */ /* - * End of "$Id: select.c 10142 2011-12-02 20:02:15Z mike $". + * End of "$Id: select.c 7720 2008-07-11 22:46:21Z mike $". */ diff --git a/scheduler/server.c b/scheduler/server.c index 32ffafef..a5a31c59 100644 --- a/scheduler/server.c +++ b/scheduler/server.c @@ -1,5 +1,5 @@ /* - * "$Id: server.c 10490 2012-05-21 17:40:22Z mike $" + * "$Id: server.c 7927 2008-09-10 22:05:29Z mike $" * * Server start/stop routines for the CUPS scheduler. * @@ -180,5 +180,5 @@ cupsdStopServer(void) /* - * End of "$Id: server.c 10490 2012-05-21 17:40:22Z mike $". + * End of "$Id: server.c 7927 2008-09-10 22:05:29Z mike $". */ diff --git a/scheduler/statbuf.c b/scheduler/statbuf.c index cb758779..e719aebd 100644 --- a/scheduler/statbuf.c +++ b/scheduler/statbuf.c @@ -1,5 +1,5 @@ /* - * "$Id: statbuf.c 9350 2010-11-04 23:23:25Z mike $" + * "$Id: statbuf.c 7674 2008-06-18 23:18:32Z mike $" * * Status buffer routines for the CUPS scheduler. * @@ -326,5 +326,5 @@ cupsdStatBufUpdate( /* - * End of "$Id: statbuf.c 9350 2010-11-04 23:23:25Z mike $". + * End of "$Id: statbuf.c 7674 2008-06-18 23:18:32Z mike $". */ diff --git a/scheduler/statbuf.h b/scheduler/statbuf.h index acb793dd..1ca22721 100644 --- a/scheduler/statbuf.h +++ b/scheduler/statbuf.h @@ -1,5 +1,5 @@ /* - * "$Id: statbuf.h 9350 2010-11-04 23:23:25Z mike $" + * "$Id: statbuf.h 7674 2008-06-18 23:18:32Z mike $" * * Status buffer definitions for the CUPS scheduler. * @@ -45,5 +45,5 @@ extern char *cupsdStatBufUpdate(cupsd_statbuf_t *sb, int *loglevel, /* - * End of "$Id: statbuf.h 9350 2010-11-04 23:23:25Z mike $". + * End of "$Id: statbuf.h 7674 2008-06-18 23:18:32Z mike $". */ diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c index b6be4c8f..15414fc1 100644 --- a/scheduler/subscriptions.c +++ b/scheduler/subscriptions.c @@ -1,5 +1,5 @@ /* - * "$Id: subscriptions.c 10253 2012-02-11 22:10:54Z mike $" + * "$Id: subscriptions.c 7824 2008-08-01 21:11:55Z mike $" * * Subscription routines for the CUPS scheduler. * @@ -1638,5 +1638,5 @@ cupsd_update_notifier(void) /* - * End of "$Id: subscriptions.c 10253 2012-02-11 22:10:54Z mike $". + * End of "$Id: subscriptions.c 7824 2008-08-01 21:11:55Z mike $". */ diff --git a/scheduler/subscriptions.h b/scheduler/subscriptions.h index 20d59b7b..2a2714ec 100644 --- a/scheduler/subscriptions.h +++ b/scheduler/subscriptions.h @@ -1,5 +1,5 @@ /* - * "$Id: subscriptions.h 9350 2010-11-04 23:23:25Z mike $" + * "$Id: subscriptions.h 7824 2008-08-01 21:11:55Z mike $" * * Subscription definitions for the CUPS scheduler. * @@ -162,5 +162,5 @@ extern void cupsdStopAllNotifiers(void); /* - * End of "$Id: subscriptions.h 9350 2010-11-04 23:23:25Z mike $". + * End of "$Id: subscriptions.h 7824 2008-08-01 21:11:55Z mike $". */ diff --git a/scheduler/sysman.c b/scheduler/sysman.c index 2a7258ab..945149f7 100644 --- a/scheduler/sysman.c +++ b/scheduler/sysman.c @@ -1,5 +1,5 @@ /* - * "$Id: sysman.c 10471 2012-05-16 22:57:03Z mike $" + * "$Id: sysman.c 7928 2008-09-10 22:14:22Z mike $" * * System management functions for the CUPS scheduler. * @@ -1002,5 +1002,5 @@ sysUpdate(void) /* - * End of "$Id: sysman.c 10471 2012-05-16 22:57:03Z mike $". + * End of "$Id: sysman.c 7928 2008-09-10 22:14:22Z mike $". */ diff --git a/scheduler/sysman.h b/scheduler/sysman.h index 18974bb7..d1672bf3 100644 --- a/scheduler/sysman.h +++ b/scheduler/sysman.h @@ -1,5 +1,5 @@ /* - * "$Id: sysman.h 10104 2011-11-04 06:37:03Z mike $" + * "$Id: sysman.h 7928 2008-09-10 22:14:22Z mike $" * * System management definitions for the CUPS scheduler. * @@ -60,5 +60,5 @@ extern void cupsdStopSystemMonitor(void); /* - * End of "$Id: sysman.h 10104 2011-11-04 06:37:03Z mike $". + * End of "$Id: sysman.h 7928 2008-09-10 22:14:22Z mike $". */ diff --git a/scheduler/testlpd.c b/scheduler/testlpd.c index 94722d06..c534f593 100644 --- a/scheduler/testlpd.c +++ b/scheduler/testlpd.c @@ -1,5 +1,5 @@ /* - * "$Id: testlpd.c 9950 2011-09-01 23:02:24Z mike $" + * "$Id: testlpd.c 6789 2007-08-13 19:52:43Z mike $" * * cups-lpd test program for CUPS. * @@ -546,5 +546,5 @@ usage(void) /* - * End of "$Id: testlpd.c 9950 2011-09-01 23:02:24Z mike $". + * End of "$Id: testlpd.c 6789 2007-08-13 19:52:43Z mike $". */ diff --git a/scheduler/testmime.c b/scheduler/testmime.c index aa68a2cd..ad7914d2 100644 --- a/scheduler/testmime.c +++ b/scheduler/testmime.c @@ -1,5 +1,5 @@ /* - * "$Id: testmime.c 10869 2013-02-19 23:53:01Z mike $" + * "$Id: testmime.c 7670 2008-06-17 22:42:08Z mike $" * * MIME test program for CUPS. * @@ -527,5 +527,5 @@ type_dir(mime_t *mime, /* I - MIME database */ /* - * End of "$Id: testmime.c 10869 2013-02-19 23:53:01Z mike $". + * End of "$Id: testmime.c 7670 2008-06-17 22:42:08Z mike $". */ diff --git a/scheduler/testspeed.c b/scheduler/testspeed.c index 2b449764..4aeaf267 100644 --- a/scheduler/testspeed.c +++ b/scheduler/testspeed.c @@ -1,5 +1,5 @@ /* - * "$Id: testspeed.c 9950 2011-09-01 23:02:24Z mike $" + * "$Id: testspeed.c 7727 2008-07-14 18:02:21Z mike $" * * Scheduler speed test for CUPS. * @@ -361,5 +361,5 @@ usage(void) /* - * End of "$Id: testspeed.c 9950 2011-09-01 23:02:24Z mike $". + * End of "$Id: testspeed.c 7727 2008-07-14 18:02:21Z mike $". */ diff --git a/scheduler/testsub.c b/scheduler/testsub.c index 389b9a44..88294a35 100644 --- a/scheduler/testsub.c +++ b/scheduler/testsub.c @@ -1,5 +1,5 @@ /* - * "$Id: testsub.c 10299 2012-02-16 00:33:54Z mike $" + * "$Id: testsub.c 6649 2007-07-11 21:46:42Z mike $" * * Scheduler notification tester for CUPS. * @@ -519,5 +519,5 @@ usage(void) /* - * End of "$Id: testsub.c 10299 2012-02-16 00:33:54Z mike $". + * End of "$Id: testsub.c 6649 2007-07-11 21:46:42Z mike $". */ diff --git a/scheduler/tls-darwin.c b/scheduler/tls-darwin.c index 117213ae..682362cf 100644 --- a/scheduler/tls-darwin.c +++ b/scheduler/tls-darwin.c @@ -1,5 +1,5 @@ /* - * "$Id: tls-darwin.c 10471 2012-05-16 22:57:03Z mike $" + * "$Id: tls-darwin.c 3833 2012-05-23 22:51:18Z msweet $" * * TLS support code for the CUPS scheduler on OS X. * @@ -566,5 +566,5 @@ make_certificate(cupsd_client_t *con) /* I - Client connection */ /* - * End of "$Id: tls-darwin.c 10471 2012-05-16 22:57:03Z mike $". + * End of "$Id: tls-darwin.c 3833 2012-05-23 22:51:18Z msweet $". */ diff --git a/scheduler/tls-gnutls.c b/scheduler/tls-gnutls.c index 106dc522..5d129c88 100644 --- a/scheduler/tls-gnutls.c +++ b/scheduler/tls-gnutls.c @@ -1,5 +1,5 @@ /* - * "$Id: tls-gnutls.c 10374 2012-03-22 20:30:20Z mike $" + * "$Id: tls-gnutls.c 3755 2012-03-30 05:59:14Z msweet $" * * TLS support code for the CUPS scheduler using GNU TLS. * @@ -288,5 +288,5 @@ make_certificate(cupsd_client_t *con) /* I - Client connection */ /* - * End of "$Id: tls-gnutls.c 10374 2012-03-22 20:30:20Z mike $". + * End of "$Id: tls-gnutls.c 3755 2012-03-30 05:59:14Z msweet $". */ diff --git a/scheduler/tls-openssl.c b/scheduler/tls-openssl.c index f19d28ae..19d3eefb 100644 --- a/scheduler/tls-openssl.c +++ b/scheduler/tls-openssl.c @@ -1,5 +1,5 @@ /* - * "$Id: tls-openssl.c 10374 2012-03-22 20:30:20Z mike $" + * "$Id: tls-openssl.c 3755 2012-03-30 05:59:14Z msweet $" * * TLS support code for the CUPS scheduler using OpenSSL. * @@ -349,5 +349,5 @@ make_certificate(cupsd_client_t *con) /* I - Client connection */ /* - * End of "$Id: tls-openssl.c 10374 2012-03-22 20:30:20Z mike $". + * End of "$Id: tls-openssl.c 3755 2012-03-30 05:59:14Z msweet $". */ diff --git a/scheduler/tls.c b/scheduler/tls.c index 357af741..41a107ab 100644 --- a/scheduler/tls.c +++ b/scheduler/tls.c @@ -1,5 +1,5 @@ /* - * "$Id: tls.c 10377 2012-03-22 21:14:02Z mike $" + * "$Id: tls.c 3755 2012-03-30 05:59:14Z msweet $" * * TLS support code for the CUPS scheduler. * @@ -26,5 +26,5 @@ /* - * End of "$Id: tls.c 10377 2012-03-22 21:14:02Z mike $". + * End of "$Id: tls.c 3755 2012-03-30 05:59:14Z msweet $". */ diff --git a/scheduler/type.c b/scheduler/type.c index d2e32b2a..60c858a9 100644 --- a/scheduler/type.c +++ b/scheduler/type.c @@ -1,5 +1,5 @@ /* - * "$Id: type.c 9793 2011-05-20 03:49:49Z mike $" + * "$Id: type.c 7720 2008-07-11 22:46:21Z mike $" * * MIME typing routines for CUPS. * @@ -1212,5 +1212,5 @@ mime_patmatch(const char *s, /* I - String to match against */ /* - * End of "$Id: type.c 9793 2011-05-20 03:49:49Z mike $". + * End of "$Id: type.c 7720 2008-07-11 22:46:21Z mike $". */ diff --git a/scheduler/util.c b/scheduler/util.c index 281c1e3c..fc55d579 100644 --- a/scheduler/util.c +++ b/scheduler/util.c @@ -1,5 +1,5 @@ /* - * "$Id: util.c 10424 2012-04-23 17:26:57Z mike $" + * "$Id: util.c 7621 2008-06-06 18:55:35Z mike $" * * Mini-daemon utility functions for CUPS. * @@ -467,5 +467,5 @@ cupsdSendIPPTrailer(void) /* - * End of "$Id: util.c 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: util.c 7621 2008-06-06 18:55:35Z mike $". */ diff --git a/scheduler/util.h b/scheduler/util.h index 0080914f..c31c045d 100644 --- a/scheduler/util.h +++ b/scheduler/util.h @@ -1,5 +1,5 @@ /* - * "$Id: util.h 9755 2011-05-09 22:53:31Z mike $" + * "$Id: util.h 7711 2008-07-02 04:39:27Z mike $" * * Mini-daemon utility definitions for CUPS. * @@ -67,5 +67,5 @@ extern void cupsdSendIPPTrailer(void); #endif /* !_CUPSD_UTIL_H_ */ /* - * End of "$Id: util.h 9755 2011-05-09 22:53:31Z mike $". + * End of "$Id: util.h 7711 2008-07-02 04:39:27Z mike $". */ diff --git a/systemv/Makefile b/systemv/Makefile index de6273f0..5fb794a9 100644 --- a/systemv/Makefile +++ b/systemv/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 10191 2012-01-20 19:00:32Z mike $" +# "$Id: Makefile 7929 2008-09-10 22:23:59Z mike $" # # System V commands makefile for CUPS. # @@ -289,5 +289,5 @@ include Dependencies # -# End of "$Id: Makefile 10191 2012-01-20 19:00:32Z mike $". +# End of "$Id: Makefile 7929 2008-09-10 22:23:59Z mike $". # diff --git a/systemv/cancel.c b/systemv/cancel.c index cbebf114..b2881ca1 100644 --- a/systemv/cancel.c +++ b/systemv/cancel.c @@ -1,5 +1,5 @@ /* - * "$Id: cancel.c 9793 2011-05-20 03:49:49Z mike $" + * "$Id: cancel.c 7720 2008-07-11 22:46:21Z mike $" * * "cancel" command for CUPS. * @@ -372,5 +372,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: cancel.c 9793 2011-05-20 03:49:49Z mike $". + * End of "$Id: cancel.c 7720 2008-07-11 22:46:21Z mike $". */ diff --git a/systemv/cupsaccept.c b/systemv/cupsaccept.c index 8423b11c..67a682cc 100644 --- a/systemv/cupsaccept.c +++ b/systemv/cupsaccept.c @@ -1,5 +1,5 @@ /* - * "$Id: cupsaccept.c 9384 2010-11-22 07:06:39Z mike $" + * "$Id: cupsaccept.c 2873 2010-11-30 03:16:24Z msweet $" * * "cupsaccept", "cupsdisable", "cupsenable", and "cupsreject" commands for * CUPS. @@ -235,5 +235,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: cupsaccept.c 9384 2010-11-22 07:06:39Z mike $". + * End of "$Id: cupsaccept.c 2873 2010-11-30 03:16:24Z msweet $". */ diff --git a/systemv/cupsaddsmb.c b/systemv/cupsaddsmb.c index c307eb2c..2ce91ccc 100644 --- a/systemv/cupsaddsmb.c +++ b/systemv/cupsaddsmb.c @@ -1,5 +1,5 @@ /* - * "$Id: cupsaddsmb.c 10431 2012-04-23 19:19:19Z mike $" + * "$Id: cupsaddsmb.c 7033 2007-10-19 02:11:28Z mike $" * * "cupsaddsmb" command for CUPS. * @@ -295,5 +295,5 @@ usage(void) /* - * End of "$Id: cupsaddsmb.c 10431 2012-04-23 19:19:19Z mike $". + * End of "$Id: cupsaddsmb.c 7033 2007-10-19 02:11:28Z mike $". */ diff --git a/systemv/cupsctl.c b/systemv/cupsctl.c index ef1e2565..0cd2a59d 100644 --- a/systemv/cupsctl.c +++ b/systemv/cupsctl.c @@ -1,5 +1,5 @@ /* - * "$Id: cupsctl.c 10431 2012-04-23 19:19:19Z mike $" + * "$Id$" * * Scheduler control program for CUPS. * @@ -223,5 +223,5 @@ usage(const char *opt) /* I - Option character/string */ /* - * End of "$Id: cupsctl.c 10431 2012-04-23 19:19:19Z mike $". + * End of "$Id$". */ diff --git a/systemv/cupstestdsc.c b/systemv/cupstestdsc.c index 748cc924..5ec01aee 100644 --- a/systemv/cupstestdsc.c +++ b/systemv/cupstestdsc.c @@ -1,5 +1,5 @@ /* - * "$Id: cupstestdsc.c 9950 2011-09-01 23:02:24Z mike $" + * "$Id: cupstestdsc.c 7720 2008-07-11 22:46:21Z mike $" * * DSC test program for CUPS. * @@ -438,5 +438,5 @@ usage(void) /* - * End of "$Id: cupstestdsc.c 9950 2011-09-01 23:02:24Z mike $". + * End of "$Id: cupstestdsc.c 7720 2008-07-11 22:46:21Z mike $". */ diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c index 9a5608ce..a5c8622c 100644 --- a/systemv/cupstestppd.c +++ b/systemv/cupstestppd.c @@ -1,5 +1,5 @@ /* - * "$Id: cupstestppd.c 10661 2012-10-24 11:57:40Z mike $" + * "$Id: cupstestppd.c 7807 2008-07-28 21:54:24Z mike $" * * PPD test program for CUPS. * @@ -3972,5 +3972,5 @@ valid_utf8(const char *s) /* I - String to check */ /* - * End of "$Id: cupstestppd.c 10661 2012-10-24 11:57:40Z mike $". + * End of "$Id: cupstestppd.c 7807 2008-07-28 21:54:24Z mike $". */ diff --git a/systemv/lp.c b/systemv/lp.c index fb4d367f..1f3b1ccc 100644 --- a/systemv/lp.c +++ b/systemv/lp.c @@ -1,5 +1,5 @@ /* - * "$Id: lp.c 10830 2013-01-21 13:14:40Z mike $" + * "$Id: lp.c 7170 2008-01-04 02:21:30Z mike $" * * "lp" command for CUPS. * @@ -146,7 +146,8 @@ main(int argc, /* I - Number of command-line arguments */ if ((instance = strrchr(printer, '/')) != NULL) *instance++ = '\0'; - if ((dest = cupsGetNamedDest(NULL, printer, instance)) != NULL) + if ((dest = cupsGetNamedDest(CUPS_HTTP_DEFAULT, printer, + instance)) != NULL) { for (j = 0; j < dest->num_options; j ++) if (cupsGetOption(dest->options[j].name, num_options, @@ -155,6 +156,14 @@ main(int argc, /* I - Number of command-line arguments */ dest->options[j].value, num_options, &options); } + else if (cupsLastError() == IPP_BAD_REQUEST || + cupsLastError() == IPP_VERSION_NOT_SUPPORTED) + { + _cupsLangPrintf(stderr, + _("%s: Error - add '/version=1.1' to server " + "name."), argv[0]); + return (1); + } break; case 'f' : /* Form */ @@ -567,6 +576,14 @@ main(int argc, /* I - Number of command-line arguments */ dest->options[j].value, num_options, &options); } + else if (cupsLastError() == IPP_BAD_REQUEST || + cupsLastError() == IPP_VERSION_NOT_SUPPORTED) + { + _cupsLangPrintf(stderr, + _("%s: Error - add '/version=1.1' to server " + "name."), argv[0]); + return (1); + } } if (printer == NULL) @@ -679,7 +696,15 @@ restart_job(const char *command, /* I - Command name */ ippDelete(cupsDoRequest(CUPS_HTTP_DEFAULT, request, "/jobs")); - if (cupsLastError() > IPP_OK_CONFLICT) + if (cupsLastError() == IPP_BAD_REQUEST || + cupsLastError() == IPP_VERSION_NOT_SUPPORTED) + { + _cupsLangPrintf(stderr, + _("%s: Error - add '/version=1.1' to server " + "name."), command); + return (1); + } + else if (cupsLastError() > IPP_OK_CONFLICT) { _cupsLangPrintf(stderr, "%s: %s", command, cupsLastErrorString()); return (1); @@ -720,7 +745,15 @@ set_job_attrs(const char *command, /* I - Command name */ ippDelete(cupsDoRequest(CUPS_HTTP_DEFAULT, request, "/jobs")); - if (cupsLastError() > IPP_OK_CONFLICT) + if (cupsLastError() == IPP_BAD_REQUEST || + cupsLastError() == IPP_VERSION_NOT_SUPPORTED) + { + _cupsLangPrintf(stderr, + _("%s: Error - add '/version=1.1' to server " + "name."), command); + return (1); + } + else if (cupsLastError() > IPP_OK_CONFLICT) { _cupsLangPrintf(stderr, "%s: %s", command, cupsLastErrorString()); return (1); @@ -731,5 +764,5 @@ set_job_attrs(const char *command, /* I - Command name */ /* - * End of "$Id: lp.c 10830 2013-01-21 13:14:40Z mike $". + * End of "$Id: lp.c 7170 2008-01-04 02:21:30Z mike $". */ diff --git a/systemv/lpadmin.c b/systemv/lpadmin.c index 19664206..5fe0b9bb 100644 --- a/systemv/lpadmin.c +++ b/systemv/lpadmin.c @@ -1,5 +1,5 @@ /* - * "$Id: lpadmin.c 10104 2011-11-04 06:37:03Z mike $" + * "$Id: lpadmin.c 7720 2008-07-11 22:46:21Z mike $" * * "lpadmin" command for CUPS. * @@ -1514,5 +1514,5 @@ validate_name(const char *name) /* I - Name to check */ /* - * End of "$Id: lpadmin.c 10104 2011-11-04 06:37:03Z mike $". + * End of "$Id: lpadmin.c 7720 2008-07-11 22:46:21Z mike $". */ diff --git a/systemv/lpinfo.c b/systemv/lpinfo.c index 5bda1c8e..f51019b7 100644 --- a/systemv/lpinfo.c +++ b/systemv/lpinfo.c @@ -1,5 +1,5 @@ /* - * "$Id: lpinfo.c 9384 2010-11-22 07:06:39Z mike $" + * "$Id: lpinfo.c 7810 2008-07-29 01:11:15Z mike $" * * "lpinfo" command for CUPS. * @@ -494,5 +494,5 @@ show_models( /* - * End of "$Id: lpinfo.c 9384 2010-11-22 07:06:39Z mike $". + * End of "$Id: lpinfo.c 7810 2008-07-29 01:11:15Z mike $". */ diff --git a/systemv/lpmove.c b/systemv/lpmove.c index 516ef767..d7c2dfb6 100644 --- a/systemv/lpmove.c +++ b/systemv/lpmove.c @@ -1,5 +1,5 @@ /* - * "$Id: lpmove.c 9384 2010-11-22 07:06:39Z mike $" + * "$Id: lpmove.c 7219 2008-01-14 22:00:02Z mike $" * * "lpmove" command for CUPS. * @@ -209,5 +209,5 @@ move_job(http_t *http, /* I - HTTP connection to server */ /* - * End of "$Id: lpmove.c 9384 2010-11-22 07:06:39Z mike $". + * End of "$Id: lpmove.c 7219 2008-01-14 22:00:02Z mike $". */ diff --git a/systemv/lpoptions.c b/systemv/lpoptions.c index 6b938245..06a1762c 100644 --- a/systemv/lpoptions.c +++ b/systemv/lpoptions.c @@ -1,5 +1,5 @@ /* - * "$Id: lpoptions.c 9950 2011-09-01 23:02:24Z mike $" + * "$Id: lpoptions.c 7720 2008-07-11 22:46:21Z mike $" * * Printer option program for CUPS. * @@ -561,5 +561,5 @@ usage(void) /* - * End of "$Id: lpoptions.c 9950 2011-09-01 23:02:24Z mike $". + * End of "$Id: lpoptions.c 7720 2008-07-11 22:46:21Z mike $". */ diff --git a/systemv/lppasswd.c b/systemv/lppasswd.c index efea0212..b9962ecf 100644 --- a/systemv/lppasswd.c +++ b/systemv/lppasswd.c @@ -1,5 +1,5 @@ /* - * "$Id: lppasswd.c 9950 2011-09-01 23:02:24Z mike $" + * "$Id: lppasswd.c 6649 2007-07-11 21:46:42Z mike $" * * MD5 password program for CUPS. * @@ -485,5 +485,5 @@ usage(FILE *fp) /* I - File to send usage to */ /* - * End of "$Id: lppasswd.c 9950 2011-09-01 23:02:24Z mike $". + * End of "$Id: lppasswd.c 6649 2007-07-11 21:46:42Z mike $". */ diff --git a/systemv/lpstat.c b/systemv/lpstat.c index 1513e70f..7edc778d 100644 --- a/systemv/lpstat.c +++ b/systemv/lpstat.c @@ -1,9 +1,9 @@ /* - * "$Id: lpstat.c 10062 2011-10-07 21:05:19Z mike $" + * "$Id: lpstat.c 7921 2008-09-10 15:42:24Z mike $" * * "lpstat" command for CUPS. * - * Copyright 2007-2011 by Apple Inc. + * Copyright 2007-2013 by Apple Inc. * Copyright 1997-2006 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -199,6 +199,16 @@ main(int argc, /* I - Number of command-line arguments */ { cupsFreeDests(num_dests, dests); num_dests = cupsGetDests(&dests); + + if (num_dests == 0 && + (cupsLastError() == IPP_BAD_REQUEST || + cupsLastError() == IPP_VERSION_NOT_SUPPORTED)) + { + _cupsLangPrintf(stderr, + _("%s: Error - add '/version=1.1' to server " + "name."), argv[0]); + return (1); + } } status |= show_accepting(NULL, num_dests, dests); @@ -267,6 +277,16 @@ main(int argc, /* I - Number of command-line arguments */ dests = cupsGetNamedDest(CUPS_HTTP_DEFAULT, NULL, NULL); num_dests = dests ? 1 : 0; + + if (num_dests == 0 && + (cupsLastError() == IPP_BAD_REQUEST || + cupsLastError() == IPP_VERSION_NOT_SUPPORTED)) + { + _cupsLangPrintf(stderr, + _("%s: Error - add '/version=1.1' to server " + "name."), argv[0]); + return (1); + } } show_default(dests); @@ -359,6 +379,16 @@ main(int argc, /* I - Number of command-line arguments */ { cupsFreeDests(num_dests, dests); num_dests = cupsGetDests(&dests); + + if (num_dests == 0 && + (cupsLastError() == IPP_BAD_REQUEST || + cupsLastError() == IPP_VERSION_NOT_SUPPORTED)) + { + _cupsLangPrintf(stderr, + _("%s: Error - add '/version=1.1' to server " + "name."), argv[0]); + return (1); + } } status |= show_printers(NULL, num_dests, dests, long_status); @@ -378,6 +408,16 @@ main(int argc, /* I - Number of command-line arguments */ { cupsFreeDests(num_dests, dests); num_dests = cupsGetDests(&dests); + + if (num_dests == 0 && + (cupsLastError() == IPP_BAD_REQUEST || + cupsLastError() == IPP_VERSION_NOT_SUPPORTED)) + { + _cupsLangPrintf(stderr, + _("%s: Error - add '/version=1.1' to server " + "name."), argv[0]); + return (1); + } } show_default(cupsGetDest(NULL, NULL, num_dests, dests)); @@ -392,6 +432,16 @@ main(int argc, /* I - Number of command-line arguments */ { cupsFreeDests(num_dests, dests); num_dests = cupsGetDests(&dests); + + if (num_dests == 0 && + (cupsLastError() == IPP_BAD_REQUEST || + cupsLastError() == IPP_VERSION_NOT_SUPPORTED)) + { + _cupsLangPrintf(stderr, + _("%s: Error - add '/version=1.1' to server " + "name."), argv[0]); + return (1); + } } show_scheduler(); @@ -441,6 +491,16 @@ main(int argc, /* I - Number of command-line arguments */ { cupsFreeDests(num_dests, dests); num_dests = cupsGetDests(&dests); + + if (num_dests == 0 && + (cupsLastError() == IPP_BAD_REQUEST || + cupsLastError() == IPP_VERSION_NOT_SUPPORTED)) + { + _cupsLangPrintf(stderr, + _("%s: Error - add '/version=1.1' to server " + "name."), argv[0]); + return (1); + } } status |= show_devices(NULL, num_dests, dests); @@ -500,9 +560,16 @@ check_dest(const char *command, /* I - Command name */ if ((*dests = cupsGetNamedDest(CUPS_HTTP_DEFAULT, printer, pptr)) == NULL) { - _cupsLangPrintf(stderr, - _("%s: Invalid destination name in list \"%s\"."), - command, name); + if (cupsLastError() == IPP_BAD_REQUEST || + cupsLastError() == IPP_VERSION_NOT_SUPPORTED) + _cupsLangPrintf(stderr, + _("%s: Error - add '/version=1.1' to server name."), + command); + else + _cupsLangPrintf(stderr, + _("%s: Invalid destination name in list \"%s\"."), + command, name); + exit(1); } else @@ -554,8 +621,15 @@ check_dest(const char *command, /* I - Command name */ if (!cupsGetDest(printer, NULL, *num_dests, *dests)) { - _cupsLangPrintf(stderr, - _("%s: Unknown destination \"%s\"."), command, printer); + if (cupsLastError() == IPP_BAD_REQUEST || + cupsLastError() == IPP_VERSION_NOT_SUPPORTED) + _cupsLangPrintf(stderr, + _("%s: Error - add '/version=1.1' to server name."), + command); + else + _cupsLangPrintf(stderr, + _("%s: Unknown destination \"%s\"."), command, printer); + exit(1); } } @@ -670,16 +744,27 @@ show_accepting(const char *printers, /* I - Destinations */ * Do the request and get back a response... */ - if ((response = cupsDoRequest(CUPS_HTTP_DEFAULT, request, "/")) != NULL) + response = cupsDoRequest(CUPS_HTTP_DEFAULT, request, "/"); + + if (cupsLastError() == IPP_BAD_REQUEST || + cupsLastError() == IPP_VERSION_NOT_SUPPORTED) { - DEBUG_puts("show_accepting: request succeeded..."); + _cupsLangPrintf(stderr, + _("%s: Error - add '/version=1.1' to server name."), + "lpstat"); + ippDelete(response); + return (1); + } + else if (cupsLastError() > IPP_OK_CONFLICT) + { + _cupsLangPrintf(stderr, "lpstat: %s", cupsLastErrorString()); + ippDelete(response); + return (1); + } - if (response->request.status.status_code > IPP_OK_CONFLICT) - { - _cupsLangPrintf(stderr, "lpstat: %s", cupsLastErrorString()); - ippDelete(response); - return (1); - } + if (response) + { + DEBUG_puts("show_accepting: request succeeded..."); /* * Loop through the printers returned in the list and display @@ -782,11 +867,6 @@ show_accepting(const char *printers, /* I - Destinations */ ippDelete(response); } - else - { - _cupsLangPrintf(stderr, "lpstat: %s", cupsLastErrorString()); - return (1); - } return (0); } @@ -849,7 +929,25 @@ show_classes(const char *dests) /* I - Destinations */ * Do the request and get back a response... */ - if ((response = cupsDoRequest(CUPS_HTTP_DEFAULT, request, "/")) != NULL) + response = cupsDoRequest(CUPS_HTTP_DEFAULT, request, "/"); + + if (cupsLastError() == IPP_BAD_REQUEST || + cupsLastError() == IPP_VERSION_NOT_SUPPORTED) + { + _cupsLangPrintf(stderr, + _("%s: Error - add '/version=1.1' to server name."), + "lpstat"); + ippDelete(response); + return (1); + } + else if (cupsLastError() > IPP_OK_CONFLICT) + { + _cupsLangPrintf(stderr, "lpstat: %s", cupsLastErrorString()); + ippDelete(response); + return (1); + } + + if (response) { DEBUG_puts("show_classes: request succeeded..."); @@ -987,11 +1085,6 @@ show_classes(const char *dests) /* I - Destinations */ ippDelete(response); } - else - { - _cupsLangPrintf(stderr, "lpstat: %s", cupsLastErrorString()); - return (1); - } return (0); } @@ -1097,16 +1190,27 @@ show_devices(const char *printers, /* I - Destinations */ * Do the request and get back a response... */ - if ((response = cupsDoRequest(CUPS_HTTP_DEFAULT, request, "/")) != NULL) + response = cupsDoRequest(CUPS_HTTP_DEFAULT, request, "/"); + + if (cupsLastError() == IPP_BAD_REQUEST || + cupsLastError() == IPP_VERSION_NOT_SUPPORTED) { - DEBUG_puts("show_devices: request succeeded..."); + _cupsLangPrintf(stderr, + _("%s: Error - add '/version=1.1' to server name."), + "lpstat"); + ippDelete(response); + return (1); + } + else if (cupsLastError() > IPP_OK_CONFLICT) + { + _cupsLangPrintf(stderr, "lpstat: %s", cupsLastErrorString()); + ippDelete(response); + return (1); + } - if (response->request.status.status_code > IPP_OK_CONFLICT) - { - _cupsLangPrintf(stderr, "lpstat: %s", cupsLastErrorString()); - ippDelete(response); - return (1); - } + if (response) + { + DEBUG_puts("show_devices: request succeeded..."); /* * Loop through the printers returned in the list and display @@ -1246,11 +1350,6 @@ show_devices(const char *printers, /* I - Destinations */ ippDelete(response); } - else - { - _cupsLangPrintf(stderr, "lpstat: %s", cupsLastErrorString()); - return (1); - } return (0); } @@ -1334,19 +1433,30 @@ show_jobs(const char *dests, /* I - Destinations */ * Do the request and get back a response... */ - if ((response = cupsDoRequest(CUPS_HTTP_DEFAULT, request, "/")) != NULL) + response = cupsDoRequest(CUPS_HTTP_DEFAULT, request, "/"); + + if (cupsLastError() == IPP_BAD_REQUEST || + cupsLastError() == IPP_VERSION_NOT_SUPPORTED) + { + _cupsLangPrintf(stderr, + _("%s: Error - add '/version=1.1' to server name."), + "lpstat"); + ippDelete(response); + return (1); + } + else if (cupsLastError() > IPP_OK_CONFLICT) + { + _cupsLangPrintf(stderr, "lpstat: %s", cupsLastErrorString()); + ippDelete(response); + return (1); + } + + if (response) { /* * Loop through the job list and display them... */ - if (response->request.status.status_code > IPP_OK_CONFLICT) - { - _cupsLangPrintf(stderr, "lpstat: %s", cupsLastErrorString()); - ippDelete(response); - return (1); - } - rank = -1; for (attr = response->attrs; attr != NULL; attr = attr->next) @@ -1492,11 +1602,6 @@ show_jobs(const char *dests, /* I - Destinations */ ippDelete(response); } - else - { - _cupsLangPrintf(stderr, "lpstat: %s", cupsLastErrorString()); - return (1); - } return (0); } @@ -1587,16 +1692,27 @@ show_printers(const char *printers, /* I - Destinations */ * Do the request and get back a response... */ - if ((response = cupsDoRequest(CUPS_HTTP_DEFAULT, request, "/")) != NULL) + response = cupsDoRequest(CUPS_HTTP_DEFAULT, request, "/"); + + if (cupsLastError() == IPP_BAD_REQUEST || + cupsLastError() == IPP_VERSION_NOT_SUPPORTED) { - DEBUG_puts("show_printers: request succeeded..."); + _cupsLangPrintf(stderr, + _("%s: Error - add '/version=1.1' to server name."), + "lpstat"); + ippDelete(response); + return (1); + } + else if (cupsLastError() > IPP_OK_CONFLICT) + { + _cupsLangPrintf(stderr, "lpstat: %s", cupsLastErrorString()); + ippDelete(response); + return (1); + } - if (response->request.status.status_code > IPP_OK_CONFLICT) - { - _cupsLangPrintf(stderr, "lpstat: %s", cupsLastErrorString()); - ippDelete(response); - return (1); - } + if (response) + { + DEBUG_puts("show_printers: request succeeded..."); /* * Loop through the printers returned in the list and display @@ -2018,11 +2134,6 @@ show_printers(const char *printers, /* I - Destinations */ ippDelete(response); } - else - { - _cupsLangPrintf(stderr, "lpstat: %s", cupsLastErrorString()); - return (1); - } return (0); } @@ -2050,5 +2161,5 @@ show_scheduler(void) /* - * End of "$Id: lpstat.c 10062 2011-10-07 21:05:19Z mike $". + * End of "$Id: lpstat.c 7921 2008-09-10 15:42:24Z mike $". */ diff --git a/templates/Makefile b/templates/Makefile index fe2d9827..9f32260a 100644 --- a/templates/Makefile +++ b/templates/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 9771 2011-05-12 05:21:56Z mike $" +# "$Id: Makefile 7940 2008-09-16 00:45:16Z mike $" # # Template makefile for CUPS. # @@ -200,5 +200,5 @@ uninstall-langbundle: # -# End of "$Id: Makefile 9771 2011-05-12 05:21:56Z mike $". +# End of "$Id: Makefile 7940 2008-09-16 00:45:16Z mike $". # diff --git a/templates/ru/add-class.tmpl b/templates/ru/add-class.tmpl index dbb60c62..a119d866 100644 --- a/templates/ru/add-class.tmpl +++ b/templates/ru/add-class.tmpl @@ -37,44 +37,4 @@ </TABLE> </FORM> -</DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">Новая группа</H2> - -<FORM METHOD="POST" ACTION="/admin"> -<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> -<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> - -<TABLE> -<TR> -<TH CLASS="label">Название:</TH> -<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127"><BR> -<SMALL>(может содержать любые символы кроме "/", "#" и пробела)</SMALL></TD> -</TR> -<TR> -<TH CLASS="label">Описание:</TH> -<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127"><BR> -<SMALL>(Расширенное описание группы, например, "Дуплексный принтер")</SMALL></TD> -</TR> -<TR> -<TH CLASS="label">Расположение:</TH> -<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127"><BR> -<SMALL>(Место расположение группы, например, "Кабинет 55")</SMALL></TD> -</TR> -<TR> -<TH CLASS="label">Состав группы:</TH> -<TD> -<SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE> -{[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}} -</SELECT> -</TD> -</TR> -<TR> -<TD></TD> -<TD><INPUT TYPE="SUBMIT" VALUE="Добавить группу"></TD> -</TR> -</TABLE> - -</FORM> </DIV>
\ No newline at end of file diff --git a/templates/ru/add-printer.tmpl b/templates/ru/add-printer.tmpl index 05d105f9..6690d88c 100644 --- a/templates/ru/add-printer.tmpl +++ b/templates/ru/add-printer.tmpl @@ -44,51 +44,4 @@ </TABLE> </FORM> -</DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">Add Printer</H2> - -<FORM METHOD="POST" ACTION="/admin"> -<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> -<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> -<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> -<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}"> -<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}"> -<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}"> -{?current_make!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE" VALUE="{current_make}">:} -{?current_make_and_model!?<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{current_make_and_model}">:} - -<TABLE> -<TR> -<TH CLASS="label">Название:</TH> -<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?template_name}"><BR> -<SMALL>(может содержать любые символы кроме "/","#" и пробела)</SMALL></TD> -</TR> -<TR> -<TH CLASS="label">Описание:</TH> -<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_INFO}"><BR> -<SMALL>(расширенное описание, например "HP LaserJet с дуплексной печатью")</SMALL></TD> -</TR> -<TR> -<TH CLASS="label">Расположение:</TH> -<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_LOCATION}"><BR> -<SMALL>(месторасположение принтера, например, "Кабинет 55")</SMALL></TD> -</TR> -<TR> -<TH CLASS="label">Подключение:</TH> -<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD> -</TR> -<TR> -<TH CLASS="label">Совместный доступ:</TH> -<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> -Разрешить совместный доступ к этому принтеру</TD> -</TR> -<TR> -<TD></TD> -<TD><INPUT TYPE="SUBMIT" VALUE="Продолжить"></TD> -</TR> -</TABLE> - -</FORM> </DIV>
\ No newline at end of file diff --git a/templates/ru/add-rss-subscription.tmpl b/templates/ru/add-rss-subscription.tmpl index dcc79b5a..4567b926 100644 --- a/templates/ru/add-rss-subscription.tmpl +++ b/templates/ru/add-rss-subscription.tmpl @@ -42,47 +42,3 @@ </TABLE> </FORM> -<FORM METHOD="POST" ACTION="/admin"> -<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> -<INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"> - -<H2 CLASS="title">Добавление подписки по RSS</H2> - -<TABLE SUMMARY="Добавление подписки по RSS"> -<TR> -<TH CLASS="label">Название:</TH> -<TD COLSPAN="5"><INPUT TYPE="TEXT" NAME="SUBSCRIPTION_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?SUBSCRIPTION_NAME}"><BR> -<SMALL>(Может содержать любые символы кроме "/", "#", "?" и пробела)</SMALL></TD> -</TR> -<TR> -<TH CLASS="label">Очередь:</TH> -<TD COLSPAN="5"><SELECT NAME="PRINTER_URI" SIZE="10"><OPTION VALUE="#ALL#"{?PRINTER_URI=#ALL#? SELECTED:}>Все очереди</OPTION>{[printer_name]<OPTION VALUE="{printer_uri_supported}"{?PRINTER_URI={printer_uri_supported}? SELECTED:}>{printer_name}</OPTION>}</SELECT></TD> -</TR> -<TR VALIGN="TOP"> -<TH CLASS="label">События:</TH> -<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CREATED" {?EVENT_JOB_CREATED}>Новое задание<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_COMPLETED" {?EVENT_JOB_COMPLETED}>Задание выполнено<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_STOPPED" {?EVENT_JOB_STOPPED}>Задание остановленно<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CONFIG_CHANGED" {?EVENT_JOB_CONFIG_CHANGED}>Изменены параметры задания</TD> -<TD> </TD> -<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_STOPPED" {?EVENT_PRINTER_STOPPED}>Очередь остановлена<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_ADDED" {?EVENT_PRINTER_ADDED}>Очередь добавлена<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_MODIFIED" {?EVENT_PRINTER_MODIFIED}>Очередь изменена<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_DELETED" {?EVENT_PRINTER_DELETED}>Очередь удалена</TD> -<TD> </TD> -<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STARTED" {?EVENT_SERVER_STARTED}>Сервер запущен<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STOPPED" {?EVENT_SERVER_STOPPED}>Сервер остановлен<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_RESTARTED" {?EVENT_SERVER_RESTARTED}>Сервер перезапущен<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_AUDIT" {?EVENT_SERVER_AUDIT}>Проверка безопасности сервера</TD> -</TR> -<TR> -<TH CLASS="label">Количество событий в ленте:</TH> -<TD COLSPAN="5"><INPUT TYPE="NUMBER" NAME="MAX_EVENTS" SIZE="4" MAXLENGTH="4" VALUE="{MAX_EVENTS?{MAX_EVENTS}:20}"></TD> -</TR> -<TR> -<TD></TD> -<TD COLSPAN="5"><INPUT TYPE="SUBMIT" VALUE="Добавить подписку по RSS"></TD> -</TR> -</TABLE> - -</FORM> diff --git a/templates/ru/admin.tmpl b/templates/ru/admin.tmpl index d9650855..ae2aab2b 100644 --- a/templates/ru/admin.tmpl +++ b/templates/ru/admin.tmpl @@ -100,105 +100,3 @@ <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Отменить подписку по RSS"></FORM> </TD><TD>{notify_events}</TD><TD NOWRAP> {notify_printer_name?{notify_printer_name}:Все очереди}</TD></TR>} </TBODY> </TABLE>:} -<TABLE CLASS="indent" SUMMARY="Администрирование"> -<TR><TD VALIGN="TOP"> - -<H2 CLASS="title">Принтеры</H2> - -<P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="SUBMIT" VALUE="Добавить принтер"></FORM> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="find-new-printers"><INPUT TYPE="SUBMIT" VALUE="Найти новый принтер"></FORM> -<FORM ACTION="/printers/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Управление принтерами"></FORM> -{have_samba?<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"><INPUT TYPE="SUBMIT" VALUE="Экспортировать принтер в Samba"></FORM>:} -</P> - -<H2 CLASS="title">Группы</H2> - -<P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-class"><INPUT TYPE="SUBMIT" VALUE="Добавить группу"></FORM> -<FORM ACTION="/classes/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Управление группами"></FORM> -</P> - -<H2 CLASS="title">Задания</H2> - -<P> -<FORM ACTION="/jobs/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Управление заданиями"></FORM> -</P> - -</TD><TD> </TD><TD VALIGN="TOP"> - -<H2 CLASS="title">Сервер</H2> - -<P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"><INPUT TYPE="SUBMIT" VALUE="Редактировать конфигурационный файл"></FORM> -<FORM ACTION="/admin/log/access_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Показать журнал заданий"></FORM> -<FORM ACTION="/admin/log/error_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Показать журнал ошибок"></FORM> -<FORM ACTION="/admin/log/page_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Показать журнал страниц"></FORM> -</P> - -{SETTINGS_ERROR?<P>{SETTINGS_MESSAGE}</P> -<BLOCKQUOTE>{SETTINGS_ERROR}</BLOCKQUOTE>: - -<FORM METHOD="POST" ACTION="/admin"> -<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> - -{ADVANCEDSETTINGS?<P><B>Параметры сервера\:</B></P> - -<P><A HREF="/admin/">Дополнительные параметры<SMALL>▼</SMALL></A><BR> -<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"> -<INPUT TYPE="HIDDEN" NAME="ADVANCEDSETTINGS" VALUE="YES"> -<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Показать принтеры, использующиеся в других системах<BR> - Протоколы\: -<INPUT TYPE="TEXT" NAME="MAX_CLIENTS" VALUE="{?max_clients}" SIZE="6"><BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Разрешить печать из интернета<BR> - <INPUT TYPE="CHECKBOX" NAME="BROWSE_WEB_IF" {?browse_web_if}> Анонсировать веб-интерфейс<BR> -<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Разрешить удаленное администрирование<BR> -{have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Разрешить аутентификацию Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:} -<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Разрешать пользователям отменять любое задание(не только их собственное)<BR> -<INPUT TYPE="CHECKBOX" NAME="PRESERVE_JOBS" {?preserve_jobs}> Вести журнал заданий<BR> - Количество заданий\: -<INPUT TYPE="TEXT" NAME="MAX_JOBS" VALUE="{?max_jobs}" SIZE="6"><BR> - Записывать метаданные(Retain Metadata)\: -<INPUT TYPE="TEXT" NAME="PRESERVE_JOB_HISTORY" VALUE="{?preserve_job_history}" SIZE="6"><BR> - Существующие документы(Retain Documents)\: -<INPUT TYPE="TEXT" NAME="PRESERVE_JOB_FILES" VALUE="{?preserve_job_files}" SIZE="6"><BR> -<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Сохранять отладочную информацию в журнале<BR> - Максимальный размер журнала ошибок\: -<INPUT TYPE="TEXT" NAME="MAX_LOG_SIZE" VALUE="{?max_log_size}" SIZE="6"></P> - -:<P><B>Параметры сервера:</B></P> - -<P><A HREF="/admin/?ADVANCEDSETTINGS=YES">Дополнительные параметры <SMALL>▶</SMALL></A><BR> -<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"> -<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Разрешить совместный доступ к принтерам, подключенных к этой системе<BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Разрешить печать из Интернета<BR> -<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Разрешить удаленное администрирование<BR> -{have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Разрешить аутентификацию Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:} -<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Разрешить пользователям отменять любое задание(не только их собственные)<BR> -<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Сохранять отладочную информацию в журнале</P> - -} -<P><INPUT TYPE="SUBMIT" NAME="CHANGESETTINGS" VALUE="Сохранить"></P> - -</FORM>} - -</TD></TR> -</TABLE> - -<DIV CLASS="indent"> - -<H2 CLASS="title">Подписка по RSS</H2> - -<P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="Добавить подписку по RSS"></FORM> -</P> - -</DIV> - -{notify_subscription_id?<TABLE CLASS="list" SUMMARY="Подписки по RSS"> -<THEAD><TR><TH>Name</TH><TH>События</TH><TH>Очередь</TH></TR></THEAD> -<TBODY>{[notify_subscription_id] -<TR><TD><A HREF="{notify_recipient_uri}">{notify_recipient_name}</A><BR> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Отменить подписку по RSS"></FORM> </TD><TD>{notify_events}</TD><TD NOWRAP> {notify_printer_name?{notify_printer_name}:Все очереди}</TD></TR>} -</TBODY> -</TABLE>:} diff --git a/templates/ru/choose-device.tmpl b/templates/ru/choose-device.tmpl index 13d08b81..3472f5fa 100644 --- a/templates/ru/choose-device.tmpl +++ b/templates/ru/choose-device.tmpl @@ -51,56 +51,3 @@ VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> ALT="Busy Indicator"> Поиск принтеров...</P>} </DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">{op=modify-printer?Изменение {printer_name}:Добавление принтера}</H2> - -{CUPS_GET_DEVICES_DONE?<FORM METHOD="POST" ACTION="/admin"> -<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> -<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> -{printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} - -<TABLE> -{op=add-printer?:<TR> -<TH CLASS="label">Текущее подключение\:</TH> -<TD><INPUT TYPE="RADIO" NAME="DEVICE_URI" VALUE="{current_device_uri}" CHECKED> -{current_device_uri}</TD> -</TR>} -<TR> -<TH CLASS="label">Локальные принтеры\:</TH> -<TD> -{[device_uri]{device_class!network?<INPUT TYPE="RADIO" NAME="DEVICE_URI" -VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> -{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR> -:}} -</TD> -</TR> -<TR> -<TH CLASS="label">Обнаруженные сетевые принтеры\:</TH> -<TD> -{[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI" -VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> -{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR> -:}:}} -</TD> -</TR> -<TR> -<TR> -<TH CLASS="label">Другие сетевые принтеры\:</TH> -<TD> -{[device_uri]{device_class=network?{device_uri~[a-z]+://?:<INPUT TYPE="RADIO" NAME="DEVICE_URI" -VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"> -{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}<BR> -}:}} -</TD> -</TR> -<TR> -<TD></TD> -<TD><INPUT TYPE="SUBMIT" VALUE="Продолжить"></TD> -</TR> -</TABLE> - -</FORM>:<P><IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16" ALIGN="ABSMIDDLE" -ALT="Busy Indicator"> Поиск принтеров...</P>} - -</DIV> diff --git a/templates/ru/choose-make.tmpl b/templates/ru/choose-make.tmpl index e61e1143..55b91db8 100644 --- a/templates/ru/choose-make.tmpl +++ b/templates/ru/choose-make.tmpl @@ -61,68 +61,4 @@ TYPE="FILE" NAME="PPD_FILE"></TD> </TABLE> </FORM> -</DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">{op=modify-printer?Изменение {printer_name}:Добавление принтера}</H2> - -<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data"> -<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> -<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> -{printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} -<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> -<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}"> -<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}"> -<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}"> - -<TABLE> -{op=modify-printer?:<TR> -<TH CLASS="label">Название:</TH> -<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD> -</TR>} -<TR> -<TH CLASS="label">Описание:</TH> -<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{printer_info}">{printer_info}</TD> -</TR> -<TR> -<TH CLASS="label">Расположение:</TH> -<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{printer_location}">{printer_location}</TD> -</TR> -<TR> -<TH CLASS="label">Подключение:</TH> -<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD> -</TR> -<TR> -<TH CLASS="label">Совместный доступ:</TH> -<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_IS_SHARED" VALUE="{?printer_is_shared}"> -{?printer_is_shared=?Нет совместного доступа:{?printer_is_shared=0?Нет совместного доступа:}} Разрешить совместный доступ к этому принтеру</TD> -</TR> -<TR> -<TH CLASS="label">Создать:</TH> -<TD> -<SELECT NAME="PPD_MAKE" SIZE="10"> -{[ppd_make]<OPTION VALUE="{ppd_make}" {?current_make={ppd_make}?SELECTED:}>{ppd_make}} -</SELECT> -</TD> -</TR> -<TR> -<TD></TD> -<TD><INPUT TYPE="SUBMIT" VALUE="Продолжить"></TD> -</TR> -<TR> -<TD></TD> -<TD> </TD> -</TR> -<TR> -<TH CLASS="label">или использовать файл PPD:</TH> -<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT -TYPE="FILE" NAME="PPD_FILE"></TD> -</TR> -<TR> -<TD></TD> -<TD><INPUT TYPE="SUBMIT" VALUE="{op=add-printer?Добавить принтер:Сохранить}"></TD> -</TR> -</TABLE> - -</FORM> </DIV>
\ No newline at end of file diff --git a/templates/ru/choose-model.tmpl b/templates/ru/choose-model.tmpl index 06a268d9..b666329e 100644 --- a/templates/ru/choose-model.tmpl +++ b/templates/ru/choose-model.tmpl @@ -57,64 +57,4 @@ TYPE="FILE" NAME="PPD_FILE"></TD> </TABLE> </FORM> -</DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">{op=modify-printer?Изменение {printer_name}:Добавление принтера}</H2> - -<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data"> -<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> -<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> -{printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} -<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> -<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}"> -<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}"> -<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}"> -<TABLE> -{op=modify-printer?:<TR> -<TH CLASS="label">Название:</TH> -<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD> -</TR>} -<TR> -<TH CLASS="label">Описание:</TH> -<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{printer_info}">{printer_info}</TD> -</TR> -<TR> -<TH CLASS="label">Расположение:</TH> -<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{printer_location}">{printer_location}</TD> -</TR> -<TR> -<TH CLASS="label">Подключение:</TH> -<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD> -</TR> -<TR> -<TH CLASS="label">Совместный доступ:</TH> -<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_IS_SHARED" VALUE="{?printer_is_shared}"> -{?printer_is_shared=?Нет совместного доступа:{?printer_is_shared=0?Нет совместного доступа:}} Разрешить совместный доступ к этому принтеру</TD> -</TR> -<TR> -<TH CLASS="label">Создать:</TH> -<TD>{PPD_MAKE} <INPUT TYPE="SUBMIT" NAME="SELECT_MAKE" VALUE="Выбрать другую модель"></TD> -</TR> -<TR> -<TH CLASS="label">Модель:</TH> -<TD> -<SELECT NAME="PPD_NAME" SIZE="10"> -{op=add-printer?:<OPTION VALUE="__no_change__" SELECTED>Текущий драйвер - {current_make_and_model}</OPTION>:} -{[ppd_name]<OPTION VALUE="{ppd_name}" {op=modify-printer?:{?current_make_and_model={ppd_make_and_model}?SELECTED:}}>{ppd_make_and_model} ({ppd_natural_language}) -}</SELECT> -</TD> -</TR> -<TR> -<TH CLASS="label">или использовать файл PPD:</TH> -<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT -TYPE="FILE" NAME="PPD_FILE"></TD> -</TR> -<TR> -<TD></TD> -<TD><INPUT TYPE="SUBMIT" VALUE="{op=add-printer?Добавить принтер:Сохранить}"></TD> -</TR> -</TABLE> - -</FORM> </DIV>
\ No newline at end of file diff --git a/templates/ru/choose-serial.tmpl b/templates/ru/choose-serial.tmpl index 3cfd30c2..5a953a2c 100644 --- a/templates/ru/choose-serial.tmpl +++ b/templates/ru/choose-serial.tmpl @@ -49,56 +49,4 @@ </TABLE> </FORM> -</DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">{op=modify-printer?Изменение {printer_name}:Добавление принтера}</H2> - -<FORM METHOD="POST" ACTION="/admin"> -<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> -<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> -{printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} - -<TABLE> -<TR> -<TH CLASS="label">Подключение:</TH> -<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD> -</TR> -<TR> -<TH CLASS="label">Скорость передачи:</TH> -<TD><SELECT NAME="BAUDRATE"> -{[baudrates]<OPTION {?baudrate={baudrates}?SELECTED:}>{baudrates}} -</SELECT></TD> -</TR> -<TR> -<TH CLASS="label">Печать страниц:</TH> -<TD><SELECT NAME="PARITY"> -<OPTION VALUE="none" {?parity=none?SELECTED:}>Все -<OPTION VALUE="even" {?parity=even?SELECTED:}>Только четные -<OPTION VALUE="odd" {?parity=odd?SELECTED:}>Только нечетные -</SELECT></TD> -</TR> -<TR> -<TH CLASS="label">Биты данных:</TH> -<TD><SELECT NAME="BITS"> -<OPTION {?bits=8?SELECTED:}>8 -<OPTION {?bits=7?SELECTED:}>7 -</SELECT></TD> -</TR> -<TR> -<TH CLASS="label">Управление:</TH> -<TD><SELECT NAME="FLOW"> -<OPTION VALUE="none" {?flow=none?SELECTED:}>Нет -<OPTION VALUE="soft" {?flow=soft?SELECTED:}>XON/XOFF (Программное) -<OPTION VALUE="hard" {?flow=hard?SELECTED:}>RTS/CTS (Аппаратное) -<OPTION VALUE="dtrdsr" {?flow=dtrdsr?SELECTED:}>DTR/DSR (Аппаратное) -</SELECT></TD> -</TR> -<TR> -<TD></TD> -<TD><INPUT TYPE="SUBMIT" VALUE="Продолжить"></TD> -</TR> -</TABLE> - -</FORM> </DIV>
\ No newline at end of file diff --git a/templates/ru/choose-uri.tmpl b/templates/ru/choose-uri.tmpl index c56cf5bc..3c843f01 100644 --- a/templates/ru/choose-uri.tmpl +++ b/templates/ru/choose-uri.tmpl @@ -40,47 +40,4 @@ </TABLE> </FORM> -</DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">{op=modify-printer?Изменение {printer_name}:Добавление принтера}</H2> - -<FORM METHOD="POST" ACTION="/admin"> -<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> -<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> -{printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} -<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}"> - -<TABLE> -<TR> -<TH CLASS="label">Подключение:</TH> -<TD><INPUT TYPE="URL" SIZE="60" MAXLENGTH="1023" NAME="DEVICE_URI" VALUE="{current_device_uri?{current_device_uri}:{device_uri}}"></TD> -</TR> -<TR> -<TD></TD> -<TD>Примеры: -<PRE> - http://hostname:631/ipp/ - http://hostname:631/ipp/port1 - - ipp://hostname/ipp/ - ipp://hostname/ipp/port1 - - lpd://hostname/queue - - socket://hostname - socket://hostname:9100 -</PRE> - -<P>Смотрите раздел <A HREF="/help/network.html" TARGET="_blank">"Сетевые принтеры"</A> для выяснения правильного адреса вашего принтера.</P> - -</TD> -</TR> -<TR> -<TD></TD> -<TD><INPUT TYPE="SUBMIT" VALUE="Продолжить"></TD> -</TR> -</TABLE> - -</FORM> </DIV>
\ No newline at end of file diff --git a/templates/ru/class-added.tmpl b/templates/ru/class-added.tmpl index 7d04612f..626cfec0 100644 --- a/templates/ru/class-added.tmpl +++ b/templates/ru/class-added.tmpl @@ -5,10 +5,3 @@ <P>Группа <A HREF="/classes/{printer_name}">{printer_name}</A> успешно добавлена. </DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">Новая группа</H2> - -<P>Группа <A HREF="/classes/{printer_name}">{printer_name}</A> успешно добавлена. - -</DIV> diff --git a/templates/ru/class-confirm.tmpl b/templates/ru/class-confirm.tmpl index 70b56279..0eb87ef5 100644 --- a/templates/ru/class-confirm.tmpl +++ b/templates/ru/class-confirm.tmpl @@ -8,13 +8,3 @@ <P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="op" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Удалить группу"></FORM></P> </DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">Удаление группы {printer_name}</H2> - -<P><B>Предупреждение:</B> Вы действительно хотите удалить группу -{printer_name}?</P> - -<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="op" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Удалить группу"></FORM></P> - -</DIV> diff --git a/templates/ru/class-deleted.tmpl b/templates/ru/class-deleted.tmpl index c1764982..08f59995 100644 --- a/templates/ru/class-deleted.tmpl +++ b/templates/ru/class-deleted.tmpl @@ -4,11 +4,4 @@ <P>Группа {printer_name} успешно удалена. -</DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">Удаление группы {printer_name}</H2> - -<P>Группа {printer_name} успешно удалена. - </DIV>
\ No newline at end of file diff --git a/templates/ru/class-jobs-header.tmpl b/templates/ru/class-jobs-header.tmpl index b552f2c4..8487cbbd 100644 --- a/templates/ru/class-jobs-header.tmpl +++ b/templates/ru/class-jobs-header.tmpl @@ -1,6 +1,3 @@ <DIV CLASS="indent"> <H3 CLASS="title">Задания</H3> </DIV> -<DIV CLASS="indent"> -<H3 CLASS="title">Задания</H3> -</DIV> diff --git a/templates/ru/class-modified.tmpl b/templates/ru/class-modified.tmpl index c7a87318..986a02b1 100644 --- a/templates/ru/class-modified.tmpl +++ b/templates/ru/class-modified.tmpl @@ -4,11 +4,4 @@ <P>Группа <A HREF="/classes/{printer_name}">{printer_name}</A> успешно изменена. -</DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">Изменение группы {printer_name}</H2> - -<P>Группа <A HREF="/classes/{printer_name}">{printer_name}</A> успешно изменена. - </DIV>
\ No newline at end of file diff --git a/templates/ru/class.tmpl b/templates/ru/class.tmpl index 2b22ca36..643cbae7 100644 --- a/templates/ru/class.tmpl +++ b/templates/ru/class.tmpl @@ -42,47 +42,3 @@ media={media_default?{media_default}:неизвестный} </TABLE> </DIV> -<DIV CLASS="indent"> -<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A> -({printer_state=3?Idle:{printer_state=4?печать:приостановлен}}, -{printer_is_accepting_jobs=0?Не принимает задания:Принимает задания}, -{server_is_sharing_printers=0?нет совместного доступа:{printer_is_shared=0?нет совместного доступа:}} Разрешен совместный доступ{default_name={printer_name}?, Сервер по умолчанию:})</H2> - -<FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance"> -<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> -<SELECT NAME="OP" ONCHANGE="document.maintenance.submit();"> -<OPTION VALUE="">Обслуживание</OPTION> -<OPTION VALUE="print-test-page">Печать пробной страницы</OPTION> -{printer_state=5?<OPTION VALUE="start-class">Данные группы</OPTION>:<OPTION VALUE="stop-class">Приостановить группу</OPTION>} -{printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Принимать задания</OPTION>:<OPTION VALUE="reject-jobs">Не принимать задания</OPTION>} -<OPTION VALUE="move-jobs">Переместить все задания</OPTION> -<OPTION VALUE="purge-jobs">Отменить все задания</OPTION> -</SELECT> -<INPUT TYPE="SUBMIT" VALUE="Сохранить" STYLE="display: none;"> -</FORM> - -<FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration"> -<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> -<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"> -<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="1"> -<SELECT NAME="OP" ONCHANGE="document.administration.submit();"> -<OPTION VALUE="">Администрирование</OPTION> -<OPTION VALUE="modify-class">Изменить группу</OPTION> -<OPTION VALUE="delete-class">Удалить группу</OPTION> -<OPTION VALUE="set-class-options">Установить параметры по умолчанию</OPTION> -<OPTION VALUE="set-as-default">Установить как принтер по умолчанию</OPTION> -<OPTION VALUE="set-allowed-users">Список разрешенных пользователей</OPTION> -</SELECT> -<INPUT TYPE="SUBMIT" VALUE="Сохранить" STYLE="display: none;"> -</FORM> - -<TABLE SUMMARY="{printer_name}"> -<TR><TH ALIGN="RIGHT" VALIGN="TOP">Описание:</TH><TD>{printer_info}</TD></TR> -<TR><TH ALIGN="RIGHT" VALIGN="TOP">Расположение:</TH><TD>{printer_location}</TD></TR> -<TR><TH ALIGN="RIGHT" VALIGN="TOP">Состав:</TH><TD>{?member_uris=?Нет принтеров:{member_uris}}</TD></TR> -<TR><TH ALIGN="RIGHT" VALIGN="TOP">По умолчанию:</TH><TD>job-sheets={job_sheets_default} -media={media_default?{media_default}:неизвестный} -{sides_default?sides={sides_default}:}</TD></TR> -</TABLE> - -</DIV> diff --git a/templates/ru/classes-header.tmpl b/templates/ru/classes-header.tmpl index dec28f27..51012c50 100644 --- a/templates/ru/classes-header.tmpl +++ b/templates/ru/classes-header.tmpl @@ -1,2 +1 @@ <P ALIGN="CENTER">{total=0?Нет групп:Показать {#printer_name} из {total} группы{total=1?:es}}.</P> -<P ALIGN="CENTER">{total=0?Нет групп:Показать {#printer_name} из {total} группы{total=1?:es}}.</P> diff --git a/templates/ru/classes.tmpl b/templates/ru/classes.tmpl index 96ff65a7..5038bea7 100644 --- a/templates/ru/classes.tmpl +++ b/templates/ru/classes.tmpl @@ -9,14 +9,3 @@ } </TBODY> </TABLE></DIV>} -{#printer_name=0?: -<TABLE CLASS="list" SUMMARY="Список групп"> -<THEAD> -<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&WHICH_JOBS={?WHICH_JOBS}&FIRST={FIRST}&ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>▲</SMALL> Очередь <SMALL>▲</SMALL>:<SMALL>▼</SMALL> Очередь <SMALL>▼</SMALL>}</A></TH><TH>Описание</TH><TH>Расположение</TH><TH>Состав</TH><TH>Статус</TH></TR> -</THEAD> -<TBODY> -{[printer_name] -<TR><TD><A HREF="{printer_uri_supported}">{printer_name}</A></TD><TD>{printer_info}</TD><TD>{printer_location}</TD><TD>{?member_uris=?Нет принтеров:{member_uris}}</TD><TD>{printer_state=3?В ожидании:{printer_state=4?Печатает:Приостановлен}}{printer_state_message? - "{printer_state_message}":}</TD></TR> -} -</TBODY> -</TABLE></DIV>} diff --git a/templates/ru/command.tmpl b/templates/ru/command.tmpl index bb79affc..4dc7b4e6 100644 --- a/templates/ru/command.tmpl +++ b/templates/ru/command.tmpl @@ -10,15 +10,3 @@ ALIGN="ABSMIDDLE" ALT="Индикатор занятости"> }Обработк <EM>"{job_printer_state_message}"</EM>:}}</P> </DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">{title} для {printer_name}</H2> - -<P>{job_state>5?:<IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16" -ALIGN="ABSMIDDLE" ALT="Busy Indicator"> }Обработка задания -{job_state=3?в очереди:{job_state=4?удерживается: -{job_state=5?обрабатывается:{job_state=6?остановлено: -{job_state=7?отменено:{job_state=8?прервано:завершено}}}}}}{job_state=9?:{job_printer_state_message?, -<EM>"{job_printer_state_message}"</EM>:}}</P> - -</DIV> diff --git a/templates/ru/edit-config.tmpl b/templates/ru/edit-config.tmpl index 8b356849..d194059d 100644 --- a/templates/ru/edit-config.tmpl +++ b/templates/ru/edit-config.tmpl @@ -22,27 +22,3 @@ onClick="reset_config();"></P> </FORM> </DIV> -<SCRIPT TYPE="text/javascript"> -function reset_config() -{ - document.cups.CUPSDCONF.value = "{?cupsdconf_default}"; -} -</SCRIPT> - -<DIV CLASS="indent"> - -<H2 CLASS="title">Редактирование конфигурационного файла</H2> - -<FORM NAME="cups" METHOD="POST" ACTION="/admin/"> -<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> -<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"> - -<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA> - -<P><INPUT TYPE="SUBMIT" NAME="SAVECHANGES" VALUE="Сохранить изменения"> -<INPUT TYPE="BUTTON" VALUE="Сбросить все изменения" -onClick="reset_config();"></P> - -</FORM> - -</DIV> diff --git a/templates/ru/error-op.tmpl b/templates/ru/error-op.tmpl index 029fe762..922976f3 100644 --- a/templates/ru/error-op.tmpl +++ b/templates/ru/error-op.tmpl @@ -7,12 +7,3 @@ <BLOCKQUOTE>Неизвестная операция "{op}"!</BLOCKQUOTE> </DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">{?title} {?printer_name} - ошибка </H2> - -<P>Ошибка:</P> - -<BLOCKQUOTE>Неизвестная операция "{op}"!</BLOCKQUOTE> - -</DIV> diff --git a/templates/ru/error.tmpl b/templates/ru/error.tmpl index ce3ebb68..4a35c8f1 100644 --- a/templates/ru/error.tmpl +++ b/templates/ru/error.tmpl @@ -7,12 +7,3 @@ <BLOCKQUOTE>{error}</BLOCKQUOTE> </DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">{?title} {?printer_name} - ошибка</H2> - -<P>{?message?{message}:Ошибка}:</P> - -<BLOCKQUOTE>{error}</BLOCKQUOTE> - -</DIV> diff --git a/templates/ru/header.tmpl.in b/templates/ru/header.tmpl.in index de9c26c3..6d16855e 100644 --- a/templates/ru/header.tmpl.in +++ b/templates/ru/header.tmpl.in @@ -27,32 +27,3 @@ VALUE="{SECTION=help?{?QUERY}:}" AUTOSAVE="org.cups.help" RESULTS="20"></FORM></ </TR> <TR><TD COLSPAN="9"> </TD></TR> </TABLE> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<HTML> -<HEAD> - <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8"> - <TITLE>{title} - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE> - <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css"> - <LINK REL="SHORTCUT ICON" HREF="/images/cups-icon.png" TYPE="image/png"> - {refresh_page?<META HTTP-EQUIV="Refresh" CONTENT="{refresh_page}">:} -</HEAD> -<BODY> -<TABLE CLASS="page" SUMMARY="{title}"> -<TR><TD CLASS="body"> -<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" SUMMARY=""> -<TR HEIGHT="36"> -<TD><A HREF="http://www.cups.org/" TARGET="_blank"><IMG -SRC="/images/left.gif" WIDTH="64" HEIGHT="36" BORDER="0" ALT=""></A></TD> -<TD CLASS="unsel"><A HREF="/"> Начало </A></TD> -<TD CLASS="{SECTION=admin?:un}sel"><A HREF="/admin"> Администрирование </A></TD> -<TD CLASS="{SECTION=classes?:un}sel"><A HREF="/classes/"> Группы </A></TD> -<TD CLASS="{SECTION=help?:un}sel"><A HREF="/help/"> Справка </A></TD> -<TD CLASS="{SECTION=jobs?:un}sel"><A HREF="/jobs/"> Задания </A></TD> -<TD CLASS="{SECTION=printers?:un}sel"><A HREF="/printers/"> Принтеры </A></TD> -<TD CLASS="unsel" WIDTH="100%"><FORM ACTION="/help/" METHOD="GET"><INPUT -TYPE="SEARCH" NAME="QUERY" SIZE="20" PLACEHOLDER="Поиск по справке" -VALUE="{SECTION=help?{?QUERY}:}" AUTOSAVE="org.cups.help" RESULTS="20"></FORM></TD> -<TD><IMG SRC="/images/right.gif" WIDTH="4" HEIGHT="36" ALT=""></TD> -</TR> -<TR><TD COLSPAN="9"> </TD></TR> -</TABLE> diff --git a/templates/ru/help-header.tmpl b/templates/ru/help-header.tmpl index 219a5b2d..d618a666 100644 --- a/templates/ru/help-header.tmpl +++ b/templates/ru/help-header.tmpl @@ -43,48 +43,3 @@ href="/help/overview.html">Введение в CUPS</a>". Опытные пол могут обратиться к разделу "<a href="/help/whatsnew.html">Что нового в CUPS 1.6</a>".</P> <P><A HREF="http://www.cups.org/">Веб-сайт CUPS</A> так же содержит большое количество ресурсов для пользователей, включая форум, ответы на часто задаваемые вопросы и форму для регистрации ошибок и пожеланий.</P>} -<DIV CLASS="indent"> -<FORM ACTION="/help/{?HELPFILE}" METHOD="GET"> -{TOPIC?<INPUT TYPE="HIDDEN" NAME="TOPIC" VALUE="{TOPIC}">:} - -<P ALIGN="CENTER"><B>Поиск -{HELPTITLE?{HELPTITLE}:{TOPIC?{TOPIC}:All Documents}}:</B> <INPUT -TYPE="SEARCH" NAME="QUERY" VALUE="{?QUERY}" SIZE="40" PLACEHOLDER="" -AUTOSAVE="org.cups.help" RESULTS="20"> -<INPUT TYPE="SUBMIT" NAME="SEARCH" VALUE="Поиск"> -<INPUT TYPE="SUBMIT" NAME="CLEAR" VALUE="Очистить"></P> - -</FORM> - -<!-- Bookmarks --> -<DIV CLASS="sidebar"><TABLE CLASS="inset" SUMMARY="Содержание"> -<TR><TD> - -<H3 CLASS="title">Документация</H3> - -<P CLASS="l0"><A HREF="/help/{QUERY??QUERY={QUERY}:}">Все разделы</A></P> -<HR> - -{[BMTEXT]<P CLASS="l{BMINDENT}"><A HREF="{BMLINK}">{BMTEXT}</A></P> -} -</TD></TR> -</TABLE></DIV> - -{QUERY?<P>Результаты поиска в {HELPFILE?{HELPTITLE}:{TOPIC?{TOPIC}:всей справке}}\:</P> -{QTEXT?<UL> -{[QTEXT]<LI><A HREF="{QLINK}">{QTEXT}</A>{QPTEXT? (in <I><A HREF="{QPLINK}">{QPTEXT}</A></I>):}</LI>} -{QTEXT?</UL>:} -:<P>Не найдено совпадений.</P>} -<HR NOSHADE>:} -{HELPTITLE?<H1>{HELPTITLE}</H1> -<FORM ACTION="/help/{?HELPFILE}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="PRINTABLE" VALUE="YES"><INPUT TYPE="SUBMIT" VALUE="Показать версию для печати"></FORM>: - -<H1>Спрвака</H1> - -<P>Это справка CUPS. Введите выше слова для поиска в справке и нажмите "Поиск", чтобы показать результаты поиска.</P> - -<P>Если вы пока мало знакомы с CUPS, прочтите раздел "<a -href="/help/overview.html">Введение в CUPS</a>". Опытные пользователи -могут обратиться к разделу "<a href="/help/whatsnew.html">Что нового в CUPS 1.6</a>".</P> - -<P><A HREF="http://www.cups.org/">Веб-сайт CUPS</A> так же содержит большое количество ресурсов лоя пользователей, включая форум, ответы на часто задаваемые вопросы и форму для регистрации ошибок и пожеланий.</P>} diff --git a/templates/ru/help-printable.tmpl b/templates/ru/help-printable.tmpl index 88635226..2463c163 100644 --- a/templates/ru/help-printable.tmpl +++ b/templates/ru/help-printable.tmpl @@ -7,12 +7,3 @@ <LINK REL="SHORTCUT ICON" HREF="/images/cups-icon.png" TYPE="image/png"> </HEAD> <BODY> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<HTML> -<HEAD> - <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8"> - <TITLE>{HELPTITLE}</TITLE> - <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups-printable.css"> - <LINK REL="SHORTCUT ICON" HREF="/images/cups-icon.png" TYPE="image/png"> -</HEAD> -<BODY> diff --git a/templates/ru/help-trailer.tmpl b/templates/ru/help-trailer.tmpl index 1266bd33..4c1ebed8 100644 --- a/templates/ru/help-trailer.tmpl +++ b/templates/ru/help-trailer.tmpl @@ -1,2 +1 @@ </DIV> -</DIV> diff --git a/templates/ru/job-cancel.tmpl b/templates/ru/job-cancel.tmpl index 7500df45..cba56446 100644 --- a/templates/ru/job-cancel.tmpl +++ b/templates/ru/job-cancel.tmpl @@ -5,10 +5,3 @@ <P><A HREF="{job_printer_uri}">Задание {job_id}</A> отменено. </DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">Отмена задания {job_id}</H2> - -<P><A HREF="{job_printer_uri}">Задание {job_id}</A> отменено. - -</DIV> diff --git a/templates/ru/job-hold.tmpl b/templates/ru/job-hold.tmpl index c840b134..162e4a46 100644 --- a/templates/ru/job-hold.tmpl +++ b/templates/ru/job-hold.tmpl @@ -5,10 +5,3 @@ <P><A HREF="{job_printer_uri}">Задание {job_id}</A> приостановлено. </DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">Приостановка задания {job_id}</H2> - -<P><A HREF="{job_printer_uri}">Задание {job_id}</A> приостановлено. - -</DIV> diff --git a/templates/ru/job-move.tmpl b/templates/ru/job-move.tmpl index 005ede5c..598e4db7 100644 --- a/templates/ru/job-move.tmpl +++ b/templates/ru/job-move.tmpl @@ -25,30 +25,3 @@ </FORM> </DIV> -<DIV CLASS="indent"> - -<FORM METHOD="POST" ACTION="/{SECTION}/{job_id?:{printer_name}}"> -<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> -<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> -{job_id?<INPUT TYPE="HIDDEN" NAME="JOB_ID" VALUE="{job_id}">:} - -<H2 CLASS="title">{job_id?Перемещение задания {job_id}:Перемещение всех заданий}</H2> - -<TABLE> -<TR> -<TH CLASS="label">Переместить на принтер:</TH> -<TD> -<SELECT NAME="JOB_PRINTER_URI" SIZE="10"> -{[job_printer_uri]<OPTION VALUE="{job_printer_uri}">{job_printer_name}} -</SELECT> -</TD> -</TR> -<TR> -<TD></TD> -<TD><INPUT TYPE="SUBMIT" VALUE="{job_id?Переместить задание:Переместить все задания}"></TD> -</TR> -</TABLE> - -</FORM> - -</DIV> diff --git a/templates/ru/job-moved.tmpl b/templates/ru/job-moved.tmpl index b54bf4e2..e5bd6568 100644 --- a/templates/ru/job-moved.tmpl +++ b/templates/ru/job-moved.tmpl @@ -6,11 +6,3 @@ <A HREF="/{is_class?группы:принтеры}/{job_printer_name}">{job_printer_name}</A>.</P> </DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">{job_id?Перемещение задания {job_id}:Перемещение всех заданий}</H2> - -<P>{job_id?<A HREF="/jobs/{job_id}">Задание {job_id}</A>:Все задания} перемещены на -<A HREF="/{is_class?группы:принтеры}/{job_printer_name}">{job_printer_name}</A>.</P> - -</DIV> diff --git a/templates/ru/job-release.tmpl b/templates/ru/job-release.tmpl index 8a6a3e77..1cad15a6 100644 --- a/templates/ru/job-release.tmpl +++ b/templates/ru/job-release.tmpl @@ -5,10 +5,3 @@ <P><A HREF="{job_printer_uri}">Задание {job_id}</A> разблокировано. </DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">Разблокирование задания {job_id}</H2> - -<P><A HREF="{job_printer_uri}">Задание {job_id}</A> разблокировано. - -</DIV> diff --git a/templates/ru/job-restart.tmpl b/templates/ru/job-restart.tmpl index 2f4b87b3..490fc3a3 100644 --- a/templates/ru/job-restart.tmpl +++ b/templates/ru/job-restart.tmpl @@ -5,10 +5,3 @@ <P><A HREF="{job_printer_uri}">Задание {job_id}</A> запущено заново. </DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">Перезапуск задания {job_id}</H2> - -<P><A HREF="{job_printer_uri}">Задание {job_id}</A> запущено заново. - -</DIV> diff --git a/templates/ru/jobs-header.tmpl b/templates/ru/jobs-header.tmpl index b56f98fa..7b645b51 100644 --- a/templates/ru/jobs-header.tmpl +++ b/templates/ru/jobs-header.tmpl @@ -3,8 +3,3 @@ {?which_jobs=all?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="all"><INPUT TYPE="SUBMIT" VALUE="Показать все задания"></FORM>}</DIV> <P ALIGN="CENTER">{total=0?Нет заданий:Задание {#job_id} из {total} {?which_jobs=?активных:{which_jobs=all?:завершенных}}}.</P> -<DIV CLASS="indent">{?which_jobs=?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Показать активные задания"></FORM>} -{?which_jobs=completed?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="completed"><INPUT TYPE="SUBMIT" VALUE="Показать завершенные задания"></FORM>} -{?which_jobs=all?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="all"><INPUT TYPE="SUBMIT" VALUE="Показать все задания"></FORM>}</DIV> - -<P ALIGN="CENTER">{total=0?Нет заданий:Задание {#job_id} из {total} {?which_jobs=?активных:{which_jobs=all?:завершенных}}}.</P> diff --git a/templates/ru/jobs.tmpl b/templates/ru/jobs.tmpl index d64a4b6b..ce80fdba 100644 --- a/templates/ru/jobs.tmpl +++ b/templates/ru/jobs.tmpl @@ -34,39 +34,3 @@ </TBODY> </TABLE> } -{#job_id=0?: -<TABLE CLASS="list" SUMMARY="Задания"> -<THEAD> -<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&WHICH_JOBS={?WHICH_JOBS}&FIRST={FIRST}&ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>▲</SMALL> Номер <SMALL>▲</SMALL>:<SMALL>▼</SMALL> ID <SMALL>▼</SMALL>}</A></TH><TH>Название</TH><TH>Пользователь</TH><TH>Размер</TH><TH>Страниц</TH><TH>Статус</TH><TH>Управление</TH></TR> -</THEAD> -<TBODY> -{[job_id] -<TR VALIGN="TOP"> -<TD><A HREF="{job_printer_uri}">{job_printer_name}</A>-{job_id}{?phone? ({phone}):} </TD> -<TD>{?job_name=?Неизвестное:{job_name}} </TD> -<TD>{?job_originating_user_name=?Приостановленно пользователем:{job_originating_user_name}} </TD> -<TD>{job_k_octets}k </TD> -<TD>{job_media_sheets_completed=0?Неизвестно:{?job_media_sheets_completed}} </TD> -<TD>{job_state=3?В очереди<BR>{time_at_creation}:{job_state=4?Приостановлено с<BR>{time_at_creation}: -{job_state=5?Создано<BR>{time_at_processing}:{job_state=6?Остановлено: -{job_state=7?Отменено<BR>{time_at_completed}:{job_state=8?Прервано:Завершено<BR>{time_at_completed}}}}}}} {job_printer_state_message?<BR> -<EM>"{job_printer_state_message}"</EM>:}</TD> -<TD> -{job_preserved>0?{job_state>5? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="restart-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"><INPUT TYPE="SUBMIT" VALUE="Перезапустить"></FORM>:}:} -{job_state=4? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="release-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> -<INPUT TYPE="SUBMIT" VALUE="Продолжить"></FORM>:} -{job_state=3? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="hold-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> -<INPUT TYPE="SUBMIT" VALUE="Приостановить"></FORM>:} -{job_state<7? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> -<INPUT TYPE="SUBMIT" VALUE="Отменить"></FORM> -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="move-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="SUBMIT" VALUE="Переместить"></FORM>:} - </TD> -</TR> -} -</TBODY> -</TABLE> -} diff --git a/templates/ru/list-available-printers.tmpl b/templates/ru/list-available-printers.tmpl index 34592151..90d3c949 100644 --- a/templates/ru/list-available-printers.tmpl +++ b/templates/ru/list-available-printers.tmpl @@ -9,14 +9,3 @@ }</UL>} </DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">Доступные принтеры</H2> - -{#device_uri=0?<P>Не обнаружено ни одного принтера.</P> -:<UL>{[device_uri] -<LI><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="HIDDEN" NAME="TEMPLATE_NAME" VALUE="{template_name}"><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="Локальный принтер"><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{device_make_and_model}"><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}"><INPUT TYPE="SUBMIT" VALUE="Добавить этот принтер"></FORM> -{device_make_and_model} ({device_info})</LI> -}</UL>} - -</DIV> diff --git a/templates/ru/modify-class.tmpl b/templates/ru/modify-class.tmpl index 43927bbc..a85698a5 100644 --- a/templates/ru/modify-class.tmpl +++ b/templates/ru/modify-class.tmpl @@ -31,38 +31,4 @@ </TABLE> </FORM> -</DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">Изменение группы {printer_name}</H2> - -<FORM METHOD="POST" ACTION="/admin"> -<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> -<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> -<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}"> - -<TABLE> -<TR> -<TH CLASS="label">Описание:</TH> -<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"></TD> -</TR> -<TR> -<TH CLASS="label">Расположение:</TH> -<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"></TD> -</TR> -<TR> -<TH CLASS="label">Состав группы:</TH> -<TD> -<SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE> -{[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}} -</SELECT> -</TD> -</TR> -<TR> -<TD></TD> -<TD><INPUT TYPE="SUBMIT" VALUE="Изменить группу"></TD> -</TR> -</TABLE> - -</FORM> </DIV>
\ No newline at end of file diff --git a/templates/ru/modify-printer.tmpl b/templates/ru/modify-printer.tmpl index 0c4dde15..8ec523f1 100644 --- a/templates/ru/modify-printer.tmpl +++ b/templates/ru/modify-printer.tmpl @@ -40,45 +40,3 @@ </FORM> </DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">Изменение принтера {printer_name}</H2> - -<FORM METHOD="POST" ACTION="/admin"> -<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> -<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> -<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> -<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}"> -<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}"> -<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}"> -<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}"> - -<TABLE> -<TR> -<TH CLASS="label">Описание:</TH> -<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"><BR> -<SMALL>(расширенное описание принтера, например, "HP LaserJet с дуплексной печатью")</SMALL></TD> -</TR> -<TR> -<TH CLASS="label">Расположение:</TH> -<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"><BR> -<SMALL>(местоположение принтера, например, "Кабинет 55")</SMALL></TD> -</TR> -<TR> -<TH CLASS="label">Подключение:</TH> -<TD><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">{device_uri}</TD> -</TR> -<TR> -<TH CLASS="label">Совместный доступ:</TH> -<TD><INPUT TYPE="CHECKBOX" NAME="PRINTER_IS_SHARED" {PRINTER_IS_SHARED=1?CHECKED:}> -Разрешить совместный доступ к этому принтеру</TD> -</TR> -<TR> -<TR> -<TD></TD> -<TD><INPUT TYPE="SUBMIT" VALUE="Продолжить"></TD> -</TR> -</TABLE> - -</FORM> -</DIV> diff --git a/templates/ru/norestart.tmpl b/templates/ru/norestart.tmpl index 405b4714..a08a467c 100644 --- a/templates/ru/norestart.tmpl +++ b/templates/ru/norestart.tmpl @@ -5,10 +5,3 @@ <P>Сервер не был перезапущен,поскольку не произошло изменений в конфигурации...</P> </DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">Применение изменений</H2> - -<P>Сервер не был перезапущен,поскольку не произошло изменений в конфигурации...</P> - -</DIV> diff --git a/templates/ru/option-boolean.tmpl b/templates/ru/option-boolean.tmpl index f8d3eef2..e832ee10 100644 --- a/templates/ru/option-boolean.tmpl +++ b/templates/ru/option-boolean.tmpl @@ -4,9 +4,3 @@ {[choices]<INPUT TYPE="RADIO" NAME="{keyword-1}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}} </TD> </TR> -<TR> -<TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH> -<TD> -{[choices]<INPUT TYPE="RADIO" NAME="{keyword-1}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}} -</TD> -</TR> diff --git a/templates/ru/option-conflict.tmpl b/templates/ru/option-conflict.tmpl index cf442782..9497fb77 100644 --- a/templates/ru/option-conflict.tmpl +++ b/templates/ru/option-conflict.tmpl @@ -5,10 +5,3 @@ }</UL> <P>Измените один или несколько параметров для того, чтобы избежать конфликта.</P> -<P><B>Ошибка:</B> следующие параметры конфликтуют:</P> - -<UL> -{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A>: {cchoice}</LI> -}</UL> - -<P>Измените один или несколько параметров для того, чтобы избежать конфликта.</P> diff --git a/templates/ru/option-header.tmpl b/templates/ru/option-header.tmpl index dcabc17d..464726a5 100644 --- a/templates/ru/option-header.tmpl +++ b/templates/ru/option-header.tmpl @@ -3,8 +3,3 @@ <H3 ALIGN="CENTER">{group}</H3> <TABLE WIDTH="100%"> -<DIV CLASS="tab" ID="{group_id}"> - -<H3 ALIGN="CENTER">{group}</H3> - -<TABLE WIDTH="100%"> diff --git a/templates/ru/option-pickmany.tmpl b/templates/ru/option-pickmany.tmpl index 90d742bd..0da75e5d 100644 --- a/templates/ru/option-pickmany.tmpl +++ b/templates/ru/option-pickmany.tmpl @@ -4,9 +4,3 @@ {[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}} </SELECT></TD> </TR> -<TR> -<TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH> -<TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10"> -{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}} -</SELECT></TD> -</TR> diff --git a/templates/ru/option-pickone.tmpl b/templates/ru/option-pickone.tmpl index 1e8676ea..49a9929a 100644 --- a/templates/ru/option-pickone.tmpl +++ b/templates/ru/option-pickone.tmpl @@ -16,21 +16,3 @@ }</TABLE> </TD>:} </TR> -<TR> -<TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH> -<TD><SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')"> -{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}} -</SELECT> -{iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params] -<TR><TH CLASS="sublabel">{paramtext}:</TH> -<TD>{params=Units?<SELECT NAME="{keyword-1}.{params}"> -<OPTION VALUE="pt"{paramvalue=pt? SELECTED:}>Пункты</OPTION> -<OPTION VALUE="mm"{paramvalue=mm? SELECTED:}>Милиметры</OPTION> -<OPTION VALUE="cm"{paramvalue=cm? SELECTED:}>Сантиметры</OPTION> -<OPTION VALUE="in"{paramvalue=in? SELECTED:}>Дюймы</OPTION> -<OPTION VALUE="ft"{paramvalue=ft? SELECTED:}>Футы</OPTION> -<OPTION VALUE="m"{paramvalue=m? SELECTED:}>Метры</OPTION> -</SELECT>:<INPUT TYPE="{inputtype}" NAME="{keyword-1}.{params}" VALUE="{paramvalue}">}</TD></TR> -}</TABLE> -</TD>:} -</TR> diff --git a/templates/ru/option-trailer.tmpl b/templates/ru/option-trailer.tmpl index e111c93f..f80e946d 100644 --- a/templates/ru/option-trailer.tmpl +++ b/templates/ru/option-trailer.tmpl @@ -2,9 +2,4 @@ <P ALIGN="CENTER"><INPUT TYPE="SUBMIT" VALUE="Сохранить параметры по умолчанию"></P> -</DIV> -</TABLE> - -<P ALIGN="CENTER"><INPUT TYPE="SUBMIT" VALUE="Сохранить параметры по умолчанию"></P> - </DIV>
\ No newline at end of file diff --git a/templates/ru/pager.tmpl b/templates/ru/pager.tmpl index ebdab35d..3c5dc62b 100644 --- a/templates/ru/pager.tmpl +++ b/templates/ru/pager.tmpl @@ -4,9 +4,3 @@ <TD WIDTH="50%" ALIGN="RIGHT">{NEXT?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{NEXT}"><INPUT TYPE="SUBMIT" VALUE="Показать следующую ▶"></FORM>: }</TD> </TR> </TABLE> -<TABLE CLASS="inset" SUMMARY="Paging Bar"> -<TR> - <TD WIDTH="50%">{PREV?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{PREV}"><INPUT TYPE="SUBMIT" VALUE="◀ Предварительный просмотр"></FORM>: }</TD> - <TD WIDTH="50%" ALIGN="RIGHT">{NEXT?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{NEXT}"><INPUT TYPE="SUBMIT" VALUE="Показать следующую ▶"></FORM>: }</TD> -</TR> -</TABLE> diff --git a/templates/ru/printer-accept.tmpl b/templates/ru/printer-accept.tmpl index d6a3b056..24d100d4 100644 --- a/templates/ru/printer-accept.tmpl +++ b/templates/ru/printer-accept.tmpl @@ -7,12 +7,3 @@ HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A> теперь принимает задания.</P> </DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">Прием заданий {is_class?в группу:на принтер} {printer_name}</H2> - -<P>{is_class?Группа:Принтер} <A -HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A> -теперь принимает задания.</P> - -</DIV> diff --git a/templates/ru/printer-added.tmpl b/templates/ru/printer-added.tmpl index 63e43c1a..cc784075 100644 --- a/templates/ru/printer-added.tmpl +++ b/templates/ru/printer-added.tmpl @@ -5,10 +5,3 @@ <P>Принтер <A HREF="/printers/{printer_name}">{printer_name}</A> успешно добавлен. </DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">Добавить принтер</H2> - -<P>Принтер <A HREF="/printers/{printer_name}">{printer_name}</A> успешно добавлен. - -</DIV> diff --git a/templates/ru/printer-configured.tmpl b/templates/ru/printer-configured.tmpl index 00bd731e..33c4c143 100644 --- a/templates/ru/printer-configured.tmpl +++ b/templates/ru/printer-configured.tmpl @@ -6,11 +6,3 @@ теперь используют параметры по умолчанию. </DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">Настройки по умолчанию для {printer_name}</H2> - -<P>{OP=set-class-options?Группа <A HREF="/classes/{printer_name}">:Принтер <A HREF="/printers/{printer_name}">}{printer_name}</A> -теперь используют параметры по умолчанию. - -</DIV> diff --git a/templates/ru/printer-confirm.tmpl b/templates/ru/printer-confirm.tmpl index 75969169..86b63609 100644 --- a/templates/ru/printer-confirm.tmpl +++ b/templates/ru/printer-confirm.tmpl @@ -8,13 +8,3 @@ <P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Удалить принтер"></FORM></P> </DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">Удаление принтера {printer_name}</H2> - -<P><B>Предупреждение:</B> вы действительно хотите удалить принтер -{printer_name}?</P> - -<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Удалить принтер"></FORM></P> - -</DIV> diff --git a/templates/ru/printer-default.tmpl b/templates/ru/printer-default.tmpl index 113815a1..474f4b83 100644 --- a/templates/ru/printer-default.tmpl +++ b/templates/ru/printer-default.tmpl @@ -10,15 +10,3 @@ HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A> the <TT>lpoptions</TT>.</BLOCKQUOTE> </DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">Установка {is_class?группы:принтера} {printer_name} по умолчанию</H2> - -<P>{is_class?Группа:Принтер} <A -HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A> -установлены на сервере по умолчанию для новых заданий.</P> - -<BLOCKQUOTE><B>Примечания:</B> вы можете переопределить это поведение с помощью команды -the <TT>lpoptions</TT>.</BLOCKQUOTE> - -</DIV> diff --git a/templates/ru/printer-deleted.tmpl b/templates/ru/printer-deleted.tmpl index 63abc912..43593c74 100644 --- a/templates/ru/printer-deleted.tmpl +++ b/templates/ru/printer-deleted.tmpl @@ -5,10 +5,3 @@ <P>Принтер {printer_name} успешно удален. </DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">Удаление принтера {printer_name}</H2> - -<P>Принтер {printer_name} успешно удален. - -</DIV> diff --git a/templates/ru/printer-jobs-header.tmpl b/templates/ru/printer-jobs-header.tmpl index b552f2c4..8487cbbd 100644 --- a/templates/ru/printer-jobs-header.tmpl +++ b/templates/ru/printer-jobs-header.tmpl @@ -1,6 +1,3 @@ <DIV CLASS="indent"> <H3 CLASS="title">Задания</H3> </DIV> -<DIV CLASS="indent"> -<H3 CLASS="title">Задания</H3> -</DIV> diff --git a/templates/ru/printer-modified.tmpl b/templates/ru/printer-modified.tmpl index 33d4c4b4..21c502f6 100644 --- a/templates/ru/printer-modified.tmpl +++ b/templates/ru/printer-modified.tmpl @@ -4,11 +4,4 @@ <P>Параметры принтера <A HREF="/printers/{printer_name}">{printer_name}</A> успешно изменены. -</DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">Изменение принтера {printer_name}</H2> - -<P>Параметры принтера <A HREF="/printers/{printer_name}">{printer_name}</A> успешно изменены. - </DIV>
\ No newline at end of file diff --git a/templates/ru/printer-purge.tmpl b/templates/ru/printer-purge.tmpl index 492f3ed2..c2768c81 100644 --- a/templates/ru/printer-purge.tmpl +++ b/templates/ru/printer-purge.tmpl @@ -6,13 +6,4 @@ HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A> очищены.</P> -</DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">Очистка всех заданий для {is_class?группы:принтера} {printer_name}</H2> - -<P>Все задания для {is_class?группы:принтера} <A -HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A> -очищены.</P> - </DIV>
\ No newline at end of file diff --git a/templates/ru/printer-reject.tmpl b/templates/ru/printer-reject.tmpl index 81958bf0..012e161f 100644 --- a/templates/ru/printer-reject.tmpl +++ b/templates/ru/printer-reject.tmpl @@ -7,12 +7,3 @@ HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A> больше не принимает задания.</P> </DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">Отмена заданий для {is_class?группы:принтера} {printer_name}</H2> - -<P>{is_class?Группа:Принтер} <A -HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A> -больше не принимает задания.</P> - -</DIV> diff --git a/templates/ru/printer-start.tmpl b/templates/ru/printer-start.tmpl index 909b2b62..cb02c798 100644 --- a/templates/ru/printer-start.tmpl +++ b/templates/ru/printer-start.tmpl @@ -6,13 +6,4 @@ HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A> теперь принимают задания.</P> -</DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">Возобновить работу {is_class?группы:принтера} {printer_name}</H2> - -<P>{is_class?Группа:Принтер} <A -HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A> -теперь принимают задания.</P> - </DIV>
\ No newline at end of file diff --git a/templates/ru/printer-stop.tmpl b/templates/ru/printer-stop.tmpl index 4cf6344b..d9fa7fc5 100644 --- a/templates/ru/printer-stop.tmpl +++ b/templates/ru/printer-stop.tmpl @@ -6,13 +6,4 @@ HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A> {is_class?была приостановлена:был приостановлен}.</P> -</DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">Приостановить {is_class?группу:принтер} {printer_name}</H2> - -<P>{is_class?Группа:Принтер} <A -HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A> -{is_class?была приостановлена:был приостановлен}.</P> - </DIV>
\ No newline at end of file diff --git a/templates/ru/printer.tmpl b/templates/ru/printer.tmpl index 00f0167b..90bc7b3d 100644 --- a/templates/ru/printer.tmpl +++ b/templates/ru/printer.tmpl @@ -44,51 +44,4 @@ media={media_default?{media_default}:неизвестный} {sides_default?sides={sides_default}:}</TD></TR> </TABLE> -</DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A> -({printer_state=3?в ожидании:{printer_state=4?печать:приостановлен}}, -{printer_is_accepting_jobs=0?не принимает задания:принимает задания}, -{server_is_sharing_printers=0?нет совместного доступа:{printer_is_shared=0?нет совместного доступа:разрешен совместный доступ}} {default_name={printer_name}?, По умолчанию:})</H2> - -<FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance"> -<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> -<SELECT NAME="OP" ONCHANGE="document.maintenance.submit();"> -<OPTION VALUE="">Обслуживание</OPTION> -<OPTION VALUE="print-test-page">Печать пробной страницы</OPTION> -{printer_commands~.*Clean.*?<OPTION VALUE="clean-print-heads">Очистить головки</OPTION>:} -{printer_commands~.*PrintSelfTestPage.*?<OPTION VALUE="print-self-test-page">печать пробной страницы принтера</OPTION>:} -{printer_state=5?<OPTION VALUE="start-printer">Resume Printer</OPTION>:<OPTION VALUE="stop-printer">Приостановить принтер</OPTION>} -{printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Возобновить печать</OPTION>:<OPTION VALUE="reject-jobs">Приостановить печать</OPTION>} -<OPTION VALUE="move-jobs">Переместить все задания</OPTION> -<OPTION VALUE="purge-jobs">Закрыть все задания</OPTION> -</SELECT> -<INPUT TYPE="SUBMIT" VALUE="Go" STYLE="display: none;"> -</FORM> - -<FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration"> -<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> -<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"> -<SELECT NAME="OP" ONCHANGE="document.administration.submit();"> -<OPTION VALUE="">Администрирование</OPTION> -<OPTION VALUE="modify-printer">Изменить принтер</OPTION> -<OPTION VALUE="delete-printer">Удалить принтер</OPTION> -<OPTION VALUE="set-printer-options">Установить параметры по умолчанию</OPTION> -<OPTION VALUE="set-as-default">Установить как принтер по умолчанию</OPTION> -<OPTION VALUE="set-allowed-users">Список разрешенных пользователей</OPTION> -</SELECT> -<INPUT TYPE="SUBMIT" VALUE="Go" STYLE="display: none;"> -</FORM> - -<TABLE SUMMARY="{printer_name}"> -<TR><TH ALIGN="RIGHT" VALIGN="TOP">Описание:</TH><TD>{printer_info}</TD></TR> -<TR><TH ALIGN="RIGHT" VALIGN="TOP">Расположение:</TH><TD>{printer_location}</TD></TR> -<TR><TH ALIGN="RIGHT" VALIGN="TOP">Драйвер:</TH><TD>{printer_make_and_model} ({color_supported=1?цветной:черно-белый}{sides_supported?, дуплексная печать:})<BR> -<TR><TH ALIGN="RIGHT" VALIGN="TOP">Подключение:</TH><TD>{device_uri}</TD></TR> -<TR><TH ALIGN="RIGHT" VALIGN="TOP">По умолчанию:</TH><TD>job-sheets={job_sheets_default} -media={media_default?{media_default}:неизвестный} -{sides_default?sides={sides_default}:}</TD></TR> -</TABLE> - </DIV>
\ No newline at end of file diff --git a/templates/ru/printers-header.tmpl b/templates/ru/printers-header.tmpl index 693572e6..6621e067 100644 --- a/templates/ru/printers-header.tmpl +++ b/templates/ru/printers-header.tmpl @@ -1,2 +1 @@ <P ALIGN="CENTER">{total=0?Нет принтеров:Принтер {#printer_name} из {total}}.</P> -<P ALIGN="CENTER">{total=0?Нет принтеров:Принтер {#printer_name} из {total}}.</P> diff --git a/templates/ru/printers.tmpl b/templates/ru/printers.tmpl index 4006b084..79feae58 100644 --- a/templates/ru/printers.tmpl +++ b/templates/ru/printers.tmpl @@ -9,14 +9,3 @@ } </TBODY> </TABLE></DIV>} -{#printer_name=0?: -<TABLE CLASS="list" SUMMARY="Список принтеров"> -<THEAD> -<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&WHICH_JOBS={?WHICH_JOBS}&FIRST={FIRST}&ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>▲</SMALL> Очередь <SMALL>▲</SMALL>:<SMALL>▼</SMALL> Очередь <SMALL>▼</SMALL>}</A></TH><TH> Описание </TH><TH>Расположение</TH><TH>Драйвер</TH><TH>Статус</TH></TR> -</THEAD> -<TBODY> -{[printer_name] -<TR><TD><A HREF="{printer_uri_supported}">{printer_name}</A></TD><TD>{printer_info}</TD><TD>{printer_location}</TD><TD>{printer_make_and_model}</TD><TD>{printer_state=3?Idle:{printer_state=4?Печатает:Приостановлен}}{printer_state_message? - "{printer_state_message}":}</TD></TR> -} -</TBODY> -</TABLE></DIV>} diff --git a/templates/ru/restart.tmpl b/templates/ru/restart.tmpl index d2e73fae..c32a5ae1 100644 --- a/templates/ru/restart.tmpl +++ b/templates/ru/restart.tmpl @@ -6,11 +6,3 @@ ALT="Ожидание"> Дождитесь перезагрузки сервера...</P> </DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">Применение изменений параметров</H2> - -<P><IMG SRC="/images/wait.gif" WIDTH="16" HEIGHT="16" ALIGN="ABSMIDDLE" -ALT="Busy Indicator"> Дождитесь перезагрузки сервера...</P> - -</DIV> diff --git a/templates/ru/samba-export.tmpl b/templates/ru/samba-export.tmpl index a9dfde00..641ca0b0 100644 --- a/templates/ru/samba-export.tmpl +++ b/templates/ru/samba-export.tmpl @@ -51,56 +51,3 @@ onChange="select_printers()"> Экспортировать все принтер </TABLE> </FORM> -<SCRIPT TYPE="text/javascript"><!-- -function select_printers() { - var list = document.export_samba.EXPORT_NAME; - var sel = document.export_samba.EXPORT_ALL.checked; - - for (i = 0; i < list.length; i ++) { - list.options[i].selected = sel; - } -} ---></SCRIPT> - -<FORM METHOD="POST" ACTION="/admin/" NAME="export_samba"> -<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> -<INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"> - -<H2 CLASS="title">Экспорт принтеров в Samba</H2> - -{error?<P>Невозможно экспортировать принтеры в Samba\:</P> -<BLOCKQUOTE>{error}</BLOCKQUOTE> -<P>Посмотрите файл <A HREF="/admin/log/error_log" -TARGET="_blank">error_log</A> для более подробной информации.</P>: -<P>Эта страница позволяет добавить принтеры в Samba так, чтобы -клиенты Windows могли получить доступ к ним через значок <VAR>Сетевое окружение</VAR> или <VAR>Сетевые подключения</VAR> на их рабочем столе. Вы должны установить на Windows драйвер принтера PostScript -как описано на странице руководства <A -HREF="/help/man-cupsaddsmb.html" -TARGET="_blank">cupsaddsmb(8)</A>.</P>} - -<TABLE> -<TR> -<TH CLASS="label">Принтеры:</TH> -<TD> -<SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE> -{[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}} -</SELECT><BR> -<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL"{export_all? CHECKED:} -onChange="select_printers()"> Экспортировать все принтеры -</TD> -</TR> -<TR> -<TH CLASS="label">Имя пользователя Samba:</TH> -<TD><INPUT TYPE="TEXT" NAME="USERNAME" VALUE="{?USERNAME}"> (обязательный параметр)</TD> -</TR> -<TR> -<TH CLASS="label">Пароль Samba:</TH> -<TD><INPUT TYPE="PASSWORD" NAME="PASSWORD" VALUE=""> (обязательный параметр)</TD> -</TR> -<TR> -<TD></TD> -<TD><INPUT TYPE="SUBMIT" VALUE="Экспортировать принтеры в Samba"></TD> -</TR> -</TABLE> - -</FORM> diff --git a/templates/ru/samba-exported.tmpl b/templates/ru/samba-exported.tmpl index 4762398e..179b2ad8 100644 --- a/templates/ru/samba-exported.tmpl +++ b/templates/ru/samba-exported.tmpl @@ -1,2 +1 @@ <P>Принтеры успешно экспортированы в Samba.</P> -<P>Принтеры успешно экспортированны в Samba.</P> diff --git a/templates/ru/search.tmpl b/templates/ru/search.tmpl index 81c64bdc..f338bc67 100644 --- a/templates/ru/search.tmpl +++ b/templates/ru/search.tmpl @@ -8,13 +8,3 @@ TYPE="SUBMIT" VALUE="Поиск"> <INPUT TYPE="SUBMIT" NAME="CLEAR" VALUE="Очистить"></P> </FORM> -<FORM ACTION="/{SECTION}/{?SEARCH_DEST}" METHOD="GET"> -{WHICH_JOBS?<INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{WHICH_JOBS}">:} -{ORDER?<INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{ORDER}">:} - -<P ALIGN="CENTER"><B>Поиск -{SEARCH_DEST?{SEARCH_DEST}:{SECTION=classes?группы:{SECTION=jobs?задания:принтеры}}}:</B> -<INPUT TYPE="SEARCH" NAME="QUERY" VALUE="{?QUERY}" SIZE="40" PLACEHOLDER="" AUTOSAVE="org.cups.{SECTION}" RESULTS="20"> <INPUT -TYPE="SUBMIT" VALUE="Поиск"> <INPUT TYPE="SUBMIT" NAME="CLEAR" VALUE="Очистить"></P> - -</FORM> diff --git a/templates/ru/set-printer-options-header.tmpl b/templates/ru/set-printer-options-header.tmpl index e23fc25d..e5c79dd4 100644 --- a/templates/ru/set-printer-options-header.tmpl +++ b/templates/ru/set-printer-options-header.tmpl @@ -24,29 +24,3 @@ function update_paramtable(option) <A HREF="#{group_id}">{group}</A> }</H3> <DIV CLASS="tabs"> -<DIV CLASS="indent"> - -<H2 CLASS="title">Установить параметры по умолчанию для {printer_name}</H2> - -<FORM METHOD="POST" ACTION="/admin"> -<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> -<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}"> -<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> -{HAVE_AUTOCONFIGURE?<INPUT TYPE="SUBMIT" NAME="AUTOCONFIGURE" VALUE="Запрос принтера для параметров по умолчанию">:} - -<SCRIPT TYPE="text/javascript"><!-- -function update_paramtable(option) -{ - var cb = document.getElementById("select-" + option) - var paramstable = document.getElementById(option + "-params"); - if (cb.value == "Custom") - paramstable.style.display = "table"; - else - paramstable.style.display = "none"; -} ---></SCRIPT> - -<H3 CLASS="title">{[group_id] -<A HREF="#{group_id}">{group}</A> }</H3> - -<DIV CLASS="tabs"> diff --git a/templates/ru/set-printer-options-trailer.tmpl b/templates/ru/set-printer-options-trailer.tmpl index d9ac4cd9..11adc701 100644 --- a/templates/ru/set-printer-options-trailer.tmpl +++ b/templates/ru/set-printer-options-trailer.tmpl @@ -14,19 +14,3 @@ for (var i = 0; i < paramtables.length; i++) </FORM> </DIV> -</DIV> - -<SCRIPT TYPE="text/javascript"><!-- -// Hide custom options parameters for browsers that understand Javascript -var paramtables = document.getElementsByName("paramtable"); -for (var i = 0; i < paramtables.length; i++) -{ - var opt = paramtables[i].id.substr(0, paramtables[i].id.lastIndexOf("-")); - var cb = document.getElementById("select-" + opt); - if (cb.value != "Custom") - paramtables[i].style.display = "none"; -} ---></SCRIPT> -</FORM> - -</DIV> diff --git a/templates/ru/subscription-added.tmpl b/templates/ru/subscription-added.tmpl index 8ccff04e..f2b46423 100644 --- a/templates/ru/subscription-added.tmpl +++ b/templates/ru/subscription-added.tmpl @@ -3,8 +3,3 @@ <P>Подписка {subscription_name} была успешно добавлена.</P> </DIV> -<DIV CLASS="indent"> - -<P>Подписка {subscription_name} была успешно добавлена.</P> - -</DIV> diff --git a/templates/ru/subscription-canceled.tmpl b/templates/ru/subscription-canceled.tmpl index 4046fb29..5daed1f4 100644 --- a/templates/ru/subscription-canceled.tmpl +++ b/templates/ru/subscription-canceled.tmpl @@ -3,8 +3,3 @@ <P>Подписка #{notify_subscription_id} была отменена.</P> </DIV> -<DIV CLASS="indent"> - -<P>Подписка #{notify_subscription_id} была отменена.</P> - -</DIV> diff --git a/templates/ru/test-page.tmpl b/templates/ru/test-page.tmpl index bbe25281..6dc1ba1b 100644 --- a/templates/ru/test-page.tmpl +++ b/templates/ru/test-page.tmpl @@ -6,11 +6,3 @@ {printer_name}-{job_id}</A>.</P> </DIV> -<DIV CLASS="indent"> - -<H2 CLASS="title">Печать пробной страницы на {printer_name}</H2> - -<P>Пробная страница отправлена на печать;Номер задания <A HREF="/{SECTION}/{printer_name}"> -{printer_name}-{job_id}</A>.</P> - -</DIV> diff --git a/templates/ru/trailer.tmpl b/templates/ru/trailer.tmpl index 113e988f..09de9263 100644 --- a/templates/ru/trailer.tmpl +++ b/templates/ru/trailer.tmpl @@ -5,10 +5,3 @@ </TABLE> </BODY> </HTML> -</TD></TR> -<TR><TD> </TD></TR> -<TR><TD CLASS="trailer">CUPS, а так же логотип CUPS являются зарегистрированными торговыми марками -<A HREF="http://www.apple.com">Apple Inc.</A> Авторские права на CUPS принадлежат (2007-2013) компании Apple Inc. Все права защищены.</TD></TR> -</TABLE> -</BODY> -</HTML> diff --git a/templates/ru/users.tmpl b/templates/ru/users.tmpl index 5489f5a9..ee718b22 100644 --- a/templates/ru/users.tmpl +++ b/templates/ru/users.tmpl @@ -28,33 +28,3 @@ </FORM> </DIV> -<DIV CLASS="indent"> - -<FORM METHOD="POST" ACTION="/admin"> -<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> -<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}"> -<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}"> -{IS_CLASS?<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="{IS_CLASS}">:} - -<H2 CLASS="title">Доступ пользователей на {printer_name}</H2> - -<TABLE> -<TR> -<TH CLASS="label">Пользователи:</TH> -<TD> -<INPUT TYPE='TEXT' NAME='users' SIZE='60' VALUE='{?requesting_user_name_allowed}{?requesting_user_name_denied}'> -<BR> -<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}>Разрешить этим пользователям печатать -<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?checked:}>Запретить этим пользователям печатать -</TD> -</TR> -<TR> -<TD></TD> -<TD> -<INPUT TYPE="SUBMIT" VALUE="Сохранить"> -</TD> -</TR> -</TABLE> - -</FORM> -</DIV> diff --git a/test/4.1-requests.test b/test/4.1-requests.test index e2eb79ca..fbd2a97f 100644 --- a/test/4.1-requests.test +++ b/test/4.1-requests.test @@ -1,5 +1,5 @@ # -# "$Id: 4.1-requests.test 9084 2010-04-07 06:54:31Z mike $" +# "$Id: 4.1-requests.test 8144 2008-11-19 19:23:12Z mike $" # # Verify that the server requires the following attributes: # @@ -155,5 +155,5 @@ STATUS server-error-version-not-supported } # -# End of "$Id: 4.1-requests.test 9084 2010-04-07 06:54:31Z mike $" +# End of "$Id: 4.1-requests.test 8144 2008-11-19 19:23:12Z mike $" # diff --git a/test/4.2-cups-printer-ops.test b/test/4.2-cups-printer-ops.test index 5fa828eb..67c515df 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 9084 2010-04-07 06:54:31Z mike $" +# "$Id: 4.2-cups-printer-ops.test 6379 2007-03-21 14:57:22Z mike $" # # Verify that the CUPS printer operations work. # @@ -323,5 +323,5 @@ } # -# End of "$Id: 4.2-cups-printer-ops.test 9084 2010-04-07 06:54:31Z mike $" +# End of "$Id: 4.2-cups-printer-ops.test 6379 2007-03-21 14:57:22Z mike $" # diff --git a/test/4.3-job-ops.test b/test/4.3-job-ops.test index e82de18d..2f2236b0 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 9084 2010-04-07 06:54:31Z mike $" +# "$Id: 4.3-job-ops.test 7550 2008-05-12 16:40:40Z mike $" # # Verify that the IPP job operations work. # @@ -326,5 +326,5 @@ } # -# End of "$Id: 4.3-job-ops.test 9084 2010-04-07 06:54:31Z mike $" +# End of "$Id: 4.3-job-ops.test 7550 2008-05-12 16:40:40Z mike $" # diff --git a/test/4.4-subscription-ops.test b/test/4.4-subscription-ops.test index 720add80..f6cf820f 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 9352 2010-11-06 04:55:26Z mike $" +# "$Id: 4.4-subscription-ops.test 6635 2007-07-09 20:34:48Z mike $" # # Verify that the CUPS subscription operations work. # @@ -149,5 +149,5 @@ } # -# End of "$Id: 4.4-subscription-ops.test 9352 2010-11-06 04:55:26Z mike $" +# End of "$Id: 4.4-subscription-ops.test 6635 2007-07-09 20:34:48Z mike $" # diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh index 545d7365..e4a8ed4a 100644 --- a/test/5.1-lpadmin.sh +++ b/test/5.1-lpadmin.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id: 5.1-lpadmin.sh 10448 2012-05-04 18:34:39Z mike $" +# "$Id: 5.1-lpadmin.sh 7494 2008-04-25 18:36:46Z mike $" # # Test the lpadmin command. # @@ -63,5 +63,5 @@ fi echo "" # -# End of "$Id: 5.1-lpadmin.sh 10448 2012-05-04 18:34:39Z mike $". +# End of "$Id: 5.1-lpadmin.sh 7494 2008-04-25 18:36:46Z mike $". # diff --git a/test/5.2-lpc.sh b/test/5.2-lpc.sh index 1079900b..ff15a871 100644 --- a/test/5.2-lpc.sh +++ b/test/5.2-lpc.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id: 5.2-lpc.sh 10097 2011-11-02 05:35:38Z mike $" +# "$Id: 5.2-lpc.sh 6649 2007-07-11 21:46:42Z mike $" # # Test the lpc command. # @@ -27,5 +27,5 @@ fi echo "" # -# End of "$Id: 5.2-lpc.sh 10097 2011-11-02 05:35:38Z mike $". +# End of "$Id: 5.2-lpc.sh 6649 2007-07-11 21:46:42Z mike $". # diff --git a/test/5.3-lpq.sh b/test/5.3-lpq.sh index 24f2a24a..633508c5 100644 --- a/test/5.3-lpq.sh +++ b/test/5.3-lpq.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id: 5.3-lpq.sh 10097 2011-11-02 05:35:38Z mike $" +# "$Id: 5.3-lpq.sh 6649 2007-07-11 21:46:42Z mike $" # # Test the lpq command. # @@ -27,5 +27,5 @@ fi echo "" # -# End of "$Id: 5.3-lpq.sh 10097 2011-11-02 05:35:38Z mike $". +# End of "$Id: 5.3-lpq.sh 6649 2007-07-11 21:46:42Z mike $". # diff --git a/test/5.4-lpstat.sh b/test/5.4-lpstat.sh index 3d5d956e..b2e38f12 100644 --- a/test/5.4-lpstat.sh +++ b/test/5.4-lpstat.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id: 5.4-lpstat.sh 10097 2011-11-02 05:35:38Z mike $" +# "$Id: 5.4-lpstat.sh 6649 2007-07-11 21:46:42Z mike $" # # Test the lpstat command. # @@ -39,5 +39,5 @@ fi echo "" # -# End of "$Id: 5.4-lpstat.sh 10097 2011-11-02 05:35:38Z mike $". +# End of "$Id: 5.4-lpstat.sh 6649 2007-07-11 21:46:42Z mike $". # diff --git a/test/5.5-lp.sh b/test/5.5-lp.sh index c8834ca9..aa326a8f 100644 --- a/test/5.5-lp.sh +++ b/test/5.5-lp.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id: 5.5-lp.sh 10448 2012-05-04 18:34:39Z mike $" +# "$Id: 5.5-lp.sh 7415 2008-03-31 22:33:20Z mike $" # # Test the lp command. # @@ -80,5 +80,5 @@ echo "" ./waitjobs.sh # -# End of "$Id: 5.5-lp.sh 10448 2012-05-04 18:34:39Z mike $". +# End of "$Id: 5.5-lp.sh 7415 2008-03-31 22:33:20Z mike $". # diff --git a/test/5.6-lpr.sh b/test/5.6-lpr.sh index fa40b740..9a26e75c 100644 --- a/test/5.6-lpr.sh +++ b/test/5.6-lpr.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id: 5.6-lpr.sh 10448 2012-05-04 18:34:39Z mike $" +# "$Id: 5.6-lpr.sh 7409 2008-03-29 00:26:03Z mike $" # # Test the lpr command. # @@ -80,5 +80,5 @@ echo "" ./waitjobs.sh # -# End of "$Id: 5.6-lpr.sh 10448 2012-05-04 18:34:39Z mike $". +# End of "$Id: 5.6-lpr.sh 7409 2008-03-29 00:26:03Z mike $". # diff --git a/test/5.7-lprm.sh b/test/5.7-lprm.sh index acaaca99..4b96920b 100644 --- a/test/5.7-lprm.sh +++ b/test/5.7-lprm.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id: 5.7-lprm.sh 10097 2011-11-02 05:35:38Z mike $" +# "$Id: 5.7-lprm.sh 7409 2008-03-29 00:26:03Z mike $" # # Test the lprm command. # @@ -43,5 +43,5 @@ fi echo "" # -# End of "$Id: 5.7-lprm.sh 10097 2011-11-02 05:35:38Z mike $". +# End of "$Id: 5.7-lprm.sh 7409 2008-03-29 00:26:03Z mike $". # diff --git a/test/5.8-cancel.sh b/test/5.8-cancel.sh index 4b4a08d1..88b7dd4e 100644 --- a/test/5.8-cancel.sh +++ b/test/5.8-cancel.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id: 5.8-cancel.sh 10097 2011-11-02 05:35:38Z mike $" +# "$Id: 5.8-cancel.sh 7409 2008-03-29 00:26:03Z mike $" # # Test the cancel command. # @@ -41,5 +41,5 @@ fi echo "" # -# End of "$Id: 5.8-cancel.sh 10097 2011-11-02 05:35:38Z mike $". +# End of "$Id: 5.8-cancel.sh 7409 2008-03-29 00:26:03Z mike $". # diff --git a/test/5.9-lpinfo.sh b/test/5.9-lpinfo.sh index 3ecaf254..a6ea3645 100644 --- a/test/5.9-lpinfo.sh +++ b/test/5.9-lpinfo.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id: 5.9-lpinfo.sh 10097 2011-11-02 05:35:38Z mike $" +# "$Id: 5.9-lpinfo.sh 7711 2008-07-02 04:39:27Z mike $" # # Test the lpinfo command. # @@ -51,5 +51,5 @@ fi echo "" # -# End of "$Id: 5.9-lpinfo.sh 10097 2011-11-02 05:35:38Z mike $". +# End of "$Id: 5.9-lpinfo.sh 7711 2008-07-02 04:39:27Z mike $". # diff --git a/test/Makefile b/test/Makefile index e6a5ec1d..ad85720c 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 10456 2012-05-07 22:41:42Z mike $" +# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $" # # IPP test makefile for CUPS. # @@ -214,5 +214,5 @@ include Dependencies # -# End of "$Id: Makefile 10456 2012-05-07 22:41:42Z mike $". +# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $". # diff --git a/test/color.jpg b/test/color.jpg Binary files differindex 170e28b1..46cbfd78 100644 --- a/test/color.jpg +++ b/test/color.jpg diff --git a/test/create-job-format.test b/test/create-job-format.test index 87d94a5b..60769a03 100644 --- a/test/create-job-format.test +++ b/test/create-job-format.test @@ -21,8 +21,8 @@ ATTR integer copies 1 # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes # What attributes do we expect? EXPECT job-id @@ -51,6 +51,6 @@ FILE ../data/testprint.ps # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes } diff --git a/test/create-job-sheets.test b/test/create-job-sheets.test index d15bb7d4..08861863 100644 --- a/test/create-job-sheets.test +++ b/test/create-job-sheets.test @@ -21,8 +21,8 @@ ATTR name job-sheets standard # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes # What attributes do we expect? EXPECT job-id @@ -50,6 +50,6 @@ FILE ../data/testprint.ps # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes } diff --git a/test/create-printer-subscription.test b/test/create-printer-subscription.test index 19f5c85f..61959172 100644 --- a/test/create-printer-subscription.test +++ b/test/create-printer-subscription.test @@ -1,5 +1,5 @@ # -# "$Id: create-printer-subscription.test 9084 2010-04-07 06:54:31Z mike $" +# "$Id$" # # Create a printer subscription. # @@ -45,5 +45,5 @@ # -# End of "$Id: create-printer-subscription.test 9084 2010-04-07 06:54:31Z mike $" +# End of "$Id$" # diff --git a/test/get-completed-jobs.test b/test/get-completed-jobs.test index 07311364..eca22793 100644 --- a/test/get-completed-jobs.test +++ b/test/get-completed-jobs.test @@ -1,5 +1,5 @@ # -# "$Id: get-completed-jobs.test 10286 2012-02-15 05:04:50Z mike $" +# "$Id$" # # Get list of completed jobs. # @@ -47,5 +47,5 @@ # -# End of "$Id: get-completed-jobs.test 10286 2012-02-15 05:04:50Z mike $". +# End of "$Id$". # diff --git a/test/get-devices.test b/test/get-devices.test index 76bb5ec7..c31a1b12 100644 --- a/test/get-devices.test +++ b/test/get-devices.test @@ -16,6 +16,6 @@ ATTR uri printer-uri $uri # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes } diff --git a/test/get-job-attributes.test b/test/get-job-attributes.test index ba62bd7f..c40e242c 100644 --- a/test/get-job-attributes.test +++ b/test/get-job-attributes.test @@ -18,8 +18,8 @@ # ATTR keyword requested-attributes job-media-sheets-completed,job-state # What statuses are OK? - #STATUS ok - #STATUS ok-subst + #STATUS successful-ok + #STATUS successful-ok-ignored-or-substituted-attributes # What attributes do we expect? EXPECT job-uri diff --git a/test/get-job-attributes2.test b/test/get-job-attributes2.test index 6a8673f8..d0891b56 100644 --- a/test/get-job-attributes2.test +++ b/test/get-job-attributes2.test @@ -16,8 +16,8 @@ ATTR uri job-uri $uri # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes # What attributes do we expect? EXPECT job-uri diff --git a/test/get-jobs.test b/test/get-jobs.test index 7c2353b5..13b9959c 100644 --- a/test/get-jobs.test +++ b/test/get-jobs.test @@ -1,5 +1,5 @@ # -# "$Id: get-jobs.test 10286 2012-02-15 05:04:50Z mike $" +# "$Id: get-jobs.test 9702 2011-04-20 21:16:08Z mike $" # # Get list of not-completed jobs. # @@ -49,5 +49,5 @@ # -# End of "$Id: get-jobs.test 10286 2012-02-15 05:04:50Z mike $". +# End of "$Id: get-jobs.test 9702 2011-04-20 21:16:08Z mike $". # diff --git a/test/get-ppds-drv-only.test b/test/get-ppds-drv-only.test index ccb1828d..e5c6de78 100644 --- a/test/get-ppds-drv-only.test +++ b/test/get-ppds-drv-only.test @@ -17,8 +17,8 @@ ATTR name include-schemes drv # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes EXPECT ppd-name } diff --git a/test/get-ppds.test b/test/get-ppds.test index 90f59eb6..a82daf89 100644 --- a/test/get-ppds.test +++ b/test/get-ppds.test @@ -16,6 +16,6 @@ ATTR uri printer-uri $uri # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes } diff --git a/test/get-subscriptions.test b/test/get-subscriptions.test index 686059df..09766ffd 100644 --- a/test/get-subscriptions.test +++ b/test/get-subscriptions.test @@ -16,6 +16,6 @@ ATTR uri printer-uri $uri # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes } diff --git a/test/ipp-1.1.test b/test/ipp-1.1.test index f4127249..4fd0ad7e 100644 --- a/test/ipp-1.1.test +++ b/test/ipp-1.1.test @@ -1,5 +1,5 @@ # -# "$Id: ipp-1.1.test 10863 2013-02-06 01:09:31Z mike $" +# "$Id$" # # IPP/1.1 test suite. # @@ -2346,5 +2346,5 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" # -# End of "$Id: ipp-1.1.test 10863 2013-02-06 01:09:31Z mike $". +# End of "$Id$". # diff --git a/test/ipp-2.0.test b/test/ipp-2.0.test index cb7fb66f..0ee0e94e 100644 --- a/test/ipp-2.0.test +++ b/test/ipp-2.0.test @@ -1,5 +1,5 @@ # -# "$Id: ipp-2.0.test 10314 2012-02-29 04:27:56Z mike $" +# "$Id$" # # IPP/2.0 test suite. # @@ -111,5 +111,5 @@ DEFINE MEDIA_REGEX "/^(choice(_((custom|na|asme|roc|oe|roll)_[a-z0-9][-a-z0-9]*_ # -# End of "$Id: ipp-2.0.test 10314 2012-02-29 04:27:56Z mike $". +# End of "$Id$". # diff --git a/test/ipp-2.1.test b/test/ipp-2.1.test index 738aefab..e8ddae4d 100644 --- a/test/ipp-2.1.test +++ b/test/ipp-2.1.test @@ -1,5 +1,5 @@ # -# "$Id: ipp-2.1.test 10010 2011-09-21 06:01:12Z mike $" +# "$Id$" # # IPP/2.1 test suite. # @@ -92,5 +92,5 @@ INCLUDE "ipp-2.0.test" # -# End of "$Id: ipp-2.1.test 10010 2011-09-21 06:01:12Z mike $". +# End of "$Id$". # diff --git a/test/ipp-2.2.test b/test/ipp-2.2.test index 1586dc17..3042ec24 100644 --- a/test/ipp-2.2.test +++ b/test/ipp-2.2.test @@ -1,5 +1,5 @@ # -# "$Id: ipp-2.2.test 10029 2011-09-29 23:49:56Z mike $" +# "$Id$" # # IPP/2.2 test suite. # @@ -82,5 +82,5 @@ INCLUDE "ipp-2.1.test" # -# End of "$Id: ipp-2.2.test 10029 2011-09-29 23:49:56Z mike $". +# End of "$Id$". # diff --git a/test/ippserver.c b/test/ippserver.c index cce95848..3f471b0c 100644 --- a/test/ippserver.c +++ b/test/ippserver.c @@ -1,5 +1,5 @@ /* - * "$Id: ippserver.c 10777 2012-12-17 22:18:10Z mike $" + * "$Id: ippserver.c 4185 2013-02-20 02:19:13Z msweet $" * * Sample IPP/2.0 server for CUPS. * @@ -5252,5 +5252,5 @@ valid_job_attributes( /* - * End of "$Id: ippserver.c 10777 2012-12-17 22:18:10Z mike $". + * End of "$Id: ippserver.c 4185 2013-02-20 02:19:13Z msweet $". */ diff --git a/test/ipptool.c b/test/ipptool.c index fee9fc5d..509b8282 100644 --- a/test/ipptool.c +++ b/test/ipptool.c @@ -1,5 +1,5 @@ /* - * "$Id: ipptool.c 10828 2013-01-21 13:00:37Z mike $" + * "$Id: ipptool.c 4185 2013-02-20 02:19:13Z msweet $" * * ipptool command for CUPS. * @@ -5477,5 +5477,5 @@ with_value(cups_array_t *errors, /* I - Errors array */ /* - * End of "$Id: ipptool.c 10828 2013-01-21 13:00:37Z mike $". + * End of "$Id: ipptool.c 4185 2013-02-20 02:19:13Z msweet $". */ diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh index 76915154..48756c8e 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id: run-stp-tests.sh 10710 2012-11-26 18:26:01Z mike $" +# "$Id: run-stp-tests.sh 9034 2010-03-09 07:03:06Z mike $" # # Perform the complete set of IPP compliance tests specified in the # CUPS Software Test Plan. @@ -944,5 +944,5 @@ if test $fail != 0; then fi # -# End of "$Id: run-stp-tests.sh 10710 2012-11-26 18:26:01Z mike $" +# End of "$Id: run-stp-tests.sh 9034 2010-03-09 07:03:06Z mike $" # diff --git a/test/set-attrs-hold.test b/test/set-attrs-hold.test index 377819ae..213bdd2e 100644 --- a/test/set-attrs-hold.test +++ b/test/set-attrs-hold.test @@ -17,8 +17,8 @@ ATTR name requesting-user-name $user # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes } { @@ -45,8 +45,8 @@ FILE ../data/testprint.ps # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes # What attributes do we expect? EXPECT job-id @@ -71,8 +71,8 @@ ATTR integer job-id $job-id # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes # What attributes do we expect? EXPECT job-state @@ -101,8 +101,8 @@ ATTR name job-hold-until 00:30:00 # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes } { @@ -123,8 +123,8 @@ ATTR integer job-id $job-id # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes # What attributes do we expect? EXPECT job-state @@ -149,8 +149,8 @@ ATTR name requesting-user-name $user # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes } { @@ -171,8 +171,8 @@ ATTR integer job-id $job-id # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes # What attributes do we expect? EXPECT job-state diff --git a/test/testfile.ps b/test/testfile.ps index d02503a1..bf8c36cb 100644 --- a/test/testfile.ps +++ b/test/testfile.ps @@ -593,6 +593,6 @@ gsave grestore showpage % -% End of "$Id: testfile.ps 9771 2011-05-12 05:21:56Z mike $". +% End of "$Id: testfile.ps 6649 2007-07-11 21:46:42Z mike $". % %%EOF diff --git a/test/testhp.ppd b/test/testhp.ppd index 4a82be67..6200c7ab 100644 --- a/test/testhp.ppd +++ b/test/testhp.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% -*% "$Id: testhp.ppd 9563 2011-02-22 20:21:24Z mike $" +*% "$Id: testhp.ppd 6649 2007-07-11 21:46:42Z mike $" *% *% Test HP PPD file for CUPS. *% @@ -183,5 +183,5 @@ *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM *Font ZapfDingbats: Special "(001.004S)" Standard ROM *% -*% End of "$Id: testhp.ppd 9563 2011-02-22 20:21:24Z mike $". +*% End of "$Id: testhp.ppd 6649 2007-07-11 21:46:42Z mike $". *% diff --git a/test/testps.ppd b/test/testps.ppd index 6e478003..10b4a377 100644 --- a/test/testps.ppd +++ b/test/testps.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% -*% "$Id: testps.ppd 9771 2011-05-12 05:21:56Z mike $" +*% "$Id: testps.ppd 6649 2007-07-11 21:46:42Z mike $" *% *% Test PS PPD file for CUPS. *% @@ -179,5 +179,5 @@ *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM *Font ZapfDingbats: Special "(001.004S)" Standard ROM *% -*% End of "$Id: testps.ppd 9771 2011-05-12 05:21:56Z mike $". +*% End of "$Id: testps.ppd 6649 2007-07-11 21:46:42Z mike $". *% diff --git a/test/waitjobs.sh b/test/waitjobs.sh index b3dec929..01c581db 100755 --- a/test/waitjobs.sh +++ b/test/waitjobs.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# "$Id: waitjobs.sh 8393 2009-02-25 23:24:18Z mike $" +# "$Id: waitjobs.sh 1253 2009-02-25 23:37:25Z msweet $" # # Script to wait for jobs to complete. # @@ -56,5 +56,5 @@ done echo "" # -# End of "$Id: waitjobs.sh 8393 2009-02-25 23:24:18Z mike $". +# End of "$Id: waitjobs.sh 1253 2009-02-25 23:37:25Z msweet $". # diff --git a/test/xmltotest.c b/test/xmltotest.c index efe04553..143f2416 100644 --- a/test/xmltotest.c +++ b/test/xmltotest.c @@ -1,5 +1,5 @@ /* - * "$Id: xmltotest.c 10192 2012-01-20 21:49:02Z mike $" + * "$Id: xmltotest.c 3643 2012-02-13 16:35:48Z msweet $" * * IANA XML registration to test file generator for CUPS. * @@ -525,5 +525,5 @@ main(void) /* - * End of "$Id: xmltotest.c 10192 2012-01-20 21:49:02Z mike $". + * End of "$Id: xmltotest.c 3643 2012-02-13 16:35:48Z msweet $". */ diff --git a/vcnet/config.h b/vcnet/config.h index f23f4f61..6120140a 100644 --- a/vcnet/config.h +++ b/vcnet/config.h @@ -1,9 +1,9 @@ /* - * "$Id: config.h 10424 2012-04-23 17:26:57Z mike $" + * "$Id: config.h 6649 2007-07-11 21:46:42Z mike $" * * Configuration file for CUPS on Windows. * - * Copyright 2007-2012 by Apple Inc. + * Copyright 2007-2013 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -86,8 +86,8 @@ * Version of software... */ -#define CUPS_SVERSION "CUPS v1.6.0" -#define CUPS_MINIMAL "CUPS/1.6.0" +#define CUPS_SVERSION "CUPS v1.6.3" +#define CUPS_MINIMAL "CUPS/1.6.3" /* @@ -784,5 +784,5 @@ #endif /* !_CUPS_CONFIG_H_ */ /* - * End of "$Id: config.h 10424 2012-04-23 17:26:57Z mike $". + * End of "$Id: config.h 6649 2007-07-11 21:46:42Z mike $". */ diff --git a/xcode/CUPS.xcodeproj/project.pbxproj b/xcode/CUPS.xcodeproj/project.pbxproj index c1a32a00..23a2067a 100644 --- a/xcode/CUPS.xcodeproj/project.pbxproj +++ b/xcode/CUPS.xcodeproj/project.pbxproj @@ -1967,7 +1967,10 @@ 273BF6B81333B4A90022CAAB /* tests */, 72220EAF1333047D00FCA411 /* Products */, ); + indentWidth = 2; sourceTree = "<group>"; + tabWidth = 8; + wrapsLines = 0; }; 72F75A681336FA42004BB496 /* libcupsimage */ = { isa = PBXGroup; diff --git a/xcode/config.h b/xcode/config.h index 5b21b19a..a6b30522 100644 --- a/xcode/config.h +++ b/xcode/config.h @@ -1,10 +1,10 @@ /* config.h. Generated from config.h.in by configure. */ /* - * "$Id: config.h 10548 2012-07-16 18:21:43Z mike $" + * "$Id: config.h 4298 2013-05-10 16:52:10Z msweet $" * * Configuration file for CUPS. * - * Copyright 2007-2012 by Apple Inc. + * Copyright 2007-2013 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -21,8 +21,8 @@ * Version of software... */ -#define CUPS_SVERSION "CUPS v1.6.0" -#define CUPS_MINIMAL "CUPS/1.6.0" +#define CUPS_SVERSION "CUPS v1.6.3" +#define CUPS_MINIMAL "CUPS/1.6.3" /* @@ -739,5 +739,5 @@ static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); } #endif /* !_CUPS_CONFIG_H_ */ /* - * End of "$Id: config.h 10548 2012-07-16 18:21:43Z mike $". + * End of "$Id: config.h 4298 2013-05-10 16:52:10Z msweet $". */ |
