From 2b92e02cc4699bc1e1b81af35b4ee01ac1b93a16 Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Sun, 9 Nov 2014 11:29:36 +0100 Subject: conf: allow second value of conf_get_csv() to be quoted this applies to config values such as "audio_player", "audio_source", "video_source" etc. example: audio_player alsa,"ALC887-VD Digital [ALC887-VD Digital]" --- src/conf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/conf.c b/src/conf.c index cf93f1b..9122e52 100644 --- a/src/conf.c +++ b/src/conf.c @@ -223,7 +223,8 @@ int conf_get_csv(const struct conf *conf, const char *name, if (err) return err; - err = re_regex(r.p, r.l, "[^,]+,[^]*", &pl1, &pl2); + /* note: second value may be quoted */ + err = re_regex(r.p, r.l, "[^,]+,[~]*", &pl1, &pl2); if (err) return err; -- cgit v1.2.3