[stgt] [PATCH 1/2] Fix bs_rbd.c slurp_to_semi() not consuming terminating semicolon

Thomas Matysik thomas at belton.co.nz
Wed Jan 22 03:14:18 CET 2014


slurp_to_semi() would not consume the terminating semicolon on a
option specified in --bsopts, so any options other than the first
would be ignored as invalid.

Signed-off-by: Thomas Matysik <thomas at belton.co.nz>
---
 usr/bs_rbd.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr/bs_rbd.c b/usr/bs_rbd.c
index 3ea9d36..f797fd5 100644
--- a/usr/bs_rbd.c
+++ b/usr/bs_rbd.c
@@ -480,6 +480,9 @@ static char *slurp_to_semi(char **p)
 	strncpy(ret, *p, len);
 	ret[len] = '\0';
 	*p = end;
+	// Jump past the semicolon, if we stopped at one
+	if (**p == ';')
+		*p = end + 1;
 	return ret;
 }
 
-- 
1.8.1.2

--
To unsubscribe from this list: send the line "unsubscribe stgt" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html



More information about the stgt mailing list