allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Use inodes_same() function.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11591 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington
2012-03-05 00:34:29 +00:00
parent a7f31b56af
commit 7a79db9117
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libs/ardour/file_source.cc
View File

@@ -270,6 +270,8 @@ FileSource::find (Session& s, DataType type, const string& path, bool must_exist
/* Remove duplicate inodes from the list of ambiguous files, since if there are symlinks
in the session path it is possible to arrive at the same file via more than one path.
I suppose this is not necessary on Windows.
*/
vector<string> de_duped_hits;
@@ -280,13 +282,7 @@ FileSource::find (Session& s, DataType type, const string& path, bool must_exist
++j;
while (j != hits.end()) {
struct stat bufA;
int const rA = stat (i->c_str(), &bufA);
struct stat bufB;
int const rB = stat (j->c_str(), &bufB);
if (rA == 0 && rB == 0 && bufA.st_ino == bufB.st_ino) {
if (inodes_same (*i, *j)) {
/* *i and *j are the same file; break out of the loop early */
break;
}