exit(1);
}
+static int
+evsnprintf(char *str, size_t size, const char *fmt, va_list ap)
+{
+ int ret;
+
+ ret = vsnprintf(str, size, fmt, ap);
+
+ if (ret < 0) {
+ warn("vsnprintf:");
+ return -1;
+ } else if ((size_t)ret >= size) {
+ warn("vsnprintf: Output truncated");
+ return -1;
+ }
+
+ return ret;
+}
+
+int
+esnprintf(char *str, size_t size, const char *fmt, ...)
+{
+ va_list ap;
+ int ret;
+
+ va_start(ap, fmt);
+ ret = evsnprintf(str, size, fmt, ap);
+ va_end(ap);
+
+ return ret;
+}
+
const char *
bprintf(const char *fmt, ...)
{
int ret;
va_start(ap, fmt);
- if ((ret = vsnprintf(buf, sizeof(buf), fmt, ap)) < 0) {
- warn("vsnprintf:");
- } else if ((size_t)ret >= sizeof(buf)) {
- warn("vsnprintf: Output truncated");
- }
+ ret = evsnprintf(buf, sizeof(buf), fmt, ap);
va_end(ap);
- return buf;
+ return (ret < 0) ? NULL : buf;
}
const char *
-fmt_scaled(size_t bytes)
+fmt_human(size_t num, int base)
{
- 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;
+ double scaled;
+ size_t i, prefixlen;
+ const char **prefix;
+ const char *prefix_1000[] = { "", "k", "M", "G", "T", "P", "E", "Z", "Y" };
+ const char *prefix_1024[] = { "", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei",
+ "Zi", "Yi" };
+
+ switch (base) {
+ case 1000:
+ prefix = prefix_1000;
+ prefixlen = LEN(prefix_1000);
+ break;
+ case 1024:
+ prefix = prefix_1024;
+ prefixlen = LEN(prefix_1024);
+ break;
+ default:
+ warn("fmt_human: Invalid base");
+ return NULL;
+ }
+
+ scaled = num;
+ for (i = 0; i < prefixlen && scaled >= base; i++) {
+ scaled /= base;
}
- return bprintf("%.1f%s", scaled, units[i]);
+ return bprintf("%.1f%s", scaled, prefix[i]);
}
int