Update NEWS, bump version

We were in plain conflict with RFC 2812 for no apparent reason.

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "liberty"]
 	path = liberty
-	url = git://github.com/pjanouch/liberty.git
+	url = https://git.janouch.name/p/liberty.git

.travis.yml

@@ -1,44 +0,0 @@
-sudo: required
-dist: trusty
-language: c
-notifications:
- irc:
-  channels: "irc.janouch.name#dev"
-  use_notice: true
-  skip_join: true
-env:
- global:
-  - secure: "ck6keK5tTbVCN7VGyKglS890hjovUNt2zyOydiyFtQDciaB/rvEwkKy4anMCEdZHFpGAPE9iBmNYaGUsD1Y+KifhhImVMbuThe2D8MLv5crSLRheYPbbmhO8MWPAxmQnuQhpwsUKZlHvUfX8nh+d0juNdqXklvhVml78Gi99QFw="
- matrix:
-  - readline=ON libedit=OFF
-  - readline=OFF libedit=ON
-addons:
- coverity_scan:
-  project:
-   name: "pjanouch/uirc3"
-   description: "Experimental IRC client, daemon and bot"
-  notification_email: p.janouch@gmail.com
-  build_command_prepend: "cmake .. -DCMAKE_BUILD_TYPE=Release"
-  build_command: "make"
-  branch_pattern: coverity_scan
-compiler:
- - clang
- - gcc
-before_install:
- # We need this PPA for a recent version of libedit
- - sudo add-apt-repository ppa:ondrej/php5-5.6 -y
- # We need this PPA for Lua 5.3
- - sudo add-apt-repository ppa:vbernat/haproxy-1.6 -y
- - sudo apt-get update -qq
-install:
- - sudo apt-get install -y libncursesw5-dev libreadline-dev libedit-dev
-   liblua5.3-dev libffi-dev help2man expect
-before_script:
- - mkdir build
- - cd build
-script:
- - cmake .. -DCMAKE_INSTALL_PREFIX=/usr
-   -DWANT_READLINE=$readline -DWANT_LIBEDIT=$libedit
- - make all test
- - cpack -G DEB
- - ../test

CMakeLists.txt

@@ -6,14 +6,14 @@ option (WANT_READLINE "Use GNU Readline for the UI (better)" ON)
 option (WANT_LIBEDIT "Use BSD libedit for the UI" OFF)
 
 # Moar warnings
-if ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUC)
+if ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUCC)
 	# -Wunused-function is pretty annoying here, as everything is static
-	set (CMAKE_C_FLAGS
+	set (wdisabled "-Wno-unused-function")
-		"${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra -Wno-unused-function")
+	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra ${wdisabled}")
-endif ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUC)
+endif ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUCC)
 
 # Version
-set (project_version "0.9.4")
+set (project_version "0.9.7")
 
 # 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.
@@ -84,7 +84,7 @@ 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)
-option (WITH_LUA "Enable experimental support for Lua plugins" ${lua_FOUND})
+option (WITH_LUA "Enable support for Lua plugins" ${lua_FOUND})
 
 if (WITH_LUA)
 	if (NOT lua_FOUND)
@@ -180,6 +180,8 @@ endfunction (make_tests_for)
 include (CTest)
 if (BUILD_TESTING)
 	make_tests_for (degesch)
+	add_test (NAME custom-static-analysis
+		COMMAND ${PROJECT_SOURCE_DIR}/test-static)
 endif (BUILD_TESTING)
 
 # Various clang-based diagnostics, loads of fake positives and spam
@@ -232,7 +234,7 @@ endforeach (page)
 set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Experimental IRC client, daemon and bot")
 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_PACKAGE_CONTACT "Přemysl Janouch <p@janouch.name>")
 set (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
 
 set (CPACK_GENERATOR "TGZ;ZIP")

LICENSE

@@ -1,8 +1,7 @@
-Copyright (c) 2014 - 2015, Přemysl Janouch <p.janouch@gmail.com>
+Copyright (c) 2014 - 2018, Přemysl Janouch <p@janouch.name>
 
 Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
+purpose with or without fee is hereby granted.
-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

NEWS

@@ -1,3 +1,75 @@
+0.9.7 (2018-10-21) "Business as Usual"
+
+ * kike: fix wildcard handling in WHOIS
+
+ * kike: properly handle STATS without parametetrs
+
+ * kike: abort earlier when an invalid mode character is detected while
+   processing channel MODE messages
+
+ * kike: do not send NICK notifications when the nickname doesn't really change
+
+ * kike: fix hostname string verification (only used for "server_name")
+
+
+0.9.6 (2018-06-22) "I've Been Sitting Here All This Time"
+
+ * Code has been relicensed to 0BSD and moved to a private git hosting
+
+ * Fix LibreSSL compatibility
+
+ * degesch: a second /disconnect cuts the connection by force
+
+ * degesch: send a QUIT message to the IRC server on Ctrl-C
+
+ * degesch: add a Slack plugin (even though the gateway's now defunct)
+
+ * degesch: show an error message on log write failure
+
+ * degesch: fix parsing of literal IPv6 addresses with port numbers
+
+ * degesch: fix some error messages
+
+ * degesch: workaround a Readline bug in the fancy-prompt.lua plugin
+
+ * kike: fix two memory leaks
+
+ * kike: improve error handling for incoming connections
+
+ * kike: disable TLS session reuse
+
+
+0.9.5 (2016-12-30) "It's Time"
+
+ * Better support for the KILL command
+
+ * degesch: export many more fields to the Lua API, add a prompt hook
+
+ * 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

README.adoc

@@ -2,17 +2,17 @@ uirc3
 =====
 :compact-option:
 
-The unethical IRC trinity.  This project consists of an experimental IRC client,
+The [line-through]#unethical# edgy IRC trinity.  This project consists of an
-daemon, and bot.  It's all you're ever going to need for chatting, as long as
+experimental IRC client, daemon, and bot.  It's all you're ever going to need
-you can make do with minimalist software.
+for chatting, as long as you can make do with minimalist software.
 
 All of them have these potentially interesting properties:
 
- - full IPv6 support
+ - IPv6 support
  - TLS support, including client certificates
  - lean on dependencies (with the exception of 'degesch')
  - compact and arguably easy to hack on
- - permissive license
+ - very permissive license
 
 degesch
 -------
@@ -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
 ----
@@ -50,6 +52,9 @@ Not supported:
    be used to implement this feature if needed
  - limits of almost any kind, just connections and mode `+l`
 
+This program has been https://git.janouch.name/p/haven/src/branch/master/hid[
+ported to Go], and development continues over there.
+
 ZyklonB
 -------
 The IRC bot.  It builds upon the concept of my other VitaminA IRC bot.  The main
@@ -66,11 +71,7 @@ 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
+a package with the latest development version from Archlinux's AUR.
-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
 --------
@@ -79,7 +80,7 @@ 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
+ $ git clone --recursive https://git.janouch.name/p/uirc3.git
  $ mkdir uirc3/build
  $ cd uirc3/build
  $ cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Debug \
@@ -142,26 +143,47 @@ 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
+Use https://git.janouch.name/p/uirc3 to report any bugs, request features,
-requests.  If you want to discuss this project, or maybe just hang out with
+or submit pull requests.  `git send-email` is tolerated.  If you want to discuss
-the developer, feel free to join me at irc://irc.janouch.name, channel #dev.
+the project, feel free to join me at ircs://irc.janouch.name, channel #dev.
 
-Disclaimer
+Bitcoin donations are accepted at: 12r5uEWEgcHC46xd64tt3hHt9EUvYYDHe9
-----------
-I am not an antisemitist, I'm just being an offensive asshole with the naming.
-And no, I'm not going to change the names.
 
 License
 -------
-'uirc3' is written by Přemysl Janouch <p.janouch@gmail.com>.
+This software is released under the terms of the 0BSD license, the text of which
+is included within the package along with the list of authors.
 
-You may use the software under the terms of the ISC license, the text of which
+Note that 'degesch' technically becomes GPL-licensed when you statically link it
-is included within the package, or, at your option, you may relicense the work
+against GNU Readline, but that is not a concern of this source package.
-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

@@ -1,11 +1,10 @@
 /*
  * common.c: common functionality
  *
- * Copyright (c) 2014 - 2015, Přemysl Janouch <p.janouch@gmail.com>
+ * Copyright (c) 2014 - 2015, Přemysl Janouch <p@janouch.name>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
+ * purpose with or without fee is hereby granted.
- * 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
@@ -34,17 +33,32 @@
 #include <arpa/inet.h>
 #include <netinet/tcp.h>
 
-/// Shorthand to set an error and return failure from the function
+static void
-#define FAIL(...)                                                              \
+init_openssl (void)
-	BLOCK_START                                                                \
+{
-		error_set (e, __VA_ARGS__);                                            \
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
-		return 0;                                                              \
+	SSL_library_init ();
-	BLOCK_END
+	// 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 --------------------------------------------------
 
+static void
+cstr_set (char **s, char *new)
+{
+	free (*s);
+	*s = new;
+}
+
 static ssize_t
-str_vector_find (const struct str_vector *v, const char *s)
+strv_find (const struct strv *v, const char *s)
 {
 	for (size_t i = 0; i < v->len; i++)
 		if (!strcmp (v->vector[i], s))
@@ -73,11 +87,10 @@ unixtime_msec (long *msec)
 static char *
 resolve_relative_runtime_unique_filename (const char *filename)
 {
-	struct str path;
-	str_init (&path);
-
 	const char *runtime_dir = getenv ("XDG_RUNTIME_DIR");
 	const char *tmpdir = getenv ("TMPDIR");
+
+	struct str path = str_make ();
 	if (runtime_dir && *runtime_dir == '/')
 		str_append (&path, runtime_dir);
 	else if (tmpdir && *tmpdir == '/')
@@ -108,79 +121,11 @@ 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;
 }
 
-// --- Simple network I/O ------------------------------------------------------
-
-// TODO: move to liberty and remove from dwmstatus.c as well
-
-#define SOCKET_IO_OVERFLOW (8 << 20)    ///< How large a read buffer can be
-
-enum socket_io_result
-{
-	SOCKET_IO_OK,                       ///< Completed successfully
-	SOCKET_IO_EOF,                      ///< Connection shut down by peer
-	SOCKET_IO_ERROR                     ///< Connection error
-};
-
-static enum socket_io_result
-socket_io_try_read (int socket_fd, struct str *rb, struct error **e)
-{
-	// We allow buffering of a fair amount of data, however within reason,
-	// so that it's not so easy to flood us and cause an allocation failure
-	ssize_t n_read;
-	while (rb->len < SOCKET_IO_OVERFLOW)
-	{
-		str_ensure_space (rb, 4096);
-		n_read = recv (socket_fd, rb->str + rb->len,
-			rb->alloc - rb->len - 1 /* null byte */, 0);
-
-		if (n_read > 0)
-		{
-			rb->str[rb->len += n_read] = '\0';
-			continue;
-		}
-		if (n_read == 0)
-			return SOCKET_IO_EOF;
-
-		if (errno == EAGAIN)
-			return SOCKET_IO_OK;
-		if (errno == EINTR)
-			continue;
-
-		error_set (e, "%s", strerror (errno));
-		return SOCKET_IO_ERROR;
-	}
-	return SOCKET_IO_OK;
-}
-
-static enum socket_io_result
-socket_io_try_write (int socket_fd, struct str *wb, struct error **e)
-{
-	ssize_t n_written;
-	while (wb->len)
-	{
-		n_written = send (socket_fd, wb->str, wb->len, 0);
-		if (n_written >= 0)
-		{
-			str_remove_slice (wb, 0, n_written);
-			continue;
-		}
-
-		if (errno == EAGAIN)
-			return SOCKET_IO_OK;
-		if (errno == EINTR)
-			continue;
-
-		error_set (e, "%s", strerror (errno));
-		return SOCKET_IO_ERROR;
-	}
-	return SOCKET_IO_OK;
-}
-
 // --- Logging -----------------------------------------------------------------
 
 static void
@@ -762,7 +707,7 @@ socks_try_fill_read_buffer (struct socks_connector *self, size_t n)
 		return true;
 
 	ssize_t received;
-	str_ensure_space (&self->read_buffer, remains);
+	str_reserve (&self->read_buffer, remains);
 	do
 		received = recv (self->socket_fd,
 			self->read_buffer.str + self->read_buffer.len, remains, 0);
@@ -786,8 +731,8 @@ socks_call_on_data (struct socks_connector *self)
 	if (self->read_buffer.len < to_consume)
 		return true;
 
-	struct msg_unpacker unpacker;
+	struct msg_unpacker unpacker =
-	msg_unpacker_init (&unpacker, self->read_buffer.str, self->read_buffer.len);
+		msg_unpacker_make (self->read_buffer.str, self->read_buffer.len);
 	bool result = self->on_data (self, &unpacker);
 	str_remove_slice (&self->read_buffer, 0, to_consume);
 	return result;
@@ -852,16 +797,16 @@ socks_connector_init (struct socks_connector *self, struct poller *poller)
 {
 	memset (self, 0, sizeof *self);
 
-	poller_fd_init (&self->socket_event, poller, (self->socket_fd = -1));
+	self->socket_event = poller_fd_make (poller, (self->socket_fd = -1));
 	self->socket_event.dispatcher = (poller_fd_fn) socks_connector_on_ready;
 	self->socket_event.user_data = self;
 
-	poller_timer_init (&self->timeout, poller);
+	self->timeout = poller_timer_make (poller);
 	self->timeout.dispatcher = (poller_timer_fn) socks_connector_on_timeout;
 	self->timeout.user_data = self;
 
-	str_init (&self->read_buffer);
+	self->read_buffer = str_make ();
-	str_init (&self->write_buffer);
+	self->write_buffer = str_make ();
 }
 
 static void
@@ -962,8 +907,8 @@ static struct ctcp_chunk *
 ctcp_chunk_new (void)
 {
 	struct ctcp_chunk *self = xcalloc (1, sizeof *self);
-	str_init (&self->tag);
+	self->tag = str_make ();
-	str_init (&self->text);
+	self->text = str_make ();
 	return self;
 }
 
@@ -1023,6 +968,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)
 {
@@ -1045,15 +997,11 @@ ctcp_parse_tagged (const char *chunk, size_t len, struct ctcp_chunk *output)
 static struct ctcp_chunk *
 ctcp_parse (const char *message)
 {
-	struct str m;
+	struct str m = str_make ();
-	str_init (&m);
 	ctcp_low_level_decode (message, &m);
 
 	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++)
@@ -1077,7 +1025,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);
 	}
 
@@ -1091,7 +1039,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);
 	}
 

plugins/degesch/auto-rejoin.lua

@@ -1,11 +1,10 @@
 --
 -- auto-rejoin.lua: join back automatically when someone kicks you
 --
--- Copyright (c) 2016, Přemysl Janouch <p.janouch@gmail.com>
+-- Copyright (c) 2016, Přemysl Janouch <p@janouch.name>
 --
 -- Permission to use, copy, modify, and/or distribute this software for any
--- purpose with or without fee is hereby granted, provided that the above
+-- purpose with or without fee is hereby granted.
--- 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
@@ -32,6 +31,7 @@ degesch.setup_config {
 	},
 }
 
+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
@@ -39,9 +39,10 @@ degesch.hook_irc (function (hook, server, line)
 	local who = msg.prefix:match ("^[^!]*")
 	local channel, whom = table.unpack (msg.params)
 	if who ~= whom and whom == server.user.nickname then
-		degesch.hook_timer (function (hook)
+		async.go (function ()
+			await (async.timer_ms (timeout * 1000))
 			server:send ("JOIN " .. channel)
-		end, timeout * 1000)
+		end)
 	end
 	return line
 end)

plugins/degesch/censor.lua

@@ -0,0 +1,73 @@
+--
+-- censor.lua: black out certain users' messages
+--
+-- Copyright (c) 2016, Přemysl Janouch <p@janouch.name>
+--
+-- Permission to use, copy, modify, and/or distribute this software for any
+-- purpose with or without fee is hereby granted.
+--
+-- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+-- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+-- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+-- SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+-- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+-- OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+-- CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+--
+
+local 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,104 @@
+--
+-- fancy-prompt.lua: the fancy multiline prompt you probably want
+--
+-- Copyright (c) 2016, Přemysl Janouch <p@janouch.name>
+--
+-- Permission to use, copy, modify, and/or distribute this software for any
+-- purpose with or without fee is hereby granted.
+--
+-- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+-- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+-- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+-- SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+-- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+-- OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+-- CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+--
+-- 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.
+
+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)
+
+	-- Readline seems to be broken and completely corrupts the prompt
+	-- (tested on 7.0.003 Archlinux, 7.0-5 Debian buster)
+	x = x:gsub("[\128-\255]", "?")
+
+	-- 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

@@ -5,11 +5,10 @@
 --
 -- I call this style closure-oriented programming
 --
--- Copyright (c) 2016, Přemysl Janouch <p.janouch@gmail.com>
+-- Copyright (c) 2016, Přemysl Janouch <p@janouch.name>
 --
 -- Permission to use, copy, modify, and/or distribute this software for any
--- purpose with or without fee is hereby granted, provided that the above
+-- purpose with or without fee is hereby granted.
--- 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
@@ -118,24 +117,23 @@ end
 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.abort () end
+	if running then running:cancel () end
-
+	running = async.go (function ()
-	running = degesch.connect ("ws.audioscrobbler.com", 80, {
+		local c, host, e = await (async.dial ("ws.audioscrobbler.com", 80))
-		on_success = function (c, host)
+		if e then
-			on_connected (buffer, c, host, action)
-			running = nil
-		end,
-		on_error   = function (e)
 			report_error (buffer, e)
-			running = nil
+		else
+			on_connected (buffer, c, host, action)
 		end
-	})
+		running = nil
+	end)
 end
 
 -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

plugins/degesch/ping-timeout.lua

@@ -1,11 +1,10 @@
 --
 -- ping-timeout.lua: ping timeout readability enhancement plugin
 --
--- Copyright (c) 2015 - 2016, Přemysl Janouch <p.janouch@gmail.com>
+-- Copyright (c) 2015 - 2016, Přemysl Janouch <p@janouch.name>
 --
 -- Permission to use, copy, modify, and/or distribute this software for any
--- purpose with or without fee is hereby granted, provided that the above
+-- purpose with or without fee is hereby granted.
--- 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

plugins/degesch/slack.lua

@@ -0,0 +1,147 @@
+--
+-- slack.lua: try to fix up UX when using the Slack IRC gateway
+--
+-- Copyright (c) 2017, Přemysl Janouch <p@janouch.name>
+--
+-- Permission to use, copy, modify, and/or distribute this software for any
+-- purpose with or without fee is hereby granted.
+--
+-- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+-- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+-- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+-- SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+-- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+-- OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+-- CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+--
+
+local servers = {}
+local read_servers = function (v)
+	servers = {}
+	for name in v:lower ():gmatch "[^,]+" do
+		servers[name] = true
+	end
+end
+
+-- This is a reverse list of Slack's automatic emoji, noseless forms
+local unemojify, emoji, emoji_default = false, {}, {
+	heart                        = "<3",
+	broken_heart                 = "</3",
+	sunglasses                   = "8)",
+	anguished                    = "D:",
+	cry                          = ":'(",
+	monkey_face                  = ":o)",
+	kiss                         = ":*",
+	smiley                       = "=)",
+	smile                        = ":D",
+	wink                         = ";)",
+	laughing                     = ":>",
+	neutral_face                 = ":|",
+	open_mouth                   = ":o",
+	angry                        = ">:(",
+	slightly_smiling_face        = ":)",
+	disappointed                 = ":(",
+	confused                     = ":/",
+	stuck_out_tongue             = ":p",
+	stuck_out_tongue_winking_eye = ";p",
+}
+local load_emoji = function (extra)
+	emoji = {}
+	for k, v in pairs (emoji_default) do emoji[k] = v end
+	for k, v in extra:gmatch "([^,]+) ([^,]+)" do emoji[k] = v end
+end
+
+degesch.setup_config {
+	servers = {
+		type = "string_array",
+		default = "\"\"",
+		comment = "list of server names that are Slack IRC gateways",
+		on_change = read_servers
+	},
+	unemojify = {
+		type = "boolean",
+		default = "true",
+		comment = "convert emoji to normal ASCII emoticons",
+		on_change = function (v) unemojify = v end
+	},
+	extra_emoji = {
+		type = "string_array",
+		default = "\"grinning :)),joy :'),innocent o:),persevere >_<\"",
+		comment = "overrides or extra emoji for unemojify",
+		on_change = function (v) load_emoji (v) end
+	}
+}
+
+-- We can handle external messages about what we've supposedly sent just fine,
+-- so let's get rid of that "[username] some message sent from the web UI" crap
+degesch.hook_irc (function (hook, server, line)
+	local msg, us = degesch.parse (line), server.user
+	if not servers[server.name] or msg.command ~= "PRIVMSG" or not us
+		or msg.params[1]:lower () ~= us.nickname:lower () then return line end
+
+	-- Taking a shortcut to avoid lengthy message reassembly
+	local quoted_nick = us.nickname:gsub ("[%^%$%(%)%%%.%[%]%*%+%-%?]", "%%%0")
+	local text = line:match ("^.- PRIVMSG .- :%[" .. quoted_nick .. "%] (.*)$")
+	if not text then return line end
+	return ":" .. us.nickname .. "!" .. server.irc_user_host .. " PRIVMSG "
+		.. msg.prefix:match "^[^!@]*" .. " :" .. text
+end)
+
+-- Unfuck emoji and :nick!nick@irc.tinyspeck.com MODE #channel +v nick : active
+degesch.hook_irc (function (hook, server, line)
+	if not servers[server.name] then return line end
+	if unemojify then
+		local start, text = line:match ("^(.- PRIVMSG .-:)(.*)$")
+		if start then return start .. text:gsub (":([a-z_]+):", function (name)
+			if emoji[name] then return emoji[name] end
+			return ":" .. name .. ":"
+		end) end
+	end
+	return line:gsub ("^(:%S+ MODE .+) : .*", "%1")
+end)
+
+-- The gateway simply ignores the NAMES command altogether
+degesch.hook_input (function (hook, buffer, input)
+	if not buffer.channel or not servers[buffer.server.name]
+		or not input:match "^/names%s*$" then return input end
+
+	local users = buffer.channel.users
+	table.sort (users, function (a, b)
+		if a.prefixes > b.prefixes then return true end
+		if a.prefixes < b.prefixes then return false end
+		return a.user.nickname < b.user.nickname
+	end)
+
+	local names = "Users on " .. buffer.channel.name .. ":"
+	for i, chan_user in ipairs (users) do
+		names = names .. " " .. chan_user.prefixes .. chan_user.user.nickname
+	end
+	buffer:log (names)
+end)
+
+degesch.hook_completion (function (hook, data, word)
+	local chan = degesch.current_buffer.channel
+	local server = degesch.current_buffer.server
+	if not chan or not servers[server.name] then return end
+
+	-- In /commands there is typically no desire at all to add the at sign
+	if data.location == 1 and data.words[1]:match "^/" then return end
+
+	-- Handle both when the at sign is already there and when it is not
+	local needle = word:gsub ("^@", ""):lower ()
+
+	local t = {}
+	local try = function (name)
+		if data.location == 0 then name = name .. ":" end
+		if name:sub (1, #needle):lower () == needle then
+			table.insert (t, "@" .. name)
+		end
+	end
+	for _, chan_user in ipairs (chan.users) do
+		try (chan_user.user.nickname)
+	end
+	for _, special in ipairs { "channel", "here" } do
+		try (special)
+	end
+	return t
+end)

plugins/degesch/thin-cursor.lua

@@ -0,0 +1,27 @@
+--
+-- thin-cursor.lua: set a thin cursor
+--
+-- Copyright (c) 2016, Přemysl Janouch <p@janouch.name>
+--
+-- Permission to use, copy, modify, and/or distribute this software for any
+-- purpose with or without fee is hereby granted.
+--
+-- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+-- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+-- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+-- SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+-- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+-- OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+-- CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+--
+-- 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/degesch/utm-filter.lua

@@ -1,11 +1,10 @@
 --
 -- utm-filter.lua: filter out Google Analytics bullshit from URLs
 --
--- Copyright (c) 2015, Přemysl Janouch <p.janouch@gmail.com>
+-- Copyright (c) 2015, Přemysl Janouch <p@janouch.name>
 --
 -- Permission to use, copy, modify, and/or distribute this software for any
--- purpose with or without fee is hereby granted, provided that the above
+-- purpose with or without fee is hereby granted.
--- 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

plugins/zyklonb/factoids

@@ -2,7 +2,7 @@
 #
 # ZyklonB factoids plugin
 #
-# Copyright 2016 Přemysl Janouch <p.janouch@gmail.com>
+# Copyright 2016 Přemysl Janouch <p@janouch.name>
 # See the file LICENSE for licensing information.
 #
 

plugins/zyklonb/seen

@@ -2,7 +2,7 @@
 --
 -- ZyklonB seen plugin
 --
--- Copyright 2016 Přemysl Janouch <p.janouch@gmail.com>
+-- Copyright 2016 Přemysl Janouch <p@janouch.name>
 -- See the file LICENSE for licensing information.
 --
 

plugins/zyklonb/youtube

@@ -2,7 +2,7 @@
 #
 # ZyklonB YouTube plugin, displaying info about YouTube links
 #
-# Copyright 2014 - 2015, Přemysl Janouch <p.janouch@gmail.com>
+# Copyright 2014 - 2015, Přemysl Janouch <p@janouch.name>
 # See the file LICENSE for licensing information.
 #
 

test-static

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

zyklonb.c

@@ -1,11 +1,10 @@
 /*
  * zyklonb.c: the experimental IRC bot
  *
- * Copyright (c) 2014 - 2016, Přemysl Janouch <p.janouch@gmail.com>
+ * Copyright (c) 2014 - 2016, Přemysl Janouch <p@janouch.name>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
+ * purpose with or without fee is hereby granted.
- * 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
@@ -83,22 +82,22 @@ struct plugin
 	struct str write_buffer;            ///< Output yet to be sent out
 };
 
-static void
+static struct plugin *
-plugin_init (struct plugin *self)
+plugin_new (void)
 {
-	memset (self, 0, sizeof *self);
+	struct plugin *self = xcalloc (1, sizeof *self);
-
 	self->pid = -1;
-	str_init (&self->queued_output);
+	self->queued_output = str_make ();
 
 	self->read_fd = -1;
-	str_init (&self->read_buffer);
+	self->read_buffer = str_make ();
 	self->write_fd = -1;
-	str_init (&self->write_buffer);
+	self->write_buffer = str_make ();
+	return self;
 }
 
 static void
-plugin_free (struct plugin *self)
+plugin_destroy (struct plugin *self)
 {
 	soft_assert (self->pid == -1);
 	free (self->name);
@@ -113,6 +112,8 @@ plugin_free (struct plugin *self)
 
 	if (!self->initialized)
 		str_free (&self->queued_output);
+
+	free (self);
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -152,34 +153,33 @@ static void on_irc_reconnect_timeout (void *user_data);
 static void
 bot_context_init (struct bot_context *self)
 {
-	str_map_init (&self->config);
+	self->config = str_map_make (free);
-	self->config.free = free;
 	simple_config_load_defaults (&self->config, g_config_table);
 	self->admin_re = NULL;
 
 	self->irc_fd = -1;
-	str_init (&self->read_buffer);
+	self->read_buffer = str_make ();
 	self->irc_registered = false;
 
 	self->ssl = NULL;
 	self->ssl_ctx = NULL;
 
 	self->plugins = NULL;
-	str_map_init (&self->plugins_by_name);
+	self->plugins_by_name = str_map_make (NULL);
 
 	poller_init (&self->poller);
 	self->quitting = false;
 	self->polling = false;
 
-	poller_timer_init (&self->timeout_tmr, &self->poller);
+	self->timeout_tmr = poller_timer_make (&self->poller);
 	self->timeout_tmr.dispatcher = on_irc_timeout;
 	self->timeout_tmr.user_data = self;
 
-	poller_timer_init (&self->ping_tmr, &self->poller);
+	self->ping_tmr = poller_timer_make (&self->poller);
 	self->ping_tmr.dispatcher = on_irc_ping_timeout;
 	self->ping_tmr.user_data = self;
 
-	poller_timer_init (&self->reconnect_tmr, &self->poller);
+	self->reconnect_tmr = poller_timer_make (&self->poller);
 	self->reconnect_tmr.dispatcher = on_irc_reconnect_timeout;
 	self->reconnect_tmr.user_data = self;
 }
@@ -193,18 +193,13 @@ bot_context_free (struct bot_context *self)
 	str_free (&self->read_buffer);
 
 	// TODO: terminate the plugins properly before this is called
-	struct plugin *link, *tmp;
+	LIST_FOR_EACH (struct plugin, link, self->plugins)
-	for (link = self->plugins; link; link = tmp)
+		plugin_destroy (link);
-	{
-		tmp = link->next;
-		plugin_free (link);
-		free (link);
-	}
 
 	if (self->irc_fd != -1)
 	{
-		xclose (self->irc_fd);
 		poller_fd_reset (&self->irc_event);
+		xclose (self->irc_fd);
 	}
 	if (self->ssl)
 		SSL_free (self->ssl);
@@ -272,8 +267,7 @@ irc_send (struct bot_context *ctx, const char *format, ...)
 		return false;
 
 	va_start (ap, format);
-	struct str str;
+	struct str str = str_make ();
-	str_init (&str);
 	str_append_vprintf (&str, format, ap);
 	str_append (&str, "\r\n");
 	va_end (ap);
@@ -310,7 +304,7 @@ irc_get_boolean_from_config
 	if (set_boolean_if_valid (value, str))
 		return true;
 
-	FAIL ("invalid configuration value for `%s'", name);
+	return error_set (e, "invalid configuration value for `%s'", name);
 }
 
 static bool
@@ -324,12 +318,14 @@ irc_initialize_ca_set (SSL_CTX *ssl_ctx, const char *file, const char *path,
 		if (SSL_CTX_load_verify_locations (ssl_ctx, file, path))
 			return true;
 
-		FAIL ("%s: %s", "failed to set locations for the CA certificate bundle",
+		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))
-		FAIL ("%s: %s", "couldn't load the default CA certificate bundle",
+		return error_set (e, "%s: %s",
+			"couldn't load the default CA certificate bundle",
 			ERR_reason_error_string (ERR_get_error ()));
 	return true;
 }
@@ -442,7 +438,7 @@ error_ssl_1:
 	//   multiple errors on the OpenSSL stack.
 	if (!error_info)
 		error_info = ERR_error_string (ERR_get_error (), NULL);
-	FAIL ("%s: %s", "could not initialize TLS", error_info);
+	return error_set (e, "%s: %s", "could not initialize TLS", error_info);
 }
 
 static bool
@@ -455,7 +451,7 @@ irc_establish_connection (struct bot_context *ctx,
 
 	int err = getaddrinfo (host, port, &gai_hints, &gai_result);
 	if (err)
-		FAIL ("%s: %s: %s", "connection failed",
+		return error_set (e, "%s: %s: %s", "connection failed",
 			"getaddrinfo", gai_strerror (err));
 
 	int sockfd;
@@ -497,7 +493,7 @@ irc_establish_connection (struct bot_context *ctx,
 	freeaddrinfo (gai_result);
 
 	if (!gai_iter)
-		FAIL ("connection failed");
+		return error_set (e, "connection failed");
 
 	ctx->irc_fd = sockfd;
 	return true;
@@ -507,7 +503,7 @@ irc_establish_connection (struct bot_context *ctx,
 
 static int g_signal_pipe[2];            ///< A pipe used to signal... signals
 
-static struct str_vector
+static struct strv
 	g_original_argv,                    ///< Original program arguments
 	g_recovery_env;                     ///< Environment for re-exec recovery
 
@@ -682,8 +678,8 @@ recovery_handler (int signum, siginfo_t *info, void *context)
 static void
 prepare_recovery_environment (void)
 {
-	str_vector_init (&g_recovery_env);
+	g_recovery_env = strv_make ();
-	str_vector_add_vector (&g_recovery_env, environ);
+	strv_append_vector (&g_recovery_env, environ);
 
 	// Prepare a location within the environment where we will put the startup
 	// (or maybe rather restart) reason in case of an irrecoverable error.
@@ -700,7 +696,7 @@ prepare_recovery_environment (void)
 	else
 	{
 		g_startup_reason_location = g_recovery_env.vector + g_recovery_env.len;
-		str_vector_add (&g_recovery_env, "");
+		strv_append (&g_recovery_env, "");
 	}
 }
 
@@ -962,7 +958,7 @@ on_plugin_readable (const struct pollfd *fd, struct plugin *plugin)
 	struct str *buf = &plugin->read_buffer;
 	while (true)
 	{
-		str_ensure_space (buf, 512 + 1);
+		str_reserve (buf, 512 + 1);
 		ssize_t n_read = read (fd->fd, buf->str + buf->len,
 			buf->alloc - buf->len - 1);
 
@@ -1026,11 +1022,17 @@ 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)
-		FAIL ("plugin directory not set");
+	{
+		error_set (e, "plugin directory not set");
+		return NULL;
+	}
 
 	int stdin_pipe[2];
 	if (pipe (stdin_pipe) == -1)
-		FAIL ("%s: %s", "pipe", strerror (errno));
+	{
+		error_set (e, "%s: %s", "pipe", strerror (errno));
+		return NULL;
+	}
 
 	int stdout_pipe[2];
 	if (pipe (stdout_pipe) == -1)
@@ -1039,8 +1041,7 @@ plugin_launch (struct bot_context *ctx, const char *name, struct error **e)
 		goto fail_1;
 	}
 
-	struct str work_dir;
+	struct str work_dir = str_make ();
-	str_init (&work_dir);
 	get_xdg_home_dir (&work_dir, "XDG_DATA_HOME", ".local/share");
 	str_append_printf (&work_dir, "/%s", PROGRAM_NAME);
 
@@ -1094,8 +1095,7 @@ plugin_launch (struct bot_context *ctx, const char *name, struct error **e)
 	xclose (stdin_pipe[0]);
 	xclose (stdout_pipe[1]);
 
-	struct plugin *plugin = xmalloc (sizeof *plugin);
+	struct plugin *plugin = plugin_new ();
-	plugin_init (plugin);
 	plugin->ctx = ctx;
 	plugin->pid = pid;
 	plugin->name = xstrdup (name);
@@ -1117,9 +1117,9 @@ static bool
 plugin_load (struct bot_context *ctx, const char *name, struct error **e)
 {
 	if (!is_valid_plugin_name (name))
-		FAIL ("invalid plugin name");
+		return error_set (e, "invalid plugin name");
 	if (str_map_find (&ctx->plugins_by_name, name))
-		FAIL ("the plugin has already been loaded");
+		return error_set (e, "the plugin has already been loaded");
 
 	struct plugin *plugin;
 	if (!(plugin = plugin_launch (ctx, name, e)))
@@ -1128,11 +1128,11 @@ plugin_load (struct bot_context *ctx, const char *name, struct error **e)
 	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 = poller_fd_make (&ctx->poller, plugin->read_fd);
 	plugin->read_event.dispatcher = (poller_fd_fn) on_plugin_readable;
 	plugin->read_event.user_data = plugin;
 
-	poller_fd_init (&plugin->write_event, &ctx->poller, plugin->write_fd);
+	plugin->write_event = poller_fd_make (&ctx->poller, plugin->write_fd);
 	plugin->write_event.dispatcher = (poller_fd_fn) on_plugin_writable;
 	plugin->write_event.user_data = plugin;
 
@@ -1149,7 +1149,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)
-		FAIL ("no such plugin is loaded");
+		return error_set (e, "no such plugin is loaded");
 
 	plugin_zombify (plugin);
 
@@ -1165,10 +1165,8 @@ plugin_load_all_from_config (struct bot_context *ctx)
 	if (!plugin_list)
 		return;
 
-	struct str_vector plugins;
+	struct strv plugins = strv_make ();
-	str_vector_init (&plugins);
+	cstr_split (plugin_list, ",", true, &plugins);
-
-	cstr_split_ignore_empty (plugin_list, ',', &plugins);
 	for (size_t i = 0; i < plugins.len; i++)
 	{
 		char *name = cstr_strip_in_place (plugins.vector[i], " ");
@@ -1181,7 +1179,7 @@ plugin_load_all_from_config (struct bot_context *ctx)
 		}
 	}
 
-	str_vector_free (&plugins);
+	strv_free (&plugins);
 }
 
 // --- Main program ------------------------------------------------------------
@@ -1206,13 +1204,13 @@ 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)
+split_bot_command_argument_list (const char *arguments, struct strv *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"))
-			str_vector_remove (out, i);
+			strv_remove (out, i);
 		else
 			i++;
 	}
@@ -1248,10 +1246,8 @@ respond_to_user (struct bot_context *ctx, const struct irc_message *msg,
 	strncpy (nick, msg->prefix, sizeof nick - 1);
 	nick[sizeof nick - 1] = '\0';
 
-	struct str text;
 	va_list ap;
-
+	struct str text = str_make ();
-	str_init (&text);
 	va_start (ap, format);
 	str_append_vprintf (&text, format, ap);
 	va_end (ap);
@@ -1312,9 +1308,7 @@ process_plugin_reload (struct bot_context *ctx,
 static char *
 make_status_report (struct bot_context *ctx)
 {
-	struct str report;
+	struct str report = str_make ();
-	str_init (&report);
-
 	const char *reason = getenv (g_startup_reason_str);
 	if (!reason)
 		reason = "launched normally";
@@ -1359,8 +1353,7 @@ process_privmsg (struct bot_context *ctx, const struct irc_message *msg)
 		return;
 
 	const char *following;
-	struct str_vector list;
+	struct strv list = strv_make ();
-	str_vector_init (&list);
 
 	if (parse_bot_command (text, "quote", &following))
 		// This seems to replace tons of random stupid commands
@@ -1400,7 +1393,7 @@ process_privmsg (struct bot_context *ctx, const struct irc_message *msg)
 			process_plugin_unload (ctx, msg, list.vector[i]);
 	}
 
-	str_vector_free (&list);
+	strv_free (&list);
 }
 
 static void
@@ -1577,13 +1570,11 @@ on_irc_disconnected (struct bot_context *ctx)
 		ctx->ssl_ctx = NULL;
 	}
 
+	poller_fd_reset (&ctx->irc_event);
 	xclose (ctx->irc_fd);
 	ctx->irc_fd = -1;
 	ctx->irc_registered = false;
 
-	ctx->irc_event.closed = true;
-	poller_fd_reset (&ctx->irc_event);
-
 	// TODO: inform plugins about the disconnect event
 
 	// All of our timers have lost their meaning now
@@ -1638,7 +1629,7 @@ on_irc_readable (const struct pollfd *fd, struct bot_context *ctx)
 	bool disconnected = false;
 	while (true)
 	{
-		str_ensure_space (buf, 512);
+		str_reserve (buf, 512);
 		switch (fill_buffer (ctx, buf))
 		{
 		case IRC_READ_AGAIN:
@@ -1778,7 +1769,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)
-		FAIL ("no hostname specified in configuration");
+		return error_set (e, "no hostname specified in configuration");
 
 	bool use_tls;
 	if (!irc_get_boolean_from_config (ctx, "tls", &use_tls, e))
@@ -1799,7 +1790,7 @@ irc_connect (struct bot_context *ctx, struct error **e)
 	}
 	print_status ("connection established");
 
-	poller_fd_init (&ctx->irc_event, &ctx->poller, ctx->irc_fd);
+	ctx->irc_event = poller_fd_make (&ctx->poller, ctx->irc_fd);
 	ctx->irc_event.dispatcher = (poller_fd_fn) on_irc_readable;
 	ctx->irc_event.user_data = ctx;
 
@@ -1823,7 +1814,10 @@ parse_config (struct bot_context *ctx, struct error **e)
 	const char *delay_str = str_map_find (&ctx->config, "reconnect_delay");
 	hard_assert (delay_str != NULL);  // We have a default value for this
 	if (!xstrtoul (&ctx->reconnect_delay, delay_str, 10))
-		FAIL ("invalid configuration value for `%s'", "reconnect_delay");
+	{
+		return error_set (e,
+			"invalid configuration value for `%s'", "reconnect_delay");
+	}
 
 	hard_assert (!ctx->admin_re);
 	const char *admin = str_map_find (&ctx->config, "admin");
@@ -1877,8 +1871,7 @@ on_plugin_death (struct plugin *plugin, int status)
 	plugin->read_fd = -1;
 
 	LIST_UNLINK (ctx->plugins, plugin);
-	plugin_free (plugin);
+	plugin_destroy (plugin);
-	free (plugin);
 
 	// Living child processes block us from quitting
 	try_finish_quit (ctx);
@@ -1956,8 +1949,8 @@ on_signal_pipe_readable (const struct pollfd *fd, struct bot_context *ctx)
 int
 main (int argc, char *argv[])
 {
-	str_vector_init (&g_original_argv);
+	g_original_argv = strv_make ();
-	str_vector_add_vector (&g_original_argv, argv);
+	strv_append_vector (&g_original_argv, argv);
 
 	static const struct opt opts[] =
 	{
@@ -1970,8 +1963,8 @@ main (int argc, char *argv[])
 		{ 0, NULL, NULL, 0, NULL }
 	};
 
-	struct opt_handler oh;
+	struct opt_handler oh =
-	opt_handler_init (&oh, argc, argv, opts, NULL, "Experimental IRC bot.");
+		opt_handler_make (argc, argv, opts, NULL, "Experimental IRC bot.");
 
 	int c;
 	while ((c = opt_handler_get (&oh)) != -1)
@@ -1999,12 +1992,7 @@ main (int argc, char *argv[])
 
 	print_status (PROGRAM_NAME " " PROGRAM_VERSION " starting");
 	setup_signal_handlers ();
-
+	init_openssl ();
-	SSL_library_init ();
-	atexit (EVP_cleanup);
-	SSL_load_error_strings ();
-	// XXX: ERR_load_BIO_strings()?  Anything else?
-	atexit (ERR_free_strings);
 
 	struct bot_context ctx;
 	bot_context_init (&ctx);
@@ -2018,7 +2006,7 @@ main (int argc, char *argv[])
 		exit (EXIT_FAILURE);
 	}
 
-	poller_fd_init (&ctx.signal_event, &ctx.poller, g_signal_pipe[0]);
+	ctx.signal_event = poller_fd_make (&ctx.poller, g_signal_pipe[0]);
 	ctx.signal_event.dispatcher = (poller_fd_fn) on_signal_pipe_readable;
 	ctx.signal_event.user_data = &ctx;
 	poller_fd_set (&ctx.signal_event, POLLIN);
@@ -2050,7 +2038,7 @@ main (int argc, char *argv[])
 		poller_run (&ctx.poller);
 
 	bot_context_free (&ctx);
-	str_vector_free (&g_original_argv);
+	strv_free (&g_original_argv);
 	return EXIT_SUCCESS;
 }