Version 1.7.16

- Updated the Italian OSD texts (thanks to Diego Pierotto).
- Added missing Dtypes for ATSC (thanks to Alex Lasnier).
- Updated the Portuguese language texts (thanks to Cristiano A. Silva).
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Fixed the array size of Atypes in cPatFilter::Process() (thanks to
  Rolf Ahrenberg).
- Added locking to the cCutter functions to avoid a crash in case CutRecording()
  is called from a plugin (reported by Andreas Mair).
- Fixed DDS detection for HD resolution subtitles (thanks to Reinhard Nissl).
- Fixed following symbolic links in RemoveFileOrDir().
- Added support for languages that are written right-to-left (based on a patch
  from Osama Alrawab). See INSTALL for information on how to turn this on.
- Added Arabian language texts (thanks to Osama Alrawab).

CONTRIBUTORS

@@ -984,6 +984,7 @@ Andreas Mair <andreas@vdr-developer.org>
  option ':groups' is given
  for fixing handling 3 and 4 byte UTF-8 symbols in Utf8CharGet()
  for fixing initializing the timer's flags in the cTimer copy constructor
+ for reporting a crash in case CutRecording() is called from a plugin
 
 Olivier Jacques <jacquesolivier@hotmail.com>)
  for translating OSD texts to the French language
@@ -1097,6 +1098,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for reporting a possible out of buffer memory access in case of bad TS data
  for implementing handling of HD resolution subtitles according to v1.3.1 of
  ETSI EN 300 743, chapter 7.2.1
+ for fixing the array size of Atypes in cPatFilter::Process()
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
@@ -1254,6 +1256,7 @@ Reinhard Nissl <rnissl@gmx.de>
  for devices with large buffers
  for implementing cDeviceHook
  for implementing cDevice::GetCurrentlyTunedTransponder()
+ for fixing DDS detection for HD resolution subtitles
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
@@ -2590,6 +2593,7 @@ Lars Hanisch <dvb@flensrocker.de>
 
 Alex Lasnier <alex@fepg.org>
  for adding tuning support for ATSC devices
+ for adding missing Dtypes for ATSC
 
 Dimitar Petrovski <dimeptr@gmail.com>
  for translating OSD texts to the Macedonian language
@@ -2614,3 +2618,10 @@ Christopher Reimer <reimer.christopher@freenet.de>
 Stefan Huskamp <coca_cola1@gmx.de>
  for suggesting to make entering characters via the number keys
  configurable
+
+Cristiano A. Silva <arquithek@gmail.com>
+ for updating the Portuguese language texts
+
+Osama Alrawab <alrawab@hotmail.com>
+ for adding support for languages that are written right-to-left
+ for translating OSD texts to the Arabian language

HISTORY

@@ -6464,3 +6464,19 @@ Video Disk Recorder Revision History
 - The new setup option "OSD/Number keys for characters" can be used to control whether
   the number keys can be used to enter characters in a text input field (suggested
   by Stefan Huskamp).
+
+2010-09-19: Version 1.7.16
+
+- Updated the Italian OSD texts (thanks to Diego Pierotto).
+- Added missing Dtypes for ATSC (thanks to Alex Lasnier).
+- Updated the Portuguese language texts (thanks to Cristiano A. Silva).
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Fixed the array size of Atypes in cPatFilter::Process() (thanks to
+  Rolf Ahrenberg).
+- Added locking to the cCutter functions to avoid a crash in case CutRecording()
+  is called from a plugin (reported by Andreas Mair).
+- Fixed DDS detection for HD resolution subtitles (thanks to Reinhard Nissl).
+- Fixed following symbolic links in RemoveFileOrDir().
+- Added support for languages that are written right-to-left (based on a patch
+  from Osama Alrawab). See INSTALL for information on how to turn this on.
+- Added Arabian language texts (thanks to Osama Alrawab).

INSTALL

@@ -23,6 +23,7 @@ You will also need to install the following libraries, as well as their
 
   fontconfig
   freetype2
+  fribidi (see "BiDi support" below)
   gettext
   libcap
   libjpeg
@@ -111,6 +112,16 @@ in English.
 Note that for VDR's internationalized texts to work, the LANG environment
 variable must be set to a valid locale!
 
+BiDi support
+------------
+
+Some languages are written right-to-left. In order to display such languages
+correctly, you need to build VDR with BIDI=1. This will link to the "fribidi"
+library and implement a function that prepares bidirectional texts to be
+displayed correctly. Since BiDi support adds some runtime overhead by requiring
+additional memory allocation and copying, this feature is not compiled in
+by default, so that users that have no need for this don't get any overhead.
+
 Workaround for providers not encoding their EPG data correctly
 --------------------------------------------------------------
 

Makefile

@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 2.9 2010/04/10 12:40:15 kls Exp $
+# $Id: Makefile 2.10 2010/09/17 13:28:50 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -53,6 +53,11 @@ endif
 ifdef VDR_USER
 DEFINES += -DVDR_USER=\"$(VDR_USER)\"
 endif
+ifdef BIDI
+INCLUDES += -I/usr/include/fribidi
+DEFINES += -DBIDI
+LIBS += -lfribidi
+endif
 
 LIRC_DEVICE ?= /dev/lircd
 RCU_DEVICE  ?= /dev/ttyS1

PLUGINS/src/dvbsddevice/dvbsdffdevice.c

@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsdffdevice.c 2.26 2010/01/30 10:05:23 kls Exp $
+ * $Id: dvbsdffdevice.c 2.27 2010/09/19 12:43:33 kls Exp $
  */
 
 #include "dvbsdffdevice.h"
@@ -15,9 +15,9 @@
 #include <linux/dvb/video.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
+#include <vdr/eitscan.h>
+#include <vdr/transfer.h>
 #include "dvbsdffosd.h"
-#include "vdr/eitscan.h"
-#include "vdr/transfer.h"
 
 // --- cDvbSdFfDevice --------------------------------------------------------
 

PLUGINS/src/dvbsddevice/dvbsdffosd.c

@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: dvbsdffosd.c 2.1 2009/12/29 11:52:48 kls Exp $
+ * $Id: dvbsdffosd.c 2.2 2010/09/19 12:43:45 kls Exp $
  */
 
 #include "dvbsdffosd.h"
@@ -11,7 +11,7 @@
 #include <signal.h>
 #include <sys/ioctl.h>
 #include <sys/unistd.h>
-#include "vdr/tools.h"
+#include <vdr/tools.h>
 
 // --- cDvbSdFfOsd -----------------------------------------------------------
 

PLUGINS/src/hello/po/fi_FI.po

@@ -2,7 +2,7 @@
 # Copyright (C) 2008 Klaus Schmidinger <kls@tvdr.de>
 # This file is distributed under the same license as the VDR package.
 # Hannu Savolainen <hannu@opensound.com>, 2002
-# Jaakko Hyvätti <jaakko@hyvatti.iki.fi>, 2002
+# Jaakko Hyvätti <jaakko@hyvatti.iki.fi>, 2002
 # Niko Tarnanen <niko.tarnanen@hut.fi>, 2003
 # Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2003
 #
@@ -15,11 +15,11 @@ msgstr ""
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "A friendly greeting"
-msgstr "Ystävällisin terveisin"
+msgstr "Ystävällisin terveisin"
 
 msgid "Hello"
 msgstr "Hei"
@@ -28,10 +28,10 @@ msgid "Greeting time (s)"
 msgstr "Tervehdysaika (s)"
 
 msgid "Use alternate greeting"
-msgstr "Käytä vaihtoehtoista tervehdystä"
+msgstr "Käytä vaihtoehtoista tervehdystä"
 
 msgid "Howdy folks!"
-msgstr "Mitä kuuluu?"
+msgstr "Mitä kuuluu?"
 
 msgid "Hello world!"
 msgstr "Hei maailma!"

PLUGINS/src/pictures/po/fi_FI.po

@@ -12,7 +12,7 @@ msgstr ""
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -29,4 +29,4 @@ msgid "Slide show delay (s)"
 msgstr "Diaesityksen viive (s)"
 
 msgid "No picture directory has been defined!"
-msgstr "Kuvahakemistoa ei ole määritelty!"
+msgstr "Kuvahakemistoa ei ole määritelty!"

PLUGINS/src/skincurses/po/fi_FI.po

@@ -12,7 +12,7 @@ msgstr ""
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "A text only skin"
@@ -22,7 +22,7 @@ msgid "Key$Mute"
 msgstr "Mykistys"
 
 msgid "Volume "
-msgstr "Äänenvoimakkuus "
+msgstr "Äänenvoimakkuus "
 
 msgid "Text mode"
 msgstr "Teksti"

config.h

@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 2.27 2010/06/06 09:53:02 kls Exp $
+ * $Id: config.h 2.28 2010/09/12 11:31:21 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -22,13 +22,13 @@
 
 // VDR's own version number:
 
-#define VDRVERSION  "1.7.15"
+#define VDRVERSION  "1.7.16"
-#define VDRVERSNUM   10715  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSNUM   10716  // Version * 10000 + Major * 100 + Minor
 
 // The plugin API's version number:
 
-#define APIVERSION  "1.7.15"
+#define APIVERSION  "1.7.16"
-#define APIVERSNUM   10715  // Version * 10000 + Major * 100 + Minor
+#define APIVERSNUM   10716  // Version * 10000 + Major * 100 + Minor
 
 // When loading plugins, VDR searches them by their APIVERSION, which
 // may be smaller than VDRVERSION in case there have been no changes to

cutter.c

@@ -4,13 +4,12 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.c 2.4 2010/01/02 13:08:08 kls Exp $
+ * $Id: cutter.c 2.5 2010/08/29 13:35:18 kls Exp $
  */
 
 #include "cutter.h"
 #include "recording.h"
 #include "remux.h"
-#include "thread.h"
 #include "videodir.h"
 
 // --- cCuttingThread --------------------------------------------------------
@@ -194,6 +193,7 @@ void cCuttingThread::Action(void)
 
 // --- cCutter ---------------------------------------------------------------
 
+cMutex cCutter::mutex;
 char *cCutter::editedVersionName = NULL;
 cCuttingThread *cCutter::cuttingThread = NULL;
 bool cCutter::error = false;
@@ -201,6 +201,7 @@ bool cCutter::ended = false;
 
 bool cCutter::Start(const char *FileName)
 {
+  cMutexLock MutexLock(&mutex);
   if (!cuttingThread) {
      error = false;
      ended = false;
@@ -231,6 +232,7 @@ bool cCutter::Start(const char *FileName)
 
 void cCutter::Stop(void)
 {
+  cMutexLock MutexLock(&mutex);
   bool Interrupted = cuttingThread && cuttingThread->Active();
   const char *Error = cuttingThread ? cuttingThread->Error() : NULL;
   delete cuttingThread;
@@ -247,6 +249,7 @@ void cCutter::Stop(void)
 
 bool cCutter::Active(void)
 {
+  cMutexLock MutexLock(&mutex);
   if (cuttingThread) {
      if (cuttingThread->Active())
         return true;
@@ -263,6 +266,7 @@ bool cCutter::Active(void)
 
 bool cCutter::Error(void)
 {
+  cMutexLock MutexLock(&mutex);
   bool result = error;
   error = false;
   return result;
@@ -270,6 +274,7 @@ bool cCutter::Error(void)
 
 bool cCutter::Ended(void)
 {
+  cMutexLock MutexLock(&mutex);
   bool result = ended;
   ended = false;
   return result;

cutter.h

@@ -4,16 +4,19 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: cutter.h 2.1 2010/01/02 12:09:54 kls Exp $
+ * $Id: cutter.h 2.2 2010/08/29 13:32:33 kls Exp $
  */
 
 #ifndef __CUTTER_H
 #define __CUTTER_H
 
+#include "thread.h"
+
 class cCuttingThread;
 
 class cCutter {
 private:
+  static cMutex mutex;
   static char *editedVersionName;
   static cCuttingThread *cuttingThread;
   static bool error;

dvbsubtitle.c

@@ -7,7 +7,7 @@
  * Original author: Marco Schlüßler <marco@lordzodiac.de>
  * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 2.6 2010/06/05 14:03:55 kls Exp $
+ * $Id: dvbsubtitle.c 2.7 2010/08/29 14:08:23 kls Exp $
  */
 
 #include "dvbsubtitle.h"
@@ -660,7 +660,7 @@ cDvbSubtitleConverter::cDvbSubtitleConverter(void)
   dvbSubtitleAssembler = new cDvbSubtitleAssembler;
   osd = NULL;
   frozen = false;
-  ddsVersionNumber = 0;
+  ddsVersionNumber = -1;
   displayWidth = 720;
   displayHeight = 576;
   displayHorizontalOffset = 0;
@@ -693,7 +693,7 @@ void cDvbSubtitleConverter::Reset(void)
   bitmaps->Clear();
   DELETENULL(osd);
   frozen = false;
-  ddsVersionNumber = 0;
+  ddsVersionNumber = -1;
   displayWidth = 720;
   displayHeight = 576;
   displayHorizontalOffset = 0;

font.c

@@ -4,12 +4,17 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.c 2.4 2009/12/31 14:49:59 kls Exp $
+ * BiDi support by Osama Alrawab <alrawab@hotmail.com> @2008 Tripoli-Libya.
+ *
+ * $Id: font.c 2.5 2010/09/19 11:49:19 kls Exp $
  */
 
 #include "font.h"
 #include <ctype.h>
 #include <fontconfig/fontconfig.h>
+#ifdef BIDI
+#include <fribidi.h>
+#endif
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include "config.h"
@@ -240,6 +245,10 @@ int cFreetypeFont::Width(const char *s) const
 {
   int w = 0;
   if (s) {
+#ifdef BIDI
+     cString bs = Bidi(s);
+     s = bs;
+#endif
      uint prevSym = 0;
      while (*s) {
            int sl = Utf8CharLen(s);
@@ -259,6 +268,10 @@ int cFreetypeFont::Width(const char *s) const
 void cFreetypeFont::DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const
 {
   if (s && height) { // checking height to make sure we actually have a valid font
+#ifdef BIDI
+     cString bs = Bidi(s);
+     s = bs;
+#endif
      bool AntiAliased = Setup.AntiAlias && Bitmap->Bpp() >= 8;
      bool TransparentBackground = ColorBg == clrTransparent;
      int16_t BlendLevelIndex[MAX_BLEND_LEVELS]; // tIndex is 8 bit unsigned, so a negative value can be used to mark unused entries
@@ -443,6 +456,32 @@ cString cFont::GetFontFileName(const char *FontName)
   return FontFileName;
 }
 
+#ifdef BIDI
+cString cFont::Bidi(const char *Ltr)
+{
+  fribidi_set_mirroring(true);
+  fribidi_set_reorder_nsm(false);
+  FriBidiCharSet fribidiCharset = FRIBIDI_CHAR_SET_UTF8;
+  int LtrLen = strlen(Ltr);
+  FriBidiCharType Base = FRIBIDI_TYPE_L;
+  FriBidiChar *Logical = MALLOC(FriBidiChar, LtrLen + 1) ;
+  int RtlLen = fribidi_charset_to_unicode(fribidiCharset, const_cast<char *>(Ltr), LtrLen, Logical);
+  FriBidiChar *Visual = MALLOC(FriBidiChar, LtrLen + 1) ;
+  char *Rtl = NULL;
+  bool ok = fribidi_log2vis(Logical, RtlLen, &Base, Visual, NULL, NULL, NULL);
+  if (ok) {
+     fribidi_remove_bidi_marks(Visual, RtlLen, NULL, NULL, NULL);
+     Rtl = MALLOC(char, RtlLen * 4);
+     fribidi_unicode_to_charset(fribidiCharset, Visual, RtlLen, Rtl);
+     }
+  free(Logical);
+  free(Visual);
+  if (ok)
+     return cString(Rtl, true);
+  return cString(Ltr);
+}
+#endif
+
 // --- cTextWrapper ----------------------------------------------------------
 
 cTextWrapper::cTextWrapper(void)

font.h

@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.h 2.3 2009/12/31 14:48:25 kls Exp $
+ * $Id: font.h 2.4 2010/09/19 11:48:37 kls Exp $
  */
 
 #ifndef __FONT_H
@@ -82,6 +82,11 @@ public:
           ///< Returns true if any font names were found.
   static cString GetFontFileName(const char *FontName);
           ///< Retruns the actual font file name for the given FontName.
+#ifdef BIDI
+  static cString Bidi(const char *Ltr);
+          ///< Converts any "right-to-left" parts in the "left-to-right" string Ltr
+          ///< to the proper language specific representation and returns the resulting string.
+#endif
   };
 
 class cTextWrapper {

i18n.c

@@ -4,9 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 2.1 2008/09/06 12:24:43 kls Exp $
+ * $Id: i18n.c 2.2 2010/09/19 11:22:39 kls Exp $
- *
- *
  */
 
 /*
@@ -60,6 +58,7 @@ const char *LanguageCodeList[] = {
   "cze,ces",
   "tur",
   "ukr",
+  "ara",
   NULL
   };
 

pat.c

@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: pat.c 2.11 2010/06/05 13:26:47 kls Exp $
+ * $Id: pat.c 2.13 2010/06/13 11:12:12 kls Exp $
  */
 
 #include "pat.h"
@@ -332,7 +332,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
         int Ppid = 0;
         int Vtype = 0;
         int Apids[MAXAPIDS + 1] = { 0 }; // these lists are zero-terminated
-        int Atypes[MAXDPIDS + 1] = { 0 };
+        int Atypes[MAXAPIDS + 1] = { 0 };
         int Dpids[MAXDPIDS + 1] = { 0 };
         int Dtypes[MAXDPIDS + 1] = { 0 };
         int Spids[MAXSPIDS + 1] = { 0 };
@@ -473,6 +473,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
                              }
                          if (NumDpids < MAXDPIDS) {
                             Dpids[NumDpids] = esPid;
+                            Dtypes[NumDpids] = SI::AC3DescriptorTag;
                             strn0cpy(DLangs[NumDpids], lang, MAXLANGCODE1);
                             NumDpids++;
                             }

po/fi_FI.po

@@ -843,7 +843,7 @@ msgid "Setup.OSD$Folders in timer menu"
 msgstr "Näytä kansiot ajastinvalikossa"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "Käytä numeronäppäimiä tekstisyötteessä"
 
 msgid "EPG"
 msgstr "Ohjelmaopas"

po/it_IT.po

@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: VDR 1.6.0\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
 "POT-Creation-Date: 2010-06-06 12:52+0200\n"
-"PO-Revision-Date: 2010-03-28 22:49+0100\n"
+"PO-Revision-Date: 2010-06-13 00:30+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian\n"
 "MIME-Version: 1.0\n"
@@ -847,7 +847,7 @@ msgid "Setup.OSD$Folders in timer menu"
 msgstr "Cartelle nel menu timer"
 
 msgid "Setup.OSD$Number keys for characters"
-msgstr ""
+msgstr "Tasti numerici per i caratteri"
 
 msgid "EPG"
 msgstr "Guida programmi EPG"

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 2.7 2010/02/28 13:31:46 kls Exp $
+ * $Id: tools.c 2.8 2010/08/29 15:03:08 kls Exp $
  */
 
 #include "tools.h"
@@ -367,22 +367,31 @@ bool RemoveFileOrDir(const char *FileName, bool FollowSymlinks)
                  if (strcmp(e->d_name, ".") && strcmp(e->d_name, "..")) {
                     cString buffer = AddDirectory(FileName, e->d_name);
                     if (FollowSymlinks) {
-                       int size = strlen(buffer) * 2; // should be large enough
+                       struct stat st2;
-                       char *l = MALLOC(char, size);
+                       if (stat(buffer, &st2) == 0) {
-                       int n = readlink(buffer, l, size);
+                          if (S_ISLNK(st2.st_mode)) {
-                       if (n < 0) {
+                             int size = st2.st_size + 1;
-                          if (errno != EINVAL)
+                             char *l = MALLOC(char, size);
-                             LOG_ERROR_STR(*buffer);
+                             int n = readlink(buffer, l, size - 1);
+                             if (n < 0) {
+                                if (errno != EINVAL)
+                                   LOG_ERROR_STR(*buffer);
+                                }
+                             else if (n < size) {
+                                l[n] = 0;
+                                dsyslog("removing %s", l);
+                                if (remove(l) < 0)
+                                   LOG_ERROR_STR(l);
+                                }
+                             else
+                                esyslog("ERROR: symlink name length (%d) exceeded anticipated buffer size (%d)", n, size);
+                             free(l);
+                             }
                           }
-                       else if (n < size) {
+                       else if (errno != ENOENT) {
-                          l[n] = 0;
+                          LOG_ERROR_STR(FileName);
-                          dsyslog("removing %s", l);
+                          return false;
-                          if (remove(l) < 0)
-                             LOG_ERROR_STR(l);
                           }
-                       else
-                          esyslog("ERROR: symlink name length (%d) exceeded anticipated buffer size (%d)", n, size);
-                       free(l);
                        }
                     dsyslog("removing %s", *buffer);
                     if (remove(buffer) < 0)