diff options
| -rw-r--r-- | include/extern.h | 1 | ||||
| -rw-r--r-- | include/module.h | 1 | ||||
| -rw-r--r-- | src/init.c | 8 | ||||
| -rw-r--r-- | src/main.c | 1 | ||||
| -rw-r--r-- | src/modules.c | 12 | ||||
| -rw-r--r-- | version.log | 6 |
6 files changed, 26 insertions, 3 deletions
diff --git a/include/extern.h b/include/extern.h index d94139cd3..f35846d36 100644 --- a/include/extern.h +++ b/include/extern.h @@ -743,6 +743,7 @@ E int logchan; E int skeleton; E int nofork; E int forceload; +E int nothird; E int noexpire; #ifdef USE_RDB diff --git a/include/module.h b/include/module.h index 1b92f95c4..bd5171c8b 100644 --- a/include/module.h +++ b/include/module.h @@ -6,6 +6,7 @@ #include "language.h" #include "modules.h" #include "depricated.h" +#include "version.h" #define MOD_UNIQUE 0 #define MOD_HEAD 1 diff --git a/src/init.c b/src/init.c index f286bab71..1d0f85c91 100644 --- a/src/init.c +++ b/src/init.c @@ -321,6 +321,12 @@ static int parse_options(int ac, char **av) logchan = 1; } else if (strcmp(s, "forceload") == 0) { forceload = 1; + } else if (strcmp(s, "nothird") == 0) { + nothird = 1; + } else if (strcmp(s, "support") == 0) { + nofork = 1; + debug++; + nothird = 1; } else if (!strcmp(s, "noexpire")) { noexpire = 1; } else if (!strcmp(s, "help")) { @@ -345,6 +351,8 @@ static int parse_options(int ac, char **av) fprintf(stdout, "-logchan -logchan channelname\n"); fprintf(stdout, "-skeleton -skeleton\n"); fprintf(stdout, "-forceload -forceload\n"); + fprintf(stdout, "-nothird -nothird\n"); + fprintf(stdout, "-support -support\n"); fprintf(stdout, "-readonly -readonly\n"); fprintf(stdout, "-noexpire -noexpire\n"); fprintf(stdout, "-version -version\n"); diff --git a/src/main.c b/src/main.c index 07b165ade..2e6de7ddb 100644 --- a/src/main.c +++ b/src/main.c @@ -42,6 +42,7 @@ int logchan = 0; /* -logchan */ int skeleton = 0; /* -skeleton */ int nofork = 0; /* -nofork */ int forceload = 0; /* -forceload */ +int nothird = 0; /* -nothrid */ int noexpire = 0; /* -noexpire */ #ifdef USE_RDB diff --git a/src/modules.c b/src/modules.c index 74af24bb9..19d1a0a84 100644 --- a/src/modules.c +++ b/src/modules.c @@ -93,7 +93,11 @@ void modules_init(void) int idx; int ret; Module *m; - + + if(nothird) { + return; + } + for (idx = 0; idx < ModulesNumber; idx++) { m = findModule(ModulesAutoload[idx]); if (!m) { @@ -197,7 +201,11 @@ void modules_delayed_init(void) int idx; int ret; Module *m; - + + if(nothird) { + return; + } + for (idx = 0; idx < ModulesDelayedNumber; idx++) { m = findModule(ModulesDelayedAutoload[idx]); if (!m) { diff --git a/version.log b/version.log index 86e416f6b..0b4cf5f10 100644 --- a/version.log +++ b/version.log @@ -9,10 +9,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="14" VERSION_EXTRA="" -VERSION_BUILD="1067" +VERSION_BUILD="1068" # $Log$ # +# BUILD : 1.7.14 (1068) +# BUGS : N/A +# NOTES : Added -nothird and -support command line options +# # BUILD : 1.7.14 (1067) # BUGS : # NOTES : Updating VERSION_BUILD with am |