Escape more characters for GN shell writing.

tools/gn/escape.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "tools/gn/escape.h"
 
 #include "base/containers/stack_container.h"
 
 namespace {
 
+// A "1" in this lookup table means that char is valid in the shell.
+const char kShellValid[0x80] = {
+// 00-1f: all are invalid
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+// ' ' !  "  #  $  %  &  '  (  )  *  +  ,  -  .  /
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1,
+//  0  1  2  3  4  5  6  7  8  9  :  ;  <  =  >  ?
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0,
+//  @  A  B  C  D  E  F  G  H  I  J  K  L  M  N  O
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+//  P  Q  R  S  T  U  V  W  X  Y  Z  [  \  ]  ^  _
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1,
+//  `  a  b  c  d  e  f  g  h  i  j  k  l  m  n  o
+    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+//  p  q  r  s  t  u  v  w  x  y  z  {  |  }  ~
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0 };
+
 template<typename DestString>
 void EscapeStringToString(const base::StringPiece& str,
                           const EscapeOptions& options,
                           DestString* dest,
                           bool* needed_quoting) {
   bool used_quotes = false;
 
   for (size_t i = 0; i < str.size(); i++) {
     if (str[i] == '$' && (options.mode & ESCAPE_NINJA)) {
-      // Escape dollars signs since ninja treats these specially.
+      // Escape dollars signs since ninja treats these specially. If we're also
+      // escaping for the shell, we need to backslash-escape that again.

[scottmg, 2014/05/30 18:02:15]

this should be if !WIN i think

+      if (options.mode & ESCAPE_SHELL)
+        dest->push_back('\\');
       dest->push_back('$');
       dest->push_back('$');
-    } else if (str[i] == '"' && (options.mode & ESCAPE_SHELL)) {
-      // Escape quotes with backslashes for the command-line (Ninja doesn't
-      // care).
-      dest->push_back('\\');
-      dest->push_back('"');
     } else if (str[i] == ' ') {
       if (options.mode & ESCAPE_NINJA) {
         // For Ninja just escape spaces with $.
         dest->push_back('$');
       }
       if (options.mode & ESCAPE_SHELL) {
         // For the shell, quote the whole string.
         if (needed_quoting)
           *needed_quoting = true;
         if (!options.inhibit_quoting) {
@@ skipping 16 matching lines @@
       // For non-Windows shell, escape backslashes.
       dest->push_back('\\');
       dest->push_back('\\');
 #endif
     } else if (str[i] == '\\' && (options.mode & ESCAPE_JSON)) {
       dest->push_back('\\');
       dest->push_back('\\');
     } else if (str[i] == ':' && (options.mode & ESCAPE_NINJA)) {
       dest->push_back('$');
       dest->push_back(':');
+    } else if ((options.mode & ESCAPE_SHELL) &&

[scottmg, 2014/05/30 18:02:15]

and this too, or at least \ doesn't escape them on windows. or is ESCAPE_SHELL
not used on windows? in that case, i'd rename "shell" in various places to
POSIX_SHELL or BASH or something.

+               (static_cast<unsigned>(str[i]) >= 0x80 ||
+                !kShellValid[static_cast<int>(str[i])])) {
+      // All other invalid shell chars get backslash-escaped.
+      dest->push_back('\\');
+      dest->push_back(str[i]);
     } else {
       dest->push_back(str[i]);
     }
   }
 
   if (used_quotes)
     dest->push_back('"');
 }
 
 }  // namespace
@@ skipping 10 matching lines @@
 void EscapeStringToStream(std::ostream& out,
                           const base::StringPiece& str,
                           const EscapeOptions& options) {
   // Escape to a stack buffer and then write out to the stream.
   base::StackVector<char, 256> result;
   result->reserve(str.size() + 4);  // Guess we'll add a couple of extra chars.
   EscapeStringToString(str, options, &result.container(), NULL);
   if (!result->empty())
     out.write(&result[0], result->size());
 }