lsyncd-conf.lua

@@ -6,6 +6,7 @@
 settings = {
 --	logfile = "/tmp/lsyncd",
 	nodaemon,
+	status = "/tmp/lsyncd.stat",
 	loglevel = DEBUG,
 }
 

lsyncd.c

@@ -972,6 +972,16 @@ masterloop(lua_State *L)
 	}
 }
 
+/**
+ * Prints a minimal help if e.g. config_file is missing 
+ */
+void mini_help(char *arg0) 
+{
+	fprintf(stderr, "Missing config file\n");
+	fprintf(stderr, "Minimal Usage: %s CONFIG_FILE\n", arg0);
+	fprintf(stderr, "  Specify -help for more help.\n");
+}
+
 
 /**
  * Main
@@ -982,12 +992,9 @@ main(int argc, char *argv[])
 	/* position at cores (minimal) argument parsing *
 	 * most arguments are parsed in the lua runner  */
 	int argp = 1; 
-
-	if (argc < 2) {
-		fprintf(stderr, "Missing config file\n");
-		fprintf(stderr, "Minimal Usage: %s CONFIG_FILE\n", argv[0]);
-		fprintf(stderr, "  Specify --help for more help.\n");
-		return -1; // ERRNO
+	if (argc <= 1) {
+		mini_help(argv[0]);
+		return -1;
 	}
 
 	/* kernel parameters */
@@ -1019,54 +1026,41 @@ main(int argc, char *argv[])
 	lua_pushinteger(L, NORMAL);  lua_setglobal(L, "NORMAL");
 	lua_pushinteger(L, ERROR);   lua_setglobal(L, "ERROR");
 
-	/* TODO parse runner */
 #ifdef LSYNCD_DEFAULT_RUNNER_FILE
+	/* checks if the user overrode default runner file */ 
 	if (!strcmp(argv[argp], "--runner")) {
 		if (argc < 3) {
 			fprintf(stderr, "Lsyncd Lua-runner file missing after --runner.\n");
 			return -1; //ERRNO
 		}
-		if (argc < 4) {
-			fprintf(stderr, "Missing config file\n");
-			fprintf(stderr, "  Usage: %s --runner %s CONFIG_FILE\n", argv[0], argv[2]);
-			fprintf(stderr, "  Specify --help for more help.\n");
-			return -1; // ERRNO
-		}
 		lsyncd_runner_file = argv[argp + 1];
 		argp += 2;
 	} else {
 		lsyncd_runner_file = LSYNCD_DEFAULT_RUNNER_FILE;
 	}
-#else
-	if (!strcmp(argv[argp], "--runner")) {
-		fprintf(stderr, "This lsyncd binary has its lua runner staticly compiled.\n");
-		fprintf(stderr, "Configure and compile with --with-runner=FILE to use the lsyncd.lua file.\n");
-		return -1; // ERRNO
-	}
-#endif
-	lsyncd_config_file = argv[argp++];
 	{
+		/* checks if the runne file exists */
 		struct stat st;
-#ifdef LSYNCD_DEFAULT_RUNNER_FILE
 		if (stat(lsyncd_runner_file, &st)) {
 			fprintf(stderr, "Cannot find Lsyncd Lua-runner at '%s'.\n", lsyncd_runner_file);
 			fprintf(stderr, "Maybe specify another place? %s --runner RUNNER_FILE CONFIG_FILE\n", argv[0]);
 			return -1; // ERRNO
 		}
-#endif
-		if (stat(lsyncd_config_file, &st)) {
-			fprintf(stderr, "Cannot find config file at '%s'.\n", lsyncd_config_file);
-			return -1; // ERRNO
-		}
 	}
-
-#ifdef LSYNCD_DEFAULT_RUNNER_FILE
+	/* loads the runner file */
 	if (luaL_loadfile(L, lsyncd_runner_file)) {
 		fprintf(stderr, "error loading '%s': %s\n", 
 		       lsyncd_runner_file, lua_tostring(L, -1));
 		return -1; // ERRNO
 	}
 #else
+	/* User cannot override runner file in a static compile */
+	if (!strcmp(argv[argp], "--runner")) {
+		fprintf(stderr, "This lsyncd binary has its lua runner staticly compiled.\n");
+		fprintf(stderr, "Configure and compile with --with-runner=FILE to use the lsyncd.lua file.\n");
+		return -1; // ERRNO
+	}
+	/* loads the runner from binary */
 	if (luaL_loadbuffer(L, &_binary_luac_out_start, 
 			&_binary_luac_out_end - &_binary_luac_out_start, "lsyncd.lua")) {
 		fprintf(stderr, "error loading precompiled lsyncd.lua runner: %s\n", 
@@ -1074,6 +1068,7 @@ main(int argc, char *argv[])
 		return -1; // ERRNO
 	}
 #endif
+	/* execute the runner defining all its functions */
 	if (lua_pcall(L, 0, LUA_MULTRET, 0)) {
 		fprintf(stderr, "error preparing '%s': %s\n", 
 			lsyncd_runner_file, lua_tostring(L, -1));
@@ -1093,6 +1088,32 @@ main(int argc, char *argv[])
 		}
 	}
 
+	{
+		/* checks if there is a "-help" or "--help" in the args before anything else */
+		int i;
+		for(i = argp; i < argc; i++) {
+			if (!strcmp(argv[i],"-help") || !strcmp(argv[i],"--help")) {
+				lua_getglobal(L, "lsyncd_help");
+				lua_call(L, 0, 0);
+				return -1; // ERRNO	
+			}
+		}
+	}
+	if (argp + 1 >= argc) {
+		mini_help(argv[0]);
+		return -1; // ERRNO
+	}
+
+	lsyncd_config_file = argv[argp++];
+	{	
+		/* checks for the existence of the config file */
+		struct stat st;
+		if (stat(lsyncd_config_file, &st)) {
+			fprintf(stderr, "Cannot find config file at '%s'.\n", lsyncd_config_file);
+			return -1; // ERRNO
+		}
+	}
+
 	if (luaL_loadfile(L, lsyncd_config_file)) {
 		fprintf(stderr, "error loading %s: %s\n", lsyncd_config_file, lua_tostring(L, -1));
 		return -1; // ERRNO

lsyncd.lua

@@ -448,6 +448,20 @@ function lsyncd_alarm(now)
 	end
 end
 
+
+-----
+-- Called by core before anything is "-help" or "--help" is in
+-- the arguments.
+--
+function lsyncd_help()
+	io.stderr:write(
+[[TODO this is a multiline
+help
+]])
+	os.exit(-1) -- ERRNO
+end
+
+
 ----
 -- Called from core on init or restart after user configuration.
 -- 
@@ -455,7 +469,19 @@ function lsyncd_initialize(args)
 	-- From this point on, no globals may be created anymore
 	GLOBAL_lock(_G)
 
-	print(table.concat(args))
+	for i = 1, #args do
+		local a = args[i]
+		if a:sub(1, 1) ~= "-" then
+			io.stderr:write("Unknown option "..a..". Options must start with '-' or '--'.\n")
+			os.exit(-1) -- ERRNO
+		end
+		if a:sub(1, 2) == "--" then
+			a = a:sub(3)
+		else
+			a = a:sub(2)
+		end
+		print(i, a)
+	end
 
 	-- makes sure the user gave lsyncd anything to do 
 	if #origins == 0 then