/[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.55 by sysadm, Fri May 23 13:32:51 2025 UTC
# Line 1333  int load_menu_shm(MENU_SET *p_menu_set) Line 1333  int load_menu_shm(MENU_SET *p_menu_set)
1333  {  {
1334          void *p_shm;          void *p_shm;
1335    
1336          // Mount shared memory          // Remap shared memory in read-only mode
1337          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);
1338          if (p_shm == (void *)-1)          if (p_shm == (void *)-1)
1339          {          {
1340                  log_error("shmat() error (%d)\n", errno);                  log_error("shmat() error (%d)\n", errno);
1341                  return -1;                  return -1;
1342          }          }
1343            
         if (p_menu_set->p_reserved != NULL && shmdt(p_menu_set->p_reserved) == -1)  
         {  
                 log_error("shmdt() error (%d)\n", errno);  
                 return -2;  
         }  
1344          p_menu_set->p_reserved = p_shm;          p_menu_set->p_reserved = p_shm;
1345    
         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;  
   
1346          return 0;          return 0;
1347  }  }
1348    
# Line 1388  int unload_menu_shm(MENU_SET *p_menu_set Line 1366  int unload_menu_shm(MENU_SET *p_menu_set
1366          }          }
1367          p_menu_set->p_reserved = NULL;          p_menu_set->p_reserved = NULL;
1368    
1369            if (p_menu_set->p_menu_name_dict != NULL)
1370            {
1371                    trie_dict_destroy(p_menu_set->p_menu_name_dict);
1372                    p_menu_set->p_menu_name_dict = NULL;
1373            }
1374    
1375            if (p_menu_set->p_menu_screen_dict != NULL)
1376            {
1377                    trie_dict_destroy(p_menu_set->p_menu_screen_dict);
1378                    p_menu_set->p_menu_screen_dict = NULL;
1379            }
1380    
1381          return 0;          return 0;
1382  }  }

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