static FILE *Tinputfile;
static int stdout_enable;
+static void Tflushstdout( void) {
+ if (fflush(stdout)) Toutputerr();
+}
+
void Q_vb(void) {
if (!adns__vbuf_append(&vb,"",1)) Tnomem();
if (fprintf(stdout," %s\n",vb.buf) == EOF) Toutputerr();
- if (fflush(stdout)) Toutputerr();
+ Tflushstdout();
}
static void Pformat(const char *what) {
return l;
}
-static void Pfdset(fd_set *set, int max) {
+static void Pfdset(fd_set *set, int max, int *r_io) {
uint16_t got;
int fd, ngot=0;
P_READ(got);
ngot= 16;
}
- if (!(got & 1u)) {
+ if (got & 1u) {
+ (*r_io)++;
+ } else {
FD_CLR(fd,set);
}
got >>= 1;
}
#ifdef HAVE_POLL
-static void Ppollfds(struct pollfd *fds, int nfds) {
-int fd;
+static void Ppollfds(struct pollfd *fds, int nfds, int *r_io) {
+ int fd;
for (fd=0; fd<nfds; fd++) {
if (!fds[fd].events) continue;
P_fdf(fd);
P_READ(fds[fd].revents);
+ if (fds[fd].revents)
+ (*r_io)++;
}
}
#endif
hm_create_proto_h
int H$1(hm_args_massage($3,void)) {
int r;
- m4_define(`hm_rv_fd',`')
- m4_define(`hm_rv_any',`')
- m4_define(`hm_rv_len',`')
- m4_define(`hm_rv_must',`')
- m4_define(`hm_rv_succfail',`')
- m4_define(`hm_rv_fcntl',`')
+ hm_create_nothing
$2
hm_create_hqcall_vars
m4_define(`hm_rv_must',`
r= 0;
')
+ m4_define(`hm_rv_select',`hm_rv_succfail')
+ m4_define(`hm_rv_poll',`hm_rv_succfail')
m4_define(`hm_rv_fcntl',`
unsigned flg = P_fdf(fd);
if (cmd == F_GETFL) {
$2
hm_create_nothing
- m4_define(`hm_arg_fdset_io',`Pfdset($'`1,$'`2);')
- m4_define(`hm_arg_pollfds_io',`Ppollfds($'`1,$'`2);')
+ m4_define(`hm_arg_fdset_io',`Pfdset($'`1,$'`2,&r);')
+ m4_define(`hm_arg_pollfds_io',`Ppollfds($'`1,$'`2,&r);')
m4_define(`hm_arg_addr_out',`Paddr($'`1,$'`2);')
$3
m4_define(`hm_arg_bytes_out',`r= Pbytes($'`2,$'`4);')
$3
+ hm_create_nothing
+ m4_define(`hm_rv_selectpoll',`
+ if (($'`1) && !r) Pformat("select/poll returning 0 but infinite timeout");
+ ')
+ m4_define(`hm_rv_select',`hm_rv_selectpoll(!to)')
+ m4_define(`hm_rv_poll',`hm_rv_selectpoll(timeout<0)')
+ $2
+
return r;
}
')