ben 97/12/28 03:52:04
Modified: src ApacheCore.mak
src/ap ap_strings.c
src/main httpd.h
Log:
Sort out ap_strings for Win32.
Revision Changes Path
1.24 +237 -1 apachen/src/ApacheCore.mak
Index: ApacheCore.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/ApacheCore.mak,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ApacheCore.mak 1997/12/27 15:07:17 1.23
+++ ApacheCore.mak 1997/12/28 11:52:00 1.24
@@ -53,6 +53,7 @@
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\alloc.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\ap_strings.obj"
[EMAIL PROTECTED] "$(INTDIR)\buff.obj"
[EMAIL PROTECTED] "$(INTDIR)\buildmark.obj"
[EMAIL PROTECTED] "$(INTDIR)\explain.obj"
@@ -100,6 +101,7 @@
[EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.dll"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.exp"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.lib"
+ [EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.pdb"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -118,13 +120,14 @@
LINK32_FLAGS=os\win32\ApacheOSR\ApacheOS.lib regex\release\regex.lib\
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib\
shell32.lib wsock32.lib /nologo /subsystem:windows /dll /incremental:no\
- /pdb:"$(OUTDIR)\ApacheCore.pdb" /machine:I386 /def:".\ApacheCore.def"\
+ /pdb:"$(OUTDIR)\ApacheCore.pdb" /debug /machine:I386
/def:".\ApacheCore.def"\
/out:"$(OUTDIR)\ApacheCore.dll" /implib:"$(OUTDIR)\ApacheCore.lib"
DEF_FILE= \
".\ApacheCore.def"
LINK32_OBJS= \
"$(INTDIR)\alloc.obj" \
"$(INTDIR)\ap_snprintf.obj" \
+ "$(INTDIR)\ap_strings.obj" \
"$(INTDIR)\buff.obj" \
"$(INTDIR)\buildmark.obj" \
"$(INTDIR)\explain.obj" \
@@ -196,6 +199,8 @@
[EMAIL PROTECTED] "$(INTDIR)\alloc.sbr"
[EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.sbr"
+ [EMAIL PROTECTED] "$(INTDIR)\ap_strings.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\ap_strings.sbr"
[EMAIL PROTECTED] "$(INTDIR)\buff.obj"
[EMAIL PROTECTED] "$(INTDIR)\buff.sbr"
[EMAIL PROTECTED] "$(INTDIR)\buildmark.obj"
@@ -303,6 +308,7 @@
BSC32_SBRS= \
"$(INTDIR)\alloc.sbr" \
"$(INTDIR)\ap_snprintf.sbr" \
+ "$(INTDIR)\ap_strings.sbr" \
"$(INTDIR)\buff.sbr" \
"$(INTDIR)\buildmark.sbr" \
"$(INTDIR)\explain.sbr" \
@@ -362,6 +368,7 @@
LINK32_OBJS= \
"$(INTDIR)\alloc.obj" \
"$(INTDIR)\ap_snprintf.obj" \
+ "$(INTDIR)\ap_strings.obj" \
"$(INTDIR)\buff.obj" \
"$(INTDIR)\buildmark.obj" \
"$(INTDIR)\explain.obj" \
@@ -515,6 +522,39 @@
!ENDIF
+SOURCE=.\ap\ap_strings.c
+
+!IF "$(CFG)" == "ApacheCore - Win32 Release"
+
+DEP_CPP_AP_ST=\
+ ".\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_ST=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
+
+
+"$(INTDIR)\ap_strings.obj" : $(SOURCE) $(DEP_CPP_AP_ST) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
+
+
+"$(INTDIR)\ap_strings.obj" "$(INTDIR)\ap_strings.sbr" : $(SOURCE)
"$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\main\buff.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
@@ -602,6 +642,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_EXPLA=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\explain.obj" "$(INTDIR)\explain.sbr" : $(SOURCE)
$(DEP_CPP_EXPLA)\
@@ -679,6 +725,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_HTTP_=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\http_bprintf.obj" "$(INTDIR)\http_bprintf.sbr" : $(SOURCE)\
@@ -730,6 +782,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_HTTP_C=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\http_config.obj" "$(INTDIR)\http_config.sbr" : $(SOURCE)\
@@ -793,6 +851,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_HTTP_CO=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\http_core.obj" "$(INTDIR)\http_core.sbr" : $(SOURCE)\
@@ -838,6 +902,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_HTTP_L=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\http_log.obj" "$(INTDIR)\http_log.sbr" : $(SOURCE)
$(DEP_CPP_HTTP_L)\
@@ -901,6 +971,12 @@
".\os\win32\readdir.h"\
".\os\win32\service.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_HTTP_M=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\http_main.obj" "$(INTDIR)\http_main.sbr" : $(SOURCE)\
@@ -956,6 +1032,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_HTTP_P=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\http_protocol.obj" "$(INTDIR)\http_protocol.sbr" :
$(SOURCE)\
@@ -1009,6 +1091,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_HTTP_R=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\http_request.obj" "$(INTDIR)\http_request.sbr" : $(SOURCE)\
@@ -1056,6 +1144,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_HTTP_V=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\http_vhost.obj" "$(INTDIR)\http_vhost.sbr" : $(SOURCE)\
@@ -1132,6 +1226,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_A=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\mod_access.obj" "$(INTDIR)\mod_access.sbr" : $(SOURCE)\
@@ -1183,6 +1283,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_AC=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\mod_actions.obj" "$(INTDIR)\mod_actions.sbr" : $(SOURCE)\
@@ -1222,6 +1328,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_AL=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\mod_alias.obj" "$(INTDIR)\mod_alias.sbr" : $(SOURCE)\
@@ -1271,6 +1383,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_AS=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\mod_asis.obj" "$(INTDIR)\mod_asis.sbr" : $(SOURCE)
$(DEP_CPP_MOD_AS)\
@@ -1316,6 +1434,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_AU=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\mod_auth.obj" "$(INTDIR)\mod_auth.sbr" : $(SOURCE)
$(DEP_CPP_MOD_AU)\
@@ -1367,6 +1491,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_AUT=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\mod_autoindex.obj" "$(INTDIR)\mod_autoindex.sbr" :
$(SOURCE)\
@@ -1420,6 +1550,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_C=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\mod_cgi.obj" "$(INTDIR)\mod_cgi.sbr" : $(SOURCE)
$(DEP_CPP_MOD_C)\
@@ -1471,6 +1607,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_D=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\mod_dir.obj" "$(INTDIR)\mod_dir.sbr" : $(SOURCE)
$(DEP_CPP_MOD_D)\
@@ -1510,6 +1652,11 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_DL=\
+ ".\main\sfio.h"\
"$(INTDIR)\mod_dll.obj" "$(INTDIR)\mod_dll.sbr" : $(SOURCE)
$(DEP_CPP_MOD_DL)\
@@ -1549,6 +1696,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_E=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\mod_env.obj" "$(INTDIR)\mod_env.sbr" : $(SOURCE)
$(DEP_CPP_MOD_E)\
@@ -1600,6 +1753,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_I=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\mod_imap.obj" "$(INTDIR)\mod_imap.sbr" : $(SOURCE)
$(DEP_CPP_MOD_I)\
@@ -1651,6 +1810,14 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_IN=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
+ ".\modules\standard\config.h"\
+ ".\modules\standard\modules\perl\mod_perl.h"\
"$(INTDIR)\mod_include.obj" "$(INTDIR)\mod_include.sbr" : $(SOURCE)\
@@ -1700,6 +1867,11 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_IS=\
+ ".\main\sfio.h"\
"$(INTDIR)\mod_isapi.obj" "$(INTDIR)\mod_isapi.sbr" : $(SOURCE)\
@@ -1743,6 +1915,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_L=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\mod_log_config.obj" "$(INTDIR)\mod_log_config.sbr" :
$(SOURCE)\
@@ -1784,6 +1962,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_M=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\mod_mime.obj" "$(INTDIR)\mod_mime.sbr" : $(SOURCE)
$(DEP_CPP_MOD_M)\
@@ -1831,6 +2015,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_N=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\mod_negotiation.obj" "$(INTDIR)\mod_negotiation.sbr" :
$(SOURCE)\
@@ -1874,6 +2064,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_S=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\mod_setenvif.obj" "$(INTDIR)\mod_setenvif.sbr" : $(SOURCE)\
@@ -1913,6 +2109,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_U=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\mod_userdir.obj" "$(INTDIR)\mod_userdir.sbr" : $(SOURCE)\
@@ -1952,6 +2154,11 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MODUL=\
+ ".\main\sfio.h"\
"$(INTDIR)\modules.obj" "$(INTDIR)\modules.sbr" : $(SOURCE)
$(DEP_CPP_MODUL)\
@@ -2048,6 +2255,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_RFC14=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\rfc1413.obj" "$(INTDIR)\rfc1413.sbr" : $(SOURCE)
$(DEP_CPP_RFC14)\
@@ -2122,6 +2335,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_UTIL_=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\util.obj" "$(INTDIR)\util.sbr" : $(SOURCE) $(DEP_CPP_UTIL_)\
@@ -2194,6 +2413,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_UTIL_M=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\util_md5.obj" "$(INTDIR)\util_md5.sbr" : $(SOURCE)
$(DEP_CPP_UTIL_M)\
@@ -2249,6 +2474,12 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_UTIL_S=\
+ ".\main\os.h"\
+ ".\main\sfio.h"\
"$(INTDIR)\util_script.obj" "$(INTDIR)\util_script.sbr" : $(SOURCE)\
@@ -2286,6 +2517,11 @@
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_UTIL_W=\
+ ".\main\sfio.h"\
"$(INTDIR)\util_win32.obj" "$(INTDIR)\util_win32.sbr" : $(SOURCE)\
1.2 +2 -2 apachen/src/ap/ap_strings.c
Index: ap_strings.c
===================================================================
RCS file: /export/home/cvs/apachen/src/ap/ap_strings.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ap_strings.c 1997/12/28 04:51:01 1.1
+++ ap_strings.c 1997/12/28 11:52:01 1.2
@@ -56,10 +56,10 @@
/*
* Given a string, replace any bare " with \" .
*/
-char *ap_escape_quotes (pool *p, char *instring)
+API_EXPORT(char *) ap_escape_quotes (pool *p, const char *instring)
{
int newlen = 0;
- char *inchr = instring;
+ const char *inchr = instring;
char *outchr, *outstring;
/*
1.169 +2 -0 apachen/src/main/httpd.h
Index: httpd.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/httpd.h,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- httpd.h 1997/11/20 00:42:37 1.168
+++ httpd.h 1997/12/28 11:52:02 1.169
@@ -806,6 +806,8 @@
API_EXPORT(int) ind(const char *, char); /* Sigh... */
API_EXPORT(int) rind(const char *, char);
+API_EXPORT(char *) ap_escape_quotes (pool *p, const char *instring);
+
/* Common structure for reading of config files / passwd files etc. */
typedef struct {
int (*getch) (void *param); /* a getc()-like function */
