no need for lsyncd.fsevents lib

This commit is contained in:
Axel Kittenberger 2010-12-15 14:20:34 +00:00
parent b784ab23c2
commit 82bdb8e0dc
1 changed files with 10 additions and 16 deletions

View File

@ -96,10 +96,6 @@ struct kfs_event {
*/ */
static int fsevents_fd = -1; static int fsevents_fd = -1;
static const luaL_reg lfseventslib[] = {
{NULL, NULL}
};
/* event names */ /* event names */
/*static const char *eventNames[FSE_MAX_EVENTS] = { /*static const char *eventNames[FSE_MAX_EVENTS] = {
"CREATE_FILE", "CREATE_FILE",
@ -297,10 +293,8 @@ fsevents_ready(lua_State *L, struct observance *obs)
exit(-1); // ERRNO exit(-1); // ERRNO
} }
{ {
ptrdiff_t len; ptrdiff_t len = read (fsevents_fd, readbuf, readbuf_size);
int err; int err = errno;
len = read (fsevents_fd, readbuf, readbuf_size);
err = errno;
if (len == 0) { if (len == 0) {
return; return;
} }
@ -343,9 +337,9 @@ fsevents_tidy(struct observance *obs)
* registers fsevents functions. * registers fsevents functions.
*/ */
extern void extern void
register_fsevents(lua_State *L) { register_fsevents(lua_State *L)
lua_pushstring(L, "fsevents"); {
luaL_register(L, "fsevents", lfseventslib); /* nothing */
} }
/** /**
@ -355,7 +349,7 @@ extern void
open_fsevents(lua_State *L) open_fsevents(lua_State *L)
{ {
int8_t event_list[] = { // action to take for each event int8_t event_list[] = { // action to take for each event
FSE_REPORT, /* FSE_CREATE_FILE */ FSE_REPORT, /* FSE_CREATE_FILE */
FSE_REPORT, /* FSE_DELETE */ FSE_REPORT, /* FSE_DELETE */
FSE_REPORT, /* FSE_STAT_CHANGED */ FSE_REPORT, /* FSE_STAT_CHANGED */
FSE_REPORT, /* FSE_RENAME */ FSE_REPORT, /* FSE_RENAME */
@ -388,12 +382,12 @@ open_fsevents(lua_State *L)
exit(-1); // ERRNO exit(-1); // ERRNO
} }
if (ioctl(fd, FSEVENTS_CLONE, (char *)&fca) < 0) { if (ioctl(fd, FSEVENTS_CLONE, (char *)&fca) < 0) {
printlogf(L, "Error", printlogf(L, "Error",
"Cannot control %s monitor! (%d:%s)", "Cannot control %s monitor! (%d:%s)",
DEV_FSEVENTS, errno, strerror(errno)); DEV_FSEVENTS, errno, strerror(errno));
exit(-1); // ERRNO exit(-1); // ERRNO
} }
if (readbuf) { if (readbuf) {
logstring("Error", logstring("Error",
@ -403,7 +397,7 @@ open_fsevents(lua_State *L)
readbuf = s_malloc(readbuf_size); readbuf = s_malloc(readbuf_size);
/* fd has been cloned, closes access fd */ /* fd has been cloned, closes access fd */
close(fd); close(fd);
close_exec_fd(fsevents_fd); close_exec_fd(fsevents_fd);
non_block_fd(fsevents_fd); non_block_fd(fsevents_fd);
observe_fd(fsevents_fd, fsevents_ready, NULL, fsevents_tidy, NULL); observe_fd(fsevents_fd, fsevents_ready, NULL, fsevents_tidy, NULL);