#include <h/tws.h>
#include <h/utils.h>
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
#endif
+#include <time.h>
int debugsw = 0; /* global */
-int forwsw = 1;
-int pushsw = 0;
int verbsw = 0;
char *altmsg = NULL;
char *annotext = NULL;
/*
** 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 *);
{ "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 }
};
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;
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";
for (n=3; n<OPEN_MAX; n++) {
}
for (msgnum = 0; msgnum < nfiles; msgnum++) {
- switch (sendsbr(vec, vecp, files[msgnum], &st, 1)) {
+ switch (sendsbr(vec, vecp, files[msgnum], &st)) {
case DONE:
done(++status);
case NOTOK:
** message sending back-end
*/
static int
-sendsbr(char **vec, int vecp, char *drft, struct stat *st, int rename_drft)
+sendsbr(char **vec, int vecp, char *drft, struct stat *st)
{
int status;
char buffer[BUFSIZ];
case OK:
status = sendaux(vec, vecp, drft, st) ? NOTOK : OK;
/* rename the original draft */
- if (rename_drft && status == OK &&
- rename(original_draft, strncpy(buffer,
- m_backup(original_draft), sizeof(buffer)))
- == NOTOK) {
- advise(buffer, "unable to rename %s to", drft);
+ if (status == OK) {
+ strncpy(buffer, m_backup(original_draft),
+ sizeof(buffer));
+ if (rename(original_draft, buffer) == NOTOK) {
+ advise(buffer, "unable to rename %s to", drft);
+ }
}
break;
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);
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);
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) {
}
-/*
-** 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)
{
projects / mmh / blobdiff