mod_http: Use hostname from the correct context (thanks gryffus)

[prosody.git] / util-src / pposix.c

diff --git a/util-src/pposix.c b/util-src/pposix.c
index 7600766f3ca489e794638c2c5101358a73f314fb..4fb1fb56b5346f062d9310b70a8788c177320a09 100644 (file)
--- a/util-src/pposix.c
+++ b/util-src/pposix.c
@@ -13,7 +13,7 @@
 * POSIX support functions for Lua
 */
 
-#define MODULE_VERSION "0.3.5"
+#define MODULE_VERSION "0.3.6"
 
 #include <stdlib.h>
 #include <math.h>
@@ -36,7 +36,7 @@
 #include "lauxlib.h"
 
 #include <fcntl.h>
-#if defined(_GNU_SOURCE)
+#if defined(__linux__) && defined(_GNU_SOURCE)
 #include <linux/falloc.h>
 #endif
 
@@ -89,6 +89,10 @@ static int lc_daemonize(lua_State *L)
        close(0);
        close(1);
        close(2);
+       /* Make sure accidental use of FDs 0, 1, 2 don't cause weirdness */
+       open("/dev/null", O_RDONLY);
+       open("/dev/null", O_WRONLY);
+       open("/dev/null", O_WRONLY);
 
        /* Final fork, use it wisely */
        if(fork())
@@ -200,12 +204,13 @@ int level_constants[] =   {
                        };
 int lc_syslog_log(lua_State* L)
 {
-       int level = luaL_checkoption(L, 1, "notice", level_strings);
-       level = level_constants[level];
+       int level = level_constants[luaL_checkoption(L, 1, "notice", level_strings)];
 
-       luaL_checkstring(L, 2);
+       if(lua_gettop(L) == 3)
+               syslog(level, "%s: %s", luaL_checkstring(L, 2), luaL_checkstring(L, 3));
+       else
+               syslog(level, "%s", lua_tostring(L, 2));
 
-       syslog(level, "%s", lua_tostring(L, 2));
        return 0;
 }
 
@@ -479,6 +484,9 @@ int string2resource(const char *s) {
        if (!strcmp(s, "MEMLOCK")) return RLIMIT_MEMLOCK;
        if (!strcmp(s, "NPROC")) return RLIMIT_NPROC;
        if (!strcmp(s, "RSS")) return RLIMIT_RSS;
+#endif
+#ifdef RLIMIT_NICE
+       if (!strcmp(s, "NICE")) return RLIMIT_NICE;
 #endif
        return -1;
 }
@@ -492,6 +500,7 @@ int lc_setrlimit(lua_State *L) {
        if(arguments < 1 || arguments > 3) {
                lua_pushboolean(L, 0);
                lua_pushstring(L, "incorrect-arguments");
+               return 2;
        }
 
        resource = luaL_checkstring(L, 1);
@@ -657,27 +666,45 @@ int lc_fallocate(lua_State* L)
 {
        off_t offset, len;
        FILE *f = *(FILE**) luaL_checkudata(L, 1, LUA_FILEHANDLE);
+       if (f == NULL)
+               luaL_error(L, "attempt to use a closed file");
 
        offset = luaL_checkinteger(L, 2);
        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
-       if(posix_fallocate(fileno(f), offset, len) != 0)
+#if defined(__linux__) && defined(_GNU_SOURCE)
+       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;
+       }
+#else
+#warning Only using posix_fallocate() fallback.
+#warning Linux fallocate() is strongly recommended if available: recompile with -D_GNU_SOURCE
+#warning Note that posix_fallocate() will still be used on filesystems that dont support fallocate()
 #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