From 350ad6d3542a07639213cf2a4fe524e829c1e7b6 Mon Sep 17 00:00:00 2001
From: markus schnalke <meillo@marmaro.de>
Date: Sat, 5 May 2012 12:19:03 +0200
Subject: [PATCH] mhl: Removed unused digest features from mhl. Only
 MIME-digest are supported now, with `forw -digest ...'.

---
 etc/Makefile.in |    2 +-
 etc/mhl.digest  |    7 ------
 uip/mhl.c       |   73 ++++++-------------------------------------------------
 3 files changed, 9 insertions(+), 73 deletions(-)
 delete mode 100644 etc/mhl.digest

diff --git a/etc/Makefile.in b/etc/Makefile.in
index efec5db..8277cc8 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -27,7 +27,7 @@ SED = sed
 
 # static configuration, format, and components files
 STATIC_FILES = components digestcomps distcomps forwcomps  \
-               mhl.body mhl.digest mhl.format mhl.forward mhl.headers  \
+               mhl.body mhl.format mhl.forward mhl.headers  \
                mhl.reply rcvdistcomps rcvdistcomps.outbox              \
                replcomps replgroupcomps scan.MMDDYY scan.YYYYMMDD      \
                scan.nmh scan.mailx scan.nomime scan.size scan.time \
diff --git a/etc/mhl.digest b/etc/mhl.digest
deleted file mode 100644
index ea4a6d5..0000000
--- a/etc/mhl.digest
+++ /dev/null
@@ -1,7 +0,0 @@
-width=80,overflowoffset=10
-leftadjust,compress,compwidth=9
-Date:formatfield="%<(nodate{text})%{text}%|%(tws{text})%>"
-From:
-Subject:
-:
-body:nocomponent,overflowoffset=0,noleftadjust,nocompress
diff --git a/uip/mhl.c b/uip/mhl.c
index 328db8f..8c2094e 100644
--- a/uip/mhl.c
+++ b/uip/mhl.c
@@ -55,13 +55,7 @@ static struct swit mhlswitches[] = {
 	{ "forward", -7 },
 #define FORW2SW  6
 	{ "forwall", -7 },
-#define DGSTSW  7
-	{ "digest list", -6 },
-#define VOLUMSW  8
-	{ "volume number", -6 },
-#define ISSUESW  9
-	{ "issue number", -5 },
-#define NBODYSW  10
+#define NBODYSW  8
 	{ "nobody", -6 },
 	{ NULL, 0 }
 };
@@ -165,10 +159,6 @@ static int forwall   = 0;
 
 static int sleepsw = NOTOK;
 
-static char *digest = NULL;
-static int volume = 0;
-static int issue = 0;
-
 static int exitstat = 0;
 static int mhldebug = 0;
 
@@ -191,10 +181,6 @@ static char *ignores[MAXARGS];
 static  jmp_buf env;
 static  jmp_buf mhlenv;
 
-static char delim3[] =
-"\n----------------------------------------------------------------------\n\n";
-static char delim4[] = "\n------------------------------\n\n";
-
 static FILE *(*mhl_action) () = (FILE *(*) ()) 0;
 
 
@@ -294,29 +280,6 @@ main(int argc, char **argv)
 							argp[-2], cp);
 				continue;
 
-			case DGSTSW:
-				if (!(digest = *argp++) ||
-						*digest == '-')
-					adios(NULL, "missing argument to %s",
-							argp[-2]);
-				continue;
-			case ISSUESW:
-				if (!(cp = *argp++) || *cp == '-')
-					adios(NULL, "missing argument to %s",
-							argp[-2]);
-				if ((issue = atoi(cp)) < 1)
-					adios(NULL, "bad argument %s %s",
-							argp[-2], cp);
-				continue;
-			case VOLUMSW:
-				if (!(cp = *argp++) || *cp == '-')
-					adios(NULL, "missing argument to %s",
-							argp[-2]);
-				if ((volume = atoi(cp)) < 1)
-					adios(NULL, "bad argument %s %s",
-							argp[-2], cp);
-				continue;
-
 			case FORW2SW:
 				forwall++;  /* fall */
 			case FORW1SW:
@@ -341,22 +304,7 @@ main(int argc, char **argv)
 	}
 
 	if (forwall) {
-		if (digest) {
-			printf("%s", delim4);
-			if (volume == 0) {
-				snprintf(buf, sizeof(buf),
-					"End of %s Digest\n", digest);
-			} else {
-				snprintf(buf, sizeof(buf), "End of %s Digest [Volume %d Issue %d]\n", digest, volume, issue);
-			}
-			i = strlen(buf);
-			for (cp = buf + i; i > 1; i--)
-				*cp++ = '*';
-			*cp++ = '\n';
-			*cp = 0;
-			printf("%s", buf);
-		} else
-			printf("\n------- End of Forwarded Message%s\n\n",
+		printf("\n------- End of Forwarded Message%s\n\n",
 				vecp > 1 ? "s" : "");
 	}
 
@@ -680,17 +628,12 @@ mhlfile(FILE *fp, char *mname, int ofilen, int ofilec)
 	char **ip, name[NAMESZ], buf[BUFSIZ];
 
 	if (forwall) {
-		if (digest)
-			printf("%s", ofilen == 1 ? delim3 : delim4);
-		else {
-			printf("\n-------");
-			if (ofilen == 1)
-				printf(" Forwarded Message%s",
-						ofilec > 1 ? "s" : "");
-			else
-				printf(" Message %d", ofilen);
-			printf("\n\n");
-		}
+		printf("\n-------");
+		if (ofilen == 1)
+			printf(" Forwarded Message%s", ofilec > 1 ? "s" : "");
+		else
+			printf(" Message %d", ofilen);
+		printf("\n\n");
 	} else if (ofilec > 1) {
 		if (ofilen > 1) {
 			printf("\n\n\n");
-- 
1.7.10.4