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 v4 2/4] util: Introduce read_file() and read_file_integer() function
Date: Thu, 16 Oct 2025 10:34:21 +0800 [thread overview]
Message-ID: <20251016023423.8923-3-yuhuang@redhat.com> (raw)
In-Reply-To: <20251016023423.8923-1-yuhuang@redhat.com>
Signed-off-by: Yumei Huang <yuhuang@redhat.com>
---
util.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
util.h | 3 +++
2 files changed, 87 insertions(+)
diff --git a/util.c b/util.c
index c492f90..197677e 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
+*/
+int 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_perror("File %s truncated, buffer too small", path);
+ return -2;
+ }
+
+ buf[total_read] = '\0';
+
+ return (int)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];
+ char *end;
+ intmax_t value;
+ int bytes_read;
+
+ 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..887d795 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);
+int 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);
@@ -249,6 +251,7 @@ static inline const char *af_name(sa_family_t af)
}
#define UINT16_STRLEN (sizeof("65535"))
+#define INTMAX_STRLEN (sizeof("-9223372036854775808"))
/* inet address (- '\0') + port (u16) (- '\0') + ':' + '\0' */
#define SOCKADDR_INET_STRLEN \
--
2.47.0
next prev parent reply other threads:[~2025-10-16 2:34 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-16 2:34 [PATCH v4 0/4] Retry SYNs for inbound connections Yumei Huang
2025-10-16 2:34 ` [PATCH v4 1/4] tcp: Rename "retrans" to "retries" Yumei Huang
2025-10-16 2:34 ` Yumei Huang [this message]
2025-10-16 6:30 ` [PATCH v4 2/4] util: Introduce read_file() and read_file_integer() function David Gibson
2025-10-16 7:49 ` Yumei Huang
2025-10-16 22:22 ` Stefano Brivio
2025-10-16 23:16 ` David Gibson
2025-10-17 2:11 ` Yumei Huang
2025-10-17 2:29 ` David Gibson
2025-10-17 2:44 ` Yumei Huang
2025-10-19 10:07 ` Stefano Brivio
2025-10-16 2:34 ` [PATCH v4 3/4] tcp: Resend SYN for inbound connections Yumei Huang
2025-10-16 22:22 ` Stefano Brivio
2025-10-16 23:34 ` David Gibson
2025-10-16 23:49 ` David Gibson
2025-10-16 2:34 ` [PATCH v4 4/4] tcp: Update data retransmission timeout Yumei Huang
2025-10-16 23:59 ` David Gibson
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=20251016023423.8923-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).