X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/blobdiff_plain/ba5978d2987cce2545e10696a6ca14c6d54fdc92..6b22a6200e8f72d3260d292800a8786666623bfc:/Plugson/src/Web/ventoy_http.c diff --git a/Plugson/src/Web/ventoy_http.c b/Plugson/src/Web/ventoy_http.c index 259dcdb..a84ac42 100644 --- a/Plugson/src/Web/ventoy_http.c +++ b/Plugson/src/Web/ventoy_http.c @@ -325,8 +325,7 @@ static int ventoy_api_sysinfo(struct mg_connection *conn, VTOY_JSON *json) VTOY_JSON_FMT_SINT("invalid_config", g_sysinfo.invalid_config); g_sysinfo.invalid_config = 0; - - + #if defined(_MSC_VER) || defined(WIN32) VTOY_JSON_FMT_STRN("os", "windows"); #else @@ -349,6 +348,8 @@ static int ventoy_api_handshake(struct mg_connection *conn, VTOY_JSON *json) VTOY_JSON_FMT_BEGIN(pos, JSON_BUFFER, JSON_BUF_MAX); VTOY_JSON_FMT_OBJ_BEGIN(); VTOY_JSON_FMT_SINT("status", 0); + VTOY_JSON_FMT_SINT("save_error", g_sysinfo.config_save_error); + g_sysinfo.config_save_error = 0; VTOY_JSON_FMT_OBJ_END(); VTOY_JSON_FMT_END(pos); @@ -485,7 +486,6 @@ void ventoy_data_default_control(data_control *data) { memset(data, 0, sizeof(data_control)); - data->default_menu_mode = 1; data->filter_dot_underscore = 1; data->max_search_level = -1; data->menu_timeout = 0; @@ -1776,7 +1776,9 @@ int ventoy_data_cmp_image_list(data_image_list *data1, data_image_list *data2) int ventoy_data_save_image_list(data_image_list *data, const char *title, char *buf, int buflen) { int pos = 0; + int prelen; path_node *node = NULL; + char newtitle[64]; (void)title; @@ -1784,17 +1786,20 @@ int ventoy_data_save_image_list(data_image_list *data, const char *title, char * { return 0; } - + + prelen = (int)strlen("image_list"); + VTOY_JSON_FMT_BEGIN(pos, buf, buflen); if (data->type == 0) { - VTOY_JSON_FMT_KEY_L(L1, "image_list"); + scnprintf(newtitle, sizeof(newtitle), "image_list%s", title + prelen); } else { - VTOY_JSON_FMT_KEY_L(L1, "image_blacklist"); + scnprintf(newtitle, sizeof(newtitle), "image_blacklist%s", title + prelen); } + VTOY_JSON_FMT_KEY_L(L1, newtitle); VTOY_JSON_FMT_ARY_BEGIN_N(); @@ -3573,6 +3578,7 @@ int ventoy_http_writeback(void) if (ret) { vlog("Failed to write ventoy.json file.\n"); + g_sysinfo.config_save_error = 1; } return 0;