diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-06 09:55:08 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-06 09:55:08 +0000 |
| commit | c751031b5436fcc12c6160f531a5c515164f08e9 (patch) | |
| tree | 452a9d9c40e4c18f47b5166fb93000036a7fd15f /base/file_util_posix.cc | |
| parent | ef0279270ece2edf8524afeb9ac6f9cd533ccb60 (diff) | |
| download | chromium_src-c751031b5436fcc12c6160f531a5c515164f08e9.zip chromium_src-c751031b5436fcc12c6160f531a5c515164f08e9.tar.gz chromium_src-c751031b5436fcc12c6160f531a5c515164f08e9.tar.bz2 | |
Reverting 11102.
Used git svn dcommit instead of git cl dcommit by mistake. Reverting to re-commit properly.
TBR=erikkay
Review URL: http://codereview.chromium.org/40213
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11104 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_util_posix.cc')
| -rw-r--r-- | base/file_util_posix.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc index 85cdc10..6d3984e 100644 --- a/base/file_util_posix.cc +++ b/base/file_util_posix.cc @@ -142,7 +142,7 @@ bool CopyDirectory(const FilePath& from_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); @@ -157,7 +157,6 @@ bool CopyDirectory(const FilePath& from_path, } // 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; @@ -186,12 +185,10 @@ bool CopyDirectory(const FilePath& from_path, 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(); |