Merge branch 'master' of feistymeow.org:feisty_meow

Conflicts:
	nucleus/library/filesystem/heavy_file_ops.cpp

diff --combined nucleus/library/filesystem/heavy_file_ops.cpp
index d6ff4184da0c756df29a9f1e4df86e0f5b9d2f91,0d2f91bc3463383ffcc1d0285597886af0abac03..6f5b19db1832feffb4e815c3df9c05069745a541
--- 1/nucleus/library/filesystem/heavy_file_ops.cpp
--- 2/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;