From 98a443cc61a02261fcbdad945a8c6c664e279d50 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Mon, 16 Jan 2012 12:09:38 +0100 Subject: [PATCH] Revoked "Fixed handling symbolic links in cRecordings::ScanVideoDir()" --- HISTORY | 3 +++ recording.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/HISTORY b/HISTORY index 4739f3e2..8f9f2477 100644 --- a/HISTORY +++ b/HISTORY @@ -6839,3 +6839,6 @@ Video Disk Recorder Revision History 2012-01-16: Version 1.7.24 - Updated the Italian OSD texts (thanks to Diego Pierotto). +- Revoked "Fixed handling symbolic links in cRecordings::ScanVideoDir()". + This change actually broke handling symbolic links (see + http://www.vdr-portal.de/board1-news/board2-vdr-news/p1047199-announce-vdr-developer-version-1-7-23/#post1047199). diff --git a/recording.c b/recording.c index cf35bb7a..63caaf53 100644 --- a/recording.c +++ b/recording.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: recording.c 2.43 2012/01/15 11:04:24 kls Exp $ + * $Id: recording.c 2.44 2012/01/16 12:05:41 kls Exp $ */ #include "recording.h" @@ -1112,7 +1112,7 @@ void cRecordings::ScanVideoDir(const char *DirName, bool Foreground, int LinkLev if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) { cString buffer = AddDirectory(DirName, e->d_name); struct stat st; - if (lstat(buffer, &st) == 0) { + if (stat(buffer, &st) == 0) { int Link = 0; if (S_ISLNK(st.st_mode)) { if (LinkLevel > MAX_LINK_LEVEL) {