From c4cd1d4d93e4a45a088edb6517555aa7e06e5f86 Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Wed, 30 Sep 2015 15:57:55 +0300 Subject: fileio: make get_status_field() more generic All users of get_status_field() expect the field pattern to occur in the beginning of a line, and the delimiter is ':'. Hardcode this into the function, and also skip any whitespace before ':' to support fields in files like /proc/cpuinfo. Add support for returning the full field value (currently stops on first whitespace). Rename the function so it's easier to ensure all callers switch to new semantics. --- src/basic/fileio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/basic/fileio.h') diff --git a/src/basic/fileio.h b/src/basic/fileio.h index 2e8148ff24..4998d4d042 100644 --- a/src/basic/fileio.h +++ b/src/basic/fileio.h @@ -48,4 +48,4 @@ int write_env_file(const char *fname, char **l); int executable_is_script(const char *path, char **interpreter); -int get_status_field(const char *filename, const char *pattern, char **field); +int get_proc_field(const char *filename, const char *pattern, const char *terminator, char **field); -- cgit v1.2.3-54-g00ecf