nixio: added sendfile(), return false instead of nil for EWOULDBLOCK
This commit is contained in:
parent
5ff898e624
commit
aa0cee169f
2 changed files with 27 additions and 3 deletions
|
@ -26,7 +26,11 @@
|
||||||
|
|
||||||
/* pushes nil, error number and errstring on the stack */
|
/* pushes nil, error number and errstring on the stack */
|
||||||
int nixio__perror(lua_State *L) {
|
int nixio__perror(lua_State *L) {
|
||||||
|
if (errno == EAGAIN) {
|
||||||
|
lua_pushboolean(L, 0);
|
||||||
|
} else {
|
||||||
lua_pushnil(L);
|
lua_pushnil(L);
|
||||||
|
}
|
||||||
lua_pushinteger(L, errno);
|
lua_pushinteger(L, errno);
|
||||||
lua_pushstring(L, strerror(errno));
|
lua_pushstring(L, strerror(errno));
|
||||||
return 3;
|
return 3;
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
|
|
||||||
#include "nixio.h"
|
#include "nixio.h"
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
#include <sys/sendfile.h>
|
||||||
|
|
||||||
/* guess what sucks... */
|
/* guess what sucks... */
|
||||||
#ifdef __UCLIBC__
|
#ifdef __UCLIBC__
|
||||||
|
@ -29,8 +30,7 @@ ssize_t splice(int __fdin, __off64_t *__offin, int __fdout,
|
||||||
__off64_t *__offout, size_t __len, unsigned int __flags) {
|
__off64_t *__offout, size_t __len, unsigned int __flags) {
|
||||||
return syscall(__NR_splice, __fdin, __offin, __fdout, __offout, __len, __flags);
|
return syscall(__NR_splice, __fdin, __offin, __fdout, __offout, __len, __flags);
|
||||||
}
|
}
|
||||||
#endif
|
#endif /* __UCLIBC__ */
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks whether a flag is set in the table and translates it into a bitmap
|
* Checks whether a flag is set in the table and translates it into a bitmap
|
||||||
|
@ -60,6 +60,9 @@ static int nixio_splice_flags(lua_State *L) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* splice(fd_in, fd_out, length, flags)
|
||||||
|
*/
|
||||||
static int nixio_splice(lua_State *L) {
|
static int nixio_splice(lua_State *L) {
|
||||||
int fd_in = nixio__checkfd(L, 1);
|
int fd_in = nixio__checkfd(L, 1);
|
||||||
int fd_out = nixio__checkfd(L, 2);
|
int fd_out = nixio__checkfd(L, 2);
|
||||||
|
@ -77,12 +80,29 @@ static int nixio_splice(lua_State *L) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* sendfile(outfd, infd, length)
|
||||||
|
*/
|
||||||
|
static int nixio_sendfile(lua_State *L) {
|
||||||
|
int sockfd = nixio__checksockfd(L);
|
||||||
|
int infd = nixio__checkfd(L, 2);
|
||||||
|
size_t len = luaL_checkinteger(L, 3);
|
||||||
|
|
||||||
|
long spliced = sendfile(sockfd, infd, NULL, len);
|
||||||
|
|
||||||
|
if (spliced < 0) {
|
||||||
|
return nixio__perror(L);
|
||||||
|
}
|
||||||
|
|
||||||
|
lua_pushnumber(L, spliced);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
/* module table */
|
/* module table */
|
||||||
static const luaL_reg R[] = {
|
static const luaL_reg R[] = {
|
||||||
{"splice", nixio_splice},
|
{"splice", nixio_splice},
|
||||||
{"splice_flags", nixio_splice_flags},
|
{"splice_flags", nixio_splice_flags},
|
||||||
|
{"sendfile", nixio_sendfile},
|
||||||
{NULL, NULL}
|
{NULL, NULL}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue