Reverting 11102....

base/file_util_posix.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/file_util.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <fnmatch.h>
 #include <fts.h>
@@ skipping 124 matching lines @@
   }
 
   int error = 0;
   FTSENT* ent;
   while (!error && (ent = fts_read(fts)) != NULL) {
     // ent->fts_path is the source path, including from_path, so paste
     // the suffix after from_path onto to_path to create the target_path.
     std::string suffix(&ent->fts_path[from_path.value().size()]);
     // Strip the leading '/' (if any).
     if (!suffix.empty()) {
-      DCHECK_EQ('/', suffix[0]);
+      DCHECK(suffix[0] == '/');
       suffix.erase(0, 1);
     }
     const FilePath target_path = to_path.Append(suffix);
     switch (ent->fts_info) {
       case FTS_D:  // Preorder directory.
         // If we encounter a subdirectory in a non-recursive copy, prune it
         // from the traversal.
         if (!recursive && ent->fts_level > 0) {
           if (fts_set(fts, ent, FTS_SKIP) != 0)
             error = errno;
           continue;
         }
 
         // Try creating the target dir, continuing on it if it exists already.
-        // Rely on the user's umask to produce correct permissions.
         if (mkdir(target_path.value().c_str(), 0777) != 0) {
           if (errno != EEXIST)
             error = errno;
         }
         break;
       case FTS_F:     // Regular file.
       case FTS_NSOK:  // File, no stat info requested.
         errno = 0;
         if (!CopyFile(FilePath(ent->fts_path), target_path))
           error = errno ? errno : EINVAL;
         break;
       case FTS_DP:   // Postorder directory.
       case FTS_DOT:  // "." or ".."
         // Skip it.
         continue;
       case FTS_DC:   // Directory causing a cycle.
         // Skip this branch.
         if (fts_set(fts, ent, FTS_SKIP) != 0)
           error = errno;
         break;
       case FTS_DNR:  // Directory cannot be read.
       case FTS_ERR:  // Error.
       case FTS_NS:   // Stat failed.
         // Abort with the error.
         error = ent->fts_errno;
         break;
       case FTS_SL:      // Symlink.
       case FTS_SLNONE:  // Symlink with broken target.
-        LOG(WARNING) << "CopyDirectory() skipping symbolic link: " <<
-            ent->fts_path;
+        LOG(WARNING) << "CopyDirectory() skipping symbolic link.";
         continue;
       case FTS_DEFAULT:  // Some other sort of file.
-        LOG(WARNING) << "CopyDirectory() skipping file of unknown type: " <<
-            ent->fts_path;
+        LOG(WARNING) << "CopyDirectory() skipping weird file.";
         continue;
       default:
         NOTREACHED();
         continue;  // Hope for the best!
     }
   }
   // fts_read may have returned NULL and set errno to indicate an error.
   if (!error && errno != 0)
     error = errno;
 
@@ skipping 369 matching lines @@
     munmap(data_, length_);
   if (file_ != -1)
     close(file_);
 
   data_ = NULL;
   length_ = 0;
   file_ = -1;
 }
 
 } // namespace file_util