libfstools: make get_var_from_file() reusable

Move get_var_from_file() to common library.

Signed-off-by: Rodrigo Balerdi <lanchon@gmail.com>

3 files changed, 38 insertions, 38 deletions

diff --git a/libfstools/common.c b/libfstools/common.c
index 82362f7..46b8114 100644
--- a/libfstools/common.c
+++ b/libfstools/common.c
@@ -3,8 +3,7 @@
 #include "common.h"
 #define BUFLEN 128
 
-int
-read_uint_from_file(char *dirname, char *filename, unsigned int *i)
+int read_uint_from_file(char *dirname, char *filename, unsigned int *i)
 {
 	FILE *f;
 	char fname[BUFLEN];
@@ -23,8 +22,7 @@ read_uint_from_file(char *dirname, char *filename, unsigned int *i)
 	return ret;
 }
 
-char
-*read_string_from_file(const char *dirname, const char *filename, char *buf, size_t bufsz)
+char *read_string_from_file(const char *dirname, const char *filename, char *buf, size_t bufsz)
 {
 	FILE *f;
 	char fname[BUFLEN];
@@ -54,6 +52,41 @@ char
 	return buf;
 }
 
+/* adapted from procd/utils.c -> should go to libubox */
+char *get_var_from_file(const char *filename, const char *name, char *out, int len)
+{
+	char line[1024], *c, *sptr;
+
+	int fd = open(filename, O_RDONLY);
+	if (fd == -1)
+		return NULL;
+
+	ssize_t r = read(fd, line, sizeof(line) - 1);
+	close(fd);
+
+	if (r <= 0)
+		return NULL;
+
+	line[r] = 0;
+
+	for (c = strtok_r(line, " \t\n", &sptr); c;
+			c = strtok_r(NULL, " \t\n", &sptr)) {
+		char *sep = strchr(c, '=');
+		if (sep == NULL)
+			continue;
+
+		ssize_t klen = sep - c;
+		if (strncmp(name, c, klen) || name[klen] != 0)
+			continue;
+
+		strncpy(out, &sep[1], len);
+		out[len-1] = '\0';
+		return out;
+	}
+
+	return NULL;
+}
+
 int block_file_identify(FILE *f, uint64_t offset)
 {
 	uint32_t magic = 0;
diff --git a/libfstools/common.h b/libfstools/common.h
index 28b82d2..f34be50 100644
--- a/libfstools/common.h
+++ b/libfstools/common.h
@@ -23,6 +23,7 @@
 
 int read_uint_from_file(char *dirname, char *filename, unsigned int *i);
 char *read_string_from_file(const char *dirname, const char *filename, char *buf, size_t bufsz);
+char *get_var_from_file(const char *filename, const char *name, char *out, int len);
 int block_file_identify(FILE *f, uint64_t offset);
 int block_volume_format(struct volume *v, uint64_t offset, const char *bdev);
 
diff --git a/libfstools/partname.c b/libfstools/partname.c
index 9f2347a..1a221a9 100644
--- a/libfstools/partname.c
+++ b/libfstools/partname.c
@@ -59,40 +59,6 @@ static int partname_volume_init(struct volume *v)
 	return block_volume_format(v, 0, p->parent_dev.devpathstr);
 }
 
-/* adapted from procd/utils.c -> should go to libubox */
-static char* get_var_from_file(const char* filename, const char* name, char* out, int len)
-{
-	char line[1024], *c, *sptr;
-	int fd = open(filename, O_RDONLY);
-	if (fd == -1)
-		return NULL;
-
-	ssize_t r = read(fd, line, sizeof(line) - 1);
-	close(fd);
-
-	if (r <= 0)
-		return NULL;
-
-	line[r] = 0;
-
-	for (c = strtok_r(line, " \t\n", &sptr); c;
-			c = strtok_r(NULL, " \t\n", &sptr)) {
-		char *sep = strchr(c, '=');
-		if (sep == NULL)
-			continue;
-
-		ssize_t klen = sep - c;
-		if (strncmp(name, c, klen) || name[klen] != 0)
-			continue;
-
-		strncpy(out, &sep[1], len);
-		out[len-1] = '\0';
-		return out;
-	}
-
-	return NULL;
-}
-
 static char *rootdevname(char *devpath) {
 	int l;