X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhl.c;h=18d0176c5d5c078bc1925da70826957ffa67f202;hb=6d6b17fd2311daa48928e36bb131cda8fd1c91eb;hp=2c1d907b775f23164135747b2ed8d6ddacca5789;hpb=0e46503be3c855bddaeae3843e1b659279c35d70;p=mmh

diff --git a/uip/mhl.c b/uip/mhl.c
index 2c1d907..18d0176 100644
--- a/uip/mhl.c
+++ b/uip/mhl.c
@@ -48,20 +48,14 @@ static struct swit mhlswitches[] = {
 #define SLEEPSW  2
 	{ "sleep seconds",  0 },
 #define VERSIONSW  3
-	{ "version", 0 },
+	{ "Version", 0 },
 #define HELPSW  4
 	{ "help", 0 },
 #define FORW1SW  5
 	{ "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  7
 	{ "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;
 
 
@@ -240,10 +226,7 @@ main(int argc, char **argv)
 	char buf[BUFSIZ], *files[MAXARGS];
 	char **argp, **arguments;
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
-
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -294,29 +277,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 +301,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 +625,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");