[5648] inexact dir match fix

[Gavin D. Smith]

Revision: 5648
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5648
Author:   gavin
Date:     2014-06-08 19:27:34 +0000 (Sun, 08 Jun 2014)
Log Message:
-----------
inexact dir match fix

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/info.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-06-08 19:19:15 UTC (rev 5647)
+++ trunk/ChangeLog     2014-06-08 19:27:34 UTC (rev 5648)
@@ -1,5 +1,10 @@
 2014-06-08  Gavin Smith  <address@hidden>
 
+       * info/info.c (get_initial_file): For inexact dir match, discard
+       command-line argument after processing, and clear error message.
+
+2014-06-08  Gavin Smith  <address@hidden>
+
        * info/nodes.h (N_IsDir): New flag.
        * info/dir.c (build_dir_node): Set N_IsDir on flags for return node.
        * info/info-utils.c (scan_reference_marker): Split out from

Modified: trunk/info/info.c
===================================================================
--- trunk/info/info.c   2014-06-08 19:19:15 UTC (rev 5647)
+++ trunk/info/info.c   2014-06-08 19:27:34 UTC (rev 5648)
@@ -254,6 +254,12 @@
       entry = lookup_dir_entry ((*argv)[0], 1);
       if (entry)
         {
+          (*argv)++; /* Advance past first remaining argument. */
+          (*argc)--;
+          /* Clear error message. */
+          free (*error);
+          *error = 0;
+
           initial_file = info_find_fullpath (entry->filename, 0);
           /* Store full path, so that we find the already loaded file in
              info_find_file, and show the full path if --where is used. */