PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-01-07 23:19:02 +00:00
Code Issues Projects Releases Wiki Activity

Support floats and negative intervals in format_time

Browse Source
This commit is contained in:
dmiller
2016-07-21 17:05:20 +00:00
parent 92ef17cc18
commit 5483beef88
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
nselib/stdnse.lua
View File

@@ -566,20 +566,25 @@ end
-- in milliseconds, this is 1000 for instance. Default: 1 (seconds)
-- @return The time interval in string format
function format_time(interval, unit)
local sign = ""
if interval < 0 then
sign = "-"
interval = math.abs(interval)
end
unit = unit or 1
local precision = floor(math.log(unit, 10))
local sec = (interval % (60 * unit)) / unit
interval = floor(interval / (60 * unit))
interval = interval // (60 * unit)
local min = interval % 60
interval = floor(interval / 60)
interval = interval // 60
local hr = interval % 24
interval = floor(interval / 24)
interval = interval // 24
local s = format("%dd%02dh%02dm%02.".. precision .."fs",
local s = format("%.0fd%02.0fh%02.0fm%02.".. precision .."fs",
interval, hr, min, sec)
-- trim off leading 0 and "empty" units
return match(s, "([1-9].*)") or format("%0.".. precision .."fs", 0)
return sign .. (match(s, "([1-9].*)") or format("%0.".. precision .."fs", 0))
end
--- Format the difference between times <code>t2</code> and <code>t1</code>