pollita Thu Jan 11 01:52:24 2007 UTC
Modified files:
/php-src/ext/posix posix.c
/php-src/ext/standard filestat.c
Log:
Some platforms have getpwnam_r() but are missing _SC_GETPW_R_SIZE_MAX
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/posix.c?r1=1.87&r2=1.88&diff_format=u
Index: php-src/ext/posix/posix.c
diff -u php-src/ext/posix/posix.c:1.87 php-src/ext/posix/posix.c:1.88
--- php-src/ext/posix/posix.c:1.87 Fri Jan 5 21:30:06 2007
+++ php-src/ext/posix/posix.c Thu Jan 11 01:52:24 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: posix.c,v 1.87 2007/01/05 21:30:06 pollita Exp $ */
+/* $Id: posix.c,v 1.88 2007/01/11 01:52:24 pollita Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -147,7 +147,7 @@
static PHP_MINFO_FUNCTION(posix)
{
php_info_print_table_start();
- php_info_print_table_row(2, "Revision", "$Revision: 1.87 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.88 $");
php_info_print_table_end();
}
/* }}} */
@@ -942,7 +942,7 @@
RETURN_FALSE;
}
-#ifdef HAVE_GETPWNAM_R
+#if defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWNAM_R)
buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
buf = emalloc(buflen);
pw = &pwbuf;
@@ -988,7 +988,7 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &uid) ==
FAILURE) {
RETURN_FALSE;
}
-#ifdef HAVE_GETPWUID_R
+#if defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWUID_R)
pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
pwbuf = emalloc(pwbuflen);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/filestat.c?r1=1.154&r2=1.155&diff_format=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.154
php-src/ext/standard/filestat.c:1.155
--- php-src/ext/standard/filestat.c:1.154 Mon Jan 1 09:29:31 2007
+++ php-src/ext/standard/filestat.c Thu Jan 11 01:52:24 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filestat.c,v 1.154 2007/01/01 09:29:31 sebastian Exp $ */
+/* $Id: filestat.c,v 1.155 2007/01/11 01:52:24 pollita Exp $ */
#include "php.h"
#include "fopen_wrappers.h"
@@ -521,7 +521,7 @@
if (Z_TYPE_P(user) == IS_LONG) {
uid = (uid_t)Z_LVAL_P(user);
} else {
-#ifdef HAVE_GETPWNAM_R
+#if defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWNAM_R)
struct passwd pw;
struct passwd *retpwptr = NULL;
int pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
