lib: Rename fgets_slash to x_fgets_slash

[martins/samba.git] / source3 / printing / print_standard.c

diff --git a/source3/printing/print_standard.c b/source3/printing/print_standard.c
index c4f9c5b7ae3ab47f6a9c7b9f2fc2a2c21460a0eb..080ef077207d4d9dc62e1a500cb8ec9d2420b700 100644 (file)
--- a/source3/printing/print_standard.c
+++ b/source3/printing/print_standard.c
@@ -59,19 +59,24 @@
 #include "printing/pcap.h"
 
 /* handle standard printcap - moved from pcap_printer_fn() */
-bool std_pcap_cache_reload(const char *pcap_name)
+bool std_pcap_cache_reload(const char *pcap_name, struct pcap_cache **_pcache)
 {
+       TALLOC_CTX *frame = talloc_stackframe();
        XFILE *pcap_file;
        char *pcap_line;
+       struct pcap_cache *pcache = NULL;
+       bool print_warning = false;
 
        if ((pcap_file = x_fopen(pcap_name, O_RDONLY, 0)) == NULL) {
                DEBUG(0, ("Unable to open printcap file %s for read!\n", pcap_name));
+               talloc_free(frame);
                return false;
        }
 
-       for (; (pcap_line = fgets_slash(NULL, 1024, pcap_file)) != NULL; free(pcap_line)) {
-               char name[MAXPRINTERLEN+1];
-               char comment[62];
+       for (; (pcap_line = x_fgets_slash(NULL, 1024, pcap_file)) != NULL;
+            free(pcap_line)) {
+               char *name = NULL;
+               char *comment = NULL;
                char *p, *q;
 
                if (*pcap_line == '#' || *pcap_line == 0)
@@ -85,8 +90,8 @@ bool std_pcap_cache_reload(const char *pcap_name)
                 * 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;
+               for (p = pcap_line; p != NULL; p = q) {
+                       bool has_punctuation = false;
 
                        if ((q = strchr_m(p, '|')) != NULL)
                                *q++ = 0;
@@ -100,29 +105,48 @@ bool std_pcap_cache_reload(const char *pcap_name)
                                           strchr_m(p, '(') ||
                                           strchr_m(p, ')'));
 
-                       if (strlen(p) > strlen(comment) && has_punctuation) {
-                               strlcpy(comment, p, sizeof(comment));
+                       if (name == NULL && !has_punctuation) {
+                               name = talloc_strdup(frame, p);
                                continue;
                        }
 
-                       if (strlen(p) <= MAXPRINTERLEN && *name == '\0' && !has_punctuation) {
-                               strlcpy(name, p, sizeof(name));
+                       if (has_punctuation) {
+                               comment = talloc_strdup(frame, p);
                                continue;
                        }
+               }
 
-                       if (!strchr_m(comment, ' ') &&
-                           strlen(p) > strlen(comment)) {
-                               strlcpy(comment, p, sizeof(comment));
-                               continue;
+               if (name != NULL) {
+                       bool ok;
+
+                       if (!print_warning && strlen(name) > MAXPRINTERLEN) {
+                               print_warning = true;
                        }
-               }
 
-               if (*name && !pcap_cache_add(name, comment, NULL)) {
-                       x_fclose(pcap_file);
-                       return false;
+                       ok = pcap_cache_add_specific(&pcache,
+                                                    name,
+                                                    comment,
+                                                    NULL);
+                       if (!ok) {
+                               x_fclose(pcap_file);
+                               pcap_cache_destroy_specific(&pcache);
+                               talloc_free(frame);
+                               return false;
+                       }
                }
+               TALLOC_FREE(name);
+               TALLOC_FREE(comment);
+       }
+
+       if (print_warning) {
+               DBG_WARNING("WARNING: You have some printer names that are "
+                           "longer than %u characters. These may not be "
+                           "accessible to some older clients!\n",
+                           (unsigned int)MAXPRINTERLEN);
        }
 
        x_fclose(pcap_file);
+       *_pcache = pcache;
+       talloc_free(frame);
        return true;
 }