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

diff --git a/src/utils.c b/src/utils.c
index 9fde673afdfe2628f58dc9fd2f51421959ce23c8..be39c4e62eca522ed7126aab0dd5b708e1f6ad58 100644 (file)
--- 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) {