aboutsummaryrefslogtreecommitdiffstats
path: root/funcs
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-09-30 20:23:10 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-09-30 20:23:10 +0000
commitdbe3ccd213efadb238a1f48f8b04c53b5505ff33 (patch)
tree708423feef3fbce49166f59a5854ff581a3e8cca /funcs
parent475318a8c41206ff8267e8af5cf747707edabfdf (diff)
Solaris fixes.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@289581 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs')
-rw-r--r--funcs/func_env.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/funcs/func_env.c b/funcs/func_env.c
index 6a3642a44..736095290 100644
--- a/funcs/func_env.c
+++ b/funcs/func_env.c
@@ -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))) {