fix issue #3163: uutils: add dir and vdir utils #3405
Conversation
|
Great work! Just a "small" comment |
src/uu/ls/src/ls.rs
Outdated
| .help("Print help information.") | ||
| ) | ||
| // Format arguments | ||
| .arg( |
There was a problem hiding this comment.
could you please refactor this ? it is a lot of duplicate content :)
There was a problem hiding this comment.
could you please refactor this ? it is a lot of duplicate content :)
Done
|
Committed suggestions |
I think you have to add them here too: |
|
I added them |
There was a problem hiding this comment.
Almost ready.
Could you please also remove vdir and dir from this line?
https://github.com/uutils/coreutils/blob/main/util/build-gnu.sh#L183=
chcon|dir|runcon|vdir) => chcon|runcon)
src/uu/ls/src/ls.rs
Outdated
| @@ -797,618 +797,713 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { | |||
| list(locs, &config) | |||
| } | |||
|
|
|||
| /// The entry point for the dir coreutils | |||
| pub fn dir_main(args: impl uucore::Args) -> UResult<()> { | |||
There was a problem hiding this comment.
sorry for one more comment
I am wondering if this is possible to move this function into dir.rs ?
to avoid ls.rs to be too big
There was a problem hiding this comment.
I could but that would mean making a lot of refactoring in ls to make a lot of functions and structs accessible to dir and vdir. Notably the whole quoting style file that is a private ls module.
There was a problem hiding this comment.
We could move it into uucore however
|
Done. Ignore what I said before, I forgot that |
Co-authored-by: Sylvestre Ledru <sledru@mozilla.com>
Co-authored-by: Sylvestre Ledru <sledru@mozilla.com>
Co-authored-by: Sylvestre Ledru <sledru@mozilla.com>
|
Looks great, i will merge if once the CI is green :) |
|
Well done! |
Fixes issue #3163 by adding the
dirandvdirutils.This is done by adding two function to
ls:dir_main()andvdir_main(). Upon launching one of these utilities, they launch the corresponding functions. These function just adddirandvdirdefault arguments and then launchlsnormally.For example, in the
vdir_main()function, we check if the user gave any formatting related argument and if he didn't, we add the-largument to the config (asvdiris a shortcut tols -l -b). This allows the user to overwritedirandvdirdefault arguments. We then do the same thing for the othervdirdefault argument.Since they use the same functions than
lsI just added tests for the default output and for the output in case an argument is given.