Just show relevant portion of invalid encoded string.

[nmh] / uip / sendsbr.c

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 6373336e750b2edb8533ce02fccbb7859f9fac75..33dd3451ee5c4c74350e8d40cf8a4e99e9af115b 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -76,22 +76,12 @@ sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st,
        by longjmp. */
     volatile int nvecs = vecp;
     int *nvecsp = (int *) &nvecs;
-    int eai = 0;
 
     /*
      * Run the mimebuildproc (which is by default mhbuild) on the message
      * with the addition of the "-auto" flag
      */
 
-    /* Make sure that EAI support is set up before calling buildmimeproc. */
-    for (i = 0; i < vecp; ++i) {
-        if (strcasecmp (vec[i], "-eai") == 0) {
-            eai = 1;
-        } else if (strcasecmp (vec[i], "-noeai") == 0) {
-            eai = 0;
-        }
-    }
-
     switch (child = fork()) {
     case NOTOK:
        adios("fork", "unable to");
@@ -103,17 +93,6 @@ sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st,
        if (distfile)
            buildvec[i++] = "-dist";
        buildvec[i++] = (char *) drft;
-       if (eai) {
-           /* Add eai profile entry, to pass utf-8 setting to
-              getname()/getadrx().  This doesn't seem to be necessary
-              now, but it's here just in case the code changes
-              later. */
-           add_profile_entry("eai", "utf-8");
-
-           /* Add mhbuild switch to enable UTF-8 headers. */
-           buildvec[i++] = "-headerencoding";
-           buildvec[i++] = "utf-8";
-       }
        buildvec[i] = NULL;
        execvp(buildprogram, buildvec);
        fprintf(stderr, "unable to exec ");
@@ -307,7 +286,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
 
     nparts = 1;
     pos = start;
-    while (fgets (buffer, sizeof(buffer) - 1, in)) {
+    while (fgets (buffer, sizeof buffer, in)) {
        long len;
 
        if ((pos += (len = strlen (buffer))) > CPERMSG) {
@@ -319,8 +298,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
     /* Only one part, nothing to split */
     if (nparts == 1) {
        free (cp);
-       if (dp)
-           free (dp);
+        mh_xfree(dp);
 
        fclose (in);
        return sendaux (vec, vecp, program, drft, st);
@@ -378,7 +356,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
        for (;;) {
            long len;
 
-           if (!fgets (buffer, sizeof(buffer) - 1, in)) {
+           if (!fgets (buffer, sizeof buffer, in)) {
                if (partno == nparts)
                    break;
                adios (NULL, "premature eof");
@@ -398,7 +376,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
        fclose (out);
 
        if (!pushsw && verbsw) {
-           printf ("\n");
+           putchar('\n');
            fflush (stdout);
        }
 
@@ -426,8 +404,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
     }
 
     free (cp);
-    if (dp)
-       free (dp);
+    mh_xfree(dp);
 
     fclose (in);       /* close the draft */
     return status;
@@ -643,7 +620,7 @@ anno (int fd, struct stat *st)
                advise (NULL,
                            "unable to fork, so doing annotations by hand...");
            if (cwd == NULL)
-               cwd = getcpy (pwd ());
+               cwd = mh_xstrdup(pwd ());
 
        case OK:
            /* block a few signals */
@@ -722,7 +699,7 @@ annoaux (int fd)
     }
     else
        fd2 = NOTOK;
-    for (ap = brkstring (cp = getcpy (cp), " ", NULL); *ap; ap++)
+    for (ap = brkstring (cp = mh_xstrdup(cp), " ", NULL); *ap; ap++)
        m_convert (mp, *ap);
     free (cp);
     if (fd2 != NOTOK)
@@ -843,21 +820,21 @@ setup_oauth_params(char *vec[], int *vecp, const char *auth_svc,
                adios(NULL, "Unable to retrieve oauth profile entries: %s",
                      errbuf);
 
-           vec[(*vecp)++] = getcpy("-authservice");
-           vec[(*vecp)++] = getcpy(auth_svc);
-           vec[(*vecp)++] = getcpy("-oauthcredfile");
-           vec[(*vecp)++] = getcpy(mh_oauth_cred_fn(auth_svc));
-           vec[(*vecp)++] = getcpy("-oauthclientid");
+           vec[(*vecp)++] = mh_xstrdup("-authservice");
+           vec[(*vecp)++] = mh_xstrdup(auth_svc);
+           vec[(*vecp)++] = mh_xstrdup("-oauthcredfile");
+           vec[(*vecp)++] = mh_xstrdup(mh_oauth_cred_fn(auth_svc));
+           vec[(*vecp)++] = mh_xstrdup("-oauthclientid");
            vec[(*vecp)++] = getcpy(svc.client_id);
-           vec[(*vecp)++] = getcpy("-oauthclientsecret");
+           vec[(*vecp)++] = mh_xstrdup("-oauthclientsecret");
            vec[(*vecp)++] = getcpy(svc.client_secret);
-           vec[(*vecp)++] = getcpy("-oauthauthendpoint");
+           vec[(*vecp)++] = mh_xstrdup("-oauthauthendpoint");
            vec[(*vecp)++] = getcpy(svc.auth_endpoint);
-           vec[(*vecp)++] = getcpy("-oauthredirect");
+           vec[(*vecp)++] = mh_xstrdup("-oauthredirect");
            vec[(*vecp)++] = getcpy(svc.redirect_uri);
-           vec[(*vecp)++] = getcpy("-oauthtokenendpoint");
+           vec[(*vecp)++] = mh_xstrdup("-oauthtokenendpoint");
            vec[(*vecp)++] = getcpy(svc.token_endpoint);
-           vec[(*vecp)++] = getcpy("-oauthscope");
+           vec[(*vecp)++] = mh_xstrdup("-oauthscope");
            vec[(*vecp)++] = getcpy(svc.scope);
         }
     }
@@ -888,7 +865,7 @@ get_from_header_info(const char *filename, const char **addr, const char **host,
         char *hostformat = "%(host{Envelope-From})";
 
         if ((*addr = get_message_header_info (in, addrformat)) == NULL  ||
-            strlen (*addr) == 0) {
+            !**addr) {
             addrformat = distfile == NULL  ?  "%(addr{Sender})"  :  "%(addr{Resent-Sender})";
             hostformat = distfile == NULL  ?  "%(host{Sender})"  :  "%(host{Resent-Sender})";
 
@@ -914,10 +891,10 @@ get_from_header_info(const char *filename, const char **addr, const char **host,
         fclose(in);
 
         return OK;
-    } else {
-        *message = "unable to open";
-        return NOTOK;
     }
+
+    *message = "unable to open";
+    return NOTOK;
 }
 
 
@@ -984,12 +961,11 @@ get_message_header_info(FILE *in, char *format) {
     /* Trim trailing newline, if any. */
     retval = rtrim(charstring_buffer_copy((buffer)));
     charstring_free(buffer);
-    if (strlen (retval) > 0) {
+    if (*retval)
         return retval;
-    } else {
-        free (retval);
-        return NULL;
-    }
+
+    free(retval);
+    return NULL;
 }
 
 
@@ -1019,7 +995,7 @@ merge_profile_entry(const char *addr, const char *host, char *vec[], int *vecp)
     }
 
     /* Use argsplit() to do the real work of splitting the args in the profile entry. */
-    if (profile_entry  &&  strlen(profile_entry) > 0) {
+    if (profile_entry && *profile_entry) {
         int profile_vecp;
         char *file;
         char **profile_vec = argsplit(profile_entry, &file, &profile_vecp);