int msgnum, status;
int in, out;
int n;
- char *cp, *maildir = NULL;
+ char *cp, *maildir = NULL, *folder = NULL;
char buf[BUFSIZ], **argp, **arguments;
char *msgs[MAXARGS], *vec[MAXARGS];
char *files[MAXARGS];
vec[vecp++] = --cp;
continue;
}
+ } else if (*cp == '+' || *cp == '@') {
+ if (folder) {
+ adios(EX_USAGE, NULL, "only one folder at a time!");
+ } else {
+ folder = mh_xstrdup(expandfol(cp));
+ }
} else {
if (*cp == '/') {
files[nfiles++] = cp;
}
if (nmsgs) {
- maildir = toabsdir(draftfolder);
+ folder = folder ? folder : draftfolder;
+ maildir = toabsdir(folder);
if (chdir(maildir) == NOTOK) {
adios(EX_OSERR, maildir, "unable to change directory to");
}
- if (!(mp = folder_read(draftfolder))) {
- adios(EX_IOERR, NULL, "unable to read draft folder %s",
- draftfolder);
+ if (!(mp = folder_read(folder))) {
+ adios(EX_IOERR, NULL, "unable to read folder %s",
+ folder);
}
if (mp->nummsg == 0) {
- adios(EX_DATAERR, NULL, "no messages in draft folder %s",
- draftfolder);
+ adios(EX_DATAERR, NULL, "no messages in folder %s",
+ folder);
}
/* parse all the msgranges/sequences and set SELECTED */
for (msgnum = 0; msgnum < nmsgs; msgnum++) {
*/
switch (attach(drft)) {
case OK:
+ /* successfully MIMEified: use generate draft */
drft = composition_file_name;
break;
return (NOTOK);
case DONE:
+ /* already in MIME format: keep original draft */
break;
}
}
static int
-contains_non_ascii(char *str)
-{
- unsigned char *cp;
-
- for (cp = str; *cp; cp++) {
- if (*cp > 127) {
- return 1;
- }
- }
- return 0;
-}
-
-static int
attach(char *draft_file_name)
{
char buf[MAXPATHLEN + 6];
int c;
- int has_attachment;
- int has_body = 0;
- int non_ascii = 0; /* msg body or hdr contains non-ASCII chars */
- int length; /* length of attachment header field name */
+ int length = strlen(attach_hdr);
char *p;
if (!(draft_file = fopen(draft_file_name, "r"))) {
field = mh_xcalloc(field_size = 256, sizeof(char));
/*
- ** Scan the draft file for an attachment header field name.
- */
- length = strlen(attach_hdr);
- has_attachment = 0;
- while (get_line() != EOF && *field != '\0' && *field != '-') {
- if (strncasecmp(field, attach_hdr, length)==0 &&
- field[length] == ':') {
- has_attachment = 1;
- }
- if (contains_non_ascii(field)) {
- non_ascii = 1;
- }
- }
-
- /*
- ** 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).
- */
- while (get_line() != EOF) {
- if (contains_non_ascii(field)) {
- non_ascii = 1;
- }
- for (p = field; *p; p++) {
- if (isgraph(*p)) {
- has_body = 1;
- }
- }
- if (has_body && non_ascii) {
- break; /* that's been already enough information */
- }
- }
-
- if (!has_attachment && non_ascii==0) {
- /* We don't need to convert it to MIME. */
- return DONE;
- }
-
- /*
- ** Else: mimify
+ ** MIMEify
*/
/* Make names for the temporary files. */
m_mktemp(toabsdir(invo_name), NULL, NULL),
sizeof (composition_file_name));
- if (has_body) {
- body_file = fopen(body_file_name, "w");
- }
+ body_file = fopen(body_file_name, "w");
composition_file = fopen(composition_file_name, "w");
- if ((has_body && !body_file) || !composition_file) {
+ if (!body_file || !composition_file) {
clean_up_temporary_files();
adios(EX_IOERR, NULL, "unable to open all of the temporary files.");
}
/* Copy non-attachment header fields to the temp composition file. */
rewind(draft_file);
while (get_line() != EOF && *field && *field != '-') {
+ if (strncasecmp(field, VRSN_FIELD, strlen(VRSN_FIELD))==0 &&
+ field[strlen(VRSN_FIELD)] == ':') {
+ /*
+ ** The draft is already in MIME format, thus
+ ** back out and use the original draft file.
+ */
+ clean_up_temporary_files();
+ return DONE;
+ }
+
if (strncasecmp(field, attach_hdr, length) != 0 ||
field[length] != ':') {
fprintf(composition_file, "%s\n", field);
}
fputs("--------\n", composition_file);
- if (has_body) {
- /* 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 */
- /* charset will be discovered/guessed by mhbuild */
- fprintf(composition_file, "#text/plain %s\n", body_file_name);
+ /* 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 */
+ /* charset will be discovered/guessed by mhbuild */
+ fprintf(composition_file, "#text/plain %s\n", body_file_name);
/*
** Now, go back to the beginning of the draft file and look for
}
}
-
return status ? NOTOK : status;
}