iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-04-30 10:34:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove the unwanted --makeconf option when launching znc after writing a config

Browse Source 
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@481 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
prozacx
2005-09-09 07:16:29 +00:00
parent 947c5a74db
commit 9c5d60fe7a
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
main.cpp
View File

@@ -47,7 +47,7 @@ void die(int sig) {
exit(sig);
}
int main(int argc, char** argv) {
int main(int argc, char** argv, char** envp) {
CString sConfig;
#ifdef HAVE_LIBSSL
@@ -102,14 +102,25 @@ int main(int argc, char** argv) {
if (optind < argc) {
sConfig = argv[optind];
}
if (bMakeConf) {
CZNC* pZNC = CZNC::New();
pZNC->InitDirs("");
if (!pZNC->WriteNewConfig(sConfig)) {
if (bMakeConf) {
CZNC* pZNC = CZNC::New();
pZNC->InitDirs("");
if (pZNC->WriteNewConfig(sConfig)) {
if (argc > 2) {
char* args[3];
args[0] = argv[0];
args[1] = argv[optind];
args[2] = NULL;
execve(*argv, args, envp);
}
}
return 0;
}
} else if (bMakeConf) {
GenerateHelp(argv[0]);
return 1;
}
#ifdef HAVE_LIBSSL