Remove dependency on libsimple since it's not portable

Signed-off-by: Mattias Andrée <m@maandree.se>

1 files changed, 101 insertions, 0 deletions

diff --git a/src/util.c b/src/util.c
index 0c1adc9..595f236 100644
--- a/src/util.c
+++ b/src/util.c
@@ -224,3 +224,104 @@ apply_nonblock:
 		eprintf("fcntl <pipe> F_SETFL +O_NONBLOCK:");
 }
 #endif
+
+
+void *
+ecalloc(size_t n, size_t m)
+{
+	char *ret = calloc(n, m);
+	if (!ret)
+		eprintf("calloc:");
+	return ret;
+}
+
+
+void *
+emalloc(size_t n)
+{
+	char *ret = malloc(n);
+	if (!ret)
+		eprintf("malloc:");
+	return ret;
+}
+
+
+void *
+erealloc(void *ptr, size_t n)
+{
+	char *ret = realloc(ptr, n);
+	if (!ret)
+		eprintf("realloc:");
+	return ret;
+}
+
+
+char *
+estrdup(const char *s)
+{
+	char *ret = strdup(s);
+	if (!ret)
+		eprintf("strdup:");
+	return ret;
+}
+
+
+void
+vweprintf(const char *fmt, va_list args)
+{
+	int saved_errno;
+	const char *errstrprefix, *errstr;
+#if !defined(WINDOWS)
+	int locked;
+#endif
+
+	saved_errno = errno;
+	if (!*fmt) {
+		errstrprefix = "";
+		errstr = strerror(saved_errno);
+	} else if (strchr(fmt, '\0')[-1] == '\n') {
+		errstrprefix = "";
+		errstr = NULL;
+	} else if (strchr(fmt, '\0')[-1] == ':') {
+		errstrprefix = " ";
+		errstr = strerror(saved_errno);
+	} else {
+		errstrprefix = "";
+		errstr = "";
+	}
+#if !defined(WINDOWS)
+	locked = !flock(STDERR_FILENO, LOCK_EX);
+#endif
+
+	fprintf(stderr, "%s: ", argv0);
+	vfprintf(stderr, fmt, args);
+	if (errstr)
+		fprintf(stderr, "%s%s\n", errstrprefix, errstr);
+
+#if !defined(WINDOWS)
+	if (locked)
+		flock(STDERR_FILENO, LOCK_UN);
+#endif
+	errno = saved_errno;
+}
+
+
+void
+weprintf(const char *fmt, ...)
+{
+	va_list args;
+	va_start(args, fmt);
+	vweprintf(fmt, args);
+	va_end(args);
+}
+
+
+void
+eprintf(const char *fmt, ...)
+{
+	va_list args;
+	va_start(args, fmt);
+	vweprintf(fmt, args);
+	va_end(args);
+	exit(1);
+}