Changeset 12811

Timestamp:

Sep 11, 2009, 3:51:22 AM (15 years ago)

Author:

Gary Byers

Message:

#include <limits.h>, so that we can refer to INT_MAX (largest signed 'int').
In load_image_section(), mem_size needs to be a natural, not an int.
In writebuf(), don't try to write more than INT_MAX bytes at a time, since
The World's Most Powerful Operating System can't do so.
(These changes are intended to support loading/saving images larger than
2GB.)

File:

• trunk/source/lisp-kernel/image.c (modified) (3 diffs)

trunk/source/lisp-kernel/image.c

@@ -26 +26 @@
 #endif
 #include <stdio.h>
+#include <limits.h>
 
 
@@ -175 +176 @@
   off_t
     pos = seek_to_next_page(fd), advance;
-  int 
+  natural
     mem_size = sect->memory_size;
   void *addr;
@@ -379 +380 @@
 writebuf(int fd, char *bytes, natural n)
 {
-  natural remain = n;
-  int result;
+  natural remain = n, this_size;
+  signed_natural result;
 
   while (remain) {
-    result = write(fd, bytes, remain);
+    this_size = remain;
+    if (this_size > INT_MAX) {
+      this_size = INT_MAX;
+    }
+    result = write(fd, bytes, this_size);
     if (result < 0) {
       return errno;
     }
     bytes += result;
+
     remain -= result;
   }