diff options
| -rw-r--r-- | source3/include/smb.h | 10 | ||||
| -rw-r--r-- | source3/lib/slprintf.c | 30 | ||||
| -rw-r--r-- | source3/lib/util_file.c | 6 |
3 files changed, 44 insertions, 2 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h index b8cd415ef9..854200e4cb 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1303,6 +1303,16 @@ int slprintf(char *str, int n, char *format, ...) int slprintf(); #endif +#ifdef HAVE_STDARG_H +int fdprintf(int fd, char *format, ...) +#ifdef __GNUC__ + __attribute__ ((format (printf, 2, 3))) +#endif +; +#else +int fdprintf(); +#endif + #ifdef WITH_DFS void dfs_unlogin(void); extern int dcelogin_atmost_once; diff --git a/source3/lib/slprintf.c b/source3/lib/slprintf.c index a755bf1bc5..ed7113c865 100644 --- a/source3/lib/slprintf.c +++ b/source3/lib/slprintf.c @@ -64,3 +64,33 @@ va_dcl va_end(ap); return ret; } + + /* this is rather line fprintf, except that it works on a file descriptor + and is limited to one pstring of output */ +#ifdef HAVE_STDARG_H + int fdprintf(int fd, char *format, ...) +{ +#else + int fdprintf(va_alist) +va_dcl +{ + int fd; + char *format; +#endif + va_list ap; + int ret; + pstring str; + +#ifdef HAVE_STDARG_H + va_start(ap, format); +#else + va_start(ap); + fd = va_arg(ap,int); + format = va_arg(ap,char *); +#endif + str[0] = 0; + + ret = vslprintf(str,sizeof(str),format,ap); + va_end(ap); + return write(fd, str, strlen(str)); +} diff --git a/source3/lib/util_file.c b/source3/lib/util_file.c index 39c97d5c3f..d533e6428f 100644 --- a/source3/lib/util_file.c +++ b/source3/lib/util_file.c @@ -362,12 +362,13 @@ char **file_lines_load(char *fname, int *numlines) if (s[0] == '\n') i++; } - ret = (char **)malloc(sizeof(ret[0])*(i+1)); + ret = (char **)malloc(sizeof(ret[0])*(i+2)); if (!ret) { free(p); return NULL; } - *numlines = i; + memset(ret, 0, sizeof(ret[0])*(i+2)); + if (numlines) *numlines = i; ret[0] = p; for (s = p, i=0; s < p+size; s++) { @@ -391,3 +392,4 @@ void file_lines_free(char **lines) free(lines[0]); free(lines); } + |