mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-06 14:47:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.pposix: Fix error reporting from posix_fallocate, it doesn't use errno (thanks pro)

Browse source
This commit is contained in:
Kim Alvefur 2014-04-25 00:36:01 +02:00
parent ef460cbd97
commit 15b883a2f5
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
util-src/pposix.c
View file

@ -664,6 +664,7 @@ int lc_meminfo(lua_State* L)
#if _XOPEN_SOURCE >= 600 || _POSIX_C_SOURCE >= 200112L || defined(_GNU_SOURCE) #if _XOPEN_SOURCE >= 600 || _POSIX_C_SOURCE >= 200112L || defined(_GNU_SOURCE)
int lc_fallocate(lua_State* L) int lc_fallocate(lua_State* L)
{ {
int ret;
off_t offset, len; off_t offset, len;
FILE *f = *(FILE**) luaL_checkudata(L, 1, LUA_FILEHANDLE); FILE *f = *(FILE**) luaL_checkudata(L, 1, LUA_FILEHANDLE);
if (f == NULL) if (f == NULL)
@ -691,7 +692,8 @@ int lc_fallocate(lua_State* L)
#warning Note that posix_fallocate() will still be used on filesystems that dont support fallocate() #warning Note that posix_fallocate() will still be used on filesystems that dont support fallocate()
#endif #endif
if(posix_fallocate(fileno(f), offset, len) == 0) ret = posix_fallocate(fileno(f), offset, len);
if(ret == 0)
{ {
lua_pushboolean(L, 1); lua_pushboolean(L, 1);
return 1; return 1;
@ -699,7 +701,7 @@ int lc_fallocate(lua_State* L)
else else
{ {
lua_pushnil(L); lua_pushnil(L);
lua_pushstring(L, strerror(errno)); lua_pushstring(L, strerror(ret));
/* posix_fallocate() can leave a bunch of NULs at the end, so we cut that /* posix_fallocate() can leave a bunch of NULs at the end, so we cut that
* this assumes that offset == length of the file */ * this assumes that offset == length of the file */
ftruncate(fileno(f), offset); ftruncate(fileno(f), offset);