X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ffilesys.h;h=94d0c874dec6611e34c946b4d2ad40161ca06072;hb=3caad3f3c9e319ca67d63231e8c64b2ace855fff;hp=7560d3c1524f3969af17e1c4c9e387cf29714d15;hpb=7220ca906dfc804bd508336f5bed252bcec62ae0;p=oweals%2Fminetest.git diff --git a/src/filesys.h b/src/filesys.h index 7560d3c15..94d0c874d 100644 --- a/src/filesys.h +++ b/src/filesys.h @@ -28,10 +28,12 @@ with this program; if not, write to the Free Software Foundation, Inc., #define DIR_DELIM "\\" #define DIR_DELIM_CHAR '\\' #define FILESYS_CASE_INSENSITIVE 1 +#define PATH_DELIM ";" #else // POSIX #define DIR_DELIM "/" #define DIR_DELIM_CHAR '/' #define FILESYS_CASE_INSENSITIVE 0 +#define PATH_DELIM ":" #endif namespace fs @@ -103,13 +105,19 @@ std::string RemoveLastPathComponent(const std::string &path, // this does not resolve symlinks and check for existence of directories. std::string RemoveRelativePathComponents(std::string path); -// Return the filename from a path or the entire path if no directory delimiter -// is found. +// Returns the absolute path for the passed path, with "." and ".." path +// components and symlinks removed. Returns "" on error. +std::string AbsolutePath(const std::string &path); + +// Returns the filename from a path or the entire path if no directory +// delimiter is found. const char *GetFilenameFromPath(const char *path); bool safeWriteToFile(const std::string &path, const std::string &content); -}//fs +bool Rename(const std::string &from, const std::string &to); + +} // namespace fs #endif