2 files changed, 13 insertions, 3 deletions
diff --git a/clang/utils/ccc b/clang/utils/ccc
index 5b54c476c2d..43093cb441d 100755
--- a/clang/utils/ccc
+++ b/clang/utils/ccc
@@ -18,8 +18,13 @@ def error(message):
     print >> sys.stderr, 'ccc: ' + message
     sys.exit(1)
 
+def quote(arg):
+    if '"' in arg:
+        return repr(arg)
+    return arg
+
 def run(args):
-    print >> sys.stderr, ' '.join(args)
+    print ' '.join(map(quote, args))
     code = subprocess.call(args)
     if code > 255:
         code = 1
diff --git a/clang/utils/ccc-analyzer b/clang/utils/ccc-analyzer
index 8427745127c..fe315f6df09 100755
--- a/clang/utils/ccc-analyzer
+++ b/clang/utils/ccc-analyzer
@@ -21,9 +21,14 @@ def error(message):
     print >> sys.stderr, 'ccc: ' + message
     sys.exit(1)
 
+def quote(arg):
+    if '"' in arg:
+        return repr(arg)
+    return arg
+
 def run(args):
-    print >> sys.stderr, ' '.join(args)
-    print >> sys.stderr, '\n'    
+    print ' '.join(map(quote, args))
+    print
     code = subprocess.call(args)
     if code > 255:
         code = 1