automerge commit

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

diff --git a/asterisk.c b/asterisk.c
index 111dcf53d2270c8ffc087ee33b3d3dea40edb0c7..83c7ed2c2b09cf837ac1b906e2478ef27284da5f 100644 (file)
--- a/asterisk.c
+++ b/asterisk.c
@@ -1816,6 +1816,9 @@ static void ast_remotecontrol(char * data)
        for(;;) {
                ebuf = (char *)el_gets(el, &num);
 
+               if (!ebuf)
+                       break;
+
                if (!ast_strlen_zero(ebuf)) {
                        if (ebuf[strlen(ebuf)-1] == '\n')
                                ebuf[strlen(ebuf)-1] = '\0';
@@ -2457,12 +2460,15 @@ int main(int argc, char *argv[])
 
                for (;;) {
                        buf = (char *)el_gets(el, &num);
-                       if (buf) {
-                               if (buf[strlen(buf)-1] == '\n')
-                                       buf[strlen(buf)-1] = '\0';
 
-                               consolehandler((char *)buf);
-                       } else if (option_remote) {
+                       if (!buf)
+                               break;
+
+                       if (buf[strlen(buf)-1] == '\n')
+                               buf[strlen(buf)-1] = '\0';
+
+                       consolehandler((char *)buf);
+                       if (!buf && option_remote) {
                                if (write(STDOUT_FILENO, "\nUse EXIT or QUIT to exit the asterisk console\n",
                                          strlen("\nUse EXIT or QUIT to exit the asterisk console\n")) < 0) {
                                        /* Whoa, stdout disappeared from under us... Make /dev/null's */

diff --git a/file.c b/file.c
index 15734ecd2e573ab9d20341667ef98f8087f32046..9139b03c833758bb1ab8618529c2a4731c728421 100644 (file)
--- a/file.c
+++ b/file.c
@@ -816,10 +816,9 @@ int ast_streamfile(struct ast_channel *chan, const char *filename, const char *p
                        return -1;
                if (vfs && ast_applystream(chan, vfs))
                        return -1;
-               if (ast_playstream(fs))
-                       return -1;
-               if (vfs && ast_playstream(vfs))
-                       return -1;
+               ast_playstream(fs);
+               if (vfs)
+                       ast_playstream(vfs);
 #if 1
                if (option_verbose > 2)
                        ast_verbose(VERBOSE_PREFIX_3 "Playing '%s' (language '%s')\n", filename, preflang ? preflang : "default");

diff --git a/res/res_agi.c b/res/res_agi.c
index 22a5c29d83439443a1b64d9915563407ed1e5fb7..4d5ede388d993366451270b12ef0c16ba44b7d34 100644 (file)
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -569,14 +569,7 @@ static int handle_streamfile(struct ast_channel *chan, AGI *agi, int argc, char
        max_length = ast_tellstream(fs);
        ast_seekstream(fs, sample_offset, SEEK_SET);
        res = ast_applystream(chan, fs);
-       res = ast_playstream(fs);
-       if (res) {
-               fdprintf(agi->fd, "200 result=%d endpos=%ld\n", res, sample_offset);
-               if (res >= 0)
-                       return RESULT_SHOWUSAGE;
-               else
-                       return RESULT_FAILURE;
-       }
+       ast_playstream(fs);
        res = ast_waitstream_full(chan, argv[3], agi->audio, agi->ctrl);
        /* this is to check for if ast_waitstream closed the stream, we probably are at
         * the end of the stream, return that amount, else check for the amount */
@@ -629,14 +622,7 @@ static int handle_getoption(struct ast_channel *chan, AGI *agi, int argc, char *
         max_length = ast_tellstream(fs);
         ast_seekstream(fs, sample_offset, SEEK_SET);
         res = ast_applystream(chan, fs);
-        res = ast_playstream(fs);
-        if (res) {
-                fdprintf(agi->fd, "200 result=%d endpos=%ld\n", res, sample_offset);
-                if (res >= 0)
-                        return RESULT_SHOWUSAGE;
-                else
-                        return RESULT_FAILURE;
-        }
+        ast_playstream(fs);
         res = ast_waitstream_full(chan, argv[3], agi->audio, agi->ctrl);
         /* this is to check for if ast_waitstream closed the stream, we probably are at
          * the end of the stream, return that amount, else check for the amount */