Skip to content

virtualfilesystem: fix bug with symlinks being ignored #27

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

Merged
benpeart merged 1 commit into from
Sep 26, 2018
Merged

virtualfilesystem: fix bug with symlinks being ignored #27

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
4 changes: 2 additions & 2 deletions virtualfilesystem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ int is_excluded_from_virtualfilesystem(const char *pathname, int pathlen, int dt
if (dtype != DT_REG && dtype != DT_DIR && dtype != DT_LNK)
die(_("is_excluded_from_virtualfilesystem passed unhandled dtype"));

if (dtype == DT_REG) {
if (dtype == DT_REG || dtype == DT_LNK) {
int ret = is_included_in_virtualfilesystem(pathname, pathlen);
if (ret > 0)
return 0;
Expand All @@ -227,7 +227,7 @@ int is_excluded_from_virtualfilesystem(const char *pathname, int pathlen, int dt
return ret;
}

if (dtype == DT_DIR || dtype == DT_LNK) {

@kewillford kewillford Sep 25, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can a link be a directory or a file? If the link can be a directory do we need to do something different?

@benpeart benpeart Sep 25, 2018

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code in treat_one_path() (the normal git excludes logic replaced by the virtual file system hashmap based code) treats DT_REG and DT_LNK the same. In addition, the comment in the code states "Nobody actually cares about the difference between DT_LNK and DT_REG" so I think we're ok.

@jeffhostetler jeffhostetler Sep 26, 2018

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some OSes do allow directory symlinks (MacOS at least). But seriously doubt the other layers know to maintain that difference (at the lstat() layer for example). And since Git only tracks file and file-symlinks, I'm guessing we're OK here.

if (dtype == DT_DIR) {
if (!parent_directory_hashmap.tablesize && virtual_filesystem_data.len)
initialize_parent_directory_hashmap(&parent_directory_hashmap, &virtual_filesystem_data);
if (!parent_directory_hashmap.tablesize)
Expand Down