--- lbbs/src/menu.c 2025/05/05 11:11:06 1.27 +++ lbbs/src/menu.c 2025/05/06 05:31:26 1.30 @@ -1,16 +1,15 @@ /*************************************************************************** menu.c - description ------------------- - begin : Wed Mar 16 2004 - copyright : (C) 2005 by Leaflet - email : leaflet@leafok.com + Copyright : (C) 2004-2025 by Leaflet + Email : leaflet@leafok.com ***************************************************************************/ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation; either version 3 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ @@ -63,9 +62,9 @@ int load_menu(MENU_SET *p_menu_set, cons if (ireg("^%S_([A-Za-z0-9_]+)", buffer, 2, pmatch) == 0) { strncpy(temp, buffer + pmatch[1].rm_so, - pmatch[1].rm_eo - pmatch[1].rm_so); + (size_t)(pmatch[1].rm_eo - pmatch[1].rm_so)); temp[pmatch[1].rm_eo - pmatch[1].rm_so] = '\0'; - sprintf(screen_filename, "%s/MENU_SCR_%s", MENU_TEMP_DIR, temp); + snprintf(screen_filename, sizeof(screen_filename), "%s/MENU_SCR_%s", MENU_TEMP_DIR, temp); if ((fout = fopen(screen_filename, "w")) == NULL) { @@ -93,7 +92,7 @@ int load_menu(MENU_SET *p_menu_set, cons strncpy(p_menu_set->p_menu[i]->name, buffer + pmatch[1].rm_so, - pmatch[1].rm_eo - pmatch[1].rm_so); + (size_t)(pmatch[1].rm_eo - pmatch[1].rm_so)); p_menu_set->p_menu[i]->name[pmatch[1].rm_eo - pmatch[1].rm_so] = '\0'; @@ -123,37 +122,37 @@ int load_menu(MENU_SET *p_menu_set, cons p_menu_set->p_menu[i]->items[j]->submenu = 1; strncpy(p_menu_set->p_menu[i]->items[j]->action, buffer + pmatch[1].rm_so, - pmatch[1].rm_eo - pmatch[1].rm_so); + (size_t)(pmatch[1].rm_eo - pmatch[1].rm_so)); p_menu_set->p_menu[i]->items[j]->action[pmatch[1].rm_eo - pmatch[1].rm_so] = '\0'; strncpy(temp, buffer + pmatch[2].rm_so, - pmatch[2].rm_eo - pmatch[2].rm_so); + (size_t)(pmatch[2].rm_eo - pmatch[2].rm_so)); temp[pmatch[2].rm_eo - pmatch[2].rm_so] = '\0'; p_menu_set->p_menu[i]->items[j]->row = atoi(temp); strncpy(temp, buffer + pmatch[3].rm_so, - pmatch[3].rm_eo - pmatch[3].rm_so); + (size_t)(pmatch[3].rm_eo - pmatch[3].rm_so)); temp[pmatch[3].rm_eo - pmatch[3].rm_so] = '\0'; p_menu_set->p_menu[i]->items[j]->col = atoi(temp); strncpy(temp, buffer + pmatch[4].rm_so, - pmatch[4].rm_eo - pmatch[4].rm_so); + (size_t)(pmatch[4].rm_eo - pmatch[4].rm_so)); temp[pmatch[4].rm_eo - pmatch[4].rm_so] = '\0'; p_menu_set->p_menu[i]->items[j]->priv = atoi(temp); strncpy(temp, buffer + pmatch[5].rm_so, - pmatch[5].rm_eo - pmatch[5].rm_so); + (size_t)(pmatch[5].rm_eo - pmatch[5].rm_so)); temp[pmatch[5].rm_eo - pmatch[5].rm_so] = '\0'; p_menu_set->p_menu[i]->items[j]->level = atoi(temp); strncpy(p_menu_set->p_menu[i]->items[j]->name, buffer + pmatch[6].rm_so, - pmatch[6].rm_eo - pmatch[6].rm_so); + (size_t)(pmatch[6].rm_eo - pmatch[6].rm_so)); p_menu_set->p_menu[i]->items[j]->name[pmatch[6].rm_eo - pmatch[6].rm_so] = '\0'; strncpy(p_menu_set->p_menu[i]->items[j]->text, buffer + pmatch[7].rm_so, - pmatch[7].rm_eo - pmatch[7].rm_so); + (size_t)(pmatch[7].rm_eo - pmatch[7].rm_so)); p_menu_set->p_menu[i]->items[j]->text[pmatch[7].rm_eo - pmatch[7].rm_so] = '\0'; @@ -171,37 +170,37 @@ int load_menu(MENU_SET *p_menu_set, cons p_menu_set->p_menu[i]->items[j]->submenu = 0; strncpy(p_menu_set->p_menu[i]->items[j]->action, buffer + pmatch[1].rm_so, - pmatch[1].rm_eo - pmatch[1].rm_so); + (size_t)(pmatch[1].rm_eo - pmatch[1].rm_so)); p_menu_set->p_menu[i]->items[j]->action[pmatch[1].rm_eo - pmatch[1].rm_so] = '\0'; strncpy(temp, buffer + pmatch[2].rm_so, - pmatch[2].rm_eo - pmatch[2].rm_so); + (size_t)(pmatch[2].rm_eo - pmatch[2].rm_so)); temp[pmatch[2].rm_eo - pmatch[2].rm_so] = '\0'; p_menu_set->p_menu[i]->items[j]->row = atoi(temp); strncpy(temp, buffer + pmatch[3].rm_so, - pmatch[3].rm_eo - pmatch[3].rm_so); + (size_t)(pmatch[3].rm_eo - pmatch[3].rm_so)); temp[pmatch[3].rm_eo - pmatch[3].rm_so] = '\0'; p_menu_set->p_menu[i]->items[j]->col = atoi(temp); strncpy(temp, buffer + pmatch[4].rm_so, - pmatch[4].rm_eo - pmatch[4].rm_so); + (size_t)(pmatch[4].rm_eo - pmatch[4].rm_so)); temp[pmatch[4].rm_eo - pmatch[4].rm_so] = '\0'; p_menu_set->p_menu[i]->items[j]->priv = atoi(temp); strncpy(temp, buffer + pmatch[5].rm_so, - pmatch[5].rm_eo - pmatch[5].rm_so); + (size_t)(pmatch[5].rm_eo - pmatch[5].rm_so)); temp[pmatch[5].rm_eo - pmatch[5].rm_so] = '\0'; p_menu_set->p_menu[i]->items[j]->level = atoi(temp); strncpy(p_menu_set->p_menu[i]->items[j]->name, buffer + pmatch[6].rm_so, - pmatch[6].rm_eo - pmatch[6].rm_so); + (size_t)(pmatch[6].rm_eo - pmatch[6].rm_so)); p_menu_set->p_menu[i]->items[j]->name[pmatch[6].rm_eo - pmatch[6].rm_so] = '\0'; strncpy(p_menu_set->p_menu[i]->items[j]->text, buffer + pmatch[7].rm_so, - pmatch[7].rm_eo - pmatch[7].rm_so); + (size_t)(pmatch[7].rm_eo - pmatch[7].rm_so)); p_menu_set->p_menu[i]->items[j]->text[pmatch[7].rm_eo - pmatch[7].rm_so] = '\0'; @@ -215,17 +214,17 @@ int load_menu(MENU_SET *p_menu_set, cons p_menu_set->p_menu[i]->title.show = 1; strncpy(temp, buffer + pmatch[1].rm_so, - pmatch[1].rm_eo - pmatch[1].rm_so); + (size_t)(pmatch[1].rm_eo - pmatch[1].rm_so)); temp[pmatch[1].rm_eo - pmatch[1].rm_so] = '\0'; p_menu_set->p_menu[i]->title.row = atoi(temp); strncpy(temp, buffer + pmatch[2].rm_so, - pmatch[2].rm_eo - pmatch[2].rm_so); + (size_t)(pmatch[2].rm_eo - pmatch[2].rm_so)); temp[pmatch[2].rm_eo - pmatch[2].rm_so] = '\0'; p_menu_set->p_menu[i]->title.col = atoi(temp); strncpy(p_menu_set->p_menu[i]->title.text, buffer + pmatch[3].rm_so, - pmatch[3].rm_eo - pmatch[3].rm_so); + (size_t)(pmatch[3].rm_eo - pmatch[3].rm_so)); p_menu_set->p_menu[i]->title.text[pmatch[3].rm_eo - pmatch[3].rm_so] = '\0'; @@ -238,20 +237,21 @@ int load_menu(MENU_SET *p_menu_set, cons p_menu_set->p_menu[i]->screen.show = 1; strncpy(temp, buffer + pmatch[1].rm_so, - pmatch[1].rm_eo - pmatch[1].rm_so); + (size_t)(pmatch[1].rm_eo - pmatch[1].rm_so)); temp[pmatch[1].rm_eo - pmatch[1].rm_so] = '\0'; p_menu_set->p_menu[i]->screen.row = atoi(temp); strncpy(temp, buffer + pmatch[2].rm_so, - pmatch[2].rm_eo - pmatch[2].rm_so); + (size_t)(pmatch[2].rm_eo - pmatch[2].rm_so)); temp[pmatch[2].rm_eo - pmatch[2].rm_so] = '\0'; p_menu_set->p_menu[i]->screen.col = atoi(temp); strncpy(temp, buffer + pmatch[3].rm_so, - pmatch[3].rm_eo - pmatch[3].rm_so); + (size_t)(pmatch[3].rm_eo - pmatch[3].rm_so)); temp[pmatch[3].rm_eo - pmatch[3].rm_so] = '\0'; - sprintf(p_menu_set->p_menu[i]->screen.filename, - "%s/MENU_SCR_%s", MENU_TEMP_DIR, temp); + snprintf(p_menu_set->p_menu[i]->screen.filename, + sizeof(p_menu_set->p_menu[i]->screen.filename), + "%s/MENU_SCR_%s", MENU_TEMP_DIR, temp); continue; } }