[Issue #246] correctly exclude nested directories such as 'pgsql_tmp'

gsmolk · gsmolk · commit 46c7dba3bb2b · 2020-08-31T14:58:19.000+03:00
diff --git a/src/dir.c b/src/dir.c
@@ -613,8 +613,8 @@ dir_check_file(pgFile *file, bool backup_logs)
 		 */
 		for (i = 0; pgdata_exclude_dir[i]; i++)
 		{
-			/* relative path exclude */
-			if (strcmp(file->rel_path, pgdata_exclude_dir[i]) == 0)
+			/* exclude by dirname */
+			if (strcmp(file->name, pgdata_exclude_dir[i]) == 0)
 			{
 				elog(VERBOSE, "Excluding directory content: %s", file->rel_path);
 				return CHECK_EXCLUDE_FALSE;

Original file line number	Diff line number	Diff line change
`@@ -613,8 +613,8 @@ dir_check_file(pgFile *file, bool backup_logs)`
`613`	`613`	`*/`
`614`	`614`	`for (i = 0; pgdata_exclude_dir[i]; i++)`
`615`	`615`	`{`
`616`		`- /* relative path exclude */`
`617`		`- if (strcmp(file->rel_path, pgdata_exclude_dir[i]) == 0)`
	`616`	`+ /* exclude by dirname */`
	`617`	`+ if (strcmp(file->name, pgdata_exclude_dir[i]) == 0)`
`618`	`618`	`{`
`619`	`619`	`elog(VERBOSE, "Excluding directory content: %s", file->rel_path);`
`620`	`620`	`return CHECK_EXCLUDE_FALSE;`