aboutsummaryrefslogtreecommitdiffstats
path: root/func.go
diff options
context:
space:
mode:
authorShinichiro Hamaji <shinichiro.hamaji@gmail.com>2015-06-29 16:40:33 +0900
committerShinichiro Hamaji <shinichiro.hamaji@gmail.com>2015-06-29 16:41:20 +0900
commit55906852d451c0b11bb6fba7e674ad44568e951f (patch)
treed7b49491b8efc8ca4c3498bfc427a0e993fe30d0 /func.go
parent1310834a240dca89fb06b4fe8dfccbdf97c83144 (diff)
downloadandroid_build_kati-55906852d451c0b11bb6fba7e674ad44568e951f.tar.gz
android_build_kati-55906852d451c0b11bb6fba7e674ad44568e951f.tar.bz2
android_build_kati-55906852d451c0b11bb6fba7e674ad44568e951f.zip
Fix $(dir /foo) for both C++ and Go
Diffstat (limited to 'func.go')
-rw-r--r--func.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/func.go b/func.go
index b1fe320..8933974 100644
--- a/func.go
+++ b/func.go
@@ -623,12 +623,12 @@ func (f *funcDir) Eval(w io.Writer, ev *Evaluator) error {
ws := newWordScanner(abuf.Bytes())
sw := ssvWriter{w: w}
for ws.Scan() {
- name := string(ws.Bytes())
+ name := filepath.Dir(string(string(ws.Bytes())))
if name == "/" {
sw.WriteString(name)
continue
}
- sw.WriteString(filepath.Dir(string(name)) + string(filepath.Separator))
+ sw.WriteString(name + string(filepath.Separator))
}
freeBuf(abuf)
stats.add("funcbody", "dir", t)