commit f8dba77dc88c37abdcaadff4ae9651cd59997f0b
author Ferenc Wagner <wferi@afavant.elte.hu> Tue Jul 06 21:03:22 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Jul 06 21:03:22 2004 +0000
tree fc2dfdeef682ec0a9e670d0a047492323fce2c5f
parent 13414ae86708fae1fe1bbd398f84ca18fe06c572

Suppress some more error message boxes.
Truncate report file if too big.

programs/winetest/send.c

diff --git a/programs/winetest/send.c b/programs/winetest/send.c
index e95fc24..6cd2e9f 100644
--- a/programs/winetest/send.c
+++ b/programs/winetest/send.c
@@ -140,9 +140,9 @@
     filesize = ftell (f);
     if (filesize > 1024*1024) {
         report (R_WARNING,
-                "File too big (%d > 1 MB), copy and submit manually",
-                filesize);
-        goto abort2;
+                "File too big (%.1f MB > 1 MB); submitting partial report.",
+                filesize/1024.0/1024);
+        filesize = 1024*1024;
     }
     fseek (f, 0, SEEK_SET);
 
@@ -159,7 +159,14 @@
 
     report (R_STATUS, "Sending %u bytes of data", filesize);
     report (R_PROGRESS, 2, filesize);
-    while ((bytes_read = fread (buffer, 1, BUFLEN / 2, f))) {
+    total = 0;
+    while (total < filesize && (bytes_read = fread (buffer, 1, BUFLEN/2, f))) {
+        if ((signed)bytes_read == -1) {
+            report (R_WARNING, "Error reading log file: %d", errno);
+            goto abort2;
+        }
+        total += bytes_read;
+        if (total > filesize) bytes_read -= total - filesize;
         if (send_buf (s, buffer, bytes_read)) {
             report (R_WARNING, "Error sending body: %d, %d",
                     errno, WSAGetLastError ());