Hard-code the config/version.c target, instead of using $@, so its

[nmh] / config / config.c

diff --git a/config/config.c b/config/config.c
index 02265c0a6befb8457041cec19a3f4f7d93162cef..3971d528e52774a1af7020490b38a05720d191ce 100644 (file)
--- a/config/config.c
+++ b/config/config.c
@@ -8,7 +8,6 @@
  */
 
 #include <h/mh.h>
  */
 
 #include <h/mh.h>

-#include <stdio.h>

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


@@ -68,8 +67,13 @@ try_it:
 
        default: 
            /* Check nmh Mail directory */
 
        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;
                return cp;

+           } else {
+               free (cp);
+           }

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


@@ -98,6 +102,9 @@ char *mh_defaults = nmhetcdir (/mh.profile);
 /* default name of user profile */
 char *mh_profile = ".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";
 
 /* 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 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;
 
 char *mhlibdir = NMHLIBDIR;
 char *mhetcdir = NMHETCDIR;
 


@@ -146,15 +156,11 @@ char *mhetcdir = NMHETCDIR;
 char *context = "context";
 
 /*
 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";
 char *mh_seq = ".mh_sequences";

-#endif

 
 /* 
  * nmh globals
 
 /* 
  * nmh globals


@@ -201,13 +207,6 @@ char *formatproc = NULL;
 
 char *incproc = nmhbindir (/inc);
 
 
 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
 /*
  * This is the default program invoked by a "list" response
  * at the "What now?" prompt.  It is also used by the draft