Add get_kill_reason() that uses BitchX.kill, and convert all /KILL users to it

Previously only send_kill() used BitchX.kill - the other KILL commands (eg.
/WHOKILL) were using the random kick reasons.  Standardise them all on
BitchX.kill, and add this file to the source so it can be installed along
with the other random reason files.
This commit is contained in:
Kevin Easton
2015-06-27 23:18:38 +10:00
parent 27e32a0319
commit ff251080da
10 changed files with 90 additions and 80 deletions

11
configure vendored
View File

@@ -309,7 +309,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS topdir VERSION_NUMBER CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S MAKE SET_MAKE CPP EGREP AWK ALLOCA GLIB_CONFIG GLIB_CFLAGS GLIB_LIBS GTK_CONFIG GTK_CFLAGS GTK_LIBS IMLIB_CONFIG GDK_IMLIB_CFLAGS GDK_IMLIB_LIBS GNOME_CONFIG GNOME_CFLAGS GNOME_LIBS X_O ESD_CONFIG ESD_CFLAGS ESD_LIBS AUDIOFILE_CONFIG AUDIOFILE_CFLAGS AUDIOFILE_LIBS VERSION _VERSION_ EXTRAS INSTALL_EXTRAS TCL_LIBS TCL_SRCS TCL_OBJS CD_SRCS CD_OBJS XMMS_CONFIG XMMS_CFLAGS XMMS_LIBS XMMS_VERSION XMMS_DATA_DIR XMMS_PLUGIN_DIR XMMS_VISUALIZATION_PLUGIN_DIR XMMS_INPUT_PLUGIN_DIR XMMS_OUTPUT_PLUGIN_DIR XMMS_GENERAL_PLUGIN_DIR XMMS_EFFECT_PLUGIN_DIR MYSQL_LIBS PLUGINS SHLIB_CFLAGS SHLIB_LD SHLIB_SUFFIX RM CP MV GZIP_ENV BZIP2 INSTALL_IRC IRCLIB IRCPATH TRANSLATION_PATH HELPDIR INSTALL_WSERV INSTALL_SCRBX PLUGINDIR INCLUDES GUI_SRCS HAVE_INET_ATON DEFAULT_CTOOLZ_DIR DEFAULT_MSGLOGFILE DEFAULT_BITCHX_HELP_FILE DEFAULT_SCRIPT_HELP_FILE DEFAULT_BITCHX_KICK_FILE DEFAULT_BITCHX_QUIT_FILE DEFAULT_BITCHX_IRCNAME_FILE HINT_FILE WINNT_INSTALL LIBOBJS LTLIBOBJS'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS topdir VERSION_NUMBER CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S MAKE SET_MAKE CPP EGREP AWK ALLOCA GLIB_CONFIG GLIB_CFLAGS GLIB_LIBS GTK_CONFIG GTK_CFLAGS GTK_LIBS IMLIB_CONFIG GDK_IMLIB_CFLAGS GDK_IMLIB_LIBS GNOME_CONFIG GNOME_CFLAGS GNOME_LIBS X_O ESD_CONFIG ESD_CFLAGS ESD_LIBS AUDIOFILE_CONFIG AUDIOFILE_CFLAGS AUDIOFILE_LIBS VERSION _VERSION_ EXTRAS INSTALL_EXTRAS TCL_LIBS TCL_SRCS TCL_OBJS CD_SRCS CD_OBJS XMMS_CONFIG XMMS_CFLAGS XMMS_LIBS XMMS_VERSION XMMS_DATA_DIR XMMS_PLUGIN_DIR XMMS_VISUALIZATION_PLUGIN_DIR XMMS_INPUT_PLUGIN_DIR XMMS_OUTPUT_PLUGIN_DIR XMMS_GENERAL_PLUGIN_DIR XMMS_EFFECT_PLUGIN_DIR MYSQL_LIBS PLUGINS SHLIB_CFLAGS SHLIB_LD SHLIB_SUFFIX RM CP MV GZIP_ENV BZIP2 INSTALL_IRC IRCLIB IRCPATH TRANSLATION_PATH HELPDIR INSTALL_WSERV INSTALL_SCRBX PLUGINDIR INCLUDES GUI_SRCS HAVE_INET_ATON DEFAULT_CTOOLZ_DIR DEFAULT_MSGLOGFILE DEFAULT_BITCHX_HELP_FILE DEFAULT_SCRIPT_HELP_FILE DEFAULT_BITCHX_KICK_FILE DEFAULT_BITCHX_KILL_FILE DEFAULT_BITCHX_QUIT_FILE DEFAULT_BITCHX_IRCNAME_FILE HINT_FILE WINNT_INSTALL LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -15756,6 +15756,7 @@ if test -n "$CYGWIN" -o -n "$EMXOS2" -o -n "$MINGWIN32"; then
DEFAULT_BITCHX_HELP_FILE="BitchX.hlp"
DEFAULT_SCRIPT_HELP_FILE="BitchX.hlp"
DEFAULT_BITCHX_KICK_FILE="BitchX.kck"
DEFAULT_BITCHX_KILL_FILE="BitchX.kil"
DEFAULT_BITCHX_QUIT_FILE="BitchX.qt"
DEFAULT_BITCHX_IRCNAME_FILE="BitchX.nam"
WINNT_INSTALL="\$(INSTALL_DATA) \$(top_srcdir)/doc/BitchX.ico \$(DESTDIR)\$(IRCLIB); \$(INSTALL_DATA) \$(top_srcdir)/doc/BitchX.bat \$(DESTDIR)\$(IRCLIB); \$(INSTALL_DATA) \$(top_srcdir)/doc/bx-rc \$(DESTDIR)\$(IRCLIB); \$(MV) \$(DESTDIR)\$(IRCLIB)/\$(VERSION)\$(EXEEXT) \$(DESTDIR)\$(IRCLIB)/\$(_VERSION_)\$(EXEEXT); \$(RM) \$(DESTDIR)\$(IRCLIB)/\$(_VERSION_).old"
@@ -15776,6 +15777,7 @@ else
DEFAULT_BITCHX_HELP_FILE="BitchX.help"
DEFAULT_SCRIPT_HELP_FILE="BitchX.help"
DEFAULT_BITCHX_KICK_FILE="BitchX.kick"
DEFAULT_BITCHX_KILL_FILE="BitchX.kill"
DEFAULT_BITCHX_QUIT_FILE="BitchX.quit"
DEFAULT_BITCHX_IRCNAME_FILE="BitchX.ircnames"
HINT_FILE="BitchX.hints"
@@ -15835,6 +15837,12 @@ _ACEOF
cat >>confdefs.h <<_ACEOF
#define DEFAULT_BITCHX_KILL_FILE "$DEFAULT_BITCHX_KILL_FILE"
_ACEOF
cat >>confdefs.h <<_ACEOF
#define DEFAULT_BITCHX_QUIT_FILE "$DEFAULT_BITCHX_QUIT_FILE"
_ACEOF
@@ -16588,6 +16596,7 @@ s,@DEFAULT_MSGLOGFILE@,$DEFAULT_MSGLOGFILE,;t t
s,@DEFAULT_BITCHX_HELP_FILE@,$DEFAULT_BITCHX_HELP_FILE,;t t
s,@DEFAULT_SCRIPT_HELP_FILE@,$DEFAULT_SCRIPT_HELP_FILE,;t t
s,@DEFAULT_BITCHX_KICK_FILE@,$DEFAULT_BITCHX_KICK_FILE,;t t
s,@DEFAULT_BITCHX_KILL_FILE@,$DEFAULT_BITCHX_KILL_FILE,;t t
s,@DEFAULT_BITCHX_QUIT_FILE@,$DEFAULT_BITCHX_QUIT_FILE,;t t
s,@DEFAULT_BITCHX_IRCNAME_FILE@,$DEFAULT_BITCHX_IRCNAME_FILE,;t t
s,@HINT_FILE@,$HINT_FILE,;t t