Use HasPrefix() instead of strncmp().

[nmh] / sbr / context_read.c

diff --git a/sbr/context_read.c b/sbr/context_read.c
index 8f63fedfa83a0ad4ea58c3c81fd89bc43a2aa60a..748114ed14eba8092ae62aa3a289700ab5effa6f 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 */
     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;
 
     /*
     int failed_to_lock = 0;
 
     /*


@@ -48,8 +48,8 @@ context_read (void)
      * 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");
        else
            mypath = pw->pw_dir;
            adios(NULL, "cannot determine your home directory");
        else
            mypath = pw->pw_dir;


@@ -65,17 +65,19 @@ context_read (void)
     if ((cp = getenv("MH")) && *cp != '\0') {
        defpath = path(cp, TFILE);
 
     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)
        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);
+               adios(NULL, "`%s' specified by your MH environment variable is not a normal file", cp);

 
 

-       if ((ib = fopen(defpath, "r")) == (FILE *)0)
-           adios((char *)0, "unable to read the `%s' profile specified by your MH environment variable", defpath);
+       if ((ib = fopen(defpath, "r")) == NULL)
+           adios(NULL, "unable to read the `%s' profile specified by your MH environment variable", defpath);

     }
     else {
        defpath = concat(mypath, "/", mh_profile, NULL);
 
     }
     else {
        defpath = concat(mypath, "/", mh_profile, NULL);
 

-       if ((ib = fopen(defpath, "r")) == (FILE *)0)
-           adios((char *)0, "Doesn't look like nmh is installed.  Run install-mh to do so.");
+       if ((ib = fopen(defpath, "r")) == NULL)
+           adios(NULL, "Doesn't look like nmh is installed.  Run install-mh to do so.");

 
        cp = mh_profile;
     }
 
        cp = mh_profile;
     }


@@ -88,7 +90,7 @@ context_read (void)
      * Convert a relative path name to an absolute one rooted in the home directory.
      */
 
      * Convert a relative path name to an absolute one rooted in the home directory.
      */
 

-    if ((cp = context_find ("path")) == (char *)0)
+    if ((cp = context_find ("path")) == NULL)

        adios(NULL, "Your %s file does not contain a path entry.", defpath);
 
     if (*cp == '\0')
        adios(NULL, "Your %s file does not contain a path entry.", defpath);
 
     if (*cp == '\0')


@@ -105,7 +107,7 @@ context_read (void)
 
        cp = concat ("Your MH-directory \"", nd, "\" doesn't exist; Create it? ", NULL);
 
 
        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);
            adios (NULL, "unable to access MH-directory \"%s\"", nd);
 
        free (cp);


@@ -115,14 +117,14 @@ context_read (void)
     }
 
     else if ((st.st_mode & S_IFDIR) == 0)
     }
 
     else if ((st.st_mode & S_IFDIR) == 0)

-       adios ((char *)0, "`%s' is not a directory", nd);
+       adios (NULL, "`%s' is not a directory", nd);

 
     /*
      * Open and read user's context file.  The name of the context file comes from the
      * profile unless overridden by the MHCONTEXT environment variable.
      */
 
 
     /*
      * Open and read user's context file.  The name of the context file comes from the
      * profile unless overridden by the MHCONTEXT environment variable.
      */
 

-    if ((cp = getenv ("MHCONTEXT")) == (char *)0 || *cp == '\0')
+    if ((cp = getenv ("MHCONTEXT")) == NULL || *cp == '\0')

        cp = context;
 
     /* context is NULL if context_foil() was called to disable use of context
        cp = context;
 
     /* context is NULL if context_foil() was called to disable use of context