X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhshowsbr.c;h=e2cde4dd9ef8b9c20bc1c1779331d0659e9a2162;hb=7fba80493bf077322a16e98bfeb11990a9c89340;hp=adb0da7bbf1d1444e0ff347023c6b2e4b7990d19;hpb=55e1d8c654ee0f7c45b9361ce34617983b454c32;p=mmh

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index adb0da7..e2cde4d 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -335,6 +335,13 @@ show_content_aux(CT ct, int alternate, char *cp, char *cracked)
 				}
 				break;
 
+			case 'c':
+				/* insert charset */
+				if (ct->c_charset) {
+					strncpy(bp, ct->c_charset, buflen);
+				}
+				break;
+
 			case 'd':
 				/* insert content description */
 				if (ct->c_descr) {
@@ -446,25 +453,6 @@ raw:
 		}
 	}
 
-	if (buflen <= 0 || (ct->c_termproc &&
-			(size_t)buflen <= strlen(ct->c_termproc))) {
-		/*
-		** content_error would provide a more useful error message
-		** here, except that if we got overrun, it probably would
-		** too.
-		*/
-		fprintf(stderr, "Buffer overflow constructing show command!\n");
-		return NOTOK;
-	}
-
-	/* use charset string to modify display method */
-	if (ct->c_termproc) {
-		char term[BUFSIZ];
-
-		strncpy(term, buffer, sizeof(term));
-		snprintf(buffer, sizeof(buffer), ct->c_termproc, term);
-	}
-
 got_command:
 	return show_content_aux2(ct, alternate, cracked, buffer,
 			fd, xlist, xstdin, xtty);
@@ -480,7 +468,6 @@ show_content_aux2(CT ct, int alternate, char *cracked,
 	char *buffer, int fd, int xlist, int xstdin, int xtty)
 {
 	pid_t child_id;
-	char *vec[4], exec[BUFSIZ + sizeof "exec "];
 
 	if (debugsw || cracked) {
 		fflush(stdout);
@@ -510,13 +497,6 @@ show_content_aux2(CT ct, int alternate, char *cracked,
 			list_switch(ct, -1, 1, 0, 0);
 	}
 
-	snprintf(exec, sizeof(exec), "exec %s", buffer);
-
-	vec[0] = "/bin/sh";
-	vec[1] = "-c";
-	vec[2] = exec;
-	vec[3] = NULL;
-
 	fflush(stdout);
 
 	switch (child_id = fork()) {
@@ -531,7 +511,7 @@ show_content_aux2(CT ct, int alternate, char *cracked,
 		if (!xstdin)
 			dup2(fd, 0);
 		close(fd);
-		execvp("/bin/sh", vec);
+		execlp("/bin/sh", "/bin/sh", "-c", buffer, NULL);
 		fprintf(stderr, "unable to exec ");
 		perror("/bin/sh");
 		_exit(-1);
@@ -573,7 +553,12 @@ show_text(CT ct, int alternate)
 	** if it is not a text part of a multipart/alternative
 	*/
 	if (!alternate || ct->c_subtype == TEXT_PLAIN) {
-		snprintf(buffer, sizeof(buffer), "%%p%s '%%F'", defaultpager);
+		if (!check_charset(ct->c_charset, strlen(ct->c_charset))) {
+			snprintf(buffer, sizeof(buffer), "%%liconv -f '%s'",
+					ct->c_charset);
+		} else {
+			snprintf(buffer, sizeof(buffer), "%%lcat");
+		}
 		cp = (ct->c_showproc = getcpy(buffer));
 		return show_content_aux(ct, alternate, cp, NULL);
 	}
@@ -768,6 +753,13 @@ show_multi_aux(CT ct, int alternate, char *cp)
 				}
 				break;
 
+			case 'c':
+				/* insert charset */
+				if (ct->c_charset) {
+					strncpy(bp, ct->c_charset, buflen);
+				}
+				break;
+
 			case 'd':
 				/* insert content description */
 				if (ct->c_descr) {
@@ -887,25 +879,6 @@ raw:
 		}
 	}
 
-	if (buflen <= 0 || (ct->c_termproc &&
-			(size_t)buflen <= strlen(ct->c_termproc))) {
-		/*
-		** content_error would provide a more useful error message
-		** here, except that if we got overrun, it probably would
-		** too.
-		*/
-		fprintf(stderr, "Buffer overflow constructing show command!\n");
-		return NOTOK;
-	}
-
-	/* use charset string to modify display method */
-	if (ct->c_termproc) {
-		char term[BUFSIZ];
-
-		strncpy(term, buffer, sizeof(term));
-		snprintf(buffer, sizeof(buffer), ct->c_termproc, term);
-	}
-
 	return show_content_aux2(ct, alternate, NULL, buffer,
 			NOTOK, xlist, 0, xtty);
 }