diff --git a/Zabbix-FileAndFolder.zip b/Zabbix-FileAndFolder.zip index 26dd837..77c8fb3 100644 Binary files a/Zabbix-FileAndFolder.zip and b/Zabbix-FileAndFolder.zip differ diff --git a/fileandfolder.exe b/fileandfolder.exe index 97cd553..da2b216 100644 Binary files a/fileandfolder.exe and b/fileandfolder.exe differ diff --git a/fileandfolderV3.au3 b/fileandfolderV3.au3 index 7c08300..6f5c0d4 100644 --- a/fileandfolderV3.au3 +++ b/fileandfolderV3.au3 @@ -5,7 +5,7 @@ #AutoIt3Wrapper_UseUpx=y #AutoIt3Wrapper_Change2CUI=y #AutoIt3Wrapper_Res_Description=2014-2017 von Bernhard Linz / Bernhard@znil.de -#AutoIt3Wrapper_Res_Fileversion=3.0.0.6 +#AutoIt3Wrapper_Res_Fileversion=3.0.0.7 #AutoIt3Wrapper_Res_Fileversion_AutoIncrement=y #AutoIt3Wrapper_Res_SaveSource=y #AutoIt3Wrapper_Res_Language=1031 diff --git a/fileandfolderV4.au3 b/fileandfolderV4.au3 index 3b7c108..741dd09 100644 --- a/fileandfolderV4.au3 +++ b/fileandfolderV4.au3 @@ -6,7 +6,7 @@ #AutoIt3Wrapper_Change2CUI=y #AutoIt3Wrapper_Res_Comment=2014-2020 von Bernhard Linz / Bernhard@znil.de #AutoIt3Wrapper_Res_Description=FileAndFolder.exe Zabbix Helper -#AutoIt3Wrapper_Res_Fileversion=4.0.0.4 +#AutoIt3Wrapper_Res_Fileversion=4.0.0.8 #AutoIt3Wrapper_Res_Fileversion_AutoIncrement=y #AutoIt3Wrapper_Res_SaveSource=y #AutoIt3Wrapper_Res_Language=1031 @@ -503,6 +503,9 @@ If StringLeft($CmdLine[1], StringLen("FileCountSize=")) = "FileCountSize=" Or St If $s_Suchmuster = "--verbose" Then $s_Suchmuster = "*" EndIf + If $s_Suchmuster = "" Then + $s_Suchmuster = "*" + EndIf If StringLeft($CmdLine[1], 1) = "#" Then $i_DateiSuchGroesse = Int(StringReplace($CmdLine[1], "#FileCountSize=", "")) $b_Inverse = True @@ -567,9 +570,17 @@ If StringLeft($CmdLine[1], StringLen("FileCountAge=")) = "FileCountAge=" Or Stri If $CmdLine[0] > 2 Then $s_Suchmuster = $CmdLine[3] EndIf + If $b_Verbose = True Then + ConsoleWrite("Aufruf Unterroutine mit folgenden Parametern:" & @CRLF) + ConsoleWrite('$s_Suchmuster Anfangs .: "' & $s_Suchmuster & '"' & @CRLF) + EndIf If $s_Suchmuster = "--verbose" Then $s_Suchmuster = "*" EndIf + If $s_Suchmuster = "" Then + $s_Suchmuster = "*" + EndIf + If StringLeft($CmdLine[1], 1) = "#" Then $i_DateiSuchAlter = Int(StringReplace($CmdLine[1], "#FileCountAge=", "")) $b_Inverse = True @@ -586,6 +597,12 @@ If StringLeft($CmdLine[1], StringLen("FileCountAge=")) = "FileCountAge=" Or Stri If StringRight($s_Path,1) <> "\" Then $s_Path = $s_Path & "\" EndIf + If $b_Verbose = True Then + ConsoleWrite('$s_Suchmuster bei Start: "' & $s_Suchmuster & '"' & @CRLF) + ConsoleWrite('$s_Path ...............: "' & $s_Path & '"' & @CRLF) + ConsoleWrite('$i_DateiSuchAlter .....: "' & $i_DateiSuchAlter & '"' & @CRLF) + ConsoleWrite('$b_Inverse ............: "' & $b_Inverse & '"' & @CRLF) + EndIf $i_Zaehler = 0 If StringInStr(FileGetAttrib($CmdLine[2]), "D") > 0 Then $h_suchhandle = FileFindFirstFile($s_Path & $s_Suchmuster)