[7449] don't fall back to dir node

[gavinsmith0123]

Revision: 7449
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7449
Author:   gavin
Date:     2016-10-12 18:45:20 +0000 (Wed, 12 Oct 2016)
Log Message:
-----------
don't fall back to dir node

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/info.c
    trunk/info/t/dir-dangling-entry.sh

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-10-12 06:38:13 UTC (rev 7448)
+++ trunk/ChangeLog     2016-10-12 18:45:20 UTC (rev 7449)
@@ -1,5 +1,11 @@
 2016-10-12  Gavin Smith  <address@hidden>
 
+       * info/info.c (get_initial_file): Don't fall back to the dir node.
+       (main): Quit if there are no nodes to show.
+       * info/t/dir-dangling-entry.sh: Update to match this new behaviour.
+
+2016-10-12  Gavin Smith  <address@hidden>
+
        * info/info-utils.c (parse_top_node_line):  Check if the
        buffer ends before the end of the first line.  Out-of-bounds
        read reported by Hanno B\xF6ck.  Some comments changed.

Modified: trunk/info/info.c
===================================================================
--- trunk/info/info.c   2016-10-12 06:38:13 UTC (rev 7448)
+++ trunk/info/info.c   2016-10-12 18:45:20 UTC (rev 7449)
@@ -324,8 +324,6 @@
         }
     }
 
-  /* Otherwise, use the dir node. */
-  initial_file = xstrdup("dir");
   return;
 }
 
@@ -1030,9 +1028,10 @@
       exit (0);
     }
 
-  if (user_filename && error)
+  if (ref_index == 0)
     {
-      info_error ("%s", error);
+      if (error)
+        info_error ("%s", error);
       exit (0);
     }
     

Modified: trunk/info/t/dir-dangling-entry.sh
===================================================================
--- trunk/info/t/dir-dangling-entry.sh  2016-10-12 06:38:13 UTC (rev 7448)
+++ trunk/info/t/dir-dangling-entry.sh  2016-10-12 18:45:20 UTC (rev 7449)
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# Copyright (C) 2014, 2016 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,17 +16,9 @@
 
 srcdir=${srcdir:-.}
 . $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
 
 # Try to load a dir entry referring to a non-existing file
-
-run_ginfo non-existent
-
-printf 'Dq' >$PTY_TYPE
-
-. $t/Timeout-test.inc
-
-grep 'File: dir' $GINFO_OUTPUT
+$GINFO non-existent 2>&1 | grep 'No menu item'
 RETVAL=$?
 
 cleanup