/*
- * "$Id: printers.c 4903 2006-01-10 20:02:46Z mike $"
+ * "$Id: printers.c 4989 2006-01-26 00:59:45Z mike $"
*
* Printer routines for the Common UNIX Printing System (CUPS).
*
* cupsdFindPrinter() - Find a printer in the list.
* cupsdFreePrinterUsers() - Free allow/deny users.
* cupsdLoadAllPrinters() - Load printers from the printers.conf file.
- * cupsdSaveAllPrinters() - Save all printer definitions to the printers.conf
- * cupsdSetPrinterAttrs() - Set printer attributes based upon the PPD file.
+ * cupsdSaveAllPrinters() - Save all printer definitions to the
+ * printers.conf file.
+ * cupsdSetPrinterAttrs() - Set printer attributes based upon the PPD
+ * file.
* cupsdSetPrinterReasons() - Set/update the reasons strings.
* cupsdSetPrinterState() - Update the current state of a printer.
* cupsdStopPrinter() - Stop a printer from printing any jobs...
* compare_printers() - Compare two printers.
* write_irix_config() - Update the config files used by the IRIX
* desktop tools.
- * write_irix_state() - Update the status files used by IRIX printing
- * desktop tools.
+ * write_irix_state() - Update the status files used by IRIX
+ * printing desktop tools.
*/
/*
p->state = IPP_PRINTER_STOPPED;
p->state_time = time(NULL);
p->accepting = 0;
- p->shared = 1;
+ p->shared = DefaultShared;
p->filetype = mimeAddType(MimeDatabase, "printer", name);
cupsdSetString(&p->job_sheets[0], "none");
cupsd_printer_t *p, /* I - Printer to add to */
const char *filter) /* I - Filter to add */
{
- int i; /* Looping var */
char super[MIME_MAX_SUPER], /* Super-type for filter */
type[MIME_MAX_TYPE], /* Type for filter */
program[1024]; /* Program/filter name */
int cost; /* Cost of filter */
- mime_type_t **temptype; /* MIME type looping var */
+ mime_type_t *temptype; /* MIME type looping var */
/*
* Add the filter to the MIME database, supporting wildcards as needed...
*/
- for (temptype = MimeDatabase->types, i = MimeDatabase->num_types;
- i > 0;
- i --, temptype ++)
- if (((super[0] == '*' && strcasecmp((*temptype)->super, "printer") != 0) ||
- !strcasecmp((*temptype)->super, super)) &&
- (type[0] == '*' || !strcasecmp((*temptype)->type, type)))
+ for (temptype = mimeFirstType(MimeDatabase);
+ temptype;
+ temptype = mimeNextType(MimeDatabase))
+ if (((super[0] == '*' && strcasecmp(temptype->super, "printer")) ||
+ !strcasecmp(temptype->super, super)) &&
+ (type[0] == '*' || !strcasecmp(temptype->type, type)))
{
cupsdLogMessage(CUPSD_LOG_DEBUG2, "Adding filter %s/%s %s/%s %d %s",
- (*temptype)->super, (*temptype)->type,
+ temptype->super, temptype->type,
p->filetype->super, p->filetype->type,
cost, program);
- mimeAddFilter(MimeDatabase, *temptype, p->filetype, cost, program);
+ mimeAddFilter(MimeDatabase, temptype, p->filetype, cost, program);
}
}
p->state);
ippAddBoolean(history, IPP_TAG_PRINTER, "printer-is-accepting-jobs",
p->accepting);
+ ippAddBoolean(history, IPP_TAG_PRINTER, "printer-is-shared", p->shared);
ippAddString(history, IPP_TAG_PRINTER, IPP_TAG_TEXT, "printer-state-message",
NULL, p->state_message);
if (p->num_reasons == 0)
"job-priority-supported", 100);
/* job-sheets-supported */
- if (NumBanners > 0)
+ if (cupsArrayCount(Banners) > 0)
{
/*
* Setup the job-sheets-supported attribute...
"job-sheets-supported", NULL, Classification);
else
attr = ippAddStrings(CommonData, IPP_TAG_PRINTER, IPP_TAG_NAME,
- "job-sheets-supported", NumBanners + 1, NULL, NULL);
+ "job-sheets-supported", cupsArrayCount(Banners) + 1,
+ NULL, NULL);
if (attr == NULL)
cupsdLogMessage(CUPSD_LOG_EMERG,
"job-sheets-supported attribute: %s!", strerror(errno));
else if (!Classification || ClassifyOverride)
{
+ cupsd_banner_t *banner; /* Current banner */
+
+
attr->values[0].string.text = strdup("none");
- for (i = 0; i < NumBanners; i ++)
- attr->values[i + 1].string.text = strdup(Banners[i].name);
+ for (i = 1, banner = (cupsd_banner_t *)cupsArrayFirst(Banners);
+ banner;
+ i ++, banner = (cupsd_banner_t *)cupsArrayNext(Banners))
+ attr->values[i].string.text = strdup(banner->name);
}
}
else
/*
* If p is the default printer, assign the next one...
+ * TODO: use next network default printer or NULL...
*/
if (p == DefaultPrinter)
cupsdDeletePrinterFilters(p);
+ mimeDeleteType(MimeDatabase, p->filetype);
+
cupsdFreePrinterUsers(p);
cupsdFreeQuotas(p);
cupsdDeletePrinterFilters(
cupsd_printer_t *p) /* I - Printer to remove from */
{
- int i; /* Looping var */
mime_filter_t *filter; /* MIME filter looping var */
* type == printer...
*/
- for (filter = MimeDatabase->filters, i = MimeDatabase->num_filters;
- i > 0;
- i --, filter ++)
+ for (filter = mimeFirstFilter(MimeDatabase);
+ filter;
+ filter = mimeNextFilter(MimeDatabase))
if (filter->dst == p->filetype)
{
/*
* Delete the current filter...
*/
- MimeDatabase->num_filters --;
-
- if (i > 1)
- memmove(filter, filter + 1, sizeof(mime_filter_t) * (i - 1));
-
- filter --;
+ mimeDeleteFilter(MimeDatabase, filter);
}
}
snprintf(line, sizeof(line), "%s/printers.conf", ServerRoot);
if ((fp = cupsFileOpen(line, "r")) == NULL)
{
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "cupsdLoadAllPrinters: Unable to open %s - %s", line,
- strerror(errno));
+ if (errno != ENOENT)
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "cupsdLoadAllPrinters: Unable to open %s - %s", line,
+ strerror(errno));
return;
}
*/
fchown(cupsFileNumber(fp), getuid(), Group);
- fchmod(cupsFileNumber(fp), ConfigFilePerm);
+ fchmod(cupsFileNumber(fp), 0600);
/*
* Write a small header to the file...
ippAddInteger(p->attrs, IPP_TAG_PRINTER, IPP_TAG_INTEGER,
"job-page-limit", p->page_limit);
- if (NumBanners > 0 && !(p->type & CUPS_PRINTER_REMOTE))
+ if (cupsArrayCount(Banners) > 0 && !(p->type & CUPS_PRINTER_REMOTE))
{
/*
* Setup the job-sheets-default attribute...
ippAddString(p->attrs, IPP_TAG_PRINTER, IPP_TAG_TEXT,
"printer-make-and-model", NULL, p->make_model);
+ ippAddString(p->attrs, IPP_TAG_PRINTER, IPP_TAG_URI, "device-uri", NULL,
+ p->uri);
+
p->raw = 1;
}
else
ippAddString(p->attrs, IPP_TAG_PRINTER, IPP_TAG_TEXT,
"printer-make-and-model", NULL, "Local Printer Class");
+ ippAddString(p->attrs, IPP_TAG_PRINTER, IPP_TAG_URI, "device-uri", NULL,
+ "file:///dev/null");
+
if (p->num_printers > 0)
{
/*
/*
- * End of "$Id: printers.c 4903 2006-01-10 20:02:46Z mike $".
+ * End of "$Id: printers.c 4989 2006-01-26 00:59:45Z mike $".
*/
projects / thirdparty / cups.git / blobdiff