admin/llgo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #725 from luoliwoshang/os/tomode

Browse Source 
lib/os:fix error fileMode to ModeT
This commit is contained in:
xushiwei
2024-08-16 16:42:28 +08:00
committed by GitHub
parent b42ad3170e 2d4f01e6cb
commit 1c6e4b7750
2 changed files with 6 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
_demo/mkdirdemo/mkdir.go
View File

@@ -3,6 +3,7 @@ package main
import ( import (
"fmt" "fmt"
"os" "os"
"path/filepath"
) )
func main() { func main() {
@@ -23,11 +24,11 @@ func main() {
defer os.Remove(tempFile.Name()) defer os.Remove(tempFile.Name())
fmt.Println("Temp file:", tempFile.Name()) fmt.Println("Temp file:", tempFile.Name())
// todo(zzy): MkdirAll nested example nestedDir := filepath.Join("nested", "directory")
err = os.MkdirAll(tempDir, 0755) err = os.MkdirAll(nestedDir, 0755)
if err != nil { if err != nil {
fmt.Println("Failed to create nested directory:", err) fmt.Println("Failed to create nested directory:", err)
return return
} }
fmt.Println("Nest directory 3:", tempDir) fmt.Println("Nest directory:", nestedDir)
} }

41
internal/lib/os/os.go
View File

@@ -19,14 +19,12 @@ package os
// llgo:skipall // llgo:skipall
import ( import (
"errors" "errors"
"io/fs"
"runtime" "runtime"
"syscall" "syscall"
_ "unsafe" _ "unsafe"
"github.com/goplus/llgo/c" "github.com/goplus/llgo/c"
"github.com/goplus/llgo/c/os" "github.com/goplus/llgo/c/os"
sys "github.com/goplus/llgo/c/syscall"
) )
const ( const (
@@ -50,11 +48,6 @@ func (e *LinkError) Unwrap() error {
return e.Err return e.Err
} }
func toMode(mode FileMode) os.ModeT {
unixMode := fileModeToUnixMode(mode) << 16
return os.ModeT(unixMode)
}
func toPathErr(op, path string, errno c.Int) error { func toPathErr(op, path string, errno c.Int) error {
return &PathError{Op: op, Path: path, Err: syscall.Errno(errno)} return &PathError{Op: op, Path: path, Err: syscall.Errno(errno)}
} }
@@ -86,7 +79,7 @@ func Chdir(dir string) error {
*/ */
func Chmod(name string, mode FileMode) error { func Chmod(name string, mode FileMode) error {
ret := os.Chmod(c.AllocaCStr(name), toMode(mode)) ret := os.Chmod(c.AllocaCStr(name), os.ModeT(syscallMode(mode)))
if ret == 0 { if ret == 0 {
return nil return nil
} }
@@ -238,7 +231,7 @@ func Link(oldname, newname string) error {
// func LookupEnv(key string) (string, bool) // func LookupEnv(key string) (string, bool)
func Mkdir(name string, perm FileMode) error { func Mkdir(name string, perm FileMode) error {
ret := os.Mkdir(c.AllocaCStr(name), toMode(perm)) ret := os.Mkdir(c.AllocaCStr(name), os.ModeT(syscallMode(perm)))
if ret == 0 { if ret == 0 {
return nil return nil
} }
@@ -469,33 +462,3 @@ func UserHomeDir() (string, error) {
// TODO(xsw): // TODO(xsw):
// func WriteFile(name string, data []byte, perm FileMode) error // func WriteFile(name string, data []byte, perm FileMode) error
func fileModeToUnixMode(mode fs.FileMode) uint32 {
var m uint32
switch mode & fs.ModeType {
default:
m = sys.S_IFREG
case fs.ModeDir:
m = sys.S_IFDIR
case fs.ModeSymlink:
m = sys.S_IFLNK
case fs.ModeNamedPipe:
m = sys.S_IFIFO
case fs.ModeSocket:
m = sys.S_IFSOCK
case fs.ModeDevice:
m = sys.S_IFBLK
case fs.ModeDevice | fs.ModeCharDevice:
m = sys.S_IFCHR
}
if mode&fs.ModeSetuid != 0 {
m |= sys.S_ISUID
}
if mode&fs.ModeSetgid != 0 {
m |= sys.S_ISGID
}
if mode&fs.ModeSticky != 0 {
m |= sys.S_ISVTX
}
return m | uint32(mode&0777)
}