diff options
| author | Andrew Tridgell <tridge@samba.org> | 2000-04-16 11:00:21 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2000-04-16 11:00:21 +0000 |
| commit | a09470817c5b21dba42f9ef4ce5e8b768a254c0b (patch) | |
| tree | 0ccfd39e6d69c905e266fe4eea5e65e6b18b7ee9 /source/include | |
| parent | 92f85cef8b4c283374edb726ff0b4999a2000b2a (diff) | |
| download | samba-a09470817c5b21dba42f9ef4ce5e8b768a254c0b.tar.gz samba-a09470817c5b21dba42f9ef4ce5e8b768a254c0b.tar.xz samba-a09470817c5b21dba42f9ef4ce5e8b768a254c0b.zip | |
converted a bunch more functions to use a fd instead of a FILE*
to support some of this I added the following functions in util_file.c
file_lines_pload : load lines from a pipe
file_pload : load a pipe into memory
Diffstat (limited to 'source/include')
| -rw-r--r-- | source/include/proto.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/include/proto.h b/source/include/proto.h index 94afe217493..dc9d9c389ec 100644 --- a/source/include/proto.h +++ b/source/include/proto.h @@ -235,8 +235,8 @@ DIR *wsys_opendir(const smb_ucs2_t *wfname); smb_ucs2_t *wsys_getwd(smb_ucs2_t *s); int wsys_chown(const smb_ucs2_t *wfname, uid_t uid, gid_t gid); int wsys_chroot(const smb_ucs2_t *wfname); -FILE *sys_popen(const char *command, const char *mode, BOOL paranoid); -int sys_pclose( FILE *fp); +int sys_popen(const char *command); +int sys_pclose(int fd); /*The following definitions come from lib/talloc.c */ @@ -378,7 +378,10 @@ SMB_BIG_UINT getfilepwpos(void *vp); BOOL setfilepwpos(void *vp, SMB_BIG_UINT tok); int getfileline(void *vp, char *linebuf, int linebuf_size); char *fgets_slash(char *s2,int maxlen,FILE *f); +char *file_pload(char *syscmd, size_t *size); +char *file_load(char *fname, size_t *size); char **file_lines_load(char *fname, int *numlines); +char **file_lines_pload(char *syscmd, int *numlines); void file_lines_free(char **lines); /*The following definitions come from lib/util_sec.c */ |