Diff for /freem/src/cmd_unmap.c between versions 1.3 and 1.5

version 1.3, 2025/03/09 19:14:24 version 1.5, 2025/04/13 04:22:43
Line 24 Line 24
  *   along with FreeM.  If not, see <https://www.gnu.org/licenses/>.   *   along with FreeM.  If not, see <https://www.gnu.org/licenses/>.
  *   *
  *   $Log$   *   $Log$
    *   Revision 1.5  2025/04/13 04:22:43  snw
    *   Fix snprintf calls
    *
    *   Revision 1.4  2025/04/09 19:52:02  snw
    *   Eliminate as many warnings as possible while building with -Wall
    *
  *   Revision 1.3  2025/03/09 19:14:24  snw   *   Revision 1.3  2025/03/09 19:14:24  snw
  *   First phase of REUSE compliance and header reformat   *   First phase of REUSE compliance and header reformat
  *   *
Line 39 Line 45
   
 MRESULT cmd_unmap(MACTION *ra)  MRESULT cmd_unmap(MACTION *ra)
 {  {
     char mapping_type;      char mapping_obj[STRLEN];
     char mapping_obj[256];      char tmp_data[STRLEN];
     char tmp_data[256];      char tmp_key[STRLEN];
     char tmp_key[256];  
           
     if (rtn_dialect () != D_FREEM) {      if (rtn_dialect () != D_FREEM) {
         return NOSTAND;          return NOSTAND;
Line 54  MRESULT cmd_unmap(MACTION *ra) Line 59  MRESULT cmd_unmap(MACTION *ra)
           
     expr (NAME);      expr (NAME);
     if (merr ()) return merr ();      if (merr ()) return merr ();
       
     if (stcmp (varnam, "GLOBAL\201") == 0 || stcmp (varnam, "global\201") == 0) {      if (stcmp (varnam, "GLOBAL\201") != 0 && stcmp (varnam, "global\201") != 0 && stcmp (varnam, "ROUTINE\201") != 0 &&  stcmp (varnam, "routine\201") != 0) {
         mapping_type = 'g';  
     }  
     else if (stcmp (varnam, "ROUTINE\201") == 0 ||  stcmp (varnam, "routine\201") == 0) {  
         mapping_type = 'r';  
         return ARGLIST;  
     }  
     else {  
         return ARGLIST;          return ARGLIST;
     }      }
           
Line 74  MRESULT cmd_unmap(MACTION *ra) Line 72  MRESULT cmd_unmap(MACTION *ra)
     stcpy (mapping_obj, varnam);      stcpy (mapping_obj, varnam);
     stcnv_m2c (mapping_obj);      stcnv_m2c (mapping_obj);
           
     snprintf (tmp_key, 255, "^$SYSTEM\202MAPPINGS\202GLOBAL\202%s\201", mapping_obj);      snprintf (tmp_key, STRLEN - 1, "^$SYSTEM\202MAPPINGS\202GLOBAL\202%s\201", mapping_obj);
     global (kill_sym, tmp_key, tmp_data);      global (kill_sym, tmp_key, tmp_data);
           
     codptr++;      codptr++;

Removed from v.1.3  
changed lines
  Added in v.1.5


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>