Update embed with mibs dir

cmd/embed/main.go

@@ -6,10 +6,10 @@ import (
 	"flag"
 	"os"
 
-	"github.com/sleepinggenius2/gosmi"
+	"github.com/min-oc/gosmi"
 )
 
-//go:embed FIZBIN-MIB.mib
+//go:embed mibs
 var fs embed.FS
 
 func main() {
@@ -18,7 +18,7 @@ func main() {
 
 	gosmi.Init()
 
-	gosmi.SetFS(gosmi.NamedFS("Embed Example", fs))
+	gosmi.SetFS(gosmi.NamedFS("mibs", fs))
 
 	m, err := gosmi.GetModule(*module)
 	if err != nil {

cmd/parse/main.go

@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/alecthomas/repr"
-	"github.com/sleepinggenius2/gosmi/parser"
+	"github.com/min-oc/gosmi/parser"
 )
 
 func main() {

cmd/smi/main.go

@@ -7,8 +7,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/sleepinggenius2/gosmi"
-	"github.com/sleepinggenius2/gosmi/types"
+	"github.com/min-oc/gosmi"
+	"github.com/min-oc/gosmi/types"
 )
 
 type arrayStrings []string

config.go

@@ -3,7 +3,7 @@ package gosmi
 import (
 	"os"
 
-	"github.com/sleepinggenius2/gosmi/smi"
+	"github.com/min-oc/gosmi/smi"
 )
 
 func Init() {

go.mod

@@ -1,4 +1,4 @@
-module github.com/sleepinggenius2/gosmi
+module github.com/min-oc/gosmi
 
 go 1.16
 

models/format.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/sleepinggenius2/gosmi/types"
+	"github.com/min-oc/gosmi/types"
 )
 
 type Format byte

models/module.go

@@ -3,7 +3,7 @@ package models
 import (
 	"time"
 
-	"github.com/sleepinggenius2/gosmi/types"
+	"github.com/min-oc/gosmi/types"
 )
 
 type Import struct {

models/node.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"github.com/sleepinggenius2/gosmi/types"
+	"github.com/min-oc/gosmi/types"
 )
 
 type Node struct {

models/nodes.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/sleepinggenius2/gosmi/types"
+	"github.com/min-oc/gosmi/types"
 )
 
 type BaseNode struct {

models/type.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/sleepinggenius2/gosmi/types"
+	"github.com/min-oc/gosmi/types"
 )
 
 type Enum struct {

module.go

@@ -3,9 +3,9 @@ package gosmi
 import (
 	"fmt"
 
-	"github.com/sleepinggenius2/gosmi/models"
-	"github.com/sleepinggenius2/gosmi/smi"
-	"github.com/sleepinggenius2/gosmi/types"
+	"github.com/min-oc/gosmi/models"
+	"github.com/min-oc/gosmi/smi"
+	"github.com/min-oc/gosmi/types"
 )
 
 type SmiModule struct {

node.go

@@ -3,9 +3,9 @@ package gosmi
 import (
 	"fmt"
 
-	"github.com/sleepinggenius2/gosmi/models"
-	"github.com/sleepinggenius2/gosmi/smi"
-	"github.com/sleepinggenius2/gosmi/types"
+	"github.com/min-oc/gosmi/models"
+	"github.com/min-oc/gosmi/smi"
+	"github.com/min-oc/gosmi/types"
 )
 
 type SmiNode struct {

notification.go

@@ -1,7 +1,7 @@
 package gosmi
 
 import (
-	"github.com/sleepinggenius2/gosmi/smi"
+	"github.com/min-oc/gosmi/smi"
 )
 
 type Notification struct {

parser/common.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/alecthomas/participle/lexer"
 
-	"github.com/sleepinggenius2/gosmi/types"
+	"github.com/min-oc/gosmi/types"
 )
 
 type SubIdentifier struct {

parser/compliance.go

@@ -3,7 +3,7 @@ package parser
 import (
 	"github.com/alecthomas/participle/lexer"
 
-	"github.com/sleepinggenius2/gosmi/types"
+	"github.com/min-oc/gosmi/types"
 )
 
 type AgentCapabilityVariation struct {

parser/macro.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/alecthomas/participle/lexer"
 
-	"github.com/sleepinggenius2/gosmi/types"
+	"github.com/min-oc/gosmi/types"
 )
 
 type MacroBody struct {

parser/module.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/alecthomas/participle/lexer"
 
-	"github.com/sleepinggenius2/gosmi/types"
+	"github.com/min-oc/gosmi/types"
 )
 
 type Date string

parser/notification.go

@@ -3,7 +3,7 @@ package parser
 import (
 	"github.com/alecthomas/participle/lexer"
 
-	"github.com/sleepinggenius2/gosmi/types"
+	"github.com/min-oc/gosmi/types"
 )
 
 type NotificationGroup struct {

parser/object.go

@@ -3,7 +3,7 @@ package parser
 import (
 	"github.com/alecthomas/participle/lexer"
 
-	"github.com/sleepinggenius2/gosmi/types"
+	"github.com/min-oc/gosmi/types"
 )
 
 type ObjectGroup struct {

parser/type.go

@@ -3,7 +3,7 @@ package parser
 import (
 	"github.com/alecthomas/participle/lexer"
 
-	"github.com/sleepinggenius2/gosmi/types"
+	"github.com/min-oc/gosmi/types"
 )
 
 type TextualConvention struct {

smi/config.go

@@ -7,8 +7,8 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/sleepinggenius2/gosmi/smi/internal"
-	"github.com/sleepinggenius2/gosmi/types"
+	"github.com/min-oc/gosmi/smi/internal"
+	"github.com/min-oc/gosmi/types"
 )
 
 const (
@@ -29,7 +29,7 @@ var DefaultSmiPaths []string = []string{
 type FS = internal.FS
 type NamedFS = internal.NamedFS
 
-func NewNamedFS(name string, fs FS) NamedFS { return NamedFS{Name: "[" + name + "]", FS: fs} }
+func NewNamedFS(name string, fs FS) NamedFS { return NamedFS{Name: name, FS: fs} }
 
 func checkInit() {
 	if !internal.Initialized() {

smi/internal/handle.go

@@ -1,8 +1,8 @@
 package internal
 
 import (
-	"github.com/sleepinggenius2/gosmi/parser"
-	"github.com/sleepinggenius2/gosmi/types"
+	"github.com/min-oc/gosmi/parser"
+	"github.com/min-oc/gosmi/types"
 )
 
 const WellKnownModuleName types.SmiIdentifier = "<well-known>"

smi/internal/import.go

@@ -1,7 +1,7 @@
 package internal
 
 import (
-	"github.com/sleepinggenius2/gosmi/types"
+	"github.com/min-oc/gosmi/types"
 )
 
 var importConversions map[types.SmiImport]types.SmiImport = map[types.SmiImport]types.SmiImport{

smi/internal/macro.go

@@ -1,7 +1,7 @@
 package internal
 
 import (
-	"github.com/sleepinggenius2/gosmi/types"
+	"github.com/min-oc/gosmi/types"
 )
 
 type Macro struct {

smi/internal/module.go

@@ -7,10 +7,11 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+	"sync"
 	"time"
 
-	"github.com/sleepinggenius2/gosmi/parser"
-	"github.com/sleepinggenius2/gosmi/types"
+	"github.com/min-oc/gosmi/parser"
+	"github.com/min-oc/gosmi/types"
 )
 
 type Module struct {
@@ -173,6 +174,7 @@ func (x *Module) getTrapTypePlaceholder(enterprise types.SmiIdentifier, line int
 }
 
 type ModuleMap struct {
+	sync.RWMutex
 	First *Module
 
 	last      *Module
@@ -181,6 +183,8 @@ type ModuleMap struct {
 }
 
 func (x *ModuleMap) Add(m *Module) {
+	x.Lock()
+	defer x.Unlock()
 	if m.IsWellKnown() {
 		x.wellKnown = m
 	}
@@ -199,6 +203,8 @@ func (x *ModuleMap) Add(m *Module) {
 }
 
 func (x *ModuleMap) Get(name types.SmiIdentifier) *Module {
+	x.RLock()
+	defer x.RUnlock()
 	if name == WellKnownModuleName {
 		return x.wellKnown
 	}
@@ -303,7 +309,10 @@ func GetModuleFile(name string) (string, io.ReadCloser, error) {
 	}
 
 	for _, path := range smiHandle.Paths {
-		dirEntries, err := path.FS.ReadDir(".")
+		if filepath.IsAbs(path.Name) {
+			path.Name = ""
+		}
+		dirEntries, err := path.FS.ReadDir(path.Name)
 		if err != nil {
 			return path.Name, nil, fmt.Errorf("Read directory: %w", err)
 		}
@@ -321,8 +330,8 @@ func GetModuleFile(name string) (string, io.ReadCloser, error) {
 			}
 			switch ext {
 			case "", "mib", "my", "mi2", "txt":
-				fullpath := filepath.Join(path.Name, dirEntry.Name())
-				r, err := path.FS.Open(dirEntry.Name())
+				fullpath := path.Name + "/" + dirEntry.Name()
+				r, err := path.FS.Open(fullpath)
 				if err != nil {
 					return fullpath, nil, fmt.Errorf("Open file: %w", err)
 				}

smi/internal/node.go

@@ -1,7 +1,9 @@
 package internal
 
 import (
-	"github.com/sleepinggenius2/gosmi/types"
+	"sync"
+
+	"github.com/min-oc/gosmi/types"
 )
 
 type Node struct {
@@ -33,20 +35,24 @@ func (x *Node) IsRoot() bool {
 }
 
 type NodeChildMap struct {
+	sync.RWMutex
 	First *Node
 
 	last *Node
 	m    map[types.SmiSubId]*Node
 }
 
 func (x *NodeChildMap) Add(n *Node) {
+
 	existing := x.Get(n.SubId)
 	if existing != nil {
 		for obj := n.FirstObject; obj != nil; obj = obj.NextSameNode {
 			existing.AddObject(obj)
 		}
 		return
 	}
+	x.Lock()
+	defer x.Unlock()
 	if n.Parent != nil && n.Parent.Oid != nil {
 		n.Oid = types.NewOid(n.Parent.Oid, n.SubId)
 		n.OidLen = n.Parent.OidLen + 1
@@ -82,6 +88,8 @@ func (x *NodeChildMap) Add(n *Node) {
 }
 
 func (x *NodeChildMap) Get(id types.SmiSubId) *Node {
+	x.RLock()
+	defer x.RUnlock()
 	if x.m == nil {
 		return nil
 	}

smi/internal/object.go

@@ -1,8 +1,8 @@
 package internal
 
 import (
-	"github.com/sleepinggenius2/gosmi/parser"
-	"github.com/sleepinggenius2/gosmi/types"
+	"github.com/min-oc/gosmi/parser"
+	"github.com/min-oc/gosmi/types"
 )
 
 type Option struct {

smi/internal/type.go

@@ -4,8 +4,8 @@ import (
 	"sort"
 	"strconv"
 
-	"github.com/sleepinggenius2/gosmi/parser"
-	"github.com/sleepinggenius2/gosmi/types"
+	"github.com/min-oc/gosmi/parser"
+	"github.com/min-oc/gosmi/types"
 )
 
 type Type struct {

smi/internal/types.go

@@ -1,7 +1,7 @@
 package internal
 
 import (
-	"github.com/sleepinggenius2/gosmi/types"
+	"github.com/min-oc/gosmi/types"
 )
 
 type List struct {

smi/macro.go

@@ -3,8 +3,8 @@ package smi
 import (
 	"unsafe"
 
-	"github.com/sleepinggenius2/gosmi/smi/internal"
-	"github.com/sleepinggenius2/gosmi/types"
+	"github.com/min-oc/gosmi/smi/internal"
+	"github.com/min-oc/gosmi/types"
 )
 
 // SmiMacro *smiGetMacro(SmiModule *smiModulePtr, char *macro)