X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsend.c;h=84e05dfb31386d64a6d1b312c8156e945bbba8ef;hp=da401e622b5388a493e9702993d2fc2239413ba0;hb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;hpb=c42222869e318fff5dec395eca3e776db3075455 diff --git a/uip/send.c b/uip/send.c index da401e6..84e05df 100644 --- a/uip/send.c +++ b/uip/send.c @@ -16,21 +16,12 @@ #include #include -#ifdef TIME_WITH_SYS_TIME +#ifdef HAVE_SYS_TIME_H # include -# include -#else -# ifdef TM_IN_SYS_TIME -# include -# else -# include -# endif #endif +#include int debugsw = 0; /* global */ -int forwsw = 1; -int inplace = 1; -int pushsw = 0; int verbsw = 0; char *altmsg = NULL; char *annotext = NULL; @@ -49,21 +40,12 @@ static FILE *body_file; /* body file pointer */ static FILE *composition_file; /* composition file pointer */ /* -** external prototypes -*/ -char *getusername(void); - -/* ** static prototypes */ -static int sendsbr(char **, int, char *, struct stat *, int); +static int sendsbr(char **, int, char *, struct stat *); static void armed_done(int) NORETURN; -static void alert(char *, int); -static int tmp_fd(void); -static void anno(int, struct stat *); -static void annoaux(int); +static void anno(struct stat *); static int sendaux(char **, int, char *, struct stat *); - static int attach(char *); static void clean_up_temporary_files(void); static int get_line(void); @@ -75,33 +57,17 @@ static struct swit switches[] = { { "alias aliasfile", 0 }, #define DEBUGSW 1 { "debug", -5 }, -#define FILTSW 2 - { "filter filterfile", 0 }, -#define NFILTSW 3 - { "nofilter", 0 }, -#define FRMTSW 4 - { "format", 0 }, -#define NFRMTSW 5 - { "noformat", 0 }, -#define FORWSW 6 - { "forward", 0 }, -#define NFORWSW 7 - { "noforward", 0 }, -#define PUSHSW 8 - { "push", 0 }, -#define NPUSHSW 9 - { "nopush", 0 }, -#define VERBSW 10 +#define VERBSW 2 { "verbose", 0 }, -#define NVERBSW 11 +#define NVERBSW 3 { "noverbose", 0 }, -#define WATCSW 12 +#define WATCSW 4 { "watch", 0 }, -#define NWATCSW 13 +#define NWATCSW 5 { "nowatch", 0 }, -#define VERSIONSW 14 - { "version", 0 }, -#define HELPSW 15 +#define VERSIONSW 6 + { "Version", 0 }, +#define HELPSW 7 { "help", 0 }, { NULL, 0 } }; @@ -112,12 +78,16 @@ main(int argc, char **argv) { int msgp = 0, nfiles = 0, distsw = 0, vecp = 1; int msgnum, status; + int in, out; + int n; char *cp, *maildir = NULL; char buf[BUFSIZ], **ap, **argp, **arguments; char *msgs[MAXARGS], *vec[MAXARGS]; char *files[MAXARGS]; struct msgs *mp; struct stat st; + struct stat st2; + #ifdef LOCALE setlocale(LC_ALL, ""); @@ -152,20 +122,6 @@ main(int argc, char **argv) print_version(invo_name); done(1); - case PUSHSW: - pushsw++; - continue; - case NPUSHSW: - pushsw = 0; - continue; - - case FORWSW: - forwsw++; - continue; - case NFORWSW: - forwsw = 0; - continue; - case VERBSW: verbsw++; vec[vecp++] = --cp; @@ -177,20 +133,17 @@ main(int argc, char **argv) case DEBUGSW: debugsw++; /* fall */ - case NFILTSW: - case FRMTSW: - case NFRMTSW: case WATCSW: case NWATCSW: vec[vecp++] = --cp; continue; case ALIASW: - case FILTSW: vec[vecp++] = --cp; - if (!(cp = *argp++) || *cp == '-') + if (!(cp = *argp++) || *cp == '-') { adios(NULL, "missing argument to %s", argp[-2]); + } vec[vecp++] = cp; continue; @@ -204,41 +157,38 @@ main(int argc, char **argv) } } - /* - ** check for "Aliasfile:" profile entry - */ + /* check for "Aliasfile:" profile entry */ if ((cp = context_find("Aliasfile"))) { char *dp = NULL; - for (ap = brkstring(dp = getcpy(cp), " ", "\n"); ap && *ap; - ap++) { + for (ap=brkstring(dp=getcpy(cp), " ", "\n"); ap && *ap; ap++) { vec[vecp++] = "-alias"; vec[vecp++] = getcpy(etcpath(*ap)); } } - if (!msgp && !nfiles) + if (!msgp && !nfiles) { msgs[msgp++] = seq_cur; + } maildir = toabsdir(draftfolder); - if (chdir(maildir) == NOTOK) + if (chdir(maildir) == NOTOK) { adios(maildir, "unable to change directory to"); + } - /* read folder and create message structure */ - if (!(mp = folder_read(draftfolder))) + if (!(mp = folder_read(draftfolder))) { adios(NULL, "unable to read draft folder %s", draftfolder); - - /* check for empty folder */ - if (mp->nummsg == 0) + } + if (mp->nummsg == 0) { adios(NULL, "no messages in draft folder %s", draftfolder); - + } /* parse all the message ranges/sequences and set SELECTED */ for (msgnum = 0; msgnum < msgp; msgnum++) { if (!m_convert(mp, msgs[msgnum])) { done(1); } } - seq_setprev(mp); /* set the previous-sequence */ + seq_setprev(mp); for (msgp = 0, msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) { if (is_selected(mp, msgnum)) { @@ -250,65 +200,55 @@ main(int argc, char **argv) mp->msgflags |= SEQMOD; seq_save(mp); - if (!(cp = getenv("SIGNATURE")) || !*cp) - if ((cp = context_find("signature")) && *cp) + if (!(cp = getenv("SIGNATURE")) || !*cp) { + if ((cp = context_find("signature")) && *cp) { m_putenv("SIGNATURE", cp); + } + } - for (msgnum = 0; msgnum < nfiles; msgnum++) - if (stat(files[msgnum], &st) == NOTOK) + for (msgnum = 0; msgnum < nfiles; msgnum++) { + if (stat(files[msgnum], &st) == NOTOK) { adios(files[msgnum], "unable to stat draft file"); + } + } - if ((annotext = getenv("mhannotate")) == NULL || *annotext == 0) + if (!(annotext = getenv("mhannotate")) || !*annotext) { annotext = NULL; - if (annotext && ((cp = getenv("mhinplace")) != NULL && *cp != 0)) - inplace = atoi(cp); - if ((altmsg = getenv("mhaltmsg")) == NULL || *altmsg == 0) + } + if (!(altmsg = getenv("mhaltmsg")) || !*altmsg) { altmsg = NULL; /* used by dist interface - see below */ + } - if ((cp = getenv("mhdist")) && *cp && (distsw = atoi (cp)) && altmsg) { + if ((cp = getenv("mhdist")) && *cp && (distsw = atoi(cp)) && altmsg) { vec[vecp++] = "-dist"; - distfile = getcpy(m_mktemp2(altmsg, invo_name, NULL, NULL)); - if (link(altmsg, distfile) == NOTOK) { - if (errno != EXDEV) - adios(distfile, "unable to link %s to", - altmsg); - free(distfile); - distfile = getcpy(m_mktemp2(NULL, invo_name, - NULL, NULL)); - { - int in, out; - struct stat st; - - if ((in = open(altmsg, O_RDONLY)) == NOTOK) - adios(altmsg, "unable to open"); - fstat(in, &st); - if ((out = creat(distfile, - (int) st.st_mode & 0777)) - == NOTOK) - adios(distfile, "unable to write"); - cpydata(in, out, altmsg, distfile); - close(in); - close(out); - } + if ((in = open(altmsg, O_RDONLY)) == NOTOK) { + adios(altmsg, "unable to open for reading"); } + fstat(in, &st2); + distfile = getcpy(m_mktemp2(NULL, invo_name, NULL, NULL)); + if ((out = creat(distfile, (int)st2.st_mode & 0777))==NOTOK) { + adios(distfile, "unable to open for writing"); + } + cpydata(in, out, altmsg, distfile); + close(in); + close(out); } else { distfile = NULL; } - if (altmsg == NULL || stat(altmsg, &st) == NOTOK) { + if (!altmsg || stat(altmsg, &st) == NOTOK) { st.st_mtime = 0; st.st_dev = 0; st.st_ino = 0; } - if (pushsw) - push(); - status = 0; - vec[0] = mhbasename(postproc); - closefds(3); + vec[0] = "spost"; + for (n=3; n= - sizeof (composition_file_name) - 6) + sizeof (composition_file_name) - 6) { advise(NULL, "unable to remove original composition file."); - - else { - if ((p = strrchr(composition_file_name, '/')) == NULL) + } else { + if (!(p = strrchr(composition_file_name, '/'))) { p = composition_file_name; - else + } else { p++; - + } strcpy(body_file_name, p); *p++ = ','; strcpy(p, body_file_name); @@ -420,38 +360,28 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st, int rename_drft) static int 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 */ + 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 */ - char *p; /* miscellaneous string pointer */ + char *p; - /* 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); + if (!(draft_file = fopen(draft_file_name, "r"))) { + adios(NULL, "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. - */ + /* We'll grow the buffer as needed. */ field = (char *)mh_xmalloc(field_size = 256); /* ** 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(attach_hdr); - has_attachment = 0; - while (get_line() != EOF && *field != '\0' && *field != '-') { - if (strncasecmp(field, attach_hdr, length) == 0 && + if (strncasecmp(field, attach_hdr, length)==0 && field[length] == ':') { has_attachment = 1; } @@ -465,7 +395,6 @@ attach(char *draft_file_name) */ has_body = 0; non_ascii = 0; - while (get_line() != EOF) { for (p = field; *p != '\0'; p++) { if (*p != ' ' && *p != '\t') { @@ -475,15 +404,13 @@ attach(char *draft_file_name) non_ascii = 1; } } - if (has_body && non_ascii) - break; + if (has_body && non_ascii) { + break; /* that's been already enough information */ + } } - /* - ** 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) { + /* We don't need to convert it to MIME. */ return DONE; } @@ -499,9 +426,9 @@ attach(char *draft_file_name) m_mktemp(toabsdir(invo_name), NULL, NULL), sizeof (composition_file_name)); - if (has_body) + if (has_body) { body_file = fopen(body_file_name, "w"); - + } composition_file = fopen(composition_file_name, "w"); if ((has_body && !body_file) || !composition_file) { @@ -509,11 +436,7 @@ attach(char *draft_file_name) adios(NULL, "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. - */ + /* 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 || @@ -531,7 +454,7 @@ attach(char *draft_file_name) fclose(body_file); /* Add a mhbuild MIME composition file line for the body */ - /* charset will be discovered/guessed by buildmimeproc */ + /* charset will be discovered/guessed by mhbuild */ fprintf(composition_file, "#text/plain %s\n", body_file_name); } @@ -551,20 +474,17 @@ attach(char *draft_file_name) /* forwarded message */ fprintf(composition_file, "#forw [forwarded message(s)] %s\n", p); } else { + /* regular attachment */ make_mime_composition_file_entry(p); } } } - fclose(composition_file); - /* - ** 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); - + /* We're ready to roll! */ + sprintf(buf, "mhbuild %s", composition_file_name); if (system(buf) != 0) { + /* some problem */ clean_up_temporary_files(); return (NOTOK); } @@ -586,7 +506,7 @@ get_line(void) { int c; /* current character */ int n; /* number of bytes in buffer */ - char *p; /* buffer pointer */ + char *p; /* ** Get a line from the input file, growing the field buffer as @@ -594,22 +514,17 @@ get_line(void) ** 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((void *)field, field_size += 256); - + field = (char *)mh_xrealloc(field, field_size += 256); p = field + n - 1; } } - - /* NUL-terminate the field. */ *p = '\0'; return (c); @@ -654,9 +569,9 @@ make_mime_composition_file_entry(char *file_name) adios(NULL, "unable to access file `%s'", file_name); } - fprintf(composition_file, "#%s; name=\"%s\" <>{attachment}", - content_type, - (!(cp = strrchr(file_name, '/'))) ? file_name : cp + 1); + cp = (!(cp = strrchr(file_name, '/'))) ? file_name : cp + 1; + fprintf(composition_file, "#%s; name=\"%s\" <> [%s] {attachment}", + content_type, cp, cp); fprintf(composition_file, " %s\n", file_name); @@ -664,80 +579,51 @@ make_mime_composition_file_entry(char *file_name) } /* -** Annotate original message, and -** call `postproc' to send message. +** The back-end of the message sending back-end. +** Annotate original message, and call `spost' to send message. */ static int sendaux(char **vec, int vecp, char *drft, struct stat *st) { pid_t child_id; - int i, status, fd, fd2; + int status; char backup[BUFSIZ]; - fd = pushsw ? tmp_fd() : NOTOK; - fd2 = NOTOK; - vec[vecp++] = drft; - if (annotext && (fd2 = tmp_fd()) == NOTOK) { - admonish(NULL, "unable to create file for annotation list"); - } - if (distfile && distout(drft, distfile, backup) == NOTOK) + if (distfile && distout(drft, distfile, backup) == NOTOK) { done(1); + } vec[vecp] = NULL; - for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++) - sleep(5); - - switch (child_id) { + switch (child_id = fork()) { case -1: /* oops -- fork error */ adios("fork", "unable to"); break; /* NOT REACHED */ 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. - */ - if (fd != NOTOK) { - dup2(fd, fileno(stdout)); - dup2(fd, fileno(stderr)); - close(fd); - } - execvp(postproc, vec); + /* child process -- send it */ + execvp(*vec, vec); fprintf(stderr, "unable to exec "); - perror(postproc); + perror(*vec); _exit(-1); break; /* NOT REACHED */ 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 (fd != NOTOK) { - alert(drft, fd); - close(fd); - } else { - advise(NULL, "message not delivered to anyone"); + if (annotext) { + anno(st); } - if (annotext && fd2 != NOTOK) - close(fd2); + } else { + /* spost failed */ + advise(NULL, "message not delivered to anyone"); if (distfile) { unlink(drft); - if (rename(backup, drft) == NOTOK) + if (rename(backup, drft) == NOTOK) { advise(drft, "unable to rename %s to", backup); + } } } break; @@ -747,223 +633,44 @@ 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) -{ - pid_t child_id; - int i, in; - char buf[BUFSIZ]; - - for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++) - sleep(5); - - switch (child_id) { - case NOTOK: - /* oops -- fork error */ - advise("fork", "unable to"); - - case OK: - /* child process -- send it */ - SIGNAL(SIGHUP, SIG_IGN); - SIGNAL(SIGINT, SIG_IGN); - SIGNAL(SIGQUIT, SIG_IGN); - SIGNAL(SIGTERM, SIG_IGN); - if (forwsw) { - if ((in = open(file, O_RDONLY)) == NOTOK) { - admonish(file, "unable to re-open"); - } else { - lseek(out, (off_t) 0, SEEK_END); - strncpy(buf, "\nMessage not delivered to anyone.\n", sizeof(buf)); - write(out, buf, strlen(buf)); - strncpy(buf, "\n------- Unsent Draft\n\n", sizeof(buf)); - write(out, buf, strlen(buf)); - cpydgst(in, out, file, "temporary file"); - close(in); - strncpy(buf, "\n------- End of Unsent Draft\n", sizeof(buf)); - write(out, buf, strlen(buf)); - if (rename(file, strncpy(buf, m_backup(file), sizeof(buf))) == NOTOK) - admonish(buf, "unable to rename %s to", file); - } - } - lseek(out, (off_t) 0, SEEK_SET); - dup2(out, fileno(stdin)); - close(out); - /* create subject for error notification */ - snprintf(buf, sizeof(buf), "send failed on %s", - forwsw ? "enclosed draft" : file); - - execlp(mailproc, mhbasename(mailproc), getusername(), - "-subject", buf, NULL); - fprintf(stderr, "unable to exec "); - perror(mailproc); - _exit(-1); - - default: /* no waiting... */ - break; - } -} - - -static int -tmp_fd(void) -{ - int fd; - char *tfile = NULL; - - tfile = m_mktemp2(NULL, invo_name, &fd, NULL); - if (tfile == NULL) return NOTOK; - fchmod(fd, 0600); - - if (debugsw) - advise(NULL, "temporary file %s selected", tfile); - else - if (unlink(tfile) == NOTOK) - advise(tfile, "unable to remove"); - - return fd; -} - - static void -anno(int fd, struct stat *st) +anno(struct stat *st) { - pid_t child_id; - sigset_t set, oset; - static char *cwd = NULL; struct stat st2; + char *msgs, *folder; + char buf[BUFSIZ]; if (altmsg && (stat(altmsg, &st2) == NOTOK || st->st_mtime != st2.st_mtime || st->st_dev != st2.st_dev || st->st_ino != st2.st_ino)) { - if (debugsw) + if (debugsw) { admonish(NULL, "$mhaltmsg mismatch"); + } return; } - child_id = debugsw ? NOTOK : fork(); - switch (child_id) { - case NOTOK: /* oops */ - if (!debugsw) - advise(NULL, "unable to fork, so doing annotations by hand..."); - if (cwd == NULL) - cwd = getcpy(pwd()); - /* fall */ - - case OK: - /* block a few signals */ - sigemptyset(&set); - sigaddset(&set, SIGHUP); - sigaddset(&set, SIGINT); - sigaddset(&set, SIGQUIT); - sigaddset(&set, SIGTERM); - SIGPROCMASK(SIG_BLOCK, &set, &oset); - - annoaux(fd); - if (child_id == OK) - _exit(0); - - /* reset the signal mask */ - SIGPROCMASK(SIG_SETMASK, &oset, &set); - - chdir(cwd); - break; - - default: /* no waiting... */ - close(fd); - break; - } -} - - -static void -annoaux(int fd) -{ - int fd2, fd3, msgnum; - char *cp, *folder, *maildir; - char buffer[BUFSIZ], **ap; - FILE *fp; - struct msgs *mp; - - if ((folder = getenv("mhfolder")) == NULL || *folder == 0) { - if (debugsw) + if (!(folder = getenv("mhfolder")) || !*folder) { + if (debugsw) { admonish(NULL, "$mhfolder not set"); + } return; } - maildir = toabsdir(folder); - if (chdir(maildir) == NOTOK) { - if (debugsw) - admonish(maildir, "unable to change directory to"); - return; - } - if (!(mp = folder_read(folder))) { - if (debugsw) - admonish(NULL, "unable to read folder %s", folder); + if (!(msgs = getenv("mhmessages")) || !*msgs) { + if (debugsw) { + admonish(NULL, "$mhmessages not set"); + } return; } - - /* check for empty folder */ - if (mp->nummsg == 0) { - if (debugsw) - admonish(NULL, "no messages in %s", folder); - goto oops; + if (debugsw) { + advise(NULL, "annotate as `%s': %s %s", annotext, + folder, msgs); } - - if ((cp = getenv("mhmessages")) == NULL || *cp == 0) { - if (debugsw) - admonish(NULL, "$mhmessages not set"); - goto oops; - } - if (!debugsw /* MOBY HACK... */ - && pushsw - && (fd3 = open("/dev/null", O_RDWR)) != NOTOK - && (fd2 = dup(fileno(stderr))) != NOTOK) { - dup2(fd3, fileno(stderr)); - close(fd3); - } else - fd2 = NOTOK; - for (ap = brkstring(cp = getcpy(cp), " ", NULL); *ap; ap++) - m_convert(mp, *ap); - free(cp); - if (fd2 != NOTOK) - dup2(fd2, fileno(stderr)); - if (mp->numsel == 0) { - if (debugsw) - admonish(NULL, "no messages to annotate"); - goto oops; - } - - lseek(fd, (off_t) 0, SEEK_SET); - if ((fp = fdopen(fd, "r")) == NULL) { - if (debugsw) - admonish(NULL, "unable to fdopen annotation list"); - goto oops; - } - cp = NULL; - while (fgets(buffer, sizeof(buffer), fp) != NULL) - cp = add(buffer, cp); - fclose(fp); - - if (debugsw) - advise(NULL, "annotate%s with %s: \"%s\"", - inplace ? " inplace" : "", annotext, cp); - for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) { - if (is_selected(mp, msgnum)) { - if (debugsw) - advise(NULL, "annotate message %d", msgnum); - annotate(m_name(msgnum), annotext, cp, inplace, - 1, -2, 0); - } + snprintf(buf, sizeof buf, "anno -comp '%s' '+%s' %s", + annotext, folder, msgs); + if (system(buf) != 0) { + advise(NULL, "unable to annotate"); } - - free(cp); - -oops: - folder_free(mp); /* free folder/message structure */ }