From 4209947f9b1f52616295ed5c7dbe31930ae0dcfb Mon Sep 17 00:00:00 2001 From: batrick Date: Sat, 2 May 2009 04:43:27 +0000 Subject: [PATCH] Removed escape_magic function in favor of a simple substitution. --- nse_main.lua | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nse_main.lua b/nse_main.lua index 09f003ffc..8762874a8 100644 --- a/nse_main.lua +++ b/nse_main.lua @@ -296,10 +296,6 @@ local function get_chosen_scripts (rules) return 'm("'..str..'")'; end end - -- Escape a magic character by prepending the '%' escape character - local function escape_magic (str) - return "%"..str; - end for i, rule in ipairs(rules) do rule = match(rule, "^%s*(.-)%s*$"); -- strip surrounding whitespace @@ -342,7 +338,7 @@ local function get_chosen_scripts (rules) if r_categories[lower(pattern)] then return true end -- Check filename with wildcards pattern = gsub(pattern, "%.nse$", ""); -- remove optional extension - pattern = gsub(pattern, "[%^%$%(%)%%%.%[%]%+%-%?]", escape_magic); + pattern = gsub(pattern, "[%^%$%(%)%%%.%[%]%+%-%?]", "%%%1"); -- esc magic pattern = gsub(pattern, "%*", ".*"); -- change to Lua wildcard pattern = "^"..pattern.."$"; -- anchor to beginning and end return not not find(escaped_basename, pattern);