Changeset 11145

Timestamp:

2008-09-02 07:51:14 (3 months ago)

Author:

olly

Message:

bin/xapian-inspect.cc: Show the help message on start-up. Correct
the alias for next from ' ' to . Avoid reading outside of input
string when it is empty. Bug#286.

Location:

trunk/xapian-core

Files:

• ChangeLog (modified) (1 diff)
• bin/xapian-inspect.cc (modified) (4 diffs)

trunk/xapian-core/ChangeLog

@@ +1 @@
+Tue Sep 02 06:48:50 GMT 2008  Olly Betts <olly@survex.com>
+
+        * bin/xapian-inspect.cc: Show the help message on start-up.  Correct
+          the alias for next from ' ' to ''.  Avoid reading outside of input
+          string when it is empty.  Bug#286.
+
 Tue Sep 02 04:19:34 GMT 2008  Olly Betts <olly@survex.com>
 

trunk/xapian-core/bin/xapian-inspect.cc

@@ -73 +73 @@
 }
 
+static void
+show_help()
+{
+    cout << "Commands:\n"
+            "next   : Next entry (alias 'n' or '')\n"
+            "prev   : Previous entry (alias 'p')\n"
+            "goto X : Goto entry X (alias 'g')\n"
+            "help   : Show this (alias 'h' or '?')\n"
+            "quit   : Quit this utility (alias 'q')" << endl;
+}
+
 int
 main(int argc, char **argv)
@@ -124 +135 @@
 
         FlintCursor cursor(&table);
-        cursor.find_entry("");
+        cursor.find_entry(string());
         cursor.next();
+
+        show_help();
+        cout << endl;
 
         while (!cin.eof()) {
@@ -141 +155 @@
             if (cin.eof()) break;
 
-            if (input[input.size() - 1] == '\r')
+            if (endswith(input, '\r'))
                 input.resize(input.size() - 1);
 
-            if (input == "" || input == "n" || input == "next") {
+            if (input.empty() || input == "n" || input == "next") {
                 if (cursor.after_end() || !cursor.next()) {
                     cout << "At end already." << endl;
@@ -172 +186 @@
                 break;
             } else if (input == "h" || input == "help" || input == "?") {
-                cout << "Commands:\n"
-                        "next   : Next entry (alias 'n' or ' ')\n"
-                        "prev   : Previous entry (alias 'p')\n"
-                        "goto X : Goto entry X (alias 'g')\n"
-                        "help   : Show this (alias 'h' or '?')\n"
-                        "quit   : Quit this utility (alias 'q')" << endl;
+                show_help();
                 goto wait_for_input;
             } else {