summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-09-22 23:40:04 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-10-14 14:04:20 +0200
commit51dce5facb4d1a6f182ede9654b25c2e83878aee (patch)
tree5fb210b3d69359c2a2af0046f400d1f5ea4788f0
parent6e30646fa28908b3f199d070ebb85151fef52a10 (diff)
downloadbarebox-51dce5facb4d1a6f182ede9654b25c2e83878aee.tar.gz
barebox-51dce5facb4d1a6f182ede9654b25c2e83878aee.tar.xz
add function to read single line files
Often small files are used to store the value od a variable. This adds a function to easily read such a variable. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--include/libbb.h2
-rw-r--r--lib/libbb.c43
2 files changed, 45 insertions, 0 deletions
diff --git a/include/libbb.h b/include/libbb.h
index 47b2e08296..2fe710c368 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -35,4 +35,6 @@ char *simple_itoa(unsigned int i);
int write_full(int fd, void *buf, size_t size);
int read_full(int fd, void *buf, size_t size);
+char *read_file_line(const char *fmt, ...);
+
#endif /* __LIBBB_H */
diff --git a/lib/libbb.c b/lib/libbb.c
index e0d7481594..189a1705cc 100644
--- a/lib/libbb.c
+++ b/lib/libbb.c
@@ -176,3 +176,46 @@ int read_full(int fd, void *buf, size_t size)
return insize;
}
EXPORT_SYMBOL(read_full);
+
+/*
+ * read_file_line - read a line from a file
+ *
+ * Used to compose a filename from a printf format and to read a line from this
+ * file. All leading and trailing whitespaces (including line endings) are
+ * removed. The returned buffer must be freed with free(). This function is
+ * supposed for reading variable like content into a buffer, so files > 1024
+ * bytes are ignored.
+ */
+char *read_file_line(const char *fmt, ...)
+{
+ va_list args;
+ char *filename;
+ char *buf, *line = NULL;
+ size_t size;
+ int ret;
+ struct stat s;
+
+ va_start(args, fmt);
+ filename = vasprintf(fmt, args);
+ va_end(args);
+
+ ret = stat(filename, &s);
+ if (ret)
+ goto out;
+
+ if (s.st_size > 1024)
+ goto out;
+
+ buf = read_file(filename, &size);
+ if (!buf)
+ goto out;
+
+ line = strim(buf);
+
+ line = xstrdup(line);
+ free(buf);
+out:
+ free(filename);
+ return line;
+}
+EXPORT_SYMBOL_GPL(read_file_line);