diff options
| -rw-r--r-- | phpdbg.c | 24 | ||||
| -rw-r--r-- | phpdbg_help.c | 1 |
2 files changed, 13 insertions, 12 deletions
@@ -569,7 +569,6 @@ const opt_struct OPTIONS[] = { /* {{{ */ {'z', 1, "load zend_extension"}, /* phpdbg options */ {'q', 0, "no banner"}, - {'e', 1, "exec"}, {'v', 0, "disable quietness"}, {'s', 0, "enable stepping"}, {'b', 0, "boring colours"}, @@ -983,16 +982,6 @@ phpdbg_main: /* begin phpdbg options */ - case 'e': { /* set execution context */ - exec_len = strlen(php_optarg); - if (exec_len) { - if (exec) { - free(exec); - } - exec = strdup(php_optarg); - } - } break; - case 'S': { /* set SAPI name */ if (sapi_name) { free(sapi_name); @@ -1083,6 +1072,19 @@ phpdbg_main: } break; } } + + /* set exec if present on command line */ + if ((argc > php_optind) && (strcmp(argv[php_optind-1],"--") != SUCCESS)) + { + exec_len = strlen(argv[php_optind]); + if (exec_len) { + if (exec) { + free(exec); + } + exec = strdup(argv[php_optind]); + } + php_optind++; + } #ifndef _WIN32 /* setup remote server if necessary */ diff --git a/phpdbg_help.c b/phpdbg_help.c index 2a6f9e82b6..f912f46787 100644 --- a/phpdbg_help.c +++ b/phpdbg_help.c @@ -361,7 +361,6 @@ phpdbg_help_text_t phpdbg_help_text[] = { " **-d** **-d**memory_limit=4G Set a php.ini directive" CR " **-n** Disable default php.ini" CR " **-q** Supress welcome banner" CR -" **-e** **-e**mytest.php Set execution context" CR " **-v** Enable oplog output" CR " **-s** Enable stepping" CR " **-b** Disable colour" CR |