pollita Thu Jan 11 02:31:50 2007 UTC
Modified files:
/php-src/ext/posix posix.c
Log:
#ifdef out the rest of that getpwuid_r() patch, see prior commit
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/posix.c?r1=1.88&r2=1.89&diff_format=u
Index: php-src/ext/posix/posix.c
diff -u php-src/ext/posix/posix.c:1.88 php-src/ext/posix/posix.c:1.89
--- php-src/ext/posix/posix.c:1.88 Thu Jan 11 01:52:24 2007
+++ php-src/ext/posix/posix.c Thu Jan 11 02:31:50 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: posix.c,v 1.88 2007/01/11 01:52:24 pollita Exp $ */
+/* $Id: posix.c,v 1.89 2007/01/11 02:31:50 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.88 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.89 $");
php_info_print_table_end();
}
/* }}} */
@@ -932,7 +932,7 @@
struct passwd *pw;
char *name;
int name_len;
-#ifdef HAVE_GETPWNAM_R
+#if defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWNAM_R)
struct passwd pwbuf;
int buflen;
char *buf;
@@ -965,7 +965,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to convert
posix passwd struct to array");
RETVAL_FALSE;
}
-#ifdef HAVE_GETPWNAM_R
+#if defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWNAM_R)
efree(buf);
#endif
}
@@ -976,7 +976,7 @@
PHP_FUNCTION(posix_getpwuid)
{
long uid;
-#ifdef HAVE_GETPWUID_R
+#if defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWUID_R)
struct passwd _pw;
struct passwd *retpwptr = NULL;
int pwbuflen;
@@ -1012,7 +1012,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to convert
posix passwd struct to array");
RETVAL_FALSE;
}
-#ifdef HAVE_GETPWUID_R
+#if defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWUID_R)
efree(pwbuf);
#endif
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
