Fossil SCM
Refine HOME search order on Windows to maintain backward compatibility with the previous search hierarchy.
Commit
c07cbcd3dbf65fbe9d742f8038d8d8d6685aaff4b41c498335a2801bd96d1a73
Parent
1f63724e5b6fec1…
1 file changed
+5
-5
M
src/db.c
+5
-5
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1379,15 +1379,15 @@ | ||
| 1379 | 1379 | db_close_config(); |
| 1380 | 1380 | } |
| 1381 | 1381 | zHome = fossil_getenv("FOSSIL_HOME"); |
| 1382 | 1382 | #if defined(_WIN32) || defined(__CYGWIN__) |
| 1383 | 1383 | if( zHome==0 ){ |
| 1384 | - zHome = fossil_getenv("USERPROFILE"); | |
| 1384 | + zHome = fossil_getenv("LOCALAPPDATA"); | |
| 1385 | 1385 | if( zHome==0 ){ |
| 1386 | - zHome = fossil_getenv("LOCALAPPDATA"); | |
| 1386 | + zHome = fossil_getenv("APPDATA"); | |
| 1387 | 1387 | if( zHome==0 ){ |
| 1388 | - zHome = fossil_getenv("APPDATA"); | |
| 1388 | + zHome = fossil_getenv("USERPROFILE"); | |
| 1389 | 1389 | if( zHome==0 ){ |
| 1390 | 1390 | char *zDrive = fossil_getenv("HOMEDRIVE"); |
| 1391 | 1391 | char *zPath = fossil_getenv("HOMEPATH"); |
| 1392 | 1392 | if( zDrive && zPath ) zHome = mprintf("%s%s", zDrive, zPath); |
| 1393 | 1393 | } |
| @@ -1395,12 +1395,12 @@ | ||
| 1395 | 1395 | } |
| 1396 | 1396 | } |
| 1397 | 1397 | if( zHome==0 ){ |
| 1398 | 1398 | if( isOptional ) return 0; |
| 1399 | 1399 | fossil_panic("cannot locate home directory - please set the " |
| 1400 | - "FOSSIL_HOME, LOCALAPPDATA, APPDATA, or HOMEPATH " | |
| 1401 | - "environment variables"); | |
| 1400 | + "FOSSIL_HOME, LOCALAPPDATA, APPDATA, USERPROFILE, " | |
| 1401 | + "or HOMEDRIVE / HOMEPATH environment variables"); | |
| 1402 | 1402 | } |
| 1403 | 1403 | #else |
| 1404 | 1404 | if( zHome==0 ){ |
| 1405 | 1405 | zHome = fossil_getenv("HOME"); |
| 1406 | 1406 | } |
| 1407 | 1407 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1379,15 +1379,15 @@ | |
| 1379 | db_close_config(); |
| 1380 | } |
| 1381 | zHome = fossil_getenv("FOSSIL_HOME"); |
| 1382 | #if defined(_WIN32) || defined(__CYGWIN__) |
| 1383 | if( zHome==0 ){ |
| 1384 | zHome = fossil_getenv("USERPROFILE"); |
| 1385 | if( zHome==0 ){ |
| 1386 | zHome = fossil_getenv("LOCALAPPDATA"); |
| 1387 | if( zHome==0 ){ |
| 1388 | zHome = fossil_getenv("APPDATA"); |
| 1389 | if( zHome==0 ){ |
| 1390 | char *zDrive = fossil_getenv("HOMEDRIVE"); |
| 1391 | char *zPath = fossil_getenv("HOMEPATH"); |
| 1392 | if( zDrive && zPath ) zHome = mprintf("%s%s", zDrive, zPath); |
| 1393 | } |
| @@ -1395,12 +1395,12 @@ | |
| 1395 | } |
| 1396 | } |
| 1397 | if( zHome==0 ){ |
| 1398 | if( isOptional ) return 0; |
| 1399 | fossil_panic("cannot locate home directory - please set the " |
| 1400 | "FOSSIL_HOME, LOCALAPPDATA, APPDATA, or HOMEPATH " |
| 1401 | "environment variables"); |
| 1402 | } |
| 1403 | #else |
| 1404 | if( zHome==0 ){ |
| 1405 | zHome = fossil_getenv("HOME"); |
| 1406 | } |
| 1407 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1379,15 +1379,15 @@ | |
| 1379 | db_close_config(); |
| 1380 | } |
| 1381 | zHome = fossil_getenv("FOSSIL_HOME"); |
| 1382 | #if defined(_WIN32) || defined(__CYGWIN__) |
| 1383 | if( zHome==0 ){ |
| 1384 | zHome = fossil_getenv("LOCALAPPDATA"); |
| 1385 | if( zHome==0 ){ |
| 1386 | zHome = fossil_getenv("APPDATA"); |
| 1387 | if( zHome==0 ){ |
| 1388 | zHome = fossil_getenv("USERPROFILE"); |
| 1389 | if( zHome==0 ){ |
| 1390 | char *zDrive = fossil_getenv("HOMEDRIVE"); |
| 1391 | char *zPath = fossil_getenv("HOMEPATH"); |
| 1392 | if( zDrive && zPath ) zHome = mprintf("%s%s", zDrive, zPath); |
| 1393 | } |
| @@ -1395,12 +1395,12 @@ | |
| 1395 | } |
| 1396 | } |
| 1397 | if( zHome==0 ){ |
| 1398 | if( isOptional ) return 0; |
| 1399 | fossil_panic("cannot locate home directory - please set the " |
| 1400 | "FOSSIL_HOME, LOCALAPPDATA, APPDATA, USERPROFILE, " |
| 1401 | "or HOMEDRIVE / HOMEPATH environment variables"); |
| 1402 | } |
| 1403 | #else |
| 1404 | if( zHome==0 ){ |
| 1405 | zHome = fossil_getenv("HOME"); |
| 1406 | } |
| 1407 |