X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2d5d9e243c91784909b11948894e3ba0989107c0..394a751fd883d2bbfc769fed7e254e008a2ef45e:/uip/install-mh.c diff --git a/uip/install-mh.c b/uip/install-mh.c index a79793f5..ac2c5c98 100644 --- a/uip/install-mh.c +++ b/uip/install-mh.c @@ -1,14 +1,29 @@ -/* - * 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 * complete copyright information. */ -#include /* mh internals */ -#include -#include /* structure for getpwuid() results */ +#include "h/mh.h" +#include "sbr/getarguments.h" +#include "sbr/read_switch.h" +#include "sbr/concat.h" +#include "sbr/smatch.h" +#include "sbr/context_save.h" +#include "sbr/context_replace.h" +#include "sbr/readconfig.h" +#include "sbr/ambigsw.h" +#include "sbr/path.h" +#include "sbr/print_version.h" +#include "sbr/print_help.h" +#include "sbr/error.h" +#include "h/done.h" +#include "h/utils.h" +#include "sbr/m_maildir.h" +#include "sbr/makedir.h" +#include +#include "sbr/read_line.h" #define INSTALLMH_SWITCHES \ X("auto", 0, AUTOSW) \ @@ -28,7 +43,7 @@ DEFINE_SWITCH_ARRAY(INSTALLMH, switches); int main (int argc, char **argv) { - int autof = 0; + bool autof = false; char *cp, buf[BUFSIZ]; const char *pathname; char *dp, **arguments, **argp; @@ -36,14 +51,14 @@ main (int argc, char **argv) struct passwd *pw; struct stat st; FILE *in, *out; - int check; + bool check; - if (nmh_init(argv[0], 0 /* use context_foil() */ )) { return 1; } + if (nmh_init(argv[0], false, false)) { return 1; } arguments = getarguments (invo_name, argc, argv, 0); argp = arguments; - check = 0; + check = false; while ((dp = *argp++)) { if (*dp == '-') { @@ -52,7 +67,7 @@ main (int argc, char **argv) ambigsw (dp, switches); done (1); case UNKWNSW: - adios (NULL, "-%s unknown\n", dp); + die("-%s unknown\n", dp); case HELPSW: snprintf (buf, sizeof(buf), "%s [switches]", invo_name); @@ -63,15 +78,15 @@ main (int argc, char **argv) done (0); case AUTOSW: - autof++; + autof = true; continue; case CHECKSW: - check = 1; + check = true; continue; } } else { - adios (NULL, "%s is invalid argument", dp); + die("%s is invalid argument", dp); } } @@ -80,11 +95,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') - adios(NULL, "cannot determine your home directory"); - else - mypath = pw->pw_dir; + if ((mypath = getenv("HOME")) == NULL) { + if ((pw = getpwuid(getuid())) == NULL || *pw->pw_dir == '\0') + die("cannot determine your home directory"); + mypath = pw->pw_dir; } /* @@ -108,15 +122,12 @@ main (int argc, char **argv) if (stat (defpath, &st) != NOTOK) { if (check) done(0); - - else if (autof) - adios (NULL, "invocation error"); - else - adios (NULL, "You already have an nmh profile, use an editor to modify it"); + if (autof) + die("invocation error"); + die("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 +142,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); @@ -157,7 +165,7 @@ query: pathname = read_line (); if (pathname == NULL) done (1); } else { - printf ("What is the whole path? /"); + fputs("What is the whole path? /", stdout); pathname = read_line (); if (pathname == NULL) done (1); pathname = concat ("/", pathname, NULL); @@ -172,9 +180,9 @@ query: cp = concat ("\"", pathname, "\" doesn't exist; Create it? ", NULL); if (autof || read_switch (cp, anoyes)) if (makedir (pathname) == 0) - adios (NULL, "unable to create %s", pathname); + die("unable to create %s", pathname); } else { - printf ("[Using existing directory]\n"); + puts("[Using existing directory]"); } /* @@ -182,8 +190,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; @@ -196,7 +204,7 @@ query: fclose (in); } - ctxpath = getcpy (m_maildir (context = "context")); + ctxpath = mh_xstrdup(m_maildir(context = "context")); /* Initialize current folder to default */ context_replace (pfolder, defaultfolder); @@ -220,8 +228,8 @@ query: } fclose (out); - puts ("\nPlease see the nmh(7) man page for an introduction to nmh.\n"); - print_intro (stdout, FALSE); + puts ("\nPlease see nmh(7) 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. */