*
* CUPS filtering program for the Common UNIX Printing System (CUPS).
*
- * Copyright 2007-2009 by Apple Inc.
+ * Copyright 2007-2010 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
static char *escape_options(int num_options, cups_option_t *options);
static int exec_filter(const char *filter, char **argv,
char **envp, int infd, int outfd);
-static int exec_filters(cups_array_t *filters, const char *infile,
+static int exec_filters(mime_type_t *srctype,
+ cups_array_t *filters, const char *infile,
const char *outfile, const char *ppdfile,
const char *printer, const char *user,
const char *title, int num_options,
const char *ppdfile; /* PPD file */
const char *title, /* Title string */
*user; /* Username */
- int removeppd, /* Remove PPD file */
+ int all_filters, /* Use all filters */
+ removeppd, /* Remove PPD file */
removeinfile; /* Remove input file */
int status; /* Execution status */
ppdfile = NULL;
title = NULL;
user = cupsUser();
+ all_filters = 0;
removeppd = 0;
removeinfile = 0;
removeinfile = 1;
break;
+ case 'e' : /* Use every filter from the PPD file */
+ all_filters = 1;
+ break;
+
case 'f' : /* Specify input file... */
i ++;
if (i < argc && !infile)
else
{
_cupsLangPuts(stderr,
- _("cupsfilter: Only one filename can be specified!\n"));
+ _("cupsfilter: Only one filename can be specified\n"));
usage(command, NULL);
}
{
_cupsLangPrintf(stderr,
_("%s: Unable to read MIME database from \"%s\" or "
- "\"%s\"!\n"),
+ "\"%s\"\n"),
command, mimedir, ServerRoot);
return (1);
}
- printer_type = add_printer_filters(command, mime, printer, ppdfile,
- &prefilter_type);
+ if (all_filters)
+ {
+ printer_type = add_printer_filters(command, mime, printer, ppdfile,
+ &prefilter_type);
+ }
+ else
+ {
+ printer_type = mimeType(mime, "application", "vnd.cups-postscript");
+ prefilter_type = NULL;
+ }
/*
* Get the source and destination types...
if ((src = mimeType(mime, super, type)) == NULL)
{
_cupsLangPrintf(stderr,
- _("%s: Unknown source MIME type %s/%s!\n"),
+ _("%s: Unknown source MIME type %s/%s\n"),
command, super, type);
return (1);
}
else if ((src = mimeFileType(mime, infile, infile, &compression)) == NULL)
{
_cupsLangPrintf(stderr,
- _("%s: Unable to determine MIME type of \"%s\"!\n"),
+ _("%s: Unable to determine MIME type of \"%s\"\n"),
command, infile);
return (1);
}
else if ((dst = mimeType(mime, super, type)) == NULL)
{
_cupsLangPrintf(stderr,
- _("%s: Unknown destination MIME type %s/%s!\n"),
+ _("%s: Unknown destination MIME type %s/%s\n"),
command, super, type);
return (1);
}
filters = cupsArrayNew(NULL, NULL);
cupsArrayAdd(filters, &GZIPFilter);
+ GZIPFilter.src = src;
+ GZIPFilter.dst = dst;
}
else if ((filters = mimeFilter(mime, src, dst, &cost)) == NULL)
{
_cupsLangPrintf(stderr,
- _("%s: No filter to convert from %s/%s to %s/%s!\n"),
+ _("%s: No filter to convert from %s/%s to %s/%s\n"),
command, src->super, src->type, dst->super, dst->type);
return (1);
}
filter;
filter = (mime_filter_t *)cupsArrayNext(filters))
{
- if ((prefilter = mimeFilterLookup(mime, filter->src, prefilter_type)))
+ if ((prefilter = mimeFilterLookup(mime, filter->src,
+ prefilter_type)) != NULL)
cupsArrayAdd(prefilters, prefilter);
cupsArrayAdd(prefilters, filter);
* Do it!
*/
- status = exec_filters(filters, infile, outfile, ppdfile, printer, user,
+ status = exec_filters(src, filters, infile, outfile, ppdfile, printer, user,
title, num_options, options);
/*
if (ppdattr->value)
add_printer_filter(command, mime, *prefilter_type, ppdattr->value);
}
+ else
+ *prefilter_type = NULL;
return (printer_type);
}
int infd, /* I - Stdin file descriptor */
int outfd) /* I - Stdout file descriptor */
{
- int pid; /* Process ID */
+ int pid, /* Process ID */
+ fd; /* Temporary file descriptor */
#if defined(__APPLE__)
char processPath[1024], /* CFProcessPath environment variable */
linkpath[1024]; /* Link path for symlinks... */
if (infd != 0)
{
- close(0);
+ if (infd < 0)
+ infd = open("/dev/null", O_RDONLY);
+
if (infd > 0)
- dup(infd);
- else
- open("/dev/null", O_RDONLY);
+ {
+ dup2(infd, 0);
+ close(infd);
+ }
}
if (outfd != 1)
{
- close(1);
- if (outfd > 0)
- dup(outfd);
- else
- open("/dev/null", O_WRONLY);
+ if (outfd < 0)
+ outfd = open("/dev/null", O_WRONLY);
+
+ if (outfd > 1)
+ {
+ dup2(outfd, 1);
+ close(outfd);
+ }
}
- close(3);
- open("/dev/null", O_RDWR);
+ if ((fd = open("/dev/null", O_RDWR)) > 3)
+ {
+ dup2(fd, 3);
+ close(fd);
+ }
fcntl(3, F_SETFL, O_NDELAY);
- close(4);
- open("/dev/null", O_RDWR);
+ if ((fd = open("/dev/null", O_RDWR)) > 4)
+ {
+ dup2(fd, 4);
+ close(fd);
+ }
fcntl(4, F_SETFL, O_NDELAY);
/*
*/
static int /* O - 0 on success, 1 on error */
-exec_filters(cups_array_t *filters, /* I - Array of filters to run */
+exec_filters(mime_type_t *srctype, /* I - Source type */
+ cups_array_t *filters, /* I - Array of filters to run */
const char *infile, /* I - File to filter */
const char *outfile, /* I - File to create */
const char *ppdfile, /* I - PPD file, if any */
{
int i; /* Looping var */
const char *argv[8], /* Command-line arguments */
- *envp[12], /* Environment variables */
+ *envp[15], /* Environment variables */
*temp; /* Temporary string */
char *optstr, /* Filter options */
content_type[1024], /* CONTENT_TYPE */
lang[1024], /* LANG */
path[1024], /* PATH */
ppd[1024], /* PPD */
+ printer_info[255], /* PRINTER_INFO env variable */
+ printer_location[255], /* PRINTER_LOCATION env variable */
+ printer_name[255], /* PRINTER env variable */
rip_cache[1024], /* RIP_CACHE */
userenv[1024], /* USER */
program[1024]; /* Program to run */
cups_array_t *pids; /* Executed filters array */
mime_filter_t key; /* Search key for filters */
cups_lang_t *language; /* Current language */
+ cups_dest_t *dest; /* Destination information */
/*
optstr = escape_options(num_options, options);
- filter = cupsArrayFirst(filters);
snprintf(content_type, sizeof(content_type), "CONTENT_TYPE=%s/%s",
- filter->src->super, filter->src->type);
+ srctype->super, srctype->type);
snprintf(cups_datadir, sizeof(cups_datadir), "CUPS_DATADIR=%s", DataDir);
snprintf(cups_fontpath, sizeof(cups_fontpath), "CUPS_FONTPATH=%s", FontPath);
snprintf(cups_serverbin, sizeof(cups_serverbin), "CUPS_SERVERBIN=%s",
snprintf(rip_cache, sizeof(rip_cache), "RIP_CACHE=%s", RIPCache);
snprintf(userenv, sizeof(userenv), "USER=%s", user);
+ if (printer &&
+ (dest = cupsGetNamedDest(CUPS_HTTP_DEFAULT, printer, NULL)) != NULL)
+ {
+ if ((temp = cupsGetOption("printer-info", dest->num_options,
+ dest->options)) != NULL)
+ snprintf(printer_info, sizeof(printer_info), "PRINTER_INFO=%s", temp);
+ else
+ snprintf(printer_info, sizeof(printer_info), "PRINTER_INFO=%s", printer);
+
+ if ((temp = cupsGetOption("printer-location", dest->num_options,
+ dest->options)) != NULL)
+ snprintf(printer_location, sizeof(printer_location),
+ "PRINTER_LOCATION=%s", temp);
+ else
+ strlcpy(printer_location, "PRINTER_LOCATION=Unknown",
+ sizeof(printer_location));
+ }
+ else
+ {
+ snprintf(printer_info, sizeof(printer_info), "PRINTER_INFO=%s",
+ printer ? printer : "Unknown");
+ strlcpy(printer_location, "PRINTER_LOCATION=Unknown",
+ sizeof(printer_location));
+ }
+
+ snprintf(printer_name, sizeof(printer_name), "PRINTER=%s",
+ printer ? printer : "Unknown");
+
argv[0] = (char *)printer;
argv[1] = "1";
argv[2] = user;
envp[6] = lang;
envp[7] = path;
envp[8] = ppd;
- envp[9] = rip_cache;
- envp[10] = userenv;
- envp[11] = NULL;
+ envp[9] = printer_info;
+ envp[10] = printer_location;
+ envp[11] = printer_name;
+ envp[12] = rip_cache;
+ envp[13] = userenv;
+ envp[14] = NULL;
for (i = 0; argv[i]; i ++)
fprintf(stderr, "DEBUG: argv[%d]=\"%s\"\n", i, argv[i]);
if (status)
{
if (WIFEXITED(status))
- fprintf(stderr, "ERROR: %s (PID %d) stopped with status %d!\n",
+ fprintf(stderr, "ERROR: %s (PID %d) stopped with status %d\n",
filter->filter, pid, WEXITSTATUS(status));
else
- fprintf(stderr, "ERROR: %s (PID %d) crashed on signal %d!\n",
+ fprintf(stderr, "ERROR: %s (PID %d) crashed on signal %d\n",
filter->filter, pid, WTERMSIG(status));
retval = 1;
if (jobid < 1 || jobid > INT_MAX)
{
- _cupsLangPrintf(stderr, _("cupsfilter: Invalid job ID %d!\n"), (int)jobid);
+ _cupsLangPrintf(stderr, _("cupsfilter: Invalid job ID %d\n"), (int)jobid);
exit(1);
}
if (docnum < 1 || docnum > INT_MAX)
{
- _cupsLangPrintf(stderr, _("cupsfilter: Invalid document number %d!\n"),
+ _cupsLangPrintf(stderr, _("cupsfilter: Invalid document number %d\n"),
(int)docnum);
exit(1);
}
const char *opt) /* I - Incorrect option, if any */
{
if (opt)
- _cupsLangPrintf(stderr, _("%s: Unknown option '%c'!\n"), command, *opt);
+ _cupsLangPrintf(stderr, _("%s: Unknown option '%c'\n"), command, *opt);
if (!strcmp(command, "cupsfilter"))
_cupsLangPuts(stdout,
"Options:\n"
"\n"
" -c cupsd.conf Set cupsd.conf file to use\n"
+ " -e Use every filter from the PPD file\n"
" -j job-id[,N] Filter file N from the specified job (default is file 1)\n"
" -n copies Set number of copies\n"
" -o name=value Set option(s)\n"
"\n"
"Options:\n"
"\n"
+ " -e Use every filter from the PPD file\n"
" -f filename Set file to be converted (otherwise stdin)\n"
" -o filename Set file to be generated (otherwise stdout)\n"
" -i mime/type Set input MIME type (otherwise auto-typed)\n"
projects / thirdparty / cups.git / blobdiff