comparison src/process.c @ 95387:be7d86474ead

(Faccept_process_output): If `millisec' is non-nil, `seconds' default to 0. (wait_reading_process_output): Also return non-nil if we read output from a non-running process.

95386:9d7e990b655a

Non-nil second arg SECONDS and third arg MILLISEC are number of
seconds and milliseconds to wait; return after that much time whether
or not there is input.  If SECONDS is a floating point number,
it specifies a fractional number of seconds to wait.

If optional fourth arg JUST-THIS-ONE is non-nil, only accept output
from PROCESS, suspending reading output from other processes.
If JUST-THIS-ONE is an integer, don't run any timers either.
Return non-nil if we received any output before the timeout expired.  */)

  if (! NILP (process))
    CHECK_PROCESS (process);
  else
    just_this_one = Qnil;

  if (!NILP (seconds))
    {
      if (INTEGERP (seconds))
	secs = XINT (seconds);
      else if (FLOATP (seconds))

	  secs = (int) timeout;
	  usecs = (int) ((timeout - (double) secs) * 1000000);
	}
      else
	wrong_type_argument (Qnumberp, seconds);

      if (INTEGERP (millisec))
	{
	  int carry;
	  usecs += XINT (millisec) * 1000;
	  carry = usecs / 1000000;
	  secs += carry;
	  if ((usecs -= carry * 1000000) < 0)
	    {
	      secs--;
	      usecs += 1000000;
	    }
	}

      if (secs < 0 || (secs == 0 && usecs == 0))
	secs = -1, usecs = 0;
    }
  else

	      if (nread == 0)
		break;

              if (0 < nread)
                total_nread += nread;
#ifdef EIO
	      else if (nread == -1 && EIO == errno)
                break;
#endif
#ifdef EAGAIN

95387:be7d86474ead

Non-nil second arg SECONDS and third arg MILLISEC are number of
seconds and milliseconds to wait; return after that much time whether
or not there is input.  If SECONDS is a floating point number,
it specifies a fractional number of seconds to wait.
The MILLISEC argument is obsolete and should be avoided.

If optional fourth arg JUST-THIS-ONE is non-nil, only accept output
from PROCESS, suspending reading output from other processes.
If JUST-THIS-ONE is an integer, don't run any timers either.
Return non-nil if we received any output before the timeout expired.  */)

  if (! NILP (process))
    CHECK_PROCESS (process);
  else
    just_this_one = Qnil;

  if (!NILP (millisec))
    { /* Obsolete calling convention using integers rather than floats.  */
      CHECK_NUMBER (millisec);
      if (NILP (seconds))
	seconds = make_float (XINT (millisec) / 1000.0);
      else
	{
	  CHECK_NUMBER (seconds);
	  seconds = make_float (XINT (millisec) / 1000.0 + XINT (seconds));
	}
    }

  if (!NILP (seconds))
    {
      if (INTEGERP (seconds))
	secs = XINT (seconds);
      else if (FLOATP (seconds))

	  secs = (int) timeout;
	  usecs = (int) ((timeout - (double) secs) * 1000000);
	}
      else
	wrong_type_argument (Qnumberp, seconds);

      if (secs < 0 || (secs == 0 && usecs == 0))
	secs = -1, usecs = 0;
    }
  else

	      if (nread == 0)
		break;

              if (0 < nread)
                {
		  total_nread += nread;
		  got_some_input = 1;
		}
#ifdef EIO
	      else if (nread == -1 && EIO == errno)
                break;
#endif
#ifdef EAGAIN