From 2a23dc8a34a8760bce197be5ff9a44221f537383 Mon Sep 17 00:00:00 2001 From: pk910 Date: Sun, 12 Feb 2012 21:33:14 +0100 Subject: [PATCH] moved cmd_extscript from NeonServ.mod to global.mod --- Makefile.am | 2 +- src/modules/NeonServ.mod/cmd_neonserv.c | 1 - src/modules/NeonServ.mod/cmd_neonserv.h | 1 - src/modules/global.mod/cmd_global.c | 1 + src/modules/global.mod/cmd_global.h | 1 + .../cmd_global_extscript.c} | 20 +++++++++---------- 6 files changed, 13 insertions(+), 13 deletions(-) rename src/modules/{NeonServ.mod/cmd_neonserv_extscript.c => global.mod/cmd_global_extscript.c} (90%) diff --git a/Makefile.am b/Makefile.am index 9a64dcd..97f61f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -45,6 +45,7 @@ libglobalcmd_la_SOURCES = src/modules/global.mod/cmd_global.c \ src/modules/global.mod/cmd_global_reconnect.c \ src/modules/global.mod/cmd_global_modcmd.c \ src/modules/global.mod/cmd_global_meminfo.c \ + src/modules/global.mod/cmd_global_extscript.c \ src/modules/global.mod/module.c libglobalcmd_la_LDFLAGS = -module -rpath /nowhere -avoid-version @@ -120,7 +121,6 @@ libNeonServ_la_SOURCES = src/modules/NeonServ.mod/bot_NeonServ.c \ src/modules/NeonServ.mod/cmd_neonserv_info.c \ src/modules/NeonServ.mod/cmd_neonserv_rename.c \ src/modules/NeonServ.mod/cmd_neonserv_unvisited.c \ - src/modules/NeonServ.mod/cmd_neonserv_extscript.c \ src/modules/NeonServ.mod/cmd_neonserv_noregister.c \ src/modules/NeonServ.mod/cmd_neonserv_nicklist.c \ src/modules/NeonServ.mod/cmd_neonserv_halfop.c \ diff --git a/src/modules/NeonServ.mod/cmd_neonserv.c b/src/modules/NeonServ.mod/cmd_neonserv.c index 8630e44..9781c67 100644 --- a/src/modules/NeonServ.mod/cmd_neonserv.c +++ b/src/modules/NeonServ.mod/cmd_neonserv.c @@ -78,7 +78,6 @@ void register_commands() { USER_COMMAND("help", neonserv_cmd_help, 0, NULL, 0); USER_COMMAND("events", neonserv_cmd_events, 0, "1", CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH); USER_COMMAND("info", neonserv_cmd_info, 0, NULL, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_NO_CROSSCHAN); - USER_COMMAND("extscript", neonserv_cmd_extscript, 0, NULL, CMDFLAG_EMPTY_ARGS | CMDFLAG_CHAN_PARAM); USER_COMMAND("nicklist", neonserv_cmd_nicklist, 0, "1", CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH); #undef USER_COMMAND diff --git a/src/modules/NeonServ.mod/cmd_neonserv.h b/src/modules/NeonServ.mod/cmd_neonserv.h index 0c824e9..cf3fe30 100644 --- a/src/modules/NeonServ.mod/cmd_neonserv.h +++ b/src/modules/NeonServ.mod/cmd_neonserv.h @@ -67,7 +67,6 @@ CMD_BIND(neonserv_cmd_devoiceall); CMD_BIND(neonserv_cmd_down); CMD_BIND(neonserv_cmd_downall); CMD_BIND(neonserv_cmd_events); -CMD_BIND(neonserv_cmd_extscript); CMD_BIND(neonserv_cmd_giveowner); CMD_BIND(neonserv_cmd_halfop); CMD_BIND(neonserv_cmd_halfopall); diff --git a/src/modules/global.mod/cmd_global.c b/src/modules/global.mod/cmd_global.c index 7f835fd..4017628 100644 --- a/src/modules/global.mod/cmd_global.c +++ b/src/modules/global.mod/cmd_global.c @@ -30,6 +30,7 @@ void register_commands() { USER_COMMAND("command", global_cmd_command, 1, NULL, CMDFLAG_ESCAPE_ARGS); USER_COMMAND("staff", global_cmd_staff, 0, NULL, 0); USER_COMMAND("motd", global_cmd_motd, 0, NULL, 0); + USER_COMMAND("extscript", global_cmd_extscript, 0, NULL, CMDFLAG_EMPTY_ARGS | CMDFLAG_CHAN_PARAM); #undef USER_COMMAND #define OPER_COMMAND(NAME,FUNCTION,PARAMCOUNT,GACCESS,FLAGS) register_command(0, NAME, module_id, FUNCTION, PARAMCOUNT, NULL, GACCESS, FLAGS) diff --git a/src/modules/global.mod/cmd_global.h b/src/modules/global.mod/cmd_global.h index 70aa47e..8bdfad6 100644 --- a/src/modules/global.mod/cmd_global.h +++ b/src/modules/global.mod/cmd_global.h @@ -48,6 +48,7 @@ CMD_BIND(global_cmd_commands); CMD_BIND(global_cmd_delbot); CMD_BIND(global_cmd_die); CMD_BIND(global_cmd_emote); +CMD_BIND(global_cmd_extscript); CMD_BIND(global_cmd_god); CMD_BIND(global_cmd_meminfo); CMD_BIND(global_cmd_modcmd); diff --git a/src/modules/NeonServ.mod/cmd_neonserv_extscript.c b/src/modules/global.mod/cmd_global_extscript.c similarity index 90% rename from src/modules/NeonServ.mod/cmd_neonserv_extscript.c rename to src/modules/global.mod/cmd_global_extscript.c index 35564e2..b0a15ea 100644 --- a/src/modules/NeonServ.mod/cmd_neonserv_extscript.c +++ b/src/modules/global.mod/cmd_global_extscript.c @@ -1,4 +1,4 @@ -/* cmd_neonserv_extscript.c - NeonServ v5.3 +/* cmd_global_extscript.c - NeonServ v5.3 * Copyright (C) 2011-2012 Philipp Kreil (pk910) * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "cmd_neonserv.h" +#include "cmd_global.h" #include /* @@ -24,9 +24,9 @@ * argv[argc-1] all arguments passed to the command */ -static TIMEQ_CALLBACK(neonserv_cmd_extscript_callback); +static TIMEQ_CALLBACK(global_cmd_extscript_callback); -struct neonserv_cmd_extscript_cache { +struct global_cmd_extscript_cache { struct ClientSocket *client, *textclient; struct Event *event; struct UserNode *user; @@ -35,7 +35,7 @@ struct neonserv_cmd_extscript_cache { FILE *pipe; }; -CMD_BIND(neonserv_cmd_extscript) { +CMD_BIND(global_cmd_extscript) { int i, j; char *args[MAXNUMPARAMS]; int argpos = 0; @@ -124,7 +124,7 @@ CMD_BIND(neonserv_cmd_extscript) { command[commandpos] = '\0'; //we should now have a valid command - struct neonserv_cmd_extscript_cache *cache = malloc(sizeof(*cache)); + struct global_cmd_extscript_cache *cache = malloc(sizeof(*cache)); if (!cache) { perror("malloc() failed"); return; @@ -139,11 +139,11 @@ CMD_BIND(neonserv_cmd_extscript) { #ifndef WIN32 fcntl(fileno(cache->pipe), F_SETFL, O_NONBLOCK); #endif - timeq_uadd(200, module_id, neonserv_cmd_extscript_callback, cache); + timeq_uadd(200, module_id, global_cmd_extscript_callback, cache); } -static TIMEQ_CALLBACK(neonserv_cmd_extscript_callback) { - struct neonserv_cmd_extscript_cache *cache = data; +static TIMEQ_CALLBACK(global_cmd_extscript_callback) { + struct global_cmd_extscript_cache *cache = data; char command[512]; char *a; if(feof(cache->pipe)) { @@ -163,7 +163,7 @@ static TIMEQ_CALLBACK(neonserv_cmd_extscript_callback) { else reply(cache->textclient, cache->user, "%s", command); } - timeq_uadd(200, module_id, neonserv_cmd_extscript_callback, cache); + timeq_uadd(200, module_id, global_cmd_extscript_callback, cache); } -- 2.20.1