Changeset 2869 for box/trunk/bin

Timestamp:

01/03/2011 23:04:08 (15 months ago)

Author:

chris

Message:

Hopefully fix crash on unknown commands when readline is not supported
by bbackupqyuery, thanks to Achim J Latz for reporting and helping to debug.

Location:

box/trunk/bin/bbackupquery

Files:

• BackupQueries.cpp (modified) (1 diff)
• bbackupquery.cpp (modified) (2 diffs)

box/trunk/bin/bbackupquery/BackupQueries.cpp

@@ -109 +109 @@
 // --------------------------------------------------------------------------
 void BackupQueries::DoCommand(ParsedCommand& rCommand)
-{       
+{
         // Check...
+
+        if(rCommand.mFailed)
+        {
+                BOX_ERROR("Parse failed");
+                return;
+        }
+
         if(rCommand.mCmdElements.size() < 1)
         {

box/trunk/bin/bbackupquery/bbackupquery.cpp

@@ -470 +470 @@
                 {
                         BackupQueries::ParsedCommand cmd(argv[c++], true);
-
-                        if(cmd.mFailed)
-                        {
-                                BOX_ERROR("Parse failed");
-                        }
-                        else
-                        {
-                                context.DoCommand(cmd);
-                        }
+                        context.DoCommand(cmd);
                 }
         }
@@ -526 +518 @@
                         
                         BackupQueries::ParsedCommand cmd(command, false);
-                        
-                        if(cmd.mFailed)
-                        {
-                                BOX_ERROR("Parse failed");
-                        }
-                        else
-                        {
-                                context.DoCommand(cmd);
-                        }
+                        context.DoCommand(cmd);
 
                         if(last_cmd != 0 && ::strcmp(last_cmd, command) == 0)