You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by dr...@apache.org on 2001/12/14 02:12:25 UTC
cvs commit: apr/threadproc/beos proc.c
dreid 01/12/13 17:12:25
Modified: threadproc/beos proc.c
Log:
This gets pipe timeouts/blocking/non-blocking working correctly on
BeOS. Small piece of tidying up as well.
Revision Changes Path
1.43 +18 -15 apr/threadproc/beos/proc.c
Index: proc.c
===================================================================
RCS file: /home/cvs/apr/threadproc/beos/proc.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- proc.c 2001/10/28 13:46:15 1.42
+++ proc.c 2001/12/14 01:12:25 1.43
@@ -93,16 +93,17 @@
}
switch (in) {
case APR_FULL_BLOCK:
+ apr_file_pipe_timeout_set(attr->child_in, -1);
+ apr_file_pipe_timeout_set(attr->parent_in, -1);
break;
case APR_PARENT_BLOCK:
- apr_file_pipe_timeout_set(attr->child_in, 0);
+ apr_file_pipe_timeout_set(attr->child_in, -1);
break;
case APR_CHILD_BLOCK:
- apr_file_pipe_timeout_set(attr->parent_in, 0);
+ apr_file_pipe_timeout_set(attr->parent_in, -1);
break;
default:
- apr_file_pipe_timeout_set(attr->child_in, 0);
- apr_file_pipe_timeout_set(attr->parent_in, 0);
+ break;
}
}
if (out) {
@@ -112,16 +113,17 @@
}
switch (out) {
case APR_FULL_BLOCK:
+ apr_file_pipe_timeout_set(attr->child_out, -1);
+ apr_file_pipe_timeout_set(attr->parent_out, -1);
break;
case APR_PARENT_BLOCK:
- apr_file_pipe_timeout_set(attr->child_out, 0);
+ apr_file_pipe_timeout_set(attr->child_out, -1);
break;
case APR_CHILD_BLOCK:
- apr_file_pipe_timeout_set(attr->parent_out, 0);
+ apr_file_pipe_timeout_set(attr->parent_out, -1);
break;
default:
- apr_file_pipe_timeout_set(attr->child_out, 0);
- apr_file_pipe_timeout_set(attr->parent_out, 0);
+ break;
}
}
if (err) {
@@ -131,16 +133,17 @@
}
switch (err) {
case APR_FULL_BLOCK:
+ apr_file_pipe_timeout_set(attr->child_err, -1);
+ apr_file_pipe_timeout_set(attr->parent_err, -1);
break;
case APR_PARENT_BLOCK:
- apr_file_pipe_timeout_set(attr->child_err, 0);
+ apr_file_pipe_timeout_set(attr->child_err, -1);
break;
case APR_CHILD_BLOCK:
- apr_file_pipe_timeout_set(attr->parent_err, 0);
+ apr_file_pipe_timeout_set(attr->parent_err, -1);
break;
default:
- apr_file_pipe_timeout_set(attr->child_err, 0);
- apr_file_pipe_timeout_set(attr->parent_err, 0);
+ break;
}
}
return APR_SUCCESS;
@@ -217,9 +220,9 @@
new->in = attr->parent_in;
new->err = attr->parent_err;
new->out = attr->parent_out;
- sp->in = attr->child_in?attr->child_in->filedes:-1;
- sp->out = attr->child_out?attr->child_out->filedes:-1;
- sp->err = attr->child_err?attr->child_err->filedes:-1;
+ sp->in = attr->child_in ? attr->child_in->filedes : -1;
+ sp->out = attr->child_out ? attr->child_out->filedes : -1;
+ sp->err = attr->child_err ? attr->child_err->filedes : -1;
i = 0;
while (args && args[i]) {