diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-06-27 20:26:20 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-06-27 20:26:20 +0000 |
| commit | 75bd9771f6e44fdd887ee90faac46f403aefc0fc (patch) | |
| tree | 354e3067522df9490e905772f73b72bfed8733ae /cups | |
| parent | dd1abb6b5f145c5e5f279d8848b5f3ec161fd227 (diff) | |
Merge changes from CUPS 1.4svn-r7696.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@818 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups')
65 files changed, 212 insertions, 130 deletions
diff --git a/cups/Makefile b/cups/Makefile index 3bf135002..6d4a68481 100644 --- a/cups/Makefile +++ b/cups/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $" +# "$Id: Makefile 7589 2008-05-19 00:13:23Z mike $" # # API library Makefile for the Common UNIX Printing System (CUPS). # @@ -600,5 +600,5 @@ include Dependencies # -# End of "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $". +# End of "$Id: Makefile 7589 2008-05-19 00:13:23Z mike $". # diff --git a/cups/adminutil.c b/cups/adminutil.c index e3adf54b4..95393afd0 100644 --- a/cups/adminutil.c +++ b/cups/adminutil.c @@ -1,5 +1,5 @@ /* - * "$Id: adminutil.c 6930 2007-09-08 00:28:06Z mike $" + * "$Id: adminutil.c 7576 2008-05-15 21:05:14Z mike $" * * Administration utility API definitions for the Common UNIX Printing * System (CUPS). @@ -2382,5 +2382,5 @@ write_option(cups_file_t *dstfp, /* I - PPD file */ /* - * End of "$Id: adminutil.c 6930 2007-09-08 00:28:06Z mike $". + * End of "$Id: adminutil.c 7576 2008-05-15 21:05:14Z mike $". */ diff --git a/cups/adminutil.h b/cups/adminutil.h index 8613a3be4..145dfa0f7 100644 --- a/cups/adminutil.h +++ b/cups/adminutil.h @@ -1,5 +1,5 @@ /* - * "$Id: adminutil.h 6649 2007-07-11 21:46:42Z mike $" + * "$Id: adminutil.h 7026 2007-10-19 00:57:45Z mike $" * * Administration utility API definitions for the Common UNIX Printing * System (CUPS). @@ -77,5 +77,5 @@ extern int cupsAdminSetServerSettings(http_t *http, #endif /* !_CUPS_ADMINUTIL_H_ */ /* - * End of "$Id: adminutil.h 6649 2007-07-11 21:46:42Z 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 34b796f4c..c4d28b464 100644 --- a/cups/api-array.header +++ b/cups/api-array.header @@ -1,5 +1,5 @@ <!-- - "$Id$" + "$Id: api-array.header 7266 2008-01-29 02:15:29Z mike $" Array API header for the Common UNIX Printing System (CUPS). diff --git a/cups/api-array.shtml b/cups/api-array.shtml index ae2787fec..bacf48307 100644 --- a/cups/api-array.shtml +++ b/cups/api-array.shtml @@ -1,5 +1,5 @@ <!-- - "$Id: api-array.shtml 6649 2007-07-11 21:46:42Z mike $" + "$Id: api-array.shtml 7616 2008-05-28 00:34:13Z mike $" Array API introduction for the Common UNIX Printing System (CUPS). diff --git a/cups/api-cups.header b/cups/api-cups.header index a706b55af..c95b611fd 100644 --- a/cups/api-cups.header +++ b/cups/api-cups.header @@ -1,5 +1,5 @@ <!-- - "$Id$" + "$Id: api-cups.header 7279 2008-01-31 01:50:44Z mike $" CUPS API header for the Common UNIX Printing System (CUPS). diff --git a/cups/api-cups.shtml b/cups/api-cups.shtml index bc9a05286..7a653d4a8 100644 --- a/cups/api-cups.shtml +++ b/cups/api-cups.shtml @@ -1,5 +1,5 @@ <!-- - "$Id: api-cups.shtml 6649 2007-07-11 21:46:42Z mike $" + "$Id: api-cups.shtml 7337 2008-02-22 04:44:04Z mike $" CUPS API introduction for the Common UNIX Printing System (CUPS). diff --git a/cups/api-filedir.header b/cups/api-filedir.header index 755311511..e4c7994f5 100644 --- a/cups/api-filedir.header +++ b/cups/api-filedir.header @@ -1,5 +1,5 @@ <!-- - "$Id$" + "$Id: api-filedir.header 7279 2008-01-31 01:50:44Z mike $" File and Directory API header for the Common UNIX Printing System (CUPS). diff --git a/cups/api-filedir.shtml b/cups/api-filedir.shtml index 2b19efa8a..843812ce5 100644 --- a/cups/api-filedir.shtml +++ b/cups/api-filedir.shtml @@ -1,5 +1,5 @@ <!-- - "$Id: api-filedir.shtml 6649 2007-07-11 21:46:42Z mike $" + "$Id: api-filedir.shtml 7279 2008-01-31 01:50:44Z mike $" File and directory API introduction for the Common UNIX Printing System (CUPS). diff --git a/cups/api-filter.header b/cups/api-filter.header index 368364ae8..bfe1a73aa 100644 --- a/cups/api-filter.header +++ b/cups/api-filter.header @@ -1,5 +1,5 @@ <!-- - "$Id$" + "$Id: api-filter.header 7616 2008-05-28 00:34:13Z mike $" Filter and backend programming header for the Common UNIX Printing System (CUPS). diff --git a/cups/api-filter.shtml b/cups/api-filter.shtml index 2be3b2bf6..90d86342d 100644 --- a/cups/api-filter.shtml +++ b/cups/api-filter.shtml @@ -1,5 +1,5 @@ <!-- - "$Id: api-filter.shtml 6649 2007-07-11 21:46:42Z mike $" + "$Id: api-filter.shtml 7677 2008-06-19 23:22:19Z mike $" Filter and backend programming introduction for the Common UNIX Printing System (CUPS). @@ -185,10 +185,11 @@ prefix strings:</p> <dt>ATTR: attribute=value [attribute=value]</dt> <dd>Sets the named printer or job attribute(s). Typically this is used to set the <code>marker-colors</code>, <code>marker-levels</code>, - <code>marker-names</code>, <code>marker-types</code>, - <code>printer-alert</code>, and <code>printer-alert-description</code> - printer attributes. Standard <code>marker-types</code> values are - listed in <a href='#TABLE1'>Table 1</a>.</dd> + <code>marker-message</code>, <code>marker-names</code>, + <code>marker-types</code>, <code>printer-alert</code>, and + <code>printer-alert-description</code> printer attributes. Standard + <code>marker-types</code> values are listed in <a href='#TABLE1'>Table + 1</a>.</dd> <dt>CRIT: message</dt> <dd>Sets the printer-state-message attribute and adds the specified diff --git a/cups/api-httpipp.header b/cups/api-httpipp.header index 03d5a8def..4bb1b3d57 100644 --- a/cups/api-httpipp.header +++ b/cups/api-httpipp.header @@ -1,5 +1,5 @@ <!-- - "$Id$" + "$Id: api-httpipp.header 7258 2008-01-28 00:15:05Z mike $" HTTP and IPP API header for the Common UNIX Printing System (CUPS). diff --git a/cups/api-httpipp.shtml b/cups/api-httpipp.shtml index b755b7ded..ed559efaf 100644 --- a/cups/api-httpipp.shtml +++ b/cups/api-httpipp.shtml @@ -1,5 +1,5 @@ <!-- - "$Id: api-httpipp.shtml 6649 2007-07-11 21:46:42Z mike $" + "$Id: api-httpipp.shtml 7684 2008-06-23 16:47:38Z mike $" HTTP and IPP API introduction for the Common UNIX Printing System (CUPS). @@ -293,7 +293,7 @@ tempfd = cupsTempFd(tempfile, sizeof(tempfile)); /* Loop for authentication */ do { - status = a href='#cupsSendRequest'>cupsSendRequest</a>(CUPS_HTTP_DEFAULT, request, "/"); + status = <a href='#cupsSendRequest'>cupsSendRequest</a>(CUPS_HTTP_DEFAULT, request, "/"); if (status == HTTP_UNAUTHORIZED) { diff --git a/cups/api-ppd.header b/cups/api-ppd.header index 60f6ff0d2..8ec2f7593 100644 --- a/cups/api-ppd.header +++ b/cups/api-ppd.header @@ -1,5 +1,5 @@ <!-- - "$Id$" + "$Id: api-ppd.header 7616 2008-05-28 00:34:13Z mike $" PPD API header for the Common UNIX Printing System (CUPS). diff --git a/cups/api-ppd.shtml b/cups/api-ppd.shtml index c411c6844..ad393e106 100644 --- a/cups/api-ppd.shtml +++ b/cups/api-ppd.shtml @@ -1,5 +1,5 @@ <!-- - "$Id: api-ppd.shtml 6649 2007-07-11 21:46:42Z mike $" + "$Id: api-ppd.shtml 7616 2008-05-28 00:34:13Z mike $" PPD API introduction for the Common UNIX Printing System (CUPS). diff --git a/cups/array.c b/cups/array.c index 19f97819d..ae45eeba0 100644 --- a/cups/array.c +++ b/cups/array.c @@ -1,5 +1,5 @@ /* - * "$Id: array.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id: array.c 7616 2008-05-28 00:34:13Z mike $" * * Sorted array routines for the Common UNIX Printing System (CUPS). * @@ -1142,5 +1142,5 @@ cups_array_find(cups_array_t *a, /* I - Array */ /* - * End of "$Id: array.c 6649 2007-07-11 21:46:42Z 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 ae5752195..029e2e996 100644 --- a/cups/array.h +++ b/cups/array.h @@ -1,5 +1,5 @@ /* - * "$Id: array.h 6649 2007-07-11 21:46:42Z mike $" + * "$Id: array.h 7266 2008-01-29 02:15:29Z mike $" * * Sorted array definitions for the Common UNIX Printing System (CUPS). * @@ -80,5 +80,5 @@ extern void *cupsArrayUserData(cups_array_t *a) _CUPS_API_1_2; #endif /* !_CUPS_ARRAY_H_ */ /* - * End of "$Id: array.h 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id: array.h 7266 2008-01-29 02:15:29Z mike $". */ diff --git a/cups/auth.c b/cups/auth.c index d3d38b47e..561756215 100644 --- a/cups/auth.c +++ b/cups/auth.c @@ -1,5 +1,5 @@ /* - * "$Id: auth.c 6779 2007-08-08 19:49:48Z mike $" + * "$Id: auth.c 7460 2008-04-16 02:19:54Z mike $" * * Authentication functions for the Common UNIX Printing System (CUPS). * @@ -683,5 +683,5 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ /* - * End of "$Id: auth.c 6779 2007-08-08 19:49:48Z mike $". + * End of "$Id: auth.c 7460 2008-04-16 02:19:54Z mike $". */ diff --git a/cups/backchannel.c b/cups/backchannel.c index 4eb1947ed..c2b53bb49 100644 --- a/cups/backchannel.c +++ b/cups/backchannel.c @@ -1,5 +1,5 @@ /* - * "$Id: backchannel.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id: backchannel.c 7616 2008-05-28 00:34:13Z mike $" * * Backchannel functions for the Common UNIX Printing System (CUPS). * @@ -195,5 +195,5 @@ cups_setup(fd_set *set, /* I - Set for select() */ /* - * End of "$Id: backchannel.c 6649 2007-07-11 21:46:42Z 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 db17bda70..477d38ecd 100644 --- a/cups/backend.c +++ b/cups/backend.c @@ -1,5 +1,5 @@ /* - * "$Id: backend.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id: backend.c 7583 2008-05-16 17:47:16Z mike $" * * Backend functions for the Common UNIX Printing System (CUPS). * @@ -58,5 +58,5 @@ cupsBackendDeviceURI(char **argv) /* I - Command-line arguments */ /* - * End of "$Id: backend.c 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id: backend.c 7583 2008-05-16 17:47:16Z mike $". */ diff --git a/cups/backend.h b/cups/backend.h index 67d5e8115..77bf57569 100644 --- a/cups/backend.h +++ b/cups/backend.h @@ -1,5 +1,5 @@ /* - * "$Id: backend.h 6649 2007-07-11 21:46:42Z mike $" + * "$Id: backend.h 7282 2008-01-31 08:37:11Z mike $" * * Backend definitions for the Common UNIX Printing System (CUPS). * @@ -53,5 +53,5 @@ extern const char *cupsBackendDeviceURI(char **argv) _CUPS_API_1_2; #endif /* !_CUPS_BACKEND_H_ */ /* - * End of "$Id: backend.h 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id: backend.h 7282 2008-01-31 08:37:11Z mike $". */ diff --git a/cups/cups.h b/cups/cups.h index 6ef70f647..e80b1665a 100644 --- a/cups/cups.h +++ b/cups/cups.h @@ -1,5 +1,5 @@ /* - * "$Id: cups.h 6870 2007-08-27 21:13:35Z mike $" + * "$Id: cups.h 7616 2008-05-28 00:34:13Z mike $" * * API definitions for the Common UNIX Printing System (CUPS). * @@ -308,5 +308,5 @@ extern http_status_t cupsWriteRequestData(http_t *http, const char *buffer, #endif /* !_CUPS_CUPS_H_ */ /* - * End of "$Id: cups.h 6870 2007-08-27 21:13:35Z mike $". + * End of "$Id: cups.h 7616 2008-05-28 00:34:13Z mike $". */ diff --git a/cups/debug.h b/cups/debug.h index 756c4773d..8b91d9366 100644 --- a/cups/debug.h +++ b/cups/debug.h @@ -1,5 +1,5 @@ /* - * "$Id: debug.h 6649 2007-07-11 21:46:42Z mike $" + * "$Id: debug.h 7460 2008-04-16 02:19:54Z mike $" * * Debugging macros for the Common UNIX Printing System (CUPS). * @@ -53,5 +53,5 @@ extern void _cups_debug_puts(const char *s); #endif /* !_CUPS_DEBUG_H_ */ /* - * End of "$Id: debug.h 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id: debug.h 7460 2008-04-16 02:19:54Z mike $". */ diff --git a/cups/dest.c b/cups/dest.c index a4c826413..185bd1a50 100644 --- a/cups/dest.c +++ b/cups/dest.c @@ -1,5 +1,5 @@ /* - * "$Id: dest.c 6943 2007-09-10 23:00:33Z mike $" + * "$Id: dest.c 7460 2008-04-16 02:19:54Z mike $" * * User-defined destination (and option) support for the Common UNIX * Printing System (CUPS). @@ -1831,5 +1831,5 @@ cups_get_sdests(http_t *http, /* I - Connection to server or CUPS_HTTP_DEFA /* - * End of "$Id: dest.c 6943 2007-09-10 23:00:33Z mike $". + * End of "$Id: dest.c 7460 2008-04-16 02:19:54Z mike $". */ diff --git a/cups/dir.c b/cups/dir.c index 1ef2046b7..b55cfc8c6 100644 --- a/cups/dir.c +++ b/cups/dir.c @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: dir.c 7279 2008-01-31 01:50:44Z mike $" * * Public directory routines for the Common UNIX Printing System (CUPS). * @@ -469,5 +469,5 @@ cupsDirRewind(cups_dir_t *dp) /* I - Directory pointer */ #endif /* WIN32 */ /* - * End of "$Id$". + * End of "$Id: dir.c 7279 2008-01-31 01:50:44Z mike $". */ diff --git a/cups/dir.h b/cups/dir.h index 5a4f8d6d0..85dd8076a 100644 --- a/cups/dir.h +++ b/cups/dir.h @@ -1,5 +1,5 @@ /* - * "$Id$" + * "$Id: dir.h 7026 2007-10-19 00:57:45Z mike $" * * Public directory definitions for the Common UNIX Printing System (CUPS). * @@ -65,5 +65,5 @@ extern void cupsDirRewind(cups_dir_t *dp) _CUPS_API_1_2; #endif /* !_CUPS_DIR_H_ */ /* - * End of "$Id$". + * End of "$Id: dir.h 7026 2007-10-19 00:57:45Z mike $". */ diff --git a/cups/emit.c b/cups/emit.c index 636f3e7fb..3e78be539 100644 --- a/cups/emit.c +++ b/cups/emit.c @@ -1,5 +1,5 @@ /* - * "$Id: emit.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id: emit.c 7493 2008-04-24 00:10:34Z mike $" * * PPD code emission routines for the Common UNIX Printing System (CUPS). * @@ -1010,5 +1010,5 @@ ppd_handle_media(ppd_file_t *ppd) /* - * End of "$Id: emit.c 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id: emit.c 7493 2008-04-24 00:10:34Z mike $". */ diff --git a/cups/encode.c b/cups/encode.c index 335623eae..f486d7d07 100644 --- a/cups/encode.c +++ b/cups/encode.c @@ -1,5 +1,5 @@ /* - * "$Id: encode.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id: encode.c 7696 2008-06-26 00:54:42Z mike $" * * Option encoding routines for the Common UNIX Printing System (CUPS). * @@ -64,6 +64,7 @@ static const _ipp_option_t ipp_options[] = { 0, "gamma-default", IPP_TAG_INTEGER, IPP_TAG_PRINTER }, { 0, "hue", IPP_TAG_INTEGER, IPP_TAG_JOB }, { 0, "hue-default", IPP_TAG_INTEGER, IPP_TAG_PRINTER }, + { 0, "job-impressions", IPP_TAG_INTEGER, IPP_TAG_JOB }, { 0, "job-k-limit", IPP_TAG_INTEGER, IPP_TAG_JOB }, { 0, "job-page-limit", IPP_TAG_INTEGER, IPP_TAG_JOB }, { 0, "job-priority", IPP_TAG_INTEGER, IPP_TAG_JOB }, @@ -588,5 +589,5 @@ compare_ipp_options(_ipp_option_t *a, /* I - First option */ /* - * End of "$Id: encode.c 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id: encode.c 7696 2008-06-26 00:54:42Z mike $". */ diff --git a/cups/file.c b/cups/file.c index d3726cf53..815e1d3c5 100644 --- a/cups/file.c +++ b/cups/file.c @@ -1,5 +1,5 @@ /* - * "$Id: file.c 6962 2007-09-17 20:35:47Z mike $" + * "$Id: file.c 7672 2008-06-18 22:03:02Z mike $" * * File functions for the Common UNIX Printing System (CUPS). * @@ -119,6 +119,9 @@ struct _cups_file_s /**** CUPS file structure... ****/ Bytef cbuf[4096]; /* (De)compression buffer */ uLong crc; /* (De)compression CRC */ #endif /* HAVE_LIBZ */ + + char *printf_buffer; /* cupsFilePrintf buffer */ + size_t printf_size; /* Size of cupsFilePrintf buffer */ }; @@ -242,6 +245,9 @@ cupsFileClose(cups_file_t *fp) /* I - CUPS file */ mode = fp->mode; is_stdio = fp->is_stdio; + if (fp->printf_buffer) + free(fp->printf_buffer); + free(fp); /* @@ -1111,7 +1117,6 @@ cupsFilePrintf(cups_file_t *fp, /* I - CUPS file */ { va_list ap; /* Argument list */ ssize_t bytes; /* Formatted size */ - char buf[8192]; /* Formatted text */ DEBUG_printf(("cupsFilePrintf(fp=%p, format=\"%s\", ...)\n", fp, format)); @@ -1119,16 +1124,48 @@ cupsFilePrintf(cups_file_t *fp, /* I - CUPS file */ if (!fp || !format || (fp->mode != 'w' && fp->mode != 's')) return (-1); + if (!fp->printf_buffer) + { + /* + * Start with an 1k printf buffer... + */ + + if ((fp->printf_buffer = malloc(1024)) == NULL) + return (-1); + + fp->printf_size = 1024; + } + va_start(ap, format); - bytes = vsnprintf(buf, sizeof(buf), format, ap); + bytes = vsnprintf(fp->printf_buffer, fp->printf_size, format, ap); va_end(ap); - if (bytes >= sizeof(buf)) - return (-1); + if (bytes >= fp->printf_size) + { + /* + * Expand the printf buffer... + */ + + char *temp; /* Temporary buffer pointer */ + + + if (bytes > 65535) + return (-1); + + if ((temp = realloc(fp->printf_buffer, bytes + 1)) == NULL) + return (-1); + + fp->printf_buffer = temp; + fp->printf_size = bytes + 1; + + va_start(ap, format); + bytes = vsnprintf(fp->printf_buffer, fp->printf_size, format, ap); + va_end(ap); + } if (fp->mode == 's') { - if (cups_write(fp, buf, bytes) < 0) + if (cups_write(fp, fp->printf_buffer, bytes) < 0) return (-1); fp->pos += bytes; @@ -1150,14 +1187,14 @@ cupsFilePrintf(cups_file_t *fp, /* I - CUPS file */ { #ifdef HAVE_LIBZ if (fp->compressed) - return (cups_compress(fp, buf, bytes)); + return (cups_compress(fp, fp->printf_buffer, bytes)); else #endif /* HAVE_LIBZ */ - return (cups_write(fp, buf, bytes)); + return (cups_write(fp, fp->printf_buffer, bytes)); } else { - memcpy(fp->ptr, buf, bytes); + memcpy(fp->ptr, fp->printf_buffer, bytes); fp->ptr += bytes; return (bytes); } @@ -2294,5 +2331,5 @@ cups_write(cups_file_t *fp, /* I - CUPS file */ /* - * End of "$Id: file.c 6962 2007-09-17 20:35:47Z 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 05a32cc71..53356d68a 100644 --- a/cups/file.h +++ b/cups/file.h @@ -1,5 +1,5 @@ /* - * "$Id: file.h 6649 2007-07-11 21:46:42Z mike $" + * "$Id: file.h 7460 2008-04-16 02:19:54Z mike $" * * Public file definitions for the Common UNIX Printing System (CUPS). * @@ -105,5 +105,5 @@ extern ssize_t cupsFileWrite(cups_file_t *fp, const char *buf, size_t bytes) _C #endif /* !_CUPS_FILE_H_ */ /* - * End of "$Id: file.h 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id: file.h 7460 2008-04-16 02:19:54Z mike $". */ diff --git a/cups/getputfile.c b/cups/getputfile.c index 6af7b56b1..31dde6ca7 100644 --- a/cups/getputfile.c +++ b/cups/getputfile.c @@ -1,5 +1,5 @@ /* - * "$Id: getputfile.c 6720 2007-07-25 00:40:03Z mike $" + * "$Id: getputfile.c 7359 2008-02-29 19:01:35Z mike $" * * Get/put file functions for the Common UNIX Printing System (CUPS). * @@ -494,5 +494,5 @@ cupsPutFile(http_t *http, /* I - Connection to server or @code CUPS_HTTP_DE /* - * End of "$Id: getputfile.c 6720 2007-07-25 00:40:03Z 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 6849f424c..d104f1b50 100644 --- a/cups/globals.c +++ b/cups/globals.c @@ -1,5 +1,5 @@ /* - * "$Id: globals.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id: globals.c 7460 2008-04-16 02:19:54Z mike $" * * Global variable access routines for the Common UNIX Printing System (CUPS). * @@ -205,5 +205,5 @@ _cupsGlobals(void) /* - * End of "$Id: globals.c 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id: globals.c 7460 2008-04-16 02:19:54Z mike $". */ diff --git a/cups/globals.h b/cups/globals.h index 2110dbcd2..1629ec35e 100644 --- a/cups/globals.h +++ b/cups/globals.h @@ -1,5 +1,5 @@ /* - * "$Id: globals.h 6712 2007-07-24 00:13:05Z mike $" + * "$Id: globals.h 7583 2008-05-16 17:47:16Z mike $" * * Global variable definitions for the Common UNIX Printing System (CUPS). * @@ -156,5 +156,5 @@ extern void _cupsSetHTTPError(http_status_t status); #endif /* !_CUPS_GLOBALS_H_ */ /* - * End of "$Id: globals.h 6712 2007-07-24 00:13:05Z mike $". + * End of "$Id: globals.h 7583 2008-05-16 17:47:16Z mike $". */ diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c index 6d645053c..effe2e6a8 100644 --- a/cups/http-addrlist.c +++ b/cups/http-addrlist.c @@ -1,5 +1,5 @@ /* - * "$Id: http-addrlist.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id: http-addrlist.c 7460 2008-04-16 02:19:54Z mike $" * * HTTP address list routines for the Common UNIX Printing System (CUPS). * @@ -599,5 +599,5 @@ httpAddrGetList(const char *hostname, /* I - Hostname, IP address, or NULL for p /* - * End of "$Id: http-addrlist.c 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id: http-addrlist.c 7460 2008-04-16 02:19:54Z mike $". */ diff --git a/cups/http-private.h b/cups/http-private.h index c933f45cf..415f25a9e 100644 --- a/cups/http-private.h +++ b/cups/http-private.h @@ -1,5 +1,5 @@ /* - * "$Id: http-private.h 6933 2007-09-10 16:45:59Z mike $" + * "$Id: http-private.h 7583 2008-05-16 17:47:16Z mike $" * * Private HTTP definitions for the Common UNIX Printing System (CUPS). * @@ -268,5 +268,5 @@ extern const char *_httpResolveURI(const char *uri, char *resolved_uri, #endif /* !_CUPS_HTTP_PRIVATE_H_ */ /* - * End of "$Id: http-private.h 6933 2007-09-10 16:45:59Z mike $". + * End of "$Id: http-private.h 7583 2008-05-16 17:47:16Z mike $". */ diff --git a/cups/http.c b/cups/http.c index b70139108..8baf29119 100644 --- a/cups/http.c +++ b/cups/http.c @@ -1,5 +1,5 @@ /* - * "$Id: http.c 6724 2007-07-25 20:39:33Z mike $" + * "$Id: http.c 7661 2008-06-16 21:46:51Z mike $" * * HTTP routines for the Common UNIX Printing System (CUPS). * @@ -3239,5 +3239,5 @@ http_write_ssl(http_t *http, /* I - Connection to server */ /* - * End of "$Id: http.c 6724 2007-07-25 20:39:33Z mike $". + * End of "$Id: http.c 7661 2008-06-16 21:46:51Z mike $". */ diff --git a/cups/http.h b/cups/http.h index 552bab98a..169a1575c 100644 --- a/cups/http.h +++ b/cups/http.h @@ -1,5 +1,5 @@ /* - * "$Id: http.h 6722 2007-07-25 17:19:09Z mike $" + * "$Id: http.h 7026 2007-10-19 00:57:45Z mike $" * * Hyper-Text Transport Protocol definitions for the Common UNIX Printing * System (CUPS). @@ -447,5 +447,5 @@ extern void httpSetAuthString(http_t *http, const char *scheme, #endif /* !_CUPS_HTTP_H_ */ /* - * End of "$Id: http.h 6722 2007-07-25 17:19:09Z mike $". + * End of "$Id: http.h 7026 2007-10-19 00:57:45Z mike $". */ diff --git a/cups/i18n.h b/cups/i18n.h index 71eb9f64d..2329de8ee 100644 --- a/cups/i18n.h +++ b/cups/i18n.h @@ -1,5 +1,5 @@ /* - * "$Id: i18n.h 6649 2007-07-11 21:46:42Z mike $" + * "$Id: i18n.h 7363 2008-03-03 22:19:24Z mike $" * * (Private) localization support for the Common UNIX Printing System (CUPS). * @@ -111,5 +111,5 @@ extern void _cupsSetLocale(char *argv[]); #endif /* !_CUPS_I18N_H_ */ /* - * End of "$Id: i18n.h 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id: i18n.h 7363 2008-03-03 22:19:24Z mike $". */ diff --git a/cups/ipp-private.h b/cups/ipp-private.h index 0083d2a38..2d1fd955f 100644 --- a/cups/ipp-private.h +++ b/cups/ipp-private.h @@ -1,5 +1,5 @@ /* - * "$Id: ipp-private.h 6649 2007-07-11 21:46:42Z mike $" + * "$Id: ipp-private.h 7259 2008-01-28 22:26:04Z mike $" * * Private IPP definitions for the Common UNIX Printing System (CUPS). * @@ -66,5 +66,5 @@ extern void _ippFreeAttr(ipp_attribute_t *); #endif /* !_CUPS_IPP_H_ */ /* - * End of "$Id: ipp-private.h 6649 2007-07-11 21:46:42Z 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 945dc4f63..47194d133 100644 --- a/cups/ipp-support.c +++ b/cups/ipp-support.c @@ -1,5 +1,5 @@ /* - * "$Id: ipp-support.c 6879 2007-08-29 20:26:50Z mike $" + * "$Id: ipp-support.c 7460 2008-04-16 02:19:54Z mike $" * * Internet Printing Protocol support functions for the Common UNIX * Printing System (CUPS). @@ -371,5 +371,5 @@ ippSetPort(int p) /* I - Port number to use */ /* - * End of "$Id: ipp-support.c 6879 2007-08-29 20:26:50Z mike $". + * End of "$Id: ipp-support.c 7460 2008-04-16 02:19:54Z mike $". */ diff --git a/cups/ipp.c b/cups/ipp.c index 0749ec2a1..d528b6a54 100644 --- a/cups/ipp.c +++ b/cups/ipp.c @@ -1,5 +1,5 @@ /* - * "$Id: ipp.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id: ipp.c 7463 2008-04-17 00:24:25Z mike $" * * Internet Printing Protocol support functions for the Common UNIX * Printing System (CUPS). @@ -2908,5 +2908,5 @@ _ipp_free_attr(ipp_attribute_t *attr) /* I - Attribute to free */ /* - * End of "$Id: ipp.c 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id: ipp.c 7463 2008-04-17 00:24:25Z mike $". */ diff --git a/cups/ipp.h b/cups/ipp.h index 2a36fe35b..9073c5775 100644 --- a/cups/ipp.h +++ b/cups/ipp.h @@ -1,5 +1,5 @@ /* - * "$Id: ipp.h 6879 2007-08-29 20:26:50Z mike $" + * "$Id: ipp.h 7257 2008-01-25 02:42:47Z mike $" * * Internet Printing Protocol definitions for the Common UNIX Printing * System (CUPS). @@ -494,5 +494,5 @@ extern ipp_state_t ippWriteIO(void *dst, ipp_iocb_t cb, int blocking, #endif /* !_CUPS_IPP_H_ */ /* - * End of "$Id: ipp.h 6879 2007-08-29 20:26:50Z mike $". + * End of "$Id: ipp.h 7257 2008-01-25 02:42:47Z mike $". */ diff --git a/cups/langprintf.c b/cups/langprintf.c index afb189c57..089eb4859 100644 --- a/cups/langprintf.c +++ b/cups/langprintf.c @@ -1,5 +1,5 @@ /* - * "$Id: langprintf.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id: langprintf.c 7193 2008-01-07 23:01:40Z mike $" * * Localized printf/puts functions for the Common UNIX Printing * System (CUPS). @@ -272,5 +272,5 @@ _cupsSetLocale(char *argv[]) /* IO - Command-line arguments */ /* - * End of "$Id: langprintf.c 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id: langprintf.c 7193 2008-01-07 23:01:40Z mike $". */ diff --git a/cups/language.c b/cups/language.c index 2949b3507..5f2083108 100644 --- a/cups/language.c +++ b/cups/language.c @@ -1,5 +1,5 @@ /* - * "$Id: language.c 6916 2007-09-05 21:14:08Z mike $" + * "$Id: language.c 7558 2008-05-12 23:46:44Z mike $" * * I18N/language support for the Common UNIX Printing System (CUPS). * @@ -1320,5 +1320,5 @@ cups_unquote(char *d, /* O - Unquoted string */ /* - * End of "$Id: language.c 6916 2007-09-05 21:14:08Z mike $". + * End of "$Id: language.c 7558 2008-05-12 23:46:44Z mike $". */ diff --git a/cups/libcups.exp b/cups/libcups.exp index ff0dd0542..20c66feff 100644 --- a/cups/libcups.exp +++ b/cups/libcups.exp @@ -319,6 +319,7 @@ _ppdFirstOption _ppdIsMarked _ppdLastError _ppdLocalize +_ppdLocalizeAttr _ppdLocalizeIPPReason _ppdLocalizeMarkerName _ppdMarkDefaults diff --git a/cups/localize.c b/cups/localize.c index 551dde98e..7a98607de 100644 --- a/cups/localize.c +++ b/cups/localize.c @@ -1,5 +1,5 @@ /* - * "$Id: localize.c 7363 2008-03-03 22:19:24Z mike $" + * "$Id: localize.c 7679 2008-06-19 23:37:45Z mike $" * * PPD localization routines for the Common UNIX Printing System (CUPS). * @@ -26,6 +26,7 @@ * Contents: * * ppdLocalize() - Localize the PPD file to the current locale. + * ppdLocalizeAttr() - Localize an attribute. * ppdLocalizeIPPReason() - Get the localized version of a cupsIPPReason * attribute. * ppdLocalizeMarkerName() - Get the localized version of a marker-names @@ -196,6 +197,45 @@ ppdLocalize(ppd_file_t *ppd) /* I - PPD file */ /* + * 'ppdLocalizeAttr()' - Localize an attribute. + * + * This function uses the current locale to find the localized attribute for + * the given main and option keywords. If no localized version of the + * attribute exists for the current locale, the unlocalized version is returned. + */ + +ppd_attr_t * /* O - Localized attribute or @code NULL@ if none exists */ +ppdLocalizeAttr(ppd_file_t *ppd, /* I - PPD file */ + const char *keyword, /* I - Main keyword */ + const char *spec) /* I - Option keyword or @code NULL@ for none */ +{ + ppd_attr_t *locattr; /* Localized attribute */ + char ll_CC[6]; /* Language + country locale */ + + + /* + * Get the default language... + */ + + ppd_ll_CC(ll_CC, sizeof(ll_CC)); + + /* + * Find the localized attribute... + */ + + if (spec) + locattr = _ppdLocalizedAttr(ppd, keyword, spec, ll_CC); + else + locattr = _ppdLocalizedAttr(ppd, "Translation", keyword, ll_CC); + + if (!locattr) + locattr = ppdFindAttr(ppd, keyword, spec); + + return (locattr); +} + + +/* * 'ppdLocalizeIPPReason()' - Get the localized version of a cupsIPPReason * attribute. * @@ -666,5 +706,5 @@ ppd_ll_CC(char *ll_CC, /* O - Country-specific locale name */ /* - * End of "$Id: localize.c 7363 2008-03-03 22:19:24Z 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 7b018e609..91de0951c 100644 --- a/cups/mark.c +++ b/cups/mark.c @@ -1,5 +1,5 @@ /* - * "$Id: mark.c 7278 2008-01-31 01:23:09Z mike $" + * "$Id: mark.c 7605 2008-05-21 00:36:25Z mike $" * * Option marking routines for the Common UNIX Printing System (CUPS). * @@ -1136,5 +1136,5 @@ ppd_mark_choices(ppd_file_t *ppd, /* I - PPD file */ /* - * End of "$Id: mark.c 7278 2008-01-31 01:23:09Z mike $". + * End of "$Id: mark.c 7605 2008-05-21 00:36:25Z mike $". */ diff --git a/cups/notify.c b/cups/notify.c index 03a382e6d..cbfe5f070 100644 --- a/cups/notify.c +++ b/cups/notify.c @@ -1,5 +1,5 @@ /* - * "$Id: notify.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id: notify.c 7337 2008-02-22 04:44:04Z mike $" * * Notification routines for the Common UNIX Printing System (CUPS). * @@ -198,5 +198,5 @@ cupsNotifyText(cups_lang_t *lang, /* I - Language data */ /* - * End of "$Id: notify.c 6649 2007-07-11 21:46:42Z 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 3e4db23be..f1f36df26 100644 --- a/cups/options.c +++ b/cups/options.c @@ -1,5 +1,5 @@ /* - * "$Id: options.c 7278 2008-01-31 01:23:09Z mike $" + * "$Id: options.c 7589 2008-05-19 00:13:23Z mike $" * * Option routines for the Common UNIX Printing System (CUPS). * @@ -448,5 +448,5 @@ cupsRemoveOption( /* - * End of "$Id: options.c 7278 2008-01-31 01:23:09Z mike $". + * End of "$Id: options.c 7589 2008-05-19 00:13:23Z mike $". */ diff --git a/cups/ppd.c b/cups/ppd.c index 91de6a9b4..cbe20558f 100644 --- a/cups/ppd.c +++ b/cups/ppd.c @@ -1,5 +1,5 @@ /* - * "$Id: ppd.c 6937 2007-09-10 21:13:31Z mike $" + * "$Id: ppd.c 7552 2008-05-12 17:42:15Z mike $" * * PPD file routines for the Common UNIX Printing System (CUPS). * @@ -3169,5 +3169,5 @@ ppd_read(cups_file_t *fp, /* I - File to read from */ /* - * End of "$Id: ppd.c 6937 2007-09-10 21:13:31Z mike $". + * End of "$Id: ppd.c 7552 2008-05-12 17:42:15Z mike $". */ diff --git a/cups/ppd.h b/cups/ppd.h index c99981793..8396e61e4 100644 --- a/cups/ppd.h +++ b/cups/ppd.h @@ -1,5 +1,5 @@ /* - * "$Id: ppd.h 6649 2007-07-11 21:46:42Z mike $" + * "$Id: ppd.h 7679 2008-06-19 23:37:45Z mike $" * * PostScript Printer Description definitions for the Common UNIX Printing * System (CUPS). @@ -399,6 +399,8 @@ extern const char *ppdLocalizeIPPReason(ppd_file_t *ppd, size_t bufsize) _CUPS_API_1_3; /**** New in CUPS 1.4 ****/ +extern ppd_attr_t *ppdLocalizeAttr(ppd_file_t *ppd, const char *keyword, + const char *spec); extern const char *ppdLocalizeMarkerName(ppd_file_t *ppd, const char *name) _CUPS_API_1_4; @@ -413,5 +415,5 @@ extern const char *ppdLocalizeMarkerName(ppd_file_t *ppd, #endif /* !_CUPS_PPD_H_ */ /* - * End of "$Id: ppd.h 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id: ppd.h 7679 2008-06-19 23:37:45Z mike $". */ diff --git a/cups/request.c b/cups/request.c index e3465def0..36b02b912 100644 --- a/cups/request.c +++ b/cups/request.c @@ -1,5 +1,5 @@ /* - * "$Id: request.c 6879 2007-08-29 20:26:50Z mike $" + * "$Id: request.c 7460 2008-04-16 02:19:54Z mike $" * * IPP utilities for the Common UNIX Printing System (CUPS). * @@ -824,5 +824,5 @@ _cupsSetHTTPError(http_status_t status) /* I - HTTP status code */ /* - * End of "$Id: request.c 6879 2007-08-29 20:26:50Z mike $". + * End of "$Id: request.c 7460 2008-04-16 02:19:54Z mike $". */ diff --git a/cups/sidechannel.c b/cups/sidechannel.c index 9a009e969..bbb8dab02 100644 --- a/cups/sidechannel.c +++ b/cups/sidechannel.c @@ -1,5 +1,5 @@ /* - * "$Id: sidechannel.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id: sidechannel.c 7594 2008-05-19 23:16:03Z mike $" * * Side-channel API code for the Common UNIX Printing System (CUPS). * @@ -552,5 +552,5 @@ cupsSideChannelWrite( /* - * End of "$Id: sidechannel.c 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id: sidechannel.c 7594 2008-05-19 23:16:03Z mike $". */ diff --git a/cups/sidechannel.h b/cups/sidechannel.h index 3a8692c1c..f69259ebe 100644 --- a/cups/sidechannel.h +++ b/cups/sidechannel.h @@ -1,5 +1,5 @@ /* - * "$Id: sidechannel.h 6649 2007-07-11 21:46:42Z mike $" + * "$Id: sidechannel.h 7616 2008-05-28 00:34:13Z mike $" * * Side-channel API definitions for the Common UNIX Printing System (CUPS). * @@ -131,5 +131,5 @@ extern cups_sc_status_t cupsSideChannelSNMPWalk(const char *oid, double timeout, #endif /* !_CUPS_SIDECHANNEL_H_ */ /* - * End of "$Id: sidechannel.h 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id: sidechannel.h 7616 2008-05-28 00:34:13Z mike $". */ diff --git a/cups/string.c b/cups/string.c index c3ec0ef6b..bd7d9cc16 100644 --- a/cups/string.c +++ b/cups/string.c @@ -1,5 +1,5 @@ /* - * "$Id: string.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id: string.c 7460 2008-04-16 02:19:54Z mike $" * * String functions for the Common UNIX Printing System (CUPS). * @@ -734,5 +734,5 @@ compare_sp_items(_cups_sp_item_t *a, /* I - First item */ /* - * End of "$Id: string.c 6649 2007-07-11 21:46:42Z 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 f25886461..6dea52b10 100644 --- a/cups/tempfile.c +++ b/cups/tempfile.c @@ -1,5 +1,5 @@ /* - * "$Id: tempfile.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id: tempfile.c 7337 2008-02-22 04:44:04Z mike $" * * Temp file utilities for the Common UNIX Printing System (CUPS). * @@ -231,5 +231,5 @@ cupsTempFile2(char *filename, /* I - Pointer to buffer */ /* - * End of "$Id: tempfile.c 6649 2007-07-11 21:46:42Z 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 1b58a5231..14d631283 100644 --- a/cups/test.ppd +++ b/cups/test.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% -*% "$Id: test.ppd 6795 2007-08-15 18:02:26Z mike $" +*% "$Id: test.ppd 7582 2008-05-16 03:13:18Z mike $" *% *% Test PPD file for the Common UNIX Printing System (CUPS). *% @@ -206,5 +206,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 6795 2007-08-15 18:02:26Z mike $". +*% End of "$Id: test.ppd 7582 2008-05-16 03:13:18Z mike $". *% diff --git a/cups/testfile.c b/cups/testfile.c index 2140765c9..117b3c9e5 100644 --- a/cups/testfile.c +++ b/cups/testfile.c @@ -1,5 +1,5 @@ /* - * "$Id: testfile.c 6962 2007-09-17 20:35:47Z mike $" + * "$Id: testfile.c 7560 2008-05-13 06:34:04Z mike $" * * File test program for the Common UNIX Printing System (CUPS). * @@ -815,5 +815,5 @@ read_write_tests(int compression) /* I - Use compression? */ /* - * End of "$Id: testfile.c 6962 2007-09-17 20:35:47Z mike $". + * End of "$Id: testfile.c 7560 2008-05-13 06:34:04Z mike $". */ diff --git a/cups/testhttp.c b/cups/testhttp.c index fa9282f4a..b445bf9d6 100644 --- a/cups/testhttp.c +++ b/cups/testhttp.c @@ -1,5 +1,5 @@ /* - * "$Id: testhttp.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id: testhttp.c 7685 2008-06-23 16:49:18Z mike $" * * HTTP test program for the Common UNIX Printing System (CUPS). * @@ -301,7 +301,7 @@ main(int argc, /* I - Number of command-line arguments */ * httpAddrGetList() */ - fputs("httpAddrGetList(): ", stdout); + printf("httpAddrGetList(%s): ", hostname); addrlist = httpAddrGetList(hostname, AF_UNSPEC, NULL); if (addrlist) @@ -526,5 +526,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: testhttp.c 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id: testhttp.c 7685 2008-06-23 16:49:18Z mike $". */ diff --git a/cups/testi18n.c b/cups/testi18n.c index c6654d62e..b18b64668 100644 --- a/cups/testi18n.c +++ b/cups/testi18n.c @@ -1,5 +1,5 @@ /* - * "$Id: testi18n.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id: testi18n.c 7560 2008-05-13 06:34:04Z mike $" * * Internationalization test for Common UNIX Printing System (CUPS). * @@ -548,5 +548,5 @@ print_utf8(const char *msg, /* I - Message String */ /* - * End of "$Id: testi18n.c 6649 2007-07-11 21:46:42Z mike $" + * End of "$Id: testi18n.c 7560 2008-05-13 06:34:04Z mike $" */ diff --git a/cups/testppd.c b/cups/testppd.c index 6772970b8..3c8a8dc6b 100644 --- a/cups/testppd.c +++ b/cups/testppd.c @@ -1,5 +1,5 @@ /* - * "$Id: testppd.c 6936 2007-09-10 18:15:36Z mike $" + * "$Id: testppd.c 7633 2008-06-10 23:07:29Z mike $" * * PPD test program for the Common UNIX Printing System (CUPS). * @@ -468,5 +468,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: testppd.c 6936 2007-09-10 18:15:36Z mike $". + * End of "$Id: testppd.c 7633 2008-06-10 23:07:29Z mike $". */ diff --git a/cups/transcode.c b/cups/transcode.c index 7a79b2a55..b0f895cd6 100644 --- a/cups/transcode.c +++ b/cups/transcode.c @@ -1,5 +1,5 @@ /* - * "$Id: transcode.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id: transcode.c 7560 2008-05-13 06:34:04Z mike $" * * Transcoding support for the Common UNIX Printing System (CUPS). * @@ -1820,5 +1820,5 @@ get_vbcs_charmap( /* - * End of "$Id: transcode.c 6649 2007-07-11 21:46:42Z mike $" + * End of "$Id: transcode.c 7560 2008-05-13 06:34:04Z mike $" */ diff --git a/cups/transcode.h b/cups/transcode.h index 8c8cd5005..0a4dac131 100644 --- a/cups/transcode.h +++ b/cups/transcode.h @@ -1,5 +1,5 @@ /* - * "$Id: transcode.h 6649 2007-07-11 21:46:42Z mike $" + * "$Id: transcode.h 7026 2007-10-19 00:57:45Z mike $" * * Transcoding definitions for the Common UNIX Printing System (CUPS). * @@ -77,5 +77,5 @@ extern int cupsUTF32ToUTF8(cups_utf8_t *dest, /* - * End of "$Id: transcode.h 6649 2007-07-11 21:46:42Z 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 28b40d0be..8e4be9559 100644 --- a/cups/usersys.c +++ b/cups/usersys.c @@ -1,5 +1,5 @@ /* - * "$Id: usersys.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id: usersys.c 7337 2008-02-22 04:44:04Z mike $" * * User, system, and password routines for the Common UNIX Printing * System (CUPS). @@ -503,5 +503,5 @@ cups_open_client_conf(void) /* - * End of "$Id: usersys.c 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id: usersys.c 7337 2008-02-22 04:44:04Z mike $". */ diff --git a/cups/util.c b/cups/util.c index a07276786..605cd89e8 100644 --- a/cups/util.c +++ b/cups/util.c @@ -1,5 +1,5 @@ /* - * "$Id: util.c 7014 2007-10-10 21:57:43Z mike $" + * "$Id: util.c 7634 2008-06-10 23:22:28Z mike $" * * Printing utilities for the Common UNIX Printing System (CUPS). * @@ -1802,5 +1802,5 @@ cups_get_printer_uri( /* - * End of "$Id: util.c 7014 2007-10-10 21:57:43Z mike $". + * End of "$Id: util.c 7634 2008-06-10 23:22:28Z mike $". */ |