- menu: cursor_position is not really useful. and it will cause SEGV for

large cmdmode (why not crashed before?). Let's remove it.


git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3855 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

1 files changed, 2 insertions, 7 deletions

diff --git a/mbbsd/menu.c b/mbbsd/menu.c
index a28047b2..31d0798f 100644
--- a/mbbsd/menu.c
+++ b/mbbsd/menu.c
@@ -221,7 +221,7 @@ show_menu(int moviemode, const commands_t * p)
 
 enum {
     M_ADMIN = 0, M_AMUSE, M_CHC, M_JCEE, M_MAIL, M_MMENU, M_NMENU,
-    M_PMENU, M_PSALE, M_SREG, M_TMENU, M_UMENU, M_XMENU,
+    M_PMENU, M_PSALE, M_SREG, M_TMENU, M_UMENU, M_XMENU, M_XMAX
 };
 
 static const int mode_map[] = {
@@ -236,14 +236,10 @@ domenu(int cmdmode, const char *cmdtitle, int cmd, const commands_t cmdtable[])
     int             n, pos, total, i;
     int             err;
 
-    static char cursor_position[sizeof(mode_map) / sizeof(mode_map[0])] = { 0 };
-
     moviemode = cmdmode;
+    assert(cmdmode < M_XMAX);
     cmdmode = mode_map[cmdmode];
 
-    if (cursor_position[cmdmode])
-	cmd = cursor_position[cmdmode];
-
     setutmpmode(cmdmode);
 
     showtitle(cmdtitle, BBSName);
@@ -331,7 +327,6 @@ domenu(int cmdmode, const char *cmdtitle, int cmd, const commands_t cmdtable[])
 		    cmd = cmdtable[lastcmdptr].desc[0];
 		else
 		    cmd = cmdtable[lastcmdptr].desc[1];
-		cursor_position[cmdmode] = cmdtable[lastcmdptr].desc[0];
 	    }
 	    if (cmd >= 'a' && cmd <= 'z')
 		cmd &= ~0x20;