X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1691e80890e5d8ba258c51c214a3e91880e1db2b..04ee0c3f6ad7e4177cc43a0c57f046013a4fbac9:/uip/packf.c diff --git a/uip/packf.c b/uip/packf.c index ec2f975a..6b092142 100644 --- a/uip/packf.c +++ b/uip/packf.c @@ -1,41 +1,40 @@ - -/* - * packf.c -- pack a nmh folder into a file +/* packf.c -- pack a nmh folder into a file * - * $Id$ + * 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 +#include "h/mh.h" +#include "sbr/path.h" +#include "sbr/print_version.h" +#include "sbr/print_help.h" +#include "sbr/error.h" #include -#include -#include - -/* - * 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 }, -#define MBOXSW 1 - { "mbox", 0 }, -#define MMDFSW 2 - { "mmdf", 0 }, -#define VERSIONSW 3 - { "version", 0 }, -#define HELPSW 4 - { "help", 4 }, - { NULL, 0 } -}; - -extern int errno; +#include "h/dropsbr.h" +#include "h/done.h" +#include "h/utils.h" +#include "sbr/m_maildir.h" + +#define PACKF_SWITCHES \ + X("file name", 0, FILESW) \ + X("mbox", 0, MBOXSW) \ + X("mmdf", 0, MMDFSW) \ + X("version", 0, VERSIONSW) \ + X("help", 0, HELPSW) \ + +#define X(sw, minchars, id) id, +DEFINE_SWITCH_ENUM(PACKF); +#undef X + +#define X(sw, minchars, id) { sw, minchars, id }, +DEFINE_SWITCH_ARRAY(PACKF, switches); +#undef X static int md = NOTOK; static int mbx_style = MBOX_FORMAT; -static int mapping = 0; + +static void mbxclose_done(int) NORETURN; char *file = NULL; @@ -43,31 +42,20 @@ char *file = NULL; 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; -#ifdef LOCALE - setlocale(LC_ALL, ""); -#endif - invo_name = r1bindex (argv[0], '/'); + if (nmh_init(argv[0], true, true)) { return 1; } - /* read user profile/context */ - context_read(); + set_done(mbxclose_done); 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 */ @@ -78,51 +66,38 @@ main (int argc, char **argv) ambigsw (cp, switches); done (1); case UNKWNSW: - adios (NULL, "-%s unknown", cp); + die("-%s unknown", cp); case HELPSW: snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name); print_help (buf, switches, 1); - done (1); + done (0); case VERSIONSW: print_version(invo_name); - done (1); + done (0); case FILESW: if (file) - adios (NULL, "only one file at a time!"); + die("only one file at a time!"); if (!(file = *argp++) || *file == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); continue; case MBOXSW: mbx_style = MBOX_FORMAT; - mapping = 0; continue; case MMDFSW: mbx_style = MMDF_FORMAT; - mapping = 1; continue; } } if (*cp == '+' || *cp == '@') { 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; - } + die("only one folder at a time!"); + folder = pluspath (cp); + } else + app_msgarg(&msgs, cp); } if (!file) @@ -137,7 +112,7 @@ main (int argc, char **argv) if (errno != ENOENT) adios (file, "error on file"); cp = concat ("Create file \"", file, "\"? ", NULL); - if (!getanswer (cp)) + if (!read_yes_or_no_if_tty (cp)) done (1); free (cp); } @@ -146,8 +121,8 @@ main (int argc, char **argv) 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); @@ -157,16 +132,16 @@ main (int argc, char **argv) adios (maildir, "unable to change directory to "); /* read folder and create message structure */ - if (!(mp = folder_read (folder))) - adios (NULL, "unable to read folder %s", folder); + if (!(mp = folder_read (folder, 1))) + 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 < 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 */ @@ -182,7 +157,7 @@ main (int argc, char **argv) break; } - if (mbx_copy (file, mbx_style, md, fd, mapping, NULL, 1) == NOTOK) + if (mbx_copy (file, mbx_style, md, fd, NULL) == NOTOK) adios (file, "error writing to file"); close (fd); @@ -198,10 +173,11 @@ main (int argc, char **argv) context_save (); /* save the context file */ folder_free (mp); /* free folder/message structure */ done (0); + return 1; } -void -done (int status) +static void NORETURN +mbxclose_done (int status) { mbx_close (file, md); exit (status);