Fossil

Check-in [5af289e9]
Login

Check-in [5af289e9]

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

Overview
Comment:Fix hardcoded "/cygdrive" for Cygwin. Thanks to Warren Young!
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 5af289e999c6ada99b71f062334bc34489f4df83
User & Date: jan.nijtmans 2013-07-26 07:06:48
Context
2013-07-26
12:55
trivial doc fix ... (check-in: 249ac411 user: jan.nijtmans tags: trunk)
12:27
Rebase. Generate sqlite3.[ch] from latest SQLite trunk. (still experimental) ... (check-in: 3719ad95 user: jan.nijtmans tags: possible-cygwin-fix)
08:17
rebase ... (Closed-Leaf check-in: 2015bbd5 user: jan.nijtmans tags: merge-integrate)
07:06
Fix hardcoded "/cygdrive" for Cygwin. Thanks to Warren Young! ... (check-in: 5af289e9 user: jan.nijtmans tags: trunk)
2013-07-24
12:27
Fix some test-cases, due to name-change "test-3-way-merge" -> "3-way-merge" ... (check-in: 8b47f2d2 user: jan.nijtmans tags: trunk)
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/db.c.

711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
*/
LOCAL sqlite3 *db_open(const char *zDbName){
  int rc;
  const char *zVfs;
  sqlite3 *db;

#if defined(__CYGWIN__)
  if( (fossil_isalpha(zDbName[0]) && zDbName[1]==':'
          && (zDbName[2]=='\\' || zDbName[2]=='/')) ) {
    zDbName = mprintf("/cygdrive/%c/%s",
        fossil_tolower(zDbName[0]), zDbName+3);
  }
#endif
  if( g.fSqlTrace ) fossil_trace("-- sqlite3_open: [%s]\n", zDbName);
  zVfs = fossil_getenv("FOSSIL_VFS");
  rc = sqlite3_open_v2(
       zDbName, &db,
       SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE,
       zVfs







<
<
|
<
<







711
712
713
714
715
716
717


718


719
720
721
722
723
724
725
*/
LOCAL sqlite3 *db_open(const char *zDbName){
  int rc;
  const char *zVfs;
  sqlite3 *db;

#if defined(__CYGWIN__)


  zDbName = fossil_utf8_to_filename(zDbName);


#endif
  if( g.fSqlTrace ) fossil_trace("-- sqlite3_open: [%s]\n", zDbName);
  zVfs = fossil_getenv("FOSSIL_VFS");
  rc = sqlite3_open_v2(
       zDbName, &db,
       SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE,
       zVfs
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039

1040
1041
1042
1043
1044
1045
1046
#ifdef FOSSIL_ENABLE_JSON
      g.json.resultCode = FSL_JSON_E_DB_NOT_VALID;
#endif
      fossil_panic("not a valid repository: %s", zDbName);
    }
  }
#if defined(__CYGWIN__)
  if( (fossil_isalpha(zDbName[0]) && zDbName[1]==':'
          && (zDbName[2]=='\\' || zDbName[2]=='/')) ) {
    g.zRepositoryName = mprintf("/cygdrive/%c/%s",
        fossil_tolower(zDbName[0]), zDbName+3);
  } else
#endif
  g.zRepositoryName = mprintf("%s", zDbName);

  db_open_or_attach(g.zRepositoryName, "repository", 0);
  g.repositoryOpen = 1;
  /* Cache "allow-symlinks" option, because we'll need it on every stat call */
  g.allowSymlinks = db_get_boolean("allow-symlinks", 0);
}

/*







<
<
|
<
|
<

>







1022
1023
1024
1025
1026
1027
1028


1029

1030

1031
1032
1033
1034
1035
1036
1037
1038
1039
#ifdef FOSSIL_ENABLE_JSON
      g.json.resultCode = FSL_JSON_E_DB_NOT_VALID;
#endif
      fossil_panic("not a valid repository: %s", zDbName);
    }
  }
#if defined(__CYGWIN__)


  g.zRepositoryName = fossil_utf8_to_filename(zDbName);

#else

  g.zRepositoryName = mprintf("%s", zDbName);
#endif
  db_open_or_attach(g.zRepositoryName, "repository", 0);
  g.repositoryOpen = 1;
  /* Cache "allow-symlinks" option, because we'll need it on every stat call */
  g.allowSymlinks = db_get_boolean("allow-symlinks", 0);
}

/*