crtxcr/adhocify
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

-r: check against max number of watches

Browse Source
This commit is contained in:
Albert S. 2016-05-23 18:24:51 +02:00
parent be91bb8473
commit 200d7ba8cb
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
adhocify.c
View File

@ -45,7 +45,8 @@ struct watchlistentry
bool isdir; bool isdir;
struct watchlistentry *next; struct watchlistentry *next;
}; };
size_t max_watches = 0;
size_t watchlistentries = 0;
struct watchlistentry *watchlist_head = NULL; struct watchlistentry *watchlist_head = NULL;
struct watchlistentry **watchlist = &watchlist_head; struct watchlistentry **watchlist = &watchlist_head;
@ -209,12 +210,18 @@ void watchqueue_add_path(const char *pathname)
e->isdir = path_is_directory(pathname); e->isdir = path_is_directory(pathname);
e->next = NULL; e->next = NULL;
watchlist= &e->next; watchlist= &e->next;
++watchlistentries;
} }
static int recursive_walker_callback(const char *path, const struct stat *sb, static int recursive_walker_callback(const char *path, const struct stat *sb,
int typeflag, struct FTW *ftwbuf) int typeflag, struct FTW *ftwbuf)
{ {
if(watchlistentries == max_watches)
{
fprintf(stderr, "Error: Max number of watches reached\n");
return -1;
}
if(typeflag == FTW_D) if(typeflag == FTW_D)
{ {
watchqueue_add_path(path); watchqueue_add_path(path);
@ -223,10 +230,24 @@ static int recursive_walker_callback(const char *path, const struct stat *sb,
} }
void watchqueue_add_recursive(const char *pathname) void watchqueue_add_recursive(const char *pathname)
{ {
FILE *fp = fopen("/proc/sys/fs/inotify/max_user_watches", "r");
if(fp == NULL)
{
fprintf(stderr, "error opening max_user_watches file\n");
exit(EXIT_FAILURE);
}
if(fscanf(fp, "%zu", &max_watches) < 1)
{
fprintf(stderr, "error processing max_user_watches file\n");
exit(EXIT_FAILURE);
}
fclose(fp);
int walker = nftw(pathname, &recursive_walker_callback, 10, FTW_PHYS); int walker = nftw(pathname, &recursive_walker_callback, 10, FTW_PHYS);
if(walker == -1) if(walker == -1)
{ {
perror("nftw"); fprintf(stderr, "nftw failed\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }