[prev in list] [next in list] [prev in thread] [next in thread] 

List:       cups-commit
Subject:    [cups.commit] [CUPS] r10866 - in trunk: . scheduler
From:       cups-dev () easysw ! com
Date:       2013-02-19 23:33:10
Message-ID: 11636-cups.commit () news ! easysw ! com
[Download RAW message or body]

Author: mike
Date: 2013-02-19 15:33:08 -0800 (Tue, 19 Feb 2013)
New Revision: 10866
Log:
The cupsfilter command did not set the CHARSET environment variable for the
text filters (STR #4273)



Modified:
   trunk/CHANGES-1.6.txt
   trunk/scheduler/cupsfilter.c

Modified: trunk/CHANGES-1.6.txt
===================================================================
--- trunk/CHANGES-1.6.txt	2013-02-08 21:27:24 UTC (rev 10865)
+++ trunk/CHANGES-1.6.txt	2013-02-19 23:33:08 UTC (rev 10866)
@@ -12,6 +12,8 @@
 	- Added a French localization (STR #4247)
 	- Added a Russian localization (STR #4228)
 	- Updated the Catalan localization (STR #4202)
+	- The cupsfilter command did not set the CHARSET environment variable
+	  for the text filters (STR #4273)
 	- The lp command did not show errors for unknown "--foo" (STR #4261)
 	- Bad IPP responses could crash ipptool (STR #4262)
 	- Updated USB quirk rules for Canon and Xerox printers (STR #4217,

Modified: trunk/scheduler/cupsfilter.c
===================================================================
--- trunk/scheduler/cupsfilter.c	2013-02-08 21:27:24 UTC (rev 10865)
+++ trunk/scheduler/cupsfilter.c	2013-02-19 23:33:08 UTC (rev 10866)
@@ -3,7 +3,7 @@
  *
  *   Filtering program 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
@@ -917,7 +917,7 @@
 {
   int		i;			/* Looping var */
   const char	*argv[8],		/* Command-line arguments */
-		*envp[15],		/* Environment variables */
+		*envp[16],		/* Environment variables */
 		*temp;			/* Temporary string */
   char		*optstr,		/* Filter options */
 		content_type[1024],	/* CONTENT_TYPE */
@@ -1040,7 +1040,8 @@
   envp[11] = printer_name;
   envp[12] = rip_max_cache;
   envp[13] = userenv;
-  envp[14] = NULL;
+  envp[14] = "CHARSET=utf-8";
+  envp[15] = NULL;
 
   for (i = 0; argv[i]; i ++)
     fprintf(stderr, "DEBUG: argv[%d]=\"%s\"\n", i, argv[i]);

_______________________________________________
cups-commit mailing list
cups-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/cups-commit
[prev in list] [next in list] [prev in thread] [next in thread]