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

Merged revisions 289543,289581 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r289543 | tilghman | 2010-09-30 12:50:52 -0500 (Thu, 30 Sep 2010) | 2 lines
  
  More Solaris compatibility fixes
........
  r289581 | tilghman | 2010-09-30 15:23:10 -0500 (Thu, 30 Sep 2010) | 2 lines
  
  Solaris fixes.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@289588 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-09-30 20:40:08 +00:00
parent 72fbcfd95d
commit 6d0e383321
6 changed files with 67 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
funcs/func_env.c
View File

@@ -788,7 +788,7 @@ static int file_write(struct ast_channel *chan, const char *cmd, char *data, con
fseeko(ff, offset, SEEK_SET);
ast_debug(3, "offset=%s/%" PRId64 ", length=%s/%" PRId64 ", vlength=%" PRId64 ", flength=%" PRId64 "\n",
args.offset, offset, args.length, length, vlength, flength);
S_OR(args.offset, "(null)"), offset, S_OR(args.length, "(null)"), length, vlength, flength);
if (length == vlength) {
/* Simplest case, a straight replace */
@@ -821,6 +821,11 @@ static int file_write(struct ast_channel *chan, const char *cmd, char *data, con
if (fwrite(fbuf, 1, sizeof(fbuf), ff) < sizeof(fbuf)) {
ast_log(LOG_ERROR, "Short write?!!\n");
}
/* Seek to where we stopped reading */
if (fseeko(ff, cur + sizeof(fbuf), SEEK_SET) < 0) {
/* Only reason for seek to fail is EOF */
break;
}
}
fclose(ff);
if (truncate(args.filename, flength - (length - vlength))) {