From a6a7d6ce079cabdaf2fa502b2e2cf15e5428ac6f Mon Sep 17 00:00:00 2001 From: Jannis Hoffmann Date: Wed, 3 Jul 2024 15:52:39 +0200 Subject: format files --- src/qmail.c | 139 ++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 74 insertions(+), 65 deletions(-) (limited to 'src/qmail.c') diff --git a/src/qmail.c b/src/qmail.c index 7bdfd29..f143af1 100644 --- a/src/qmail.c +++ b/src/qmail.c @@ -1,21 +1,22 @@ +#include "qmail.h" + #include -#include "readwrite.h" + #include "buffer.h" -#include "wait.h" +#include "env.h" #include "exit.h" #include "fd.h" -#include "qmail.h" +#include "readwrite.h" +#include "wait.h" + #include "auto_qmail.h" -#include "env.h" -static char *binqqargs[2] = { 0, 0 } ; +static char *binqqargs[2] = {0, 0}; static void setup_qqargs() { - if (!binqqargs[0]) - binqqargs[0] = env_get("QMAILQUEUE"); - if (!binqqargs[0]) - binqqargs[0] = "bin/qmail-queue"; + if (!binqqargs[0]) binqqargs[0] = env_get("QMAILQUEUE"); + if (!binqqargs[0]) binqqargs[0] = "bin/qmail-queue"; } int qmail_open(struct qmail *qq) @@ -26,26 +27,34 @@ int qmail_open(struct qmail *qq) setup_qqargs(); if (pipe(pim) == -1) return -1; - if (pipe(pie) == -1) { close(pim[0]); close(pim[1]); return -1; } - + if (pipe(pie) == -1) { + close(pim[0]); + close(pim[1]); + return -1; + } + switch (qq->pid = vfork()) { case -1: - close(pim[0]); close(pim[1]); - close(pie[0]); close(pie[1]); + close(pim[0]); + close(pim[1]); + close(pie[0]); + close(pie[1]); return -1; case 0: close(pim[1]); close(pie[1]); - if (fd_move(0,pim[0]) == -1) _exit(120); - if (fd_move(1,pie[0]) == -1) _exit(120); + if (fd_move(0, pim[0]) == -1) _exit(120); + if (fd_move(1, pie[0]) == -1) _exit(120); if (chdir(auto_qmail) == -1) _exit(61); - execv(*binqqargs,binqqargs); + execv(*binqqargs, binqqargs); _exit(120); } - qq->fdm = pim[1]; close(pim[0]); - qq->fde = pie[1]; close(pie[0]); - buffer_init(&qq->ss,write,qq->fdm,qq->buf,sizeof(qq->buf)); + qq->fdm = pim[1]; + close(pim[0]); + qq->fde = pie[1]; + close(pie[0]); + buffer_init(&qq->ss, write, qq->fdm, qq->buf, sizeof(qq->buf)); qq->flagerr = 0; return 0; } @@ -60,31 +69,33 @@ void qmail_fail(struct qmail *qq) qq->flagerr = 1; } -void qmail_put(struct qmail *qq,char *s,int len) +void qmail_put(struct qmail *qq, char *s, int len) { - if (!qq->flagerr) if (buffer_put(&qq->ss,s,len) == -1) qq->flagerr = 1; + if (!qq->flagerr) + if (buffer_put(&qq->ss, s, len) == -1) qq->flagerr = 1; } -void qmail_puts(struct qmail *qq,char *s) +void qmail_puts(struct qmail *qq, char *s) { - if (!qq->flagerr) if (buffer_puts(&qq->ss,s) == -1) qq->flagerr = 1; + if (!qq->flagerr) + if (buffer_puts(&qq->ss, s) == -1) qq->flagerr = 1; } -void qmail_from(struct qmail *qq,char *s) +void qmail_from(struct qmail *qq, char *s) { if (buffer_flush(&qq->ss) == -1) qq->flagerr = 1; close(qq->fdm); - buffer_init(&qq->ss,write,qq->fde,qq->buf,sizeof(qq->buf)); - qmail_put(qq,"F",1); - qmail_puts(qq,s); - qmail_put(qq,"",1); + buffer_init(&qq->ss, write, qq->fde, qq->buf, sizeof(qq->buf)); + qmail_put(qq, "F", 1); + qmail_puts(qq, s); + qmail_put(qq, "", 1); } -void qmail_to(struct qmail *qq,char *s) +void qmail_to(struct qmail *qq, char *s) { - qmail_put(qq,"T",1); - qmail_puts(qq,s); - qmail_put(qq,"",1); + qmail_put(qq, "T", 1); + qmail_puts(qq, s); + qmail_put(qq, "", 1); } char *qmail_close(struct qmail *qq) @@ -92,48 +103,46 @@ char *qmail_close(struct qmail *qq) int wstat; int exitcode; - qmail_put(qq,"",1); - if (!qq->flagerr) + qmail_put(qq, "", 1); + if (!qq->flagerr) if (buffer_flush(&qq->ss) == -1) qq->flagerr = 1; close(qq->fde); - if (wait_pid(&wstat,qq->pid) != qq->pid) - return "Zqq waitpid surprise (#4.3.0)"; - if (wait_crashed(wstat)) - return "Zqq crashed (#4.3.0)"; + if (wait_pid(&wstat, qq->pid) != qq->pid) return "Zqq waitpid surprise (#4.3.0)"; + if (wait_crashed(wstat)) return "Zqq crashed (#4.3.0)"; exitcode = wait_exitcode(wstat); switch (exitcode) { - case 0: if (!qq->flagerr) return ""; /* fall through */ - case 11: return "Denvelope address too long for qq (#5.1.3)"; - case 31: return "Dmail server permanently rejected message (#5.3.0)"; - case 32: return "Vmail server does not accept message (#5.3.0)"; - case 33: return "Smail server does not accept message (#5.3.0)"; - case 34: return "Amail server does not accept message (#5.3.0)"; - case 35: return "Imail server fails to verify DKIM signed message (#5.3.0)"; - case 51: return "Zqq out of memory (#4.3.0)"; - case 52: return "Zqq timeout (#4.3.0)"; - case 53: return "Zqq write error or disk full (#4.3.0)"; - case 54: return "Zqq read error (#4.3.0)"; - case 55: return "Zqq unable to read configuration (#4.3.0)"; - case 56: return "Zqq trouble making network connection (#4.3.0)"; - case 61: return "Zqq trouble in home directory (#4.3.0)"; - case 62: return "Zqq trouble creating files in queue (#4.3.0)"; - case 63: /* qmail-queue: fstat/unlinking problem */ - case 64: /* qmail-queue: linking pidfn -> messfn */ - case 65: /* qmail-queue: exclusive open failed */ - case 66: /* qmail-queue: linking intdfn -> todofn */ - case 71: return "Zmail server temporarily rejected message (#4.3.0)"; - case 72: return "Zconnection to mail server timed out (#4.4.1)"; - case 73: return "Zconnection to mail server rejected (#4.4.1)"; - case 74: return "Zcommunication with mail server failed (#4.4.2)"; - case 91: /* fall through */ - case 81: return "Zqq internal bug (#4.3.0)"; + case 0: + if (!qq->flagerr) return ""; /* fall through */ + case 11: return "Denvelope address too long for qq (#5.1.3)"; + case 31: return "Dmail server permanently rejected message (#5.3.0)"; + case 32: return "Vmail server does not accept message (#5.3.0)"; + case 33: return "Smail server does not accept message (#5.3.0)"; + case 34: return "Amail server does not accept message (#5.3.0)"; + case 35: return "Imail server fails to verify DKIM signed message (#5.3.0)"; + case 51: return "Zqq out of memory (#4.3.0)"; + case 52: return "Zqq timeout (#4.3.0)"; + case 53: return "Zqq write error or disk full (#4.3.0)"; + case 54: return "Zqq read error (#4.3.0)"; + case 55: return "Zqq unable to read configuration (#4.3.0)"; + case 56: return "Zqq trouble making network connection (#4.3.0)"; + case 61: return "Zqq trouble in home directory (#4.3.0)"; + case 62: return "Zqq trouble creating files in queue (#4.3.0)"; + case 63: /* qmail-queue: fstat/unlinking problem */ + case 64: /* qmail-queue: linking pidfn -> messfn */ + case 65: /* qmail-queue: exclusive open failed */ + case 66: /* qmail-queue: linking intdfn -> todofn */ + case 71: return "Zmail server temporarily rejected message (#4.3.0)"; + case 72: return "Zconnection to mail server timed out (#4.4.1)"; + case 73: return "Zconnection to mail server rejected (#4.4.1)"; + case 74: return "Zcommunication with mail server failed (#4.4.2)"; + case 91: /* fall through */ + case 81: return "Zqq internal bug (#4.3.0)"; case 115: /* compatibility */ case 120: return "Zunable to exec qq (#4.3.0)"; default: - if ((exitcode >= 11) && (exitcode <= 40)) - return "Dqq permanent problem (#5.3.0)"; + if ((exitcode >= 11) && (exitcode <= 40)) return "Dqq permanent problem (#5.3.0)"; return "Zqq temporary problem (#4.3.0)"; } } -- cgit v1.2.3