Makefile.am: Alter long lists to be sorted, one entry per line.

[nmh] / uip / install-mh.c

diff --git a/uip/install-mh.c b/uip/install-mh.c
index 627c48e2d603eaa5207e6e9820252f01e8f5603a..bcdb3a2e94270ba68d9092a123a178c86c9a4fd7 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
@@ -80,8 +79,8 @@ 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;
@@ -143,7 +142,7 @@ main (int argc, char **argv)
        }
     } 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,16 +173,16 @@ query:
            if (makedir (pathname) == 0)
                adios (NULL, "unable to create %s", pathname);
     } else {
-       printf ("[Using existing directory]\n");
+       puts("[Using existing directory]");
     }
 
     /*
      * Add some initial elements to the profile/context list
      */
-    m_defs = (struct node *) mh_xmalloc (sizeof *np);
-    np = m_defs;
-    np->n_name = getcpy ("Path");
-    np->n_field = getcpy (pathname);
+    NEW(np);
+    m_defs = np;
+    np->n_name = mh_xstrdup("Path");
+    np->n_field = mh_xstrdup(pathname);
     np->n_context = 0;
     np->n_next = NULL;
 
@@ -219,6 +218,14 @@ query:
            fprintf (out, "%s: %s\n", np->n_name, np->n_field);
     }
     fclose (out);
+
+    puts ("\nPlease see the nmh(7) man page for an introduction to nmh.\n");
+    print_intro (stdout, FALSE);
+
+    /* Initialize the saved nmh version.  The Path profile entry was added
+       above, that's all this needs. */
+    (void) nmh_version_changed (0);
+
     done (0);
     return 1;
 }