Fossil SCM
Minor improvement to SEE integration.
Commit
660c2b15124d482401c5c65c7e3c8956264e77e00f17e65fafa840d95aebd79f
Parent
a3ed29ea34830e3…
1 file changed
+3
M
src/db.c
+3
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1614,10 +1614,11 @@ | ||
| 1614 | 1614 | void db_read_saved_encryption_key_from_process_via_th1( |
| 1615 | 1615 | const char *zConfig /* The TH1 script to evaluate. */ |
| 1616 | 1616 | ){ |
| 1617 | 1617 | int rc; |
| 1618 | 1618 | char *zResult; |
| 1619 | + char *zPwd = file_getcwd(0, 0); | |
| 1619 | 1620 | Th_FossilInit(TH_INIT_DEFAULT | TH_INIT_NEED_CONFIG | TH_INIT_NO_REPO); |
| 1620 | 1621 | rc = Th_Eval(g.interp, 0, zConfig, -1); |
| 1621 | 1622 | zResult = (char*)Th_GetResult(g.interp, 0); |
| 1622 | 1623 | if( rc!=TH_OK ){ |
| 1623 | 1624 | fossil_fatal("script for pid key failed: %s", zResult); |
| @@ -1627,10 +1628,12 @@ | ||
| 1627 | 1628 | LPVOID pAddress = NULL; |
| 1628 | 1629 | SIZE_T nSize = 0; |
| 1629 | 1630 | parse_pid_key_value(zResult, &processId, &pAddress, &nSize); |
| 1630 | 1631 | db_read_saved_encryption_key_from_process(processId, pAddress, nSize); |
| 1631 | 1632 | } |
| 1633 | + file_chdir(zPwd, 0); | |
| 1634 | + fossil_free(zPwd); | |
| 1632 | 1635 | } |
| 1633 | 1636 | #endif /* defined(_WIN32) */ |
| 1634 | 1637 | #endif /* USE_SEE */ |
| 1635 | 1638 | |
| 1636 | 1639 | /* |
| 1637 | 1640 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1614,10 +1614,11 @@ | |
| 1614 | void db_read_saved_encryption_key_from_process_via_th1( |
| 1615 | const char *zConfig /* The TH1 script to evaluate. */ |
| 1616 | ){ |
| 1617 | int rc; |
| 1618 | char *zResult; |
| 1619 | Th_FossilInit(TH_INIT_DEFAULT | TH_INIT_NEED_CONFIG | TH_INIT_NO_REPO); |
| 1620 | rc = Th_Eval(g.interp, 0, zConfig, -1); |
| 1621 | zResult = (char*)Th_GetResult(g.interp, 0); |
| 1622 | if( rc!=TH_OK ){ |
| 1623 | fossil_fatal("script for pid key failed: %s", zResult); |
| @@ -1627,10 +1628,12 @@ | |
| 1627 | LPVOID pAddress = NULL; |
| 1628 | SIZE_T nSize = 0; |
| 1629 | parse_pid_key_value(zResult, &processId, &pAddress, &nSize); |
| 1630 | db_read_saved_encryption_key_from_process(processId, pAddress, nSize); |
| 1631 | } |
| 1632 | } |
| 1633 | #endif /* defined(_WIN32) */ |
| 1634 | #endif /* USE_SEE */ |
| 1635 | |
| 1636 | /* |
| 1637 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1614,10 +1614,11 @@ | |
| 1614 | void db_read_saved_encryption_key_from_process_via_th1( |
| 1615 | const char *zConfig /* The TH1 script to evaluate. */ |
| 1616 | ){ |
| 1617 | int rc; |
| 1618 | char *zResult; |
| 1619 | char *zPwd = file_getcwd(0, 0); |
| 1620 | Th_FossilInit(TH_INIT_DEFAULT | TH_INIT_NEED_CONFIG | TH_INIT_NO_REPO); |
| 1621 | rc = Th_Eval(g.interp, 0, zConfig, -1); |
| 1622 | zResult = (char*)Th_GetResult(g.interp, 0); |
| 1623 | if( rc!=TH_OK ){ |
| 1624 | fossil_fatal("script for pid key failed: %s", zResult); |
| @@ -1627,10 +1628,12 @@ | |
| 1628 | LPVOID pAddress = NULL; |
| 1629 | SIZE_T nSize = 0; |
| 1630 | parse_pid_key_value(zResult, &processId, &pAddress, &nSize); |
| 1631 | db_read_saved_encryption_key_from_process(processId, pAddress, nSize); |
| 1632 | } |
| 1633 | file_chdir(zPwd, 0); |
| 1634 | fossil_free(zPwd); |
| 1635 | } |
| 1636 | #endif /* defined(_WIN32) */ |
| 1637 | #endif /* USE_SEE */ |
| 1638 | |
| 1639 | /* |
| 1640 |