adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-06 08:52:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't start a new process for starting znc after --makeconf

Browse Source 
The code now just falls through to the normal bootup code.

Thanks to kroimon for this idea and also for writing this patch.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1171 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2008-08-25 14:42:11 +00:00
parent 840d1ba15a
commit 971aa39e10
1 changed files with 4 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.cpp
+4 -35
View File
@@ -158,42 +158,11 @@ int main(int argc, char** argv) {
}
if (bMakeConf) {
if (pZNC->WriteNewConfig(sConfig)) {
char const* args[5];
if (argc > 2) {
args[0] = argv[0];
if (!sDataDir.empty()) {
args[1] = "--datadir";
args[2] = strdup(sDataDir.c_str());
args[3] = argv[optind];
args[4] = NULL;
} else {
args[1] = argv[optind];
args[2] = NULL;
}
} else if (argc > 1) {
args[0] = argv[0];
if (!sDataDir.empty()) {
args[1] = "--datadir";
args[2] = strdup(sDataDir.c_str());
args[3] = NULL;
} else {
args[1] = NULL;
}
} else {
CUtils::PrintError("Unable to launch znc [Try manually restarting]");
return 1;
}
if ((chdir(pZNC->GetCurPath().c_str()) == -1)
|| (execv(*argv, (char *const*)args) == -1)) {
CUtils::PrintError("Unable to launch znc [" + CString(strerror(errno)) + "]");
return 1;
}
if (!pZNC->WriteNewConfig(sConfig)) {
delete pZNC;
return 0;
}
return 0;
/* Fall through to normal bootup */
}
if (!pZNC->ParseConfig(sConfig)) {