initialize errno and don't report an error when poll() returns without indicating...

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

diff --git a/channel.c b/channel.c
index d08bc42..5192811 100755 (executable)
--- a/channel.c
+++ b/channel.c
@@ -1251,9 +1251,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) {
                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)) { 
                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;
                                continue;
                        ast_log(LOG_WARNING, "Wait failed (%s)\n", strerror(errno));
                        return -1;