sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-26 01:49:31 +03:00
Code Activity

lib: Add fgets_slash

Browse Source 
Copy x_fgets_slash with conversion to stdio and talloc.

Probably I'd do this functionality a bit differently, but for simplicity I
chose to make it the same as what is there.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke
2016-11-21 19:20:10 +01:00
parent 7437150381
commit 9a6243eb9d
2 changed files with 84 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/util/samba_util.h
View File

@ -336,6 +336,8 @@ const char **str_list_make_v3_const(TALLOC_CTX *mem_ctx,
*/
_PUBLIC_ char *afdgets(int fd, TALLOC_CTX *mem_ctx, size_t hint);
char *fgets_slash(TALLOC_CTX *mem_ctx, char *s2, int maxlen, FILE *f);
/**
load a file into memory from a fd.
**/

82
lib/util/util_file.c
View File

@ -79,6 +79,88 @@ _PUBLIC_ char *afdgets(int fd, TALLOC_CTX *mem_ctx, size_t hint)
return data;
}
char *fgets_slash(TALLOC_CTX *mem_ctx, char *s2, int maxlen, FILE *f)
{
char *s = s2;
int len = 0;
int c;
bool start_of_line = true;
if (feof(f)) {
return NULL;
}
if (maxlen < 2) {
return NULL;
}
if (s2 == NULL) {
maxlen = MIN(maxlen,8);
s = talloc_array(mem_ctx, char, maxlen);
}
if (s == NULL) {
return NULL;
}
*s = 0;
while (len < maxlen-1) {
c = getc(f);
switch (c)
{
case '\r':
break;
case '\n':
while (len > 0 && s[len-1] == ' ') {
s[--len] = 0;
}
if (len > 0 && s[len-1] == '\\') {
s[--len] = 0;
start_of_line = true;
break;
}
return s;
case EOF:
if (len <= 0 && (s2 == NULL)) {
TALLOC_FREE(s);
}
return (len>0) ? s : NULL;
case ' ':
if (start_of_line) {
break;
}
/* fall through */
default:
start_of_line = false;
s[len++] = c;
s[len] = 0;
}
if ((s2 == NULL) && (len > maxlen-3)) {
int m;
char *t;
m = maxlen * 2;
if (m < maxlen) {
DBG_ERR("length overflow");
TALLOC_FREE(s);
return NULL;
}
maxlen = m;
t = talloc_realloc(mem_ctx, s, char, maxlen);
if (t == NULL) {
DBG_ERR("failed to expand buffer!\n");
TALLOC_FREE(s);
return NULL;
}
s = t;
}
}
return s;
}
/**
load a file into memory from a fd.