mirror of
https://github.com/octoleo/lsyncd.git
synced 2024-12-12 14:17:47 +00:00
Fixes for diffrent lua versions
This commit is contained in:
parent
e2a4dc0e87
commit
7a44958347
12
flake.lock
12
flake.lock
@ -2,11 +2,11 @@
|
|||||||
"nodes": {
|
"nodes": {
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1637014545,
|
"lastModified": 1644229661,
|
||||||
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
|
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
|
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -17,11 +17,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1639488789,
|
"lastModified": 1648109818,
|
||||||
"narHash": "sha256-Ey12CBni1jlEGoW4eH4X0hugWs25MxHMcNH4N8VVX0U=",
|
"narHash": "sha256-Cz/VvpkiHCp08IKAKq8kHLqV8/svwqIQ5JK8zDft8i8=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ce635e9dca8f7e2bfab19a3667d7e697c019c68b",
|
"rev": "f2aa493e616a754c95e5af617a7d7f0f3ea67972",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -117,9 +117,9 @@
|
|||||||
|
|
||||||
buildTypes = {
|
buildTypes = {
|
||||||
lua5_1 = [pkgs.lua5_1 pkgs.lua51Packages.luaposix (buildExtensions pkgs.lua51Packages)];
|
lua5_1 = [pkgs.lua5_1 pkgs.lua51Packages.luaposix (buildExtensions pkgs.lua51Packages)];
|
||||||
lua5_2 = [pkgs.lua5_2 pkgs.lua52Packages.luaposix (buildExtensions pkgs.lua51Packages)];
|
lua5_2 = [pkgs.lua5_2 pkgs.lua52Packages.luaposix (buildExtensions pkgs.lua52Packages)];
|
||||||
lua5_3 = [pkgs.lua5_3 pkgs.lua53Packages.luaposix (buildExtensions pkgs.lua51Packages)];
|
lua5_3 = [pkgs.lua5_3 pkgs.lua53Packages.luaposix (buildExtensions pkgs.lua53Packages)];
|
||||||
lua5_4 = [pkgs.lua5_3 (luaposix35 mylua5_4) (buildExtensions mylua5_4)];
|
lua5_4 = [pkgs.lua5_4 (luaposix35 mylua5_4) (buildExtensions mylua5_4.pkgs)];
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
let
|
let
|
||||||
|
10
lsyncd.c
10
lsyncd.c
@ -488,8 +488,8 @@ static void safeexit (lua_State *L, int exitcode) {
|
|||||||
lua_remove( L, -2 );
|
lua_remove( L, -2 );
|
||||||
lua_pushinteger(L, exitcode);
|
lua_pushinteger(L, exitcode);
|
||||||
lua_call(L, 2, 1);
|
lua_call(L, 2, 1);
|
||||||
if (lua_isinteger(L, -1)) {
|
if (lua_isnumber(L, -1)) {
|
||||||
exitcode = luaL_checkinteger(L, -1);
|
exitcode = luaL_checkint(L, -1);
|
||||||
}
|
}
|
||||||
exit(exitcode);
|
exit(exitcode);
|
||||||
}
|
}
|
||||||
@ -1131,8 +1131,8 @@ l_now(lua_State *L)
|
|||||||
static int
|
static int
|
||||||
l_kill( lua_State *L )
|
l_kill( lua_State *L )
|
||||||
{
|
{
|
||||||
pid_t pid = luaL_checkinteger( L, 1 );
|
pid_t pid = luaL_checkint( L, 1 );
|
||||||
int sig = luaL_checkinteger( L, 2 );
|
int sig = luaL_checkint( L, 2 );
|
||||||
|
|
||||||
int rv = kill(pid, sig );
|
int rv = kill(pid, sig );
|
||||||
|
|
||||||
@ -1692,7 +1692,7 @@ l_readdir( lua_State *L )
|
|||||||
int
|
int
|
||||||
l_terminate( lua_State *L )
|
l_terminate( lua_State *L )
|
||||||
{
|
{
|
||||||
int exitcode = luaL_checkinteger( L, 1 );
|
int exitcode = luaL_checkint( L, 1 );
|
||||||
|
|
||||||
exit( exitcode );
|
exit( exitcode );
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user