Prepare 3.51.0.

Author: ncruces

internal/util/module.go

@@ -26,11 +26,16 @@ func NewContext(ctx context.Context) context.Context {
 }
 
 func GetSystemError(ctx context.Context) error {
-	s := ctx.Value(moduleKey{}).(*moduleState)
-	return s.sysError
+	// Test needed to simplify testing.
+	s, ok := ctx.Value(moduleKey{}).(*moduleState)
+	if ok {
+		return s.sysError
+	}
+	return nil
 }
 
 func SetSystemError(ctx context.Context, err error) {
+	// Test needed to simplify testing.
 	s, ok := ctx.Value(moduleKey{}).(*moduleState)
 	if ok {
 		s.sysError = err

vfs/adiantum/hbsh.go

@@ -56,7 +56,7 @@ func (h *hbshVFS) OpenFilename(name *vfs.Filename, flags vfs.OpenFlag) (file vfs
 
 	if hbsh == nil {
 		file.Close()
-		return nil, flags, sqlite3.CANTOPEN
+		return nil, flags, sqlite3.IOERR_BADKEY
 	}
 	return &hbshFile{File: file, hbsh: hbsh, init: h.init}, flags, nil
 }
@@ -108,7 +108,7 @@ func (h *hbshFile) Pragma(name string, value string) (string, error) {
 	if h.hbsh = h.init.HBSH(key); h.hbsh != nil {
 		return "ok", nil
 	}
-	return "", sqlite3.CANTOPEN
+	return "", sqlite3.IOERR_BADKEY
 }
 
 func (h *hbshFile) ReadAt(p []byte, off int64) (n int, err error) {

vfs/api.go

@@ -207,6 +207,10 @@ type blockingSharedMemory interface {
 	shmEnableBlocking(block bool)
 }
 
+// FileControl makes it easy to forward all fileControl methods,
+// which we want to do for the checksum VFS.
+// However, this is not a safe default, and other VFSes
+// should explicitly wrap the methods they want to wrap.
 type fileControl interface {
 	File
 	fileControl(ctx context.Context, mod api.Module, op _FcntlOpcode, pArg ptr_t) _ErrorCode

vfs/xts/xts.go

@@ -55,7 +55,7 @@ func (x *xtsVFS) OpenFilename(name *vfs.Filename, flags vfs.OpenFlag) (file vfs.
 
 	if cipher == nil {
 		file.Close()
-		return nil, flags, sqlite3.CANTOPEN
+		return nil, flags, sqlite3.IOERR_BADKEY
 	}
 	return &xtsFile{File: file, cipher: cipher, init: x.init}, flags, nil
 }
@@ -103,7 +103,7 @@ func (x *xtsFile) Pragma(name string, value string) (string, error) {
 	if x.cipher = x.init.XTS(key); x.cipher != nil {
 		return "ok", nil
 	}
-	return "", sqlite3.CANTOPEN
+	return "", sqlite3.IOERR_BADKEY
 }
 
 func (x *xtsFile) ReadAt(p []byte, off int64) (n int, err error) {