fix program name stuff correctly

[moira.git] / clients / moira / main.c

diff --git a/clients/moira/main.c b/clients/moira/main.c
index 976a4c3c307b515fc627de0753e362ab141db47c..1d46fd2e52616015bbc4cca708e9850c7ecb04f4 100644 (file)
--- a/clients/moira/main.c
+++ b/clients/moira/main.c
@@ -65,6 +65,13 @@ main(argc, argv)
        user = getpwuid((int) getuid())->pw_name;
     user = (user && strlen(user)) ? Strsave(user) : "";
 
+    if ((program_name = rindex(argv[0], '/')) == NULL)
+      program_name = argv[0];
+    else
+      program_name++;
+    program_name = Strsave(program_name);
+    whoami = Strsave(program_name); /* used by menu.c,  ugh !!! */
+
     init_sms_err_tbl();
     init_krb_err_tbl();
     verbose = TRUE;
@@ -75,21 +82,14 @@ main(argc, argv)
        use_menu = FALSE;
       else 
        Usage();
-                               /* Fall Through. */
+      break;
     case 1:
-      if ((program_name = rindex(argv[0], '/')) == NULL)
-       program_name = argv[0];
-      else
-       program_name++;
       break;
     default:
       Usage();
       break;
     }
 
-    program_name = Strsave(program_name);
-    whoami = Strsave(program_name); /* used by menu.c,  ugh !!! */
-
     if ( status = sms_connect() ) 
        ErrorExit("\nConnection to SMS server failed", status);