hholzgra Mon Oct 21 15:24:49 2002 EDT
Modified files:
/php4/ext/standard basic_functions.c
Log:
fixed build for getopt_long-less platforms,
removed left-over todo comments
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.534
php4/ext/standard/basic_functions.c:1.535
--- php4/ext/standard/basic_functions.c:1.534 Mon Oct 21 15:12:13 2002
+++ php4/ext/standard/basic_functions.c Mon Oct 21 15:24:48 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.534 2002/10/21 19:12:13 jon Exp $ */
+/* $Id: basic_functions.c,v 1.535 2002/10/21 19:24:48 hholzgra Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -1412,8 +1412,6 @@
* 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 @@
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 @@
#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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
