Changeset 542

Timestamp:

02/08/10 23:27:43 (2 years ago)

Author:

eagle

Message:

minor bugfix with initial config file read

Location:

trunk

Files:

• configure (modified) (10 diffs)
• src/ocat.c (modified) (2 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.r541.
+# Generated by GNU Autoconf 2.62 for onioncat 0.2.2.r542.
 #
 # Report bugs to <rahra@cypherpunk.at>.
@@ -597 +597 @@
 PACKAGE_NAME='onioncat'
 PACKAGE_TARNAME='onioncat'
-PACKAGE_VERSION='0.2.2.r541'
-PACKAGE_STRING='onioncat 0.2.2.r541'
+PACKAGE_VERSION='0.2.2.r542'
+PACKAGE_STRING='onioncat 0.2.2.r542'
 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.r541 to adapt to many kinds of systems.
+\`configure' configures onioncat 0.2.2.r542 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.r541:";;
+     short | recursive ) echo "Configuration of onioncat 0.2.2.r542:";;
    esac
   cat <<\_ACEOF
@@ -1423 +1423 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-onioncat configure 0.2.2.r541
+onioncat configure 0.2.2.r542
 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.r541, which was
+It was created by onioncat $as_me 0.2.2.r542, 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.r541'
+ VERSION='0.2.2.r542'
 
 
@@ -2237 +2237 @@
 
 cat >>confdefs.h <<\_ACEOF
-#define SVN_REVISION "541"
+#define SVN_REVISION "542"
 _ACEOF
 
@@ -5326 +5326 @@
 # values after options handling.
 ac_log="
-This file was extended by onioncat $as_me 0.2.2.r541, which was
+This file was extended by onioncat $as_me 0.2.2.r542, 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.r541
+onioncat config.status 0.2.2.r542
 configured by $0, generated by GNU Autoconf 2.62,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

trunk/src/ocat.c

@@ -282 +282 @@
             free(CNF(config_file));
             CNF(config_file) = optarg;
-            CNF(config_read) = 0;
             break;
 
@@ -431 +430 @@
 
    if ((c = open(CNF(config_file), O_RDONLY)) == -1)
+   {
       CNF(config_failed) = errno;
+      CNF(config_read) = 1;
+   }
    else
       ctrl_handler((void*) (long) c);
+ 
 
    urlconv = parse_opt(argc, argv);