h/prototypes.h: Remove scan_reset_m_getfld_state() prototype.

[nmh] / config / config.c

diff --git a/config/config.c b/config/config.c
index 28436d93a8ab0fa64be6d362ab5e60393803dfd4..633293e226bb9987ec3be5596f557e661de8925c 100644 (file)
--- a/config/config.c
+++ b/config/config.c
@@ -1,6 +1,4 @@
-
-/*
- * config.c -- master nmh configuration file
+/* config.c -- master nmh configuration file

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -58,12 +56,13 @@ etcpath (char *file)
                }
            }
 
                }
            }
 

-           snprintf (epath, sizeof(epath), "%s/%s", pp, cp ? cp : "");
+           snprintf (epath, sizeof(epath), "%s/%s", pp, FENDNULL(cp));

            if (cp)
                *--cp = '/';
 
            if (access (epath, R_OK) != NOTOK)
            if (cp)
                *--cp = '/';
 
            if (access (epath, R_OK) != NOTOK)

-               return epath;   /* else fall */
+               return epath;
+               /* FALLTHRU */

 try_it:
 
        default: 
 try_it:
 
        default: 


@@ -72,9 +71,8 @@ try_it:
                /* Will leak because caller doesn't know cp was
                   dynamically allocated. */
                return cp;
                /* Will leak because caller doesn't know cp was
                   dynamically allocated. */
                return cp;

-           } else {
-               free (cp);

            }
            }

+            free (cp);

     }
 
     /* Check nmh `etc' directory */
     }
 
     /* Check nmh `etc' directory */


@@ -106,6 +104,9 @@ char *mh_profile = ".mh_profile";
 /* name of credentials file, defaults to .netrc in either Path or $HOME. */
 char *credentials_file;
 
 /* name of credentials file, defaults to .netrc in either Path or $HOME. */
 char *credentials_file;
 

+/* if set to 1, do not check permissions on credentials file */
+int credentials_no_perm_check = 0;
+

 /* name of current message "sequence" */
 char *current = "cur";
 
 /* name of current message "sequence" */
 char *current = "cur";
 


@@ -330,4 +331,3 @@ char *foldprot = "700";
  */
 
 char *msgprot = "600";
  */
 
 char *msgprot = "600";

-