Check in ftok() function by Andrew Sitnikov <sitnikov@infonet.ee>

This commit is contained in:
Stanislav Malyshev 2001-11-15 09:53:40 +00:00
parent 15f0f8ae23
commit 39f3075500
5 changed files with 105 additions and 1 deletions

View file

@ -9,7 +9,7 @@ LTLIBRARY_SOURCES=\
syslog.c type.c uniqid.c url.c url_scanner.c var.c versioning.c assert.c \ 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 \ 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 \
var_unserializer.c var_unserializer.c ftok.c
include $(top_srcdir)/build/dynlib.mk include $(top_srcdir)/build/dynlib.mk

View file

@ -792,6 +792,13 @@ function_entry basic_functions[] = {
/* functions from versioning.c */ /* functions from versioning.c */
PHP_FE(version_compare, NULL) 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} {NULL, NULL, NULL}
}; };

66
ext/standard/ftok.c Normal file
View file

@ -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 <sitnikov@infonet.ee |
+----------------------------------------------------------------------+
*/
/* $Id$ */
#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:
*/

30
ext/standard/php_ftok.h Normal file
View file

@ -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 <sitnikov@infonet.ee> |
+----------------------------------------------------------------------+
*/
/* $Id$ */
#ifndef PHP_FTOK_H
#define PHP_FTOK_H
#if HAVE_SYSVSEM || HAVE_SYSVSHM || HAVE_SHMOP
PHP_FUNCTION(ftok);
#endif
#endif /* PHP_FTOK_H */

View file

@ -57,6 +57,7 @@
#include "php_array.h" #include "php_array.h"
#include "php_assert.h" #include "php_assert.h"
#include "php_versioning.h" #include "php_versioning.h"
#include "php_ftok.h"
#define phpext_standard_ptr basic_functions_module_ptr #define phpext_standard_ptr basic_functions_module_ptr