From: Jeremy Allison Date: Sat, 18 May 2019 18:14:53 +0000 (-0700) Subject: lib: util: Remove file_pload() X-Git-Tag: ldb-2.0.5~628 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c5729ae44219ec81008040d4d50f0f5fdf254201;p=thirdparty%2Fsamba.git lib: util: Remove file_pload() No longer used. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13964 Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme --- diff --git a/lib/util/samba_util.h b/lib/util/samba_util.h index cf8602e2015..f0aa42e7271 100644 --- a/lib/util/samba_util.h +++ b/lib/util/samba_util.h @@ -404,7 +404,6 @@ bool file_compare(const char *path1, const char *path2); /* load from a pipe into memory. */ -char *file_pload(const char *syscmd, size_t *size); char *file_ploadv(char * const argl[], size_t *size); /* The following definitions come from lib/util/util.c */ diff --git a/lib/util/util_file.c b/lib/util/util_file.c index 1541a08f935..79276153015 100644 --- a/lib/util/util_file.c +++ b/lib/util/util_file.c @@ -398,52 +398,6 @@ bool file_compare(const char *path1, const char *path2) return true; } - -/** - Load from a pipe into memory. -**/ -char *file_pload(const char *syscmd, size_t *size) -{ - int fd, n; - char *p; - char buf[1024]; - size_t total; - - fd = sys_popen(syscmd); - if (fd == -1) { - return NULL; - } - - p = NULL; - total = 0; - - while ((n = sys_read(fd, buf, sizeof(buf))) > 0) { - p = talloc_realloc(NULL, p, char, total + n + 1); - if (!p) { - DEBUG(0,("file_pload: failed to expand buffer!\n")); - close(fd); - return NULL; - } - memcpy(p+total, buf, n); - total += n; - } - - if (p) { - p[total] = 0; - } - - /* FIXME: Perhaps ought to check that the command completed - * successfully (returned 0); if not the data may be - * truncated. */ - sys_pclose(fd); - - if (size) { - *size = total; - } - - return p; -} - /** Load from a pipe into memory. **/