X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsendsbr.c;h=0cae87803885767532290ce7e4e925b9057e1ab6;hp=f7c2a08dbbf572dca2ba081d41102bea11c4d957;hb=ced6090a330d3d83d0bce709f756aa3d7d65fea4;hpb=337338b404931f06f0db2119c9e145e8ca5a9860 diff --git a/uip/sendsbr.c b/uip/sendsbr.c index f7c2a08..0cae878 100644 --- a/uip/sendsbr.c +++ b/uip/sendsbr.c @@ -1,10 +1,10 @@ /* - * sendsbr.c -- routines to help WhatNow/Send along - * - * This code is Copyright (c) 2002, by the authors of nmh. See the - * COPYRIGHT file in the root directory of the nmh distribution for - * complete copyright information. - */ +** sendsbr.c -- routines to help WhatNow/Send along +** +** This code is Copyright (c) 2002, by the authors of nmh. See the +** COPYRIGHT file in the root directory of the nmh distribution for +** complete copyright information. +*/ #include #include @@ -39,8 +39,10 @@ char *distfile = NULL; static jmp_buf env; -static char body_file_name[MAXPATHLEN + 1]; /* name of temporary file for body content */ -static char composition_file_name[MAXPATHLEN + 1]; /* name of mhbuild composition temporary file */ +/* name of temp file for body content */ +static char body_file_name[MAXPATHLEN + 1]; +/* name of mhbuild composition temporary file */ +static char composition_file_name[MAXPATHLEN + 1]; static int field_size; /* size of header field buffer */ static char *field; /* header field buffer */ static FILE *draft_file; /* draft file pointer */ @@ -48,14 +50,14 @@ static FILE *body_file; /* body file pointer */ static FILE *composition_file; /* composition file pointer */ /* - * external prototypes - */ +** external prototypes +*/ int sendsbr (char **, int, char *, struct stat *, int, char *, int); char *getusername (void); /* - * static prototypes - */ +** static prototypes +*/ static void armed_done (int) NORETURN; static void alert (char *, int); static int tmp_fd (void); @@ -70,8 +72,8 @@ static void make_mime_composition_file_entry(char *, int); /* - * Entry point into (back-end) routines to send message. - */ +** Entry point into (back-end) routines to send message. +*/ int sendsbr (char **vec, int vecp, char *drft, struct stat *st, @@ -83,26 +85,27 @@ sendsbr (char **vec, int vecp, char *drft, struct stat *st, char *p; /* string pointer for building file name */ /* - * Save the original name of the draft file. The name of the - * draft file is changed to a temporary file containing the built - * MIME message if there are attachments. We need the original - * name so that it can be renamed after the message is sent. - */ + ** Save the original name of the draft file. The name of the + ** draft file is changed to a temporary file containing the built + ** MIME message if there are attachments. We need the original + ** name so that it can be renamed after the message is sent. + */ original_draft = drft; /* - * There might be attachments if a header field name for - * attachments is supplied. 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. - */ + ** There might be attachments if a header field name for + ** attachments is supplied. 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. + */ if (attachment_header_field_name != (char *)0) { - switch (attach(attachment_header_field_name, drft, attachformat)) { + switch (attach(attachment_header_field_name, drft, + attachformat)) { case OK: drft = composition_file_name; break; @@ -119,15 +122,16 @@ sendsbr (char **vec, int vecp, char *drft, struct stat *st, 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 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) + if (rename (drft, strncpy(file, cp, sizeof(file))) + == NOTOK) adios (file, "unable to rename %s to", drft); drft = file; } @@ -150,20 +154,21 @@ sendsbr (char **vec, int vecp, char *drft, struct stat *st, unlink (distfile); /* - * Get rid of any temporary files that we created for attachments. - * Also get rid of the renamed composition file that mhbuild - * leaves as a turd. It looks confusing, but we use the body - * file name to help build the renamed composition file name. - */ + ** Get rid of any temporary files that we created for attachments. + ** Also get rid of the renamed composition file that mhbuild + ** leaves as a turd. It looks confusing, but we use the body + ** file name to help build the renamed composition file name. + */ if (drft == composition_file_name) { clean_up_temporary_files(); - if (strlen(composition_file_name) >= sizeof (composition_file_name) - 6) + if (strlen(composition_file_name) >= + sizeof (composition_file_name) - 6) advise((char *)0, "unable to remove original composition file."); else { - if ((p = strrchr(composition_file_name, '/')) == (char *)0) + if ((p = strrchr(composition_file_name, '/')) == NULL) p = composition_file_name; else p++; @@ -192,43 +197,45 @@ attach(char *attachment_header_field_name, char *draft_file_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((char *)0, "can't open draft file `%s'.", draft_file_name); + adios((char *)0, "can't open draft file `%s'.", + 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. - */ + ** 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 - * 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. - */ + ** Scan the draft file for a header field name that matches the + ** -attach argument. 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); has_attachment = 0; while (get_line() != EOF && *field != '\0' && *field != '-') - if (strncasecmp(field, attachment_header_field_name, length) == 0 && field[length] == ':') + if (strncasecmp(field, attachment_header_field_name, 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. - */ + ** 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. + */ has_body = 0; @@ -245,43 +252,45 @@ attach(char *attachment_header_field_name, char *draft_file_name, } /* - * Make names for the temporary files. - */ + ** Make names for the temporary files. + */ (void)strncpy(body_file_name, - m_mktemp(m_maildir(invo_name), NULL, NULL), - sizeof (body_file_name)); + m_mktemp(m_maildir(invo_name), NULL, NULL), + sizeof (body_file_name)); (void)strncpy(composition_file_name, - m_mktemp(m_maildir(invo_name), NULL, NULL), - sizeof (composition_file_name)); + m_mktemp(m_maildir(invo_name), NULL, NULL), + sizeof (composition_file_name)); if (has_body) body_file = fopen(body_file_name, "w"); composition_file = fopen(composition_file_name, "w"); - if ((has_body && body_file == (FILE *)0) || composition_file == (FILE *)0) { + if ((has_body && body_file == (FILE *)0) || + composition_file == (FILE *)0) { clean_up_temporary_files(); adios((char *)0, "unable to open all of the temporary files."); } /* - * Start at the beginning of the draft file. Copy all - * non-attachment header fields to the temporary composition file. - * Then add the dashed line separator. - */ + ** Start at the beginning of the draft file. Copy all + ** 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] != ':') + if (strncasecmp(field, attachment_header_field_name, length) + != 0 || field[length] != ':') (void)fprintf(composition_file, "%s\n", field); (void)fputs("--------\n", composition_file); /* - * Copy the message body to a temporary file. - */ + ** Copy the message body to a temporary file. + */ if (has_body) { while ((c = getc(draft_file)) != EOF) @@ -291,24 +300,26 @@ attach(char *attachment_header_field_name, char *draft_file_name, } /* - * Add a mhbuild MIME composition file line for the body if - * there was one. - */ + ** 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); /* - * 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. - */ + ** 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++) + 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); @@ -318,9 +329,9 @@ attach(char *attachment_header_field_name, char *draft_file_name, (void)fclose(composition_file); /* - * We're ready to roll! Run mhbuild on the composition file. - * Note that mhbuild is in the context as buildmimeproc. - */ + ** We're ready to roll! Run mhbuild on the composition file. + ** Note that mhbuild is in the context as buildmimeproc. + */ (void)sprintf(buf, "%s %s", buildmimeproc, composition_file_name); @@ -349,11 +360,11 @@ get_line(void) char *p; /* buffer pointer */ /* - * Get a line from the input file, growing the field buffer as - * needed. We do this so that we can fit an entire line in the - * buffer making it easy to do a string comparison on both the - * field name and the field body which might be a long path name. - */ + ** Get a line from the input file, growing the field buffer as + ** needed. We do this so that we can fit an entire line in the + ** buffer making it easy to do a string comparison on both the + ** field name and the field body which might be a long path name. + */ for (n = 0, p = field; (c = getc(draft_file)) != EOF; *p++ = c) { if (c == '\n' && (c = getc(draft_file)) != ' ' && c != '\t') { @@ -369,10 +380,7 @@ get_line(void) } } - /* - * NUL-terminate the field.. - */ - + /* NUL-terminate the field. */ *p = '\0'; return (c); @@ -393,17 +401,19 @@ make_mime_composition_file_entry(char *file_name, int attachformat) content_type = (char *)0; /* - * 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. - */ + ** 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, '.')) != (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 + && mh_strcasecmp(p, np->n_field) == 0) + { content_type = np->n_name + 14; break; } @@ -411,16 +421,17 @@ make_mime_composition_file_entry(char *file_name, int attachformat) } /* - * 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. - */ + ** 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 == (char *)0) { if ((fp = fopen(file_name, "r")) == (FILE *)0) { clean_up_temporary_files(); - adios((char *)0, "unable to access file \"%s\"", file_name); + adios((char *)0, "unable to access file \"%s\"", + file_name); } binary = 0; @@ -434,16 +445,17 @@ make_mime_composition_file_entry(char *file_name, int attachformat) (void)fclose(fp); - content_type = binary ? "application/octet-stream" : "text/plain"; + content_type = binary ? + "application/octet-stream" : "text/plain"; } /* - * 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. - */ + ** 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) { clean_up_temporary_files(); @@ -453,26 +465,31 @@ make_mime_composition_file_entry(char *file_name, int attachformat) switch (attachformat) { case 0: /* Insert name, file mode, and Content-Id. */ - (void)fprintf(composition_file, "#%s; name=\"%s\"; x-unix-mode=0%.3ho", - content_type, ((p = strrchr(file_name, '/')) == (char *)0) ? file_name : p + 1, (unsigned short)(st.st_mode & 0777)); + (void)fprintf(composition_file, + "#%s; name=\"%s\"; x-unix-mode=0%.3ho", + content_type, ((p = strrchr(file_name, '/')) + == (char *)0) ? file_name : p + 1, + (unsigned short)(st.st_mode & 0777)); if (strlen(file_name) > MAXPATHLEN) { clean_up_temporary_files(); - adios((char *)0, "attachment file name `%s' too long.", file_name); + adios((char *)0, "attachment file name `%s' too long.", + file_name); } (void)sprintf(cmd, "file '%s'", file_name); - if ((fp = popen(cmd, "r")) != (FILE *)0 && fgets(cmd, sizeof (cmd), fp) != (char *)0) { + if ((fp = popen(cmd, "r")) != (FILE *)0 && + fgets(cmd, sizeof (cmd), fp) != (char *)0) { *strchr(cmd, '\n') = '\0'; /* - * The output of the "file" command is of the form - * - * file: description - * - * Strip off the "file:" and subsequent white space. - */ + ** 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 == ':') { @@ -495,14 +512,17 @@ make_mime_composition_file_entry(char *file_name, int attachformat) case 1: if (stringdex (m_maildir(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. - */ + ** 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. + */ (void) fprintf (composition_file, "#%s <>", content_type); } else { - /* Suppress Content-Id, insert simple Content-Disposition. */ + /* + ** Suppress Content-Id, insert simple + ** Content-Disposition. + */ (void) fprintf (composition_file, "#%s; name=\"%s\" <>{attachment}", content_type, @@ -514,17 +534,18 @@ make_mime_composition_file_entry(char *file_name, int attachformat) case 2: if (stringdex (m_maildir(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. - */ - (void) fprintf (composition_file, "#%s <>", content_type); + ** 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. + */ + (void) fprintf (composition_file, "#%s <>", + content_type); } else { /* - * Suppress Content-Id, insert Content-Disposition - * with modification date. - */ + ** Suppress Content-Id, insert Content-Disposition + ** with modification date. + */ (void) fprintf (composition_file, "#%s; name=\"%s\" <>{attachment; modification-date=\"%s\"}", content_type, @@ -538,8 +559,8 @@ make_mime_composition_file_entry(char *file_name, int attachformat) } /* - * Finish up with the file name. - */ + ** Finish up with the file name. + */ (void)fprintf(composition_file, " %s\n", file_name); @@ -547,9 +568,9 @@ make_mime_composition_file_entry(char *file_name, int attachformat) } /* - * Annotate original message, and - * call `postproc' to send message. - */ +** Annotate original message, and +** call `postproc' to send message. +*/ static int sendaux (char **vec, int vecp, char *drft, struct stat *st) @@ -586,11 +607,11 @@ sendaux (char **vec, int vecp, char *drft, struct stat *st) case 0: /* - * child process -- send it - * - * If fd is ok, then we are pushing and fd points to temp - * file, so capture anything on stdout and stderr there. - */ + ** child process -- send it + ** + ** If fd is ok, then we are pushing and fd points to temp + ** file, so capture anything on stdout and stderr there. + */ if (fd != NOTOK) { dup2 (fd, fileno (stdout)); dup2 (fd, fileno (stderr)); @@ -604,17 +625,17 @@ sendaux (char **vec, int vecp, char *drft, struct stat *st) default: /* - * parent process -- wait for it - */ + ** parent process -- wait for it + */ if ((status = pidwait(child_id, NOTOK)) == OK) { if (annotext && fd2 != NOTOK) anno (fd2, st); } else { /* - * If postproc failed, and we have good fd (which means - * we pushed), then mail error message (and possibly the - * draft) back to the user. - */ + ** If postproc failed, and we have good fd (which + ** means we pushed), then mail error message + ** (and possibly the draft) back to the user. + */ if (fd != NOTOK) { alert (drft, fd); close (fd); @@ -626,7 +647,8 @@ sendaux (char **vec, int vecp, char *drft, struct stat *st) if (distfile) { unlink (drft); if (rename (backup, drft) == NOTOK) - advise (drft, "unable to rename %s to", backup); + advise (drft, "unable to rename %s to", + backup); } } break; @@ -637,9 +659,9 @@ 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 - */ +** Mail error notification (and possibly a copy of the +** message) back to the user, using the mailproc +*/ static void alert (char *file, int out) @@ -684,9 +706,11 @@ alert (char *file, int out) close (out); /* create subject for error notification */ snprintf (buf, sizeof(buf), "send failed on %s", - forwsw ? "enclosed draft" : file); + forwsw ? + "enclosed draft" : file); - execlp (mailproc, r1bindex (mailproc, '/'), getusername (), + execlp (mailproc, r1bindex (mailproc, '/'), + getusername (), "-subject", buf, NULL); fprintf (stderr, "unable to exec "); perror (mailproc); @@ -740,8 +764,7 @@ anno (int fd, struct stat *st) switch (child_id) { case NOTOK: /* oops */ if (!debugsw) - advise (NULL, - "unable to fork, so doing annotations by hand..."); + advise (NULL, "unable to fork, so doing annotations by hand..."); if (cwd == NULL) cwd = getcpy (pwd ());