firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 07:23:04 +01:00
Code Issues

instclient now looks for fbclient in its current working directory, instead of ..\bin

Browse Source
This commit is contained in:
paul_reeves 2007-09-18 15:06:05 +00:00
parent 2810d19af8
commit c586b4ed7d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/utilities/install/install.cpp
View File

@ -96,7 +96,8 @@ USHORT CLIENT_install(const TEXT * rootdir, USHORT client, bool sw_force,
// number that we intend to install to WinSysDir.
TEXT fbdll[MAXPATHLEN];
lstrcpy(fbdll, rootdir);
lstrcat(fbdll, "\\bin\\");
// lstrcat(fbdll, "\\bin\\");
lstrcat(fbdll, "\\");
lstrcat(fbdll, FBCLIENT_NAME);
DWORD newverMS = 0, newverLS = 0;
@ -325,7 +326,8 @@ USHORT CLIENT_remove(const TEXT * rootdir, USHORT client, bool sw_force,
// number that we could have installed to WinSysDir.
TEXT fbdll[MAXPATHLEN];
lstrcpy(fbdll, rootdir);
lstrcat(fbdll, "\\bin\\");
// lstrcat(fbdll, "\\bin\\");
lstrcat(fbdll, "\\");
lstrcat(fbdll, FBCLIENT_NAME);
DWORD ourverMS = 0, ourverLS = 0;

2
src/utilities/install/install_client.cpp
View File

@ -94,9 +94,11 @@ int CLIB_ROUTINE main( int argc, char **argv)
TEXT* p = directory + len;
do {--p;} while (*p != '\\');
/* Instclient no longer strips the bin\\ part. This section can be removed after fb2.1.0 beta2
// Get to the previous '\' (this one should precede the supposed 'bin\\' part).
// There is always an additional '\' OR a ':'.
do {--p;} while (*p != '\\' && *p != ':');
*/
*p = '\0';
const TEXT* const* const end = argv + argc;