Update move_downloads.sh

What was young me thinking? Probably nothing.

While mask_to_names() was not causing issues in practise, it was
rewritten to be more reasonable. Not that it is the only
thing that could use a rewrite...

Ah, to be young again...

README.md

@@ -73,7 +73,6 @@ You can also get a string of the inotify events. This is particularly useful if
 ```
 echo "test" > /tmp/test
 adhocify -m IN_ALL_EVENTS -w /tmp/test echo File: "%eventfilepath%" Event: "%eventmaskstr%"
-#second shell commands
 Starting execution of command echo
 File: /tmp/test Event: IN_ATTRIB
 Starting execution of command echo
@@ -84,19 +83,19 @@ File: /tmp/test Event: IN_CLOSE,IN_CLOSE_WRITE
 File: /tmp/test Event: IN_MODIFY
 
 ```
-A second shell ran
+In this example, another shell ran
 ```
 chmod 600 /tmp/test
 echo "test" >> /tmp/test
 ```
 
-Passing ```-q``` would also keep adhocify silent, surpressing those "Starting execution..." messages.
+Passing ```-q``` keeps adhocify silent, surpressing those "Starting execution..." messages.
 
 
 Other tools
 ===========
 If adhocify does not suit your needs, take a look at:
-  * inotify-tools: https://github.com/rvoicilas/inotify-tools/wiki
+  * inotify-tools: https://github.com/inotify-tools/inotify-tools/wiki
 
 Install
 =======
@@ -104,8 +103,16 @@ Install
 ## Debian / Ubuntu
 Latest release can be installed using apt
 ```
-curl -s https://repo.quitesimple.org/repo.quitesimple.org.asc | sudo apt-key add -
-echo "deb https://repo.quitesimple.org/debian/ default main" | sudo tee /etc/apt/sources.list.d/quitesimple.list
+# First, obtain key. Here we just assume it's trustworhty.
+wget -O- https://repo.quitesimple.org/repo.quitesimple.org.asc  | gpg --dearmor > repo.quitesimple.org-keyring.gpg
+cat repo.quitesimple.org-keyring.gpg | sudo tee -a /usr/share/keyrings/repo.quitesimple.org.gpg > /dev/null
+
+#For Debian
+echo "deb [arch=amd64 signed-by=/usr/share/keyrings/repo.quitesimple.org.gpg] https://repo.quitesimple.org/debian/ default main" | sudo tee /etc/apt/sources.list.d/quitesimple.list
+
+#For Ubuntu >=21.10, prefer these sources
+#echo "deb [arch=amd64 signed-by=/usr/share/keyrings/repo.quitesimple.org.gpg] https://repo.quitesimple.org/debian/ $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/quitesimple.list
+
 sudo apt-get update
 sudo apt-get install adhocify
 ```

TODO

@@ -1,4 +0,0 @@
--e: if multiple children are running and we exit, they become orphaned.
-Deal with IN_Q_OVERFLOW etc.?
-General rename handling, e. g. refresh mappings after renames etc.
-Deal with IN_IGNORE

adhocify.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2020 Albert S. <adhocify@quitesimple.org>
+ * Copyright (c) 2014-2024 Albert S. <adhocify@quitesimple.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -13,7 +13,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#define  _GNU_SOURCE
+#define _GNU_SOURCE
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -36,10 +36,9 @@
 #include <ftw.h>
 #include <linux/limits.h>
 #define BUF_SIZE (sizeof(struct inotify_event) + NAME_MAX + 1) * 1024
-#define STREQ(s1,s2) ( strcmp(s1,s2) == 0 )
+#define STREQ(s1, s2) (strcmp(s1, s2) == 0)
 
-
-#define SCRIPT_PLACE_SPECIFIER "{}" //same as EVENTFILE_PLACEHOLDER for backwards compatibility 
+#define SCRIPT_PLACE_SPECIFIER "{}" // same as EVENTFILE_PLACEHOLDER for backwards compatibility
 #define EVENTFILE_PLACEHOLDER "%eventfilepath%"
 #define EVENTSTR_PLACEHOLDER "%eventmaskstr%"
 
@@ -54,8 +53,6 @@ struct watchlistentry
 struct watchlistentry *watchlist_head = NULL;
 struct watchlistentry **watchlist = &watchlist_head;
 
-
-
 struct ignorelist
 {
 	char *ignore;
@@ -65,13 +62,12 @@ struct ignorelist
 struct ignorelist *ignorelist_head = NULL;
 struct ignorelist **ignorelist_current = &ignorelist_head;
 
-
 /* Write-once globals. Set from process_arguments*/
 bool silent = false;
 bool noenv = false;
 bool fromstdin = false;
 bool forkbombcheck = true;
-bool daemonize  = false;
+bool daemonize = false;
 bool exit_with_child = false;
 int awaited_child_exit_code = -1;
 bool negate_child_exit_code = false;
@@ -79,15 +75,17 @@ bool negate_child_exit_code = false;
 uint32_t mask = 0;
 char *prog = NULL;
 char *path_logfile = NULL;
-char **script_arguments = NULL; //options to be passed to script we are calling 
+char **script_arguments = NULL; // options to be passed to script we are calling
 size_t n_script_arguments = 0;
 
+volatile sig_atomic_t handle_child_exits = 0;
+
 void *xmalloc(size_t size)
 {
 	void *m = malloc(size);
-	if(m == NULL) 
+	if(m == NULL)
 	{
-		perror("malloc"); 
+		perror("malloc");
 		exit(EXIT_FAILURE);
 	}
 	return m;
@@ -116,12 +114,11 @@ char *xrealpath(const char *path, char *resolved_path)
 	return tmp;
 }
 
-
 char *ndirname(const char *path)
 {
 	if(path == NULL)
 	{
-		return xstrdup("."); 
+		return xstrdup(".");
 	}
 	char *c = strdupa(path);
 	return xstrdup(dirname(c));
@@ -130,8 +127,8 @@ char *ndirname(const char *path)
 char *find_ifd_path(int ifd)
 {
 	for(struct watchlistentry *lkp = watchlist_head; lkp != NULL; lkp = lkp->next)
-	{	
-		if(lkp->ifd == ifd) 
+	{
+		if(lkp->ifd == ifd)
 		{
 			return lkp->path;
 		}
@@ -165,20 +162,17 @@ bool path_is_directory(const char *path)
 
 static inline bool file_exists(const char *path)
 {
-	return access(path, F_OK) == 0; 
+	return access(path, F_OK) == 0;
 }
 
-
 void add_to_ignore_list(const char *str)
 {
 	*ignorelist_current = xmalloc(sizeof(struct ignorelist));
 	(*ignorelist_current)->ignore = xstrdup(str);
-
-	ignorelist_current = &(*ignorelist_current)->next; 
+	(*ignorelist_current)->next = NULL;
+	ignorelist_current = &(*ignorelist_current)->next;
 }
 
-
-
 void logwrite(const char *format, ...)
 {
 	if(silent)
@@ -196,14 +190,13 @@ void logerror(const char *format, ...)
 {
 	va_list args;
 	va_start(args, format);
-	char *prefix = "Error: "; 
+	char *prefix = "Error: ";
 	char *tmp = alloca(strlen(format) + strlen(prefix) + 1);
 	strcpy(tmp, prefix);
 	strcat(tmp, format);
 	vfprintf(stderr, tmp, args);
 	fflush(stderr);
 	va_end(args);
-
 }
 
 void watchqueue_add_path(const char *pathname)
@@ -215,24 +208,22 @@ void watchqueue_add_path(const char *pathname)
 	e->path = path;
 	e->isdir = path_is_directory(pathname);
 	e->next = NULL;
-	watchlist= &e->next;
+	watchlist = &e->next;
 }
 
-
-
 void create_watches(int fd, uint32_t mask)
 {
 	for(struct watchlistentry *lkp = watchlist_head; lkp != NULL; lkp = lkp->next)
 	{
 		int ret = inotify_add_watch(fd, lkp->path, mask);
-		if(ret == -1) 
+		if(ret == -1)
 		{
-			perror("inotify_add_watch"); 
-			exit(EXIT_FAILURE); 
+			perror("inotify_add_watch");
+			exit(EXIT_FAILURE);
 		}
 
 		lkp->ifd = ret;
-	}	
+	}
 }
 
 bool redirect_stdout(const char *outfile)
@@ -255,93 +246,99 @@ bool redirect_stdout(const char *outfile)
 
 const char *mask_to_names(int mask)
 {
-	static char ret[1024];
-	size_t n = sizeof(ret) - 1;
+	char ret[1024] = {0};
+	FILE *f = fmemopen(ret, sizeof(ret), "w");
+	if(f == NULL)
+	{
+		logerror("fmemopen() failed\n");
+		return NULL;
+	}
 	if(mask & IN_ATTRIB)
 	{
-		strncat(ret, "IN_ATTRIB,",n);
+		fputs("IN_ATTRIB,", f);
 	}
 	if(mask & IN_OPEN)
 	{
-		strncat(ret, "IN_OPEN,", n);
+		fputs("IN_OPEN,", f);
 	}
 	if(mask & IN_CLOSE)
 	{
-		strncat(ret, "IN_CLOSE,", n);
+		fputs("IN_CLOSE,", f);
 	}
 	if(mask & IN_CLOSE_NOWRITE)
 	{
-		strncat(ret, "IN_CLOSE,", n);
+		fputs("IN_CLOSE_NOWRITE,", f);
 	}
 	if(mask & IN_CLOSE_WRITE)
 	{
-		strncat(ret, "IN_CLOSE_WRITE,", n);
+		fputs("IN_CLOSE_WRITE,", f);
 	}
 	if(mask & IN_CREATE)
 	{
-		strncat(ret, "IN_CREATE,", n);
+		fputs("IN_CREATE,", f);
 	}
 	if(mask & IN_DELETE)
 	{
-		strncat(ret, "IN_DELETE,", n);
+		fputs("IN_DELETE,", f);
 	}
 	if(mask & IN_DELETE_SELF)
 	{
-		strncat(ret, "IN_DELETE_SELF,", n);
+		fputs("IN_DELETE_SELF,", f);
 	}
 	if(mask & IN_MODIFY)
 	{
-		strncat(ret, "IN_MODIFY,", n);
+		fputs("IN_MODIFY,", f);
 	}
 	if(mask & IN_MOVE)
 	{
-		strncat(ret, "IN_MOVE,", n);
+		fputs("IN_MOVE,", f);
 	}
 	if(mask & IN_MOVE_SELF)
 	{
-		strncat(ret, "IN_MOVE_SELF,", n);
+		fputs("IN_MOVE_SELF,", f);
 	}
 	if(mask & IN_MOVED_FROM)
 	{
-		strncat(ret, "IN_MOVED_FROM,", n);
+		fputs("IN_MOVED_FROM,", f);
 	}
 	if(mask & IN_MOVED_TO)
 	{
-		strncat(ret, "IN_MOVED_TO,", n);
+		fputs("IN_MOVED_TO,", f);
 	}
-
-	for(int i = n; i >= 0; --i)
+	long pos = ftell(f);
+	fclose(f);
+	if(pos > 0)
 	{
-		if(ret[i] == ',')
-		{
-			ret[i] = 0;
-			break;
-		}
+			ret[pos-1] = '\0';
 	}
-	ret[1023] = 0;
-	return ret;
+	return xstrdup(ret);
 }
 
-bool run_prog(const char *eventfile,  uint32_t eventmask)
+bool run_prog(const char *eventfile, uint32_t eventmask)
 {
 	pid_t pid = fork();
 	if(pid == 0)
 	{
 		if(path_logfile)
 		{
-			if(! redirect_stdout(path_logfile))
+			if(!redirect_stdout(path_logfile))
 			{
-				return false;	
+				return false;
 			}
 		}
 
-		if(! noenv)
+		if(!noenv)
 		{
 			char envvar[30];
-			snprintf(envvar, sizeof(envvar), "ADHOCIFYEVENT=%"PRIu32, eventmask);
-			putenv(envvar);
+			snprintf(envvar, sizeof(envvar), "%" PRIu32, eventmask);
+			int ret = setenv("ADHOCIFYEVENT", envvar, 1);
+			if(ret != 0)
+			{
+				perror("setenv");
+				exit(EXIT_FAILURE);
+			}
 		}
-		
+
 		for(unsigned int i = 0; i < n_script_arguments; i++)
 		{
 			char *argument = script_arguments[i];
@@ -353,11 +350,17 @@ bool run_prog(const char *eventfile,  uint32_t eventmask)
 				}
 				if(STREQ(argument, EVENTSTR_PLACEHOLDER))
 				{
-					script_arguments[i] = mask_to_names(eventmask);
+					const char *names = mask_to_names(eventmask);
+					if(names == NULL)
+					{
+						logerror("Failed to convert mask to strings");
+						exit(EXIT_FAILURE);
+					}
+					script_arguments[i] = names;
 				}
 			}
 		}
-		
+
 		execvp(prog, script_arguments);
 		logerror("Exec of %s failed: %s\n", prog, strerror(errno));
 		int exitcode = (errno == ENOENT) ? 127 : EXIT_FAILURE;
@@ -367,14 +370,13 @@ bool run_prog(const char *eventfile,  uint32_t eventmask)
 	{
 		perror("fork");
 		return false;
-	}	
+	}
 
 	return true;
-
 }
 
 uint32_t name_to_mask(const char *name)
-{ 
+{
 	if(STREQ(name, "IN_CLOSE_WRITE"))
 		return IN_CLOSE_WRITE;
 	else if(STREQ(name, "IN_OPEN"))
@@ -410,7 +412,7 @@ uint32_t name_to_mask(const char *name)
 void check_forkbomb(const char *path_logfile, const char *path_prog)
 {
 	char *dir_log = ndirname(path_logfile);
-	char *dir_prog = ndirname(path_prog);	
+	char *dir_prog = ndirname(path_prog);
 
 	struct watchlistentry *lkp = watchlist_head;
 	while(lkp)
@@ -418,9 +420,10 @@ void check_forkbomb(const char *path_logfile, const char *path_prog)
 		if(lkp->isdir)
 		{
 			char *dir_lkpPath = lkp->path;
-			if( STREQ(dir_lkpPath, dir_log)	|| STREQ(dir_lkpPath, dir_prog) )
+			if(STREQ(dir_lkpPath, dir_log) || STREQ(dir_lkpPath, dir_prog))
 			{
-				logerror("Don't place your logfiles or command in a directory you are watching for events. Pass -b to bypass this check.\n");
+				logerror("Don't place your logfiles or command in a directory you are watching for events. Pass -b to "
+						 "bypass this check.\n");
 				exit(EXIT_FAILURE);
 			}
 		}
@@ -435,14 +438,15 @@ void check_forkbomb(const char *path_logfile, const char *path_prog)
 void queue_watches_from_stdin()
 {
 	char *line = NULL;
-	size_t n = 0; 
+	size_t n = 0;
 	ssize_t r;
 	while((r = getline(&line, &n, stdin)) != -1)
 	{
-		if(line[r-1] == '\n') 
-			line[r-1] = 0;
+		if(line[r - 1] == '\n')
+			line[r - 1] = 0;
 		watchqueue_add_path(line);
 	}
+	free(line);
 }
 
 char *get_eventfile_abspath(struct inotify_event *event)
@@ -452,9 +456,9 @@ char *get_eventfile_abspath(struct inotify_event *event)
 	{
 		return NULL;
 	}
-	
+
 	char *result = NULL;
-	if((event->len) > 0 )
+	if((event->len) > 0)
 	{
 		if(asprintf(&result, "%s/%s", wdpath, event->name) == -1)
 		{
@@ -468,171 +472,175 @@ char *get_eventfile_abspath(struct inotify_event *event)
 	return result;
 }
 
-
 void handle_event(struct inotify_event *event)
 {
-	if(event->mask & mask) 
-	{	
+	if(event->mask & mask)
+	{
 		char *eventfile_abspath = get_eventfile_abspath(event);
 		if(eventfile_abspath == NULL)
 		{
 			logerror("Could not get absolute path for event. Watch descriptor %i\n", event->wd);
 			exit(EXIT_FAILURE);
 		}
-		
-		if(is_ignored(eventfile_abspath)) 
+
+		if(is_ignored(eventfile_abspath))
 		{
 			free(eventfile_abspath);
 			return;
 		}
 		logwrite("Starting execution of command %s\n", prog);
 		bool r = run_prog(eventfile_abspath, event->mask);
-		if(!r) 
+		if(!r)
 		{
 			logerror("Execution of command %s failed\n", prog);
 			exit(EXIT_FAILURE);
 		}
-		
+
 		fflush(stdout);
 		fflush(stderr);
-		
-		free (eventfile_abspath);
+
+		free(eventfile_abspath);
 	}
 }
 
 static inline char *get_cwd()
 {
-	return getcwd(NULL,0); 
+	return getcwd(NULL, 0);
 }
 
 void print_usage()
 {
 	printf("adhocify [OPTIONS] command [arguments for command] - Monitor for inotify events and launch commands\n\n");
-    printf("--daemon, -d            run as a daemon\n");
+	printf("--daemon, -d            run as a daemon\n");
 	printf("--path, -w              adds the specified path to the watchlist\n");
 	printf("--logfile, -o           path to write output of adhocify and stdout/stderr of launched commands to\n");
-	printf("--mask, -m              inotify event to watch for (see inotify(7)). Can be specified multiple times to watch for several events\n");
-	printf("--no-env, -a            if specified, the inotify event which occured won't be passed to the command as an environment variable\n");
+	printf("--mask, -m              inotify event to watch for (see inotify(7)). Can be specified multiple times to "
+		   "watch for several events\n");
+	printf("--no-env, -a            if specified, the inotify event which occured won't be passed to the command as an "
+		   "environment variable\n");
 	printf("--silent, -q            surpress any output created by adhocify itself\n");
-	printf("--stdin, -s             Read the paths which must be added to the watchlist from stdin. Each path must be in a seperate line\n");
+	printf("--stdin, -s             Read the paths which must be added to the watchlist from stdin. Each path must be "
+		   "in a seperate line.\n");
 	printf("--no-forkbomb-check, -b Disable fork bomb detection\n");
-	printf("--ignore, -i            Shell wildcard pattern (see glob(7)) to ignore events on files for which the pattern matches\n");
-	printf("--exit-with-child, -e   Exit when the commands exits. You can also specify a return code (e. g. -e=1 to exit only on errors)\n");	printf("\nIf your command should know the file the event occured on, use the {} placeholder when you specify the arguments (like xargs)\n");
+	printf("--ignore, -i            Shell wildcard pattern (see glob(7)) to ignore events on files for which the "
+		   "pattern matches\n");
+	printf("--exit-with-child, -e   Exit with the command. You can also specify a return code and negations (e. g. -e'!0' to "
+		   "exit only on errors)\n");
+	printf("\nIf your command should know the file the event occured on, use the {} placeholder when you specify the "
+		   "arguments (like xargs)\n");
 }
 
-static struct option long_options[] = 
-{
-  { "daemon", no_argument, 0, 'd' },
-  { "logfile", required_argument, 0, 'o' },
-  { "mask", required_argument, 0, 'm' },
-  { "path", required_argument, 0, 'w' },
-  { "no-env", no_argument, 0, 'a' },
-  { "stdin", no_argument, 0, 's' },
-  { "no-forkbomb-check", no_argument, 0, 'b' },
-  { "ignore", required_argument, 0, 'i' },  
-  { "silent", no_argument, 0, 'q' },
-  { "help", no_argument, 0, 'h' },
-  { "exit-with-child", optional_argument, 0, 'e' }
-};
+static struct option long_options[] = {{"daemon", no_argument, 0, 'd'},
+									   {"logfile", required_argument, 0, 'o'},
+									   {"mask", required_argument, 0, 'm'},
+									   {"path", required_argument, 0, 'w'},
+									   {"no-env", no_argument, 0, 'a'},
+									   {"stdin", no_argument, 0, 's'},
+									   {"no-forkbomb-check", no_argument, 0, 'b'},
+									   {"ignore", required_argument, 0, 'i'},
+									   {"silent", no_argument, 0, 'q'},
+									   {"help", no_argument, 0, 'h'},
+									   {"exit-with-child", optional_argument, 0, 'e'},
+									   {0,0,0,0}};
 
-//fills global n_script_arguments and script_arguments var
+// fills global n_script_arguments and script_arguments var
 void fill_script_arguments(size_t n_args, char *args[])
 {
-		n_script_arguments = n_args + 2; //2 = argv0 and terminating NULL
-		
-		char **arguments = xmalloc( n_script_arguments * sizeof(char *) ); 
-		
-		const char *argv0 = memrchr(prog, '/', strlen(prog));
-		argv0 = ( argv0 == NULL ) ? prog : argv0+1;
-		arguments[0] = argv0;
-		
-		const int begin_offset = 1;
-		for(unsigned int i = 0; i < n_args; i++)
-		{
-			char *argument = args[i];
-			arguments[i+begin_offset] = strdup(argument); 
-		}
-		arguments[n_args+begin_offset] = NULL;
-		
-		script_arguments = arguments;
-}
+	n_script_arguments = n_args + 2; // 2 = argv0 and terminating NULL
 
+	char **arguments = xmalloc(n_script_arguments * sizeof(char *));
+
+	const char *argv0 = memrchr(prog, '/', strlen(prog));
+	argv0 = (argv0 == NULL) ? prog : argv0 + 1;
+	arguments[0] = xstrdup(argv0);
+
+	const int begin_offset = 1;
+	for(unsigned int i = 0; i < n_args; i++)
+	{
+		char *argument = args[i];
+		arguments[i + begin_offset] = xstrdup(argument);
+	}
+	arguments[n_args + begin_offset] = NULL;
+
+	script_arguments = arguments;
+}
 
 void parse_options(int argc, char **argv)
 {
 	char *watchpath = NULL;
 	int option;
-    int option_index;
-    uint32_t optmask = 0; 
-	while((option = getopt_long(argc, argv, "absdo:w:m:l:i:e::", long_options, &option_index)) != -1)
+	int option_index;
+	uint32_t optmask = 0;
+	while((option = getopt_long(argc, argv, "absdo:w:m:i:e::", long_options, &option_index)) != -1)
 	{
 		switch(option)
 		{
-			case 'd':
-				daemonize = true;
-				break;
-			case 'o':
-				path_logfile = optarg;
-				break;
-			case 'm':
-				optmask = name_to_mask(optarg);
-				if(optmask == 0) { 
-					logerror("Not supported inotify event: %s\n", optarg);
-					exit(EXIT_FAILURE); 
-				}
-				mask |= optmask;
-				break;
-			case 'w':
-				watchpath = optarg;
-				watchqueue_add_path(watchpath);
-				break;
-			case 'a':
-				noenv=true;
-				break;
-			case 's':
-				fromstdin=true;
-				break;
-			case 'b':
-				forkbombcheck=false;
-				break;
-			case 'i':
-				add_to_ignore_list(optarg);
-				break;
-			case 'q':
-				silent=true;
-				break;
-			case 'h':
-				print_usage();
-				exit(EXIT_SUCCESS);
-			case 'e':
-				exit_with_child = true;
-				if(optarg)
+		case 'd':
+			daemonize = true;
+			break;
+		case 'o':
+			path_logfile = optarg;
+			break;
+		case 'm':
+			optmask = name_to_mask(optarg);
+			if(optmask == 0)
+			{
+				logerror("Unsupported inotify event: %s\n", optarg);
+				exit(EXIT_FAILURE);
+			}
+			mask |= optmask;
+			break;
+		case 'w':
+			watchpath = optarg;
+			watchqueue_add_path(watchpath);
+			break;
+		case 'a':
+			noenv = true;
+			break;
+		case 's':
+			fromstdin = true;
+			break;
+		case 'b':
+			forkbombcheck = false;
+			break;
+		case 'i':
+			add_to_ignore_list(optarg);
+			break;
+		case 'q':
+			silent = true;
+			break;
+		case 'h':
+			print_usage();
+			exit(EXIT_SUCCESS);
+		case 'e':
+			exit_with_child = true;
+			if(optarg)
+			{
+				if(*optarg == '!')
 				{
-					if(*optarg == '!')
-					{
-						negate_child_exit_code = true;
-						++optarg;
-					}
-					if(*optarg == '\0')
-					{
-						logerror("Please specify the exit code\n");
-						exit(EXIT_FAILURE);
-					}
-					awaited_child_exit_code = atoi(optarg);
+					negate_child_exit_code = true;
+					++optarg;
 				}
-				break;
-		}	
+				if(*optarg == '\0')
+				{
+					logerror("Please specify the exit code\n");
+					exit(EXIT_FAILURE);
+				}
+				awaited_child_exit_code = atoi(optarg);
+			}
+			break;
+		}
 	}
-	
-	if(optind == argc) 
-	{ 
+
+	if(optind == argc)
+	{
 		print_usage();
 		logerror("missing command path\n");
-		exit(EXIT_FAILURE); 
+		exit(EXIT_FAILURE);
 	}
-	
+
 	prog = argv[optind++];
-	
+
 	if(optind <= argc)
 	{
 		fill_script_arguments(argc - optind, &argv[optind]);
@@ -654,8 +662,8 @@ void process_options()
 	if(mask == 0)
 	{
 		mask |= IN_CLOSE_WRITE;
-	}	
-	
+	}
+
 	if(path_logfile)
 	{
 		path_logfile = xrealpath(path_logfile, NULL);
@@ -673,7 +681,7 @@ void process_options()
 
 	if(daemonize)
 	{
-		if(daemon(0,0) == -1)
+		if(daemon(0, 0) == -1)
 		{
 			perror("daemon");
 			exit(EXIT_FAILURE);
@@ -681,82 +689,98 @@ void process_options()
 	}
 }
 
-void start_monitoring(int ifd)
+
+void wait_for_children()
 {
-	while(1) 
+	while(1)
 	{
-			int len;
-			int offset =0;
-			char buf[BUF_SIZE];
-			len = read(ifd, buf, BUF_SIZE);
-			if(len == -1) 
+		int status;
+		pid_t p = waitpid(-1, &status, WNOHANG);
+		if(p == 0 || (p == -1 && errno == ECHILD)) // No more children to reap
+		{
+			return;
+		}
+		if(p == -1)
+		{
+			logerror("waitpid() failed when handling child exit\n");
+			exit(EXIT_FAILURE);
+		}
+		int adhocify_exit_code = 0;
+		if(WIFEXITED(status))
+		{
+			adhocify_exit_code = WEXITSTATUS(status);
+			if(adhocify_exit_code == 127)
 			{
-				if(errno == EINTR) 
-					continue;
-				perror("read");
-				exit(EXIT_FAILURE);
+				logwrite("command not found, exiting\n");
+				exit(adhocify_exit_code);
 			}
-
-			while(offset < len)
+			if(exit_with_child)
 			{
-
-				struct inotify_event *event = (struct inotify_event *)&buf[offset];
-				handle_event(event);
-				offset+=sizeof(struct inotify_event) + event->len;
+				bool must_exit = adhocify_exit_code == awaited_child_exit_code || awaited_child_exit_code == -1;
+				if(negate_child_exit_code)
+				{
+					must_exit = !must_exit;
+				}
+				if(must_exit)
+				{
+					logwrite("command exited with specified exit code, exiting too\n");
+					exit(adhocify_exit_code);
+				}
 			}
+		}
+		if(exit_with_child && WIFSIGNALED(status))
+		{
+			adhocify_exit_code = 128 + WTERMSIG(status); // copy bash's behaviour
+			exit(adhocify_exit_code);
+		}
 	}
 }
 
+void start_monitoring(int ifd)
+{
+	while(1)
+	{
+		if(handle_child_exits)
+		{
+			handle_child_exits = 0;
+			wait_for_children();
+		}
+		int len;
+		int offset = 0;
+		char buf[BUF_SIZE];
+		len = read(ifd, buf, BUF_SIZE);
+		if(len == -1)
+		{
+			if(errno == EINTR)
+				continue;
+			perror("read");
+			exit(EXIT_FAILURE);
+		}
+		while(offset < len)
+		{
+			struct inotify_event *event = (struct inotify_event *)&buf[offset];
+			handle_event(event);
+			offset += sizeof(struct inotify_event) + event->len;
+		}
+	}
+}
+
+
 void child_handler(int signum, siginfo_t *info, void *context)
 {
 	if(signum != SIGCHLD)
 	{
 		return;
-	}	
-	
-	int status;
-	pid_t p = waitpid(-1, &status, WNOHANG);
-	if(p == -1)
-	{
-		logerror("waitpid failed when handling child exit\n");
-		exit(EXIT_FAILURE);
-	}
-
-	int adhocify_exit_code = 0;
-	if(WIFEXITED(status))
-	{
-		adhocify_exit_code = WEXITSTATUS(status);
-		if(adhocify_exit_code == 127)
-		{
-			logwrite("command not found, exiting\n");
-			exit(adhocify_exit_code);
-		}
-		if(exit_with_child && awaited_child_exit_code > -1)
-		{
-			bool must_exit = adhocify_exit_code == awaited_child_exit_code;
-			if(negate_child_exit_code)
-			{
-				must_exit = !must_exit;
-			}
-			if(must_exit)
-			{
-				logwrite("command exited with specified exit code, exiting too\n");
-				exit(adhocify_exit_code);
-			}
-		}
-	}
-	if(exit_with_child && WIFSIGNALED(status))
-	{
-		adhocify_exit_code = 128 + WTERMSIG(status); //copy bash's behaviour
-		exit(adhocify_exit_code);
 	}
+	handle_child_exits = 1;
 }
 
 void set_signals()
 {
-	struct sigaction action;
+	struct sigaction action = {0};
 	action.sa_flags = SA_NOCLDSTOP | SA_SIGINFO;
 	action.sa_sigaction = &child_handler;
+	sigemptyset(&action.sa_mask);
 	if(sigaction(SIGCHLD, &action, NULL) == -1)
 	{
 		logerror("Error when setting up the signal handler\n");
@@ -764,26 +788,24 @@ void set_signals()
 	}
 }
 
-
 int main(int argc, char **argv)
 {
-	if(argc < 2) 
-	{ 
+	if(argc < 2)
+	{
 		print_usage();
 		exit(EXIT_FAILURE);
 	}
 
-	//signal(SIGCHLD, SIG_IGN);
+	// signal(SIGCHLD, SIG_IGN);
 	set_signals();
-	
-	
+
 	parse_options(argc, argv);
 	process_options();
-	
-	int ifd = inotify_init();
+
+	int ifd = inotify_init1(O_CLOEXEC);
 	if(ifd == -1)
 	{
-		perror("inotify_init");
+		perror("inotify_init1");
 		exit(EXIT_FAILURE);
 	}
 	create_watches(ifd, mask);

examples/encryptor.sh

@@ -1,19 +0,0 @@
-#!/bin/sh
-#example: encrypt files once they get written to a directory and remove them
-#launch with: adhocify -w /path/encryptin /path/to/this/script.sh {}
-#This is a simple example and has security flaws:
-#-no secure delete (better to use e. g. ramfs or tmpfs...)
-#-then still not necessarily secure against people who can dump the content of the memory
-set -e
-DESTINATION="/tmp/store"
-if [ -z "$1" ] ; then
-echo "Need path to encrypt" >&2
-exit 1
-fi
-sleep 2 #some clients may want to set permissions and so on after writing
-FILEPATH="$1"
-gpg -e -r mail@example.com -o $DESTINATION/$(basename $FILEPATH) $FILEPATH 
-rm $FILEPATH
-
-
-

examples/move_downloads.sh

@@ -1,9 +1,10 @@
 #!/bin/bash
-#moves all incoming files (e. g. downloads) to another directory. 
+#Hardlinks all incoming files (e. g. downloads) to another directory.
 #There, they will be put into subdirectories which are named after the current date (YYYYMMDD) to get some minimal automatic "organization".  
 #adhocify -d -m IN_CLOSE_WRITE -m IN_MOVED_TO -w /home/user/Downloads -w /home/user/other_dir /path/to/move_downloads.sh
 
 INCOMING="$1"
+stat -c"%s" "$INCOMING" | grep -q "^0$" && exit
 #ignore partial downloads (.part in firefox, .crdownload in chrome)
 echo "$INCOMING" | grep -q .part$ && exit 
 echo "$INCOMING" | grep -q .crdownload$ && exit
@@ -11,11 +12,12 @@ today=$(date +%Y%m%d)
 TARGET_DIR="/target/dir/path"
 TODAY_DIR="$TARGET_DIR"/$today
 if [ ! -d "$TODAY_DIR" ] ; then
-mkdir "$TODAY_DIR"
-rm -f "$TARGET_DIR"/today
-ln -s "$TODAY_DIR" "$TARGET_DIR"/today
+	mkdir "$TODAY_DIR"
+	rm -f "$TARGET_DIR"/today
+	ln -s "$TODAY_DIR" "$TARGET_DIR"/today
 fi
-#You can also filter/grep the filename here and move certain patterns to other designated locations...
-mv "$INCOMING" "$TARGET_DIR"/$today/
+# Nowadays, some browsers don't like it when files are moved away immediately and might report download failure. Use hardlinks so they don't complain.
+# Alternatively, a sufficiently long enough "sleep" followed by "mv" might work
+ln "$INCOMING" "$TARGET_DIR"/$today/