diff options
author | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2008-12-02 05:59:15 +0000 |
---|---|---|
committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2008-12-02 05:59:15 +0000 |
commit | 2f669cbe75c054851234b7789342a5650ef951a5 (patch) | |
tree | 942580b700e524a01ee01276af4f09c270676197 /src/google/protobuf/compiler/command_line_interface.cc | |
parent | eb241fadf22bd9cafa3c2b2e91a914a12df07993 (diff) | |
download | protobuf-2f669cbe75c054851234b7789342a5650ef951a5.tar.gz protobuf-2f669cbe75c054851234b7789342a5650ef951a5.tar.bz2 protobuf-2f669cbe75c054851234b7789342a5650ef951a5.zip |
* Avoid using pushd/popd in generate_descriptor_proto.sh because they are
bash-only features, and /bin/sh is not a symlink to bash on all systems.
* If an input file is a Windows absolute path (e.g. "C:\foo\bar.proto") and
the import path only contains "." (or contains "." but does not contain
the file), protoc incorrectly thought that the file was under ".", because
it thought that the path was relative (since it didn't start with a slash).
This has been fixed.
Diffstat (limited to 'src/google/protobuf/compiler/command_line_interface.cc')
-rw-r--r-- | src/google/protobuf/compiler/command_line_interface.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/command_line_interface.cc b/src/google/protobuf/compiler/command_line_interface.cc index ea8c4ab2..089844f4 100644 --- a/src/google/protobuf/compiler/command_line_interface.cc +++ b/src/google/protobuf/compiler/command_line_interface.cc @@ -93,7 +93,8 @@ static const char* kPathSeparator = ":"; #endif // Returns true if the text looks like a Windows-style absolute path, starting -// with a drive letter. Example: "C:\foo". +// with a drive letter. Example: "C:\foo". TODO(kenton): Share this with +// copy in importer.cc? static bool IsWindowsAbsolutePath(const string& text) { #if defined(_WIN32) || defined(__CYGWIN__) return text.size() >= 3 && text[1] == ':' && |