diff options
| author | Shinichiro Hamaji <shinichiro.hamaji@gmail.com> | 2016-02-22 16:50:04 +0900 |
|---|---|---|
| committer | Shinichiro Hamaji <shinichiro.hamaji@gmail.com> | 2016-02-22 16:50:04 +0900 |
| commit | 03ce23949c79d6817d18e68ec0918e7ce2e4cdad (patch) | |
| tree | 035f8bcb0a524854b0a4f1bc9c5dfdbd9e5728b9 | |
| parent | 71f5813d160b95a0a9db0ecac05b3ae2213f863d (diff) | |
| download | platform_build_kati-03ce23949c79d6817d18e68ec0918e7ce2e4cdad.tar.gz platform_build_kati-03ce23949c79d6817d18e68ec0918e7ce2e4cdad.tar.bz2 platform_build_kati-03ce23949c79d6817d18e68ec0918e7ce2e4cdad.zip | |
[C++] Fix comment_in_command.mk
Newline characters were escaped for some reason.
| -rw-r--r-- | strutil.cc | 6 | ||||
| -rw-r--r-- | strutil_test.cc | 1 |
2 files changed, 4 insertions, 3 deletions
@@ -524,9 +524,9 @@ string EchoEscape(const string str) { void EscapeShell(string* s) { #ifdef __SSE4_2__ - static const char ranges[] = "\0\0\n\n\"\"$$\\\\``"; + static const char ranges[] = "\0\0\"\"$$\\\\``"; size_t prev = 0; - size_t i = SkipUntilSSE42(s->c_str(), s->size(), ranges, 12); + size_t i = SkipUntilSSE42(s->c_str(), s->size(), ranges, 10); if (i == s->size()) return; @@ -544,7 +544,7 @@ void EscapeShell(string* s) { r += c; i++; prev = i; - i += SkipUntilSSE42(s->c_str() + i, s->size() - i, ranges, 12); + i += SkipUntilSSE42(s->c_str() + i, s->size() - i, ranges, 10); } StringPiece(*s).substr(prev).AppendToString(&r); s->swap(r); diff --git a/strutil_test.cc b/strutil_test.cc index ce7e012..4d31c51 100644 --- a/strutil_test.cc +++ b/strutil_test.cc @@ -127,6 +127,7 @@ void TestEscapeShell() { ASSERT_EQ(EscapeShell("foo$`\\baz\"bar"), "foo\\$\\`\\\\baz\\\"bar"); ASSERT_EQ(EscapeShell("$$"), "\\$$"); ASSERT_EQ(EscapeShell("$$$"), "\\$$\\$"); + ASSERT_EQ(EscapeShell("\\\n"), "\\\\\n"); } } // namespace |
