From 786245efe525d5bf35f18a0bce3bdc20466e532b Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Fri, 4 Nov 2022 14:30:01 +0100 Subject: [PATCH] Now assuming the lock when removing deleted recordings even if the disk is full --- CONTRIBUTORS | 2 ++ HISTORY | 4 +++- tools.c | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 7382521e..55685061 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -3516,6 +3516,8 @@ Claus Muus ".../Volume linearize" for reporting multiple recording entries in case a recording is started during the initial reading of the video directory + for reporting that getting the lock for removing deleted recordings may fail if the + disk is full Dieter Ferdinand for reporting a problem with jumping to an absolute position via the Red key in diff --git a/HISTORY b/HISTORY index 57f6a637..948af28e 100644 --- a/HISTORY +++ b/HISTORY @@ -9780,9 +9780,11 @@ Video Disk Recorder Revision History out by Onur Sentürk). - Official release. -2022-03-03: +2022-11-04: - Added UPDATE-2.6.0, which was missing in the official 2.6.0 release. - Fixed unexpected calls of the '-r' script when a recording is interrupted and the timer has not yet finished. - Now dropping capabilities after opening terminal. +- Now assuming the lock when removing deleted recordings even if the disk is full + (reported by Claus Muus). diff --git a/tools.c b/tools.c index e86cf853..86c63eb4 100644 --- a/tools.c +++ b/tools.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: tools.c 5.5 2021/12/30 14:35:40 kls Exp $ + * $Id: tools.c 5.6 2022/11/04 14:30:01 kls Exp $ */ #include "tools.h" @@ -2050,6 +2050,10 @@ bool cLockFile::Lock(int WaitSeconds) } else { LOG_ERROR_STR(fileName); + if (errno == ENOSPC) { + esyslog("ERROR: can't create lock file '%s' - assuming lock anyway!", fileName); + return true; + } break; } if (WaitSeconds)