X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=menu%2Fm_driver.c;h=dcc1c55d83a237d7c37716e6a0ff03f674bb0dd9;hp=d29c6024a7e3a0c235a2ed0973b4b5a15ab6762f;hb=c120fddebe9e9c1e2b29dbd744a6b1d03652bf8b;hpb=027ae42953e3186daed8f3882da73de48291b606

diff --git a/menu/m_driver.c b/menu/m_driver.c
index d29c6024..dcc1c55d 100644
--- a/menu/m_driver.c
+++ b/menu/m_driver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -37,7 +37,7 @@
 
 #include "menu.priv.h"
 
-MODULE_ID("$Id: m_driver.c,v 1.25 2005/11/26 20:46:59 tom Exp $")
+MODULE_ID("$Id: m_driver.c,v 1.30 2011/05/21 18:56:41 tom Exp $")
 
 /* Macros */
 
@@ -74,7 +74,7 @@ Is_Sub_String(
     {
       while (*string && *part)
 	{
-	  if (toupper(*string++) != toupper(*part))
+	  if (toupper(UChar(*string++)) != toupper(UChar(*part)))
 	    break;
 	  part++;
 	}
@@ -121,7 +121,8 @@ _nc_Match_Next_Character_In_Item_Name
   bool found = FALSE, passed = FALSE;
   int idx, last;
 
-  T((T_CALLED("_nc_Match_Next_Character(%p,%d,%p)"), menu, ch, item));
+  T((T_CALLED("_nc_Match_Next_Character(%p,%d,%p)"),
+     (void *)menu, ch, (void *)item));
 
   assert(menu && item && *item);
   idx = (*item)->index;
@@ -197,7 +198,7 @@ _nc_Match_Next_Character_In_Item_Name
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnmenu
-|   Function      :  int menu_driver(MENU *menu, int c)
+|   Function      :  int menu_driver(MENU* menu, int c)
 |
 |   Description   :  Central dispatcher for the menu. Translates the logical
 |                    request 'c' into a menu action.
@@ -220,7 +221,7 @@ menu_driver(MENU * menu, int c)
   ITEM *item;
   int my_top_row, rdiff;
 
-  T((T_CALLED("menu_driver(%p,%d)"), menu, c));
+  T((T_CALLED("menu_driver(%p,%d)"), (void *)menu, c));
 
   if (!menu)
     RETURN(E_BAD_ARGUMENT);
@@ -303,7 +304,7 @@ menu_driver(MENU * menu, int c)
 	  else
 	    {
 	      my_top_row += rdiff;
-	      while (rdiff-- > 0 && item != (ITEM *) 0)
+	      while (rdiff-- > 0 && item != 0 && item->down != 0)
 		item = item->down;
 	    }
 	  break;
@@ -316,7 +317,7 @@ menu_driver(MENU * menu, int c)
 	  else
 	    {
 	      my_top_row -= rdiff;
-	      while (rdiff-- && item != (ITEM *) 0)
+	      while (rdiff-- > 0 && item != 0 && item->up != 0)
 		item = item->up;
 	    }
 	  break;
@@ -536,7 +537,11 @@ menu_driver(MENU * menu, int c)
 	result = E_UNKNOWN_COMMAND;
     }
 
-  if (E_OK == result)
+  if (item == 0)
+    {
+      result = E_BAD_STATE;
+    }
+  else if (E_OK == result)
     {
       /* Adjust the top row if it turns out that the current item unfortunately
          doesn't appear in the menu window */