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 <dsp@php.net>
[DOC]: These changes will be available from 5.3+

# Note: Fixed also tests and synced basic_functions.c with HEAD.

4 files changed, 5 insertions, 219 deletions

diff --git a/sapi/cli/config.w32 b/sapi/cli/config.w32
index 98ca1d0cc3..a30e7cec6a 100644
--- a/sapi/cli/config.w32
+++ b/sapi/cli/config.w32
@@ -6,7 +6,7 @@ ARG_ENABLE('crt-debug', 'Extra CRT debugging', 'no');
 ARG_ENABLE('cli-win32', 'Build console-less CLI version of PHP', 'no');
 
 if (PHP_CLI == "yes") {
-	SAPI('cli', 'getopt.c php_cli.c php_cli_readline.c', 'php.exe');
+	SAPI('cli', '..\\..\\main\\getopt.c php_cli.c php_cli_readline.c', 'php.exe');
 	if (PHP_CRT_DEBUG == "yes") {
 		ADD_FLAG("CFLAGS_CLI", "/D PHP_WIN32_DEBUG_HEAP");
 	}
@@ -14,7 +14,7 @@ if (PHP_CLI == "yes") {
 }
 
 if (PHP_CLI_WIN32 == "yes") {
-	SAPI('cli_win32', 'getopt.c cli_win32.c php_cli_readline.c', 'php-win.exe');
+	SAPI('cli_win32', '..\\..\\main\\getopt.c cli_win32.c php_cli_readline.c', 'php-win.exe');
 	ADD_FLAG("LDFLAGS_CLI_WIN32", "/stack:8388608");
 }
 
diff --git a/sapi/cli/getopt.c b/sapi/cli/getopt.c
deleted file mode 100644
index 7e6419e674..0000000000
--- a/sapi/cli/getopt.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2007 The PHP Group                                |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.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.               |
-   +----------------------------------------------------------------------+
-   | Author: Marcus Boerger <helly@php.net>                               |
-   +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include <stdlib.h>
-#include "php_getopt.h"
-#define OPTERRCOLON (1)
-#define OPTERRNF (2)
-#define OPTERRARG (3)
-
-
-static int php_opt_error(int argc, char * const *argv, int oint, int optchr, int err, int show_err) /* {{{ */
-{
-	if (show_err)
-	{
-		fprintf(stderr, "Error in argument %d, char %d: ", oint, optchr+1);
-		switch(err)
-		{
-		case OPTERRCOLON:
-			fprintf(stderr, ": in flags\n");
-			break;
-		case OPTERRNF:
-			fprintf(stderr, "option not found %c\n", argv[oint][optchr]);
-			break;
-		case OPTERRARG:
-			fprintf(stderr, "no argument for option %c\n", argv[oint][optchr]);
-			break;
-		default:
-			fprintf(stderr, "unknown\n");
-			break;
-		}
-	}
-	return('?');
-}
-/* }}} */
-
-int php_getopt(int argc, char* const *argv, const opt_struct opts[], char **optarg, int *optind, int show_err) /* {{{ */
-{
-	static int optchr = 0;
-	static int dash = 0; /* have already seen the - */
-	int arg_start = 2;
-
-	int opts_idx = -1;
-
-	if (*optind >= argc) {
-		return(EOF);
-	}
-	if (!dash) {
-		if ((argv[*optind][0] !=  '-')) {
-			return(EOF);
-		} else {
-			if (!argv[*optind][1])
-			{
-				/*
-				* use to specify stdin. Need to let pgm process this and
-				* the following args
-				*/
-				return(EOF);
-			}
-		}
-	}
-	if ((argv[*optind][0] == '-') && (argv[*optind][1] == '-')) {
-		/* '--' indicates end of args if not followed by a known long option name */
-		if (argv[*optind][2] == '\0') {
-			(*optind)++;
-			return(EOF);
-		}
-
-		while (1) {
-			opts_idx++;
-			if (opts[opts_idx].opt_char == '-') {
-				(*optind)++;
-				return(php_opt_error(argc, argv, *optind-1, optchr, OPTERRARG, show_err));
-			} else if (opts[opts_idx].opt_name && !strcmp(&argv[*optind][2], opts[opts_idx].opt_name)) {
-				break;
-			}
-		}
-		optchr = 0;
-		dash = 0;
-		arg_start = 2 + strlen(opts[opts_idx].opt_name);
-	} else {
-		if (!dash) {
-			dash = 1;
-			optchr = 1;
-		}
-		/* Check if the guy tries to do a -: kind of flag */
-		if (argv[*optind][optchr] == ':') {
-			dash = 0;
-			(*optind)++;
-			return (php_opt_error(argc, argv, *optind-1, optchr, OPTERRCOLON, show_err));
-		}
-		arg_start = 1 + optchr;
-	}
-	if (opts_idx < 0) {
-		while (1) {
-			opts_idx++;
-			if (opts[opts_idx].opt_char == '-') {
-				int errind = *optind;
-				int errchr = optchr;
-		
-				if (!argv[*optind][optchr+1]) {
-					dash = 0;
-					(*optind)++;
-				} else {
-					optchr++;
-					arg_start++;
-				}
-				return(php_opt_error(argc, argv, errind, errchr, OPTERRNF, show_err));
-			} else if (argv[*optind][optchr] == opts[opts_idx].opt_char) {
-				break;
-			}
-		}
-	}
-	if (opts[opts_idx].need_param) {
-		/* Check for cases where the value of the argument
-		is in the form -<arg> <val> or in the form -<arg><val> */
-		dash = 0;
-		if(!argv[*optind][arg_start]) {
-			(*optind)++;
-			if (*optind == argc) {
-				return(php_opt_error(argc, argv, *optind-1, optchr, OPTERRARG, show_err));
-			}
-			*optarg = argv[(*optind)++];
-		} else {
-			*optarg = &argv[*optind][arg_start];
-			(*optind)++;
-		}
-		return opts[opts_idx].opt_char;
-	} else {
-		/* multiple options specified as one (exclude long opts) */
-		if (arg_start >= 2 && !((argv[*optind][0] == '-') && (argv[*optind][1] == '-'))) {
-			if (!argv[*optind][optchr+1])
-			{
-				dash = 0;
-				(*optind)++;
-			} else {
-				optchr++;
-			}
-		} else {
-			(*optind)++;
-		}
-		return opts[opts_idx].opt_char;
-	}
-	assert(0);
-	return(0);	/* never reached */
-}
-/* }}} */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
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 */
diff --git a/sapi/cli/php_getopt.h b/sapi/cli/php_getopt.h
deleted file mode 100644
index fc14c96743..0000000000
--- a/sapi/cli/php_getopt.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2007 The PHP Group                                |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.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.               |
-   +----------------------------------------------------------------------+
-   | Author: Marcus Boerger <helly@php.net>                               |
-   +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-
-#include "php.h"
-
-#ifdef NETWARE
-/*
-As NetWare LibC has optind and optarg macros defined in unistd.h our local variables were getting mistakenly preprocessed so undeffing optind and optarg
-*/
-#undef optarg
-#undef optind
-#endif
-/* Define structure for one recognized option (both single char and long name).
- * If short_open is '-' this is the last option.
- */
-typedef struct _opt_struct {
-	const char opt_char;
-	const int  need_param;
-	const char * opt_name;
-} opt_struct;
-
-int php_getopt(int argc, char* const *argv, const opt_struct opts[], char **optarg, int *optind, int show_err);