aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorseanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>2011-01-26 01:24:58 +0000
committerseanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>2011-01-26 01:24:58 +0000
commitba464097395476eea7b14e708c0843eddfc14aba (patch)
tree2365936906ac00842a4093c4ec356a0332c6dca9
parentd0b639da78824e618323d34e60f255ca87f5b1f1 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@304096 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/file.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/main/file.c b/main/file.c
index 20cda4929..57adf79a6 100644
--- a/main/file.c
+++ b/main/file.c
@@ -1117,6 +1117,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);
@@ -1143,11 +1148,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));