From 43ae54c062edfbe0bd9dbfc07471484d151ef649 Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Thu, 31 Jan 2013 11:27:00 +0000 Subject: [PATCH] Fix #1569 - dvr: simplify filename cleanup --- src/dvr/dvr_rec.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/dvr/dvr_rec.c b/src/dvr/dvr_rec.c index adcb4302..0893562d 100644 --- a/src/dvr/dvr_rec.c +++ b/src/dvr/dvr_rec.c @@ -126,12 +126,11 @@ cleanupfilename(char *s, int dvr_flags) { int i, len = strlen(s); for(i = 0; i < len; i++) { - if(s[i] == '/' || s[i] == ':' || s[i] == '\\' || s[i] == '<' || - s[i] == '>' || s[i] == '|' || s[i] == '*' || s[i] == '?') - s[i] = '-'; - - if((dvr_flags & DVR_WHITESPACE_IN_TITLE) && s[i] == ' ') + if((dvr_flags & DVR_WHITESPACE_IN_TITLE) && (s[i] == ' ' || s[i] == '\t')) s[i] = '-'; + + if((s[i] < 32) || (s[i] > 122) || (strchr("/:\\<>|*?'\"", s[i]) != NULL)) + s[i] = '-'; } }