From d4fd1c07b1dfac42061d96c3a7aae9f0b91d218d Mon Sep 17 00:00:00 2001 From: Marcus Boerger Date: Sun, 16 Feb 2003 01:23:11 +0000 Subject: - Allow long option names - Update CLI's manpage @Added support for long options in CLI & CGI (e.g. --version). (Marcus) # In contrast to the preliminary patch this should work now completely. # If all long option names are accepted we may even think about MFHing. --- sapi/cli/php_getopt.h | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) (limited to 'sapi/cli/php_getopt.h') diff --git a/sapi/cli/php_getopt.h b/sapi/cli/php_getopt.h index 40da432b59..1e2355ff63 100644 --- a/sapi/cli/php_getopt.h +++ b/sapi/cli/php_getopt.h @@ -1,7 +1,30 @@ -/* Borrowed from Apache NT Port */ +/* + +----------------------------------------------------------------------+ + | PHP Version 4 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997-2003 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. | + +----------------------------------------------------------------------+ + | Author: Marcus Boerger | + +----------------------------------------------------------------------+ +*/ + #include "php.h" -extern char *ap_php_optarg; -extern int ap_php_optind; +/* 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 ap_php_getopt(int argc, char* const *argv, const char *optstr); +int php_getopt(int argc, char* const *argv, const opt_struct opts[], char **optarg, int *optind, int show_err); -- cgit v1.2.1