lock_file.c: close(2) file descriptor on failure, avoiding leak.

[nmh] / uip / install-mh.c

diff --git a/uip/install-mh.c b/uip/install-mh.c
index ce8e2940c112e94dfc35fc29d1348617944cb8cb..e3eab12f55354a312a7c30b9a4382deccf31b14c 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
  *
  * 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,7 +7,10 @@
 
 #include <h/mh.h>                              /* mh internals */
 #include <h/utils.h>
 
 #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 */
 #include <pwd.h>                               /* structure for getpwuid() results */

+#include "sbr/read_line.h"

 
 #define INSTALLMH_SWITCHES \
     X("auto", 0, AUTOSW) \
 
 #define INSTALLMH_SWITCHES \
     X("auto", 0, AUTOSW) \


@@ -24,17 +26,13 @@ DEFINE_SWITCH_ENUM(INSTALLMH);
 DEFINE_SWITCH_ARRAY(INSTALLMH, switches);
 #undef X
 
 DEFINE_SWITCH_ARRAY(INSTALLMH, switches);
 #undef X
 

-/*
- * static prototypes
- */
-static char *geta(void);
-

 
 int
 main (int argc, char **argv)
 {
     int autof = 0;
 
 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;
     char *dp, **arguments, **argp;
     struct node *np;
     struct passwd *pw;


@@ -84,11 +82,10 @@ main (int argc, char **argv)
      * the home directory field in the password file if that's not found.
      */
 
      * 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");
            adios(NULL, "cannot determine your home directory");

-       else
-           mypath = pw->pw_dir;
+        mypath = pw->pw_dir;

     }
 
     /*
     }
 
     /*


@@ -112,17 +109,14 @@ main (int argc, char **argv)
     if (stat (defpath, &st) != NOTOK) {
        if (check)
            done(0);
     if (stat (defpath, &st) != NOTOK) {
        if (check)
            done(0);

-
-       else if (autof)
+       if (autof)

            adios (NULL, "invocation error");
            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);
        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"
        (void)printf(
         "\n"
         "Prior to using nmh, it is necessary to have a file in your login\n"


@@ -135,33 +129,33 @@ main (int argc, char **argv)
 
     cp = concat (mypath, "/", "Mail", NULL);
     if (stat (cp, &st) != NOTOK) {
 
     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 (gans (cp, anoyes))
-               pathname = "Mail";
-           else
-               goto query;
-       } else {
+       if (!S_ISDIR(st.st_mode))

            goto query;
            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)
     } 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);
        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:
            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);
                        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?  /");
            } else {
                printf ("What is the whole path?  /");

-               pathname = concat ("/", geta (), NULL);
+               pathname = read_line ();
+               if (pathname == NULL) done (1);
+               pathname = concat ("/", pathname, NULL);

            }
        }
     }
            }
        }
     }


@@ -171,20 +165,20 @@ query:
     }
     if (chdir (pathname) == NOTOK) {
        cp = concat ("\"", pathname, "\" doesn't exist; Create it? ", NULL);
     }
     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 {
            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
      */
     }
 
     /*
      * 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;
 
     np->n_context = 0;
     np->n_next = NULL;
 


@@ -220,21 +214,14 @@ query:
            fprintf (out, "%s: %s\n", np->n_name, np->n_field);
     }
     fclose (out);
            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;

 }
 }