Skip to content

Commit b9d1800

Browse files
tonydnewellcopybara-github
authored andcommitted
Windows - Fix handling of utf8 command line arguments (#17854)
This relates to: Issues: - #17036 - grpc/grpc#36518 PRs: - #15519 The fix in #15519 has one line missing that breaks `Grpc.Tools` and doesn't actually fix the problem it proports to fix. This PR fixes this. This fix needs to also be applied to the version of protobuf that is used by gRPC. There are various scenarios that need to be tested on Windows: **A. Non-ascii command line arguments, e.g.** ``` protoc.exe --csharp_out=out --proto_path=E:\work\grpc\protoctest\test-Dré E:\work\grpc\protoctest\test-Dré\helloworld.proto ``` Failed output: ``` E:\work\grpc\protoctest\test-DrΘ: warning: directory does not exist. Could not make proto path relative: E:\work\grpc\protoctest\test-DrΘ\helloworld.proto: No such file or directory ``` Success output: - no errors printed - generated `.cs` file in the `out` directory **B. Non-ascii arguments in a file containing the protoc arguments (no path to file) e.g.:** ``` protoc.exe @test.rsp ``` where `test.rsp` contains: ``` --plugin=protoc-gen-grpc=E:\work\grpc\protoctest\tools\grpc_csharp_plugin.exe --csharp_out=E:\work\grpc\protoctest\test-Dré\out --grpc_out=E:\work\grpc\protoctest\test-Dré\out --proto_path=E:\work\grpc\protoctest\test-Dré helloworld.proto ``` Success output for both old and fixed code: - no errors printed - generated `.cs` file in the `out` directory **C. Non-ascii arguments in a file containing the protoc arguments (with non-ascii path to file).** (This is what `Grpc.Tools` uses.) e.g. ``` protoc.exe @e:\work\grpc\protoctest\test-Dré\test.rsp ``` Failed output: ``` Failed to open argument file: E:\work\grpc\protoctest\test-DrΘ\test.rsp ``` Success output: - no errors printed - generated `.cs` file in the `out` directory Closes #17854 COPYBARA_INTEGRATE_REVIEW=#17854 from tonydnewell:windows-utf8-command-fix de9ec54 PiperOrigin-RevId: 669083804
1 parent eec827d commit b9d1800

File tree

1 file changed

+1
-1
lines changed
  • src/google/protobuf/compiler

1 file changed

+1
-1
lines changed

src/google/protobuf/compiler/main.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ int main(int argc, char* argv[]) {
134134
std::string* multibyte_string = new auto(ToMultiByteUtf8String(wargv[i]));
135135
argv_mbcs[i] = const_cast<char*>(multibyte_string->c_str());
136136
}
137-
return google::protobuf::compiler::ProtobufMain(argc, argv);
137+
return google::protobuf::compiler::ProtobufMain(argc, argv_mbcs);
138138
}
139139
#else
140140
int main(int argc, char* argv[]) {

0 commit comments

Comments
 (0)