diff options
Diffstat (limited to 'scheduler/cupsfilter.c')
| -rw-r--r-- | scheduler/cupsfilter.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/scheduler/cupsfilter.c b/scheduler/cupsfilter.c index ba7a9ce6..0761cde9 100644 --- a/scheduler/cupsfilter.c +++ b/scheduler/cupsfilter.c @@ -1,9 +1,9 @@ /* - * "$Id: cupsfilter.c 10434 2012-04-23 21:47:41Z mike $" + * "$Id: cupsfilter.c 10869 2013-02-19 23:53:01Z mike $" * * 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 @@ -409,6 +409,7 @@ main(int argc, /* I - Number of command-line args */ if (srctype) { + /* sscanf return value already checked above */ sscanf(srctype, "%15[^/]/%255s", super, type); if ((src = mimeType(mime, super, type)) == NULL) { @@ -426,6 +427,7 @@ main(int argc, /* I - Number of command-line args */ return (1); } + /* sscanf return value already checked above */ sscanf(dsttype, "%15[^/]/%255s", super, type); if (!_cups_strcasecmp(super, "printer")) dst = printer_type; @@ -915,7 +917,7 @@ exec_filters(mime_type_t *srctype, /* I - Source type */ { 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 */ @@ -1038,7 +1040,8 @@ exec_filters(mime_type_t *srctype, /* I - Source type */ 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]); @@ -1456,5 +1459,5 @@ usage(const char *opt) /* I - Incorrect option, if any */ /* - * End of "$Id: cupsfilter.c 10434 2012-04-23 21:47:41Z mike $". + * End of "$Id: cupsfilter.c 10869 2013-02-19 23:53:01Z mike $". */ |