diff options
| author | Sean Bright <sean@malleable.com> | 2011-01-26 01:27:39 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2011-01-26 01:27:39 +0000 |
| commit | 50a023add5880c383308cf343d51cb75cf5ec830 (patch) | |
| tree | cabbe06f98fdfe7ce2bc0baa7bd910b026c70d59 /main/file.c | |
| parent | ca014f49a2d50229a12278d44fab3131fc8e84aa (diff) | |
Merged revisions 304097 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r304097 | seanbright | 2011-01-25 20:26:26 -0500 (Tue, 25 Jan 2011) | 19 lines
Merged revisions 304096 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r304096 | seanbright | 2011-01-25 20:24:58 -0500 (Tue, 25 Jan 2011) | 12 lines
Per the man page, setvbuf() must be called before any other operation on an open file.
We use setvbuf() to associate a buffer with a stream, but we have already written
to the open file. This works (by chance) on Linux, but fails on other platforms,
such as OpenSolaris.
(closes issue #16610)
Reported by: bklang
Patches:
setvbuf.patch uploaded by crjw (license 963)
Tested by: bklang, asgaroth, efutch
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@304098 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/file.c')
| -rw-r--r-- | main/file.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/file.c b/main/file.c index d29dc2e9d..c2ab096cd 100644 --- a/main/file.c +++ b/main/file.c @@ -1113,6 +1113,11 @@ struct ast_filestream *ast_writefile(const char *filename, const char *type, con if (fd > -1) { errno = 0; fs = get_filestream(f, bfile); + if (fs) { + if ((fs->write_buffer = ast_malloc(32768))) { + setvbuf(fs->f, fs->write_buffer, _IOFBF, 32768); + } + } if (!fs || rewrite_wrapper(fs, comment)) { ast_log(LOG_WARNING, "Unable to rewrite %s\n", fn); close(fd); @@ -1139,11 +1144,6 @@ struct ast_filestream *ast_writefile(const char *filename, const char *type, con } fs->vfs = NULL; /* If truncated, we'll be at the beginning; if not truncated, then append */ - - if ((fs->write_buffer = ast_malloc(32768))){ - setvbuf(fs->f, fs->write_buffer, _IOFBF, 32768); - } - f->seek(fs, 0, SEEK_END); } else if (errno != EEXIST) { ast_log(LOG_WARNING, "Unable to open file %s: %s\n", fn, strerror(errno)); |