Rest of the MMDF-style mail drop support removal.

[mmh] / sbr / mts.c

diff --git a/sbr/mts.c b/sbr/mts.c
index 3313aef..2830bb7 100644 (file)
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -9,9 +9,6 @@
 #include <h/mh.h>   /* for snprintf() */
 #include <h/nmh.h>
 #include <h/utils.h>
-
-#define nmhetcdir(file) NMHETCDIR#file
-
 #include <ctype.h>
 #include <stdio.h>
 #include <h/mts.h>
@@ -35,25 +32,10 @@ static const char *get_mtsuserconf_pathname(void);
 static void mts_read_conf_file(FILE *fp);
 
 /*
-** *mmdfldir and *uucpldir are the maildrop directories.  If maildrops
-** are kept in the user's home directory, then these should be empty
-** strings.  In this case, the appropriate ...lfil array should contain
-** the name of the file in the user's home directory.  Usually, this is
-** something like ".mail".
-*/
-
-/*
 ** nmh mail transport interface customization file
 */
-static char *mtsconf = nmhetcdir(/mts.conf);
+static char *mtsconf = NMHETCDIR"/mts.conf";
 
-char *mmdfldir = MAILSPOOL;
-char *mmdflfil = "";
-char *uucpldir = "/usr/spool/mail";
-char *uucplfil = "";
-
-char *mmdlm1 = "\001\001\001\001\n";
-char *mmdlm2 = "\001\001\001\001\n";
 
 /* Cache the username and fullname of the user */
 static char username[BUFSIZ];
@@ -68,7 +50,7 @@ static char* masquerade = "";
 /*
 ** Global MailDelivery file
 */
-char *maildelivery = nmhetcdir(/maildelivery);
+char *maildelivery = NMHETCDIR"/maildelivery";
 
 
 /*
@@ -89,12 +71,6 @@ struct bind {
 };
 
 static struct bind binds[] = {
-       { "mmdfldir", &mmdfldir },
-       { "mmdflfil", &mmdflfil },
-       { "uucpldir", &uucpldir },
-       { "uucplfil", &uucplfil },
-       { "mmdelim1", &mmdlm1 },
-       { "mmdelim2", &mmdlm2 },
        { "masquerade", &masquerade },
        { "maildelivery", &maildelivery },
        { "everyone", &everyone },
@@ -160,27 +136,27 @@ tailor_value(unsigned char *s)
                        *bp = *s;
                } else {
                        switch (*++s) {
-                               case 'b': *bp = '\b'; break;
-                               case 'f': *bp = '\f'; break;
-                               case 'n': *bp = '\n'; break;
-                               case 't': *bp = '\t'; break;
-
-                               case 0: s--;
-                               case QUOTE:
-                                       *bp = QUOTE;
-                                       break;
-
-                               default:
-                                       if (!isdigit(*s)) {
-                                               *bp++ = QUOTE;
-                                               *bp = *s;
-                                       }
-                                       r = *s != '0' ? 10 : 8;
-                                       for (i = 0; isdigit(*s); s++)
-                                               i = i * r + *s - '0';
-                                       s--;
-                                       *bp = toascii(i);
-                                       break;
+                       case 'b': *bp = '\b'; break;
+                       case 'f': *bp = '\f'; break;
+                       case 'n': *bp = '\n'; break;
+                       case 't': *bp = '\t'; break;
+
+                       case 0: s--;
+                       case QUOTE:
+                               *bp = QUOTE;
+                               break;
+
+                       default:
+                               if (!isdigit(*s)) {
+                                       *bp++ = QUOTE;
+                                       *bp = *s;
+                               }
+                               r = *s != '0' ? 10 : 8;
+                               for (i = 0; isdigit(*s); s++)
+                                       i = i * r + *s - '0';
+                               s--;
+                               *bp = toascii(i);
+                               break;
                        }
                }
        }
@@ -466,7 +442,7 @@ mts_read_conf_file(FILE *fp)
                        *bp++ = 0;
 
                for (b = binds; b->keyword; b++)
-                       if (!strcmp(buffer, b->keyword))
+                       if (strcmp(buffer, b->keyword)==0)
                                break;
                if (b->keyword && (cp = tailor_value(bp)))
                        *b->value = cp;