_cupsLangPrintf() doesn't print with en_US.ASCII locale

[michaelrsweet]

Version: 1.4.6
CUPS.org User: jpopelka

Binaries (all from systemv directory) using _cupsLangPrintf()
don't print anything out when locale is set to en_US.ASCII

Problem is that there's no us-ascii.txt data file so
cupsUTF8ToCharset(encoding = CUPS_US_ASCII)
can't transcode to ASCII.

I have no idea whether this is a bug or designed so.
Work-around could be to treat CUPS_US_ASCII the same way as other "unknown" encoding. See attached patch.

See also original bug report
https://bugzilla.redhat.com/show_bug.cgi?id=681836

[michaelrsweet]

CUPS.org User: mike

Jiri,

The simplest fix for 1.4.x is probably just to map ASCII to ISO-8859-1 in the transcoding code; for CUPS 1.5 we actually switched to using iconv so the "right" things will happen.

[michaelrsweet]

CUPS.org User: mike

Fixed in Subversion repository.

A 1.4.x and 1.5.x version of the fix is attached; the charset->UTF-8 mapping using the UTF-8 "identity" path, while the UTF-8->charset mapping uses a modified version of the ISO-8859-1 "fast" path (which will map unicode characters to "?").

[michaelrsweet]

"cups-1.4.6-ascii.patch":

diff -up cups-1.4.6/cups/language.c.ascii cups-1.4.6/cups/language.c
--- cups-1.4.6/cups/language.c.ascii 2010-08-10 08:15:55.000000000 +0200
+++ cups-1.4.6/cups/language.c 2011-04-18 16:33:59.000000000 +0200
@@ -670,6 +670,9 @@ cupsLangGet(const char language) / I -
break;
}

• if (encoding == CUPS_US_ASCII)

•  encoding = CUPS_AUTO_ENCODING;
  

  if (encoding == CUPS_AUTO_ENCODING)
  {
  /*

[michaelrsweet]

"str3832.patch":

Index: CHANGES-1.4.txt

--- CHANGES-1.4.txt (revision 9694)
+++ CHANGES-1.4.txt (working copy)
@@ -9,6 +9,8 @@
STR #3755, STR #3769, STR #3783)
- Configure script fixes (STR #3659, STR #3691)
- Compilation fixes (STR #3718, STR #3771, STR #3774)

• • CUPS did not work with locales using the ASCII character set

• (STR #3832)
  

  • httpAddrString() did not return a URI-style IPv6 numeric address
    (STR Incorrect 'upgrade required' URL when IPv6 address used #3814)

  • Fixed an issue when reading compressed CUPS raster streams (STR Failure to read last page of raster data #3812)
    Index: cups/transcode.c

    --- cups/transcode.c (revision 9694)
    +++ cups/transcode.c (working copy)
    @@ -230,7 +230,7 @@
  • Handle identity conversions...
    */
• if (encoding == CUPS_UTF8 || encoding <= CUPS_US_ASCII ||
• if (encoding == CUPS_UTF8 ||
  encoding >= CUPS_ENCODING_VBCS_END)
  {
  strlcpy(dest, (char *)src, maxout);
  @@ -243,12 +243,13 @@

destptr = dest;

• if (encoding == CUPS_ISO8859_1)
• if (encoding == CUPS_ISO8859_1 || encoding <= CUPS_US_ASCII)
  {
• int ch; /* Character from string */
• int ch, /* Character from string */

•   maxch;          /\* Maximum character for charset _/
  

  char *destend; /_ End of ISO-8859-1 buffer */

• maxch = encoding == CUPS_ISO8859_1 ? 256 : 128;
  destend = dest + maxout - 1;

while (_src && destptr < destend)
@@ -259,7 +260,7 @@
{
ch = ((ch & 0x1f) << 6) | (_src++ & 0x3f);

• if (ch < 256)
• if (ch < maxch)
  *destptr++ = ch;
  else
  *destptr++ = '?';

[michaelrsweet]

"str3832-1.4.patch":

Index: cups/transcode.c

--- cups/transcode.c (revision 9694)
+++ cups/transcode.c (working copy)
@@ -1,9 +1,9 @@
/*

• "$Id$"
  *
  • * Transcoding support for the Common UNIX Printing System (CUPS).
  • * Transcoding support for CUPS.
    *
  • * Copyright 2007-2009 by Apple Inc.
  • * Copyright 2007-2011 by Apple Inc.
• Copyright 1997-2007 by Easy Software Products.

• These coded instructions, statements, and computer programs are the
  @@ -279,7 +279,7 @@
• Handle identity conversions...
  */
• if (encoding == CUPS_UTF8 ||
• if (encoding == CUPS_UTF8 || encoding <= CUPS_US_ASCII ||
  encoding < 0 || encoding >= CUPS_ENCODING_VBCS_END)
  {
  strlcpy((char *)dest, src, maxout);
  @@ -385,13 +385,14 @@
• Handle UTF-8 to ISO-8859-1 directly...
  */
• if (encoding == CUPS_ISO8859_1)
• if (encoding == CUPS_ISO8859_1 || encoding == CUPS_US_ASCII)
  {
• int ch; /* Character from string */
• int ch, /* Character from string */

•   maxch;          /\* Maximum character for charset _/
  

  char *destptr, /_ Pointer into ISO-8859-1 buffer /
  *destend; / End of ISO-8859-1 buffer */

• maxch = encoding == CUPS_ISO8859_1 ? 256 : 128;
  destptr = dest;
  destend = dest + maxout - 1;

@@ -403,7 +404,7 @@
{
ch = ((ch & 0x1f) << 6) | (*src++ & 0x3f);

• if (ch < 256)
• if (ch < maxch)
  *destptr++ = ch;
  else
  *destptr++ = '?';

Index: CHANGES.txt

--- CHANGES.txt (revision 9694)
+++ CHANGES.txt (working copy)
@@ -1,4 +1,4 @@
-CHANGES.txt - 2011-04-13

+CHANGES.txt - 2011-04-18

CHANGES IN CUPS V1.4.7
@@ -9,6 +9,8 @@
STR #3755, STR #3769, STR #3783)

• Configure script fixes (STR configure does not fail when explicitly enabled options fail #3659, STR Performance: Do not compile programs with PIC #3691)
• Compilation fixes (STR Solaris compilation fails: "printers.c", line 494: prototype mismatch: 2 args passed, 4 expected #3718, STR HP-UX, IRIX and RHEL 3 compilation fixes #3771, STR cups with dbus support fails to compile on solaris and HP-UX #3774)
• • CUPS did not work with locales using the ASCII character set

• (STR #3832)
  

  • httpAddrString() did not return a URI-style IPv6 numeric address
    (STR Incorrect 'upgrade required' URL when IPv6 address used #3814)
  • Fixed an issue when reading compressed CUPS raster streams (STR Failure to read last page of raster data #3812)