check file format in dir_list_file

alubennikova · alubennikova · commit a2bcbc77bd6c · 2017-04-21T11:41:20.000+03:00
diff --git a/dir.c b/dir.c
@@ -354,7 +354,13 @@ dir_list_file_internal(parray *files, const char *root, bool exclude,
 	/* skip if the file is in black_list defined by user */
 	if (black_list && parray_bsearch(black_list, root, BlackListCompare))
 	{
-		/* found in black_list. skip this item */
+		elog(LOG, "Skip file \"%s\": file is in the user's black list", file->path);
+		return;
+	}
+
+	if (!S_ISDIR(file->mode) && !S_ISLNK(file->mode) &&	!S_ISREG(file->mode))
+	{
+		elog(WARNING, "Skip file \"%s\": Unexpected file format", file->path);
 		return;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,13 @@ dir_list_file_internal(parray files, const char root, bool exclude,`
`354`	`354`	`/* skip if the file is in black_list defined by user */`
`355`	`355`	`if (black_list && parray_bsearch(black_list, root, BlackListCompare))`
`356`	`356`	`{`
`357`		`- /* found in black_list. skip this item */`
	`357`	`+ elog(LOG, "Skip file \"%s\": file is in the user's black list", file->path);`
	`358`	`+ return;`
	`359`	`+ }`
	`360`	`+`
	`361`	`+ if (!S_ISDIR(file->mode) && !S_ISLNK(file->mode) && !S_ISREG(file->mode))`
	`362`	`+ {`
	`363`	`+ elog(WARNING, "Skip file \"%s\": Unexpected file format", file->path);`
`358`	`364`	`return;`
`359`	`365`	`}`
`360`	`366`