From fcbad61c7f63eb73694a10b47a51f32a7de3847b Mon Sep 17 00:00:00 2001 From: Rinigus Date: Sat, 17 Sep 2016 13:07:26 +0300 Subject: [PATCH] use fgets in parse_value_file, fixes #1941 --- src/daemon/common.c | 29 +++++++++++++++++++++-------- src/daemon/common.h | 1 + 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/daemon/common.c b/src/daemon/common.c index e2c872cc..d2fae571 100644 --- a/src/daemon/common.c +++ b/src/daemon/common.c @@ -1090,6 +1090,11 @@ int parse_identifier_vl (const char *str, value_list_t *vl) /* {{{ */ } /* }}} int parse_identifier_vl */ int parse_value (const char *value_orig, value_t *ret_value, int ds_type) +{ + return parse_value_ext(value_orig, ret_value, ds_type, ""); +} + +int parse_value_ext (const char *value_orig, value_t *ret_value, int ds_type, const char *error_identifier) { char *value; char *endptr = NULL; @@ -1129,19 +1134,19 @@ int parse_value (const char *value_orig, value_t *ret_value, int ds_type) default: sfree (value); - ERROR ("parse_value: Invalid data source type: %i.", ds_type); + ERROR ("parse_value %s: Invalid data source type: %i.", error_identifier, ds_type); return -1; } if (value == endptr) { - ERROR ("parse_value: Failed to parse string as %s: %s.", + ERROR ("parse_value %s: Failed to parse string as %s: %s.", error_identifier, DS_TYPE_TO_STRING (ds_type), value); sfree (value); return -1; } else if ((NULL != endptr) && ('\0' != *endptr)) - INFO ("parse_value: Ignoring trailing garbage \"%s\" after %s value. " - "Input string was \"%s\".", + INFO ("parse_value %s: Ignoring trailing garbage \"%s\" after %s value. " + "Input string was \"%s\".", error_identifier, endptr, DS_TYPE_TO_STRING (ds_type), value_orig); sfree (value); @@ -1211,14 +1216,22 @@ int parse_values (char *buffer, value_list_t *vl, const data_set_t *ds) int parse_value_file (char const *path, value_t *ret_value, int ds_type) { + FILE *fh; char buffer[256]; - if (read_file_contents (path, buffer, sizeof (buffer)) < 0) - return errno; + fh = fopen (path, "r"); + if (fh == NULL) + return (-1); + + if (fgets (buffer, sizeof (buffer), fh) == NULL) + { + fclose (fh); + return (-1); + } - strstripnewline (buffer); + fclose (fh); - return parse_value (buffer, ret_value, ds_type); + return parse_value_ext (buffer, ret_value, ds_type, path); } /* int parse_value_file */ #if !HAVE_GETPWNAM_R diff --git a/src/daemon/common.h b/src/daemon/common.h index 6d01ca4b..87dd4a04 100644 --- a/src/daemon/common.h +++ b/src/daemon/common.h @@ -323,6 +323,7 @@ int parse_identifier (char *str, char **ret_host, char **ret_type, char **ret_type_instance); int parse_identifier_vl (const char *str, value_list_t *vl); int parse_value (const char *value, value_t *ret_value, int ds_type); +int parse_value_ext (const char *value, value_t *ret_value, int ds_type, const char *error_identifier); int parse_values (char *buffer, value_list_t *vl, const data_set_t *ds); /* parse_value_file reads "path" and parses its content as an integer or -- 2.30.2