Use more path_basename_nocompression where we don't have to deal with

archive files
seanstardev · Apr 11, 2021 · 2f0f724 · 2f0f724
1 parent fc5b557
commit 2f0f724
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
@@ -1152,12 +1152,12 @@ static void menu_action_setting_disp_set_label_core_option_override_info(
    *w = 19;
 
    if (!string_is_empty(override_path))
-      options_file = path_basename(override_path);
+      options_file = path_basename_nocompression(override_path);
    else if (rarch_ctl(RARCH_CTL_CORE_OPTIONS_LIST_GET, &coreopts))
    {
       const char *options_path = coreopts->conf_path;
       if (!string_is_empty(options_path))
-         options_file = path_basename(options_path);
+         options_file = path_basename_nocompression(options_path);
    }
 
    if (!string_is_empty(options_file))

diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
@@ -7196,7 +7196,7 @@ int action_ok_core_lock(const char *path,
          core_name = core_info.inf->display_name;
       /* If not, use core file name */
       else
-         core_name = path_basename(core_path);
+         core_name = path_basename_nocompression(core_path);
 
       /* Build error message */
       strlcpy(
@@ -7256,7 +7256,7 @@ static int action_ok_core_delete(const char *path,
          core_name = core_info.inf->display_name;
       /* If not, use core file name */
       else
-         core_name = path_basename(core_path);
+         core_name = path_basename_nocompression(core_path);
 
       /* Build notification message */
       strlcpy(msg, msg_hash_to_str(MSG_CORE_DELETE_DISABLED), sizeof(msg));
@@ -7289,7 +7289,7 @@ static int action_ok_core_delete(const char *path,
     * interface */
    if (play_feature_delivery_enabled())
    {
-      const char *core_filename = path_basename(core_path);
+      const char *core_filename = path_basename_nocompression(core_path);
       char backup_core_path[PATH_MAX_LENGTH];
 
       backup_core_path[0] = '\0';

diff --git a/retroarch.c b/retroarch.c
@@ -5132,7 +5132,7 @@ void menu_driver_set_last_start_content(const char *start_content_path)
       file_name       = path_basename(archive_path);
    }
    else
-      file_name       = path_basename(start_content_path);
+      file_name       = path_basename_nocompression(start_content_path);
 
    if (!string_is_empty(file_name))
       strlcpy(menu->last_start_content.file_name, file_name,

diff --git a/tasks/task_database.c b/tasks/task_database.c
@@ -115,7 +115,7 @@ static int task_database_iterate_start(retro_task_t *task,
 {
    char msg[256];
    const char *basename_path = !string_is_empty(name) ?
-      path_basename(name) : "";
+      path_basename_nocompression(name) : "";
 
    msg[0] = '\0';