diff options
author | Evan Martin <martine@danga.com> | 2013-04-19 21:32:29 (GMT) |
---|---|---|
committer | Evan Martin <martine@danga.com> | 2013-04-19 21:32:59 (GMT) |
commit | 0275ead49797dc5b5723d89205bafcd7c313a76d (patch) | |
tree | b9b4897a37d9afddf5d2ccc387fb0972f71d9a82 /src/disk_interface.cc | |
parent | 9b6b1fd44a589c3725947280ff5a2ce8fc50a387 (diff) | |
download | Ninja-0275ead49797dc5b5723d89205bafcd7c313a76d.zip Ninja-0275ead49797dc5b5723d89205bafcd7c313a76d.tar.gz Ninja-0275ead49797dc5b5723d89205bafcd7c313a76d.tar.bz2 |
make DiskInterfaceTest.StatBadPath quiet
Add a flag to temporarily suppress error output.
Fixes issue #281.
Diffstat (limited to 'src/disk_interface.cc')
-rw-r--r-- | src/disk_interface.cc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/disk_interface.cc b/src/disk_interface.cc index 7c557cd..ee3e99a 100644 --- a/src/disk_interface.cc +++ b/src/disk_interface.cc @@ -80,8 +80,10 @@ TimeStamp RealDiskInterface::Stat(const string& path) { // MSDN: "Naming Files, Paths, and Namespaces" // http://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx if (!path.empty() && path[0] != '\\' && path.size() > MAX_PATH) { - Error("Stat(%s): Filename longer than %i characters", - path.c_str(), MAX_PATH); + if (!quiet_) { + Error("Stat(%s): Filename longer than %i characters", + path.c_str(), MAX_PATH); + } return -1; } WIN32_FILE_ATTRIBUTE_DATA attrs; @@ -89,8 +91,10 @@ TimeStamp RealDiskInterface::Stat(const string& path) { DWORD err = GetLastError(); if (err == ERROR_FILE_NOT_FOUND || err == ERROR_PATH_NOT_FOUND) return 0; - Error("GetFileAttributesEx(%s): %s", path.c_str(), - GetLastErrorString().c_str()); + if (!quiet_) { + Error("GetFileAttributesEx(%s): %s", path.c_str(), + GetLastErrorString().c_str()); + } return -1; } const FILETIME& filetime = attrs.ftLastWriteTime; @@ -107,7 +111,9 @@ TimeStamp RealDiskInterface::Stat(const string& path) { if (stat(path.c_str(), &st) < 0) { if (errno == ENOENT || errno == ENOTDIR) return 0; - Error("stat(%s): %s", path.c_str(), strerror(errno)); + if (!quiet_) { + Error("stat(%s): %s", path.c_str(), strerror(errno)); + } return -1; } return st.st_mtime; |