lib: Give lib/util/util_file.c its own header file

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Martin Schwenke <mschwenke@ddn.com>

auth/credentials/credentials.c

@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "librpc/gen_ndr/samr.h" /* for struct samrPassword */
 #include "auth/credentials/credentials.h"
 #include "auth/credentials/credentials_internal.h"

ctdb/common/ctdb_util.c

@@ -21,6 +21,7 @@
 #include "system/network.h"
 #include "system/filesys.h"
 #include "system/wait.h"
+#include "lib/util/util_file.h"
 
 #include <tdb.h>
 

ctdb/server/ctdb_takeover.c

@@ -30,6 +30,7 @@
 #include "lib/util/dlinklist.h"
 #include "lib/util/debug.h"
 #include "lib/util/samba_util.h"
+#include "lib/util/util_file.h"
 #include "lib/util/sys_rw.h"
 #include "lib/util/util_process.h"
 

ctdb/tests/src/fake_ctdbd.c

@@ -31,6 +31,7 @@
 #include "lib/util/tevent_unix.h"
 #include "lib/util/debug.h"
 #include "lib/util/samba_util.h"
+#include "lib/util/util_file.h"
 #include "lib/async_req/async_sock.h"
 
 #include "protocol/protocol.h"

ctdb/tools/ctdb.c

@@ -33,6 +33,7 @@
 #include "version.h"
 #include "lib/util/debug.h"
 #include "lib/util/samba_util.h"
+#include "lib/util/util_file.h"
 #include "lib/util/sys_rw.h"
 #include "lib/util/smb_strtox.h"
 

lib/fuzzing/afl-fuzz-main.c

@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "lib/util/samba_util.h"
+#include "lib/util/util_file.h"
 #include "fuzzing.h"
 
 int main(int argc, char *argv[]) {

lib/util/samba_util.h

@@ -366,61 +366,6 @@ const char **str_list_make_v3_const(TALLOC_CTX *mem_ctx,
 				    const char *string,
 				    const char *sep);
 
-/* The following definitions come from lib/util/util_file.c  */
-
-
-/**
- * Read one line (data until next newline or eof) and allocate it
- */
-_PUBLIC_ char *afdgets(int fd, TALLOC_CTX *mem_ctx, size_t hint);
-
-char *fgets_slash(TALLOC_CTX *mem_ctx, char *s2, size_t maxlen, FILE *f);
-
-/**
-load a file into memory from a fd.
-**/
-_PUBLIC_ char *fd_load(int fd, size_t *size, size_t maxsize, TALLOC_CTX *mem_ctx);
-
-
-char **file_lines_parse(const char *p, size_t size, int *numlines, TALLOC_CTX *mem_ctx);
-
-/**
-load a file into memory
-**/
-_PUBLIC_ char *file_load(const char *fname, size_t *size, size_t maxsize, TALLOC_CTX *mem_ctx);
-
-/**
-load a file into memory and return an array of pointers to lines in the file
-must be freed with talloc_free().
-**/
-_PUBLIC_ char **file_lines_load(const char *fname, int *numlines, size_t maxsize, TALLOC_CTX *mem_ctx);
-
-/**
-load a fd into memory and return an array of pointers to lines in the file
-must be freed with talloc_free(). If convert is true calls unix_to_dos on
-the list.
-**/
-_PUBLIC_ char **fd_lines_load(int fd, int *numlines, size_t maxsize, TALLOC_CTX *mem_ctx);
-
-_PUBLIC_ bool file_save_mode(const char *fname, const void *packet,
-			     size_t length, mode_t mode);
-/**
-  save a lump of data into a file. Mostly used for debugging
-*/
-_PUBLIC_ bool file_save(const char *fname, const void *packet, size_t length);
-_PUBLIC_ int vfdprintf(int fd, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0);
-_PUBLIC_ int fdprintf(int fd, const char *format, ...) PRINTF_ATTRIBUTE(2,3);
-
-/*
-  compare two files, return true if the two files have the same content
- */
-bool file_compare(const char *path1, const char *path2);
-
-/*
-  load from a pipe into memory.
- */
-char *file_ploadv(char * const argl[], size_t *size);
-
 /* The following definitions come from lib/util/util.c  */
 
 

lib/util/tests/file.c

@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "system/filesys.h"
 #include "torture/torture.h"
 #include "torture/local/proto.h"

lib/util/util_file.c

@@ -24,6 +24,7 @@
 #include "system/filesys.h"
 #include <talloc.h>
 #include "lib/util/samba_util.h"
+#include "lib/util/util_file.h"
 #include "lib/util/sys_popen.h"
 #include "lib/util/sys_rw.h"
 #include "lib/util/debug.h"

lib/util/util_file.h

@@ -0,0 +1,80 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * SMB parameters and setup
+ * Copyright (C) Andrew Tridgell 1992-1998 Modified by Jeremy Allison 1995.
+ *
+ * Added afdgets() Jelmer Vernooij 2005
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __LIB_UTIL_UTIL_FILE_H__
+#define __LIB_UTIL_UTIL_FILE_H__
+
+#include "replace.h"
+#include <talloc.h>
+
+/**
+ * Read one line (data until next newline or eof) and allocate it
+ */
+_PUBLIC_ char *afdgets(int fd, TALLOC_CTX *mem_ctx, size_t hint);
+
+char *fgets_slash(TALLOC_CTX *mem_ctx, char *s2, size_t maxlen, FILE *f);
+
+/**
+load a file into memory from a fd.
+**/
+_PUBLIC_ char *fd_load(int fd, size_t *size, size_t maxsize, TALLOC_CTX *mem_ctx);
+
+/**
+load a file into memory
+**/
+_PUBLIC_ char *file_load(const char *fname, size_t *size, size_t maxsize, TALLOC_CTX *mem_ctx);
+
+/**
+load a file into memory and return an array of pointers to lines in the file
+must be freed with talloc_free().
+**/
+_PUBLIC_ char **file_lines_load(const char *fname, int *numlines, size_t maxsize, TALLOC_CTX *mem_ctx);
+
+/**
+load a fd into memory and return an array of pointers to lines in the file
+must be freed with talloc_free(). If convert is true calls unix_to_dos on
+the list.
+**/
+_PUBLIC_ char **fd_lines_load(int fd, int *numlines, size_t maxsize, TALLOC_CTX *mem_ctx);
+
+char **file_lines_parse(const char *p, size_t size, int *numlines, TALLOC_CTX *mem_ctx);
+
+_PUBLIC_ bool file_save_mode(const char *fname, const void *packet,
+			     size_t length, mode_t mode);
+
+/**
+  save a lump of data into a file. Mostly used for debugging
+*/
+_PUBLIC_ bool file_save(const char *fname, const void *packet, size_t length);
+_PUBLIC_ int vfdprintf(int fd, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0);
+_PUBLIC_ int fdprintf(int fd, const char *format, ...) PRINTF_ATTRIBUTE(2,3);
+
+/*
+  compare two files, return true if the two files have the same content
+ */
+bool file_compare(const char *path1, const char *path2);
+
+/*
+  load from a pipe into memory.
+ */
+char *file_ploadv(char * const argl[], size_t *size);
+
+#endif

libcli/nbt/lmhosts.c

@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "lib/util/util_net.h"
 #include "system/filesys.h"
 #include "system/network.h"

libcli/netlogon/netlogon.c

@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "../libcli/netlogon/netlogon.h"
 
 NTSTATUS push_netlogon_samlogon_response(DATA_BLOB *data, TALLOC_CTX *mem_ctx,

libgpo/gpo_ini.c

@@ -19,6 +19,7 @@
  */
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "gpo.h"
 #include "gpo_ini.h"
 #include "system/filesys.h"

librpc/rpc/dcerpc_pkt_auth.c

@@ -22,6 +22,7 @@
 #include "replace.h"
 #include "system/network.h"
 #include <tevent.h>
+#include "lib/util/util_file.h"
 #include "lib/util/talloc_stack.h"
 #include "lib/util/debug.h"
 #include "lib/util/byteorder.h"

librpc/rpc/dcerpc_util.c

@@ -23,6 +23,7 @@
 #include "system/network.h"
 #include <tevent.h>
 #include "lib/tsocket/tsocket.h"
+#include "lib/util/util_file.h"
 #include "lib/util/tevent_ntstatus.h"
 #include "librpc/rpc/dcerpc.h"
 #include "librpc/rpc/dcerpc_util.h"

librpc/tools/ndrdump.c

@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "system/filesys.h"
 #include "system/locale.h"
 #include "librpc/ndr/libndr.h"

librpc/wsp/wsp_util.c

@@ -19,6 +19,7 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "librpc/wsp/wsp_util.h"
 #include "librpc/gen_ndr/wsp.h"
 #include "librpc/gen_ndr/ndr_wsp.h"

source3/auth/user_util.c

@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "system/filesys.h"
 #include "auth.h"
 #include "lib/gencache.h"

source3/client/clitar.c

@@ -71,6 +71,7 @@
 #include "client/client_proto.h"
 #include "client/clitar_proto.h"
 #include "libsmb/libsmb.h"
+#include "lib/util/util_file.h"
 
 #ifdef HAVE_LIBARCHIVE
 

source3/lib/dumpcore.c

@@ -26,6 +26,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "system/filesys.h"
 
 #ifdef HAVE_SYS_SYSCTL_H

source3/lib/util_file.c

@@ -18,7 +18,8 @@
  */
 
 #include "replace.h"
-#include "lib/util_file.h"
+#include "lib/util/util_file.h"
+#include "source3/lib/util_file.h"
 #include "lib/util/debug.h"
 #include "lib/util/samba_util.h"
 #include "lib/util/sys_rw.h"

source3/libgpo/gpext/registry.c

@@ -24,6 +24,7 @@
 #include "registry.h"
 #include "../librpc/gen_ndr/ndr_preg.h"
 #include "libgpo/gpext/gpext.h"
+#include "lib/util/util_file.h"
 
 #define GP_EXT_NAME "registry"
 

source3/modules/vfs_fruit.c

@@ -30,6 +30,7 @@
 #include "../libcli/smb/smb2_create_ctx.h"
 #include "lib/util/tevent_ntstatus.h"
 #include "lib/util/tevent_unix.h"
+#include "lib/util/util_file.h"
 #include "offload_token.h"
 #include "string_replace.h"
 #include "hash_inode.h"

source3/modules/vfs_glusterfs.c

@@ -41,6 +41,7 @@
 #include <glusterfs/api/glfs.h>
 #include "lib/util/dlinklist.h"
 #include "lib/util/tevent_unix.h"
+#include "lib/util/util_file.h"
 #include "smbd/globals.h"
 #include "lib/util/sys_rw.h"
 #include "smbprofile.h"

source3/modules/vfs_shell_snap.c

@@ -21,6 +21,7 @@
 #include "include/ntioctl.h"
 #include "system/filesys.h"
 #include "smbd/smbd.h"
+#include "lib/util/util_file.h"
 
 /*
  * Check whether a path can be shadow copied. Return the base volume, allowing

source3/nmbd/nmbd_synclists.c

@@ -33,6 +33,7 @@
 #include "libsmb/clirap.h"
 #include "../libcli/smb/smbXcli_base.h"
 #include "lib/util/string_wrappers.h"
+#include "lib/util/util_file.h"
 #include "source3/lib/substitute.h"
 
 struct sync_record {

source3/nmbd/nmbd_winsserver.c

@@ -24,6 +24,7 @@
 #include "system/filesys.h"
 #include "nmbd/nmbd.h"
 #include "util_tdb.h"
+#include "lib/util/util_file.h"
 
 #define WINS_LIST "wins.dat"
 #define WINS_VERSION 1

source3/param/loadparm.c

@@ -55,6 +55,7 @@
 
 #define LOADPARM_SUBSTITUTION_INTERNALS 1
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "system/filesys.h"
 #include "util_tdb.h"
 #include "lib/param/loadparm.h"

source3/passdb/machine_sid.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "passdb/machine_sid.h"
 #include "secrets.h"
 #include "dbwrap/dbwrap.h"

source3/printing/nt_printing_os2.c

@@ -20,6 +20,7 @@
  */
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "printing/nt_printing_os2.h"
 
 /****************************************************************************

source3/printing/print_generic.c

@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "printing.h"
 #include "smbd/proto.h"
 #include "source3/lib/substitute.h"

source3/printing/print_standard.c

@@ -55,6 +55,7 @@
 
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "system/filesys.h"
 #include "printing/pcap.h"
 

source3/rpc_server/rpc_host.c

@@ -54,6 +54,7 @@
 #include "lib/util/debug.h"
 #include "lib/util/server_id.h"
 #include "lib/util/util_tdb.h"
+#include "lib/util/util_file.h"
 #include "lib/tdb_wrap/tdb_wrap.h"
 #include "lib/async_req/async_sock.h"
 #include "librpc/rpc/dcerpc_util.h"

source3/rpc_server/spoolss/srv_spoolss_nt.c

@@ -28,6 +28,7 @@
    up, all the errors returned are DOS errors, not NT status codes. */
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "libsmb/namequery.h"
 #include "ntdomain.h"
 #include "nt_printing.h"

source3/smbd/smb1_lanman.c

@@ -26,6 +26,7 @@
    */
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "source3/smbd/smbXsrv_session.h"

source3/torture/torture.c

@@ -48,6 +48,7 @@
 #include "lib/gencache.h"
 #include "lib/util/sys_rw.h"
 #include "lib/util/asn1.h"
+#include "lib/util/util_file.h"
 #include "lib/param/param.h"
 #include "auth/gensec/gensec.h"
 #include "lib/util/string_wrappers.h"

source3/utils/net_ads.c

@@ -42,6 +42,7 @@
 #include "utils/net_dns.h"
 #include "auth/kerberos/pac_utils.h"
 #include "lib/util/string_wrappers.h"
+#include "lib/util/util_file.h"
 
 #ifdef HAVE_JANSSON
 #include <jansson.h>

source3/utils/net_eventlog.c

@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "utils/net.h"
 #include "lib/eventlog/eventlog.h"
+#include "lib/util/util_file.h"
 
 /**
  * Dump an *evt win32 eventlog file

source3/utils/net_offlinejoin.c

@@ -24,6 +24,7 @@
 #include "libcli/registry/util_reg.h"
 #include "libcli/security/dom_sid.h"
 #include "lib/cmdline/cmdline.h"
+#include "lib/util/util_file.h"
 
 int net_offlinejoin_usage(struct net_context *c, int argc, const char **argv)
 {

source3/utils/net_usershare.c

@@ -24,6 +24,7 @@
 #include "utils/net.h"
 #include "../libcli/security/security.h"
 #include "lib/util/string_wrappers.h"
+#include "lib/util/util_file.h"
 
 struct {
 	const char *us_errstr;

source3/utils/smbcacls.c

@@ -34,6 +34,7 @@
 #include "../librpc/gen_ndr/ndr_lsa_c.h"
 #include "util_sd.h"
 #include "lib/param/param.h"
+#include "lib/util/util_file.h"
 
 static char DIRSEP_CHAR = '\\';
 

source4/lib/registry/patchfile_dotreg.c

@@ -26,6 +26,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "lib/registry/registry.h"
 #include "system/filesys.h"
 

source4/lib/registry/regf.c

@@ -18,6 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "system/filesys.h"
 #include "system/time.h"
 #include "lib/registry/tdr_regf.h"
@@ -2218,7 +2219,8 @@ WERROR reg_open_regf_file(TALLOC_CTX *parent_ctx, const char *location,
 
 	pull = tdr_pull_init(regf);
 
-	pull->data.data = (uint8_t*)fd_load(regf->fd, &pull->data.length, 0, regf);
+	pull->data.data = (uint8_t*)
+		fd_load(regf->fd, &pull->data.length, 0, regf);
 
 	if (pull->data.data == NULL) {
 		DEBUG(0, ("Error reading data from file: %s\n", location));

source4/lib/tls/tls_tstream.c

@@ -21,6 +21,7 @@
 #include "system/network.h"
 #include "system/filesys.h"
 #include "system/time.h"
+#include "lib/util/util_file.h"
 #include "../util/tevent_unix.h"
 #include "../lib/tsocket/tsocket.h"
 #include "../lib/tsocket/tsocket_internal.h"

source4/lib/tls/tlscert.c

@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "lib/tls/tls.h"
 
 #include <gnutls/gnutls.h>

source4/libcli/dgram/browse.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "libcli/dgram/libdgram.h"
 #include "lib/socket/socket.h"
 #include "libcli/resolve/resolve.h"

source4/libcli/dgram/netlogon.c

@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "libcli/dgram/libdgram.h"
 #include "lib/socket/socket.h"
 #include "libcli/resolve/resolve.h"

source4/librpc/rpc/dcerpc.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "system/filesys.h"
 #include "../lib/util/dlinklist.h"
 #include "lib/events/events.h"

source4/torture/auth/pac.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "system/kerberos.h"
 #include "auth/auth.h"
 #include "auth/kerberos/kerberos.h"

source4/torture/basic/misc.c

@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
 #include "system/time.h"

source4/torture/drs/rpc/dssync.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "lib/cmdline/cmdline.h"
 #include "librpc/gen_ndr/ndr_drsuapi_c.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"

source4/torture/gentest.c

@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "lib/cmdline/cmdline.h"
 #include "lib/events/events.h"
 #include "system/time.h"

source4/torture/locktest.c

@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "lib/cmdline/cmdline.h"
 #include "lib/events/events.h"
 #include "system/filesys.h"

source4/torture/smbtorture.c

@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "lib/cmdline/cmdline.h"
 #include "system/time.h"
 #include "system/wait.h"

source4/torture/util_smb.c

@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/util_file.h"
 #include "lib/cmdline/cmdline.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"