[Lldb-commits] [lldb] r144562 - in /lldb/trunk: lldb.xcodeproj/project.pbxproj source/Interpreter/CommandInterpreter.cpp

Jim Ingham jingham at apple.com
Mon Nov 14 12:02:01 PST 2011


Author: jingham
Date: Mon Nov 14 14:02:01 2011
New Revision: 144562

URL: http://llvm.org/viewvc/llvm-project?rev=144562&view=rev
Log:
Confirm should accept both "Y" and "y" in case somebody confuses the "default answer" indicator for a
directive to enter a capital letter.

Modified:
    lldb/trunk/lldb.xcodeproj/project.pbxproj
    lldb/trunk/source/Interpreter/CommandInterpreter.cpp

Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=144562&r1=144561&r2=144562&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Mon Nov 14 14:02:01 2011
@@ -3621,7 +3621,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				LLVM_BUILD_DIR = "$(SRCROOT)/llvm-build/$(LLVM_CONFIGURATION)";
 				LLVM_BUILD_DIR_ARCH = "$(CURRENT_ARCH)/";
-				LLVM_CONFIGURATION = Release;
+				LLVM_CONFIGURATION = "Debug+Asserts";
 				LLVM_SOURCE_DIR = "$(SRCROOT)/llvm";
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (

Modified: lldb/trunk/source/Interpreter/CommandInterpreter.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/CommandInterpreter.cpp?rev=144562&r1=144561&r2=144562&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/CommandInterpreter.cpp (original)
+++ lldb/trunk/source/Interpreter/CommandInterpreter.cpp Mon Nov 14 14:02:01 2011
@@ -1793,12 +1793,12 @@
         {
             reader.SetIsDone(true);
         }
-        else if (bytes[0] == 'y')
+        else if (bytes[0] == 'y' || bytes[0] == 'Y')
         {
             *response_ptr = true;
             reader.SetIsDone(true);
         }
-        else if (bytes[0] == 'n')
+        else if (bytes[0] == 'n' || bytes[0] == 'N')
         {
             *response_ptr = false;
             reader.SetIsDone(true);
@@ -1807,7 +1807,7 @@
         {
             if (out_file.IsValid() && !reader.IsDone() && reader.GetPrompt())
             {
-                out_file.Printf ("Please answer \"y\" or \"n\"\n%s", reader.GetPrompt());
+                out_file.Printf ("Please answer \"y\" or \"Y\" or \"n\" or \"N\"\n%s", reader.GetPrompt());
                 out_file.Flush ();
             }
         }





More information about the lldb-commits mailing list