diff --git a/lib/common/common_helper.rb b/lib/common/common_helper.rb index 019b4be9..2ffff163 100644 --- a/lib/common/common_helper.rb +++ b/lib/common/common_helper.rb @@ -42,6 +42,11 @@ def kali_linux? end end +# Determins if installed on Windows OS +def windows? + Gem.win_platform? +end + require 'environment' def escape_glob(s) @@ -223,7 +228,11 @@ end # # @return [ Integer ] The number of lines in the given file def count_file_lines(file) - `wc -l #{file.shellescape}`.split[0].to_i + if windows? + `findstr /R /N "^" #{file.shellescape} | find /C ":"`.split[0].to_i + else + `wc -l #{file.shellescape}`.split[0].to_i + end end # Truncates a string to a specific length and adds ... at the end diff --git a/wpscan.rb b/wpscan.rb index 5cd6afd3..eba4e1da 100755 --- a/wpscan.rb +++ b/wpscan.rb @@ -152,7 +152,7 @@ def main # Output runtime data start_time = Time.now - start_memory = get_memory_usage + start_memory = get_memory_usage unless windows? puts info("URL: #{wp_target.url}") puts info("Started: #{start_time.asctime}") puts @@ -440,12 +440,12 @@ def main stop_time = Time.now elapsed = stop_time - start_time - used_memory = get_memory_usage - start_memory + used_memory = get_memory_usage - start_memory unless windows? puts puts info("Finished: #{stop_time.asctime}") puts info("Requests Done: #{@total_requests_done}") - puts info("Memory used: #{used_memory.bytes_to_human}") + puts info("Memory used: #{used_memory.bytes_to_human}") unless windows? puts info("Elapsed time: #{Time.at(elapsed).utc.strftime('%H:%M:%S')}") rescue Interrupt