texinfo/info session.c

[Sergey Poznyakoff]

CVSROOT:        /cvsroot/texinfo
Module name:    texinfo
Changes by:     Sergey Poznyakoff <gray>        11/07/28 08:13:19

Modified files:
        info           : session.c 

Log message:
        (min_search_length): New variable.
        (info_search_1): Do not search for patterns shorter than 
min_search_length.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/session.c?cvsroot=texinfo&r1=1.49&r2=1.50

Patches:
Index: session.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/info/session.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- session.c   28 Jul 2011 07:15:20 -0000      1.49
+++ session.c   28 Jul 2011 08:13:19 -0000      1.50
@@ -1,5 +1,5 @@
 /* session.c -- user windowing interface to Info.
-   $Id: session.c,v 1.49 2011/07/28 07:15:20 gray Exp $
+   $Id: session.c,v 1.50 2011/07/28 08:13:19 gray Exp $
 
    Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
    2004, 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -66,6 +66,9 @@
 /* Whether to use regexps or not for search.  */
 static int use_regex = 1;
 
+/* Minimal length of a search string */
+int min_search_length = 3;
+
 void remember_window_and_node (WINDOW *window, NODE *node);
 void forget_window_and_nodes (WINDOW *window);
 void display_startup_message_and_start (void);
@@ -4110,6 +4113,12 @@
         }
     }
 
+  if (mbslen (search_string) < min_search_length)
+    {
+      info_error (_("Search string too short"));
+      return;
+    }
+
   /* If the search string includes upper-case letters, make the search
      case-sensitive.  */
   if (case_sensitive == 0)