X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/3865f55b4195bac67932ac3aacbd8f3c53239b62..17b9beb40640e8731143f61e3b94756f3e77d20c:/config/config.c

diff --git a/config/config.c b/config/config.c
index b08b3e23..4024d305 100644
--- a/config/config.c
+++ b/config/config.c
@@ -9,10 +9,7 @@
 
 #include <h/mh.h>
 #include <stdio.h>
-
-#ifdef MHRC
-# include <pwd.h>
-#endif
+#include <pwd.h>
 
 #define nmhbindir(file) NMHBINDIR#file
 #define nmhetcdir(file) NMHETCDIR#file
@@ -35,21 +32,16 @@ etcpath (char *file)
 {
     static char epath[PATH_MAX];
     char *cp;
-#ifdef MHRC
     char *pp;
     struct passwd *pw;
-#endif
 
-#ifdef MHRC
     context_read();
-#endif
 
     switch (*file) {
 	case '/': 
 	    /* If already absolute pathname, return it */
 	    return file;
 
-#ifdef MHRC
 	case '~': 
 	    /* Expand ~username */
 	    if ((cp = strchr(pp = file + 1, '/')))
@@ -73,12 +65,16 @@ etcpath (char *file)
 	    if (access (epath, R_OK) != NOTOK)
 		return epath;	/* else fall */
 try_it:
-#endif /* MHRC */
 
 	default: 
 	    /* Check nmh Mail directory */
-	    if (access ((cp = m_mailpath (file)), R_OK) != NOTOK)
+	    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);
+	    }
     }
 
     /* Check nmh `etc' directory */
@@ -92,9 +88,9 @@ try_it:
  */
 
 struct swit anoyes[] = {
-    { "no", 0 },
-    { "yes", 0 },
-    { NULL, 0 }
+    { "no", 0, 0 },
+    { "yes", 0, 1 },
+    { NULL, 0, 0 }
 };
 
 /* 
@@ -142,6 +138,9 @@ char *nmhprivcache = "nmh-private-cache";
 /* profile entry for external ftp access command */
 char *nmhaccessftp = "nmh-access-ftp";
 
+/* profile entry for external url access command */
+char *nmhaccessurl = "nmh-access-url";
+
 char *mhlibdir = NMHLIBDIR;
 char *mhetcdir = NMHETCDIR;
 
@@ -189,12 +188,6 @@ char *buildmimeproc = nmhbindir (/mhbuild);
  */
 char *catproc = "/bin/cat";
 
-/*
- * mhl runs this program as a visual-end.
- */
-
-char *faceproc = NULL;
-
 /*
  * This program is usually called directly by users, but it is
  * also invoked by the post program to process an "Fcc", or by
@@ -203,18 +196,18 @@ char *faceproc = NULL;
 
 char *fileproc = nmhbindir (/refile);
 
-/* 
- * This program is called to incorporate messages into a folder.
+/*
+ * This program is used to optionally format the bodies of messages by
+ * "mhl".
  */
 
-char *incproc = nmhbindir (/inc);
+char *formatproc = NULL;
 
-/*
- * When a user runs an nmh program for the first time, this program
- * is called to create his nmh profile, and mail directory.
+/* 
+ * This program is called to incorporate messages into a folder.
  */
 
-char *installproc = nmhlibdir (/install-mh);
+char *incproc = nmhbindir (/inc);
 
 /*
  * This is the default program invoked by a "list" response
@@ -223,7 +216,7 @@ char *installproc = nmhlibdir (/install-mh);
  * draft message.
  */
 
-char *lproc = DEFAULT_PAGER;
+char *lproc = NULL;
 
 /*
  * This is the path for the Bell equivalent mail program.
@@ -237,7 +230,7 @@ char *mailproc = nmhbindir (/mhmail);
  * or message parts of type text/plain.
  */
 
-char *moreproc = DEFAULT_PAGER;
+char *moreproc = NULL;
 
 /* 
  * This is the program (mhl) used to filter messages.  It is
@@ -277,12 +270,6 @@ char *postproc = nmhlibdir (/post);
 
 char *rcvstoreproc = nmhlibdir (/rcvstore);
 
-/* 
- * This program is called to remove a folder.  
- */
-
-char *rmfproc = nmhbindir (/rmf);
-
 /* 
  * This program is called to remove a message by rmm or refile -nolink.
  * It's usually empty, which means to rename the file to a backup name.
@@ -332,14 +319,6 @@ char *whatnowproc = nmhbindir (/whatnow);
 
 char *whomproc = nmhbindir (/whom);
 
-/*
- * This is the editor invoked by the various message
- * composition programs.  It SHOULD be a full screen
- * editor, such as vi or emacs, but any editor will work.
- */
-
-char *defaulteditor = DEFAULT_EDITOR;
-
 /* 
  * This is the global nmh alias file.  It is somewhat obsolete, since
  * global aliases should be handled by the Mail Transport Agent (MTA).
@@ -355,7 +334,7 @@ char *AliasFile = nmhetcdir (/MailAliases);
  * Folders (directories) are created with this protection (mode)
  */
 
-char *foldprot = DEFAULT_FOLDER_MODE;
+char *foldprot = "700";
 
 /*
  * Every NEW message will be created with this protection.  When a
@@ -363,5 +342,5 @@ char *foldprot = DEFAULT_FOLDER_MODE;
  * to messages coming in through inc.
  */
 
-char *msgprot = DEFAULT_MESSAGE_MODE;
+char *msgprot = "600";