core.shm: Fix bug in resolve()

Corrected bug caught by SnabbBot and selftest(). resolve() was broken.
snabbco · Jun 5, 2015 · ffb4cf1 · ffb4cf1
1 parent 2b376f1
commit ffb4cf1
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/core/shm.lua b/src/core/shm.lua
@@ -93,12 +93,9 @@ function map (name, type,  readonly)
 end
 
 function resolve (name)
-   local result = name
-   -- q is qualifier ("", "/", "//")
-   local q, p = name:match("^(/*)(.*)")
-   -- Add path, if name is related and path is defined
+   local q, p = name:match("^(/*)(.*)") -- split qualifier (/ or //)
+   local result = p
    if q == '' and path ~= '' then result = path.."/"..result end
-   -- Add process qualifier, unless name is fully qualified
    if q ~= '//'              then result = tostring(S.getpid()).."/"..result end
    return result
 end