--- ext/standard/Makefile.in.org Mon Nov 20 12:05:57 2000 +++ ext/standard/Makefile.in Sat Oct 13 01:17:25 2001 @@ -8,7 +8,8 @@ parsedate.c quot_print.c rand.c reg.c soundex.c string.c scanf.c \ syslog.c type.c uniqid.c url.c url_scanner.c var.c output.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 + ftp_fopen_wrapper.c http_fopen_wrapper.c php_fopen_wrapper.c credits.c \ + ftok.c include $(top_srcdir)/build/dynlib.mk --- ext/standard/basic_functions.c.org Thu Mar 29 00:51:34 2001 +++ ext/standard/basic_functions.c Sat Oct 13 01:58:54 2001 @@ -590,6 +590,13 @@ PHP_FE(assert, NULL) PHP_FE(assert_options, 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} }; --- ext/standard/ftok.c.org Thu Jan 1 02:00:00 1970 +++ ext/standard/ftok.c Sat Oct 13 02:09:37 2001 @@ -0,0 +1,66 @@ +/* + +----------------------------------------------------------------------+ + | 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 +#include + +/* {{{ 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: + */ --- ext/standard/php_ftok.h.org Thu Jan 1 02:00:00 1970 +++ ext/standard/php_ftok.h Sat Oct 13 02:09:46 2001 @@ -0,0 +1,30 @@ +/* + +----------------------------------------------------------------------+ + | 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 | + +----------------------------------------------------------------------+ +*/ + +/* $Id: $ */ + +#ifndef PHP_FTOK_H +#define PHP_FTOK_H + +#if HAVE_SYSVSEM || HAVE_SYSVSHM || HAVE_SHMOP + +PHP_FUNCTION(ftok); + +#endif + +#endif /* PHP_FTOK_H */ --- ext/standard/php_standard.h.org Mon Feb 26 08:07:23 2001 +++ ext/standard/php_standard.h Sat Oct 13 01:00:55 2001 @@ -56,6 +56,7 @@ #include "php_output.h" #include "php_array.h" #include "php_assert.h" +#include "php_ftok.h" #define phpext_standard_ptr basic_functions_module_ptr