From 2bc631fb4040b731388fb126c2ca76a06d3989d1 Mon Sep 17 00:00:00 2001 From: Jani Taskinen Date: Mon, 1 Oct 2007 12:40:54 +0000 Subject: MFH:- Added common getopt implementation to core. MFH:- Added long-option feature to getopt(). MFH:- Made getopt() available on win32 systems. MFH: Patch by: David Soria Parra [DOC]: These changes will be available from 5.3+ # Note: Fixed also tests and synced basic_functions.c with HEAD. --- sapi/cli/php_cli.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sapi/cli/php_cli.c') diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 395888cceb..0f432f257e 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -664,7 +664,7 @@ int main(int argc, char *argv[]) memcpy(cli_sapi_module.ini_entries, HARDCODED_INI, ini_entries_len+1); cli_sapi_module.ini_entries[ini_entries_len+1] = 0; - while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0))!=-1) { + while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0, 2))!=-1) { switch (c) { case 'c': if (cli_sapi_module.php_ini_path_override) { @@ -735,7 +735,7 @@ int main(int argc, char *argv[]) goto out_err; } - while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0)) != -1) { + while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0, 2)) != -1) { switch (c) { case 'h': /* help & quit */ @@ -806,7 +806,7 @@ int main(int argc, char *argv[]) php_optind = orig_optind; php_optarg = orig_optarg; - while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0)) != -1) { + while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0, 2)) != -1) { switch (c) { case 'a': /* interactive mode */ -- cgit v1.2.1