Fossil

Check-in [c07cbcd3]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Refine HOME search order on Windows to maintain backward compatibility with the previous search hierarchy.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | windows-env-usage-v2
Files: files | file ages | folders
SHA3-256: c07cbcd3dbf65fbe9d742f8038d8d8d6685aaff4b41c498335a2801bd96d1a73
User & Date: mistachkin 2019-08-10 18:07:13.509
Context
2019-08-13
20:31
Improvements to HOME search on windows, and improve the documentation of the same. ... (check-in: 006afac0 user: drh tags: trunk)
2019-08-10
18:07
Refine HOME search order on Windows to maintain backward compatibility with the previous search hierarchy. ... (Closed-Leaf check-in: c07cbcd3 user: mistachkin tags: windows-env-usage-v2)
03:44
Updated the temp file and dir location documentation in www/env-opts.md to match what the current code does. ... (Closed-Leaf check-in: 1f63724e user: wyoung tags: windows-env-usage)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/db.c.
︙︙
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408

    int alreadyAttached = db_database_slot("configdb")>0;
    if( useAttach==alreadyAttached ) return 1; /* Already open. */
    db_close_config();
  }
  zHome = fossil_getenv("FOSSIL_HOME");
#if defined(_WIN32) || defined(__CYGWIN__)
  if( zHome==0 ){
    zHome = fossil_getenv("USERPROFILE");
    if( zHome==0 ){
      zHome = fossil_getenv("LOCALAPPDATA");
      if( zHome==0 ){
        zHome = fossil_getenv("APPDATA");
        if( zHome==0 ){
          char *zDrive = fossil_getenv("HOMEDRIVE");
          char *zPath = fossil_getenv("HOMEPATH");
          if( zDrive && zPath ) zHome = mprintf("%s%s", zDrive, zPath);
        }
      }
    }
  }
  if( zHome==0 ){
    if( isOptional ) return 0;
    fossil_panic("cannot locate home directory - please set the "
                 "FOSSIL_HOME, LOCALAPPDATA, APPDATA, or HOMEPATH "
                 "environment variables");
  }
#else
  if( zHome==0 ){
    zHome = fossil_getenv("HOME");
  }
  if( zHome==0 ){
    if( isOptional ) return 0;








|

|

|











|
|








1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408

    int alreadyAttached = db_database_slot("configdb")>0;
    if( useAttach==alreadyAttached ) return 1; /* Already open. */
    db_close_config();
  }
  zHome = fossil_getenv("FOSSIL_HOME");
#if defined(_WIN32) || defined(__CYGWIN__)
  if( zHome==0 ){
    zHome = fossil_getenv("LOCALAPPDATA");
    if( zHome==0 ){
      zHome = fossil_getenv("APPDATA");
      if( zHome==0 ){
        zHome = fossil_getenv("USERPROFILE");
        if( zHome==0 ){
          char *zDrive = fossil_getenv("HOMEDRIVE");
          char *zPath = fossil_getenv("HOMEPATH");
          if( zDrive && zPath ) zHome = mprintf("%s%s", zDrive, zPath);
        }
      }
    }
  }
  if( zHome==0 ){
    if( isOptional ) return 0;
    fossil_panic("cannot locate home directory - please set the "
                 "FOSSIL_HOME, LOCALAPPDATA, APPDATA, USERPROFILE, "
                 "or HOMEDRIVE / HOMEPATH environment variables");
  }
#else
  if( zHome==0 ){
    zHome = fossil_getenv("HOME");
  }
  if( zHome==0 ){
    if( isOptional ) return 0;
︙︙