cvs: /php4 php4dll.dsp php4dllts.dsp /php4/serverapi isapi_sapi.c /php4/win32 readdir.c

andi Sat Sep 18 15:13:38 1999 EDT Modified files: /php4 php4dll.dsp php4dllts.dsp /php4/serverapi isapi_sapi.c /php4/win32 readdir.c Log: - Make Win32 compile again Index: php4/php4dll.dsp diff -u php4/php4dll.dsp:1.17 php4/php4dll.dsp:1.18 --- php4/php4dll.dsp:1.17 Thu Sep 16 19:18:15 1999 +++ php4/php4dll.dsp Sat Sep 18 15:13:37 1999 @@ -131,6 +131,10 @@ # End Source File # Begin Source File +SOURCE=.\php_content_types.c +# End Source File +# Begin Source File + SOURCE=.\php_ini.c # End Source File # Begin Source File @@ -215,6 +219,10 @@ # End Source File # Begin Source File +SOURCE=.\php_content_types.h +# End Source File +# Begin Source File + SOURCE=.\php_globals.h # End Source File # Begin Source File @@ -363,6 +371,10 @@ # End Source File # Begin Source File +SOURCE=.\ext\session\mod_user.c +# End Source File +# Begin Source File + SOURCE=.\ext\bcmath\number.c # End Source File # Begin Source File @@ -497,6 +509,10 @@ # Begin Source File SOURCE=.\ext\standard\mime.h +# End Source File +# Begin Source File + +SOURCE=.\ext\session\mod_user.h # End Source File # Begin Source File Index: php4/php4dllts.dsp diff -u php4/php4dllts.dsp:1.25 php4/php4dllts.dsp:1.26 --- php4/php4dllts.dsp:1.25 Thu Sep 16 22:06:08 1999 +++ php4/php4dllts.dsp Sat Sep 18 15:13:37 1999 @@ -375,6 +375,10 @@ # End Source File # Begin Source File +SOURCE=.\ext\session\mod_user.c +# End Source File +# Begin Source File + SOURCE=.\ext\bcmath\number.c # End Source File # Begin Source File @@ -400,17 +404,7 @@ # Begin Source File SOURCE=.\ext\pcre\php_pcre.c - -!IF "$(CFG)" == "php4dllts - Win32 Debug_TS" - -# ADD CPP /D "STATIC" - -!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" - # ADD CPP /D "STATIC" - -!ENDIF - # End Source File # Begin Source File @@ -518,6 +512,10 @@ # End Source File # Begin Source File +SOURCE=.\ext\session\mod_user.h +# End Source File +# Begin Source File + SOURCE=.\ext\bcmath\number.h # End Source File # Begin Source File @@ -610,77 +608,27 @@ # Begin Source File SOURCE=.\ext\pcre\pcrelib\chartables.c - -!IF "$(CFG)" == "php4dllts - Win32 Debug_TS" - -# ADD CPP /D "STATIC" - -!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" - # ADD CPP /D "STATIC" - -!ENDIF - # End Source File # Begin Source File SOURCE=.\ext\pcre\pcrelib\get.c - -!IF "$(CFG)" == "php4dllts - Win32 Debug_TS" - -# ADD CPP /D "STATIC" - -!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" - # ADD CPP /D "STATIC" - -!ENDIF - # End Source File # Begin Source File SOURCE=.\ext\pcre\pcrelib\maketables.c - -!IF "$(CFG)" == "php4dllts - Win32 Debug_TS" - -# ADD CPP /D "STATIC" - -!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" - # ADD CPP /D "STATIC" - -!ENDIF - # End Source File # Begin Source File SOURCE=.\ext\pcre\pcrelib\pcre.c - -!IF "$(CFG)" == "php4dllts - Win32 Debug_TS" - # ADD CPP /D "STATIC" - -!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" - -# ADD CPP /D "STATIC" - -!ENDIF - # End Source File # Begin Source File SOURCE=.\ext\pcre\pcrelib\study.c - -!IF "$(CFG)" == "php4dllts - Win32 Debug_TS" - -# ADD CPP /D "STATIC" - -!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" - # ADD CPP /D "STATIC" - -!ENDIF - # End Source File # End Group # Begin Group "Header Files No. 3" Index: php4/serverapi/isapi_sapi.c diff -u php4/serverapi/isapi_sapi.c:1.5 php4/serverapi/isapi_sapi.c:1.6 --- php4/serverapi/isapi_sapi.c:1.5 Sat Sep 4 17:49:39 1999 +++ php4/serverapi/isapi_sapi.c Sat Sep 18 15:13:38 1999 @@ -212,7 +212,7 @@ { version->dwExtensionVersion = MAKELONG( HSE_VERSION_MINOR, HSE_VERSION_MAJOR ); - strncpy( version->lpszExtensionDesc, + strlcpy( version->lpszExtensionDesc, "PHP v3.0 ISAPI Extension", HSE_MAX_EXT_DLL_NAME_LEN); Index: php4/win32/readdir.c diff -u php4/win32/readdir.c:1.1 php4/win32/readdir.c:1.2 --- php4/win32/readdir.c:1.1 Wed Apr 7 17:05:12 1999 +++ php4/win32/readdir.c Sat Sep 18 15:13:38 1999 @@ -4,6 +4,7 @@ #define NEEDRDH 1 #include "readdir.h" +#include "php.h" /********************************************************************** * Implement dirent-style opendir/readdir/closedir on Window 95/NT @@ -62,7 +63,7 @@ } dp->offset++; - strncpy(dp->dent.d_name, dp->fileinfo.name, _MAX_FNAME); + strlcpy(dp->dent.d_name, dp->fileinfo.name, _MAX_FNAME+1); dp->dent.d_ino = 1; dp->dent.d_reclen = strlen(dp->dent.d_name); dp->dent.d_off = dp->offset;