randy 99/08/07 13:34:14
Modified: src ApacheCore.def src/ap ap.mak src/support htpasswd.c htpasswd.mak Log: Fix build on Win32 Revision Changes Path 1.17 +1 -1 apache-1.3/src/ApacheCore.def Index: ApacheCore.def =================================================================== RCS file: /home/cvs/apache-1.3/src/ApacheCore.def,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ApacheCore.def 1999/07/29 17:53:43 1.16 +++ ApacheCore.def 1999/08/07 20:34:03 1.17 @@ -343,4 +343,4 @@ ap_standalone @337 ap_server_confname @338 ap_sub_req_method_uri @339 - + ap_sha1_base64 @340 1.6 +86 -2 apache-1.3/src/ap/ap.mak Index: ap.mak =================================================================== RCS file: /home/cvs/apache-1.3/src/ap/ap.mak,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ap.mak 1999/01/19 14:20:40 1.5 +++ ap.mak 1999/08/07 20:34:09 1.6 @@ -50,6 +50,8 @@ [EMAIL PROTECTED] "$(INTDIR)\ap_signal.obj" [EMAIL PROTECTED] "$(INTDIR)\ap_slack.obj" [EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.obj" + [EMAIL PROTECTED] "$(INTDIR)\ap_sha1.obj" + [EMAIL PROTECTED] "$(INTDIR)\ap_checkpass.obj" [EMAIL PROTECTED] "$(INTDIR)\vc50.idb" [EMAIL PROTECTED] "$(OUTDIR)\ap.lib" @@ -104,7 +106,9 @@ "$(INTDIR)\ap_md5c.obj" \ "$(INTDIR)\ap_signal.obj" \ "$(INTDIR)\ap_slack.obj" \ - "$(INTDIR)\ap_snprintf.obj" + "$(INTDIR)\ap_snprintf.obj" \ + "$(INTDIR)\ap_sha1.obj" \ + "$(INTDIR)\ap_checkpass.obj" "$(OUTDIR)\ap.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) $(LIB32) @<< @@ -136,6 +140,8 @@ [EMAIL PROTECTED] "$(INTDIR)\ap_signal.obj" [EMAIL PROTECTED] "$(INTDIR)\ap_slack.obj" [EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.obj" + [EMAIL PROTECTED] "$(INTDIR)\ap_sha1.obj" + [EMAIL PROTECTED] "$(INTDIR)\ap_checkpass.obj" [EMAIL PROTECTED] "$(INTDIR)\vc50.idb" [EMAIL PROTECTED] "$(OUTDIR)\ap.lib" @@ -190,7 +196,9 @@ "$(INTDIR)\ap_md5c.obj" \ "$(INTDIR)\ap_signal.obj" \ "$(INTDIR)\ap_slack.obj" \ - "$(INTDIR)\ap_snprintf.obj" + "$(INTDIR)\ap_snprintf.obj" \ + "$(INTDIR)\ap_sha1.obj" \ + "$(INTDIR)\ap_checkpass.obj" "$(OUTDIR)\ap.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) $(LIB32) @<< @@ -480,6 +488,82 @@ !ENDIF + +SOURCE=.\ap_checkpass.c + +!IF "$(CFG)" == "ap - Win32 Release" + +DEP_CPP_AP_CH=\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_AP_CH=\ + "..\include\ap_config_auto.h"\ + "..\include\os.h"\ + ".\ebcdic.h"\ + + +"$(INTDIR)\ap_checkpass.obj" : $(SOURCE) $(DEP_CPP_AP_CH) "$(INTDIR)" + + +!ELSEIF "$(CFG)" == "ap - Win32 Debug" + +DEP_CPP_AP_CH=\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +"$(INTDIR)\ap_checkpass.obj" : $(SOURCE) $(DEP_CPP_AP_CH) "$(INTDIR)" + + +!ENDIF + +SOURCE=.\ap_sha1.c + +!IF "$(CFG)" == "ap - Win32 Release" + +DEP_CPP_AP_SH=\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_sha1.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_AP_SH=\ + "..\include\ap_config_auto.h"\ + "..\include\os.h"\ + ".\ebcdic.h"\ + + +"$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)" + + +!ELSEIF "$(CFG)" == "ap - Win32 Debug" + +DEP_CPP_AP_SH=\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_sha1.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +"$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)" + + +!ENDIF !ENDIF 1.33 +2 -2 apache-1.3/src/support/htpasswd.c Index: htpasswd.c =================================================================== RCS file: /home/cvs/apache-1.3/src/support/htpasswd.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- htpasswd.c 1999/08/02 10:13:48 1.32 +++ htpasswd.c 1999/08/07 20:34:14 1.33 @@ -181,7 +181,7 @@ return ERR_PWMISMATCH; } pw = pwin; - bzero(pwv,sizeof(pwin)); + memset(pwv, '\0', sizeof(pwin)); } switch (alg) { @@ -213,7 +213,7 @@ ap_cpystrn(cpw, (char *)crypt(pw, salt), sizeof(cpw) - 1); break; } - bzero(pw,strlen(pw)); + memset(pw, '\0', strlen(pw)); /* * Check to see if the buffer is large enough to hold the username, 1.8 +92 -0 apache-1.3/src/support/htpasswd.mak Index: htpasswd.mak =================================================================== RCS file: /home/cvs/apache-1.3/src/support/htpasswd.mak,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- htpasswd.mak 1999/06/30 09:09:44 1.7 +++ htpasswd.mak 1999/08/07 20:34:14 1.8 @@ -53,6 +53,8 @@ [EMAIL PROTECTED] "$(INTDIR)\ap_getpass.obj" [EMAIL PROTECTED] "$(INTDIR)\ap_md5c.obj" [EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.obj" + [EMAIL PROTECTED] "$(INTDIR)\ap_sha1.obj" + [EMAIL PROTECTED] "$(INTDIR)\ap_checkpass.obj" [EMAIL PROTECTED] "$(INTDIR)\htpasswd.obj" [EMAIL PROTECTED] "$(INTDIR)\vc50.idb" [EMAIL PROTECTED] "$(OUTDIR)\htpasswd.exe" @@ -78,6 +80,8 @@ "$(INTDIR)\ap_getpass.obj" \ "$(INTDIR)\ap_md5c.obj" \ "$(INTDIR)\ap_snprintf.obj" \ + "$(INTDIR)\ap_sha1.obj" \ + "$(INTDIR)\ap_checkpass.obj" \ "$(INTDIR)\htpasswd.obj" "$(OUTDIR)\htpasswd.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -108,6 +112,8 @@ [EMAIL PROTECTED] "$(INTDIR)\ap_getpass.obj" [EMAIL PROTECTED] "$(INTDIR)\ap_md5c.obj" [EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.obj" + [EMAIL PROTECTED] "$(INTDIR)\ap_sha1.obj" + [EMAIL PROTECTED] "$(INTDIR)\ap_checkpass.obj" [EMAIL PROTECTED] "$(INTDIR)\htpasswd.obj" [EMAIL PROTECTED] "$(INTDIR)\vc50.idb" [EMAIL PROTECTED] "$(INTDIR)\vc50.pdb" @@ -137,6 +143,8 @@ "$(INTDIR)\ap_getpass.obj" \ "$(INTDIR)\ap_md5c.obj" \ "$(INTDIR)\ap_snprintf.obj" \ + "$(INTDIR)\ap_sha1.obj" \ + "$(INTDIR)\ap_checkpass.obj" \ "$(INTDIR)\htpasswd.obj" "$(OUTDIR)\htpasswd.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -361,6 +369,90 @@ "$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ENDIF + +SOURCE=..\ap\ap_sha1.c + +!IF "$(CFG)" == "htpasswd - Win32 Release" + +DEP_CPP_AP_SH=\ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_sha1.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_AP_SH=\ + "..\ap\ebcdic.h"\ + "..\include\ap_config_auto.h"\ + "..\include\os.h"\ + + +"$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ELSEIF "$(CFG)" == "htpasswd - Win32 Debug" + +DEP_CPP_AP_SH=\ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_sha1.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +"$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ENDIF + +SOURCE=..\ap\ap_checkpass.c + +!IF "$(CFG)" == "htpasswd - Win32 Release" + +DEP_CPP_AP_CH=\ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_AP_CH=\ + "..\ap\ebcdic.h"\ + "..\include\ap_config_auto.h"\ + "..\include\os.h"\ + + +"$(INTDIR)\ap_checkpass.obj" : $(SOURCE) $(DEP_CPP_AP_CH) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ELSEIF "$(CFG)" == "htpasswd - Win32 Debug" + +DEP_CPP_AP_CH=\ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +"$(INTDIR)\ap_checkpass.obj" : $(SOURCE) $(DEP_CPP_AP_CH) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE)