database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-06 15:49:35 +03:00
Code Activity

Improved method for finding the home directory under windows. Ticket #1926. (CVS 3357)

Browse Source 
FossilOrigin-Name: 10907bb2011eefa306c0e6ee573b6dfe765c8631
This commit is contained in:
drh
2006-08-19 11:15:20 +00:00
parent 9bd41eaec7
commit 164a1b693f
3 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Remove\sobsolete\sclause\sin\sthe\sdocumentation.\s\sTicket\s#1923.\s(CVS\s3356) C Improved\smethod\sfor\sfinding\sthe\shome\sdirectory\sunder\swindows.\s\sTicket\s#1926.\s(CVS\s3357)
D 2006-08-16T22:58:50 D 2006-08-19T11:15:20
F Makefile.in 986db66b0239b460fc118e7d2fa88b45b26c444e F Makefile.in 986db66b0239b460fc118e7d2fa88b45b26c444e
F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -71,7 +71,7 @@ F src/printf.c b179b6ed12f793e028dd169e2e2e2b2a37eedc63
F src/random.c d40f8d356cecbd351ccfab6eaedd7ec1b54f5261 F src/random.c d40f8d356cecbd351ccfab6eaedd7ec1b54f5261
F src/select.c 0d4724930a1f34c747105ed1802fa4af0d8eb519 F src/select.c 0d4724930a1f34c747105ed1802fa4af0d8eb519
F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96 F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
F src/shell.c 9e95f12ef57c3dc9fa0774c27f8743e2d39a9f1f F src/shell.c bc41feffb59676885368b7be5104e7d65ddb55d3
F src/sqlite.h.in 432848ac7f8d7e6fea727668acccec62bdd86cc4 F src/sqlite.h.in 432848ac7f8d7e6fea727668acccec62bdd86cc4
F src/sqlite3ext.h 11a046b3519c4b9b7709e6d6a95c3a36366f684a F src/sqlite3ext.h 11a046b3519c4b9b7709e6d6a95c3a36366f684a
F src/sqliteInt.h 85975cbb95777f619fd76f1ba728022f13321e1b F src/sqliteInt.h 85975cbb95777f619fd76f1ba728022f13321e1b
@@ -377,7 +377,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
P 8c52d2ad468615e50a727adab2977a0bef1bc068 P d4f182e5aa7163de3c692c9ce8dc9092d9d8de49
R 265ca43621ca392582e4afb82527077a R 2c6b6a7b6c9000afdeb6274ef1bce859
U drh U drh
Z 683f3f97e1dcf3338ec8beb16c941c2a Z 0759be7ee293a30335cb7327cd80ca65

2
manifest.uuid
View File

@@ -1 +1 @@
d4f182e5aa7163de3c692c9ce8dc9092d9d8de49 10907bb2011eefa306c0e6ee573b6dfe765c8631

24
src/shell.c
View File

@@ -12,7 +12,7 @@
** This file contains code to implement the "sqlite" command line ** This file contains code to implement the "sqlite" command line
** utility for accessing SQLite databases. ** utility for accessing SQLite databases.
** **
** $Id: shell.c,v 1.145 2006/07/28 20:16:14 adamd Exp $ ** $Id: shell.c,v 1.146 2006/08/19 11:15:20 drh Exp $
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@@ -1563,16 +1563,30 @@ static char *find_home_dir(void){
home_dir = getcwd(home_path, _MAX_PATH); home_dir = getcwd(home_path, _MAX_PATH);
#endif #endif
#if defined(_WIN32) || defined(WIN32) || defined(__OS2__)
if (!home_dir) {
home_dir = getenv("USERPROFILE");
}
#endif
if (!home_dir) { if (!home_dir) {
home_dir = getenv("HOME"); home_dir = getenv("HOME");
if (!home_dir) {
home_dir = getenv("HOMEPATH"); /* Windows? */
}
} }
#if defined(_WIN32) || defined(WIN32) || defined(__OS2__) #if defined(_WIN32) || defined(WIN32) || defined(__OS2__)
if (!home_dir) { if (!home_dir) {
home_dir = "c:"; char *zDrive, *zPath;
int n;
zDrive = getenv("HOMEDRIVE");
zPath = getenv("HOMEPATH");
if( zDrive && zPath ){
n = strlen(zDrive) + strlen(zPath) + 1;
home_dir = malloc( n );
if( home_dir==0 ) return 0;
sqlite3_snprintf(n, home_dir, "%s%s", zDrive, zPath);
return home_dir;
}
home_dir = "c:\\";
} }
#endif #endif