cvs: php4 /ext/standard Makefile.in basic_functions.c ftok.c php_ftok.h php_standard.h

stas Thu Nov 15 04:53:40 2001 EDT Added files: /php4/ext/standard ftok.c php_ftok.h Modified files: /php4/ext/standard Makefile.in basic_functions.c php_standard.h Log: Check in ftok() function by Andrew Sitnikov <sitnikov@infonet.ee> Index: php4/ext/standard/Makefile.in diff -u php4/ext/standard/Makefile.in:1.24 php4/ext/standard/Makefile.in:1.25 --- php4/ext/standard/Makefile.in:1.24 Sat Nov 10 16:18:34 2001 +++ php4/ext/standard/Makefile.in Thu Nov 15 04:53:40 2001 @@ -9,7 +9,7 @@ syslog.c type.c uniqid.c url.c url_scanner.c var.c versioning.c assert.c \ strnatcmp.c levenshtein.c incomplete_class.c url_scanner_ex.c \ ftp_fopen_wrapper.c http_fopen_wrapper.c php_fopen_wrapper.c credits.c \ - var_unserializer.c + var_unserializer.c ftok.c include $(top_srcdir)/build/dynlib.mk Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.420 php4/ext/standard/basic_functions.c:1.421 --- php4/ext/standard/basic_functions.c:1.420 Mon Nov 12 19:37:49 2001 +++ php4/ext/standard/basic_functions.c Thu Nov 15 04:53:40 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.420 2001/11/13 00:37:49 sniper Exp $ */ +/* $Id: basic_functions.c,v 1.421 2001/11/15 09:53:40 stas Exp $ */ #include "php.h" #include "php_main.h" @@ -791,6 +791,13 @@ /* functions from versioning.c */ PHP_FE(version_compare, NULL) + + /* functions from ftok.c*/ +#if HAVE_SYSVSEM || HAVE_SYSVSHM || HAVE_SHMOP + PHP_FE(ftok, NULL) +#else + PHP_FALIAS(ftok , warn_not_available, NULL) +#endif {NULL, NULL, NULL} }; Index: php4/ext/standard/php_standard.h diff -u php4/ext/standard/php_standard.h:1.10 php4/ext/standard/php_standard.h:1.11 --- php4/ext/standard/php_standard.h:1.10 Fri Oct 5 19:56:19 2001 +++ php4/ext/standard/php_standard.h Thu Nov 15 04:53:40 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_standard.h,v 1.10 2001/10/05 23:56:19 ssb Exp $ */ +/* $Id: php_standard.h,v 1.11 2001/11/15 09:53:40 stas Exp $ */ #include "basic_functions.h" #include "php_math.h" @@ -57,6 +57,7 @@ #include "php_array.h" #include "php_assert.h" #include "php_versioning.h" +#include "php_ftok.h" #define phpext_standard_ptr basic_functions_module_ptr Index: php4/ext/standard/ftok.c +++ php4/ext/standard/ftok.c /* +----------------------------------------------------------------------+ | PHP version 4.0 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2001 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 2.02 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available at through the world-wide-web at | | http://www.php.net/license/2_02.txt. | | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ | Authors: Andrew Sitnikov <sitnikov@infonet.ee | +----------------------------------------------------------------------+ */ /* $Id: ftok.c,v 1.1 2001/11/15 09:53:40 stas Exp $ */ #include "php.h" #if HAVE_SYSVSEM || HAVE_SYSVSHM || HAVE_SHMOP #include <sys/types.h> #include <sys/ipc.h> /* {{{ proto int ftok(string pathname, char proj) convert a pathname and a project identifier to a System V IPC key */ PHP_FUNCTION(ftok) { pval **pathname, **proj; key_t k; if(ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pathname, &proj) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_string_ex(pathname); convert_to_string_ex(proj); if (Z_STRLEN_PP(pathname)==0){ php_error(E_WARNING, "Invalid argument 1 in ftok"); RETURN_LONG(-1); } if (Z_STRLEN_PP(proj)!=1){ php_error(E_WARNING, "Invalid argument 2 in ftok"); RETURN_LONG(-1); } k = ftok(Z_STRVAL_PP(pathname),Z_STRVAL_PP(proj)[0]); RETURN_LONG(k); } /* }}} */ #endif /* * Local variables: * tab-width: 4 * c-basic-offset: 4 * End: */ Index: php4/ext/standard/php_ftok.h +++ php4/ext/standard/php_ftok.h /* +----------------------------------------------------------------------+ | PHP version 4.0 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2001 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 2.02 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available at through the world-wide-web at | | http://www.php.net/license/2_02.txt. | | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ | Authors: Andrew Sitnikov <sitnikov@infonet.ee> | +----------------------------------------------------------------------+ */ /* $Id: php_ftok.h,v 1.1 2001/11/15 09:53:40 stas Exp $ */ #ifndef PHP_FTOK_H #define PHP_FTOK_H #if HAVE_SYSVSEM || HAVE_SYSVSHM || HAVE_SHMOP PHP_FUNCTION(ftok); #endif #endif /* PHP_FTOK_H */