From 692760720b197b46e8e4268bede8cad6f90399aa Mon Sep 17 00:00:00 2001 From: Manuel Mausz Date: Tue, 11 Jun 2019 15:28:27 +0200 Subject: Fix compile warnings... --- .gitignore | 1 + auto-gid.c | 2 +- auto-int.c | 2 +- auto-int8.c | 2 +- auto-str.c | 2 +- auto-uid.c | 2 +- bouncesaying.c | 1 + cdb_seek.c | 1 + cdbmss.c | 3 ++- cdbmss.h | 4 ++++ chkshsgr.c | 6 +++++- condredirect.c | 4 ++-- control.c | 2 +- dnscname.c | 2 +- dnsmxip.c | 1 + except.c | 1 + fd_copy.c | 1 + fd_move.c | 1 + forward.c | 4 ++-- hostname.c | 2 +- idedit.c | 3 ++- install.c | 4 +++- instcheck.c | 2 +- ipme.c | 1 + maildir.c | 1 + maildir2mbox.c | 5 ++++- maildirgetquota.c | 2 -- maildirmake.c | 3 +++ maildirmisc.h | 2 ++ maildiropen.c | 2 -- maildirquota.c | 6 ------ maildirwatch.c | 2 +- newfield.c | 1 + overmaildirquota.c | 11 ++++++----- predate.c | 3 ++- preline.c | 2 +- prot.c | 3 +++ qbiff.c | 2 +- qmail-clean.c | 2 +- qmail-getpw.c | 2 +- qmail-inject.c | 1 + qmail-local.c | 4 +++- qmail-lspawn.c | 3 +++ qmail-newbrt.c | 6 +++++- qmail-newmrh.c | 6 +++++- qmail-newu.c | 6 +++++- qmail-pop3d.c | 11 ++++++----- qmail-popup.c | 10 +++++----- qmail-pw2u.c | 3 ++- qmail-qmqpc.c | 13 +++++++------ qmail-qmqpd.c | 15 +++++++++------ qmail-qmtpd.c | 14 ++++++++------ qmail-qread.c | 2 +- qmail-queue.c | 2 +- qmail-remote.c | 10 +++++----- qmail-rspawn.c | 1 + qmail-send.c | 9 +++++---- qmail-showctl.c | 1 + qmail-smtpd.c | 11 ++++++----- qmail-spp.c | 2 +- qmail-start.c | 3 +++ qmail-tcpok.c | 2 +- qmail-tcpto.c | 3 +++ qmail.c | 2 +- qsmhook.c | 2 +- qsutil.c | 2 +- rcpthosts.c | 1 + realrcptto.c | 24 +++++++++++++----------- remoteinfo.c | 1 + scan.h | 1 + seek_cur.c | 1 + seek_end.c | 1 + seek_set.c | 1 + seek_trunc.c | 1 + sendmail.c | 2 +- slurpclose.c | 2 +- spawn.c | 1 + subfd.h | 4 ++-- subfderr.c | 2 +- subfdin.c | 4 ++-- subfdins.c | 4 ++-- subfdout.c | 2 +- subfdouts.c | 2 +- substdio.c | 2 +- substdio.h | 4 +++- tcp-env.c | 1 + tcpto.c | 2 +- tcpto_clean.c | 2 +- timeoutconn.c | 2 +- timeoutread.c | 4 ++-- timeoutread.h | 2 +- timeoutwrite.c | 2 +- trigger.c | 1 + triggerpull.c | 1 + 94 files changed, 200 insertions(+), 124 deletions(-) diff --git a/.gitignore b/.gitignore index 469dca4..978f39c 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,7 @@ case_diffs.o case_lowerb.o case_lowers.o case_starts.o +case_startb.o case.a getln.o getln2.o diff --git a/auto-gid.c b/auto-gid.c index 774a8c1..2727cfc 100644 --- a/auto-gid.c +++ b/auto-gid.c @@ -1,8 +1,8 @@ #include +#include #include #include "subfd.h" #include "substdio.h" -#include "readwrite.h" #include "exit.h" #include "scan.h" #include "fmt.h" diff --git a/auto-int.c b/auto-int.c index c138869..8af2b6c 100644 --- a/auto-int.c +++ b/auto-int.c @@ -1,5 +1,5 @@ +#include #include "substdio.h" -#include "readwrite.h" #include "exit.h" #include "scan.h" #include "fmt.h" diff --git a/auto-int8.c b/auto-int8.c index 091978f..2ff5dc7 100644 --- a/auto-int8.c +++ b/auto-int8.c @@ -1,5 +1,5 @@ +#include #include "substdio.h" -#include "readwrite.h" #include "exit.h" #include "scan.h" #include "fmt.h" diff --git a/auto-str.c b/auto-str.c index acc3d60..ae38f33 100644 --- a/auto-str.c +++ b/auto-str.c @@ -1,5 +1,5 @@ +#include #include "substdio.h" -#include "readwrite.h" #include "exit.h" char buf1[256]; diff --git a/auto-uid.c b/auto-uid.c index 326051c..6298a4f 100644 --- a/auto-uid.c +++ b/auto-uid.c @@ -1,8 +1,8 @@ #include +#include #include #include "subfd.h" #include "substdio.h" -#include "readwrite.h" #include "exit.h" #include "scan.h" #include "fmt.h" diff --git a/bouncesaying.c b/bouncesaying.c index c7d0026..cae5451 100644 --- a/bouncesaying.c +++ b/bouncesaying.c @@ -1,3 +1,4 @@ +#include #include "fork.h" #include "strerr.h" #include "error.h" diff --git a/cdb_seek.c b/cdb_seek.c index f31b87d..33e9f05 100644 --- a/cdb_seek.c +++ b/cdb_seek.c @@ -1,4 +1,5 @@ #include +#include #include #include "cdb.h" diff --git a/cdbmss.c b/cdbmss.c index 2d8f367..b39b5c7 100644 --- a/cdbmss.c +++ b/cdbmss.c @@ -1,4 +1,5 @@ -#include "readwrite.h" +#include +#include #include "seek.h" #include "alloc.h" #include "cdbmss.h" diff --git a/cdbmss.h b/cdbmss.h index 5e6bdf4..6b7e30f 100644 --- a/cdbmss.h +++ b/cdbmss.h @@ -13,4 +13,8 @@ struct cdbmss { int fd; } ; +int cdbmss_start(struct cdbmss *c, int fd); +int cdbmss_add(struct cdbmss *c, unsigned char *key, unsigned int keylen, + unsigned char *data, unsigned int datalen); +int cdbmss_finish(struct cdbmss *c); #endif diff --git a/chkshsgr.c b/chkshsgr.c index 2bcdade..bee9700 100644 --- a/chkshsgr.c +++ b/chkshsgr.c @@ -1,7 +1,11 @@ +#include +#include +#include #include "exit.h" + void main() { - short x[4]; + gid_t x[4]; x[0] = x[1] = 0; if (getgroups(1,x) == 0) if (setgroups(1,x) == -1) _exit(1); diff --git a/condredirect.c b/condredirect.c index 593d2f5..4b65c96 100644 --- a/condredirect.c +++ b/condredirect.c @@ -1,5 +1,5 @@ +#include #include "sig.h" -#include "readwrite.h" #include "exit.h" #include "env.h" #include "error.h" @@ -15,7 +15,7 @@ struct qmail qqt; -int mywrite(fd,buf,len) int fd; char *buf; int len; +ssize_t mywrite(fd,buf,len) int fd; char *buf; int len; { qmail_put(&qqt,buf,len); return len; diff --git a/control.c b/control.c index b655352..f3e4900 100644 --- a/control.c +++ b/control.c @@ -1,4 +1,4 @@ -#include "readwrite.h" +#include #include "open.h" #include "getln.h" #include "stralloc.h" diff --git a/dnscname.c b/dnscname.c index b3cd6f1..37a95c5 100644 --- a/dnscname.c +++ b/dnscname.c @@ -1,9 +1,9 @@ +#include #include "substdio.h" #include "subfd.h" #include "stralloc.h" #include "dns.h" #include "dnsdoe.h" -#include "readwrite.h" #include "exit.h" stralloc sa = {0}; diff --git a/dnsmxip.c b/dnsmxip.c index 6d8e137..de40aa5 100644 --- a/dnsmxip.c +++ b/dnsmxip.c @@ -1,3 +1,4 @@ +#include #include "substdio.h" #include "subfd.h" #include "stralloc.h" diff --git a/except.c b/except.c index c553b3b..4d14da6 100644 --- a/except.c +++ b/except.c @@ -1,3 +1,4 @@ +#include #include "fork.h" #include "strerr.h" #include "wait.h" diff --git a/fd_copy.c b/fd_copy.c index b9f7167..65d2345 100644 --- a/fd_copy.c +++ b/fd_copy.c @@ -1,4 +1,5 @@ #include +#include #include "fd.h" int fd_copy(to,from) diff --git a/fd_move.c b/fd_move.c index 1aa557f..09c474b 100644 --- a/fd_move.c +++ b/fd_move.c @@ -1,3 +1,4 @@ +#include #include "fd.h" int fd_move(to,from) diff --git a/forward.c b/forward.c index e7390aa..6cf0252 100644 --- a/forward.c +++ b/forward.c @@ -1,5 +1,5 @@ +#include #include "sig.h" -#include "readwrite.h" #include "exit.h" #include "env.h" #include "qmail.h" @@ -13,7 +13,7 @@ void die_nomem() { strerr_die2x(111,FATAL,"out of memory"); } struct qmail qqt; -int mywrite(fd,buf,len) int fd; char *buf; int len; +ssize_t mywrite(fd,buf,len) int fd; char *buf; int len; { qmail_put(&qqt,buf,len); return len; diff --git a/hostname.c b/hostname.c index 39c7f87..3dbae21 100644 --- a/hostname.c +++ b/hostname.c @@ -1,6 +1,6 @@ +#include #include "substdio.h" #include "subfd.h" -#include "readwrite.h" #include "exit.h" char host[256]; diff --git a/idedit.c b/idedit.c index e6747b5..5c209e2 100644 --- a/idedit.c +++ b/idedit.c @@ -1,7 +1,7 @@ #include +#include #include #include -#include "readwrite.h" #include "exit.h" #include "scan.h" #include "fmt.h" @@ -9,6 +9,7 @@ #include "open.h" #include "seek.h" #include "fork.h" +#include "wait.h" #define FATAL "idedit: fatal: " #define WARNING "idedit: warning: " diff --git a/install.c b/install.c index 95034f2..244072f 100644 --- a/install.c +++ b/install.c @@ -1,9 +1,11 @@ +#include +#include #include "substdio.h" #include "strerr.h" #include "error.h" #include "open.h" -#include "readwrite.h" #include "exit.h" +#include "fifo.h" extern void hier(); diff --git a/instcheck.c b/instcheck.c index d41efda..ed4900f 100644 --- a/instcheck.c +++ b/instcheck.c @@ -1,8 +1,8 @@ #include #include +#include #include "strerr.h" #include "error.h" -#include "readwrite.h" #include "exit.h" extern void hier(); diff --git a/ipme.c b/ipme.c index f636ab5..40bf926 100644 --- a/ipme.c +++ b/ipme.c @@ -8,6 +8,7 @@ #ifndef SIOCGIFCONF /* whatever works */ #include #endif +#include #include "hassalen.h" #include "byte.h" #include "ip.h" diff --git a/maildir.c b/maildir.c index efbd3d4..5ef3a5a 100644 --- a/maildir.c +++ b/maildir.c @@ -1,5 +1,6 @@ #include #include +#include #include "prioq.h" #include "env.h" #include "stralloc.h" diff --git a/maildir2mbox.c b/maildir2mbox.c index 7364441..39361f2 100644 --- a/maildir2mbox.c +++ b/maildir2mbox.c @@ -1,4 +1,7 @@ -#include "readwrite.h" +#include +#include +#include +#include #include "prioq.h" #include "env.h" #include "stralloc.h" diff --git a/maildirgetquota.c b/maildirgetquota.c index 1c541f8..a863f47 100644 --- a/maildirgetquota.c +++ b/maildirgetquota.c @@ -5,9 +5,7 @@ #include "maildirgetquota.h" #include "maildirmisc.h" -#if HAVE_UNISTD_H #include -#endif #include #include #include diff --git a/maildirmake.c b/maildirmake.c index 9863fef..0be327e 100644 --- a/maildirmake.c +++ b/maildirmake.c @@ -1,3 +1,6 @@ +#include +#include +#include #include "strerr.h" #include "exit.h" diff --git a/maildirmisc.h b/maildirmisc.h index 86743bc..dc96b55 100644 --- a/maildirmisc.h +++ b/maildirmisc.h @@ -136,6 +136,8 @@ char *maildir_getlink(const char *); int maildir_hasflag(const char *filename, char); +int user_over_maildirquota(const char *, const char *); + #define MAILDIR_DELETED(f) maildir_hasflag((f), 'T') #ifdef __cplusplus diff --git a/maildiropen.c b/maildiropen.c index bcaadd4..85e706b 100644 --- a/maildiropen.c +++ b/maildiropen.c @@ -12,9 +12,7 @@ #include #include #include -#if HAVE_UNISTD_H #include -#endif #include #include #include diff --git a/maildirquota.c b/maildirquota.c index e9ba47b..d5609c2 100644 --- a/maildirquota.c +++ b/maildirquota.c @@ -25,9 +25,7 @@ #endif #endif */ #include -/* #if HAVE_SYS_STAT_H */ #include -/* #endif */ #include #include "maildirquota.h" @@ -36,12 +34,8 @@ #include #include #include -/* #if HAVE_FCNTL_H */ #include -/* #endif */ -#if HAVE_UNISTD_H #include -#endif #include #include "numlib.h" diff --git a/maildirwatch.c b/maildirwatch.c index 40d8322..8a26f6e 100644 --- a/maildirwatch.c +++ b/maildirwatch.c @@ -1,3 +1,4 @@ +#include #include "getln.h" #include "substdio.h" #include "subfd.h" @@ -6,7 +7,6 @@ #include "str.h" #include "exit.h" #include "hfield.h" -#include "readwrite.h" #include "open.h" #include "headerbody.h" #include "maildir.h" diff --git a/newfield.c b/newfield.c index 78d6bb8..e2cd5d4 100644 --- a/newfield.c +++ b/newfield.c @@ -1,3 +1,4 @@ +#include #include "fmt.h" #include "datetime.h" #include "stralloc.h" diff --git a/overmaildirquota.c b/overmaildirquota.c index 5e1877c..553d3ec 100644 --- a/overmaildirquota.c +++ b/overmaildirquota.c @@ -6,11 +6,12 @@ #if HAVE_CONFIG_H #include "config.h" #endif -#include "maildirquota.h" -#include -#include -#include -#include +#include "maildirquota.h" +#include +#include +#include +#include +#include static const char rcsid[]="$Id: overquota.c,v 1.0 2002/06/09 16:21:05 mr \ sam Exp $"; diff --git a/predate.c b/predate.c index 9648f6e..46b81f3 100644 --- a/predate.c +++ b/predate.c @@ -1,4 +1,5 @@ #include +#include #include #include "datetime.h" #include "fork.h" @@ -8,8 +9,8 @@ #include "strerr.h" #include "substdio.h" #include "subfd.h" -#include "readwrite.h" #include "exit.h" +#include "sig.h" #define FATAL "predate: fatal: " diff --git a/preline.c b/preline.c index 1a4cef8..8ca1c38 100644 --- a/preline.c +++ b/preline.c @@ -1,6 +1,6 @@ +#include #include "fd.h" #include "sgetopt.h" -#include "readwrite.h" #include "strerr.h" #include "substdio.h" #include "exit.h" diff --git a/prot.c b/prot.c index a38e0f9..448fe95 100644 --- a/prot.c +++ b/prot.c @@ -1,3 +1,6 @@ +#include +#include +#include #include "hasshsgr.h" #include "prot.h" diff --git a/qbiff.c b/qbiff.c index 4e9f1d8..a068ad9 100644 --- a/qbiff.c +++ b/qbiff.c @@ -1,5 +1,6 @@ #include #include +#include #include #ifndef UTMP_FILE #ifdef _PATH_UTMP @@ -8,7 +9,6 @@ #define UTMP_FILE "/etc/utmp" #endif #endif -#include "readwrite.h" #include "stralloc.h" #include "substdio.h" #include "subfd.h" diff --git a/qmail-clean.c b/qmail-clean.c index 4926f86..cba8818 100644 --- a/qmail-clean.c +++ b/qmail-clean.c @@ -1,6 +1,6 @@ #include #include -#include "readwrite.h" +#include #include "sig.h" #include "now.h" #include "str.h" diff --git a/qmail-getpw.c b/qmail-getpw.c index 128c682..bd3419d 100644 --- a/qmail-getpw.c +++ b/qmail-getpw.c @@ -1,7 +1,7 @@ #include #include +#include #include -#include "readwrite.h" #include "substdio.h" #include "subfd.h" #include "error.h" diff --git a/qmail-inject.c b/qmail-inject.c index ac7ac32..43b53fe 100644 --- a/qmail-inject.c +++ b/qmail-inject.c @@ -1,3 +1,4 @@ +#include #include "sig.h" #include "substdio.h" #include "stralloc.h" diff --git a/qmail-local.c b/qmail-local.c index 1bafb34..0376408 100644 --- a/qmail-local.c +++ b/qmail-local.c @@ -1,6 +1,6 @@ #include #include -#include "readwrite.h" +#include #include "sig.h" #include "env.h" #include "byte.h" @@ -28,6 +28,8 @@ #include "myctime.h" #include "gfrom.h" #include "auto_patrn.h" +#include "maildirgetquota.h" +#include "maildirmisc.h" void usage() { strerr_die1x(100,"qmail-local: usage: qmail-local [ -nN ] user homedir local dash ext domain sender aliasempty"); } diff --git a/qmail-lspawn.c b/qmail-lspawn.c index 5109cc3..ab8b65d 100644 --- a/qmail-lspawn.c +++ b/qmail-lspawn.c @@ -1,3 +1,4 @@ +#include #include "fd.h" #include "wait.h" #include "prot.h" @@ -13,6 +14,8 @@ #include "auto_qmail.h" #include "auto_uids.h" #include "qlx.h" +#include "open.h" +#include "byte.h" char *aliasempty; diff --git a/qmail-newbrt.c b/qmail-newbrt.c index 9344444..93e05af 100644 --- a/qmail-newbrt.c +++ b/qmail-newbrt.c @@ -1,12 +1,16 @@ +#include +#include +#include +#include #include "strerr.h" #include "stralloc.h" #include "substdio.h" #include "getln.h" #include "exit.h" -#include "readwrite.h" #include "open.h" #include "auto_qmail.h" #include "cdbmss.h" +#include "case.h" #define FATAL "qmail-newbrt: fatal: " diff --git a/qmail-newmrh.c b/qmail-newmrh.c index 25a4a10..d9ff992 100644 --- a/qmail-newmrh.c +++ b/qmail-newmrh.c @@ -1,12 +1,16 @@ +#include +#include +#include +#include #include "strerr.h" #include "stralloc.h" #include "substdio.h" #include "getln.h" #include "exit.h" -#include "readwrite.h" #include "open.h" #include "auto_qmail.h" #include "cdbmss.h" +#include "case.h" #define FATAL "qmail-newmrh: fatal: " diff --git a/qmail-newu.c b/qmail-newu.c index 1f9ecc3..3d19c6f 100644 --- a/qmail-newu.c +++ b/qmail-newu.c @@ -1,14 +1,18 @@ +#include +#include +#include +#include #include "stralloc.h" #include "subfd.h" #include "getln.h" #include "substdio.h" #include "cdbmss.h" #include "exit.h" -#include "readwrite.h" #include "open.h" #include "error.h" #include "case.h" #include "auto_qmail.h" +#include "byte.h" void die_temp() { _exit(111); } diff --git a/qmail-pop3d.c b/qmail-pop3d.c index e299339..e547b24 100644 --- a/qmail-pop3d.c +++ b/qmail-pop3d.c @@ -1,5 +1,6 @@ #include #include +#include #include "commands.h" #include "sig.h" #include "getln.h" @@ -13,28 +14,28 @@ #include "str.h" #include "exit.h" #include "maildir.h" -#include "readwrite.h" #include "timeoutread.h" #include "timeoutwrite.h" #include #include "maildirquota.h" #include "maildirmisc.h" +#include "maildirgetquota.h" #define QUOTABUFSIZE 256 void die() { _exit(0); } -int saferead(fd,buf,len) int fd; char *buf; int len; +ssize_t saferead(fd,buf,len) int fd; char *buf; int len; { - int r; + ssize_t r; r = timeoutread(1200,fd,buf,len); if (r <= 0) die(); return r; } -int safewrite(fd,buf,len) int fd; char *buf; int len; +ssize_t safewrite(fd,buf,len) int fd; char *buf; int len; { - int r; + ssize_t r; r = timeoutwrite(1200,fd,buf,len); if (r <= 0) die(); return r; diff --git a/qmail-popup.c b/qmail-popup.c index 8e5bc76..10cc55a 100644 --- a/qmail-popup.c +++ b/qmail-popup.c @@ -1,3 +1,4 @@ +#include #include "commands.h" #include "fd.h" #include "sig.h" @@ -10,23 +11,22 @@ #include "now.h" #include "fmt.h" #include "exit.h" -#include "readwrite.h" #include "timeoutread.h" #include "timeoutwrite.h" void die() { _exit(1); } -int saferead(fd,buf,len) int fd; char *buf; int len; +ssize_t saferead(fd,buf,len) int fd; char *buf; int len; { - int r; + ssize_t r; r = timeoutread(1200,fd,buf,len); if (r <= 0) die(); return r; } -int safewrite(fd,buf,len) int fd; char *buf; int len; +ssize_t safewrite(fd,buf,len) int fd; char *buf; int len; { - int r; + ssize_t r; r = timeoutwrite(1200,fd,buf,len); if (r <= 0) die(); return r; diff --git a/qmail-pw2u.c b/qmail-pw2u.c index f068ab1..0257f39 100644 --- a/qmail-pw2u.c +++ b/qmail-pw2u.c @@ -1,7 +1,7 @@ #include #include +#include #include "substdio.h" -#include "readwrite.h" #include "subfd.h" #include "sgetopt.h" #include "control.h" @@ -17,6 +17,7 @@ #include "auto_qmail.h" #include "auto_usera.h" #include "exit.h" +#include "byte.h" void die_chdir() { diff --git a/qmail-qmqpc.c b/qmail-qmqpc.c index d5adf05..ef63ec8 100644 --- a/qmail-qmqpc.c +++ b/qmail-qmqpc.c @@ -2,9 +2,9 @@ #include #include #include +#include #include "substdio.h" #include "getln.h" -#include "readwrite.h" #include "exit.h" #include "stralloc.h" #include "slurpclose.h" @@ -34,16 +34,16 @@ void die_format() { _exit(91); } int lasterror = 55; int qmqpfd; -int saferead(fd,buf,len) int fd; char *buf; int len; +ssize_t saferead(fd,buf,len) int fd; char *buf; int len; { - int r; + ssize_t r; r = timeoutread(60,qmqpfd,buf,len); if (r <= 0) die_conn(); return r; } -int safewrite(fd,buf,len) int fd; char *buf; int len; +ssize_t safewrite(fd,buf,len) int fd; char *buf; int len; { - int r; + ssize_t r; r = timeoutwrite(60,qmqpfd,buf,len); if (r <= 0) die_conn(); return r; @@ -135,7 +135,7 @@ char *server; stralloc servers = {0}; -main() +int main() { int i; int j; @@ -156,4 +156,5 @@ main() } _exit(lasterror); + return 0; } diff --git a/qmail-qmqpd.c b/qmail-qmqpd.c index 86cb284..8726ab0 100644 --- a/qmail-qmqpd.c +++ b/qmail-qmqpd.c @@ -1,26 +1,28 @@ +#include #include "auto_qmail.h" #include "qmail.h" #include "received.h" #include "sig.h" #include "substdio.h" -#include "readwrite.h" #include "exit.h" #include "now.h" #include "fmt.h" #include "env.h" +#include "byte.h" +#include "str.h" void resources() { _exit(111); } -int safewrite(fd,buf,len) int fd; char *buf; int len; +ssize_t safewrite(fd,buf,len) int fd; char *buf; int len; { - int r; + ssize_t r; r = write(fd,buf,len); if (r <= 0) _exit(0); return r; } -int saferead(fd,buf,len) int fd; char *buf; int len; +ssize_t saferead(fd,buf,len) int fd; char *buf; int len; { - int r; + ssize_t r; r = read(fd,buf,len); if (r <= 0) _exit(0); return r; @@ -105,7 +107,7 @@ int getbuf() int flagok = 1; -main() +int main() { char *result; unsigned long qp; @@ -171,4 +173,5 @@ main() substdio_puts(&ssout,","); substdio_flush(&ssout); _exit(0); + return 0; } diff --git a/qmail-qmtpd.c b/qmail-qmtpd.c index 85a0f99..1055274 100644 --- a/qmail-qmtpd.c +++ b/qmail-qmtpd.c @@ -1,3 +1,4 @@ +#include #include "stralloc.h" #include "substdio.h" #include "qmail.h" @@ -8,10 +9,10 @@ #include "sig.h" #include "rcpthosts.h" #include "auto_qmail.h" -#include "readwrite.h" #include "control.h" #include "received.h" #include "exit.h" +#include "scan.h" void badproto() { _exit(100); } void resources() { _exit(111); } @@ -25,9 +26,9 @@ extern void realrcptto_start(); extern int realrcptto(); extern int realrcptto_deny(); -int safewrite(fd,buf,len) int fd; char *buf; int len; +ssize_t safewrite(fd,buf,len) int fd; char *buf; int len; { - int r; + ssize_t r; r = write(fd,buf,len); if (r <= 0) _exit(0); return r; @@ -36,9 +37,9 @@ int safewrite(fd,buf,len) int fd; char *buf; int len; char ssoutbuf[256]; substdio ssout = SUBSTDIO_FDBUF(safewrite,1,ssoutbuf,sizeof ssoutbuf); -int saferead(fd,buf,len) int fd; char *buf; int len; +ssize_t saferead(fd,buf,len) int fd; char *buf; int len; { - int r; + ssize_t r; substdio_flush(&ssout); r = read(fd,buf,len); if (r <= 0) _exit(0); @@ -84,7 +85,7 @@ stralloc failure = {0}; char *relayclient; int relayclientlen; -main() +int main() { char ch; int i; @@ -283,4 +284,5 @@ main() /* ssout will be flushed when we read from the network again */ } + return 0; } diff --git a/qmail-qread.c b/qmail-qread.c index 8ec0fbd..4bdc92f 100644 --- a/qmail-qread.c +++ b/qmail-qread.c @@ -1,5 +1,6 @@ #include #include +#include #include "stralloc.h" #include "substdio.h" #include "subfd.h" @@ -12,7 +13,6 @@ #include "open.h" #include "datetime.h" #include "date822fmt.h" -#include "readwrite.h" #include "error.h" #include "exit.h" diff --git a/qmail-queue.c b/qmail-queue.c index 7d5ed67..e7272b0 100644 --- a/qmail-queue.c +++ b/qmail-queue.c @@ -1,6 +1,6 @@ #include #include -#include "readwrite.h" +#include #include "sig.h" #include "exit.h" #include "open.h" diff --git a/qmail-remote.c b/qmail-remote.c index 58437da..0e2377e 100644 --- a/qmail-remote.c +++ b/qmail-remote.c @@ -3,6 +3,7 @@ #include #include #include +#include #include "sig.h" #include "stralloc.h" #include "substdio.h" @@ -26,7 +27,6 @@ #include "exit.h" #include "constmap.h" #include "tcpto.h" -#include "readwrite.h" #include "timeoutconn.h" #include "timeoutread.h" #include "timeoutwrite.h" @@ -161,9 +161,9 @@ int timeoutconnect = 60; int smtpfd; int timeout = 1200; -int saferead(fd,buf,len) int fd; char *buf; int len; +ssize_t saferead(fd,buf,len) int fd; char *buf; int len; { - int r; + ssize_t r; #ifdef TLS if (ssl) { r = ssl_timeoutread(timeout, smtpfd, smtpfd, ssl, buf, len); @@ -174,9 +174,9 @@ int saferead(fd,buf,len) int fd; char *buf; int len; if (r <= 0) dropped(); return r; } -int safewrite(fd,buf,len) int fd; char *buf; int len; +ssize_t safewrite(fd,buf,len) int fd; char *buf; int len; { - int r; + ssize_t r; #ifdef TLS if (ssl) { r = ssl_timeoutwrite(timeout, smtpfd, smtpfd, ssl, buf, len); diff --git a/qmail-rspawn.c b/qmail-rspawn.c index 0177c8b..e0a9d5e 100644 --- a/qmail-rspawn.c +++ b/qmail-rspawn.c @@ -1,3 +1,4 @@ +#include #include "fd.h" #include "wait.h" #include "substdio.h" diff --git a/qmail-send.c b/qmail-send.c index 8c6237e..9d76228 100644 --- a/qmail-send.c +++ b/qmail-send.c @@ -1,6 +1,7 @@ #include #include -#include "readwrite.h" +#include +#include #include "sig.h" #include "direntry.h" #include "control.h" @@ -484,15 +485,15 @@ void pqfinish() { int c; struct prioq_elt pe; - time_t ut[2]; /* XXX: more portable than utimbuf, but still worrisome */ + struct utimbuf ut; for (c = 0;c < CHANNELS;++c) while (prioq_min(&pqchan[c],&pe)) { prioq_delmin(&pqchan[c]); fnmake_chanaddr(pe.id,c); - ut[0] = ut[1] = pe.dt; - if (utime(fn.s,ut) == -1) + ut.actime = ut.modtime = pe.dt; + if (utime(fn.s,&ut) == -1) log3("warning: unable to utime ",fn.s,"; message will be retried too soon\n"); } } diff --git a/qmail-showctl.c b/qmail-showctl.c index 9d4e1bc..50755c4 100644 --- a/qmail-showctl.c +++ b/qmail-showctl.c @@ -1,5 +1,6 @@ #include #include +#include #include "substdio.h" #include "subfd.h" #include "exit.h" diff --git a/qmail-smtpd.c b/qmail-smtpd.c index 3352911..38c5929 100644 --- a/qmail-smtpd.c +++ b/qmail-smtpd.c @@ -1,6 +1,7 @@ #include +#include +#include #include "sig.h" -#include "readwrite.h" #include "stralloc.h" #include "substdio.h" #include "alloc.h" @@ -86,9 +87,9 @@ int smtputf8 = 0; int flagauth = 0; char **childargs; -int safewrite(fd,buf,len) int fd; char *buf; int len; +ssize_t safewrite(fd,buf,len) int fd; char *buf; int len; { - int r; + ssize_t r; #ifdef TLS if (ssl && fd == ssl_wfd) r = ssl_timeoutwrite(timeout, ssl_rfd, ssl_wfd, ssl, buf, len); @@ -796,9 +797,9 @@ void smtp_rcpt(arg) char *arg; { } -int saferead(fd,buf,len) int fd; char *buf; int len; +ssize_t saferead(fd,buf,len) int fd; char *buf; int len; { - int r; + ssize_t r; flush(); #ifdef TLS if (ssl && fd == ssl_rfd) diff --git a/qmail-spp.c b/qmail-spp.c index 78ab9e7..dbe14bf 100644 --- a/qmail-spp.c +++ b/qmail-spp.c @@ -29,7 +29,7 @@ * */ -#include "readwrite.h" +#include #include "stralloc.h" #include "substdio.h" #include "control.h" diff --git a/qmail-start.c b/qmail-start.c index 37423b0..866de0d 100644 --- a/qmail-start.c +++ b/qmail-start.c @@ -1,3 +1,6 @@ +#include +#include +#include #include "fd.h" #include "prot.h" #include "exit.h" diff --git a/qmail-tcpok.c b/qmail-tcpok.c index a9b9652..d99cca5 100644 --- a/qmail-tcpok.c +++ b/qmail-tcpok.c @@ -1,8 +1,8 @@ +#include #include "strerr.h" #include "substdio.h" #include "lock.h" #include "open.h" -#include "readwrite.h" #include "auto_qmail.h" #include "exit.h" diff --git a/qmail-tcpto.c b/qmail-tcpto.c index d181ecf..ecf2ecc 100644 --- a/qmail-tcpto.c +++ b/qmail-tcpto.c @@ -1,5 +1,6 @@ /* XXX: this program knows quite a bit about tcpto's internals */ +#include #include "substdio.h" #include "subfd.h" #include "auto_qmail.h" @@ -10,6 +11,8 @@ #include "exit.h" #include "datetime.h" #include "now.h" +#include "open.h" +#include "byte.h" void die(n) int n; { substdio_flush(subfdout); _exit(n); } diff --git a/qmail.c b/qmail.c index e61260f..5b7c449 100644 --- a/qmail.c +++ b/qmail.c @@ -1,5 +1,5 @@ +#include #include "substdio.h" -#include "readwrite.h" #include "wait.h" #include "exit.h" #include "fork.h" diff --git a/qsmhook.c b/qsmhook.c index d5b38aa..a024683 100644 --- a/qsmhook.c +++ b/qsmhook.c @@ -1,6 +1,6 @@ +#include #include "fd.h" #include "stralloc.h" -#include "readwrite.h" #include "sgetopt.h" #include "wait.h" #include "env.h" diff --git a/qsutil.c b/qsutil.c index 43890d0..0e07953 100644 --- a/qsutil.c +++ b/qsutil.c @@ -1,5 +1,5 @@ +#include #include "stralloc.h" -#include "readwrite.h" #include "substdio.h" #include "qsutil.h" diff --git a/rcpthosts.c b/rcpthosts.c index 1bc3018..9e8dc66 100644 --- a/rcpthosts.c +++ b/rcpthosts.c @@ -6,6 +6,7 @@ #include "constmap.h" #include "stralloc.h" #include "rcpthosts.h" +#include "case.h" static int flagrh = 0; static stralloc rh = {0}; diff --git a/realrcptto.c b/realrcptto.c index 0f275ba..f5f6f15 100644 --- a/realrcptto.c +++ b/realrcptto.c @@ -1,5 +1,6 @@ #include #include +#include #include #include #include @@ -19,7 +20,6 @@ #include "env.h" #include "slurpclose.h" #include "control.h" -#include "readwrite.h" extern void die_nomem(); extern void die_control(); @@ -50,6 +50,8 @@ static char remoteipbuf[64]=" "; static int flagdenyall; static int flagdenyany; +int realrcptto(char *addr, int depth); + void realrcptto_init() { char *x; @@ -276,16 +278,7 @@ int depth; return 1; } -int realrcptto(addr, depth) -char *addr; -int depth; -{ - env_unset("DTUSER"); - extension = NULL; - return realrcptto_ex(addr, depth); -} - -int realrcptto_ex(addr, depth) +static int realrcptto_ex(addr, depth) char *addr; int depth; { @@ -476,6 +469,15 @@ int depth; } } +int realrcptto(addr, depth) +char *addr; +int depth; +{ + env_unset("DTUSER"); + extension = NULL; + return realrcptto_ex(addr, depth); +} + int realrcptto_deny() { return flagdenyall && flagdenyany; diff --git a/remoteinfo.c b/remoteinfo.c index c7abd70..45725d2 100644 --- a/remoteinfo.c +++ b/remoteinfo.c @@ -2,6 +2,7 @@ #include #include #include +#include #include "byte.h" #include "substdio.h" #include "ip.h" diff --git a/scan.h b/scan.h index 53ce703..548d599 100644 --- a/scan.h +++ b/scan.h @@ -10,6 +10,7 @@ extern unsigned int scan_nbbshort(); extern unsigned int scan_ulong(); extern unsigned int scan_xlong(); extern unsigned int scan_nbblong(); +extern unsigned int scan_8long(); extern unsigned int scan_plusminus(); extern unsigned int scan_0x(); diff --git a/seek_cur.c b/seek_cur.c index c8a3ee8..9c6b32c 100644 --- a/seek_cur.c +++ b/seek_cur.c @@ -1,4 +1,5 @@ #include +#include #include "seek.h" #define CUR 1 /* sigh */ diff --git a/seek_end.c b/seek_end.c index 8a7b3c5..10b9190 100644 --- a/seek_end.c +++ b/seek_end.c @@ -1,4 +1,5 @@ #include +#include #include "seek.h" #define END 2 /* sigh */ diff --git a/seek_set.c b/seek_set.c index f540664..56088a3 100644 --- a/seek_set.c +++ b/seek_set.c @@ -1,4 +1,5 @@ #include +#include #include "seek.h" #define SET 0 /* sigh */ diff --git a/seek_trunc.c b/seek_trunc.c index 6a1a73e..06ba1d4 100644 --- a/seek_trunc.c +++ b/seek_trunc.c @@ -1,4 +1,5 @@ #include +#include #include "seek.h" int seek_trunc(fd,pos) int fd; seek_pos pos; diff --git a/sendmail.c b/sendmail.c index c82a536..04c2650 100644 --- a/sendmail.c +++ b/sendmail.c @@ -1,3 +1,4 @@ +#include #include "sgetopt.h" #include "substdio.h" #include "subfd.h" @@ -8,7 +9,6 @@ #include "str.h" #include "stralloc.h" #include "getln.h" -#include "readwrite.h" #include "wait.h" #include "fd.h" #include "sig.h" diff --git a/slurpclose.c b/slurpclose.c index 2fcef15..3b3808c 100644 --- a/slurpclose.c +++ b/slurpclose.c @@ -1,5 +1,5 @@ +#include #include "stralloc.h" -#include "readwrite.h" #include "slurpclose.h" #include "error.h" diff --git a/spawn.c b/spawn.c index 20e3d16..57e168d 100644 --- a/spawn.c +++ b/spawn.c @@ -1,3 +1,4 @@ +#include #include #include #include "alloc.h" diff --git a/subfd.h b/subfd.h index bcb2e1e..e58c1c6 100644 --- a/subfd.h +++ b/subfd.h @@ -9,7 +9,7 @@ extern substdio *subfdout; extern substdio *subfdoutsmall; extern substdio *subfderr; -extern int subfd_read(); -extern int subfd_readsmall(); +extern ssize_t subfd_read(); +extern ssize_t subfd_readsmall(); #endif diff --git a/subfderr.c b/subfderr.c index 011ab0f..bed54f0 100644 --- a/subfderr.c +++ b/subfderr.c @@ -1,4 +1,4 @@ -#include "readwrite.h" +#include #include "substdio.h" #include "subfd.h" diff --git a/subfdin.c b/subfdin.c index a11d323..88fc718 100644 --- a/subfdin.c +++ b/subfdin.c @@ -1,8 +1,8 @@ -#include "readwrite.h" +#include #include "substdio.h" #include "subfd.h" -int subfd_read(fd,buf,len) int fd; char *buf; int len; +ssize_t subfd_read(fd,buf,len) int fd; char *buf; int len; { if (substdio_flush(subfdout) == -1) return -1; return read(fd,buf,len); diff --git a/subfdins.c b/subfdins.c index 36983ac..45dc949 100644 --- a/subfdins.c +++ b/subfdins.c @@ -1,8 +1,8 @@ -#include "readwrite.h" +#include #include "substdio.h" #include "subfd.h" -int subfd_readsmall(fd,buf,len) int fd; char *buf; int len; +ssize_t subfd_readsmall(fd,buf,len) int fd; char *buf; int len; { if (substdio_flush(subfdoutsmall) == -1) return -1; return read(fd,buf,len); diff --git a/subfdout.c b/subfdout.c index 0aee102..ac3a008 100644 --- a/subfdout.c +++ b/subfdout.c @@ -1,4 +1,4 @@ -#include "readwrite.h" +#include #include "substdio.h" #include "subfd.h" diff --git a/subfdouts.c b/subfdouts.c index 5be356d..e9c47c1 100644 --- a/subfdouts.c +++ b/subfdouts.c @@ -1,4 +1,4 @@ -#include "readwrite.h" +#include #include "substdio.h" #include "subfd.h" diff --git a/substdio.c b/substdio.c index d03dff2..4c1bb97 100644 --- a/substdio.c +++ b/substdio.c @@ -2,7 +2,7 @@ void substdio_fdbuf(s,op,fd,buf,len) register substdio *s; -register int (*op)(); +register ssize_t (*op)(); register int fd; register char *buf; register int len; diff --git a/substdio.h b/substdio.h index c3f7f7d..bb9dac9 100644 --- a/substdio.h +++ b/substdio.h @@ -1,12 +1,14 @@ #ifndef SUBSTDIO_H #define SUBSTDIO_H +#include + typedef struct substdio { char *x; int p; int n; int fd; - int (*op)(); + ssize_t (*op)(); } substdio; #define SUBSTDIO_FDBUF(op,fd,buf,len) { (buf), 0, (len), (fd), (op) } diff --git a/tcp-env.c b/tcp-env.c index feb85cc..ca15088 100644 --- a/tcp-env.c +++ b/tcp-env.c @@ -2,6 +2,7 @@ #include #include #include +#include #include "sig.h" #include "stralloc.h" #include "str.h" diff --git a/tcpto.c b/tcpto.c index 8d100d5..2582cfb 100644 --- a/tcpto.c +++ b/tcpto.c @@ -1,3 +1,4 @@ +#include #include "tcpto.h" #include "open.h" #include "lock.h" @@ -6,7 +7,6 @@ #include "ip.h" #include "byte.h" #include "datetime.h" -#include "readwrite.h" char tcpto_buf[1024]; diff --git a/tcpto_clean.c b/tcpto_clean.c index ed48506..ba246c2 100644 --- a/tcpto_clean.c +++ b/tcpto_clean.c @@ -1,7 +1,7 @@ +#include #include "tcpto.h" #include "open.h" #include "substdio.h" -#include "readwrite.h" char tcpto_cleanbuf[1024]; diff --git a/timeoutconn.c b/timeoutconn.c index 33a16d9..e6d5f19 100644 --- a/timeoutconn.c +++ b/timeoutconn.c @@ -2,10 +2,10 @@ #include #include #include +#include #include "ndelay.h" #include "select.h" #include "error.h" -#include "readwrite.h" #include "ip.h" #include "byte.h" #include "timeoutconn.h" diff --git a/timeoutread.c b/timeoutread.c index c75e29c..a730ba2 100644 --- a/timeoutread.c +++ b/timeoutread.c @@ -1,9 +1,9 @@ +#include #include "timeoutread.h" #include "select.h" #include "error.h" -#include "readwrite.h" -int timeoutread(t,fd,buf,len) int t; int fd; char *buf; int len; +ssize_t timeoutread(t,fd,buf,len) int t; int fd; char *buf; int len; { fd_set rfds; struct timeval tv; diff --git a/timeoutread.h b/timeoutread.h index 20d3bfc..13a525f 100644 --- a/timeoutread.h +++ b/timeoutread.h @@ -1,6 +1,6 @@ #ifndef TIMEOUTREAD_H #define TIMEOUTREAD_H -extern int timeoutread(); +extern ssize_t timeoutread(); #endif diff --git a/timeoutwrite.c b/timeoutwrite.c index 516d283..2ec7641 100644 --- a/timeoutwrite.c +++ b/timeoutwrite.c @@ -1,7 +1,7 @@ +#include #include "timeoutwrite.h" #include "select.h" #include "error.h" -#include "readwrite.h" int timeoutwrite(t,fd,buf,len) int t; int fd; char *buf; int len; { diff --git a/trigger.c b/trigger.c index 39f81b8..82f7e28 100644 --- a/trigger.c +++ b/trigger.c @@ -1,3 +1,4 @@ +#include #include "select.h" #include "open.h" #include "trigger.h" diff --git a/triggerpull.c b/triggerpull.c index 30b9a97..efa200b 100644 --- a/triggerpull.c +++ b/triggerpull.c @@ -1,3 +1,4 @@ +#include #include "ndelay.h" #include "open.h" #include "triggerpull.h" -- cgit v1.2.3