You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@locus.apache.org on 2000/05/17 18:45:48 UTC
cvs commit: apache-2.0/src/lib/apr/file_io/unix fileacc.c
rbb 00/05/17 09:45:45
Modified: src/lib/apr/file_io/os2 Makefile.in
src/lib/apr/file_io/unix fileacc.c
Added: src/lib/apr/file_io/os2 common.c
Removed: src/lib/apr/file_io/os2 fileacc.c
Log:
Combine the Unix and OS/2 fileacc.c code. They are basically the same, and
with two well placed ifdefs, they are the same.
Revision Changes Path
1.12 +1 -1 apache-2.0/src/lib/apr/file_io/os2/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.in 2000/04/30 17:58:26 1.11
+++ Makefile.in 2000/05/17 16:45:42 1.12
@@ -15,7 +15,7 @@
LIB=file.a
OBJS=dir.o \
- fileacc.o \
+ common.o \
filedup.o \
filestat.o \
open.o \
1.1 apache-2.0/src/lib/apr/file_io/os2/common.c
Index: common.c
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000 The Apache Software Foundation. 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. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" 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 name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``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 SOFTWARE FOUNDATION 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 Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
#include "../unix/fileacc.c"
1.25 +13 -1 apache-2.0/src/lib/apr/file_io/unix/fileacc.c
Index: fileacc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/fileacc.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- fileacc.c 2000/04/21 14:51:22 1.24
+++ fileacc.c 2000/05/17 16:45:45 1.25
@@ -52,8 +52,17 @@
* <http://www.apache.org/>.
*/
+#ifdef OS2
+#include "../os2/fileio.h"
+#include "apr_file_io.h"
+#include "apr_general.h"
+#include "apr_lib.h"
+#include <errno.h>
+#include <string.h>
+#include <sys/types.h>
+#else
#include "fileio.h"
-
+#endif
/* A file to put ALL of the accessor functions for ap_file_t types. */
ap_status_t ap_get_filename(char **new, ap_file_t *thefile)
@@ -68,6 +77,7 @@
}
}
+#ifndef (OS2)
mode_t ap_unix_get_fileperms(ap_fileperms_t mode)
{
mode_t rv = 0;
@@ -95,6 +105,7 @@
return rv;
}
+#endif
ap_status_t ap_get_filedata(void **data, char *key, ap_file_t *file)
{
@@ -114,6 +125,7 @@
return ap_set_userdata(data, key, cleanup, file->cntxt);
}
else {
+ *data = NULL;
return APR_ENOFILE;
}
}