Replace getcpy() with mh_xstrdup() where the string isn't NULL.

[nmh] / uip / install-mh.c

diff --git a/uip/install-mh.c b/uip/install-mh.c
index ce8e2940c112e94dfc35fc29d1348617944cb8cb..ea4e876b752527de0bf6dc59d69cbc1bd545a0b1 100644 (file)
--- a/uip/install-mh.c
+++ b/uip/install-mh.c
@@ -24,17 +24,13 @@ DEFINE_SWITCH_ENUM(INSTALLMH);
 DEFINE_SWITCH_ARRAY(INSTALLMH, switches);
 #undef X
 
-/*
- * static prototypes
- */
-static char *geta(void);
-
 
 int
 main (int argc, char **argv)
 {
     int autof = 0;
-    char *cp, *pathname, buf[BUFSIZ];
+    char *cp, buf[BUFSIZ];
+    const char *pathname;
     char *dp, **arguments, **argp;
     struct node *np;
     struct passwd *pw;
@@ -122,7 +118,7 @@ main (int argc, char **argv)
        done(1);
     }
 
-    if (!autof && gans ("Do you want help? ", anoyes)) {
+    if (!autof && read_switch ("Do you want help? ", anoyes)) {
        (void)printf(
         "\n"
         "Prior to using nmh, it is necessary to have a file in your login\n"
@@ -138,7 +134,7 @@ main (int argc, char **argv)
        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 (gans (cp, anoyes))
+           if (read_switch (cp, anoyes))
                pathname = "Mail";
            else
                goto query;
@@ -151,17 +147,20 @@ main (int argc, char **argv)
        else
            cp = concat ("Do you want the standard nmh path \"",
                    mypath, "/", "Mail\"? ", NULL);
-       if (autof || gans (cp, anoyes))
+       if (autof || read_switch (cp, anoyes))
            pathname = "Mail";
        else {
 query:
-           if (gans ("Do you want a path below your login directory? ",
+           if (read_switch ("Do you want a path below your login directory? ",
                        anoyes)) {
                printf ("What is the path?  %s/", mypath);
-               pathname = geta ();
+               pathname = read_line ();
+               if (pathname == NULL) done (1);
            } else {
                printf ("What is the whole path?  /");
-               pathname = concat ("/", geta (), NULL);
+               pathname = read_line ();
+               if (pathname == NULL) done (1);
+               pathname = concat ("/", pathname, NULL);
            }
        }
     }
@@ -171,7 +170,7 @@ query:
     }
     if (chdir (pathname) == NOTOK) {
        cp = concat ("\"", pathname, "\" doesn't exist; Create it? ", NULL);
-       if (autof || gans (cp, anoyes))
+       if (autof || read_switch (cp, anoyes))
            if (makedir (pathname) == 0)
                adios (NULL, "unable to create %s", pathname);
     } else {
@@ -181,9 +180,9 @@ query:
     /*
      * 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");
+    NEW(np);
+    m_defs = np;
+    np->n_name = mh_xstrdup("Path");
     np->n_field = getcpy (pathname);
     np->n_context = 0;
     np->n_next = NULL;
@@ -220,21 +219,14 @@ query:
            fprintf (out, "%s: %s\n", np->n_name, np->n_field);
     }
     fclose (out);
-    done (0);
-    return 1;
-}
 
+    puts ("\nPlease see the nmh(7) man page for an introduction to nmh.\n");
+    print_intro (stdout, FALSE);
 
-static char *
-geta (void)
-{
-    char *cp;
-    static char line[BUFSIZ];
-
-    fflush(stdout);
-    if (fgets(line, sizeof(line), stdin) == NULL)
-       done (1);
-    if ((cp = strchr(line, '\n')))
-       *cp = 0;
-    return line;
+    /* 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;
 }