X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/ecd50cc5f6c2a427e821483993678b78c94ffdfd..361f9cbca968760822f53a80b407f24ce1713ccd:/uip/scan.c diff --git a/uip/scan.c b/uip/scan.c index b65fef74..c1f27194 100644 --- a/uip/scan.c +++ b/uip/scan.c @@ -5,14 +5,37 @@ * complete copyright information. */ -#include -#include -#include -#include -#include -#include -#include "../sbr/m_maildir.h" -#include "../sbr/terminal.h" +#include "h/mh.h" +#include "sbr/fmt_new.h" +#include "sbr/dtime.h" +#include "scansbr.h" +#include "sbr/m_name.h" +#include "sbr/getarguments.h" +#include "sbr/seq_setprev.h" +#include "sbr/seq_save.h" +#include "sbr/smatch.h" +#include "sbr/m_convert.h" +#include "sbr/getfolder.h" +#include "sbr/folder_read.h" +#include "sbr/folder_free.h" +#include "sbr/context_save.h" +#include "sbr/context_replace.h" +#include "sbr/context_find.h" +#include "sbr/brkstring.h" +#include "sbr/ambigsw.h" +#include "sbr/path.h" +#include "sbr/print_version.h" +#include "sbr/print_help.h" +#include "sbr/seq_getnum.h" +#include "sbr/error.h" +#include "h/fmt_scan.h" +#include "h/tws.h" +#include "h/mts.h" +#include "h/done.h" +#include "h/utils.h" +#include "sbr/m_maildir.h" +#include "sbr/terminal.h" +#include "sbr/maildir_read_and_sort.h" #define SCAN_SWITCHES \ X("clear", 0, CLRSW) \ @@ -40,19 +63,24 @@ DEFINE_SWITCH_ARRAY(SCAN, switches); int main (int argc, char **argv) { - int clearflag = 0, hdrflag = 0, ontty; - int width = -1, revflag = 0; + bool clearflag = false; + bool hdrflag = false; + int ontty = 0; + int width = -1; + bool revflag = false; int i, state, msgnum; ivector_t seqnum = ivector_create (0); - int unseen, num_unseen_seq = 0; + bool unseen; + int num_unseen_seq = 0; char *cp, *maildir, *file = NULL, *folder = NULL; char *form = NULL, *format = NULL, buf[BUFSIZ]; char **argp, *nfs, **arguments; struct msgs_array msgs = { 0, 0, NULL }; struct msgs *mp; + charstring_t scanl = NULL; FILE *in; - if (nmh_init(argv[0], 1)) { return 1; } + if (nmh_init(argv[0], true, true)) { return 1; } mts_init (); arguments = getarguments (invo_name, argc, argv, 1); @@ -64,13 +92,13 @@ main (int argc, char **argv) while ((cp = *argp++)) { if (*cp == '-') { switch (smatch (++cp, switches)) { - case AMBIGSW: + case AMBIGSW: ambigsw (cp, switches); done (1); - case UNKWNSW: - adios (NULL, "-%s unknown", cp); + case UNKWNSW: + die("-%s unknown", cp); - case HELPSW: + case HELPSW: snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name); print_help (buf, switches, 1); @@ -79,46 +107,46 @@ main (int argc, char **argv) print_version(invo_name); done (0); - case CLRSW: - clearflag++; + case CLRSW: + clearflag = true; continue; - case NCLRSW: - clearflag = 0; + case NCLRSW: + clearflag = false; continue; - case FORMSW: + case FORMSW: if (!(form = *argp++) || *form == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); format = NULL; continue; - case FMTSW: + case FMTSW: if (!(format = *argp++) || *format == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); form = NULL; continue; - case HEADSW: - hdrflag++; + case HEADSW: + hdrflag = true; continue; - case NHEADSW: - hdrflag = 0; + case NHEADSW: + hdrflag = false; continue; - case WIDTHSW: + case WIDTHSW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); width = atoi (cp); continue; case REVSW: - revflag++; + revflag = true; continue; case NREVSW: - revflag = 0; + revflag = false; continue; case FILESW: if (!(cp = *argp++) || (cp[0] == '-' && cp[1])) - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); if (strcmp (file = cp, "-")) file = path (cp, TFILE); continue; @@ -126,7 +154,7 @@ main (int argc, char **argv) } if (*cp == '+' || *cp == '@') { if (folder) - adios (NULL, "only one folder at a time!"); + die("only one folder at a time!"); folder = pluspath (cp); } else app_msgarg(&msgs, cp); @@ -140,38 +168,91 @@ main (int argc, char **argv) */ nfs = new_fs (form, format, FORMAT); - /* - * We are scanning a maildrop file - */ if (file) { + /* + * We have a -file argument + */ if (msgs.size) - adios (NULL, "\"msgs\" not allowed with -file"); + die("\"msgs\" not allowed with -file"); if (folder) - adios (NULL, "\"+folder\" not allowed with -file"); + die("\"+folder\" not allowed with -file"); /* check if "file" is really stdin */ if (strcmp (file, "-") == 0) { in = stdin; file = "stdin"; } else { - if ((in = fopen (file, "r")) == NULL) - adios (file, "unable to open"); + /* check if "file" is really a Maildir folder */ + struct stat st; + if (stat (file, &st) == NOTOK) + adios (file, "unable to stat"); + if (!(st.st_mode & S_IFDIR)) { + if ((in = fopen (file, "r")) == NULL) + adios (file, "unable to open"); + } else { + /* + * We are scanning a Maildir folder + */ + struct Maildir_entry *Maildir; + int num_maildir_entries; + int msgnum = 0; + char *fnp; + FILE *in; + int i; + + maildir_read_and_sort(file, &Maildir, &num_maildir_entries); + for (i = 0; i < num_maildir_entries; i++) { + msgnum++; + fnp = Maildir[i].filename; + + if ((in = fopen (fnp, "r")) == NULL) { + admonish (fnp, "unable to open message"); + continue; + } + + switch (state = scan (in, msgnum, 0, nfs, width, + 0, 0, hdrflag ? file : NULL, + 0L, 1, &scanl)) { + case SCNMSG: + case SCNERR: + break; + + default: + die("scan() botch (%d)", state); + + case SCNEOF: + inform("message %d: empty", msgnum); + break; + } + if (scanl) + charstring_clear(scanl); + scan_finished (); + hdrflag = false; + fclose (in); + if (ontty) + fflush (stdout); + } + done (0); + } } + /* + * We are scanning a maildrop file + */ if (hdrflag) { printf ("FOLDER %s\t%s\n", file, dtimenow (1)); } scan_detect_mbox_style (in); for (msgnum = 1; ; ++msgnum) { - charstring_t scanl = NULL; - state = scan (in, msgnum, -1, nfs, width, 0, 0, hdrflag ? file : NULL, 0L, 1, &scanl); - charstring_free (scanl); - if (state != SCNMSG && state != SCNENC) + if (scanl) + charstring_clear(scanl); + if (state != SCNMSG) break; } + charstring_free (scanl); scan_finished (); fclose (in); done (0); @@ -192,11 +273,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++) @@ -221,7 +302,7 @@ main (int argc, char **argv) ivector_push_back (seqnum, seq_getnum (mp, *ap)); num_unseen_seq = i; - mh_xfree(dp); + free(dp); } ontty = isatty (fileno (stdout)); @@ -230,7 +311,6 @@ main (int argc, char **argv) (revflag ? msgnum >= mp->lowsel : msgnum <= mp->hghsel); msgnum += (revflag ? -1 : 1)) { if (is_selected(mp, msgnum)) { - charstring_t scanl = NULL; if ((in = fopen (cp = m_name (msgnum), "r")) == NULL) { admonish (cp, "unable to open message"); @@ -245,10 +325,10 @@ main (int argc, char **argv) * Check if message is in any sequence given * by Unseen-Sequence profile entry. */ - unseen = 0; + unseen = false; for (i = 0; i < num_unseen_seq; i++) { if (in_sequence(mp, ivector_at (seqnum, i), msgnum)) { - unseen = 1; + unseen = true; break; } } @@ -256,26 +336,27 @@ main (int argc, char **argv) switch (state = scan (in, msgnum, 0, nfs, width, msgnum == mp->curmsg, unseen, folder, 0L, 1, &scanl)) { - case SCNMSG: - case SCNENC: - case SCNERR: + case SCNMSG: + case SCNERR: break; - default: - adios (NULL, "scan() botch (%d)", state); + default: + die("scan() botch (%d)", state); - case SCNEOF: + case SCNEOF: inform("message %d: empty", msgnum); break; } - charstring_free (scanl); + if (scanl) + charstring_clear(scanl); scan_finished (); - hdrflag = 0; + hdrflag = false; fclose (in); if (ontty) fflush (stdout); } } + charstring_free (scanl); ivector_free (seqnum); folder_free (mp); /* free folder/message structure */