From 6a10bc8d7d186fd83099c75c2a03409d0881aae9 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 16 Jun 2011 22:10:50 +0300 Subject: Fix dataDir in branding files. Move path functions to paths.cpp --- src/utils/paths.cpp | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ src/utils/paths.h | 30 ++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 src/utils/paths.cpp create mode 100644 src/utils/paths.h (limited to 'src/utils') diff --git a/src/utils/paths.cpp b/src/utils/paths.cpp new file mode 100644 index 000000000..cae2d1837 --- /dev/null +++ b/src/utils/paths.cpp @@ -0,0 +1,48 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "utils/paths.h" + +#include +#include +#include + +#include + +#ifdef WIN32 +#define realpath(N,R) _fullpath((R),(N),_MAX_PATH) +#endif + +#include "debug.h" + +std::string getRealPath(const std::string &str) +{ + std::string path; + char *realPath = realpath(str.c_str(), NULL); + path = realPath; + free(realPath); + return path; +} + +bool isRealPath(const std::string &str) +{ + std::string path = getRealPath(str); + return str == path; +} diff --git a/src/utils/paths.h b/src/utils/paths.h new file mode 100644 index 000000000..1723bf6c4 --- /dev/null +++ b/src/utils/paths.h @@ -0,0 +1,30 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef UTILS_PATHS_H +#define UTILS_PATHS_H + +#include + +std::string getRealPath(const std::string &str); + +bool isRealPath(const std::string &str); + +#endif // UTILS_PATHS_H -- cgit v1.2.3-60-g2f50