#include <h/utils.h>
#include <h/tws.h>
-static int get_line(char *, size_t);
-static int make_mime_composition_file_entry(char *, int, char *);
-
-static FILE *draft_file; /* draft file pointer */
-static FILE *composition_file; /* composition file pointer */
+static int get_line(FILE *, char *, size_t);
+#ifdef MIMETYPEPROC
+static char *get_file_info(const char *, const char *);
+#endif /* MIMETYPEPROC */
int
attach(char *attachment_header_field_name, char *draft_file_name,
char *composition_file_name, size_t composition_file_name_len,
int attachformat)
{
- char buf[PATH_MAX + 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 length; /* length of attachment header field name */
- char *p; /* miscellaneous string pointer */
- FILE *fp; /* pointer for mhn.defaults */
- FILE *body_file = NULL; /* body file pointer */
- int field_size; /* size of header field buffer */
- char *field; /* header field buffer */
+ char buf[PATH_MAX + 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 length; /* of attachment header field name */
+ char *p; /* miscellaneous string pointer */
+ struct stat st; /* file status buffer */
+ FILE *body_file = NULL; /* body file pointer */
+ FILE *draft_file; /* draft file pointer */
+ int field_size; /* size of header field buffer */
+ char *field; /* header field buffer */
+ FILE *composition_file; /* composition file pointer */
+ char *build_directive; /* mhbuild directive */
+
/*
* 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(NULL, "can't open draft file `%s'.", draft_file_name);
/*
* Allocate a buffer to hold the header components as they're read in.
has_attachment = 0;
- while (get_line(field, field_size) != EOF && *field != '\0' &&
+ while (get_line(draft_file, field, field_size) != EOF && *field != '\0' &&
*field != '-') {
if (strncasecmp(field, attachment_header_field_name, length) == 0 &&
field[length] == ':') {
has_body = 0;
- while (get_line(field, field_size) != EOF) {
+ while (get_line(draft_file, field, field_size) != EOF) {
for (p = field; *p != '\0'; p++) {
if (*p != ' ' && *p != '\t') {
has_body = 1;
* Make names for the temporary files.
*/
- (void)strncpy(body_file_name,
- m_mktemp(m_maildir(invo_name), NULL, NULL),
- body_file_name_len);
- (void)strncpy(composition_file_name,
- m_mktemp(m_maildir(invo_name), NULL, NULL),
- composition_file_name_len);
+ if ((p = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
+ adios(NULL, "unable to create temporary file in %s", get_temp_dir());
+ }
+ (void)strncpy(body_file_name, p, body_file_name_len);
+ if ((p = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
+ unlink(body_file_name);
+ adios(NULL, "unable to create temporary file in %s", get_temp_dir());
+ }
+ (void)strncpy(composition_file_name, p, composition_file_name_len);
if (has_body)
body_file = fopen(body_file_name, "w");
if ((has_body && body_file == (FILE *)0) || composition_file == (FILE *)0) {
clean_up_temporary_files(body_file_name, composition_file_name);
- adios((char *)0, "unable to open all of the temporary files.");
+ adios(NULL, "unable to open all of the temporary files.");
}
/*
rewind(draft_file);
- while (get_line(field, field_size) != EOF && *field != '\0' &&
+ while (get_line(draft_file, field, field_size) != EOF && *field != '\0' &&
*field != '-')
if (strncasecmp(field, attachment_header_field_name, length) != 0 ||
field[length] != ':')
*/
if (has_body)
- if (make_mime_composition_file_entry(body_file_name, attachformat,
- "text/plain")) {
- clean_up_temporary_files(body_file_name, composition_file_name);
- adios (NULL, "exiting");
- }
+ /*
+ * Make sure that the attachment file exists and is readable.
+ */
+ if (stat(body_file_name, &st) != OK ||
+ access(body_file_name, R_OK) != OK) {
+ advise(NULL, "unable to access file \"%s\"", body_file_name);
+ return NOTOK;
+ }
+
+ if ((build_directive = construct_build_directive (body_file_name,
+ "text/plain",
+ attachformat)) == NULL) {
+ clean_up_temporary_files(body_file_name, composition_file_name);
+ adios (NULL, "exiting due to failure in attach()");
+ } else {
+ (void) fputs(build_directive, composition_file);
+ free(build_directive);
+ }
/*
* Now, go back to the beginning of the draft file and look for
* composition file for each.
*/
- if ((fp = fopen (p = etcpath ("mhn.defaults"), "r"))) {
- readconfig ((struct node **) NULL, fp, p, 0);
- fclose(fp);
- }
-
rewind(draft_file);
- while (get_line(field, field_size) != EOF && *field != '\0' &&
+ while (get_line(draft_file, field, field_size) != EOF && *field != '\0' &&
*field != '-') {
if (strncasecmp(field, attachment_header_field_name, length) == 0 &&
field[length] == ':') {
/* Skip empty attachment_header_field_name lines. */
if (strlen (p) > 0) {
struct stat st;
- if (stat (p, &st) == OK) {
+ if (stat(p, &st) == OK && access(p, R_OK) == OK) {
if (S_ISREG (st.st_mode)) {
- /* Don't set the default content type so take
- make_mime_composition_file_entry() will try
- to infer it from the file type. */
- if (make_mime_composition_file_entry(p, attachformat, 0)) {
- clean_up_temporary_files(body_file_name,
+ /* Don't set the default content type so that
+ construct_build_directive() will try to infer
+ it from the file type. */
+ if ((build_directive = construct_build_directive (p, 0,
+ attachformat)) == NULL) {
+ clean_up_temporary_files(body_file_name,
composition_file_name);
- adios (NULL, "exiting");
- }
+ adios (NULL, "exiting due to failure in attach()");
+ } else {
+ (void) fputs(build_directive, composition_file);
+ free(build_directive);
+ }
} else {
adios (NULL, "unable to attach %s, not a plain file",
p);
clean_up_temporary_files(const char *body_file_name,
const char *composition_file_name)
{
- (void)unlink(body_file_name);
- (void)unlink(composition_file_name);
+ (void) unlink(body_file_name);
+ (void) unlink(composition_file_name);
return;
}
static int
-get_line(char *field, size_t field_size)
+get_line(FILE *draft_file, char *field, size_t field_size)
{
int c; /* current character */
size_t n; /* number of bytes in buffer */
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) {
return (c);
}
-static int
-make_mime_composition_file_entry(char *file_name, int attachformat,
- char *default_content_type)
-{
- int binary; /* binary character found flag */
- int c; /* current character */
- char cmd[PATH_MAX + 8]; /* 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 */
+/*
+ * Try to use external command to determine mime type, and possibly
+ * encoding. Caller is responsible for free'ing returned memory.
+ */
+char *
+mime_type(const char *file_name) {
+ char *content_type = NULL; /* mime content type */
+
+#ifdef MIMETYPEPROC
+ char *mimetype;
+
+ if ((mimetype = get_file_info(MIMETYPEPROC, file_name))) {
+#ifdef MIMEENCODINGPROC
+ /* Try to append charset for text content. */
+ char *mimeencoding;
+
+ if (strncasecmp(mimetype, "text", 4) == 0) {
+ if ((mimeencoding = get_file_info(MIMEENCODINGPROC, file_name))) {
+ content_type = concat(mimetype, "; charset=", mimeencoding,
+ NULL);
+ } else {
+ content_type = strdup(mimetype);
+ }
+ } else {
+ content_type = strdup(mimetype);
+ }
+#else /* MIMEENCODINGPROC */
+ content_type = strdup(mimetype);
+#endif /* MIMEENCODINGPROC */
+ }
+#else /* MIMETYPEPROC */
+ NMH_UNUSED(file_name);
+#endif /* MIMETYPEPROC */
+
+ return content_type;
+}
+
+
+#ifdef MIMETYPEPROC
+/*
+ * Get information using proc about a file.
+ */
+static char *
+get_file_info(const char *proc, const char *file_name) {
+ char *cmd, *cp;
+ char *quotec = "'";
+
+ if ((cp = strchr(file_name, '\''))) {
+ /* file_name contains a single quote. */
+ if (strchr(file_name, '"')) {
+ advise(NULL, "filenames containing both single and double quotes "
+ "are unsupported for attachment");
+ return NULL;
+ } else {
+ quotec = "\"";
+ }
+ }
+
+ cmd = concat(proc, " ", quotec, file_name, quotec, NULL);
+ if ((cmd = concat(proc, " ", quotec, file_name, quotec, NULL))) {
+ FILE *fp;
+
+ if ((fp = popen(cmd, "r")) != NULL) {
+ char buf[BUFSIZ >= 2048 ? BUFSIZ : 2048];
+
+ buf[0] = '\0';
+ if (fgets(buf, sizeof buf, fp)) {
+ char *eol;
+
+ /* Skip leading <filename>:<whitespace>, if present. */
+ if ((cp = strchr(buf, ':')) != NULL) {
+ ++cp;
+ while (*cp && isblank((unsigned char) *cp)) {
+ ++cp;
+ }
+ } else {
+ cp = buf;
+ }
+
+ /* Truncate at newline (LF or CR), if present. */
+ if ((eol = strpbrk(cp, "\n\r")) != NULL) {
+ *eol = '\0';
+ }
+ } else if (buf[0] == '\0') {
+ /* This can happen on Cygwin if the popen()
+ mysteriously fails. Return NULL so that the caller
+ will use another method to determine the info. */
+ free (cp);
+ cp = NULL;
+ }
+
+ (void) pclose(fp);
+ } else {
+ advise(NULL, "no output from %s", cmd);
+ }
+
+ free(cmd);
+ } else {
+ advise(NULL, "concat with \"%s\" failed, out of memory?", proc);
+ }
+
+ return cp ? strdup(cp) : NULL;
+}
+#endif /* MIMETYPEPROC */
+
+
+/*
+ * Construct an mhbuild directive for the draft file. This starts
+ * with the content type. Append a file name attribute, and depending
+ * on attachformat value a private x-unix-mode attribute and a
+ * description obtained (if possible) by running the "file" command on
+ * the file. Caller is responsible for free'ing returned memory.
+ */
+char *
+construct_build_directive (char *file_name, const char *default_content_type,
+ int attachformat) {
+ char *build_directive = NULL; /* Return value. */
+ char *content_type; /* mime content type */
+ char cmd[PATH_MAX + 8]; /* file command buffer */
+ struct stat st; /* file status buffer */
+ char *p; /* miscellaneous temporary variables */
+ int c; /* current character */
if ((content_type = mime_type (file_name)) == NULL) {
/*
* 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) {
+ struct node *np; /* context scan node pointer */
+ static FILE *fp = NULL; /* pointer for mhn.defaults */
+
+ if (fp == NULL && (fp = fopen (p = etcpath ("mhn.defaults"), "r"))) {
+ readconfig ((struct node **) NULL, fp, p, 0);
+ fclose(fp);
+ }
+
+ if ((p = strrchr(file_name, '.')) != NULL) {
for (np = m_defs; np; np = np->n_next) {
if (strncasecmp(np->n_name, "mhshow-suffix-", 14) == 0 &&
strcasecmp(p, np->n_field ? np->n_field : "") == 0) {
}
/*
- * 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 == NULL) {
+ int binary; /* binary character found flag */
+ FILE *fp;
- if (content_type == (char *)0) {
- if ((fp = fopen(file_name, "r")) == (FILE *)0) {
- advise((char *)0, "unable to access file \"%s\"", file_name);
- return NOTOK;
- }
+ if ((fp = fopen(file_name, "r")) == (FILE *)0) {
+ advise(NULL, "unable to access file \"%s\"", file_name);
+ return NULL;
+ }
- binary = 0;
+ binary = 0;
- while ((c = getc(fp)) != EOF) {
- if (c > 127 || c < 0) {
- binary = 1;
- break;
- }
- }
+ while ((c = getc(fp)) != EOF) {
+ if (c > 127 || c < 0) {
+ binary = 1;
+ break;
+ }
+ }
- (void)fclose(fp);
+ (void) fclose(fp);
- content_type =
+ content_type =
strdup (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.
- */
-
- if (stat(file_name, &st) == -1 || access(file_name, R_OK) != 0) {
- advise((char *)0, "unable to access file \"%s\"", file_name);
- return NOTOK;
- }
-
switch (attachformat) {
- case 0:
+ case 0: {
+ struct stat st;
+ FILE *fp;
+ char m[4];
+
/* 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));
+ if (stat(file_name, &st) != OK || access(file_name, R_OK) != OK) {
+ advise(NULL, "unable to access file \"%s\"", file_name);
+ return NULL;
+ }
+
+ snprintf (m, sizeof m, "%.3ho", (unsigned short)(st.st_mode & 0777));
+ build_directive = concat ("#", content_type, "; name=\"",
+ ((p = strrchr(file_name, '/')) == NULL)
+ ? file_name
+ : p + 1,
+ "\"; x-unix-mode=0", m, NULL);
if (strlen(file_name) > PATH_MAX) {
- advise((char *)0, "attachment file name `%s' too long.", file_name);
- return NOTOK;
+ advise(NULL, "attachment file name `%s' too long.", file_name);
+ return NULL;
}
- (void)sprintf(cmd, "file '%s'", 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")) != NULL &&
+ fgets(cmd, sizeof (cmd), fp) != NULL) {
*strchr(cmd, '\n') = '\0';
/*
* The output of the "file" command is of the form
*
- * file: description
+ * 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 != '\0')
+ if (*p != '\0') {
/* Insert Content-Description. */
- (void)fprintf(composition_file, " [ %s ]", p);
+ build_directive =
+ concat (build_directive, " [ ", p, " ]", NULL);
+ }
- (void)pclose(fp);
+ (void) pclose(fp);
}
-
break;
+ }
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. */
- (void) fprintf (composition_file, "#%s <>", content_type);
+ build_directive = concat ("#", content_type, " <>", NULL);
} else {
/* Suppress Content-Id, insert simple Content-Disposition
and Content-Description with filename.
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]{%s}",
- content_type,
- (p == (char *)0) ? file_name : p + 1,
- (p == (char *)0) ? file_name : p + 1,
- strcmp ("text/calendar", content_type)
- ? "attachment" : "inline");
+ build_directive = concat ("#", content_type, "; name=\"",
+ (p == NULL) ? file_name : p + 1,
+ "\" <> [",
+ (p == NULL) ? file_name : p + 1,
+ "]{",
+ strcmp ("text/calendar", content_type)
+ ? "attachment" : "inline",
+ "}", NULL);
}
break;
Don't generate Content-Disposition header, because
it confuses Microsoft Outlook, Build 10.0.6626, at
least. */
- (void) fprintf (composition_file, "#%s <>", content_type);
+ build_directive = concat ("#", content_type, " <>", NULL);
} else {
/* Suppress Content-Id, insert Content-Disposition with
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. */
+
+ if (stat(file_name, &st) != OK || access(file_name, R_OK) != OK) {
+ advise(NULL, "unable to access file \"%s\"", file_name);
+ return NULL;
+ }
+
p = strrchr(file_name, '/');
- (void) fprintf (composition_file,
- "#%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));
+ build_directive = concat ("#", content_type, "; name=\"",
+ (p == NULL) ? file_name : p + 1,
+ "\" <> [",
+ (p == NULL) ? file_name : p + 1,
+ "]{",
+ strcmp ("text/calendar", content_type)
+ ? "attachment" : "inline",
+ "; modification-date=\"",
+ dtime (&st.st_mtime, 0),
+ "}", NULL);
}
break;
default:
- adios ((char *)0, "unsupported attachformat %d", attachformat);
+ advise (NULL, "unsupported attachformat %d", attachformat);
}
- free (content_type);
+ free(content_type);
/*
- * Finish up with the file name.
+ * Finish up with the file name.
*/
+ build_directive = concat (build_directive, " ", file_name, "\n", NULL);
- (void)fprintf(composition_file, " %s\n", file_name);
-
- return OK;
-}
-
-/*
- * Try to use external command to determine mime type, and possibly
- * encoding. Caller is responsible for free'ing returned memory.
- */
-char *
-mime_type (const char *file_name) {
- char *content_type = NULL; /* mime content type */
-
-#ifdef MIMETYPEPROC
- char cmd[2 * PATH_MAX + 2]; /* file command buffer */
- char buf[BUFSIZ >= 2048 ? BUFSIZ : 2048];
- FILE *fp; /* content and pipe file pointer */
- char mimetypeproc[] = MIMETYPEPROC " '%s'";
-
- if ((int) snprintf (cmd, sizeof cmd, mimetypeproc, file_name) <
- (int) sizeof cmd) {
- if ((fp = popen (cmd, "r")) != NULL) {
- /* Make sure that buf has space for one additional
- character, the semicolon that might be added below. */
- if (fgets (buf, sizeof buf - 1, fp)) {
- char *cp, *space;
-
- /* Skip leading <filename>:<whitespace>, if present. */
- if ((content_type = strchr (buf, ':')) != NULL) {
- ++content_type;
- while (*content_type && isblank (*content_type)) {
- ++content_type;
- }
- } else {
- content_type = buf;
- }
-
- /* Truncate at newline (LF or CR), if present. */
- if ((cp = strpbrk (content_type, "\n\n")) != NULL) {
- *cp = '\0';
- }
-
- /* If necessary, insert semicolon between content type
- and charset. Assume that the first space is between
- them. */
- if ((space = strchr (content_type, ' ')) != NULL) {
- ssize_t len = strlen (content_type);
-
- if (space - content_type > 0 &&
- len > space - content_type + 1) {
- if (*(space - 1) != ';') {
- /* The +1 is for the terminating NULL. */
- memmove (space + 1, space,
- len - (space - content_type) + 1);
- *space = ';';
- }
- }
- }
- } else {
- advise (NULL, "unable to read mime type");
- }
- } else {
- advise (NULL, "unable to run %s", buf);
- }
- } else {
- advise (NULL, "filename to large to deduce mime type");
- }
-#else
- NMH_UNUSED (file_name);
-#endif
-
- return content_type ? strdup (content_type) : NULL;
+ return build_directive;
}
projects / nmh / blobdiff