httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-apr/apr/file_io/unix readwrite.c Makefile open.c
Date Thu, 25 Feb 1999 19:58:42 GMT
rbb         99/02/25 11:58:42

  Modified:    apr/file_io/unix Makefile open.c
  Added:       apr/file_io/unix readwrite.c
  Log:
  Added readwrite file, for all reading and writing functions, and made
  minor changes to apr_close, so it works nicely with the rest of the file I/O
  functions.
  
  Revision  Changes    Path
  1.2       +3 -1      apache-apr/apr/file_io/unix/Makefile
  
  Index: Makefile
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/file_io/unix/Makefile,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile	1999/02/25 16:33:19	1.1
  +++ Makefile	1999/02/25 19:58:41	1.2
  @@ -47,7 +47,7 @@
   
   LIB=  libfile.a
   
  -OBJS= open.o \
  +OBJS= open.o readwrite.o\
   
   .c.o:
   	$(CC) -c $(INCLUDES) $(CFLAGS) $<
  @@ -83,3 +83,5 @@
   
   # DO NOT REMOVE
   alloc.o: open.c 
  +readwrite.o: readwrite.c
  +
  
  
  
  1.8       +3 -3      apache-apr/apr/file_io/unix/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/file_io/unix/open.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- open.c	1999/02/25 16:36:37	1.7
  +++ open.c	1999/02/25 19:58:41	1.8
  @@ -133,10 +133,10 @@
       }
   }
   
  -apr_status_t apr_close(apr_file_t file)
  +apr_status_t apr_close(apr_file_t *file)
   {
  -    if (close(file.filedes) == 0) {
  -        file.filedes = -1;
  +    if (close(file->filedes) == 0) {
  +        file->filedes = -1;
           return APR_SUCCESS;
       }
       else {
  
  
  
  1.1                  apache-apr/apr/file_io/unix/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  /* ====================================================================
   * Copyright (c) 1999 The Apache Group.  All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer. 
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. All advertising materials mentioning features or use of this
   *    software must display the following acknowledgment:
   *    "This product includes software developed by the Apache Group
   *    for use in the Apache HTTP server project (http://www.apache.org/)."
   *
   * 4. The names "Apache Server" and "Apache Group" must not be used to
   *    endorse or promote products derived from this software without
   *    prior written permission. For written permission, please contact
   *    apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * 6. Redistributions of any form whatsoever must retain the following
   *    acknowledgment:
   *    "This product includes software developed by the Apache Group
   *    for use in the Apache HTTP server project (http://www.apache.org/)."
   *
   * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
   * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
   * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
   * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
   * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
   * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
   * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
   * OF THE POSSIBILITY OF SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Group.
   * For more information on the Apache Group and the Apache HTTP server
   * project, please see <http://www.apache.org/>.
   *
   */
  
  #include "apr_file_io.h"
  #include "apr_general.h"
  #include "apr_errno.h"
  #include <errno.h>
  #include <unistd.h>
  
  apr_uint64_t apr_read(apr_file_t *thefile, void *buf, apr_uint64_t nbytes)
  {
      apr_int64_t rv;
  
      if (thefile->filedes < 0) {
          errno = EBADF;
          return -1;
      }
  
      rv = read(thefile->filedes, buf, nbytes);
  
      return rv;
  }
  
  apr_uint64_t apr_write(apr_file_t *thefile, void * buf, apr_uint64_t nbytes)
  {
      apr_int64_t rv;
      struct stat info;
  
      if (thefile->filedes < 0) {
          errno = EBADF;
          return -1;
      }
  
      rv = write(thefile->filedes, buf, nbytes);
  
      if (stat(thefile->fname, &info) == 0) {
          thefile->size = info.st_size;
          thefile->atime = info.st_atime;
          thefile->mtime = info.st_mtime;
          thefile->ctime = info.st_ctime;
      }
      return rv;
  }
  
  
  

Mime
View raw message