This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [gold patch] Fix problem where --incremental-base with huge file reports "file too short"


Looking over this patch this morning, I realized that there's a
potential confusion between "this->base_", base, and base_size, so I
renamed the latter two variables. Here's the revised patch...

-cary


2011-10-11  Cary Coutant  <ccoutant@google.com>

	* gold/output.cc (Output_file::open_base_file): Handle case where
	::read returns less than requested size.


commit 4dbbb5bf9166e62d8fdfbf8184f2ef94b7ce3afb
Author: Cary Coutant <ccoutant@google.com>
Date:   Tue Oct 11 16:27:17 2011 -0700

    Add loop around ::read when reading base file.

diff --git a/gold/output.cc b/gold/output.cc
index d6bdaba..7b272e8 100644
--- a/gold/output.cc
+++ b/gold/output.cc
@@ -4893,17 +4893,27 @@ Output_file::open_base_file(const char*
base_name, bool writable)
   if (use_base_file)
     {
       this->open(s.st_size);
-      ssize_t len = ::read(o, this->base_, s.st_size);
-      if (len < 0)
-        {
-	  gold_info(_("%s: read failed: %s"), base_name, strerror(errno));
-	  return false;
-        }
-      if (len < s.st_size)
-        {
-	  gold_info(_("%s: file too short"), base_name);
-	  return false;
-        }
+      ssize_t bytes_to_read = s.st_size;
+      unsigned char* p = this->base_;
+      while (bytes_to_read > 0)
+	{
+	  ssize_t len = ::read(o, p, bytes_to_read);
+	  if (len < 0)
+	    {
+	      gold_info(_("%s: read failed: %s"), base_name, strerror(errno));
+	      return false;
+	    }
+	  if (len == 0)
+	    {
+	      gold_info(_("%s: file too short: read only %lld of %lld bytes"),
+			base_name,
+			static_cast<long long>(s.st_size - bytes_to_read),
+			static_cast<long long>(s.st_size));
+	      return false;
+	    }
+	  p += len;
+	  bytes_to_read -= len;
+	}
       ::close(o);
       return true;
     }


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]