MFH: add error messages to disk_free_space() & disk_total_space() (feature request...

diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index d19a29f67cf917292b35ad2bce52652f07affad5..60fcfca1c3d301ac6a93dd629e67d005cb18b1a1 100644 (file)
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -79,6 +79,10 @@
 # endif
 #endif
 
+#ifdef PHP_WIN32
+#include "win32/winutil.h"
+#endif
+
 #include "basic_functions.h"
 #include "php_filestat.h"
 
@@ -170,7 +174,10 @@ PHP_FUNCTION(disk_total_space)
                        if (func(Z_STRVAL_PP(path),
                                &FreeBytesAvailableToCaller,
                                &TotalNumberOfBytes,
-                               &TotalNumberOfFreeBytes) == 0) RETURN_FALSE;
+                               &TotalNumberOfFreeBytes) == 0) { 
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", php_win_err());
+                               RETURN_FALSE;
+                       }
 
                        /* i know - this is ugly, but i works <thies@thieso.net> */
                        bytestotal  = TotalNumberOfBytes.HighPart *
@@ -181,7 +188,10 @@ PHP_FUNCTION(disk_total_space)
                else {
                        if (GetDiskFreeSpace(Z_STRVAL_PP(path),
                                &SectorsPerCluster, &BytesPerSector,
-                               &NumberOfFreeClusters, &TotalNumberOfClusters) == 0) RETURN_FALSE;
+                               &NumberOfFreeClusters, &TotalNumberOfClusters) == 0) { 
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", php_win_err());
+                               RETURN_FALSE; 
+                       }
                        bytestotal = (double)TotalNumberOfClusters * (double)SectorsPerCluster * (double)BytesPerSector;
                }
        }
@@ -200,7 +210,10 @@ PHP_FUNCTION(disk_total_space)
        }
 #else /* WINDOWS, OS/2 */
 #if defined(HAVE_SYS_STATVFS_H) && defined(HAVE_STATVFS)
-       if (statvfs(Z_STRVAL_PP(path), &buf)) RETURN_FALSE;
+       if (statvfs(Z_STRVAL_PP(path), &buf)) { 
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", strerror(errno));
+               RETURN_FALSE; 
+       }
        if (buf.f_frsize) {
                bytestotal = (((double)buf.f_blocks) * ((double)buf.f_frsize));
        } else {
@@ -208,7 +221,10 @@ PHP_FUNCTION(disk_total_space)
        }
 
 #elif (defined(HAVE_SYS_STATFS_H) || defined(HAVE_SYS_MOUNT_H)) && defined(HAVE_STATFS)
-       if (statfs(Z_STRVAL_PP(path), &buf)) RETURN_FALSE;
+       if (statfs(Z_STRVAL_PP(path), &buf)) { 
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", strerror(errno));
+               RETURN_FALSE;
+       }
        bytestotal = (((double)buf.f_bsize) * ((double)buf.f_blocks));
 #endif
 #endif /* WINDOWS */
@@ -273,7 +289,10 @@ PHP_FUNCTION(disk_free_space)
                        if (func(Z_STRVAL_PP(path),
                                &FreeBytesAvailableToCaller,
                                &TotalNumberOfBytes,
-                               &TotalNumberOfFreeBytes) == 0) RETURN_FALSE;
+                               &TotalNumberOfFreeBytes) == 0) { 
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", php_win_err());
+                               RETURN_FALSE;
+                       }
 
                        /* i know - this is ugly, but i works <thies@thieso.net> */
                        bytesfree  = FreeBytesAvailableToCaller.HighPart *
@@ -284,7 +303,10 @@ PHP_FUNCTION(disk_free_space)
                else {
                        if (GetDiskFreeSpace(Z_STRVAL_PP(path),
                                &SectorsPerCluster, &BytesPerSector,
-                               &NumberOfFreeClusters, &TotalNumberOfClusters) == 0) RETURN_FALSE;
+                               &NumberOfFreeClusters, &TotalNumberOfClusters) == 0) { 
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", php_win_err());
+                               RETURN_FALSE;
+                       }
                        bytesfree = (double)NumberOfFreeClusters * (double)SectorsPerCluster * (double)BytesPerSector;
                }
        }
@@ -303,14 +325,20 @@ PHP_FUNCTION(disk_free_space)
        }
 #else /* WINDOWS, OS/2 */
 #if defined(HAVE_SYS_STATVFS_H) && defined(HAVE_STATVFS)
-       if (statvfs(Z_STRVAL_PP(path), &buf)) RETURN_FALSE;
+       if (statvfs(Z_STRVAL_PP(path), &buf)) { 
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", strerror(errno));
+               RETURN_FALSE;
+       }
        if (buf.f_frsize) {
                bytesfree = (((double)buf.f_bavail) * ((double)buf.f_frsize));
        } else {
                bytesfree = (((double)buf.f_bavail) * ((double)buf.f_bsize));
        }
 #elif (defined(HAVE_SYS_STATFS_H) || defined(HAVE_SYS_MOUNT_H)) && defined(HAVE_STATFS)
-       if (statfs(Z_STRVAL_PP(path), &buf)) RETURN_FALSE;
+       if (statfs(Z_STRVAL_PP(path), &buf)) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", strerror(errno));
+               RETURN_FALSE;
+       }
 #ifdef NETWARE
        bytesfree = (((double)buf.f_bsize) * ((double)buf.f_bfree));
 #else