From d382c7a7fdf92047655aa54e07a42d346d1d422a Mon Sep 17 00:00:00 2001 From: Avra Sengupta Date: Tue, 4 Feb 2014 04:36:19 +0000 Subject: glusterd: Handling eof during gf_store_read_and_tokenize Change-Id: I88eeffd64c521db78b9e7539ae57ed046854cb63 BUG: 1049278 Signed-off-by: Avra Sengupta Reviewed-on: http://review.gluster.org/6903 Reviewed-by: Raghavendra Bhat Reviewed-by: Sachin Pandit Reviewed-by: Rajesh Joseph Tested-by: Rajesh Joseph --- libglusterfs/src/store.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libglusterfs') diff --git a/libglusterfs/src/store.c b/libglusterfs/src/store.c index 64497e9bb..1e6601837 100644 --- a/libglusterfs/src/store.c +++ b/libglusterfs/src/store.c @@ -182,16 +182,16 @@ gf_store_read_and_tokenize (FILE *file, char *str, char **iter_key, GF_ASSERT (store_errno); temp = fgets (str, PATH_MAX, file); - str_len = strlen(str); - str[str_len - 1] = '\0'; - /* Truncate the "\n", as fgets stores "\n" in str */ - if (temp == NULL || feof (file)) { ret = -1; *store_errno = GD_STORE_EOF; goto out; } + str_len = strlen(str); + str[str_len - 1] = '\0'; + /* Truncate the "\n", as fgets stores "\n" in str */ + key = strtok_r (str, "=", &savetok); if (!key) { ret = -1; -- cgit