sbr/m_mktemp.h: Move remaining prototypes from h/prototypes.h.

Gives the normal one header file showing interface exported by one C
file.

diff --git a/h/prototypes.h b/h/prototypes.h
index a89fe73..28d21f0 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -257,10 +257,6 @@ char *m_maildir (char *);
 char *m_mailpath (char *);
 char *m_name (int);
 int m_rand (unsigned char *, size_t);
-char *m_mktemp(const char *, int *, FILE **);
-char *m_mktemp2(const char *, const char *, int *, FILE **);
-char *m_mktemps(const char *pfx, const char *suffix, int *, FILE **);
-char *get_temp_dir(void);
 
 /*
  * Create a subprocess and redirect our standard output to it.
@@ -558,9 +554,3 @@ void nmh_credentials_free(nmh_creds_t creds);
  *              - 2: read context, don't check nmh version
  */
 int nmh_init(const char *argv0, int read_context);
-
-/*
- * temporary file management
- */
-int m_unlink(const char *);
-void unregister_for_removal(int remove_files);

diff --git a/sbr/folder_delmsgs.c b/sbr/folder_delmsgs.c
index 92c7ca3..e5b6ae2 100644 (file)
--- a/sbr/folder_delmsgs.c
+++ b/sbr/folder_delmsgs.c
@@ -7,6 +7,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include "m_mktemp.h"
 
 /*
  * 1) If we are using an external rmmproc, then exec it.

diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index 0bf82f8..c7002b2 100644 (file)
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -17,6 +17,7 @@
 #include <h/signals.h>
 #include <h/utils.h>
 #include <h/mts.h>
+#include "m_mktemp.h"
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>

diff --git a/sbr/m_backup.c b/sbr/m_backup.c
index 05be68a..5a616f2 100644 (file)
--- a/sbr/m_backup.c
+++ b/sbr/m_backup.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include "m_mktemp.h"
 
 
 char *

diff --git a/sbr/m_mktemp.h b/sbr/m_mktemp.h
index dbc614f..e26114d 100644 (file)
--- a/sbr/m_mktemp.h
+++ b/sbr/m_mktemp.h
@@ -5,5 +5,13 @@
  * complete copyright information.
  */
 
+char *m_mktemp(const char *pfx_in, int *fd_ret, FILE **fp_ret);
+char *m_mktemp2(const char *dir_in, const char *pfx_in,
+    int *fd_ret, FILE **fp_ret);
+char *m_mktemps(const char *pfx_in, const char *suffix,
+    int *fd_ret, FILE **fp_ret);
+char *get_temp_dir(void);
+void unregister_for_removal(int remove_files);
+int m_unlink(const char *pathname);
 void remove_registered_files_atexit(void);
 void remove_registered_files(int sig);

diff --git a/sbr/push.c b/sbr/push.c
index 6c57e6e..d77e375 100644 (file)
--- a/sbr/push.c
+++ b/sbr/push.c
@@ -7,6 +7,7 @@
 
 #include <h/mh.h>
 #include <h/signals.h>
+#include "m_mktemp.h"
 
 
 void

diff --git a/sbr/seq_save.c b/sbr/seq_save.c
index f95b443..787db94 100644 (file)
--- a/sbr/seq_save.c
+++ b/sbr/seq_save.c
@@ -8,6 +8,7 @@
 
 #include <h/mh.h>
 #include <h/signals.h>
+#include "m_mktemp.h"
 
 
 /*

diff --git a/uip/annosbr.c b/uip/annosbr.c
index c2aa865..778e2ab 100644 (file)
--- a/uip/annosbr.c
+++ b/uip/annosbr.c
@@ -8,6 +8,7 @@
 #include <h/mh.h>
 #include <h/tws.h>
 #include <h/utils.h>
+#include "../sbr/m_mktemp.h"
 #include <fcntl.h>
 #include <utime.h>
 

diff --git a/uip/burst.c b/uip/burst.c
index 888fb31..626e0bd 100644 (file)
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -8,6 +8,7 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <h/mhparse.h>
+#include "../sbr/m_mktemp.h"
 #include "mhfree.h"
 
 #define BURST_SWITCHES \

diff --git a/uip/distsbr.c b/uip/distsbr.c
index 91eb0a8..a4c4872 100644 (file)
--- a/uip/distsbr.c
+++ b/uip/distsbr.c
@@ -8,6 +8,7 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/utils.h>
+#include "../sbr/m_mktemp.h"
 
 static int  hdrfd = NOTOK;
 static int  txtfd = NOTOK;

diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index 3109bcf..e3fcb0d 100644 (file)
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -12,6 +12,7 @@
 #include <h/dropsbr.h>
 #include <h/mts.h>
 #include <h/tws.h>
+#include "../sbr/m_mktemp.h"
 
 #ifdef NTOHLSWAP
 # include <netinet/in.h>

diff --git a/uip/forwsbr.c b/uip/forwsbr.c
index f6104d2..a412d9a 100644 (file)
--- a/uip/forwsbr.c
+++ b/uip/forwsbr.c
@@ -10,6 +10,7 @@
 #include <h/fmt_scan.h>
 #include <h/tws.h>
 #include <h/utils.h>
+#include "../sbr/m_mktemp.h"
 
 /*
  * Take from replsbr.c - a buffer big enough to read in data header lines

diff --git a/uip/inc.c b/uip/inc.c
index 1bc4b19..fded926 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -40,6 +40,7 @@
 #include <h/signals.h>
 #include <h/tws.h>
 #include <h/mts.h>
+#include "../sbr/m_mktemp.h"
 
 #ifndef TLS_SUPPORT
 # define TLSminc(a) (a)

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index db5362f..1ef90e3 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -14,6 +14,7 @@
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
+#include "../sbr/m_mktemp.h"
 #include "mhfree.h"
 
 #define MHBUILD_SWITCHES \

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 8decc9f..26f9e3b 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -21,6 +21,7 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
+#include "../sbr/m_mktemp.h"
 #include "mhfree.h"
 
 #ifdef HAVE_SYS_TIME_H

diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index fe4f479..2c9a33d 100644 (file)
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -14,6 +14,7 @@
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
+#include "../sbr/m_mktemp.h"
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index fdeac8d..9d676cb 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -10,6 +10,7 @@
 #include <h/mhparse.h>
 #include <h/utils.h>
 #include <h/signals.h>
+#include "../sbr/m_mktemp.h"
 #include "mhfree.h"
 #include <fcntl.h>
 

diff --git a/uip/mhfree.c b/uip/mhfree.c
index 6e91623..1bb488d 100644 (file)
--- a/uip/mhfree.c
+++ b/uip/mhfree.c
@@ -10,6 +10,7 @@
 #include <h/utils.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
+#include "../sbr/m_mktemp.h"
 #include "mhfree.h"
 
 /* The list of top-level contents to display */

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 238fc1a..0be1329 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -13,6 +13,7 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
+#include "../sbr/m_mktemp.h"
 #include "mhfree.h"
 #ifdef HAVE_ICONV
 # include <iconv.h>

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 1e3a4ba..b2cdfb5 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -15,6 +15,7 @@
 #include <h/mhparse.h>
 #include <h/fmt_scan.h>
 #include <h/utils.h>
+#include "../sbr/m_mktemp.h"
 #ifdef HAVE_ICONV
 #   include <iconv.h>
 #endif /* ! HAVE_ICONV */

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index b836c07..7d74f1e 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -13,6 +13,7 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
+#include "../sbr/m_mktemp.h"
 
 enum clobber_policy_t {
   NMH_CLOBBER_ALWAYS = 0,

diff --git a/uip/post.c b/uip/post.c
index ff12d0c..44faf72 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -15,6 +15,7 @@
 #include <h/utils.h>
 #include <h/tws.h>
 #include <h/mts.h>
+#include "../sbr/m_mktemp.h"
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>

diff --git a/uip/prompter.c b/uip/prompter.c
index 3509229..0532c21 100644 (file)
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -8,6 +8,7 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/signals.h>
+#include "../sbr/m_mktemp.h"
 #include <setjmp.h>
 
 #include <termios.h>

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index 3707e8b..1ad585d 100644 (file)
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -11,6 +11,7 @@
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/utils.h>
+#include "../sbr/m_mktemp.h"
 
 #define RCVDIST_SWITCHES \
     X("form formfile", 4, FORMSW) \

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 257ef3d..bb07856 100644 (file)
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -9,6 +9,7 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/mts.h>
+#include "../sbr/m_mktemp.h"
 
 #define RCVSTORE_SWITCHES \
     X("create", 0, CRETSW) \

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index bd6fc33..3b83708 100644 (file)
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -17,6 +17,7 @@
 #include <h/scansbr.h>
 #include <h/tws.h>
 #include <h/mts.h>
+#include "../sbr/m_mktemp.h"
 #include <fcntl.h>
 
 #ifdef HAVE_GETUTXENT

diff --git a/uip/refile.c b/uip/refile.c
index 906eb89..8beae1b 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -8,6 +8,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include "../sbr/m_mktemp.h"
 #include <fcntl.h>
 
 #define REFILE_SWITCHES \

diff --git a/uip/rmf.c b/uip/rmf.c
index 36c7f92..7ac660c 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -7,6 +7,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include "../sbr/m_mktemp.h"
 
 #define RMF_SWITCHES \
     X("interactive", 0, INTRSW) \

diff --git a/uip/send.c b/uip/send.c
index 4df2827..83e148a 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -8,10 +8,10 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/utils.h>
-
 #ifdef OAUTH_SUPPORT
 # include <h/oauth.h>
 #endif
+#include "../sbr/m_mktemp.h"
 
 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 6f3c126..64a1ed6 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -23,7 +23,10 @@
 
 #ifdef OAUTH_SUPPORT
 #include <h/oauth.h>
+#endif
+#include "../sbr/m_mktemp.h"
 
+#ifdef OAUTH_SUPPORT
 static int setup_oauth_params(char *[], int *, const char *, const char **);
 #endif /* OAUTH_SUPPORT */
 

diff --git a/uip/slocal.c b/uip/slocal.c
index 4174d4a..60b222d 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -27,6 +27,7 @@
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/utils.h>
+#include "../sbr/m_mktemp.h"
 
 #include <pwd.h>
 #include <sys/ioctl.h>

diff --git a/uip/viamail.c b/uip/viamail.c
index 6732ddf..e7af770 100644 (file)
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -12,6 +12,7 @@
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
+#include "../sbr/m_mktemp.h"
 
 #define VIAMAIL_SWITCHES \
     X("to mailpath", 0, TOSW) \

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 71daf43..3aa9171 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -41,10 +41,10 @@
 #include <fcntl.h>
 #include <h/mime.h>
 #include <h/utils.h>
-
 #ifdef OAUTH_SUPPORT
 # include <h/oauth.h>
 #endif
+#include "../sbr/m_mktemp.h"
 
 #define WHATNOW_SWITCHES \
     X("draftfolder +folder", 0, DFOLDSW) \

diff --git a/uip/whom.c b/uip/whom.c
index edad5d7..f3a49f8 100644 (file)
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -8,6 +8,7 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <h/signals.h>
+#include "../sbr/m_mktemp.h"
 
 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)