#include <h/mh.h>
#include <fcntl.h>
#include <h/dropsbr.h>
+#include <h/utils.h>
#include <errno.h>
-/*
- * We allocate space for messages (msgs array)
- * this number of elements at a time.
- */
-#define MAXMSGS 256
-
-
static struct swit switches[] = {
#define FILESW 0
{ "file name", 0 },
int
main (int argc, char **argv)
{
- int nummsgs, maxmsgs, fd, msgnum;
+ int fd, msgnum;
char *cp, *maildir, *msgnam, *folder = NULL, buf[BUFSIZ];
- char **argp, **arguments, **msgs;
+ char **argp, **arguments;
+ struct msgs_array msgs = { 0, 0, NULL };
struct msgs *mp;
struct stat st;
arguments = getarguments (invo_name, argc, argv, 1);
argp = arguments;
- /* Allocate the initial space to record message
- * names and ranges.
- */
- nummsgs = 0;
- maxmsgs = MAXMSGS;
- if (!(msgs = (char **) malloc ((size_t) (maxmsgs * sizeof(*msgs)))))
- adios (NULL, "unable to allocate storage");
-
/*
* Parse arguments
*/
if (folder)
adios (NULL, "only one folder at a time!");
folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
- } else {
- /*
- * Check if we need to allocate more space
- * for message name/ranges.
- */
- if (nummsgs >= maxmsgs) {
- maxmsgs += MAXMSGS;
- if (!(msgs = (char **) realloc (msgs,
- (size_t) (maxmsgs * sizeof(*msgs)))))
- adios (NULL, "unable to reallocate msgs storage");
- }
- msgs[nummsgs++] = cp;
- }
+ } else
+ app_msgarg(&msgs, cp);
}
if (!file)
free (path ("./", TFOLDER));
/* default is to pack whole folder */
- if (!nummsgs)
- msgs[nummsgs++] = "all";
+ if (!msgs.size)
+ app_msgarg(&msgs, "all");
if (!folder)
folder = getfolder (1);
adios (NULL, "no messages in %s", folder);
/* parse all the message ranges/sequences and set SELECTED */
- for (msgnum = 0; msgnum < nummsgs; msgnum++)
- if (!m_convert (mp, msgs[msgnum]))
+ for (msgnum = 0; msgnum < msgs.size; msgnum++)
+ if (!m_convert (mp, msgs.msgs[msgnum]))
done (1);
seq_setprev (mp); /* set the previous-sequence */