Solaris fixes.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@289581 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/funcs/func_env.c b/funcs/func_env.c
index 6a3642a44ea550d43bb0f8af3c9c79a8fbc67326..736095290d9c386ee459a13ed9a1340d9005588b 100644 (file)
--- 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))) {