Skip to content

ext/getopt.c: simplify and cleanup #22139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DanielEScherzer merged 1 commit into from
May 24, 2026
Merged

ext/getopt.c: simplify and cleanup #22139

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 22 additions & 26 deletions main/getopt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,14 @@
#include <stdlib.h>
#include "php_getopt.h"

#define OPTERRCOLON (1)
#define OPTERRNF (2)
#define OPTERRARG (3)
#define OPTERRCOLON 1
#define OPTERRNF 2
#define OPTERRARG 3

// Print error message to stderr and return -2 to distinguish it from '?' command line option.
static int php_opt_error(int argc, char * const *argv, int optint, int optchr, int err, int show_err) /* {{{ */
{
if (show_err)
{
if (show_err) {
fprintf(stderr, "Error in argument %d, char %d: ", optint, optchr+1);
switch(err)
{
Expand Down Expand Up @@ -61,28 +60,26 @@ PHPAPI int php_getopt(int argc, char* const *argv, const opt_struct opts[], char
*optarg = NULL;
}

if(prev_optarg && prev_optarg != optarg) {
if (prev_optarg && prev_optarg != optarg) {
/* reset the state */
optchr = 0;
dash = 0;
}
prev_optarg = optarg;

if (*optind >= argc) {
return(EOF);
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] != '-') {
return EOF;
}
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] == '-')) {
Expand All @@ -92,7 +89,7 @@ PHPAPI int php_getopt(int argc, char* const *argv, const opt_struct opts[], char
/* '--' indicates end of args if not followed by a known long option name */
if (argv[*optind][2] == '\0') {
(*optind)++;
return(EOF);
return EOF;
}

arg_start = 2;
Expand All @@ -109,7 +106,7 @@ PHPAPI int php_getopt(int argc, char* const *argv, const opt_struct opts[], char
php_optidx++;
if (opts[php_optidx].opt_char == '-') {
(*optind)++;
return(php_opt_error(argc, argv, *optind-1, optchr, OPTERRARG, show_err));
return php_opt_error(argc, argv, *optind-1, optchr, OPTERRARG, show_err);
} else if (opts[php_optidx].opt_name && !strncmp(&argv[*optind][2], opts[php_optidx].opt_name, arg_end) && arg_end == strlen(opts[php_optidx].opt_name)) {
break;
}
Expand All @@ -127,7 +124,7 @@ PHPAPI int php_getopt(int argc, char* const *argv, const opt_struct opts[], char
if (argv[*optind][optchr] == ':') {
dash = 0;
(*optind)++;
return (php_opt_error(argc, argv, *optind-1, optchr, OPTERRCOLON, show_err));
return php_opt_error(argc, argv, *optind-1, optchr, OPTERRCOLON, show_err);
}
arg_start = 1 + optchr;
}
Expand All @@ -145,7 +142,7 @@ PHPAPI int php_getopt(int argc, char* const *argv, const opt_struct opts[], char
optchr++;
arg_start++;
}
return(php_opt_error(argc, argv, errind, errchr, OPTERRNF, show_err));
return php_opt_error(argc, argv, errind, errchr, OPTERRNF, show_err);
} else if (argv[*optind][optchr] == opts[php_optidx].opt_char) {
break;
}
Expand All @@ -160,7 +157,7 @@ PHPAPI int php_getopt(int argc, char* const *argv, const opt_struct opts[], char
if (*optind == argc) {
/* Was the value required or is it optional? */
if (opts[php_optidx].need_param == 1) {
return(php_opt_error(argc, argv, *optind-1, optchr, OPTERRARG, show_err));
return php_opt_error(argc, argv, *optind-1, optchr, OPTERRARG, show_err);
}
/* Optional value is not supported with -<arg> <val> style */
} else if (opts[php_optidx].need_param == 1) {
Expand All @@ -178,8 +175,7 @@ PHPAPI int php_getopt(int argc, char* const *argv, const opt_struct opts[], 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])
{
if (!argv[*optind][optchr+1]) {
dash = 0;
(*optind)++;
} else {
Expand All @@ -191,6 +187,6 @@ PHPAPI int php_getopt(int argc, char* const *argv, const opt_struct opts[], char
return opts[php_optidx].opt_char;
}
assert(0);
return(0); /* never reached */
return 0; /* never reached */
}
/* }}} */
Loading