mhbuild: Don't list anything (removed -list and -header).

For displaying the MIME structure, use mhlist(1). If you are curious what
mhbuild(1) had created, simply run mhlist(1) on the same file afterwards.

diff --git a/man/mhbuild.man1 b/man/mhbuild.man1
index c2614e4..32df651 100644 (file)
--- a/man/mhbuild.man1
+++ b/man/mhbuild.man1
@@ -9,8 +9,6 @@ mhbuild \- translate MIME composition draft
 .HP 5
 .B mhbuild
 .I file
-.RB [ \-list " | " \-nolist ]
-.RB [ \-headers " | " \-noheaders ]
 .RB [ \-contentid " | " \-nocontentid ]
 .RB [ \-verbose " | " \-noverbose ]
 .RB [ \-version ]
@@ -51,26 +49,6 @@ it will be renamed to \*(lq,draft.orig\*(rq.  This allows you to easily
 recover the
 .B mhbuild
 input file.
-.SS "Listing the Contents"
-The
-.B \-list
-switch tells
-.B mhbuild
-to list the table of contents associated with the MIME message that is created.
-.PP
-The
-.B \-headers
-switch indicates
-that a one-line banner should be displayed above the listing.
-The size of the \*(lqnative\*(rq
-(decoded) format of each content is evaluated.  This provides an
-accurate count at the expense of a small delay.
-If the
-.B \-verbose
-switch
-is present, then the listing will show any \*(lqextra\*(rq information
-that is present in the message, such as comments in the
-\*(lqContent-Type\*(rq header.
 .SS "Translating the Composition File"
 .B mhbuild
 is essentially a filter to aid in the composition of MIME
@@ -520,7 +498,6 @@ mhlist(1), show(1), mhstore(1), forw(1),
 
 .SH DEFAULTS
 .nf
-.RB ` \-headers '
 .RB ` \-contentid '
 .RB ` \-noverbose '
 .fi

diff --git a/uip/Makefile.in b/uip/Makefile.in
index 6b1469f..4e68ee1 100644 (file)
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -134,8 +134,8 @@ mmhwrap: mmhwrap.sh
        sed "s,%bindir%,"$(bindir)"," $(srcdir)/mmhwrap.sh >mmhwrap
        chmod +x mmhwrap
 
-mhbuild: mhbuild.o mhlistsbr.o mhoutsbr.o mhmisc.o mhfree.o mhparse.o termsbr.o $(LOCALLIBS)
-       $(LINK) mhbuild.o mhlistsbr.o mhoutsbr.o mhmisc.o mhfree.o mhparse.o $(LINKLIBS) $(TERMLIB)
+mhbuild: mhbuild.o mhoutsbr.o mhmisc.o mhfree.o mhparse.o termsbr.o $(LOCALLIBS)
+       $(LINK) mhbuild.o mhoutsbr.o mhmisc.o mhfree.o mhparse.o $(LINKLIBS) $(TERMLIB)
 
 mhl: mhl.o termsbr.o $(LOCALLIBS)
        $(LINK) mhl.o termsbr.o $(LINKLIBS) $(TERMLIB)

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index fd6cee0..0fb5315 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -29,27 +29,19 @@
 #include <time.h>
 
 static struct swit switches[] = {
-#define HEADSW  0
-       { "headers", 0 },
-#define NHEADSW  1
-       { "noheaders", 0 },
-#define LISTSW  2
-       { "list", 0 },
-#define NLISTSW  3
-       { "nolist", 0 },
-#define VERBSW  4
+#define VERBSW  0
        { "verbose", 0 },
-#define NVERBSW  5
+#define NVERBSW  1
        { "noverbose", 0 },
-#define CONTENTIDSW  6
+#define CONTENTIDSW  2
        { "contentid", 0 },
-#define NCONTENTIDSW  7
+#define NCONTENTIDSW  3
        { "nocontentid", 0 },
-#define VERSIONSW  8
+#define VERSIONSW  4
        { "version", 0 },
-#define HELPSW  9
+#define HELPSW  5
        { "help", 0 },
-#define DEBUGSW  10
+#define DEBUGSW  6
        { "debug", -5 },
        { NULL, 0 }
 };
@@ -95,7 +87,6 @@ static CT build_mime(char *);
 int debugsw = 0;
 int verbosw = 0;
 
-int listsw   = 0;
 int contentidsw = 1;
 
 /*
@@ -113,9 +104,6 @@ static void unlink_done(int) NORETURN;
 int output_message(CT, char *);
 int output_message_fp(CT, FILE *, char*);
 
-/* mhlistsbr.c */
-int list_all_messages(CT *, int, int, int);
-
 /* mhmisc.c */
 void set_endian(void);
 
@@ -126,7 +114,6 @@ void free_content(CT);
 int
 main(int argc, char **argv)
 {
-       int headsw = 1;
        char *cp, buf[BUFSIZ];
        char buffer[BUFSIZ], *compfile = NULL;
        char **argp, **arguments;
@@ -153,7 +140,6 @@ main(int argc, char **argv)
                                adios(NULL, "cannot specify both standard input and a file");
                        else
                                compfile = cp;
-                       listsw = 0;  /* turn off -list if using std in/out */
                        verbosw = 0;  /* turn off -verbose listings */
                        break;
                }
@@ -173,20 +159,6 @@ main(int argc, char **argv)
                                print_version(invo_name);
                                done(1);
 
-                       case HEADSW:
-                               headsw++;
-                               continue;
-                       case NHEADSW:
-                               headsw = 0;
-                               continue;
-
-                       case LISTSW:
-                               listsw++;
-                               continue;
-                       case NLISTSW:
-                               listsw = 0;
-                               continue;
-
                        case CONTENTIDSW:
                                contentidsw = 1;
                                continue;
@@ -213,9 +185,6 @@ main(int argc, char **argv)
 
        set_endian();
 
-       if ((cp = getenv("MM_NOASK")) && strcmp(cp, "1")==0)
-               listsw  = 0;
-
        /*
        ** Check if we've specified an additional profile
        */
@@ -313,12 +282,6 @@ main(int argc, char **argv)
        output_message_fp(ct, fp_out, outfile);
        fclose(fp_out);
 
-       /*
-       ** List the message info
-       */
-       if (listsw)
-               list_all_messages(cts, headsw, verbosw, debugsw);
-
        /* Rename composition draft */
        snprintf(buffer, sizeof(buffer), "%s.orig", m_backup(compfile));
        if (rename(compfile, buffer) == NOTOK) {
@@ -632,7 +595,6 @@ user_content(FILE *in, char *file, char *buf, CT *ctp)
        char buffer[BUFSIZ];
        struct multipart *m;
        struct part **pp;
-       struct stat st;
        struct str2init *s2i;
        CI ci;
        CT ct;
@@ -760,8 +722,6 @@ rock_and_roll:
                        }
                }
 
-               if (listsw)
-                       ct->c_end = ftell(out);
                fclose(out);
 
                /* parse content type */
@@ -868,8 +828,6 @@ use_forw:
                                ce->ce_file = ci->ci_magic;
                                if (access(ce->ce_file, R_OK) == NOTOK)
                                        adios("reading", "unable to access %s for", ce->ce_file);
-                               if (listsw && stat(ce->ce_file, &st) != NOTOK)
-                                       ct->c_end = (long) st.st_size;
                                ci->ci_magic = NULL;
                        }
                        return OK;
@@ -984,9 +942,6 @@ use_forw:
                                                        "%s/%d", mp->foldpath,
                                                        msgnum);
                                        pe->ce_file = getcpy(buffer);
-                                       if (listsw && stat(pe->ce_file, &st)
-                                                       != NOTOK)
-                                               p->c_end = (long) st.st_size;
 
                                        if ((part = (struct part *) calloc(1, sizeof(*part))) == NULL)
                                                adios(NULL, "out of memory");
@@ -1006,8 +961,6 @@ use_forw:
                        snprintf(buffer, sizeof(buffer), "%s/%d",
                                        mp->foldpath, msgnum);
                        ce->ce_file = getcpy(buffer);
-                       if (listsw && stat(ce->ce_file, &st) != NOTOK)
-                               ct->c_end = (long) st.st_size;
                }
 
                folder_free(mp);  /* free folder/message structure */
@@ -1144,12 +1097,6 @@ compose_content(CT ct)
                        if (compose_content(p) == NOTOK)
                                return NOTOK;
                }
-
-               if (listsw) {
-                       ct->c_end = (partnum = strlen(prefix) + 2) + 2;
-                       for (part = m->mp_parts; part; part = part->mp_next)
-                               ct->c_end += part->mp_part->c_end + partnum;
-               }
        }
        break;
 
@@ -1287,14 +1234,6 @@ raw:
                                break;
                        }
                }
-
-               /* Check size of file */
-               if (listsw && ct->c_end == 0L) {
-                       struct stat st;
-
-                       if (stat(ce->ce_file, &st) != NOTOK)
-                               ct->c_end = (long) st.st_size;
-               }
                break;
        }