Upstream qmail 1.03

[qmail] / timeoutread.c

diff --git a/timeoutread.c b/timeoutread.c
index 4cebf544c8f3294b53b82af27f402c036df3409e..c75e29c87dbab57167ebbe701d457df46e776365 100644 (file)
--- a/timeoutread.c
+++ b/timeoutread.c
@@ -3,23 +3,20 @@
 #include "error.h"
 #include "readwrite.h"
 
 #include "error.h"
 #include "readwrite.h"
 

-int timeoutread(fdt,buf,len) int fdt; char *buf; int len;
+int timeoutread(t,fd,buf,len) int t; int fd; char *buf; int len;

 {
   fd_set rfds;
   struct timeval tv;
 {
   fd_set rfds;
   struct timeval tv;

-  int fd;

 
 

-  tv.tv_sec = (fdt >> 10);
+  tv.tv_sec = t;

   tv.tv_usec = 0;
 
   tv.tv_usec = 0;
 

-  fd = (fdt & 1023);

   FD_ZERO(&rfds);
   FD_SET(fd,&rfds);
 
   if (select(fd + 1,&rfds,(fd_set *) 0,(fd_set *) 0,&tv) == -1) return -1;
   if (FD_ISSET(fd,&rfds)) return read(fd,buf,len);
 
   FD_ZERO(&rfds);
   FD_SET(fd,&rfds);
 
   if (select(fd + 1,&rfds,(fd_set *) 0,(fd_set *) 0,&tv) == -1) return -1;
   if (FD_ISSET(fd,&rfds)) return read(fd,buf,len);
 

-  shutdown(fd,0);

   errno = error_timeout;
   return -1;
 }
   errno = error_timeout;
   return -1;
 }