From b0ed595e249d4accc8e9ab66b74d5f342a96683d Mon Sep 17 00:00:00 2001
From: Greg Hewgill <greg@hewgill.com>
Date: Wed, 27 Apr 2011 07:38:53 +1200
Subject: [PATCH] FileLister: don't assume that all files have nonzero size in
 test case

---
 cli/filelister.cpp      | 6 ++----
 test/testfilelister.cpp | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/cli/filelister.cpp b/cli/filelister.cpp
index 7efa64d2c..037f65f3a 100644
--- a/cli/filelister.cpp
+++ b/cli/filelister.cpp
@@ -289,13 +289,11 @@ void FileLister::recursiveAddFiles2(std::vector<std::string> &relative,
                 relative.push_back(filename);
                 absolute.push_back(fname);
                 struct stat sb;
-                off_t size = 0;
                 if (stat(fname, &sb) == 0)
                 {
-                    size = sb.st_size;
+                    // Limitation: file sizes are assumed to fit in a 'long'
+                    filesizes[filename] = static_cast<long>(sb.st_size);
                 }
-                // Limitation: file sizes are assumed to fit in a 'long'
-                filesizes[filename] = static_cast<long>(size);
             }
 
 #ifndef PATH_MAX
diff --git a/test/testfilelister.cpp b/test/testfilelister.cpp
index 62533ecbb..14ce6ac2d 100644
--- a/test/testfilelister.cpp
+++ b/test/testfilelister.cpp
@@ -55,11 +55,10 @@ private:
         std::map<std::string, long> filesizes;
         FileLister::recursiveAddFiles(filenames, filesizes, ".");
 
-        // Ensure a nonzero size is present for each listed file
+        // Ensure a size entry is present for each listed file
         for (std::vector<std::string>::const_iterator i = filenames.begin(); i != filenames.end(); ++i)
         {
             ASSERT(filesizes.find(*i) != filesizes.end());
-            ASSERT(filesizes[*i] > 0);
         }
 
         // In case there are leading "./"..