Merged h/mts.h into h/prototypes.h.

Note: spost.c is not up to date.

diff --git a/h/Makefile.in b/h/Makefile.in
index dbf540e..a2c4061 100644 (file)
--- a/h/Makefile.in
+++ b/h/Makefile.in
@@ -9,7 +9,7 @@ VPATH  = @srcdir@
 
 # header files included in distribution
 HDRS = addrsbr.h aliasbr.h crawl_folders.h dropsbr.h fmt_compile.h     \
 
 # header files included in distribution
 HDRS = addrsbr.h aliasbr.h crawl_folders.h dropsbr.h fmt_compile.h     \

-       fmt_scan.h md5.h mf.h mh.h mhcachesbr.h mhparse.h mime.h mts.h  \
+       fmt_scan.h md5.h mf.h mh.h mhcachesbr.h mhparse.h mime.h        \

        netdb.h nmh.h picksbr.h popsbr.h prototypes.h rcvmail.h         \
        scansbr.h signals.h tws.h utils.h
 
        netdb.h nmh.h picksbr.h popsbr.h prototypes.h rcvmail.h         \
        scansbr.h signals.h tws.h utils.h
 

diff --git a/h/mts.h b/h/mts.h
deleted file mode 100644 (file)
index 2155e05..0000000
--- a/h/mts.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-** mts.h -- definitions for the mail system
-*/
-
-/*
-** Local and UUCP Host Name
-*/
-char *LocalName(void);
-char *SystemName(void);
-
-char *getusername(void);
-char *getfullname(void);

diff --git a/h/prototypes.h b/h/prototypes.h
index 9425b6d..4d93d9b 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -154,3 +154,11 @@ void replout(FILE *, char *, char *, struct msgs *, int,
                char *, char *, char *);
 int what_now(char *, int, int, char *, char *, int, struct msgs *,
                char *, int, char *);
                char *, char *, char *);
 int what_now(char *, int, int, char *, char *, int, struct msgs *,
                char *, int, char *);

+
+/*
+** from the former mts.h
+*/
+char *LocalName(void);  /* hostname */
+char *SystemName(void);
+char *getusername(void);
+char *getfullname(void);

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index 4059ce0..c1e937f 100644 (file)
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -466,7 +466,6 @@ local_test: ;
 ** everything is a valid host, and let SendMail worry about it.
 */
 
 ** everything is a valid host, and let SendMail worry about it.
 */
 

-#include <h/mts.h>

 #include <netdb.h>
 
 
 #include <netdb.h>
 
 

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index 4dbd94f..d64457f 100644 (file)
--- a/sbr/m_getfld.c
+++ b/sbr/m_getfld.c
@@ -7,7 +7,6 @@
 */
 
 #include <h/mh.h>
 */
 
 #include <h/mh.h>

-#include <h/mts.h>

 #include <h/utils.h>
 
 /*
 #include <h/utils.h>
 
 /*

diff --git a/sbr/mts.c b/sbr/mts.c
index f43b15d..dd193bc 100644 (file)
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -11,7 +11,6 @@
 #include <h/utils.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <h/utils.h>
 #include <ctype.h>
 #include <stdio.h>

-#include <h/mts.h>

 #include <pwd.h>
 #include <netdb.h>
 
 #include <pwd.h>
 #include <netdb.h>
 

diff --git a/uip/ali.c b/uip/ali.c
index f1d7416..df29930 100644 (file)
--- a/uip/ali.c
+++ b/uip/ali.c
@@ -9,7 +9,6 @@
 #include <h/mh.h>
 #include <h/addrsbr.h>
 #include <h/aliasbr.h>
 #include <h/mh.h>
 #include <h/addrsbr.h>
 #include <h/aliasbr.h>

-#include <h/mts.h>

 #include <h/utils.h>
 
 /*
 #include <h/utils.h>
 
 /*

diff --git a/uip/ap.c b/uip/ap.c
index 4f7f760..e444cd8 100644 (file)
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -9,7 +9,6 @@
 #include <h/mh.h>
 #include <h/addrsbr.h>
 #include <h/fmt_scan.h>
 #include <h/mh.h>
 #include <h/addrsbr.h>
 #include <h/fmt_scan.h>

-#include <h/mts.h>

 
 #define NADDRS 100
 
 
 #define NADDRS 100
 

diff --git a/uip/conflict.c b/uip/conflict.c
index 03de873..0d9c78c 100644 (file)
--- a/uip/conflict.c
+++ b/uip/conflict.c
@@ -9,7 +9,6 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/aliasbr.h>
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/aliasbr.h>

-#include <h/mts.h>

 #include <h/utils.h>
 #include <grp.h>
 #include <pwd.h>
 #include <h/utils.h>
 #include <grp.h>
 #include <pwd.h>

diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index dd7a2df..62ba424 100644 (file)
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -11,7 +11,6 @@
 
 #include <h/mh.h>
 #include <h/dropsbr.h>
 
 #include <h/mh.h>
 #include <h/dropsbr.h>

-#include <h/mts.h>

 #include <h/tws.h>
 
 #ifdef HAVE_ERRNO_H
 #include <h/tws.h>
 
 #ifdef HAVE_ERRNO_H

diff --git a/uip/inc.c b/uip/inc.c
index 1f03e2b..587bd84 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -34,7 +34,6 @@
 #include <h/scansbr.h>
 #include <h/signals.h>
 #include <h/tws.h>
 #include <h/scansbr.h>
 #include <h/signals.h>
 #include <h/tws.h>

-#include <h/mts.h>

 #include <errno.h>
 #include <signal.h>
 
 #include <errno.h>
 #include <signal.h>
 

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 734d8ab..63d7be2 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -12,7 +12,6 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>

-#include <h/mts.h>

 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 4358606..069ea85 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -20,7 +20,6 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>

-#include <h/mts.h>

 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index 13ab153..c6f0603 100644 (file)
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -13,7 +13,6 @@
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>

-#include <h/mts.h>

 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhlist.c b/uip/mhlist.c
index 12480cf..8902f75 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -12,7 +12,6 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>

-#include <h/mts.h>

 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhlistsbr.c b/uip/mhlistsbr.c
index e11cf5d..4c788d1 100644 (file)
--- a/uip/mhlistsbr.c
+++ b/uip/mhlistsbr.c
@@ -12,7 +12,6 @@
 #include <h/signals.h>
 #include <errno.h>
 #include <signal.h>
 #include <h/signals.h>
 #include <errno.h>
 #include <signal.h>

-#include <h/mts.h>

 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index 939275f..00b538c 100644 (file)
--- a/uip/mhoutsbr.c
+++ b/uip/mhoutsbr.c
@@ -13,7 +13,6 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>

-#include <h/mts.h>

 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhparse.c b/uip/mhparse.c
index d2f69bc..86c16a9 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -13,7 +13,6 @@
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>

-#include <h/mts.h>

 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 1f37c0e..bf5ef8b 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -12,7 +12,6 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>

-#include <h/mts.h>

 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index b7452d8..e302d3b 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -13,7 +13,6 @@
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>

-#include <h/mts.h>

 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 2167a3f..c1a3edb 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -12,7 +12,6 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>

-#include <h/mts.h>

 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 0b1a9b3..aa95dd8 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -13,7 +13,6 @@
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>

-#include <h/mts.h>

 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhtest.c b/uip/mhtest.c
index 0cfce9f..7dc9c07 100644 (file)
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -12,7 +12,6 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>

-#include <h/mts.h>

 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/msgchk.c b/uip/msgchk.c
index 5e10ad3..932da20 100644 (file)
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -7,7 +7,6 @@
 */
 
 #include <h/mh.h>
 */
 
 #include <h/mh.h>

-#include <h/mts.h>

 #include <h/tws.h>
 #include <pwd.h>
 
 #include <h/tws.h>
 #include <pwd.h>
 

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index cff337d..338455f 100644 (file)
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -10,7 +10,6 @@
 #include <h/fmt_scan.h>
 #include <h/rcvmail.h>
 #include <h/tws.h>
 #include <h/fmt_scan.h>
 #include <h/rcvmail.h>
 #include <h/tws.h>

-#include <h/mts.h>

 #include <h/utils.h>
 
 static struct swit switches[] = {
 #include <h/utils.h>
 
 static struct swit switches[] = {

diff --git a/uip/rcvpack.c b/uip/rcvpack.c
index f0f1bd1..d6e1025 100644 (file)
--- a/uip/rcvpack.c
+++ b/uip/rcvpack.c
@@ -10,7 +10,6 @@
 #include <h/dropsbr.h>
 #include <h/rcvmail.h>
 #include <h/tws.h>
 #include <h/dropsbr.h>
 #include <h/rcvmail.h>
 #include <h/tws.h>

-#include <h/mts.h>

 
 static struct swit switches[] = {
 #define VERSIONSW  0
 
 static struct swit switches[] = {
 #define VERSIONSW  0

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index ebf3e14..04b62d8 100644 (file)
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -11,7 +11,6 @@
 #include <h/signals.h>
 #include <errno.h>
 #include <signal.h>
 #include <h/signals.h>
 #include <errno.h>
 #include <signal.h>

-#include <h/mts.h>

 
 static struct swit switches[] = {
 #define CRETSW  0
 
 static struct swit switches[] = {
 #define CRETSW  0

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 1dc38c4..ecdbbcf 100644 (file)
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -16,7 +16,6 @@
 #include <h/rcvmail.h>
 #include <h/scansbr.h>
 #include <h/tws.h>
 #include <h/rcvmail.h>
 #include <h/scansbr.h>
 #include <h/tws.h>

-#include <h/mts.h>

 #include <signal.h>
 #include <fcntl.h>
 
 #include <signal.h>
 #include <fcntl.h>
 

diff --git a/uip/scan.c b/uip/scan.c
index 18de4c4..d228c71 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -10,7 +10,6 @@
 #include <h/fmt_scan.h>
 #include <h/scansbr.h>
 #include <h/tws.h>
 #include <h/fmt_scan.h>
 #include <h/scansbr.h>
 #include <h/tws.h>

-#include <h/mts.h>

 #include <h/utils.h>
 #include <errno.h>
 
 #include <h/utils.h>
 #include <errno.h>
 

diff --git a/uip/slocal.c b/uip/slocal.c
index 0ef54c6..fe1977f 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -25,7 +25,6 @@
 #include <h/rcvmail.h>
 #include <h/signals.h>
 #include <h/tws.h>
 #include <h/rcvmail.h>
 #include <h/signals.h>
 #include <h/tws.h>

-#include <h/mts.h>

 #include <h/utils.h>
 
 #include <pwd.h>
 #include <h/utils.h>
 
 #include <pwd.h>