From: Sean Bright <sean@malleable.com>
Date: Wed, 26 Jan 2011 01:24:58 +0000 (+0000)
Subject: Per the man page, setvbuf() must be called before any other operation on an open... 
X-Git-Tag: 1.6.2.18-rc1~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ef4c6820eeff77922e139e6f8c2fe8b715dc61e;p=thirdparty%2Fasterisk.git

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/branches/1.6.2@304096 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/file.c b/main/file.c
index 20cda4929e..57adf79a61 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));