Replace sprintf() with strcpy(); it's no worse.

[nmh] / sbr / context_read.c

diff --git a/sbr/context_read.c b/sbr/context_read.c
index 8f63fedfa83a0ad4ea58c3c81fd89bc43a2aa60a..adaa172b5f132ad779c6781b81e5b88cbf298a7d 100644 (file)
--- a/sbr/context_read.c
+++ b/sbr/context_read.c
@@ -32,8 +32,8 @@ context_read (void)
     char                       *cp;            /* miscellaneous pointer */
     char                       *nd;            /* nmh directory pointer */
     struct     stat            st;             /* stat() results */
-    register   struct  passwd  *pw;            /* getpwuid() results */
-    register   FILE            *ib;            /* profile and context file pointer */
+    struct     passwd          *pw;            /* getpwuid() results */
+    FILE                       *ib;            /* profile and context file pointer */
     int failed_to_lock = 0;
 
     /*
@@ -65,6 +65,8 @@ context_read (void)
     if ((cp = getenv("MH")) && *cp != '\0') {
        defpath = path(cp, TFILE);
 
+        /* defpath is an absolute path; make sure that always MH is, too. */
+       setenv("MH", defpath, 1);
        if (stat(defpath, &st) != -1 && (st.st_mode & S_IFREG) == 0)
                adios((char *)0, "`%s' specified by your MH environment variable is not a normal file", cp);
 
@@ -105,7 +107,7 @@ context_read (void)
 
        cp = concat ("Your MH-directory \"", nd, "\" doesn't exist; Create it? ", NULL);
 
-       if (!getanswer(cp))
+       if (!read_yes_or_no_if_tty(cp))
            adios (NULL, "unable to access MH-directory \"%s\"", nd);
 
        free (cp);