Skip to content

fix(#2015): store correct path of symlinks #2025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
h-2 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(#2015): store correct path of symlinks #2025

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/library/filescanner.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -911,7 +911,14 @@ process_directory(char *path, int parent_id, int flags)
else if (!(flags & F_SCAN_FAST))
{
if (S_ISREG(sb.st_mode) || S_ISFIFO(sb.st_mode))
process_file(resolved_path, &sb, file_type, scan_type, flags, dir_id);
/* Use the path we found the file at, not the dereferenced path. For
* regular files the two are identical, but for symlinks it means the
* file is registered where the user put it, ie below the directory
* we are scanning. Otherwise the file's directory_id and its path
* would disagree, and lookups by path (eg mpd's "add") would not
* find it, even though browsing the directory would show it.
*/
process_file(entry, &sb, file_type, scan_type, flags, dir_id);
else
DPRINTF(E_LOG, L_SCAN, "Skipping %s, not a directory, symlink, pipe nor regular file\n", entry);
}
Expand Down