diff options
| -rw-r--r-- | eit.c | 6 | ||||
| -rw-r--r-- | tools.c | 7 |
2 files changed, 6 insertions, 7 deletions
@@ -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) @@ -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; } |