diff options
| author | jlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2006-02-22 16:59:36 +0000 |
|---|---|---|
| committer | jlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2006-02-22 16:59:36 +0000 |
| commit | ecdc06282a65bd04f801c877d2ceb83106d737e1 (patch) | |
| tree | cd00fed2f725d8c7b193bb566974e4d4da30740f /scheduler | |
| parent | bd7854cb4d663bb0e561eaf5b01bbd47baa71d22 (diff) | |
| download | cups-ecdc06282a65bd04f801c877d2ceb83106d737e1.tar.gz | |
Load cups into easysw/current.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@63 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'scheduler')
| -rw-r--r-- | scheduler/printers.c | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/scheduler/printers.c b/scheduler/printers.c index e04a4875c..9423e1b37 100644 --- a/scheduler/printers.c +++ b/scheduler/printers.c @@ -1,5 +1,5 @@ /* - * "$Id: printers.c 5132 2006-02-19 14:57:11Z mike $" + * "$Id: printers.c 5143 2006-02-21 19:13:01Z mike $" * * Printer routines for the Common UNIX Printing System (CUPS). * @@ -2621,21 +2621,24 @@ add_printer_filter( * the error! */ - if (program[0] == '/') - strlcpy(filename, program, sizeof(filename)); - else - snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin, program); - - if (access(filename, X_OK)) + if (strcmp(program, "-")) { - snprintf(p->state_message, sizeof(p->state_message), - "Filter \"%s\" for printer \"%s\" not available: %s", - program, p->name, strerror(errno)); - cupsdSetPrinterState(p, IPP_PRINTER_STOPPED, 0); - cupsdSetPrinterReasons(p, "+cups-missing-filter-error"); - cupsdAddPrinterHistory(p); - - cupsdLogMessage(CUPSD_LOG_ERROR, "%s", p->state_message); + if (program[0] == '/') + strlcpy(filename, program, sizeof(filename)); + else + snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin, program); + + if (access(filename, X_OK)) + { + snprintf(p->state_message, sizeof(p->state_message), + "Filter \"%s\" for printer \"%s\" not available: %s", + program, p->name, strerror(errno)); + cupsdSetPrinterState(p, IPP_PRINTER_STOPPED, 0); + cupsdSetPrinterReasons(p, "+cups-missing-filter-error"); + cupsdAddPrinterHistory(p); + + cupsdLogMessage(CUPSD_LOG_ERROR, "%s", p->state_message); + } } /* @@ -3106,5 +3109,5 @@ write_irix_state(cupsd_printer_t *p) /* I - Printer to update */ /* - * End of "$Id: printers.c 5132 2006-02-19 14:57:11Z mike $". + * End of "$Id: printers.c 5143 2006-02-21 19:13:01Z mike $". */ |