From: Ralph Corderoy Date: Mon, 1 May 2017 21:56:30 +0000 (+0100) Subject: dropsbr.c: Flip mbx_open()'s logic to simplify. X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/ca3143890523c6d3092f0e7c3f9aceffa698dbd9?hp=b705240a0933857f7248170bb1419391f651cff6 dropsbr.c: Flip mbx_open()'s logic to simplify. --- diff --git a/uip/dropsbr.c b/uip/dropsbr.c index a02e29c4..3109bcf7 100644 --- a/uip/dropsbr.c +++ b/uip/dropsbr.c @@ -46,19 +46,16 @@ mbx_open (char *file, int mbx_style, uid_t uid, gid_t gid, mode_t mode) /* attempt to open and lock file */ for (count = 4; count > 0; count--) { int failed_to_lock = 0; - if ((fd = lkopenspool (file, O_RDWR | O_CREAT | - O_NONBLOCK, mode, &failed_to_lock)) == NOTOK) { - if (failed_to_lock) { - j = errno; - sleep (5); - continue; - } else { - return NOTOK; - } - } - /* good file descriptor */ - break; + if ((fd = lkopenspool (file, O_RDWR | O_CREAT | O_NONBLOCK, + mode, &failed_to_lock)) != NOTOK) + break; + + if (!failed_to_lock) + return NOTOK; + + j = errno; + sleep (5); } errno = j;