[Pkg-privacy-commits] [onioncat] 213/340: minor bugfix with initial config file read

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch debian
in repository onioncat.

commit 23fa65af6092b2d544ea4f0d66618dd5c00afcba
Author: eagle <eagle at 58e1ccc2-750e-0410-8d0d-f93ca75ab447>
Date:   Mon Feb 8 22:27:43 2010 +0000

    minor bugfix with initial config file read
    
    git-svn-id: http://www.cypherpunk.at/svn/onioncat/trunk@542 58e1ccc2-750e-0410-8d0d-f93ca75ab447
---
 configure  | 22 +++++++++++-----------
 src/ocat.c |  5 ++++-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/configure b/configure
index 614fa3b..abd4cf3 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /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 at cypherpunk.at>.
 #
@@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 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 at cypherpunk.at'
 
 ac_subst_vars='SHELL
@@ -1260,7 +1260,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # 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]...
 
@@ -1330,7 +1330,7 @@ fi
 
 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
 
@@ -1422,7 +1422,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 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
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1436,7 +1436,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 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
 
   $ $0 $@
@@ -2085,7 +2085,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='onioncat'
- VERSION='0.2.2.r541'
+ VERSION='0.2.2.r542'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2236,7 +2236,7 @@ ac_config_headers="$ac_config_headers config.h"
 
 
 cat >>confdefs.h <<\_ACEOF
-#define SVN_REVISION "541"
+#define SVN_REVISION "542"
 _ACEOF
 
 
@@ -5325,7 +5325,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # 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
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5378,7 +5378,7 @@ Report bugs to <bug-autoconf at gnu.org>."
 _ACEOF
 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'`\\"
 
diff --git a/src/ocat.c b/src/ocat.c
index df4095b..9b0be71 100644
--- a/src/ocat.c
+++ b/src/ocat.c
@@ -281,7 +281,6 @@ void parse_opt_early(int argc, char *argv[])
          case 'f':
             free(CNF(config_file));
             CNF(config_file) = optarg;
-            CNF(config_read) = 0;
             break;
 
          case 'I':
@@ -430,9 +429,13 @@ int main(int argc, char *argv[])
    }
 
    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);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onioncat.git