| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "tools/gn/escape.h" | 5 #include "tools/gn/escape.h" |
| 6 | 6 |
| 7 #include "base/containers/stack_container.h" | 7 #include "base/containers/stack_container.h" |
| 8 | 8 |
| 9 namespace { | 9 namespace { |
| 10 | 10 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 if (!used_quotes) { | 38 if (!used_quotes) { |
| 39 used_quotes = true; | 39 used_quotes = true; |
| 40 dest->insert(dest->begin(), '"'); | 40 dest->insert(dest->begin(), '"'); |
| 41 } | 41 } |
| 42 } | 42 } |
| 43 } | 43 } |
| 44 dest->push_back(' '); | 44 dest->push_back(' '); |
| 45 } else if (str[i] == '\'' && (options.mode & ESCAPE_JSON)) { | 45 } else if (str[i] == '\'' && (options.mode & ESCAPE_JSON)) { |
| 46 dest->push_back('\\'); | 46 dest->push_back('\\'); |
| 47 dest->push_back('\''); | 47 dest->push_back('\''); |
| 48 #if defined(OS_WIN) | 48 #if !defined(OS_WIN) |
| 49 } else if (str[i] == '/' && options.convert_slashes) { | |
| 50 // Convert slashes on Windows if requested. | |
| 51 dest->push_back('\\'); | |
| 52 #else | |
| 53 } else if (str[i] == '\\' && (options.mode & ESCAPE_SHELL)) { | 49 } else if (str[i] == '\\' && (options.mode & ESCAPE_SHELL)) { |
| 54 // For non-Windows shell, escape backslashes. | 50 // For non-Windows shell, escape backslashes. |
| 55 dest->push_back('\\'); | 51 dest->push_back('\\'); |
| 56 dest->push_back('\\'); | 52 dest->push_back('\\'); |
| 57 #endif | 53 #endif |
| 58 } else if (str[i] == '\\' && (options.mode & ESCAPE_JSON)) { | 54 } else if (str[i] == '\\' && (options.mode & ESCAPE_JSON)) { |
| 59 dest->push_back('\\'); | 55 dest->push_back('\\'); |
| 60 dest->push_back('\\'); | 56 dest->push_back('\\'); |
| 61 } else { | 57 } else { |
| 62 dest->push_back(str[i]); | 58 dest->push_back(str[i]); |
| (...skipping 18 matching lines...) Expand all Loading... |
| 81 void EscapeStringToStream(std::ostream& out, | 77 void EscapeStringToStream(std::ostream& out, |
| 82 const base::StringPiece& str, | 78 const base::StringPiece& str, |
| 83 const EscapeOptions& options) { | 79 const EscapeOptions& options) { |
| 84 // Escape to a stack buffer and then write out to the stream. | 80 // Escape to a stack buffer and then write out to the stream. |
| 85 base::StackVector<char, 256> result; | 81 base::StackVector<char, 256> result; |
| 86 result->reserve(str.size() + 4); // Guess we'll add a couple of extra chars. | 82 result->reserve(str.size() + 4); // Guess we'll add a couple of extra chars. |
| 87 EscapeStringToString(str, options, &result.container(), NULL); | 83 EscapeStringToString(str, options, &result.container(), NULL); |
| 88 if (!result->empty()) | 84 if (!result->empty()) |
| 89 out.write(result->data(), result->size()); | 85 out.write(result->data(), result->size()); |
| 90 } | 86 } |
| OLD | NEW |