Add more NORETURN and CHECK_PRINTF function attributes.

[nmh] / uip / install-mh.c

diff --git a/uip/install-mh.c b/uip/install-mh.c
index 09d1f9dfa8caba00d9d065fa357dd86065b06beb..414a4877410ed637e41258761080ae9486486c6a 100644 (file)
--- a/uip/install-mh.c
+++ b/uip/install-mh.c
@@ -1,5 +1,4 @@
-/*
- * install-mh.c -- initialize the nmh environment of a new user
+/* install-mh.c -- initialize the nmh environment of a new user
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -8,6 +7,8 @@
 
 #include <h/mh.h>                              /* mh internals */
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
+#include "../sbr/makedir.h"
 #include <pwd.h>                               /* structure for getpwuid() results */
 
 #define INSTALLMH_SWITCHES \
@@ -83,8 +84,7 @@ main (int argc, char **argv)
     if ((mypath = getenv("HOME")) == NULL) {
        if ((pw = getpwuid(getuid())) == NULL || *pw->pw_dir == '\0')
            adios(NULL, "cannot determine your home directory");
-       else
-           mypath = pw->pw_dir;
+        mypath = pw->pw_dir;
     }
 
     /*
@@ -108,15 +108,12 @@ main (int argc, char **argv)
     if (stat (defpath, &st) != NOTOK) {
        if (check)
            done(0);
-
-       else if (autof)
+       if (autof)
            adios (NULL, "invocation error");
-       else
-           adios (NULL, "You already have an nmh profile, use an editor to modify it");
+        adios (NULL, "You already have an nmh profile, use an editor to modify it");
     }
-    else if (check) {
+    if (check)
        done(1);
-    }
 
     if (!autof && read_switch ("Do you want help? ", anoyes)) {
        (void)printf(
@@ -131,16 +128,13 @@ main (int argc, char **argv)
 
     cp = concat (mypath, "/", "Mail", NULL);
     if (stat (cp, &st) != NOTOK) {
-       if (S_ISDIR(st.st_mode)) {
-           cp = concat ("You already have the standard nmh directory \"",
-                   cp, "\".\nDo you want to use it for nmh? ", NULL);
-           if (read_switch (cp, anoyes))
-               pathname = "Mail";
-           else
-               goto query;
-       } else {
+       if (!S_ISDIR(st.st_mode))
            goto query;
-       }
+        cp = concat ("You already have the standard nmh directory \"",
+                cp, "\".\nDo you want to use it for nmh? ", NULL);
+        if (!read_switch (cp, anoyes))
+            goto query;
+        pathname = "Mail";
     } else {
        if (autof)
            puts("I'm going to create the standard nmh path for you.");