Fixed inc(1) and %(me) to not obey Local-Mailbox profile component.

[nmh] / uip / mhlist.c

diff --git a/uip/mhlist.c b/uip/mhlist.c
index 6ab50e399f24ec7312313827b42ae900e8402542..a8e28cbd4030feeb4fdd5cec89c94d9f5a7de700 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -1,39 +1,59 @@
-
-/*
- * mhlist.c -- list the contents of MIME messages
+/* mhlist.c -- list the contents of MIME 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/mh.h"
+#include "sbr/m_name.h"
+#include "sbr/m_gmprot.h"
+#include "sbr/getarguments.h"
+#include "sbr/seq_setprev.h"
+#include "sbr/seq_setcur.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/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/error.h"

 #include <fcntl.h>
 #include <fcntl.h>

-#include <h/signals.h>
-#include <h/md5.h>
-#include <errno.h>
-#include <signal.h>
-#include <h/mts.h>
-#include <h/tws.h>
-#include <h/mime.h>
-#include <h/mhparse.h>
-#include <h/mhcachesbr.h>
-#include <h/utils.h>
+#include "h/signals.h"
+#include "h/mts.h"
+#include "h/tws.h"
+#include "h/mime.h"
+#include "h/mhparse.h"
+#include "h/done.h"
+#include "h/utils.h"
+#include "mhmisc.h"
+#include "sbr/m_maildir.h"
+#include "mhfree.h"

 
 #define MHLIST_SWITCHES \
 
 #define MHLIST_SWITCHES \

-    X("check", 0, CHECKSW) \
-    X("nocheck", 0, NCHECKSW) \
+    X("check", -5, CHECKSW) \
+    X("nocheck", -7, NCHECKSW) \

     X("headers", 0, HEADSW) \
     X("noheaders", 0, NHEADSW) \
     X("realsize", 0, SIZESW) \
     X("norealsize", 0, NSIZESW) \
     X("verbose", 0, VERBSW) \
     X("noverbose", 0, NVERBSW) \
     X("headers", 0, HEADSW) \
     X("noheaders", 0, NHEADSW) \
     X("realsize", 0, SIZESW) \
     X("norealsize", 0, NSIZESW) \
     X("verbose", 0, VERBSW) \
     X("noverbose", 0, NVERBSW) \

+    X("disposition", 0, DISPOSW) \
+    X("nodisposition", 0, NDISPOSW) \

     X("file file", 0, FILESW) \
     X("part number", 0, PARTSW) \
     X("type content", 0, TYPESW) \
     X("file file", 0, FILESW) \
     X("part number", 0, PARTSW) \
     X("type content", 0, TYPESW) \

-    X("rcache policy", 0, RCACHESW) \
-    X("wcache policy", 0, WCACHESW) \
+    X("prefer content", 0, PREFERSW) \
+    X("noprefer", 0, NPREFERSW) \
+    X("changecur", 0, CHGSW) \
+    X("nochangecur", 0, NCHGSW) \

     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
     X("debug", -5, DEBUGSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
     X("debug", -5, DEBUGSW) \


@@ -46,49 +66,14 @@ DEFINE_SWITCH_ENUM(MHLIST);
 DEFINE_SWITCH_ARRAY(MHLIST, switches);
 #undef X
 
 DEFINE_SWITCH_ARRAY(MHLIST, switches);
 #undef X
 

-
-/* mhparse.c */
-extern char *tmp;      /* directory to place temp files */
-
-/* mhcachesbr.c */
-extern int rcachesw;
-extern int wcachesw;
-extern char *cache_public;
-extern char *cache_private;
-
-/* mhmisc.c */
-extern int npart;
-extern int ntype;
-extern char *parts[NPARTS + 1];
-extern char *types[NTYPES + 1];
-extern int userrs;
-

 /*
  * This is currently needed to keep mhparse happy.
  * This needs to be changed.
  */
 /*
  * This is currently needed to keep mhparse happy.
  * This needs to be changed.
  */

-pid_t xpid  = 0;
-

 int debugsw = 0;
 int debugsw = 0;

-int verbosw = 0;

 
 #define        quitser pipeser
 
 
 #define        quitser pipeser
 

-/* mhparse.c */
-CT parse_mime (char *);
-
-/* mhmisc.c */
-int part_ok (CT, int);
-int type_ok (CT, int);
-void flush_errors (void);
-
-/* mhlistsbr.c */
-void list_all_messages (CT *, int, int, int, int);
-
-/* mhfree.c */
-extern CT *cts;
-void freects_done (int) NORETURN;
-

 /*
  * static prototypes
  */
 /*
  * static prototypes
  */


@@ -98,8 +83,12 @@ static void pipeser (int);
 int
 main (int argc, char **argv)
 {
 int
 main (int argc, char **argv)
 {

-    int sizesw = 1, headsw = 1;
-    int msgnum, *icachesw;
+    bool sizesw = true;
+    bool headsw = true;
+    bool chgflag = true;
+    bool verbosw = false;
+    bool dispo = false;
+    int msgnum;

     char *cp, *file = NULL, *folder = NULL;
     char *maildir, buf[100], **argp;
     char **arguments;
     char *cp, *file = NULL, *folder = NULL;
     char *maildir, buf[100], **argp;
     char **arguments;


@@ -107,15 +96,9 @@ main (int argc, char **argv)
     struct msgs *mp = NULL;
     CT ct, *ctp;
 
     struct msgs *mp = NULL;
     CT ct, *ctp;
 

-    done=freects_done;
-
-#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(freects_done);

 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;


@@ -130,7 +113,7 @@ main (int argc, char **argv)
                ambigsw (cp, switches);
                done (1);
            case UNKWNSW: 
                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]",
 
            case HELPSW: 
                snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",


@@ -141,75 +124,83 @@ main (int argc, char **argv)
                print_version(invo_name);
                done (0);
 
                print_version(invo_name);
                done (0);
 

-           case RCACHESW:
-               icachesw = &rcachesw;
-               goto do_cache;
-           case WCACHESW:
-               icachesw = &wcachesw;
-do_cache:
-               if (!(cp = *argp++) || *cp == '-')
-                   adios (NULL, "missing argument to %s", argp[-2]);
-               switch (*icachesw = smatch (cp, caches)) {
-               case AMBIGSW:
-                   ambigsw (cp, caches);
-                   done (1);
-               case UNKWNSW:
-                   adios (NULL, "%s unknown", cp);
-               default:
-                   break;
-               }
-               continue;
-

            case CHECKSW:
            case CHECKSW:

-               checksw++;
-               continue;

            case NCHECKSW:
            case NCHECKSW:

-               checksw = 0;
+               /* Currently a NOP */

                continue;
 
            case HEADSW:
                continue;
 
            case HEADSW:

-               headsw = 1;
+               headsw = true;

                continue;
            case NHEADSW:
                continue;
            case NHEADSW:

-               headsw = 0;
+               headsw = false;

                continue;
 
            case SIZESW:
                continue;
 
            case SIZESW:

-               sizesw = 1;
+               sizesw = true;

                continue;
            case NSIZESW:
                continue;
            case NSIZESW:

-               sizesw = 0;
+               sizesw = false;

                continue;
 
            case PARTSW:
                if (!(cp = *argp++) || *cp == '-')
                continue;
 
            case PARTSW:
                if (!(cp = *argp++) || *cp == '-')

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

                if (npart >= NPARTS)
                if (npart >= NPARTS)

-                   adios (NULL, "too many parts (starting with %s), %d max",
+                   die("too many parts (starting with %s), %d max",

                           cp, NPARTS);
                parts[npart++] = cp;
                continue;
 
            case TYPESW:
                if (!(cp = *argp++) || *cp == '-')
                           cp, NPARTS);
                parts[npart++] = cp;
                continue;
 
            case TYPESW:
                if (!(cp = *argp++) || *cp == '-')

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

                if (ntype >= NTYPES)
                if (ntype >= NTYPES)

-                   adios (NULL, "too many types (starting with %s), %d max",
+                   die("too many types (starting with %s), %d max",

                           cp, NTYPES);
                types[ntype++] = cp;
                continue;
 
                           cp, NTYPES);
                types[ntype++] = cp;
                continue;
 

+           case PREFERSW:
+               if (!(cp = *argp++) || *cp == '-')
+                   die("missing argument to %s", argp[-2]);
+               if (npreferred >= NPREFS)
+                   die("too many preferred types (starting with %s), %d max",
+                          cp, NPREFS);
+                mime_preference[npreferred].type = cp;
+               cp = strchr(cp, '/');
+               if (cp) *cp++ = '\0';
+               mime_preference[npreferred++].subtype = cp;
+               continue;
+
+           case NPREFERSW:
+               npreferred = 0;
+               continue;
+

            case FILESW:
                if (!(cp = *argp++) || (*cp == '-' && cp[1]))
            case FILESW:
                if (!(cp = *argp++) || (*cp == '-' && cp[1]))

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

                file = *cp == '-' ? cp : path (cp, TFILE);
                continue;
 
                file = *cp == '-' ? cp : path (cp, TFILE);
                continue;
 

+           case CHGSW:
+               chgflag = true;
+               continue;
+           case NCHGSW:
+               chgflag = false;
+               continue;
+

            case VERBSW: 
            case VERBSW: 

-               verbosw = 1;
+               verbosw = true;

                continue;
            case NVERBSW: 
                continue;
            case NVERBSW: 

-               verbosw = 0;
+               verbosw = false;
+               continue;
+           case DISPOSW:
+               dispo = true;
+               continue;
+           case NDISPOSW:
+               dispo = false;

                continue;
            case DEBUGSW:
                debugsw = 1;
                continue;
            case DEBUGSW:
                debugsw = 1;


@@ -218,9 +209,8 @@ do_cache:
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)
        }
        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
                app_msgarg(&msgs, cp);
     }
        } else
                app_msgarg(&msgs, cp);
     }


@@ -229,37 +219,17 @@ do_cache:
     parts[npart] = NULL;
     types[ntype] = NULL;
 
     parts[npart] = NULL;
     types[ntype] = NULL;
 

-    /* Check for public cache location */
-    if ((cache_public = context_find (nmhcache)) && *cache_public != '/')
-       cache_public = NULL;
-
-    /* Check for private cache location */
-    if (!(cache_private = context_find (nmhprivcache)))
-       cache_private = ".cache";
-    cache_private = getcpy (m_maildir (cache_private));
-
-    /*
-     * Check for storage directory.  If specified,
-     * then store temporary files there.  Else we
-     * store them in standard nmh directory.
-     */
-    if ((cp = context_find (nmhstorage)) && *cp)
-       tmp = concat (cp, "/", invo_name, NULL);
-    else
-       tmp = add (m_maildir (invo_name), NULL);
-

     if (!context_find ("path"))
        free (path ("./", TFOLDER));
 
     if (file && msgs.size)
     if (!context_find ("path"))
        free (path ("./", TFOLDER));
 
     if (file && msgs.size)

-       adios (NULL, "cannot specify msg and file at same time!");
+       die("cannot specify msg and file at same time!");

 
     /*
      * check if message is coming from file
      */
     if (file) {
 
     /*
      * check if message is coming from file
      */
     if (file) {

-       if (!(cts = (CT *) calloc ((size_t) 2, sizeof(*cts))))
-           adios (NULL, "out of memory");
+       cts = mh_xcalloc(2, sizeof *cts);

        ctp = cts;
 
        if ((ct = parse_mime (file)))
        ctp = cts;
 
        if ((ct = parse_mime (file)))


@@ -278,12 +248,12 @@ do_cache:
            adios (maildir, "unable to change directory to");
 
        /* read folder and create message structure */
            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, 0)))
+           die("unable to read folder %s", folder);

 
        /* check for empty folder */
        if (mp->nummsg == 0)
 
        /* 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++)
 
        /* parse all the message ranges/sequences and set SELECTED */
        for (msgnum = 0; msgnum < msgs.size; msgnum++)


@@ -291,8 +261,7 @@ do_cache:
                done (1);
        seq_setprev (mp);       /* set the previous-sequence */
 
                done (1);
        seq_setprev (mp);       /* set the previous-sequence */
 

-       if (!(cts = (CT *) calloc ((size_t) (mp->numsel + 1), sizeof(*cts))))
-           adios (NULL, "out of memory");
+       cts = mh_xcalloc(mp->numsel + 1, sizeof *cts);

        ctp = cts;
 
        for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
        ctp = cts;
 
        for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {


@@ -309,7 +278,7 @@ do_cache:
     if (!*cts)
        done (1);
 
     if (!*cts)
        done (1);
 

-    userrs = 1;
+    userrs = true;

     SIGNAL (SIGQUIT, quitser);
     SIGNAL (SIGPIPE, pipeser);
 
     SIGNAL (SIGQUIT, quitser);
     SIGNAL (SIGPIPE, pipeser);
 


@@ -331,19 +300,20 @@ do_cache:
     /*
      * List the message content
      */
     /*
      * List the message content
      */

-    list_all_messages (cts, headsw, sizesw, verbosw, debugsw);
+    list_all_messages (cts, headsw, sizesw, verbosw, debugsw, dispo);

 
     /* Now free all the structures for the content */
     for (ctp = cts; *ctp; ctp++)
        free_content (*ctp);
 
 
     /* Now free all the structures for the content */
     for (ctp = cts; *ctp; ctp++)
        free_content (*ctp);
 

-    free ((char *) cts);
+    free(cts);

     cts = NULL;
 
     /* If reading from a folder, do some updating */
     if (mp) {
        context_replace (pfolder, folder);/* update current folder  */
     cts = NULL;
 
     /* If reading from a folder, do some updating */
     if (mp) {
        context_replace (pfolder, folder);/* update current folder  */

-       seq_setcur (mp, mp->hghsel);      /* update current message */
+       if (chgflag)
+           seq_setcur (mp, mp->hghsel);  /* update current message */

        seq_save (mp);                    /* synchronize sequences  */
        context_save ();                  /* save the context file  */
     }
        seq_save (mp);                    /* synchronize sequences  */
        context_save ();                  /* save the context file  */
     }