X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/f67e3671c985ad8095dc6fcc8be7ba6dd25cdf63..6fd1d18f:/uip/install-mh.c?ds=inline diff --git a/uip/install-mh.c b/uip/install-mh.c index 2921d261..2470c3ef 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 @@ -7,8 +6,12 @@ */ #include /* mh internals */ +#include "h/done.h" #include +#include "sbr/m_maildir.h" +#include "sbr/makedir.h" #include /* structure for getpwuid() results */ +#include "sbr/read_line.h" #define INSTALLMH_SWITCHES \ X("auto", 0, AUTOSW) \ @@ -24,17 +27,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; @@ -42,10 +41,8 @@ main (int argc, char **argv) FILE *in, *out; int check; -#ifdef LOCALE - setlocale(LC_ALL, ""); -#endif - invo_name = r1bindex (argv[0], '/'); + if (nmh_init(argv[0], 0 /* use context_foil() */ )) { return 1; } + arguments = getarguments (invo_name, argc, argv, 0); argp = arguments; @@ -86,11 +83,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; } /* @@ -114,17 +110,14 @@ 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 && 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" @@ -137,54 +130,56 @@ 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 (gans (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); - 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); } } } - chdir (mypath); + if (chdir (mypath) < 0) { + advise (mypath, "chdir"); + } 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 { - 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; @@ -208,26 +203,26 @@ query: */ if ((out = fopen (defpath, "w")) == NULL) adios (defpath, "unable to write"); + /* + * The main purpose of this first line is to fool file(1). + * Without it, if the first line of the profile is Path:, + * file 5.19 reports its type as message/news. With it, + * it reports the type as text/plain. + */ + fprintf (out, "MH-Profile-Version: 1.0\n"); for (np = m_defs; np; np = np->n_next) { if (!np->n_context) fprintf (out, "%s: %s\n", np->n_name, np->n_field); } fclose (out); - done (0); - return 1; -} + puts ("\nPlease see nmh(7) 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; }