]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
initialize errno and don't report an error when poll() returns without indicating...
authorRussell Bryant <russell@russellbryant.com>
Thu, 12 May 2005 02:42:48 +0000 (02:42 +0000)
committerRussell Bryant <russell@russellbryant.com>
Thu, 12 May 2005 02:42:48 +0000 (02:42 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@5635 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channel.c

index 92d9e31b5a3c11b42a9087018b10233f31b10410..f88dcf73b316d93d1b209c6219a73a8faa8fdba5 100755 (executable)
--- a/channel.c
+++ b/channel.c
@@ -1144,9 +1144,10 @@ char ast_waitfordigit_full(struct ast_channel *c, int ms, int audiofd, int cmdfd
                return -1;
        /* Wait for a digit, no more than ms milliseconds total. */
        while(ms) {
+               errno = 0;
                rchan = ast_waitfor_nandfds(&c, 1, &cmdfd, (cmdfd > -1) ? 1 : 0, NULL, &outfd, &ms);
                if ((!rchan) && (outfd < 0) && (ms)) { 
-                       if (errno == EINTR)
+                       if (errno == 0 || errno == EINTR)
                                continue;
                        ast_log(LOG_WARNING, "Wait failed (%s)\n", strerror(errno));
                        return -1;