diff options
Diffstat (limited to 'file_io/unix/filedup.c')
| -rw-r--r-- | file_io/unix/filedup.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/file_io/unix/filedup.c b/file_io/unix/filedup.c index a8e14acfb..d1c668f79 100644 --- a/file_io/unix/filedup.c +++ b/file_io/unix/filedup.c @@ -22,7 +22,7 @@ #include <assert.h> -static apr_status_t file_dup(apr_file_t **new_file, +static apr_status_t file_dup(apr_file_t **new_file, apr_file_t *old_file, apr_pool_t *p, int which_dup) { @@ -32,7 +32,7 @@ static apr_status_t file_dup(apr_file_t **new_file, #endif assert(which_dup == 1 || which_dup == 2); - + if (which_dup == 2) { if ((*new_file) == NULL) { /* We can't dup2 unless we have a valid new_file */ @@ -65,7 +65,7 @@ static apr_status_t file_dup(apr_file_t **new_file, if (rv == -1) return errno; - + if (which_dup == 1) { (*new_file) = (apr_file_t *)apr_pcalloc(p, sizeof(apr_file_t)); (*new_file)->pool = p; @@ -94,7 +94,7 @@ static apr_status_t file_dup(apr_file_t **new_file, } /* this is the way dup() works */ - (*new_file)->blocking = old_file->blocking; + (*new_file)->blocking = old_file->blocking; /* make sure unget behavior is consistent */ (*new_file)->ungetchar = old_file->ungetchar; @@ -110,8 +110,8 @@ static apr_status_t file_dup(apr_file_t **new_file, (*new_file)->rotating->manual = old_file->rotating->manual; } - /* apr_file_dup2() retains the original cleanup, reflecting - * the existing inherit and nocleanup flags. This means, + /* apr_file_dup2() retains the original cleanup, reflecting + * the existing inherit and nocleanup flags. This means, * that apr_file_dup2() cannot be called against an apr_file_t * already closed with apr_file_close, because the expected * cleanup was already killed. @@ -122,14 +122,14 @@ static apr_status_t file_dup(apr_file_t **new_file, /* apr_file_dup() retains all old_file flags with the exceptions * of APR_INHERIT and APR_FOPEN_NOCLEANUP. - * The user must call apr_file_inherit_set() on the dupped + * The user must call apr_file_inherit_set() on the dupped * apr_file_t when desired. */ (*new_file)->flags = old_file->flags & ~(APR_INHERIT | APR_FOPEN_NOCLEANUP); apr_pool_cleanup_register((*new_file)->pool, (void *)(*new_file), - apr_unix_file_cleanup, + apr_unix_file_cleanup, apr_unix_child_file_cleanup); #ifndef WAITIO_USES_POLL /* Start out with no pollset. apr_wait_for_io_or_timeout() will @@ -181,7 +181,7 @@ APR_DECLARE(apr_status_t) apr_file_setaside(apr_file_t **new_file, if (!(old_file->flags & APR_FOPEN_NOCLEANUP)) { apr_pool_cleanup_kill(old_file->pool, (void *)old_file, apr_unix_file_cleanup); - apr_pool_cleanup_register(p, (void *)(*new_file), + apr_pool_cleanup_register(p, (void *)(*new_file), apr_unix_file_cleanup, ((*new_file)->flags & APR_INHERIT) ? apr_pool_cleanup_null |