Fossil SCM
Fix hardcoded "/cygdrive" for Cygwin. Thanks to Warren Young!
Commit
5af289e999c6ada99b71f062334bc34489f4df83
Parent
8b47f2d27086b4a…
1 file changed
+4
-11
M
src/db.c
+4
-11
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -713,15 +713,11 @@ | ||
| 713 | 713 | int rc; |
| 714 | 714 | const char *zVfs; |
| 715 | 715 | sqlite3 *db; |
| 716 | 716 | |
| 717 | 717 | #if defined(__CYGWIN__) |
| 718 | - if( (fossil_isalpha(zDbName[0]) && zDbName[1]==':' | |
| 719 | - && (zDbName[2]=='\\' || zDbName[2]=='/')) ) { | |
| 720 | - zDbName = mprintf("/cygdrive/%c/%s", | |
| 721 | - fossil_tolower(zDbName[0]), zDbName+3); | |
| 722 | - } | |
| 718 | + zDbName = fossil_utf8_to_filename(zDbName); | |
| 723 | 719 | #endif |
| 724 | 720 | if( g.fSqlTrace ) fossil_trace("-- sqlite3_open: [%s]\n", zDbName); |
| 725 | 721 | zVfs = fossil_getenv("FOSSIL_VFS"); |
| 726 | 722 | rc = sqlite3_open_v2( |
| 727 | 723 | zDbName, &db, |
| @@ -1028,17 +1024,14 @@ | ||
| 1028 | 1024 | #endif |
| 1029 | 1025 | fossil_panic("not a valid repository: %s", zDbName); |
| 1030 | 1026 | } |
| 1031 | 1027 | } |
| 1032 | 1028 | #if defined(__CYGWIN__) |
| 1033 | - if( (fossil_isalpha(zDbName[0]) && zDbName[1]==':' | |
| 1034 | - && (zDbName[2]=='\\' || zDbName[2]=='/')) ) { | |
| 1035 | - g.zRepositoryName = mprintf("/cygdrive/%c/%s", | |
| 1036 | - fossil_tolower(zDbName[0]), zDbName+3); | |
| 1037 | - } else | |
| 1038 | -#endif | |
| 1029 | + g.zRepositoryName = fossil_utf8_to_filename(zDbName); | |
| 1030 | +#else | |
| 1039 | 1031 | g.zRepositoryName = mprintf("%s", zDbName); |
| 1032 | +#endif | |
| 1040 | 1033 | db_open_or_attach(g.zRepositoryName, "repository", 0); |
| 1041 | 1034 | g.repositoryOpen = 1; |
| 1042 | 1035 | /* Cache "allow-symlinks" option, because we'll need it on every stat call */ |
| 1043 | 1036 | g.allowSymlinks = db_get_boolean("allow-symlinks", 0); |
| 1044 | 1037 | } |
| 1045 | 1038 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -713,15 +713,11 @@ | |
| 713 | int rc; |
| 714 | const char *zVfs; |
| 715 | sqlite3 *db; |
| 716 | |
| 717 | #if defined(__CYGWIN__) |
| 718 | if( (fossil_isalpha(zDbName[0]) && zDbName[1]==':' |
| 719 | && (zDbName[2]=='\\' || zDbName[2]=='/')) ) { |
| 720 | zDbName = mprintf("/cygdrive/%c/%s", |
| 721 | fossil_tolower(zDbName[0]), zDbName+3); |
| 722 | } |
| 723 | #endif |
| 724 | if( g.fSqlTrace ) fossil_trace("-- sqlite3_open: [%s]\n", zDbName); |
| 725 | zVfs = fossil_getenv("FOSSIL_VFS"); |
| 726 | rc = sqlite3_open_v2( |
| 727 | zDbName, &db, |
| @@ -1028,17 +1024,14 @@ | |
| 1028 | #endif |
| 1029 | fossil_panic("not a valid repository: %s", zDbName); |
| 1030 | } |
| 1031 | } |
| 1032 | #if defined(__CYGWIN__) |
| 1033 | if( (fossil_isalpha(zDbName[0]) && zDbName[1]==':' |
| 1034 | && (zDbName[2]=='\\' || zDbName[2]=='/')) ) { |
| 1035 | g.zRepositoryName = mprintf("/cygdrive/%c/%s", |
| 1036 | fossil_tolower(zDbName[0]), zDbName+3); |
| 1037 | } else |
| 1038 | #endif |
| 1039 | g.zRepositoryName = mprintf("%s", zDbName); |
| 1040 | db_open_or_attach(g.zRepositoryName, "repository", 0); |
| 1041 | g.repositoryOpen = 1; |
| 1042 | /* Cache "allow-symlinks" option, because we'll need it on every stat call */ |
| 1043 | g.allowSymlinks = db_get_boolean("allow-symlinks", 0); |
| 1044 | } |
| 1045 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -713,15 +713,11 @@ | |
| 713 | int rc; |
| 714 | const char *zVfs; |
| 715 | sqlite3 *db; |
| 716 | |
| 717 | #if defined(__CYGWIN__) |
| 718 | zDbName = fossil_utf8_to_filename(zDbName); |
| 719 | #endif |
| 720 | if( g.fSqlTrace ) fossil_trace("-- sqlite3_open: [%s]\n", zDbName); |
| 721 | zVfs = fossil_getenv("FOSSIL_VFS"); |
| 722 | rc = sqlite3_open_v2( |
| 723 | zDbName, &db, |
| @@ -1028,17 +1024,14 @@ | |
| 1024 | #endif |
| 1025 | fossil_panic("not a valid repository: %s", zDbName); |
| 1026 | } |
| 1027 | } |
| 1028 | #if defined(__CYGWIN__) |
| 1029 | g.zRepositoryName = fossil_utf8_to_filename(zDbName); |
| 1030 | #else |
| 1031 | g.zRepositoryName = mprintf("%s", zDbName); |
| 1032 | #endif |
| 1033 | db_open_or_attach(g.zRepositoryName, "repository", 0); |
| 1034 | g.repositoryOpen = 1; |
| 1035 | /* Cache "allow-symlinks" option, because we'll need it on every stat call */ |
| 1036 | g.allowSymlinks = db_get_boolean("allow-symlinks", 0); |
| 1037 | } |
| 1038 |