X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=menu%2Fm_req_name.c;h=cc0066d540b8947bba1661d5642787df8cc4a712;hp=13c9e31fd8cfbc3c1b1a4faf74241c0220248738;hb=9208e1bde56ebb9cc550fd93034f1d4650518b11;hpb=3a9b6a3bf0269231bef7de74757a910dedd04e0c diff --git a/menu/m_req_name.c b/menu/m_req_name.c index 13c9e31f..cc0066d5 100644 --- a/menu/m_req_name.c +++ b/menu/m_req_name.c @@ -1,53 +1,67 @@ -/*-----------------------------------------------------------------------------+ -| The ncurses menu library is Copyright (C) 1995-1997 | -| by Juergen Pfeifer | -| All Rights Reserved. | -| | -| Permission to use, copy, modify, and distribute this software and its | -| documentation for any purpose and without fee is hereby granted, provided | -| that the above copyright notice appear in all copies and that both that | -| copyright notice and this permission notice appear in supporting | -| documentation, and that the name of the above listed copyright holder(s) not | -| be used in advertising or publicity pertaining to distribution of the | -| software without specific, written prior permission. | -| | -| THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD TO | -| THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT- | -| NESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR | -| ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RE- | -| SULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, | -| NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH | -| THE USE OR PERFORMANCE OF THIS SOFTWARE. | -+-----------------------------------------------------------------------------*/ +/**************************************************************************** + * Copyright (c) 1998-2012,2015 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 * + * "Software"), to deal in the Software without restriction, including * + * without limitation the rights to use, copy, modify, merge, publish, * + * distribute, distribute with modifications, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included * + * in all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * + * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + * * + * Except as contained in this notice, the name(s) of the above copyright * + * holders shall not be used in advertising or otherwise to promote the * + * sale, use or other dealings in this Software without prior written * + * authorization. * + ****************************************************************************/ + +/**************************************************************************** + * Author: Juergen Pfeifer, 1995,1997 * + ****************************************************************************/ /*************************************************************************** -* Module menu_request_name * +* Module m_request_name * * Routines to handle external names of menu requests * ***************************************************************************/ #include "menu.priv.h" -MODULE_ID("$Id: m_req_name.c,v 1.8 1997/05/01 16:47:26 juergen Exp $") +MODULE_ID("$Id: m_req_name.c,v 1.23 2015/04/04 18:00:23 tom Exp $") + +#define DATA(s) { s } -static const char *request_names[ MAX_MENU_COMMAND - MIN_MENU_COMMAND + 1 ] = { - "LEFT_ITEM" , - "RIGHT_ITEM" , - "UP_ITEM" , - "DOWN_ITEM" , - "SCR_ULINE" , - "SCR_DLINE" , - "SCR_DPAGE" , - "SCR_UPAGE" , - "FIRST_ITEM" , - "LAST_ITEM" , - "NEXT_ITEM" , - "PREV_ITEM" , - "TOGGLE_ITEM" , - "CLEAR_PATTERN", - "BACK_PATTERN" , - "NEXT_MATCH" , - "PREV_MATCH" +static const char request_names[MAX_MENU_COMMAND - MIN_MENU_COMMAND + 1][14] = +{ + DATA("LEFT_ITEM"), + DATA("RIGHT_ITEM"), + DATA("UP_ITEM"), + DATA("DOWN_ITEM"), + DATA("SCR_ULINE"), + DATA("SCR_DLINE"), + DATA("SCR_DPAGE"), + DATA("SCR_UPAGE"), + DATA("FIRST_ITEM"), + DATA("LAST_ITEM"), + DATA("NEXT_ITEM"), + DATA("PREV_ITEM"), + DATA("TOGGLE_ITEM"), + DATA("CLEAR_PATTERN"), + DATA("BACK_PATTERN"), + DATA("NEXT_MATCH"), + DATA("PREV_MATCH") }; + #define A_SIZE (sizeof(request_names)/sizeof(request_names[0])) /*--------------------------------------------------------------------------- @@ -59,18 +73,19 @@ static const char *request_names[ MAX_MENU_COMMAND - MIN_MENU_COMMAND + 1 ] = { | Return Values : Pointer to name - on success | NULL - on invalid request code +--------------------------------------------------------------------------*/ -const char *menu_request_name( int request ) +NCURSES_EXPORT(const char *) +menu_request_name(int request) { - if ( (request < MIN_MENU_COMMAND) || (request > MAX_MENU_COMMAND) ) + T((T_CALLED("menu_request_name(%d)"), request)); + if ((request < MIN_MENU_COMMAND) || (request > MAX_MENU_COMMAND)) { SET_ERROR(E_BAD_ARGUMENT); - return (const char *)0; + returnCPtr((const char *)0); } else - return request_names[ request - MIN_MENU_COMMAND ]; + returnCPtr(request_names[request - MIN_MENU_COMMAND]); } - /*--------------------------------------------------------------------------- | Facility : libnmenu | Function : int menu_request_by_name (const char *str); @@ -80,28 +95,34 @@ const char *menu_request_name( int request ) | Return Values : Request Id - on success | E_NO_MATCH - request not found +--------------------------------------------------------------------------*/ -int menu_request_by_name( const char *str ) -{ +NCURSES_EXPORT(int) +menu_request_by_name(const char *str) +{ /* because the table is so small, it doesn't really hurt to run sequentially through it. - */ - unsigned int i = 0; + */ + size_t i = 0; char buf[16]; - - if (str) + + T((T_CALLED("menu_request_by_name(%s)"), _nc_visbuf(str))); + + if (str != 0 && (i = strlen(str)) != 0) { - strncpy(buf,str,sizeof(buf)); - while( (i sizeof(buf) - 2) + i = sizeof(buf) - 2; + memcpy(buf, str, i); + buf[i] = '\0'; + + for (i = 0; buf[i] != '\0'; ++i) { - buf[i] = toupper(buf[i]); - i++; + buf[i] = (char)toupper(UChar(buf[i])); } - - for (i=0; i < A_SIZE; i++) + + for (i = 0; i < A_SIZE; i++) { - if (strncmp(request_names[i],buf,sizeof(buf))==0) - return MIN_MENU_COMMAND + i; - } + if (strcmp(request_names[i], buf) == 0) + returnCode(MIN_MENU_COMMAND + (int)i); + } } RETURN(E_NO_MATCH); }