summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2001-08-11 14:51:28 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2001-08-11 14:51:28 +0200
commit2069b9946ea0c561d5c65bfc19baa202edeeaa91 (patch)
tree4c1d46c74f6694d3dc17cbb9d7fbc2025eb01ed7
parent8e7c06006f8667148f6564326be2deafa5a3a3e8 (diff)
downloadvdr-2069b9946ea0c561d5c65bfc19baa202edeeaa91.tar.gz
vdr-2069b9946ea0c561d5c65bfc19baa202edeeaa91.tar.bz2
Fixed AddDirectory
-rw-r--r--eit.c6
-rw-r--r--tools.c7
2 files changed, 6 insertions, 7 deletions
diff --git a/eit.c b/eit.c
index 50f380f2..6584e598 100644
--- a/eit.c
+++ b/eit.c
@@ -13,7 +13,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
- * $Id: eit.c 1.17 2001/08/11 09:31:54 kls Exp $
+ * $Id: eit.c 1.18 2001/08/11 14:51:28 kls Exp $
***************************************************************************/
#include "eit.h"
@@ -1140,7 +1140,9 @@ void cSIProcessor::SetEpgDataFileName(const char *FileName)
const char *cSIProcessor::GetEpgDataFileName(void)
{
- return epgDataFileName ? AddDirectory(VideoDirectory, epgDataFileName) : NULL;
+ if (epgDataFileName)
+ return *epgDataFileName == '/' ? epgDataFileName : AddDirectory(VideoDirectory, epgDataFileName);
+ return NULL;
}
void cSIProcessor::SetStatus(bool On)
diff --git a/tools.c b/tools.c
index bf07ad07..75e96487 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 1.37 2001/08/11 11:14:19 kls Exp $
+ * $Id: tools.c 1.38 2001/08/11 14:49:48 kls Exp $
*/
#define _GNU_SOURCE
@@ -117,10 +117,7 @@ const char *AddDirectory(const char *DirName, const char *FileName)
{
static char *buf = NULL;
delete buf;
- if (*FileName != '/')
- asprintf(&buf, "%s/%s", DirName && *DirName ? DirName : ".", FileName);
- else
- buf = strdup(FileName);
+ asprintf(&buf, "%s/%s", DirName && *DirName ? DirName : ".", FileName);
return buf;
}