reformat with clangformat - no functional change
This commit is contained in:
parent
cf14367aa8
commit
75b7db7d36
122
adhocify.c
122
adhocify.c
@ -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,7 +62,6 @@ 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;
|
||||
@ -79,7 +75,7 @@ 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;
|
||||
|
||||
void *xmalloc(size_t size)
|
||||
@ -116,7 +112,6 @@ char *xrealpath(const char *path, char *resolved_path)
|
||||
return tmp;
|
||||
}
|
||||
|
||||
|
||||
char *ndirname(const char *path)
|
||||
{
|
||||
if(path == NULL)
|
||||
@ -168,7 +163,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 +171,6 @@ void add_to_ignore_list(const char *str)
|
||||
ignorelist_current = &(*ignorelist_current)->next;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void logwrite(const char *format, ...)
|
||||
{
|
||||
if(silent)
|
||||
@ -203,7 +195,6 @@ void logerror(const char *format, ...)
|
||||
vfprintf(stderr, tmp, args);
|
||||
fflush(stderr);
|
||||
va_end(args);
|
||||
|
||||
}
|
||||
|
||||
void watchqueue_add_path(const char *pathname)
|
||||
@ -215,11 +206,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 +248,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)
|
||||
{
|
||||
@ -329,16 +318,16 @@ bool run_prog(const char *eventfile, uint32_t eventmask)
|
||||
{
|
||||
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 +359,6 @@ bool run_prog(const char *eventfile, uint32_t eventmask)
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
}
|
||||
|
||||
uint32_t name_to_mask(const char *name)
|
||||
@ -418,9 +406,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 +428,8 @@ void queue_watches_from_stdin()
|
||||
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);
|
||||
}
|
||||
}
|
||||
@ -454,7 +443,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 +457,6 @@ char *get_eventfile_abspath(struct inotify_event *event)
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
void handle_event(struct inotify_event *event)
|
||||
{
|
||||
if(event->mask & mask)
|
||||
@ -496,13 +484,13 @@ 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()
|
||||
@ -511,53 +499,56 @@ void print_usage()
|
||||
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 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");
|
||||
}
|
||||
|
||||
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'}};
|
||||
|
||||
//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));
|
||||
argv0 = ( argv0 == NULL ) ? prog : argv0+1;
|
||||
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[i + begin_offset] = strdup(argument);
|
||||
}
|
||||
arguments[n_args+begin_offset] = NULL;
|
||||
arguments[n_args + begin_offset] = NULL;
|
||||
|
||||
script_arguments = arguments;
|
||||
}
|
||||
|
||||
|
||||
void parse_options(int argc, char **argv)
|
||||
{
|
||||
char *watchpath = NULL;
|
||||
@ -576,7 +567,8 @@ void parse_options(int argc, char **argv)
|
||||
break;
|
||||
case 'm':
|
||||
optmask = name_to_mask(optarg);
|
||||
if(optmask == 0) {
|
||||
if(optmask == 0)
|
||||
{
|
||||
logerror("Not supported inotify event: %s\n", optarg);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
@ -587,19 +579,19 @@ void parse_options(int argc, char **argv)
|
||||
watchqueue_add_path(watchpath);
|
||||
break;
|
||||
case 'a':
|
||||
noenv=true;
|
||||
noenv = true;
|
||||
break;
|
||||
case 's':
|
||||
fromstdin=true;
|
||||
fromstdin = true;
|
||||
break;
|
||||
case 'b':
|
||||
forkbombcheck=false;
|
||||
forkbombcheck = false;
|
||||
break;
|
||||
case 'i':
|
||||
add_to_ignore_list(optarg);
|
||||
break;
|
||||
case 'q':
|
||||
silent=true;
|
||||
silent = true;
|
||||
break;
|
||||
case 'h':
|
||||
print_usage();
|
||||
@ -673,7 +665,7 @@ void process_options()
|
||||
|
||||
if(daemonize)
|
||||
{
|
||||
if(daemon(0,0) == -1)
|
||||
if(daemon(0, 0) == -1)
|
||||
{
|
||||
perror("daemon");
|
||||
exit(EXIT_FAILURE);
|
||||
@ -686,7 +678,7 @@ void start_monitoring(int ifd)
|
||||
while(1)
|
||||
{
|
||||
int len;
|
||||
int offset =0;
|
||||
int offset = 0;
|
||||
char buf[BUF_SIZE];
|
||||
len = read(ifd, buf, BUF_SIZE);
|
||||
if(len == -1)
|
||||
@ -702,7 +694,7 @@ void start_monitoring(int ifd)
|
||||
|
||||
struct inotify_event *event = (struct inotify_event *)&buf[offset];
|
||||
handle_event(event);
|
||||
offset+=sizeof(struct inotify_event) + event->len;
|
||||
offset += sizeof(struct inotify_event) + event->len;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -747,7 +739,7 @@ void child_handler(int signum, siginfo_t *info, void *context)
|
||||
}
|
||||
if(exit_with_child && WIFSIGNALED(status))
|
||||
{
|
||||
adhocify_exit_code = 128 + WTERMSIG(status); //copy bash's behaviour
|
||||
adhocify_exit_code = 128 + WTERMSIG(status); // copy bash's behaviour
|
||||
exit(adhocify_exit_code);
|
||||
}
|
||||
}
|
||||
@ -764,7 +756,6 @@ void set_signals()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
if(argc < 2)
|
||||
@ -773,10 +764,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();
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user