X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsend.c;h=84e05dfb31386d64a6d1b312c8156e945bbba8ef;hp=1529c0faa13e16cdf96f6d1fbf6b2abe83a2716b;hb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;hpb=f3cb7cde0e6f10451b6848678d95860d512224b9 diff --git a/uip/send.c b/uip/send.c index 1529c0f..84e05df 100644 --- a/uip/send.c +++ b/uip/send.c @@ -16,20 +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 pushsw = 0; int verbsw = 0; char *altmsg = NULL; char *annotext = NULL; @@ -50,10 +42,8 @@ static FILE *composition_file; /* composition file pointer */ /* ** 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(struct stat *); static int sendaux(char **, int, char *, struct stat *); static int attach(char *); @@ -67,25 +57,17 @@ static struct swit switches[] = { { "alias aliasfile", 0 }, #define DEBUGSW 1 { "debug", -5 }, -#define FORWSW 2 - { "forward", 0 }, -#define NFORWSW 3 - { "noforward", 0 }, -#define PUSHSW 4 - { "push", 0 }, -#define NPUSHSW 5 - { "nopush", 0 }, -#define VERBSW 6 +#define VERBSW 2 { "verbose", 0 }, -#define NVERBSW 7 +#define NVERBSW 3 { "noverbose", 0 }, -#define WATCSW 8 +#define WATCSW 4 { "watch", 0 }, -#define NWATCSW 9 +#define NWATCSW 5 { "nowatch", 0 }, -#define VERSIONSW 10 - { "version", 0 }, -#define HELPSW 11 +#define VERSIONSW 6 + { "Version", 0 }, +#define HELPSW 7 { "help", 0 }, { NULL, 0 } }; @@ -97,6 +79,7 @@ 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]; @@ -139,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; @@ -252,27 +221,17 @@ main(int argc, char **argv) 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)); - if ((in = open(altmsg, O_RDONLY)) == NOTOK) { - adios(altmsg, "unable to open"); - } - fstat(in, &st2); - if ((out = creat(distfile, (int)st2.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; } @@ -282,15 +241,14 @@ main(int argc, char **argv) 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{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); @@ -625,51 +580,32 @@ make_mime_composition_file_entry(char *file_name) /* ** The back-end of the message sending back-end. -** Annotate original message, and call `postproc' to send message. +** 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; + int status; char backup[BUFSIZ]; - /* - ** fd collects the output of postproc, and is used for the - ** failure notice if we need to send one in alert(). - */ - fd = pushsw ? tmp_fd() : NOTOK; - vec[vecp++] = drft; 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 */ @@ -680,17 +616,8 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st) anno(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"); - } + /* spost failed */ + advise(NULL, "message not delivered to anyone"); if (distfile) { unlink(drft); if (rename(backup, drft) == NOTOK) { @@ -706,91 +633,6 @@ 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(struct stat *st) {