X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsend.c;h=148c05bc65c2cec04f5d355e7a96ee57fcb1360b;hp=7e80bc40f247b570ec865449608c4036df5d3e6f;hb=HEAD;hpb=e8ac33e207bd0ac7efa723d32687156a9924c3f8 diff --git a/uip/send.c b/uip/send.c index 7e80bc4..1df2fa9 100644 --- a/uip/send.c +++ b/uip/send.c @@ -11,31 +11,34 @@ #include #include #include -#include #include #include #include #include #include +#include +#include +#include +#include #ifdef HAVE_SYS_TIME_H # include #endif #include +#ifdef HAVE_SYS_PARAM_H +# include +#endif + int debugsw = 0; /* global */ char *altmsg = NULL; char *annotext = NULL; char *distfile = NULL; -static jmp_buf env; - /* 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 */ static FILE *body_file; /* body file pointer */ static FILE *composition_file; /* composition file pointer */ @@ -44,13 +47,11 @@ static FILE *composition_file; /* composition file pointer */ ** static prototypes */ static int sendsbr(char **, int, char *, struct stat *); -static void armed_done(int) NORETURN; static void anno(struct stat *); static int sendaux(char **, int, char *, struct stat *); static int attach(char *); static int signandenc(char *); static void clean_up_temporary_files(void); -static int get_line(void); static void make_mime_composition_file_entry(char *); static char* strexit(int status); @@ -69,6 +70,7 @@ static struct swit switches[] = { { NULL, 0 } }; +char *version=VERSION; int main(int argc, char **argv) @@ -77,7 +79,7 @@ main(int argc, char **argv) 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]; @@ -99,19 +101,19 @@ main(int argc, char **argv) switch (smatch(++cp, switches)) { case AMBIGSW: ambigsw(cp, switches); - done(1); + exit(EX_USAGE); case UNKWNSW: - adios(NULL, "-%s unknown\n", cp); + adios(EX_USAGE, NULL, "-%s unknown\n", cp); case HELPSW: snprintf(buf, sizeof(buf), "%s [file] [switches]", invo_name); print_help(buf, switches, 1); - done(1); + exit(argc == 2 ? EX_OK : EX_USAGE); case VERSIONSW: print_version(invo_name); - done(1); + exit(argc == 2 ? EX_OK : EX_USAGE); case DEBUGSW: debugsw++; @@ -121,6 +123,12 @@ main(int argc, char **argv) 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; @@ -135,30 +143,30 @@ main(int argc, char **argv) } if (nmsgs) { - maildir = toabsdir(draftfolder); + folder = folder ? folder : draftfolder; + maildir = toabsdir(folder); if (chdir(maildir) == NOTOK) { - adios(maildir, "unable to change directory to"); + adios(EX_OSERR, maildir, "unable to change directory to"); } - if (!(mp = folder_read(draftfolder))) { - adios(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(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++) { if (!m_convert(mp, msgs[msgnum])) { - done(1); + exit(EX_USAGE); } } - seq_setprev(mp); for (nmsgs = 0, msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) { if (is_selected(mp, msgnum)) { - files[nfiles++] = getcpy(m_name(msgnum)); + files[nfiles++] = mh_xstrdup(m_name(msgnum)); unset_exists(mp, msgnum); } } @@ -175,7 +183,7 @@ main(int argc, char **argv) for (n = 0; n < nfiles; n++) { if (stat(files[n], &st) == NOTOK) { - adios(files[n], "unable to stat draft file"); + adios(EX_IOERR, files[n], "unable to stat draft file"); } } @@ -189,12 +197,12 @@ main(int argc, char **argv) if ((cp = getenv("mhdist")) && *cp && (distsw = atoi(cp)) && altmsg) { vec[vecp++] = "-dist"; if ((in = open(altmsg, O_RDONLY)) == NOTOK) { - adios(altmsg, "unable to open for reading"); + adios(EX_IOERR, altmsg, "unable to open for reading"); } fstat(in, &st2); - distfile = getcpy(m_mktemp2(NULL, invo_name, NULL, NULL)); + distfile = mh_xstrdup(m_mktemp2(NULL, invo_name, NULL, NULL)); if ((out = creat(distfile, (int)st2.st_mode & 0777))==NOTOK) { - adios(distfile, "unable to open for writing"); + adios(EX_IOERR, distfile, "unable to open for writing"); } cpydata(in, out, altmsg, distfile); close(in); @@ -217,7 +225,7 @@ main(int argc, char **argv) for (n = 0; n < nfiles; n++) { switch (sendsbr(vec, vecp, files[n], &st)) { case DONE: - done(++status); + exit(++status); case NOTOK: status++; /* fall */ case OK: @@ -226,8 +234,7 @@ main(int argc, char **argv) } context_save(); - done(status); - return 1; + return status; } @@ -238,7 +245,6 @@ static int sendsbr(char **vec, int vecp, char *drft, struct stat *st) { int status, dupfd; - char buffer[BUFSIZ]; char *original_draft; /* @@ -259,6 +265,7 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st) */ switch (attach(drft)) { case OK: + /* successfully MIMEified: use generate draft */ drft = composition_file_name; break; @@ -266,6 +273,7 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st) return (NOTOK); case DONE: + /* already in MIME format: keep original draft */ break; } @@ -289,31 +297,22 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st) break; } - done=armed_done; - switch (setjmp(env)) { - case OK: - status = sendaux(vec, vecp, drft, st) ? NOTOK : OK; - if (status == OK) { - /* move original draft to +trash folder */ - /* temporary close stdin, for refile not to ask */ - dupfd = dup(0); - close(0); - if (execprogl("refile", "refile", "-file", - original_draft, "+trash", - (char *)NULL) != 0) { - advise(NULL, "unable to trash the draft"); - } - dup2(dupfd, 0); - close(dupfd); + if ((status = sendaux(vec, vecp, drft, st)) == OK) { + /* move original draft to +trash folder */ + /* temporary close stdin, for refile not to ask */ + dupfd = dup(0); + close(0); + if (execprogl("refile", "refile", "-file", + original_draft, "+trash", + (char *)NULL) != 0) { + advise(NULL, "unable to trash the draft"); } - break; - - default: + dup2(dupfd, 0); + close(dupfd); + } else { status = DONE; - break; } - done=exit; if (distfile) { unlink(distfile); } @@ -329,62 +328,24 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st) static int attach(char *draft_file_name) { + enum state state; + struct field f = {{0}}; + int compnum; + int finished_header = 0; char buf[MAXPATHLEN + 6]; - int c; - int has_attachment; - int has_body; - int non_ascii; /* msg body contains non-ASCII chars */ - int length; /* length of attachment header field name */ + size_t length = strlen(attach_hdr); char *p; - if (!(draft_file = fopen(draft_file_name, "r"))) { - adios(NULL, "can't open draft file `%s'.", draft_file_name); - } - - /* We'll grow the buffer as needed. */ - field = (char *)mh_xmalloc(field_size = 256); - - /* - ** 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; - } - } - - /* - ** 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; - } - if (*p > 127 || *p < 0) { - non_ascii = 1; - } - } - if (has_body && non_ascii) { - break; /* that's been already enough information */ - } + if(distfile) { + return DONE; } - if (!has_attachment && non_ascii==0) { - /* We don't need to convert it to MIME. */ - return DONE; + if (!(draft_file = fopen(draft_file_name, "r"))) { + adios(EX_IOERR, NULL, "can't open draft file `%s'.", draft_file_name); } /* - ** Else: mimify + ** MIMEify */ /* Make names for the temporary files. */ @@ -395,37 +356,57 @@ attach(char *draft_file_name) 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(NULL, "unable to open all of the 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, attach_hdr, length) != 0 || - field[length] != ':') { - fprintf(composition_file, "%s\n", field); + for (compnum = 1, state = FLD2; state == FLD2 || state == BODY2;) { + switch (state = m_getfld2(state, &f, draft_file)) { + case LENERR2: + state = FLD2; + case FLD2: + compnum++; + if (strncasecmp(f.name, VRSN_FIELD, sizeof(VRSN_FIELD) - 1)==0) { + /* + ** The draft is already in MIME format, thus + ** back out and use the original draft file. + */ + clean_up_temporary_files(); + return DONE; + } + if (strncasecmp(f.name, attach_hdr, length) != 0 || + f.namelen != length) { + fprintf(composition_file, "%s:%s", f.name, f.value); + } + break; + case BODY2: + if (!finished_header) { + fputs("--------\n", composition_file); + finished_header++; + } + fputs(f.value, body_file); + break; + case FILEEOF2: + break; + case FMTERR2: + adios(EX_DATAERR, NULL, "message format error in component #%d", compnum); + case IOERR2: + adios(EX_IOERR, NULL, "error reading draft file: %s", draft_file_name); + default: + adios(EX_SOFTWARE, NULL, "getfld() returned %d", state); } } - fputs("--------\n", composition_file); + fclose(body_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); - } + /* 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 @@ -433,17 +414,33 @@ attach(char *draft_file_name) ** composition file for each. */ rewind(draft_file); - while (get_line() != EOF && *field && *field != '-') { - if (strncasecmp(field, attach_hdr, length) == 0 && - field[length] == ':') { - p = trim(field+length+1); - if (*p == '+') { - /* forwarded message */ - fprintf(composition_file, "#forw [forwarded message(s)] %s\n", p); - } else { - /* regular attachment */ - make_mime_composition_file_entry(p); + for (compnum = 1, state = FLD2; state == FLD2;) { + switch (state = m_getfld2(state, &f, draft_file)) { + case LENERR2: + state = FLD2; + case FLD2: + compnum++; + if (strncasecmp(f.name, attach_hdr, length) == 0 && + f.namelen == length) { + p = trim(f.value); + if (*p == '+') { + /* forwarded message */ + fprintf(composition_file, "#forw [forwarded message(s)] %s\n", p); + } else { + /* regular attachment */ + make_mime_composition_file_entry(p); + } } + break; + case BODY2: + case FILEEOF2: + break; + case FMTERR2: + adios(EX_DATAERR, NULL, "message format error in component #%d", compnum); + case IOERR2: + adios(EX_IOERR, NULL, "error reading draft file: %s", draft_file_name); + default: + adios(EX_SOFTWARE, NULL, "getfld() returned %d", state); } } fclose(composition_file); @@ -467,29 +464,48 @@ attach(char *draft_file_name) static int signandenc(char *draft_file_name) { + enum state state; + int compnum; + struct field f = {{0}}; char buf[BUFSIZ]; int dosign = 0; int doenc = 0; int ret; - if (!(draft_file = fopen(draft_file_name, "r"))) { - adios(NULL, "can't open draft file `%s'.", draft_file_name); + if(distfile) { + return DONE; } - /* We'll grow the buffer as needed. */ - field = (char *)mh_xmalloc(field_size = 256); + if (!(draft_file = fopen(draft_file_name, "r"))) { + adios(EX_IOERR, NULL, "can't open draft file `%s'.", draft_file_name); + } /* Scan the draft file for an attachment header field name. */ - while (get_line() != EOF && *field != '\0' && *field != '-') { - if (strncasecmp(field, sign_hdr, strlen(sign_hdr))==0 && - field[strlen(sign_hdr)] == ':') { - dosign = 1; - } - if (strncasecmp(field, enc_hdr, strlen(enc_hdr))==0 && - field[strlen(enc_hdr)] == ':') { - doenc = 1; + for (compnum = 1, state = FLD2; state == FLD2;) { + switch (state = m_getfld2(state, &f, draft_file)) { + case LENERR2: + state = FLD2; + case FLD2: + compnum++; + if (strcasecmp(f.name, sign_hdr)==0) { + dosign = 1; + } + if (strcasecmp(f.name, enc_hdr)==0) { + doenc = 1; + } + break; + case BODY2: + case FILEEOF2: + break; + case FMTERR2: + adios(EX_DATAERR, NULL, "message format error in component #%d", compnum); + case IOERR2: + adios(EX_IOERR, NULL, "error reading draft file: %s", draft_file_name); + default: + adios(EX_SOFTWARE, NULL, "getfld() returned %d", state); } } + if (!dosign && !doenc) { return DONE; } @@ -526,35 +542,6 @@ clean_up_temporary_files(void) return; } -static int -get_line(void) -{ - int c; /* current character */ - int n; /* number of bytes in buffer */ - char *p; - - /* - ** 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') { - ungetc(c, draft_file); - c = '\n'; - break; - } - if (++n >= field_size - 1) { - field = (char *)mh_xrealloc(field, field_size += 256); - p = field + n - 1; - } - } - *p = '\0'; - - return (c); -} - static void make_mime_composition_file_entry(char *file_name) { @@ -576,7 +563,7 @@ make_mime_composition_file_entry(char *file_name) if (!(fp = popen(cmdbuf, "r"))) { clean_up_temporary_files(); - adios(NULL, "unable to determine content type with `%s'", + adios(EX_IOERR, NULL, "unable to determine content type with `%s'", cmdbuf); } if (fgets(content_type, sizeof content_type, fp) && @@ -592,14 +579,14 @@ make_mime_composition_file_entry(char *file_name) /* 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); + adios(EX_IOERR, NULL, "unable to access file `%s'", file_name); } /* Check for broken file(1). See man page mh-profile(5). */ for (cp=content_type; *cp; cp++) { if (isspace(*cp)) { if (!semicolon) { - adios(NULL, "Sorry, your Mime-Type-Query command (%s) is broken.\n\tThe output misses a semicolon before the whitespace.\n\tOutput was: %s", cmd, content_type); + adios(EX_SOFTWARE, NULL, "Sorry, your Mime-Type-Query command (%s) is broken.\n\tThe output misses a semicolon before the whitespace.\n\tOutput was: %s", cmd, content_type); } } else if (*cp == ';') { semicolon = 1; @@ -629,22 +616,22 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st) vec[vecp++] = drft; if (distfile && distout(drft, distfile, backup) == NOTOK) { - done(1); + return DONE; } vec[vecp] = NULL; switch (child_id = fork()) { case -1: /* oops -- fork error */ - adios("fork", "unable to"); - break; /* NOT REACHED */ + advise("fork", "unable to"); + return DONE; case 0: /* child process -- send it */ execvp(*vec, vec); fprintf(stderr, "unable to exec "); perror(*vec); - _exit(-1); + _exit(EX_OSERR); break; /* NOT REACHED */ default: @@ -667,8 +654,7 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st) } } - - return status; + return status ? NOTOK : status; } @@ -679,7 +665,7 @@ anno(struct stat *st) char *msgs, *folder; char buf[BUFSIZ]; char *vec[MAXARGS]; - int vecp; + int vecp = 0; char *cp, *dp; if (altmsg && (stat(altmsg, &st2) == NOTOK || @@ -750,12 +736,3 @@ strexit(int status) return "message not delivered to anyone"; } } - - -static void -armed_done(int status) -{ - longjmp(env, status ? status : NOTOK); - - exit(status); -}