ncurses 6.1 - patch 20190831

[ncurses.git] / form / frm_req_name.c

diff --git a/form/frm_req_name.c b/form/frm_req_name.c
index ffd722ccca10a5018439dfdedeecd93205cfe424..5686b22202d1dfdc801b73157031ce789c012df1 100644 (file)
--- a/form/frm_req_name.c
+++ b/form/frm_req_name.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -27,7 +27,7 @@
  ****************************************************************************/
 
 /****************************************************************************
  ****************************************************************************/
 
 /****************************************************************************

- *   Author: Juergen Pfeifer <Juergen.Pfeifer@T-Online.de> 1995,1997        *
+ *   Author:  Juergen Pfeifer, 1995,1997                                    *

  ****************************************************************************/
 
 /***************************************************************************
  ****************************************************************************/
 
 /***************************************************************************


@@ -37,71 +37,77 @@
 
 #include "form.priv.h"
 
 
 #include "form.priv.h"
 

-MODULE_ID("$Id: frm_req_name.c,v 1.5 1998/02/11 12:13:43 tom Exp $")
-
-static const char *request_names[ MAX_FORM_COMMAND - MIN_FORM_COMMAND + 1 ] = {
-  "NEXT_PAGE"   ,
-  "PREV_PAGE"   ,
-  "FIRST_PAGE"  ,
-  "LAST_PAGE"   ,
-
-  "NEXT_FIELD"  ,
-  "PREV_FIELD"  ,
-  "FIRST_FIELD"         ,
-  "LAST_FIELD"  ,
-  "SNEXT_FIELD"         ,
-  "SPREV_FIELD"         ,
-  "SFIRST_FIELD" ,
-  "SLAST_FIELD"         ,
-  "LEFT_FIELD"  ,
-  "RIGHT_FIELD"         ,
-  "UP_FIELD"    ,
-  "DOWN_FIELD"  ,
-
-  "NEXT_CHAR"   ,
-  "PREV_CHAR"   ,
-  "NEXT_LINE"   ,
-  "PREV_LINE"   ,
-  "NEXT_WORD"   ,
-  "PREV_WORD"   ,
-  "BEG_FIELD"   ,
-  "END_FIELD"   ,
-  "BEG_LINE"    ,
-  "END_LINE"    ,
-  "LEFT_CHAR"   ,
-  "RIGHT_CHAR"  ,
-  "UP_CHAR"     ,
-  "DOWN_CHAR"   ,
-
-  "NEW_LINE"    ,
-  "INS_CHAR"    ,
-  "INS_LINE"    ,
-  "DEL_CHAR"    ,
-  "DEL_PREV"    ,
-  "DEL_LINE"    ,
-  "DEL_WORD"    ,
-  "CLR_EOL"     ,
-  "CLR_EOF"     ,
-  "CLR_FIELD"   ,
-  "OVL_MODE"    ,
-  "INS_MODE"    ,
-  "SCR_FLINE"   ,
-  "SCR_BLINE"   ,
-  "SCR_FPAGE"   ,
-  "SCR_BPAGE"   ,
-  "SCR_FHPAGE"   ,
-  "SCR_BHPAGE"   ,
-  "SCR_FCHAR"    ,
-  "SCR_BCHAR"    ,
-  "SCR_HFLINE"   ,
-  "SCR_HBLINE"   ,
-  "SCR_HFHALF"   ,
-  "SCR_HBHALF"   ,
-
-  "VALIDATION"  ,
-  "NEXT_CHOICE"         ,
-  "PREV_CHOICE"         
+MODULE_ID("$Id: frm_req_name.c,v 1.19 2015/04/04 17:11:46 tom Exp $")
+
+#define DATA(s) { s }
+
+static const char request_names[MAX_FORM_COMMAND - MIN_FORM_COMMAND + 1][13] =
+{
+  DATA("NEXT_PAGE"),
+  DATA("PREV_PAGE"),
+  DATA("FIRST_PAGE"),
+  DATA("LAST_PAGE"),
+
+  DATA("NEXT_FIELD"),
+  DATA("PREV_FIELD"),
+  DATA("FIRST_FIELD"),
+  DATA("LAST_FIELD"),
+  DATA("SNEXT_FIELD"),
+  DATA("SPREV_FIELD"),
+  DATA("SFIRST_FIELD"),
+  DATA("SLAST_FIELD"),
+  DATA("LEFT_FIELD"),
+  DATA("RIGHT_FIELD"),
+  DATA("UP_FIELD"),
+  DATA("DOWN_FIELD"),
+
+  DATA("NEXT_CHAR"),
+  DATA("PREV_CHAR"),
+  DATA("NEXT_LINE"),
+  DATA("PREV_LINE"),
+  DATA("NEXT_WORD"),
+  DATA("PREV_WORD"),
+  DATA("BEG_FIELD"),
+  DATA("END_FIELD"),
+  DATA("BEG_LINE"),
+  DATA("END_LINE"),
+  DATA("LEFT_CHAR"),
+  DATA("RIGHT_CHAR"),
+  DATA("UP_CHAR"),
+  DATA("DOWN_CHAR"),
+
+  DATA("NEW_LINE"),
+  DATA("INS_CHAR"),
+  DATA("INS_LINE"),
+  DATA("DEL_CHAR"),
+  DATA("DEL_PREV"),
+  DATA("DEL_LINE"),
+  DATA("DEL_WORD"),
+  DATA("CLR_EOL"),
+  DATA("CLR_EOF"),
+  DATA("CLR_FIELD"),
+  DATA("OVL_MODE"),
+  DATA("INS_MODE"),
+  DATA("SCR_FLINE"),
+  DATA("SCR_BLINE"),
+  DATA("SCR_FPAGE"),
+  DATA("SCR_BPAGE"),
+  DATA("SCR_FHPAGE"),
+  DATA("SCR_BHPAGE"),
+  DATA("SCR_FCHAR"),
+  DATA("SCR_BCHAR"),
+  DATA("SCR_HFLINE"),
+  DATA("SCR_HBLINE"),
+  DATA("SCR_HFHALF"),
+  DATA("SCR_HBHALF"),
+
+  DATA("VALIDATION"),
+  DATA("NEXT_CHOICE"),
+  DATA("PREV_CHOICE")

 };
 };

+
+#undef DATA
+

 #define A_SIZE (sizeof(request_names)/sizeof(request_names[0]))
 
 /*---------------------------------------------------------------------------
 #define A_SIZE (sizeof(request_names)/sizeof(request_names[0]))
 
 /*---------------------------------------------------------------------------


@@ -113,18 +119,20 @@ static const char *request_names[ MAX_FORM_COMMAND - MIN_FORM_COMMAND + 1 ] = {
 |   Return Values :  Pointer to name      - on success
 |                    NULL                 - on invalid request code
 +--------------------------------------------------------------------------*/
 |   Return Values :  Pointer to name      - on success
 |                    NULL                 - on invalid request code
 +--------------------------------------------------------------------------*/

-const char *form_request_name( int request )
+NCURSES_EXPORT(const char *)
+form_request_name(int request)

 {
 {

-  if ( (request < MIN_FORM_COMMAND) || (request > MAX_FORM_COMMAND) )
+  T((T_CALLED("form_request_name(%d)"), request));
+
+  if ((request < MIN_FORM_COMMAND) || (request > MAX_FORM_COMMAND))

     {
     {

-      SET_ERROR (E_BAD_ARGUMENT);
-      return (const char *)0;
+      SET_ERROR(E_BAD_ARGUMENT);
+      returnCPtr((const char *)0);

     }
   else
     }
   else

-    return request_names[ request - MIN_FORM_COMMAND ];
+    returnCPtr(request_names[request - MIN_FORM_COMMAND]);

 }
 
 }
 

-

 /*---------------------------------------------------------------------------
 |   Facility      :  libnform  
 |   Function      :  int form_request_by_name (const char *str);
 /*---------------------------------------------------------------------------
 |   Facility      :  libnform  
 |   Function      :  int form_request_by_name (const char *str);


@@ -134,28 +142,34 @@ const char *form_request_name( int request )
 |   Return Values :  Request Id       - on success
 |                    E_NO_MATCH       - request not found
 +--------------------------------------------------------------------------*/
 |   Return Values :  Request Id       - on success
 |                    E_NO_MATCH       - request not found
 +--------------------------------------------------------------------------*/

-int form_request_by_name( const char *str )
-{ 
+NCURSES_EXPORT(int)
+form_request_by_name(const char *str)
+{

   /* because the table is so small, it doesn't really hurt
      to run sequentially through it.
   /* because the table is so small, it doesn't really hurt
      to run sequentially through it.

-  */
-  unsigned int i = 0;
-  char buf[16];
-  
-  if (str)
+   */
+  size_t i = 0;
+  char buf[16];                        /* longest name is 10 chars */
+
+  T((T_CALLED("form_request_by_name(%s)"), _nc_visbuf(str)));
+
+  if (str != 0 && (i = strlen(str)) != 0)

     {
     {

-      strncpy(buf,str,sizeof(buf));
-      while( (i<sizeof(buf)) && (buf[i] != '\0') )
+      if (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_FORM_COMMAND + i;
-       } 
+         if (strcmp(request_names[i], buf) == 0)
+           returnCode(MIN_FORM_COMMAND + (int)i);
+       }

     }
   RETURN(E_NO_MATCH);
 }
     }
   RETURN(E_NO_MATCH);
 }