Update the manpage style guide.

[mmh] / config / config.c

diff --git a/config/config.c b/config/config.c
index b08b3e23a58f6376487a97390f4a7a2f6d7fbfd8..72da2cd97c6ab1f9e222d84b7e97761545d8ae80 100644 (file)
--- a/config/config.c
+++ b/config/config.c
@@ -9,10 +9,7 @@
 
 #include <h/mh.h>
 #include <stdio.h>
 
 #include <h/mh.h>
 #include <stdio.h>

-
-#ifdef MHRC
-# include <pwd.h>
-#endif
+#include <pwd.h>

 
 #define nmhbindir(file) NMHBINDIR#file
 #define nmhetcdir(file) NMHETCDIR#file
 
 #define nmhbindir(file) NMHBINDIR#file
 #define nmhetcdir(file) NMHETCDIR#file


@@ -35,21 +32,16 @@ etcpath (char *file)
 {
     static char epath[PATH_MAX];
     char *cp;
 {
     static char epath[PATH_MAX];
     char *cp;

-#ifdef MHRC

     char *pp;
     struct passwd *pw;
     char *pp;
     struct passwd *pw;

-#endif

 
 

-#ifdef MHRC

     context_read();
     context_read();

-#endif

 
     switch (*file) {
        case '/': 
            /* If already absolute pathname, return it */
            return file;
 
 
     switch (*file) {
        case '/': 
            /* If already absolute pathname, return it */
            return file;
 

-#ifdef MHRC

        case '~': 
            /* Expand ~username */
            if ((cp = strchr(pp = file + 1, '/')))
        case '~': 
            /* Expand ~username */
            if ((cp = strchr(pp = file + 1, '/')))


@@ -73,7 +65,6 @@ etcpath (char *file)
            if (access (epath, R_OK) != NOTOK)
                return epath;   /* else fall */
 try_it:
            if (access (epath, R_OK) != NOTOK)
                return epath;   /* else fall */
 try_it:

-#endif /* MHRC */

 
        default: 
            /* Check nmh Mail directory */
 
        default: 
            /* Check nmh Mail directory */


@@ -189,12 +180,6 @@ char *buildmimeproc = nmhbindir (/mhbuild);
  */
 char *catproc = "/bin/cat";
 
  */
 char *catproc = "/bin/cat";
 

-/*
- * mhl runs this program as a visual-end.
- */
-
-char *faceproc = NULL;
-

 /*
  * This program is usually called directly by users, but it is
  * also invoked by the post program to process an "Fcc", or by
 /*
  * This program is usually called directly by users, but it is
  * also invoked by the post program to process an "Fcc", or by


@@ -203,6 +188,13 @@ char *faceproc = NULL;
 
 char *fileproc = nmhbindir (/refile);
 
 
 char *fileproc = nmhbindir (/refile);
 

+/*
+ * This program is used to optionally format the bodies of messages by
+ * "mhl".
+ */
+
+char *formatproc = NULL;
+

 /* 
  * This program is called to incorporate messages into a folder.
  */
 /* 
  * This program is called to incorporate messages into a folder.
  */


@@ -223,7 +215,7 @@ char *installproc = nmhlibdir (/install-mh);
  * draft message.
  */
 
  * draft message.
  */
 

-char *lproc = DEFAULT_PAGER;
+char *lproc = NULL;

 
 /*
  * This is the path for the Bell equivalent mail program.
 
 /*
  * This is the path for the Bell equivalent mail program.


@@ -237,7 +229,7 @@ char *mailproc = nmhbindir (/mhmail);
  * or message parts of type text/plain.
  */
 
  * or message parts of type text/plain.
  */
 

-char *moreproc = DEFAULT_PAGER;
+char *moreproc = NULL;

 
 /* 
  * This is the program (mhl) used to filter messages.  It is
 
 /* 
  * This is the program (mhl) used to filter messages.  It is


@@ -277,12 +269,6 @@ char *postproc = nmhlibdir (/post);
 
 char *rcvstoreproc = nmhlibdir (/rcvstore);
 
 
 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.
 /* 
  * 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.


@@ -355,7 +341,7 @@ char *AliasFile = nmhetcdir (/MailAliases);
  * Folders (directories) are created with this protection (mode)
  */
 
  * Folders (directories) are created with this protection (mode)
  */
 

-char *foldprot = DEFAULT_FOLDER_MODE;
+char *foldprot = "700";

 
 /*
  * Every NEW message will be created with this protection.  When a
 
 /*
  * Every NEW message will be created with this protection.  When a


@@ -363,5 +349,5 @@ char *foldprot = DEFAULT_FOLDER_MODE;
  * to messages coming in through inc.
  */
 
  * to messages coming in through inc.
  */
 

-char *msgprot = DEFAULT_MESSAGE_MODE;
+char *msgprot = "600";