uip/mhparse.c: Fix body starting a byte too soon when no blank line.

[nmh] / config / config.c

diff --git a/config/config.c b/config/config.c
index a5cdfd9b82353dcc8178b5753d447d8c0ef0cc61..c44f1396fcac9fd63b8865f57e6a1449672de062 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


@@ -8,11 +6,13 @@
  */
 
 #include <h/mh.h>
  */
 
 #include <h/mh.h>

+#include "../sbr/m_maildir.h"

 #include <pwd.h>
 
 #define nmhbindir(file) NMHBINDIR#file
 #include <pwd.h>
 
 #define nmhbindir(file) NMHBINDIR#file

-#define nmhetcdir(file) NMHETCDIR#file

 #define nmhlibexecdir(file) NMHLIBEXECDIR#file
 #define nmhlibexecdir(file) NMHLIBEXECDIR#file

+#define nmhetcdir(file) NMHETCDIR#file
+#define nmhdocdir(file) NMHDOCDIR#file

 
 
 /*
 
 
 /*


@@ -57,23 +57,23 @@ 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 */
-try_it:
+               return epath;

 
 

+            /* FALLTHRU */
+try_it:

        default: 
            /* Check nmh Mail directory */
            if (access ((cp = m_mailpath (file)), R_OK) != NOTOK) {
                /* Will leak because caller doesn't know cp was
                   dynamically allocated. */
                return cp;
        default: 
            /* Check nmh Mail directory */
            if (access ((cp = m_mailpath (file)), R_OK) != NOTOK) {
                /* 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 */


@@ -105,6 +105,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";
 


@@ -143,8 +146,10 @@ char *nmhaccessftp = "nmh-access-ftp";
 /* profile entry for external url access command */
 char *nmhaccessurl = "nmh-access-url";
 
 /* profile entry for external url access command */
 char *nmhaccessurl = "nmh-access-url";
 

+char *mhbindir = NMHBINDIR;

 char *mhlibexecdir = NMHLIBEXECDIR;
 char *mhetcdir = NMHETCDIR;
 char *mhlibexecdir = NMHLIBEXECDIR;
 char *mhetcdir = NMHETCDIR;

+char *mhdocdir = NMHDOCDIR;

 
 /* 
  * nmh not-so constants
 
 /* 
  * nmh not-so constants


@@ -241,13 +246,6 @@ char *moreproc = NULL;
 
 char *mhlproc = nmhlibexecdir (/mhl);
 
 
 char *mhlproc = nmhlibexecdir (/mhl);
 

-/* 
- * This is the super handy BBoard reading program, which is
- * really just the nmh shell program.
- */
-
-char *mshproc = nmhbindir (/msh);
-

 /* 
  * This program is called to pack a folder.  
  */
 /* 
  * This program is called to pack a folder.  
  */


@@ -298,13 +296,6 @@ char *showmimeproc = nmhbindir (/mhshow);
 
 char *showproc = nmhlibexecdir (/mhl);
 
 
 char *showproc = nmhlibexecdir (/mhl);
 

-/* 
- * This program is called by vmh as the back-end to the window management
- * protocol
- */
-
-char *vmhproc = nmhbindir (/msh);
-

 /* 
  * This program is called after comp, et. al., have built a draft
  */
 /* 
  * This program is called after comp, et. al., have built a draft
  */


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

-