From 88cb57bc58b8dac24e8b64f909d6349ffdd70d63 Mon Sep 17 00:00:00 2001
From: Axel Kittenberger <axkibe@gmail.com>
Date: Sun, 17 Oct 2010 20:26:37 +0000
Subject: [PATCH]

---
 lsyncd.c   | 71 ++++++++++++++++++++++++++++++++++++------------------
 lsyncd.lua |  7 +++---
 2 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/lsyncd.c b/lsyncd.c
index ed70200..f302b2f 100644
--- a/lsyncd.c
+++ b/lsyncd.c
@@ -50,11 +50,11 @@ volatile sig_atomic_t reset = 0;
 void *
 s_calloc(size_t nmemb, size_t size)
 {
-    void *r = calloc(nmemb, size);
-    if (r == NULL) {
-        printf("Out of memory!\n");
-        exit(-1); // ERRNO 
-    }
+	void *r = calloc(nmemb, size);
+	if (r == NULL) {
+		printf("Out of memory!\n");
+		exit(-1); // ERRNO 
+	}
 	return r;
 }
 
@@ -65,11 +65,11 @@ s_calloc(size_t nmemb, size_t size)
 void *
 s_malloc(size_t size)
 {
-    void *r = malloc(size);
-    if (r == NULL) {
-        printf("Out of memory!\n");
+	void *r = malloc(size);
+	if (r == NULL) {
+		printf("Out of memory!\n");
 		exit(-1);  // ERRNO
-    }
+	}
 	return r;
 }
 
@@ -96,14 +96,37 @@ add_watch(lua_State *L)
 static int
 exec(lua_State *L)
 {
-	const char *path = luaL_checkstring(L, 1);
+	const char *binary = luaL_checkstring(L, 1);
 	int argc = lua_gettop(L) - 1;
+	pid_t pid;
 	int i;
-	const char **argv = s_calloc(argc + 1, sizeof(char *));
-	for(i = 0; i < argc; i++) {
-		argv[i] = luaL_checkstring(L, i + 2);
+	char const **argv = s_calloc(argc + 2, sizeof(char *));
+
+	argv[0] = binary;
+	for(i = 1; i < argc; i++) {
+		argv[i] = luaL_checkstring(L, i + 1);
+		printf("%d.%s\n", i, argv[i]);
+	}
+	argv[i] = NULL;
+
+	pid = fork();
+
+	if (pid == 0) {
+		//if (!log->flag_nodaemon && log->logfile) {
+		//	if (!freopen(log->logfile, "a", stdout)) {
+		//		printlogf(log, ERROR, "cannot redirect stdout to [%s].", log->logfile);
+		//	}
+		//	if (!freopen(log->logfile, "a", stderr)) {
+		//		printlogf(log, ERROR, "cannot redirect stderr to [%s].", log->logfile);
+		//	}
+		//}
+		execv(binary, (char **)argv);
+		// in a sane world execv does not return!
+		printf("Failed executing [%s]!\n", binary);
+		exit(-1); // ERRNO
 	}
 
+	free(argv);
 	return 0;
 }
 
@@ -165,14 +188,15 @@ stackdump(lua_State* l)
 			case LUA_TBOOLEAN:
 				printf("%d boolean %s\n", i, lua_toboolean(l, i) ? "true" : "false");
 				break;
-            case LUA_TNUMBER: 
+			case LUA_TNUMBER: 
 				printf("%d number: %g\n", i, lua_tonumber(l, i));
 				break;
 			default:  /* other values */
 				printf("%d %s\n", i, lua_typename(l, t));
 				break;
 		}
-    }
+	}
+	
     printf("\n");
 	return 0;
 }
@@ -191,9 +215,9 @@ sub_dirs (lua_State *L)
 	int idx = 1;
 
 	d = opendir(dirname);
-    if (d == NULL) {
-        printf("cannot open dir %s.\n", dirname);
-        return 0;
+	if (d == NULL) {
+		printf("cannot open dir %s.\n", dirname);
+		return 0;
 	}
 	
 	lua_newtable(L);
@@ -270,12 +294,11 @@ main(int argc, char *argv[])
 	}
 
 	/* open inotify */
-    inotify_fd = inotify_init();
-    if (inotify_fd == -1) {
-        printf("Cannot create inotify instance! (%d:%s)",
-               errno, strerror(errno));
-        return -1; // ERRNO
-    }
+	inotify_fd = inotify_init();
+	if (inotify_fd == -1) {
+		printf("Cannot create inotify instance! (%d:%s)", errno, strerror(errno));
+		return -1; // ERRNO
+	}
 
 	/* initialize */
 	lua_getglobal(L, "lsyncd_initialize");
diff --git a/lsyncd.lua b/lsyncd.lua
index 53936aa..ec37925 100644
--- a/lsyncd.lua
+++ b/lsyncd.lua
@@ -82,7 +82,7 @@ function lsyncd_initialize()
 		local target = { path = o.targetpath }
 		table.insert(targets, target)
 		origin[i].target = target
-		attend_dir(lsyncd.real_dir(o.source), "", target)
+		attend_dir(o.source, "", target)
 	end
 end
 
@@ -94,7 +94,7 @@ end
 ----
 -- Add one directory to be watched.
 function add(source_dir, target_path)
-	local o = { source = source_dir, targetpath = target_path }
+	local o = { source = lsyncd.real_dir(source_dir), targetpath = target_path }
 	table.insert(origin, o)
 	return o
 end
@@ -111,7 +111,8 @@ function default_startup()
 	print("--- STARTUP ---")
 	local pids = { }
 	for i, o in ipairs(origin) do
-		pid = lsyncd.exec("/usr/bin/rsyc", "-ltrs", o.source, o.targetpath)
+		print("/usr/bin/rsync", "-ltrs", o.source, o.targetpath)
+		pid = lsyncd.exec("/usr/bin/rsync", "-ltrs", o.source, o.targetpath)
 		print("started ", pid)
 		table.insert(pids, pid)
 	end