isPublicFrom: support relative path

goplus · Jul 20, 2022 · 06aa42d · 06aa42d
1 parent 019f67c
commit 06aa42d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/cl/pkginfo.go b/cl/pkginfo.go
@@ -127,6 +127,9 @@ func canPub(name string) bool {
 
 func isPublicFrom(f string, pubFrom []string) bool {
 	for _, from := range pubFrom {
+		if strings.HasPrefix(from, ".") { // relative path
+			from = strings.TrimLeft(from, "./") // remove "./", "../", etc.
+		}
 		if strings.HasSuffix(f, from) {
 			return true
 		}

diff --git a/testdata/libc/c2go.cfg b/testdata/libc/c2go.cfg
@@ -1,6 +1,9 @@
 {
     "public": {
-        "from": ["size_t.h"]
+        "from": [
+            "size_t.h",
+            "./src/foo.h"
+        ]
     },
     "target": {
         "name": "libc",

diff --git a/testdata/libc/c2go.pub b/testdata/libc/c2go.pub
@@ -5,4 +5,3 @@ __builtin_bswap64
 printf
 strlen
 qsort QSort
-foo