using namespace std;
namespace lyx {
+
+void emergencyCleanup();
+
namespace support {
namespace os {
string cygdrive = "/cygdrive";
+BOOL terminate_handler(DWORD event)
+{
+ if (event == CTRL_CLOSE_EVENT
+ || event == CTRL_LOGOFF_EVENT
+ || event == CTRL_SHUTDOWN_EVENT) {
+ lyx::emergencyCleanup();
+ return TRUE;
+ }
+ return FALSE;
+}
+
} // namespace anon
void init(int /* argc */, char * argv[])
if ((retVal == ERROR_SUCCESS) && (bufSize <= MAX_PATH))
cygdrive = rtrim(string(buf), "/");
}
+
+ // Catch shutdown events.
+ SetConsoleCtrlHandler((PHANDLER_ROUTINE)terminate_handler, TRUE);
}
docstring::size_type const p2_len = p2.length();
docstring::size_type common_len = common_path(p1, p2);
- if (p2[p2_len - 1] == '/')
+ if (p2[p2_len - 1] == '/' && p1_len != p2_len)
++common_len;
if (common_len != p2_len)
return false;
- if (how == CASE_ADJUSTED && !prefixIs(path, pre))
- path = to_utf8(p2 + p1.substr(common_len, p1_len - common_len));
+ if (how == CASE_ADJUSTED && !prefixIs(path, pre)) {
+ if (p1_len < common_len)
+ path = to_utf8(p2.substr(0, p1_len));
+ else
+ path = to_utf8(p2 + p1.substr(common_len,
+ p1_len - common_len));
+ }
return true;
}