From cbb89356604ae790e5d9f56f29dbddf34d37dc58 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Tue, 11 May 2021 07:02:30 +0200
Subject: [PATCH] New functions: fnread() and fngetint(), companions to
 fnwrite()

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 src/util.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
 src/util.h |  2 ++
 2 files changed, 46 insertions(+)

diff --git a/src/util.c b/src/util.c
index 79a5a59b..9f90a2a7 100644
--- a/src/util.c
+++ b/src/util.c
@@ -154,6 +154,35 @@ char *str(char *fmt, ...)
 	return buf;
 }
 
+int fnread(char *buf, size_t len, char *fmt, ...)
+{
+	char path[256];
+	va_list ap;
+	FILE *fp;
+
+	va_start(ap, fmt);
+	vsnprintf(path, sizeof(path), fmt, ap);
+	va_end(ap);
+
+	if (!buf || !len) {
+		struct stat st;
+
+		if (stat(path, &st))
+			return -1;
+
+		return (ssize_t)st.st_size;
+	}
+
+	fp = fopen(path, "r");
+	if (!fp)
+		return -1;
+
+	len = fread(buf, sizeof(char), len, fp);
+	fclose(fp);
+
+	return (int)len;
+}
+
 int fnwrite(char *value, char *fmt, ...)
 {
 	char path[256];
@@ -185,6 +214,21 @@ int fnwrite(char *value, char *fmt, ...)
 	return rc;
 }
 
+int fngetint(char *path, int *val)
+{
+	char buf[10];
+
+	if (fnread(buf, sizeof(buf), path) <= 0)
+		return -1;
+
+	errno = 0;
+	*val = strtoul(chomp(buf), NULL, 0);
+	if (errno)
+		return -1;
+
+	return 0;
+}
+
 /*
  * musl libc default to /dev/null/utmp and /dev/null/wtmp, respectively.
  * See https://www.openwall.com/lists/musl/2012/03/04/4 for reasoning.
diff --git a/src/util.h b/src/util.h
index 0a44b726..bb7cb97e 100644
--- a/src/util.h
+++ b/src/util.h
@@ -50,7 +50,9 @@ extern char *prognm;
 char *progname     (char *arg0);
 
 char *str          (char *fmt, ...);
+int   fnread       (char *buf, size_t len, char *fmt, ...);
 int   fnwrite      (char *value, char *fmt, ...);
+int   fngetint     (char *path, int *val);
 
 int   has_utmp     (void);
 int   strtobytes   (char *arg);