Skip to content
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.

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

Try canonicalisation when converting File to Dir #1018

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

Conversation

Frederick888
Copy link

Without this canonicalisation, if the directory is a symbolic link to
another directory, later at reorient_target_path [1], File and path
argument look like:

- self: File {
    name: "."
    ext: None
    path: "/tmp/test2"
    metadata: {...}
    parent_dir: Some({
      contents: vec![]
      path: "/tmp/test2"
    })
    is_all_all: true
  }
- path: "test1"

...where /tmp/test2 is a symlink to /tmp/test1 and command being used is
exa -laa /tmp/test2.

So the result of dir.join(&*path) becomes /tmp/test2/test1, which
doesn't exist.

The canonicalisation also makes the behaviours of exa -laa /tmp/test2
and exa -laa /tmp/test2/ consistent, where . is not treated as a
symlink in either case. This is a bit different from coreutils ls
though.

Closes #952.

[1]

exa/src/fs/file.rs

Lines 215 to 217 in 42659f9

else if let Some(dir) = self.parent_dir {
dir.join(&*path)
}

Without this canonicalisation, if the directory is a symbolic link to
another directory, later at `reorient_target_path` [1], File and path
argument look like:

- self: File {
    name: "."
    ext: None
    path: "/tmp/test2"
    metadata: {...}
    parent_dir: Some({
      contents: vec![]
      path: "/tmp/test2"
    })
    is_all_all: true
  }
- path: "test1"

...where /tmp/test2 is a symlink to /tmp/test1 and command being used is
`exa -laa /tmp/test2`.

So the result of `dir.join(&*path)` becomes `/tmp/test2/test1`, which
doesn't exist.

The canonicalisation also makes the behaviours of `exa -laa /tmp/test2`
and `exa -laa /tmp/test2/` consistent, where `.` is not treated as a
symlink in either case. This is a bit different from coreutils `ls`
though.

Closes ogham#952.

[1] https://github.com/ogham/exa/blob/42659f93456d9ff7cc1096cbd84d778ede26d76e/src/fs/file.rs#L215-L217
@ariasuni
Copy link
Collaborator

I have changed the code quite a bit in #872, do you think the two could work together? Also, I think it would be nice to have a test with vagrant (look at the README), do you think you could look at it? Since symlinks are tricky, I think it would be nice to have tests (and check they passes, since they aren’t run on the CI).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

exa -laa <dir> marks <dir> as a broken symbolic link if it's relative
2 participants