X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/e9bab734900d62af2bf2fc873dd480e7503335b9..ec173fd2c:/uip/burst.c?ds=inline diff --git a/uip/burst.c b/uip/burst.c index 0b15ebc9..09ecb992 100644 --- a/uip/burst.c +++ b/uip/burst.c @@ -5,9 +5,35 @@ * complete copyright information. */ -#include -#include -#include +#include "h/mh.h" +#include "sbr/m_name.h" +#include "sbr/m_gmprot.h" +#include "sbr/getarguments.h" +#include "sbr/seq_setprev.h" +#include "sbr/seq_setcur.h" +#include "sbr/seq_save.h" +#include "sbr/smatch.h" +#include "sbr/m_convert.h" +#include "sbr/m_backup.h" +#include "sbr/getfolder.h" +#include "sbr/ext_hook.h" +#include "sbr/folder_read.h" +#include "sbr/folder_realloc.h" +#include "sbr/folder_free.h" +#include "sbr/context_save.h" +#include "sbr/context_replace.h" +#include "sbr/context_find.h" +#include "sbr/ambigsw.h" +#include "sbr/path.h" +#include "sbr/print_version.h" +#include "sbr/print_help.h" +#include "sbr/error.h" +#include "h/utils.h" +#include "h/mhparse.h" +#include "h/done.h" +#include "sbr/m_maildir.h" +#include "sbr/m_mktemp.h" +#include "mhfree.h" #define BURST_SWITCHES \ X("inplace", 0, INPLSW) \ @@ -46,7 +72,7 @@ int debugsw = 0; */ static int find_delim (int, struct smsg *, int *); static void find_mime_parts (CT, struct smsg *, int *); -static void burst (struct msgs **, int, struct smsg *, int, int, int, +static void burst(struct msgs **, int, struct smsg *, int, bool, bool, char *, int); static void cpybrst (FILE *, FILE *, char *, char *, int, int); @@ -64,7 +90,10 @@ static void cpybrst (FILE *, FILE *, char *, char *, int, int); int main (int argc, char **argv) { - int inplace = 0, quietsw = 0, verbosw = 0, mimesw = 1; + bool inplace = false; + bool quietsw = false; + bool verbosw = false; + int mimesw = 1; int hi, msgnum, numburst; char *cp, *maildir, *folder = NULL, buf[BUFSIZ]; char **argp, **arguments; @@ -72,7 +101,7 @@ main (int argc, char **argv) struct smsg *smsgs; struct msgs *mp; - if (nmh_init(argv[0], 1)) { return 1; } + if (nmh_init(argv[0], true, true)) { return 1; } arguments = getarguments (invo_name, argc, argv, 1); argp = arguments; @@ -84,7 +113,7 @@ main (int argc, char **argv) ambigsw (cp, switches); done (1); case UNKWNSW: - adios (NULL, "-%s unknown\n", cp); + die("-%s unknown\n", cp); case HELPSW: snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]", @@ -96,10 +125,10 @@ main (int argc, char **argv) done (0); case INPLSW: - inplace++; + inplace = true; continue; case NINPLSW: - inplace = 0; + inplace = false; continue; case MIMESW: @@ -113,25 +142,24 @@ main (int argc, char **argv) continue; case QIETSW: - quietsw++; + quietsw = true; continue; case NQIETSW: - quietsw = 0; + quietsw = false; continue; case VERBSW: - verbosw++; + verbosw = true; continue; case NVERBSW: - verbosw = 0; + verbosw = false; continue; } } if (*cp == '+' || *cp == '@') { if (folder) - adios (NULL, "only one folder at a time!"); - else - folder = pluspath (cp); + die("only one folder at a time!"); + folder = pluspath (cp); } else { app_msgarg(&msgs, cp); } @@ -150,11 +178,11 @@ main (int argc, char **argv) /* read folder and create message structure */ if (!(mp = folder_read (folder, 1))) - adios (NULL, "unable to read folder %s", folder); + die("unable to read folder %s", folder); /* check for empty folder */ if (mp->nummsg == 0) - adios (NULL, "no messages in %s", folder); + die("no messages in %s", folder); /* parse all the message ranges/sequences and set SELECTED */ for (msgnum = 0; msgnum < msgs.size; msgnum++) @@ -182,7 +210,7 @@ main (int argc, char **argv) msgnum); } /* this pair of braces was missing before 1999-07-15 */ else - adios (NULL, "burst() botch -- you lose big"); + die("burst() botch -- you lose big"); } } } @@ -246,11 +274,11 @@ find_delim (int msgnum, struct smsg *smsgs, int *mimesw) msgp = 1; find_mime_parts(content, smsgs, &msgp); free_content(content); - if (msgp == 1 && *mimesw == 2) { + if (msgp == 1 && *mimesw == 2) adios (msgnam, "does not have any message/rfc822 parts"); - } else if (msgp > 1) { + if (msgp > 1) { *mimesw = 1; - return (msgp - 1); + return msgp - 1; } } } @@ -290,8 +318,7 @@ find_delim (int msgnum, struct smsg *smsgs, int *mimesw) for (c = 0; fgets (buffer, sizeof(buffer), in); c = buffer[0]) { if ((wasdlm = CHECKDELIM(buffer))) break; - else - pos += (long) strlen (buffer); + pos += (long) strlen (buffer); } /* @@ -314,7 +341,7 @@ find_delim (int msgnum, struct smsg *smsgs, int *mimesw) } fclose (in); - return (msgp - 1); /* return the number of messages burst */ + return msgp - 1; /* return the number of messages burst */ } @@ -360,7 +387,7 @@ find_mime_parts (CT content, struct smsg *smsgs, int *msgp) static void burst (struct msgs **mpp, int msgnum, struct smsg *smsgs, int numburst, - int inplace, int verbosw, char *maildir, int mimesw) + bool inplace, bool verbosw, char *maildir, int mimesw) { int i, j, mode; char *msgnam; @@ -382,7 +409,7 @@ burst (struct msgs **mpp, int msgnum, struct smsg *smsgs, int numburst, */ if ((mp->hghmsg + numburst > mp->hghoff) && !(mp = folder_realloc (mp, mp->lowoff, mp->hghmsg + numburst))) - adios (NULL, "unable to allocate folder storage"); + die("unable to allocate folder storage"); *mpp = mp; j = mp->hghmsg; /* old value */ @@ -453,7 +480,7 @@ burst (struct msgs **mpp, int msgnum, struct smsg *smsgs, int numburst, char *tempfile; if ((tempfile = m_mktemp2(NULL, invo_name, NULL, &out)) == NULL) { - adios(NULL, "unable to create temporary file in %s", + die("unable to create temporary file in %s", get_temp_dir()); } strncpy (f2, tempfile, sizeof(f2));