cvs: php-src / NEWS /ext/posix config.m4 php_posix.h posix.c

From: Date: Fri, 13 May 2005 21:38:18 +0000
Subject: cvs: php-src / NEWS /ext/posix config.m4 php_posix.h posix.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-31867@lists.php.net to get a copy of this message
magnus Fri May 13 17:38:18 2005 EDT Modified files: /php-src NEWS /php-src/ext/posix config.m4 posix.c php_posix.h Log: Added new function: posix_mknod(). http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1899&r2=1.1900&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1899 php-src/NEWS:1.1900 --- php-src/NEWS:1.1899 Fri May 13 06:11:46 2005 +++ php-src/NEWS Fri May 13 17:38:17 2005 @@ -86,6 +86,7 @@ . inet_ntop() (Sara) . mysqli::client_info property (Georg) . posix_access() (Magnus) + . posix_mknod() (Magnus) . SimpleXMLElement::registerXPathNamespace() (Christian) . stream_context_get_default() (Wez) . stream_socket_enable_crypto() (Wez) http://cvs.php.net/diff.php/php-src/ext/posix/config.m4?r1=1.8&r2=1.9&ty=u Index: php-src/ext/posix/config.m4 diff -u php-src/ext/posix/config.m4:1.8 php-src/ext/posix/config.m4:1.9 --- php-src/ext/posix/config.m4:1.8 Mon May 9 08:15:53 2005 +++ php-src/ext/posix/config.m4 Fri May 13 17:38:17 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.8 2005/05/09 12:15:53 sniper Exp $ +dnl $Id: config.m4,v 1.9 2005/05/13 21:38:17 magnus Exp $ dnl PHP_ARG_ENABLE(posix,whether to enable POSIX-like functions, @@ -9,5 +9,5 @@ AC_DEFINE(HAVE_POSIX, 1, [whether to include POSIX-like functions]) PHP_NEW_EXTENSION(posix, posix.c, $ext_shared) - AC_CHECK_FUNCS(seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo getrlimit getlogin getgroups) + AC_CHECK_FUNCS(seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod getrlimit getlogin getgroups) fi http://cvs.php.net/diff.php/php-src/ext/posix/posix.c?r1=1.65&r2=1.66&ty=u Index: php-src/ext/posix/posix.c diff -u php-src/ext/posix/posix.c:1.65 php-src/ext/posix/posix.c:1.66 --- php-src/ext/posix/posix.c:1.65 Mon May 9 08:15:53 2005 +++ php-src/ext/posix/posix.c Fri May 13 17:38:17 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: posix.c,v 1.65 2005/05/09 12:15:53 sniper Exp $ */ +/* $Id: posix.c,v 1.66 2005/05/13 21:38:17 magnus Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -111,6 +111,9 @@ #ifdef HAVE_MKFIFO PHP_FE(posix_mkfifo, NULL) #endif +#ifdef HAVE_MKNOD + PHP_FE(posix_mknod, NULL) +#endif /* POSIX.1, 5.6 */ PHP_FE(posix_access, NULL) @@ -137,7 +140,7 @@ static PHP_MINFO_FUNCTION(posix) { php_info_print_table_start(); - php_info_print_table_row(2, "Revision", "$Revision: 1.65 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.66 $"); php_info_print_table_end(); } /* }}} */ @@ -156,6 +159,22 @@ REGISTER_LONG_CONSTANT("POSIX_X_OK", X_OK, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("POSIX_W_OK", W_OK, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("POSIX_R_OK", R_OK, CONST_CS | CONST_PERSISTENT); +#ifdef S_IFREG + REGISTER_LONG_CONSTANT("POSIX_S_IFREG", S_IFREG, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef S_IFCHR + REGISTER_LONG_CONSTANT("POSIX_S_IFCHR", S_IFCHR, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef S_IFBLK + REGISTER_LONG_CONSTANT("POSIX_S_IFBLK", S_IFBLK, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef S_IFIFO + REGISTER_LONG_CONSTANT("POSIX_S_IFIFO", S_IFIFO, CONST_CS | CONST_PERSISTENT); +#endif +#ifdef S_IFSOCK + REGISTER_LONG_CONSTANT("POSIX_S_IFSOCK", S_IFSOCK, CONST_CS | CONST_PERSISTENT); +#endif + return SUCCESS; } /* }}} */ @@ -646,6 +665,51 @@ #endif /* }}} */ +/* {{{ proto bool posix_mknod(string pathname, int mode [, int major [, int minor]]) + Make a special or ordinary file (POSIX.1) */ +#ifdef HAVE_MKNOD +PHP_FUNCTION(posix_mknod) +{ + char *path; + int path_len; + long mode; + long major, minor = 0; + int result; + dev_t php_dev; + + php_dev = 0; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl|ll", &path, &path_len, + &mode, &major, &minor) == FAILURE) { + RETURN_FALSE; + } + + if (php_check_open_basedir_ex(path, 0 TSRMLS_CC) || + (PG(safe_mode) && (!php_checkuid(path, NULL, CHECKUID_ALLOW_ONLY_DIR)))) { + RETURN_FALSE; + } + + if ((mode & S_IFCHR) || (mode & S_IFBLK)) { + if (major == 0) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, + "expects argument 4 to be non-zero for POSIX_S_IFCHR and POSIX_S_IFBLK"); + RETURN_FALSE; + } else { + php_dev = makedev(major, minor); + } + } + + result = mknod(path, mode, php_dev); + if (result < 0) { + POSIX_G(last_error) = errno; + RETURN_FALSE; + } + + RETURN_TRUE; +} +#endif +/* }}} */ + /* Takes a pointer to posix group and a pointer to an already initialized ZVAL * array container and fills the array with the posix group member data. */ int php_posix_group_to_array(struct group *g, zval *array_group) { http://cvs.php.net/diff.php/php-src/ext/posix/php_posix.h?r1=1.16&r2=1.17&ty=u Index: php-src/ext/posix/php_posix.h diff -u php-src/ext/posix/php_posix.h:1.16 php-src/ext/posix/php_posix.h:1.17 --- php-src/ext/posix/php_posix.h:1.16 Mon May 9 08:15:53 2005 +++ php-src/ext/posix/php_posix.h Fri May 13 17:38:17 2005 @@ -17,7 +17,7 @@ */ -/* $Id: php_posix.h,v 1.16 2005/05/09 12:15:53 sniper Exp $ */ +/* $Id: php_posix.h,v 1.17 2005/05/13 21:38:17 magnus Exp $ */ #ifndef PHP_POSIX_H #define PHP_POSIX_H @@ -93,6 +93,9 @@ #ifdef HAVE_MKFIFO PHP_FUNCTION(posix_mkfifo); #endif +#ifdef HAVE_MKNOD +PHP_FUNCTION(posix_mknod); +#endif /* POSIX.1, 5.6 */ PHP_FUNCTION(posix_access);

« previous php.cvs (#31867) next »