From: Ben Fennema <fennema@google.com>
Date: Mon, 25 May 2015 21:28:35 +0000 (-0700)
Subject: dvr: remove legal character ' from unsafe/windows compatible filenames list
X-Git-Tag: v4.2.1~2431
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=779874c177053464127d9c847d87405d66b93b02;p=thirdparty%2Ftvheadend.git

dvr: remove legal character ' from unsafe/windows compatible filenames list
---

diff --git a/docs/html/config_dvr.html b/docs/html/config_dvr.html
index f0a27403a..72a1c64e3 100644
--- a/docs/html/config_dvr.html
+++ b/docs/html/config_dvr.html
@@ -207,7 +207,7 @@
   <dt>Remove all unsafe characters from filename
   <dd>If checked, all characters that could possibly cause problems for filenaming will be replaced with '_'.<br>
   	  Applies to characters:<br>
-      * not supported by Windows characters: <i>/ : \ < > | * ? ' "</i><br>
+      * not supported by Windows characters: <i>/ : \ < > | * ? "</i><br>
       * control characters (ASCII code below 32)<br>
       * control and national characters (ASCII code above 122)<br> 
   
@@ -216,7 +216,7 @@
   
   <dt>Use Windows-compatible filenames
   <dd>If checked:<br>
-      * special characters not supported by Windows like: <i>/ : \ < > | * ? ' "</i> will be replaced with '_'<br>
+      * special characters not supported by Windows like: <i>/ : \ < > | * ? "</i> will be replaced with '_'<br>
       * trailing spaces ' ' and dots '.' will be removed
   
  </dl>
diff --git a/src/dvr/dvr_rec.c b/src/dvr/dvr_rec.c
index 70e5aea65..09aed48c3 100644
--- a/src/dvr/dvr_rec.c
+++ b/src/dvr/dvr_rec.c
@@ -198,11 +198,11 @@ cleanup_filename(dvr_config_t *cfg, char *s)
 
     else if (cfg->dvr_clean_title &&
              ((*s < 32) || (*s > 122) ||
-             (strchr("/:\\<>|*?'\"", *s) != NULL)))
+             (strchr("/:\\<>|*?\"", *s) != NULL)))
       *s = '_';
 
     else if (cfg->dvr_windows_compatible_filenames &&
-             (strchr("/:\\<>|*?'\"", *s) != NULL))
+             (strchr("/:\\<>|*?\"", *s) != NULL))
       *s = '_';
   }