gdbmtool: accept commands from command line as well as from file

Commands can be supplied to gdbmtool in three ways:

 1. From a file, using the --file (-f) option:

     gdbmtool -f comfile

 2. From the command line, if first argument is the database name:

     gdbmtool test.db count \; fetch mykey \; avail

    Note the use of semicolon to delimit commands.

 3. From the interactive shell, if neither of the above is used.

* src/Makefile.am: Add new sources.
* src/gdbmtool.c: Use new stream functions for input.
* src/gdbmtool.h (setsource): Remove proto.
(instream_t): New data type.
(instream_name, instream_read)
(instream_close, instream_interactive)
(instream_eq): New functions.
(instream_stdin_create)
(instream_argv_create)
(instream_file_create)
(interactive, input_context_push): New protos.
* src/gram.y: Accept ; in place of newline.
* src/input-argv.c: New file.
* src/input-file.c: New file.
* src/input-rl.c: Rewrite to provide instream_t API.
* src/input-std.c: Likewise.
* src/lex.l: Rewrite.
* tests/.gitignore: Update.
* tests/Makefile.am: Add new tests. Incorporate
DejaGNU tests.
* tests/config/default.exp: New file.
* tests/gdbmtool/base.exp: New file.
* tests/gdbmtool00.at: New file.
* tests/gdbmtool01.at: New file.
* tests/gdbmtool02.at: New file.
* tests/testsuite.at: Include new tests.

18 files changed, 995 insertions, 281 deletions

diff --git a/doc/gdbm.texi b/doc/gdbm.texi
index 2aac1c3..0876f8d 100644
--- a/doc/gdbm.texi
+++ b/doc/gdbm.texi
@@ -11,6 +11,7 @@
 * GDBM: (gdbm).                  The GNU database manager.
 * gdbm_dump: (gdbm) gdbm_dump.   Dump the GDBM database into a flat file.
 * gdbm_load: (gdbm) gdbm_load.   Load the database from a flat file.
+* gdbmtool: (gdbm) gdbmtool.     Examine and modify a GDBM database.
 @end direntry
 @end ifinfo
 
diff --git a/src/Makefile.am b/src/Makefile.am
index aff6982..766dba8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -96,6 +96,8 @@ gdbmtool_LDADD  = \
 gdbmtool_SOURCES = \
  datconv.c\
  gram.y\
+ input-argv.c\
+ input-file.c\
  lex.l\
  gdbmtool.h\
  gdbmtool.c\
@@ -109,7 +111,7 @@ else
 endif
 
 AM_YFLAGS = -dtv
-#AM_LFLAGS = -d
+AM_LFLAGS = -d
 
 gdbm_load_LDADD  = ./libgdbmapp.a ./libgdbm.la 
 gdbm_dump_LDADD  = ./libgdbmapp.a ./libgdbm.la 
diff --git a/src/gdbmtool.c b/src/gdbmtool.c
index b322260..c522ad0 100644
--- a/src/gdbmtool.c
+++ b/src/gdbmtool.c
@@ -78,7 +78,7 @@ opendb (char *dbname)
       
   if (open_mode == GDBM_NEWDB)
     {
-      if (interactive && variable_is_true ("confirm") &&
+      if (interactive () && variable_is_true ("confirm") &&
           access (dbname, F_OK) == 0)
         {
           if (!getyn (_("database %s already exists; overwrite"), dbname))
@@ -1106,9 +1106,10 @@ void
 source_handler (struct handler_param *param)
 {
   char *fname = tildexpand (PARAM_STRING (param, 0));
-  if (setsource (fname, 0) == 0)
-    yyparse ();
+  instream_t istr = instream_file_create (fname);
   free (fname);
+  if (input_context_push (istr) == 0)
+    yyparse ();
 }
 
 
@@ -1456,7 +1457,7 @@ command_lookup (const char *str, struct locus *loc, struct command **pcmd)
               break;
 
             case fcom_found:
-              if (!interactive)
+              if (!interactive ())
                 {
                   state = fcom_abort;
                   found = NULL;
@@ -1479,9 +1480,8 @@ command_lookup (const char *str, struct locus *loc, struct command **pcmd)
     }
 
   if (state == fcom_init)
-    lerror (loc,
-                 interactive ? _("Invalid command. Try ? for help.") :
-                               _("Unknown command"));
+    lerror (loc, interactive () ? _("Invalid command. Try ? for help.") :
+                                  _("Unknown command"));
   if (!found)
     return T_BOGUS;
 
@@ -1490,7 +1490,12 @@ command_lookup (const char *str, struct locus *loc, struct command **pcmd)
 }
 
 char *parseopt_program_doc = N_("examine and/or modify a GDBM database");
-char *parseopt_program_args = N_("DBFILE");
+char *parseopt_program_args = N_("DBFILE [COMMAND [ARG ...]]");
+
+enum {
+  OPT_LEX_TRACE = 256,
+  OPT_GRAM_TRACE
+};
 
 struct gdbm_option optab[] = {
   { 'b', "block-size", N_("SIZE"), N_("set block size") },
@@ -1504,6 +1509,8 @@ struct gdbm_option optab[] = {
   { 'r', "read-only",  NULL,       N_("open database in read-only mode") },
   { 's', "synchronize", NULL,      N_("synchronize to disk after each write") },
   { 'q', "quiet",      NULL,       N_("don't print initial banner") },
+  { OPT_LEX_TRACE, "lex-trace", NULL, N_("enable lexical analyzer traces") },
+  { OPT_GRAM_TRACE, "gram-trace", NULL, N_("enable grammar traces") },
   { 0 }
 };
 
@@ -1786,7 +1793,7 @@ static struct gdbmarglist last_args;
 void
 run_last_command (void)
 {
-  if (interactive)
+  if (interactive ())
     {
       if (last_cmd)
         {
@@ -1846,7 +1853,7 @@ run_command (struct command *cmd, struct gdbmarglist *arglist)
         /* Optional argument */
         break;
 
-      if (!interactive)
+      if (!interactive ())
         {
           terror (_("%s: not enough arguments"), cmd->name);
           return 1;
@@ -1896,7 +1903,7 @@ run_command (struct command *cmd, struct gdbmarglist *arglist)
   pagfp = NULL;
       
   expected_lines = 0;
-  expected_lines_ptr = (interactive && pager) ? &expected_lines : NULL;
+  expected_lines_ptr = (interactive () && pager) ? &expected_lines : NULL;
   if (!(cmd->begin && cmd->begin (&param, expected_lines_ptr)))
     {
       if (pager && expected_lines > get_screen_lines ())
@@ -1938,12 +1945,13 @@ run_command (struct command *cmd, struct gdbmarglist *arglist)
 }
 
 static void
-source_rcfile ()
+source_rcfile (void)
 {
+  instream_t istr = NULL;
+  
   if (access (GDBMTOOLRC, R_OK) == 0)
     {
-      if (setsource (GDBMTOOLRC, 0) == 0)
-        yyparse ();
+      istr = instream_file_create (GDBMTOOLRC);
     }
   else
     {
@@ -1962,11 +1970,17 @@ source_rcfile ()
       fname = mkfilename (p, GDBMTOOLRC, NULL);
       if (access (fname, R_OK) == 0)
         {
-          if (setsource (fname, 0) == 0)
-            yyparse ();
+          istr = instream_file_create (GDBMTOOLRC);
         }
       free (fname);
     }
+
+  if (istr)
+    {
+      if (input_context_push (istr))
+        exit (EXIT_FATAL);
+      yyparse ();
+    }
 }
 
 #if GDBM_DEBUG_ENABLE
@@ -1984,12 +1998,12 @@ debug_printer (char const *fmt, ...)
 int
 main (int argc, char *argv[])
 {
-  int intr;  
   int opt;
   int bv;
   int norc = 0;
   int res;
-  char *source = "-";
+  char *source = NULL;
+  instream_t input = NULL;
   
   set_progname (argv[0]);