Merge branch 'improvements'

15 files changed, 161 insertions, 0 deletions

diff --git a/tests/mksock.c b/tests/mksock.c
new file mode 100644
index 0000000..a996d58
--- /dev/null
+++ b/tests/mksock.c
@@ -0,0 +1,131 @@
+/****************************************************************************
+ * bfs                                                                      *
+ * Copyright (C) 2019 Tavian Barnes <tavianator@tavianator.com>             *
+ *                                                                          *
+ * 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.           *
+ ****************************************************************************/
+
+/**
+ * There's no standard Unix utility that creates a socket file, so this small
+ * program does the job.
+ */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <libgen.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/un.h>
+#include <unistd.h>
+
+/**
+ * Print an error message.
+ */
+static void errmsg(const char *cmd, const char *path) {
+	fprintf(stderr, "%s: '%s': %s.\n", cmd, path, strerror(errno));
+}
+
+/**
+ * struct sockaddr_un::sun_path is very short, so we chdir() into the target
+ * directory before creating sockets in case the full path is too long but the
+ * file name is not.
+ */
+static int chdir_parent(const char *path) {
+	char *copy = strdup(path);
+	if (!copy) {
+		return -1;
+	}
+	const char *dir = dirname(copy);
+
+	int ret = chdir(dir);
+
+	int error = errno;
+	free(copy);
+	errno = error;
+
+	return ret;
+}
+
+/**
+ * Initialize a struct sockaddr_un with the right filename.
+ */
+static int init_sun(struct sockaddr_un *sock, const char *path) {
+	size_t len = strlen(path);
+	if (len == 0 || path[len - 1] == '/') {
+		errno = ENOENT;
+		return -1;
+	}
+
+	char *copy = strdup(path);
+	if (!copy) {
+		return -1;
+	}
+	const char *base = basename(copy);
+
+	len = strlen(base);
+	if (len >= sizeof(sock->sun_path)) {
+		free(copy);
+		errno = ENAMETOOLONG;
+		return -1;
+	}
+
+	sock->sun_family = AF_UNIX;
+	memcpy(sock->sun_path, base, len + 1);
+	free(copy);
+	return 0;
+}
+
+int main(int argc, char *argv[]) {
+	const char *cmd = argc > 0 ? argv[0] : "mksock";
+
+	if (argc != 2) {
+		fprintf(stderr, "Usage: %s NAME\n", cmd);
+		return EXIT_FAILURE;
+	}
+
+	const char *path = argv[1];
+
+	if (chdir_parent(path) != 0) {
+		errmsg(cmd, path);
+		return EXIT_FAILURE;
+	}
+
+	struct sockaddr_un sock;
+	if (init_sun(&sock, path) != 0) {
+		errmsg(cmd, path);
+		return EXIT_FAILURE;
+	}
+
+	int fd = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (fd < 0) {
+		errmsg(cmd, path);
+		return EXIT_FAILURE;
+	}
+
+	int ret = EXIT_SUCCESS;
+
+	if (bind(fd, (struct sockaddr *)&sock, sizeof(sock)) != 0) {
+		errmsg(cmd, path);
+		ret = EXIT_FAILURE;
+	}
+
+	if (close(fd) != 0) {
+		errmsg(cmd, path);
+		ret = EXIT_FAILURE;
+	}
+
+	return ret;
+}
diff --git a/tests/test_closed_stdin.out b/tests/test_closed_stdin.out
new file mode 100644
index 0000000..bb3cd8d
--- /dev/null
+++ b/tests/test_closed_stdin.out
@@ -0,0 +1,19 @@
+basic
+basic/a
+basic/b
+basic/c
+basic/e
+basic/g
+basic/i
+basic/j
+basic/k
+basic/l
+basic/c/d
+basic/e/f
+basic/g/h
+basic/j/foo
+basic/k/foo
+basic/l/foo
+basic/k/foo/bar
+basic/l/foo/bar
+basic/l/foo/bar/baz
diff --git a/tests/test_color.out b/tests/test_color.out
index e267da8..40e09b4 100644
--- a/tests/test_color.out
+++ b/tests/test_color.out
@@ -1,5 +1,6 @@
 rainbow
 rainbow/exec.sh
+rainbow/socket
 rainbow/link.txt
 rainbow/sticky_ow
 rainbow/sgid
diff --git a/tests/test_color_ext.out b/tests/test_color_ext.out
index d2e2a70..f8c4d28 100644
--- a/tests/test_color_ext.out
+++ b/tests/test_color_ext.out
@@ -1,5 +1,6 @@
 rainbow
 rainbow/exec.sh
+rainbow/socket
 rainbow/link.txt
 rainbow/file.txt
 rainbow/sticky_ow
diff --git a/tests/test_color_ext0.out b/tests/test_color_ext0.out
index 3bc8dc1..8710fc8 100644
--- a/tests/test_color_ext0.out
+++ b/tests/test_color_ext0.out
@@ -1,6 +1,7 @@
 rainbow
 rainbow/file.txt
 rainbow/exec.sh
+rainbow/socket
 rainbow/link.txt
 rainbow/sticky_ow
 rainbow/sgid
diff --git a/tests/test_color_mh.out b/tests/test_color_mh.out
index 600451e..32e2b95 100644
--- a/tests/test_color_mh.out
+++ b/tests/test_color_mh.out
@@ -1,5 +1,6 @@
 rainbow
 rainbow/exec.sh
+rainbow/socket
 rainbow/link.txt
 rainbow/mh1
 rainbow/mh2
diff --git a/tests/test_color_mh0.out b/tests/test_color_mh0.out
index e267da8..40e09b4 100644
--- a/tests/test_color_mh0.out
+++ b/tests/test_color_mh0.out
@@ -1,5 +1,6 @@
 rainbow
 rainbow/exec.sh
+rainbow/socket
 rainbow/link.txt
 rainbow/sticky_ow
 rainbow/sgid
diff --git a/tests/test_color_mi.out b/tests/test_color_mi.out
index e267da8..40e09b4 100644
--- a/tests/test_color_mi.out
+++ b/tests/test_color_mi.out
@@ -1,5 +1,6 @@
 rainbow
 rainbow/exec.sh
+rainbow/socket
 rainbow/link.txt
 rainbow/sticky_ow
 rainbow/sgid
diff --git a/tests/test_color_missing_colon.out b/tests/test_color_missing_colon.out
index d2e2a70..f8c4d28 100644
--- a/tests/test_color_missing_colon.out
+++ b/tests/test_color_missing_colon.out
@@ -1,5 +1,6 @@
 rainbow
 rainbow/exec.sh
+rainbow/socket
 rainbow/link.txt
 rainbow/file.txt
 rainbow/sticky_ow
diff --git a/tests/test_color_or.out b/tests/test_color_or.out
index 6e94bc6..e132546 100644
--- a/tests/test_color_or.out
+++ b/tests/test_color_or.out
@@ -1,5 +1,6 @@
 rainbow
 rainbow/exec.sh
+rainbow/socket
 rainbow/link.txt
 rainbow/broken
 rainbow/sticky_ow
diff --git a/tests/test_color_or0_mi.out b/tests/test_color_or0_mi.out
index cafa798..8b92ded 100644
--- a/tests/test_color_or0_mi.out
+++ b/tests/test_color_or0_mi.out
@@ -1,5 +1,6 @@
 rainbow
 rainbow/exec.sh
+rainbow/socket
 rainbow/broken
 rainbow/link.txt
 rainbow/sticky_ow
diff --git a/tests/test_color_or_mi.out b/tests/test_color_or_mi.out
index 7e57688..8a095a8 100644
--- a/tests/test_color_or_mi.out
+++ b/tests/test_color_or_mi.out
@@ -1,6 +1,7 @@
 rainbow
 rainbow/broken
 rainbow/exec.sh
+rainbow/socket
 rainbow/link.txt
 rainbow/sticky_ow
 rainbow/sgid
diff --git a/tests/test_color_or_mi0.out b/tests/test_color_or_mi0.out
index 7e57688..8a095a8 100644
--- a/tests/test_color_or_mi0.out
+++ b/tests/test_color_or_mi0.out
@@ -1,6 +1,7 @@
 rainbow
 rainbow/broken
 rainbow/exec.sh
+rainbow/socket
 rainbow/link.txt
 rainbow/sticky_ow
 rainbow/sgid
diff --git a/tests/test_ok_closed_stdin.out b/tests/test_ok_closed_stdin.out
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/test_ok_closed_stdin.out
diff --git a/tests/test_okdir_closed_stdin.out b/tests/test_okdir_closed_stdin.out
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/test_okdir_closed_stdin.out