X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/836f8eb0eda25f31b82c07384fc9b1fb60ce7182..ef0725fd97369e801a56febfdb7a6ec2eaff73c8:/uip/mhmisc.c?ds=sidebyside

diff --git a/uip/mhmisc.c b/uip/mhmisc.c
index 778d8055..525cc6df 100644
--- a/uip/mhmisc.c
+++ b/uip/mhmisc.c
@@ -5,11 +5,14 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/mime.h>
-#include <h/mhparse.h>
-#include <h/utils.h>
-#include "../sbr/makedir.h"
+#include "h/mh.h"
+#include "sbr/read_yes_or_no_if_tty.h"
+#include "sbr/concat.h"
+#include "sbr/error.h"
+#include "h/mime.h"
+#include "h/mhparse.h"
+#include "h/utils.h"
+#include "sbr/makedir.h"
 #include "mhmisc.h"
 
 extern int debugsw;
@@ -22,7 +25,7 @@ int ntype = 0;
 char *parts[NPARTS + 1];
 char *types[NTYPES + 1];
 
-int userrs = 0;
+bool userrs;
 
 static char *errs = NULL;
 
@@ -161,7 +164,7 @@ void
 content_error (char *what, CT ct, char *fmt, ...)
 {
     va_list arglist;
-    int	i, len, buflen;
+    int	len, buflen;
     char *bp, buffer[BUFSIZ];
     CI ci;
 
@@ -204,10 +207,8 @@ content_error (char *what, CT ct, char *fmt, ...)
 	buflen -= len;
     }
 
-    i = strlen (invo_name) + 2;
-
     /* Now add content type and subtype */
-    snprintf (bp, buflen, "\n%*s(content %s/%s", i, "",
+    snprintf (bp, buflen, "\n    (content %s/%s",
 	ci->ci_type, ci->ci_subtype);
     len = strlen (bp);
     bp += len;
@@ -242,6 +243,8 @@ content_error (char *what, CT ct, char *fmt, ...)
     } else {
 	inform("%s", buffer);
     }
+
+    va_end(arglist);
 }