From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 12 Oct 2015 09:42:58 +0000 (+0200)
Subject: utils: fix deferred_unlink again for long filenames, fixes #3136
X-Git-Tag: v4.2.1~1940
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85e4f7a12206190064c5db3110a88e9ec1bb0add;p=thirdparty%2Ftvheadend.git

utils: fix deferred_unlink again for long filenames, fixes #3136
---

diff --git a/src/utils.c b/src/utils.c
index 9fde673af..be39c4e62 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -716,7 +716,9 @@ deferred_unlink(const char *filename, const char *rootdir)
       p[1] = '.';
     strcpy(s + l, ".removing");
   } else {
-    memcpy(s, ".rm.", 4);
+    p = strrchr(s, '/');
+    p = p && p[1] ? p + 1 : s;
+    memcpy(p, ".rm.", 4);
   }
   r = rename(filename, s);
   if (r) {