go/ferret
go/ferret
1
0
Fork 0
mirror of https://github.com/MontFerret/ferret.git synced 2025-03-03 15:02:32 +02:00
Code Issues Releases Activity

move parseWriteMode into parseParams

Browse Source
This commit is contained in:
3timeslazy 2019-10-21 19:02:44 +03:00
parent 2b3a82d720
commit 474b340ad0
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkg/stdlib/io/fs/write.go
View File

@ -40,13 +40,8 @@ func Write(_ context.Context, args ...core.Value) (core.Value, error) {
} }
} }
flag, err := parseWriteMode(params.Mode)
if err != nil {
return values.None, core.Error(err, "parse write mode")
}
// 0222 - write only permissions // 0222 - write only permissions
file, err := os.OpenFile(fpath, flag, 0222) file, err := os.OpenFile(fpath, params.ModeFlag, 0222)
if err != nil { if err != nil {
return values.None, core.Error(err, "open file") return values.None, core.Error(err, "open file")
} }
@ -79,19 +74,20 @@ func validateRequiredWriteArgs(args []core.Value) error {
return nil return nil
} }
// params is the same as `params` argument, but as Go struct. // parsedParams contains parsed additional parameters.
type params struct { type parsedParams struct {
Mode string ModeFlag int
} }
var defaultParams = params{ var defaultParams = parsedParams{
Mode: "w", // the same as `w`
ModeFlag: os.O_WRONLY | os.O_CREATE | os.O_TRUNC,
} }
func parseParams(value core.Value) (params, error) { func parseParams(value core.Value) (parsedParams, error) {
obj, ok := value.(*values.Object) obj, ok := value.(*values.Object)
if !ok { if !ok {
return params{}, core.Error( return parsedParams{}, core.Error(
core.ErrInvalidArgument, core.ErrInvalidArgument,
"value should be an object", "value should be an object",
) )
@ -101,7 +97,16 @@ func parseParams(value core.Value) (params, error) {
modestr, exists := obj.Get(values.NewString("mode")) modestr, exists := obj.Get(values.NewString("mode"))
if exists { if exists {
params.Mode = modestr.String()
flag, err := parseWriteMode(modestr.String())
if err != nil {
return parsedParams{}, core.Error(
core.ErrInvalidArgument,
"parse write mode",
)
}
params.ModeFlag = flag
} }
return params, nil return params, nil