summaryrefslogtreecommitdiff
path: root/source3/printing/pcap.c
diff options
context:
space:
mode:
Diffstat (limited to 'source3/printing/pcap.c')
-rw-r--r--source3/printing/pcap.c93
1 files changed, 1 insertions, 92 deletions
diff --git a/source3/printing/pcap.c b/source3/printing/pcap.c
index a6bf52a0a4..f1cf58d6bc 100644
--- a/source3/printing/pcap.c
+++ b/source3/printing/pcap.c
@@ -26,30 +26,6 @@
*/
/*
- * This module contains code to parse and cache printcap data, possibly
- * in concert with the CUPS/SYSV/AIX-specific code found elsewhere.
- *
- * The way this module looks at the printcap file is very simplistic.
- * Only the local printcap file is inspected (no searching of NIS
- * databases etc).
- *
- * There are assumed to be one or more printer names per record, held
- * as a set of sub-fields separated by vertical bar symbols ('|') in the
- * first field of the record. The field separator is assumed to be a colon
- * ':' and the record separator a newline.
- *
- * Lines ending with a backspace '\' are assumed to flag that the following
- * line is a continuation line so that a set of lines can be read as one
- * printcap entry.
- *
- * A line stating with a hash '#' is assumed to be a comment and is ignored
- * Comments are discarded before the record is strung together from the
- * set of continuation lines.
- *
- * Opening a pipe for "lpc status" and reading that would probably
- * be pretty effective. Code to do this already exists in the freely
- * distributable PCNFS server code.
- *
* Modified to call SVID/XPG4 support if printcap name is set to "lpstat"
* in smb.conf under Solaris.
*
@@ -130,8 +106,6 @@ void pcap_cache_reload(void)
const char *pcap_name = lp_printcapname();
bool pcap_reloaded = False;
struct pcap_cache *tmp_cache = NULL;
- XFILE *pcap_file;
- char *pcap_line;
DEBUG(3, ("reloading printcap cache\n"));
@@ -172,72 +146,7 @@ void pcap_cache_reload(void)
}
#endif
- /* handle standard printcap - moved from pcap_printer_fn() */
-
- if ((pcap_file = x_fopen(pcap_name, O_RDONLY, 0)) == NULL) {
- DEBUG(0, ("Unable to open printcap file %s for read!\n", pcap_name));
- goto done;
- }
-
- for (; (pcap_line = fgets_slash(NULL, 1024, pcap_file)) != NULL; free(pcap_line)) {
- char name[MAXPRINTERLEN+1];
- char comment[62];
- char *p, *q;
-
- if (*pcap_line == '#' || *pcap_line == 0)
- continue;
-
- /* now we have a real printer line - cut at the first : */
- if ((p = strchr_m(pcap_line, ':')) != NULL)
- *p = 0;
-
- /*
- * now find the most likely printer name and comment
- * this is pure guesswork, but it's better than nothing
- */
- for (*name = *comment = 0, p = pcap_line; p != NULL; p = q) {
- bool has_punctuation;
-
- if ((q = strchr_m(p, '|')) != NULL)
- *q++ = 0;
-
- has_punctuation = (strchr_m(p, ' ') ||
- strchr_m(p, '\t') ||
- strchr_m(p, '(') ||
- strchr_m(p, ')'));
-
- if (strlen(p) > strlen(comment) && has_punctuation) {
- strlcpy(comment, p, sizeof(comment));
- continue;
- }
-
- if (strlen(p) <= MAXPRINTERLEN &&
- strlen(p) > strlen(name) && !has_punctuation) {
- if (!*comment) {
- strlcpy(comment, name, sizeof(comment));
- }
- strlcpy(name, p, sizeof(name));
- continue;
- }
-
- if (!strchr_m(comment, ' ') &&
- strlen(p) > strlen(comment)) {
- strlcpy(comment, p, sizeof(comment));
- continue;
- }
- }
-
- comment[60] = 0;
- name[MAXPRINTERLEN] = 0;
-
- if (*name && !pcap_cache_add(name, comment)) {
- x_fclose(pcap_file);
- goto done;
- }
- }
-
- x_fclose(pcap_file);
- pcap_reloaded = True;
+ pcap_reloaded = std_pcap_cache_reload(pcap_name);
done:
DEBUG(3, ("reload status: %s\n", (pcap_reloaded) ? "ok" : "error"));