Bump version, update NEWS

Not having this has caused me much annoyance over the years.

.clang-format

@@ -0,0 +1,32 @@
+# clang-format is fairly limited, and these rules are approximate:
+#  - array initializers can get terribly mangled with clang-format 12.0,
+#  - sometimes it still aligns with space characters,
+#  - struct name NL { NL ... NL } NL name; is unachievable.
+BasedOnStyle: GNU
+ColumnLimit: 80
+IndentWidth: 4
+TabWidth: 4
+UseTab: ForContinuationAndIndentation
+BreakBeforeBraces: Allman
+SpaceAfterCStyleCast: true
+AlignAfterOpenBracket: DontAlign
+AlignOperands: DontAlign
+AlignConsecutiveMacros: Consecutive
+AllowAllArgumentsOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+IndentGotoLabels: false
+
+# IncludeCategories has some potential, but it may also break the build.
+# Note that the documentation says the value should be "Never".
+SortIncludes: false
+
+# This is a compromise, it generally works out aesthetically better.
+BinPackArguments: false
+
+# Unfortunately, this can't be told to align to column 40 or so.
+SpacesBeforeTrailingComments: 2
+
+# liberty-specific macro body wrappers.
+MacroBlockBegin: "BLOCK_START"
+MacroBlockEnd: "BLOCK_END"
+ForEachMacros: ["LIST_FOR_EACH"]

.gitignore

@@ -7,3 +7,5 @@
 /uirc3.files
 /uirc3.creator*
 /uirc3.includes
+/uirc3.cflags
+/uirc3.cxxflags

CMakeLists.txt

@@ -1,19 +1,23 @@
-project (uirc3 C)
-cmake_minimum_required (VERSION 2.8.11)
+# Ubuntu 18.04 LTS and OpenBSD 6.4
+cmake_minimum_required (VERSION 3.10)
+project (uirc3 VERSION 1.5.0 LANGUAGES C)
 
 # Options
 option (WANT_READLINE "Use GNU Readline for the UI (better)" ON)
 option (WANT_LIBEDIT "Use BSD libedit for the UI" OFF)
 
 # Moar warnings
+set (CMAKE_C_STANDARD 99)
+set (CMAKE_C_STANDARD_REQUIRED ON)
+set (CMAKE_C_EXTENSIONS OFF)
+
 if ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUCC)
 	# -Wunused-function is pretty annoying here, as everything is static
-	set (wdisabled "-Wno-unused-function")
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra ${wdisabled}")
-endif ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUCC)
+	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-function")
+endif ()
 
 # Version
-set (project_version "0.9.8")
+set (project_version "${PROJECT_VERSION}")
 
 # Try to append commit ID if it follows a version tag.  It might be nicer if
 # we could also detect dirty worktrees but that's very hard to get right.
@@ -28,8 +32,8 @@ if (GIT_FOUND AND EXISTS "${git_head}")
 		set (git_ref "${PROJECT_SOURCE_DIR}/.git/${CMAKE_MATCH_1}")
 		if (EXISTS "${git_ref}")
 			configure_file ("${git_ref}" git-ref.tag COPYONLY)
-		endif (EXISTS "${git_ref}")
-	endif (git_head_content MATCHES "^ref: ([^\r\n]+)")
+		endif ()
+	endif ()
 
 	execute_process (COMMAND ${GIT_EXECUTABLE} describe --tags --match v*
 		WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
@@ -37,8 +41,8 @@ if (GIT_FOUND AND EXISTS "${git_head}")
 		OUTPUT_VARIABLE git_describe OUTPUT_STRIP_TRAILING_WHITESPACE)
 	if (NOT git_describe_result)
 		string (REGEX REPLACE "^v" "" project_version "${git_describe}")
-	endif (NOT git_describe_result)
-endif (GIT_FOUND AND EXISTS "${git_head}")
+	endif ()
+endif ()
 
 # Dashes make filenames confusing and upset packaging software
 string (REPLACE "-" "+" project_version_safe "${project_version}")
@@ -54,21 +58,22 @@ include_directories (${libssl_INCLUDE_DIRS})
 link_directories (${libssl_LIBRARY_DIRS})
 
 if ("${CMAKE_SYSTEM_NAME}" MATCHES "BSD")
-	include_directories (/usr/local/include)
-	link_directories (/usr/local/lib)
 	# Need this for SIGWINCH in FreeBSD and OpenBSD respectively;
 	# our POSIX version macros make it undefined
 	add_definitions (-D__BSD_VISIBLE=1 -D_BSD_SOURCE=1)
-endif ("${CMAKE_SYSTEM_NAME}" MATCHES "BSD")
+elseif (APPLE)
+	add_definitions (-D_DARWIN_C_SOURCE)
+endif ()
 
 # -lrt is only for glibc < 2.17
 # -liconv may or may not be a part of libc
-foreach (extra iconv rt)
+# -lm may or may not be a part of libc
+foreach (extra iconv rt m)
 	find_library (extra_lib_${extra} ${extra})
 	if (extra_lib_${extra})
 		list (APPEND project_libraries ${extra_lib_${extra}})
-	endif (extra_lib_${extra})
-endforeach (extra)
+	endif ()
+endforeach ()
 
 include (CheckCSourceRuns)
 set (CMAKE_REQUIRED_LIBRARIES ${project_libraries})
@@ -78,53 +83,59 @@ CHECK_C_SOURCE_RUNS ("#include <iconv.h>
 	int main () { return iconv_open (\"UTF-8//TRANSLIT\", \"ISO-8859-1\")
 		== (iconv_t) -1; }" ICONV_ACCEPTS_TRANSLIT)
 
-# Dependencies for degesch
+# Dependencies for xC
 pkg_check_modules (libffi REQUIRED libffi)
-list (APPEND degesch_libraries ${libffi_LIBRARIES})
+list (APPEND xC_libraries ${libffi_LIBRARIES})
 include_directories (${libffi_INCLUDE_DIRS})
 link_directories (${libffi_LIBRARY_DIRS})
 
-# FIXME: other Lua versions may be acceptable, don't know yet
+# XXX: other Lua versions may be acceptable, don't know yet
 pkg_search_module (lua lua53 lua5.3 lua-5.3 lua54 lua5.4 lua-5.4 lua>=5.3)
 option (WITH_LUA "Enable support for Lua plugins" ${lua_FOUND})
 
 if (WITH_LUA)
 	if (NOT lua_FOUND)
 		message (FATAL_ERROR "Lua library not found")
-	endif (NOT lua_FOUND)
+	endif ()
 
-	list (APPEND degesch_libraries ${lua_LIBRARIES})
+	list (APPEND xC_libraries ${lua_LIBRARIES})
 	include_directories (${lua_INCLUDE_DIRS})
 	link_directories (${lua_LIBRARY_DIRS})
-endif (WITH_LUA)
+endif ()
 
 find_package (Curses)
 pkg_check_modules (ncursesw ncursesw)
 if (ncursesw_FOUND)
-	list (APPEND degesch_libraries ${ncursesw_LIBRARIES})
+	list (APPEND xC_libraries ${ncursesw_LIBRARIES})
 	include_directories (${ncursesw_INCLUDE_DIRS})
 elseif (CURSES_FOUND)
-	list (APPEND degesch_libraries ${CURSES_LIBRARY})
+	list (APPEND xC_libraries ${CURSES_LIBRARY})
 	include_directories (${CURSES_INCLUDE_DIR})
-else (CURSES_FOUND)
+else ()
 	message (SEND_ERROR "Curses not found")
-endif (ncursesw_FOUND)
+endif ()
 
 if ((WANT_READLINE AND WANT_LIBEDIT) OR (NOT WANT_READLINE AND NOT WANT_LIBEDIT))
 	message (SEND_ERROR "You have to choose either GNU Readline or libedit")
 elseif (WANT_READLINE)
+	pkg_check_modules (readline readline)
+
 	# OpenBSD's default readline is too old
 	if ("${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD")
-		include_directories (/usr/local/include/ereadline)
-		list (APPEND degesch_libraries ereadline)
-	else ("${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD")
-		list (APPEND degesch_libraries readline)
-	endif ("${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD")
+		include_directories (${OPENBSD_LOCALBASE}/include/ereadline)
+		list (APPEND xC_libraries ereadline)
+	elseif (readline_FOUND)
+		list (APPEND xC_libraries ${readline_LIBRARIES})
+		include_directories (${readline_INCLUDE_DIRS})
+		link_directories (${readline_LIBRARY_DIRS})
+	else ()
+		list (APPEND xC_libraries readline)
+	endif ()
 elseif (WANT_LIBEDIT)
 	pkg_check_modules (libedit REQUIRED libedit)
-	list (APPEND degesch_libraries ${libedit_LIBRARIES})
+	list (APPEND xC_libraries ${libedit_LIBRARIES})
 	include_directories (${libedit_INCLUDE_DIRS})
-endif ((WANT_READLINE AND WANT_LIBEDIT) OR (NOT WANT_READLINE AND NOT WANT_LIBEDIT))
+endif ()
 
 # Generate a configuration file
 set (HAVE_READLINE "${WANT_READLINE}")
@@ -132,59 +143,41 @@ set (HAVE_EDITLINE "${WANT_LIBEDIT}")
 set (HAVE_LUA      "${WITH_LUA}")
 
 include (GNUInstallDirs)
-# ZyklonB is currently an odd duck but degesch follows normal XDG rules
-set (zyklonb_plugin_dir ${CMAKE_INSTALL_LIBDIR}/zyklonb/plugins)
 configure_file (${PROJECT_SOURCE_DIR}/config.h.in ${PROJECT_BINARY_DIR}/config.h)
 include_directories (${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR})
 
-# Project source files
-set (common_sources)
-set (common_headers ${PROJECT_BINARY_DIR}/config.h)
-
-add_custom_command (OUTPUT kike-replies.c kike.msg
-	COMMAND ${PROJECT_SOURCE_DIR}/kike-gen-replies.sh
-		> kike-replies.c < ${PROJECT_SOURCE_DIR}/kike-replies
-	DEPENDS ${PROJECT_SOURCE_DIR}/kike-replies
+# Generate IRC replies--we need a custom target because of the multiple outputs
+add_custom_command (OUTPUT xD-replies.c xD.msg
+	COMMAND ${PROJECT_SOURCE_DIR}/xD-gen-replies.sh
+		> xD-replies.c < ${PROJECT_SOURCE_DIR}/xD-replies
+	DEPENDS ${PROJECT_SOURCE_DIR}/xD-replies
 	COMMENT "Generating files from the list of server numerics")
-set_source_files_properties (${PROJECT_BINARY_DIR}/kike-replies.c
-	PROPERTIES HEADER_FILE_ONLY TRUE)
+add_custom_target (replies DEPENDS ${PROJECT_BINARY_DIR}/xD-replies.c)
 
 # Build
-add_executable (zyklonb zyklonb.c ${common_sources} ${common_headers})
-target_link_libraries (zyklonb ${project_libraries})
-add_threads (zyklonb)
+foreach (name xB xC xD)
+	add_executable (${name} ${name}.c ${PROJECT_BINARY_DIR}/config.h)
+	target_link_libraries (${name} ${project_libraries})
+	add_threads (${name})
+endforeach ()
 
-add_executable (degesch degesch.c kike-replies.c
-	${common_sources} ${common_headers})
-target_link_libraries (degesch ${project_libraries} ${degesch_libraries})
-add_threads (degesch)
-
-add_executable (kike kike.c kike-replies.c ${common_sources} ${common_headers})
-target_link_libraries (kike ${project_libraries})
-add_threads (kike)
+add_dependencies (xD replies)
+add_dependencies (xC replies)
+target_link_libraries (xC ${xC_libraries})
 
 # Tests
-function (make_tests_for target_name)
-	get_target_property (sources   ${target_name} SOURCES)
-	get_target_property (libraries ${target_name} LINK_LIBRARIES)
-	get_target_property (options   ${target_name} COMPILE_OPTIONS)
-
-	set (test test-${target_name})
-	add_executable (${test} ${sources})
-	target_link_libraries (${test} ${libraries})
-	set_target_properties (${test} PROPERTIES
-		COMPILE_DEFINITIONS TESTING
-		COMPILE_OPTIONS "${options}")
-
-	add_test (NAME ${test} COMMAND ${test})
-endfunction (make_tests_for)
-
 include (CTest)
 if (BUILD_TESTING)
-	make_tests_for (degesch)
+	add_executable (test-xC $<TARGET_PROPERTY:xC,SOURCES>)
+	set_target_properties (test-xC PROPERTIES COMPILE_DEFINITIONS TESTING)
+	target_link_libraries (test-xC $<TARGET_PROPERTY:xC,LINK_LIBRARIES>)
+	add_threads (test-xC)
+	add_dependencies (test-xC replies)
+
+	add_test (NAME test-xC COMMAND test-xC)
 	add_test (NAME custom-static-analysis
 		COMMAND ${PROJECT_SOURCE_DIR}/test-static)
-endif (BUILD_TESTING)
+endif ()
 
 # Various clang-based diagnostics, loads of fake positives and spam
 file (GLOB clang_tidy_sources *.c)
@@ -201,28 +194,31 @@ add_custom_target (clang-tidy
 	WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
 
 # Installation
-install (TARGETS zyklonb degesch kike DESTINATION ${CMAKE_INSTALL_BINDIR})
+install (TARGETS xB xC xD DESTINATION ${CMAKE_INSTALL_BINDIR})
 install (FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR})
-install (DIRECTORY plugins/zyklonb/
-	DESTINATION ${zyklonb_plugin_dir} USE_SOURCE_PERMISSIONS)
-install (DIRECTORY plugins/degesch/
-	DESTINATION ${CMAKE_INSTALL_DATADIR}/degesch/plugins)
+# XXX: our defaults for XDG_DATA_DIRS expect /usr/local/shore or /usr/share
+install (DIRECTORY plugins/xB/
+	DESTINATION ${CMAKE_INSTALL_DATADIR}/xB/plugins USE_SOURCE_PERMISSIONS)
+install (DIRECTORY plugins/xC/
+	DESTINATION ${CMAKE_INSTALL_DATADIR}/xC/plugins)
 
-# Generate documentation from program help
-find_program (HELP2MAN_EXECUTABLE help2man)
-if (NOT HELP2MAN_EXECUTABLE)
-	message (FATAL_ERROR "help2man not found")
-endif (NOT HELP2MAN_EXECUTABLE)
+# Generate documentation from text markup
+find_program (ASCIIDOCTOR_EXECUTABLE asciidoctor)
+if (NOT ASCIIDOCTOR_EXECUTABLE)
+	message (FATAL_ERROR "asciidoctor not found")
+endif ()
 
-foreach (page zyklonb degesch kike)
+foreach (page xB xC xD)
 	set (page_output "${PROJECT_BINARY_DIR}/${page}.1")
 	list (APPEND project_MAN_PAGES "${page_output}")
 	add_custom_command (OUTPUT ${page_output}
-		COMMAND ${HELP2MAN_EXECUTABLE} -N
-			"${PROJECT_BINARY_DIR}/${page}" -o ${page_output}
-		DEPENDS ${page}
+		COMMAND ${ASCIIDOCTOR_EXECUTABLE} -b manpage
+			-a release-version=${project_version}
+			"${PROJECT_SOURCE_DIR}/${page}.adoc"
+			-o "${page_output}"
+		DEPENDS ${page}.adoc
 		COMMENT "Generating man page for ${page}" VERBATIM)
-endforeach (page)
+endforeach ()
 
 add_custom_target (docs ALL DEPENDS ${project_MAN_PAGES})
 
@@ -230,10 +226,10 @@ foreach (page ${project_MAN_PAGES})
 	string (REGEX MATCH "\\.([0-9])$" manpage_suffix "${page}")
 	install (FILES "${page}"
 		DESTINATION "${CMAKE_INSTALL_MANDIR}/man${CMAKE_MATCH_1}")
-endforeach (page)
+endforeach ()
 
 # CPack
-set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Experimental IRC client, daemon and bot")
+set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Unreasonable IRC client, daemon and bot")
 set (CPACK_PACKAGE_VERSION "${project_version_safe}")
 set (CPACK_PACKAGE_VENDOR "Premysl Eric Janouch")
 set (CPACK_PACKAGE_CONTACT "Přemysl Eric Janouch <p@janouch.name>")

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014 - 2020, Přemysl Eric Janouch <p@janouch.name>
+Copyright (c) 2014 - 2021, Přemysl Eric Janouch <p@janouch.name>
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted.

NEWS

@@ -1,25 +1,128 @@
+1.5.0 (2021-12-21) "The Show Must Go On"
+
+ * xC: made it possible to pass the cursor position to external editors,
+   in particular VIM and Emacs
+
+ * xC: started quoting text coming from bracketed pastes,
+   to minimize the risk of trying to execute filesystem paths as commands
+
+ * xC: fixed to work with post-2021-08-29 editline
+
+ * xC: extended editline's autocomplete to show all options
+
+ * utm-filter.lua: added Facebook's tracking parameter to the filter
+
+
+1.4.0 (2021-10-06) "Call Me Scruffy Scruffington"
+
+ * xC: made message autosplitting respect text formatting
+
+ * xC: fixed displaying IRC colours above 16
+
+ * xC: offer IRCnet as an IRC network to connect to,
+   rather than the lunatic new Freenode
+
+ * xD: started bumping the soft limit on file descriptors to the hard one
+
+
+1.3.0 (2021-08-07) "New World Order"
+
+ * xC: made nick autocompletion offer recent speakers first
+
+ * All binaries have been renamed to something even sillier,
+   and all references in the source tree have been redacted;
+   this represents a major incompatible change for all plugins;
+   configuration and program data have to be adjusted manually
+
+
+1.2.0 (2021-07-08) "There Are Other Countries As Well"
+
+ * xC: added a /squery command for IRCnet
+
+ * xC: added trivial support for SASL EXTERNAL, enabled by adding "sasl"
+   to the respective server's "capabilities" list
+
+ * xC: now supporting IRCv3.2 capability negotiation, including CAP DEL
+
+ * xC: added support for IRCv3 chghost
+
+ * xC: /deop and /devoice without arguments will use the client's user
+
+ * xC: /set +=/-= now treats its argument as a string array
+
+ * xC: made "/help /command" work the same way as "/help command" does
+
+ * xC: /ban and /unban don't mangle extended bans anymore
+
+ * xC: joining new channels no longer switches to their buffer automatically
+   if the current input line isn't empty
+
+ * censor.lua: now stripping colours from censored messages;
+   their attributes are also configurable rather than always black on black
+
+
+1.1.0 (2020-10-31) "What Do You Mean By 'This Isn't Germany'?"
+
+ * xC: made fancy-prompt.lua work with libedit
+
+ * xD: fixed a regression with an unspecified "bind_host"
+
+ * Miscellaneous minor improvements
+
+
+1.0.0 (2020-10-29) "We're Finally There!"
+
+ * Coming with real manual pages instead of help2man-generated stubs
+
+ * xC: added support for more IRC colours and strike-through text (M-m x)
+
+ * xC: now tolerating all UTF-8 messages cut off by the server
+
+ * xC: disabled "behaviour.backlog_helper_strip_formatting" by default
+   since the relevant issue with ACS terminfo entries has been resolved
+
+ * xC: enabled word wrapping in the backlog by default
+
+ * xC: made the unread marker span the whole line, with a configurable
+   character; the previous behaviour can be obtained by setting it empty
+
+ * xC: fixed the prompt not showing back up after exiting a backlog helper
+   when an external event has provoked an attempt to change it
+
+ * xC: now watching fellow channel users' away status when the server
+   supports the away-notify capability; indicated by italicised nicknames
+
+ * xC: added a plugin to highlight prime numbers in incoming messages
+
+ * xD: make sure an unspecified "bind_host" binds to both IPv4 and IPv6
+
+ * xB: install plugins to /usr/share and look for them in XDG data dirs
+
+ * Miscellaneous little fixes
+
+
 0.9.8 (2020-09-02) "Yep, Still Using It"
 
- * degesch: fixed a crash and prompt attribute output in libedit 20191231-3.1,
+ * xC: fixed a crash and prompt attribute output in libedit 20191231-3.1,
    though users are officially discouraged from using this library
 
- * degesch: fixed Lua 5.4 build, so far the support is experimental
+ * xC: fixed Lua 5.4 build, so far the support is experimental
 
  * Miscellaneous little fixes
 
 
 0.9.7 (2018-10-21) "Business as Usual"
 
- * kike: fix wildcard handling in WHOIS
+ * xD: fix wildcard handling in WHOIS
 
- * kike: properly handle STATS without parametetrs
+ * xD: properly handle STATS without parametetrs
 
- * kike: abort earlier when an invalid mode character is detected while
+ * xD: abort earlier when an invalid mode character is detected while
    processing channel MODE messages
 
- * kike: do not send NICK notifications when the nickname doesn't really change
+ * xD: do not send NICK notifications when the nickname doesn't really change
 
- * kike: fix hostname string verification (only used for "server_name")
+ * xD: fix hostname string verification (only used for "server_name")
 
 
 0.9.6 (2018-06-22) "I've Been Sitting Here All This Time"
@@ -28,108 +131,108 @@
 
  * Fix LibreSSL compatibility
 
- * degesch: a second /disconnect cuts the connection by force
+ * xC: a second /disconnect cuts the connection by force
 
- * degesch: send a QUIT message to the IRC server on Ctrl-C
+ * xC: send a QUIT message to the IRC server on Ctrl-C
 
- * degesch: add a Slack plugin (even though the gateway's now defunct)
+ * xC: add a Slack plugin (even though the gateway's now defunct)
 
- * degesch: show an error message on log write failure
+ * xC: show an error message on log write failure
 
- * degesch: fix parsing of literal IPv6 addresses with port numbers
+ * xC: fix parsing of literal IPv6 addresses with port numbers
 
- * degesch: fix some error messages
+ * xC: fix some error messages
 
- * degesch: workaround a Readline bug in the fancy-prompt.lua plugin
+ * xC: workaround a Readline bug in the fancy-prompt.lua plugin
 
- * kike: fix two memory leaks
+ * xD: fix two memory leaks
 
- * kike: improve error handling for incoming connections
+ * xD: improve error handling for incoming connections
 
- * kike: disable TLS session reuse
+ * xD: disable TLS session reuse
 
 
 0.9.5 (2016-12-30) "It's Time"
 
  * Better support for the KILL command
 
- * degesch: export many more fields to the Lua API, add a prompt hook
+ * xC: export many more fields to the Lua API, add a prompt hook
 
- * degesch: show channel user count in the prompt
+ * xC: show channel user count in the prompt
 
- * degesch: allow hiding join/part messages and other noise (Meta-Shift-H)
+ * xC: allow hiding join/part messages and other noise (Meta-Shift-H)
 
- * degesch: allow autojoining channels with keys
+ * xC: allow autojoining channels with keys
 
- * degesch: rejoin channels with keys on reconnect
+ * xC: rejoin channels with keys on reconnect
 
- * degesch: make /query without arguments just open the buffer
+ * xC: make /query without arguments just open the buffer
 
- * degesch: add a censor plugin
+ * xC: add a censor plugin
 
- * degesch: die on configuration parse errors
+ * xC: die on configuration parse errors
 
- * degesch: request channel modes also on rejoin
+ * xC: request channel modes also on rejoin
 
- * degesch: don't show remembered channel modes on parted channels
+ * xC: don't show remembered channel modes on parted channels
 
- * degesch: fix highlight detection in colored text
+ * xC: fix highlight detection in colored text
 
- * degesch: fix CTCP handling for the real world and don't decode X-QUOTEs
+ * xC: fix CTCP handling for the real world and don't decode X-QUOTEs
 
- * degesch: add support for OpenSSL 1.1.0
+ * xC: add support for OpenSSL 1.1.0
 
 
 0.9.4 (2016-04-28) "Oops"
 
- * degesch: fix crash on characters invalid in Windows-1252
+ * xC: fix crash on characters invalid in Windows-1252
 
- * degesch: add an auto-rejoin plugin
+ * xC: add an auto-rejoin plugin
 
- * degesch: better date change messages with customizable formatting;
+ * xC: better date change messages with customizable formatting;
    now also used in the backlog, so it looks closer to regular output
 
- * ZyklonB: add a calc plugin providing a basic Scheme REPL
+ * xB: add a calc plugin providing a basic Scheme REPL
 
- * ZyklonB: add a seen plugin
+ * xB: add a seen plugin
 
- * kike, ZyklonB: use pledge(2) on OpenBSD
+ * xD, xB: use pledge(2) on OpenBSD
 
 
 0.9.3 (2016-03-27) "Doesn't Even Suck"
 
  * Use TLS Server Name Indication when connecting to servers
 
- * degesch: now we erase the screen before displaying buffers
+ * xC: now we erase the screen before displaying buffers
 
- * degesch: implemented word wrapping in buffers
+ * xC: implemented word wrapping in buffers
 
- * degesch: added autocomplete for /topic
+ * xC: added autocomplete for /topic
 
- * degesch: Lua API was improved and extended
+ * xC: Lua API was improved and extended
 
- * degesch: added a basic last.fm "now playing" plugin
+ * xC: added a basic last.fm "now playing" plugin
 
- * degesch: backlog limit was made configurable
+ * xC: backlog limit was made configurable
 
- * degesch: allow changing the list of IRC capabilities to use if available
+ * xC: allow changing the list of IRC capabilities to use if available
 
- * degesch: optimize buffer memory usage
+ * xC: optimize buffer memory usage
 
- * degesch: added logging of messages sent from /quote and plugins
+ * xC: added logging of messages sent from /quote and plugins
 
- * degesch: M-! and M-a to go to the next buffer in order with
-   a highlight or new activity respectively
+ * xC: M-! and M-a to go to the next buffer in order with a highlight
+   or new activity respectively
 
- * degesch: added --format for previewing things like MOTD files
+ * xC: added --format for previewing things like MOTD files
 
- * degesch: added /buffer goto supporting case insensitive partial matches
+ * xC: added /buffer goto supporting case insensitive partial matches
 
- * kike: add support for IRCv3.2 server-time
+ * xD: add support for IRCv3.2 server-time
 
- * ZyklonB: plugins now run in a dedicated data directory
+ * xB: plugins now run in a dedicated data directory
 
- * ZyklonB: added a factoids plugin
+ * xB: added a factoids plugin
 
  * Remote addresses are now resolved asynchronously
 
@@ -138,28 +241,28 @@
 
 0.9.2 (2015-12-31)
 
- * degesch: added rudimentary support for Lua scripting
+ * xC: added rudimentary support for Lua scripting
 
- * degesch: added detection of pasting, so that it doesn't trigger other
+ * xC: added detection of pasting, so that it doesn't trigger other
    keyboard shortcuts, such as for autocomplete
 
- * degesch: added auto-away capability
+ * xC: added auto-away capability
 
- * degesch: added an /oper command
+ * xC: added an /oper command
 
- * degesch: libedit backend works again
+ * xC: libedit backend works again
  
- * degesch: added capability to edit the input line using VISUAL/EDITOR
+ * xC: added capability to edit the input line using VISUAL/EDITOR
 
- * degesch: added Meta-Tab to switch to the last used buffer
+ * xC: added Meta-Tab to switch to the last used buffer
 
- * degesch: correctly respond to stopping and resuming (SIGTSTP)
+ * xC: correctly respond to stopping and resuming (SIGTSTP)
 
- * degesch: fixed decoding of text formatting
+ * xC: fixed decoding of text formatting
 
- * degesch: unseen PMs now show up as highlights
+ * xC: unseen PMs now show up as highlights
 
- * degesch: various bugfixes
+ * xC: various bugfixes
 
 
 0.9.1 (2015-09-25)
@@ -170,23 +273,23 @@
 
  * Pulled in kqueue support
 
- * degesch: added backlog/scrollback functionality using less(1)
+ * xC: added backlog/scrollback functionality using less(1)
 
- * degesch: made showing the entire set of channel mode user prefixes optional
+ * xC: made showing the entire set of channel mode user prefixes optional
 
- * degesch: nicknames in /names are now ordered
+ * xC: nicknames in /names are now ordered
 
- * degesch: nicknames now use the 256-color terminal palette if available
+ * xC: nicknames now use the 256-color terminal palette if available
 
- * degesch: now we skip entries in the "addresses" list that can't be resolved
+ * xC: now we skip entries in the "addresses" list that can't be resolved
    to an address, along with displaying a more helpful message
 
- * degesch: joins, parts, nick changes and quits don't count as new buffer
+ * xC: joins, parts, nick changes and quits don't count as new buffer
    activity anymore
 
- * degesch: added Meta-H to open the full log file
+ * xC: added Meta-H to open the full log file
 
- * degesch: various bugfixes and little improvements
+ * xC: various bugfixes and little improvements
 
 
 0.9.0 (2015-07-23)

README.adoc

@@ -1,35 +1,34 @@
 uirc3
 =====
-:compact-option:
 
-The [line-through]#unethical# edgy IRC trinity.  This project consists of an
-experimental IRC client, daemon, and bot.  It's all you're ever going to need
-for chatting, as long as you can make do with minimalist software.
+The unreasonable IRC trinity.  This project consists of an IRC client, daemon,
+and bot.  It's all you're ever going to need for chatting, as long as you can
+make do with minimalist software.
 
-All of them have these potentially interesting properties:
+They have these potentially interesting properties:
 
- - IPv6 support
- - TLS support, including client certificates
- - lean on dependencies (with the exception of 'degesch')
+ - supporting IRCv3, SOCKS, IPv6, TLS (including client certificates)
+ - lean on dependencies
  - compact and arguably easy to hack on
- - very permissive license
+ - maximally permissive license
 
-degesch
--------
+xC
+--
 The IRC client.  It is largely defined by being built on top of GNU Readline
 that has been hacked to death.  Its interface should feel somewhat familiar for
 weechat or irssi users.
 
-image::degesch.png[align="center"]
+image::xC.png[align="center"]
 
-This is the largest application within the project.  It has most of the stuff
-you'd expect of an IRC client, such as being able to set up multiple servers,
-a powerful configuration system, integrated help, text formatting, CTCP queries,
-automatic splitting of overlong messages, autocomplete, logging to file,
-auto-away, command aliases and basic support for Lua scripting.
+This is the core of the project.  It has most of the stuff you'd expect of
+an IRC client, such as being multiserver, a powerful configuration system,
+integrated help, text formatting, automatic splitting of overlong messages,
+multiline editing, bracketed paste support, decent word wrapping, autocomplete,
+logging, CTCP queries, auto-away, command aliases, and basic support for Lua
+scripting.  As a unique bonus, you can launch a full text editor from within.
 
-kike
-----
+xD
+--
 The IRC daemon.  It is designed to be used as a regular user application rather
 than a system-wide daemon.  If all you want is a decent, minimal IRCd for
 testing purposes or a small network of respectful users (or bots), this one will
@@ -37,10 +36,8 @@ do it just fine.
 
 Notable features:
 
- - TLS autodetection (why doesn't everyone have this?), using secure defaults
+ - TLS autodetection (I'm still wondering why everyone doesn't have this)
  - IRCop authentication via TLS client certificates
- - epoll/kqueue support; this means that it should be able to handle quite
-   a number of concurrent user connections
  - partial IRCv3 support
 
 Not supported:
@@ -48,7 +45,7 @@ Not supported:
  - server linking (which also means no services); I consider existing protocols
    for this purpose ugly and tricky to implement correctly; I've also found no
    use for this feature yet
- - online changes to configuration; the configuration system from degesch could
+ - online changes to configuration; the configuration system from 'xC' could
    be used to implement this feature if needed
  - limits of almost any kind, just connections and mode `+l`
 
@@ -56,18 +53,16 @@ This program has been
 https://git.janouch.name/p/haven/src/branch/master/hid[ported to Go],
 and development continues over there.
 
-ZyklonB
--------
-The IRC bot.  It builds upon the concept of my other VitaminA IRC bot.  The main
-characteristic of these two bots is that they run plugins as coprocesses, which
-allows for enhanced reliability and programming language freedom.
+xB
+--
+The IRC bot.  While originally intended to be a simple rewrite of my old GNU AWK
+bot in C, it fairly quickly became a playground, and it eventually got me into
+writing the rest of this package.
 
-While originally intended to be a simple rewrite of the original AWK bot in C,
-it fairly quickly became a playground, and it eventually got me into writing
-the rest of the package.
-
-It survives crashes, server disconnects and timeouts, and also has native SOCKS
-support (even though socksify can add that easily to any program).
+Its main characteristic is that it runs plugins as coprocesses, allowing for
+enhanced reliability and programming language freedom.  Moreover, it recovers
+from any crashes, and offers native SOCKS support (even though socksify can add
+that easily to any program).
 
 Packages
 --------
@@ -76,10 +71,10 @@ a package with the latest development version from Archlinux's AUR.
 
 Building
 --------
-Build dependencies: CMake, pkg-config, help2man, awk, sh, liberty (included) +
+Build dependencies: CMake, pkg-config, asciidoctor, awk, liberty (included) +
 Runtime dependencies: openssl +
-Additionally for degesch: curses, libffi, lua >= 5.3 (optional),
-                          readline >= 6.0 or libedit >= 2013-07-12
+Additionally for 'xC': curses, libffi, lua >= 5.3 (optional),
+                       readline >= 6.0 or libedit >= 2013-07-12
 
 Avoid libedit if you can, in general it works but at the moment history is
 acting up and I have no clue about fixing it.
@@ -87,7 +82,7 @@ acting up and I have no clue about fixing it.
  $ git clone --recursive https://git.janouch.name/p/uirc3.git
  $ mkdir uirc3/build
  $ cd uirc3/build
- $ cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Debug \
+ $ cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo \
             -DWANT_READLINE=ON -DWANT_LIBEDIT=OFF -DWANT_LUA=ON
  $ make
 
@@ -95,51 +90,56 @@ To install the application, you can do either the usual:
 
  # make install
 
-Or you can try telling CMake to make a package for you.  For Debian it is:
+Or you can try telling CMake to make a package for you:
 
- $ cpack -G DEB
+ $ cpack -G DEB  # also supported: RPM, FreeBSD
  # dpkg -i uirc3-*.deb
 
 Usage
 -----
-'degesch' has in-program configuration.  Just run it and read the instructions.
+'xC' has in-program configuration.  Just run it and read the instructions.
+Consult its link:xC.adoc[man page] for details about the interface.
 
 For the rest you might want to generate a configuration file:
 
- $ zyklonb --write-default-config
- $ kike --write-default-config
+ $ xB --write-default-config
+ $ xD --write-default-config
 
 After making any necessary edits to the file (there are comments to aid you in
 doing that), simply run the appropriate program with no arguments:
 
- $ zyklonb
- $ kike
+ $ xB
+ $ xD
 
-'ZyklonB' stays running in the foreground, therefore I recommend launching it
-inside a Screen or tmux session.
+'xB' stays running in the foreground, therefore I recommend launching it inside
+a Screen or tmux session.
 
-'kike', on the other hand, immediately forks into the background.  Use the PID
+'xD', on the other hand, immediately forks into the background.  Use the PID
 file or something like `killall` if you want to terminate it.  You can run it
 as a `forking` type systemd user service.
 
 Client Certificates
 -------------------
-'kike' uses SHA1 fingerprints of TLS client certificates to authenticate users.
+'xC' will use the SASL EXTERNAL method to authenticate using the TLS client
+certificate specified by the respective server's `tls_cert` option if you add
+`sasl` to the `capabilities` option and the server supports this.
+
+'xD' uses SHA-1 fingerprints of TLS client certificates to authenticate users.
 To get the fingerprint from a certificate file in the required form, use:
 
  $ openssl x509 -in public.pem -outform DER | sha1sum
 
-Custom Key Bindings in degesch
-------------------------------
-The default and preferred frontend used in 'degesch' is GNU Readline.  This
-means that you can change your bindings by editing '~/.inputrc'.  For example:
+Custom Key Bindings in xC
+-------------------------
+The default and preferred frontend used in 'xC' is GNU Readline.  This means
+that you can change your bindings by editing '~/.inputrc'.  For example:
 
 ....
 # Preload with system-wide settings
 $include /etc/inputrc
 
 # Make M-left and M-right reorder buffers
-$if degesch
+$if xC
 "\e\e[C": move-buffer-right
 "\e\e[D": move-buffer-left
 $endif
@@ -149,23 +149,22 @@ Consult the source code and the GNU Readline manual for a list of available
 functions.  Also refer to the latter for the exact syntax of this file.
 Beware that you can easily break the program if you're not careful.
 
-How do I make degesch look like the screenshot?
------------------------------------------------
-First of all, you must build it with Lua support.  With the defaults, degesch
-doesn't look very fancy because some things are rather hackish, and I also don't
-want to depend on UTF-8 or 256color terminals in the code.  In addition to that,
-I appear to be one of the few people who use black on white terminals.
+How do I make xC look like the screenshot?
+------------------------------------------
+First of all, you must build it with Lua support.  With the defaults, 'xC'
+doesn't look too fancy because I don't want to depend on Lua or 256-colour
+terminals.  In addition to that, I appear to be one of the few people who use
+black on white terminals.
 
  /set behaviour.date_change_line = "%a %e %b %Y"
- /set behaviour.plugin_autoload += "fancy-prompt.lua,thin-cursor.lua"
- /set behaviour.backlog_helper = "LESSSECURE=1 less -R +Gb -Ps'Backlog ?ltlines %lt-%lb?L/%L. .?e(END):?pB%pB\\%..'"
- /set behaviour.backlog_helper_strip_formatting = off
- /set attributes.reset = "\x1b[0m"
+ /set behaviour.plugin_autoload += "fancy-prompt.lua"
+ /set behaviour.backlog_helper = "LESSSECURE=1 less -R +Gb1d -Ps'Backlog ?ltlines %lt-%lb?L/%L. .?e(END):?pB%pB\\%..'"
  /set attributes.userhost = "\x1b[38;5;109m"
  /set attributes.join = "\x1b[38;5;108m"
  /set attributes.part = "\x1b[38;5;138m"
  /set attributes.external = "\x1b[38;5;248m"
  /set attributes.timestamp = "\x1b[48;5;255m\x1b[38;5;250m"
+ /set attributes.read_marker = "\x1b[38;5;202m"
 
 Configuration profiles
 ----------------------
@@ -191,5 +190,5 @@ License
 This software is released under the terms of the 0BSD license, the text of which
 is included within the package along with the list of authors.
 
-Note that 'degesch' technically becomes GPL-licensed when you statically link it
-against GNU Readline, but that is not a concern of this source package.
+Note that 'xC' becomes GPL-licensed when you link it against GNU Readline,
+but that is not a concern of this source package.  The licenses are compatible.

common.c

@@ -1,7 +1,7 @@
 /*
  * common.c: common functionality
  *
- * Copyright (c) 2014 - 2015, Přemysl Eric Janouch <p@janouch.name>
+ * Copyright (c) 2014 - 2020, Přemysl Eric Janouch <p@janouch.name>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted.
@@ -22,11 +22,11 @@
 #define LIBERTY_WANT_PROTO_IRC
 
 #ifdef WANT_SYSLOG_LOGGING
-	#define print_fatal_data    ((void *) LOG_ERR)
-	#define print_error_data    ((void *) LOG_ERR)
-	#define print_warning_data  ((void *) LOG_WARNING)
-	#define print_status_data   ((void *) LOG_INFO)
-	#define print_debug_data    ((void *) LOG_DEBUG)
+#define print_fatal_data    ((void *) LOG_ERR)
+#define print_error_data    ((void *) LOG_ERR)
+#define print_warning_data  ((void *) LOG_WARNING)
+#define print_status_data   ((void *) LOG_INFO)
+#define print_debug_data    ((void *) LOG_DEBUG)
 #endif // WANT_SYSLOG_LOGGING
 
 #include "liberty/liberty.c"
@@ -50,11 +50,28 @@ init_openssl (void)
 
 // --- To be moved to liberty --------------------------------------------------
 
-static void
-cstr_set (char **s, char *new)
+// FIXME: in xssl_get_error() we rely on error reasons never being NULL (i.e.,
+//   all loaded), which isn't very robust.
+// TODO: check all places where this is used and see if we couldn't gain better
+//   information by piecing together some other subset of data from the error
+//   stack.  Most often, this is used in an error_set() context, which would
+//   allow us to allocate memory instead of returning static strings.
+static const char *
+xerr_describe_error (void)
 {
-	free (*s);
-	*s = new;
+	unsigned long err = ERR_get_error ();
+	if (!err)
+		return "undefined error";
+
+	const char *reason = ERR_reason_error_string (err);
+	do
+		// Not thread-safe, not a concern right now--need a buffer
+		print_debug ("%s", ERR_error_string (err, NULL));
+	while ((err = ERR_get_error ()));
+
+	if (!reason)
+		return "cannot retrieve error description";
+	return reason;
 }
 
 static ssize_t
@@ -70,60 +87,15 @@ static time_t
 unixtime_msec (long *msec)
 {
 #ifdef _POSIX_TIMERS
-        struct timespec tp;
-        hard_assert (clock_gettime (CLOCK_REALTIME, &tp) != -1);
-        *msec = tp.tv_nsec / 1000000;
+	struct timespec tp;
+	hard_assert (clock_gettime (CLOCK_REALTIME, &tp) != -1);
+	*msec = tp.tv_nsec / 1000000;
 #else // ! _POSIX_TIMERS
-        struct timeval tp;
-        hard_assert (gettimeofday (&tp, NULL) != -1);
-        *msec = tp.tv_usec / 1000;
+	struct timeval tp;
+	hard_assert (gettimeofday (&tp, NULL) != -1);
+	*msec = tp.tv_usec / 1000;
 #endif // ! _POSIX_TIMERS
-        return tp.tv_sec;
-}
-
-/// This differs from the non-unique version in that we expect the filename
-/// to be something like a pattern for mkstemp(), so the resulting path can
-/// reside in a system-wide directory with no risk of a conflict.
-static char *
-resolve_relative_runtime_unique_filename (const char *filename)
-{
-	const char *runtime_dir = getenv ("XDG_RUNTIME_DIR");
-	const char *tmpdir = getenv ("TMPDIR");
-
-	struct str path = str_make ();
-	if (runtime_dir && *runtime_dir == '/')
-		str_append (&path, runtime_dir);
-	else if (tmpdir && *tmpdir == '/')
-		str_append (&path, tmpdir);
-	else
-		str_append (&path, "/tmp");
-	str_append_printf (&path, "/%s/%s", PROGRAM_NAME, filename);
-
-	// Try to create the file's ancestors;
-	// typically the user will want to immediately create a file in there
-	const char *last_slash = strrchr (path.str, '/');
-	if (last_slash && last_slash != path.str)
-	{
-		char *copy = xstrndup (path.str, last_slash - path.str);
-		(void) mkdir_with_parents (copy, NULL);
-		free (copy);
-	}
-	return str_steal (&path);
-}
-
-static bool
-xwrite (int fd, const char *data, size_t len, struct error **e)
-{
-	size_t written = 0;
-	while (written < len)
-	{
-		ssize_t res = write (fd, data + written, len - written);
-		if (res >= 0)
-			written += res;
-		else if (errno != EINTR)
-			return error_set (e, "%s", strerror (errno));
-	}
-	return true;
+	return tp.tv_sec;
 }
 
 // --- Logging -----------------------------------------------------------------

config.h.in

@@ -2,7 +2,6 @@
 #define CONFIG_H
 
 #define PROGRAM_VERSION "${project_version}"
-#define ZYKLONB_PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/${zyklonb_plugin_dir}"
 
 #cmakedefine HAVE_READLINE
 #cmakedefine HAVE_EDITLINE

plugins/xB/calc

@@ -1,6 +1,6 @@
 #!/usr/bin/env guile
 
-  ZyklonB calc plugin, basic Scheme evaluator
+  xB calc plugin, basic Scheme evaluator
 
   Copyright 2016 Přemysl Eric Janouch
   See the file LICENSE for licensing information.
@@ -77,7 +77,7 @@
         (substring line 0 (- len 1)) line))))
 
 (define (get-config name)
-  (send "ZYKLONB get_config :" name)
+  (send "XB get_config :" name)
   (car (message-params (parse-message (get-line-crlf irc-input-port)))))
 
 (define (extract-nick prefix)
@@ -216,7 +216,7 @@
 ; --- Main loop ----------------------------------------------------------------
 
 (define prefix (get-config "prefix"))
-(send "ZYKLONB register")
+(send "XB register")
 
 (define (process msg)
   (when (string-ci=? (message-command msg) "PRIVMSG")

plugins/xB/coin

@@ -1,6 +1,6 @@
 #!/usr/bin/env tclsh
 #
-# ZyklonB coin plugin, random number-based utilities
+# xB coin plugin, random number-based utilities
 #
 # Copyright 2012, 2014 Přemysl Eric Janouch
 # See the file LICENSE for licensing information.
@@ -37,7 +37,7 @@ proc parse {line} {
 
 proc get_config {key} {
 	global msg
-	puts "ZYKLONB get_config :$key"
+	puts "XB get_config :$key"
 	gets stdin line
 	parse $line
 	return [lindex $msg(param) 0]
@@ -53,7 +53,7 @@ fconfigure stdin -translation crlf -encoding iso8859-1
 fconfigure stdout -translation crlf -encoding iso8859-1
 
 set prefix [get_config prefix]
-puts "ZYKLONB register"
+puts "XB register"
 
 set eightball [list \
 	"It is certain" \

plugins/xB/eval

@@ -1,6 +1,6 @@
 #!/usr/bin/awk -f
 #
-# ZyklonB eval plugin, LISP-like expression evaluator
+# xB eval plugin, LISP-like expression evaluator
 #
 # Copyright 2013, 2014 Přemysl Eric Janouch
 # See the file LICENSE for licensing information.
@@ -15,7 +15,7 @@ BEGIN \
 
 	prefix = get_config("prefix")
 
-	print "ZYKLONB register"
+	print "XB register"
 	fflush("")
 
 	# All functions have to be in this particular array
@@ -258,7 +258,7 @@ function process_end ()
 
 function get_config (key)
 {
-	print "ZYKLONB get_config :" key
+	print "XB get_config :" key
 	fflush("")
 
 	getline

plugins/xB/factoids

@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# ZyklonB factoids plugin
+# xB factoids plugin
 #
 # Copyright 2016 Přemysl Eric Janouch <p@janouch.name>
 # See the file LICENSE for licensing information.
@@ -24,18 +24,18 @@ sub parse ($) {
 }
 
 sub bot_print {
-	print "ZYKLONB print :${\shift}";
+	print "XB print :${\shift}";
 }
 
 # --- Initialization -----------------------------------------------------------
 
 my %config;
 for my $name (qw(prefix)) {
-	print "ZYKLONB get_config :$name";
+	print "XB get_config :$name";
 	$config{$name} = (parse <STDIN>)->{args}->[0];
 }
 
-print "ZYKLONB register";
+print "XB register";
 
 # --- Database -----------------------------------------------------------------
 # Simple map of (factoid_name => [definitions]); all factoids are separated

plugins/xB/pomodoro

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # coding: utf-8
 #
-# ZyklonB pomodoro plugin
+# xB pomodoro plugin
 #
 # Copyright 2015 Přemysl Eric Janouch
 # See the file LICENSE for licensing information.
@@ -206,7 +206,7 @@ def parse (line)
 end
 
 def bot_print (what)
-	print "ZYKLONB print :#{what}"
+	print "XB print :#{what}"
 end
 
 # --- Initialization -----------------------------------------------------------
@@ -215,12 +215,12 @@ end
 # To read it from anywhere else, it has to be done asynchronously
 $config = {}
 [:prefix].each do |name|
-	print "ZYKLONB get_config :#{name}"
+	print "XB get_config :#{name}"
 	_, _, _, _, args = *parse($stdin.gets.chomp)
 	$config[name] = args[0]
 end
 
-print "ZYKLONB register"
+print "XB register"
 
 # --- Plugin logic -------------------------------------------------------------
 

plugins/xB/script

@@ -1,6 +1,6 @@
 #!/usr/bin/tcc -run -lm
 //
-// ZyklonB scripting plugin, using a custom stack-based language
+// xB scripting plugin, using a custom stack-based language
 //
 // Copyright 2014 Přemysl Eric Janouch
 // See the file LICENSE for licensing information.
@@ -1964,12 +1964,12 @@ read_message (void)
 
 // --- Interfacing with the bot ------------------------------------------------
 
-#define BOT_PRINT "ZYKLONB print :script: "
+#define BOT_PRINT "XB print :script: "
 
 static const char *
 get_config (const char *key)
 {
-	printf ("ZYKLONB get_config :%s\r\n", key);
+	printf ("XB get_config :%s\r\n", key);
 	struct message *msg = read_message ();
 	if (!msg || msg->n_params <= 0)
 		exit (EXIT_FAILURE);
@@ -2298,7 +2298,7 @@ main (int argc, char *argv[])
 		printf (BOT_PRINT "%s\r\n", "runtime library initialization failed");
 
 	g_prefix = strdup (get_config ("prefix"));
-	printf ("ZYKLONB register\r\n");
+	printf ("XB register\r\n");
 	struct message *msg;
 	while ((msg = read_message ()))
 		process_message (msg);

plugins/xB/seen

@@ -1,6 +1,6 @@
 #!/usr/bin/env lua
 --
--- ZyklonB seen plugin
+-- xB seen plugin
 --
 -- Copyright 2016 Přemysl Eric Janouch <p@janouch.name>
 -- See the file LICENSE for licensing information.
@@ -26,7 +26,7 @@ function parse (line)
 end
 
 function get_config (name)
-	io.write ("ZYKLONB get_config :", name, "\r\n")
+	io.write ("XB get_config :", name, "\r\n")
 	return parse (io.read ()).params[1]
 end
 
@@ -34,7 +34,7 @@ end
 
 io.output ():setvbuf ('line')
 local prefix = get_config ('prefix')
-io.write ("ZYKLONB register\r\n")
+io.write ("XB register\r\n")
 
 local db = {}
 local db_filename = "seen.db"

plugins/xB/seen-import-xC.pl

@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
-# Creates a database for the "seen" plugin from logs for degesch.
+# Creates a database for the "seen" plugin from logs for xC.
 # The results may not be completely accurate but are good for jumpstarting.
-# Usage: ./seen-import-degesch.pl LOG-FILE... > seen.db
+# Usage: ./seen-import-xC.pl LOG-FILE... > seen.db
 
 use strict;
 use warnings;

plugins/xB/youtube

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# ZyklonB YouTube plugin, displaying info about YouTube links
+# xB YouTube plugin, displaying info about YouTube links
 #
 # Copyright 2014 - 2015, Přemysl Eric Janouch <p@janouch.name>
 # See the file LICENSE for licensing information.
@@ -27,12 +27,12 @@ class Plugin:
 		return (nick, user, host, command, args)
 
 	def get_config (self, key):
-		print ("ZYKLONB get_config :%s" % key)
+		print ("XB get_config :%s" % key)
 		(_, _, _, _, args) = self.parse (sys.stdin.readline ())
 		return args[0]
 
 	def bot_print (self, what):
-		print ('ZYKLONB print :%s' % what)
+		print ('XB print :%s' % what)
 
 class YouTube (Plugin):
 	re_videos = [re.compile (x) for x in [
@@ -98,7 +98,7 @@ class YouTube (Plugin):
 		if self.youtube_api_key == "":
 			self.bot_print ("youtube: missing `youtube_api_key'")
 
-		print ("ZYKLONB register")
+		print ("XB register")
 
 		for line in sys.stdin:
 			self.process_line (line)

plugins/xC/auto-rejoin.lua

@@ -16,7 +16,7 @@
 --
 
 local timeout
-degesch.setup_config {
+xC.setup_config {
 	timeout = {
 		type = "integer",
 		comment = "auto rejoin timeout",
@@ -31,9 +31,9 @@ degesch.setup_config {
 	},
 }
 
-async, await = degesch.async, coroutine.yield
-degesch.hook_irc (function (hook, server, line)
-	local msg = degesch.parse (line)
+async, await = xC.async, coroutine.yield
+xC.hook_irc (function (hook, server, line)
+	local msg = xC.parse (line)
 	if msg.command ~= "KICK" then return line end
 
 	local who = msg.prefix:match ("^[^!]*")

plugins/xC/censor.lua

@@ -1,7 +1,7 @@
 --
 -- censor.lua: black out certain users' messages
 --
--- Copyright (c) 2016, Přemysl Eric Janouch <p@janouch.name>
+-- Copyright (c) 2016 - 2021, Přemysl Eric Janouch <p@janouch.name>
 --
 -- Permission to use, copy, modify, and/or distribute this software for any
 -- purpose with or without fee is hereby granted.
@@ -38,25 +38,42 @@ local read_masks = function (v)
 	end
 end
 
-degesch.setup_config {
+local quote
+xC.setup_config {
 	masks = {
 		type = "string_array",
 		default = "\"\"",
 		comment = "user masks (optionally \"/#channel\") to censor",
 		on_change = read_masks
 	},
+	quote = {
+		type = "string",
+		default = "\"\\x0301,01\"",
+		comment = "formatting prefix for censored messages",
+		on_change = function (v) quote = v end
+	},
 }
 
+local decolor = function (text)
+	local rebuilt, last = {""}, 1
+	for start in text:gmatch ('()\x03') do
+		table.insert (rebuilt, text:sub (last, start - 1))
+		local sub = text:sub (start + 1)
+		last = start + (sub:match ('^%d%d?,%d%d?()') or sub:match ('^%d?%d?()'))
+	end
+	return table.concat (rebuilt) .. text:sub (last)
+end
+
 local censor = function (line)
 	-- Taking a shortcut to avoid lengthy message reassembly
-	local start, text = line:match ("^(.- PRIVMSG .-:)(.*)$")
+	local start, text = line:match ("^(.- PRIVMSG .- :)(.*)$")
 	local ctcp, rest = text:match ("^(\x01%g+ )(.*)")
-	text = ctcp and ctcp .. "\x0301,01" .. rest or "\x0301,01" .. text
+	text = ctcp and ctcp .. quote .. decolor (rest) or quote .. decolor (text)
 	return start .. text
 end
 
-degesch.hook_irc (function (hook, server, line)
-	local msg = degesch.parse (line)
+xC.hook_irc (function (hook, server, line)
+	local msg = xC.parse (line)
 	if msg.command ~= "PRIVMSG" then return line end
 
 	local channel = msg.params[1]:lower ()

plugins/xC/fancy-prompt.lua

@@ -28,15 +28,15 @@
 -- background but to really fix that mode, we'd have to fully reimplement it
 -- since its alternative prompt very often gets overriden by accident anyway.
 
-degesch.hook_prompt (function (hook)
-	local current = degesch.current_buffer
+xC.hook_prompt (function (hook)
+	local current = xC.current_buffer
 	local chan = current.channel
 	local s = current.server
 
 	local bg_color = "255"
 	local current_n = 0
 	local active = ""
-	for i, buffer in ipairs (degesch.buffers) do
+	for i, buffer in ipairs (xC.buffers) do
 		if buffer == current then
 			current_n = i
 		elseif buffer.new_messages_count ~= buffer.new_unimportant_count then
@@ -61,15 +61,16 @@ degesch.hook_prompt (function (hook)
 	end
 	if current.hide_unimportant then x = x .. "<H>" end
 
-	local lines, cols = degesch.get_screen_size ()
+	local lines, cols = xC.get_screen_size ()
 	x = x .. " " .. active .. string.rep (" ", cols)
 
-	-- Readline seems to be broken and completely corrupts the prompt
-	-- (tested on 7.0.003 Archlinux, 7.0-5 Debian buster)
-	x = x:gsub("[\128-\255]", "?")
+	-- Readline 7.0.003 seems to be broken and completely corrupts the prompt.
+	-- However 8.0.004 seems to be fine with these, as is libedit 20191231-3.1.
+	--x = x:gsub("[\128-\255]", "?")
 
 	-- Cut off extra characters and apply formatting, including the hack.
-	-- Note that this doesn't count with full-width or zero-width characters.
+	-- FIXME: this doesn't count with full-width or zero-width characters.
+	--   We might want to export wcwidth() above term_from_utf8 somehow.
 	local overflow = utf8.offset (x, cols - 1)
 	if overflow then x = x:sub (1, overflow) end
 	x = "\x01\x1b[0;4;1;38;5;16m\x1b[48;5;" .. bg_color .. "m\x02" ..

plugins/xC/last-fm.lua

@@ -23,7 +23,7 @@ local cjson = require "cjson"
 
 -- Setup configuration to load last.fm API credentials from
 local user, api_key
-degesch.setup_config {
+xC.setup_config {
 	user    = {
 		type = "string",
 		comment = "last.fm username",
@@ -117,7 +117,7 @@ end
 local running
 
 -- Initiate a connection to last.fm servers
-async, await = degesch.async, coroutine.yield
+async, await = xC.async, coroutine.yield
 local make_request = function (buffer, action)
 	if not user or not api_key then
 		report_error (buffer, "configuration is incomplete")
@@ -159,7 +159,7 @@ local send_song = function (buffer)
 end
 
 -- Hook input to simulate new commands
-degesch.hook_input (function (hook, buffer, input)
+xC.hook_input (function (hook, buffer, input)
 	if input == "/np" then
 		make_request (buffer, function (np)
 			now_playing = np

plugins/xC/ping-timeout.lua

@@ -15,8 +15,8 @@
 -- CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 --
 
-degesch.hook_irc (function (hook, server, line)
-	local msg = degesch.parse (line)
+xC.hook_irc (function (hook, server, line)
+	local msg = xC.parse (line)
 	local start, timeout = line:match ("^(.* :Ping timeout:) (%d+) seconds$")
 	if msg.command ~= "QUIT" or not start then
 		return line

plugins/xC/prime.lua

@@ -0,0 +1,68 @@
+--
+-- prime.lua: highlight prime numbers in messages
+--
+-- Copyright (c) 2020, Přemysl Eric Janouch <p@janouch.name>
+--
+-- Permission to use, copy, modify, and/or distribute this software for any
+-- purpose with or without fee is hereby granted.
+--
+-- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+-- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+-- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+-- SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+-- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+-- OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+-- CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+--
+
+local smallest, highlight = 0, "\x1f"
+xC.setup_config {
+	smallest = {
+		type = "integer",
+		default = "0",
+		comment = "smallest number to scan for primality",
+		on_change = function (v) smallest = math.max (v, 2) end
+	},
+	highlight = {
+		type = "string",
+		default = "\"\\x1f\"",
+		comment = "the attribute to use for highlights",
+		on_change = function (v) highlight = v end
+	},
+}
+
+-- The prime test is actually very fast, so there is no DoS concern
+local do_intercolour = function (text)
+	return tostring (text:gsub ("%f[%w_]%d+", function (n)
+		if tonumber (n) < smallest then return nil end
+		for i = 2, n ^ (1 / 2) do if (n % i) == 0 then return nil end end
+		return highlight .. n .. highlight
+	end))
+end
+
+local do_interlink = function (text)
+	local rebuilt, last = {""}, 1
+	for start in text:gmatch ('()\x03') do
+		table.insert (rebuilt, do_intercolour (text:sub (last, start - 1)))
+		local sub = text:sub (start + 1)
+		last = start + (sub:match ('^%d%d?,%d%d?()') or sub:match ('^%d?%d?()'))
+		table.insert (rebuilt, text:sub (start, last - 1))
+	end
+	return table.concat (rebuilt) .. do_intercolour (text:sub (last))
+end
+
+local do_message = function (text)
+	local rebuilt, last = {""}, 1
+	for run, link, endpos in text:gmatch ('(.-)(%f[%g]https?://%g+)()') do
+		last = endpos
+		table.insert (rebuilt, do_interlink (run) .. link)
+	end
+	return table.concat (rebuilt) .. do_interlink (text:sub (last))
+end
+
+-- XXX: sadly it won't typically highlight primes in our own messages,
+-- unless IRCv3 echo-message is on
+xC.hook_irc (function (hook, server, line)
+	local start, message = line:match ("^(.- PRIVMSG .- :)(.*)$")
+	return message and start .. do_message (message) or line
+end)

plugins/xC/slack.lua

@@ -51,7 +51,7 @@ local load_emoji = function (extra)
 	for k, v in extra:gmatch "([^,]+) ([^,]+)" do emoji[k] = v end
 end
 
-degesch.setup_config {
+xC.setup_config {
 	servers = {
 		type = "string_array",
 		default = "\"\"",
@@ -74,8 +74,8 @@ degesch.setup_config {
 
 -- We can handle external messages about what we've supposedly sent just fine,
 -- so let's get rid of that "[username] some message sent from the web UI" crap
-degesch.hook_irc (function (hook, server, line)
-	local msg, us = degesch.parse (line), server.user
+xC.hook_irc (function (hook, server, line)
+	local msg, us = xC.parse (line), server.user
 	if not servers[server.name] or msg.command ~= "PRIVMSG" or not us
 		or msg.params[1]:lower () ~= us.nickname:lower () then return line end
 
@@ -88,10 +88,10 @@ degesch.hook_irc (function (hook, server, line)
 end)
 
 -- Unfuck emoji and :nick!nick@irc.tinyspeck.com MODE #channel +v nick : active
-degesch.hook_irc (function (hook, server, line)
+xC.hook_irc (function (hook, server, line)
 	if not servers[server.name] then return line end
 	if unemojify then
-		local start, text = line:match ("^(.- PRIVMSG .-:)(.*)$")
+		local start, text = line:match ("^(.- PRIVMSG .- :)(.*)$")
 		if start then return start .. text:gsub (":([a-z_]+):", function (name)
 			if emoji[name] then return emoji[name] end
 			return ":" .. name .. ":"
@@ -101,7 +101,7 @@ degesch.hook_irc (function (hook, server, line)
 end)
 
 -- The gateway simply ignores the NAMES command altogether
-degesch.hook_input (function (hook, buffer, input)
+xC.hook_input (function (hook, buffer, input)
 	if not buffer.channel or not servers[buffer.server.name]
 		or not input:match "^/names%s*$" then return input end
 
@@ -119,9 +119,9 @@ degesch.hook_input (function (hook, buffer, input)
 	buffer:log (names)
 end)
 
-degesch.hook_completion (function (hook, data, word)
-	local chan = degesch.current_buffer.channel
-	local server = degesch.current_buffer.server
+xC.hook_completion (function (hook, data, word)
+	local chan = xC.current_buffer.channel
+	local server = xC.current_buffer.server
 	if not chan or not servers[server.name] then return end
 
 	-- In /commands there is typically no desire at all to add the at sign

plugins/xC/utm-filter.lua

@@ -1,7 +1,7 @@
 --
--- utm-filter.lua: filter out Google Analytics bullshit from URLs
+-- utm-filter.lua: filter out Google Analytics bullshit etc. from URLs
 --
--- Copyright (c) 2015, Přemysl Eric Janouch <p@janouch.name>
+-- Copyright (c) 2015 - 2021, Přemysl Eric Janouch <p@janouch.name>
 --
 -- Permission to use, copy, modify, and/or distribute this software for any
 -- purpose with or without fee is hereby granted.
@@ -18,6 +18,7 @@
 -- A list of useless URL parameters that don't affect page function
 local banned = {
 	gclid        = 1,
+	fbclid       = 1,
 
 	utm_source   = 1,
 	utm_medium   = 1,
@@ -52,11 +53,11 @@ local do_text = function (text)
 	return text:gsub ('%f[%g]https?://%g+', do_single_url)
 end
 
-degesch.hook_irc (function (hook, server, line)
+xC.hook_irc (function (hook, server, line)
 	local start, message = line:match ("^(.* :)(.*)$")
 	return message and start .. do_text (message) or line
 end)
 
-degesch.hook_input (function (hook, buffer, input)
+xC.hook_input (function (hook, buffer, input)
 	return do_text (input)
 end)

test

@@ -1,14 +1,14 @@
 #!/usr/bin/expect -f
-# Very basic end-to-end testing for Travis CI
+# Very basic end-to-end testing for CI
 
 # Run the daemon to test against
-system ./kike --write-default-cfg
-spawn ./kike -d
+system ./xD --write-default-cfg
+spawn ./xD -d
 
 # 10 seconds is a bit too much
 set timeout 5
 
-spawn ./degesch
+spawn ./xC
 
 # Fuck this Tcl shit, I want the exit code
 expect_after {

test-nick-colors

@@ -0,0 +1,26 @@
+#!/bin/sh
+# Check whether the terminal colours filtered by our algorithm are legible
+export example=$(
+	tcc "-run -lm" - <<-END
+	#include <stddef.h>
+	#include <stdio.h>
+	#include <math.h>
+
+	#define N_ELEMENTS(a) (sizeof (a) / sizeof ((a)[0]))
+
+	$(perl -0777 -ne 'print $& if /^.*?\nfilter_color(?s:.*?)^}$/m' \
+		"$(dirname "$0")"/xC.c)
+
+	void main () {
+		size_t len = 0;
+		int *table = filter_color_cube_for_acceptable_nick_colors (&len);
+		for (size_t i = 0; i < len; i++)
+			printf ("<@\\x1b[38;5;%dmIRCuser\\x1b[m> I'm typing!\n", table[i]);
+	}
+	END
+)
+
+# Both should give acceptable results,
+# which results in a bad compromise that the main author himself needs
+xterm -bg black -fg white -e 'echo $example; cat' &
+xterm -bg white -fg black -e 'echo $example; cat' &

test-static

@@ -1,7 +1,7 @@
 #!/bin/sh
 # We don't use printf's percent notation with our custom logging mechanism,
 # so the compiler cannot check it for us like it usually does
-perl -n0777 - "$(dirname "$0")"/degesch.c <<-'END'
+perl -n0777 - "$(dirname "$0")"/xC.c <<-'END'
 	while (/\blog_[^ ]+\s*\([^"()]*"[^"]*%[^%][^"]*"/gm) {
 		my ($p, $m) = ($`, $&);
 		printf "$ARGV:%d: suspicious log format string: %s...\n",

xB.adoc

@@ -0,0 +1,104 @@
+xB(1)
+=====
+:doctype: manpage
+:manmanual: uirc3 Manual
+:mansource: uirc3 {release-version}
+
+Name
+----
+xB - modular IRC bot
+
+Synopsis
+--------
+*xB* [_OPTION_]...
+
+Description
+-----------
+*xB* is a modular IRC bot with a programming language-agnostic plugin
+architecture based on co-processes.
+
+Options
+-------
+*-d*, *--debug*::
+	Print more information to help debug various issues.
+
+*-h*, *--help*::
+	Display a help message and exit.
+
+*-V*, *--version*::
+	Output version information and exit.
+
+*--write-default-cfg*[**=**__PATH__]::
+	Write a configuration file with defaults, show its path and exit.
++
+The file will be appropriately commented.
+
+Commands
+--------
+The bot accepts the following commands when they either appear quoted by the
+*prefix* string on a channel or unquoted as a private message sent directly
+to the bot, on the condition that the sending user matches the *admin*
+regular expression or that it is left unset:
+
+*quote* [_message_]::
+	Forwards the message to the IRC server as-is.
+*quit* [_reason_]::
+	Quits the IRC server, with an optional reason string.
+*status*::
+	Sends back a report about its state and all loaded plugins.
+*load* _plugin_[, _plugin_]...::
+	Tries to load the given plugins.
+*unload* _plugin_[, _plugin_]...::
+	Tries to unload the given plugins.
+*reload* _plugin_[, _plugin_]...::
+	The same as *unload* immediately followed by *load*.
+
+Plugins
+-------
+Plugins communicate with the bot over their standard input and output streams
+using the IRC protocol.  (Caveat: the standard C library doesn't automatically
+flush FILE streams for pipes on newlines.)  A special *XB* command is introduced
+for RPC, with the following subcommands:
+
+*XB get_config* _key_::
+	Request the value of the given configuration option.  If no such option
+	exists, the value will be empty.  The response will be delivered in
+	the following format:
++
+```
+XB :value
+```
++
+This is particularly useful for retrieving the *prefix* string.
+
+*XB print* _message_::
+	Make the bot print the _message_ on its standard output.
+
+*XB register*::
+	Once a plugin issues this command, it will start receiving all of the bot's
+	incoming IRC traffic, which includes data from the initialization period.
+
+All other commands will be forwarded directly to the IRC server.
+
+Files
+-----
+*xB* follows the XDG Base Directory Specification.
+
+_~/.config/xB/xB.conf_::
+	The bot's configuration file.  Use the *--write-default-cfg* option
+	to create a new one for editing.
+
+_~/.local/share/xB/_::
+	The initial working directory for plugins, in which they may create private
+	databases or other files as needed.
+
+_~/.local/share/xB/plugins/_::
+_/usr/local/share/xB/plugins/_::
+_/usr/share/xB/plugins/_::
+	Plugins are searched for in these directories, in order, unless
+	the *plugin_dir* configuration option overrides this.
+
+Reporting bugs
+--------------
+Use https://git.janouch.name/p/uirc3 to report bugs, request features,
+or submit pull requests.

xB.c

@@ -1,7 +1,7 @@
 /*
- * zyklonb.c: the experimental IRC bot
+ * xB.c: a modular IRC bot
  *
- * Copyright (c) 2014 - 2016, Přemysl Eric Janouch <p@janouch.name>
+ * Copyright (c) 2014 - 2020, Přemysl Eric Janouch <p@janouch.name>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted.
@@ -17,8 +17,7 @@
  */
 
 #include "config.h"
-#define PROGRAM_NAME "ZyklonB"
-#define PLUGIN_DIR ZYKLONB_PLUGIN_DIR
+#define PROGRAM_NAME "xB"
 
 #include "common.c"
 
@@ -26,9 +25,9 @@
 
 static struct simple_config_item g_config_table[] =
 {
-	{ "nickname",        "ZyklonB",         "IRC nickname"                   },
+	{ "nickname",        "xB",              "IRC nickname"                   },
 	{ "username",        "bot",             "IRC user name"                  },
-	{ "realname",        "ZyklonB IRC bot", "IRC real name/e-mail"           },
+	{ "realname",        "xB IRC bot",      "IRC real name/e-mail"           },
 
 	{ "irc_host",        NULL,              "Address of the IRC server"      },
 	{ "irc_port",        "6667",            "Port of the IRC server"         },
@@ -49,7 +48,7 @@ static struct simple_config_item g_config_table[] =
 	{ "prefix",          ":",               "The prefix for bot commands"    },
 	{ "admin",           NULL,              "Host mask for administrators"   },
 	{ "plugins",         NULL,              "The plugins to load on startup" },
-	{ "plugin_dir",      PLUGIN_DIR,        "Where to search for plugins"    },
+	{ "plugin_dir",      NULL,              "Plugin search path override"    },
 	{ "recover",         "on",              "Whether to re-launch on crash"  },
 
 	{ NULL,              NULL,              NULL                             }
@@ -280,7 +279,7 @@ irc_send (struct bot_context *ctx, const char *format, ...)
 		if (SSL_write (ctx->ssl, str.str, str.len) != (int) str.len)
 		{
 			print_debug ("%s: %s: %s", __func__, "SSL_write",
-				ERR_error_string (ERR_get_error (), NULL));
+				xerr_describe_error ());
 			result = false;
 		}
 	}
@@ -320,13 +319,13 @@ irc_initialize_ca_set (SSL_CTX *ssl_ctx, const char *file, const char *path,
 
 		return error_set (e, "%s: %s",
 			"failed to set locations for the CA certificate bundle",
-			ERR_reason_error_string (ERR_get_error ()));
+			xerr_describe_error ());
 	}
 
 	if (!SSL_CTX_set_default_verify_paths (ssl_ctx))
 		return error_set (e, "%s: %s",
 			"couldn't load the default CA certificate bundle",
-			ERR_reason_error_string (ERR_get_error ()));
+			xerr_describe_error ());
 	return true;
 }
 
@@ -407,7 +406,7 @@ irc_initialize_tls (struct bot_context *ctx, struct error **e)
 		else if (!SSL_use_certificate_file (ctx->ssl, path, SSL_FILETYPE_PEM)
 			|| !SSL_use_PrivateKey_file (ctx->ssl, path, SSL_FILETYPE_PEM))
 			print_error ("%s: %s", "setting the TLS client certificate failed",
-				ERR_error_string (ERR_get_error (), NULL));
+				xerr_describe_error ());
 		free (path);
 	}
 
@@ -434,10 +433,8 @@ error_ssl_2:
 	SSL_CTX_free (ctx->ssl_ctx);
 	ctx->ssl_ctx = NULL;
 error_ssl_1:
-	// XXX: these error strings are really nasty; also there could be
-	//   multiple errors on the OpenSSL stack.
 	if (!error_info)
-		error_info = ERR_error_string (ERR_get_error (), NULL);
+		error_info = xerr_describe_error ();
 	return error_set (e, "%s: %s", "could not initialize TLS", error_info);
 }
 
@@ -738,7 +735,7 @@ setup_recovery_handler (struct bot_context *ctx, struct error **e)
 // --- Plugins -----------------------------------------------------------------
 
 /// The name of the special IRC command for interprocess communication
-static const char *plugin_ipc_command = "ZYKLONB";
+static const char *plugin_ipc_command = "XB";
 
 static struct plugin *
 plugin_find_by_pid (struct bot_context *ctx, pid_t pid)
@@ -1017,21 +1014,40 @@ is_valid_plugin_name (const char *name)
 	return true;
 }
 
+static char *
+plugin_resolve_relative_filename (const char *filename)
+{
+	struct strv paths = strv_make ();
+	get_xdg_data_dirs (&paths);
+	char *result = resolve_relative_filename_generic
+		(&paths, PROGRAM_NAME "/plugins/", filename);
+	strv_free (&paths);
+	return result;
+}
+
 static struct plugin *
 plugin_launch (struct bot_context *ctx, const char *name, struct error **e)
 {
+	char *path = NULL;
 	const char *plugin_dir = str_map_find (&ctx->config, "plugin_dir");
-	if (!plugin_dir)
+	if (plugin_dir)
 	{
-		error_set (e, "plugin directory not set");
-		return NULL;
+		// resolve_relative_filename_generic() won't accept relative paths,
+		// so just keep the old behaviour and expect the file to exist.
+		// We could use resolve_filename() on "plugin_dir" with paths=getcwd().
+		path = xstrdup_printf ("%s/%s", plugin_dir, name);
+	}
+	else if (!(path = plugin_resolve_relative_filename (name)))
+	{
+		error_set (e, "plugin not found");
+		goto fail_0;
 	}
 
 	int stdin_pipe[2];
 	if (pipe (stdin_pipe) == -1)
 	{
 		error_set (e, "%s: %s", "pipe", strerror (errno));
-		return NULL;
+		goto fail_0;
 	}
 
 	int stdout_pipe[2];
@@ -1081,7 +1097,7 @@ plugin_launch (struct bot_context *ctx, const char *name, struct error **e)
 		// Restore some of the signal handling
 		signal (SIGPIPE, SIG_DFL);
 
-		char *argv[] = { xstrdup_printf ("%s/%s", plugin_dir, name), NULL };
+		char *argv[] = { path, NULL };
 		execve (argv[0], argv, environ);
 
 		// We will collect the failure later via SIGCHLD
@@ -1091,6 +1107,7 @@ plugin_launch (struct bot_context *ctx, const char *name, struct error **e)
 	}
 
 	str_free (&work_dir);
+	free (path);
 
 	xclose (stdin_pipe[0]);
 	xclose (stdout_pipe[1]);
@@ -1110,6 +1127,8 @@ fail_2:
 fail_1:
 	xclose (stdin_pipe[0]);
 	xclose (stdin_pipe[1]);
+fail_0:
+	free (path);
 	return NULL;
 }
 
@@ -1841,7 +1860,7 @@ on_plugin_death (struct plugin *plugin, int status)
 	struct bot_context *ctx = plugin->ctx;
 
 	// TODO: callbacks on children death, so that we may tell the user
-	//       "plugin `name' died like a dirty jewish pig"; use `status'
+	//       "plugin `name' died"; use `status'
 	if (!plugin->is_zombie && WIFSIGNALED (status))
 	{
 		const char *notes = "";
@@ -1964,7 +1983,7 @@ main (int argc, char *argv[])
 	};
 
 	struct opt_handler oh =
-		opt_handler_make (argc, argv, opts, NULL, "Experimental IRC bot.");
+		opt_handler_make (argc, argv, opts, NULL, "Modular IRC bot.");
 
 	int c;
 	while ((c = opt_handler_get (&oh)) != -1)

xC.adoc

@@ -0,0 +1,127 @@
+xC(1)
+=====
+:doctype: manpage
+:manmanual: uirc3 Manual
+:mansource: uirc3 {release-version}
+
+Name
+----
+xC - terminal-based IRC client
+
+Synopsis
+--------
+*xC* [_OPTION_]...
+
+Description
+-----------
+*xC* is a scriptable IRC client for the command line.  On the first run it will
+welcome you with an introductory message.  Should you ever get lost, use the
+*/help* command to obtain more information on commands or options.
+
+Options
+-------
+*-f*, *--format*::
+	Format IRC text from the standard input, converting colour sequences and
+	other formatting marks to ANSI codes retrieved from the *terminfo*(5)
+	database:
++
+```
+printf '\x02bold\x02\n' | xC -f
+```
++
+This feature may be used to preview server MOTD files.
+
+*-h*, *--help*::
+	Display a help message and exit.
+
+*-V*, *--version*::
+	Output version information and exit.
+
+Key bindings
+------------
+Most key bindings are inherited from the frontend in use, which is either GNU
+Readline or BSD editline.  A few of them, however, are special to the IRC client
+or assume a different function.  This is a list of all local overrides and
+their respective function names:
+
+*M-p*::
+	Go up in history for this buffer (normally mapped to *C-p*).
+*M-n*::
+	Go down in history for this buffer (normally mapped to *C-n*).
+*C-p*, *F5*: *previous-buffer*::
+	Switch to the previous buffer in order.
+*C-n*, *F6*: *next-buffer*::
+	Switch to the next buffer in order.
+*M-TAB*: *switch-buffer*::
+	Switch to the last buffer, i.e., the one you were in before.
+*M-0*, *M-1*, ..., *M-9*: *goto-buffer*::
+	Go to the N-th buffer (normally sets a repeat counter).
+	Since there is no buffer number zero, *M-0* goes to the tenth one.
+*M-!*: *goto-highlight*::
+	Go to the first following buffer with an unseen highlight.
+*M-a*: *goto-activity*::
+	Go to the first following buffer with unseen activity.
+*PageUp*: *display-backlog*::
+	Show the in-memory backlog for this buffer in the backlog helper,
+	which is almost certainly the *less*(1) program.
+*M-h*: *display-full-log*::
+	Show the log file for this buffer in the backlog helper.
+*M-H*: *toggle-unimportant*::
+	Hide all join, part and quit messages, as well as all channel mode changes
+	that only relate to user channel modes.  Intended to reduce noise in
+	channels with lots of people.
+*M-e*: *edit-input*::
+	Run an editor on the command line, making it easy to edit multiline
+	messages.  Remember to save the file before exit.
+*M-m*: *insert-attribute*::
+	The next key will be interpreted as a formatting mark to insert:
+	*c* for colours (optionally followed by numbers for the foreground
+	and background), *i* for italics, *b* for bold text, *u* for underlined,
+	*x* for struck-through, *v* for inverse text and *o* resets all formatting.
+*C-l*: *redraw-screen*::
+	Should there be any issues with the display, this will clear the terminal
+	screen and redraw all information.
+
+Additionally, *C-w* and *C-u* in editline behave the same as they would in
+Readline or the "vi" command mode, even though the "emacs" mode is enabled
+by default.
+
+Bindings can be customized in your _.inputrc_ or _.editrc_ file.  Both libraries
+support conditional execution based on the program name.  Beware that it is easy
+to make breaking changes.
+
+Environment
+-----------
+*VISUAL*, *EDITOR*::
+	The editor program to be launched by the *edit-input* function.
+	If neither variable is set, it defaults to *vi*(1).
+
+Files
+-----
+*xC* follows the XDG Base Directory Specification.
+
+_~/.config/xC/xC.conf_::
+	The program's configuration file.  Preferrably use internal facilities, such
+	as the */set* command, to make changes in it.
+
+_~/.local/share/xC/logs/_::
+	When enabled by *behaviour.logging*, log files are stored here.
+
+_~/.local/share/xC/plugins/_::
+_/usr/local/share/xC/plugins/_::
+_/usr/share/xC/plugins/_::
+	Plugins are searched for in these directories, in order.
+
+Bugs
+----
+The editline (libedit) frontend is more of a proof of concept that mostly seems
+to work but exhibits bugs that are not our fault.
+
+Reporting bugs
+--------------
+Use https://git.janouch.name/p/uirc3 to report bugs, request features,
+or submit pull requests.
+
+See also
+--------
+*less*(1), *readline*(3) or *editline*(7)

xD-gen-replies.sh

@@ -2,7 +2,7 @@
 LC_ALL=C exec awk '
 	BEGIN {
 		# The message catalog is a by-product
-		msg = "kike.msg"
+		msg = "xD.msg"
 		print "$quote \"" > msg;
 		print "$set 1" > msg;
 	}

xD-replies

@@ -85,3 +85,9 @@
 482 IRC_ERR_CHANOPRIVSNEEDED "%s :You're not channel operator"
 501 IRC_ERR_UMODEUNKNOWNFLAG ":Unknown MODE flag"
 502 IRC_ERR_USERSDONTMATCH ":Cannot change mode for other users"
+902 IRC_ERR_NICKLOCKED ":You must use a nick assigned to you"
+903 IRC_RPL_SASLSUCCESS ":SASL authentication successful"
+904 IRC_ERR_SASLFAIL ":SASL authentication failed"
+905 IRC_ERR_SASLTOOLONG ":SASL message too long"
+906 IRC_ERR_SASLABORTED ":SASL authentication aborted"
+907 IRC_ERR_SASLALREADY ":You have already authenticated using SASL"

xD.adoc

@@ -0,0 +1,53 @@
+xD(1)
+=====
+:doctype: manpage
+:manmanual: uirc3 Manual
+:mansource: uirc3 {release-version}
+
+Name
+----
+xD - IRC daemon
+
+Synopsis
+--------
+*xD* [_OPTION_]...
+
+Description
+-----------
+*xD* is a basic IRC daemon for single-server networks, suitable for testing
+and private use.  When run without a configuration file, it will start listening
+on the standard port 6667 and the "any" address.
+
+Options
+-------
+*-d*, *--debug*::
+	Do not daemonize, print more information on the standard error stream
+	to help debug various issues.
+
+*-h*, *--help*::
+	Display a help message and exit.
+
+*-V*, *--version*::
+	Output version information and exit.
+
+*--write-default-cfg*[**=**__PATH__]::
+	Write a configuration file with defaults, show its path and exit.
++
+The file will be appropriately commented.
++
+When no _PATH_ is specified, it will be created in the user's home directory,
+contrary to what you might expect from a server.
+
+Files
+-----
+*xD* follows the XDG Base Directory Specification.
+
+_~/.config/xD/xD.conf_::
+_/etc/xdg/xD/xD.conf_::
+	The daemon's configuration file.  Use the *--write-default-cfg* option
+	to create a new one for editing.
+
+Reporting bugs
+--------------
+Use https://git.janouch.name/p/uirc3 to report bugs, request features,
+or submit pull requests.

xD.c

@@ -1,7 +1,7 @@
 /*
- * kike.c: the experimental IRC daemon
+ * xD.c: an IRC daemon
  *
- * Copyright (c) 2014 - 2018, Přemysl Eric Janouch <p@janouch.name>
+ * Copyright (c) 2014 - 2021, Přemysl Eric Janouch <p@janouch.name>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted.
@@ -17,12 +17,14 @@
  */
 
 #include "config.h"
-#define PROGRAM_NAME "kike"
+#define PROGRAM_NAME "xD"
 
 #define WANT_SYSLOG_LOGGING
 #include "common.c"
-#include "kike-replies.c"
+#include "xD-replies.c"
+
 #include <nl_types.h>
+#include <sys/resource.h>
 
 enum { PIPE_READ, PIPE_WRITE };
 
@@ -47,7 +49,7 @@ static struct simple_config_item g_config_table[] =
 	{ "tls_key",         NULL,              "Server TLS private key (PEM)"   },
 	{ "tls_ciphers",     DEFAULT_CIPHERS,   "OpenSSL cipher list"            },
 
-	{ "operators",       NULL,              "IRCop TLS cert. fingerprints"   },
+	{ "operators",       NULL, "IRCop TLS client cert. SHA-1 fingerprints"   },
 
 	{ "max_connections", "0",               "Global connection limit"        },
 	{ "ping_interval",   "180",             "Interval between PINGs (sec)"   },
@@ -614,7 +616,8 @@ struct server_context
 {
 	int *listen_fds;                    ///< Listening socket FD's
 	struct poller_fd *listen_events;    ///< New connections available
-	size_t n_listen_fds;                ///< Number of listening sockets
+	size_t listen_len;                  ///< Number of listening sockets
+	size_t listen_alloc;                ///< How many we've allocated
 
 	time_t started;                     ///< When has the server been started
 
@@ -695,7 +698,7 @@ server_context_free (struct server_context *self)
 {
 	str_map_free (&self->config);
 
-	for (size_t i = 0; i < self->n_listen_fds; i++)
+	for (size_t i = 0; i < self->listen_len; i++)
 	{
 		poller_fd_reset (&self->listen_events[i]);
 		xclose (self->listen_fds[i]);
@@ -746,12 +749,12 @@ irc_initiate_quit (struct server_context *ctx)
 {
 	print_status ("shutting down");
 
-	for (size_t i = 0; i < ctx->n_listen_fds; i++)
+	for (size_t i = 0; i < ctx->listen_len; i++)
 	{
 		poller_fd_reset (&ctx->listen_events[i]);
 		xclose (ctx->listen_fds[i]);
 	}
-	ctx->n_listen_fds = 0;
+	ctx->listen_len = 0;
 
 	for (struct client *iter = ctx->clients; iter; iter = iter->next)
 		if (!iter->closing_link)
@@ -3061,8 +3064,8 @@ irc_try_read (struct client *c)
 	while (true)
 	{
 		str_reserve (buf, 512);
-		n_read = recv (c->socket_fd, buf->str + buf->len,
-			buf->alloc - buf->len - 1 /* null byte */, 0);
+		n_read = read (c->socket_fd, buf->str + buf->len,
+			buf->alloc - buf->len - 1 /* null byte */);
 
 		if (n_read > 0)
 		{
@@ -3082,7 +3085,7 @@ irc_try_read (struct client *c)
 		if (errno == EINTR)
 			continue;
 
-		print_debug ("%s: %s: %s", __func__, "recv", strerror (errno));
+		print_debug ("%s: %s: %s", __func__, "read", strerror (errno));
 		client_kill (c, strerror (errno));
 		return false;
 	}
@@ -3137,7 +3140,7 @@ irc_try_write (struct client *c)
 
 	while (buf->len)
 	{
-		n_written = send (c->socket_fd, buf->str, buf->len, 0);
+		n_written = write (c->socket_fd, buf->str, buf->len);
 		if (n_written >= 0)
 		{
 			str_remove_slice (buf, 0, n_written);
@@ -3149,7 +3152,7 @@ irc_try_write (struct client *c)
 		if (errno == EINTR)
 			continue;
 
-		print_debug ("%s: %s: %s", __func__, "send", strerror (errno));
+		print_debug ("%s: %s: %s", __func__, "write", strerror (errno));
 		client_kill (c, strerror (errno));
 		return false;
 	}
@@ -3261,7 +3264,7 @@ error_ssl_3:
 	SSL_free (c->ssl);
 	c->ssl = NULL;
 error_ssl_2:
-	error_info = ERR_reason_error_string (ERR_get_error ());
+	error_info = xerr_describe_error ();
 error_ssl_1:
 	print_debug ("could not initialize TLS for %s: %s", c->address, error_info);
 	return false;
@@ -3540,7 +3543,7 @@ irc_initialize_ssl_ctx (struct server_context *ctx,
 	if (!ctx->ssl_ctx)
 	{
 		error_set (e, "%s: %s", "could not initialize TLS",
-			ERR_reason_error_string (ERR_get_error ()));
+			xerr_describe_error ());
 		return false;
 	}
 	SSL_CTX_set_verify (ctx->ssl_ctx,
@@ -3570,11 +3573,11 @@ irc_initialize_ssl_ctx (struct server_context *ctx,
 		error_set (e, "failed to select any cipher from the cipher list");
 	else if (!SSL_CTX_use_certificate_chain_file (ctx->ssl_ctx, cert_path))
 		error_set (e, "%s: %s", "setting the TLS certificate failed",
-			ERR_reason_error_string (ERR_get_error ()));
+			xerr_describe_error ());
 	else if (!SSL_CTX_use_PrivateKey_file
 		(ctx->ssl_ctx, key_path, SSL_FILETYPE_PEM))
 		error_set (e, "%s: %s", "setting the TLS private key failed",
-			ERR_reason_error_string (ERR_get_error ()));
+			xerr_describe_error ());
 	else
 		// TODO: SSL_CTX_check_private_key()?  It has probably already been
 		//   checked by SSL_CTX_use_PrivateKey_file() above.
@@ -3680,26 +3683,35 @@ irc_initialize_motd (struct server_context *ctx, struct error **e)
 	return true;
 }
 
+static bool
+irc_parse_config_unsigned (const char *name, const char *value, unsigned *out,
+	unsigned long min, unsigned long max, struct error **e)
+{
+	unsigned long ul;
+	hard_assert (value != NULL);
+	if (!xstrtoul (&ul, value, 10) || ul > max || ul < min)
+	{
+		error_set (e, "invalid configuration value for `%s': %s",
+			name, "the number is invalid or out of range");
+		return false;
+	}
+	*out = ul;
+	return true;
+}
+
 /// This function handles values that require validation before their first use,
 /// or some kind of a transformation (such as conversion to an integer) needs
 /// to be done before they can be used directly.
 static bool
 irc_parse_config (struct server_context *ctx, struct error **e)
 {
-	unsigned long ul;
 #define PARSE_UNSIGNED(name, min, max)                                         \
-	const char *name = str_map_find (&ctx->config, #name);                     \
-	hard_assert (name != NULL);                                                \
-	if (!xstrtoul (&ul, name, 10) || ul > max || ul < min)                     \
-	{                                                                          \
-		error_set (e, "invalid configuration value for `%s': %s",              \
-			#name, "the number is invalid or out of range");                   \
-		return false;                                                          \
-	}                                                                          \
-	ctx->name = ul
+	irc_parse_config_unsigned (#name, str_map_find (&ctx->config, #name),      \
+		&ctx->name, min, max, e)
 
-	PARSE_UNSIGNED (ping_interval,   1, UINT_MAX);
-	PARSE_UNSIGNED (max_connections, 0, UINT_MAX);
+	if (!PARSE_UNSIGNED (ping_interval,   1, UINT_MAX)
+	 || !PARSE_UNSIGNED (max_connections, 0, UINT_MAX))
+		return false;
 
 	bool result = true;
 	struct strv fingerprints = strv_make ();
@@ -3792,6 +3804,14 @@ irc_listen (struct addrinfo *gai_iter)
 	soft_assert (setsockopt (fd, SOL_SOCKET, SO_REUSEADDR,
 		&yes, sizeof yes) != -1);
 
+#if defined SOL_IPV6 && defined IPV6_V6ONLY
+	// Make NULL always bind to both IPv4 and IPv6, irrespectively of the order
+	// of results; only INADDR6_ANY seems to be affected by this
+	if (gai_iter->ai_family == AF_INET6)
+		soft_assert (setsockopt (fd, SOL_IPV6, IPV6_V6ONLY,
+			&yes, sizeof yes) != -1);
+#endif
+
 	char host[NI_MAXHOST], port[NI_MAXSERV];
 	host[0] = port[0] = '\0';
 	int err = getnameinfo (gai_iter->ai_addr, gai_iter->ai_addrlen,
@@ -3835,18 +3855,20 @@ irc_listen_resolve (struct server_context *ctx,
 	int fd;
 	for (gai_iter = gai_result; gai_iter; gai_iter = gai_iter->ai_next)
 	{
+		if (ctx->listen_len == ctx->listen_alloc)
+			break;
+
 		if ((fd = irc_listen (gai_iter)) == -1)
 			continue;
 		set_blocking (fd, false);
 
-		struct poller_fd *event = &ctx->listen_events[ctx->n_listen_fds];
+		struct poller_fd *event = &ctx->listen_events[ctx->listen_len];
 		*event = poller_fd_make (&ctx->poller, fd);
 		event->dispatcher = (poller_fd_fn) on_irc_client_available;
 		event->user_data = ctx;
 
-		ctx->listen_fds[ctx->n_listen_fds++] = fd;
+		ctx->listen_fds[ctx->listen_len++] = fd;
 		poller_fd_set (event, POLLIN);
-		break;
 	}
 	freeaddrinfo (gai_result);
 }
@@ -3866,13 +3888,20 @@ irc_setup_listen_fds (struct server_context *ctx, struct error **e)
 
 	struct strv ports = strv_make ();
 	cstr_split (bind_port, ",", true, &ports);
-	ctx->listen_fds = xcalloc (ports.len, sizeof *ctx->listen_fds);
-	ctx->listen_events = xcalloc (ports.len, sizeof *ctx->listen_events);
+
+	// For C and simplicity's sake let's assume that the host will resolve
+	// to at most two different addresses: IPv4 and IPv6 in case it is NULL
+	ctx->listen_alloc = ports.len * 2;
+
+	ctx->listen_fds =
+		xcalloc (ctx->listen_alloc, sizeof *ctx->listen_fds);
+	ctx->listen_events =
+		xcalloc (ctx->listen_alloc, sizeof *ctx->listen_events);
 	for (size_t i = 0; i < ports.len; i++)
 		irc_listen_resolve (ctx, bind_host, ports.vector[i], &gai_hints);
 	strv_free (&ports);
 
-	if (!ctx->n_listen_fds)
+	if (!ctx->listen_len)
 	{
 		error_set (e, "%s: %s",
 			"network setup failed", "no ports to listen on");
@@ -3957,6 +3986,21 @@ daemonize (struct server_context *ctx)
 	poller_post_fork (&ctx->poller);
 }
 
+static void
+setup_limits (void)
+{
+	struct rlimit limit;
+	if (getrlimit (RLIMIT_NOFILE, &limit))
+	{
+		print_warning ("%s: %s", "getrlimit", strerror (errno));
+		return;
+	}
+
+	limit.rlim_cur = limit.rlim_max;
+	if (setrlimit (RLIMIT_NOFILE, &limit))
+		print_warning ("%s: %s", "setrlimit", strerror (errno));
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -3975,7 +4019,7 @@ main (int argc, char *argv[])
 	};
 
 	struct opt_handler oh =
-		opt_handler_make (argc, argv, opts, NULL, "Experimental IRC daemon.");
+		opt_handler_make (argc, argv, opts, NULL, "IRC daemon.");
 
 	int c;
 	while ((c = opt_handler_get (&oh)) != -1)
@@ -4003,6 +4047,7 @@ main (int argc, char *argv[])
 
 	print_status (PROGRAM_NAME " " PROGRAM_VERSION " starting");
 	setup_signal_handlers ();
+	setup_limits ();
 	init_openssl ();
 
 	struct server_context ctx;