Fix uip/whom.c for C89 compatibility
[mmh] / uip / scan.c
index a11ca0d..018cd9c 100644 (file)
 #include <h/fmt_scan.h>
 #include <h/scansbr.h>
 #include <h/tws.h>
-#include <h/mts.h>
 #include <h/utils.h>
 #include <errno.h>
+#include <unistd.h>
+#include <locale.h>
+#include <sysexits.h>
 
 static struct swit switches[] = {
-#define CLRSW  0
-       { "clear", 0 },
-#define NCLRSW  1
-       { "noclear", 0 },
-#define FORMSW  2
+#define FORMSW  0
        { "form formatfile", 0 },
-#define FMTSW  3
-       { "format string", 5 },
-#define WIDTHSW  4
+#define WIDTHSW  1
        { "width columns", 0 },
-#define FILESW  5
-       { "file file", 4 },
-#define VERSIONSW 6
-       { "version", 0 },
-#define HELPSW  7
+#define FILESW  2
+       { "file file", 0 },
+#define VERSIONSW 3
+       { "Version", 0 },
+#define HELPSW  4
        { "help", 0 },
        { NULL, 0 }
 };
 
-
-/*
-** prototypes
-*/
-void clear_screen(void);  /* from termsbr.c */
-
+char *version=VERSION;
 
 int
 main(int argc, char **argv)
 {
-       int clearflag = 0, ontty;
        int width = 0;
        int i, state, msgnum;
        int seqnum[NUMATTRS], unseen, num_unseen_seq = 0;
        char *cp, *maildir, *file = NULL, *folder = NULL;
-       char *form = NULL, *format = NULL, buf[BUFSIZ];
-       char **argp, *nfs, **arguments;
+       char *form = NULL, buf[BUFSIZ];
+       char **argp, *fmtstr, **arguments;
        struct msgs_array msgs = { 0, 0, NULL };
        struct msgs *mp;
        FILE *in;
 
-#ifdef LOCALE
        setlocale(LC_ALL, "");
-#endif
        invo_name = mhbasename(argv[0]);
 
        /* read user profile/context */
        context_read();
 
-       mts_init(invo_name);
        arguments = getarguments(invo_name, argc, argv, 1);
        argp = arguments;
 
@@ -75,94 +62,76 @@ main(int argc, char **argv)
                        switch (smatch(++cp, switches)) {
                        case AMBIGSW:
                                ambigsw(cp, switches);
-                               done(1);
+                               exit(EX_USAGE);
                        case UNKWNSW:
-                               adios(NULL, "-%s unknown", cp);
+                               adios(EX_USAGE, NULL, "-%s unknown", cp);
 
                        case HELPSW:
                                snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
                                print_help(buf, switches, 1);
-                               done(1);
+                               exit(argc == 2 ? EX_OK : EX_USAGE);
                        case VERSIONSW:
                                print_version(invo_name);
-                               done(1);
-
-                       case CLRSW:
-                               clearflag++;
-                               continue;
-                       case NCLRSW:
-                               clearflag = 0;
-                               continue;
+                               exit(argc == 2 ? EX_OK : EX_USAGE);
 
                        case FORMSW:
                                if (!(form = *argp++) || *form == '-')
-                                       adios(NULL, "missing argument to %s",
-                                                       argp[-2]);
-                               format = NULL;
-                               continue;
-                       case FMTSW:
-                               if (!(format = *argp++) || *format == '-')
-                                       adios(NULL, "missing argument to %s",
+                                       adios(EX_USAGE, NULL, "missing argument to %s",
                                                        argp[-2]);
-                               form = NULL;
                                continue;
 
                        case WIDTHSW:
                                if (!(cp = *argp++) || *cp == '-')
-                                       adios(NULL, "missing argument to %s",
+                                       adios(EX_USAGE, NULL, "missing argument to %s",
                                                        argp[-2]);
                                width = atoi(cp);
                                continue;
 
                        case FILESW:
                                if (!(cp = *argp++) || (cp[0] == '-' && cp[1]))
-                                       adios(NULL, "missing argument to %s",
+                                       adios(EX_USAGE, NULL, "missing argument to %s",
                                                        argp[-2]);
                                if (strcmp(file = cp, "-")!=0)
-                                       file = getcpy(expanddir(cp));
+                                       file = mh_xstrdup(expanddir(cp));
                                continue;
                        }
                }
                if (*cp == '+' || *cp == '@') {
                        if (folder)
-                               adios(NULL, "only one folder at a time!");
+                               adios(EX_USAGE, NULL, "only one folder at a time!");
                        else
-                               folder = getcpy(expandfol(cp));
+                               folder = mh_xstrdup(expandfol(cp));
                } else
                        app_msgarg(&msgs, cp);
        }
 
-       /*
-       ** Get new format string.  Must be before chdir().
-       */
-       nfs = new_fs(form, format, FORMAT);
+       /* Set format string.  Must be before chdir(). */
+       fmtstr = new_fs(form, scanformat);
 
        /*
        ** We are scanning a maildrop file
        */
        if (file) {
                if (msgs.size)
-                       adios(NULL, "\"msgs\" not allowed with -file");
+                       adios(EX_USAGE, NULL, "\"msgs\" not allowed with -file");
                if (folder)
-                       adios(NULL, "\"+folder\" not allowed with -file");
+                       adios(EX_USAGE, NULL, "\"+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"))) {
-                       adios(file, "unable to open");
+                       adios(EX_IOERR, file, "unable to open");
                }
 
-               m_unknown(in);
                for (msgnum = 1; ; ++msgnum) {
-                       state = scan(in, msgnum, -1, nfs, width, 0, 0,
-                                       NULL, 0L, 1);
-                       if (state != SCNMSG && state != SCNENC)
+                       state = scan(in, msgnum, SCN_MBOX, fmtstr, width, 0, 0);
+                       if (state != SCNMSG)
                                break;
                }
                fclose(in);
-               done(0);
+               exit(EX_OK);
        }
 
        /*
@@ -176,25 +145,24 @@ main(int argc, char **argv)
        maildir = toabsdir(folder);
 
        if (chdir(maildir) == NOTOK)
-               adios(maildir, "unable to change directory to");
+               adios(EX_OSERR, 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);
+               adios(EX_IOERR, NULL, "unable to read folder %s", folder);
 
        /* check for empty folder */
        if (mp->nummsg == 0)
-               adios(NULL, "no messages in %s", folder);
+               adios(EX_DATAERR, NULL, "no messages in %s", folder);
 
        /* parse all the message ranges/sequences and set SELECTED */
        for (msgnum = 0; msgnum < msgs.size; msgnum++)
                if (!m_convert(mp, msgs.msgs[msgnum]))
-                       done(1);
-       seq_setprev(mp);  /* set the Previous-Sequence */
+                       exit(EX_USAGE);
+       seq_setprev(mp);
 
-       context_replace(curfolder, folder);  /* update current folder */
-       seq_save(mp);  /* synchronize message sequences */
-       context_save();  /* save the context file */
+       context_replace(curfolder, folder);
+       seq_save(mp);
+       context_save();
 
        /*
        ** Get the sequence number for each `unseen' sequence
@@ -205,63 +173,55 @@ main(int argc, char **argv)
        if (*cp) {
                char **ap, *dp;
 
-               dp = getcpy(cp);
+               dp = mh_xstrdup(cp);
                ap = brkstring(dp, " ", "\n");
                for (i = 0; ap && *ap; i++, ap++) {
                        seqnum[i] = seq_getnum(mp, *ap);
                }
                num_unseen_seq = i;
                if (dp) {
-                       free(dp);
+                       mh_free0(&dp);
                }
        }
 
-       ontty = isatty(fileno(stdout));
-
        for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
-               if (is_selected(mp, msgnum)) {
-                       if ((in = fopen(cp = m_name(msgnum), "r")) == NULL) {
-                               admonish(cp, "unable to open message");
-                               continue;
-                       }
+               if (!is_selected(mp, msgnum)) {
+                       continue;
+               }
 
-                       /*
-                       ** Check if message is in any sequence given
-                       ** by Unseen-Sequence profile entry.
-                       */
-                       unseen = 0;
-                       for (i = 0; i < num_unseen_seq; i++) {
-                               if (in_sequence(mp, seqnum[i], msgnum)) {
-                                       unseen = 1;
-                                       break;
-                               }
-                       }
+               if ((in = fopen(cp = m_name(msgnum), "r")) == NULL) {
+                       admonish(cp, "unable to open message");
+                       continue;
+               }
 
-                       switch (state = scan(in, msgnum, 0, nfs, width,
-                                               msgnum == mp->curmsg, unseen,
-                                               folder, 0L, 1)) {
-                       case SCNMSG:
-                       case SCNENC:
-                       case SCNERR:
+               /*
+               ** Check if message is in any sequence given
+               ** by Unseen-Sequence profile entry.
+               */
+               unseen = 0;
+               for (i = 0; i < num_unseen_seq; i++) {
+                       if (in_sequence(mp, seqnum[i], msgnum)) {
+                               unseen = 1;
                                break;
+                       }
+               }
 
-                       default:
-                               adios(NULL, "scan() botch(%d)", state);
+               switch (state = scan(in, msgnum, SCN_FOLD, fmtstr,
+                               width, msgnum==mp->curmsg, unseen)) {
+               case SCNMSG:
+               case SCNERR:
+                       break;
 
-                       case SCNEOF:
-                               advise(NULL, "message %d: empty", msgnum);
-                               break;
-                       }
-                       fclose(in);
-                       if (ontty)
-                               fflush(stdout);
+               default:
+                       adios(EX_SOFTWARE, NULL, "scan() botch(%d)", state);
+
+               case SCNEOF:
+                       advise(NULL, "message %d: empty", msgnum);
+                       break;
                }
+               fclose(in);
        }
+       folder_free(mp);
 
-       folder_free(mp);  /* free folder/message structure */
-       if (clearflag)
-               clear_screen();
-
-       done(0);
-       return 1;
+       return 0;
 }