Author: Andreas Beckmann <anbe@debian.org>
Description: fix building with -Werror=implicit-function-declaration

--- a/auto-str.c
+++ b/auto-str.c
@@ -5,7 +5,7 @@
 char buf1[256];
 substdio ss1 = SUBSTDIO_FDBUF(write,1,buf1,sizeof(buf1));
 
-void puts(s)
+void xputs(s)
 char *s;
 {
   if (substdio_puts(&ss1,s) == -1) _exit(111);
@@ -25,20 +25,20 @@ char **argv;
   value = argv[2];
   if (!value) _exit(100);
 
-  puts("char ");
-  puts(name);
-  puts("[] = \"\\\n");
+  xputs("char ");
+  xputs(name);
+  xputs("[] = \"\\\n");
 
   while (ch = *value++) {
-    puts("\\");
+    xputs("\\");
     octal[3] = 0;
     octal[2] = '0' + (ch & 7); ch >>= 3;
     octal[1] = '0' + (ch & 7); ch >>= 3;
     octal[0] = '0' + (ch & 7);
-    puts(octal);
+    xputs(octal);
   }
 
-  puts("\\\n\";\n");
+  xputs("\\\n\";\n");
   if (substdio_flush(&ss1) == -1) _exit(111);
   _exit(0);
 }
--- a/readwrite.h
+++ b/readwrite.h
@@ -1,7 +1,11 @@
 #ifndef READWRITE_H
 #define READWRITE_H
 
+#if 1
+#include <unistd.h>
+#else
 extern int read();
 extern int write();
+#endif
 
 #endif
--- a/alloc.c
+++ b/alloc.c
@@ -1,7 +1,11 @@
 #include "alloc.h"
 #include "error.h"
+#if 1
+#include <stdlib.h>
+#else
 extern char *malloc();
 extern void free();
+#endif
 
 #define ALIGNMENT 16 /* XXX: assuming that this alignment is enough */
 #define SPACE 4096 /* must be multiple of ALIGNMENT */
--- a/cdb.h
+++ b/cdb.h
@@ -1,6 +1,7 @@
 #ifndef CDB_H
 #define CDB_H
 
+#include <unistd.h>
 #include "uint32.h"
 
 extern uint32 cdb_hash();
--- a/seek.h
+++ b/seek.h
@@ -1,6 +1,8 @@
 #ifndef SEEK_H
 #define SEEK_H
 
+#include <unistd.h>
+
 typedef unsigned long seek_pos;
 
 extern seek_pos seek_cur();
--- a/fd.h
+++ b/fd.h
@@ -1,6 +1,8 @@
 #ifndef FD_H
 #define FD_H
 
+#include <unistd.h>
+
 extern int fd_copy();
 extern int fd_move();
 
--- 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
--- a/newaliases.c
+++ b/newaliases.c
@@ -1,3 +1,5 @@
+#include <sys/stat.h>
+#include <stdio.h>
 #include "substdio.h"
 #include "strerr.h"
 #include "stralloc.h"
@@ -9,6 +11,7 @@
 #include "auto_qmail.h"
 #include "case.h"
 #include "cdbmss.h"
+#include "byte.h"
 
 #define FATAL "newaliases: fatal: "
 
--- a/fastforward.c
+++ b/fastforward.c
@@ -18,6 +18,11 @@
 #include "seek.h"
 #include "wait.h"
 #include "fork.h"
+#include "str.h"
+#include "byte.h"
+#include "slurpclose.h"
+#include "cdb.h"
+#include "open.h"
 
 #define FATAL "fastforward: fatal: "
 
@@ -53,7 +58,7 @@ struct qmail qq;
 char qp[FMT_ULONG];
 char qqbuf[1];
 
-int qqwrite(fd,buf,len) int fd; char *buf; int len;
+ssize_t qqwrite(fd,buf,len) int fd; const void *buf; size_t len;
 {
   qmail_put(&qq,buf,len);
   return len;
@@ -62,7 +67,7 @@ int qqwrite(fd,buf,len) int fd; char *bu
 substdio ssqq = SUBSTDIO_FDBUF(qqwrite,-1,qqbuf,sizeof qqbuf);
 
 char messbuf[4096];
-substdio ssmess = SUBSTDIO_FDBUF(read,0,messbuf,sizeof messbuf);
+substdio ssmess = SUBSTDIO_FDBUF((substdio_op)read,0,messbuf,sizeof messbuf);
 
 int flagdeliver = 1;
 int flagpassthrough = 0;
--- a/printmaillist.c
+++ b/printmaillist.c
@@ -1,8 +1,10 @@
+#include <unistd.h>
 #include "substdio.h"
 #include "subfd.h"
 #include "strerr.h"
 #include "stralloc.h"
 #include "getln.h"
+#include "str.h"
 
 #define FATAL "printmaillist: fatal: "
 
--- a/setforward.c
+++ b/setforward.c
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include "substdio.h"
 #include "subfd.h"
 #include "strerr.h"
--- a/setmaillist.c
+++ b/setmaillist.c
@@ -1,3 +1,5 @@
+#include <stdio.h>
+#include <sys/stat.h>
 #include "substdio.h"
 #include "subfd.h"
 #include "strerr.h"
@@ -5,6 +7,7 @@
 #include "getln.h"
 #include "open.h"
 #include "readwrite.h"
+#include "byte.h"
 
 #define FATAL "setmaillist: fatal: "
 
--- a/newinclude.c
+++ b/newinclude.c
@@ -1,3 +1,5 @@
+#include <stdio.h>
+#include <sys/stat.h>
 #include "substdio.h"
 #include "strerr.h"
 #include "stralloc.h"
@@ -8,6 +10,7 @@
 #include "control.h"
 #include "auto_qmail.h"
 #include "env.h"
+#include "byte.h"
 
 #define FATAL "newinclude: fatal: "
 
--- 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)(int, const void*, size_t);
 register int fd;
 register char *buf;
 register int len;
--- a/substdio.h
+++ b/substdio.h
@@ -1,12 +1,16 @@
 #ifndef SUBSTDIO_H
 #define SUBSTDIO_H
 
+#include <sys/types.h>
+
+typedef ssize_t (*substdio_op)(int, const void *, size_t);
+
 typedef struct substdio {
   char *x;
   int p;
   int n;
   int fd;
-  int (*op)();
+  substdio_op op;
 } substdio;
 
 #define SUBSTDIO_FDBUF(op,fd,buf,len) { (buf), 0, (len), (fd), (op) }
--- a/subfdins.c
+++ b/subfdins.c
@@ -2,12 +2,12 @@
 #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; void *buf; size_t len;
 {
   if (substdio_flush(subfdoutsmall) == -1) return -1;
   return read(fd,buf,len);
 }
 
 char subfd_inbufsmall[256];
-static substdio it = SUBSTDIO_FDBUF(subfd_readsmall,0,subfd_inbufsmall,256);
+static substdio it = SUBSTDIO_FDBUF((substdio_op)subfd_readsmall,0,subfd_inbufsmall,256);
 substdio *subfdinsmall = &it;
--- a/subfd.h
+++ b/subfd.h
@@ -10,6 +10,6 @@ extern substdio *subfdoutsmall;
 extern substdio *subfderr;
 
 extern int subfd_read();
-extern int subfd_readsmall();
+extern ssize_t subfd_readsmall();
 
 #endif