1 files changed, 8 insertions, 6 deletions

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 <unistd.h>
 #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;
 }