pajoye Fri, 09 Oct 2009 17:15:46 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=289430
Log: - Merge: fix #40013, php_uname() doesnt return nodename (MFH) Bug: http://bugs.php.net/40013 (Closed) php_uname() doesnt return nodename Changed paths: U php/php-src/branches/PHP_5_3_1/ext/standard/info.c Modified: php/php-src/branches/PHP_5_3_1/ext/standard/info.c =================================================================== --- php/php-src/branches/PHP_5_3_1/ext/standard/info.c 2009-10-09 17:13:05 UTC (rev 289429) +++ php/php-src/branches/PHP_5_3_1/ext/standard/info.c 2009-10-09 17:15:46 UTC (rev 289430) @@ -527,9 +527,33 @@ if (uname((struct utsname *)&buf) == -1) { php_uname = PHP_UNAME; } else { +#ifdef NETWARE if (mode == 's') { php_uname = buf.sysname; } else if (mode == 'r') { + snprintf(tmp_uname, sizeof(tmp_uname), "%d.%d.%d", + buf.netware_major, buf.netware_minor, buf.netware_revision); + php_uname = tmp_uname; + } else if (mode == 'n') { + php_uname = buf.servername; + } else if (mode == 'v') { + snprintf(tmp_uname, sizeof(tmp_uname), "libc-%d.%d.%d #%d", + buf.libmajor, buf.libminor, buf.librevision, buf.libthreshold); + php_uname = tmp_uname; + } else if (mode == 'm') { + php_uname = buf.machine; + } else { /* assume mode == 'a' */ + snprintf(tmp_uname, sizeof(tmp_uname), "%s %s %d.%d.%d libc-%d.%d.%d #%d %s", + buf.sysname, buf.servername, + buf.netware_major, buf.netware_minor, buf.netware_revision, + buf.libmajor, buf.libminor, buf.librevision, buf.libthreshold, + buf.machine); + php_uname = tmp_uname; + } +#else + if (mode == 's') { + php_uname = buf.sysname; + } else if (mode == 'r') { php_uname = buf.release; } else if (mode == 'n') { php_uname = buf.nodename; @@ -543,6 +567,7 @@ buf.machine); php_uname = tmp_uname; } +#endif /* NETWARE */ } #else php_uname = PHP_UNAME;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
