Split nmh dir into mmh dir (~/.mmh) and mail storage (~/Mail).

[mmh] / config / config.c

diff --git a/config/config.c b/config/config.c
index 2bcc435..3f9d106 100644 (file)
--- a/config/config.c
+++ b/config/config.c
@@ -9,29 +9,57 @@
 #include <h/mh.h>
 
 
+
 /*
-** Standard yes/no switches structure
+** nmh globals
 */
-struct swit anoyes[] = {
-       { "no", 0 },
-       { "yes", 0 },
-       { NULL, 0 }
-};
+
+char *mhlibdir = NMHLIBDIR;
+char *mhetcdir = NMHETCDIR;
+
+char *invo_name;        /* command invocation name    */
+char *mypath;           /* user's $HOME               */
+char *mmhpath;          /* pathname of user's mmh dir */
+char *defpath;          /* pathname of user's profile */
+char *ctxpath;          /* pathname of user's context */
+char ctxflags;          /* status of user's context   */
+struct node *m_defs;    /* profile/context structure  */
 
 
 /*
 ** nmh constants
+**
+** Important: Adjust uip/mmh.sh if you make changes here!
 */
 
-/* initial profile for new users */
-char *mh_defaults = NMHETCDIR"/mh.profile";
+/* default name of the mail storage */
+char *mailstore = "Mail";
+
+/* default name of user profile */
+char *mmhdir = ".mmh";
 
 /* default name of user profile */
-char *mh_profile = ".mh_profile";
+char *profile = "profile";
+
+/* default name for the nmh context file */
+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.
+*/
+#ifdef NOPUBLICSEQ
+       char *mh_seq = NULL;
+#else
+       char *mh_seq = ".mh_sequences";
+#endif
+
 
 /* name of current message "sequence" */
 char *current = "cur";
 
+
 /* standard component files */
 char *components     = "components";       /* comp         */
 char *replcomps      = "replcomps";        /* repl         */
@@ -46,11 +74,11 @@ char *mhlformat      = "mhl.format";       /* show         */
 char *mhlreply       = "mhl.reply";        /* repl -filter */
 char *mhlforward     = "mhl.forward";      /* forw -filter */
 
-char *draftfolder = "+drafts";
-
 char *inbox = "Inbox";
 char *defaultfolder = "+inbox";
 
+char *draftfolder = "+drafts";
+
 char *curfolder = "Current-Folder";
 char *usequence = "Unseen-Sequence";
 char *psequence = "Previous-Sequence";
@@ -64,42 +92,6 @@ char *nmhprivcache = "nmh-private-cache";
 /* profile entry for external ftp access command */
 char *nmhaccessftp = "nmh-access-ftp";
 
-char *mhlibdir = NMHLIBDIR;
-char *mhetcdir = NMHETCDIR;
-
-
-/*
-** nmh not-so constants
-*/
-
-/*
-** Default name for the nmh context file.
-*/
-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.
-*/
-#ifdef NOPUBLICSEQ
-char *mh_seq = NULL;
-#else
-char *mh_seq = ".mh_sequences";
-#endif
-
-
-/*
-** nmh globals
-*/
-
-char ctxflags;          /* status of user's context   */
-char *invo_name;        /* command invocation name    */
-char *mypath;           /* user's $HOME               */
-char *defpath;          /* pathname of user's profile */
-char *ctxpath;          /* pathname of user's context */
-struct node *m_defs;    /* profile/context structure  */
-
 
 /*
 ** nmh processes
@@ -256,3 +248,15 @@ char *foldprot = "700";
 ** to messages coming in through inc.
 */
 char *msgprot = "600";
+
+
+
+/*
+** Standard yes/no switches structure
+*/
+struct swit anoyes[] = {
+       { "no", 0 },
+       { "yes", 0 },
+       { NULL, 0 }
+};
+