From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 18 Sep 2012 03:36:54 +0000 (-0400)
Subject: Merge branch 'master' of feistymeow.org:feisty_meow
X-Git-Tag: 2.140.90~1228
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=3ef36fb6ef3a651ee4a3238ac4618f86bfa79725;hp=-c;p=feisty_meow.git

Merge branch 'master' of feistymeow.org:feisty_meow

Conflicts:
	nucleus/library/filesystem/heavy_file_ops.cpp
---

3ef36fb6ef3a651ee4a3238ac4618f86bfa79725
diff --combined nucleus/library/filesystem/heavy_file_ops.cpp
index d6ff4184,0d2f91bc..6f5b19db
--- a/nucleus/library/filesystem/heavy_file_ops.cpp
+++ b/nucleus/library/filesystem/heavy_file_ops.cpp
@@@ -27,7 -27,7 +27,7 @@@ using namespace structures
  
  namespace filesystem {
  
- //#define DEBUG_HEAVY_FILE_OPS
+ #define DEBUG_HEAVY_FILE_OPS
    // uncomment for noisier debugging.
  
  #undef LOG
@@@ -275,14 -275,12 +275,13 @@@ outcome heavy_file_operations::buffer_f
      huge_file current(full_file, "rb");
      if (!current.good()) {
        // we need to skip this file.
 +LOG(astring("skipping bad file: ") + full_file);
        if (!advance(to_transfer, last_action)) break;
        continue;
      }
  
-     if ((last_action._byte_start + last_action._length >= current.length())
-         && current.length()) {
- //LOG(astring("finished handling file: ") + full_file);
+     if (last_action._byte_start + last_action._length >= current.length()) {
 -//        && current.length()) {
++LOG(astring("finished handling file: ") + full_file);
        // this file is done now.  go to the next one.
        if (!advance(to_transfer, last_action)) break;
        continue;