From 9ece34eb218c5c1960468294c733fd00ac7fa696 Mon Sep 17 00:00:00 2001 From: Firehawke Date: Wed, 13 Dec 2017 21:31:27 -0700 Subject: Revert "Revert "Merge branch 'master' of https://github.com/mamedev/mame"" This reverts commit 54155441e9ba9941e85d80c4834a66376a11e791. --- src/osd/modules/file/posixfile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/osd/modules/file/posixfile.cpp') diff --git a/src/osd/modules/file/posixfile.cpp b/src/osd/modules/file/posixfile.cpp index 3cc122342dd..967202eb61c 100644 --- a/src/osd/modules/file/posixfile.cpp +++ b/src/osd/modules/file/posixfile.cpp @@ -446,7 +446,7 @@ bool osd_is_absolute_path(std::string const &path) if (!path.empty() && is_path_separator(path[0])) return true; #if !defined(WIN32) - else if (!path.empty() && (path[0] == '.')) + else if (!path.empty() && (path[0] == '.') && (!path[1] || is_path_separator(path[1]))) // FIXME: why is this even here? foo/./bar is a valid way to refer to foo/bar return true; #elif !defined(UNDER_CE) else if ((path.length() > 1) && (path[1] == ':')) -- cgit v1.2.3-70-g09d2