1 files changed, 36 insertions, 10 deletions

diff --git a/src/google/protobuf/compiler/importer.cc b/src/google/protobuf/compiler/importer.cc
index 7689ce9..701ac48 100644
--- a/src/google/protobuf/compiler/importer.cc
+++ b/src/google/protobuf/compiler/importer.cc
@@ -43,6 +43,7 @@
 #include <errno.h>
 
 #include <algorithm>
+#include <memory>
 
 #include <google/protobuf/compiler/importer.h>
 
@@ -124,7 +125,8 @@ bool SourceTreeDescriptorDatabase::FindFileByName(
   scoped_ptr<io::ZeroCopyInputStream> input(source_tree_->Open(filename));
   if (input == NULL) {
     if (error_collector_ != NULL) {
-      error_collector_->AddError(filename, -1, 0, "File not found.");
+      error_collector_->AddError(filename, -1, 0,
+                                 source_tree_->GetLastErrorMessage());
     }
     return false;
   }
@@ -186,6 +188,7 @@ Importer::Importer(SourceTree* source_tree,
                    MultiFileErrorCollector* error_collector)
   : database_(source_tree),
     pool_(&database_, database_.GetValidationErrorCollector()) {
+  pool_.EnforceWeakDependencies(true);
   database_.RecordErrorsTo(error_collector);
 }
 
@@ -195,10 +198,22 @@ const FileDescriptor* Importer::Import(const string& filename) {
   return pool_.FindFileByName(filename);
 }
 
+void Importer::AddUnusedImportTrackFile(const string& file_name) {
+  pool_.AddUnusedImportTrackFile(file_name);
+}
+
+void Importer::ClearUnusedImportTrackFiles() {
+  pool_.ClearUnusedImportTrackFiles();
+}
+
 // ===================================================================
 
 SourceTree::~SourceTree() {}
 
+string SourceTree::GetLastErrorMessage() {
+  return "File not found.";
+}
+
 DiskSourceTree::DiskSourceTree() {}
 
 DiskSourceTree::~DiskSourceTree() {}
@@ -231,12 +246,17 @@ static string CanonicalizePath(string path) {
   // The Win32 API accepts forward slashes as a path delimiter even though
   // backslashes are standard.  Let's avoid confusion and use only forward
   // slashes.
-  path = StringReplace(path, "\\", "/", true);
+  if (HasPrefixString(path, "\\\\")) {
+    // Avoid converting two leading backslashes.
+    path = "\\\\" + StringReplace(path.substr(2), "\\", "/", true);
+  } else {
+    path = StringReplace(path, "\\", "/", true);
+  }
 #endif
 
-  vector<string> parts;
   vector<string> canonical_parts;
-  SplitStringUsing(path, "/", &parts);  // Note:  Removes empty parts.
+  vector<string> parts = Split(
+      path, "/", true);  // Note:  Removes empty parts.
   for (int i = 0; i < parts.size(); i++) {
     if (parts[i] == ".") {
       // Ignore.
@@ -244,7 +264,7 @@ static string CanonicalizePath(string path) {
       canonical_parts.push_back(parts[i]);
     }
   }
-  string result = JoinStrings(canonical_parts, "/");
+  string result = Join(canonical_parts, "/");
   if (!path.empty() && path[0] == '/') {
     // Restore leading slash.
     result = '/' + result;
@@ -390,8 +410,8 @@ DiskSourceTree::DiskFileToVirtualFile(
 
 bool DiskSourceTree::VirtualFileToDiskFile(const string& virtual_file,
                                            string* disk_file) {
-  scoped_ptr<io::ZeroCopyInputStream> stream(OpenVirtualFile(virtual_file,
-                                                             disk_file));
+  scoped_ptr<io::ZeroCopyInputStream> stream(
+      OpenVirtualFile(virtual_file, disk_file));
   return stream != NULL;
 }
 
@@ -399,6 +419,10 @@ io::ZeroCopyInputStream* DiskSourceTree::Open(const string& filename) {
   return OpenVirtualFile(filename, NULL);
 }
 
+string DiskSourceTree::GetLastErrorMessage() {
+  return last_error_message_;
+}
+
 io::ZeroCopyInputStream* DiskSourceTree::OpenVirtualFile(
     const string& virtual_file,
     string* disk_file) {
@@ -407,6 +431,8 @@ io::ZeroCopyInputStream* DiskSourceTree::OpenVirtualFile(
     // We do not allow importing of paths containing things like ".." or
     // consecutive slashes since the compiler expects files to be uniquely
     // identified by file name.
+    last_error_message_ = "Backslashes, consecutive slashes, \".\", or \"..\" "
+                          "are not allowed in the virtual path";
     return NULL;
   }
 
@@ -424,13 +450,13 @@ io::ZeroCopyInputStream* DiskSourceTree::OpenVirtualFile(
 
       if (errno == EACCES) {
         // The file exists but is not readable.
-        // TODO(kenton):  Find a way to report this more nicely.
-        GOOGLE_LOG(WARNING) << "Read access is denied for file: " << temp_disk_file;
+        last_error_message_ = "Read access is denied for file: " +
+                              temp_disk_file;
         return NULL;
       }
     }
   }
-
+  last_error_message_ = "File not found.";
   return NULL;
 }