X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fdropsbr.c;h=0ce5425bce4e1e3e99bfa1b9ad1d2cc1a6c211a8;hb=5d690daafbcd4ed26d19610fcc017999ee5af892;hp=f093c2fd4824c53b5200189683fa6e66ccf32eb8;hpb=ef1216bc36bd48ceb7549ae76aa7c26e3be4d9e4;p=mmh diff --git a/uip/dropsbr.c b/uip/dropsbr.c index f093c2f..0ce5425 100644 --- a/uip/dropsbr.c +++ b/uip/dropsbr.c @@ -6,18 +6,15 @@ ** complete copyright information. */ -#include -#include - #include +#include #include #include - -#ifdef HAVE_ERRNO_H -# include -#endif - +#include #include +#include +#include +#include /* @@ -25,7 +22,7 @@ ** a file or maildrop. */ int -mbx_open(char *file, uid_t uid, gid_t gid, mode_t mode) +mbox_open(char *file, uid_t uid, gid_t gid, mode_t mode) { int i, count, fd; struct stat st; @@ -48,7 +45,7 @@ mbx_open(char *file, uid_t uid, gid_t gid, mode_t mode) case ETXTBSY: i = errno; sleep(5); - break; + continue; default: /* just return error */ @@ -102,7 +99,7 @@ mbx_open(char *file, uid_t uid, gid_t gid, mode_t mode) ** Append message to end of mbox. */ int -mbx_copy(int to, int from) +mbox_copy(int to, int from) { int i; char buffer[BUFSIZ]; @@ -173,7 +170,7 @@ mbx_copy(int to, int from) if (i != 0 && strncmp(buffer, "From ", 5) == 0) { write(to, ">", 1); } - if (write(to, buffer, strlen(buffer)) != strlen(buffer)) { + if (write(to, buffer, strlen(buffer)) != (int)strlen(buffer)) { fclose(fp); return NOTOK; } @@ -194,7 +191,7 @@ mbx_copy(int to, int from) ** Close and unlock file/maildrop. */ int -mbx_close(char *mailbox, int md) +mbox_close(char *mailbox, int md) { if (lkclose(md, mailbox) == 0) return OK;