X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsendsbr.c;h=029ccb75007875331abb0c4b8773f9fd7e242cc4;hp=de00429e936cb84615b70af666a712379a73b2d2;hb=66153aae4e74cc270cbdbc48f20284b13fb700fc;hpb=40821f5c1316e9205a08375e7075909cc9968e7d diff --git a/uip/sendsbr.c b/uip/sendsbr.c index de00429..029ccb7 100644 --- a/uip/sendsbr.c +++ b/uip/sendsbr.c @@ -30,7 +30,6 @@ int debugsw = 0; /* global */ int forwsw = 1; int inplace = 1; int pushsw = 0; -int unique = 0; int verbsw = 0; char *altmsg = NULL; /* .. */ @@ -52,7 +51,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 *, struct stat *, int); char *getusername(void); /* @@ -65,10 +64,10 @@ static void anno(int, struct stat *); static void annoaux(int); static int sendaux(char **, int, char *, struct stat *); -static int attach(char *, char *, int); +static int attach(char *); static void clean_up_temporary_files(void); static int get_line(void); -static void make_mime_composition_file_entry(char *, int); +static void make_mime_composition_file_entry(char *); /* @@ -76,11 +75,10 @@ static void make_mime_composition_file_entry(char *, int); */ 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 *drft, struct stat *st, int rename_drft) { int status; - char buffer[BUFSIZ], file[BUFSIZ]; + char buffer[BUFSIZ]; char *original_draft; /* name of original draft file */ char *p; /* string pointer for building file name */ @@ -94,50 +92,29 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st, original_draft = drft; /* - ** There might be attachments if a header field name for - ** attachments is supplied. Convert the draft to a MIME message. + ** Convert the draft to a MIME message. ** Use the mhbuild composition file for the draft if there was ** a successful conversion because that now contains the MIME ** message. A nice side effect of this is that it leaves the ** original draft file untouched so that it can be retrieved ** and modified if desired. */ + switch (attach(drft)) { + case OK: + drft = composition_file_name; + break; - if (attachment_header_field_name != NULL) { - switch (attach(attachment_header_field_name, drft, - attachformat)) { - case OK: - drft = composition_file_name; - break; - - case NOTOK: - return (NOTOK); + case NOTOK: + return (NOTOK); - case DONE: - break; - } + case DONE: + break; } done=armed_done; switch (setjmp(env)) { case OK: - /* - ** If given -push and -unique (which is undocumented), then - ** rename the draft file. I'm not quite sure why. - */ - if (pushsw && unique) { - char *cp = m_mktemp2(drft, invo_name, NULL, NULL); - if (cp == NULL) { - adios("sendsbr", "unable to create temporary file"); - } - if (rename(drft, strncpy(file, cp, sizeof(file))) - == NOTOK) - adios(file, "unable to rename %s to", drft); - drft = file; - } - status = sendaux(vec, vecp, drft, st) ? NOTOK : OK; - /* rename the original draft */ if (rename_drft && status == OK && rename(original_draft, strncpy(buffer, @@ -188,20 +165,17 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st, } static int -attach(char *attachment_header_field_name, char *draft_file_name, - int attachformat) +attach(char *draft_file_name) { char buf[MAXPATHLEN + 6]; /* miscellaneous buffer */ int c; /* current character for body copy */ int has_attachment; /* draft has at least one attachment */ int has_body; /* draft has a message body */ + int non_ascii; /* msg body contains non-ASCII chars */ int length; /* length of attachment header field name */ char *p; /* miscellaneous string pointer */ - /* - ** Open up the draft file. - */ - + /* Open up the draft file. */ if ((draft_file = fopen(draft_file_name, "r")) == (FILE *)0) adios(NULL, "can't open draft file `%s'.", draft_file_name); @@ -210,53 +184,61 @@ attach(char *attachment_header_field_name, char *draft_file_name, ** Allocate a buffer to hold the header components as they're read in. ** This buffer might need to be quite large, so we grow it as needed. */ - field = (char *)mh_xmalloc(field_size = 256); /* - ** Scan the draft file for a header field name that matches the - ** -attach argument. The existence of one indicates that the + ** Scan the draft file for an attachment header field name. + ** The existence of one indicates that the ** draft has attachments. Bail out if there are no attachments ** because we're done. Read to the end of the headers even if ** we have no attachments. */ - - length = strlen(attachment_header_field_name); + length = strlen(attach_hdr); has_attachment = 0; - while (get_line() != EOF && *field != '\0' && *field != '-') - if (strncasecmp(field, attachment_header_field_name, length) - == 0 && field[length] == ':') + while (get_line() != EOF && *field != '\0' && *field != '-') { + if (strncasecmp(field, attach_hdr, length) == 0 && + field[length] == ':') { has_attachment = 1; - - if (has_attachment == 0) - return (DONE); + } + } /* - ** We have at least one attachment. Look for at least one - ** non-blank line in the body of the message which indicates - ** content in the body. + ** Look for at least one non-blank line in the body of the + ** message which indicates content in the body. + ** Check if body contains at least one non-blank (= not empty) + ** and if it contains any non-ASCII chars (= need MIME). */ - has_body = 0; + non_ascii = 0; while (get_line() != EOF) { for (p = field; *p != '\0'; p++) { if (*p != ' ' && *p != '\t') { has_body = 1; - break; + } + if (*p > 127 || *p < 0) { + non_ascii = 1; } } - - if (has_body) + if (has_body && non_ascii) break; } /* - ** Make names for the temporary files. + ** Bail out if there are no attachments and only ASCII text. + ** This means we don't need to convert it to MIME. + */ + if (!has_attachment && non_ascii==0) { + return DONE; + } + + /* + ** Else: mimify */ + /* Make names for the temporary files. */ strncpy(body_file_name, m_mktemp(toabsdir(invo_name), NULL, NULL), sizeof (body_file_name)); @@ -269,8 +251,7 @@ attach(char *attachment_header_field_name, char *draft_file_name, composition_file = fopen(composition_file_name, "w"); - if ((has_body && body_file == (FILE *)0) || - composition_file == (FILE *)0) { + if ((has_body && !body_file) || !composition_file) { clean_up_temporary_files(); adios(NULL, "unable to open all of the temporary files."); } @@ -280,51 +261,45 @@ attach(char *attachment_header_field_name, char *draft_file_name, ** non-attachment header fields to the temporary composition file. ** Then add the dashed line separator. */ - rewind(draft_file); - - while (get_line() != EOF && *field != '\0' && *field != '-') - if (strncasecmp(field, attachment_header_field_name, length) - != 0 || field[length] != ':') + while (get_line() != EOF && *field && *field != '-') { + if (strncasecmp(field, attach_hdr, length) != 0 || + field[length] != ':') { fprintf(composition_file, "%s\n", field); - + } + } fputs("--------\n", composition_file); - /* - ** Copy the message body to a temporary file. - */ - if (has_body) { - while ((c = getc(draft_file)) != EOF) - putc(c, body_file); - + /* Copy the message body to the temporary file. */ + while ((c = getc(draft_file)) != EOF) { + putc(c, body_file); + } fclose(body_file); - } - /* - ** Add a mhbuild MIME composition file line for the body if - ** there was one. - */ - - if (has_body) - make_mime_composition_file_entry(body_file_name, attachformat); + /* Add a mhbuild MIME composition file line for the body */ + /* charset will be discovered/guessed by buildmimeproc */ + fprintf(composition_file, "#text/plain %s\n", body_file_name); + } /* ** Now, go back to the beginning of the draft file and look for ** header fields that specify attachments. Add a mhbuild MIME ** composition file for each. */ - rewind(draft_file); - - while (get_line() != EOF && *field != '\0' && *field != '-') { - if (strncasecmp(field, attachment_header_field_name, length) - == 0 && field[length] == ':') { - for (p = field + length + 1; *p == ' ' || *p == '\t'; - p++) - ; - - make_mime_composition_file_entry(p, attachformat); + 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; + } + if (*p == '+') { + /* forwarded message */ + fprintf(composition_file, "#forw [forwarded message(s)] %s\n", p); + } else { + make_mime_composition_file_entry(p); + } } } @@ -334,7 +309,6 @@ attach(char *attachment_header_field_name, char *draft_file_name, ** We're ready to roll! Run mhbuild on the composition file. ** Note that mhbuild is in the context as buildmimeproc. */ - sprintf(buf, "%s %s", buildmimeproc, composition_file_name); if (system(buf) != 0) { @@ -389,179 +363,47 @@ get_line(void) } static void -make_mime_composition_file_entry(char *file_name, int attachformat) +make_mime_composition_file_entry(char *file_name) { - int binary; /* binary character found flag */ - int c; /* current character */ - char cmd[MAXPATHLEN + 6]; /* file command buffer */ - char *content_type; /* mime content type */ - FILE *fp; /* content and pipe file pointer */ - struct node *np; /* context scan node pointer */ - char *p; /* miscellaneous string pointer */ - struct stat st; /* file status buffer */ - - content_type = NULL; - - /* - ** Check the file name for a suffix. Scan the context for that - ** suffix on a mhshow-suffix- entry. We use these entries to - ** be compatible with mhshow, and there's no reason to make the - ** user specify each suffix twice. Context entries of the form - ** "mhshow-suffix-contenttype" in the name have the suffix in - ** the field, including the dot. - */ - - if ((p = strrchr(file_name, '.')) != NULL) { - 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) - { - content_type = np->n_name + 14; - break; - } - } - } - - /* - ** No content type was found, either because there was no matching - ** entry in the context or because the file name has no suffix. - ** Open the file and check for non-ASCII characters. Choose the - ** content type based on this check. - */ - - if (content_type == NULL) { - if ((fp = fopen(file_name, "r")) == (FILE *)0) { - clean_up_temporary_files(); - adios(NULL, "unable to access file \"%s\"", - file_name); - } - - binary = 0; - - while ((c = getc(fp)) != EOF) { - if (c > 127 || c < 0) { - binary = 1; - break; - } + FILE *fp; + struct node *np; + char *cp; + char content_type[BUFSIZ]; + char cmdbuf[BUFSIZ]; + char *cmd = mimetypequeryproc; + + for (np = m_defs; np; np = np->n_next) { + if (strcasecmp(np->n_name, mimetypequery)==0) { + cmd = np->n_field; + break; } - - fclose(fp); - - content_type = binary ? - "application/octet-stream" : "text/plain"; } + snprintf(cmdbuf, sizeof cmdbuf, "%s %s", cmd, file_name); - /* - ** Make sure that the attachment file exists and is readable. - ** Append a mhbuild directive to the draft file. This starts with - ** the content type. Append a file name attribute and a private - ** x-unix-mode attribute. Also append a description obtained - ** (if possible) by running the "file" command on the file. - */ - - if (stat(file_name, &st) == -1 || access(file_name, R_OK) != 0) { + if (!(fp = popen(cmdbuf, "r"))) { clean_up_temporary_files(); - adios(NULL, "unable to access file \"%s\"", file_name); + adios(NULL, "unable to determine content type with `%s'", + cmdbuf); } + if (fgets(content_type, sizeof content_type, fp) && + (cp = strrchr(content_type, '\n'))) { + *cp = '\0'; + } else { + strcpy(content_type, "application/octet-stream"); + admonish(NULL, "problems with `%s', using fall back type `%s'", + cmdbuf, content_type); + } + pclose(fp); - switch (attachformat) { - case 0: - /* Insert name, file mode, and Content-Id. */ - fprintf(composition_file, - "#%s; name=\"%s\"; x-unix-mode=0%.3ho", - content_type, ((p = strrchr(file_name, '/')) - == NULL) ? file_name : p + 1, - (unsigned short)(st.st_mode & 0777)); - - if (strlen(file_name) > MAXPATHLEN) { - clean_up_temporary_files(); - adios(NULL, "attachment file name `%s' too long.", - file_name); - } - - sprintf(cmd, "file '%s'", file_name); - - if ((fp = popen(cmd, "r")) != (FILE *)0 && - fgets(cmd, sizeof (cmd), fp) != NULL) { - *strchr(cmd, '\n') = '\0'; - - /* - ** The output of the "file" command is of the form - ** - ** file: description - ** - ** Strip off the "file:" and subsequent white space. - */ - - for (p = cmd; *p != '\0'; p++) { - if (*p == ':') { - for (p++; *p != '\0'; p++) { - if (*p != '\t') - break; - } - break; - } - } - - if (*p != '\0') - /* Insert Content-Description. */ - fprintf(composition_file, " [ %s ]", p); - - pclose(fp); - } - - break; - case 1: - if (stringdex(toabsdir(invo_name), file_name) == 0) { - /* - ** Content had been placed by send into a temp file. - ** Don't generate Content-Disposition header, because - ** it confuses Microsoft Outlook, Build 10.0.6626, at - ** least. - */ - fprintf(composition_file, "#%s <>", content_type); - } else { - /* - ** Suppress Content-Id, insert simple - ** Content-Disposition. - */ - fprintf(composition_file, - "#%s; name=\"%s\" <>{attachment}", - content_type, - ((p = strrchr(file_name, '/')) == NULL) ? - file_name : p + 1); - } - - break; - case 2: - if (stringdex(toabsdir(invo_name), file_name) == 0) { - /* - ** Content had been placed by send into a temp file. - ** Don't generate Content-Disposition header, because - ** it confuses Microsoft Outlook, Build 10.0.6626, at - ** least. - */ - fprintf(composition_file, "#%s <>", content_type); - } else { - /* - ** Suppress Content-Id, insert Content-Disposition - ** with modification date. - */ - fprintf(composition_file, - "#%s; name=\"%s\" <>{attachment; modification-date=\"%s\"}", - content_type, - ((p = strrchr(file_name, '/')) == NULL) ? - file_name : p + 1, dtime(&st.st_mtime, 0)); - } - - break; - default: - adios(NULL, "unsupported attachformat %d", attachformat); + /* TODO: don't use access(2) because it checks for ruid, not euid */ + if (access(file_name, R_OK) != 0) { + clean_up_temporary_files(); + adios(NULL, "unable to access file `%s'", file_name); } - /* - ** Finish up with the file name. - */ + fprintf(composition_file, "#%s; name=\"%s\" <>{attachment}", + content_type, + (!(cp = strrchr(file_name, '/'))) ? file_name : cp + 1); fprintf(composition_file, " %s\n", file_name); @@ -572,26 +414,19 @@ make_mime_composition_file_entry(char *file_name, int attachformat) ** Annotate original message, and ** call `postproc' to send message. */ - static int sendaux(char **vec, int vecp, char *drft, struct stat *st) { pid_t child_id; int i, status, fd, fd2; - char backup[BUFSIZ], buf[BUFSIZ]; + char backup[BUFSIZ]; fd = pushsw ? tmp_fd() : NOTOK; fd2 = NOTOK; vec[vecp++] = drft; - if (annotext) { - if ((fd2 = tmp_fd()) != NOTOK) { - vec[vecp++] = "-idanno"; - snprintf(buf, sizeof(buf), "%d", fd2); - vec[vecp++] = buf; - } else { - admonish(NULL, "unable to create file for annotation list"); - } + if (annotext && (fd2 = tmp_fd()) == NOTOK) { + admonish(NULL, "unable to create file for annotation list"); } if (distfile && distout(drft, distfile, backup) == NOTOK) done(1); @@ -663,7 +498,6 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st) ** Mail error notification (and possibly a copy of the ** message) back to the user, using the mailproc */ - static void alert(char *file, int out) { @@ -765,6 +599,7 @@ anno(int fd, struct stat *st) advise(NULL, "unable to fork, so doing annotations by hand..."); if (cwd == NULL) cwd = getcpy(pwd()); + /* fall */ case OK: /* block a few signals */ @@ -836,8 +671,7 @@ annoaux(int fd) && (fd2 = dup(fileno(stderr))) != NOTOK) { dup2(fd3, fileno(stderr)); close(fd3); - } - else + } else fd2 = NOTOK; for (ap = brkstring(cp = getcpy(cp), " ", NULL); *ap; ap++) m_convert(mp, *ap); @@ -868,7 +702,7 @@ annoaux(int fd) if (is_selected(mp, msgnum)) { if (debugsw) advise(NULL, "annotate message %d", msgnum); - annotate(m_name (msgnum), annotext, cp, inplace, + annotate(m_name(msgnum), annotext, cp, inplace, 1, -2, 0); } }