Fix compiler panics when building on Windows.

nevkontakte · nevkontakte · commit bc8384e62b22 · 2022-04-10T13:40:35.000+01:00
Embedded file systems use unix-style slashes, which was causing errors on Windows, when two styles were mixed. Converting all VFS paths to unix-style slashes resolves the issue. Fixes #1049.
diff --git a/build/vfs.go b/build/vfs.go
@@ -5,6 +5,7 @@ import (
 	"net/http"
 	"os"
 	"path"
+	"path/filepath"
 	"strings"
 )
 
@@ -13,6 +14,7 @@ import (
 type vfs struct{ http.FileSystem }
 
 func (fs vfs) IsDir(name string) bool {
+	name = filepath.ToSlash(name)
 	dir, err := fs.Open(name)
 	if err != nil {
 		return false
@@ -26,6 +28,7 @@ func (fs vfs) IsDir(name string) bool {
 }
 
 func (fs vfs) ReadDir(name string) (fi []os.FileInfo, err error) {
+	name = filepath.ToSlash(name)
 	dir, err := fs.Open(name)
 	if err != nil {
 		return nil, err
@@ -35,6 +38,7 @@ func (fs vfs) ReadDir(name string) (fi []os.FileInfo, err error) {
 }
 
 func (fs vfs) OpenFile(name string) (r io.ReadCloser, err error) {
+	name = filepath.ToSlash(name)
 	return fs.Open(name)
 }
 
@@ -75,10 +79,12 @@ type withPrefix struct {
 }
 
 func (wp *withPrefix) Open(name string) (http.File, error) {
-	if !strings.HasPrefix(name, wp.prefix) {
+	name = filepath.ToSlash(name)
+	prefix := filepath.ToSlash(wp.prefix)
+	if !strings.HasPrefix(name, prefix) {
 		return nil, &os.PathError{Op: "open", Path: name, Err: os.ErrNotExist}
 	}
-	f, err := wp.fs.Open(strings.TrimPrefix(name, wp.prefix))
+	f, err := wp.fs.Open(strings.TrimPrefix(name, prefix))
 	if err != nil {
 		return nil, &os.PathError{Op: "open", Path: name, Err: err}
 	}

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import (`
`5`	`5`	`"net/http"`
`6`	`6`	`"os"`
`7`	`7`	`"path"`
	`8`	`+ "path/filepath"`
`8`	`9`	`"strings"`
`9`	`10`	`)`
`10`	`11`
`@@ -13,6 +14,7 @@ import (`
`13`	`14`	`type vfs struct{ http.FileSystem }`
`14`	`15`
`15`	`16`	`func (fs vfs) IsDir(name string) bool {`
	`17`	`+ name = filepath.ToSlash(name)`
`16`	`18`	`dir, err := fs.Open(name)`
`17`	`19`	`if err != nil {`
`18`	`20`	`return false`
`@@ -26,6 +28,7 @@ func (fs vfs) IsDir(name string) bool {`
`26`	`28`	`}`
`27`	`29`
`28`	`30`	`func (fs vfs) ReadDir(name string) (fi []os.FileInfo, err error) {`
	`31`	`+ name = filepath.ToSlash(name)`
`29`	`32`	`dir, err := fs.Open(name)`
`30`	`33`	`if err != nil {`
`31`	`34`	`return nil, err`
`@@ -35,6 +38,7 @@ func (fs vfs) ReadDir(name string) (fi []os.FileInfo, err error) {`
`35`	`38`	`}`
`36`	`39`
`37`	`40`	`func (fs vfs) OpenFile(name string) (r io.ReadCloser, err error) {`
	`41`	`+ name = filepath.ToSlash(name)`
`38`	`42`	`return fs.Open(name)`
`39`	`43`	`}`
`40`	`44`
`@@ -75,10 +79,12 @@ type withPrefix struct {`
`75`	`79`	`}`
`76`	`80`
`77`	`81`	`func (wp *withPrefix) Open(name string) (http.File, error) {`
`78`		`- if !strings.HasPrefix(name, wp.prefix) {`
	`82`	`+ name = filepath.ToSlash(name)`
	`83`	`+ prefix := filepath.ToSlash(wp.prefix)`
	`84`	`+ if !strings.HasPrefix(name, prefix) {`
`79`	`85`	`return nil, &os.PathError{Op: "open", Path: name, Err: os.ErrNotExist}`
`80`	`86`	`}`
`81`		`- f, err := wp.fs.Open(strings.TrimPrefix(name, wp.prefix))`
	`87`	`+ f, err := wp.fs.Open(strings.TrimPrefix(name, prefix))`
`82`	`88`	`if err != nil {`
`83`	`89`	`return nil, &os.PathError{Op: "open", Path: name, Err: err}`
`84`	`90`	`}`