From b8fa29a3fcd6358cda412aa1c73a9ec1b154a998 Mon Sep 17 00:00:00 2001 From: Winston Ametsitsi Date: Thu, 22 Feb 2018 23:33:47 -0800 Subject: [PATCH 1/2] fix handling of symlinks causing directory tree recursion to break --- scripts/inc/process.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/inc/process.class.php b/scripts/inc/process.class.php index b75265c..509b599 100644 --- a/scripts/inc/process.class.php +++ b/scripts/inc/process.class.php @@ -532,6 +532,8 @@ function _validateLine($line, $lineNum) { } else { + $split[$this->_col_path] = explode(' ', $split[$this->_col_path], 2)[0]; + // Only if all the checks passed. $ret = $split; } From cf2299b23c82efe3dbe4040d54547255261a772d Mon Sep 17 00:00:00 2001 From: Winston Ametsitsi Date: Fri, 23 Feb 2018 00:22:58 -0800 Subject: [PATCH 2/2] only strip symlink destination off links with a more specific split separator --- scripts/inc/process.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/inc/process.class.php b/scripts/inc/process.class.php index 509b599..ab162b2 100644 --- a/scripts/inc/process.class.php +++ b/scripts/inc/process.class.php @@ -532,7 +532,9 @@ function _validateLine($line, $lineNum) { } else { - $split[$this->_col_path] = explode(' ', $split[$this->_col_path], 2)[0]; + if ($split[$this->_col_type] == 'l') { + $split[$this->_col_path] = explode(' -> ', $split[$this->_col_path], 2)[0]; + } // Only if all the checks passed. $ret = $split;