From 0b0314d4ff409eb6b9619d9b609069eb2693c717 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 17 Sep 2016 12:19:17 +0200
Subject: [PATCH] Move more functions to paths.c

---
 dynamic.c   |  3 ++-
 paths.c     | 39 +++++++++++++++++++++++++++++++++++++++
 paths.h     |  2 ++
 retroarch.c | 38 +-------------------------------------
 4 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/dynamic.c b/dynamic.c
index 6f31667c73..13f2afd1ab 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -51,6 +51,7 @@
 #include "cores/internal_cores.h"
 #include "frontend/frontend_driver.h"
 #include "content.h"
+#include "paths.h"
 #include "retroarch.h"
 #include "runloop.h"
 #include "configuration.h"
@@ -1049,7 +1050,7 @@ bool rarch_environment_cb(unsigned cmd, void *data)
          break;
 
       case RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY:
-         *(const char**)data = retroarch_get_current_savefile_dir();
+         *(const char**)data = path_get_current_savefile_dir();
          break;
 
       case RETRO_ENVIRONMENT_GET_USERNAME:
diff --git a/paths.c b/paths.c
index 4ae36c20c1..8d6f0893df 100644
--- a/paths.c
+++ b/paths.c
@@ -15,7 +15,9 @@
 
 #include <compat/strl.h>
 #include <file/file_path.h>
+#include <lists/string_list.h>
 #include <string/stdstring.h>
+#include <retro_assert.h>
 #include <retro_stat.h>
 
 #ifdef HAVE_CONFIG_H
@@ -30,6 +32,7 @@
 
 #include "core.h"
 #include "msg_hash.h"
+#include "retroarch.h"
 #include "runloop.h"
 #include "verbosity.h"
 
@@ -226,3 +229,39 @@ const char *path_get_current_savefile_dir(void)
 
    return ret;
 }
+
+void path_set_special(char **argv, unsigned num_content)
+{
+   unsigned i;
+   union string_list_elem_attr attr;
+   global_t   *global   = global_get_ptr();
+
+   /* First content file is the significant one. */
+   path_set_basename(argv[0]);
+
+   global->subsystem_fullpaths = string_list_new();
+   retro_assert(global->subsystem_fullpaths);
+
+   attr.i = 0;
+
+   for (i = 0; i < num_content; i++)
+      string_list_append(global->subsystem_fullpaths, argv[i], attr);
+
+   /* We defer SRAM path updates until we can resolve it.
+    * It is more complicated for special content types. */
+
+   if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_STATE_PATH))
+      fill_pathname_noext(global->name.savestate, global->name.base,
+            file_path_str(FILE_PATH_STATE_EXTENSION),
+            sizeof(global->name.savestate));
+
+   if (path_is_directory(global->name.savestate))
+   {
+      fill_pathname_dir(global->name.savestate, global->name.base,
+            file_path_str(FILE_PATH_STATE_EXTENSION),
+            sizeof(global->name.savestate));
+      RARCH_LOG("%s \"%s\".\n",
+            msg_hash_to_str(MSG_REDIRECTING_SAVESTATE_TO),
+            global->name.savestate);
+   }
+}
diff --git a/paths.h b/paths.h
index ce8bc5f8d5..cb3449701e 100644
--- a/paths.h
+++ b/paths.h
@@ -23,6 +23,8 @@ RETRO_BEGIN_DECLS
 
 void path_set_redirect(void);
 
+void path_set_special(char **argv, unsigned num_content);
+
 void path_set_basename(const char *path);
 
 const char *path_get_current_savefile_dir(void);
diff --git a/retroarch.c b/retroarch.c
index d26dcf5dd9..1be266cf07 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -338,42 +338,6 @@ static void retroarch_print_help(const char *arg0)
         "then exits.\n");
 }
 
-static void retroarch_set_special_paths(char **argv, unsigned num_content)
-{
-   unsigned i;
-   union string_list_elem_attr attr;
-   global_t   *global   = global_get_ptr();
-
-   /* First content file is the significant one. */
-   path_set_basename(argv[0]);
-
-   global->subsystem_fullpaths = string_list_new();
-   retro_assert(global->subsystem_fullpaths);
-
-   attr.i = 0;
-
-   for (i = 0; i < num_content; i++)
-      string_list_append(global->subsystem_fullpaths, argv[i], attr);
-
-   /* We defer SRAM path updates until we can resolve it.
-    * It is more complicated for special content types. */
-
-   if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_STATE_PATH))
-      fill_pathname_noext(global->name.savestate, global->name.base,
-            file_path_str(FILE_PATH_STATE_EXTENSION),
-            sizeof(global->name.savestate));
-
-   if (path_is_directory(global->name.savestate))
-   {
-      fill_pathname_dir(global->name.savestate, global->name.base,
-            file_path_str(FILE_PATH_STATE_EXTENSION),
-            sizeof(global->name.savestate));
-      RARCH_LOG("%s \"%s\".\n",
-            msg_hash_to_str(MSG_REDIRECTING_SAVESTATE_TO),
-            global->name.savestate);
-   }
-}
-
 enum rarch_content_type retroarch_path_is_media_type(const char *path)
 {
    char ext_lower[PATH_MAX_LENGTH] = {0};
@@ -909,7 +873,7 @@ static void retroarch_parse_input(int argc, char *argv[])
    {
       /* We requested explicit ROM, so use PLAIN core type. */
       retroarch_set_current_core_type(CORE_TYPE_PLAIN, false);
-      retroarch_set_special_paths(argv + optind, argc - optind);
+      path_set_special(argv + optind, argc - optind);
    }
    else
       content_set_does_not_need_content();