X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fpathexpand.cc;h=63ae348df1f6f7f5da5c5bd05d5d00026bc8bf0e;hb=1ec471c961c328ca4c585d35f9e567135f301d2d;hp=a92005a08621e9a0d850be26675d53bd3581ca02;hpb=22b07e0233a29d9633ffa825a79503befaf2e16e;p=ardour.git diff --git a/libs/pbd/pathexpand.cc b/libs/pbd/pathexpand.cc index a92005a086..63ae348df1 100644 --- a/libs/pbd/pathexpand.cc +++ b/libs/pbd/pathexpand.cc @@ -37,72 +37,6 @@ using std::string; using std::vector; -#ifdef COMPILER_MINGW - -#include -#include -#include - -/**************************************************************** - * Emulate POSIX realpath() using Win32 _fullpath() since realpath() - * is not available. - * - * Returns: - * On Success: A pointer to the resolved (absolute) path - * On Failure: 0 (NULL) - */ - -static char* -realpath (const char *original_path, char resolved_path[_MAX_PATH+1]) -{ - char *rpath = 0; - bool bIsSymLink = false; // We'll probably need to test the incoming path - // to find out if it points to a Windows shortcut - // (or a hard link) and set this appropriately. - - if (bIsSymLink) { - // At the moment I'm not sure if Windows '_fullpath()' is directly - // equivalent to POSIX 'realpath()' - in as much as the latter will - // resolve the supplied path if it happens to point to a symbolic - // link ('_fullpath()' probably DOESN'T do this but I'm not really - // sure if Ardour needs such functionality anyway). Therefore we'll - // possibly need to add that functionality here at a later date. - } else { - char temp[(_MAX_PATH+1)*6]; // Allow for maximum length of a path in wchar characters - - // POSIX 'realpath()' requires that the buffer size is at - // least PATH_MAX+1, so assume that the user knew this !! - - rpath = _fullpath (temp, Glib::locale_from_utf8 (original_path).c_str(), _MAX_PATH); - - if (0 != rpath) { - snprintf (resolved_path, _MAX_PATH+1, "%s", Glib::locale_to_utf8 (temp).c_str()); - } - - } - - return (rpath); -} - -#endif // COMPILER_MINGW - -string -PBD::canonical_path (const std::string& path) -{ - char buf[PATH_MAX+1]; - - if (realpath (path.c_str(), buf) == NULL) { - DEBUG_TRACE (DEBUG::FileUtils, - string_compose("PBD::canonical_path: Unable to resolve %1: %2\n", path, g_strerror(errno))); - return path; - } - - DEBUG_TRACE (DEBUG::FileUtils, - string_compose("PBD::canonical_path %1 resolved to: %2\n", path, string(buf))); - - return string (buf); -} - string PBD::path_expand (string path) {