mts/smtp/smtp.c: Replace int with bool.

[nmh] / uip / install-mh.c

diff --git a/uip/install-mh.c b/uip/install-mh.c
index 549e452569e677c483d64f6cbb34c00bb8d06191..b11848992e797dfd2ee165bc10f40d699e12064e 100644 (file)
--- a/uip/install-mh.c
+++ b/uip/install-mh.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>                              /* mh internals */
  */
 
 #include <h/mh.h>                              /* mh internals */

+#include "h/done.h"

 #include <h/utils.h>
 #include "sbr/m_maildir.h"
 #include "sbr/makedir.h"
 #include <h/utils.h>
 #include "sbr/m_maildir.h"
 #include "sbr/makedir.h"


@@ -40,7 +41,7 @@ main (int argc, char **argv)
     FILE *in, *out;
     int                check;
 
     FILE *in, *out;
     int                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;
 
     arguments = getarguments (invo_name, argc, argv, 0);
     argp = arguments;


@@ -54,7 +55,7 @@ main (int argc, char **argv)
                    ambigsw (dp, switches);
                    done (1);
                case UNKWNSW:
                    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);
 
                case HELPSW:
                    snprintf (buf, sizeof(buf), "%s [switches]", invo_name);


@@ -73,7 +74,7 @@ main (int argc, char **argv)
                    continue;
            }
        } else {
                    continue;
            }
        } else {

-           adios (NULL, "%s is invalid argument", dp);
+           die("%s is invalid argument", dp);

        }
     }
 
        }
     }
 


@@ -84,7 +85,7 @@ main (int argc, char **argv)
 
     if ((mypath = getenv("HOME")) == NULL) {
        if ((pw = getpwuid(getuid())) == NULL || *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");
+           die("cannot determine your home directory");

         mypath = pw->pw_dir;
     }
 
         mypath = pw->pw_dir;
     }
 


@@ -110,8 +111,8 @@ main (int argc, char **argv)
        if (check)
            done(0);
        if (autof)
        if (check)
            done(0);
        if (autof)

-           adios (NULL, "invocation error");
-        adios (NULL, "You already have an nmh profile, use an editor to modify it");
+           die("invocation error");
+        die("You already have an nmh profile, use an editor to modify it");

     }
     if (check)
        done(1);
     }
     if (check)
        done(1);


@@ -152,7 +153,7 @@ query:
                pathname = read_line ();
                if (pathname == NULL) done (1);
            } else {
                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);
                pathname = read_line ();
                if (pathname == NULL) done (1);
                pathname = concat ("/", pathname, NULL);


@@ -167,7 +168,7 @@ query:
        cp = concat ("\"", pathname, "\" doesn't exist; Create it? ", NULL);
        if (autof || read_switch (cp, anoyes))
            if (makedir (pathname) == 0)
        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 {
        puts("[Using existing directory]");
     }
     } else {
        puts("[Using existing directory]");
     }


@@ -191,7 +192,7 @@ query:
        fclose (in);
     }
 
        fclose (in);
     }
 

-    ctxpath = getcpy (m_maildir (context = "context"));
+    ctxpath = mh_xstrdup(m_maildir(context = "context"));

 
     /* Initialize current folder to default */
     context_replace (pfolder, defaultfolder);
 
     /* Initialize current folder to default */
     context_replace (pfolder, defaultfolder);