# HG changeset patch # User Steven Tamm # Date 1039543429 0 # Node ID da833584a044a379f06187e67198b69735bfb88c # Parent a3c07e71f333ce698d3e2d89823782659e3c50ff Modifying sys_read to not check the event queue if timeout=0 and to never use a timeout larger than the one passed in. diff -r a3c07e71f333 -r da833584a044 src/mac.c --- a/src/mac.c Tue Dec 10 17:58:24 2002 +0000 +++ b/src/mac.c Tue Dec 10 18:03:49 2002 +0000 @@ -2769,7 +2769,9 @@ { if (!inhibit_window_system && rfds && FD_ISSET (0, rfds)) return 1; - else if (inhibit_window_system || noninteractive) + else if (inhibit_window_system || noninteractive || + (timeout && (EMACS_SECS(*timeout)==0) && + (EMACS_USECS(*timeout)==0))) return select(n, rfds, wfds, efds, timeout); else { @@ -2787,6 +2789,9 @@ EMACS_SET_SECS (one_second, 1); EMACS_SET_USECS (one_second, 0); + if (timeout && EMACS_TIME_LT(*timeout, one_second)) + one_second = *timeout; + if ((r = select (n, rfds, wfds, efds, &one_second)) > 0) return r;