public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: Yumei Huang <yuhuang@redhat.com>
To: passt-dev@passt.top, sbrivio@redhat.com
Cc: david@gibson.dropbear.id.au, yuhuang@redhat.com
Subject: [PATCH v6 2/4] util: Introduce read_file() and read_file_integer() function
Date: Fri, 17 Oct 2025 14:28:36 +0800	[thread overview]
Message-ID: <20251017062838.21041-3-yuhuang@redhat.com> (raw)
In-Reply-To: <20251017062838.21041-1-yuhuang@redhat.com>

Signed-off-by: Yumei Huang <yuhuang@redhat.com>
---
 util.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 util.h |  8 ++++++
 2 files changed, 92 insertions(+)

diff --git a/util.c b/util.c
index c492f90..5c8c4bc 100644
--- a/util.c
+++ b/util.c
@@ -579,6 +579,90 @@ int write_file(const char *path, const char *buf)
 	return len == 0 ? 0 : -1;
 }
 
+/**
+ * read_file() - Read contents of file into a buffer
+ * @path:	File to read
+ * @buf:	Buffer to store file contents
+ * @buf_size:	Size of buffer
+ *
+ * Return: number of bytes read on success, -1 on any error, -2 on truncation
+*/
+ssize_t read_file(const char *path, char *buf, size_t buf_size)
+{
+	int fd = open(path, O_RDONLY | O_CLOEXEC);
+	size_t total_read = 0;
+	ssize_t rc;
+
+	if (fd < 0) {
+		warn_perror("Could not open %s", path);
+		return -1;
+	}
+
+	while (total_read < buf_size) {
+		rc = read(fd, buf + total_read, buf_size - total_read);
+
+		if (rc < 0) {
+			warn_perror("Couldn't read from %s", path);
+			close(fd);
+			return -1;
+		}
+
+		if (rc == 0)
+			break;
+
+		total_read += rc;
+	}
+
+	close(fd);
+
+	if (total_read == buf_size) {
+		warn("File %s truncated, buffer too small", path);
+		return -2;
+	}
+
+	buf[total_read] = '\0';
+
+	return total_read;
+}
+
+/**
+ * read_file_integer() - Read an integer value from a file
+ * @path: File to read
+ * @fallback: Default value if file can't be read
+ *
+ * Return: Integer value, fallback on failure
+*/
+intmax_t read_file_integer(const char *path, intmax_t fallback)
+{
+	char buf[INTMAX_STRLEN];
+	ssize_t bytes_read;
+	intmax_t value;
+	char *end;
+
+	bytes_read = read_file(path, buf, sizeof(buf));
+
+	if (bytes_read < 0)
+		return fallback;
+
+	if (bytes_read == 0) {
+		debug("Empty file %s", path);
+		return fallback;
+	}
+
+	errno = 0;
+	value = strtoimax(buf, &end, 10);
+	if (*end && *end != '\n') {
+		debug("Invalid format in %s", path);
+		return fallback;
+	}
+	if (errno) {
+		debug("Invalid value in %s: %s", path, buf);
+		return fallback;
+	}
+
+	return value;
+}
+
 #ifdef __ia64__
 /* Needed by do_clone() below: glibc doesn't export the prototype of __clone2(),
  * use the description from clone(2).
diff --git a/util.h b/util.h
index 22eaac5..3f9f296 100644
--- a/util.h
+++ b/util.h
@@ -222,6 +222,8 @@ void pidfile_write(int fd, pid_t pid);
 int __daemon(int pidfile_fd, int devnull_fd);
 int fls(unsigned long x);
 int write_file(const char *path, const char *buf);
+ssize_t read_file(const char *path, char *buf, size_t buf_size);
+intmax_t read_file_integer(const char *path, intmax_t fallback);
 int write_all_buf(int fd, const void *buf, size_t len);
 int write_remainder(int fd, const struct iovec *iov, size_t iovcnt, size_t skip);
 int read_all_buf(int fd, void *buf, size_t len);
@@ -250,6 +252,12 @@ static inline const char *af_name(sa_family_t af)
 
 #define UINT16_STRLEN		(sizeof("65535"))
 
+/* Each byte expands to at most 3 decimal digits since 0xff == 255.
+ * Plus 2 extra bytes for the sign and null terminator.
+ * See https://stackoverflow.com/a/10536254.
+ */
+#define INTMAX_STRLEN		(sizeof(intmax_t) * 3 + 2)
+
 /* inet address (- '\0') + port (u16) (- '\0') + ':' + '\0' */
 #define SOCKADDR_INET_STRLEN					\
 	(INET_ADDRSTRLEN-1 + UINT16_STRLEN-1 + sizeof(":"))
-- 
2.47.0


  parent reply	other threads:[~2025-10-17  6:29 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-17  6:28 [PATCH v6 0/4] Retry SYNs for inbound connections Yumei Huang
2025-10-17  6:28 ` [PATCH v6 1/4] tcp: Rename "retrans" to "retries" Yumei Huang
2025-10-17  6:28 ` Yumei Huang [this message]
2025-10-19 10:07   ` [PATCH v6 2/4] util: Introduce read_file() and read_file_integer() function Stefano Brivio
2025-10-21  9:32     ` Yumei Huang
2025-10-21 21:50       ` Stefano Brivio
2025-10-22  0:51         ` David Gibson
2025-10-22  8:42           ` Yumei Huang
2025-10-22  0:55         ` Yumei Huang
2025-10-23 23:04   ` Stefano Brivio
2025-10-24  3:16     ` David Gibson
2025-10-24  6:05       ` Yumei Huang
2025-10-28  7:11       ` Yumei Huang
2025-10-28 11:43         ` Stefano Brivio
2025-10-17  6:28 ` [PATCH v6 3/4] tcp: Resend SYN for inbound connections Yumei Huang
2025-10-22  1:16   ` David Gibson
2025-10-22  1:30     ` Yumei Huang
2025-10-22  2:26       ` David Gibson
2025-10-23 23:04   ` Stefano Brivio
2025-10-24  3:30     ` David Gibson
2025-10-24  8:37       ` Stefano Brivio
2025-10-24 10:55         ` David Gibson
2025-10-27  3:37           ` Yumei Huang
2025-10-27  6:49             ` Stefano Brivio
2025-10-28  7:43     ` Yumei Huang
2025-10-28 11:44       ` Stefano Brivio
2025-10-29  2:31         ` Yumei Huang
2025-10-17  6:28 ` [PATCH v6 4/4] tcp: Update data retransmission timeout Yumei Huang
2025-10-22  1:19   ` David Gibson
2025-10-22  8:40     ` Yumei Huang
2025-10-23 23:04   ` Stefano Brivio
2025-10-28  8:09     ` Yumei Huang
2025-10-28 11:44       ` Stefano Brivio
2025-10-28 11:54         ` Stefano Brivio
2025-10-29  3:06         ` Yumei Huang
2025-10-29  4:38           ` Stefano Brivio
2025-10-29  5:11             ` Yumei Huang
2025-10-29  7:09               ` Stefano Brivio
2025-10-29  7:32                 ` Yumei Huang
2025-10-29  7:39                   ` Stefano Brivio
2025-10-29  8:59                     ` Yumei Huang
2025-10-29 12:18                       ` Stefano Brivio
2025-10-30  8:25                         ` Yumei Huang
2025-10-30  8:51                           ` Stefano Brivio

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20251017062838.21041-3-yuhuang@redhat.com \
    --to=yuhuang@redhat.com \
    --cc=david@gibson.dropbear.id.au \
    --cc=passt-dev@passt.top \
    --cc=sbrivio@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://passt.top/passt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).