Removed some #includes of stdio.h, ctype.h, stdlib.h, and

[nmh] / config / config.c

diff --git a/config/config.c b/config/config.c
index 72da2cd97c6ab1f9e222d84b7e97761545d8ae80..151f7fc296d106f3d10349a94590fc817d55d548 100644 (file)
--- a/config/config.c
+++ b/config/config.c
@@ -68,8 +68,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 */
@@ -83,9 +88,9 @@ try_it:
  */
 
 struct swit anoyes[] = {
-    { "no", 0 },
-    { "yes", 0 },
-    { NULL, 0 }
+    { "no", 0, 0 },
+    { "yes", 0, 1 },
+    { NULL, 0, 0 }
 };
 
 /* 
@@ -98,6 +103,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 +141,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;
 
@@ -201,13 +212,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 +322,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).