diff options
Diffstat (limited to 'file_io/unix/pipe.c')
| -rw-r--r-- | file_io/unix/pipe.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/file_io/unix/pipe.c b/file_io/unix/pipe.c index b68ac6542..6c603ec9a 100644 --- a/file_io/unix/pipe.c +++ b/file_io/unix/pipe.c @@ -45,7 +45,7 @@ static apr_status_t pipeblock(apr_file_t *thepipe) fd_flags &= ~O_NDELAY; # elif defined(O_FNDELAY) fd_flags &= ~O_FNDELAY; -# else +# else /* XXXX: this breaks things, but an alternative isn't obvious...*/ return APR_ENOTIMPL; # endif @@ -61,8 +61,8 @@ static apr_status_t pipeblock(apr_file_t *thepipe) } # else /* "classic" BeOS doesn't support this at all */ return APR_ENOTIMPL; -# endif - +# endif + #endif /* !BEOS_BLOCKING */ thepipe->blocking = BLK_ON; @@ -87,7 +87,7 @@ static apr_status_t pipenonblock(apr_file_t *thepipe) if (fcntl(thepipe->filedes, F_SETFL, fd_flags) == -1) { return errno; } - + #else /* BEOS_BLOCKING */ # if BEOS_BONE /* This only works on BONE 0-6 */ @@ -139,7 +139,7 @@ APR_DECLARE(apr_status_t) apr_os_pipe_put_ex(apr_file_t **file, apr_pool_t *pool) { int *dafile = thefile; - + (*file) = apr_pcalloc(pool, sizeof(apr_file_t)); (*file)->pool = pool; (*file)->eof_hit = 0; @@ -187,7 +187,7 @@ static apr_status_t file_pipe_create(apr_file_t **in, if (pipe(filedes) == -1) { return errno; } - + (*in) = (apr_file_t *)apr_pcalloc(pool_in, sizeof(apr_file_t)); (*in)->pool = pool_in; (*in)->filedes = filedes[0]; @@ -249,8 +249,8 @@ APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in, return file_pipe_create(in, out, APR_FULL_BLOCK, pool, pool); } -APR_DECLARE(apr_status_t) apr_file_pipe_create_ex(apr_file_t **in, - apr_file_t **out, +APR_DECLARE(apr_status_t) apr_file_pipe_create_ex(apr_file_t **in, + apr_file_t **out, apr_int32_t blocking, apr_pool_t *pool) { @@ -266,7 +266,7 @@ APR_DECLARE(apr_status_t) apr_file_pipe_create_pools(apr_file_t **in, return file_pipe_create(in, out, blocking, pool_in, pool_out); } -APR_DECLARE(apr_status_t) apr_file_namedpipe_create(const char *filename, +APR_DECLARE(apr_status_t) apr_file_namedpipe_create(const char *filename, apr_fileperms_t perm, apr_pool_t *pool) { mode_t mode = apr_unix_perms2mode(perm); @@ -275,7 +275,7 @@ APR_DECLARE(apr_status_t) apr_file_namedpipe_create(const char *filename, return errno; } return APR_SUCCESS; -} +} + - |