kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 304097 via svnmerge from

Browse Source 
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
This commit is contained in:
Sean Bright
2011-01-26 01:27:39 +00:00
parent ca014f49a2
commit 50a023add5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/file.c
View File

@@ -1113,6 +1113,11 @@ struct ast_filestream *ast_writefile(const char *filename, const char *type, con
if (fd > -1) { if (fd > -1) {
errno = 0; errno = 0;
fs = get_filestream(f, bfile); 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)) { if (!fs || rewrite_wrapper(fs, comment)) {
ast_log(LOG_WARNING, "Unable to rewrite %s\n", fn); ast_log(LOG_WARNING, "Unable to rewrite %s\n", fn);
close(fd); close(fd);
@@ -1139,11 +1144,6 @@ struct ast_filestream *ast_writefile(const char *filename, const char *type, con
} }
fs->vfs = NULL; fs->vfs = NULL;
/* If truncated, we'll be at the beginning; if not truncated, then append */ /* 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); f->seek(fs, 0, SEEK_END);
} else if (errno != EEXIST) { } else if (errno != EEXIST) {
ast_log(LOG_WARNING, "Unable to open file %s: %s\n", fn, strerror(errno)); ast_log(LOG_WARNING, "Unable to open file %s: %s\n", fn, strerror(errno));