diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2003-11-08 15:45:59 +0100 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2003-11-08 15:45:59 +0100 |
| commit | a6809c5c7b97d862f14a4e41a0e65fd2861b7d34 (patch) | |
| tree | 3fae591b1e96375668b796c06d14da79c46e056e | |
| parent | eec1af5845750b3eff9bd3d421c8238c91b9bad9 (diff) | |
| download | vdr-a6809c5c7b97d862f14a4e41a0e65fd2861b7d34.tar.gz vdr-a6809c5c7b97d862f14a4e41a0e65fd2861b7d34.tar.bz2 | |
Fixed getting the list of recordings in case VDR is started from a directory where it doesn't have access to1.2.6pre5
| -rw-r--r-- | CONTRIBUTORS | 4 | ||||
| -rw-r--r-- | HISTORY | 4 | ||||
| -rw-r--r-- | recording.c | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index ca698f27..f988ff49 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -856,3 +856,7 @@ Richard Scobie <r.scobie@clear.net.nz> Luke Jenkins <a@xmission.com> for adding North American satellites to 'sources.conf' + +Dirk Mueller <dmuell@gmx.net> + for fixing getting the list of recordings in case VDR is started from a directory + where it doesn't have access to @@ -2452,8 +2452,10 @@ Video Disk Recorder Revision History - Added missing 'const' to some cChannel member functions (thanks to Torsten Herz). -2003-11-07: Version 1.2.6pre5 +2003-11-08: Version 1.2.6pre5 - Added cDevice::GetSTC() (suggested by Sven Goethel). - Added Asia-Pacific satellites to 'sources.conf' (thanks to Richard Scobie). - Added North American satellites to 'sources.conf' (thanks to Luke Jenkins). +- Fixed getting the list of recordings in case VDR is started from a directory + where it doesn't have access to (thanks to Dirk Mueller). diff --git a/recording.c b/recording.c index b6e6cac2..77f216cb 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 1.84.1.1 2003/10/24 15:49:00 kls Exp $ + * $Id: recording.c 1.84.1.2 2003/11/08 15:25:35 kls Exp $ */ #include "recording.h" @@ -46,7 +46,7 @@ #define SUMMARYFILESUFFIX "/summary.vdr" #define MARKSFILESUFFIX "/marks.vdr" -#define FINDCMD "find %s -follow -type d -name '%s' 2> /dev/null" +#define FINDCMD "cd '%s' && find '%s' -follow -type d -name '%s' 2> /dev/null" #define MINDISKSPACE 1024 // MB @@ -621,7 +621,7 @@ bool cRecordings::Load(bool Deleted) Clear(); bool result = false; char *cmd = NULL; - asprintf(&cmd, FINDCMD, VideoDirectory, Deleted ? "*" DELEXT : "*" RECEXT); + asprintf(&cmd, FINDCMD, VideoDirectory, VideoDirectory, Deleted ? "*" DELEXT : "*" RECEXT); FILE *p = popen(cmd, "r"); if (p) { char *s; |