From: Jaroslav Kysela Date: Sun, 11 Oct 2015 14:41:24 +0000 (+0200) Subject: utils: fix deferred_unlink (reggresion from 1ffad11881c63db416f2ee957740ab1a29d145b7... X-Git-Tag: v4.2.1~1947 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6769c0ed6f47cc566f0b0994d42993c329f6bb6f;p=thirdparty%2Ftvheadend.git utils: fix deferred_unlink (reggresion from 1ffad11881c63db416f2ee957740ab1a29d145b7), fixes #3143 --- diff --git a/src/utils.c b/src/utils.c index 4da475119..9fde673af 100644 --- a/src/utils.c +++ b/src/utils.c @@ -699,7 +699,7 @@ int deferred_unlink(const char *filename, const char *rootdir) { deferred_unlink_t *du; - char *s; + char *s, *p; size_t l; int r; long max; @@ -711,7 +711,9 @@ deferred_unlink(const char *filename, const char *rootdir) max = pathconf(filename, _PC_NAME_MAX); strcpy(s, filename); if (l + 10 < max) { - s[0] = '.'; + p = strrchr(s, '/'); + if (p && p[1]) + p[1] = '.'; strcpy(s + l, ".removing"); } else { memcpy(s, ".rm.", 4);