Changeset 545 for trunk/src/ocat.c

Timestamp:

02/11/10 14:42:19 (2 years ago)

Author:

eagle

Message:

parse options twice caused some troubles at least on Linux.

File:

• trunk/src/ocat.c (modified) (7 diffs)

trunk/src/ocat.c

@@ -271 +271 @@
 
 
-void parse_opt_early(int argc, char *argv[])
+void parse_opt_early(int argc, char *argv_orig[])
 {
    int c;
-
+   char *argv[argc + 1];
+
+   log_debug("parse_opt_early()");
+   // argv array is copied to prevent the original one from being modified by
+   // getopt(). This behavior is at least true for Linux.
+   memcpy(&argv, argv_orig, sizeof(char*) * (argc + 1));
    opterr = 0;
    while ((c = getopt(argc, argv, "f:I")) != -1)
+   {
+      log_debug("getopt(): c = %c, optind = %d, opterr = %d, optarg = \"%s\"", c, optind, opterr, optarg);
       switch (c)
       {
@@ -291 +298 @@
             break;
       }
+   }
 }
 
@@ -298 +306 @@
    int c, urlconv = 0;
 
+   log_debug("parse_opt_early()");
    opterr = 1;
    optind = 1;
    while ((c = getopt(argc, argv, "f:IabBCd:hrRiopl:t:T:s:u:4L:P:")) != -1)
+   {
+      log_debug("getopt(): c = %c, optind = %d, opterr = %d, optarg = \"%s\"", c, optind, opterr, optarg);
       switch (c)
       {
@@ -399 +410 @@
             exit(1);
       }
+   }
 
    return urlconv;
@@ -423 +435 @@
    }
 
+#ifdef DEBUG
+   for (c = 0; c < argc; c++) log_debug("argv[%d] = \"%s\"", c, argv[c]);
+#endif
    parse_opt_early(argc, argv);
 
@@ -439 +454 @@
       ctrl_handler((void*) (long) c);
  
-
+#ifdef DEBUG
+   for (c = 0; c < argc; c++) log_debug("argv[%d] = \"%s\"", c, argv[c]);
+#endif
    urlconv = parse_opt(argc, argv);
 
@@ -480 +497 @@
 
    // copy onion-URL from command line
+   log_debug("argv[%d] = \"%s\"", optind, argv[optind]);
    if (!CNF(rand_addr))
       strncpy(CNF(onion_url), argv[optind], NDESC(name_size));