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 a89fe734f973dbd959a016fd2b7b50cdc4d13f9e..28d21f0b29b0e645550aa8501e82aa97fd294ff2 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 92c7ca39179a75157c51886789697747670611ea..e5b6ae282d745fd7950f3e92aacabc4d7e79ef6c 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 0bf82f8afc885e04d667ca98602537f6ea57e5b0..c7002b2e361a954f015250097f10d8f52ffd8954 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 05be68af4e73ddd4b584864e591995dc9a58de99..5a616f260f0a44bdd55bfe5edbd62b3380384ea9 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 dbc614fe0bec4e3a7765022037c11567cdf08649..e26114d965fe9e9e153df73e38c6667be0e5f243 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 6c57e6ecb137e6f2a623726868156d22098752c3..d77e37548d939f3ff276cf060bf09f790e169e79 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 f95b44365879a3716f154b6a0d4d9810c327ec85..787db946f70280a833641a4321d7df751ccddf7b 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 c2aa8652718a5f50390ce06ebce0c7a92dd7c386..778e2ab2c9be8f55a7dd18a17d7385a70eb8d0bd 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 888fb31a2854c1b8cd1f9e434bfb0db56d240300..626e0bd104414d33f54cdb714c7715d4d7e4e94a 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 91eb0a8b2a60cfc9a36217a245a2cfc3af2ff138..a4c487238ec3659972ea91a9dfa0d1f0666107e4 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 3109bcf78a1223cbcd08ef0c2a3ef2694c5439cd..e3fcb0d45afc5dd5e855533ba59d2aa1fcf5aaa5 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 f6104d2393df8f11d06bcc610d79ee08be503c7d..a412d9a484321d229c518ddb9a64dd84d71656c3 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 1bc4b19835404b4d8de23986b0ba6674ecef0aa5..fded9267bb5b69a7ef9081b26552cb11daf28d6d 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 db5362f8365a1c69510d5f637d42a76f614ca10e..1ef90e364986d354114ceb6284e776de813e16f9 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 8decc9fe7c2c6e02057011a74a8d44d2bf2c76bb..26f9e3bd5badc74b787705c5a1386bc2c545d712 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 fe4f4790d5352a92f9b3398609b764793bb5d4b6..2c9a33de5f16416be3dddeae2b77370ca538b916 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 fdeac8d6c45be2c0df01632ffdbdd08101d9fe7c..9d676cbe4eaa4548a2108aec148ec5cdec7256bd 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 6e91623ccbc714f69a3be07345a7a5be8c95d387..1bb488d1678147b5c8ddf9e9693671a55cc889fb 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 238fc1a30d4cfe3c21f4a7a7760d5b9a4267aaa9..0be13294926e323b671dfe567033d258a88fa51d 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 1e3a4ba465c3de24d78396bc60a04392eb40eeeb..b2cdfb54d40ab7fb0f677824e598bfb2601d5aba 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 b836c07c37b73b869e22778967197273220ec253..7d74f1ea36d11b2f7463278c507e93df755d34e5 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 ff12d0c9ae1cb770807c340fe6cb476deb242b77..44faf725f841929c8ca9d5f4592757f6fd0f4604 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 35092296eba43b27fc07fd1717099b41c00d1919..0532c2194d2dfc5b666b27522c1f38b50e49fb18 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 3707e8b5e047f0bfbd686995295705b83b206f53..1ad585d2035cdab965cb8f8329820f417a801f89 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 257ef3da7e677f95e8fa5b2d036970cde014b409..bb07856e9d8a0d982941df824c8bee099ab330f0 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 bd6fc33589b677d4c11ba3150b0fd9edc987801d..3b837081d2e367db2ad0391271adbb67a10f8949 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 906eb89337b4cc7dcce23ce41c20a249b8e8c684..8beae1b8d6c4a26b71924284be6794653e2424ae 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 36c7f924331ce24b2e971f399ae674eb0ced962d..7ac660cba24e5c15cef6e812c74584312af9a71e 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 4df28271ea1e2fdb005faba1ea67debca36c509f..83e148a770e4a5e54d33e37deb3911e9cc7ffcb7 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 6f3c12622c5735b4e61d27291a11e770d1596312..64a1ed683fc9f246d56830b0bb64619f5b0750ce 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 4174d4a00e3552f7c08b5f0364e57673ce11a617..60b222d7940aa7057d3386ac45188fa70c90043c 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 6732ddf6023c7018100fc46e451a8c71a012bc52..e7af7706865a30d20f960bb71b28f183b746715f 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 71daf43f3153f5ad54302bd71f9d381ebe57486d..3aa91716aaf5a0c412fa92edbf6bf304daf29345 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 edad5d778b7b0fed4eda1d5901464ce1b1911319..f3a49f854d9cbafac00750c0868c44784de0689a 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)