start_monitoring(): Fix incorrect assignment of 'handle_child_exits'

Otherwise, we call printf() etc. in the signal handler...

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
@@ -96,7 +95,7 @@ Passing ```-q``` would also keep adhocify silent, surpressing those "Starting ex
 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 -
+# First, obtain key, assume it's trusted.
-echo "deb https://repo.quitesimple.org/debian/ default main" | sudo tee /etc/apt/sources.list.d/quitesimple.list
+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,9 +75,11 @@ 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);
@@ -116,7 +114,6 @@ char *xrealpath(const char *path, char *resolved_path)
 	return tmp;
 }
 
-
 char *ndirname(const char *path)
 {
 	if(path == NULL)
@@ -168,7 +165,6 @@ static inline bool file_exists(const char *path)
 	return access(path, F_OK) == 0;
 }
 
-
 void add_to_ignore_list(const char *str)
 {
 	*ignorelist_current = xmalloc(sizeof(struct ignorelist));
@@ -177,8 +173,6 @@ void add_to_ignore_list(const char *str)
 	ignorelist_current = &(*ignorelist_current)->next;
 }
 
-
-
 void logwrite(const char *format, ...)
 {
 	if(silent)
@@ -203,7 +197,6 @@ void logerror(const char *format, ...)
 	vfprintf(stderr, tmp, args);
 	fflush(stderr);
 	va_end(args);
-
 }
 
 void watchqueue_add_path(const char *pathname)
@@ -215,11 +208,9 @@ 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)
@@ -259,7 +250,7 @@ const char *mask_to_names(int mask)
 	size_t n = sizeof(ret) - 1;
 	if(mask & IN_ATTRIB)
 	{
-		strncat(ret, "IN_ATTRIB,",n);
+		strncat(ret, "IN_ATTRIB,", n);
 	}
 	if(mask & IN_OPEN)
 	{
@@ -322,23 +313,23 @@ const char *mask_to_names(int mask)
 	return 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;
 			}
 		}
 
-		if(! noenv)
+		if(!noenv)
 		{
 			char envvar[30];
-			snprintf(envvar, sizeof(envvar), "ADHOCIFYEVENT=%"PRIu32, eventmask);
+			snprintf(envvar, sizeof(envvar), "ADHOCIFYEVENT=%" PRIu32, eventmask);
 			putenv(envvar);
 		}
 
@@ -370,7 +361,6 @@ bool run_prog(const char *eventfile,  uint32_t eventmask)
 	}
 
 	return true;
-
 }
 
 uint32_t name_to_mask(const char *name)
@@ -418,9 +408,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);
 			}
 		}
@@ -439,8 +430,8 @@ void queue_watches_from_stdin()
 	ssize_t r;
 	while((r = getline(&line, &n, stdin)) != -1)
 	{
-		if(line[r-1] == '\n') 
+		if(line[r - 1] == '\n')
-			line[r-1] = 0;
+			line[r - 1] = 0;
 		watchqueue_add_path(line);
 	}
 }
@@ -454,7 +445,7 @@ char *get_eventfile_abspath(struct inotify_event *event)
 	}
 
 	char *result = NULL;
-	if((event->len) > 0 )
+	if((event->len) > 0)
 	{
 		if(asprintf(&result, "%s/%s", wdpath, event->name) == -1)
 		{
@@ -468,7 +459,6 @@ char *get_eventfile_abspath(struct inotify_event *event)
 	return result;
 }
 
-
 void handle_event(struct inotify_event *event)
 {
 	if(event->mask & mask)
@@ -496,131 +486,135 @@ void handle_event(struct inotify_event *event)
 		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("--mask, -m              inotify event to watch for (see inotify(7)). Can be specified multiple times to "
-	printf("--no-env, -a            if specified, the inotify event which occured won't be passed to the command as an environment variable\n");
+		   "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("--ignore, -i            Shell wildcard pattern (see glob(7)) to ignore events on files for which the "
-	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");
+		   "pattern matches\n");
+	printf("--exit-with-child, -e   Exit when the commands exits. 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[] = 
+static struct option long_options[] = {{"daemon", no_argument, 0, 'd'},
-{
+									   {"logfile", required_argument, 0, 'o'},
-  { "daemon", no_argument, 0, 'd' },
+									   {"mask", required_argument, 0, 'm'},
-  { "logfile", required_argument, 0, 'o' },
+									   {"path", required_argument, 0, 'w'},
-  { "mask", required_argument, 0, 'm' },
+									   {"no-env", no_argument, 0, 'a'},
-  { "path", required_argument, 0, 'w' },
+									   {"stdin", no_argument, 0, 's'},
-  { "no-env", no_argument, 0, 'a' },
+									   {"no-forkbomb-check", no_argument, 0, 'b'},
-  { "stdin", no_argument, 0, 's' },
+									   {"ignore", required_argument, 0, 'i'},
-  { "no-forkbomb-check", no_argument, 0, 'b' },
+									   {"silent", no_argument, 0, 'q'},
-  { "ignore", required_argument, 0, 'i' },  
+									   {"help", no_argument, 0, 'h'},
-  { "silent", no_argument, 0, 'q' },
+									   {"exit-with-child", optional_argument, 0, 'e'}};
-  { "help", no_argument, 0, 'h' },
-  { "exit-with-child", optional_argument, 0, 'e' }
-};
 
-//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
+	n_script_arguments = n_args + 2; // 2 = argv0 and terminating NULL
 
-		char **arguments = xmalloc( n_script_arguments * sizeof(char *) ); 
+	char **arguments = xmalloc(n_script_arguments * sizeof(char *));
 
-		const char *argv0 = memrchr(prog, '/', strlen(prog));
+	const char *argv0 = memrchr(prog, '/', strlen(prog));
-		argv0 = ( argv0 == NULL ) ? prog : argv0+1;
+	argv0 = (argv0 == NULL) ? prog : argv0 + 1;
-		arguments[0] = argv0;
+	arguments[0] = argv0;
 
-		const int begin_offset = 1;
+	const int begin_offset = 1;
-		for(unsigned int i = 0; i < n_args; i++)
+	for(unsigned int i = 0; i < n_args; i++)
-		{
+	{
-			char *argument = args[i];
+		char *argument = args[i];
-			arguments[i+begin_offset] = strdup(argument); 
+		arguments[i + begin_offset] = strdup(argument);
-		}
+	}
-		arguments[n_args+begin_offset] = NULL;
+	arguments[n_args + begin_offset] = NULL;
 
-		script_arguments = arguments;
+	script_arguments = arguments;
 }
 
-
 void parse_options(int argc, char **argv)
 {
 	char *watchpath = NULL;
 	int option;
-    int option_index;
+	int option_index;
-    uint32_t optmask = 0; 
+	uint32_t optmask = 0;
 	while((option = getopt_long(argc, argv, "absdo:w:m:l:i:e::", long_options, &option_index)) != -1)
 	{
 		switch(option)
 		{
-			case 'd':
+		case 'd':
-				daemonize = true;
+			daemonize = true;
-				break;
+			break;
-			case 'o':
+		case 'o':
-				path_logfile = optarg;
+			path_logfile = optarg;
-				break;
+			break;
-			case 'm':
+		case 'm':
-				optmask = name_to_mask(optarg);
+			optmask = name_to_mask(optarg);
-				if(optmask == 0) { 
+			if(optmask == 0)
-					logerror("Not supported inotify event: %s\n", optarg);
+			{
+				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)
+			{
+				if(*optarg == '!')
+				{
+					negate_child_exit_code = true;
+					++optarg;
+				}
+				if(*optarg == '\0')
+				{
+					logerror("Please specify the exit code\n");
 					exit(EXIT_FAILURE);
 				}
-				mask |= optmask;
+				awaited_child_exit_code = atoi(optarg);
-				break;
+			}
-			case 'w':
+			break;
-				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 == '!')
-					{
-						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);
-				}
-				break;
 		}
 	}
 
@@ -673,7 +667,7 @@ void process_options()
 
 	if(daemonize)
 	{
-		if(daemon(0,0) == -1)
+		if(daemon(0, 0) == -1)
 		{
 			perror("daemon");
 			exit(EXIT_FAILURE);
@@ -681,75 +675,91 @@ void process_options()
 	}
 }
 
+
+void wait_for_children()
+{
+	while(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)
+			{
+				logwrite("command not found, exiting\n");
+				exit(adhocify_exit_code);
+			}
+			if(exit_with_child)
+			{
+				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)
 	{
-			int len;
+		if(handle_child_exits)
-			int offset =0;
+		{
-			char buf[BUF_SIZE];
+			handle_child_exits = 0;
-			len = read(ifd, buf, BUF_SIZE);
+			wait_for_children();
-			if(len == -1) 
+		}
-			{
+		int len;
-				if(errno == EINTR) 
+		int offset = 0;
-					continue;
+		char buf[BUF_SIZE];
-				perror("read");
+		len = read(ifd, buf, BUF_SIZE);
-				exit(EXIT_FAILURE);
+		if(len == -1)
-			}
+		{
+			if(errno == EINTR)
+				continue;
+			perror("read");
+			exit(EXIT_FAILURE);
+		}
+		while(offset < len)
+		{
 
-			while(offset < len)
+			struct inotify_event *event = (struct inotify_event *)&buf[offset];
-			{
+			handle_event(event);
-
+			offset += sizeof(struct inotify_event) + event->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;
 	}
-	
+	handle_child_exits = 1;
-	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);
-	}
 }
 
 void set_signals()
@@ -764,7 +774,6 @@ void set_signals()
 	}
 }
 
-
 int main(int argc, char **argv)
 {
 	if(argc < 2)
@@ -773,10 +782,9 @@ int main(int argc, char **argv)
 		exit(EXIT_FAILURE);
 	}
 
-	//signal(SIGCHLD, SIG_IGN);
+	// signal(SIGCHLD, SIG_IGN);
 	set_signals();
 
-	
 	parse_options(argc, argv);
 	process_options();
 

examples/move_downloads.sh

@@ -4,6 +4,7 @@
 #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