X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2d5d9e243c91784909b11948894e3ba0989107c0..07916b2ff:/uip/install-mh.c?ds=sidebyside

diff --git a/uip/install-mh.c b/uip/install-mh.c
index a79793f5..414a4877 100644
--- 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 \
@@ -80,11 +81,10 @@ main (int argc, char **argv)
      *	the home directory field in the password file if that's not found.
      */
 
-    if ((mypath = getenv("HOME")) == (char *)0) {
-	if ((pw = getpwuid(getuid())) == (struct passwd *)0 || *pw->pw_dir == '\0')
+    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,19 +128,16 @@ 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)
-	    printf ("I'm going to create the standard nmh path for you.\n");
+	    puts("I'm going to create the standard nmh path for you.");
 	else
 	    cp = concat ("Do you want the standard nmh path \"",
 		    mypath, "/", "Mail\"? ", NULL);
@@ -174,7 +168,7 @@ query:
 	    if (makedir (pathname) == 0)
 		adios (NULL, "unable to create %s", pathname);
     } else {
-	printf ("[Using existing directory]\n");
+	puts("[Using existing directory]");
     }
 
     /*
@@ -182,8 +176,8 @@ query:
      */
     NEW(np);
     m_defs = np;
-    np->n_name = getcpy ("Path");
-    np->n_field = getcpy (pathname);
+    np->n_name = mh_xstrdup("Path");
+    np->n_field = mh_xstrdup(pathname);
     np->n_context = 0;
     np->n_next = NULL;