PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-09 22:21:29 +00:00
Code Issues Projects Releases Wiki Activity

Update the output formatting to the style that Fyodor requested. Haven't updated the @output sections yet, just in case we decide to change this again.

Browse Source
This commit is contained in:
ron
2009-11-20 16:12:41 +00:00
parent 76db1dc4d5
commit 422b5855e5
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nselib/stdnse.lua
View File

@@ -268,14 +268,14 @@ local function format_get_indent(indent, at_end)
local had_continue = false
if(not(at_end)) then
str = rep('| ', #indent)
str = rep(' ', #indent) -- Was: "| "
else
for i = #indent, 1, -1 do
if(indent[i] and not(had_continue)) then
str = str .. "|_ "
str = str .. " " -- Was: "|_ "
else
had_continue = true
str = str .. "| "
str = str .. " " -- Was: "| "
end
end
end
@@ -370,12 +370,12 @@ function format_output(status, data, indent)
if(type(value) == 'table') then
if(value['name']) then
if(value['warning'] and nmap.debugging() > 0) then
output = output .. format("%s| %s%s (WARNING: %s)\n", format_get_indent(indent), prefix, value['name'], value['warning'])
output = output .. format("%s %s%s (WARNING: %s)\n", format_get_indent(indent), prefix, value['name'], value['warning'])
else
output = output .. format("%s| %s%s\n", format_get_indent(indent), prefix, value['name'])
output = output .. format("%s %s%s\n", format_get_indent(indent), prefix, value['name'])
end
elseif(value['warning'] and nmap.debugging() > 0) then
output = output .. format("%s| %s(WARNING: %s)\n", format_get_indent(indent), prefix, value['warning'])
output = output .. format("%s %s(WARNING: %s)\n", format_get_indent(indent), prefix, value['warning'])
end
-- Do a shallow copy of indent
@@ -394,9 +394,9 @@ function format_output(status, data, indent)
elseif(type(value) == 'string') then
if(i ~= #data) then
output = output .. format("%s| %s%s\n", format_get_indent(indent, false), prefix, value)
output = output .. format("%s %s%s\n", format_get_indent(indent, false), prefix, value)
else
output = output .. format("%s|_ %s%s\n", format_get_indent(indent, true), prefix, value)
output = output .. format("%s %s%s\n", format_get_indent(indent, true), prefix, value)
end
end
end