X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/96f3a8a54eeb3b2294ed953dad8b15349f3e2703..d47d78255ef8ede773c69a97e2cb5de78cee7da9:/util.c

diff --git a/util.c b/util.c
index cd3524b..a7576b4 100644
--- a/util.c
+++ b/util.c
@@ -1,26 +1,86 @@
 /* See LICENSE file for copyright and license details. */
+#include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "util.h"
 
+char *argv0;
+
+static void
+verr(const char *fmt, va_list ap)
+{
+	if (argv0 && strncmp(fmt, "usage", sizeof("usage") - 1)) {
+		fprintf(stderr, "%s: ", argv0);
+	}
+
+	vfprintf(stderr, fmt, ap);
+
+	if (fmt[0] && fmt[strlen(fmt) - 1] == ':') {
+		fputc(' ', stderr);
+		perror(NULL);
+	} else {
+		fputc('\n', stderr);
+	}
+}
+
+void
+warn(const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	verr(fmt, ap);
+	va_end(ap);
+}
+
+void
+die(const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	verr(fmt, ap);
+	va_end(ap);
+
+	exit(1);
+}
+
 const char *
 bprintf(const char *fmt, ...)
 {
 	va_list ap;
-	size_t len;
+	int ret;
 
 	va_start(ap, fmt);
-	len = vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
+	if ((ret = vsnprintf(buf, sizeof(buf), fmt, ap)) < 0) {
+		warn("vsnprintf:");
+	} else if ((size_t)ret >= sizeof(buf)) {
+		warn("vsnprintf: Output truncated");
+	}
 	va_end(ap);
 
-	if (len >= sizeof(buf))
-		buf[sizeof(buf)-1] = '\0';
-
 	return buf;
 }
 
+const char *
+fmt_scaled(size_t bytes)
+{
+	unsigned int i;
+	float scaled;
+	const char *units[] = { "B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB",
+	                        "ZiB", "YiB" };
+
+	scaled = bytes;
+	for (i = 0; i < LEN(units) && scaled >= 1024; i++) {
+		scaled /= 1024.0;
+	}
+
+	return bprintf("%.1f%s", scaled, units[i]);
+}
+
 int
 pscanf(const char *path, const char *fmt, ...)
 {
@@ -29,7 +89,7 @@ pscanf(const char *path, const char *fmt, ...)
 	int n;
 
 	if (!(fp = fopen(path, "r"))) {
-		fprintf(stderr, "fopen for %s failed", path);
+		warn("fopen '%s':", path);
 		return -1;
 	}
 	va_start(ap, fmt);