routesearch: improve arg parsing

[ypp-sc-tools.db-test.git] / yarrg / rsmain.c

diff --git a/yarrg/rsmain.c b/yarrg/rsmain.c
index 2e1c500308658ed53c60a49e7b9fc3f64590a268..f99f866d2ee0e39316403e2cd682bc5e7ef98c3a 100644 (file)
--- a/yarrg/rsmain.c
+++ b/yarrg/rsmain.c
@@ -30,6 +30,7 @@ int main(int argc, const char **argv) {
   const char *arg;
   int i, ap;
   int granui;
+  const char *database=0;
 
 #ifndef debug_flags
   debug_flags= ~( dbg_sql2 );
@@ -38,14 +39,18 @@ int main(int argc, const char **argv) {
   for (;;) {
     arg= *++argv;
     if (arg[0] != '-') break;
+    if (!strcmp(arg,"-d")) {
+      database= *++argv;
+    } else if (!strcmp(arg,"-g")) {
+      granus= atoi(*++argv);
+      assert(granus>=1 && granus<=GRANUS);
 #ifndef debug_flags
-    if (!strcmp(arg,"-DN")) {
+    } else if (!strcmp(arg,"-DN")) {
       debug_flags= 0;
     } else if (!strcmp(arg,"-D1")) {
       debug_flags= ~(dbg_sql2|dbg_lp|dbg_value2);
-    } else
+    } else {
 #endif
-    {
       abort();
     }
   }
@@ -77,8 +82,6 @@ int main(int argc, const char **argv) {
     debug_file= stderr;
   }
 
-  const char *database= *argv++;
-
   sysassert( !setvbuf(debug,0,_IOLBF,0) );
 
   max_mass= atof(*argv++);