From 8b96cd93b95e5313fc1043a412787e206601c76a Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 8 Nov 2003 15:46:29 +0100
Subject: Fixed getting the list of recordings in case VDR is started from a
 directory where it doesn't have access to

---
 CONTRIBUTORS | 4 ++++
 HISTORY      | 4 +++-
 recording.c  | 6 +++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 2d714404..9fc0ef8e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -864,6 +864,10 @@ 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
+
 Emil Petersky <petersky@isr.uni-stuttgart.de>
  for adding "Slovak Link" and "Czech Link" to 'ca.conf'
 
diff --git a/HISTORY b/HISTORY
index 10174e3f..7cde22cf 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2452,11 +2452,13 @@ 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).
 
 2003-10-24: Version 1.3.0
 
diff --git a/recording.c b/recording.c
index 77b236f4..a181ff45 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.85 2003/10/24 15:49:00 kls Exp $
+ * $Id: recording.c 1.86 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;
-- 
cgit v1.2.3