summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfred E. Heggestad <aeh@db.org>2014-11-09 11:29:36 +0100
committerAlfred E. Heggestad <aeh@db.org>2014-11-09 11:29:36 +0100
commit2b92e02cc4699bc1e1b81af35b4ee01ac1b93a16 (patch)
treef77da7a9891c2d8c62e2f91459bff97745ff90c8
parent89deeb14cb876a37d9fd0b6e47d48a392bae1515 (diff)
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]"
-rw-r--r--src/conf.c3
1 files changed, 2 insertions, 1 deletions
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;