iptv pipe: handle the backslash character, fixes#2487

tvheadend · Nov 18, 2014 · 4f68d03 · 4f68d03
1 parent fa22f18
commit 4f68d03
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/docs/html/config_muxes.html b/docs/html/config_muxes.html
@@ -96,7 +96,9 @@
 				    using spaces. A raw MPEG-TS stream is
 				    expected. The string ${service_name}
 				    is substituted with the service name
-				    field contents.
+				    field contents. The \ (backslash) character means
+				    "take the next character asis" (usually
+				    space or the backslash itself.
 
 			</dl>
 

diff --git a/src/input/mpegts/iptv/iptv_pipe.c b/src/input/mpegts/iptv/iptv_pipe.c
@@ -54,8 +54,15 @@ iptv_pipe_start ( iptv_mux_t *im, const char *_raw, const url_t *url )
 
   while (*s && i < ARRAY_SIZE(argv) - 1) {
     f = s;
-    while (*s && *s != ' ')
-      s++;
+    while (*s && *s != ' ') {
+      while (*s && *s != ' ' && *s != '\\')
+        s++;
+      if (*s == '\\') {
+        s++;
+        if (*s)
+          s++;
+      }
+    }
     if (f != s) {
       if (*s) {
         *(char *)s = '\0';