Skip to content

Commit 5edb5fa

Browse files
committed
[Fix] Dead code cleanup: wire view_report_json(), remove 3 orphaned variables
[Fix] --json-report: call view_report_json() instead of inlining identical logic [Fix] Remove orphaned $pidof variable (process detection uses pgrep) [Fix] Remove orphaned $clamdscan variable (clamselector() discovers binary inline) [Fix] Remove vestigial $coltest capability test (result never consumed)
1 parent 597da39 commit 5edb5fa

2 files changed

Lines changed: 1 addition & 11 deletions

File tree

files/internals/internals.conf

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,22 +63,13 @@ mail=$(command -v mail 2>/dev/null)
6363
sendmail=$(command -v sendmail 2>/dev/null)
6464
wget=$(command -v wget 2>/dev/null)
6565
curl=$(command -v curl 2>/dev/null)
66-
pidof=$(command -v pidof 2>/dev/null)
6766
sed=$(command -v sed 2>/dev/null)
6867
stat=$(command -v stat 2>/dev/null)
6968
usermod=$(command -v usermod 2>/dev/null)
7069
clamscan_extraopts=""
7170
clamdscan_extraopts=""
72-
clamdscan=$(command -v clamdscan 2>/dev/null)
7371
yara=$(command -v yara 2>/dev/null)
7472
yr=$(command -v yr 2>/dev/null)
75-
coltest=$(command -v column 2>/dev/null)
76-
if [ -n "$coltest" ]; then
77-
# Validate -o (output separator) support; util-linux < 2.23 lacks it
78-
if ! echo "a:b" | "$coltest" -s ':' -t -o ':' >/dev/null 2>&1; then
79-
coltest=""
80-
fi
81-
fi
8273

8374
ignore_paths="$confpath/ignore_paths"
8475
ignore_sigs="$confpath/ignore_sigs"

files/maldet

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -946,8 +946,7 @@ else
946946
;;
947947
--json-report)
948948
shift
949-
_report_format="json"
950-
view_report "$1"
949+
view_report_json "$1"
951950
;;
952951
-p|--purge)
953952
header

0 commit comments

Comments
 (0)