From: markus schnalke <meillo@marmaro.de>
Date: Mon, 2 Jan 2012 10:50:35 +0000 (+0100)
Subject: Removed references to unused default procs and commented config/config.c
X-Git-Tag: mmh-thesis-end~441
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=fd00a3b030ab9d854eac79641f7bf25e6538acc1;p=mmh

Removed references to unused default procs and commented config/config.c
---

diff --git a/config/config.c b/config/config.c
index 9add9e2..54fea67 100644
--- a/config/config.c
+++ b/config/config.c
@@ -27,7 +27,7 @@ struct node *m_defs;    /* profile/context structure  */
 
 
 /*
-** nmh constants
+** nmh constants: standard file names
 **
 ** Important: Adjust uip/mmh.sh if you make changes here!
 */
@@ -51,10 +51,6 @@ char *context = "context";
 */
 char *mh_seq = ".mh_sequences";
 
-/* name of current message "sequence" */
-char *current = "cur";
-
-
 /* standard component files */
 char *components     = "components";       /* comp         */
 char *replcomps      = "replcomps";        /* repl         */
@@ -69,11 +65,19 @@ char *mhlformat      = "mhl.format";       /* show         */
 char *mhlreply       = "mhl.reply";        /* repl -filter */
 char *mhlforward     = "mhl.forward";      /* forw -filter */
 
-char *inbox = "Inbox";
-char *defaultfolder = "+inbox";
 
+/*
+** standard names for: mail folders, sequences, and profile entries
+*/
+
+/* some default folder names */
+char *defaultfolder = "+inbox";
 char *draftfolder = "+drafts";
 
+/* name of current message "sequence" */
+char *current = "cur";
+
+char *inbox = "Inbox";  /* profile entry name to specify the default folder */
 char *curfolder = "Current-Folder";
 char *usequence = "Unseen-Sequence";
 char *psequence = "Previous-Sequence";
@@ -88,8 +92,9 @@ char *nmhprivcache = "nmh-private-cache";
 char *nmhaccessftp = "nmh-access-ftp";
 
 
+
 /*
-** nmh processes
+** nmh default programs
 */
 
 /*
@@ -120,12 +125,6 @@ char *fileproc = NMHBINDIR"/refile";
 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
 ** folder facility in comp/dist/forw/repl to display the
@@ -146,19 +145,11 @@ char *mailproc = NMHBINDIR"/mhmail";
 char *moreproc = "more";
 
 /*
-** This is the program (mhl) used to filter messages.  It is
-** used by mhshow to filter and display the message headers of
-** MIME messages.  It is used by repl/forw (with -filter)
-** to filter the message to which you are replying/forwarding.
-** It is used by send/spost (with -filter) to filter the message
-** for "Bcc:" recipients.
-*/
-char *mhlproc = NMHLIBDIR"/mhl";
-
-/*
-** This program is called to pack a folder.
+** 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 *packproc = NMHBINDIR"/packf";
+char *defaulteditor = "vi";
 
 /*
 ** This is the delivery program called by send to actually
@@ -173,11 +164,6 @@ char *postproc = NMHLIBDIR"/spost";
 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.
 */
@@ -204,6 +190,16 @@ char *showmimeproc = NMHBINDIR"/mhshow";
 char *showproc = NMHLIBDIR"/mhl";
 
 /*
+** This is the program (mhl) used to filter messages.  It is
+** used by mhshow to filter and display the message headers of
+** MIME messages.  It is used by repl/forw (with -filter)
+** to filter the message to which you are replying/forwarding.
+** It is used by send/spost (with -filter) to filter the message
+** for "Bcc:" recipients.
+*/
+char *mhlproc = NMHLIBDIR"/mhl";
+
+/*
 ** This program is called after comp, et. al., have built a draft
 */
 char *whatnowproc = NMHBINDIR"/whatnow";
@@ -213,18 +209,16 @@ char *whatnowproc = NMHBINDIR"/whatnow";
 */
 char *sendmail = SENDMAILPATH;
 
+
 /*
-** The prefix that is prepended to the name of message files when they
-** are "removed" by rmm. This should typically be `,' or `#'.
+** file stuff
 */
-char *backup_prefix = ",";
 
 /*
-** 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.
+** The prefix that is prepended to the name of message files when they
+** are "removed" by rmm. This should typically be `,' or `#'.
 */
-char *defaulteditor = "vi";
+char *backup_prefix = ",";
 
 /*
 ** Name of link to file to which you are replying or which you are
diff --git a/h/mh.h b/h/mh.h
index 0c0d81f..56ce885 100644
--- a/h/mh.h
+++ b/h/mh.h
@@ -314,7 +314,6 @@ extern char *foldprot;
 extern char *forwcomps;
 extern char *inbox;
 extern char *incproc;
-extern char *installproc;
 extern char *lproc;
 extern char *mhetcdir;
 extern char *mailproc;
@@ -330,7 +329,6 @@ extern char *nmhstorage;
 extern char *nmhcache;
 extern char *nmhprivcache;
 extern char *nsequence;
-extern char *packproc;
 extern char *postproc;
 extern char *profile;
 extern char *psequence;
@@ -338,7 +336,6 @@ extern char *rcvdistcomps;
 extern char *rcvstoreproc;
 extern char *replcomps;
 extern char *replgroupcomps;
-extern char *rmfproc;
 extern char *rmmproc;
 extern char *sendmail;
 extern char *sendproc;
diff --git a/man/mh-profile.man5 b/man/mh-profile.man5
index 63633fd..feffaca 100644
--- a/man/mh-profile.man5
+++ b/man/mh-profile.man5
@@ -400,14 +400,6 @@ to incorporate new mail when it
 is invoked with no arguments.
 .RE
 .PP
-.BR installproc :
-mmh
-.RS 5
-This program is called to initialize the environment for
-new users of
-.BR mmh .
-.RE
-.PP
 .BR lproc :
 more
 .RS 5
@@ -487,12 +479,6 @@ program used by
 to display message bodies (or message parts) of type text/plain.
 .RE
 .PP
-.BR packproc :
-%bindir%/packf
-.RS 5
-Currently not used.
-.RE
-.PP
 .BR postproc :
 %libdir%/post
 .RS 5
@@ -518,12 +504,6 @@ and
 to delete a message from a folder.
 .RE
 .PP
-.BR rmfproc :
-%bindir%/rmf
-.RS 5
-Currently not used.
-.RE
-.PP
 .BR sendproc :
 %bindir%/send
 .RS 5
diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index a557cda..3cc8b7b 100644
--- a/sbr/readconfig.c
+++ b/sbr/readconfig.c
@@ -25,14 +25,11 @@ static struct procstr procs[] = {
 	{ "faceproc",      &faceproc },
 	{ "fileproc",      &fileproc },
 	{ "incproc",       &incproc },
-	{ "installproc",   &installproc },
 	{ "lproc",         &lproc },
 	{ "mailproc",      &mailproc },
 	{ "mhlproc",       &mhlproc },
 	{ "moreproc",      &moreproc },
-	{ "packproc",      &packproc },
 	{ "postproc",      &postproc },
-	{ "rmfproc",       &rmfproc },
 	{ "rmmproc",       &rmmproc },
 	{ "sendmail",      &sendmail },
 	{ "sendproc",      &sendproc },
diff --git a/uip/mhparam.c b/uip/mhparam.c
index dc122ad..d9ba2a3 100644
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -43,15 +43,12 @@ static struct proc procs [] = {
 	 { "fileproc",      &fileproc },
 	 { "foldprot",      &foldprot },
 	 { "incproc",       &incproc },
-	 { "installproc",   &installproc  },
 	 { "lproc",         &lproc },
 	 { "mailproc",      &mailproc },
 	 { "mhlproc",       &mhlproc },
 	 { "moreproc",      &moreproc },
 	 { "msgprot",       &msgprot },
-	 { "packproc",      &packproc },
 	 { "postproc",      &postproc },
-	 { "rmfproc",       &rmfproc },
 	 { "rmmproc",       &rmmproc },
 	 { "sendmail",      &sendmail },
 	 { "sendproc",      &sendproc },