Make a release

Login shells have a dash at the beginning of their first argument.

.clang-format

@@ -0,0 +1,14 @@
+BasedOnStyle: LLVM
+ColumnLimit: 80
+IndentWidth: 4
+TabWidth: 4
+UseTab: ForContinuationAndIndentation
+SpaceAfterCStyleCast: true
+SpaceBeforeParens: Always
+AlignAfterOpenBracket: DontAlign
+AlignEscapedNewlines: DontAlign
+AlignOperands: DontAlign
+AlignConsecutiveMacros: Consecutive
+BreakBeforeTernaryOperators: true
+SpacesBeforeTrailingComments: 2
+WhitespaceSensitiveMacros: ['XX', 'ACTIONS', 'LS']

CMakeLists.txt

@@ -1,24 +1,24 @@
 # target_compile_features has been introduced in that version
-cmake_minimum_required (VERSION 3.1)
-project (sdn VERSION 0.1 LANGUAGES CXX)
+cmake_minimum_required (VERSION 3.1...3.27)
+project (sdn VERSION 1.0 LANGUAGES CXX)
 
 if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic")
-endif ()
-
-# Since we use a language with slow compilers, let's at least use a fast linker
-execute_process (COMMAND ${CMAKE_CXX_COMPILER} -fuse-ld=gold -Wl,--version
-	ERROR_QUIET OUTPUT_VARIABLE ld_version)
-if ("${ld_version}" MATCHES "GNU gold")
-	set (CMAKE_EXE_LINKER_FLAGS "-fuse-ld=gold ${CMAKE_EXE_LINKER_FLAGS}")
+	set (CMAKE_CXX_FLAGS
+		"${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-misleading-indentation -pedantic")
 endif ()
 
 find_package (PkgConfig REQUIRED)
-pkg_check_modules (NCURSESW QUIET ncursesw)
+pkg_check_modules (ACL libacl)
+pkg_check_modules (NCURSESW ncursesw)
+if (NOT NCURSESW_FOUND)
+	find_library (NCURSESW_LIBRARIES NAMES ncursesw)
+	find_path (NCURSESW_INCLUDE_DIRS ncurses.h PATH_SUFFIXES ncurses)
+endif ()
 
 add_executable (${PROJECT_NAME} ${PROJECT_NAME}.cpp)
 target_include_directories (${PROJECT_NAME} PUBLIC ${NCURSESW_INCLUDE_DIRS})
-target_link_libraries (${PROJECT_NAME} PUBLIC ${NCURSESW_LIBRARIES} acl)
+target_link_libraries (${PROJECT_NAME}
+	PUBLIC ${NCURSESW_LIBRARIES} ${ACL_LIBRARIES})
 target_compile_features (${PROJECT_NAME} PUBLIC cxx_std_14)
 target_compile_definitions (${PROJECT_NAME} PUBLIC
 	-DPROJECT_NAME=\"${PROJECT_NAME}\" -DPROJECT_VERSION=\"${PROJECT_VERSION}\")

LICENSE

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

Makefile

@@ -1,19 +1,19 @@
 .POSIX:
 SHELL = /bin/sh
-CXXFLAGS = -g -std=c++14 -Wall -Wextra -pedantic
+CXXFLAGS = -g -std=c++14 -Wall -Wextra -Wno-misleading-indentation -pedantic
 CPPFLAGS = `sed -ne '/^project (\([^ )]*\) VERSION \([^ )]*\).*/ \
 	s//-DPROJECT_NAME="\1" -DPROJECT_VERSION="\2"/p' CMakeLists.txt`
 
 sdn: sdn.cpp CMakeLists.txt
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $< -o sdn \
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $< -o $@ \
 	-lacl `pkg-config --libs --cflags ncursesw`
-static: sdn.cpp CMakeLists.txt
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $< -o sdn \
+sdn-static: sdn.cpp CMakeLists.txt
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $< -o $@ \
 	-static-libstdc++ \
 	-Wl,--start-group,-Bstatic \
 	-lacl `pkg-config --static --libs --cflags ncursesw` \
 	-Wl,--end-group,-Bdynamic
 clean:
-	rm -f sdn
+	rm -f sdn sdn-static
 
-.PHONY: static clean
+.PHONY: clean

NEWS

@@ -0,0 +1,4 @@
+1.0.0 (2024-12-21)
+
+ * Initial release
+

README.adoc

@@ -11,20 +11,22 @@ commands.  It enables you to:
    can be simply forwarded if it is to be edited.  What's more, it will always
    be obvious whether the navigator is running.
 
-The only supported platform is Linux.  I wanted to try a different, simpler
-approach here, and the end result is very friendly to tinkering.
+'sdn' runs on Linux and all BSD derivatives.  I wanted to try a different,
+simpler approach here, and the end result is very friendly to tinkering.
 
 image::sdn.png[align="center"]
 
 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.
+Regular releases are sporadic.  git master should be stable enough.
+You can get a package with the latest development version using Arch Linux's
+https://aur.archlinux.org/packages/sdn-git[AUR],
+or as a https://git.janouch.name/p/nixexprs[Nix derivation].
 
 Building
 --------
 Build dependencies: CMake and/or make, a C++14 compiler, pkg-config +
-Runtime dependencies: ncursesw, libacl
+Runtime dependencies: ncursesw, libacl (on Linux)
 
 // Working around libasciidoc's missing support for escaping it like \++
 Unfortunately most LLVM libc{plus}{plus} versions have a bug that crashes 'sdn'

sdn-install

@@ -16,6 +16,9 @@ sdn-navigate () {
     # helpers after the terminal has been resized while running sdn
     command true
 
+    # Add to history, see https://www.zsh.org/mla/workers/2020/msg00633.html
+    fc -R =(print -- "$helper")
+
     /bin/sh -c "$helper" </dev/tty || break
   done
   # optionally: zle zle-line-init
@@ -51,6 +54,7 @@ sdn-navigate () {
       ((SDN_P=SDN_P+${#insert}+1))
     }
     [[ -z $helper ]] && break
+    history -s -- "$helper"
     /bin/sh -c "$helper" || break
   done
 }
@@ -121,7 +125,7 @@ done
 
 # Figure out the shell to integrate with
 login=$(basename "$SHELL")
-actual=$(ps -p $$ -o ppid= | xargs ps -o comm= -p)
+actual=$(ps -p $$ -o ppid= | xargs ps -o comm= -p | sed 's/^-//')
 if [ -z "$shell" ]
 then
   if [ "$login" != "$actual" ]

sdn.cpp

@@ -1,7 +1,7 @@
 //
 // sdn: simple directory navigator
 //
-// Copyright (c) 2017 - 2021, Přemysl Eric Janouch <p@janouch.name>
+// Copyright (c) 2017 - 2024, Přemysl Eric Janouch <p@janouch.name>
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted.
@@ -18,42 +18,53 @@
 // May be required for ncursesw and we generally want it all anyway
 #define _XOPEN_SOURCE_EXTENDED
 
-#include <string>
-#include <vector>
-#include <locale>
-#include <iostream>
 #include <algorithm>
-#include <cwchar>
 #include <climits>
 #include <cstdlib>
 #include <cstring>
+#include <cwchar>
 #include <fstream>
+#include <iostream>
+#include <locale>
 #include <map>
-#include <tuple>
 #include <memory>
+#include <string>
+#include <tuple>
+#include <vector>
 
-#include <unistd.h>
 #include <dirent.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/acl.h>
 #include <fcntl.h>
-#include <pwd.h>
+#include <fnmatch.h>
 #include <grp.h>
 #include <libgen.h>
-#include <time.h>
+#include <pwd.h>
 #include <signal.h>
-
-#include <sys/inotify.h>
-#include <sys/xattr.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <time.h>
+#include <unistd.h>
+
+#ifdef __linux__
+#include <sys/inotify.h>
+// ACL information is not important enough to be ported
 #include <acl/libacl.h>
+#include <sys/acl.h>
+#include <sys/xattr.h>
+#else
+#include <sys/event.h>
+#endif
 #include <ncurses.h>
 
-// Unicode is complex enough already and we might make assumptions
+// To implement cbreak() with disabled ^S that gets reënabled on endwin()
+#define NCURSES_INTERNALS
+#include <term.h>
+#undef CTRL  // term.h -> termios.h -> sys/ttydefaults.h, too simplistic
+
 #ifndef __STDC_ISO_10646__
-#error Unicode required for wchar_t
+// Unicode is complex enough already and we might make assumptions,
+// though macOS doesn't define this despite using UCS-4,
+// and we won't build on Windows that seems to be the only one to use UTF-16.
 #endif
 
 // Trailing return types make C++ syntax suck considerably less
@@ -93,8 +104,8 @@ fun to_mb (const wstring &wide) -> string {
 	return mb;
 }
 
-fun prefix_length (const wstring &in, const wstring &of) -> int {
-	int score = 0;
+fun prefix_length (const wstring &in, const wstring &of) -> size_t {
+	size_t score = 0;
 	for (size_t i = 0; i < of.size () && in.size () >= i && in[i] == of[i]; i++)
 		score++;
 	return score;
@@ -268,7 +279,7 @@ fun xdg_config_home () -> string {
 fun xdg_config_find (const string &suffix) -> unique_ptr<ifstream> {
 	vector<string> dirs {xdg_config_home ()};
 	const char *system_dirs = getenv ("XDG_CONFIG_DIRS");
-	split (system_dirs ? system_dirs : "/etc/xdg", ":", dirs);
+	split ((system_dirs && *system_dirs) ? system_dirs : "/etc/xdg", ":", dirs);
 	for (const auto &dir : dirs) {
 		if (dir[0] != '/')
 			continue;
@@ -297,7 +308,21 @@ fun xdg_config_write (const string &suffix) -> unique_ptr<fstream> {
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-using ncstring = basic_string<cchar_t>;
+// This should be basic_string, however that crashes on macOS
+using ncstring = vector<cchar_t>;
+
+fun operator+ (const ncstring &lhs, const ncstring &rhs) -> ncstring {
+	ncstring result;
+	result.reserve (lhs.size () + rhs.size ());
+	result.insert (result.end (), lhs.begin (), lhs.end ());
+	result.insert (result.end (), rhs.begin (), rhs.end ());
+	return result;
+}
+
+fun operator+= (ncstring &lhs, const ncstring &rhs) -> ncstring & {
+	lhs.insert (lhs.end (), rhs.begin (), rhs.end ());
+	return lhs;
+}
 
 fun cchar (chtype attrs, wchar_t c) -> cchar_t {
 	cchar_t ch {}; wchar_t ws[] = {c, 0};
@@ -318,9 +343,9 @@ fun invert (cchar_t &ch) {
 }
 
 fun apply_attrs (const wstring &w, attr_t attrs) -> ncstring {
-	ncstring res;
-	for (auto c : w)
-		res += cchar (attrs, c);
+	ncstring res (w.size (), cchar_t {});
+	for (size_t i = 0; i < w.size (); i++)
+		res[i] = cchar (attrs, w[i]);
 	return res;
 }
 
@@ -405,12 +430,13 @@ enum { ALT = 1 << 24, SYM = 1 << 25 };  // Outside the range of Unicode
 #define ACTIONS(XX) XX(NONE) XX(HELP) XX(QUIT) XX(QUIT_NO_CHDIR) \
 	XX(CHOOSE) XX(CHOOSE_FULL) XX(VIEW) XX(EDIT) XX(SORT_LEFT) XX(SORT_RIGHT) \
 	XX(UP) XX(DOWN) XX(TOP) XX(BOTTOM) XX(HIGH) XX(MIDDLE) XX(LOW) \
-	XX(PAGE_PREVIOUS) XX(PAGE_NEXT) XX(SCROLL_UP) XX(SCROLL_DOWN) \
+	XX(PAGE_PREVIOUS) XX(PAGE_NEXT) XX(SCROLL_UP) XX(SCROLL_DOWN) XX(CENTER) \
 	XX(CHDIR) XX(PARENT) XX(GO_START) XX(GO_HOME) \
-	XX(SEARCH) XX(RENAME) XX(RENAME_PREFILL) \
+	XX(SEARCH) XX(RENAME) XX(RENAME_PREFILL) XX(MKDIR) \
 	XX(TOGGLE_FULL) XX(REVERSE_SORT) XX(SHOW_HIDDEN) XX(REDRAW) XX(RELOAD) \
 	XX(INPUT_ABORT) XX(INPUT_CONFIRM) XX(INPUT_B_DELETE) XX(INPUT_DELETE) \
-	XX(INPUT_B_KILL_LINE) XX(INPUT_KILL_LINE) XX(INPUT_QUOTED_INSERT) \
+	XX(INPUT_B_KILL_WORD) XX(INPUT_B_KILL_LINE) XX(INPUT_KILL_LINE) \
+	XX(INPUT_QUOTED_INSERT) \
 	XX(INPUT_BACKWARD) XX(INPUT_FORWARD) XX(INPUT_BEGINNING) XX(INPUT_END)
 
 #define XX(name) ACTION_ ## name,
@@ -437,10 +463,12 @@ static map<wint_t, action> g_normal_actions {
 	{'H', ACTION_HIGH}, {'M', ACTION_MIDDLE}, {'L', ACTION_LOW},
 	{KEY (PPAGE), ACTION_PAGE_PREVIOUS}, {KEY (NPAGE), ACTION_PAGE_NEXT},
 	{CTRL ('Y'), ACTION_SCROLL_UP}, {CTRL ('E'), ACTION_SCROLL_DOWN},
+	{'z', ACTION_CENTER},
 	{'c', ACTION_CHDIR}, {ALT | KEY (UP), ACTION_PARENT},
 	{'&', ACTION_GO_START}, {'~', ACTION_GO_HOME},
-	{'/', ACTION_SEARCH},  {'s', ACTION_SEARCH},
+	{'/', ACTION_SEARCH}, {'s', ACTION_SEARCH}, {CTRL ('S'), ACTION_SEARCH},
 	{ALT | 'e', ACTION_RENAME_PREFILL}, {'e', ACTION_RENAME},
+	{KEY (F (6)), ACTION_RENAME_PREFILL}, {KEY (F (7)), ACTION_MKDIR},
 	{'t', ACTION_TOGGLE_FULL}, {ALT | 't', ACTION_TOGGLE_FULL},
 	{'R', ACTION_REVERSE_SORT}, {ALT | '.', ACTION_SHOW_HIDDEN},
 	{CTRL ('L'), ACTION_REDRAW}, {'r', ACTION_RELOAD},
@@ -451,7 +479,8 @@ static map<wint_t, action> g_input_actions {
 	// Sometimes terminfo is wrong, we need to accept both of these
 	{L'\b', ACTION_INPUT_B_DELETE}, {CTRL ('?'), ACTION_INPUT_B_DELETE},
 	{KEY (BACKSPACE), ACTION_INPUT_B_DELETE}, {KEY (DC), ACTION_INPUT_DELETE},
-	{CTRL ('D'), ACTION_INPUT_DELETE}, {CTRL ('U'), ACTION_INPUT_B_KILL_LINE},
+	{CTRL ('W'), ACTION_INPUT_B_KILL_WORD}, {CTRL ('D'), ACTION_INPUT_DELETE},
+	{CTRL ('U'), ACTION_INPUT_B_KILL_LINE},
 	{CTRL ('K'), ACTION_INPUT_KILL_LINE},
 	{CTRL ('V'), ACTION_INPUT_QUOTED_INSERT},
 	{CTRL ('B'), ACTION_INPUT_BACKWARD}, {KEY (LEFT), ACTION_INPUT_BACKWARD},
@@ -528,7 +557,7 @@ static struct {
 	bool no_chdir;                      ///< Do not tell the shell to chdir
 	bool quitting;                      ///< Whether we should quit already
 
-	int inotify_fd, inotify_wd = -1;    ///< File watch
+	int watch_fd, watch_wd = -1;        ///< File watch (inotify/kqueue)
 	bool out_of_date;                   ///< Entries may be out of date
 
 	const wchar_t *editor;              ///< Prompt string for editing
@@ -537,7 +566,6 @@ static struct {
 	int editor_cursor = 0;              ///< Cursor position
 	bool editor_inserting;              ///< Inserting a literal character
 	void (*editor_on_change) ();        ///< Callback on editor change
-	void (*editor_on_confirm) ();       ///< Callback on editor confirmation
 	map<action, void (*) ()> editor_on; ///< Handlers for custom actions
 
 	enum { AT_CURSOR, AT_BAR, AT_CWD, AT_INPUT, AT_INFO, AT_CMDLINE, AT_COUNT };
@@ -556,8 +584,8 @@ static struct {
 
 	// Refreshed by reload():
 
-	map<uid_t, string> unames;          ///< User names by UID
-	map<gid_t, string> gnames;          ///< Group names by GID
+	map<uid_t, wstring> unames;         ///< User names by UID
+	map<gid_t, wstring> gnames;         ///< Group names by GID
 	struct tm now;                      ///< Current local time for display
 } g;
 
@@ -588,8 +616,10 @@ fun ls_format (const entry &e, bool for_target) -> chtype {
 			set (LS_MULTIHARDLINK);
 		if ((info.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
 			set (LS_EXECUTABLE);
+#ifdef __linux__
 		if (lgetxattr (name.c_str (), "security.capability", NULL, 0) >= 0)
 			set (LS_CAPABILITY);
+#endif
 		if ((info.st_mode & S_ISGID))
 			set (LS_SETGID);
 		if ((info.st_mode & S_ISUID))
@@ -604,8 +634,8 @@ fun ls_format (const entry &e, bool for_target) -> chtype {
 			set (LS_STICKY_OTHER_WRITABLE);
 	} else if (S_ISLNK (info.st_mode)) {
 		type = LS_SYMLINK;
-		if (!e.target_info.st_mode
-		 && (ls_is_colored (LS_ORPHAN) || g.ls_symlink_as_target))
+		if (!e.target_info.st_mode &&
+			(ls_is_colored (LS_ORPHAN) || g.ls_symlink_as_target))
 			type = LS_ORPHAN;
 	} else if (S_ISFIFO (info.st_mode)) {
 		type = LS_FIFO;
@@ -631,15 +661,33 @@ fun ls_format (const entry &e, bool for_target) -> chtype {
 	return format;
 }
 
+fun suffixize (off_t size, unsigned shift, wchar_t suffix, std::wstring &out)
+	-> bool {
+	// Prevent implementation-defined and undefined behaviour
+	if (size < 0 || shift >= sizeof size * 8)
+		return false;
+
+	off_t divided = size >> shift;
+	if (divided >= 10) {
+		out.assign (std::to_wstring (divided)).append (1, suffix);
+		return true;
+	} else if (divided > 0) {
+		unsigned times_ten = size / double (off_t (1) << shift) * 10.0;
+		out.assign ({L'0' + wchar_t (times_ten / 10), L'.',
+			L'0' + wchar_t (times_ten % 10), suffix});
+		return true;
+	}
+	return false;
+}
+
 fun make_entry (const struct dirent *f) -> entry {
 	entry e;
 	e.filename = f->d_name;
 	e.info.st_mode = DTTOIF (f->d_type);
 	auto &info = e.info;
 
-	// TODO: benchmark just readdir() vs. lstat(), also on dead mounts;
-	//   it might make sense to stat asynchronously in threads
-	//   http://lkml.iu.edu/hypermail//linux/kernel/0804.3/1616.html
+	// io_uring is only at most about 50% faster, though it might help with
+	// slowly statting devices, at a major complexity cost.
 	if (lstat (f->d_name, &info)) {
 		e.cols[entry::MODES] = apply_attrs ({ decode_type (info.st_mode),
 			L'?', L'?', L'?', L'?', L'?', L'?', L'?', L'?', L'?' }, 0);
@@ -665,39 +713,44 @@ fun make_entry (const struct dirent *f) -> entry {
 	}
 
 	auto mode = decode_mode (info.st_mode);
-	// This is a Linux-only extension
+#ifdef __linux__
+	// We're using a laughably small subset of libacl: this translates to
+	// two lgetxattr() calls, the results of which are compared with
+	// specific architecture-dependent constants.  Linux-only.
 	if (acl_extended_file_nofollow (f->d_name) > 0)
 		mode += L"+";
+#endif
 	e.cols[entry::MODES] = apply_attrs (mode, 0);
 
 	auto usr = g.unames.find (info.st_uid);
 	e.cols[entry::USER] = (usr != g.unames.end ())
-		? apply_attrs (to_wide (usr->second), 0)
+		? apply_attrs (usr->second, 0)
 		: apply_attrs (to_wstring (info.st_uid), 0);
 
 	auto grp = g.gnames.find (info.st_gid);
 	e.cols[entry::GROUP] = (grp != g.gnames.end ())
-		? apply_attrs (to_wide (grp->second), 0)
+		? apply_attrs (grp->second, 0)
 		: apply_attrs (to_wstring (info.st_gid), 0);
 
-	auto size = to_wstring (info.st_size);
-	if      (info.st_size >> 40) size = to_wstring (info.st_size >> 40) + L"T";
-	else if (info.st_size >> 30) size = to_wstring (info.st_size >> 30) + L"G";
-	else if (info.st_size >> 20) size = to_wstring (info.st_size >> 20) + L"M";
-	else if (info.st_size >> 10) size = to_wstring (info.st_size >> 10) + L"K";
+	std::wstring size;
+	if (!suffixize (info.st_size, 40, L'T', size) &&
+		!suffixize (info.st_size, 30, L'G', size) &&
+		!suffixize (info.st_size, 20, L'M', size) &&
+		!suffixize (info.st_size, 10, L'K', size))
+		size = to_wstring (info.st_size);
 	e.cols[entry::SIZE] = apply_attrs (size, 0);
 
-	char buf[32] = "";
+	wchar_t buf[32] = L"";
 	auto tm = localtime (&info.st_mtime);
-	strftime (buf, sizeof buf,
-		(tm->tm_year == g.now.tm_year) ? "%b %e %H:%M" : "%b %e  %Y", tm);
-	e.cols[entry::MTIME] = apply_attrs (to_wide (buf), 0);
+	wcsftime (buf, sizeof buf / sizeof *buf,
+		(tm->tm_year == g.now.tm_year) ? L"%b %e %H:%M" : L"%b %e  %Y", tm);
+	e.cols[entry::MTIME] = apply_attrs (buf, 0);
 
 	auto &fn = e.cols[entry::FILENAME] =
 		apply_attrs (to_wide (e.filename), ls_format (e, false));
 	if (!e.target_path.empty ()) {
-		fn.append (apply_attrs (to_wide (" -> "), 0));
-		fn.append (apply_attrs (to_wide (e.target_path), ls_format (e, true)));
+		fn += apply_attrs (L" -> ", 0);
+		fn += apply_attrs (to_wide (e.target_path), ls_format (e, true));
 	}
 	return e;
 }
@@ -767,8 +820,8 @@ fun update () {
 			print (info, info_width);
 		}
 
-		auto start = sanitize (prompt + line.substr (0, g.editor_cursor));
-		move (LINES - 1, compute_width (start));
+		line.resize (g.editor_cursor);
+		move (LINES - 1, compute_width (sanitize (prompt + line)));
 		curs_set (1);
 	} else if (!g.message.empty ()) {
 		move (LINES - 1, 0);
@@ -782,9 +835,10 @@ fun update () {
 }
 
 fun operator< (const entry &e1, const entry &e2) -> bool {
-	auto t1 = make_tuple (e1.filename != "..",
+	static string dotdot {".."};
+	auto t1 = make_tuple (e1.filename != dotdot,
 		!S_ISDIR (e1.info.st_mode) && !S_ISDIR (e1.target_info.st_mode));
-	auto t2 = make_tuple (e2.filename != "..",
+	auto t2 = make_tuple (e2.filename != dotdot,
 		!S_ISDIR (e2.info.st_mode) && !S_ISDIR (e2.target_info.st_mode));
 	if (t1 != t2)
 		return t1 < t2;
@@ -821,15 +875,33 @@ fun at_cursor () -> const entry & {
 	return g.cursor >= int (g.entries.size ()) ? invalid : g.entries[g.cursor];
 }
 
+fun focus (const string &anchor) {
+	if (!anchor.empty ()) {
+		for (size_t i = 0; i < g.entries.size (); i++)
+			if (g.entries[i].filename == anchor)
+				g.cursor = i;
+	}
+}
+
+fun resort (const string anchor = at_cursor ().filename) {
+	sort (begin (g.entries), end (g.entries));
+	focus (anchor);
+}
+
+fun show_message (const string &message, int ttl = 30) {
+	g.message = to_wide (message);
+	g.message_ttl = ttl;
+}
+
 fun reload (bool keep_anchor) {
 	g.unames.clear ();
 	while (auto *ent = getpwent ())
-		g.unames.emplace (ent->pw_uid, ent->pw_name);
+		g.unames.emplace (ent->pw_uid, to_wide (ent->pw_name));
 	endpwent ();
 
 	g.gnames.clear ();
 	while (auto *ent = getgrent ())
-		g.gnames.emplace (ent->gr_gid, ent->gr_name);
+		g.gnames.emplace (ent->gr_gid, to_wide (ent->gr_name));
 	endgrent ();
 
 	string anchor;
@@ -839,6 +911,16 @@ fun reload (bool keep_anchor) {
 	auto now = time (NULL); g.now = *localtime (&now);
 	auto dir = opendir (".");
 	g.entries.clear ();
+	if (!dir) {
+		show_message (strerror (errno));
+		if (g.cwd != "/") {
+			struct dirent f = {};
+			strncpy (f.d_name, "..", sizeof f.d_name);
+			f.d_type = DT_DIR;
+			g.entries.push_back (make_entry (&f));
+		}
+		goto readfail;
+	}
 	while (auto f = readdir (dir)) {
 		string name = f->d_name;
 		// Two dots are for navigation but this ain't as useful
@@ -848,45 +930,52 @@ fun reload (bool keep_anchor) {
 			g.entries.push_back (make_entry (f));
 	}
 	closedir (dir);
-	sort (begin (g.entries), end (g.entries));
-	g.out_of_date = false;
 
-	if (!anchor.empty ()) {
-		for (size_t i = 0; i < g.entries.size (); i++)
-			if (g.entries[i].filename == anchor)
-				g.cursor = i;
-	}
+readfail:
+	g.out_of_date = false;
 	for (int col = 0; col < entry::COLUMNS; col++) {
 		auto &longest = g.max_widths[col] = 0;
 		for (const auto &entry : g.entries)
 			longest = max (longest, compute_width (entry.cols[col]));
 	}
 
+	resort (anchor);
+
 	g.cursor = max (0, min (g.cursor, int (g.entries.size ()) - 1));
 	g.offset = max (0, min (g.offset, int (g.entries.size ()) - 1));
 
-	if (g.inotify_wd != -1)
-		inotify_rm_watch (g.inotify_fd, g.inotify_wd);
+#ifdef __linux__
+	if (g.watch_wd != -1)
+		inotify_rm_watch (g.watch_fd, g.watch_wd);
 
 	// We don't show atime, so access and open are merely spam
-	g.inotify_wd = inotify_add_watch (g.inotify_fd, ".",
+	g.watch_wd = inotify_add_watch (g.watch_fd, ".",
 		(IN_ALL_EVENTS | IN_ONLYDIR | IN_EXCL_UNLINK) & ~(IN_ACCESS | IN_OPEN));
-}
+#else
+	if (g.watch_wd != -1)
+		close (g.watch_wd);
 
-fun show_message (const string &message, int ttl = 30) {
-	g.message = to_wide (message);
-	g.message_ttl = ttl;
+	if ((g.watch_wd = open (".", O_RDONLY | O_DIRECTORY | O_CLOEXEC)) >= 0) {
+		// At least the macOS kqueue doesn't report anything too specific
+		struct kevent ev {};
+		EV_SET (&ev, g.watch_wd, EVFILT_VNODE, EV_ADD | EV_CLEAR,
+			NOTE_WRITE | NOTE_LINK, 0, nullptr);
+		(void) kevent (g.watch_fd, &ev, 1, nullptr, 0, nullptr);
+	}
+#endif
 }
 
 fun run_program (initializer_list<const char *> list, const string &filename) {
+	auto args = (!filename.empty() && filename.front() == '-' ? " -- " : " ")
+		+ shell_escape (filename);
 	if (g.ext_helpers) {
-		// XXX: this doesn't try them all out, though it shouldn't make any
-		// noticeable difference
+		// XXX: this doesn't try them all out,
+		// though it shouldn't make any noticeable difference
 		const char *found = nullptr;
 		for (auto program : list)
 			if ((found = program))
 				break;
-		g.ext_helper = found + (" " + shell_escape (filename));
+		g.ext_helper.assign (found).append (args);
 		g.quitting = true;
 		return;
 	}
@@ -902,8 +991,8 @@ fun run_program (initializer_list<const char*> list, const string &filename) {
 		tcsetpgrp (STDOUT_FILENO, getpgid (0));
 
 		for (auto program : list)
-			if (program) execl ("/bin/sh", "/bin/sh", "-c", (string (program)
-				+ " " + shell_escape (filename)).c_str (), NULL);
+			if (program) execl ("/bin/sh", "/bin/sh", "-c",
+				(program + args).c_str (), NULL);
 		_exit (EXIT_FAILURE);
 	default:
 		// ...and make sure of it in the parent as well
@@ -1003,24 +1092,23 @@ fun show_help () {
 	fclose (contents);
 }
 
-/// Stays on the current match when there are no better ones, unless it's pushed
-fun search (const wstring &needle, int push) -> int {
-	int best = g.cursor, best_n = 0, matches = 0, step = push != 0 ? push : 1;
+fun match (const wstring &needle, int push) -> int {
+	string pattern = to_mb (needle) + "*";
+	bool jump_to_first = push || fnmatch (pattern.c_str (),
+		g.entries[g.cursor].filename.c_str (), 0) == FNM_NOMATCH;
+	int best = g.cursor, matches = 0, step = push + !push;
 	for (int i = 0, count = g.entries.size (); i < count; i++) {
-		auto o = (g.cursor + (count + i * step) + (count + push)) % count;
-		int n = prefix_length (to_wide (g.entries[o].filename), needle);
-		matches += n == needle.size ();
-		if (n > best_n) {
+		int o = (g.cursor + (count + i * step) + (count + push)) % count;
+		if (!fnmatch (pattern.c_str (), g.entries[o].filename.c_str (), 0)
+		 && !matches++ && jump_to_first)
 			best = o;
-			best_n = n;
-		}
 	}
 	g.cursor = best;
 	return matches;
 }
 
-fun search_interactive (int push) {
-	int matches = search (g.editor_line, push);
+fun match_interactive (int push) {
+	int matches = match (g.editor_line, push);
 	if (g.editor_line.empty ())
 		g.editor_info.clear ();
 	else if (matches == 0)
@@ -1031,6 +1119,21 @@ fun search_interactive (int push) {
 		g.editor_info = L"(" + to_wstring (matches) + L" matches)";
 }
 
+/// Stays on the current item unless there are better matches
+fun lookup (const wstring &needle) {
+	int best = g.cursor;
+	size_t best_n = 0;
+	for (int i = 0, count = g.entries.size (); i < count; i++) {
+		int o = (g.cursor + i) % count;
+		size_t n = prefix_length (to_wide (g.entries[o].filename), needle);
+		if (n > best_n) {
+			best = o;
+			best_n = n;
+		}
+	}
+	g.cursor = best;
+}
+
 fun fix_cursor_and_offset () {
 	g.cursor = min (g.cursor, int (g.entries.size ()) - 1);
 	g.cursor = max (g.cursor, 0);
@@ -1087,7 +1190,7 @@ fun pop_levels (const string& old_cwd) {
 
 	fix_cursor_and_offset ();
 	if (!anchor.empty () && at_cursor ().filename != anchor)
-		search (to_wide (anchor), 0);
+		lookup (to_wide (anchor));
 }
 
 fun explode_path (const string &path, vector<string> &out) {
@@ -1212,9 +1315,9 @@ fun choose (const entry &entry) {
 // Move the cursor in `diff` direction and look for non-combining characters
 fun move_towards_spacing (int diff) -> bool {
 	g.editor_cursor += diff;
-	return g.editor_cursor <= 0
-		|| g.editor_cursor >= int (g.editor_line.length ())
-		|| wcwidth (g.editor_line.at (g.editor_cursor));
+	return g.editor_cursor <= 0 ||
+		g.editor_cursor >= int (g.editor_line.length ()) ||
+		wcwidth (g.editor_line.at (g.editor_cursor));
 }
 
 fun handle_editor (wint_t c) {
@@ -1228,16 +1331,16 @@ fun handle_editor (wint_t c) {
 			action = i->second;
 
 		auto m = g_binding_contexts.find (to_mb (g.editor));
-		if (m != g_binding_contexts.end ()
-		 && (i = m->second->find (c)) != m->second->end ())
+		if (m != g_binding_contexts.end () &&
+			(i = m->second->find (c)) != m->second->end ())
 			action = i->second;
 	}
 
 	auto original = g.editor_line;
 	switch (action) {
 	case ACTION_INPUT_CONFIRM:
-		if (g.editor_on_confirm)
-			g.editor_on_confirm ();
+		if (auto handler = g.editor_on[action])
+			handler ();
 		// Fall-through
 	case ACTION_INPUT_ABORT:
 		g.editor = 0;
@@ -1246,7 +1349,6 @@ fun handle_editor (wint_t c) {
 		g.editor_cursor = 0;
 		g.editor_inserting = false;
 		g.editor_on_change = nullptr;
-		g.editor_on_confirm = nullptr;
 		g.editor_on.clear ();
 		return;
 	case ACTION_INPUT_BEGINNING:
@@ -1256,13 +1358,13 @@ fun handle_editor (wint_t c) {
 		g.editor_cursor = g.editor_line.length ();
 		break;
 	case ACTION_INPUT_BACKWARD:
-		while (g.editor_cursor > 0
-			&& !move_towards_spacing (-1))
+		while (g.editor_cursor > 0 &&
+			!move_towards_spacing (-1))
 			;
 		break;
 	case ACTION_INPUT_FORWARD:
-		while (g.editor_cursor < int (g.editor_line.length ())
-			&& !move_towards_spacing (+1))
+		while (g.editor_cursor < int (g.editor_line.length ()) &&
+			!move_towards_spacing (+1))
 			;
 		break;
 	case ACTION_INPUT_B_DELETE:
@@ -1280,6 +1382,17 @@ fun handle_editor (wint_t c) {
 				break;
 		}
 		break;
+	case ACTION_INPUT_B_KILL_WORD:
+	{
+		int i = g.editor_cursor;
+		while (i && g.editor_line[--i] == L' ');
+		while (i-- && g.editor_line[i] != L' ');
+		i++;
+
+		g.editor_line.erase (i, g.editor_cursor - i);
+		g.editor_cursor = i;
+		break;
+	}
 	case ACTION_INPUT_B_KILL_LINE:
 		g.editor_line.erase (0, g.editor_cursor);
 		g.editor_cursor = 0;
@@ -1295,6 +1408,7 @@ fun handle_editor (wint_t c) {
 		if (auto handler = g.editor_on[action]) {
 			handler ();
 		} else if (c & (ALT | SYM)) {
+			if (c != KEY (RESIZE))
 				beep ();
 		} else {
 			g.editor_line.insert (g.editor_cursor, 1, c);
@@ -1351,12 +1465,12 @@ fun handle (wint_t c) -> bool {
 	case ACTION_SORT_LEFT:
 		g.sort_column = (g.sort_column + entry::COLUMNS - 1) % entry::COLUMNS;
 		g.sort_flash_ttl = 2;
-		reload (true);
+		resort ();
 		break;
 	case ACTION_SORT_RIGHT:
 		g.sort_column = (g.sort_column + entry::COLUMNS + 1) % entry::COLUMNS;
 		g.sort_flash_ttl = 2;
-		reload (true);
+		resort ();
 		break;
 
 	case ACTION_UP:
@@ -1395,10 +1509,13 @@ fun handle (wint_t c) -> bool {
 	case ACTION_SCROLL_UP:
 		g.offset--;
 		break;
+	case ACTION_CENTER:
+		g.offset = g.cursor - (visible_lines () - 1) / 2;
+		break;
 
 	case ACTION_CHDIR:
 		g.editor = L"chdir";
-		g.editor_on_confirm = [] {
+		g.editor_on[ACTION_INPUT_CONFIRM] = [] {
 			change_dir (untilde (to_mb (g.editor_line)));
 		};
 		break;
@@ -1414,10 +1531,10 @@ fun handle (wint_t c) -> bool {
 
 	case ACTION_SEARCH:
 		g.editor = L"search";
-		g.editor_on_change       = [] { search_interactive (0); };
-		g.editor_on[ACTION_UP]   = [] { search_interactive (-1); };
-		g.editor_on[ACTION_DOWN] = [] { search_interactive (+1); };
-		g.editor_on_confirm      = [] { choose (at_cursor ()); };
+		g.editor_on_change                = [] { match_interactive (0); };
+		g.editor_on[ACTION_UP]            = [] { match_interactive (-1); };
+		g.editor_on[ACTION_DOWN]          = [] { match_interactive (+1); };
+		g.editor_on[ACTION_INPUT_CONFIRM] = [] { choose (at_cursor ()); };
 		break;
 	case ACTION_RENAME_PREFILL:
 		g.editor_line = to_wide (current.filename);
@@ -1425,19 +1542,30 @@ fun handle (wint_t c) -> bool {
 		// Fall-through
 	case ACTION_RENAME:
 		g.editor = L"rename";
-		g.editor_on_confirm = [] {
+		g.editor_on[ACTION_INPUT_CONFIRM] = [] {
 			auto mb = to_mb (g.editor_line);
-			rename (at_cursor ().filename.c_str (), mb.c_str ());
+			if (rename (at_cursor ().filename.c_str (), mb.c_str ()))
+				show_message (strerror (errno));
 			reload (true);
 		};
 		break;
+	case ACTION_MKDIR:
+		g.editor = L"mkdir";
+		g.editor_on[ACTION_INPUT_CONFIRM] = [] {
+			auto mb = to_mb (g.editor_line);
+			if (mkdir (mb.c_str (), 0777))
+				show_message (strerror (errno));
+			reload (true);
+			focus (mb);
+		};
+		break;
 
 	case ACTION_TOGGLE_FULL:
 		g.full_view = !g.full_view;
 		break;
 	case ACTION_REVERSE_SORT:
 		g.reverse_sort = !g.reverse_sort;
-		reload (true);
+		resort ();
 		break;
 	case ACTION_SHOW_HIDDEN:
 		g.show_hidden = !g.show_hidden;
@@ -1458,19 +1586,27 @@ fun handle (wint_t c) -> bool {
 	return !g.quitting;
 }
 
-fun inotify_check () {
-	// Only provide simple indication that contents might have changed
-	char buf[4096]; ssize_t len;
+fun watch_check () {
 	bool changed = false;
-	while ((len = read (g.inotify_fd, buf, sizeof buf)) > 0) {
+	// Only provide simple indication that contents might have changed,
+	// if only because kqueue can't do any better
+#ifdef __linux__
+	char buf[4096]; ssize_t len;
+	while ((len = read (g.watch_fd, buf, sizeof buf)) > 0) {
 		const inotify_event *e;
 		for (char *ptr = buf; ptr < buf + len; ptr += sizeof *e + e->len) {
 			e = (const inotify_event *) buf;
-			if (e->wd == g.inotify_wd)
-				changed = g.out_of_date = true;
+			if (e->wd == g.watch_wd)
+				changed = true;
 		}
 	}
-	if (changed)
+#else
+	struct kevent ev {};
+	struct timespec timeout {};
+	if (kevent (g.watch_fd, nullptr, 0, &ev, 1, &timeout) > 0)
+		changed = ev.filter == EVFILT_VNODE && (ev.fflags & NOTE_WRITE);
+#endif
+	if ((g.out_of_date = changed))
 		update ();
 }
 
@@ -1534,8 +1670,8 @@ fun load_ls_colors (vector<string> colors) {
 		if (equal == string::npos)
 			continue;
 		auto key = pair.substr (0, equal), value = pair.substr (equal + 1);
-		if (key != g_ls_colors[LS_SYMLINK]
-		 || !(g.ls_symlink_as_target = value == "target"))
+		if (key != g_ls_colors[LS_SYMLINK] ||
+			!(g.ls_symlink_as_target = value == "target"))
 			attrs[key] = decode_ansi_sgr (split (value, ";"));
 	}
 	for (int i = 0; i < LS_COUNT; i++) {
@@ -1792,10 +1928,17 @@ int main (int argc, char *argv[]) {
 	// So that the neither us nor our children stop on tcsetpgrp()
 	signal (SIGTTOU, SIG_IGN);
 
-	if ((g.inotify_fd = inotify_init1 (IN_NONBLOCK)) < 0) {
+#ifdef __linux__
+	if ((g.watch_fd = inotify_init1 (IN_NONBLOCK)) < 0) {
 		cerr << "cannot initialize inotify" << endl;
 		return 1;
 	}
+#else
+	if ((g.watch_fd = kqueue ()) < 0) {
+		cerr << "cannot initialize kqueue" << endl;
+		return 1;
+	}
+#endif
 
 	locale::global (locale (""));
 	load_bindings ();
@@ -1815,6 +1958,13 @@ int main (int argc, char *argv[]) {
 	pop_levels (g.cwd);
 	update ();
 
+	// Cunt, now I need to reïmplement all signal handling
+#if NCURSES_VERSION_PATCH < 20210821
+	// This gets applied along with the following halfdelay()
+	cur_term->Nttyb.c_cc[VSTOP] =
+		cur_term->Nttyb.c_cc[VSTART] = _POSIX_VDISABLE;
+#endif
+
 	// Invoking keypad() earlier would make ncurses flush its output buffer,
 	// which would worsen start-up flickering
 	if (halfdelay (1) == ERR || keypad (stdscr, TRUE) == ERR) {
@@ -1825,7 +1975,7 @@ int main (int argc, char *argv[]) {
 
 	wint_t c;
 	while (!read_key (c) || handle (c)) {
-		inotify_check ();
+		watch_check ();
 		if (g.sort_flash_ttl && !--g.sort_flash_ttl)
 			update ();
 		if (g.message_ttl && !--g.message_ttl) {