--- lbbs/src/main.c 2025/06/21 05:57:43 1.56 +++ lbbs/src/main.c 2025/07/16 05:46:17 1.61 @@ -128,8 +128,16 @@ int main(int argc, char *argv[]) strncpy(file_path_temp, argv[0], sizeof(file_path_temp) - 1); file_path_temp[sizeof(file_path_temp) - 1] = '\0'; - chdir(dirname(file_path_temp)); - chdir(".."); + if (chdir(dirname(file_path_temp)) < 0) + { + fprintf(stderr, "chdir(%s) error: %d\n", dirname(file_path_temp), errno); + return -1; + } + if (chdir("..") < 0) + { + fprintf(stderr, "chdir(..) error: %d\n", errno); + return -1; + } // Initialize log if (log_begin(LOG_FILE_INFO, LOG_FILE_ERROR) < 0) @@ -205,13 +213,7 @@ int main(int argc, char *argv[]) } // Load menus - p_bbs_menu = calloc(1, sizeof(MENU_SET)); - if (p_bbs_menu == NULL) - { - log_error("OOM: calloc(MENU_SET)\n"); - goto cleanup; - } - if (load_menu(p_bbs_menu, CONF_MENU) < 0) + if (load_menu(&bbs_menu, CONF_MENU) < 0) { goto cleanup; } @@ -230,10 +232,10 @@ int main(int argc, char *argv[]) } } - // Load section config - if (load_section_config_from_db() < 0) + // Load section config and gen_ex + if (load_section_config_from_db(1) < 0) { - log_error("load_section_config_from_db() error\n"); + log_error("load_section_config_from_db(0) error\n"); goto cleanup; } @@ -289,9 +291,7 @@ cleanup: file_loader_cleanup(); // Cleanup menu - unload_menu(p_bbs_menu); - free(p_bbs_menu); - p_bbs_menu = NULL; + unload_menu(&bbs_menu); // Cleanup data pools section_list_cleanup(); @@ -313,5 +313,7 @@ cleanup: log_common("Main process exit normally\n"); + log_end(); + return 0; }