pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-28 14:16:38 +02:00
Code Activity

Fixed restarting Anope when it is started from outside of the services binary dir

Browse Source
This commit is contained in:
Adam
2010-10-05 19:46:33 -04:00
parent 64a3bda235
commit 9ab50eedf2
5 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+10 -14
View File
@@ -186,6 +186,7 @@ void do_restart_services()
delete UplinkSock;
ModuleManager::UnloadAll();
chdir(binary_dir.c_str());
my_av[0] = const_cast<char *>(("./" + services_bin).c_str());
execve(services_bin.c_str(), my_av, my_envp);
if (!readonly)
{
@@ -309,7 +310,7 @@ Anope::string GetFullProgDir(const Anope::string &argv0)
if (GetModuleFileName(NULL, buffer, PATH_MAX))
{
Anope::string fullpath = buffer;
Anope::string::size_type n = fullpath.rfind("\\" SERVICES_BIN);
Anope::string::size_type n = fullpath.rfind("\\");
services_bin = fullpath.substr(n + 1, fullpath.length());
return fullpath.substr(0, n);
}
@@ -319,20 +320,15 @@ Anope::string GetFullProgDir(const Anope::string &argv0)
{
Anope::string remainder = argv0;
/* Does argv[0] start with /? If so, it's a full path, use it */
if (remainder[0] == '/')
{
Anope::string::size_type n = remainder.rfind("/" SERVICES_BIN);
services_bin = remainder.substr(n + 1, remainder.length());
return remainder.substr(0, n);
}
services_bin = remainder;
if (services_bin.substr(0, 2).equals_cs("./"))
services_bin = services_bin.substr(2);
Anope::string fullpath = Anope::string(buffer) + "/" + remainder;
Anope::string::size_type n = fullpath.rfind("/" SERVICES_BIN);
return fullpath.substr(0, n);
Anope::string::size_type n = services_bin.rfind("/");
Anope::string fullpath;
if (services_bin[0] == '/')
fullpath = services_bin.substr(0, n);
else
fullpath = Anope::string(buffer) + "/" + services_bin.substr(0, n);
services_bin = services_bin.substr(n + 1, remainder.length());
return fullpath;
}
#endif
return "/";