ben 97/12/30 08:42:33
Modified: src ApacheCore.mak
src/ap ap_cpystrn.c
Log:
Make ap_cpystrn() work on Windoze.
Revision Changes Path
1.25 +40 -6 apachen/src/ApacheCore.mak
Index: ApacheCore.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/ApacheCore.mak,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ApacheCore.mak 1997/12/28 11:52:00 1.24
+++ ApacheCore.mak 1997/12/30 16:42:31 1.25
@@ -52,6 +52,7 @@
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\alloc.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\ap_cpystrn.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_strings.obj"
[EMAIL PROTECTED] "$(INTDIR)\buff.obj"
@@ -126,6 +127,7 @@
".\ApacheCore.def"
LINK32_OBJS= \
"$(INTDIR)\alloc.obj" \
+ "$(INTDIR)\ap_cpystrn.obj" \
"$(INTDIR)\ap_snprintf.obj" \
"$(INTDIR)\ap_strings.obj" \
"$(INTDIR)\buff.obj" \
@@ -197,6 +199,8 @@
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\alloc.obj"
[EMAIL PROTECTED] "$(INTDIR)\alloc.sbr"
+ [EMAIL PROTECTED] "$(INTDIR)\ap_cpystrn.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\ap_cpystrn.sbr"
[EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.sbr"
[EMAIL PROTECTED] "$(INTDIR)\ap_strings.obj"
@@ -307,6 +311,7 @@
BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheCore.bsc"
BSC32_SBRS= \
"$(INTDIR)\alloc.sbr" \
+ "$(INTDIR)\ap_cpystrn.sbr" \
"$(INTDIR)\ap_snprintf.sbr" \
"$(INTDIR)\ap_strings.sbr" \
"$(INTDIR)\buff.sbr" \
@@ -367,6 +372,7 @@
".\ApacheCore.def"
LINK32_OBJS= \
"$(INTDIR)\alloc.obj" \
+ "$(INTDIR)\ap_cpystrn.obj" \
"$(INTDIR)\ap_snprintf.obj" \
"$(INTDIR)\ap_strings.obj" \
"$(INTDIR)\buff.obj" \
@@ -493,6 +499,40 @@
!ENDIF
+SOURCE=.\ap\ap_cpystrn.c
+DEP_CPP_AP_CP=\
+ ".\main\alloc.h"\
+ ".\main\buff.h"\
+ ".\main\conf.h"\
+ ".\main\httpd.h"\
+ ".\os\win32\os.h"\
+ ".\os\win32\readdir.h"\
+ ".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_AP_CP=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
+
+
+!IF "$(CFG)" == "ApacheCore - Win32 Release"
+
+
+"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
+
+
+"$(INTDIR)\ap_cpystrn.obj" "$(INTDIR)\ap_cpystrn.sbr" : $(SOURCE)\
+ $(DEP_CPP_AP_CP) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\ap\ap_snprintf.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
@@ -534,12 +574,6 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_AP_ST=\
- ".\main\os.h"\
- ".\main\sfio.h"\
"$(INTDIR)\ap_strings.obj" : $(SOURCE) $(DEP_CPP_AP_ST) "$(INTDIR)"
1.2 +1 -1 apachen/src/ap/ap_cpystrn.c
Index: ap_cpystrn.c
===================================================================
RCS file: /export/home/cvs/apachen/src/ap/ap_cpystrn.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ap_cpystrn.c 1997/12/30 15:10:43 1.1
+++ ap_cpystrn.c 1997/12/30 16:42:32 1.2
@@ -66,7 +66,7 @@
* ap_cpystrn() follows the same call structure as strncpy().
*/
-char *ap_cpystrn(char *dst, const char *src, size_t dst_size)
+API_EXPORT(char *) ap_cpystrn(char *dst, const char *src, size_t dst_size)
{
char *d, *end;
