/[LeafOK_CVS]/lbbs/src/menu.c
ViewVC logotype

Diff of /lbbs/src/menu.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.54 by sysadm, Tue May 20 12:18:24 2025 UTC Revision 1.59 by sysadm, Wed May 28 07:30:23 2025 UTC
# Line 864  static int display_menu_current_page(MEN Line 864  static int display_menu_current_page(MEN
864          {          {
865                  if (p_menu->title.row == 0 && p_menu->title.col == 0)                  if (p_menu->title.row == 0 && p_menu->title.col == 0)
866                  {                  {
867                          show_top(p_menu->title.text);                          show_top(p_menu->title.text, BBS_name, "");
868                  }                  }
869                  else                  else
870                  {                  {
# Line 1306  int menu_control(MENU_SET *p_menu_set, i Line 1306  int menu_control(MENU_SET *p_menu_set, i
1306    
1307  int unload_menu(MENU_SET *p_menu_set)  int unload_menu(MENU_SET *p_menu_set)
1308  {  {
1309            int shmid;
1310    
1311          if (p_menu_set->p_menu_name_dict != NULL)          if (p_menu_set->p_menu_name_dict != NULL)
1312          {          {
1313                  trie_dict_destroy(p_menu_set->p_menu_name_dict);                  trie_dict_destroy(p_menu_set->p_menu_name_dict);
# Line 1318  int unload_menu(MENU_SET *p_menu_set) Line 1320  int unload_menu(MENU_SET *p_menu_set)
1320                  p_menu_set->p_menu_screen_dict = NULL;                  p_menu_set->p_menu_screen_dict = NULL;
1321          }          }
1322    
1323          unload_menu_shm(p_menu_set);          shmid = p_menu_set->shmid;
1324    
1325            detach_menu_shm(p_menu_set);
1326    
1327          if (shmctl(p_menu_set->shmid, IPC_RMID, NULL) == -1)          if (shmctl(shmid, IPC_RMID, NULL) == -1)
1328          {          {
1329                  log_error("shmctl(shmid=%d, IPC_RMID) error (%d)\n", p_menu_set->shmid, errno);                  log_error("shmctl(shmid=%d, IPC_RMID) error (%d)\n", shmid, errno);
1330                  return -1;                  return -1;
1331          }          }
1332    
1333          return 0;          return 0;
1334  }  }
1335    
1336  int load_menu_shm(MENU_SET *p_menu_set)  int set_menu_shm_readonly(MENU_SET *p_menu_set)
1337  {  {
1338          void *p_shm;          void *p_shm;
1339    
1340          // Mount shared memory          // Remap shared memory in read-only mode
1341          p_shm = shmat(p_menu_set->shmid, NULL, SHM_RDONLY);          p_shm = shmat(p_menu_set->shmid, p_menu_set->p_reserved, SHM_RDONLY | SHM_REMAP);
1342          if (p_shm == (void *)-1)          if (p_shm == (void *)-1)
1343          {          {
1344                  log_error("shmat() error (%d)\n", errno);                  log_error("shmat(menu_shm shmid = %d) error (%d)\n", p_menu_set->shmid, errno);
1345                  return -1;                  return -1;
1346          }          }
1347            
         if (p_menu_set->p_reserved != NULL && shmdt(p_menu_set->p_reserved) == -1)  
         {  
                 log_error("shmdt() error (%d)\n", errno);  
                 return -2;  
         }  
1348          p_menu_set->p_reserved = p_shm;          p_menu_set->p_reserved = p_shm;
1349    
         p_menu_set->p_menu_pool = p_menu_set->p_reserved + MENU_SET_RESERVED_LENGTH;  
         p_menu_set->p_menu_item_pool = p_menu_set->p_menu_pool + sizeof(MENU) * MAX_MENUS;  
         p_menu_set->p_menu_screen_pool = p_menu_set->p_menu_item_pool + sizeof(MENU_ITEM) * MAX_MENUITEMS;  
         p_menu_set->p_menu_screen_buf = p_menu_set->p_menu_screen_pool + sizeof(MENU_SCREEN) * MAX_MENUS;  
         p_menu_set->p_menu_screen_buf_free = p_menu_set->p_menu_screen_buf;  
   
         // Restore status varaibles into reserved memory area  
         p_menu_set->menu_count = *((int16_t *)p_menu_set->p_reserved);  
         p_menu_set->menu_item_count = *(((int16_t *)p_menu_set->p_reserved) + 1);  
         p_menu_set->menu_screen_count = *(((int16_t *)p_menu_set->p_reserved) + 2);  
   
         p_menu_set->choose_step = 0;  
         p_menu_set->menu_id_path[0] = 0;  
   
         p_menu_set->p_menu_name_dict = NULL;  
         p_menu_set->p_menu_screen_dict = NULL;  
   
1350          return 0;          return 0;
1351  }  }
1352    
1353  int unload_menu_shm(MENU_SET *p_menu_set)  int detach_menu_shm(MENU_SET *p_menu_set)
1354  {  {
1355          p_menu_set->menu_count = 0;          p_menu_set->menu_count = 0;
1356          p_menu_set->menu_item_count = 0;          p_menu_set->menu_item_count = 0;
# Line 1381  int unload_menu_shm(MENU_SET *p_menu_set Line 1363  int unload_menu_shm(MENU_SET *p_menu_set
1363          p_menu_set->p_menu_screen_buf = NULL;          p_menu_set->p_menu_screen_buf = NULL;
1364          p_menu_set->p_menu_screen_buf_free = NULL;          p_menu_set->p_menu_screen_buf_free = NULL;
1365    
1366            p_menu_set->p_menu_name_dict = NULL;
1367            p_menu_set->p_menu_screen_dict = NULL;
1368    
1369          if (p_menu_set->p_reserved != NULL && shmdt(p_menu_set->p_reserved) == -1)          if (p_menu_set->p_reserved != NULL && shmdt(p_menu_set->p_reserved) == -1)
1370          {          {
1371                  log_error("shmdt() error (%d)\n", errno);                  log_error("shmdt() error (%d)\n", errno);
1372                  return -1;                  return -1;
1373          }          }
1374    
1375          p_menu_set->p_reserved = NULL;          p_menu_set->p_reserved = NULL;
1376    
1377          return 0;          return 0;

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
webmaster@leafok.com
 ViewVC Help
Powered by ViewVC 1.3.0-beta1