Merge branch 'master' of github.com:axkibe/lsyncd

This commit is contained in:
Axel Kittenberger 2013-06-07 13:23:55 +02:00
commit 72fa0e8865
2 changed files with 2 additions and 2 deletions

View File

@ -71,7 +71,7 @@ fi
_LIBS="${LIBS}"
_CFLAGS="${CFLAGS}"
_CPPFLAGS="${CPPFLAGS}"
LIBS="${LIBS} ${LUA_LIBS}"
LIBS="-lm ${LIBS} ${LUA_LIBS}"
CFLAGS="${CFLAGS} ${LUA_CFLAGS}"
CPPFLAGS="${CPPFLAGS} ${LUA_CFLAGS}"

View File

@ -1246,7 +1246,7 @@ l_exec( lua_State *L )
struct pipemsg *pm;
logstring( "Exec", "adding pipe observance" );
pm = s_calloc( 1, sizeof( struct pipemsg ) );
pm->text = s_calloc( pipe_len + 1, sizeof( char * ) );
pm->text = s_calloc( pipe_len + 1, sizeof( char ) );
memcpy( pm->text, pipe_text, pipe_len + 1 );
pm->tlen = pipe_len;
pm->pos = len;