Changeset 24659

Timestamp:

2011-09-27T12:09:55+13:00 (13 years ago)

Author:

jmt12

Message:

Several small changes to CLI such as new commands

File:

• gs2-extensions/parallel-building/trunk/src/src/gdbmcli-src/gdbmcli.cpp (modified) (3 diffs)

gs2-extensions/parallel-building/trunk/src/src/gdbmcli-src/gdbmcli.cpp

@@ -73 +73 @@
 
 void
-printUsage (char *program_name)
+printUsage ()
 {
   cerr << "===== GDBM Command Line Interface v1.0 =====" << endl << endl;
-  cerr << "usage: " << program_name << " [-removeold] database-name" << endl << endl;
-  cerr << " -removeold   delete the contents of any existing database with the same name" << endl << endl;
-  cerr << "Once the program is running enter empty key (\"[]\") to exit." << endl << endl;
-  cerr << "examples:" << endl;
+  cerr << "usage: gdbmcli <db path>" << endl << endl;
+  cerr << "Once the program is running, the first thing it expects is the" << endl;
+  cerr << "path to the GDBM database to open, after which you can use the" << endl;
+  cerr << "commands below:" << endl;
   cerr << "  [key]+<newline>value <= adds the pair key:value" << endl;
   cerr << "  [key]<newline>value  <= also adds the pair" << endl;
   cerr << "  [key]-               <= deleted the pair identified by key" << endl;
   cerr << "  [key]?               <= lookup the value for key" << endl;
-  cerr << "  [*]                  <= retrieve a list of keys" << endl << endl;
+  cerr << "  [*]                  <= retrieve a list of keys" << endl;
+  cerr << "  []                   <= exit " << endl << endl;
 }
 
@@ -90 +91 @@
 main (int argc, char *argv[])
 {
-  // sanity check
-  if (argc != 2 && argc != 3)
+  if (argc != 2)
   {
-    printUsage(argv[0]);
+    printUsage();
     exit(0);
   }
 
-  char *dbname;
-  bool removeold = false;
-  if (argc == 3)
-  {
-    if (strcmp (argv[1], "-removeold") == 0)
-    {
-      removeold = true;
-      dbname = argv[2];
-    }
-    else
-    {
-      cerr << argv[1] << " is not a valid option." << endl << endl;
-      printUsage (argv[0]);
-      exit(0);
-    }
-  }
-  else
-  {
-    dbname = argv[1];
-  }
+  char *dbname = argv[1];
 
   // open the database
   // note that GDBM_FAST is obsolete on newer versions of gdbm
   int read_write = GDBM_WRCREAT | GDBM_FAST;
-  if (removeold)
-  {
-    read_write = GDBM_NEWDB | GDBM_FAST;
-  }
   int block_size = 0;
 #ifdef __WIN32__
@@ -181 +158 @@
       }
 
+      if (key == "?")
+      {
+        cout << "0.1" << endl;
+        gdbm_close (dbf);
+        return 0;
+      }
+
       // retrieve the command token
       if (!cin.eof())