Fossil SCM
Use a combination of $HOMEDRIVE$HOMEPATH instead of just $HOMEPATH when searching for the home directory on windows. Ticket [44002a7760cf5406]
Commit
3715b5d2453e39dd017e0b5a1b6de10288ccaae5
Parent
3bd2de4c92f8f00…
1 file changed
+4
-1
M
src/db.c
+4
-1
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -685,16 +685,19 @@ | ||
| 685 | 685 | #if defined(_WIN32) |
| 686 | 686 | zHome = getenv("LOCALAPPDATA"); |
| 687 | 687 | if( zHome==0 ){ |
| 688 | 688 | zHome = getenv("APPDATA"); |
| 689 | 689 | if( zHome==0 ){ |
| 690 | + char *zDrive = getenv("HOMEDRIVE"); | |
| 690 | 691 | zHome = getenv("HOMEPATH"); |
| 692 | + if( zDrive && zHome ) zHome = mprintf("%s%s", zDrive, zHome); | |
| 691 | 693 | } |
| 692 | 694 | } |
| 693 | 695 | if( zHome==0 ){ |
| 694 | 696 | fossil_fatal("cannot locate home directory - " |
| 695 | - "please set the HOMEPATH environment variable"); | |
| 697 | + "please set the LOCALAPPDATA or APPDATA or HOMEPATH " | |
| 698 | + "environment variables"); | |
| 696 | 699 | } |
| 697 | 700 | #else |
| 698 | 701 | zHome = getenv("HOME"); |
| 699 | 702 | if( zHome==0 ){ |
| 700 | 703 | fossil_fatal("cannot locate home directory - " |
| 701 | 704 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -685,16 +685,19 @@ | |
| 685 | #if defined(_WIN32) |
| 686 | zHome = getenv("LOCALAPPDATA"); |
| 687 | if( zHome==0 ){ |
| 688 | zHome = getenv("APPDATA"); |
| 689 | if( zHome==0 ){ |
| 690 | zHome = getenv("HOMEPATH"); |
| 691 | } |
| 692 | } |
| 693 | if( zHome==0 ){ |
| 694 | fossil_fatal("cannot locate home directory - " |
| 695 | "please set the HOMEPATH environment variable"); |
| 696 | } |
| 697 | #else |
| 698 | zHome = getenv("HOME"); |
| 699 | if( zHome==0 ){ |
| 700 | fossil_fatal("cannot locate home directory - " |
| 701 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -685,16 +685,19 @@ | |
| 685 | #if defined(_WIN32) |
| 686 | zHome = getenv("LOCALAPPDATA"); |
| 687 | if( zHome==0 ){ |
| 688 | zHome = getenv("APPDATA"); |
| 689 | if( zHome==0 ){ |
| 690 | char *zDrive = getenv("HOMEDRIVE"); |
| 691 | zHome = getenv("HOMEPATH"); |
| 692 | if( zDrive && zHome ) zHome = mprintf("%s%s", zDrive, zHome); |
| 693 | } |
| 694 | } |
| 695 | if( zHome==0 ){ |
| 696 | fossil_fatal("cannot locate home directory - " |
| 697 | "please set the LOCALAPPDATA or APPDATA or HOMEPATH " |
| 698 | "environment variables"); |
| 699 | } |
| 700 | #else |
| 701 | zHome = getenv("HOME"); |
| 702 | if( zHome==0 ){ |
| 703 | fossil_fatal("cannot locate home directory - " |
| 704 |