From 4d27d83f6287ee1b3c5eaea2bcce53096af93d69 Mon Sep 17 00:00:00 2001 From: batrick Date: Thu, 21 Jul 2011 18:26:11 +0000 Subject: [PATCH] Fix to make SCRIPT_NAME not have a filename extension in certain situations. See [1]. [1] http://seclists.org/nmap-dev/2011/q3/304 --- nse_main.lua | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nse_main.lua b/nse_main.lua index 42f21f510..46efedb47 100644 --- a/nse_main.lua +++ b/nse_main.lua @@ -386,10 +386,9 @@ do "Warning: Loading '%s' -- the recommended file extension is '.nse'.", filename); end - local basename = match(filename, "[/\\]([^/\\]-)$") or filename; - local short_basename = match(filename, "[/\\]([^/\\]-)%.nse$") or - match(filename, "[/\\]([^/\\]-)%.[^.]*$") or - filename; + local basename = match(filename, "([^/\\]+)$") or filename; + local short_basename = match(filename, "([^/\\]+)%.nse$") or + match(filename, "([^/\\]+)%.[^.]*$") or filename; local file_closure = assert(loadfile(filename)); -- Give the closure its own environment, with global access local env = {