aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2012-07-31 23:38:02 +0200
committerKim Alvefur <zash@zash.se>2012-07-31 23:38:02 +0200
commit534b0bc77178a689bf334a3bb339fc8c08e3fd83 (patch)
treecd71cf661f20d005c4007e428e32b95c2524d752
parent5539608830c46a26d95f364acdf21789e0035f6f (diff)
downloadprosody-534b0bc77178a689bf334a3bb339fc8c08e3fd83.tar.gz
prosody-534b0bc77178a689bf334a3bb339fc8c08e3fd83.zip
util.pposix: Try posix_fallocate() if fallocate() is unsupported by the file system
-rw-r--r--util-src/pposix.c31
1 files changed, 21 insertions, 10 deletions
diff --git a/util-src/pposix.c b/util-src/pposix.c
index 7dd8708b..bda13ec0 100644
--- a/util-src/pposix.c
+++ b/util-src/pposix.c
@@ -662,23 +662,34 @@ int lc_fallocate(lua_State* L)
len = luaL_checkinteger(L, 3);
#if defined(_GNU_SOURCE)
- if(fallocate(fileno(f), FALLOC_FL_KEEP_SIZE, offset, len) != 0)
-#elif _XOPEN_SOURCE >= 600 || _POSIX_C_SOURCE >= 200112L
-#warning Using posix_fallocate() fallback. Linux fallocate() is strongly recommended if available: recompile with -D_GNU_SOURCE
- if(posix_fallocate(fileno(f), offset, len) != 0)
+ if(fallocate(fileno(f), FALLOC_FL_KEEP_SIZE, offset, len) == 0)
+ {
+ lua_pushboolean(L, 1);
+ return 1;
+ }
+
+ if(errno != ENOSYS && errno != EOPNOTSUPP)
+ {
+ lua_pushnil(L);
+ lua_pushstring(L, strerror(errno));
+ return 2;
+ }
#endif
+
+ if(posix_fallocate(fileno(f), offset, len) == 0)
{
-#if ! defined(_GNU_SOURCE)
+ lua_pushboolean(L, 1);
+ return 1;
+ }
+ else
+ {
+ lua_pushnil(L);
+ lua_pushstring(L, strerror(errno));
/* posix_fallocate() can leave a bunch of NULs at the end, so we cut that
* this assumes that offset == length of the file */
ftruncate(fileno(f), offset);
-#endif
- lua_pushnil(L);
- lua_pushstring(L, strerror(errno));
return 2;
}
- lua_pushboolean(L, 1);
- return 1;
}
#endif