diff --git a/include/vars.h b/include/vars.h index de897f3..8345194 100644 --- a/include/vars.h +++ b/include/vars.h @@ -404,7 +404,6 @@ extern int loading_global; #define STR_TYPE_VAR 3 #define SET_TYPE_VAR 4 -#define VF_NODAEMON 0x0001 #define VF_EXPAND_PATH 0x0002 #define VIF_CHANGED 0x01 diff --git a/source/vars.c b/source/vars.c index af14c7e..7f71e23 100644 --- a/source/vars.c +++ b/source/vars.c @@ -218,7 +218,7 @@ static IrcVariable irc_variable[] = { "DISPLAY_PC_CHARACTERS",0, INT_TYPE_VAR, DEFAULT_DISPLAY_PC_CHARACTERS, NULL, reinit_screen, 0, VIF_BITCHX }, { "DOUBLE_STATUS_LINE",0, INT_TYPE_VAR, DEFAULT_DOUBLE_STATUS_LINE, NULL, NULL, 0, VIF_BITCHX }, { "EIGHT_BIT_CHARACTERS",0, BOOL_TYPE_VAR, DEFAULT_EIGHT_BIT_CHARACTERS, NULL, eight_bit_characters, 0, VIF_BITCHX }, - { "EXEC_PROTECTION",0, BOOL_TYPE_VAR, DEFAULT_EXEC_PROTECTION, NULL, exec_warning, 0, VF_NODAEMON }, + { "EXEC_PROTECTION",0, BOOL_TYPE_VAR, DEFAULT_EXEC_PROTECTION, NULL, exec_warning, 0, 0 }, { "FAKE_SPLIT_PATTERNS",0, STR_TYPE_VAR, 0, NULL, NULL, 0, 0 }, { "FLOATING_POINT_MATH_VAR",0, BOOL_TYPE_VAR, DEFAULT_FLOATING_POINT_MATH, NULL, NULL, 0, 0 }, @@ -235,13 +235,13 @@ static IrcVariable irc_variable[] = { "HACK_OPS",0, BOOL_TYPE_VAR, 0, NULL, NULL, 0, 0}, { "HEBREW_TOGGLE",0, BOOL_TYPE_VAR, 0, NULL, NULL, 0, VIF_BITCHX }, { "HELP_PAGER",0, BOOL_TYPE_VAR, DEFAULT_HELP_PAGER, NULL, NULL, 0, 0 }, - { "HELP_PATH",0, STR_TYPE_VAR, 0, NULL, NULL, 0, VF_EXPAND_PATH|VF_NODAEMON }, + { "HELP_PATH",0, STR_TYPE_VAR, 0, NULL, NULL, 0, VF_EXPAND_PATH }, { "HELP_PROMPT",0, BOOL_TYPE_VAR, DEFAULT_HELP_PROMPT, NULL, NULL, 0, 0 }, { "HELP_WINDOW",0, BOOL_TYPE_VAR, DEFAULT_HELP_WINDOW, NULL, NULL, 0, 0 }, { "HIDE_PRIVATE_CHANNELS",0, BOOL_TYPE_VAR, DEFAULT_HIDE_PRIVATE_CHANNELS, NULL, BX_update_all_status, 0, 0 }, { "HIGHLIGHT_CHAR",0, STR_TYPE_VAR, 0, NULL, set_highlight_char, 0, 0 }, { "HIGH_BIT_ESCAPE",0, INT_TYPE_VAR, DEFAULT_HIGH_BIT_ESCAPE, NULL, set_meta_8bit, 0, 0 }, - { "HISTORY",0, INT_TYPE_VAR, DEFAULT_HISTORY, NULL, set_history_size, 0, VF_NODAEMON }, + { "HISTORY",0, INT_TYPE_VAR, DEFAULT_HISTORY, NULL, set_history_size, 0, 0 }, { "HOLD_MODE",0, BOOL_TYPE_VAR, DEFAULT_HOLD_MODE, NULL, BX_reset_line_cnt, 0, 0 }, { "HOLD_MODE_MAX",0, INT_TYPE_VAR, DEFAULT_HOLD_MODE_MAX, NULL, NULL, 0, 0 }, { "HTTP_GRAB",0, BOOL_TYPE_VAR, DEFAULT_HTTP_GRAB, NULL, NULL, 0, VIF_BITCHX }, @@ -275,9 +275,9 @@ static IrcVariable irc_variable[] = { "LASTLOG_LEVEL",0, STR_TYPE_VAR, 0, NULL, set_lastlog_level, 0, 0 }, { "LLOOK",0, BOOL_TYPE_VAR, DEFAULT_LLOOK, NULL, NULL, 0, 0 }, { "LLOOK_DELAY",0, INT_TYPE_VAR, DEFAULT_LLOOK_DELAY, NULL, NULL, 0, VIF_BITCHX }, - { "LOAD_PATH",0, STR_TYPE_VAR, 0, NULL, NULL, 0, VF_NODAEMON }, + { "LOAD_PATH",0, STR_TYPE_VAR, 0, NULL, NULL, 0, 0 }, { "LOG",0, BOOL_TYPE_VAR, DEFAULT_LOG, NULL, logger, 0, 0 }, - { "LOGFILE",0, STR_TYPE_VAR, 0, NULL, set_log_file, 0, VF_NODAEMON }, + { "LOGFILE",0, STR_TYPE_VAR, 0, NULL, set_log_file, 0, 0 }, { "MAIL",0, INT_TYPE_VAR, DEFAULT_MAIL, NULL, BX_update_all_status, 0, VIF_BITCHX }, { "MANGLE_INBOUND",0, STR_TYPE_VAR, 0, NULL, set_mangle_inbound, 0, VIF_BITCHX }, @@ -319,7 +319,7 @@ static IrcVariable irc_variable[] = { "NOTIFY_HANDLER",0, STR_TYPE_VAR, 0, NULL, set_notify_handler, 0, 0 }, { "NOTIFY_INTERVAL",0, INT_TYPE_VAR, DEFAULT_NOTIFY_INTERVAL, NULL, NULL, 0, VIF_BITCHX }, { "NOTIFY_LEVEL",0, STR_TYPE_VAR, 0, NULL, set_notify_level, 0, 0 }, - { "NOTIFY_ON_TERMINATION",0, BOOL_TYPE_VAR, DEFAULT_NOTIFY_ON_TERMINATION, NULL, NULL, 0, VF_NODAEMON }, + { "NOTIFY_ON_TERMINATION",0, BOOL_TYPE_VAR, DEFAULT_NOTIFY_ON_TERMINATION, NULL, NULL, 0, 0 }, { "NO_CTCP_FLOOD",0, BOOL_TYPE_VAR, DEFAULT_NO_CTCP_FLOOD, NULL, NULL, 0, 0 }, { "NO_FAIL_DISCONNECT",0, BOOL_TYPE_VAR, DEFAULT_NO_FAIL_DISCONNECT, NULL, NULL, 0, VIF_BITCHX }, { "NUM_BANMODES",0, INT_TYPE_VAR, DEFAULT_NUM_BANMODES, NULL, NULL, 0, VIF_BITCHX }, @@ -344,10 +344,10 @@ static IrcVariable irc_variable[] = { "QUEUE_SENDS",0, INT_TYPE_VAR, DEFAULT_QUEUE_SENDS, NULL, NULL, 0, VIF_BITCHX }, { "RANDOM_LOCAL_PORTS",0, BOOL_TYPE_VAR, DEFAULT_RANDOM_LOCAL_PORTS, NULL, NULL, 0, VIF_BITCHX }, { "RANDOM_SOURCE",0, INT_TYPE_VAR, DEFAULT_RANDOM_SOURCE, NULL, NULL, 0, VIF_BITCHX }, - { "REALNAME",0, STR_TYPE_VAR, 0, NULL, set_realname, 0, VF_NODAEMON }, + { "REALNAME",0, STR_TYPE_VAR, 0, NULL, set_realname, 0, 0 }, { "REVERSE_STATUS",0, BOOL_TYPE_VAR, 0, NULL, reinit_status, 0, 0 }, { "SAVEFILE",0, STR_TYPE_VAR, 0, NULL, NULL, 0, VIF_BITCHX }, - { "SCREEN_OPTIONS",0, STR_TYPE_VAR, 0, NULL, NULL, 0, VF_NODAEMON }, + { "SCREEN_OPTIONS",0, STR_TYPE_VAR, 0, NULL, NULL, 0, 0 }, { "SCRIPT_HELP",0, STR_TYPE_VAR, 0, NULL, NULL, 0, VIF_BITCHX }, { "SCROLLBACK",0, INT_TYPE_VAR, DEFAULT_SCROLLBACK_LINES, NULL, BX_set_scrollback_size, 0, 0 }, { "SCROLLBACK_RATIO",0, INT_TYPE_VAR, DEFAULT_SCROLLBACK_RATIO, NULL, NULL, 0, 0 }, @@ -358,9 +358,9 @@ static IrcVariable irc_variable[] = { "SEND_OP_MSG",0, BOOL_TYPE_VAR, DEFAULT_SEND_OP_MSG, NULL, NULL, 0, VIF_BITCHX }, { "SERVER_GROUPS",0, BOOL_TYPE_VAR, DEFAULT_SERVER_GROUPS, NULL, NULL, 0, VIF_BITCHX }, { "SERVER_PROMPT",0, STR_TYPE_VAR, 0, NULL, NULL, 0, 0 }, - { "SHELL",0, STR_TYPE_VAR, 0, NULL, NULL, 0, VF_NODAEMON }, - { "SHELL_FLAGS",0, STR_TYPE_VAR, 0, NULL, NULL, 0, VF_NODAEMON }, - { "SHELL_LIMIT",0, INT_TYPE_VAR, DEFAULT_SHELL_LIMIT, NULL, NULL, 0, VF_NODAEMON }, + { "SHELL",0, STR_TYPE_VAR, 0, NULL, NULL, 0, 0 }, + { "SHELL_FLAGS",0, STR_TYPE_VAR, 0, NULL, NULL, 0, 0 }, + { "SHELL_LIMIT",0, INT_TYPE_VAR, DEFAULT_SHELL_LIMIT, NULL, NULL, 0, 0 }, { "SHITLIST",0, BOOL_TYPE_VAR, DEFAULT_SHITLIST, NULL, NULL, 0, VIF_BITCHX }, { "SHITLIST_REASON",0, STR_TYPE_VAR, 0, NULL, NULL, 0, VIF_BITCHX }, { "SHOW_AWAY_ONCE",0, BOOL_TYPE_VAR, DEFAULT_SHOW_AWAY_ONCE, NULL, NULL, 0, VIF_BITCHX }, @@ -390,7 +390,7 @@ static IrcVariable irc_variable[] = { "STATUS_HOLD_LINES",0, STR_TYPE_VAR, 0, NULL, BX_build_status, 0, 0 }, { "STATUS_INSERT",0, STR_TYPE_VAR, 0, NULL, BX_build_status, 0, 0 }, { "STATUS_LAG",0, STR_TYPE_VAR, 0, NULL, BX_build_status, 0, 0 }, - { "STATUS_MAIL",0, STR_TYPE_VAR, 0, NULL, BX_build_status, 0, VF_NODAEMON }, + { "STATUS_MAIL",0, STR_TYPE_VAR, 0, NULL, BX_build_status, 0, 0 }, { "STATUS_MODE",0, STR_TYPE_VAR, 0, NULL, BX_build_status, 0, 0 }, { "STATUS_MSGCOUNT",0, STR_TYPE_VAR, 0, NULL, BX_build_status, 0, 0 }, { "STATUS_NICK",0, STR_TYPE_VAR, 0, NULL, BX_build_status, 0, 0 }, @@ -447,7 +447,7 @@ static IrcVariable irc_variable[] = { "STATUS_USERS",0, STR_TYPE_VAR, 0, NULL, BX_build_status, 0, 0 }, { "STATUS_VOICE",0, STR_TYPE_VAR, 0, NULL, BX_build_status, 0, 0 }, { "STATUS_WINDOW",0, STR_TYPE_VAR, 0, NULL, BX_build_status, 0, 0 }, - { "SUPPRESS_SERVER_MOTD",0, BOOL_TYPE_VAR, DEFAULT_SUPPRESS_SERVER_MOTD, NULL, NULL, 0, VF_NODAEMON }, + { "SUPPRESS_SERVER_MOTD",0, BOOL_TYPE_VAR, DEFAULT_SUPPRESS_SERVER_MOTD, NULL, NULL, 0, 0 }, #ifdef WANT_OPERVIEW { "SWATCH",0, STR_TYPE_VAR, 0, NULL, convert_swatch, 0, VIF_BITCHX }, #else @@ -475,7 +475,7 @@ static IrcVariable irc_variable[] = { "WINDOW_QUIET",0, BOOL_TYPE_VAR, 0, NULL, NULL, 0, VIF_BITCHX }, { "WORD_BREAK",0, STR_TYPE_VAR, 0, NULL, NULL, 0, VIF_BITCHX }, { "XTERM",0, STR_TYPE_VAR, 0, NULL, NULL, 0, VIF_BITCHX }, - { "XTERM_OPTIONS",0, STR_TYPE_VAR, 0, NULL, NULL, 0, VF_NODAEMON }, + { "XTERM_OPTIONS",0, STR_TYPE_VAR, 0, NULL, NULL, 0, 0 }, { "XTERM_TITLE",0, BOOL_TYPE_VAR, 0, NULL, NULL, 0, VIF_BITCHX }, { "_CDCC_CLOSE_IDLE_SENDS_TIME",0,INT_TYPE_VAR, 55,NULL, NULL, 0, VIF_BITCHX }, { "_CDCC_MINSPEED_TIME",0, INT_TYPE_VAR, 0, NULL, NULL, 0, VIF_BITCHX },