p
/
desktop-tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iexec: enable watching a different path

This commit is contained in:
Přemysl Eric Janouch 2023-06-19 17:14:18 +02:00
parent 957aed63a8
commit 4cc1baf429
Signed by: p
GPG Key ID: A0420B94F92B9493
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE
View File

@ -1,4 +1,4 @@
Copyright (c) 2015 - 2021, Přemysl Eric Janouch <p@janouch.name> Copyright (c) 2015 - 2023, Přemysl Eric Janouch <p@janouch.name>
Permission to use, copy, modify, and/or distribute this software for any Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted. purpose with or without fee is hereby granted.

12
iexec.c
View File

@ -98,8 +98,10 @@ sigchld_handler (int signum)
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
const char *target = NULL;
static const struct opt opts[] = static const struct opt opts[] =
{ {
{ 'f', "file", "PATH", 0, "watch this path rather than the program" },
{ 'd', "debug", NULL, 0, "run in debug mode" }, { 'd', "debug", NULL, 0, "run in debug mode" },
{ 'h', "help", NULL, 0, "display this help and exit" }, { 'h', "help", NULL, 0, "display this help and exit" },
{ 'V', "version", NULL, 0, "output version information and exit" }, { 'V', "version", NULL, 0, "output version information and exit" },
@ -116,6 +118,9 @@ main (int argc, char *argv[])
while ((c = opt_handler_get (&oh)) != -1) while ((c = opt_handler_get (&oh)) != -1)
switch (c) switch (c)
{ {
case 'f':
target = optarg;
break;
case 'd': case 'd':
g_debug_mode = true; g_debug_mode = true;
break; break;
@ -141,6 +146,9 @@ main (int argc, char *argv[])
argc -= optind; argc -= optind;
argv += optind; argv += optind;
if (!target)
target = argv[0];
(void) signal (SIGPIPE, SIG_IGN); (void) signal (SIGPIPE, SIG_IGN);
struct sigaction sa = { .sa_handler = sigchld_handler }; struct sigaction sa = { .sa_handler = sigchld_handler };
sigemptyset (&sa.sa_mask); sigemptyset (&sa.sa_mask);
@ -154,7 +162,7 @@ main (int argc, char *argv[])
exit_fatal ("sigprocmask: %s", strerror (errno)); exit_fatal ("sigprocmask: %s", strerror (errno));
char *path = NULL; char *path = NULL;
char *dir = dirname ((path = xstrdup (argv[0]))); char *dir = dirname ((path = xstrdup (target)));
if ((g_inotify_fd = inotify_init1 (IN_NONBLOCK)) < 0) if ((g_inotify_fd = inotify_init1 (IN_NONBLOCK)) < 0)
exit_fatal ("inotify_init1: %s", strerror (errno)); exit_fatal ("inotify_init1: %s", strerror (errno));
@ -163,7 +171,7 @@ main (int argc, char *argv[])
exit_fatal ("inotify_add_watch: %s", strerror (errno)); exit_fatal ("inotify_add_watch: %s", strerror (errno));
free (path); free (path);
char *base = basename ((path = xstrdup (argv[0]))); char *base = basename ((path = xstrdup (target)));
spawn (argv); spawn (argv);
do do