Move other fs related files into fs directory.

35 files changed, 80 insertions, 81 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ca320b926..53ce3bba1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -865,8 +865,8 @@ SET(SRCS
     utils/dumplibs.h
     utils/env.cpp
     utils/env.h
-    utils/files.cpp
-    utils/files.h
+    fs/files.cpp
+    fs/files.h
     utils/fuzzer.cpp
     utils/fuzzer.h
     utils/gettext.h
@@ -882,8 +882,8 @@ SET(SRCS
     utils/mathutils.h
     utils/parameters.cpp
     utils/parameters.h
-    utils/paths.cpp
-    utils/paths.h
+    fs/paths.cpp
+    fs/paths.h
     utils/perfomance.cpp
     utils/perfomance.h
     utils/debugmemoryobject.h
@@ -917,8 +917,8 @@ SET(SRCS
     utils/mutex.h
     utils/naclmessages.cpp
     utils/naclmessages.h
-    utils/mkdir.cpp
-    utils/mkdir.h
+    fs/mkdir.cpp
+    fs/mkdir.h
     utils/mrand.cpp
     utils/mrand.h
     utils/xml.h
@@ -1763,14 +1763,14 @@ SET(DYE_CMD_SRCS
     resources/sprite/spritedef.h
     resources/sprite/spritedisplay.h
     resources/sprite/spritereference.h
-    utils/files.cpp
-    utils/files.h
-    utils/mkdir.cpp
-    utils/mkdir.h
+    fs/files.cpp
+    fs/files.h
+    fs/mkdir.cpp
+    fs/mkdir.h
     utils/mrand.cpp
     utils/mrand.h
-    utils/paths.cpp
-    utils/paths.h
+    fs/paths.cpp
+    fs/paths.h
     utils/perfomance.cpp
     utils/perfomance.h
     fs/virtfsrwops.cpp
@@ -1997,14 +1997,14 @@ SET(SRCS_TMWA
 IF (WIN32)
     SET(SRCS
         ${SRCS}
-        utils/specialfolder.cpp
-        utils/specialfolder.h
+        fs/specialfolder.cpp
+        fs/specialfolder.h
         manaplus.rc
     )
     SET(DYE_CMD_SRCS
         ${DYE_CMD_SRCS}
-        utils/specialfolder.cpp
-        utils/specialfolder.h
+        fs/specialfolder.cpp
+        fs/specialfolder.h
         manaplus.rc
     )
 ENDIF ()
diff --git a/src/Makefile.am b/src/Makefile.am
index 6c5b2d4e5..1f50fa699 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -527,8 +527,8 @@ BASE_SRC += events/actionevent.h \
 	      utils/dumplibs.h \
 	      utils/env.cpp \
 	      utils/env.h \
-	      utils/files.cpp \
-	      utils/files.h \
+	      fs/files.cpp \
+	      fs/files.h \
 	      utils/fuzzer.cpp \
 	      utils/fuzzer.h \
 	      utils/gettext.h \
@@ -540,14 +540,14 @@ BASE_SRC += events/actionevent.h \
 	      utils/langs.cpp \
 	      utils/langs.h \
 	      utils/mathutils.h \
-	      utils/mkdir.cpp \
-	      utils/mkdir.h \
+	      fs/mkdir.cpp \
+	      fs/mkdir.h \
 	      utils/mrand.cpp \
 	      utils/mrand.h \
 	      utils/parameters.cpp \
 	      utils/parameters.h \
-	      utils/paths.cpp \
-	      utils/paths.h \
+	      fs/paths.cpp \
+	      fs/paths.h \
 	      utils/perfomance.cpp \
 	      utils/perfomance.h \
 	      utils/debugmemoryobject.h \
@@ -568,8 +568,8 @@ BASE_SRC += events/actionevent.h \
 	      utils/sdlhelper.cpp \
 	      utils/sdlhelper.h \
 	      utils/sdlmemoryobject.h \
-	      utils/specialfolder.cpp \
-	      utils/specialfolder.h \
+	      fs/specialfolder.cpp \
+	      fs/specialfolder.h \
 	      utils/stringmap.h \
 	      utils/stringutils.cpp \
 	      utils/stringutils.h \
@@ -1924,7 +1924,7 @@ manaplustests_SOURCES = ${SRC} \
 	      utils/timer_unittest.cc \
 	      utils/xmlutils_unittest.cc \
 	      utils/mathutils_unittest.cc \
-	      utils/files_unittest.cc \
+	      fs/files_unittest.cc \
 	      utils/stringutils_unittest.cc \
 	      utils/parameters_unittest.cc \
 	      resources/mstack_unittest.cc \
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index 7f1e37104..b4fadf62d 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -38,6 +38,8 @@
 
 #include "const/resources/skill.h"
 
+#include "fs/files.h"
+
 #include "gui/gui.h"
 #include "gui/popupmanager.h"
 #include "gui/sdlinput.h"
@@ -102,7 +104,6 @@
 #include "utils/chatutils.h"
 #include "utils/delete2.h"
 #include "utils/gettext.h"
-#include "utils/files.h"
 #include "utils/timer.h"
 #include "utils/mathutils.h"
 
diff --git a/src/actormanager.cpp b/src/actormanager.cpp
index 9f8985d7e..35be95159 100644
--- a/src/actormanager.cpp
+++ b/src/actormanager.cpp
@@ -40,10 +40,11 @@
 #include "gui/windows/socialwindow.h"
 #include "gui/windows/questswindow.h"
 
+#include "fs/files.h"
+
 #include "input/inputmanager.h"
 
 #include "utils/checkutils.h"
-#include "utils/files.h"
 #include "utils/mathutils.h"
 #include "utils/gettext.h"
 
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 9a86c26cb..1e63b9b98 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -51,7 +51,7 @@
 
 #include "enums/resources/map/blockmask.h"
 
-#include "particle/particleinfo.h"
+#include "fs/files.h"
 
 #include "gui/gui.h"
 #include "gui/userpalette.h"
@@ -74,6 +74,8 @@
 #include "net/playerhandler.h"
 #include "net/serverfeatures.h"
 
+#include "particle/particleinfo.h"
+
 #include "resources/attack.h"
 #include "resources/chatobject.h"
 #include "resources/emoteinfo.h"
@@ -110,7 +112,6 @@
 
 #include "utils/checkutils.h"
 #include "utils/delete2.h"
-#include "utils/files.h"
 #include "utils/gettext.h"
 #include "utils/timer.h"
 
diff --git a/src/chatlogger.cpp b/src/chatlogger.cpp
index 1f6fae035..2b420d1f3 100644
--- a/src/chatlogger.cpp
+++ b/src/chatlogger.cpp
@@ -34,10 +34,9 @@
 
 #include "configuration.h"
 
+#include "fs/mkdir.h"
 #include "fs/virtfs.h"
 
-#include "utils/mkdir.h"
-
 #include "debug.h"
 
 ChatLogger *chatLogger = nullptr;
diff --git a/src/client.cpp b/src/client.cpp
index e87ac65cb..bb7c8e687 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -144,7 +144,7 @@
 #include "utils/gettexthelper.h"
 #include "utils/mrand.h"
 #ifdef ANDROID
-#include "utils/paths.h"
+#include "fs/paths.h"
 #endif  // ANDROID
 #include "utils/sdlcheckutils.h"
 #include "utils/timer.h"
@@ -163,7 +163,7 @@
 
 #ifdef WIN32
 #include <SDL_syswm.h>
-#include "utils/specialfolder.h"
+#include "fs/specialfolder.h"
 #undef ERROR
 #endif  // WIN32
 
diff --git a/src/commandline.cpp b/src/commandline.cpp
index 8315d7d58..55bea5bd3 100644
--- a/src/commandline.cpp
+++ b/src/commandline.cpp
@@ -25,8 +25,9 @@
 #include "main.h"
 #include "settings.h"
 
+#include "fs/paths.h"
+
 #include "utils/gettext.h"
-#include "utils/paths.h"
 #include "utils/stringutils.h"
 
 #include <getopt.h>
diff --git a/src/configmanager.cpp b/src/configmanager.cpp
index 95aac7ed1..bd19d7307 100644
--- a/src/configmanager.cpp
+++ b/src/configmanager.cpp
@@ -29,12 +29,12 @@
 
 #include "being/beingspeech.h"
 
+#include "fs/files.h"
 #include "fs/virtfs.h"
+#include "fs/mkdir.h"
+#include "fs/paths.h"
 
-#include "utils/files.h"
 #include "utils/gettext.h"
-#include "utils/mkdir.h"
-#include "utils/paths.h"
 
 #include "render/renderers.h"
 
diff --git a/src/configuration.cpp b/src/configuration.cpp
index 7a6f91e79..bcf461892 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -25,10 +25,11 @@
 #include "logger.h"
 #include "variabledata.h"
 
+#include "fs/paths.h"
+
 #include "listeners/configlistener.h"
 
 #include "utils/delete2.h"
-#include "utils/paths.h"
 #ifdef DEBUG_CONFIG
 #include "utils/stringmap.h"
 #endif  // DEBUG_CONFIG
diff --git a/src/dirs.cpp b/src/dirs.cpp
index 43f27ae4c..72d108388 100644
--- a/src/dirs.cpp
+++ b/src/dirs.cpp
@@ -28,16 +28,16 @@
 #include "main.h"
 #include "settings.h"
 
+#include "fs/mkdir.h"
+#include "fs/paths.h"
 #include "fs/virtfs.h"
 
 #include "utils/base64.h"
 #if defined(__native_client__) || (defined(ANDROID) && defined(USE_SDL2))
-#include "utils/files.h"
+#include "fs/files.h"
 #endif  // defined(__native_client__) || (defined(ANDROID) &&
         // defined(USE_SDL2))
 #include "utils/gettext.h"
-#include "utils/mkdir.h"
-#include "utils/paths.h"
 
 #ifdef ANDROID
 #ifdef USE_SDL2
@@ -53,7 +53,7 @@
 
 #ifdef WIN32
 #include <SDL_syswm.h>
-#include "utils/specialfolder.h"
+#include "fs/specialfolder.h"
 #undef ERROR
 #endif  // WIN32
 
diff --git a/src/dyetool/client.cpp b/src/dyetool/client.cpp
index 0ee7d0c2c..6e206de7f 100644
--- a/src/dyetool/client.cpp
+++ b/src/dyetool/client.cpp
@@ -63,7 +63,7 @@
 #include "utils/gettexthelper.h"
 #include "utils/mrand.h"
 #ifdef ANDROID
-#include "utils/paths.h"
+#include "fs/paths.h"
 #endif  // ANDROID
 
 #include "utils/sdlcheckutils.h"
@@ -77,7 +77,7 @@
 
 #ifdef WIN32
 #include <SDL_syswm.h>
-#include "utils/specialfolder.h"
+#include "fs/specialfolder.h"
 #undef ERROR
 #endif  // WIN32
 
diff --git a/src/utils/files.cpp b/src/fs/files.cpp
index 4dd26126a..516283fe6 100644
--- a/src/utils/files.cpp
+++ b/src/fs/files.cpp
@@ -18,21 +18,16 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "utils/files.h"
+#include "fs/files.h"
 
 #include "logger.h"
 
+#include "fs/mkdir.h"
 #if defined(ANDROID) || defined(__native_client__)
-#include "utils/mkdir.h"
-#endif  // defined(ANDROID) || defined(__native_client__)
-
-#include "utils/mkdir.h"
-#if defined(ANDROID) || defined(__native_client__)
+#include "fs/paths.h"
 #include "fs/virtfs.h"
 #include "fs/virtfstools.h"
 #include "fs/virtlist.h"
-
-#include "utils/paths.h"
 #endif  // defined(ANDROID) || defined(__native_client__)
 
 #include <dirent.h>
diff --git a/src/utils/files.h b/src/fs/files.h
index b91f7e9ab..b91f7e9ab 100644
--- a/src/utils/files.h
+++ b/src/fs/files.h
diff --git a/src/utils/files_unittest.cc b/src/fs/files_unittest.cc
index 1012221f2..7b4c6ca33 100644
--- a/src/utils/files_unittest.cc
+++ b/src/fs/files_unittest.cc
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "utils/files.h"
+#include "fs/files.h"
 
 #include "catch.hpp"
 #include "logger.h"
diff --git a/src/utils/mkdir.cpp b/src/fs/mkdir.cpp
index a3cd52dc0..e84ab5f28 100644
--- a/src/utils/mkdir.cpp
+++ b/src/fs/mkdir.cpp
@@ -19,7 +19,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "utils/mkdir.h"
+#include "fs/mkdir.h"
 
 #if defined WIN32
 #include <limits.h>
diff --git a/src/utils/mkdir.h b/src/fs/mkdir.h
index a662daca3..a662daca3 100644
--- a/src/utils/mkdir.h
+++ b/src/fs/mkdir.h
diff --git a/src/utils/paths.cpp b/src/fs/paths.cpp
index 3e5bf8829..affc12285 100644
--- a/src/utils/paths.cpp
+++ b/src/fs/paths.cpp
@@ -24,14 +24,13 @@
 #include "config.h"
 #endif  // _MSC_VER
 
+#include "fs/paths.h"
 #include "fs/virtfs.h"
 
-#include "utils/paths.h"
-
 #include "utils/stringutils.h"
 
 #ifdef USE_X11
-#include "utils/files.h"
+#include "fs/files.h"
 #endif  // USE_X11
 
 #ifdef __native_client__
@@ -40,7 +39,7 @@
 #endif  // __native_client__
 
 #ifdef WIN32
-#include "utils/specialfolder.h"
+#include "fs/specialfolder.h"
 #define realpath(N, R) _fullpath((R), (N), _MAX_PATH)
 #elif defined __OpenBSD__
 #include <limits>
diff --git a/src/utils/paths.h b/src/fs/paths.h
index fc90730f3..fc90730f3 100644
--- a/src/utils/paths.h
+++ b/src/fs/paths.h
diff --git a/src/utils/specialfolder.cpp b/src/fs/specialfolder.cpp
index a6b748c3c..ee27dab4b 100644
--- a/src/utils/specialfolder.cpp
+++ b/src/fs/specialfolder.cpp
@@ -20,7 +20,7 @@
  */
 
 #ifdef WIN32
-#include "utils/specialfolder.h"
+#include "fs/specialfolder.h"
 #include <windows.h>
 
 #include "debug.h"
diff --git a/src/utils/specialfolder.h b/src/fs/specialfolder.h
index f2cc93c9b..f2cc93c9b 100644
--- a/src/utils/specialfolder.h
+++ b/src/fs/specialfolder.h
diff --git a/src/fs/virtfs.cpp b/src/fs/virtfs.cpp
index 0db25f435..9b19890eb 100644
--- a/src/fs/virtfs.cpp
+++ b/src/fs/virtfs.cpp
@@ -30,7 +30,7 @@
 #include <unistd.h>
 
 #ifdef ANDROID
-#include "utils/paths.h"
+#include "fs/paths.h"
 #endif  // ANDROID
 
 #include "debug.h"
diff --git a/src/fs/virtfstools.cpp b/src/fs/virtfstools.cpp
index 4d6c96c33..889739658 100644
--- a/src/fs/virtfstools.cpp
+++ b/src/fs/virtfstools.cpp
@@ -22,10 +22,10 @@
 
 #include "logger.h"
 
+#include "fs/paths.h"
 #include "fs/virtfs.h"
 #include "fs/virtlist.h"
 
-#include "utils/paths.h"
 #include "utils/stringutils.h"
 
 #include <algorithm>
diff --git a/src/game.cpp b/src/game.cpp
index 3318c4268..9dcafad67 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -41,6 +41,7 @@
 
 #include "enums/being/beingdirection.h"
 
+#include "fs/mkdir.h"
 #include "fs/virtfs.h"
 
 #include "gui/dialogsmanager.h"
@@ -122,7 +123,6 @@
 
 #include "utils/delete2.h"
 #include "utils/gettext.h"
-#include "utils/mkdir.h"
 #include "utils/sdlcheckutils.h"
 #include "utils/timer.h"
 
diff --git a/src/gui/fonts/font.cpp b/src/gui/fonts/font.cpp
index 877f112e0..8c148f003 100644
--- a/src/gui/fonts/font.cpp
+++ b/src/gui/fonts/font.cpp
@@ -66,6 +66,7 @@
 
 #include "gui/fonts/font.h"
 
+#include "fs/paths.h"
 #include "fs/virtfstools.h"
 
 #include "gui/fonts/textchunk.h"
@@ -77,7 +78,6 @@
 #include "resources/image/image.h"
 
 #include "utils/delete2.h"
-#include "utils/paths.h"
 #include "utils/sdlcheckutils.h"
 #include "utils/stringutils.h"
 #include "utils/timer.h"
diff --git a/src/gui/windows/helpwindow.cpp b/src/gui/windows/helpwindow.cpp
index 91bdbe13e..f10933996 100644
--- a/src/gui/windows/helpwindow.cpp
+++ b/src/gui/windows/helpwindow.cpp
@@ -26,6 +26,7 @@
 
 #include "enums/gui/layouttype.h"
 
+#include "fs/paths.h"
 #include "fs/virtfstools.h"
 
 #include "gui/gui.h"
@@ -40,7 +41,6 @@
 #include "input/inputmanager.h"
 
 #include "utils/gettext.h"
-#include "utils/paths.h"
 #include "utils/process.h"
 
 #include "utils/translation/podict.h"
diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp
index dfa613ba3..731db0cc9 100644
--- a/src/gui/windows/logindialog.cpp
+++ b/src/gui/windows/logindialog.cpp
@@ -25,7 +25,7 @@
 #include "client.h"
 #include "configuration.h"
 
-#include "listeners/openurllistener.h"
+#include "fs/paths.h"
 
 #include "gui/models/updatelistmodel.h"
 #include "gui/models/updatetypemodel.h"
@@ -40,13 +40,14 @@
 #include "gui/widgets/passwordfield.h"
 #include "gui/widgets/layoutcell.h"
 
+#include "listeners/openurllistener.h"
+
 #include "net/charserverhandler.h"
 #include "net/logindata.h"
 #include "net/loginhandler.h"
 #include "net/updatetypeoperators.h"
 
 #include "utils/delete2.h"
-#include "utils/paths.h"
 
 #include "debug.h"
 
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index 3ccd68999..c4f65d770 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -30,6 +30,8 @@
 
 #include "net/download.h"
 
+#include "fs/paths.h"
+
 #include "gui/widgets/checkbox.h"
 #include "gui/widgets/createwidget.h"
 #include "gui/widgets/desktop.h"
@@ -45,7 +47,6 @@
 #include "utils/delete2.h"
 #include "utils/gettext.h"
 #include "utils/langs.h"
-#include "utils/paths.h"
 
 #include "debug.h"
 
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 4d0ff9f3a..ef4b543a1 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -29,6 +29,9 @@
 
 #include "enums/gui/layouttype.h"
 
+#include "fs/files.h"
+#include "fs/mkdir.h"
+#include "fs/paths.h"
 #include "fs/virtfs.h"
 #include "fs/virtfstools.h"
 
@@ -47,10 +50,7 @@
 #include "resources/db/moddb.h"
 
 #include "utils/delete2.h"
-#include "utils/files.h"
 #include "utils/gettext.h"
-#include "utils/mkdir.h"
-#include "utils/paths.h"
 
 #include <sys/stat.h>
 
diff --git a/src/maingui.cpp b/src/maingui.cpp
index 7bf5e1290..5019daf22 100644
--- a/src/maingui.cpp
+++ b/src/maingui.cpp
@@ -31,8 +31,8 @@
 
 #include "utils/delete2.h"
 #ifdef ANDROID
-#include "utils/mkdir.h"
-#include "utils/paths.h"
+#include "fs/mkdir.h"
+#include "fs/paths.h"
 #endif  // ANDROID
 #include "utils/process.h"
 #include "utils/xml.h"
diff --git a/src/net/download.cpp b/src/net/download.cpp
index 32ee36ab2..feb92265c 100644
--- a/src/net/download.cpp
+++ b/src/net/download.cpp
@@ -25,15 +25,11 @@
 #include "logger.h"
 #include "settings.h"
 
-#include "utils/files.h"
+#include "fs/files.h"
 #include "utils/sdlhelper.h"
 
 #include <zlib.h>
 
-#if defined __native_client__
-#include "utils/files.h"
-#endif  // defined __native_client__
-
 #include <sstream>
 
 #include "debug.h"
diff --git a/src/net/ea/loginrecv.cpp b/src/net/ea/loginrecv.cpp
index f96424e6d..6c6e1bad1 100644
--- a/src/net/ea/loginrecv.cpp
+++ b/src/net/ea/loginrecv.cpp
@@ -27,10 +27,11 @@
 
 #include "being/being.h"
 
+#include "fs/paths.h"
+
 #include "gui/windows/logindialog.h"
 
 #include "utils/gettext.h"
-#include "utils/paths.h"
 
 #include "net/logindata.h"
 #include "net/loginhandler.h"
diff --git a/src/net/eathena/loginrecv.cpp b/src/net/eathena/loginrecv.cpp
index 336ca84a4..c31692b4f 100644
--- a/src/net/eathena/loginrecv.cpp
+++ b/src/net/eathena/loginrecv.cpp
@@ -24,6 +24,8 @@
 
 #include "client.h"
 
+#include "fs/paths.h"
+
 #include "gui/windows/logindialog.h"
 
 #include "net/logindata.h"
@@ -33,7 +35,6 @@
 #include "net/eathena/updateprotocol.h"
 
 #include "utils/gettext.h"
-#include "utils/paths.h"
 
 #include "debug.h"
 
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp
index 5af4e72f3..3d47e96fc 100644
--- a/src/resources/map/map.cpp
+++ b/src/resources/map/map.cpp
@@ -34,6 +34,7 @@
 #include "enums/resources/map/blockmask.h"
 #include "enums/resources/map/mapitemtype.h"
 
+#include "fs/mkdir.h"
 #include "fs/virtfs.h"
 
 #include "gui/userpalette.h"
@@ -64,7 +65,6 @@
 
 #include "utils/delete2.h"
 #include "utils/dtor.h"
-#include "utils/mkdir.h"
 #include "utils/timer.h"
 
 #include <queue>
diff --git a/src/test/testmain.cpp b/src/test/testmain.cpp
index dd1829a65..c2fcc75f9 100644
--- a/src/test/testmain.cpp
+++ b/src/test/testmain.cpp
@@ -25,8 +25,9 @@
 #include "logger.h"
 #include "settings.h"
 
+#include "fs/paths.h"
+
 #include "utils/delete2.h"
-#include "utils/paths.h"
 #include "utils/process.h"
 
 #include "debug.h"