From: Ralph Corderoy Date: Mon, 15 May 2017 14:07:10 +0000 (+0100) Subject: sbr/m_mktemp.h: Move remaining prototypes from h/prototypes.h. X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/f2753d64be0a74a22018e03ec9c04cc9ca45d3ab?ds=sidebyside;hp=--cc sbr/m_mktemp.h: Move remaining prototypes from h/prototypes.h. Gives the normal one header file showing interface exported by one C file. --- f2753d64be0a74a22018e03ec9c04cc9ca45d3ab diff --git a/h/prototypes.h b/h/prototypes.h index a89fe734..28d21f0b 100644 --- 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 92c7ca39..e5b6ae28 100644 --- a/sbr/folder_delmsgs.c +++ b/sbr/folder_delmsgs.c @@ -7,6 +7,7 @@ #include #include +#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 0bf82f8a..c7002b2e 100644 --- a/sbr/lock_file.c +++ b/sbr/lock_file.c @@ -17,6 +17,7 @@ #include #include #include +#include "m_mktemp.h" #ifdef HAVE_SYS_TIME_H # include diff --git a/sbr/m_backup.c b/sbr/m_backup.c index 05be68af..5a616f26 100644 --- a/sbr/m_backup.c +++ b/sbr/m_backup.c @@ -6,6 +6,7 @@ */ #include +#include "m_mktemp.h" char * diff --git a/sbr/m_mktemp.h b/sbr/m_mktemp.h index dbc614fe..e26114d9 100644 --- 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 6c57e6ec..d77e3754 100644 --- a/sbr/push.c +++ b/sbr/push.c @@ -7,6 +7,7 @@ #include #include +#include "m_mktemp.h" void diff --git a/sbr/seq_save.c b/sbr/seq_save.c index f95b4436..787db946 100644 --- a/sbr/seq_save.c +++ b/sbr/seq_save.c @@ -8,6 +8,7 @@ #include #include +#include "m_mktemp.h" /* diff --git a/uip/annosbr.c b/uip/annosbr.c index c2aa8652..778e2ab2 100644 --- a/uip/annosbr.c +++ b/uip/annosbr.c @@ -8,6 +8,7 @@ #include #include #include +#include "../sbr/m_mktemp.h" #include #include diff --git a/uip/burst.c b/uip/burst.c index 888fb31a..626e0bd1 100644 --- a/uip/burst.c +++ b/uip/burst.c @@ -8,6 +8,7 @@ #include #include #include +#include "../sbr/m_mktemp.h" #include "mhfree.h" #define BURST_SWITCHES \ diff --git a/uip/distsbr.c b/uip/distsbr.c index 91eb0a8b..a4c48723 100644 --- a/uip/distsbr.c +++ b/uip/distsbr.c @@ -8,6 +8,7 @@ #include #include #include +#include "../sbr/m_mktemp.h" static int hdrfd = NOTOK; static int txtfd = NOTOK; diff --git a/uip/dropsbr.c b/uip/dropsbr.c index 3109bcf7..e3fcb0d4 100644 --- a/uip/dropsbr.c +++ b/uip/dropsbr.c @@ -12,6 +12,7 @@ #include #include #include +#include "../sbr/m_mktemp.h" #ifdef NTOHLSWAP # include diff --git a/uip/forwsbr.c b/uip/forwsbr.c index f6104d23..a412d9a4 100644 --- a/uip/forwsbr.c +++ b/uip/forwsbr.c @@ -10,6 +10,7 @@ #include #include #include +#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 1bc4b198..fded9267 100644 --- a/uip/inc.c +++ b/uip/inc.c @@ -40,6 +40,7 @@ #include #include #include +#include "../sbr/m_mktemp.h" #ifndef TLS_SUPPORT # define TLSminc(a) (a) diff --git a/uip/mhbuild.c b/uip/mhbuild.c index db5362f8..1ef90e36 100644 --- a/uip/mhbuild.c +++ b/uip/mhbuild.c @@ -14,6 +14,7 @@ #include #include #include +#include "../sbr/m_mktemp.h" #include "mhfree.h" #define MHBUILD_SWITCHES \ diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c index 8decc9fe..26f9e3bd 100644 --- a/uip/mhbuildsbr.c +++ b/uip/mhbuildsbr.c @@ -21,6 +21,7 @@ #include #include #include +#include "../sbr/m_mktemp.h" #include "mhfree.h" #ifdef HAVE_SYS_TIME_H diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c index fe4f4790..2c9a33de 100644 --- a/uip/mhcachesbr.c +++ b/uip/mhcachesbr.c @@ -14,6 +14,7 @@ #include #include #include +#include "../sbr/m_mktemp.h" #ifdef HAVE_SYS_TIME_H # include diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c index fdeac8d6..9d676cbe 100644 --- a/uip/mhfixmsg.c +++ b/uip/mhfixmsg.c @@ -10,6 +10,7 @@ #include #include #include +#include "../sbr/m_mktemp.h" #include "mhfree.h" #include diff --git a/uip/mhfree.c b/uip/mhfree.c index 6e91623c..1bb488d1 100644 --- a/uip/mhfree.c +++ b/uip/mhfree.c @@ -10,6 +10,7 @@ #include #include #include +#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 238fc1a3..0be13294 100644 --- a/uip/mhparse.c +++ b/uip/mhparse.c @@ -13,6 +13,7 @@ #include #include #include +#include "../sbr/m_mktemp.h" #include "mhfree.h" #ifdef HAVE_ICONV # include diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c index 1e3a4ba4..b2cdfb54 100644 --- a/uip/mhshowsbr.c +++ b/uip/mhshowsbr.c @@ -15,6 +15,7 @@ #include #include #include +#include "../sbr/m_mktemp.h" #ifdef HAVE_ICONV # include #endif /* ! HAVE_ICONV */ diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c index b836c07c..7d74f1ea 100644 --- a/uip/mhstoresbr.c +++ b/uip/mhstoresbr.c @@ -13,6 +13,7 @@ #include #include #include +#include "../sbr/m_mktemp.h" enum clobber_policy_t { NMH_CLOBBER_ALWAYS = 0, diff --git a/uip/post.c b/uip/post.c index ff12d0c9..44faf725 100644 --- a/uip/post.c +++ b/uip/post.c @@ -15,6 +15,7 @@ #include #include #include +#include "../sbr/m_mktemp.h" #ifdef HAVE_SYS_TIME_H # include diff --git a/uip/prompter.c b/uip/prompter.c index 35092296..0532c219 100644 --- a/uip/prompter.c +++ b/uip/prompter.c @@ -8,6 +8,7 @@ #include #include #include +#include "../sbr/m_mktemp.h" #include #include diff --git a/uip/rcvdist.c b/uip/rcvdist.c index 3707e8b5..1ad585d2 100644 --- a/uip/rcvdist.c +++ b/uip/rcvdist.c @@ -11,6 +11,7 @@ #include #include #include +#include "../sbr/m_mktemp.h" #define RCVDIST_SWITCHES \ X("form formfile", 4, FORMSW) \ diff --git a/uip/rcvstore.c b/uip/rcvstore.c index 257ef3da..bb07856e 100644 --- a/uip/rcvstore.c +++ b/uip/rcvstore.c @@ -9,6 +9,7 @@ #include #include #include +#include "../sbr/m_mktemp.h" #define RCVSTORE_SWITCHES \ X("create", 0, CRETSW) \ diff --git a/uip/rcvtty.c b/uip/rcvtty.c index bd6fc335..3b837081 100644 --- a/uip/rcvtty.c +++ b/uip/rcvtty.c @@ -17,6 +17,7 @@ #include #include #include +#include "../sbr/m_mktemp.h" #include #ifdef HAVE_GETUTXENT diff --git a/uip/refile.c b/uip/refile.c index 906eb893..8beae1b8 100644 --- a/uip/refile.c +++ b/uip/refile.c @@ -8,6 +8,7 @@ #include #include +#include "../sbr/m_mktemp.h" #include #define REFILE_SWITCHES \ diff --git a/uip/rmf.c b/uip/rmf.c index 36c7f924..7ac660cb 100644 --- a/uip/rmf.c +++ b/uip/rmf.c @@ -7,6 +7,7 @@ #include #include +#include "../sbr/m_mktemp.h" #define RMF_SWITCHES \ X("interactive", 0, INTRSW) \ diff --git a/uip/send.c b/uip/send.c index 4df28271..83e148a7 100644 --- a/uip/send.c +++ b/uip/send.c @@ -8,10 +8,10 @@ #include #include #include - #ifdef OAUTH_SUPPORT # include #endif +#include "../sbr/m_mktemp.h" #ifndef CYRUS_SASL # define SASLminc(a) (a) diff --git a/uip/sendsbr.c b/uip/sendsbr.c index 6f3c1262..64a1ed68 100644 --- a/uip/sendsbr.c +++ b/uip/sendsbr.c @@ -23,7 +23,10 @@ #ifdef OAUTH_SUPPORT #include +#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 4174d4a0..60b222d7 100644 --- a/uip/slocal.c +++ b/uip/slocal.c @@ -27,6 +27,7 @@ #include #include #include +#include "../sbr/m_mktemp.h" #include #include diff --git a/uip/viamail.c b/uip/viamail.c index 6732ddf6..e7af7706 100644 --- a/uip/viamail.c +++ b/uip/viamail.c @@ -12,6 +12,7 @@ #include #include #include +#include "../sbr/m_mktemp.h" #define VIAMAIL_SWITCHES \ X("to mailpath", 0, TOSW) \ diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c index 71daf43f..3aa91716 100644 --- a/uip/whatnowsbr.c +++ b/uip/whatnowsbr.c @@ -41,10 +41,10 @@ #include #include #include - #ifdef OAUTH_SUPPORT # include #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 edad5d77..f3a49f85 100644 --- a/uip/whom.c +++ b/uip/whom.c @@ -8,6 +8,7 @@ #include #include #include +#include "../sbr/m_mktemp.h" #ifndef CYRUS_SASL # define SASLminc(a) (a)