lock_file.c: close(2) file descriptor on failure, avoiding leak.

[nmh] / h / mts.h

diff --git a/h/mts.h b/h/mts.h
index f782d6767b632c0e1d07f1eb065e9f0f05d4a9a6..d0fa4f05c575567681b8117832d8319f4f1caad7 100644 (file)
--- a/h/mts.h
+++ b/h/mts.h
@@ -1,12 +1,10 @@
-
-/*
- * mts.h -- definitions for the mail system
+/* mts.h -- definitions for the mail system
  */
 
 /*
  * Local and UUCP Host Name
  */
-char *LocalName(void);
+char *LocalName(int);
 char *SystemName(void);
 
 /*
@@ -16,42 +14,37 @@ extern char *mmdfldir;
 extern char *mmdflfil;
 extern char *uucpldir;
 extern char *uucplfil;
+extern char *spoollocking;
 
 #define        MAILDIR (mmdfldir && *mmdfldir ? mmdfldir : getenv ("HOME"))
 #define        MAILFIL (mmdflfil && *mmdflfil ? mmdflfil : getusername ())
-#define        UUCPDIR (uucpldir && *uucpldir ? uucpldir : getenv ("HOME"))
-#define        UUCPFIL (uucplfil && *uucplfil ? uucplfil : getusername ())
 
 char *getusername(void);
 char *getfullname(void);
+char *getlocalmbox(void);
 
 /*
  * Separators
  */
-extern char *mmdlm1;
-extern char *mmdlm2;
-
-#define        isdlm1(s) (strcmp (s, mmdlm1) == 0)
-#define        isdlm2(s) (strcmp (s, mmdlm2) == 0)
+#define MMDF_DELIM "\001\001\001\001\n"
 
 /*
  * Read mts.conf file
  */
-void mts_init (char *);
+void mts_init (void);
 
 /*
  * MTS specific variables
  */
-#if defined (SMTPMTS)
 
-/* whether to speak SMTP to localhost:25 or to /usr/sbin/sendmail */
-#define MTS_SMTP     0
-#define MTS_SENDMAIL 1
+/* whether to speak SMTP, and over the network or directly to sendmail */
+#define MTS_SMTP          0
+#define MTS_SENDMAIL_SMTP 1
+#define MTS_SENDMAIL_PIPE 2
 extern int sm_mts;
+void save_mts_method (const char *);
 
-extern char *hostable;
 extern char *sendmail;
-#endif
 
 /*
  * SMTP/POP stuff
@@ -60,27 +53,7 @@ extern char *clientname;
 extern char *servers;
 extern char *pophost;
 
-/*
- * BBoards-specific variables
- */
-extern char *bb_domain;
-
-/*
- * POP BBoards-specific variables
- */
-#ifdef BPOP
-extern char *popbbhost;
-extern char *popbbuser;
-extern char *popbblist;
-#endif /* BPOP */
-
 /*
  * Global MailDelivery File
  */
 extern char *maildelivery;
-
-/*
- * Aliasing Facility (doesn't belong here)
- */
-extern int Everyone;
-extern char *NoShell;