From 86759acf010dde242a447db9ce11882692cf283f Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Thu, 2 Sep 2010 18:24:46 +0000 Subject: Apply a patch from Kees van Reeuwijk to add support for Minix. Minix apparently doesn't like double-slash separators, and there's no apparent need for them here. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@112844 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/System/Unix/Path.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/System') diff --git a/lib/System/Unix/Path.inc b/lib/System/Unix/Path.inc index 44cb0081c5..47e4d1ac3c 100644 --- a/lib/System/Unix/Path.inc +++ b/lib/System/Unix/Path.inc @@ -282,14 +282,14 @@ Path::GetCurrentDirectory() { return Path(pathname); } -#if defined(__FreeBSD__) || defined (__NetBSD__) +#if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__minix) static int test_dir(char buf[PATH_MAX], char ret[PATH_MAX], const char *dir, const char *bin) { struct stat sb; - snprintf(buf, PATH_MAX, "%s//%s", dir, bin); + snprintf(buf, PATH_MAX, "%s/%s", dir, bin); if (realpath(buf, ret) == NULL) return (1); if (stat(buf, &sb) != 0) @@ -350,7 +350,7 @@ Path Path::GetMainExecutable(const char *argv0, void *MainAddr) { if (realpath(exe_path, link_path)) return Path(std::string(link_path)); } -#elif defined(__FreeBSD__) || defined (__NetBSD__) +#elif defined(__FreeBSD__) || defined (__NetBSD__) || defined(__minix) char exe_path[PATH_MAX]; if (getprogpath(exe_path, argv0) != NULL) -- cgit v1.2.3