-
-/*
- * burst.c -- explode digests into individual messages
+/* burst.c -- explode digests into individual messages
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
* complete copyright information.
*/
-#include <h/mh.h>
-#include <h/utils.h>
-#include <h/mhparse.h>
+#include "h/mh.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) \
*/
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);
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;
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;
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]",
done (0);
case INPLSW:
- inplace++;
+ inplace = true;
continue;
case NINPLSW:
- inplace = 0;
+ inplace = false;
continue;
case MIMESW:
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);
}
/* 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++)
done (1);
seq_setprev (mp); /* set the previous-sequence */
- smsgs = (struct smsg *)
- mh_xcalloc ((size_t) (MAXFOLDER + 2), sizeof(*smsgs));
- if (smsgs == NULL)
- adios (NULL, "unable to allocate burst storage");
+ smsgs = mh_xcalloc(MAXFOLDER + 2, sizeof *smsgs);
hi = mp->hghmsg + 1;
if ((numburst = find_delim (msgnum, smsgs, &mimesw)) >= 1) {
if (verbosw)
printf ("%d message%s exploded from digest %d\n",
- numburst, numburst > 1 ? "s" : "", msgnum);
+ numburst, PLURALS(numburst), msgnum);
burst (&mp, msgnum, smsgs, numburst, inplace, verbosw,
maildir, mimesw);
} else {
if (numburst == 0) {
if (!quietsw)
- admonish (NULL, "message %d not in digest format",
+ inform("message %d not in digest format, continuing...",
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");
}
}
}
- free ((char *) smsgs);
+ free(smsgs);
context_replace (pfolder, folder); /* update current folder */
/*
content = parse_mime(msgnam);
if (! content && *mimesw == 2)
return 0;
- else if (content) {
+ if (content) {
smsgs[0].s_start = 0;
smsgs[0].s_stop = content->c_begin - 1;
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;
}
}
}
/*
* Read in lines until we get to a message delimiter.
*
- * Previously we checked to make sure the preceeding line and
+ * Previously we checked to make sure the preceding line and
* next line was a newline. That actually does not comply with
* RFC 934, so make sure we break on a message delimiter even
* if the previous character was NOT a newline.
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);
}
/*
}
fclose (in);
- return (msgp - 1); /* return the number of messages burst */
+ return msgp - 1; /* return the number of messages burst */
}
for (part = m->mp_parts; part; part = part->mp_next)
find_mime_parts(part->mp_part, smsgs, msgp);
}
-
- return;
}
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;
*/
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 */
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));
admonish (f3, "unable to rename %s to", f1);
(void)snprintf(f3, sizeof (f3), "%s/%d", maildir, i);
- ext_hook("del-hook", f3, (char *)0);
+ ext_hook("del-hook", f3, NULL);
}
if (rename (f2, f1) == NOTOK)
admonish (f1, "unable to rename %s to", f2);
(void)snprintf(f3, sizeof (f3), "%s/%d", maildir, i);
- ext_hook("add-hook", f3, (char *)0);
+ ext_hook("add-hook", f3, NULL);
copy_msg_flags (mp, i, msgnum);
mp->msgflags |= SEQMOD;
#define S4 3
/*
- * Copy a mesage which is being burst out of a digest.
+ * Copy a message which is being burst out of a digest.
* It will remove any "dashstuffing" in the message.
*/
static void
cpybrst (FILE *in, FILE *out, char *ifile, char *ofile, int len, int mime)
{
- register int c, state;
+ int c, state;
for (state = mime ? S4 : S1; (c = fgetc (in)) != EOF && len > 0; len--) {
if (c == 0)
default:
state = S2;
+ /* FALLTHRU */
case '\n':
fputc (c, out);
break;
switch (c) {
case '\n':
state = S1;
+ /* FALLTHRU */
default:
fputc (c, out);
break;
projects / nmh / blobdiff