[GNUnet-SVN] r2345 - GNUnet/src/conf

[durner]

Author: durner
Date: 2005-12-18 12:46:34 -0800 (Sun, 18 Dec 2005)
New Revision: 2345

Modified:
   GNUnet/src/conf/gnunet-setup.c
Log:
fix

Modified: GNUnet/src/conf/gnunet-setup.c
===================================================================
--- GNUnet/src/conf/gnunet-setup.c      2005-12-18 20:43:04 UTC (rev 2344)
+++ GNUnet/src/conf/gnunet-setup.c      2005-12-18 20:46:34 UTC (rev 2345)
@@ -222,10 +222,13 @@
 int main(int argc, char *argv[])
 {
   char *operation;
-  int def;
+  int def, done;
 
   if(OK != initUtil(argc, argv, &parser))
     return -1;
+
+  done = NO;
+
   operation = getConfigurationString("GNUNET-SETUP", "OPERATION");
   if (operation == NULL) {
     operation = STRDUP("");
@@ -233,8 +236,10 @@
       _("No interface specified, using default\n"));
     def = YES;
   }
-  else
+  else {
     def = NO;
+    done = YES;
+  }
   
   if(strcmp(operation, "gconfig") == 0 || def) {
     if (dyn_config("setup_gtk", "gconf_main",
@@ -244,8 +249,10 @@
         errexit(_("`%s' is not available."), "gconfig");
       }
     }
-    else
+    else {
       def = NO;
+      done = YES;
+    }
   }
   
   if(strcmp(operation, "menuconfig") == 0 || def) {
@@ -256,8 +263,10 @@
         errexit(_("`%s' is not available."), "menuconfig");
       }
     }
-    else
+    else {
       def = NO;
+      done = YES;
+    }
   }
   
   if(strcmp(operation, "config") == 0 || def)
@@ -284,7 +293,7 @@
       errexit(_("`%s' is not available."), "wizard-gtk");
     }
   }
-  else if (strcmp(operation, "") != 0) {
+  else if (!done) {
     printf(_("Unknown operation `%s'\n"), operation);
     printf(_("Use --help to get a list of options.\n"));
     FREE(operation);