Date: 19 Dec 1999 08:00:33 -0000
Message-ID: <19991219080033.10821.qmail@hyperreal.org>
From: bjh@hyperreal.org
To: apache-2.0-cvs@apache.org
Subject: cvs commit: apache-2.0/src/lib/apr/file_io/os2 filedup.c
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

bjh         99/12/19 00:00:32

  Modified:    src/lib/apr/file_io/os2 filedup.c
  Log:
  OS/2: Let the user supply two file descriptors to ap_dupfile to make
  them equivalent.
  
  Revision  Changes    Path
  1.4       +24 -13    apache-2.0/src/lib/apr/file_io/os2/filedup.c
  
  Index: filedup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/filedup.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- filedup.c	1999/10/12 06:14:40	1.3
  +++ filedup.c	1999/12/19 08:00:28	1.4
  @@ -64,26 +64,37 @@
   ap_status_t ap_dupfile(struct file_t **new_file, struct file_t *old_file)
   {
       int rv;
  -    struct file_t *dup_file = (struct file_t *)ap_palloc(old_file->cntxt, sizeof(struct file_t));
  -    
  -    if (new_file == NULL) {
  -        return APR_ENOMEM;
  -    } 
  -    
  -    dup_file->filedes = -1;
  +    struct file_t *dup_file;
  +
  +    if (*new_file == NULL) {
  +        dup_file = (struct file_t *)ap_palloc(old_file->cntxt, sizeof(struct file_t));
  +
  +        if (dup_file == NULL) {
  +            return APR_ENOMEM;
  +        }
  +
  +        dup_file->filedes = -1;
  +        dup_file->cntxt = old_file->cntxt;
  +    } else {
  +      dup_file = *new_file;
  +    }
  +
       rv = DosDupHandle(old_file->filedes, &dup_file->filedes);
  -    
  +
       if (rv) {
           return os2errno(rv);
       }
  -    
  -    dup_file->cntxt = old_file->cntxt;
  +
       dup_file->fname = ap_pstrdup(dup_file->cntxt, old_file->fname);
       dup_file->buffered = old_file->buffered;
       dup_file->status = old_file->status;
       dup_file->isopen = old_file->isopen;
  -    *new_file = dup_file;
  -    ap_register_cleanup(dup_file->cntxt, dup_file, file_cleanup,
  -                        ap_null_cleanup);
  +
  +    if (*new_file == NULL) {
  +        ap_register_cleanup(dup_file->cntxt, dup_file, file_cleanup,
  +                            ap_null_cleanup);
  +        *new_file = dup_file;
  +    }
  +
       return APR_SUCCESS;
   }