CVS update: php3/functions

Date: Friday November 6, 1998 @ 17:53 Author: rasmus Update of /repository/php3/functions In directory asf:/u2/tmp/cvs-serv10300/functions Modified Files: exec.c reg.c Log Message: Some more prototype doc comments Index: php3/functions/exec.c diff -c php3/functions/exec.c:1.78 php3/functions/exec.c:1.79 *** php3/functions/exec.c:1.78 Thu Sep 10 19:57:18 1998 --- php3/functions/exec.c Fri Nov 6 17:53:29 1998 *************** *** 23,32 **** | If you did not, or have any questions about PHP licensing, please | | contact core@php.net. | +----------------------------------------------------------------------+ ! | Author: Rasmus Lerdorf | +----------------------------------------------------------------------+ */ ! /* $Id: exec.c,v 1.78 1998/09/10 23:57:18 zeev Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 23,32 ---- | If you did not, or have any questions about PHP licensing, please | | contact core@php.net. | +----------------------------------------------------------------------+ ! | Author: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ ! /* $Id: exec.c,v 1.79 1998/11/06 22:53:29 rasmus Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 193,198 **** --- 193,200 ---- return ret; } + /* {{{ proto int exec(string command [, array output [, int return_value]]) + Execute an external program */ void php3_exec(INTERNAL_FUNCTION_PARAMETERS) { pval *arg1, *arg2, *arg3; *************** *** 224,231 **** arg3->value.lval=ret; break; } ! } void php3_system(INTERNAL_FUNCTION_PARAMETERS) { pval *arg1, *arg2; --- 226,235 ---- arg3->value.lval=ret; break; } ! } /* }}} */ + /* {{{ proto int system(string command [, int return_value]) + Execute an external program and display output */ void php3_system(INTERNAL_FUNCTION_PARAMETERS) { pval *arg1, *arg2; *************** *** 248,255 **** arg2->value.lval=ret; break; } ! } void php3_passthru(INTERNAL_FUNCTION_PARAMETERS) { pval *arg1, *arg2; --- 252,261 ---- arg2->value.lval=ret; break; } ! } /* }}} */ + /* {{{ proto int passthru(string command [, int return_value]) + Execute an external program and display raw output */ void php3_passthru(INTERNAL_FUNCTION_PARAMETERS) { pval *arg1, *arg2; *************** *** 272,278 **** arg2->value.lval=ret; break; } ! } static int php3_ind(char *s, char c) { --- 278,284 ---- arg2->value.lval=ret; break; } ! } /* }}} */ static int php3_ind(char *s, char c) { *************** *** 312,317 **** --- 318,325 ---- return cmd; } + /* {{{ proto escapeshellcmd(string command) + escape shell metacharacters */ void php3_escapeshellcmd(INTERNAL_FUNCTION_PARAMETERS) { pval *arg1; *************** *** 325,331 **** RETVAL_STRING(cmd,1); efree(cmd); ! } /* * Local variables: * tab-width: 4 --- 333,339 ---- RETVAL_STRING(cmd,1); efree(cmd); ! } /* }}} */ /* * Local variables: * tab-width: 4 Index: php3/functions/reg.c diff -c php3/functions/reg.c:1.86 php3/functions/reg.c:1.87 *** php3/functions/reg.c:1.86 Thu Sep 10 19:57:21 1998 --- php3/functions/reg.c Fri Nov 6 17:53:29 1998 *************** *** 28,34 **** | Jaakko Hyvätti <jaakko@hyvatti.iki.fi> | +----------------------------------------------------------------------+ */ ! /* $Id: reg.c,v 1.86 1998/09/10 23:57:21 zeev Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif --- 28,34 ---- | Jaakko Hyvätti <jaakko@hyvatti.iki.fi> | +----------------------------------------------------------------------+ */ ! /* $Id: reg.c,v 1.87 1998/11/06 22:53:29 rasmus Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif *************** *** 209,223 **** regfree(&re); } void php3_ereg(INTERNAL_FUNCTION_PARAMETERS) { _php3_ereg(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); ! } void php3_eregi(INTERNAL_FUNCTION_PARAMETERS) { _php3_ereg(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); ! } /* this is the meat and potatoes of regex replacement! */ char *_php3_regreplace(const char *pattern, const char *replace, const char *string, int icase, int extended) --- 209,227 ---- regfree(&re); } + /* {{{ proto int ereg(string pattern, string string [, array registers]) + Regular expression match */ void php3_ereg(INTERNAL_FUNCTION_PARAMETERS) { _php3_ereg(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); ! } /* }}} */ + /* {{{ proto int eregi(string pattern, string string [, array registers]) + Case-insensitive regular expression match */ void php3_eregi(INTERNAL_FUNCTION_PARAMETERS) { _php3_ereg(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); ! } /* }}} */ /* this is the meat and potatoes of regex replacement! */ char *_php3_regreplace(const char *pattern, const char *replace, const char *string, int icase, int extended) *************** *** 418,435 **** STR_FREE(pattern); } void php3_eregreplace(INTERNAL_FUNCTION_PARAMETERS) { _php3_eregreplace(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); ! } void php3_eregireplace(INTERNAL_FUNCTION_PARAMETERS) { _php3_eregreplace(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); ! } /* ("root", "passwd", "uid", "gid", "other:stuff:like:/bin/sh") = split(":", $passwd_file, 5); */ void php3_split(INTERNAL_FUNCTION_PARAMETERS) { pval *spliton, *str, *arg_count = NULL; --- 422,445 ---- STR_FREE(pattern); } + /* {{{ proto string ereg_replace(string pattern, string string [, array registers]) + Replace regular expression */ void php3_eregreplace(INTERNAL_FUNCTION_PARAMETERS) { _php3_eregreplace(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); ! } /* }}} */ + /* {{{ proto string eregi_replace(string pattern, string string [, array registers]) + Case insensitive replace regular expression */ void php3_eregireplace(INTERNAL_FUNCTION_PARAMETERS) { _php3_eregreplace(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); ! } /* }}} */ /* ("root", "passwd", "uid", "gid", "other:stuff:like:/bin/sh") = split(":", $passwd_file, 5); */ + /* {{{ proto array split(string pattern, string string [, int limit]) + split string into array by regular expression */ void php3_split(INTERNAL_FUNCTION_PARAMETERS) { pval *spliton, *str, *arg_count = NULL; *************** *** 521,529 **** regfree(&re); return; ! } ! PHPAPI void php3_sql_regcase(INTERNAL_FUNCTION_PARAMETERS) { pval *string; --- 531,540 ---- regfree(&re); return; ! } /* }}} */ + /* {{{ proto string sql_regcase(string string) + Make regular expression for case insensitive match */ PHPAPI void php3_sql_regcase(INTERNAL_FUNCTION_PARAMETERS) { pval *string; *************** *** 549,555 **** return_value->value.str.val = tmp; return_value->value.str.len = string->value.str.len*4; return_value->type = IS_STRING; ! } /* * Local variables: --- 560,566 ---- return_value->value.str.val = tmp; return_value->value.str.len = string->value.str.len*4; return_value->type = IS_STRING; ! } /* }}} */ /* * Local variables: -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net