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

[nmh] / uip / mhbuild.c

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 17833f599f8998d422b08111f8d07bdaf48a961d..b111df0cea8de60cd1f9c1cc2074d489f999805f 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -9,9 +9,7 @@
 
 #include <h/mh.h>
 #include <fcntl.h>
 
 #include <h/mh.h>
 #include <fcntl.h>

-#include <h/signals.h>

 #include <h/md5.h>
 #include <h/md5.h>

-#include <signal.h>

 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>


@@ -20,6 +18,8 @@
 #include <h/utils.h>
 
 #define MHBUILD_SWITCHES \
 #include <h/utils.h>
 
 #define MHBUILD_SWITCHES \

+    X("auto", 0, AUTOSW) \
+    X("noauto", 0, NAUTOSW) \

     X("check", 0, CHECKSW) \
     X("nocheck", 0, NCHECKSW) \
     X("directives", 0, DIRECTIVES) \
     X("check", 0, CHECKSW) \
     X("nocheck", 0, NCHECKSW) \
     X("directives", 0, DIRECTIVES) \


@@ -34,13 +34,19 @@
     X("norfc934mode", 0, NRFC934SW) \
     X("verbose", 0, VERBSW) \
     X("noverbose", 0, NVERBSW) \
     X("norfc934mode", 0, NRFC934SW) \
     X("verbose", 0, VERBSW) \
     X("noverbose", 0, NVERBSW) \

+    X("disposition", 0, DISPOSW) \
+    X("nodisposition", 0, NDISPOSW) \

     X("rcache policy", 0, RCACHESW) \
     X("wcache policy", 0, WCACHESW) \
     X("contentid", 0, CONTENTIDSW) \
     X("nocontentid", 0, NCONTENTIDSW) \
     X("rcache policy", 0, RCACHESW) \
     X("wcache policy", 0, WCACHESW) \
     X("contentid", 0, CONTENTIDSW) \
     X("nocontentid", 0, NCONTENTIDSW) \

+    X("headerencoding encoding-algorithm", 0, HEADERENCSW) \
+    X("autoheaderencoding", 0, AUTOHEADERENCSW) \
+    X("maxunencoded", 0, MAXUNENCSW) \

     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
     X("debug", -5, DEBUGSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
     X("debug", -5, DEBUGSW) \

+    X("dist", 0, DISTSW) \

 
 #define X(sw, minchars, id) id,
 DEFINE_SWITCH_ENUM(MHBUILD);
 
 #define X(sw, minchars, id) id,
 DEFINE_SWITCH_ENUM(MHBUILD);


@@ -50,9 +56,19 @@ DEFINE_SWITCH_ENUM(MHBUILD);
 DEFINE_SWITCH_ARRAY(MHBUILD, switches);
 #undef X
 
 DEFINE_SWITCH_ARRAY(MHBUILD, switches);
 #undef X
 

+/* utf-8 is for Email Address Internationalization, using SMTPUTF8. */
+#define MIMEENCODING_SWITCHES \
+    X("base64", 0, BASE64SW) \
+    X("quoted-printable", 0, QUOTEDPRINTSW) \
+    X("utf-8", 0, UTF8SW) \

 
 

-/* mhbuildsbr.c */
-extern char *tmp;      /* directory to place temp files */
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(MIMEENCODING);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(MIMEENCODING, encodingswitches);
+#undef X

 
 /* mhcachesbr.c */
 extern int rcachesw;
 
 /* mhcachesbr.c */
 extern int rcachesw;


@@ -61,7 +77,6 @@ extern char *cache_public;
 extern char *cache_private;
 
 int debugsw = 0;
 extern char *cache_private;
 
 int debugsw = 0;

-int verbosw = 0;

 
 int listsw   = 0;
 int rfc934sw = 0;
 
 int listsw   = 0;
 int rfc934sw = 0;


@@ -79,18 +94,16 @@ static int unlink_outfile = 0;
 static void unlink_done (int) NORETURN;
 
 /* mhbuildsbr.c */
 static void unlink_done (int) NORETURN;
 
 /* mhbuildsbr.c */

-CT build_mime (char *, int);

 int output_message (CT, char *);
 int output_message_fp (CT, FILE *, char*);
 
 int output_message (CT, char *);
 int output_message_fp (CT, FILE *, char*);
 

-/* mhlistsbr.c */
-int list_all_messages (CT *, int, int, int, int);
-

 
 int
 main (int argc, char **argv)
 {
 
 int
 main (int argc, char **argv)
 {

-    int sizesw = 1, headsw = 1, directives = 1;
+    int sizesw = 1, headsw = 1, directives = 1, autobuild = 0, dist = 0;
+    int verbosw = 0, dispo = 0;
+    size_t maxunencoded = MAXTEXTPERLN;

     int *icachesw;
     char *cp, buf[BUFSIZ];
     char buffer[BUFSIZ], *compfile = NULL;
     int *icachesw;
     char *cp, buf[BUFSIZ];
     char buffer[BUFSIZ], *compfile = NULL;


@@ -98,16 +111,12 @@ main (int argc, char **argv)
     CT ct, cts[2];
     FILE *fp = NULL;
     FILE *fp_out = NULL;
     CT ct, cts[2];
     FILE *fp = NULL;
     FILE *fp_out = NULL;

+    int header_encoding = CE_UNKNOWN;
+    size_t n;

 
 

-    done=unlink_done;
+    if (nmh_init(argv[0], 2)) { return 1; }

 
 

-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
+    done=unlink_done;

 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;


@@ -138,6 +147,20 @@ main (int argc, char **argv)
                print_version(invo_name);
                done (0);
 
                print_version(invo_name);
                done (0);
 

+           case AUTOSW:
+               /* -auto implies -nodirectives */
+               autobuild = 1;
+               directives = 0;
+               continue;
+           case NAUTOSW:
+               /*
+                * We're turning directives back on since this is likely here
+                * to override a profile entry
+                */
+               autobuild = 0;
+               directives = 1;
+               continue;
+

            case RCACHESW:
                icachesw = &rcachesw;
                goto do_cache;
            case RCACHESW:
                icachesw = &rcachesw;
                goto do_cache;


@@ -206,15 +229,63 @@ main (int argc, char **argv)
                contentidsw = 0;
                continue;
 
                contentidsw = 0;
                continue;
 

+           case HEADERENCSW: {
+               int encoding;
+
+               if (!(cp = *argp++) || *cp == '-')
+                   adios (NULL, "missing argument to %s", argp[-2]);
+               switch (encoding = smatch (cp, encodingswitches)) {
+               case AMBIGSW:
+                   ambigsw (cp, encodingswitches);
+                   done (1);
+               case UNKWNSW:
+                   adios (NULL, "%s unknown encoding algorithm", cp);
+               case BASE64SW:
+                   header_encoding = CE_BASE64;
+                   break;
+               case QUOTEDPRINTSW:
+                   header_encoding = CE_QUOTED;
+                   break;
+               case UTF8SW:
+                   header_encoding = CE_8BIT;
+                   break;
+               default:
+                   adios (NULL, "Internal error: algorithm %s", cp);
+               }
+               continue;
+           }
+
+           case AUTOHEADERENCSW:
+               header_encoding = CE_UNKNOWN;
+               continue;
+
+           case MAXUNENCSW:
+               if (!(cp = *argp++) || *cp == '-')
+                   adios (NULL, "missing argument to %s", argp[-2]);
+               if ((maxunencoded = atoi(cp)) < 1)
+                   adios (NULL, "Invalid argument for %s: %s", argp[-2], cp);
+               if (maxunencoded > 998)
+                   adios (NULL, "limit of -maxunencoded is 998");
+               continue;
+

            case VERBSW: 
                verbosw++;
                continue;
            case NVERBSW: 
                verbosw = 0;
                continue;
            case VERBSW: 
                verbosw++;
                continue;
            case NVERBSW: 
                verbosw = 0;
                continue;

+           case DISPOSW:
+               dispo = 1;
+               continue;
+           case NDISPOSW:
+               dispo = 0;
+               continue;

            case DEBUGSW:
                debugsw = 1;
                continue;
            case DEBUGSW:
                debugsw = 1;
                continue;

+           case DISTSW:
+               dist = 1;
+               continue;

            }
        }
        if (compfile)
            }
        }
        if (compfile)


@@ -252,16 +323,6 @@ main (int argc, char **argv)
        cache_private = ".cache";
     cache_private = getcpy (m_maildir (cache_private));
 
        cache_private = ".cache";
     cache_private = getcpy (m_maildir (cache_private));
 

-    /*
-     * Check for storage directory.  If defined, we
-     * will store temporary files there.  Else we
-     * store them in standard nmh directory.
-     */
-    if ((cp = context_find (nmhstorage)) && *cp)
-       tmp = concat (cp, "/", invo_name, NULL);
-    else
-       tmp = add (m_maildir (invo_name), NULL);
-

     if (!context_find ("path"))
        free (path ("./", TFOLDER));
 
     if (!context_find ("path"))
        free (path ("./", TFOLDER));
 


@@ -273,40 +334,47 @@ main (int argc, char **argv)
      * Process the composition file from standard input.
      */
     if (compfile[0] == '-' && compfile[1] == '\0') {
      * Process the composition file from standard input.
      */
     if (compfile[0] == '-' && compfile[1] == '\0') {

+       if ((cp = m_mktemp2(NULL, invo_name, NULL, &fp)) == NULL) {
+           adios(NULL, "unable to create temporary file in %s",
+                 get_temp_dir());
+       }
+
+       /* save a copy of the name for later removal */
+       strncpy (infile, cp, sizeof(infile));
+       unlink_infile = 1;
+

        /* copy standard input to temporary file */
        /* copy standard input to temporary file */

-       strncpy (infile, m_mktemp(invo_name, NULL, &fp), sizeof(infile));
-       while (fgets (buffer, BUFSIZ, stdin))
-           fputs (buffer, fp);
+       while ((n = fread(buffer, 1, sizeof(buffer), stdin)) > 0) {
+           if (fwrite(buffer, 1, n, fp) != n) {
+               adios (NULL, "error copying to temporary file");
+           }
+       }

        fclose (fp);
        fclose (fp);

-       unlink_infile = 1;

 
        /* build the content structures for MIME message */
 
        /* build the content structures for MIME message */

-       ct = build_mime (infile, directives);
-       cts[0] = ct;
-       cts[1] = NULL;
-
-       /* output MIME message to this temporary file */
-       strncpy (outfile, m_mktemp(invo_name, NULL, &fp_out), sizeof(outfile));
-       unlink_outfile = 1;
-
-       /* output the message */
-       output_message_fp (ct, fp_out, outfile);
-        fclose(fp_out);
-
-       /* output the temp file to standard output */
-       if ((fp = fopen (outfile, "r")) == NULL)
-           adios (outfile, "unable to open");
-       while (fgets (buffer, BUFSIZ, fp))
-           fputs (buffer, stdout);
-       fclose (fp);
+       ct = build_mime (infile, autobuild, dist, directives, header_encoding,
+                        maxunencoded, verbosw);

 
 

-       unlink (infile);
-       unlink_infile = 0;
+       /*
+        * If ct == NULL, that means that -auto was set and a MIME version
+        * header was already seen.  Just use the input file as the output
+        */

 
 

-       unlink (outfile);
-       unlink_outfile = 0;
+       if (!ct) {
+           if (! (fp = fopen(infile, "r"))) {
+               adios(NULL, "Unable to open %s for reading", infile);
+           }
+           while ((n = fread(buffer, 1, sizeof(buffer), fp)) > 0) {
+               if (fwrite(buffer, 1, n, stdout) != n) {
+                   adios(NULL, "error copying %s to stdout", infile);
+               }
+           }
+       } else {
+           /* output the message */
+           output_message_fp (ct, stdout, NULL);
+           free_content (ct);
+       }

 
 

-       free_content (ct);

        done (0);
     }
 
        done (0);
     }
 


@@ -315,13 +383,25 @@ main (int argc, char **argv)
      */
 
     /* build the content structures for MIME message */
      */
 
     /* build the content structures for MIME message */

-    ct = build_mime (compfile, directives);
+    ct = build_mime (compfile, autobuild, dist, directives, header_encoding,
+                    maxunencoded, verbosw);
+
+    /*
+     * If ct == NULL, that means -auto was set and we found a MIME version
+     * header.  Simply exit and do nothing.
+     */
+
+    if (! ct)
+       done(0);
+

     cts[0] = ct;
     cts[1] = NULL;
 
     /* output MIME message to this temporary file */
     cts[0] = ct;
     cts[1] = NULL;
 
     /* output MIME message to this temporary file */

-    strncpy(outfile, m_mktemp2(compfile, invo_name, NULL, &fp_out),
-            sizeof(outfile));
+    if ((cp = m_mktemp2(compfile, invo_name, NULL, &fp_out)) == NULL) {
+       adios(NULL, "unable to create temporary file in %s", get_temp_dir());
+    }
+    strncpy(outfile, cp, sizeof(outfile));

     unlink_outfile = 1;
 
     /* output the message */
     unlink_outfile = 1;
 
     /* output the message */


@@ -332,7 +412,7 @@ main (int argc, char **argv)
      * List the message info
      */
     if (listsw)
      * List the message info
      */
     if (listsw)

-       list_all_messages (cts, headsw, sizesw, verbosw, debugsw);
+       list_all_messages (cts, headsw, sizesw, verbosw, debugsw, dispo);

 
     /* Rename composition draft */
     snprintf (buffer, sizeof(buffer), "%s.orig", m_backup (compfile));
 
     /* Rename composition draft */
     snprintf (buffer, sizeof(buffer), "%s.orig", m_backup (compfile));


@@ -362,9 +442,9 @@ unlink_done (int status)
      * temporary files.
      */
     if (unlink_infile)
      * temporary files.
      */
     if (unlink_infile)

-       unlink (infile);
+       (void) m_unlink (infile);

     if (unlink_outfile)
     if (unlink_outfile)

-       unlink (outfile);
+       (void) m_unlink (outfile);

 
     exit (status);
 }
 
     exit (status);
 }