Replaced mkinstalldirs with `mkdir -p'.
[mmh] / uip / mhshow.c
index bbb7fb8..a1fff55 100644 (file)
@@ -1,10 +1,10 @@
 /*
- * mhshow.c -- display 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.
- */
+** mhshow.c -- display 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.
+*/
 
 #include <h/mh.h>
 #include <fcntl.h>
@@ -12,7 +12,6 @@
 #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>
@@ -28,51 +27,41 @@ static struct swit switches[] = {
        { "check", 0 },
 #define NCHECKSW  1
        { "nocheck", 0 },
-#define PAUSESW  2
-       { "pause", 0 },
-#define NPAUSESW  3
-       { "nopause", 0 },
-#define SERIALSW  4
+#define SERIALSW  2
        { "serialonly", 0 },
-#define NSERIALSW  5
+#define NSERIALSW  3
        { "noserialonly", 0 },
-#define VERBSW  6
+#define VERBSW  4
        { "verbose", 0 },
-#define NVERBSW  7
+#define NVERBSW  5
        { "noverbose", 0 },
-#define FILESW  8  /* interface from show */
+#define FILESW  6  /* interface from show */
        { "file file", 0 },
-#define FORMSW  9
+#define FORMSW  7
        { "form formfile", 0 },
-#define PARTSW  10
+#define PARTSW  8
        { "part number", 0 },
-#define TYPESW  11
+#define TYPESW  9
        { "type content", 0 },
-#define RCACHESW  12
+#define RCACHESW  10
        { "rcache policy", 0 },
-#define WCACHESW  13
+#define WCACHESW  11
        { "wcache policy", 0 },
-#define VERSIONSW  14
+#define VERSIONSW  12
        { "version", 0 },
-#define HELPSW  15
+#define HELPSW  13
        { "help", 0 },
-
 /*
- * switches for moreproc/mhlproc
- */
-#define PROGSW  16
+** switches for moreproc/mhlproc
+*/
+#define PROGSW  14
        { "moreproc program", -4 },
-#define NPROGSW  17
-       { "nomoreproc", -3 },
-#define LENSW  18
-       { "length lines", -4 },
-#define WIDTHSW  19
+#define WIDTHSW  15
        { "width columns", -4 },
-
 /*
- * switches for debugging
- */
-#define DEBUGSW  20
+** switches for debugging
+*/
+#define DEBUGSW  16
        { "debug", -5 },
        { NULL, 0 }
 };
@@ -88,11 +77,9 @@ extern char *cache_public;
 extern char *cache_private;
 
 /* mhshowsbr.c */
-extern int pausesw;
 extern int serialsw;
 extern char *progsw;
 extern int nolist;
-extern int nomore;  /* flags for moreproc/header display */
 extern char *formsw;
 
 /* mhmisc.c */
@@ -108,30 +95,30 @@ int verbosw = 0;
 #define quitser pipeser
 
 /* mhparse.c */
-CT parse_mime (char *);
+CT parse_mime(char *);
 
 /* mhmisc.c */
-int part_ok (CT, int);
-int type_ok (CT, int);
-void set_endian (void);
-void flush_errors (void);
+int part_ok(CT, int);
+int type_ok(CT, int);
+void set_endian(void);
+void flush_errors(void);
 
 /* mhshowsbr.c */
-void show_all_messages (CT *);
+void show_all_messages(CT *);
 
 /* mhfree.c */
-void free_content (CT);
+void free_content(CT);
 extern CT *cts;
-void freects_done (int) NORETURN;
+void freects_done(int) NORETURN;
 
 /*
- * static prototypes
- */
-static RETSIGTYPE pipeser (int);
+** static prototypes
+*/
+static RETSIGTYPE pipeser(int);
 
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
        int msgnum, *icachesw;
        char *cp, *file = NULL, *folder = NULL;
@@ -147,34 +134,33 @@ main (int argc, char **argv)
 #ifdef LOCALE
        setlocale(LC_ALL, "");
 #endif
-       invo_name = r1bindex (argv[0], '/');
+       invo_name = mhbasename(argv[0]);
 
        /* read user profile/context */
        context_read();
 
-       arguments = getarguments (invo_name, argc, argv, 1);
+       arguments = getarguments(invo_name, argc, argv, 1);
        argp = arguments;
 
        /*
-        * Parse arguments
-        */
+       ** Parse arguments
+       */
        while ((cp = *argp++)) {
                if (*cp == '-') {
-                       switch (smatch (++cp, switches)) {
+                       switch (smatch(++cp, switches)) {
                        case AMBIGSW:
-                               ambigsw (cp, switches);
-                               done (1);
+                               ambigsw(cp, switches);
+                               done(1);
                        case UNKWNSW:
-                               adios (NULL, "-%s unknown", cp);
+                               adios(NULL, "-%s unknown", cp);
 
                        case HELPSW:
-                               snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
-                                               invo_name);
-                               print_help (buf, switches, 1);
-                               done (1);
+                               snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
+                               print_help(buf, switches, 1);
+                               done(1);
                        case VERSIONSW:
                                print_version(invo_name);
-                               done (1);
+                               done(1);
 
                        case RCACHESW:
                                icachesw = &rcachesw;
@@ -183,13 +169,14 @@ main (int argc, char **argv)
                                icachesw = &wcachesw;
 do_cache:
                                if (!(cp = *argp++) || *cp == '-')
-                                       adios (NULL, "missing argument to %s", argp[-2]);
-                               switch (*icachesw = smatch (cp, caches)) {
+                                       adios(NULL, "missing argument to %s",
+                                                       argp[-2]);
+                               switch (*icachesw = smatch(cp, caches)) {
                                case AMBIGSW:
-                                       ambigsw (cp, caches);
-                                       done (1);
+                                       ambigsw(cp, caches);
+                                       done(1);
                                case UNKWNSW:
-                                       adios (NULL, "%s unknown", cp);
+                                       adios(NULL, "%s unknown", cp);
                                default:
                                        break;
                                }
@@ -202,13 +189,6 @@ do_cache:
                                checksw = 0;
                                continue;
 
-                       case PAUSESW:
-                               pausesw = 1;
-                               continue;
-                       case NPAUSESW:
-                               pausesw = 0;
-                               continue;
-
                        case SERIALSW:
                                serialsw = 1;
                                continue;
@@ -218,51 +198,51 @@ do_cache:
 
                        case PARTSW:
                                if (!(cp = *argp++) || *cp == '-')
-                                       adios (NULL, "missing argument to %s", argp[-2]);
+                                       adios(NULL, "missing argument to %s",
+                                                       argp[-2]);
                                if (npart >= NPARTS)
-                                       adios (NULL, "too many parts (starting with %s), %d max",
-                                                  cp, NPARTS);
+                                       adios(NULL, "too many parts (starting with %s), %d max", cp, NPARTS);
                                parts[npart++] = cp;
                                continue;
 
                        case TYPESW:
                                if (!(cp = *argp++) || *cp == '-')
-                                       adios (NULL, "missing argument to %s", argp[-2]);
+                                       adios(NULL, "missing argument to %s",
+                                                       argp[-2]);
                                if (ntype >= NTYPES)
-                                       adios (NULL, "too many types (starting with %s), %d max",
-                                                  cp, NTYPES);
+                                       adios(NULL, "too many types (starting with %s), %d max", cp, NTYPES);
                                types[ntype++] = cp;
                                continue;
 
                        case FILESW:
                                if (!(cp = *argp++) || (*cp == '-' && cp[1]))
-                                       adios (NULL, "missing argument to %s", argp[-2]);
-                               file = *cp == '-' ? cp : path (cp, TFILE);
+                                       adios(NULL, "missing argument to %s",
+                                                       argp[-2]);
+                               file = *cp == '-' ? cp : getcpy(expanddir(cp));
                                continue;
 
                        case FORMSW:
                                if (!(cp = *argp++) || *cp == '-')
-                                       adios (NULL, "missing argument to %s", argp[-2]);
+                                       adios(NULL, "missing argument to %s",
+                                                       argp[-2]);
                                if (formsw)
-                                       free (formsw);
-                               formsw = getcpy (etcpath (cp));
+                                       free(formsw);
+                               formsw = getcpy(etcpath(cp));
                                continue;
 
                        /*
-                        * Switches for moreproc/mhlproc
-                        */
+                       ** Switches for moreproc/mhlproc
+                       */
                        case PROGSW:
                                if (!(progsw = *argp++) || *progsw == '-')
-                                       adios (NULL, "missing argument to %s", argp[-2]);
-                               continue;
-                       case NPROGSW:
-                               nomore++;
+                                       adios(NULL, "missing argument to %s",
+                                                       argp[-2]);
                                continue;
 
-                       case LENSW:
                        case WIDTHSW:
                                if (!(cp = *argp++) || *cp == '-')
-                                       adios (NULL, "missing argument to %s", argp[-2]);
+                                       adios(NULL, "missing argument to %s",
+                                                       argp[-2]);
                                continue;
 
                        case VERBSW:
@@ -278,151 +258,149 @@ do_cache:
                }
                if (*cp == '+' || *cp == '@') {
                        if (folder)
-                               adios (NULL, "only one folder at a time!");
+                               adios(NULL, "only one folder at a time!");
                        else
-                               folder = pluspath (cp);
+                               folder = getcpy(expandfol(cp));
                } else
-                               app_msgarg(&msgs, cp);
+                       app_msgarg(&msgs, cp);
        }
 
        /* null terminate the list of acceptable parts/types */
        parts[npart] = NULL;
        types[ntype] = NULL;
 
-       set_endian ();
+       set_endian();
 
-       if ((cp = getenv ("MM_NOASK")) && !strcmp (cp, "1")) {
+       if ((cp = getenv("MM_NOASK")) && strcmp(cp, "1")==0) {
                nolist  = 1;
-               pausesw = 0;
        }
 
        /*
-        * Check if we've specified an additional profile
-        */
-       if ((cp = getenv ("MHSHOW"))) {
-               if ((fp = fopen (cp, "r"))) {
-                       readconfig ((struct node **) 0, fp, cp, 0);
-                       fclose (fp);
+       ** Check if we've specified an additional profile
+       */
+       if ((cp = getenv("MHSHOW"))) {
+               if ((fp = fopen(cp, "r"))) {
+                       readconfig((struct node **) 0, fp, cp, 0);
+                       fclose(fp);
                } else {
-                       admonish ("", "unable to read $MHSHOW profile (%s)", cp);
+                       admonish("", "unable to read $MHSHOW profile (%s)",
+                                       cp);
                }
        }
 
        /*
-        * Read the standard profile setup
-        */
-       if ((fp = fopen (cp = etcpath ("mhn.defaults"), "r"))) {
-               readconfig ((struct node **) 0, fp, cp, 0);
-               fclose (fp);
+       ** Read the standard profile setup
+       */
+       if ((fp = fopen(cp = etcpath("mhn.defaults"), "r"))) {
+               readconfig((struct node **) 0, fp, cp, 0);
+               fclose(fp);
        }
 
        /* Check for public cache location */
-       if ((cache_public = context_find (nmhcache)) && *cache_public != '/')
+       if ((cache_public = context_find(nmhcache)) && *cache_public != '/')
                cache_public = NULL;
 
        /* Check for private cache location */
-       if (!(cache_private = context_find (nmhprivcache)))
+       if (!(cache_private = context_find(nmhprivcache)))
                cache_private = ".cache";
-       cache_private = getcpy (m_maildir (cache_private));
+       cache_private = getcpy(toabsdir(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);
+       ** 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));
+               tmp = getcpy(toabsdir(invo_name));
 
        if (file && msgs.size)
-               adios (NULL, "cannot specify msg and file at same time!");
+               adios(NULL, "cannot specify msg and file at same time!");
 
        /*
-        * check if message is coming from file
-        */
+       ** check if message is coming from file
+       */
        if (file) {
-               if (!(cts = (CT *) calloc ((size_t) 2, sizeof(*cts))))
-                       adios (NULL, "out of memory");
+               if (!(cts = (CT *) calloc((size_t) 2, sizeof(*cts))))
+                       adios(NULL, "out of memory");
                ctp = cts;
 
-               if ((ct = parse_mime (file)));
+               if ((ct = parse_mime(file)));
                        *ctp++ = ct;
        } else {
                /*
-                * message(s) are coming from a folder
-                */
+               ** message(s) are coming from a folder
+               */
                if (!msgs.size)
-                       app_msgarg(&msgs, "cur");
+                       app_msgarg(&msgs, seq_cur);
                if (!folder)
-                       folder = getfolder (1);
-               maildir = m_maildir (folder);
+                       folder = getcurfol();
+               maildir = toabsdir(folder);
 
-               if (chdir (maildir) == NOTOK)
-                       adios (maildir, "unable to change directory to");
+               if (chdir(maildir) == NOTOK)
+                       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)))
+                       adios(NULL, "unable to read folder %s", folder);
 
                /* check for empty folder */
                if (mp->nummsg == 0)
-                       adios (NULL, "no messages in %s", folder);
+                       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);
+                       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.
-                */
+               ** 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);
+                               set_unseen(mp, msgnum);
 
-               seq_setprev (mp);  /* set the Previous-Sequence */
-               seq_setunseen (mp, 1);  /* unset the Unseen-Sequence */
+               seq_setprev(mp);  /* set the Previous-Sequence */
+               seq_setunseen(mp, 0);  /* unset unseen seqs for shown msgs */
 
-               if (!(cts = (CT *) calloc ((size_t) (mp->numsel + 1), sizeof(*cts))))
-                       adios (NULL, "out of memory");
+               if (!(cts = (CT *) calloc((size_t) (mp->numsel + 1),
+                               sizeof(*cts))))
+                       adios(NULL, "out of memory");
                ctp = cts;
 
                /*
-                * Parse all the SELECTED messages.
-                */
+               ** Parse all the SELECTED messages.
+               */
                for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
                        if (is_selected(mp, msgnum)) {
                                char *msgnam;
 
-                               msgnam = m_name (msgnum);
-                               if ((ct = parse_mime (msgnam)))
+                               msgnam = m_name(msgnum);
+                               if ((ct = parse_mime(msgnam)))
                                        *ctp++ = ct;
                        }
                }
        }
 
        if (!*cts)
-               done (1);
+               done(1);
 
        userrs = 1;
-       SIGNAL (SIGQUIT, quitser);
-       SIGNAL (SIGPIPE, pipeser);
+       SIGNAL(SIGQUIT, quitser);
+       SIGNAL(SIGPIPE, pipeser);
 
        /*
-        * Get the associated umask for the relevant contents.
-        */
+       ** Get the associated umask for the relevant contents.
+       */
        for (ctp = cts; *ctp; ctp++) {
                struct stat st;
 
                ct = *ctp;
-               if (type_ok (ct, 1) && !ct->c_umask) {
-                       if (stat (ct->c_file, &st) != NOTOK)
+               if (type_ok(ct, 1) && !ct->c_umask) {
+                       if (stat(ct->c_file, &st) != NOTOK)
                                ct->c_umask = ~(st.st_mode & 0777);
                        else
                                ct->c_umask = ~m_gmprot();
@@ -430,40 +408,40 @@ do_cache:
        }
 
        /*
-        * Show the message content
-        */
-       show_all_messages (cts);
+       ** Show the message content
+       */
+       show_all_messages(cts);
 
        /* Now free all the structures for the content */
        for (ctp = cts; *ctp; ctp++)
-               free_content (*ctp);
+               free_content(*ctp);
 
-       free ((char *) cts);
+       free((char *) cts);
        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 */
-               seq_save (mp);                      /* synchronize sequences */
-               context_save ();                    /* save the context file */
+               context_replace(curfolder, folder); /* update current folder */
+               seq_setcur(mp, mp->hghsel);        /* update current message */
+               seq_save(mp);                      /* synchronize sequences */
+               context_save();                    /* save the context file */
        }
 
-       done (0);
+       done(0);
        return 1;
 }
 
 
 static RETSIGTYPE
-pipeser (int i)
+pipeser(int i)
 {
        if (i == SIGQUIT) {
-               unlink ("core");
-               fflush (stdout);
-               fprintf (stderr, "\n");
-               fflush (stderr);
+               unlink("core");
+               fflush(stdout);
+               fprintf(stderr, "\n");
+               fflush(stderr);
        }
 
-       done (1);
+       done(1);
        /* NOTREACHED */
 }