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

Adjusted instreg, instsvc and fbguard with current binaries names and paths

Browse Source
This commit is contained in:
hvlad 2011-05-10 13:03:11 +00:00
parent a8842629ea
commit e3a6969eab
4 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/iscguard/iscguard.h
View File

@ -22,7 +22,7 @@
static const char* const GUARDIAN_APP_NAME = "Firebird Guardian";
static const char* const GUARDIAN_APP_LABEL = "Firebird Guardian";
static const char* const GUARDIAN_CLASS_NAME = "FB_Guard";
static const char* const FBSERVER = "fbserver.exe";
static const char* const FBSERVER = "firebird.exe";
// Help Constants
const DWORD ibs_server_directory = 8060;

6
src/utilities/install/install_nt.h
View File

@ -27,13 +27,12 @@
static const char* const REMOTE_SERVICE = "FirebirdServer%s";
static const char* const REMOTE_DISPLAY_NAME = "Firebird Server - %s";
static const char* const REMOTE_DISPLAY_DESCR = "Firebird Database Server - www.firebirdsql.org";
static const char* const REMOTE_SS_EXECUTABLE = "bin\\fbserver";
static const char* const REMOTE_CS_EXECUTABLE = "bin\\fb_inet_server";
static const char* const REMOTE_EXECUTABLE = "firebird";
static const char* const ISCGUARD_SERVICE = "FirebirdGuardian%s";
static const char* const ISCGUARD_DISPLAY_NAME = "Firebird Guardian - %s";
static const char* const ISCGUARD_DISPLAY_DESCR = "Firebird Server Guardian - www.firebirdsql.org";
static const char* const ISCGUARD_EXECUTABLE = "bin\\fbguard";
static const char* const ISCGUARD_EXECUTABLE = "fbguard";
static const char* const SERVER_MUTEX = "FirebirdServerMutex%s";
static const char* const GUARDIAN_MUTEX = "FirebirdGuardianMutex%s";
@ -69,7 +68,6 @@ const USHORT HIGH_PRIORITY = 2;
// sw_arch
const USHORT ARCH_SS = 0;
const USHORT ARCH_CS = 1;
const USHORT ARCH_SCS = 2;
// sw_client
const USHORT CLIENT_NONE = 0;

5
src/utilities/install/install_reg.cpp
View File

@ -75,9 +75,6 @@ int CLIB_ROUTINE main( int argc, char** argv)
TEXT* p = directory + len;
do {--p;} while (*p != '\\');
// 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;
@ -219,7 +216,7 @@ static void usage_exit()
printf("\nUsage:\n");
printf(" instreg i[nstall]\n");
printf(" r[emove]\n\n");
printf(" This utility should be located and run from the 'bin' directory\n");
printf(" This utility should be located and run from the root directory\n");
printf(" of your Firebird installation.\n\n");
printf(" '-z' can be used with any other option, prints version\n");

24
src/utilities/install/install_svc.cpp
View File

@ -33,8 +33,6 @@
#include "../utilities/install/registry.h"
#include "../common/config/config.h"
#define REMOTE_EXECUTABLE ((sw_arch == ARCH_SS) ? REMOTE_SS_EXECUTABLE : REMOTE_CS_EXECUTABLE)
static void svc_query(const char*, const char*, SC_HANDLE manager);
static USHORT svc_query_ex(SC_HANDLE manager);
static USHORT svc_error(SLONG, const TEXT*, SC_HANDLE);
@ -101,18 +99,6 @@ int CLIB_ROUTINE main( int argc, char **argv)
if ((*p) == '\\')
break;
}
// Get to the previous '\' (this one should precede the supposed 'bin\\' part).
// There is always an additional '\' OR a ':'.
while (p != directory)
{
--p;
if ((*p) == '\\' || (*p) == ':')
break;
}
// Truncate directory path
*p = '\0';
TEXT full_username[128];
@ -179,10 +165,6 @@ int CLIB_ROUTINE main( int argc, char **argv)
sw_arch = ARCH_CS;
break;
case 'M':
sw_arch = ARCH_SCS;
break;
case 'L':
if (++argv < end)
username = *argv;
@ -346,7 +328,7 @@ int CLIB_ROUTINE main( int argc, char **argv)
else
switches.printf("-s %s", instance);
if (sw_arch == ARCH_SCS)
if (sw_arch == ARCH_SS)
switches += " -m";
switch (sw_command)
@ -762,7 +744,7 @@ static void usage_exit()
*
**************************************/
printf("\nUsage:\n");
printf(" instsvc i[nstall] [ -s[uperserver]* | -c[lassic] | -m[ultithreaded] ]\n");
printf(" instsvc i[nstall] [ -s[uperserver]* | -c[lassic] ]\n");
printf(" [ -a[uto]* | -d[emand] ]\n");
printf(" [ -g[uardian] ]\n");
printf(" [ -l[ogin] username [password] ]\n");
@ -773,7 +755,7 @@ static void usage_exit()
printf(" sto[p] [ -n[ame] instance ]\n");
printf(" q[uery]\n");
printf(" r[emove] [ -n[ame] instance ]\n\n");
printf(" This utility should be located and run from the 'bin' directory\n");
printf(" This utility should be located and run from the root directory\n");
printf(" of your Firebird installation.\n\n");
printf(" '*' denotes the default values\n");
printf(" '-z' can be used with any other option, prints version\n");