X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2a00f59c84996b2782505bc49845b8828be500b5..a9bb157da7d3cee576e8944eaf8fab2bdbc4be8d:/uip/mhmisc.c

diff --git a/uip/mhmisc.c b/uip/mhmisc.c
index abcf8cc7..ad50264e 100644
--- a/uip/mhmisc.c
+++ b/uip/mhmisc.c
@@ -1,6 +1,4 @@
-
-/*
- * mhparse.c -- misc routines to process MIME messages
+/* mhmisc.c -- misc routines to process MIME messages
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -31,6 +29,7 @@ static char *errs = NULL;
  * prototypes
  */
 int part_ok (CT);
+int part_exact(CT ct);
 int type_ok (CT, int);
 void content_error (char *, CT, char *, ...);
 void flush_errors (void);
@@ -65,6 +64,23 @@ part_ok (CT ct)
     return 0;
 }
 
+int
+part_exact(CT ct)
+{
+    char **ap;
+
+    if (!ct->c_partno)
+	return 0;
+
+    for (ap = parts; *ap; ap++) {
+        if (!strcmp (*ap, ct->c_partno)) {
+            return 1;
+	}
+    }
+
+    return 0;
+}
+
 
 int
 type_ok (CT ct, int sP)
@@ -104,8 +120,7 @@ is_inline(CT ct)
 
     if (! ct->c_dispo_type || strcasecmp(ct->c_dispo_type, "inline") == 0)
 	return 1;
-    else
-	return 0;
+    return 0;
 }
 
 int
@@ -128,13 +143,13 @@ losing_directory:
 	    }
 
 	    ep = concat ("Create directory \"", file, "\"? ", NULL);
-	    answer = getanswer (ep);
+	    answer = read_yes_or_no_if_tty (ep);
 	    free (ep);
 
 	    if (!answer)
 		goto losing_directory;
 	    if (!makedir (file)) {
-		advise (NULL, "unable to create directory %s", file);
+		inform("unable to create directory %s", file);
 		goto losing_directory;
 	    }
 	}
@@ -233,7 +248,7 @@ content_error (char *what, CT ct, char *fmt, ...)
 
 	errs = add (buffer, errs);
     } else {
-	advise (NULL, "%s", buffer);
+	inform("%s", buffer);
     }
 }
 
@@ -243,7 +258,7 @@ flush_errors (void)
 {
     if (errs) {
 	fflush (stdout);
-	fprintf (stderr, "%s", errs);
+	fputs(errs, stderr);
 	free (errs);
 	errs = NULL;
     }