X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/81a21a9a97d8633f6d6231e31fdb6e328d0d3ff2..4bf2f9df237a4ff9cf449abaae0e444d74981dfa:/uip/pick.c?ds=inline diff --git a/uip/pick.c b/uip/pick.c index 4f26bb2e..5549ea64 100644 --- a/uip/pick.c +++ b/uip/pick.c @@ -2,9 +2,7 @@ /* * pick.c -- search for messages by content * - * $Id$ - * - * This code is Copyright (c) 2002, by the authors of nmh. See the + * This code is Copyright (c) 2002, 2008, by the authors of nmh. See the * COPYRIGHT file in the root directory of the nmh distribution for * complete copyright information. */ @@ -14,79 +12,60 @@ #include #include -/* - * We allocate space for messages (msgs array) - * this number of elements at a time. - */ -#define MAXMSGS 256 - - -static struct swit switches[] = { -#define ANDSW 0 - { "and", 0 }, -#define ORSW 1 - { "or", 0 }, -#define NOTSW 2 - { "not", 0 }, -#define LBRSW 3 - { "lbrace", 0 }, -#define RBRSW 4 - { "rbrace", 0 }, -#define CCSW 5 - { "cc pattern", 0 }, -#define DATESW 6 - { "date pattern", 0 }, -#define FROMSW 7 - { "from pattern", 0 }, -#define SRCHSW 8 - { "search pattern", 0 }, -#define SUBJSW 9 - { "subject pattern", 0 }, -#define TOSW 10 - { "to pattern", 0 }, -#define OTHRSW 11 - { "-othercomponent pattern", 0 }, -#define AFTRSW 12 - { "after date", 0 }, -#define BEFRSW 13 - { "before date", 0 }, -#define DATFDSW 14 - { "datefield field", 5 }, -#define SEQSW 15 - { "sequence name", 0 }, -#define PUBLSW 16 - { "public", 0 }, -#define NPUBLSW 17 - { "nopublic", 0 }, -#define ZEROSW 18 - { "zero", 0 }, -#define NZEROSW 19 - { "nozero", 0 }, -#define LISTSW 20 - { "list", 0 }, -#define NLISTSW 21 - { "nolist", 0 }, -#define VERSIONSW 22 - { "version", 0 }, -#define HELPSW 23 - { "help", 0 }, - { NULL, 0 } -}; +#define PICK_SWITCHES \ + X("and", 0, ANDSW) \ + X("or", 0, ORSW) \ + X("not", 0, NOTSW) \ + X("lbrace", 0, LBRSW) \ + X("rbrace", 0, RBRSW) \ + X("cc pattern", 0, CCSW) \ + X("date pattern", 0, DATESW) \ + X("from pattern", 0, FROMSW) \ + X("search pattern", 0, SRCHSW) \ + X("subject pattern", 0, SUBJSW) \ + X("to pattern", 0, TOSW) \ + X("-othercomponent pattern", 0, OTHRSW) \ + X("after date", 0, AFTRSW) \ + X("before date", 0, BEFRSW) \ + X("datefield field", 5, DATFDSW) \ + X("sequence name", 0, SEQSW) \ + X("nosequence", 0, NSEQSW) \ + X("public", 0, PUBLSW) \ + X("nopublic", 0, NPUBLSW) \ + X("zero", 0, ZEROSW) \ + X("nozero", 0, NZEROSW) \ + X("list", 0, LISTSW) \ + X("nolist", 0, NLISTSW) \ + X("version", 0, VERSIONSW) \ + X("help", 0, HELPSW) \ + +#define X(sw, minchars, id) id, +DEFINE_SWITCH_ENUM(PICK); +#undef X + +#define X(sw, minchars, id) { sw, minchars, id }, +DEFINE_SWITCH_ARRAY(PICK, switches); +#undef X static int listsw = -1; +static void putzero_done (int) NORETURN; int main (int argc, char **argv) { - int publicsw = -1, zerosw = 1, seqp = 0, vecp = 0; - int nummsgs, maxmsgs, lo, hi, msgnum; + int publicsw = -1, zerosw = 1, vecp = 0; + size_t seqp = 0; + int lo, hi, msgnum; char *maildir, *folder = NULL, buf[100]; char *cp, **argp, **arguments; - char **msgs, *seqs[NUMATTRS + 1], *vec[MAXARGS]; + char *seqs[NUMATTRS + 1], *vec[MAXARGS]; + struct msgs_array msgs = { 0, 0, NULL }; struct msgs *mp; register FILE *fp; + done=putzero_done; + #ifdef LOCALE setlocale(LC_ALL, ""); #endif @@ -98,14 +77,6 @@ main (int argc, char **argv) arguments = getarguments (invo_name, argc, argv, 1); argp = arguments; - /* - * Allocate the initial space to record message - * names, ranges, and sequences. - */ - nummsgs = 0; - maxmsgs = MAXMSGS; - msgs = (char **) mh_xmalloc ((size_t) (maxmsgs * sizeof(*msgs))); - while ((cp = *argp++)) { if (*cp == '-') { if (*++cp == '-') { @@ -125,11 +96,11 @@ main (int argc, char **argv) invo_name); print_help (buf, switches, 1); listsw = 0; /* HACK */ - done (1); + done (0); case VERSIONSW: print_version(invo_name); listsw = 0; /* HACK */ - done (1); + done (0); case CCSW: case DATESW: @@ -164,8 +135,15 @@ main (int argc, char **argv) /* check if too many sequences specified */ if (seqp >= NUMATTRS) adios (NULL, "too many sequences (more than %d) specified", NUMATTRS); + + if (!seq_nameok (cp)) + done (1); + seqs[seqp++] = cp; continue; + case NSEQSW: + seqp = 0; + continue; case PUBLSW: publicsw = 1; continue; @@ -191,20 +169,9 @@ main (int argc, char **argv) if (folder) adios (NULL, "only one folder at a time!"); else - folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF); - } else { - /* - * Check if we need to allocate more space - * for message name/ranges/sequences. - */ - 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; - } + folder = pluspath (cp); + } else + app_msgarg(&msgs, cp); } vec[vecp] = NULL; @@ -215,8 +182,8 @@ main (int argc, char **argv) * If we didn't specify which messages to search, * then search the whole folder. */ - if (!nummsgs) - msgs[nummsgs++] = "all"; + if (!msgs.size) + app_msgarg(&msgs, "all"); if (!folder) folder = getfolder (1); @@ -234,8 +201,8 @@ main (int argc, char **argv) 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 */ @@ -255,6 +222,11 @@ main (int argc, char **argv) lo = mp->lowsel; hi = mp->hghsel; + /* If printing message numbers to standard out, force line buffering on. + */ + if (listsw) + setvbuf (stdout, NULL, _IOLBF, 0); + /* * Scan through all the SELECTED messages and check for a * match. If the message does not match, then unselect it. @@ -268,6 +240,9 @@ main (int argc, char **argv) lo = msgnum; if (msgnum > hi) hi = msgnum; + + if (listsw) + printf ("%s\n", m_name (msgnum)); } else { /* if it doesn't match, then unselect it */ unset_selected (mp, msgnum); @@ -294,13 +269,9 @@ main (int argc, char **argv) done (1); /* - * Print the name of all the matches + * Print total matched if not printing each matched message number. */ - if (listsw) { - for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) - if (is_selected (mp, msgnum)) - printf ("%s\n", m_name (msgnum)); - } else { + if (!listsw) { printf ("%d hit%s\n", mp->numsel, mp->numsel == 1 ? "" : "s"); } @@ -308,15 +279,15 @@ main (int argc, char **argv) seq_save (mp); /* synchronize message sequences */ context_save (); /* save the context file */ folder_free (mp); /* free folder/message structure */ - return done (0); + done (0); + return 1; } -int -done (int status) +static void +putzero_done (int status) { if (listsw && status && !isatty (fileno (stdout))) printf ("0\n"); exit (status); - return 1; /* dead code to satisfy the compiler */ }