Massive roll-up of changes. See CHANGES.txt.

1 files changed, 9 insertions, 4 deletions

diff --git a/src/google/protobuf/testing/file.cc b/src/google/protobuf/testing/file.cc
index f813e8ee..e224781d 100644
--- a/src/google/protobuf/testing/file.cc
+++ b/src/google/protobuf/testing/file.cc
@@ -84,10 +84,13 @@ void File::ReadFileToStringOrDie(const string& name, string* output) {
 
 void File::WriteStringToFileOrDie(const string& contents, const string& name) {
   FILE* file = fopen(name.c_str(), "wb");
-  GOOGLE_CHECK(file != NULL);
+  GOOGLE_CHECK(file != NULL)
+      << "fopen(" << name << ", \"wb\"): " << strerror(errno);
   GOOGLE_CHECK_EQ(fwrite(contents.data(), 1, contents.size(), file),
-                  contents.size());
-  GOOGLE_CHECK(fclose(file) == 0);
+                  contents.size())
+      << "fwrite(" << name << "): " << strerror(errno);
+  GOOGLE_CHECK(fclose(file) == 0)
+      << "fclose(" << name << "): " << strerror(errno);
 }
 
 bool File::CreateDir(const string& name, int mode) {
@@ -97,8 +100,10 @@ bool File::CreateDir(const string& name, int mode) {
 bool File::RecursivelyCreateDir(const string& path, int mode) {
   if (CreateDir(path, mode)) return true;
 
+  if (Exists(path)) return false;
+
   // Try creating the parent.
-  string::size_type slashpos = path.find_first_of('/');
+  string::size_type slashpos = path.find_last_of('/');
   if (slashpos == string::npos) {
     // No parent given.
     return false;