summaryrefslogtreecommitdiff
path: root/source4/lib/util_file.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-09-28 21:54:29 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:39:08 -0500
commit87af8061c760b7d1eaa596183ac1635af73524b4 (patch)
treebc1b6026945a6213e178a2949d2b2217183c000b /source4/lib/util_file.c
parent4abb4797613868e518baafb5f3618e78f67ac05c (diff)
downloadsamba-87af8061c760b7d1eaa596183ac1635af73524b4.tar.gz
samba-87af8061c760b7d1eaa596183ac1635af73524b4.tar.bz2
samba-87af8061c760b7d1eaa596183ac1635af73524b4.zip
r10592: Add "adfgets()" function, which allocates and reads a line from a fd.
Also add torture tests for this function and file_{load,save}. I've hardcoded a file name here.. should I handle that neater somehow? (This used to be commit 8fa383f182f1c4479979455968dd690edc0117ea)
Diffstat (limited to 'source4/lib/util_file.c')
-rw-r--r--source4/lib/util_file.c50
1 files changed, 49 insertions, 1 deletions
diff --git a/source4/lib/util_file.c b/source4/lib/util_file.c
index 156d09aaf5..77066e78cc 100644
--- a/source4/lib/util_file.c
+++ b/source4/lib/util_file.c
@@ -2,6 +2,8 @@
* 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
@@ -96,6 +98,52 @@ char *fgets_slash(char *s2,int maxlen,XFILE *f)
return(s);
}
+/* Read one line (data until next newline or eof) and allocate it */
+char *afdgets(int fd, TALLOC_CTX *mem_ctx, size_t hint)
+{
+ char *data = NULL;
+ ssize_t alloc_size = 0, offset = 0, ret;
+ int p;
+
+ if (hint <= 0) hint = 0x100;
+
+ do {
+ alloc_size += hint;
+
+ data = talloc_realloc(mem_ctx, data, char, alloc_size);
+
+ if (!data)
+ return NULL;
+
+ ret = read(fd, data + offset, hint);
+
+ if (ret == -1) {
+ talloc_free(data);
+ return NULL;
+ }
+
+ /* Find newline */
+ for (p = 0; p < ret; p++) {
+ if (data[offset + p] == '\n')
+ break;
+ }
+
+ if (p < ret) {
+ data[offset + p] = '\0';
+
+ /* Go back to position of newline */
+ lseek(fd, p - ret + 1, SEEK_CUR);
+ return data;
+ }
+
+ offset += ret;
+
+ } while (ret == hint);
+
+ data[offset] = '\0';
+
+ return data;
+}
/****************************************************************************
@@ -287,7 +335,7 @@ void file_lines_slashcont(char **lines)
/*
save a lump of data into a file. Mostly used for debugging
*/
-BOOL file_save(const char *fname, void *packet, size_t length)
+BOOL file_save(const char *fname, const void *packet, size_t length)
{
int fd;
fd = open(fname, O_WRONLY|O_CREAT|O_TRUNC, 0644);