X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8146bc09fc2e8ad69520ba998be51fb02cbf069c..7d5df1b80b43bfe60de33b0b62c992eea1d8d531:/uip/mhshowsbr.c

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 97455045..d8733953 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -13,7 +13,7 @@
 #include <setjmp.h>
 #include <signal.h>
 #include <zotnet/mts/mts.h>
-#include <zotnet/tws/tws.h>
+#include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 
@@ -405,7 +405,16 @@ show_content_aux (CT ct, int serial, int alternate, char *cp, char *cracked)
 
 	    case 'f':
 		/* insert filename containing content */
-		snprintf (bp, buflen, "%s", file);
+		snprintf (bp, buflen, "'%s'", file);
+		/* since we've quoted the file argument, set things up
+		 * to look past it, to avoid problems with the quoting
+		 * logic below.  (I know, I should figure out what's
+		 * broken with the quoting logic, but..)
+		 */
+		len = strlen(bp);
+		buflen -= len;
+		bp += len;
+		pp = bp;
 		break;
 
 	    case 'p':
@@ -869,8 +878,9 @@ show_multi_aux (CT ct, int serial, int alternate, char *cp)
     quoted = 0;
 
     /* Now parse display string */
-    for ( ; *cp; cp++) {
+    for ( ; *cp && buflen > 0; cp++) {
 	if (*cp == '%') {
+	    pp = bp;
 	    switch (*++cp) {
 	    case 'a':
 		/* insert parameters from Content-Type field */
@@ -923,6 +933,10 @@ show_multi_aux (CT ct, int serial, int alternate, char *cp)
 		    buflen -= len;
 		    s = " ";
 		}
+		/* set our starting pointer back to bp, to avoid
+		 * requoting the filenames we just added
+		 */
+		pp = bp;
 	    }
 	    break;