Changeset 545

Timestamp:

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

Author:

eagle

Message:

parse options twice caused some troubles at least on Linux.

Location:

trunk

Files:

• configure (modified) (10 diffs)
• src/ocat.c (modified) (7 diffs)

trunk/configure

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for onioncat 0.2.2.r544.
+# Generated by GNU Autoconf 2.62 for onioncat 0.2.2.r545.
 #
 # Report bugs to <rahra@cypherpunk.at>.
@@ -597 +597 @@
 PACKAGE_NAME='onioncat'
 PACKAGE_TARNAME='onioncat'
-PACKAGE_VERSION='0.2.2.r544'
-PACKAGE_STRING='onioncat 0.2.2.r544'
+PACKAGE_VERSION='0.2.2.r545'
+PACKAGE_STRING='onioncat 0.2.2.r545'
 PACKAGE_BUGREPORT='rahra@cypherpunk.at'
 
@@ -1261 +1261 @@
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures onioncat 0.2.2.r544 to adapt to many kinds of systems.
+\`configure' configures onioncat 0.2.2.r545 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1331 +1331 @@
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of onioncat 0.2.2.r544:";;
+     short | recursive ) echo "Configuration of onioncat 0.2.2.r545:";;
    esac
   cat <<\_ACEOF
@@ -1423 +1423 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-onioncat configure 0.2.2.r544
+onioncat configure 0.2.2.r545
 generated by GNU Autoconf 2.62
 
@@ -1437 +1437 @@
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by onioncat $as_me 0.2.2.r544, which was
+It was created by onioncat $as_me 0.2.2.r545, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
@@ -2086 +2086 @@
 # Define the identity of the package.
  PACKAGE='onioncat'
- VERSION='0.2.2.r544'
+ VERSION='0.2.2.r545'
 
 
@@ -2237 +2237 @@
 
 cat >>confdefs.h <<\_ACEOF
-#define SVN_REVISION "544"
+#define SVN_REVISION "545"
 _ACEOF
 
@@ -5326 +5326 @@
 # values after options handling.
 ac_log="
-This file was extended by onioncat $as_me 0.2.2.r544, which was
+This file was extended by onioncat $as_me 0.2.2.r545, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
@@ -5379 +5379 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-onioncat config.status 0.2.2.r544
+onioncat config.status 0.2.2.r545
 configured by $0, generated by GNU Autoconf 2.62,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

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));