frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Now stopping scanning the video directory if there are too many levels of symbolic links

Browse Source
This commit is contained in:
Klaus Schmidinger
2006-02-12 11:46:44 +01:00
parent c9b5fd6588
commit 23d7402c00
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
recording.c
View File

@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: recording.c 1.134 2006/02/05 12:34:08 kls Exp $
* $Id: recording.c 1.135 2006/02/12 11:34:19 kls Exp $
*/
#include "recording.h"
@@ -58,6 +58,8 @@
#define MAX_SUBTITLE_LENGTH 40
#define MAX_LINK_LEVEL 6
bool VfatFileSystem = false;
cRecordings DeletedRecordings(true);
@@ -811,7 +813,7 @@ void cRecordings::Refresh(bool Foreground)
ScanVideoDir(VideoDirectory, Foreground);
}
void cRecordings::ScanVideoDir(const char *DirName, bool Foreground)
void cRecordings::ScanVideoDir(const char *DirName, bool Foreground, int LinkLevel)
{
cReadDir d(DirName);
struct dirent *e;
@@ -821,7 +823,13 @@ void cRecordings::ScanVideoDir(const char *DirName, bool Foreground)
asprintf(&buffer, "%s/%s", DirName, e->d_name);
struct stat st;
if (stat(buffer, &st) == 0) {
int Link = 0;
if (S_ISLNK(st.st_mode)) {
if (LinkLevel > MAX_LINK_LEVEL) {
isyslog("max link level exceeded - not scanning %s", buffer);
continue;
}
Link = 1;
char *old = buffer;
buffer = ReadLink(old);
free(old);
@@ -849,7 +857,7 @@ void cRecordings::ScanVideoDir(const char *DirName, bool Foreground)
delete r;
}
else
ScanVideoDir(buffer, Foreground);
ScanVideoDir(buffer, Foreground, LinkLevel + Link);
}
}
free(buffer);