printing: std_pcap_cache_reload xfile->stdio

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

1 files changed, 12 insertions, 8 deletions

diff --git a/source3/printing/print_standard.c b/source3/printing/print_standard.c
index 4404aeb681d..7cbdac7b257 100644
--- a/source3/printing/print_standard.c
+++ b/source3/printing/print_standard.c
@@ -57,31 +57,32 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "printing/pcap.h"
-#include "lib/util/xfile.h"
 
 /* handle standard printcap - moved from pcap_printer_fn() */
 bool std_pcap_cache_reload(const char *pcap_name, struct pcap_cache **_pcache)
 {
 	TALLOC_CTX *frame = talloc_stackframe();
-	XFILE *pcap_file;
+	FILE *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) {
+	if ((pcap_file = fopen(pcap_name, "r")) == NULL) {
 		DEBUG(0, ("Unable to open printcap file %s for read!\n", pcap_name));
 		talloc_free(frame);
 		return false;
 	}
 
-	for (; (pcap_line = x_fgets_slash(NULL, 1024, pcap_file)) != NULL;
-	     free(pcap_line)) {
+	while ((pcap_line = fgets_slash(frame, NULL, 1024,
+					pcap_file)) != NULL) {
 		char *name = NULL;
 		char *comment = NULL;
 		char *p, *q;
 
-		if (*pcap_line == '#' || *pcap_line == 0)
+		if (*pcap_line == '#' || *pcap_line == 0) {
+			TALLOC_FREE(pcap_line);
 			continue;
+		}
 
 		/* now we have a real printer line - cut at the first : */
 		if ((p = strchr_m(pcap_line, ':')) != NULL)
@@ -108,11 +109,13 @@ bool std_pcap_cache_reload(const char *pcap_name, struct pcap_cache **_pcache)
 
 			if (name == NULL && !has_punctuation) {
 				name = talloc_strdup(frame, p);
+				TALLOC_FREE(pcap_line);
 				continue;
 			}
 
 			if (has_punctuation) {
 				comment = talloc_strdup(frame, p);
+				TALLOC_FREE(pcap_line);
 				continue;
 			}
 		}
@@ -129,7 +132,7 @@ bool std_pcap_cache_reload(const char *pcap_name, struct pcap_cache **_pcache)
 						     comment,
 						     NULL);
 			if (!ok) {
-				x_fclose(pcap_file);
+				fclose(pcap_file);
 				pcap_cache_destroy_specific(&pcache);
 				talloc_free(frame);
 				return false;
@@ -137,6 +140,7 @@ bool std_pcap_cache_reload(const char *pcap_name, struct pcap_cache **_pcache)
 		}
 		TALLOC_FREE(name);
 		TALLOC_FREE(comment);
+		TALLOC_FREE(pcap_line);
 	}
 
 	if (print_warning) {
@@ -146,7 +150,7 @@ bool std_pcap_cache_reload(const char *pcap_name, struct pcap_cache **_pcache)
 			    (unsigned int)MAXPRINTERLEN);
 	}
 
-	x_fclose(pcap_file);
+	fclose(pcap_file);
 	*_pcache = pcache;
 	talloc_free(frame);
 	return true;