commit - 9d65b1d9ae3209a8a2bc8e8c376dede4f71290ce
commit + c553191ed9d1aa9c51b3617893fc11019635c3cd
blob - 60f44eabb2ef406faef7d11a9fdabd181c7873a3
blob + a53c81059b97b7a452859d64d8ffce6e0f1981a8
--- Makefile.am
+++ Makefile.am
@@ -45,7 +45,7 @@ telescope_SOURCES =	cmd.c			\
 			ui.h			\
 			utf8.c			\
 			utf8.h			\
-			util.c			\
+			utils.c			\
 			utils.h			\
 			wrap.c
 
blob - a5d1e24337dabd9284ea816ef502588921762707 (mode 644)
blob + /dev/null
--- util.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) 2021 Omar Polo <op@omarpolo.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "compat.h"
-
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "telescope.h"
-#include "utils.h"
-
-static void	 imsg_event_add(struct imsgev *);
-
-int
-mark_nonblock(int fd)
-{
-	int flags;
-
-	if ((flags = fcntl(fd, F_GETFL)) == -1)
-		return 0;
-	if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) == -1)
-		return 0;
-	return 1;
-}
-
-int
-has_prefix(const char *str, const char *prfx)
-{
-	size_t i;
-
-	for (i = 0; str[i] != '\0' && prfx[i] != '\0'; ++i)
-		if (str[i] != prfx[i])
-			return 0;
-	return prfx[i] == '\0';
-}
-
-int
-has_suffix(const char *str, const char *sufx)
-{
-	size_t l, s;
-
-	l = strlen(str);
-	s = strlen(sufx);
-
-	if (l < s)
-		return 0;
-
-	return !strcmp(str + (l - s), sufx);
-}
-
-int
-unicode_isspace(uint32_t cp)
-{
-	if (cp < INT8_MAX)
-		return isspace(cp);
-	return 0;
-}
-
-int
-unicode_isgraph(uint32_t cp)
-{
-	if (cp < INT8_MAX)
-		return isgraph(cp);
-	return 1;
-}
-
-static void
-imsg_event_add(struct imsgev *iev)
-{
-	iev->events = EV_READ;
-	if (iev->ibuf.w.queued)
-		iev->events |= EV_WRITE;
-
-	event_del(&iev->ev);
-	event_set(&iev->ev, iev->ibuf.fd, iev->events, iev->handler, iev);
-	event_add(&iev->ev, NULL);
-}
-
-int
-dispatch_imsg(struct imsgev *iev, short event, imsg_handlerfn **handlers,
-    size_t size)
-{
-	struct imsgbuf	*ibuf;
-	struct imsg	 imsg;
-	size_t		 datalen, i;
-	ssize_t		 n;
-
-	ibuf = &iev->ibuf;
-
-	if (event & EV_READ) {
-		if ((n = imsg_read(ibuf)) == -1 && errno != EAGAIN)
-			err(1, "imsg_read error");
-		if (n == 0)
-			return -1;
-	}
-	if (event & EV_WRITE) {
-		if ((n = msgbuf_write(&ibuf->w)) == -1 && errno != EAGAIN)
-			err(1, "msgbuf_write");
-		if (n == 0)
-			return -1;
-	}
-
-	for (;;) {
-		if ((n = imsg_get(ibuf, &imsg)) == -1)
-			_exit(1);
-		if (n == 0)
-			break;
-		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
-		i = imsg.hdr.type;
-		if (i > (size / sizeof(imsg_handlerfn*)) || handlers[i] == NULL)
-			abort();
-		handlers[i](&imsg, datalen);
-		imsg_free(&imsg);
-	}
-
-	imsg_event_add(iev);
-	return 0;
-}
-
-int
-imsg_compose_event(struct imsgev *iev, uint16_t type, uint32_t peerid,
-    pid_t pid, int fd, const void *data, uint16_t datalen)
-{
-	int	ret;
-
-	if ((ret = imsg_compose(&iev->ibuf, type, peerid, pid, fd, data,
-	    datalen) != -1))
-		imsg_event_add(iev);
-
-	return ret;
-}
-
-void *
-hash_alloc(size_t len, void *d)
-{
-	if ((d = malloc(len)) == NULL)
-		abort();
-	return d;
-}
-
-void *
-hash_calloc(size_t nmemb, size_t size, void *d)
-{
-	if ((d = calloc(nmemb, size)) == NULL)
-		abort();
-	return d;
-}
-
-void
-hash_free(void *ptr, void *d)
-{
-	free(ptr);
-}
blob - /dev/null
blob + a5d1e24337dabd9284ea816ef502588921762707 (mode 644)
--- /dev/null
+++ utils.c
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2021 Omar Polo <op@omarpolo.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "compat.h"
+
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "telescope.h"
+#include "utils.h"
+
+static void	 imsg_event_add(struct imsgev *);
+
+int
+mark_nonblock(int fd)
+{
+	int flags;
+
+	if ((flags = fcntl(fd, F_GETFL)) == -1)
+		return 0;
+	if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) == -1)
+		return 0;
+	return 1;
+}
+
+int
+has_prefix(const char *str, const char *prfx)
+{
+	size_t i;
+
+	for (i = 0; str[i] != '\0' && prfx[i] != '\0'; ++i)
+		if (str[i] != prfx[i])
+			return 0;
+	return prfx[i] == '\0';
+}
+
+int
+has_suffix(const char *str, const char *sufx)
+{
+	size_t l, s;
+
+	l = strlen(str);
+	s = strlen(sufx);
+
+	if (l < s)
+		return 0;
+
+	return !strcmp(str + (l - s), sufx);
+}
+
+int
+unicode_isspace(uint32_t cp)
+{
+	if (cp < INT8_MAX)
+		return isspace(cp);
+	return 0;
+}
+
+int
+unicode_isgraph(uint32_t cp)
+{
+	if (cp < INT8_MAX)
+		return isgraph(cp);
+	return 1;
+}
+
+static void
+imsg_event_add(struct imsgev *iev)
+{
+	iev->events = EV_READ;
+	if (iev->ibuf.w.queued)
+		iev->events |= EV_WRITE;
+
+	event_del(&iev->ev);
+	event_set(&iev->ev, iev->ibuf.fd, iev->events, iev->handler, iev);
+	event_add(&iev->ev, NULL);
+}
+
+int
+dispatch_imsg(struct imsgev *iev, short event, imsg_handlerfn **handlers,
+    size_t size)
+{
+	struct imsgbuf	*ibuf;
+	struct imsg	 imsg;
+	size_t		 datalen, i;
+	ssize_t		 n;
+
+	ibuf = &iev->ibuf;
+
+	if (event & EV_READ) {
+		if ((n = imsg_read(ibuf)) == -1 && errno != EAGAIN)
+			err(1, "imsg_read error");
+		if (n == 0)
+			return -1;
+	}
+	if (event & EV_WRITE) {
+		if ((n = msgbuf_write(&ibuf->w)) == -1 && errno != EAGAIN)
+			err(1, "msgbuf_write");
+		if (n == 0)
+			return -1;
+	}
+
+	for (;;) {
+		if ((n = imsg_get(ibuf, &imsg)) == -1)
+			_exit(1);
+		if (n == 0)
+			break;
+		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
+		i = imsg.hdr.type;
+		if (i > (size / sizeof(imsg_handlerfn*)) || handlers[i] == NULL)
+			abort();
+		handlers[i](&imsg, datalen);
+		imsg_free(&imsg);
+	}
+
+	imsg_event_add(iev);
+	return 0;
+}
+
+int
+imsg_compose_event(struct imsgev *iev, uint16_t type, uint32_t peerid,
+    pid_t pid, int fd, const void *data, uint16_t datalen)
+{
+	int	ret;
+
+	if ((ret = imsg_compose(&iev->ibuf, type, peerid, pid, fd, data,
+	    datalen) != -1))
+		imsg_event_add(iev);
+
+	return ret;
+}
+
+void *
+hash_alloc(size_t len, void *d)
+{
+	if ((d = malloc(len)) == NULL)
+		abort();
+	return d;
+}
+
+void *
+hash_calloc(size_t nmemb, size_t size, void *d)
+{
+	if ((d = calloc(nmemb, size)) == NULL)
+		abort();
+	return d;
+}
+
+void
+hash_free(void *ptr, void *d)
+{
+	free(ptr);
+}