--- lbbs/src/menu.c 2025/10/29 05:30:05 1.77 +++ lbbs/src/menu.c 2025/11/04 14:58:56 1.83 @@ -1,18 +1,10 @@ -/*************************************************************************** - menu.c - description - ------------------- - 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 3 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/* SPDX-License-Identifier: GPL-3.0-or-later */ +/* + * menu + * - configurable user interactive menu feature + * + * Copyright (C) 2004-2025 Leaflet + */ #include "bbs.h" #include "bbs_cmd.h" @@ -38,7 +30,7 @@ #define MENU_SET_RESERVED_LENGTH (sizeof(int16_t) * 4) -#define MENU_SHMGET_RETRY_LIMIT 3 +#define MENU_SHMGET_RETRY_LIMIT 10 MENU_SET bbs_menu; MENU_SET top10_menu; @@ -104,24 +96,21 @@ int load_menu(MENU_SET *p_menu_set, cons key = ftok(conf_file, proj_id + retry_cnt); if (key == -1) { - log_error("ftok(%s %d) error (%d)\n", conf_file, proj_id, errno); - return -2; + log_error("ftok(%s %d) error (%d)\n", conf_file, proj_id + retry_cnt, errno); + return -3; } p_menu_set->shmid = shmget(key, size, IPC_CREAT | IPC_EXCL | 0600); - if (p_menu_set->shmid == -1) { if (errno != EEXIST || retry_cnt + 1 >= MENU_SHMGET_RETRY_LIMIT) { log_error("shmget(conf_file=%s, size=%d) error (%d) %d times\n", conf_file, size, errno, retry_cnt + 1); - break; + return -3; } -#ifdef _DEBUG log_error("shmget(conf_file=%s, proj_id=%d, key=0x%x, size=%d) error (%d), retry ...\n", conf_file, proj_id + retry_cnt, key, size, errno); -#endif retry_cnt++; } } while (p_menu_set->shmid == -1); @@ -1395,7 +1384,7 @@ int unload_menu(MENU_SET *p_menu_set) detach_menu_shm(p_menu_set); - if (shmctl(shmid, IPC_RMID, NULL) == -1) + if (shmid != 0 && shmctl(shmid, IPC_RMID, NULL) == -1) { log_error("shmctl(shmid=%d, IPC_RMID) error (%d)\n", shmid, errno); return -1;