- Make Win32 compile again

diff --git a/php4dll.dsp b/php4dll.dsp
index 6e398f40878da9f5b8da2aec3fc0909b8d7e13a1..957f5cfd20c849e0bbebf61c46f931df9efeb036 100644 (file)
--- a/php4dll.dsp
+++ b/php4dll.dsp
@@ -131,6 +131,10 @@ SOURCE=.\php3_realpath.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\php_content_types.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\php_ini.c\r
 # End Source File\r
 # Begin Source File\r
@@ -215,6 +219,10 @@ SOURCE=.\php3_realpath.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\php_content_types.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\php_globals.h\r
 # End Source File\r
 # Begin Source File\r
@@ -363,6 +371,10 @@ SOURCE=.\ext\session\mod_files.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\ext\session\mod_user.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\ext\bcmath\number.c\r
 # End Source File\r
 # Begin Source File\r
@@ -500,6 +512,10 @@ SOURCE=.\ext\standard\mime.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\ext\session\mod_user.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\ext\bcmath\number.h\r
 # End Source File\r
 # Begin Source File\r

diff --git a/php4dllts.dsp b/php4dllts.dsp
index 1e07cd2e2229d083e9397254e00c388e7d1ab99e..5ef16a9d794575de6b222f3ef92f5978f09670fc 100644 (file)
--- a/php4dllts.dsp
+++ b/php4dllts.dsp
@@ -375,6 +375,10 @@ SOURCE=.\ext\session\mod_files.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\ext\session\mod_user.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\ext\bcmath\number.c\r
 # End Source File\r
 # Begin Source File\r
@@ -400,17 +404,7 @@ SOURCE=.\ext\odbc\php_odbc.c
 # Begin Source File\r
 \r
 SOURCE=.\ext\pcre\php_pcre.c\r
-\r
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"\r
-\r
 # ADD CPP /D "STATIC"\r
-\r
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"\r
-\r
-# ADD CPP /D "STATIC"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -518,6 +512,10 @@ SOURCE=.\ext\standard\md5.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\ext\session\mod_user.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\ext\bcmath\number.h\r
 # End Source File\r
 # Begin Source File\r
@@ -610,77 +608,27 @@ SOURCE=.\ext\standard\url.h
 # Begin Source File\r
 \r
 SOURCE=.\ext\pcre\pcrelib\chartables.c\r
-\r
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"\r
-\r
-# ADD CPP /D "STATIC"\r
-\r
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"\r
-\r
 # ADD CPP /D "STATIC"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\ext\pcre\pcrelib\get.c\r
-\r
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"\r
-\r
-# ADD CPP /D "STATIC"\r
-\r
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"\r
-\r
 # ADD CPP /D "STATIC"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\ext\pcre\pcrelib\maketables.c\r
-\r
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"\r
-\r
 # ADD CPP /D "STATIC"\r
-\r
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"\r
-\r
-# ADD CPP /D "STATIC"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\ext\pcre\pcrelib\pcre.c\r
-\r
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"\r
-\r
 # ADD CPP /D "STATIC"\r
-\r
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"\r
-\r
-# ADD CPP /D "STATIC"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\ext\pcre\pcrelib\study.c\r
-\r
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"\r
-\r
-# ADD CPP /D "STATIC"\r
-\r
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"\r
-\r
 # ADD CPP /D "STATIC"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files No. 3"\r

diff --git a/win32/readdir.c b/win32/readdir.c
index 2ebec905e3feaea615e91f8c33816f970a9f5082..5a680ff5a7445ad1e063d472c1e79643984e031f 100644 (file)
--- a/win32/readdir.c
+++ b/win32/readdir.c
@@ -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 @@ struct dirent *readdir(DIR * dp)
        }
        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;