From: Martin Mares <mj@ucw.cz>
Date: Mon, 24 Apr 2006 21:53:48 +0000 (+0200)
Subject: The "don't cf_load on error exit" optimization was wrong.
X-Git-Tag: holmes-import~645^2~11^2~48
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=47163d979f33ee9f0d577b12cb18b3135c9dfe1b;p=libucw.git

The "don't cf_load on error exit" optimization was wrong.
---

diff --git a/lib/conf2.c b/lib/conf2.c
index f6be8c6b..900e8e55 100644
--- a/lib/conf2.c
+++ b/lib/conf2.c
@@ -1347,7 +1347,7 @@ cf_get_opt(int argc, char * const argv[], const char *short_opts, const struct o
       }
     } else {
       /* unhandled option or end of options */
-      if (res == -1)
+      if (res != ':' && res != '?')
 	load_default();
       other_options++;
       return res;