Don't try to obey bwlimit restriction until bwlimit_writemax is set.
authorWayne Davison <wayned@samba.org>
Mon, 20 Feb 2006 17:50:36 +0000 (17:50 +0000)
committerWayne Davison <wayned@samba.org>
Mon, 20 Feb 2006 17:50:36 +0000 (17:50 +0000)
This fixes a bug with option errors not getting reported because the
write code gets called with bwlimit != 0 and bwlimit_writemax == 0.

io.c

diff --git a/io.c b/io.c
index 0948416..b69ae00 100644 (file)
--- a/io.c
+++ b/io.c
@@ -1011,7 +1011,7 @@ static void sleep_for_bwlimit(int bytes_written)
 
 #define ONE_SEC        1000000L /* # of microseconds in a second */
 
-       if (!bwlimit)
+       if (!bwlimit_writemax)
                return;
 
        total_written += bytes_written; 
@@ -1091,7 +1091,7 @@ static void writefd_unbuffered(int fd,char *buf,size_t len)
                        continue;
 
                n = len - total;
-               if (bwlimit && n > bwlimit_writemax)
+               if (bwlimit_writemax && n > bwlimit_writemax)
                        n = bwlimit_writemax;
                cnt = write(fd, buf + total, n);