Merge 92ba6b439e6aed8557a315ebfcd350016159be52 into bd67b41f329702465d1d548ca2144b609e82927a

nfq/helpers.c

@@ -9,7 +9,6 @@
 #include <ctype.h>
 #include <sys/stat.h>
 #include <libgen.h>
-#include <fcntl.h>
 
 int unique_size_t(size_t *pu, int ct)
 {
@@ -314,17 +313,6 @@ bool file_mod_signature(const char *filename, file_mod_sig *ms)
 	return true;
 }
 
-bool file_open_test(const char *filename, int flags)
-{
-	int fd = open(filename,flags);
-	if (fd>=0)
-	{
-		close(fd);
-		return true;
-	}
-	return false;
-}
-
 bool pf_in_range(uint16_t port, const port_filter *pf)
 {
 	return port && (((!pf->from && !pf->to) || (port>=pf->from && port<=pf->to)) ^ pf->neg);

nfq/helpers.h

@@ -77,7 +77,6 @@ typedef struct
 #define FILE_MOD_RESET(ms) memset(ms,0,sizeof(file_mod_sig))
 bool file_mod_signature(const char *filename, file_mod_sig *ms);
 time_t file_mod_time(const char *filename);
-bool file_open_test(const char *filename, int flags);
 
 typedef struct
 {

nfq/nfqws.c

@@ -126,16 +126,16 @@ static bool test_list_files()
 	struct ipset_file *ifile;
 
 	LIST_FOREACH(hfile, &params.hostlists, next)
-		if (!file_open_test(hfile->filename, O_RDONLY))
+		if (!file_mod_time(hfile->filename))
 		{
-			DLOG_PERROR("file_open_test");
+			DLOG_PERROR("file_mod_time");
 			DLOG_ERR("cannot access hostlist file '%s'\n",hfile->filename);
 			return false;
 		}
 	LIST_FOREACH(ifile, &params.ipsets, next)
-		if (!file_open_test(ifile->filename, O_RDONLY))
+		if (!file_mod_time(ifile->filename))
 		{
-			DLOG_PERROR("file_open_test");
+			DLOG_PERROR("file_mod_time");
 			DLOG_ERR("cannot access ipset file '%s'\n",ifile->filename);
 			return false;
 		}

tpws/helpers.c

@@ -11,7 +11,6 @@
 #include <sys/stat.h>
 #include <libgen.h>
 #include <unistd.h>
-#include <fcntl.h>
 
 #ifdef __ANDROID__
 #include "andr/ifaddrs.h"
@@ -328,17 +327,6 @@ bool file_mod_signature(const char *filename, file_mod_sig *ms)
 	return true;
 }
 
-bool file_open_test(const char *filename, int flags)
-{
-	int fd = open(filename,flags);
-	if (fd>=0)
-	{
-		close(fd);
-		return true;
-	}
-	return false;
-}
-
 bool pf_in_range(uint16_t port, const port_filter *pf)
 {
 	return port && (((!pf->from && !pf->to) || (port >= pf->from && port <= pf->to)) ^ pf->neg);

tpws/helpers.h

@@ -71,7 +71,6 @@ typedef struct
 #define FILE_MOD_RESET(ms) memset(ms,0,sizeof(file_mod_sig))
 bool file_mod_signature(const char *filename, file_mod_sig *ms);
 time_t file_mod_time(const char *filename);
-bool file_open_test(const char *filename, int flags);
 
 typedef struct
 {

tpws/tpws.c

@@ -122,16 +122,16 @@ static bool test_list_files()
 	struct ipset_file *ifile;
 
 	LIST_FOREACH(hfile, &params.hostlists, next)
-		if (!file_open_test(hfile->filename, O_RDONLY))
+		if (!file_mod_time(hfile->filename))
 		{
-			DLOG_PERROR("file_open_test");
+			DLOG_PERROR("file_mod_time");
 			DLOG_ERR("cannot access hostlist file '%s'\n",hfile->filename);
 			return false;
 		}
 	LIST_FOREACH(ifile, &params.ipsets, next)
-		if (!file_open_test(ifile->filename, O_RDONLY))
+		if (!file_mod_time(ifile->filename))
 		{
-			DLOG_PERROR("file_open_test");
+			DLOG_PERROR("file_mod_time");
 			DLOG_ERR("cannot access ipset file '%s'\n",ifile->filename);
 			return false;
 		}