X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/de4636bb664106d9932ae7acb517e471b848f1f3..0a7838e0e8026cbfe8a8924ef256ad9e930fb03d:/config/config.c

diff --git a/config/config.c b/config/config.c
index f78c1478..3971d528 100644
--- a/config/config.c
+++ b/config/config.c
@@ -8,7 +8,6 @@
  */
 
 #include <h/mh.h>
-#include <stdio.h>
 #include <pwd.h>
 
 #define nmhbindir(file) NMHBINDIR#file
@@ -68,8 +67,13 @@ try_it:
 
 	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 */
@@ -98,6 +102,9 @@ char *mh_defaults = nmhetcdir (/mh.profile);
 /* default name of user profile */
 char *mh_profile = ".mh_profile";
 
+/* name of credentials file, defaults to .netrc in either Path or $HOME. */
+char *credentials_file;
+
 /* name of current message "sequence" */
 char *current = "cur";
 
@@ -133,6 +140,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;
 
@@ -146,15 +156,11 @@ char *mhetcdir = NMHETCDIR;
 char *context = "context";
 
 /*
- * Default name of file for public sequences.  If NULL,
- * then nmh will use private sequences by default, unless the
- * user defines a value using the "mh-sequences" profile entry.
+ * Default name of file for public sequences.  If "\0" (an empty
+ * "mh-sequences" profile entry), then nmh will use private sequences by
+ * default.
  */
-#ifdef NOPUBLICSEQ
-char *mh_seq = NULL;
-#else
 char *mh_seq = ".mh_sequences";
-#endif
 
 /* 
  * nmh globals
@@ -201,13 +207,6 @@ char *formatproc = NULL;
 
 char *incproc = nmhbindir (/inc);
 
-/*
- * When a user runs an nmh program for the first time, this program
- * is called to create his nmh profile, and mail directory.
- */
-
-char *installproc = nmhlibdir (/install-mh);
-
 /*
  * This is the default program invoked by a "list" response
  * at the "What now?" prompt.  It is also used by the draft
@@ -318,14 +317,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).