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

Fix bug #1008 by moving parse_options() back to init_secondary() (reverts r1426) and moving the options for -debug, -nofork, and -support into parse_dir_options() instead (real reason for r1426).

Browse Source 
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1950 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
cyberbotx
2009-02-08 21:03:52 +00:00
parent 92f744e421
commit 9312af211e
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/init.c
+14 -7
View File
@@ -105,6 +105,14 @@ static int parse_dir_options(int ac, char **av)
return -1;
}
log_filename = av[i];
} else if (strcmp(s, "debug") == 0) {
++debug;
} else if (strcmp(s, "nofork") == 0) {
nofork = 1;
} else if (strcmp(s, "support") == 0) {
nofork = 1;
++debug;
nothird = 1;
} else if (strcmp(s, "version") == 0) {
fprintf(stdout, "Anope-%s %s -- %s\n", version_number,
version_flags, version_build);
@@ -226,11 +234,11 @@ static int parse_options(int ac, char **av)
} else
ExpireTimeout = atol(s);
} else if (strcmp(s, "debug") == 0) {
debug++;
/* Handled by parse_dir_options() */
} else if (strcmp(s, "readonly") == 0) {
readonly = 1;
} else if (strcmp(s, "nofork") == 0) {
nofork = 1;
/* Handled by parse_dir_options() */
} else if (strcmp(s, "logchan") == 0) {
if (!LogChannel) {
fprintf(stderr,
@@ -246,9 +254,7 @@ static int parse_options(int ac, char **av)
} else if (strcmp(s, "protocoldebug") == 0) {
protocoldebug = 1;
} else if (strcmp(s, "support") == 0) {
nofork = 1;
debug++;
nothird = 1;
/* Handled by parse_dir_options() */
} else if (!strcmp(s, "noexpire")) {
noexpire = 1;
} else if (!strcmp(s, "help")) {
@@ -348,8 +354,6 @@ int init_primary(int ac, char **av)
/* Parse command line for -dir and -version options. */
parse_dir_options(ac, av);
/* Parse all remaining command-line options. */
parse_options(ac, av);
/* Chdir to Services data directory. */
if (chdir(services_dir.c_str()) < 0) {
@@ -395,6 +399,9 @@ int init_secondary(int ac, char **av)
/* Add Core MSG handles */
moduleAddMsgs();
/* Parse all remaining command-line options. */
parse_options(ac, av);
/* Parse the defcon mode string if needed */
if (DefConLevel) {
if (!defconParseModeString(DefConChanModes)) {