mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-08-08 10:50:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix SQLite home directory discovery on Windows (reapply 29cb5388)

Browse source 
See #193
This commit is contained in:
Paul Kulchenko 2022-11-22 20:38:42 -08:00
parent 132f85d184
commit 923f8f7875
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
third_party/sqlite3/shell.c vendored
View file

@ -11178,7 +11178,8 @@ static char *find_home_dir(int clearFlag){
} }
if( home_dir ) return home_dir; if( home_dir ) return home_dir;
#if 0 && !defined(_WIN32) && !defined(WIN32) && !defined(_WIN32_WCE) \ #if 0
#if !defined(_WIN32) && !defined(WIN32) && !defined(_WIN32_WCE) \
&& !defined(__RTP__) && !defined(_WRS_KERNEL) && !defined(__RTP__) && !defined(_WRS_KERNEL)
{ {
struct passwd *pwent; struct passwd *pwent;
@ -11188,6 +11189,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()
@ -11195,18 +11197,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");
@ -11220,7 +11219,6 @@ static char *find_home_dir(int clearFlag){
} }
home_dir = "c:\\"; home_dir = "c:\\";
} }
#endif
#endif /* !_WIN32_WCE */ #endif /* !_WIN32_WCE */