Merge pull request #2028 from havardAasen/delete-tmp-files

evgenyz · web-flow · commit ffdf8b523076 · 2023-09-11T20:10:10.000+02:00
Be able to delete temporary files on a different mount point
diff --git a/src/common/oscap_acquire.c b/src/common/oscap_acquire.c
@@ -210,7 +210,7 @@ void oscap_acquire_cleanup_dir(char **dir_path)
 {
 	if (*dir_path != NULL)
 	{
-		nftw(*dir_path, __unlink_cb, 64, FTW_DEPTH | FTW_PHYS | FTW_MOUNT);
+		nftw(*dir_path, __unlink_cb, 64, FTW_DEPTH | FTW_PHYS);
 		free(*dir_path);
 		*dir_path = NULL;
 	}

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ void oscap_acquire_cleanup_dir(char **dir_path)`
`210`	`210`	`{`
`211`	`211`	`if (*dir_path != NULL)`
`212`	`212`	`{`
`213`		`- nftw(*dir_path, __unlink_cb, 64, FTW_DEPTH \| FTW_PHYS \| FTW_MOUNT);`
	`213`	`+ nftw(*dir_path, __unlink_cb, 64, FTW_DEPTH \| FTW_PHYS);`
`214`	`214`	`free(*dir_path);`
`215`	`215`	`*dir_path = NULL;`
`216`	`216`	`}`