diff options
| author | Hartmut Holzgraefe <hholzgra@php.net> | 2002-10-21 19:24:48 +0000 |
|---|---|---|
| committer | Hartmut Holzgraefe <hholzgra@php.net> | 2002-10-21 19:24:48 +0000 |
| commit | f768d343f501832b14befedbf6934e339182f512 (patch) | |
| tree | 6ca4d72ab9739bfcbe143cb442e0b74d5649c466 /ext/standard/basic_functions.c | |
| parent | 3fd56c2995f992bb80cfc1a33f6d56501e333c49 (diff) | |
| download | php-git-f768d343f501832b14befedbf6934e339182f512.tar.gz | |
fixed build for getopt_long-less platforms,
removed left-over todo comments
Diffstat (limited to 'ext/standard/basic_functions.c')
| -rw-r--r-- | ext/standard/basic_functions.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index af30c32daf..a9ff8571cf 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -1412,8 +1412,6 @@ PHP_FUNCTION(getopt) * Get argv from the global symbol table. We calculate argc ourselves * in order to be on the safe side, even though it is also available * from the symbol table. - * - * TODO: Take from trackbars instead. */ if (zend_hash_find(HASH_OF(PG(http_globals)[TRACK_VARS_SERVER]), "argv", sizeof("argv"), (void **) &args) != FAILURE) { @@ -1469,7 +1467,6 @@ PHP_FUNCTION(getopt) while (zend_hash_get_current_data(Z_ARRVAL_P(p_longopts), (void **)&arg) == SUCCESS) { - /* TODO: check for : and ::, strip'em, efrees ... */ p->has_arg = 0; name = estrdup(Z_STRVAL_PP(arg)); len = strlen(name); @@ -1513,13 +1510,14 @@ PHP_FUNCTION(getopt) #endif /* Skip unknown arguments. */ if (o == '?') { - // TODO bailout? continue; } /* Prepare the option character and the argument string. */ if(o == 0) { +#ifdef HAVE_GETOPT_LONG optname = (char *)longopts[longindex].name; +#endif } else { if(o == 1) o = '-'; opt[0] = o; |