Fix SQLite home directory discovery on Windows

See #193
This commit is contained in:
Justine Tunney 2021-06-12 00:28:06 -07:00
parent 8d7d00af3a
commit 29cb53881e

View file

@ -20713,6 +20713,7 @@ static char *find_home_dir(int clearFlag){
} }
if( home_dir ) return home_dir; if( home_dir ) return home_dir;
#if 0
#if !defined(_WIN32) && !defined(WIN32) && !defined(_WIN32_WCE) \ #if !defined(_WIN32) && !defined(WIN32) && !defined(_WIN32_WCE) \
&& !defined(__RTP__) && !defined(_WRS_KERNEL) && !defined(__RTP__) && !defined(_WRS_KERNEL)
{ {
@ -20723,6 +20724,7 @@ static char *find_home_dir(int clearFlag){
} }
} }
#endif #endif
#endif
#if defined(_WIN32_WCE) #if defined(_WIN32_WCE)
/* Windows CE (arm-wince-mingw32ce-gcc) does not provide getenv() /* Windows CE (arm-wince-mingw32ce-gcc) does not provide getenv()
@ -20730,18 +20732,15 @@ static char *find_home_dir(int clearFlag){
home_dir = "/"; home_dir = "/";
#else #else
#if defined(_WIN32) || defined(WIN32) if (IsWindows() && !home_dir) {
if (!home_dir) {
home_dir = getenv("USERPROFILE"); home_dir = getenv("USERPROFILE");
} }
#endif
if (!home_dir) { if (!home_dir) {
home_dir = getenv("HOME"); home_dir = getenv("HOME");
} }
#if defined(_WIN32) || defined(WIN32) if (IsWindows() && !home_dir) {
if (!home_dir) {
char *zDrive, *zPath; char *zDrive, *zPath;
int n; int n;
zDrive = getenv("HOMEDRIVE"); zDrive = getenv("HOMEDRIVE");
@ -20755,7 +20754,6 @@ static char *find_home_dir(int clearFlag){
} }
home_dir = "c:\\"; home_dir = "c:\\";
} }
#endif
#endif /* !_WIN32_WCE */ #endif /* !_WIN32_WCE */