mhsign: Ignore expired, revoked, invalid, and similar public keys.

[mmh] / uip / send.c

diff --git a/uip/send.c b/uip/send.c
index 76280aa..e1e7518 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -70,7 +70,7 @@ static struct swit switches[] = {
 int
 main(int argc, char **argv)
 {
-       int msgp = 0, nfiles = 0, distsw = 0, vecp = 1;
+       int nmsgs = 0, nfiles = 0, distsw = 0, vecp = 1;
        int msgnum, status;
        int in, out;
        int n;
@@ -122,43 +122,47 @@ main(int argc, char **argv)
                        if (*cp == '/') {
                                files[nfiles++] = cp;
                        } else {
-                               msgs[msgp++] = cp;
+                               msgs[nmsgs++] = cp;
                        }
                }
        }
 
-       if (!msgp && !nfiles) {
-               msgs[msgp++] = seq_cur;
+       if (!nmsgs && !nfiles) {
+               msgs[nmsgs++] = seq_cur;
        }
-       maildir = toabsdir(draftfolder);
 
-       if (chdir(maildir) == NOTOK) {
-               adios(maildir, "unable to change directory to");
-       }
-
-       if (!(mp = folder_read(draftfolder))) {
-               adios(NULL, "unable to read draft folder %s", draftfolder);
-       }
-       if (mp->nummsg == 0) {
-               adios(NULL, "no messages in draft folder %s", draftfolder);
-       }
-       /* parse all the message ranges/sequences and set SELECTED */
-       for (msgnum = 0; msgnum < msgp; msgnum++) {
-               if (!m_convert(mp, msgs[msgnum])) {
-                       done(1);
+       if (nmsgs) {
+               maildir = toabsdir(draftfolder);
+               if (chdir(maildir) == NOTOK) {
+                       adios(maildir, "unable to change directory to");
                }
-       }
-       seq_setprev(mp);
+               if (!(mp = folder_read(draftfolder))) {
+                       adios(NULL, "unable to read draft folder %s",
+                                       draftfolder);
+               }
+               if (mp->nummsg == 0) {
+                       adios(NULL, "no messages in draft folder %s",
+                                       draftfolder);
+               }
+               /* parse all the msgranges/sequences and set SELECTED */
+               for (msgnum = 0; msgnum < nmsgs; msgnum++) {
+                       if (!m_convert(mp, msgs[msgnum])) {
+                               done(1);
+                       }
+               }
+               seq_setprev(mp);
 
-       for (msgp = 0, msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
-               if (is_selected(mp, msgnum)) {
-                       files[nfiles++] = getcpy(m_name(msgnum));
-                       unset_exists(mp, msgnum);
+               for (nmsgs = 0, msgnum = mp->lowsel;
+                               msgnum <= mp->hghsel; msgnum++) {
+                       if (is_selected(mp, msgnum)) {
+                               files[nfiles++] = getcpy(m_name(msgnum));
+                               unset_exists(mp, msgnum);
+                       }
                }
-       }
 
-       mp->msgflags |= SEQMOD;
-       seq_save(mp);
+               mp->msgflags |= SEQMOD;
+               seq_save(mp);
+       }
 
        if (!(cp = getenv("SIGNATURE")) || !*cp) {
                if ((cp = context_find("signature")) && *cp) {
@@ -166,9 +170,9 @@ main(int argc, char **argv)
                }
        }
 
-       for (msgnum = 0; msgnum < nfiles; msgnum++) {
-               if (stat(files[msgnum], &st) == NOTOK) {
-                       adios(files[msgnum], "unable to stat draft file");
+       for (n = 0; n < nfiles; n++) {
+               if (stat(files[n], &st) == NOTOK) {
+                       adios(files[n], "unable to stat draft file");
                }
        }
 
@@ -207,8 +211,8 @@ main(int argc, char **argv)
                close(n);
        }
 
-       for (msgnum = 0; msgnum < nfiles; msgnum++) {
-               switch (sendsbr(vec, vecp, files[msgnum], &st)) {
+       for (n = 0; n < nfiles; n++) {
+               switch (sendsbr(vec, vecp, files[n], &st)) {
                case DONE:
                        done(++status);
                case NOTOK:
@@ -425,9 +429,7 @@ attach(char *draft_file_name)
        while (get_line() != EOF && *field && *field != '-') {
                if (strncasecmp(field, attach_hdr, length) == 0 &&
                                field[length] == ':') {
-                       for (p = field+length+1; *p==' ' || *p=='\t'; p++) {
-                               continue;
-                       }
+                       p = trim(field+length+1);
                        if (*p == '+') {
                                /* forwarded message */
                                fprintf(composition_file, "#forw [forwarded message(s)] %s\n", p);
@@ -549,6 +551,7 @@ make_mime_composition_file_entry(char *file_name)
        char content_type[BUFSIZ];
        char cmdbuf[BUFSIZ];
        char *cmd = mimetypequeryproc;
+       int semicolon = 0;
 
        for (np = m_defs; np; np = np->n_next) {
                if (strcasecmp(np->n_name, mimetypequery)==0) {
@@ -579,11 +582,23 @@ make_mime_composition_file_entry(char *file_name)
                adios(NULL, "unable to access file `%s'", file_name);
        }
 
-       cp = (!(cp = strrchr(file_name, '/'))) ? file_name : cp + 1;
-       fprintf(composition_file, "#%s; name=\"%s\" <> [%s] {attachment}",
-                       content_type, cp, cp);
+       /* Check for broken file(1). See man page mh-profile(5). */
+       for (cp=content_type; *cp; cp++) {
+               if (isspace(*cp)) {
+                       if (!semicolon) {
+                               adios(NULL, "Sorry, your Mime-Type-Query command (%s) is broken.\n\tThe output misses a semicolon before the whitespace.\n\tOutput was: %s", cmd, content_type);
+                       }
+               } else if (*cp == ';') {
+                       semicolon = 1;
+               } else {
+                       semicolon = 0;
+               }
+       }
 
-       fprintf(composition_file, " %s\n", file_name);
+       cp = (!(cp = strrchr(file_name, '/'))) ? file_name : cp + 1;
+       fprintf(composition_file,
+                       "#%s; name=\"%s\" <> [%s] {attachment} %s\n",
+                       content_type, cp, cp, file_name);
 
        return;
 }