Commit Diff

Commit:
6fdaa2e11e3cb2126b05d32c8d0adbcd25288eba
From:
Martijn van Duren <martijn@openbsd.org>
Date:
Message:
Don't botter writing if we're pending EV_WRITE. While here, rename ev to stdoutev
Actions:
Patch | Tree
commit - dd179c35d31a64503484b5bda4bcb72ce0dca065
commit + 6fdaa2e11e3cb2126b05d32c8d0adbcd25288eba
blob - 335ff458e79a73e8d2f105f064dbb66cd2503d5d
blob + 1badcb9d08ab4839113cd97ba4ecbf55c9a4ccb0
--- smtp_proc.c
+++ smtp_proc.c
@@ -375,26 +375,28 @@ static void
 smtp_write(int fd, short event, void *arg)
 {
 	struct smtp_writebuf *buf = arg;
-	static struct event ev;
+	static struct event stdoutev;
 	static int evset = 0;
 	ssize_t wlen;
 
 	if (buf->buflen == 0)
 		return;
+	if (event_pending(&stdoutev, EV_WRITE, NULL))
+		return;
 	if (!evset) {
-		event_set(&ev, fd, EV_WRITE, smtp_write, buf);
+		event_set(&stdoutev, fd, EV_WRITE, smtp_write, buf);
 		evset = 1;
 	}
 	wlen = write(fd, buf->buf, buf->buflen);
 	if (wlen == -1) {
 		if (errno != EAGAIN && errno != EINTR)
 			fatal("Failed to write to smtpd");
-		event_add(&ev, NULL);
+		event_add(&stdoutev, NULL);
 		return;
 	}
 	if (wlen < buf->buflen) {
 		memmove(buf->buf, buf->buf + wlen, buf->buflen - wlen);
-		event_add(&ev, NULL);
+		event_add(&stdoutev, NULL);
 	}
 	buf->buflen -= wlen;
 }