Bump version

Bugs unnoticed for so long.

.travis.yml

@@ -3,7 +3,7 @@ dist: trusty
 language: c
 notifications:
  irc:
-  channels: "anathema.irc.so#anathema"
+  channels: "irc.janouch.name#dev"
   use_notice: true
   skip_join: true
 env:
@@ -32,7 +32,7 @@ before_install:
  - sudo apt-get update -qq
 install:
  - sudo apt-get install -y libncursesw5-dev libreadline-dev libedit-dev
-   liblua5.3-dev help2man expect
+   liblua5.3-dev libffi-dev help2man expect
 before_script:
  - mkdir build
  - cd build

CMakeLists.txt

@@ -8,35 +8,79 @@ option (WANT_LIBEDIT "Use BSD libedit for the UI" OFF)
 # Moar warnings
 if ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUC)
 	# -Wunused-function is pretty annoying here, as everything is static
-	set (CMAKE_C_FLAGS "-std=c99 -Wall -Wextra -Wno-unused-function")
+	set (CMAKE_C_FLAGS
+		"${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra -Wno-unused-function")
 endif ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUC)
 
 # Version
-set (project_VERSION_MAJOR "0")
-set (project_VERSION_MINOR "9")
-set (project_VERSION_PATCH "2")
+set (project_version "0.9.5")
 
-set (project_VERSION "${project_VERSION_MAJOR}")
-set (project_VERSION "${project_VERSION}.${project_VERSION_MINOR}")
-set (project_VERSION "${project_VERSION}.${project_VERSION_PATCH}")
+# 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.
+find_package (Git)
+set (git_head "${PROJECT_SOURCE_DIR}/.git/HEAD")
+if (GIT_FOUND AND EXISTS "${git_head}")
+	configure_file ("${git_head}" git-head.tag COPYONLY)
+	file (READ "${git_head}" git_head_content)
+	if (git_head_content MATCHES "^ref: ([^\r\n]+)")
+		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]+)")
+
+	execute_process (COMMAND ${GIT_EXECUTABLE} describe --tags --match v*
+		WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+		RESULT_VARIABLE git_describe_result
+		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}")
+
+# Dashes make filenames confusing and upset packaging software
+string (REPLACE "-" "+" project_version_safe "${project_version}")
 
 # Dependencies
-find_package (Curses)
+set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/liberty/cmake)
+include (AddThreads)
+
 find_package (PkgConfig REQUIRED)
 pkg_check_modules (libssl REQUIRED libssl libcrypto)
-pkg_check_modules (ncursesw ncursesw)
+list (APPEND project_libraries ${libssl_LIBRARIES})
+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)
+	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")
 
-list (APPEND project_libraries ${libssl_LIBRARIES})
-include_directories (${libssl_INCLUDE_DIRS})
-link_directories (${libssl_LIBRARY_DIRS})
+# -lrt is only for glibc < 2.17
+# -liconv may or may not be a part of libc
+foreach (extra iconv rt)
+	find_library (extra_lib_${extra} ${extra})
+	if (extra_lib_${extra})
+		list (APPEND project_libraries ${extra_lib_${extra}})
+	endif (extra_lib_${extra})
+endforeach (extra)
+
+include (CheckCSourceRuns)
+set (CMAKE_REQUIRED_LIBRARIES ${project_libraries})
+get_property (CMAKE_REQUIRED_INCLUDES
+	DIRECTORY "${PROJECT_SOURCE_DIR}" PROPERTY INCLUDE_DIRECTORIES)
+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
+pkg_check_modules (libffi REQUIRED libffi)
+list (APPEND degesch_libraries ${libffi_LIBRARIES})
+include_directories (${libffi_INCLUDE_DIRS})
+link_directories (${libffi_LIBRARY_DIRS})
 
 # FIXME: other Lua versions may be acceptable, don't know yet
 pkg_search_module (lua lua53 lua5.3 lua-5.3 lua>=5.3)
@@ -47,26 +91,18 @@ if (WITH_LUA)
 		message (FATAL_ERROR "Lua library not found")
 	endif (NOT lua_FOUND)
 
-	list (APPEND project_libraries ${lua_LIBRARIES})
+	list (APPEND degesch_libraries ${lua_LIBRARIES})
 	include_directories (${lua_INCLUDE_DIRS})
 	link_directories (${lua_LIBRARY_DIRS})
 endif (WITH_LUA)
 
-# -lpthread is only there for debugging (gdb & errno)
-# -lrt is only for glibc < 2.17
-# -liconv may or may not be a part of libc
-foreach (extra iconv rt pthread)
-	find_library (extra_lib_${extra} ${extra})
-	if (extra_lib_${extra})
-		list (APPEND project_libraries ${extra})
-	endif (extra_lib_${extra})
-endforeach (extra)
-
+find_package (Curses)
+pkg_check_modules (ncursesw ncursesw)
 if (ncursesw_FOUND)
-	list (APPEND project_libraries ${ncursesw_LIBRARIES})
+	list (APPEND degesch_libraries ${ncursesw_LIBRARIES})
 	include_directories (${ncursesw_INCLUDE_DIRS})
 elseif (CURSES_FOUND)
-	list (APPEND project_libraries ${CURSES_LIBRARY})
+	list (APPEND degesch_libraries ${CURSES_LIBRARY})
 	include_directories (${CURSES_INCLUDE_DIR})
 else (CURSES_FOUND)
 	message (SEND_ERROR "Curses not found")
@@ -78,13 +114,13 @@ elseif (WANT_READLINE)
 	# OpenBSD's default readline is too old
 	if ("${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD")
 		include_directories (/usr/local/include/ereadline)
-		list (APPEND project_libraries ereadline)
+		list (APPEND degesch_libraries ereadline)
 	else ("${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD")
-		list (APPEND project_libraries readline)
+		list (APPEND degesch_libraries readline)
 	endif ("${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD")
 elseif (WANT_LIBEDIT)
 	pkg_check_modules (libedit REQUIRED libedit)
-	list (APPEND project_libraries ${libedit_LIBRARIES})
+	list (APPEND degesch_libraries ${libedit_LIBRARIES})
 	include_directories (${libedit_INCLUDE_DIRS})
 endif ((WANT_READLINE AND WANT_LIBEDIT) OR (NOT WANT_READLINE AND NOT WANT_LIBEDIT))
 
@@ -114,24 +150,31 @@ set_source_files_properties (${PROJECT_BINARY_DIR}/kike-replies.c
 # Build
 add_executable (zyklonb zyklonb.c ${common_sources} ${common_headers})
 target_link_libraries (zyklonb ${project_libraries})
+add_threads (zyklonb)
 
 add_executable (degesch degesch.c kike-replies.c
 	${common_sources} ${common_headers})
-target_link_libraries (degesch ${project_libraries})
+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)
 
 # 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})
-	set_target_properties (${test} PROPERTIES COMPILE_DEFINITIONS TESTING)
 endfunction (make_tests_for)
 
 include (CTest)
@@ -180,26 +223,26 @@ endforeach (page)
 add_custom_target (docs ALL DEPENDS ${project_MAN_PAGES})
 
 foreach (page ${project_MAN_PAGES})
-	string (REGEX MATCH "\\.([0-9])" manpage_suffix "${page}")
+	string (REGEX MATCH "\\.([0-9])$" manpage_suffix "${page}")
 	install (FILES "${page}"
 		DESTINATION "${CMAKE_INSTALL_MANDIR}/man${CMAKE_MATCH_1}")
 endforeach (page)
 
 # CPack
 set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Experimental IRC client, daemon and bot")
-set (CPACK_PACKAGE_VERSION ${project_VERSION})
+set (CPACK_PACKAGE_VERSION "${project_version_safe}")
 set (CPACK_PACKAGE_VENDOR "Premysl Janouch")
 set (CPACK_PACKAGE_CONTACT "Přemysl Janouch <p.janouch@gmail.com>")
 set (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
 
 set (CPACK_GENERATOR "TGZ;ZIP")
 set (CPACK_PACKAGE_FILE_NAME
-	"${PROJECT_NAME}-${project_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
-set (CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}-${project_VERSION}")
+	"${PROJECT_NAME}-${project_version_safe}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
+set (CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}-${project_version_safe}")
 
 set (CPACK_SOURCE_GENERATOR "TGZ;ZIP")
 set (CPACK_SOURCE_IGNORE_FILES "/\\\\.git;/build;/CMakeLists.txt.user")
-set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${project_VERSION}")
+set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${project_version_safe}")
 
 set (CPACK_SET_DESTDIR TRUE)
 include (CPack)

NEWS

@@ -1,3 +1,90 @@
+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
+
+ * degesch: show channel user count in the prompt
+
+ * degesch: allow hiding join/part messages and other noise (Meta-Shift-H)
+
+ * degesch: allow autojoining channels with keys
+
+ * degesch: rejoin channels with keys on reconnect
+
+ * degesch: make /query without arguments just open the buffer
+
+ * degesch: add a censor plugin
+
+ * degesch: die on configuration parse errors
+
+ * degesch: request channel modes also on rejoin
+
+ * degesch: don't show remembered channel modes on parted channels
+
+ * degesch: fix highlight detection in colored text
+
+ * degesch: fix CTCP handling for the real world and don't decode X-QUOTEs
+
+ * degesch: add support for OpenSSL 1.1.0
+
+
+0.9.4 (2016-04-28) "Oops"
+
+ * degesch: fix crash on characters invalid in Windows-1252
+
+ * degesch: add an auto-rejoin plugin
+
+ * degesch: 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
+
+ * ZyklonB: add a seen plugin
+
+ * kike, ZyklonB: 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
+
+ * degesch: implemented word wrapping in buffers
+
+ * degesch: added autocomplete for /topic
+
+ * degesch: Lua API was improved and extended
+
+ * degesch: added a basic last.fm "now playing" plugin
+
+ * degesch: backlog limit was made configurable
+
+ * degesch: allow changing the list of IRC capabilities to use if available
+
+ * degesch: optimize buffer memory usage
+
+ * degesch: 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
+
+ * degesch: added --format for previewing things like MOTD files
+
+ * degesch: added /buffer goto supporting case insensitive partial matches
+
+ * kike: add support for IRCv3.2 server-time
+
+ * ZyklonB: plugins now run in a dedicated data directory
+
+ * ZyklonB: added a factoids plugin
+
+ * Remote addresses are now resolved asynchronously
+
+ * Various bugfixes
+
+
 0.9.2 (2015-12-31)
 
  * degesch: added rudimentary support for Lua scripting

README.adoc

@@ -10,7 +10,7 @@ All of them have these potentially interesting properties:
 
  - full IPv6 support
  - TLS support, including client certificates
- - minimal dependencies
+ - lean on dependencies (with the exception of 'degesch')
  - compact and arguably easy to hack on
  - permissive license
 
@@ -20,11 +20,13 @@ 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"]
+
 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 rudimentary support for Lua scripting.
+auto-away, command aliases and basic support for Lua scripting.
 
 kike
 ----
@@ -63,12 +65,21 @@ 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).
 
+Packages
+--------
+Regular releases are sporadic.  git master should be stable enough.  You can get
+a package with the latest development version from Archlinux's AUR, or from
+openSUSE Build Service for the rest of mainstream distributions.  Consult the
+list of repositories and their respective links at:
+
+https://build.opensuse.org/project/repositories/home:pjanouch:git
+
 Building
 --------
 Build dependencies: CMake, pkg-config, help2man, awk, sh, liberty (included) +
-Runtime dependencies: openssl, curses (degesch),
-                      readline >= 6.0 or libedit >= 2013-07-12 (degesch),
-                      lua >= 5.3 (degesch, optional)
+Runtime dependencies: openssl +
+Additionally for degesch: curses, libffi, lua >= 5.3 (optional),
+                          readline >= 6.0 or libedit >= 2013-07-12
 
  $ git clone --recursive https://github.com/pjanouch/uirc3.git
  $ mkdir uirc3/build
@@ -86,11 +97,8 @@ Or you can try telling CMake to make a package for you.  For Debian it is:
  $ cpack -G DEB
  # dpkg -i uirc3-*.deb
 
-Note that for versions of CMake before 2.8.9, you need to prefix `cpack` with
-`fakeroot` or file ownership will end up wrong.
-
-Running
--------
+Usage
+-----
 'degesch' has in-program configuration.  Just run it and read the instructions.
 
 For the rest you might want to generate a configuration file:
@@ -118,11 +126,58 @@ 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:
+....
+# Preload with system-wide settings
+$include /etc/inputrc
+
+# Make M-left and M-right reorder buffers
+$if degesch
+"\e\e[C": move-buffer-right
+"\e\e[D": move-buffer-left
+$endif
+....
+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.
+
+ /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 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"
+
+Configuration profiles
+----------------------
+Even though the applications don't directly support configuration profiles,
+they conform to the XDG standard, and thus you can change the location they
+load configuration from via XDG_CONFIG_HOME (normally '~/.config') and the
+location where store their data via XDG_DATA_HOME (normally '~/.local/share').
+
+It would be relatively easy to make the applications assume whatever name you
+run them under (for example by using symbolic links), and load different
+configurations accordingly, but I consider it rather messy and unnecessary.
+
 Contributing and Support
 ------------------------
 Use this project's GitHub to report any bugs, request features, or submit pull
 requests.  If you want to discuss this project, or maybe just hang out with
-the developer, feel free to join me at irc://anathema.irc.so, channel #anathema.
+the developer, feel free to join me at irc://irc.janouch.name, channel #dev.
 
 Disclaimer
 ----------
@@ -138,3 +193,6 @@ is included within the package, or, at your option, you may relicense the work
 under the MIT or the Modified BSD License, as listed at the following site:
 
 http://www.gnu.org/licenses/license-list.html
+
+Note that 'degesch' technically becomes GPL-licensed when you compile it against
+GNU Readline, but that is not a concern of this source package.

common.c

@@ -18,6 +18,7 @@
  */
 
 #define LIBERTY_WANT_SSL
+#define LIBERTY_WANT_ASYNC
 #define LIBERTY_WANT_POLLER
 #define LIBERTY_WANT_PROTO_IRC
 
@@ -33,15 +34,20 @@
 #include <arpa/inet.h>
 #include <netinet/tcp.h>
 
-/// Shorthand to set an error and return failure from the function
-#define FAIL(...)                                                              \
-	BLOCK_START                                                                \
-		error_set (e, __VA_ARGS__);                                            \
-		return 0;                                                              \
-	BLOCK_END
-
-#define CONTAINER_OF(pointer, type, member) \
-	(type *) ((char *) pointer - offsetof (type, member))
+static void
+init_openssl (void)
+{
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+	SSL_library_init ();
+	// XXX: this list is probably not complete
+	atexit (EVP_cleanup);
+	SSL_load_error_strings ();
+	atexit (ERR_free_strings);
+#else
+	// Cleanup is done automatically via atexit()
+	OPENSSL_init_ssl (0, NULL);
+#endif
+}
 
 // --- To be moved to liberty --------------------------------------------------
 
@@ -54,6 +60,21 @@ str_vector_find (const struct str_vector *v, const char *s)
 	return -1;
 }
 
+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;
+#else // ! _POSIX_TIMERS
+        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.
@@ -64,8 +85,11 @@ resolve_relative_runtime_unique_filename (const char *filename)
 	str_init (&path);
 
 	const char *runtime_dir = getenv ("XDG_RUNTIME_DIR");
+	const char *tmpdir = getenv ("TMPDIR");
 	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);
@@ -92,7 +116,7 @@ xwrite (int fd, const char *data, size_t len, struct error **e)
 		if (res >= 0)
 			written += res;
 		else if (errno != EINTR)
-			FAIL ("%s", strerror (errno));
+			return error_set (e, "%s", strerror (errno));
 	}
 	return true;
 }
@@ -223,7 +247,7 @@ struct socks_connector
 	// You may destroy the connector object in these two main callbacks:
 
 	/// Connection has been successfully established
-	void (*on_connected) (void *user_data, int socket);
+	void (*on_connected) (void *user_data, int socket, const char *hostname);
 	/// Failed to establish a connection to either target
 	void (*on_failure) (void *user_data);
 
@@ -308,7 +332,6 @@ socks_4a_start (struct socks_connector *self)
 	}
 
 	struct str *wb = &self->write_buffer;
-	str_init (wb);
 	str_pack_u8 (wb, 4);                  // version
 	str_pack_u8 (wb, 1);                  // connect
 
@@ -594,9 +617,11 @@ socks_connector_on_timeout (struct socks_connector *self)
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 static void
-socks_connector_on_connected (void *user_data, int socket_fd)
+socks_connector_on_connected
+	(void *user_data, int socket_fd, const char *hostname)
 {
 	set_blocking (socket_fd, false);
+	(void) hostname;
 
 	struct socks_connector *self = user_data;
 	self->socket_fd = socket_fd;
@@ -658,20 +683,8 @@ socks_connector_start (struct socks_connector *self)
 	connector->on_error      = socks_connector_on_error;
 	connector->on_failure    = socks_connector_on_failure;
 
-	struct error *e = NULL;
-	if (!connector_add_target (connector, self->hostname, self->service, &e))
-	{
-		if (self->on_error)
-			self->on_error (self->user_data, e->message);
-		error_free (e);
-
-		socks_connector_destroy_connector (self);
-		socks_connector_fail (self);
-		return;
-	}
-
+	connector_add_target (connector, self->hostname, self->service);
 	poller_timer_set (&self->timeout, 60 * 1000);
-	connector_step (connector);
 	self->done = false;
 
 	self->bound_port = 0;
@@ -762,8 +775,10 @@ socks_connector_on_ready
 
 		int fd = self->socket_fd;
 		self->socket_fd = -1;
+
+		struct socks_target *target = self->targets_iter;
 		set_blocking (fd, true);
-		self->on_connected (self->user_data, fd);
+		self->on_connected (self->user_data, fd, target->address_str);
 	}
 	else
 		// We've failed this target, let's try to move on
@@ -948,6 +963,13 @@ ctcp_intra_decode (const char *chunk, size_t len, struct str *output)
 	}
 }
 
+// According to the original CTCP specification we should use
+// ctcp_intra_decode() on all parts, however no one seems to use that
+// and it breaks normal text with backslashes
+#ifndef SUPPORT_CTCP_X_QUOTES
+#define ctcp_intra_decode(s, len, output) str_append_data (output, s, len)
+#endif
+
 static void
 ctcp_parse_tagged (const char *chunk, size_t len, struct ctcp_chunk *output)
 {
@@ -976,9 +998,6 @@ ctcp_parse (const char *message)
 
 	struct ctcp_chunk *result = NULL, *result_tail = NULL;
 
-	// According to the original CTCP specification we should use
-	// ctcp_intra_decode() on all parts, however no one seems to
-	// use that and it breaks normal text with backslashes
 	size_t start = 0;
 	bool in_ctcp = false;
 	for (size_t i = 0; i < m.len; i++)
@@ -1002,7 +1021,7 @@ ctcp_parse (const char *message)
 		if (my_is_ctcp)
 			ctcp_parse_tagged (m.str + my_start, i - my_start, chunk);
 		else
-			str_append_data (&chunk->text, m.str + my_start, i - my_start);
+			ctcp_intra_decode (m.str + my_start, i - my_start, &chunk->text);
 		LIST_APPEND_WITH_TAIL (result, result_tail, chunk);
 	}
 
@@ -1016,7 +1035,7 @@ ctcp_parse (const char *message)
 			chunk->is_partial = true;
 		}
 		else
-			str_append_data (&chunk->text, m.str + start, m.len - start);
+			ctcp_intra_decode (m.str + start, m.len - start, &chunk->text);
 		LIST_APPEND_WITH_TAIL (result, result_tail, chunk);
 	}
 

config.h.in

@@ -1,11 +1,13 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#define PROGRAM_VERSION "${project_VERSION}"
+#define PROGRAM_VERSION "${project_version}"
 #define ZYKLONB_PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/${zyklonb_plugin_dir}"
 
 #cmakedefine HAVE_READLINE
 #cmakedefine HAVE_EDITLINE
 #cmakedefine HAVE_LUA
 
+#cmakedefine01 ICONV_ACCEPTS_TRANSLIT
+
 #endif  // ! CONFIG_H

kike.c

@@ -1,7 +1,7 @@
 /*
  * kike.c: the experimental IRC daemon
  *
- * Copyright (c) 2014 - 2015, Přemysl Janouch <p.janouch@gmail.com>
+ * Copyright (c) 2014 - 2016, Přemysl Janouch <p.janouch@gmail.com>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -307,7 +307,8 @@ enum
 	IRC_CAP_MULTI_PREFIX             = (1 << 0),
 	IRC_CAP_INVITE_NOTIFY            = (1 << 1),
 	IRC_CAP_ECHO_MESSAGE             = (1 << 2),
-	IRC_CAP_USERHOST_IN_NAMES        = (1 << 3)
+	IRC_CAP_USERHOST_IN_NAMES        = (1 << 3),
+	IRC_CAP_SERVER_TIME              = (1 << 4)
 };
 
 struct client
@@ -330,17 +331,17 @@ struct client
 	struct poller_timer timeout_timer;  ///< Connection seems to be dead
 	struct poller_timer kill_timer;     ///< Hard kill timeout
 
-	bool initialized;                   ///< Has any data been received yet?
-	bool cap_negotiating;               ///< Negotiating capabilities
-	bool registered;                    ///< The user has registered
-	bool closing_link;                  ///< Closing link
-	bool half_closed;                   ///< Closing link: conn. is half-closed
-
 	unsigned long cap_version;          ///< CAP protocol version
 	unsigned caps_enabled;              ///< Enabled capabilities
 
-	bool ssl_rx_want_tx;                ///< SSL_read() wants to write
-	bool ssl_tx_want_rx;                ///< SSL_write() wants to read
+	unsigned initialized     : 1;       ///< Has any data been received yet?
+	unsigned cap_negotiating : 1;       ///< Negotiating capabilities
+	unsigned registered      : 1;       ///< The user has registered
+	unsigned closing_link    : 1;       ///< Closing link
+	unsigned half_closed     : 1;       ///< Closing link: conn. is half-closed
+
+	unsigned ssl_rx_want_tx  : 1;       ///< SSL_read() wants to write
+	unsigned ssl_tx_want_rx  : 1;       ///< SSL_write() wants to read
 	SSL *ssl;                           ///< SSL connection
 	char *ssl_cert_fingerprint;         ///< Client certificate fingerprint
 
@@ -349,20 +350,23 @@ struct client
 	char *realname;                     ///< IRC realname (e-mail)
 
 	char *hostname;                     ///< Hostname shown to the network
-	char *address;                      ///< Full address including port
+	char *port;                         ///< Port of the peer as a string
+	char *address;                      ///< Full address
 
 	unsigned mode;                      ///< User's mode
 	char *away_message;                 ///< Away message
 	time_t last_active;                 ///< Last PRIVMSG, to get idle time
 	struct str_map invites;             ///< Channel invitations by operators
 	struct flood_detector antiflood;    ///< Flood detector
+
+	struct async_getnameinfo *gni;      ///< Backwards DNS resolution
+	struct poller_timer gni_timer;      ///< Backwards DNS resolution timeout
 };
 
-static void
-client_init (struct client *self)
+static struct client *
+client_new (void)
 {
-	memset (self, 0, sizeof *self);
-
+	struct client *self = xcalloc (1, sizeof *self);
 	self->socket_fd = -1;
 	str_init (&self->read_buffer);
 	str_init (&self->write_buffer);
@@ -371,10 +375,11 @@ client_init (struct client *self)
 	flood_detector_init (&self->antiflood, 10, 20);
 	str_map_init (&self->invites);
 	self->invites.key_xfrm = irc_strxfrm;
+	return self;
 }
 
 static void
-client_free (struct client *self)
+client_destroy (struct client *self)
 {
 	if (!soft_assert (self->socket_fd == -1))
 		xclose (self->socket_fd);
@@ -389,10 +394,16 @@ client_free (struct client *self)
 	free (self->realname);
 
 	free (self->hostname);
+	free (self->port);
 	free (self->address);
+
 	free (self->away_message);
 	flood_detector_free (&self->antiflood);
 	str_map_free (&self->invites);
+
+	if (self->gni)
+		async_cancel (&self->gni->async);
+	free (self);
 }
 
 static void client_close_link (struct client *c, const char *reason);
@@ -819,12 +830,25 @@ client_get_mode (struct client *self)
 static void
 client_send_str (struct client *c, const struct str *s)
 {
-	hard_assert (c->initialized && !c->closing_link);
+	hard_assert (!c->closing_link);
 
 	size_t old_sendq = c->write_buffer.len;
+
+	// So far there's only one message tag we use, so we can do it simple;
+	// note that a 1024-character limit applies to messages with tags on
+	if (c->caps_enabled & IRC_CAP_SERVER_TIME)
+	{
+		long milliseconds; char buf[32]; struct tm tm;
+		time_t now = unixtime_msec (&milliseconds);
+		if (soft_assert (strftime (buf, sizeof buf,
+			"%Y-%m-%dT%T", gmtime_r (&now, &tm))))
+			str_append_printf (&c->write_buffer,
+				"@time=%s.%03ldZ ", buf, milliseconds);
+	}
+
 	// TODO: kill the connection above some "SendQ" threshold (careful!)
 	str_append_data (&c->write_buffer, s->str,
-		s->len > IRC_MAX_MESSAGE_LENGTH ? IRC_MAX_MESSAGE_LENGTH : s->len);
+		MIN (s->len, IRC_MAX_MESSAGE_LENGTH));
 	str_append (&c->write_buffer, "\r\n");
 	// XXX: we might want to move this elsewhere, so that it doesn't get called
 	//   as often; it's going to cause a lot of syscalls with epoll.
@@ -891,9 +915,46 @@ client_unregister (struct client *c, const char *reason)
 	c->registered = false;
 }
 
+static void
+client_kill (struct client *c, const char *reason)
+{
+	struct server_context *ctx = c->ctx;
+	client_unregister (c, reason ? reason : "Client exited");
+
+	if (c->address)
+		// Only log the event if address resolution has finished
+		print_debug ("closed connection to %s (%s)", c->address,
+			reason ? reason : "");
+
+	if (c->ssl)
+		// Note that we might have already called this once, but that is fine
+		(void) SSL_shutdown (c->ssl);
+
+	xclose (c->socket_fd);
+	c->socket_fd = -1;
+
+	c->socket_event.closed = true;
+	poller_fd_reset (&c->socket_event);
+	client_cancel_timers (c);
+
+	LIST_UNLINK (ctx->clients, c);
+	ctx->n_clients--;
+	client_destroy (c);
+
+	irc_try_finish_quit (ctx);
+}
+
 static void
 client_close_link (struct client *c, const char *reason)
 {
+	// Let's just cut the connection, the client can try again later.
+	// We also want to avoid accidentally setting poller events before
+	// address resolution has finished.
+	if (!c->initialized)
+	{
+		client_kill (c, reason);
+		return;
+	}
 	if (!soft_assert (!c->closing_link))
 		return;
 
@@ -910,35 +971,6 @@ client_close_link (struct client *c, const char *reason)
 	client_set_kill_timer (c);
 }
 
-static void
-client_kill (struct client *c, const char *reason)
-{
-	client_unregister (c, reason ? reason : "Client exited");
-
-	struct server_context *ctx = c->ctx;
-
-	if (c->ssl)
-		// Note that we might have already called this once, but that is fine
-		(void) SSL_shutdown (c->ssl);
-
-	xclose (c->socket_fd);
-
-	c->socket_event.closed = true;
-	poller_fd_reset (&c->socket_event);
-	client_cancel_timers (c);
-
-	print_debug ("closed connection to %s (%s)",
-		c->address, reason ? reason : "");
-
-	c->socket_fd = -1;
-	client_free (c);
-	LIST_UNLINK (ctx->clients, c);
-	ctx->n_clients--;
-	free (c);
-
-	irc_try_finish_quit (ctx);
-}
-
 static bool
 client_in_mask_list (const struct client *c, const struct str_vector *mask)
 {
@@ -991,6 +1023,7 @@ client_cancel_timers (struct client *c)
 	poller_timer_reset (&c->kill_timer);
 	poller_timer_reset (&c->timeout_timer);
 	poller_timer_reset (&c->ping_timer);
+	poller_timer_reset (&c->gni_timer);
 }
 
 static void
@@ -1002,9 +1035,8 @@ client_set_timer (struct client *c,
 }
 
 static void
-on_client_kill_timer (void *user_data)
+on_client_kill_timer (struct client *c)
 {
-	struct client *c = user_data;
 	hard_assert (!c->initialized || c->closing_link);
 	client_kill (c, NULL);
 }
@@ -1016,9 +1048,8 @@ client_set_kill_timer (struct client *c)
 }
 
 static void
-on_client_timeout_timer (void *user_data)
+on_client_timeout_timer (struct client *c)
 {
-	struct client *c = user_data;
 	char *reason = xstrdup_printf
 		("Ping timeout: >%u seconds", c->ctx->ping_interval);
 	client_close_link (c, reason);
@@ -1026,9 +1057,8 @@ on_client_timeout_timer (void *user_data)
 }
 
 static void
-on_client_ping_timer (void *user_data)
+on_client_ping_timer (struct client *c)
 {
-	struct client *c = user_data;
 	hard_assert (!c->closing_link);
 	client_send (c, "PING :%s", c->ctx->server_name);
 	client_set_timer (c, &c->timeout_timer, c->ctx->ping_interval);
@@ -1235,6 +1265,7 @@ irc_cap_table[] =
 	{ IRC_CAP_INVITE_NOTIFY,            "invite-notify"     },
 	{ IRC_CAP_ECHO_MESSAGE,             "echo-message"      },
 	{ IRC_CAP_USERHOST_IN_NAMES,        "userhost-in-names" },
+	{ IRC_CAP_SERVER_TIME,              "server-time"       },
 };
 
 static void
@@ -1247,7 +1278,7 @@ irc_handle_cap_ls (struct client *c, struct irc_cap_args *a)
 
 	c->cap_negotiating = true;
 	client_send (c, ":%s CAP %s LS :multi-prefix invite-notify echo-message"
-		" userhost-in-names", c->ctx->server_name, a->target);
+		" userhost-in-names server-time", c->ctx->server_name, a->target);
 }
 
 static void
@@ -1372,7 +1403,7 @@ irc_handle_cap (const struct irc_message *msg, struct client *c)
 	if (msg->params.len > 1)
 	{
 		args.full_params = msg->params.vector[1];
-		cstr_split_ignore_empty (args.full_params, ' ', &args.params);
+		cstr_split (args.full_params, " ", true, &args.params);
 	}
 
 	struct irc_cap_command *cmd =
@@ -2155,7 +2186,7 @@ irc_handle_list (const struct irc_message *msg, struct client *c)
 	{
 		struct str_vector channels;
 		str_vector_init (&channels);
-		cstr_split_ignore_empty (msg->params.vector[0], ',', &channels);
+		cstr_split (msg->params.vector[0], ",", true, &channels);
 		for (size_t i = 0; i < channels.len; i++)
 			if ((chan = str_map_find (&c->ctx->channels, channels.vector[i]))
 			 && (!(chan->modes & IRC_CHAN_MODE_SECRET)
@@ -2286,7 +2317,7 @@ irc_handle_names (const struct irc_message *msg, struct client *c)
 	{
 		struct str_vector channels;
 		str_vector_init (&channels);
-		cstr_split_ignore_empty (msg->params.vector[0], ',', &channels);
+		cstr_split (msg->params.vector[0], ",", true, &channels);
 		for (size_t i = 0; i < channels.len; i++)
 			if ((chan = str_map_find (&c->ctx->channels, channels.vector[i]))
 			 && (!(chan->modes & IRC_CHAN_MODE_SECRET)
@@ -2449,7 +2480,7 @@ irc_handle_whois (const struct irc_message *msg, struct client *c)
 	struct str_vector masks;
 	str_vector_init (&masks);
 	const char *masks_str = msg->params.vector[msg->params.len > 1];
-	cstr_split_ignore_empty (masks_str, ',', &masks);
+	cstr_split (masks_str, ",", true, &masks);
 	for (size_t i = 0; i < masks.len; i++)
 	{
 		const char *mask = masks.vector[i];
@@ -2490,7 +2521,7 @@ irc_handle_whowas (const struct irc_message *msg, struct client *c)
 
 	struct str_vector nicks;
 	str_vector_init (&nicks);
-	cstr_split_ignore_empty (msg->params.vector[0], ',', &nicks);
+	cstr_split (msg->params.vector[0], ",", true, &nicks);
 
 	for (size_t i = 0; i < nicks.len; i++)
 	{
@@ -2610,7 +2641,7 @@ irc_handle_part (const struct irc_message *msg, struct client *c)
 	const char *reason = msg->params.len > 1 ? msg->params.vector[1] : NULL;
 	struct str_vector channels;
 	str_vector_init (&channels);
-	cstr_split_ignore_empty (msg->params.vector[0], ',', &channels);
+	cstr_split (msg->params.vector[0], ",", true, &channels);
 	for (size_t i = 0; i < channels.len; i++)
 		irc_try_part (c, channels.vector[i], reason);
 	str_vector_free (&channels);
@@ -2661,8 +2692,8 @@ irc_handle_kick (const struct irc_message *msg, struct client *c)
 	struct str_vector users;
 	str_vector_init (&channels);
 	str_vector_init (&users);
-	cstr_split_ignore_empty (msg->params.vector[0], ',', &channels);
-	cstr_split_ignore_empty (msg->params.vector[1], ',', &users);
+	cstr_split (msg->params.vector[0], ",", true, &channels);
+	cstr_split (msg->params.vector[1], ",", true, &users);
 
 	if (channels.len == 1)
 		for (size_t i = 0; i < users.len; i++)
@@ -2790,9 +2821,9 @@ irc_handle_join (const struct irc_message *msg, struct client *c)
 	struct str_vector keys;
 	str_vector_init (&channels);
 	str_vector_init (&keys);
-	cstr_split_ignore_empty (msg->params.vector[0], ',', &channels);
+	cstr_split (msg->params.vector[0], ",", true, &channels);
 	if (msg->params.len > 1)
-		cstr_split_ignore_empty (msg->params.vector[1], ',', &keys);
+		cstr_split (msg->params.vector[1], ",", true, &keys);
 
 	for (size_t i = 0; i < channels.len; i++)
 		irc_try_join (c, channels.vector[i],
@@ -2960,6 +2991,11 @@ irc_handle_kill (const struct irc_message *msg, struct client *c)
 	struct client *target;
 	if (!(target = str_map_find (&c->ctx->users, msg->params.vector[0])))
 		RETURN_WITH_REPLY (c, IRC_ERR_NOSUCHNICK, msg->params.vector[0]);
+
+	client_send (target, ":%s!%s@%s KILL %s :%s",
+		c->nickname, c->username, c->hostname,
+		target->nickname, msg->params.vector[1]);
+
 	char *reason = xstrdup_printf ("Killed by %s: %s",
 		c->nickname, msg->params.vector[1]);
 	client_close_link (target, reason);
@@ -3211,6 +3247,8 @@ irc_try_write_tls (struct client *c)
 	return true;
 }
 
+// -----------------------------------------------------------------------------
+
 static bool
 irc_autodetect_tls (struct client *c)
 {
@@ -3281,6 +3319,8 @@ error_ssl_1:
 	return false;
 }
 
+// -----------------------------------------------------------------------------
+
 static void
 on_client_ready (const struct pollfd *pfd, void *user_data)
 {
@@ -3336,6 +3376,7 @@ on_client_ready (const struct pollfd *pfd, void *user_data)
 static void
 client_update_poller (struct client *c, const struct pollfd *pfd)
 {
+	// We must not poll for writing when the connection hasn't been initialized
 	int new_events = POLLIN;
 	if (c->ssl)
 	{
@@ -3346,7 +3387,7 @@ client_update_poller (struct client *c, const struct pollfd *pfd)
 		if (c->ssl_rx_want_tx)  new_events &= ~POLLIN;
 		if (c->ssl_tx_want_rx)  new_events &= ~POLLOUT;
 	}
-	else if (c->write_buffer.len)
+	else if (c->initialized && c->write_buffer.len)
 		new_events |= POLLOUT;
 
 	hard_assert (new_events != 0);
@@ -3354,6 +3395,43 @@ client_update_poller (struct client *c, const struct pollfd *pfd)
 		poller_fd_set (&c->socket_event, new_events);
 }
 
+static void
+client_finish_connection (struct client *c)
+{
+	c->gni = NULL;
+
+	c->address = format_host_port_pair (c->hostname, c->port);
+	print_debug ("accepted connection from %s", c->address);
+
+	client_update_poller (c, NULL);
+	client_set_kill_timer (c);
+}
+
+static void
+on_client_gni_resolved (int result, char *host, char *port, void *user_data)
+{
+	struct client *c = user_data;
+
+	if (result)
+		print_debug ("%s: %s", "getnameinfo", gai_strerror (result));
+	else
+	{
+		free (c->hostname);
+		c->hostname = xstrdup (host);
+		(void) port;
+	}
+
+	poller_timer_reset (&c->gni_timer);
+	client_finish_connection (c);
+}
+
+static void
+on_client_gni_timer (struct client *c)
+{
+	async_cancel (&c->gni->async);
+	client_finish_connection (c);
+}
+
 static bool
 irc_try_fetch_client (struct server_context *ctx, int listen_fd)
 {
@@ -3378,6 +3456,15 @@ irc_try_fetch_client (struct server_context *ctx, int listen_fd)
 		return false;
 	}
 
+	set_blocking (fd, false);
+
+	// A little bit questionable once the traffic gets high enough (IMO),
+	// but it reduces silly latencies that we don't need because we already
+	// do buffer our output
+	int yes = 1;
+	soft_assert (setsockopt (fd, IPPROTO_TCP, TCP_NODELAY,
+		&yes, sizeof yes) != -1);
+
 	if (ctx->max_connections != 0 && ctx->n_clients >= ctx->max_connections)
 	{
 		print_debug ("connection limit reached, refusing connection");
@@ -3387,20 +3474,16 @@ irc_try_fetch_client (struct server_context *ctx, int listen_fd)
 
 	char host[NI_MAXHOST] = "unknown", port[NI_MAXSERV] = "unknown";
 	int err = getnameinfo ((struct sockaddr *) &peer, peer_len,
-		host, sizeof host, port, sizeof port, NI_NUMERICSERV);
+		host, sizeof host, port, sizeof port, NI_NUMERICHOST | NI_NUMERICSERV);
 	if (err)
 		print_debug ("%s: %s", "getnameinfo", gai_strerror (err));
 
-	char *address = format_host_port_pair (host, port);
-	print_debug ("accepted connection from %s", address);
-
-	struct client *c = xmalloc (sizeof *c);
-	client_init (c);
+	struct client *c = client_new ();
 	c->ctx = ctx;
 	c->opened = time (NULL);
 	c->socket_fd = fd;
 	c->hostname = xstrdup (host);
-	c->address = address;
+	c->port = xstrdup (port);
 	c->last_active = time (NULL);
 	LIST_PREPEND (ctx->clients, c);
 	ctx->n_clients++;
@@ -3410,27 +3493,29 @@ irc_try_fetch_client (struct server_context *ctx, int listen_fd)
 	c->socket_event.user_data = c;
 
 	poller_timer_init (&c->kill_timer, &c->ctx->poller);
-	c->kill_timer.dispatcher = on_client_kill_timer;
+	c->kill_timer.dispatcher = (poller_timer_fn) on_client_kill_timer;
 	c->kill_timer.user_data = c;
 
 	poller_timer_init (&c->timeout_timer, &c->ctx->poller);
-	c->timeout_timer.dispatcher = on_client_timeout_timer;
+	c->timeout_timer.dispatcher = (poller_timer_fn) on_client_timeout_timer;
 	c->timeout_timer.user_data = c;
 
 	poller_timer_init (&c->ping_timer, &c->ctx->poller);
-	c->ping_timer.dispatcher = on_client_ping_timer;
+	c->ping_timer.dispatcher = (poller_timer_fn) on_client_ping_timer;
 	c->ping_timer.user_data = c;
 
-	// A little bit questionable once the traffic gets high enough (IMO),
-	// but it reduces silly latencies that we don't need because we already
-	// do buffer our output
-	int yes = 1;
-	soft_assert (setsockopt (fd, IPPROTO_TCP, TCP_NODELAY,
-		&yes, sizeof yes) != -1);
+	// Resolve the client's hostname first; this is a blocking operation that
+	// depends on the network, so run it asynchronously with some timeout
+	c->gni = async_getnameinfo (&ctx->poller.common.async,
+		(const struct sockaddr *) &peer, peer_len, NI_NUMERICSERV);
+	c->gni->dispatcher = on_client_gni_resolved;
+	c->gni->user_data = c;
 
-	set_blocking (fd, false);
-	client_update_poller (c, NULL);
-	client_set_kill_timer (c);
+	poller_timer_init (&c->gni_timer, &c->ctx->poller);
+	c->gni_timer.dispatcher = (poller_timer_fn) on_client_gni_timer;
+	c->gni_timer.user_data = c;
+
+	poller_timer_set (&c->gni_timer, 5000);
 	return true;
 }
 
@@ -3659,7 +3744,7 @@ irc_parse_config (struct server_context *ctx, struct error **e)
 	str_vector_init (&fingerprints);
 	const char *operators = str_map_find (&ctx->config, "operators");
 	if (operators)
-		cstr_split_ignore_empty (operators, ',', &fingerprints);
+		cstr_split (operators, ",", true, &fingerprints);
 	for (size_t i = 0; i < fingerprints.len; i++)
 	{
 		const char *key = fingerprints.vector[i];
@@ -3718,51 +3803,6 @@ irc_initialize_server_name (struct server_context *ctx, struct error **e)
 	return true;
 }
 
-static bool
-lock_pid_file (const char *path, struct error **e)
-{
-	// When using XDG_RUNTIME_DIR, the file needs to either have its
-	// access time bumped every 6 hours, or have the sticky bit set
-	int fd = open (path, O_RDWR | O_CREAT,
-		S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH /* 644 */ | S_ISVTX /* sticky */);
-	if (fd < 0)
-	{
-		error_set (e, "can't open `%s': %s", path, strerror (errno));
-		return false;
-	}
-
-	struct flock lock =
-	{
-		.l_type = F_WRLCK,
-		.l_start = 0,
-		.l_whence = SEEK_SET,
-		.l_len = 0,
-	};
-	if (fcntl (fd, F_SETLK, &lock))
-	{
-		error_set (e, "can't lock `%s': %s", path, strerror (errno));
-		xclose (fd);
-		return false;
-	}
-
-	struct str pid;
-	str_init (&pid);
-	str_append_printf (&pid, "%ld", (long) getpid ());
-
-	if (ftruncate (fd, 0)
-	 || write (fd, pid.str, pid.len) != (ssize_t) pid.len)
-	{
-		error_set (e, "can't write to `%s': %s", path, strerror (errno));
-		xclose (fd);
-		return false;
-	}
-	str_free (&pid);
-
-	// Intentionally not closing the file descriptor; it must stay alive
-	// for the entire life of the application
-	return true;
-}
-
 static bool
 irc_lock_pid_file (struct server_context *ctx, struct error **e)
 {
@@ -3771,7 +3811,7 @@ irc_lock_pid_file (struct server_context *ctx, struct error **e)
 		return true;
 
 	char *resolved = resolve_filename (path, resolve_relative_runtime_filename);
-	bool result = lock_pid_file (resolved, e);
+	bool result = lock_pid_file (resolved, e) != -1;
 	free (resolved);
 	return result;
 }
@@ -3865,7 +3905,7 @@ irc_setup_listen_fds (struct server_context *ctx, struct error **e)
 
 	struct str_vector ports;
 	str_vector_init (&ports);
-	cstr_split_ignore_empty (bind_port, ',', &ports);
+	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 (size_t i = 0; i < ports.len; i++)
@@ -3953,6 +3993,8 @@ daemonize (struct server_context *ctx)
 	int tty = open ("/dev/null", O_RDWR);
 	if (tty != 0 || dup (0) != 1 || dup (0) != 2)
 		exit_fatal ("failed to reopen FD's: %s", strerror (errno));
+
+	poller_post_fork (&ctx->poller);
 }
 
 int
@@ -4001,11 +4043,7 @@ main (int argc, char *argv[])
 
 	print_status (PROGRAM_NAME " " PROGRAM_VERSION " starting");
 	setup_signal_handlers ();
-
-	SSL_library_init ();
-	atexit (EVP_cleanup);
-	SSL_load_error_strings ();
-	atexit (ERR_free_strings);
+	init_openssl ();
 
 	struct server_context ctx;
 	server_context_init (&ctx);
@@ -4039,6 +4077,12 @@ main (int argc, char *argv[])
 	else if (!irc_lock_pid_file (&ctx, &e))
 		exit_fatal ("%s", e->message);
 
+#if OpenBSD >= 201605
+	// This won't be as simple once we decide to implement REHASH
+	if (pledge ("stdio inet dns", NULL))
+		exit_fatal ("%s: %s", "pledge", strerror (errno));
+#endif
+
 	ctx.polling = true;
 	while (ctx.polling)
 		poller_run (&ctx.poller);

plugins/degesch/auto-rejoin.lua

@@ -0,0 +1,49 @@
+--
+-- auto-rejoin.lua: join back automatically when someone kicks you
+--
+-- Copyright (c) 2016, Přemysl Janouch <p.janouch@gmail.com>
+--
+-- Permission to use, copy, modify, and/or distribute this software for any
+-- purpose with or without fee is hereby granted, provided that the above
+-- copyright notice and this permission notice appear in all copies.
+--
+-- 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 timeout
+degesch.setup_config {
+	timeout = {
+		type = "integer",
+		comment = "auto rejoin timeout",
+		default = "0",
+
+		on_change = function (v)
+			timeout = v
+		end,
+		validate = function (v)
+			if v < 0 then error ("timeout must not be negative", 0) end
+		end,
+	},
+}
+
+async, await = degesch.async, coroutine.yield
+degesch.hook_irc (function (hook, server, line)
+	local msg = degesch.parse (line)
+	if msg.command ~= "KICK" then return line end
+
+	local who = msg.prefix:match ("^[^!]*")
+	local channel, whom = table.unpack (msg.params)
+	if who ~= whom and whom == server.user.nickname then
+		async.go (function ()
+			await (async.timer_ms (timeout * 1000))
+			server:send ("JOIN " .. channel)
+		end)
+	end
+	return line
+end)

plugins/degesch/censor.lua

@@ -0,0 +1,74 @@
+--
+-- censor.lua: black out certain users' messages
+--
+-- Copyright (c) 2016, Přemysl Janouch <p.janouch@gmail.com>
+--
+-- Permission to use, copy, modify, and/or distribute this software for any
+-- purpose with or without fee is hereby granted, provided that the above
+-- copyright notice and this permission notice appear in all copies.
+--
+-- 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 to_pattern = function (mask)
+	if not mask:match ("!") then mask = mask .. "!*" end
+	if not mask:match ("@") then mask = mask .. "@*" end
+
+	-- That is, * acts like a wildcard, otherwise everything is escaped
+	return "^" .. mask:gsub ("[%^%$%(%)%%%.%[%]%+%-%?]", "%%%0")
+		:gsub ("%*", ".*") .. "$"
+end
+
+local patterns = {}
+local read_masks = function (v)
+	patterns = {}
+	local add = function (who, where)
+		local channels = patterns[who] or {}
+		table.insert (channels, where)
+		patterns[who] = channels
+	end
+	for item in v:lower ():gmatch ("[^,]+") do
+		local who, where = item:match ("^([^/]+)/*(.*)")
+		if who then add (to_pattern (who), where == "" or where) end
+	end
+end
+
+degesch.setup_config {
+	masks = {
+		type = "string_array",
+		default = "\"\"",
+		comment = "user masks (optionally \"/#channel\") to censor",
+		on_change = read_masks
+	},
+}
+
+local censor = function (line)
+	-- Taking a shortcut to avoid lengthy message reassembly
+	local start, text = line:match ("^(.- PRIVMSG .-:)(.*)$")
+	local ctcp, rest = text:match ("^(\x01%g+ )(.*)")
+	text = ctcp and ctcp .. "\x0301,01" .. rest or "\x0301,01" .. text
+	return start .. text
+end
+
+degesch.hook_irc (function (hook, server, line)
+	local msg = degesch.parse (line)
+	if msg.command ~= "PRIVMSG" then return line end
+
+	local channel = msg.params[1]:lower ()
+	for who, where in pairs (patterns) do
+		if msg.prefix:lower ():match (who) then
+			for _, x in pairs (where) do
+				if x == true or x == channel then
+					return censor (line)
+				end
+			end
+		end
+	end
+	return line
+end)

plugins/degesch/fancy-prompt.lua

@@ -0,0 +1,101 @@
+--
+-- fancy-prompt.lua: the fancy multiline prompt you probably want
+--
+-- Copyright (c) 2016, Přemysl Janouch <p.janouch@gmail.com>
+--
+-- Permission to use, copy, modify, and/or distribute this software for any
+-- purpose with or without fee is hereby granted, provided that the above
+-- copyright notice and this permission notice appear in all copies.
+--
+-- 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.
+--
+-- Beware that it is a hack and only goes about 90% of the way, which is why
+-- this functionality is only available as a plugin in the first place
+-- (well, and also for customizability).
+--
+-- The biggest problem is that the way we work with Readline is incompatible
+-- with multiline prompts, and normal newlines just don't work.  This is being
+-- circumvented by using an overflowing single-line prompt with a specially
+-- crafted character in the rightmost column that prevents the bar's background
+-- from spilling all over the last line.
+--
+-- There is also a problem with C-r search rendering not clearing out the
+-- 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.
+
+local prompt = degesch.hook_prompt (function (hook)
+	local current = degesch.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
+		if buffer == current then
+			current_n = i
+		elseif buffer.new_messages_count ~= buffer.new_unimportant_count then
+			if active ~= "" then active = active .. "," end
+			if buffer.highlighted then
+				active = active .. "!"
+				bg_color = "224"
+			end
+			active = active .. i
+		end
+	end
+	if active ~= "" then active = "(" .. active .. ")" end
+	local x = current_n .. ":" .. current.name
+	if chan and chan.users_len ~= 0 then
+		local params = ""
+		for mode, param in pairs (chan.param_modes) do
+			params = params .. " +" .. mode .. " " .. param
+		end
+		local modes = chan.no_param_modes .. params:sub (3)
+		if modes ~= "" then x = x .. "(+" .. modes .. ")" end
+		x = x .. "{" .. chan.users_len .. "}"
+	end
+	if current.hide_unimportant then x = x .. "<H>" end
+
+	local lines, cols = degesch.get_screen_size ()
+	x = x .. " " .. active .. string.rep (" ", cols)
+
+	-- Cut off extra characters and apply formatting, including the hack.
+	-- Note that this doesn't count with full-width or zero-width characters.
+	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" ..
+		x ..  "\x01\x1b[0;4;1;7;38;5;" .. bg_color .. "m\x02 \x01\x1b[0;1m\x02"
+
+	local user_prefix = function (chan, user)
+		for i, chan_user in ipairs (chan.users) do
+			if chan_user.user == user then return chan_user.prefixes end
+		end
+		return ""
+	end
+	if s then
+		x = x .. "["
+		local state = s.state
+		if state == "disconnected" or state == "connecting" then
+			x = x .. "(" .. state .. ")"
+		elseif state ~= "registered" then
+			x = x .. "(unregistered)"
+		else
+			local user, modes = s.user, s.user_mode
+			if chan then x = x .. user_prefix (chan, user) end
+			x = x .. user.nickname
+			if modes ~= "" then x = x .. "(" .. modes .. ")" end
+		end
+		x = x .. "] "
+	else
+		-- There needs to be at least one character so that the cursor
+		-- doesn't get damaged by our hack in that last column
+		x = x .. "> "
+	end
+	return x
+end)

plugins/degesch/last-fm.lua

@@ -0,0 +1,179 @@
+--
+-- last-fm.lua: "now playing" feature using the last.fm API
+--
+-- Dependencies: lua-cjson (from luarocks e.g.)
+--
+-- I call this style closure-oriented programming
+--
+-- Copyright (c) 2016, Přemysl Janouch <p.janouch@gmail.com>
+--
+-- Permission to use, copy, modify, and/or distribute this software for any
+-- purpose with or without fee is hereby granted, provided that the above
+-- copyright notice and this permission notice appear in all copies.
+--
+-- 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 cjson = require "cjson"
+
+-- Setup configuration to load last.fm API credentials from
+local user, api_key
+degesch.setup_config {
+	user    = {
+		type = "string",
+		comment = "last.fm username",
+		on_change = function (v) user    = v end
+	},
+	api_key = {
+		type = "string",
+		comment = "last.fm API key",
+		on_change = function (v) api_key = v end
+	},
+}
+
+-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+-- Generic error reporting
+local report_error = function (buffer, error)
+	buffer:log ("last-fm error: " .. error)
+end
+
+-- Process data return by the server and extract the now playing song
+local process = function (buffer, data, action)
+	-- There's no reasonable Lua package to parse HTTP that I could find
+	local s, e, v, status, message = string.find (data, "(%S+) (%S+) .+\r\n")
+	if not s then return "server returned unexpected data" end
+	if status ~= "200" then return status .. " " .. message end
+
+	local s, e = string.find (data, "\r\n\r\n")
+	if not s then return "server returned unexpected data" end
+
+	local parser = cjson.new ()
+	data = parser.decode (string.sub (data, e + 1))
+	if not data.recenttracks or not data.recenttracks.track then
+		return "invalid response" end
+
+	-- Need to make some sense of the XML automatically converted to JSON
+	local text_of = function (node)
+		if type (node) ~= "table" then return node end
+		return node["#text"] ~= "" and node["#text"] or nil
+	end
+
+	local name, artist, album
+	for i, track in ipairs (data.recenttracks.track) do
+		if track["@attr"] and track["@attr"].nowplaying then
+			if track.name   then name   = text_of (track.name)   end
+			if track.artist then artist = text_of (track.artist) end
+			if track.album  then album  = text_of (track.album)  end
+		end
+	end
+
+	if not name then
+		action (false)
+	else
+		local np = "\"" .. name .. "\""
+		if artist then np = np .. " by "   .. artist end
+		if album  then np = np .. " from " .. album  end
+		action (np)
+	end
+end
+
+-- Set up the connection and make the request
+local on_connected = function (buffer, c, host, action)
+	-- Buffer data in the connection object
+	c.data = ""
+	c.on_data = function (data)
+		c.data = c.data .. data
+	end
+
+	-- And process it after we receive everything
+	c.on_eof = function ()
+		error = process (buffer, c.data, action)
+		if error then report_error (buffer, error) end
+		c:close ()
+	end
+	c.on_error = function (e)
+		report_error (buffer, e)
+	end
+
+	-- Make the unencrypted HTTP request
+	local url = "/2.0/?method=user.getrecenttracks&user=" .. user ..
+		"&limit=1&api_key=" .. api_key .. "&format=json"
+	c:send ("GET " .. url .. " HTTP/1.1\r\n")
+	c:send ("User-agent: last-fm.lua\r\n")
+	c:send ("Host: " .. host .. "\r\n")
+	c:send ("Connection: close\r\n")
+	c:send ("\r\n")
+end
+
+-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+-- Avoid establishing more than one connection at a time
+local running
+
+-- Initiate a connection to last.fm servers
+async, await = degesch.async, coroutine.yield
+local make_request = function (buffer, action)
+	if not user or not api_key then
+		report_error (buffer, "configuration is incomplete")
+		return
+	end
+
+	if running then running:cancel () end
+	running = async.go (function ()
+		local c, host, e = await (async.dial ("ws.audioscrobbler.com", 80))
+		if e then
+			report_error (buffer, e)
+		else
+			on_connected (buffer, c, host, action)
+		end
+		running = nil
+	end)
+end
+
+-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+local now_playing
+
+local tell_song = function (buffer)
+	if now_playing == nil then
+		buffer:log ("last-fm: I don't know what you're listening to")
+	elseif not now_playing then
+		buffer:log ("last-fm: not playing anything right now")
+	else
+		buffer:log ("last-fm: now playing: " .. now_playing)
+	end
+end
+
+local send_song = function (buffer)
+	if not now_playing then
+		tell_song (buffer)
+	else
+		buffer:execute ("/me is listening to " .. now_playing)
+	end
+end
+
+-- Hook input to simulate new commands
+degesch.hook_input (function (hook, buffer, input)
+	if input == "/np" then
+		make_request (buffer, function (np)
+			now_playing = np
+			send_song (buffer)
+		end)
+	elseif input == "/np?" then
+		make_request (buffer, function (np)
+			now_playing = np
+			tell_song (buffer)
+		end)
+	elseif input == "/np!" then
+		send_song (buffer)
+	else
+		return input
+	end
+end)

plugins/degesch/ping-timeout.lua

@@ -1,7 +1,7 @@
 --
 -- ping-timeout.lua: ping timeout readability enhancement plugin
 --
--- Copyright (c) 2015, Přemysl Janouch <p.janouch@gmail.com>
+-- Copyright (c) 2015 - 2016, Přemysl Janouch <p.janouch@gmail.com>
 --
 -- Permission to use, copy, modify, and/or distribute this software for any
 -- purpose with or without fee is hereby granted, provided that the above
@@ -17,9 +17,9 @@
 --
 
 degesch.hook_irc (function (hook, server, line)
-	local start, timeout =
-		line:match ("^(:[^ ]* QUIT :Ping timeout:) (%d+) seconds$")
-	if not start then
+	local msg = degesch.parse (line)
+	local start, timeout = line:match ("^(.* :Ping timeout:) (%d+) seconds$")
+	if msg.command ~= "QUIT" or not start then
 		return line
 	end
 

plugins/degesch/thin-cursor.lua

@@ -0,0 +1,28 @@
+--
+-- thin-cursor.lua: set a thin cursor
+--
+-- Copyright (c) 2016, Přemysl Janouch <p.janouch@gmail.com>
+--
+-- Permission to use, copy, modify, and/or distribute this software for any
+-- purpose with or without fee is hereby granted, provided that the above
+-- copyright notice and this permission notice appear in all copies.
+--
+-- 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.
+--
+-- If tmux doesn't work, add the following to its configuration:
+--   set -as terminal-overrides ',*:Ss=\E[%p1%d q:Se=\E[2 q'
+-- Change the "2" as per http://invisible-island.net/xterm/ctlseqs/ctlseqs.html
+
+local out = io.output ()
+out:write ("\x1b[6 q"):flush ()
+
+-- By registering a global variable, we get notified about plugin unload
+x = setmetatable ({}, { __gc = function ()
+	out:write ("\x1b[2 q"):flush ()
+end })

plugins/zyklonb/calc

@@ -0,0 +1,241 @@
+#!/usr/bin/env guile
+
+  ZyklonB calc plugin, basic Scheme evaluator
+
+  Copyright 2016 Přemysl Janouch
+  See the file LICENSE for licensing information.
+
+!#
+
+(import (rnrs (6)))
+(use-modules ((rnrs) :version (6)))
+
+; --- Message parsing ----------------------------------------------------------
+
+(define-record-type message (fields prefix command params))
+(define (parse-message line)
+  (let f ([parts '()] [chars (string->list line)])
+    (define (take-word w chars)
+      (if (or (null? chars) (eqv? (car chars) #\x20))
+        (f (cons (list->string (reverse w)) parts)
+           (if (null? chars) chars (cdr chars)))
+        (take-word (cons (car chars) w) (cdr chars))))
+    (if (null? chars)
+      (let ([data (reverse parts)])
+        (when (< (length data) 2)
+          (error 'parse-message "invalid message"))
+        (make-message (car data) (cadr data) (cddr data)))
+      (if (null? parts)
+        (if (eqv? (car chars) #\:)
+          (take-word '() (cdr chars))
+          (f (cons #f parts) chars))
+        (if (eqv? (car chars) #\:)
+          (f (cons (list->string (cdr chars)) parts) '())
+          (take-word '() chars))))))
+
+; --- Utilities ----------------------------------------------------------------
+
+(define (display-exception e port)
+  (define (puts . x)
+    (for-all (lambda (a) (display a port)) x)
+    (newline port))
+
+  (define (record-fields rec)
+    (let* ([rtd (record-rtd rec)]
+           [v (record-type-field-names rtd)]
+           [len (vector-length v)])
+      (map (lambda (k i) (cons k ((record-accessor rtd i) rec)))
+        (vector->list v)
+        (let c ([i len] [ls '()])
+          (if (= i 0) ls (c (- i 1) (cons (- i 1) ls)))))))
+
+  (puts "Caught " (record-type-name (record-rtd e)))
+  (for-all
+    (lambda (subtype)
+      (puts "  " (record-type-name (record-rtd subtype)))
+      (for-all
+        (lambda (field) (puts "    " (car field) ": " (cdr field)))
+        (record-fields subtype)))
+    (simple-conditions e)))
+
+; XXX - we have to work around Guile's lack of proper eol-style support
+(define xc (make-transcoder (latin-1-codec) 'lf 'replace))
+(define irc-input-port (transcoded-port (standard-input-port) xc))
+(define irc-output-port (transcoded-port (standard-output-port) xc))
+
+(define (send . message)
+  (for-all (lambda (x) (display x irc-output-port)) message)
+  (display #\return irc-output-port)
+  (newline irc-output-port)
+  (flush-output-port irc-output-port))
+
+(define (get-line-crlf port)
+  (define line (get-line port))
+  (if (eof-object? line) line
+    (let ([len (string-length line)])
+      (if (and (> len 0) (eqv? (string-ref line (- len 1)) #\return))
+        (substring line 0 (- len 1)) line))))
+
+(define (get-config name)
+  (send "ZYKLONB get_config :" name)
+  (car (message-params (parse-message (get-line-crlf irc-input-port)))))
+
+(define (extract-nick prefix)
+  (do ([i 0 (+ i 1)] [len (string-length prefix)])
+      ([or (= i len) (char=? #\! (string-ref prefix i))]
+       [substring prefix 0 i])))
+
+(define (string-after s start)
+  (let ([s-len (string-length s)] [with-len (string-length start)])
+    (and (>= s-len with-len)
+         (string=? (substring s 0 with-len) start)
+         (substring s with-len s-len))))
+
+; --- Calculator ---------------------------------------------------------------
+
+; Evaluator derived from the example in The Scheme Programming Language.
+;
+; Even though EVAL with a carefully crafted environment would also do a good
+; job at sandboxing, it would probably be impossible to limit execution time...
+
+(define (env-new formals actuals env)
+  (cond [(null? formals) env]
+        [(symbol? formals) (cons (cons formals actuals) env)]
+        [else (cons (cons (car formals) (car actuals))
+                    (env-new (cdr formals) (cdr actuals) env))]))
+(define (env-lookup var env) (cdr (assq var env)))
+(define (env-assign var val env) (set-cdr! (assq var env) val))
+
+(define (check-reductions r)
+  (if (= (car r) 0)
+    (error 'check-reductions "reduction limit exceeded")
+    (set-car! r (- (car r) 1))))
+
+; TODO - think about implementing more syntactical constructs,
+;   however there's not much point in having anything else in a calculator...
+(define (exec expr r env)
+  (check-reductions r)
+  (cond [(symbol? expr) (env-lookup expr env)]
+        [(pair? expr)
+         (case (car expr)
+           [(quote) (cadr expr)]
+           [(lambda) (lambda vals
+                       (let ([env (env-new (cadr expr) vals env)])
+                         (let loop ([exprs (cddr expr)])
+                           (if (null? (cdr exprs))
+                             (exec (car exprs) r env)
+                             (begin (exec (car exprs) r env)
+                                    (loop (cdr exprs)))))))]
+           [(if) (if (exec (cadr expr) r env)
+                   (exec (caddr expr) r env)
+                   (exec (cadddr expr) r env))]
+           [(set!) (env-assign (cadr expr) (exec (caddr expr) r env) env)]
+           [else (apply (exec (car expr) r env)
+                        (map (lambda (x) (exec x r env)) (cdr expr)))])]
+        [else expr]))
+
+(define-syntax forward
+  (syntax-rules ()
+    [(_) '()]
+    [(_ a b ...) (cons (cons (quote a) a) (forward b ...))]))
+
+; ...which can't prevent me from simply importing most of the standard library
+(define base-library
+  (forward
+    ; Equivalence, procedure predicate, booleans
+    eqv? eq? equal? procedure? boolean? boolean=? not
+    ; numbers, numerical input and output
+    number? complex? real? rational? integer?  exact? inexact? exact inexact
+    real-valued? rational-valued? integer-valued? number->string string->number
+    ; Arithmetic
+    = < > <= >= zero? positive? negative? odd? even? finite? infinite? nan?
+    min max + * - / abs div-and-mod div mod div0-and-mod0 div0 mod0
+    gcd lcm numerator denominator floor ceiling truncate round
+    rationalize exp log sin cos tan asin acos atan sqrt expt
+    make-rectangular make-polar real-part imag-part magnitude angle
+    ; Pairs and lists
+    map for-each cons car cdr caar cadr cdar cddr
+    caaar caadr cadar caddr cdaar cdadr cddar cdddr
+    caaaar caaadr caadar caaddr cadaar cadadr caddar cadddr
+    cdaaar cdaadr cdadar cdaddr cddaar cddadr cdddar cddddr
+    pair? null? list? list length append reverse list-tail list-ref
+    ; Symbols
+    symbol? symbol=? symbol->string string->symbol
+    ; Characters
+    char? char=? char<? char>? char<=? char>=?  char->integer integer->char
+    ; Strings; XXX - omitted make-string - can cause OOM
+    string? string=? string<? string>? string<=? string>=?
+    string string-length string-ref substring
+    string-append string->list list->string string-for-each string-copy
+    ; Vectors; XXX - omitted make-vector - can cause OOM
+    vector? vector vector-length vector-ref vector-set!
+    vector->list list->vector vector-fill! vector-map vector-for-each
+    ; Control features
+    apply call/cc values call-with-values dynamic-wind))
+(define extended-library
+  (forward
+    char-upcase char-downcase char-titlecase char-foldcase
+    char-ci=? char-ci<? char-ci>? char-ci<=? char-ci>=?
+    char-alphabetic? char-numeric? char-whitespace?
+    char-upper-case? char-lower-case? char-title-case?
+    string-upcase string-downcase string-titlecase string-foldcase
+    string-ci=? string-ci<? string-ci>? string-ci<=? string-ci>=?
+    find for-all exists filter partition fold-left fold-right
+    remp remove remv remq memp member memv memq assp assoc assv assq cons*
+    list-sort vector-sort vector-sort!
+    bitwise-not bitwise-and bitwise-ior bitwise-xor bitwise-if
+    bitwise-bit-count bitwise-length bitwise-first-bit-set bitwise-bit-set?
+    bitwise-copy-bit bitwise-bit-field bitwise-copy-bit-field
+    bitwise-arithmetic-shift bitwise-rotate-bit-field bitwise-reverse-bit-field
+    bitwise-arithmetic-shift-left bitwise-arithmetic-shift-right
+    set-car! set-cdr! string-set! string-fill!))
+(define (interpret expr)
+  (exec expr '(2000) (append base-library extended-library)))
+
+; We could show something a bit nicer but it would be quite Guile-specific
+(define (error-string e)
+  (map (lambda (x) (string-append " " (symbol->string x)))
+    (filter (lambda (x) (not (member x '(&who &message &irritants &guile))))
+      (map (lambda (x) (record-type-name (record-rtd x)))
+        (simple-conditions e)))))
+
+(define (calc input respond)
+  (define (stringify x)
+    (call-with-string-output-port (lambda (port) (write x port))))
+  (guard (e [else (display-exception e (current-error-port))
+                  (apply respond "caught" (error-string e))])
+    (let* ([input (open-string-input-port input)]
+           [data (let loop ()
+                   (define datum (get-datum input))
+                   (if (eof-object? datum) '() (cons datum (loop))))])
+      (call-with-values
+        (lambda () (interpret (list (append '(lambda ()) data))))
+        (lambda message
+          (for-all (lambda (x) (respond (stringify x))) message))))))
+
+; --- Main loop ----------------------------------------------------------------
+
+(define prefix (get-config "prefix"))
+(send "ZYKLONB register")
+
+(define (process msg)
+  (when (string-ci=? (message-command msg) "PRIVMSG")
+    (let* ([nick (extract-nick (message-prefix msg))]
+           [target (car (message-params msg))]
+           [response-begin
+             (apply string-append "PRIVMSG "
+               (if (memv (string-ref target 0) (string->list "#&!+"))
+                 `(,target " :" ,nick ": ") `(,nick " :")))]
+           [respond (lambda args (apply send response-begin args))]
+           [text (cadr (message-params msg))]
+           [input (or (string-after text (string-append prefix "calc "))
+                      (string-after text (string-append prefix "= ")))])
+      (when input (calc input respond)))))
+
+(let main-loop ()
+  (define line (get-line-crlf irc-input-port))
+  (unless (eof-object? line)
+    (guard (e [else (display-exception e (current-error-port))])
+      (unless (string=? "" line)
+        (process (parse-message line))))
+    (main-loop)))

plugins/zyklonb/factoids

@@ -0,0 +1,177 @@
+#!/usr/bin/env perl
+#
+# ZyklonB factoids plugin
+#
+# Copyright 2016 Přemysl Janouch <p.janouch@gmail.com>
+# See the file LICENSE for licensing information.
+#
+
+use strict;
+use warnings;
+use Text::Wrap;
+
+# --- IRC protocol -------------------------------------------------------------
+
+binmode STDIN;  select STDIN;  $| = 1; $/ = "\r\n";
+binmode STDOUT; select STDOUT; $| = 1; $\ = "\r\n";
+
+sub parse ($) {
+	chomp (my $line = shift);
+	return undef unless my ($nick, $user, $host, $command, $args) = ($line =~
+		qr/^(?::([^! ]*)(?:!([^@]*)@([^ ]*))? +)?([^ ]+)(?: +(.*))?$/o);
+	return {nick => $nick, user => $user, host => $host, command => $command,
+		args => defined $args ? [$args =~ /:?((?<=:).*|[^ ]+) */og] : []};
+}
+
+sub bot_print {
+	print "ZYKLONB print :${\shift}";
+}
+
+# --- Initialization -----------------------------------------------------------
+
+my %config;
+for my $name (qw(prefix)) {
+	print "ZYKLONB get_config :$name";
+	$config{$name} = (parse <STDIN>)->{args}->[0];
+}
+
+print "ZYKLONB register";
+
+# --- Database -----------------------------------------------------------------
+# Simple map of (factoid_name => [definitions]); all factoids are separated
+# by newlines and definitions by carriage returns.  Both disallowed in IRC.
+
+sub db_load {
+	local $/ = "\n";
+	my ($path) = @_;
+	open my $db, "<", $path or return {};
+
+	my %entries;
+	while (<$db>) {
+		chomp;
+		my @defs = split "\r";
+		$entries{shift @defs} = \@defs;
+	}
+	\%entries
+}
+
+sub db_save {
+	local $\ = "\n";
+	my ($path, $ref) = @_;
+	my $path_new = "$path.new";
+	open my $db, ">", $path_new or die "db save failed: $!";
+
+	my %entries = %$ref;
+	print $db join "\r", ($_, @{$entries{$_}}) for keys %entries;
+	close $db;
+	rename $path_new, $path or die "db save failed: $!";
+}
+
+# --- Factoids -----------------------------------------------------------------
+
+my $db_path = 'factoids.db';
+my %db = %{db_load $db_path};
+
+sub learn {
+	my ($respond, $input) = @_;
+	return &$respond("usage: <name> = <definition>")
+		unless $input =~ /^([^=]+?)(?:\s+(\d+))?\s*=\s*(.+?)\s*$/;
+
+	my ($name, $number, $definition) = ($1, $2, $3);
+	return &$respond("trailing numbers in names are disallowed")
+		if defined $2;
+	$db{$name} = [] unless exists $db{$name};
+
+	my $entries = $db{$name};
+	return &$respond("duplicate definition")
+		if grep { lc $_ eq lc $definition } @$entries;
+
+	push @$entries, $definition;
+	&$respond("saved as #${\scalar @$entries}");
+	db_save $db_path, \%db;
+}
+
+sub check_number {
+	my ($respond, $name, $number) = @_;
+	my $entries = $db{$name};
+	if ($number > @$entries) {
+		&$respond(qq/"$name" has only ${\scalar @$entries} definitions/);
+	} elsif (not $number) {
+		&$respond("number must not be zero");
+	} else {
+		return 1;
+	}
+	return 0;
+}
+
+sub forget {
+	my ($respond, $input) = @_;
+	return &$respond("usage: <name> <number>")
+		unless $input =~ /^([^=]+?)\s+(\d+)\s*$/;
+
+	my ($name, $number) = ($1, int($2));
+	return &$respond(qq/"$name" is undefined/)
+		unless exists $db{$name};
+
+	my $entries = $db{$name};
+	return unless check_number $respond, $name, $number;
+
+	splice @$entries, --$number, 1;
+	&$respond("forgotten");
+	db_save $db_path, \%db;
+}
+
+sub whatis {
+	my ($respond, $input) = @_;
+	return &$respond("usage: <name> [<number>]")
+		unless $input =~ /^([^=]+?)(?:\s+(\d+))?\s*$/;
+
+	my ($name, $number) = ($1, $2);
+	return &$respond(qq/"$name" is undefined/)
+		unless exists $db{$name};
+
+	my $entries = $db{$name};
+	if (defined $number) {
+		return unless check_number $respond, $name, $number;
+		&$respond(qq/"$name" is #$number $entries->[$number - 1]/);
+	} else {
+		my $i = 1;
+		my $definition = join ", ", map { "#${\$i++} $_" } @{$entries};
+		&$respond(qq/"$name" is $definition/);
+	}
+}
+
+sub wildcard {
+	my ($respond, $input) = @_;
+	$input =~ /=/ ? learn(@_) : whatis(@_);
+}
+
+my %commands = (
+	'learn'  => \&learn,
+	'forget' => \&forget,
+	'whatis' => \&whatis,
+	'??'     => \&wildcard,
+);
+
+# --- Input loop ---------------------------------------------------------------
+
+while (my $line = <STDIN>) {
+	my %msg = %{parse $line};
+	my @args = @{$msg{args}};
+
+	# This plugin only bothers to respond to PRIVMSG messages
+	next unless $msg{command} eq 'PRIVMSG' and @args >= 2
+		and my ($cmd, $input) = $args[1] =~ /^$config{prefix}(\S+)\s*(.*)/;
+
+	# So far the only reaction is a PRIVMSG back to the sender, so all the
+	# handlers need is a response callback and all arguments to the command
+	my ($target => $quote) = ($args[0] =~ /^[#+&!]/)
+		? ($args[0] => "$msg{nick}: ") : ($msg{nick} => '');
+	# Wrap all responses so that there's space for our prefix in the message
+	my $respond = sub {
+		local ($Text::Wrap::columns, $Text::Wrap::unexpand) = 400, 0;
+		my $start = "PRIVMSG $target :$quote";
+		print for split "\n", wrap $start, $start, shift;
+	};
+	&{$commands{$cmd}}($respond, $input) if exists($commands{$cmd});
+}

plugins/zyklonb/seen

@@ -0,0 +1,160 @@
+#!/usr/bin/env lua
+--
+-- ZyklonB seen plugin
+--
+-- Copyright 2016 Přemysl Janouch <p.janouch@gmail.com>
+-- See the file LICENSE for licensing information.
+--
+
+function parse (line)
+	local msg = { params = {} }
+	line = line:match ("[^\r]*")
+	for start, word in line:gmatch ("()([^ ]+)") do
+		local colon = word:match ("^:(.*)")
+		if start == 1 and colon then
+			msg.prefix = colon
+		elseif not msg.command then
+			msg.command = word
+		elseif colon then
+			table.insert (msg.params, line:sub (start + 1))
+			break
+		elseif start ~= #line then
+			table.insert (msg.params, word)
+		end
+	end
+	return msg
+end
+
+function get_config (name)
+	io.write ("ZYKLONB get_config :", name, "\r\n")
+	return parse (io.read ()).params[1]
+end
+
+-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+io.output ():setvbuf ('line')
+local prefix = get_config ('prefix')
+io.write ("ZYKLONB register\r\n")
+
+local db = {}
+local db_filename = "seen.db"
+local db_garbage = 0
+
+function remember (who, where, when, what)
+	if not db[who] then db[who] = {} end
+	if db[who][where] then db_garbage = db_garbage + 1 end
+	db[who][where] = { tonumber (when), what }
+end
+
+-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+local db_file, e = io.open (db_filename, "a+")
+if not db_file then error ("cannot open database: " .. e, 0) end
+
+function db_store (who, where, when, what)
+	db_file:write (string.format
+		(":%s %s %s %s :%s\n", who, "PRIVMSG", where, when, what))
+end
+
+function db_compact ()
+	db_file:close ()
+
+	-- Unfortunately, default Lua doesn't have anything like mkstemp()
+	local db_tmpname = db_filename .. "." .. os.time ()
+	db_file, e = io.open (db_tmpname, "a+")
+	if not db_file then error ("cannot save database: " .. e, 0) end
+
+	for who, places in pairs (db) do
+		for where, data in pairs (places) do
+			db_store (who, where, data[1], data[2])
+		end
+	end
+	db_file:flush ()
+
+	local ok, e = os.rename (db_tmpname, db_filename)
+	if not ok then error ("cannot save database: " .. e, 0) end
+	db_garbage = 0
+end
+
+for line in db_file:lines () do
+	local msg = parse (line)
+	remember (msg.prefix, table.unpack (msg.params))
+end
+
+-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+function seen (who, where, args)
+	local respond = function (...)
+		local privmsg = function (target, ...)
+			io.write ("PRIVMSG ", target, " :", table.concat { ... }, "\r\n")
+		end
+		if where:match ("^[#&!+]") then
+			privmsg (where, who, ": ", ...)
+		else
+			privmsg (who, ...)
+		end
+	end
+
+	local whom, e, garbage = args:match ("^(%S+)()%s*(.*)")
+	if not whom or #garbage ~= 0 then
+		return respond ("usage: <name>")
+	elseif who:lower () == whom:lower () then
+		return respond ("I can see you right now.")
+	end
+
+	local top = {}
+	-- That is, * acts like a wildcard, otherwise everything is escaped
+	local pattern = "^" .. whom:gsub ("[%^%$%(%)%%%.%[%]%+%-%?]", "%%%0")
+		:gsub ("%*", ".*"):lower () .. "$"
+	for name, places in pairs (db) do
+		if places[where] and name:lower ():match (pattern) then
+			local when, what = table.unpack (places[where])
+			table.insert (top, { name = name, when = when, what = what })
+		end
+	end
+	if #top == 0 then
+		return respond ("I have not seen \x02" .. whom .. "\x02 here.")
+	end
+
+	-- Get all matching nicknames ordered from the most recently active
+	-- and make the list case insensitive (remove older duplicates)
+	table.sort (top, function (a, b) return a.when > b.when end)
+	for i = #top, 2, -1 do
+		if top[i - 1].name:lower () == top[i].name:lower () then
+			table.remove (top, i)
+		end
+	end
+
+	-- Hopefully the formatting mess will disrupt highlights in clients
+	for i = 1, math.min (#top, 3) do
+		local name = top[i].name:gsub ("^.", "%0\x02\x02")
+		respond (string.format ("\x02%s\x02 -> %s -> %s",
+			name, os.date ("%c", top[i].when), top[i].what))
+	end
+end
+
+function handle (msg)
+	local who = msg.prefix:match ("^[^!@]*")
+	local where, what = table.unpack (msg.params)
+	local when = os.time ()
+
+	local what_log = what:gsub ("^\x01ACTION", "*"):gsub ("\x01$", "")
+	remember (who, where, when, what_log)
+	db_store (who, where, when, what_log)
+
+	-- Comment out to reduce both disk load and reliability
+	db_file:flush ()
+
+	if db_garbage > 5000 then db_compact () end
+
+	if what:sub (1, #prefix) == prefix then
+		local command = what:sub (#prefix + 1)
+		local name, e = command:match ("^(%S+)%s*()")
+		if name == 'seen' then seen (who, where, command:sub (e)) end
+	end
+end
+
+for line in io.lines () do
+	local msg = parse (line)
+	if msg.command == "PRIVMSG" then handle (msg) end
+end

plugins/zyklonb/seen-import-degesch.pl

@@ -0,0 +1,39 @@
+#!/usr/bin/env perl
+# Creates a database for the "seen" plugin from logs for degesch.
+# The results may not be completely accurate but are good for jumpstarting.
+# Usage: ./seen-import-degesch.pl LOG-FILE... > seen.db
+
+use strict;
+use warnings;
+use File::Basename;
+use Time::Piece;
+
+my $db = {};
+for (@ARGV) {
+	my $where = (basename($_) =~ /\.(.*).log/)[0];
+	unless ($where) {
+		print STDERR "Invalid filename: $_\n";
+		next;
+	}
+
+	open my $fh, '<', $_ or die "Failed to open log file: $!";
+	while (<$fh>) {
+		my ($when, $who, $who_action, $what) =
+			/^(.{19}) (?:<[~&@%+]*(.*?)>| \*  (\S+)) (.*)/;
+		next unless $when;
+
+		if ($who_action) {
+			$who = $who_action;
+			$what = "* $what";
+		}
+		$db->{$who}->{$where} =
+			[Time::Piece->strptime($when, "%Y-%m-%d %T")->epoch, $what];
+	}
+}
+
+while (my ($who, $places) = each %$db) {
+	while (my ($where, $data) = each %$places) {
+		my ($when, $what) = @$data;
+		print ":$who PRIVMSG $where $when :$what\n";
+	}
+}

zyklonb.c

@@ -1,7 +1,7 @@
 /*
  * zyklonb.c: the experimental IRC bot
  *
- * Copyright (c) 2014 - 2015, Přemysl Janouch <p.janouch@gmail.com>
+ * Copyright (c) 2014 - 2016, Přemysl Janouch <p.janouch@gmail.com>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -310,8 +310,54 @@ irc_get_boolean_from_config
 	if (set_boolean_if_valid (value, str))
 		return true;
 
-	error_set (e, "invalid configuration value for `%s'", name);
-	return false;
+	return error_set (e, "invalid configuration value for `%s'", name);
+}
+
+static bool
+irc_initialize_ca_set (SSL_CTX *ssl_ctx, const char *file, const char *path,
+	struct error **e)
+{
+	ERR_clear_error ();
+
+	if (file || path)
+	{
+		if (SSL_CTX_load_verify_locations (ssl_ctx, file, path))
+			return true;
+
+		return error_set (e, "%s: %s",
+			"failed to set locations for the CA certificate bundle",
+			ERR_reason_error_string (ERR_get_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 ()));
+	return true;
+}
+
+static bool
+irc_initialize_ca (struct bot_context *ctx, struct error **e)
+{
+	const char *ca_file = str_map_find (&ctx->config, "tls_ca_file");
+	const char *ca_path = str_map_find (&ctx->config, "tls_ca_path");
+
+	char *full_file = ca_file
+		? resolve_filename (ca_file, resolve_relative_config_filename) : NULL;
+	char *full_path = ca_path
+		? resolve_filename (ca_path, resolve_relative_config_filename) : NULL;
+
+	bool ok = false;
+	if      (ca_file && !full_file)
+		error_set (e, "couldn't find the CA bundle file");
+	else if (ca_path && !full_path)
+		error_set (e, "couldn't find the CA bundle path");
+	else
+		ok = irc_initialize_ca_set (ctx->ssl_ctx, full_file, full_path, e);
+
+	free (full_file);
+	free (full_path);
+	return ok;
 }
 
 static bool
@@ -326,40 +372,19 @@ irc_initialize_ssl_ctx (struct bot_context *ctx, struct error **e)
 	SSL_CTX_set_verify (ctx->ssl_ctx,
 		verify ? SSL_VERIFY_PEER : SSL_VERIFY_NONE, NULL);
 
-	const char *ca_file = str_map_find (&ctx->config, "ca_file");
-	const char *ca_path = str_map_find (&ctx->config, "ca_path");
-
 	struct error *error = NULL;
-	if (ca_file || ca_path)
+	if (!irc_initialize_ca (ctx, &error))
 	{
-		if (SSL_CTX_load_verify_locations (ctx->ssl_ctx, ca_file, ca_path))
-			return true;
+		if (verify)
+		{
+			error_propagate (e, error);
+			return false;
+		}
 
-		error_set (&error, "%s: %s",
-			"failed to set locations for the CA certificate bundle",
-			ERR_reason_error_string (ERR_get_error ()));
-		goto ca_error;
+		// Only inform the user if we're not actually verifying
+		print_warning ("%s", error->message);
+		error_free (error);
 	}
-
-	if (!SSL_CTX_set_default_verify_paths (ctx->ssl_ctx))
-	{
-		error_set (&error, "%s: %s",
-			"couldn't load the default CA certificate bundle",
-			ERR_reason_error_string (ERR_get_error ()));
-		goto ca_error;
-	}
-	return true;
-
-ca_error:
-	if (verify)
-	{
-		error_propagate (e, error);
-		return false;
-	}
-
-	// Only inform the user if we're not actually verifying
-	print_warning ("%s", error->message);
-	error_free (error);
 	return true;
 }
 
@@ -419,8 +444,7 @@ error_ssl_1:
 	//   multiple errors on the OpenSSL stack.
 	if (!error_info)
 		error_info = ERR_error_string (ERR_get_error (), NULL);
-	error_set (e, "%s: %s", "could not initialize TLS", error_info);
-	return false;
+	return error_set (e, "%s: %s", "could not initialize TLS", error_info);
 }
 
 static bool
@@ -433,11 +457,8 @@ irc_establish_connection (struct bot_context *ctx,
 
 	int err = getaddrinfo (host, port, &gai_hints, &gai_result);
 	if (err)
-	{
-		error_set (e, "%s: %s: %s",
-			"connection failed", "getaddrinfo", gai_strerror (err));
-		return false;
-	}
+		return error_set (e, "%s: %s: %s", "connection failed",
+			"getaddrinfo", gai_strerror (err));
 
 	int sockfd;
 	for (gai_iter = gai_result; gai_iter; gai_iter = gai_iter->ai_next)
@@ -478,10 +499,7 @@ irc_establish_connection (struct bot_context *ctx,
 	freeaddrinfo (gai_result);
 
 	if (!gai_iter)
-	{
-		error_set (e, "connection failed");
-		return false;
-	}
+		return error_set (e, "connection failed");
 
 	ctx->irc_fd = sockfd;
 	return true;
@@ -636,6 +654,9 @@ recovery_handler (int signum, siginfo_t *info, void *context)
 			"signal received", signal_name);
 	*g_startup_reason_location = buf;
 
+	// Avoid annoying resource intensive infinite loops by sleeping for a bit
+	(void) sleep (1);
+
 	// TODO: maybe pregenerate the path, see the following for some other ways
 	//   that would be illegal to do from within a signal handler:
 	//     http://stackoverflow.com/a/1024937
@@ -1002,88 +1023,85 @@ is_valid_plugin_name (const char *name)
 	return true;
 }
 
-static bool
-plugin_load (struct bot_context *ctx, const char *name, struct error **e)
+static struct plugin *
+plugin_launch (struct bot_context *ctx, const char *name, struct error **e)
 {
 	const char *plugin_dir = str_map_find (&ctx->config, "plugin_dir");
 	if (!plugin_dir)
 	{
 		error_set (e, "plugin directory not set");
-		return false;
-	}
-
-	if (!is_valid_plugin_name (name))
-	{
-		error_set (e, "invalid plugin name");
-		return false;
-	}
-
-	if (str_map_find (&ctx->plugins_by_name, name))
-	{
-		error_set (e, "the plugin has already been loaded");
-		return false;
+		return NULL;
 	}
 
 	int stdin_pipe[2];
 	if (pipe (stdin_pipe) == -1)
 	{
-		error_set (e, "%s: %s: %s",
-			"failed to load the plugin", "pipe", strerror (errno));
-		goto fail_1;
+		error_set (e, "%s: %s", "pipe", strerror (errno));
+		return NULL;
 	}
 
 	int stdout_pipe[2];
 	if (pipe (stdout_pipe) == -1)
 	{
-		error_set (e, "%s: %s: %s",
-			"failed to load the plugin", "pipe", strerror (errno));
-		goto fail_2;
+		error_set (e, "%s: %s", "pipe", strerror (errno));
+		goto fail_1;
 	}
 
+	struct str work_dir;
+	str_init (&work_dir);
+	get_xdg_home_dir (&work_dir, "XDG_DATA_HOME", ".local/share");
+	str_append_printf (&work_dir, "/%s", PROGRAM_NAME);
+
+	if (!mkdir_with_parents (work_dir.str, e))
+		goto fail_2;
+
 	set_cloexec (stdin_pipe[1]);
 	set_cloexec (stdout_pipe[0]);
 
 	pid_t pid = fork ();
 	if (pid == -1)
 	{
-		error_set (e, "%s: %s: %s",
-			"failed to load the plugin", "fork", strerror (errno));
-		goto fail_3;
+		error_set (e, "%s: %s", "fork", strerror (errno));
+		goto fail_2;
 	}
 
 	if (pid == 0)
 	{
 		// Redirect the child's stdin and stdout to the pipes
-		hard_assert (dup2 (stdin_pipe[0],  STDIN_FILENO)  != -1);
-		hard_assert (dup2 (stdout_pipe[1], STDOUT_FILENO) != -1);
+		if (dup2 (stdin_pipe[0], STDIN_FILENO) == -1
+		 || dup2 (stdout_pipe[1], STDOUT_FILENO) == -1)
+		{
+			print_error ("%s: %s: %s", "failed to load the plugin",
+				"dup2", strerror (errno));
+			_exit (EXIT_FAILURE);
+		}
+		if (chdir (work_dir.str))
+		{
+			print_error ("%s: %s: %s", "failed to load the plugin",
+				"chdir", strerror (errno));
+			_exit (EXIT_FAILURE);
+		}
 
 		xclose (stdin_pipe[0]);
 		xclose (stdout_pipe[1]);
 
-		struct str pathname;
-		str_init (&pathname);
-		str_append (&pathname, plugin_dir);
-		str_append_c (&pathname, '/');
-		str_append (&pathname, name);
-
 		// Restore some of the signal handling
 		signal (SIGPIPE, SIG_DFL);
 
-		char *const argv[] = { pathname.str, NULL };
+		char *argv[] = { xstrdup_printf ("%s/%s", plugin_dir, name), NULL };
 		execve (argv[0], argv, environ);
 
 		// We will collect the failure later via SIGCHLD
-		print_error ("%s: %s: %s",
-			"failed to load the plugin", "exec", strerror (errno));
+		print_error ("%s: %s: %s", "failed to load the plugin",
+			"exec", strerror (errno));
 		_exit (EXIT_FAILURE);
 	}
 
+	str_free (&work_dir);
+
 	xclose (stdin_pipe[0]);
 	xclose (stdout_pipe[1]);
 
-	set_blocking (stdout_pipe[0], false);
-	set_blocking (stdin_pipe[1], false);
-
 	struct plugin *plugin = xmalloc (sizeof *plugin);
 	plugin_init (plugin);
 	plugin->ctx = ctx;
@@ -1091,6 +1109,32 @@ plugin_load (struct bot_context *ctx, const char *name, struct error **e)
 	plugin->name = xstrdup (name);
 	plugin->read_fd = stdout_pipe[0];
 	plugin->write_fd = stdin_pipe[1];
+	return plugin;
+
+fail_2:
+	str_free (&work_dir);
+	xclose (stdout_pipe[0]);
+	xclose (stdout_pipe[1]);
+fail_1:
+	xclose (stdin_pipe[0]);
+	xclose (stdin_pipe[1]);
+	return NULL;
+}
+
+static bool
+plugin_load (struct bot_context *ctx, const char *name, struct error **e)
+{
+	if (!is_valid_plugin_name (name))
+		return error_set (e, "invalid plugin name");
+	if (str_map_find (&ctx->plugins_by_name, name))
+		return error_set (e, "the plugin has already been loaded");
+
+	struct plugin *plugin;
+	if (!(plugin = plugin_launch (ctx, name, e)))
+		return false;
+
+	set_blocking (plugin->read_fd, false);
+	set_blocking (plugin->write_fd, false);
 
 	poller_fd_init (&plugin->read_event, &ctx->poller, plugin->read_fd);
 	plugin->read_event.dispatcher = (poller_fd_fn) on_plugin_readable;
@@ -1105,15 +1149,6 @@ plugin_load (struct bot_context *ctx, const char *name, struct error **e)
 
 	poller_fd_set (&plugin->read_event, POLLIN);
 	return true;
-
-fail_3:
-	xclose (stdout_pipe[0]);
-	xclose (stdout_pipe[1]);
-fail_2:
-	xclose (stdin_pipe[0]);
-	xclose (stdin_pipe[1]);
-fail_1:
-	return false;
 }
 
 static bool
@@ -1122,10 +1157,7 @@ plugin_unload (struct bot_context *ctx, const char *name, struct error **e)
 	struct plugin *plugin = str_map_find (&ctx->plugins_by_name, name);
 
 	if (!plugin)
-	{
-		error_set (e, "no such plugin is loaded");
-		return false;
-	}
+		return error_set (e, "no such plugin is loaded");
 
 	plugin_zombify (plugin);
 
@@ -1144,7 +1176,7 @@ plugin_load_all_from_config (struct bot_context *ctx)
 	struct str_vector plugins;
 	str_vector_init (&plugins);
 
-	cstr_split_ignore_empty (plugin_list, ',', &plugins);
+	cstr_split (plugin_list, ",", true, &plugins);
 	for (size_t i = 0; i < plugins.len; i++)
 	{
 		char *name = cstr_strip_in_place (plugins.vector[i], " ");
@@ -1184,7 +1216,7 @@ parse_bot_command (const char *s, const char *command, const char **following)
 static void
 split_bot_command_argument_list (const char *arguments, struct str_vector *out)
 {
-	cstr_split_ignore_empty (arguments, ',', out);
+	cstr_split (arguments, ",", true, out);
 	for (size_t i = 0; i < out->len; )
 	{
 		if (!*cstr_strip_in_place (out->vector[i], " \t"))
@@ -1663,8 +1695,10 @@ struct irc_socks_data
 };
 
 static void
-irc_on_socks_connected (void *user_data, int socket)
+irc_on_socks_connected (void *user_data, int socket, const char *hostname)
 {
+	(void) hostname;
+
 	struct irc_socks_data *data = user_data;
 	data->ctx->irc_fd = socket;
 	data->succeeded = true;
@@ -1722,6 +1756,8 @@ irc_establish_connection_socks (struct bot_context *ctx,
 			str_map_find (&ctx->config, "socks_password"));
 		while (data.polling)
 			poller_run (poller);
+		if (!data.succeeded)
+			error_set (e, "connection failed");
 	}
 
 	socks_connector_free (connector);
@@ -1750,10 +1786,7 @@ irc_connect (struct bot_context *ctx, struct error **e)
 	// TODO: again, get rid of `struct error' in here.  The question is: how
 	//   do we tell our caller that he should not try to reconnect?
 	if (!irc_host)
-	{
-		error_set (e, "no hostname specified in configuration");
-		return false;
-	}
+		return error_set (e, "no hostname specified in configuration");
 
 	bool use_tls;
 	if (!irc_get_boolean_from_config (ctx, "tls", &use_tls, e))
@@ -1799,9 +1832,8 @@ parse_config (struct bot_context *ctx, struct error **e)
 	hard_assert (delay_str != NULL);  // We have a default value for this
 	if (!xstrtoul (&ctx->reconnect_delay, delay_str, 10))
 	{
-		error_set (e, "invalid configuration value for `%s'",
-			"reconnect_delay");
-		return false;
+		return error_set (e,
+			"invalid configuration value for `%s'", "reconnect_delay");
 	}
 
 	hard_assert (!ctx->admin_re);
@@ -1978,12 +2010,7 @@ main (int argc, char *argv[])
 
 	print_status (PROGRAM_NAME " " PROGRAM_VERSION " starting");
 	setup_signal_handlers ();
-
-	SSL_library_init ();
-	atexit (EVP_cleanup);
-	SSL_load_error_strings ();
-	// XXX: ERR_load_BIO_strings()?  Anything else?
-	atexit (ERR_free_strings);
+	init_openssl ();
 
 	struct bot_context ctx;
 	bot_context_init (&ctx);
@@ -2002,6 +2029,12 @@ main (int argc, char *argv[])
 	ctx.signal_event.user_data = &ctx;
 	poller_fd_set (&ctx.signal_event, POLLIN);
 
+#if OpenBSD >= 201605
+	// cpath is for creating the plugin home directory
+	if (pledge ("stdio rpath cpath inet proc exec", NULL))
+		exit_fatal ("%s: %s", "pledge", strerror (errno));
+#endif
+
 	plugin_load_all_from_config (&ctx);
 	if (!parse_config (&ctx, &e)
 	 || !irc_connect (&ctx, &e))