error handling added

git-svn-id: https://projectname.googlecode.com/svn/trunk@8 c416075f-80b4-e980-4839-00ea3ed24e77

trunk/src/file_types/base.cpp

@@ -2,6 +2,7 @@
 #include <boost/make_shared.hpp>
 #include <cstring>
 #include <cassert>
+#include <iostream>
 
 #include "base.h"
 #include "../kleisli.h"
@@ -23,21 +24,13 @@ void base::compare(const base& a, category::kleisli::end<compare_result>& cont)
     while (true) {
         file1.read(buf1, buf_size);
         file2.read(buf2, buf_size);
-        assert(file1.gcount() == file2.gcount());
-        if (file1.gcount() == file2.gcount()) {
-            if (memcmp(buf1, buf2, file1.gcount()) != 0) {
-                return;
-            }
-            assert(file1.eof() == file2.eof());
-            if (file1.eof() && file2.eof()) {
-                cont.next(compare_result(_path, a._path));
-                return;
-            } else
-            if (!file1.eof() && !file2.eof()) {
-                continue;
-            }
+        if (file1.gcount() != file2.gcount() || file1.eof() != file2.eof() || memcmp(buf1, buf2, file1.gcount()) != 0) {
+            return;
+        }
+        if (file1.eof() && file2.eof()) {
+            cont.next(compare_result(_path, a._path));
+            return;
         }
-        return;
     }
 }
 

trunk/src/filesystem.cpp

@@ -13,8 +13,12 @@ void recursive::next(const std::string& value) {
         struct : category::kleisli::arr<fs::path, fs::path> {
             void next(const fs::path& value) { if (is_regular_file(value)) pass(value); }
         } filter;
-        make_pair(recursive_directory_iterator(value), recursive_directory_iterator())
+        boost::system::error_code e;
+        make_pair(recursive_directory_iterator(value, e), recursive_directory_iterator())
         >>= filter >>= continuation();
+        if (e) {
+            logger::std_stream() << value << ": " << e.message() << "\n";
+        }
     } else
     if (is_regular_file(value)) {
         pass(value);