mhl: removed -folder switch and folder output for messagename pseudo component.

diff --git a/man/mh-profile.man5 b/man/mh-profile.man5
index ecc9ef4..65a2d6f 100644 (file)
--- a/man/mh-profile.man5
+++ b/man/mh-profile.man5
@@ -665,16 +665,6 @@ which file to ask \*(lqWhat now?\*(rq
 questions about.
 .RE
 .PP
-.B $mhfolder
-.RS 5
-This is set by
-.BR dist ,
-.BR forw ,
-and
-.BR repl ,
-if appropriate.
-.RE
-.PP
 .B $mhaltmsg
 .RS 5
 .B dist
@@ -749,15 +739,7 @@ and
 .B repl
 during edit sessions so you
 can peruse other messages in the current folder besides the one being
-distributed or replied to.  The environment variable
-.B $mhfolder
-is also set by
-.BR show ,
-.BR prev ,
-and
-.B next
-for use by
-.BR mhl .
+distributed or replied to.
 .RE
 
 .SH FILES

diff --git a/man/mhl.man1 b/man/mhl.man1
index f408604..f9536c0 100644 (file)
--- a/man/mhl.man1
+++ b/man/mhl.man1
@@ -8,8 +8,6 @@ mhl \- produce formatted listings of nmh messages
 .HP 5
 .na
 .B mhl
-.RB [ \-folder
-.IR +folder ]
 .RB [ \-form
 .IR formfile ]
 .RB [ \-width
@@ -64,23 +62,6 @@ tool, the
 switch does only take file names, but no format strings with a prepended
 equal sign `='.
 .PP
-Finally, the
-.B \-folder
-.I +folder
-switch sets the
-.B nmh
-folder name,
-which is used for the \*(lqmessagename:\*(rq field described below.  The
-environment variable
-.B $mhfolder
-is consulted for the default value,
-which
-.BR show ,
-.BR next ,
-and
-.B prev
-initialize appropriately.
-.PP
 .B Mhl
 operates in two phases: 1) read and parse the format file, and
 2) process each message (file).  During phase 1, an internal description
@@ -194,12 +175,9 @@ ignores=component,...
 specifies a list of components which are never output.
 .PP
 The component \*(lqMessageName\*(rq (case\-insensitive) will output the
-actual message name (file name) preceded by the folder name if one is
-specified or found in the environment.  The format is identical to that
-produced by the
-.B \-header
-option to
+message file name as a one-line header, similar to
 .BR show .
+E.g. ``(Message 42)''
 .PP
 The component \*(lqExtras\*(rq will output all of the components of the
 message which were not matched by explicit components, or included in

diff --git a/uip/mhl.c b/uip/mhl.c
index c78619e..58c7d2b 100644 (file)
--- a/uip/mhl.c
+++ b/uip/mhl.c
@@ -41,29 +41,27 @@
 #define QUOTE  '\\'
 
 static struct swit mhlswitches[] = {
-#define FOLDSW  0
-       { "folder +folder", 0 },
-#define FORMSW  1
+#define FORMSW  0
        { "form formfile", 0 },
-#define WIDTHSW  2
+#define WIDTHSW  1
        { "width columns", 0 },
-#define SLEEPSW  3
+#define SLEEPSW  2
        { "sleep seconds",  0 },
-#define VERSIONSW  4
+#define VERSIONSW  3
        { "version", 0 },
-#define HELPSW  5
+#define HELPSW  4
        { "help", 0 },
-#define FORW1SW  6
+#define FORW1SW  5
        { "forward", -7 },
-#define FORW2SW  7
+#define FORW2SW  6
        { "forwall", -7 },
-#define DGSTSW  8
+#define DGSTSW  7
        { "digest list", -6 },
-#define VOLUMSW  9
+#define VOLUMSW  8
        { "volume number", -6 },
-#define ISSUESW  10
+#define ISSUESW  9
        { "issue number", -5 },
-#define NBODYSW  11
+#define NBODYSW  10
        { "nobody", -6 },
        { NULL, 0 }
 };
@@ -219,7 +217,7 @@ static int evalvar(struct mcomp *);
 static int ptoi(char *, int *);
 static int ptos(char *, char **);
 static char *parse(void);
-static void process(char *, char *, int, int);
+static void process(char *, int, int);
 static void mhlfile(FILE *, char *, int, int);
 static int mcomp_flags(char *);
 static char *mcomp_add(long, char *, char *);
@@ -247,7 +245,7 @@ int
 main(int argc, char **argv)
 {
        int i, width = 0, vecp = 0;
-       char *cp, *folder = NULL, *form = NULL;
+       char *cp, *form = NULL;
        char buf[BUFSIZ], *files[MAXARGS];
        char **argp, **arguments;
 
@@ -283,11 +281,6 @@ main(int argc, char **argv)
                                print_version(invo_name);
                                done(1);
 
-                       case FOLDSW:
-                               if (!(folder = *argp++) || *folder == '-')
-                                       adios(NULL, "missing argument to %s",
-                                                       argp[-2]);
-                               continue;
                        case FORMSW:
                                if (!(form = *argp++) || *form == '-')
                                        adios(NULL, "missing argument to %s",
@@ -347,9 +340,6 @@ main(int argc, char **argv)
                files[vecp++] = cp;
        }
 
-       if (!folder)
-               folder = getenv("mhfolder");
-
        if (isatty(fileno(stdout))) {
                if (mhl_action) {
                        SIGNAL(SIGINT, SIG_IGN);
@@ -365,10 +355,10 @@ main(int argc, char **argv)
        mhl_format(form ? form : mhlformat, width);
 
        if (vecp == 0) {
-               process(folder, NULL, 1, vecp = 1);
+               process(NULL, 1, vecp = 1);
        } else {
                for (i = 0; i < vecp; i++)
-                       process(folder, files[i], i + 1, vecp);
+                       process(files[i], i + 1, vecp);
        }
 
        if (forwall) {
@@ -668,9 +658,8 @@ parse(void)
 
 
 static void
-process(char *folder, char *fname, int ofilen, int ofilec)
+process(char *fname, int ofilen, int ofilec)
 {
-       char *cp = NULL;
        FILE *fp = NULL;
        struct mcomp *c1;
 
@@ -688,17 +677,15 @@ process(char *folder, char *fname, int ofilen, int ofilec)
                        fname = "(stdin)";
                        fp = stdin;
                }
-               cp = folder ? concat(folder, ":", fname, NULL) : getcpy(fname);
                if (ontty != PITTY)
                        SIGNAL(SIGINT, intrser);
-               mhlfile(fp, cp, ofilen, ofilec);
+               mhlfile(fp, fname, ofilen, ofilec);
                /* FALL THROUGH! */
        default:
                if (ontty != PITTY)
                        SIGNAL(SIGINT, SIG_IGN);
                if (mhl_action == NULL && fp != stdin)
                        fclose(fp);
-               free(cp);
                if (holder.c_text) {
                        free(holder.c_text);
                        holder.c_text = NULL;

diff --git a/uip/show.c b/uip/show.c
index 9a3c46e..a0178fe 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -250,9 +250,6 @@ go_to_it: ;
        /* Set the "proc" */
        proc = (mime) ? showmimeproc : showproc;
 
-       if (folder && !file)
-               m_putenv("mhfolder", folder);
-
        /* Special-cased because mhshow takes msg not files args. */
        if (strcmp(mhbasename(proc), "mhshow")==0) {
                if (file) {