From d26d6b68dd5ad6cea00331182d70432e4bac3393 Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Wed, 14 Sep 2011 23:21:47 +0000 Subject: [PATCH] Update the comment for system_temp_directory() to indicate when it will ignore the erasedOnReboot option, and properly escape the backslash in "C:\TEMP". Thanks to Aaron and Francois. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@139755 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/PathV2.h | 5 ++++- lib/Support/PathV2.cpp | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/llvm/Support/PathV2.h b/include/llvm/Support/PathV2.h index 8dfbd778405..6d38c957155 100644 --- a/include/llvm/Support/PathV2.h +++ b/include/llvm/Support/PathV2.h @@ -268,7 +268,10 @@ bool is_separator(char value); /// "/var/tmp" or "C:/TEMP" /// /// @param erasedOnReboot Whether to favor a path that is erased on reboot -/// rather than one that potentially persists longer. +/// rather than one that potentially persists longer. This parameter will be +/// ignored if the user or system has set the typical environment variable +/// (e.g., TEMP on Windows, TMPDIR on *nix) to specify a temporary directory. +/// /// @param Result Holds the resulting path name. void system_temp_directory(bool erasedOnReboot, SmallVectorImpl &result); diff --git a/lib/Support/PathV2.cpp b/lib/Support/PathV2.cpp index 4d969fe25f9..b7dfe4f9a5f 100644 --- a/lib/Support/PathV2.cpp +++ b/lib/Support/PathV2.cpp @@ -510,7 +510,7 @@ void system_temp_directory(bool erasedOnReboot, SmallVectorImpl &result) { const char *DefaultResult; #ifdef LLVM_ON_WIN32 (void)erasedOnReboot; - DefaultResult = "C:\TEMP"; + DefaultResult = "C:\\TEMP"; #else if (erasedOnReboot) DefaultResult = "/tmp"; -- 2.34.1