commit fb1fb2c140253e55d3268079b892c137f15ab0c2
author Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Thu Jul 02 01:04:59 2015 +0900
committer Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Thu Jul 02 01:04:59 2015 +0900
tree 8ca11f84f26dbddc3a884dc8a3775064e6736d3d
parent d45a09d315e86740dc60abd6b10cb5a51386e2fa

[C++] Do not find same entries twice

find.cc

diff --git a/find.cc b/find.cc
index 6a2fcd3..555d15a 100644
--- a/find.cc
+++ b/find.cc
@@ -240,7 +240,7 @@
     unsigned char type = DT_LNK;
     if (fc.follows_symlinks) {
       // TODO
-      LOG("symlink is hard");
+      LOG("FindEmulator: symlink is hard");
       return false;
 
       char buf[PATH_MAX+1];
@@ -331,19 +331,20 @@
       return false;
     }
 
+    const size_t orig_out_size = out->size();
     for (StringPiece finddir : fc.finddirs) {
       const DirentNode* base = root_->FindDir(ConcatDir(fc.chdir, finddir));
       if (!base) {
-        string s = "testdir/../testdir";
-        NormalizePath(&s);
         LOG("FindEmulator: Find dir (%s) not found: %s",
             ConcatDir(fc.chdir, finddir).c_str(), cmd.c_str());
+        out->resize(orig_out_size);
         return false;
       }
 
       string path = finddir.as_string();
       if (!base->RunFind(fc, 0, &path, out)) {
         LOG("FindEmulator: RunFind failed: %s", cmd.c_str());
+        out->resize(orig_out_size);
         return false;
       }
     }