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 v3 2/4] util: Introduce read_file() and read_file_long() function
Date: Tue, 14 Oct 2025 15:38:34 +0800	[thread overview]
Message-ID: <20251014073836.18150-3-yuhuang@redhat.com> (raw)
In-Reply-To: <20251014073836.18150-1-yuhuang@redhat.com>

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

diff --git a/util.c b/util.c
index c492f90..d331f08 100644
--- a/util.c
+++ b/util.c
@@ -579,6 +579,98 @@ 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;
+	bool truncated = false;
+
+	if (fd < 0) {
+		warn_perror("Could not open %s", path);
+		return -1;
+	}
+
+	while (total_read < buf_size - 1) {
+		rc = read(fd, buf + total_read, buf_size - 1 - total_read);
+
+		if (rc < 0 ) {
+			warn_perror("Couldn't read from %s", path);
+			close(fd);
+			return -1;
+		}
+
+		if (rc == 0) {
+			break;
+		}
+
+		total_read += rc;
+
+		if (total_read == buf_size - 1) {
+			char test_byte;
+			rc = read(fd, &test_byte, 1);
+			if (rc >0) {
+				truncated = true;
+				warn_perror("File %s truncated, buffer too small", path);
+			}
+		}
+	}
+
+	close(fd);
+
+	if (total_read < buf_size){
+		buf[total_read] = '\0';
+	}
+
+	return truncated ? -2 : (int)total_read;
+}
+
+/**
+ * read_file_long() - Read a long integer value from a file
+ * @path: Path to the sysctl file
+ * @fallback: Default value if file can't be read
+ *
+ * Return: Parameter value, fallback on failure
+*/
+long read_file_long(const char *path, long fallback)
+{
+        char buf[32];
+        char *end;
+        long value;
+        int bytes_read;
+
+        bytes_read = read_file(path, buf, sizeof(buf));
+        if (bytes_read < 0) {
+                debug("Unable to read %s", path);
+                return fallback;
+        }
+
+        if (bytes_read == 0) {
+                debug("Empty file %s", path);
+                return fallback;
+        }
+
+        errno = 0;
+        value = strtol(buf, &end, 10);
+        if (*end && *end != '\n') {
+                debug("Invalid format in %s", path);
+                return fallback;
+        }
+        if (errno || value < 0 || value > LONG_MAX) {
+                debug("Invalid value in %s: %ld", path, value);
+                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..e509bec 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);
+long read_file_long(const char *path, long 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);
-- 
2.47.0


  parent reply	other threads:[~2025-10-14  7:38 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-14  7:38 [PATCH v3 0/4] Retry SYNs for inbound connections Yumei Huang
2025-10-14  7:38 ` [PATCH v3 1/4] tcp: Rename "retrans" to "retries" Yumei Huang
2025-10-14 22:50   ` David Gibson
2025-10-15  2:17     ` Yumei Huang
2025-10-14  7:38 ` Yumei Huang [this message]
2025-10-14 23:27   ` [PATCH v3 2/4] util: Introduce read_file() and read_file_long() function David Gibson
2025-10-15  3:50     ` Yumei Huang
2025-10-15  4:46       ` David Gibson
2025-10-15  5:46         ` Yumei Huang
2025-10-28 23:12         ` Stefano Brivio
2025-10-29  0:43           ` David Gibson
2025-10-29  4:43             ` Stefano Brivio
2025-10-29  9:35               ` David Gibson
2025-10-29 16:23                 ` Stefano Brivio
2025-10-14  7:38 ` [PATCH v3 3/4] tcp: Resend SYN for inbound connections Yumei Huang
2025-10-14 23:40   ` David Gibson
2025-10-14  7:38 ` [PATCH v3 4/4] tcp: Update data retransmission timeout Yumei Huang
2025-10-15  0:05   ` David Gibson
2025-10-15  6:31     ` Yumei Huang
2025-10-15 22:54       ` David Gibson
2025-10-17 18:28         ` Stefano Brivio
2025-10-20  0:20           ` David Gibson
2025-10-20  5:11             ` Stefano Brivio
2025-10-20  9:17               ` David Gibson
2025-10-28 23:13                 ` Stefano Brivio
2025-10-29  0:35                   ` David Gibson
2025-10-29  4:52                     ` Stefano Brivio
2025-10-29  9:37                       ` David Gibson
2025-10-20 10:57           ` Yumei Huang
2025-10-20 23:20             ` Stefano Brivio
2025-10-22  2:23               ` 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=20251014073836.18150-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).