X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/bacd74669e1b6614519259f7eaba98da54f9c97c..167e542b:/uip/sendsbr.c?ds=sidebyside diff --git a/uip/sendsbr.c b/uip/sendsbr.c index 3bc3df15..73f15b89 100644 --- a/uip/sendsbr.c +++ b/uip/sendsbr.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include @@ -46,7 +45,7 @@ static FILE *composition_file; /* composition file pointer */ /* * external prototypes */ -int sendsbr (char **, int, char *, struct stat *, int, char *, int); +int sendsbr (char **, int, char *, char *, struct stat *, int, char *, int); char *getusername (void); /* @@ -57,8 +56,8 @@ static void alert (char *, int); static int tmp_fd (void); static void anno (int, struct stat *); static void annoaux (int); -static int splitmsg (char **, int, char *, struct stat *, int); -static int sendaux (char **, int, char *, struct stat *); +static int splitmsg (char **, int, char *, char *, struct stat *, int); +static int sendaux (char **, int, char *, char *, struct stat *); static int attach(char *, char *, int); static void clean_up_temporary_files(void); @@ -71,7 +70,8 @@ static void make_mime_composition_file_entry(char *, int, char *); */ int -sendsbr (char **vec, int vecp, char *drft, struct stat *st, int rename_drft, char *attachment_header_field_name, int attachformat) +sendsbr (char **vec, int vecp, char *program, char *drft, struct stat *st, + int rename_drft, char *attachment_header_field_name, int attachformat) { int status; char buffer[BUFSIZ], file[BUFSIZ]; @@ -132,9 +132,9 @@ sendsbr (char **vec, int vecp, char *drft, struct stat *st, int rename_drft, cha */ if (splitsw >= 0 && !distfile && stat (drft, &sts) != NOTOK && sts.st_size >= CPERMSG) { - status = splitmsg (vec, vecp, drft, st, splitsw) ? NOTOK : OK; + status = splitmsg (vec, vecp, program, drft, st, splitsw) ? NOTOK : OK; } else { - status = sendaux (vec, vecp, drft, st) ? NOTOK : OK; + status = sendaux (vec, vecp, program, drft, st) ? NOTOK : OK; } /* rename the original draft */ @@ -437,7 +437,8 @@ make_mime_composition_file_entry(char *file_name, int attachformat, if ((p = strrchr(file_name, '.')) != (char *)0) { for (np = m_defs; np; np = np->n_next) { - if (strncasecmp(np->n_name, "mhshow-suffix-", 14) == 0 && mh_strcasecmp(p, np->n_field) == 0) { + if (strncasecmp(np->n_name, "mhshow-suffix-", 14) == 0 && + strcasecmp(p, np->n_field ? np->n_field : "") == 0) { content_type = np->n_name + 14; break; } @@ -533,13 +534,18 @@ make_mime_composition_file_entry(char *file_name, int attachformat, (void) fprintf (composition_file, "#%s <>", content_type); } else { /* Suppress Content-Id, insert simple Content-Disposition - and Content-Description with filename. */ + and Content-Description with filename. + The Content-Disposition type needs to be "inline" for + MS Outlook and BlackBerry calendar programs to properly + handle a text/calendar attachment. */ p = strrchr(file_name, '/'); (void) fprintf (composition_file, - "#%s; name=\"%s\" <> [%s]{attachment}", + "#%s; name=\"%s\" <> [%s]{%s}", content_type, (p == (char *)0) ? file_name : p + 1, - (p == (char *)0) ? file_name : p + 1); + (p == (char *)0) ? file_name : p + 1, + strcmp ("text/calendar", content_type) + ? "attachment" : "inline"); } break; @@ -552,13 +558,19 @@ make_mime_composition_file_entry(char *file_name, int attachformat, (void) fprintf (composition_file, "#%s <>", content_type); } else { /* Suppress Content-Id, insert Content-Disposition with - modification date and Content-Description wtih filename. */ + modification date and Content-Description wtih filename. + The Content-Disposition type needs to be "inline" for + MS Outlook and BlackBerry calendar programs to properly + handle a text/calendar attachment. */ p = strrchr(file_name, '/'); (void) fprintf (composition_file, - "#%s; name=\"%s\" <>[%s]{attachment; modification-date=\"%s\"}", + "#%s; name=\"%s\" <>[%s]{%s; " + "modification-date=\"%s\"}", content_type, (p == (char *)0) ? file_name : p + 1, (p == (char *)0) ? file_name : p + 1, + strcmp ("text/calendar", content_type) + ? "attachment" : "inline", dtime (&st.st_mtime, 0)); } @@ -582,7 +594,8 @@ make_mime_composition_file_entry(char *file_name, int attachformat, */ static int -splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay) +splitmsg (char **vec, int vecp, char *program, char *drft, + struct stat *st, int delay) { int compnum, nparts, partno, state, status; long pos, start; @@ -614,15 +627,15 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay) /* * This header field is discarded. */ - if (!mh_strcasecmp (name, "Message-ID")) { + if (!strcasecmp (name, "Message-ID")) { while (state == FLDPLUS) { bufsz = sizeof buffer; state = m_getfld (&gstate, name, buffer, &bufsz, in); } } else if (uprf (name, XXX_FIELD_PRF) - || !mh_strcasecmp (name, VRSN_FIELD) - || !mh_strcasecmp (name, "Subject") - || !mh_strcasecmp (name, "Encrypted")) { + || !strcasecmp (name, VRSN_FIELD) + || !strcasecmp (name, "Subject") + || !strcasecmp (name, "Encrypted")) { /* * These header fields are copied to the enclosed * header of the first message in the collection @@ -631,7 +644,7 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay) * version of it, can be copied to the header * of each messsage/partial in the collection. */ - if (!mh_strcasecmp (name, "Subject")) { + if (!strcasecmp (name, "Subject")) { size_t sublen; strncpy (subject, buffer, BUFSIZ); @@ -698,7 +711,7 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay) free (dp); fclose (in); - return sendaux (vec, vecp, drft, st); + return sendaux (vec, vecp, program, drft, st); } if (!pushsw) { @@ -788,7 +801,7 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay) } snprintf (partnum, sizeof(partnum), "%d", partno); - status = sendaux (vec, vecp, tmpdrf, st); + status = sendaux (vec, vecp, program, tmpdrf, st); unlink (tmpdrf); if (status != OK) break; @@ -811,11 +824,11 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay) /* * Annotate original message, and - * call `postproc' to send message. + * call `postproc' (which is passed down in "program") to send message. */ static int -sendaux (char **vec, int vecp, char *drft, struct stat *st) +sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st) { pid_t child_id; int i, status, fd, fd2; @@ -859,11 +872,10 @@ sendaux (char **vec, int vecp, char *drft, struct stat *st) dup2 (fd, fileno (stderr)); close (fd); } - execvp (postproc, vec); + execvp (program, vec); fprintf (stderr, "unable to exec "); perror (postproc); _exit (-1); - break; /* NOT REACHED */ default: /* @@ -1062,7 +1074,7 @@ annoaux (int fd) admonish (maildir, "unable to change directory to"); return; } - if (!(mp = folder_read (folder))) { + if (!(mp = folder_read (folder, 0))) { if (debugsw) admonish (NULL, "unable to read folder %s", folder); return; @@ -1133,6 +1145,4 @@ static void armed_done (int status) { longjmp (env, status ? status : NOTOK); - - exit (status); }