hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-17 01:03:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix previous commit

Browse Source
This commit is contained in:
Owen Mansel-Chan
2025-05-20 03:03:36 +01:00
parent d5044fd072
commit 47dac64301
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
go/extractor/extractor.go
View File

@@ -773,24 +773,22 @@ func (extraction *Extraction) extractFileInfo(tw *trap.Writer, file string, isDu
var parentLbl trap.Label var parentLbl trap.Label
for i, component := range components { for i, component := range components {
isRoot := false var rawPath, canonicalPath string
if i == 0 { if i == 0 {
if component == "" { rawPath = component
path = "/" if component == "" || regexp.MustCompile(`^[A-Za-z]:$`).MatchString(component) {
isRoot = true // Handle linux root and Windows drive letters by appending "/"
} else if regexp.MustCompile(`^[A-Za-z]:$`).MatchString(component) { canonicalPath = rawPath + "/"
// Handle Windows drive letters by appending "/"
path = component + "/"
isRoot = true
} else { } else {
path = component canonicalPath = rawPath
} }
} else { } else {
path = parentPath + "/" + component rawPath = parentPath + "/" + component
canonicalPath = rawPath
} }
if i == len(components)-1 { if i == len(components)-1 {
lbl := tw.Labeler.FileLabelFor(file) lbl := tw.Labeler.FileLabelFor(file)
dbscheme.FilesTable.Emit(tw, lbl, path) dbscheme.FilesTable.Emit(tw, lbl, canonicalPath)
dbscheme.ContainerParentTable.Emit(tw, parentLbl, lbl) dbscheme.ContainerParentTable.Emit(tw, parentLbl, lbl)
dbscheme.HasLocationTable.Emit(tw, lbl, emitLocation(tw, lbl, 0, 0, 0, 0)) dbscheme.HasLocationTable.Emit(tw, lbl, emitLocation(tw, lbl, 0, 0, 0, 0))
extraction.Lock.Lock() extraction.Lock.Lock()
@@ -801,14 +799,12 @@ func (extraction *Extraction) extractFileInfo(tw *trap.Writer, file string, isDu
extraction.Lock.Unlock() extraction.Lock.Unlock()
break break
} }
lbl := tw.Labeler.GlobalID(util.EscapeTrapSpecialChars(path) + ";folder") lbl := tw.Labeler.GlobalID(util.EscapeTrapSpecialChars(canonicalPath) + ";folder")
dbscheme.FoldersTable.Emit(tw, lbl, path) dbscheme.FoldersTable.Emit(tw, lbl, canonicalPath)
if i > 0 { if i > 0 {
dbscheme.ContainerParentTable.Emit(tw, parentLbl, lbl) dbscheme.ContainerParentTable.Emit(tw, parentLbl, lbl)
} }
if !isRoot { parentPath = rawPath
parentPath = path
}
parentLbl = lbl parentLbl = lbl
} }
} }