X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsend.c;h=0660e9588a376d52f640b0be4a4a81785ec06c03;hp=5054273b61b762649a13ff5068bdae7dd536b0ce;hb=ca0b3e830b86700d9e5e31b1784de2bdcaf58fc5;hpb=66ef547b1aa9794afb6137927aa3cd7335522c64 diff --git a/uip/send.c b/uip/send.c index 5054273..0660e95 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 pushsw = 0; -int verbsw = 0; char *altmsg = NULL; char *annotext = NULL; char *distfile = NULL; @@ -50,10 +41,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 *); @@ -63,29 +52,15 @@ static void make_mime_composition_file_entry(char *); static struct swit switches[] = { -#define ALIASW 0 - { "alias aliasfile", 0 }, -#define DEBUGSW 1 +#define DEBUGSW 0 { "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 1 { "verbose", 0 }, -#define NVERBSW 7 - { "noverbose", 0 }, -#define WATCSW 8 - { "watch", 0 }, -#define NWATCSW 9 - { "nowatch", 0 }, -#define VERSIONSW 10 - { "version", 0 }, -#define HELPSW 11 +#define NVERBSW 2 + { "noverbose", 2 }, +#define VERSIONSW 3 + { "Version", 0 }, +#define HELPSW 4 { "help", 0 }, { NULL, 0 } }; @@ -97,18 +72,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 buf[BUFSIZ], **argp, **arguments; char *msgs[MAXARGS], *vec[MAXARGS]; char *files[MAXARGS]; struct msgs *mp; struct stat st; struct stat st2; - -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ @@ -117,9 +90,6 @@ main(int argc, char **argv) arguments = getarguments(invo_name, argc, argv, 1); argp = arguments; - vec[vecp++] = "-library"; - vec[vecp++] = getcpy(toabsdir("+")); - while ((cp = *argp++)) { if (*cp == '-') { switch (smatch(++cp, switches)) { @@ -139,45 +109,13 @@ 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 DEBUGSW: + debugsw++; + /* fall */ case VERBSW: - verbsw++; - vec[vecp++] = --cp; - continue; case NVERBSW: - verbsw = 0; vec[vecp++] = --cp; continue; - - case DEBUGSW: - debugsw++; /* fall */ - case WATCSW: - case NWATCSW: - vec[vecp++] = --cp; - continue; - - case ALIASW: - vec[vecp++] = --cp; - if (!(cp = *argp++) || *cp == '-') { - adios(NULL, "missing argument to %s", - argp[-2]); - } - vec[vecp++] = cp; - continue; - } } else { if (*cp == '/') { @@ -188,16 +126,6 @@ main(int argc, char **argv) } } - /* check for "Aliasfile:" profile entry */ - if ((cp = context_find("Aliasfile"))) { - char *dp = NULL; - - for (ap=brkstring(dp=getcpy(cp), " ", "\n"); ap && *ap; ap++) { - vec[vecp++] = "-alias"; - vec[vecp++] = getcpy(etcpath(*ap)); - } - } - if (!msgp && !nfiles) { msgs[msgp++] = seq_cur; } @@ -272,42 +200,14 @@ main(int argc, char **argv) st.st_dev = 0; st.st_ino = 0; } - if (pushsw) { - /* push a fork into the background */ - pid_t pid; - - switch (pid = fork()) { - case -1: - /* fork error */ - advise(NULL, "unable to fork, so can't push..."); - break; - - default: - /* parent, just exit */ - done(0); - - case 0: - /* child, block a few signals and continue */ - SIGNAL(SIGHUP, SIG_IGN); - SIGNAL(SIGINT, SIG_IGN); - SIGNAL(SIGQUIT, SIG_IGN); - SIGNAL(SIGTERM, SIG_IGN); -#ifdef SIGTSTP - SIGNAL(SIGTSTP, SIG_IGN); - SIGNAL(SIGTTIN, SIG_IGN); - SIGNAL(SIGTTOU, SIG_IGN); -#endif - freopen("/dev/null", "r", stdin); - freopen("/dev/null", "w", stdout); - break; - } - } status = 0; vec[0] = "spost"; - closefds(3); + for (n=3; n= - sizeof (composition_file_name) - 6) { - advise(NULL, "unable to remove original composition file."); - } else { - if (!(p = strrchr(composition_file_name, '/'))) { - p = composition_file_name; - } else { - p++; - } - strcpy(body_file_name, p); - *p++ = ','; - strcpy(p, body_file_name); - strcat(p, ".orig"); - - unlink(composition_file_name); - } } return status; @@ -546,6 +425,11 @@ attach(char *draft_file_name) clean_up_temporary_files(); return (NOTOK); } + /* Remove the automatically created backup of mhbuild. */ + snprintf(buf, sizeof buf, "%s.orig", composition_file_name); + if (unlink(buf) == -1) { + advise(NULL, "unable to remove original composition file."); + } return (OK); } @@ -627,9 +511,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); @@ -644,15 +528,9 @@ static int sendaux(char **vec, int vecp, char *drft, struct stat *st) { pid_t child_id; - int status, fd; + int status; char backup[BUFSIZ]; - /* - ** fd collects the output of spost, 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); @@ -666,17 +544,7 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st) 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); - } + /* child process -- send it */ execvp(*vec, vec); fprintf(stderr, "unable to exec "); perror(*vec); @@ -690,17 +558,8 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st) anno(st); } } else { - /* - ** If spost 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) { @@ -716,86 +575,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 mhmail(1). -*/ -static void -alert(char *file, int out) -{ - pid_t child_id; - int in; - char buf[BUFSIZ]; - - switch (child_id = fork()) { - 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("mhmail", "mhmail", getusername(), - "-subject", buf, NULL); - fprintf(stderr, "unable to exec "); - perror("mhmail"); - _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) {