expect this commit to be force-replaced periodically

[nmh] / uip / show.c

diff --git a/uip/show.c b/uip/show.c
index 25ed7573fb5e3fbf38a7e855a2098e246262527b..7aedb5f6ed4779344330fb809107f13952a084fe 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -1,14 +1,42 @@
-/*
- * show.c -- show/list messages
+/* show.c -- show/list messages

  *
  * 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.
  */
 
  *
  * 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 <h/mh.h>
-#include <h/mime.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "h/managed_folders.h"
+#include "h/folder.h"
+#include "mhlsbr.h"
+#include "sbr/m_name.h"
+#include "sbr/m_getfld.h"
+#include "sbr/getarguments.h"
+#include "sbr/seq_setunseen.h"
+#include "sbr/seq_setprev.h"
+#include "sbr/seq_setcur.h"
+#include "sbr/seq_save.h"
+#include "sbr/smatch.h"
+#include "sbr/r1bindex.h"
+#include "sbr/uprf.h"
+#include "sbr/check_charset.h"
+#include "sbr/m_draft.h"
+#include "sbr/m_convert.h"
+#include "sbr/getfolder.h"
+#include "sbr/folder_read.h"
+#include "sbr/context_save.h"
+#include "sbr/context_replace.h"
+#include "sbr/context_find.h"
+#include "sbr/ambigsw.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/arglist.h"
+#include "sbr/error.h"
+#include "h/mime.h"
+#include "h/done.h"
+#include "h/utils.h"
+#include "sbr/m_maildir.h"

 
 #define SHOW_SWITCHES \
     X("checkmime", 0, CHECKMIMESW) \
 
 #define SHOW_SWITCHES \
     X("checkmime", 0, CHECKMIMESW) \


@@ -65,16 +93,18 @@ static int is_nontext(char *);
 int
 main (int argc, char **argv)
 {
 int
 main (int argc, char **argv)
 {

-    int draftsw = 0, headersw = 1;
-    int nshow = 0, checkmime = 1, mime = 0;
+    bool draftsw = false;
+    bool headersw = true;
+    bool nshow = false;
+    bool checkmime = true;
+    bool mime = false;

     int isdf = 0, mode = SHOW, msgnum;
     int isdf = 0, mode = SHOW, msgnum;

-    char *cp, *maildir, *file = NULL, *folder = NULL, *proc, *program;
+    char *cp, *file = NULL, *folder = NULL, *proc, *program;

     char buf[BUFSIZ], **argp, **arguments;
     char buf[BUFSIZ], **argp, **arguments;

-    struct msgs *mp = NULL;

     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs_array vec = { 0, 0, NULL }, non_mhl_vec = { 0, 0, NULL };
 
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs_array vec = { 0, 0, NULL }, non_mhl_vec = { 0, 0, NULL };
 

-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }

 
     if (!strcasecmp (invo_name, "next")) {
        mode = NEXT;
 
     if (!strcasecmp (invo_name, "next")) {
        mode = NEXT;


@@ -92,10 +122,11 @@ main (int argc, char **argv)
                    done (1);
 
                case HEADSW:
                    done (1);
 
                case HEADSW:

-                   headersw = 1;
+                   headersw = true;

                    goto non_mhl_switches;
                case NHEADSW:
                    goto non_mhl_switches;
                case NHEADSW:

-                   headersw = 0;
+                   headersw = false;
+                   /* FALLTHRU */

                case CONCATSW:
                case NCONCATSW:
 non_mhl_switches:
                case CONCATSW:
                case NCONCATSW:
 non_mhl_switches:


@@ -121,29 +152,28 @@ non_mhl_switches:
 
                case DRFTSW:
                    if (file)
 
                case DRFTSW:
                    if (file)

-                       adios (NULL, "only one file at a time!");
-                   draftsw++;
+                       die("only one file at a time!");
+                   draftsw = true;

                    if (mode == SHOW)
                        continue;
 usage:
                    if (mode == SHOW)
                        continue;
 usage:

-                   adios (NULL,
-                           "usage: %s [+folder] [switches] [switches for showproc]",
+                   die(                            "usage: %s [+folder] [switches] [switches for showproc]",

                            invo_name);
                case FILESW:
                    if (mode != SHOW)
                        goto usage;
                    if (draftsw || file)
                            invo_name);
                case FILESW:
                    if (mode != SHOW)
                        goto usage;
                    if (draftsw || file)

-                       adios (NULL, "only one file at a time!");
+                       die("only one file at a time!");

                    if (!(cp = *argp++) || *cp == '-')
                    if (!(cp = *argp++) || *cp == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    file = path (cp, TFILE);
                    continue;
 
                case FORMSW:
                    app_msgarg(&vec, --cp);
                    if (!(cp = *argp++) || *cp == '-')
                    file = path (cp, TFILE);
                    continue;
 
                case FORMSW:
                    app_msgarg(&vec, --cp);
                    if (!(cp = *argp++) || *cp == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
-                   app_msgarg(&vec, getcpy (etcpath(cp)));
+                       die("missing argument to %s", argp[-2]);
+                   app_msgarg(&vec, mh_xstrdup(etcpath(cp)));

                    continue;
 
                case PROGSW:
                    continue;
 
                case PROGSW:


@@ -158,37 +188,36 @@ usage:
                case WCACHESW:
                    app_msgarg(&vec, --cp);
                    if (!(cp = *argp++) || *cp == '-')
                case WCACHESW:
                    app_msgarg(&vec, --cp);
                    if (!(cp = *argp++) || *cp == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    app_msgarg(&vec, cp);
                    continue;
 
                case SHOWSW:
                    if (!(showproc = *argp++) || *showproc == '-')
                    app_msgarg(&vec, cp);
                    continue;
 
                case SHOWSW:
                    if (!(showproc = *argp++) || *showproc == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
-                   nshow = 0;
+                       die("missing argument to %s", argp[-2]);
+                   nshow = false;

                    continue;
                case NSHOWSW:
                    continue;
                case NSHOWSW:

-                   nshow++;
+                   nshow = true;

                    continue;
 
                case SHOWMIMESW:
                    if (!(showmimeproc = *argp++) || *showmimeproc == '-')
                    continue;
 
                case SHOWMIMESW:
                    if (!(showmimeproc = *argp++) || *showmimeproc == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
-                   nshow = 0;
+                       die("missing argument to %s", argp[-2]);
+                   nshow = false;

                    continue;
                case CHECKMIMESW:
                    continue;
                case CHECKMIMESW:

-                   checkmime++;
+                   checkmime = true;

                    continue;
                case NOCHECKMIMESW:
                    continue;
                case NOCHECKMIMESW:

-                   checkmime = 0;
+                   checkmime = false;

                    continue;
            }
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)
                    continue;
            }
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)

-               adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+               die("only one folder at a time!");
+            folder = pluspath (cp);

        } else {
            if (mode != SHOW)
                goto usage;
        } else {
            if (mode != SHOW)
                goto usage;


@@ -201,12 +230,12 @@ usage:
 
     if (draftsw || file) {
        if (msgs.size)
 
     if (draftsw || file) {
        if (msgs.size)

-           adios (NULL, "only one file at a time!");
+           die("only one file at a time!");

        if (draftsw)
        if (draftsw)

-           app_msgarg(&vec, getcpy (m_draft (folder, NULL, 1, &isdf)));
+           app_msgarg(&vec, mh_xstrdup(m_draft(folder, NULL, 1, &isdf)));

        else
            app_msgarg(&vec, file);
        else
            app_msgarg(&vec, file);

-       headersw = 0;
+       headersw = false;

        goto go_to_it;
     }
 
        goto go_to_it;
     }
 


@@ -226,42 +255,16 @@ usage:
 
     if (!folder)
        folder = getfolder (1);
 
     if (!folder)
        folder = getfolder (1);

-    maildir = m_maildir (folder);
-
-    if (chdir (maildir) == NOTOK)
-       adios (maildir, "unable to change directory to");
-
-    /* read folder and create message structure */
-    if (!(mp = folder_read (folder, 1)))
-       adios (NULL, "unable to read folder %s", folder);
-
-    /* check for empty folder */
-    if (mp->nummsg == 0)
-       adios (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);
-
-    /*
-     * Set the SELECT_UNSEEN bit for all the SELECTED messages,
-     * since we will use that as a tag to know which messages
-     * to remove from the "unseen" sequence.
-     */
-    for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++)
-       if (is_selected(mp, msgnum))
-           set_unseen (mp, msgnum);
-
-    seq_setprev (mp);          /* set the Previous-Sequence */
-    seq_setunseen (mp, 1);     /* unset the Unseen-Sequence */
+    mh_managed_folders *mmfs;
+    if (!mh_managed_folders_open(&mmfs))
+        die("%s", mh_managed_folders_get_err_string(mmfs));
+    mh_folder *mhf;
+    if (!mh_folder_open(&mhf, folder, mmfs))
+        die("%s", mh_folder_get_err_string(mhf));
+    const struct msgs *const mp = mh_folder_select_and_chdir_and_mark_seen(&vec, mhf, msgs);
+    if (mp == NULL)
+        die("%s", mh_folder_get_err_string(mhf));

 
 

-    for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++)
-       if (is_selected(mp, msgnum))
-           app_msgarg(&vec, mh_xstrdup(m_name (msgnum)));
-
-    seq_setcur (mp, mp->hghsel);       /* update current message  */
-    seq_save (mp);                     /* synchronize sequences   */

     context_replace (pfolder, folder); /* update current folder   */
     context_save ();                   /* save the context file   */
 
     context_replace (pfolder, folder); /* update current folder   */
     context_save ();                   /* save the context file   */
 


@@ -279,13 +282,13 @@ go_to_it: ;
                /* loop through selected messages and check for MIME */
                for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++)
                    if (is_selected (mp, msgnum) && is_nontext (m_name (msgnum))) {
                /* loop through selected messages and check for MIME */
                for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++)
                    if (is_selected (mp, msgnum) && is_nontext (m_name (msgnum))) {

-                       mime = 1;
+                       mime = true;

                        break;
                    }
            } else {
                /* check the file or draft for MIME */
                if (is_nontext (vec.msgs[vec.size - 1]))
                        break;
                    }
            } else {
                /* check the file or draft for MIME */
                if (is_nontext (vec.msgs[vec.size - 1]))

-                   mime = 1;
+                   mime = true;

            }
        }
 
            }
        }
 


@@ -297,7 +300,7 @@ go_to_it: ;
     }
 
     if (folder && !draftsw && !file)
     }
 
     if (folder && !draftsw && !file)

-       m_putenv ("mhfolder", folder);
+       setenv("mhfolder", folder, 1);

 
     if (strcmp (r1bindex (proc, '/'), "cat") == 0) {
 
 
     if (strcmp (r1bindex (proc, '/'), "cat") == 0) {
 


@@ -367,16 +370,16 @@ is_nontext (char *msgnam)
 {
     int        result, state;
     char *bp, *dp, *cp;
 {
     int        result, state;
     char *bp, *dp, *cp;

-    char buf[BUFSIZ], name[NAMESZ];
+    char buf[NMH_BUFSIZ], name[NAMESZ];

     FILE *fp;
     FILE *fp;

-    m_getfld_state_t gstate = 0;
+    m_getfld_state_t gstate;

 
     if ((fp = fopen (msgnam, "r")) == NULL)
        return 0;
 
     if ((fp = fopen (msgnam, "r")) == NULL)
        return 0;

-
+    gstate = m_getfld_state_init(fp);

     for (;;) {
        int bufsz = sizeof buf;
     for (;;) {
        int bufsz = sizeof buf;

-       switch (state = m_getfld (&gstate, name, buf, &bufsz, fp)) {
+       switch (state = m_getfld2(&gstate, name, buf, &bufsz)) {

        case FLD:
        case FLDPLUS:
            /*
        case FLD:
        case FLDPLUS:
            /*


@@ -386,10 +389,10 @@ is_nontext (char *msgnam)
                int passno;
                char c;
 
                int passno;
                char c;
 

-               cp = add (buf, NULL);
+               cp = mh_xstrdup(buf);

                while (state == FLDPLUS) {
                    bufsz = sizeof buf;
                while (state == FLDPLUS) {
                    bufsz = sizeof buf;

-                   state = m_getfld (&gstate, name, buf, &bufsz, fp);
+                   state = m_getfld2(&gstate, name, buf, &bufsz);

                    cp = add (buf, cp);
                }
                bp = cp;
                    cp = add (buf, cp);
                }
                bp = cp;


@@ -413,7 +416,7 @@ invalid:
                            continue;
                        case '(':
                            i++;
                            continue;
                        case '(':
                            i++;

-                           /* and fall... */
+                           continue;

                        default:
                            continue;
                        case ')':
                        default:
                            continue;
                        case ')':


@@ -491,10 +494,10 @@ out:
             * Check Content-Transfer-Encoding field
             */
            if (!strcasecmp (name, ENCODING_FIELD)) {
             * Check Content-Transfer-Encoding field
             */
            if (!strcasecmp (name, ENCODING_FIELD)) {

-               cp = add (buf, NULL);
+               cp = mh_xstrdup(buf);

                while (state == FLDPLUS) {
                    bufsz = sizeof buf;
                while (state == FLDPLUS) {
                    bufsz = sizeof buf;

-                   state = m_getfld (&gstate, name, buf, &bufsz, fp);
+                   state = m_getfld2(&gstate, name, buf, &bufsz);

                    cp = add (buf, cp);
                }
                for (bp = cp; isspace ((unsigned char) *bp); bp++)
                    cp = add (buf, cp);
                }
                for (bp = cp; isspace ((unsigned char) *bp); bp++)


@@ -521,7 +524,7 @@ out:
             */
            while (state == FLDPLUS) {
                bufsz = sizeof buf;
             */
            while (state == FLDPLUS) {
                bufsz = sizeof buf;

-               state = m_getfld (&gstate, name, buf, &bufsz, fp);
+               state = m_getfld2(&gstate, name, buf, &bufsz);

            }
            break;
 
            }
            break;