Closed by commit rL214093 (authored by @zturner).
REPOSITORY
rL LLVM
http://reviews.llvm.org/D4674
Files:
lldb/trunk/include/lldb/Host/Host.h
lldb/trunk/include/lldb/Host/windows/win32.h
lldb/trunk/source/Host/common/Host.cpp
lldb/trunk/source/Interpreter/CommandInterpreter.cpp
Index: lldb/trunk/include/lldb/Host/Host.h
===================================================================
--- lldb/trunk/include/lldb/Host/Host.h
+++ lldb/trunk/include/lldb/Host/Host.h
@@ -19,6 +19,7 @@
#include "lldb/lldb-private.h"
#include "lldb/Core/StringList.h"
#include "lldb/Host/File.h"
+#include "lldb/Host/FileSpec.h"
namespace lldb_private {
@@ -361,6 +362,17 @@
SetShortThreadName (lldb::pid_t pid, lldb::tid_t tid, const char *name, size_t len);
//------------------------------------------------------------------
+ /// Gets the FileSpec of the user profile directory. On Posix-platforms
+ /// this is ~, and on windows this is generally something like
+ /// C:\Users\Alice.
+ ///
+ /// @return
+ /// \b A file spec with the path to the user's home directory.
+ //------------------------------------------------------------------
+ static FileSpec
+ GetUserProfileFileSpec ();
+
+ //------------------------------------------------------------------
/// Gets the FileSpec of the current process (the process that
/// that is running the LLDB code).
///
Index: lldb/trunk/include/lldb/Host/windows/win32.h
===================================================================
--- lldb/trunk/include/lldb/Host/windows/win32.h
+++ lldb/trunk/include/lldb/Host/windows/win32.h
@@ -19,7 +19,7 @@
char* realpath(const char * name, char * resolved);
#ifndef PATH_MAX
-#define PATH_MAX MAX_PATH
+#define PATH_MAX 32768
#endif
#define O_NOCTTY 0
Index: lldb/trunk/source/Host/common/Host.cpp
===================================================================
--- lldb/trunk/source/Host/common/Host.cpp
+++ lldb/trunk/source/Host/common/Host.cpp
@@ -75,6 +75,7 @@
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/Support/Host.h"
+#include "llvm/Support/Path.h"
#include "llvm/Support/raw_ostream.h"
#if defined (__APPLE__)
@@ -828,6 +829,19 @@
#endif
FileSpec
+Host::GetUserProfileFileSpec ()
+{
+ static FileSpec g_profile_filespec;
+ if (!g_profile_filespec)
+ {
+ llvm::SmallString<64> path;
+ llvm::sys::path::home_directory(path);
+ return FileSpec(path.c_str(), false);
+ }
+ return g_profile_filespec;
+}
+
+FileSpec
Host::GetProgramFileSpec ()
{
static FileSpec g_program_filespec;
@@ -867,6 +881,10 @@
g_program_filespec.SetFile(exe_path, false);
delete[] exe_path;
}
+#elif defined(_WIN32)
+ std::vector<char> buffer(PATH_MAX);
+ ::GetModuleFileName(NULL, &buffer[0], buffer.size());
+ g_program_filespec.SetFile(&buffer[0], false, FileSpec::ePathSyntaxWindows);
#endif
}
return g_program_filespec;
Index: lldb/trunk/source/Interpreter/CommandInterpreter.cpp
===================================================================
--- lldb/trunk/source/Interpreter/CommandInterpreter.cpp
+++ lldb/trunk/source/Interpreter/CommandInterpreter.cpp
@@ -2381,7 +2381,9 @@
// "-" and the name of the program. If this file doesn't exist, we fall
// back to just the "~/.lldbinit" file. We also obey any requests to not
// load the init files.
- const char *init_file_path = "~/.lldbinit";
+ FileSpec profilePath = Host::GetUserProfileFileSpec();
+ profilePath.AppendPathComponent(".lldbinit");
+ std::string init_file_path = profilePath.GetPath();
if (m_skip_app_init_files == false)
{
@@ -2391,15 +2393,15 @@
if (program_name)
{
char program_init_file_name[PATH_MAX];
- ::snprintf (program_init_file_name, sizeof(program_init_file_name), "%s-%s", init_file_path, program_name);
+ ::snprintf (program_init_file_name, sizeof(program_init_file_name), "%s-%s", init_file_path.c_str(), program_name);
init_file.SetFile (program_init_file_name, true);
if (!init_file.Exists())
init_file.Clear();
}
}
if (!init_file && !m_skip_lldbinit_files)
- init_file.SetFile (init_file_path, true);
+ init_file.SetFile (init_file_path.c_str(), false);
}
// If the file exists, tell HandleCommand to 'source' it; this will do the actual broadcasting
_______________________________________________
lldb-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
