From 6f893ea3b4b6f38f4ea96196ade9441ab092cae1 Mon Sep 17 00:00:00 2001
From: mboelen <michael@cisofy.com>
Date: Mon, 13 Oct 2014 19:45:14 +0200
Subject: [PATCH] Improved symlink detection and reporting

---
 include/binaries | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/include/binaries b/include/binaries
index f68c1e85..4a72ed1b 100644
--- a/include/binaries
+++ b/include/binaries
@@ -46,14 +46,18 @@
                 if [ -L ${SCANDIR} ]; then
                     logtext "Result: directory exists, but is actually a symlink"
                     ShowSymlinkPath ${SCANDIR}
-                    if [ ${FOUNDPATH} -eq 1 -a -d ${rFILE} ]; then
-                        # Set path to new location
-                        logtext "Result: found the path behind this symlink (${SCANDIR} --> ${sFILE})"
-                        ORGPATH="${SCANDIR}"
-                        SCANDIR="${sFILE}"
-                        FIND=`echo ${SCANNEDPATHS} | grep ", ${SCANDIR}"`
-                        if [ ! "${FIND}" = "" ]; then
-                             SKIPDIR=1; logtext "Result: Skipping this directory as it is a symlink and was already scanned"
+                    if [ ${FOUNDPATH} -eq 1 ]; then
+                        if [ ! "${SYMLINK}" = "" -a -d ${SYMLINK} ]; then
+                            # Set path to new location
+                            logtext "Result: found the path behind this symlink (${SCANDIR} --> ${sFILE})"
+                            ORGPATH="${SCANDIR}"
+                            SCANDIR="${sFILE}"
+                            FIND=`echo ${SCANNEDPATHS} | grep ", ${SCANDIR}"`
+                            if [ ! "${FIND}" = "" ]; then
+                                 SKIPDIR=1; logtext "Result: Skipping this directory as it is a symlink and was already scanned"
+                            fi
+                          else
+                            SKIPDIR=1; logtext "Result: Symlink variable empty, or directory to symlink is non-existing"
                         fi
                       else
                         SKIPDIR=1; logtext "Result: Could not find the location of this symlink, or is not a directory"