Skip to content

Commit 152828b

Browse files
authored
Merge pull request #32 from scr-oath/copy-return-err
2 parents c7fc84f + 8801310 commit 152828b

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

ioutil/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ local input_fh, err = io.open("./test/file.test", "r")
1919
assert(not err, err)
2020
local output_fh, err = io.open("./test/file2.data", "w")
2121
assert(not err, err)
22-
ioutil.copy(output_fh, input_fh)
22+
err = ioutil.copy(output_fh, input_fh)
23+
assert(not err, err)
2324
input_fh:close()
2425
output_fh:close()
2526
```

ioutil/api.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ func Copy(L *lua.LState) int {
4040
reader := lio.CheckIOReader(L, 2)
4141
L.Pop(L.GetTop())
4242
if _, err := io.Copy(writer, reader); err != nil {
43-
L.RaiseError(err.Error())
43+
L.Push(lua.LString(err.Error()))
44+
return 1
4445
}
4546
return 0
4647
}
@@ -51,7 +52,8 @@ func CopyN(L *lua.LState) int {
5152
n := L.CheckInt64(3)
5253
L.Pop(L.GetTop())
5354
if _, err := io.CopyN(writer, reader, n); err != nil {
54-
L.RaiseError(err.Error())
55+
L.Push(lua.LString(err.Error()))
56+
return 1
5557
}
5658
return 0
5759
}

0 commit comments

Comments
 (0)