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 dbf540ec13888395db290a8a39cb79141f8450d4..a2c40610cbccfc2a91d2d1d77fc791da0f275814 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     \
-       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
 

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 9425b6d4e2eef0097d7d6c6d9bd248779b1d1c7e..4d93d9b3bffe4f2190c01e6da7fd3088120e5bf5 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 *);
+
+/*
+** 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 4059ce00abd3ef0d26c9f6f6f7f0029b701ae7d4..c1e937f0a97962a97e34f362e21f04a1144f22be 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.
 */
 
-#include <h/mts.h>
 #include <netdb.h>
 
 

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

diff --git a/sbr/mts.c b/sbr/mts.c
index f43b15dea0436e1aa09c95e1e3224acd5fa32889..dd193bc4e53a30a59b6d7479fcb1a965a8c8c4c6 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/mts.h>
 #include <pwd.h>
 #include <netdb.h>
 

diff --git a/uip/ali.c b/uip/ali.c
index f1d74163df364db1d92001372ad524adb0f3cd9a..df29930c2d6265be6c357a2a7906f6507b69fb71 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/mts.h>
 #include <h/utils.h>
 
 /*

diff --git a/uip/ap.c b/uip/ap.c
index 4f7f7603001af91c1745d045ca1e1d812a1d8ed2..e444cd89566176e3d37795e070e3fb910502397a 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/mts.h>
 
 #define NADDRS 100
 

diff --git a/uip/conflict.c b/uip/conflict.c
index 03de873a611872e15706142421b9e3d1153e6607..0d9c78c4a1ca1c7497cdb7b183adaff7f0dde5dd 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/mts.h>
 #include <h/utils.h>
 #include <grp.h>
 #include <pwd.h>

diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index dd7a2df53cf1ef7137005ea9f68f3582da14056d..62ba424e677cb77d9b0bc6b175c35ec2928c02f9 100644 (file)
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -11,7 +11,6 @@
 
 #include <h/mh.h>
 #include <h/dropsbr.h>
-#include <h/mts.h>
 #include <h/tws.h>
 
 #ifdef HAVE_ERRNO_H

diff --git a/uip/inc.c b/uip/inc.c
index 1f03e2b7b6f879c628a86c2859d7645bb2196e50..587bd846df21b930424bd3d934a86545a46222c2 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/mts.h>
 #include <errno.h>
 #include <signal.h>
 

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 734d8ab206205a8c0850157b3a5d5a1b5607334a..63d7be2fcbaeb0384149d8beef34c9913056dcfd 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/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 4358606269a3e54337d632ed5e1e840f0ee100bd..069ea85f2f87dc44d815f8ec5b695530edd1f8c4 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/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index 13ab1534124c184a908682303b326918936ea154..c6f0603bcb3cbb861beaa89f21bb838c0fc4c9d9 100644 (file)
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -13,7 +13,6 @@
 #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>

diff --git a/uip/mhlist.c b/uip/mhlist.c
index 12480cf745d43a73a978a962267b053269bb48fb..8902f7595f206e493c813b0cb08bd6e9da643e3a 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/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhlistsbr.c b/uip/mhlistsbr.c
index e11cf5dce32055c1dcad0435d298d0239f161ccb..4c788d1616ee86b32e2e80569c5d1dad6ae91ad9 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/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index 939275f61f81ed5592de27b42e7b1bfaf058c882..00b538ca20c31ac9554fbd0210b0044119eb63b8 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/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhparse.c b/uip/mhparse.c
index d2f69bc6a1eb979917369b7ad63f7144520e38a9..86c16a9ae71518d03c12173a82a2537384312b1b 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -13,7 +13,6 @@
 #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>

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 1f37c0e8ac0564ae1d34e6676bffefbb134771be..bf5ef8bbe20f481f80ef6782527feb0a5f000109 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/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index b7452d8a1b8cc3d39d714b8279d97511c6fc6f91..e302d3bde69cf4ac9f8759e409588bfb941d8b28 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -13,7 +13,6 @@
 #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>

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 2167a3feb821713410e9ae9001dc03d4a8beda80..c1a3edbe54489fbd1e3b90dfb5d3fb6e65778a6d 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/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 0b1a9b304ae290f0a76b46d4402567e6f392d05e..aa95dd8ad7f6a0287cdb5f90b32a9c5cf4d0ece2 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -13,7 +13,6 @@
 #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>

diff --git a/uip/mhtest.c b/uip/mhtest.c
index 0cfce9f873f2a90f286c4c25b60be1e6fe373381..7dc9c07d91d3da6319e7a44ac5f4aa2fab5872a1 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/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

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

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index cff337db989440796641db201a6d09c95bd1a527..338455f931bfcd32ec74fc9e27df1d2e007b42b5 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/mts.h>
 #include <h/utils.h>
 
 static struct swit switches[] = {

diff --git a/uip/rcvpack.c b/uip/rcvpack.c
index f0f1bd18351c83a669877aeac7a1ece1f34d7f09..d6e102575fb629fe84066c80f676a6f48ec58e62 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/mts.h>
 
 static struct swit switches[] = {
 #define VERSIONSW  0

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index ebf3e14dac058facf863d232b364eb80c2abaca5..04b62d85ca4b6ff41a8c9d79ef24c06c9d74e829 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/mts.h>
 
 static struct swit switches[] = {
 #define CRETSW  0

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 1dc38c4eeaab3f2fbc5cb95c59b329455c2fcb63..ecdbbcfb899ac1c6aa2fe9cfdc7a5f2d35c8a98c 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/mts.h>
 #include <signal.h>
 #include <fcntl.h>
 

diff --git a/uip/scan.c b/uip/scan.c
index 18de4c48e9ccdb078120064c32de8de7d32086c5..d228c717128f0add4af4031ec169c1059806be78 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/mts.h>
 #include <h/utils.h>
 #include <errno.h>
 

diff --git a/uip/slocal.c b/uip/slocal.c
index 0ef54c6f9b73d6985834d7a9b1dae4a1267fa45e..fe1977fa053b3c79acc97eceb0adb378aff32eda 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/mts.h>
 #include <h/utils.h>
 
 #include <pwd.h>