Alter HasSuffixC()'s char * to be const.

[nmh] / uip / mhmisc.c

diff --git a/uip/mhmisc.c b/uip/mhmisc.c
index 895ec313f9d9ef1de411b6eaaf253c3dacbab06f..fddf284dd02914efbbd8f80f47a2ae74e14bc8b8 100644 (file)
--- a/uip/mhmisc.c
+++ b/uip/mhmisc.c
@@ -8,7 +8,6 @@
  */
 
 #include <h/mh.h>
  */
 
 #include <h/mh.h>

-#include <errno.h>

 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>


@@ -31,26 +30,54 @@ static char *errs = NULL;
 /*
  * prototypes
  */
 /*
  * prototypes
  */

-int part_ok (CT, int);
+int part_ok (CT);
+int part_exact(CT ct);

 int type_ok (CT, int);
 void content_error (char *, CT, char *, ...);
 void flush_errors (void);
 
 
 int
 int type_ok (CT, int);
 void content_error (char *, CT, char *, ...);
 void flush_errors (void);
 
 
 int

-part_ok (CT ct, int sP)
+part_ok (CT ct)

 {
     char **ap;
     int len;
 
 {
     char **ap;
     int len;
 

-    if (npart == 0 || (ct->c_type == CT_MULTIPART && (sP || ct->c_subtype)))
+    /* a part is "ok", i.e., should be processed, if:
+       - there were no -part arguments
+       - this part is a multipart
+     */
+    if (npart == 0 || ct->c_type == CT_MULTIPART) {

        return 1;
        return 1;

+    }

 
 

+    /* or if:
+       - this part is a an exact match for any -part option
+       - this part is a sub-part of any -part option
+     */

     for (ap = parts; *ap; ap++) {
         len = strlen(*ap);
         if (!strncmp (*ap, ct->c_partno, len) &&
     for (ap = parts; *ap; ap++) {
         len = strlen(*ap);
         if (!strncmp (*ap, ct->c_partno, len) &&

-                (!ct->c_partno[len] || ct->c_partno[len] == '.' ))
+                (!ct->c_partno[len] || ct->c_partno[len] == '.' )) {
+            return 1;
+       }
+    }
+
+    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 1;

+       }

     }
 
     return 0;
     }
 
     return 0;


@@ -76,6 +103,28 @@ type_ok (CT ct, int sP)
 }
 
 
 }
 
 

+/*
+ * Returns true if this content is marked as "inline".
+ *
+ * Technically we should check parent content to see if they have
+ * disposition to use as a default, but we don't right now.  Maybe
+ * later ....
+ */
+
+int
+is_inline(CT ct)
+{
+    /*
+     * If there isn't any disposition at all, it's "inline".  Obviously
+     * if it's "inline", then it's inline.  RFC 2183 says if it's an unknown
+     * disposition, treat it as 'attachment'.
+     */
+
+    if (! ct->c_dispo_type || strcasecmp(ct->c_dispo_type, "inline") == 0)
+       return 1;
+    return 0;
+}
+

 int
 make_intermediates (char *file)
 {
 int
 make_intermediates (char *file)
 {


@@ -96,7 +145,7 @@ losing_directory:
            }
 
            ep = concat ("Create directory \"", file, "\"? ", NULL);
            }
 
            ep = concat ("Create directory \"", file, "\"? ", NULL);

-           answer = getanswer (ep);
+           answer = read_yes_or_no_if_tty (ep);

            free (ep);
 
            if (!answer)
            free (ep);
 
            if (!answer)