D34684.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D34684.diff
View Options

	diff --git a/contrib/llvm-project/llvm/lib/Support/Unix/Path.inc b/contrib/llvm-project/llvm/lib/Support/Unix/Path.inc
	--- a/contrib/llvm-project/llvm/lib/Support/Unix/Path.inc
	+++ b/contrib/llvm-project/llvm/lib/Support/Unix/Path.inc
	@@ -930,7 +930,15 @@
	return s;
	}

	-#if !defined(F_GETPATH)
	+//
	+// FreeBSD optionally provides /proc/self/fd, but it is incompatible with
	+// Linux. The thing to use is realpath.
	+//
	+#if !defined(__FreeBSD__)
	+#define TRY_PROC_SELF_FD
	+#endif
	+
	+#if !defined(F_GETPATH) && defined(TRY_PROC_SELF_FD)
	static bool hasProcSelfFD() {
	// If we have a /proc filesystem mounted, we can quickly establish the
	// real name of the file with readlink
	@@ -1117,6 +1125,7 @@
	RealPath->append(Buffer, Buffer + strlen(Buffer));
	#else
	char Buffer[PATH_MAX];
	+#if defined(TRY_PROC_SELF_FD)
	if (hasProcSelfFD()) {
	char ProcPath[64];
	snprintf(ProcPath, sizeof(ProcPath), "/proc/self/fd/%d", ResultFD);
	@@ -1124,13 +1133,16 @@
	if (CharCount > 0)
	RealPath->append(Buffer, Buffer + CharCount);
	} else {
	+#endif
	SmallString<128> Storage;
	StringRef P = Name.toNullTerminatedStringRef(Storage);

	// Use ::realpath to get the real path name
	if (::realpath(P.begin(), Buffer) != nullptr)
	RealPath->append(Buffer, Buffer + strlen(Buffer));
	+#if defined(TRY_PROC_SELF_FD)
	}
	+#endif
	#endif
	return std::error_code();
	}