Bump version to v8.2.1

fixes #678

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,28 @@
+---
+name: Bug Report
+about: Report a bug.
+title: ""
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug you encountered:**
+
+<!--
+Please check out the troubleshooting section first:
+  https://github.com/sharkdp/fd#troubleshooting
+-->
+
+
+**Describe what you expected to happen:**
+
+
+**What version of `fd` are you using?**
+<!-- paste the output of `fd --version` here -->
+
+**Which operating system / distribution are you on?**
+<!--
+Unix:    paste the output of `uname -srm` and `lsb_release -a` here.
+Windows: please tell us your Windows version
+-->

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,2 @@
+blank_issues_enabled: true
+

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,10 @@
+---
+name: Feature Request
+about: Suggest an idea for this project.
+title: ''
+labels: feature-request
+assignees: ''
+
+---
+
+

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,13 @@
+---
+name: Question
+about: Ask a question about 'fd'.
+title: ''
+labels: question
+assignees: ''
+
+---
+
+
+
+**What version of `fd` are you using?**
+[paste the output of `fd --version` here]

.travis.yml

@@ -1,8 +1,5 @@
 language: rust
-cache: cargo
-matrix:
-  # allow_failures:
-  #   - rust: nightly
+jobs:
   include:
     # Stable channel.
     - os: linux
@@ -18,75 +15,45 @@ matrix:
       rust: stable
       env: TARGET=i686-unknown-linux-musl
     - os: osx
+      osx_image: xcode11.4 # Catalina
       rust: stable
       env: TARGET=x86_64-apple-darwin
+    - os: linux
+      rust: stable
+      env:
+        - TARGET=arm-unknown-linux-gnueabihf
+        - CC_arm_unknown_linux_gnueabihf=/usr/bin/arm-linux-gnueabihf-gcc-4.8
+        - CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc-4.8
+    - os: linux
+      rust: stable
+      env:
+        - TARGET=arm-unknown-linux-musleabihf
+        - CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABIHF_LINKER=arm-linux-gnueabihf-gcc-4.8
 
     # Beta channel.
     - os: linux
       rust: beta
       env: TARGET=x86_64-unknown-linux-gnu
-    # Disabled to reduce total CI time
-    # - os: linux
-    #   rust: beta
-    #   env: TARGET=x86_64-unknown-linux-musl
-    # - os: linux
-    #   rust: beta
-    #   env: TARGET=i686-unknown-linux-gnu
-    # - os: linux
-    #   rust: beta
-    #   env: TARGET=i686-unknown-linux-musl
-    # - os: osx
-    #   rust: beta
-    #   env: TARGET=x86_64-apple-darwin
-
-    # Nightly channel.
-    - os: linux
-      rust: nightly
-      env: TARGET=x86_64-unknown-linux-gnu
-    # Disabled to reduce total CI time
-    # - os: linux
-    #   rust: nightly
-    #   env: TARGET=x86_64-unknown-linux-musl
-    # - os: linux
-    #   rust: nightly
-    #   env: TARGET=i686-unknown-linux-gnu
-    # - os: linux
-    #   rust: nightly
-    #   env: TARGET=i686-unknown-linux-musl
-    # - os: osx
-    #   rust: nightly
-    #   env: TARGET=x86_64-apple-darwin
 
     # Minimum Rust supported channel.
     - os: linux
-      rust: 1.20.0
+      rust: 1.40.0
       env: TARGET=x86_64-unknown-linux-gnu
     - os: linux
-      rust: 1.20.0
+      rust: 1.40.0
       env: TARGET=x86_64-unknown-linux-musl
     - os: linux
-      rust: 1.20.0
+      rust: 1.40.0
       env: TARGET=i686-unknown-linux-gnu
     - os: linux
-      rust: 1.20.0
+      rust: 1.40.0
       env: TARGET=i686-unknown-linux-musl
     - os: osx
-      rust: 1.20.0
+      rust: 1.40.0
       env: TARGET=x86_64-apple-darwin
 
-    # Code formatting check
-    - os: linux
-      rust: nightly
-      # skip the global install step
-      install:
-        - cargo install --force rustfmt-nightly
-      script: cargo fmt -- --write-mode=diff
-
-addons:
-  apt:
-    packages:
-      # needed for i686-unknown-linux-gnu target
-      - gcc-multilib
+before_install:
+  - ci/before_install.bash
 
 env:
   global:
@@ -101,21 +68,19 @@ install:
   - if [[ $TRAVIS_OS_NAME = linux && $HOST != $TARGET ]]; then rustup target add $TARGET; fi
 
 script:
-  # Incorporate TARGET env var to the build and test process
-  - cargo build --target $TARGET --verbose
-  - cargo test --target $TARGET --verbose
+  - ci/script.bash
 
 before_deploy:
   - bash ci/before_deploy.bash
 
 deploy:
   provider: releases
-  # NOTE updating the `api_key.secure`
+  # NOTE updating the `token.secure`
   # - go to: https://github.com/settings/tokens/new
   # - generate new token using `public_repo` scope
   # - encrypt it using: `travis encrypt API_KEY_HERE`
   # - paste the output below
-  api_key:
+  token:
     secure: "RyFdh2lpDmaNhPar7ezsb18Xz+6XFM40y7cZCDRML+Sk+eYK1xtDNfEhDRJU5Qo1ReVsByds/QJTSXr2KmZPk3lXwG3SiN7UtrLUxCxFr6qrcM/iujlKTf5UxeRklkzPXxnH95DEyEgxvgbVhWTGVDWoyMnrVQXZKDy6z1iAiYB5h2Zl1rs+MRb/Enlt5q6XIKAlG0ppGtl8CfYudq5ZiqfJaMWTt9SWm2YskC8FeMc0S3IM6/EhTvaNYLdaarFqVWQEVql+6oCuL3ayPzmGyxLdxM37tIMNQ0f97zxqWodacXTG5ULdRD8if1l/SmTujrtjbZ0KWRjsjOq4vBtxBJKGdprcSiB0xH/hToqqtTSO0z5FPXi5cB8UlK6YLDDHcP3kXNer8CYMLI1VPaUDLTF57/0/RPi2DZiiGfZsIAS6PsICbHdTQVzxQckM4lN1vnAGgkhXIMbztml21pv+QrGy98OZJ0ubf5ztgQhpT0WPH4JXT8M6htsoo8dZf8lQ5aLfmW9RKePJDqixQwPqmimPIkrlxRDTDGII0ZAZws7l779eOLmEcM2tH2HbsUKUCZIG/pRHLSlP45Jn2bULGzuXZ2daq70z6zvIbom0CUzSXIvdTXEZI2AM5RBvPYGGaKI8YlxgRdQvJp3h0BzPdFOXI3RAxscCY7PJpa/RdIg="
   # for uploading multiple files
   file_glob: true

CHANGELOG.md

@@ -0,0 +1,511 @@
+# Upcoming release
+
+## Features
+## Bugfixes
+## Changes
+## Other
+
+# v8.2.1
+
+No functional changes with respect to v8.2.0. Bugfix in the release process.
+
+# v8.2.0
+
+## Features
+
+- Add new `--prune` flag, see #535 (@reima)
+- Improved the usability of the time-based options, see #624 and #645 (@gorogoroumaru)
+- Add support for exact file sizes in the `--size` filter, see #669 and #696 (@Rogach)
+- `fd` now prints an error message if the search pattern requires a leading dot but
+  `--hidden` is not enabled (Unix only), see #615
+
+## Bugfixes
+
+- Avoid panic when performing limited searches in directories with restricted permissions, see #678
+- Invalid numeric command-line arguments are silently ignored, see #675
+- Disable jemalloc on Android, see #662
+- The `--help` text will be colorless if `NO_COLOR` has been set, see #600 (@xanonid)
+
+## Changes
+
+- If `LS_COLORS` is not set (e.g. on Windows), we now provide a more comprehensive default which
+  includes much more filetypes, see #604 and #682 (mjsir911).
+
+## Other
+
+- Added `zsh` completion files, see #654 and #189 (@smancill)
+
+# v8.1.1
+
+## Bugfixes
+
+- Support colored output on older Windows versions if either (1) `--color=always` is set or (2) the `TERM` environment variable is set. See #469
+
+# v8.1.0
+
+## Features
+
+- Add new `--owner [user][:group]` filter. See #307 (pull #581) (@alexmaco)
+- Add support for a global ignore file (`~/.config/fd/ignore` on Unix), see #575 (@soedirgo)
+- Do not exit immediately if one of the search paths is missing, see #587 (@DJRHails)
+
+## Bugfixes
+
+- Reverted a change from fd 8.0 that enabled colors on all Windows terminals (see below) in order to support older Windows versions again, see #577. Unfortunately, this re-opens #469
+- Fix segfault caused by jemalloc on macOS Catalina, see #498
+- Fix `--glob` behavior with empty pattern, see #579 (@SeamusConnor)
+- Fix `--list-details` on FreeBSD, DragonFly BSD, OpenBSD and NetBSD. See #573 (@t6)
+
+## Changes
+
+- Updated documentation for `--size`, see #584
+
+# v8.0.0
+
+## Features
+
+- Add a new `-l`/`--list-details` option to show more details about the search results. This is
+  basically an alias for `--exec-batch ls -l` with some additional `ls` options.
+  This can be used in order to:
+    * see metadata like permissions, owner, file size, modification times (#491)
+    * see symlink targets (#482)
+    * achieve a deterministic output order (#324, #196, #159)
+- Add a new `--max-results=<count>` option to limit the number of search results, see #472, #476 and #555
+  This can be useful to speed up searches in cases where you know that there are only N results.
+  Using this option is also (slightly) faster than piping to `head -n <count>` where `fd` can only
+  exit when it finds the search results `<count> + 1`.
+- Add the alias `-1` for `--max-results=1`, see #561. (@SimplyDanny).
+- Add new `--type socket` and `--type pipe` filters, see #511.
+- Add new `--min-depth <depth>` and `--exact-depth <depth>` options in addition to the existing option
+  to limit the maximum depth. See #404.
+- Support additional ANSI font styles in `LS_COLORS`: faint, slow blink, rapid blink, dimmed, hidden and strikethrough.
+
+## Bugfixes
+
+- Preserve non-UTF8 filenames: invalid UTF-8 filenames are now properly passed to child-processes
+  when using `--exec`, `--exec-batch` or `--list-details`. In `fd`'s output, we replace non-UTF-8
+  sequences with the "�" character. However, if the output of `fd` goes to another process, we
+  print the actual bytes of the filename. For more details, see #558 and #295.
+- `LS_COLORS` entries with unsupported font styles are not completely ignored, see #552
+
+## Changes
+
+- Colored output will now be enabled by default on older Windows versions.
+  This allows the use of colored output if the terminal supports it (e.g.
+  MinTTY, Git Bash). On the other hand, this will be a regression for users
+  on older Windows versions with terminals that do not support ANSI escape
+  sequences. Affected users can use an alias `fd="fd --color=never"` to
+  continue using `fd` without colors. There is no change of behavior for
+  Windows 10. See #469.
+- When using `--glob` in combination with `--full-path`, a `*` character does not match a path
+  separation character (`/` or `\\`) anymore. You can use `**` for that. This allows things like
+  `fd -p -g '/some/base/path/*/*/*.txt'` which would previously match to arbitrary depths (instead
+  of exactly two folders below `/some/base/path`. See #404.
+- "Legacy" support to use `fd -exec` (with a single dash) has been removed. Use `fd -x` or
+  `fd --exec` instead.
+- Overall improved error handling and error messages.
+
+
+## Other
+
+- Korean translation of the README, see: [한국어](https://github.com/spearkkk/fd-kor) (@spearkkk)
+
+
+# v7.5.0
+
+## Features
+
+- Added `--one-file-system` (aliases: `--mount`, `--xdev`) to not cross file system boundaries on Unix and Windows, see #507 (@FallenWarrior2k).
+- Added `--base-directory` to change the working directory in which `fd` is run, see #509 and #475 (@hajdamak).
+- `fd` will not use colored output if the `NO_COLOR` environment variable is set, see #550 and #551 (@metadave).
+- `fd --exec` will return exit code 1 if one of the executed commands fails, see #526 and #531 (@fusillicode and @Giuffre)
+
+## Bug Fixes
+
+- Fixed 'command not found' error when using zsh completion, see #487 (@barskern).
+- `fd -L` should include broken symlinks, see #357 and #497 (@tommilligan, @neersighted and @sharkdp)
+- Display directories even if we don't have permission to enter, see #437 (@sharkdp)
+
+## Changes
+
+- A flag can now be passed multiple times without producing an error, see #488 and #496 (@rootbid).
+- Search results are sorted when using the `-X` option to match the behaviour of piping to `xargs`, see #441 and #524 (@Marcoleni @crash-g).
+
+
+# v7.4.0
+
+## Performance improvements
+
+- Reduce number of `stat` syscalls, improving the performance for searches where file metadata is
+  required (`--type`, `--size`, `--changed-within`, …), see #434 (@tavianator)
+- Use jemalloc by default, improving the performance for almost all searches, see #481. Note that
+  Windows and `*musl*` builds do not profit from this.
+
+## Features
+
+- Added a new `-g`/`--glob` option to switch to glob-based searches (instead of regular expression
+  based searches). This is accompanied by a new `--regex` option that can be used to switch back,
+  if users want to `alias fd="fd --glob"`. See #284
+- Added a new `--path-separator <sep>` option which can be useful for Windows users who
+  want/need `fd` to use `/` instead of `\`, see #428 and #153 (@mookid)
+- Added support for hidden files on Windows, see #379
+- When `fd` is run with the `--exec-batch`/`-X` option, it now exposes the exit status of the
+  command that was run, see #333.
+- Exit immediately when Ctrl-C has been pressed twice, see #423
+
+## Bugfixes
+
+- Make `--changed-within`/`--changed-before` work for directories, see #470
+
+## Other
+
+- Pre-built `fd` binaries should now be available for `armhf` targets, see #457 (@detly)
+- `fd` is now available on Alpine Linux, see #451 (@5paceToast)
+- `fd` is now in the officla FreeBSD repositories, see #412 (@t6)
+- Added OpenBSD install instructions, see #421 (@evitalis)
+- Added metadata to the Debian package, see #416 (@cathalgarvey)
+- `fd` can be installed via npm, see #438 (@pablopunk)
+
+
+# v7.3.0
+
+## Features
+
+- New `--exec-batch <cmd>`/`-X <cmd>` option for batch execution of commands, see #360 (@kimsnj).
+  This allows you to do things like:
+  ``` bash
+  fd … -X vim  # open all search results in vim (or any other editor)
+  fd … -X ls -l  # view detailed stats about the search results with 'ls'
+  fd -e svg -X inkscape  # open all SVG files in Inkscape
+  ```
+- Support for 24-bit color codes (when specified via `LS_COLORS`) as well as
+  different font styles (bold, italic, underline).
+
+## Changes
+
+- A few performance improvements, in particular when printing lots of colorized
+  results to the console, see #370
+- The `LS_COLORS` handling has been "outsourced" to a separate crate (https://github.com/sharkdp/lscolors) that is now being used by other tools as well: [fselect](https://github.com/jhspetersson/fselect), [lsd](https://github.com/Peltoche/lsd/pull/84). For details, see #363.
+
+## Other
+
+- `fd` will be available in Ubuntu Disco DIngo (19.04), see #373 (@sylvestre)
+- This release should come with a static ARM binary (`arm-unknown-linux-musleabihf`), see #320 (@duncanfinney)
+- Various documentation improvements, see #389
+
+## Thanks
+
+Special thanks to @alexmaco for his awesome work on refactoring and code improvements! (see #401, #398, and #383)
+
+# v7.2.0
+
+## Features
+
+* Added support for filtering by file modification time by adding two new options `--changed-before <date|duration>` and `--changed-within <..>`. For more details, see the `--help` text, the man page, the relevant issue #165 and the PR #339 (@kimsnj)
+* Added `--show-errors` option to enable the display of filesystem error messages such as "permission denied", see #311 (@psinghal20 and @majecty)
+* Added `--maxdepth` as a (hidden) alias for `--max-depth`, see #323 (@mqudsi)
+* Added `--search-path` option which can be supplied to replace the positional `path` argument at any position.
+
+## Changes
+
+* Loosen strict handling of missing `--ignore-file`, see #280 (@psinghal20)
+* Re-enabled `.ignore` files, see #156.
+
+## Bugfixes
+
+* `fd` could previously get stuck when run from the root directory in the
+  presence of zombie processes. This curious bug has been fixed in Rust 1.29 and higher. For more details, see #288, [rust-lang/rust#50619](https://github.com/rust-lang/rust/issues/50619) and [the fix](https://github.com/rust-lang/rust/pull/50630)
+
+## Other
+
+* `fd` has officially landed in Debian! See #345 for details. Thanks goes to @sylvestre, @paride and possibly others I don't know about.
+* Added Chinese translation of README (@chinanf-boy)
+
+## Thanks
+
+A special thanks goes to @joshleeb for his amazing improvements throughout
+the code base (new tests, refactoring work and various other things)!
+
+
+# v7.1.0
+
+## Features
+
+* Added `--size` filter option, see #276 (@stevepentland, @JonathanxD and @alexmaco)
+* Added `--type empty` (or `-t e`) to search for empty files and/or directories, see #273
+
+## Changes
+
+* With the new version, `.gitignore` files will only be respected in Git repositories, not outside.
+* A few performance improvements for `--type` searches, see 641976cf7ad311ba741571ca8b7f02b2654b6955 and 50a2bab5cd52d26d4a3bc786885a2c270ed3b227
+
+## Other
+
+* Starting with this release, we will offer pre-built ARM binaries, see #244
+* Added instructions on how to use `fd` with `emacs`, see #282 (@redguardtoo)
+* `fd` is now in the official openSUSE repositories, see #275 (@avindra)
+* `fd` is now available via MacPorts, see #291 (@raimue)
+
+
+# v7.0.0
+
+## Features
+
+* Added `--type executable` (or `-t x`) to search for executable files only, see #246 (@PramodBisht)
+* Added support for `.fdignore` files, see #156 and #241.
+* Added `--ignore-file` option to add custom ignore files, see #156.
+* Suggest `--fixed-strings` on invalid regular expressions, see #234 (@PramodBisht)
+* Detect when user supplied path instead of pattern, see #235.
+
+## Changes
+
+* `.ignore` and `.rgignore` files are not parsed anymore. Use `.fdignore` files
+  or add custom files via `--ignore-file` instead.
+* Updated to `regex-syntax` 0.5 (@cuviper)
+
+## Bugfixes
+
+* Properly normalize absolute paths, see #268
+* Invalid utf8 filenames displayed when `-e` is used, see #250
+* If `--type` is used, fifos/sockets/etc. are always shown, see #260
+
+## Other
+
+* Packaging:
+    * The Arch Linux package is now simply called `fd`.
+    * There is now a `fd` ebuild for Gentoo Linux.
+    * There is a `scoop` package for `fd` (Windows).
+    * There is a `Chocolatey` package for `fd` (Windows).
+    * There is a Fedora `copr` package for `fd`.
+
+
+# v6.3.0
+
+## Features
+
+* Files with multiple extensions can now be found via `--extension`/`-e`, see #214 (@althonos)
+  ``` bash
+  > fd -e tar.gz
+  ```
+
+* Added new `-F`/`--fixed-strings`/`--literal` option that treats the pattern as a literal string instead of a regular expression, see #157
+
+  ``` bash
+  > fd -F 'file(1).txt'
+  ```
+
+* Allow `-exec` to work as `--exec`, see #226 (@stevepentland)
+
+## Bugfixes
+
+* Fixed `Ctrl-C` handling when using `--exec`, see #224 (@Doxterpepper)
+
+* Fixed wrong file owner for files in deb package, see #213
+
+## Other
+
+* Replaced old gif by a fancy new SVG screencast (@marionebl)
+* Updated [benchmark results](https://github.com/sharkdp/fd#benchmark) (fd has become faster in the meantime!). There is a new repository that hosts several benchmarking scripts for fd: https://github.com/sharkdp/fd-benchmarks
+
+
+# v6.2.0
+
+## Features
+
+* Support for filtering by multiple file extensions and multiple file types, see #199 and #177
+  (@tkadur).
+
+  For example, it's possible to search for C++ source or header files:
+  ``` bash
+  > fd -e cpp -e c -e cxx -e h pattern
+  ```
+
+## Changes
+
+* The size of the output buffer (for sorting search results) is now limited to 1000 entries. This
+  improves the search speed significantly if there are a lot of results, see #191 (@sharkdp).
+
+## Bugfixes
+
+* Fix a bug where long-running searches could not be killed via Ctrl-C, see #210 (@Doxterpepper)
+* fd's exit codes are now in accordance with Unix standards, see #201 (@Doxterpepper)
+
+## Other
+
+* Bash, zsh and fish completion should now work with the Ubuntu `.deb` packages, see #195 and #209
+  (@tmccombs and @sharkdp)
+* There is a new section on how to set up `fzf` to use `fd` in the
+  [README](https://github.com/sharkdp/fd#using-fd-with-fzf), see #168.
+
+
+# v6.1.0
+
+## Features
+
+* Support for multiple search paths, see #166 (@Doxterpepper)
+* Added `--no-ignore-vcs` option to disable `.gitignore` and other VCS ignore files,
+  without disabling `.ignore` files - see #156 (@ptzz).
+
+## Bugfixes
+
+* Handle terminal signals, see #128 (@Doxterpepper)
+* Fixed hang on `--exec` when user input was required, see #178 and #193 (@reima)
+
+## Other
+
+* Debian packages are now created via Travis CI and should be available for this and all
+  future releases (@tmccombs).
+* fd is now available on Void Linux (@maxice8)
+* The minimum required Rust version is now 1.20
+
+## Thanks
+
+@Doxterpepper deserves a special mention for his great work that is included in this release and
+for the support in ticket discussions and concerning Travis CI fixes. Thank you very much!
+
+Thanks also go out to @tmccombs for the work on Debian packages and for reviewing a lot of pull requests!
+
+# v6.0.0
+
+## Changes
+
+- The `--exec`/`-x` option does not spawn an intermediate shell anymore. This improves the
+  performance of parallel command execution and fixes a whole class of (present and potentially
+  future) problems with shell escaping. The drawback is that shell commands cannot directly be
+  called with `--exec`. See #155 for the full discussion. These changes have been implemented by
+  @reima (Thanks!).
+
+## Bugfixes
+
+- `--exec` does not escape cmd.exe metacharacters on Windows (see #155, as above).
+
+## Other
+
+* *fd* is now available in the FreeBSD ports (@andoriyu)
+* The minimal `rustc` version is now checked when building with `cargo`, see #164 (@matematikaadit)
+* The output directory for the shell completion files is created if it does not exist (@andoriyu)
+
+
+# v5.0.0
+
+## Features
+
+* Added new `--exec`, `-x` option for parallel command execution (@mmstick, see #84 and #116). See the corresponding [README section](https://github.com/sharkdp/fd#parallel-command-execution) for an introduction.
+* Auto-disable color output on unsupported Windows shells like `cmd.exe` (@iology, see #129)
+* Added the `--exclude`, `-X` option to suppress certain files/directories in the search results
+  (see #89).
+* Added ripgrep aliases `-u` and `-uu` for `--no-ignore` and `--no-ignore --hidden`, respectively
+  (@unsignedint, see #92)
+* Added `-i`, `--ignore-case` (@iology, see #95)
+* Made smart case really smart (@reima, see #103)
+* Added RedoxOS support (@goyox86, see #131)
+
+## Changes
+
+* The dot `.` can now match newlines in file names (@iology, see #111)
+* The short `--type` argument for symlinks has been changed from `s` to `l` (@jcpetkovich, see #83)
+
+## Bugfixes
+
+* Various improvements in root-path and symlink handling (@iology, see #82, #107, and #113)
+* Fixed absolute path handling on Windows (@reima, #93)
+* Fixed: current directory not included when using relative path (see #81)
+* Fixed `--type` behavior for unknown file types (@iology, see #150)
+* Some fixes around `--exec` (@iology, see #142)
+
+## Other
+
+* Major updates and bugfixes to our continuous integration and deployment tooling on Travis
+  (@matematikaadit, see #149, #145, #133)
+* Code style improvements & automatic style checking via `rustfmt` on Travis (@Detegr, see #99)
+* Added a man page (@pickfire, see #77)
+* *fd* has been relicensed under the dual license MIT/Apache-2.0 (@Detegr, see #105)
+* Major refactorings and code improvements (Big thanks to @gsquire, @reima, @iology)
+* First version of [`CONTRIBUTING`](https://github.com/sharkdp/fd/blob/master/CONTRIBUTING.md) guidelines
+* There is now a Nix package (@mehandes)
+* *fd* is now in the official Arch Linux repos (@cassava)
+* Improved tooling around shell completion files (@ImbaKnugel, see #124)
+* Updated tutorial in the [`README`](https://github.com/sharkdp/fd/blob/master/README.md)
+* The minimum required version of Rust has been bumped to 1.19.
+
+## Thanks
+
+A *lot* of things have happened since the last release and I'd like to thank all contributors for their great support. I'd also like to thank those that have contributed by reporting bugs and by posting feature requests.
+
+I'd also like to take this chance to say a special Thank You to a few people that have stood out in one way or another: To @iology, for contributing a multitude of bugfixes, improvements and new features. To @reima and @Detegr for their continuing great support. To @mmstick, for implementing the most advanced new feature of *fd*. And to @matematikaadit for the CI/tooling upgrades.
+
+
+# v4.0.0
+
+## Features
+
+* Added filtering by file extension, for example `fd -e txt`, see #56 (@reima)
+* Add option to force colored output: `--color always`, see #49 (@Detegr)
+* Generate Shell completions for Bash, ZSH, Fish and Powershell, see #64 (@ImbaKnugel)
+* Better & extended `--help` text (@abaez and @Detegr)
+* Proper Windows support, see #70 
+
+## Changes
+
+* The integration tests have been re-written in Rust :sparkles:, making them platform-independent and easily callable via `cargo test` - see #65  (many thanks to @reima!)
+* New tutorial in the README (@deg4uss3r)
+* Reduced number of `stat` syscalls for each result from 3 to 1, see #36.
+* Enabled Appveyor CI
+
+# v3.1.0
+
+## Features
+- Added file type filtering, e.g. `find --type directory` or `find -t f` (@exitium)
+
+# v3.0.0
+
+## Features
+- Directories are now traversed in parallel, leading to significant performance improvements (see [benchmarks](https://github.com/sharkdp/fd#benchmark))
+- Added `--print0` option (@michaelmior)
+- Added AUR packages (@wezm)
+
+## Changes
+- Changed short flag for `--follow` from `-f` to `-L` (consistency with `ripgrep`)
+
+# v2.0.0
+
+* Changed `--sensitive` to `--case-sensitive`
+* Changed `--absolute` to `--absolute-path`
+* Throw an error if root directory is not existent, see #39 
+* Use absolute paths if the root dir is an absolute path, see #40 
+* Handle invalid UTF-8, see #34 #38 
+* Support `-V`, `--version` by switching from `getopts` to `clap`.
+
+Misc:
+* It's now possible to install `fd` via homebrew on macOS: `brew install fd`.
+
+# v1.1.0
+
+- Windows compatibility (@sebasv), see #29 #35 
+- Safely exit on broken output pipes (e.g.: usage with `head`, `tail`, ..), see #24 
+- Backport for rust 1.16, see #23
+
+# v1.0.0
+
+* Respect `.(git)ignore` files
+* Use `LS_COLORS` environment variable directly, instead of `~/.dir_colors` file.
+* Added unit and integration tests
+* Added optional second argument (search path)
+
+# v0.3.0
+
+-  Parse dircolors files, closes #20 
+-  Colorize each path component, closes #19 
+-  Add short command line option for --hidden, see #18 
+
+# v0.2.0
+
+-  Option to follow symlinks, disable colors, closes #16, closes #17 
+- `--filename` instead of `--full-path`
+-  Option to search hidden directories, closes #12 
+-  Configurable search depth, closes #13 
+-  Detect interactive terminal, closes #11 
+
+# v0.1.0
+
+Initial release

CONTRIBUTING.md

@@ -10,11 +10,28 @@ We welcome any form of contribution:
 **Note**: Before you take the time to open a pull request, please open a ticket first. This will
 give us the chance to discuss any potential changes first.
 
+## Add an entry to the changelog
+
+If your contribution changes the behavior of `fd` (as opposed to a typo-fix
+in the documentation), please update the [`CHANGELOG.md`](CHANGELOG.md) file
+and describe your changes. This makes the release process much easier and
+therefore helps to get your changes into a new `fd` release faster.
+
+The top of the `CHANGELOG` contains a *"unreleased"* section with a few
+subsections (Features, Bugfixes, …). Please add your entry to the subsection
+that best describes your change.
+
+Entries follow this format:
+```
+- Short description of what has been changed, see #123 (@user)
+```
+Here, `#123` is the number of the original issue and/or your pull request.
+Please replace `@user` by your GitHub username.
+
 ## Important links
 
   * [Open issues](https://github.com/sharkdp/fd/issues)
   * [Open pull requests](https://github.com/sharkdp/fd/pulls)
   * [Development section in the README](https://github.com/sharkdp/fd#development)
   * [fd on crates.io](https://crates.io/crates/fd-find)
-  * [LICENSE](https://github.com/sharkdp/fd/blob/master/LICENSE)
-  
+  * [LICENSE-APACHE](https://github.com/sharkdp/fd/blob/master/LICENSE-APACHE) and [LICENSE-MIT](https://github.com/sharkdp/fd/blob/master/LICENSE-MIT)

Cargo.lock

@@ -1,442 +1,551 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
 [[package]]
 name = "aho-corasick"
-version = "0.6.4"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
 dependencies = [
- "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr",
 ]
 
 [[package]]
 name = "ansi_term"
-version = "0.9.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
+dependencies = [
+ "winapi",
+]
 
 [[package]]
 name = "ansi_term"
-version = "0.10.2"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c0df63cb2955042487fad3aefd2c6e3ae7389ac5dc1beb28921de0b69f779d4"
 
 [[package]]
 name = "atty"
-version = "0.2.6"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 dependencies = [
- "libc 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
- "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hermit-abi",
+ "libc",
+ "winapi",
 ]
 
 [[package]]
-name = "bitflags"
-version = "0.7.0"
+name = "autocfg"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "bitflags"
-version = "1.0.1"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+
+[[package]]
+name = "bstr"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "473fc6b38233f9af7baa94fb5852dca389e3d95b8e21c8e3719301462c5d9faf"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
 
 [[package]]
 name = "cfg-if"
-version = "0.1.2"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "2.29.0"
+version = "2.33.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
 dependencies = [
- "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "atty 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "textwrap 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ansi_term 0.11.0",
+ "atty",
+ "bitflags",
+ "strsim",
+ "term_size",
+ "textwrap",
+ "unicode-width",
+ "vec_map",
 ]
 
 [[package]]
-name = "crossbeam"
-version = "0.2.10"
+name = "crossbeam-utils"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
+dependencies = [
+ "autocfg",
+ "cfg-if 1.0.0",
+ "lazy_static",
+]
 
 [[package]]
 name = "ctrlc"
-version = "3.0.3"
+version = "3.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b57a92e9749e10f25a171adcebfafe72991d45e7ec2dcb853e8f83d9dafaeb08"
 dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "nix 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nix",
+ "winapi",
 ]
 
 [[package]]
 name = "diff"
-version = "0.1.11"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
+
+[[package]]
+name = "dirs-next"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
+dependencies = [
+ "cfg-if 1.0.0",
+ "dirs-sys-next",
+]
+
+[[package]]
+name = "dirs-sys-next"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99de365f605554ae33f115102a02057d4fc18b01f3284d6870be0938743cfe7d"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
 
 [[package]]
 name = "fd-find"
-version = "6.2.0"
+version = "8.2.1"
 dependencies = [
- "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "atty 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "clap 2.29.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ctrlc 3.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "ignore 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "version_check 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ansi_term 0.12.1",
+ "anyhow",
+ "atty",
+ "clap",
+ "ctrlc",
+ "diff",
+ "dirs-next",
+ "filetime",
+ "globset",
+ "humantime",
+ "ignore",
+ "jemallocator",
+ "lazy_static",
+ "libc",
+ "lscolors",
+ "num_cpus",
+ "regex",
+ "regex-syntax",
+ "tempdir",
+ "users",
+ "version_check",
+]
+
+[[package]]
+name = "filetime"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c122a393ea57648015bf06fbd3d372378992e86b9ff5a7a497b076a28c79efe"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "redox_syscall",
+ "winapi",
 ]
 
 [[package]]
 name = "fnv"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
-name = "fuchsia-zircon"
-version = "0.3.2"
+name = "fs_extra"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
+
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+
+[[package]]
+name = "getrandom"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
 dependencies = [
- "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "fuchsia-zircon-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10",
+ "libc",
+ "wasi",
 ]
 
-[[package]]
-name = "fuchsia-zircon-sys"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "globset"
-version = "0.2.1"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c152169ef1e421390738366d2f796655fec62621dabbd0fd476f905934061e4a"
 dependencies = [
- "aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aho-corasick",
+ "bstr",
+ "fnv",
+ "log",
+ "regex",
 ]
 
+[[package]]
+name = "hermit-abi"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "humantime"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a"
+
 [[package]]
 name = "ignore"
-version = "0.2.2"
+version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b287fb45c60bb826a0dc68ff08742b9d88a2fea13d6e0c286b3172065aaf878c"
 dependencies = [
- "crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "globset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "thread_local 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "walkdir 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils",
+ "globset",
+ "lazy_static",
+ "log",
+ "memchr",
+ "regex",
+ "same-file",
+ "thread_local",
+ "walkdir",
+ "winapi-util",
 ]
 
 [[package]]
-name = "kernel32-sys"
-version = "0.2.2"
+name = "jemalloc-sys"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d3b9f3f5c9b31aa0f5ed3260385ac205db665baa41d49bb8338008ae94ede45"
 dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc",
+ "fs_extra",
+ "libc",
+]
+
+[[package]]
+name = "jemallocator"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43ae63fcfc45e99ab3d1b29a46782ad679e98436c3169d15a167a1108a724b69"
+dependencies = [
+ "jemalloc-sys",
+ "libc",
 ]
 
 [[package]]
 name = "lazy_static"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "lazy_static"
-version = "1.0.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.34"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
 
 [[package]]
 name = "log"
-version = "0.3.9"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
 dependencies = [
- "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10",
 ]
 
 [[package]]
-name = "log"
-version = "0.4.1"
+name = "lscolors"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d24b894c45c9da468621cdd615a5a79ee5e5523dd4f75c76ebc03d458940c16e"
 dependencies = [
- "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ansi_term 0.12.1",
 ]
 
 [[package]]
 name = "memchr"
-version = "1.0.2"
+version = "2.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "memchr"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
-]
+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
 
 [[package]]
 name = "nix"
-version = "0.8.1"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83450fe6a6142ddd95fb064b746083fc4ef1705fe81f64a64e1d4b39f54a1055"
 dependencies = [
- "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
- "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "cc",
+ "cfg-if 0.1.10",
+ "libc",
 ]
 
 [[package]]
 name = "num_cpus"
-version = "1.8.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
 dependencies = [
- "libc 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hermit-abi",
+ "libc",
 ]
 
 [[package]]
 name = "rand"
-version = "0.3.19"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
 dependencies = [
- "fuchsia-zircon 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-cprng",
+ "libc",
+ "rand_core 0.3.1",
+ "rdrand",
+ "winapi",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+dependencies = [
+ "rand_core 0.4.2",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
+
+[[package]]
+name = "rdrand"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
+dependencies = [
+ "rand_core 0.3.1",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.1.33"
+version = "0.1.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
 
 [[package]]
-name = "redox_termios"
-version = "0.1.1"
+name = "redox_users"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
 dependencies = [
- "redox_syscall 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getrandom",
+ "redox_syscall",
 ]
 
 [[package]]
 name = "regex"
-version = "0.2.5"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
 dependencies = [
- "aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "thread_local 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+ "thread_local",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.4.2"
+version = "0.6.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
+
+[[package]]
+name = "remove_dir_all"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
+dependencies = [
+ "winapi",
+]
 
 [[package]]
 name = "same-file"
-version = "0.1.3"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
 dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-util",
 ]
 
 [[package]]
 name = "strsim"
-version = "0.6.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 
 [[package]]
 name = "tempdir"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
 dependencies = [
- "rand 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand",
+ "remove_dir_all",
 ]
 
 [[package]]
 name = "term_size"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9"
 dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "termion"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
+ "winapi",
 ]
 
 [[package]]
 name = "textwrap"
-version = "0.9.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
 dependencies = [
- "term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "term_size",
+ "unicode-width",
 ]
 
 [[package]]
 name = "thread_local"
-version = "0.3.5"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
 dependencies = [
- "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static",
 ]
 
 [[package]]
 name = "unicode-width"
-version = "0.1.4"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
 
 [[package]]
-name = "unreachable"
-version = "1.0.0"
+name = "users"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24cc0f6d6f267b73e5a2cadf007ba8f9bc39c6a6f9666f8cf25ea809a153b032"
 dependencies = [
- "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
+ "log",
 ]
 
-[[package]]
-name = "utf8-ranges"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "vec_map"
-version = "0.8.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 
 [[package]]
 name = "version_check"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "void"
-version = "1.0.2"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
 
 [[package]]
 name = "walkdir"
-version = "1.0.7"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
 dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "same-file",
+ "winapi",
+ "winapi-util",
 ]
 
 [[package]]
-name = "winapi"
-version = "0.2.8"
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
 
 [[package]]
 name = "winapi"
-version = "0.3.2"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 dependencies = [
- "winapi-i686-pc-windows-gnu 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-x86_64-pc-windows-gnu 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
 ]
 
-[[package]]
-name = "winapi-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "winapi-i686-pc-windows-gnu"
-version = "0.3.2"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+dependencies = [
+ "winapi",
+]
 
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
-version = "0.3.2"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[metadata]
-"checksum aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d6531d44de723825aa81398a6415283229725a00fa30713812ab9323faa82fc4"
-"checksum ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6b3568b48b7cefa6b8ce125f9bb4989e52fbcc29ebea88df04cc7c5f12f70455"
-"checksum ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6"
-"checksum atty 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8352656fd42c30a0c3c89d26dea01e3b77c0ab2af18230835c15e2e13cd51859"
-"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
-"checksum bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf"
-"checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de"
-"checksum clap 2.29.0 (registry+https://github.com/rust-lang/crates.io-index)" = "110d43e343eb29f4f51c1db31beb879d546db27998577e5715270a54bcf41d3f"
-"checksum crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97"
-"checksum ctrlc 3.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "df391ea008fca636e41e40863a0b39a850e2ab26b0cdeed0c3657fd05a66d44c"
-"checksum diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "3c2b69f912779fbb121ceb775d74d51e915af17aaebc38d28a592843a2dd0a3a"
-"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
-"checksum fuchsia-zircon 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bd510087c325af53ba24f3be8f1c081b0982319adcb8b03cad764512923ccc19"
-"checksum fuchsia-zircon-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "08b3a6f13ad6b96572b53ce7af74543132f1a7055ccceb6d073dd36c54481859"
-"checksum globset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "464627f948c3190ae3d04b1bc6d7dca2f785bda0ac01278e6db129ad383dbeb6"
-"checksum ignore 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b3fcaf2365eb14b28ec7603c98c06cc531f19de9eb283d89a3dff8417c8c99f5"
-"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
-"checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d"
-"checksum libc 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)" = "36fbc8a8929c632868295d0178dd8f63fc423fd7537ad0738372bd010b3ac9b0"
-"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
-"checksum log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "89f010e843f2b1a31dbd316b3b8d443758bc634bed37aabade59c686d644e0a2"
-"checksum memchr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "148fab2e51b4f1cfc66da2a7c32981d1d3c083a803978268bb11fe4b86925e7a"
-"checksum memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "796fba70e76612589ed2ce7f45282f5af869e0fdd7cc6199fa1aa1f1d591ba9d"
-"checksum nix 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "47e49f6982987135c5e9620ab317623e723bd06738fd85377e8d55f57c8b6487"
-"checksum num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30"
-"checksum rand 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)" = "9e7944d95d25ace8f377da3ac7068ce517e4c646754c43a1b1849177bbf72e59"
-"checksum redox_syscall 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)" = "07b8f011e3254d5a9b318fde596d409a0001c9ae4c6e7907520c2eaa4d988c99"
-"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
-"checksum regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "744554e01ccbd98fff8c457c3b092cd67af62a555a43bfe97ae8a0451f7799fa"
-"checksum regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8e931c58b93d86f080c734bfd2bce7dd0079ae2331235818133c8be7f422e20e"
-"checksum same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7"
-"checksum strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694"
-"checksum tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "87974a6f5c1dfb344d733055601650059a3363de2a6104819293baff662132d6"
-"checksum term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9e5b9a66db815dcfd2da92db471106457082577c3c278d4138ab3e3b4e189327"
-"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
-"checksum textwrap 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0b59b6b4b44d867f1370ef1bd91bfb262bf07bf0ae65c202ea2fbc16153b693"
-"checksum thread_local 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "279ef31c19ededf577bfd12dfae728040a21f635b06a24cd670ff510edd38963"
-"checksum unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3a113775714a22dcb774d8ea3655c53a32debae63a063acc00a91cc586245f"
-"checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
-"checksum utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122"
-"checksum vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "887b5b631c2ad01628bbbaa7dd4c869f80d3186688f8d0b6f58774fbe324988c"
-"checksum version_check 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6b772017e347561807c1aa192438c5fd74242a670a6cffacc40f2defd1dc069d"
-"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-"checksum walkdir 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "bb08f9e670fab86099470b97cd2b252d6527f0b3cc1401acdb595ffc9dd288ff"
-"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-"checksum winapi 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "890b38836c01d72fdb636d15c9cfc52ec7fd783b330abc93cd1686f4308dfccc"
-"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-"checksum winapi-i686-pc-windows-gnu 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ec6667f60c23eca65c561e63a13d81b44234c2e38a6b6c959025ee907ec614cc"
-"checksum winapi-x86_64-pc-windows-gnu 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "98f12c52b2630cd05d2c3ffd8e008f7f48252c042b4871c72aed9dc733b96668"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

Cargo.toml

@@ -16,42 +16,59 @@ license = "MIT/Apache-2.0"
 name = "fd-find"
 readme = "README.md"
 repository = "https://github.com/sharkdp/fd"
-version = "6.2.0"
+version = "8.2.1"
+edition= "2018"
 
-[[bin]]
-name = "fd"
-path = "src/main.rs"
 [badges.appveyor]
 repository = "sharkdp/fd"
 
 [badges.travis-ci]
 repository = "sharkdp/fd"
 
+[[bin]]
+name = "fd"
+path = "src/main.rs"
+
 [build-dependencies]
-clap = "2.26.0"
-version_check = "0.1.3"
+clap = "2.31.2"
+version_check = "0.9"
 
 [dependencies]
-ansi_term = "0.9"
+ansi_term = "0.12"
 atty = "0.2"
-ignore = "0.2"
-lazy_static = "1"
-num_cpus = "1.6.2"
-regex = "0.2"
-regex-syntax = "0.4"
-ctrlc = "3.0"
+ignore = "0.4.3"
+lazy_static = "1.1.0"
+num_cpus = "1.8"
+regex = "1.0.0"
+regex-syntax = "0.6"
+ctrlc = "3.1"
+humantime = "2.0"
+lscolors = "0.7"
+globset = "0.4"
+anyhow = "1.0"
+dirs-next = "2.0"
 
 [dependencies.clap]
-version = "2.26.0"
+version = "2.31.2"
 features = ["suggestions", "color", "wrap_help"]
 
+[target.'cfg(unix)'.dependencies]
+users = "0.11.0"
+
 [target.'cfg(all(unix, not(target_os = "redox")))'.dependencies]
 libc = "0.2"
 
-[target.'cfg(windows)'.dependencies]
-kernel32-sys = "0.2"
-winapi = "0.2"
+# FIXME: Re-enable jemalloc on macOS
+# jemalloc is currently disabled on macOS due to a bug in jemalloc in combination with macOS
+# Catalina. See https://github.com/sharkdp/fd/issues/498 for details.
+[target.'cfg(all(not(windows), not(target_os = "android"), not(target_os = "macos"), not(target_env = "musl")))'.dependencies]
+jemallocator = "0.3.0"
 
 [dev-dependencies]
 diff = "0.1"
 tempdir = "0.3"
+filetime = "0.2.1"
+
+[profile.release]
+lto = true
+codegen-units = 1

LICENSE-APACHE

@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
    same "printed page" as the copyright notice for easier
    identification within third-party archives.
 
-Copyright 2017 fd developers
+Copyright 2017-2020 fd developers
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

LICENSE-MIT

@@ -1,23 +1,21 @@
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
+MIT License
 
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
+Copyright (c) 2017-2020 The fd developers
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,7 +1,9 @@
 # fd
 [![Build Status](https://travis-ci.org/sharkdp/fd.svg?branch=master)](https://travis-ci.org/sharkdp/fd)
-[![Build status](https://ci.appveyor.com/api/projects/status/21c4p5fwggc5gy3j?svg=true)](https://ci.appveyor.com/project/sharkdp/fd)
+[![Build status](https://ci.appveyor.com/api/projects/status/21c4p5fwggc5gy3j/branch/master?svg=true)](https://ci.appveyor.com/project/sharkdp/fd/branch/master)
 [![Version info](https://img.shields.io/crates/v/fd-find.svg)](https://crates.io/crates/fd-find)
+[中文](https://github.com/chinanf-boy/fd-zh)
+[한국어](https://github.com/spearkkk/fd-kor)
 
 *fd* is a simple, fast and user-friendly alternative to
 [*find*](https://www.gnu.org/software/findutils/).
@@ -26,63 +28,62 @@ While it does not seek to mirror all of *find*'s powerful functionality, it prov
 
 ## Demo
 
-![Demo](http://i.imgur.com/kTMFSVU.gif)
+![Demo](doc/screencast.svg)
 
 ## Benchmark
-Let's search my home folder for files that end in `[0-9].jpg`. It contains ~150.000
+
+Let's search my home folder for files that end in `[0-9].jpg`. It contains ~190.000
 subdirectories and about a million files. For averaging and statistical analysis, I'm using
-[bench](https://github.com/Gabriel439/bench). All benchmarks are performed for a "warm
-cache". Results for a cold cache are similar.
+[hyperfine](https://github.com/sharkdp/hyperfine). The following benchmarks are performed
+with a "warm"/pre-filled disk-cache (results for a "cold" disk-cache show the same trends).
 
 Let's start with `find`:
 ```
-find ~ -iregex '.*[0-9]\.jpg$'
+Benchmark #1: find ~ -iregex '.*[0-9]\.jpg$'
 
-time                 6.265 s    (6.127 s .. NaN s)
-                     1.000 R²   (1.000 R² .. 1.000 R²)
-mean                 6.162 s    (6.140 s .. 6.181 s)
-std dev              31.73 ms   (0.0 s .. 33.48 ms)
+  Time (mean ± σ):      7.236 s ±  0.090 s
+
+  Range (min … max):    7.133 s …  7.385 s
 ```
 
 `find` is much faster if it does not need to perform a regular-expression search:
 ```
-find ~ -iname '*[0-9].jpg'
+Benchmark #2: find ~ -iname '*[0-9].jpg'
 
-time                 2.866 s    (2.754 s .. 2.964 s)
-                     1.000 R²   (0.999 R² .. 1.000 R²)
-mean                 2.860 s    (2.834 s .. 2.875 s)
-std dev              23.11 ms   (0.0 s .. 25.09 ms)
+  Time (mean ± σ):      3.914 s ±  0.027 s
+
+  Range (min … max):    3.876 s …  3.964 s
 ```
 
 Now let's try the same for `fd`. Note that `fd` *always* performs a regular expression
 search. The options `--hidden` and `--no-ignore` are needed for a fair comparison,
 otherwise `fd` does not have to traverse hidden folders and ignored paths (see below):
 ```
-fd --hidden --no-ignore '.*[0-9]\.jpg$' ~
+Benchmark #3: fd -HI '.*[0-9]\.jpg$' ~
 
-time                 892.6 ms   (839.0 ms .. 915.4 ms)
-                     0.999 R²   (0.997 R² .. 1.000 R²)
-mean                 871.2 ms   (857.9 ms .. 881.3 ms)
-std dev              15.50 ms   (0.0 s .. 17.49 ms)
+  Time (mean ± σ):     811.6 ms ±  26.9 ms
+
+  Range (min … max):   786.0 ms … 870.7 ms
 ```
-For this particular example, `fd` is approximately seven times faster than `find -iregex`
-and about three times faster than `find -iname`. By the way, both tools found the exact
-same 14030 files :smile:.
+For this particular example, `fd` is approximately nine times faster than `find -iregex`
+and about five times faster than `find -iname`. By the way, both tools found the exact
+same 20880 files :smile:.
 
 Finally, let's run `fd` without `--hidden` and `--no-ignore` (this can lead to different
-search results, of course):
+search results, of course). If *fd* does not have to traverse the hidden and git-ignored
+folders, it is almost an order of magnitude faster:
 ```
-fd '[0-9]\.jpg$' ~
+Benchmark #4: fd '[0-9]\.jpg$' ~
 
-time                 159.5 ms   (155.8 ms .. 165.3 ms)
-                     0.999 R²   (0.996 R² .. 1.000 R²)
-mean                 158.7 ms   (156.5 ms .. 161.6 ms)
-std dev              3.263 ms   (2.401 ms .. 4.298 ms)
+  Time (mean ± σ):     123.7 ms ±   6.0 ms
+
+  Range (min … max):   118.8 ms … 140.0 ms
 ```
 
 **Note**: This is *one particular* benchmark on *one particular* machine. While I have
 performed quite a lot of different tests (and found consistent results), things might
-be different for you! I encourage everyone to try it out on their own.
+be different for you! I encourage everyone to try it out on their own. See
+[this repository](https://github.com/sharkdp/fd-benchmarks) for all necessary scripts.
 
 Concerning *fd*'s speed, the main credit goes to the `regex` and `ignore` crates that are also used
 in [ripgrep](https://github.com/BurntSushi/ripgrep) (check it out!).
@@ -92,11 +93,13 @@ in [ripgrep](https://github.com/BurntSushi/ripgrep) (check it out!).
 variable [`LS_COLORS`](https://linux.die.net/man/5/dir_colors) has to be set. Typically, the value
 of this variable is set by the `dircolors` command which provides a convenient configuration format
 to define colors for different file formats.
-On most distributions, `LS_COLORS` should be set already. If you are looking for alternative, more
-complete (and more colorful) variants, see
+On most distributions, `LS_COLORS` should be set already. If you are on Windows or if you are looking
+for alternative, more complete (or more colorful) variants, see [here](https://github.com/sharkdp/vivid),
 [here](https://github.com/seebi/dircolors-solarized) or
 [here](https://github.com/trapd00r/LS_COLORS).
 
+`fd` also honors the [`NO_COLOR`](https://no-color.org/) environment variable.
+
 ## Parallel command execution
 If the `-x`/`--exec` option is specified alongside a command template, a job pool will be created
 for executing commands in parallel for each discovered path as the input. The syntax for generating
@@ -123,21 +126,80 @@ fd -e flac -x ffmpeg -i {} -c:a libopus {.}.opus
 fd -x wc -l \; -e rs
 ```
 
+The number of threads used for command execution can be set with the `--threads`/`-j` option.
+
 ## Installation
 
-### On Ubuntu
-*... and other Debian-based Linux distrutions.*
+[![Packaging status](https://repology.org/badge/vertical-allrepos/fd-find.svg)](https://repology.org/project/fd-find/versions)
 
-Download the latest `.deb` package from the [release page](https://github.com/sharkdp/fd/releases) and install it via:
+### On Ubuntu
+*... and other Debian-based Linux distributions.*
+
+If you run Ubuntu 19.04 (Disco Dingo) or newer, you can install the
+[officially maintained package](https://packages.ubuntu.com/fd-find):
+```
+sudo apt install fd-find
+```
+Note that the binary is called `fdfind` as the binary name `fd` is already used by another package.
+It is recommended that you add an `alias fd=fdfind` to your shells initialization file, in order to
+use `fd` in the same way as in this documentation.
+
+If you use an older version of Ubuntu, you can download the latest `.deb` package from the
+[release page](https://github.com/sharkdp/fd/releases) and install it via:
 ``` bash
-sudo dpkg -i fd_6.2.0_amd64.deb  # adapt version number and architecture
+sudo dpkg -i fd_8.2.1_amd64.deb  # adapt version number and architecture
+```
+
+### On Debian
+
+If you run Debian Buster or newer, you can install the
+[officially maintained Debian package](https://tracker.debian.org/pkg/rust-fd-find):
+```
+sudo apt-get install fd-find
+```
+Note that the binary is called `fdfind` as the binary name `fd` is already used by another package.
+It is recommended that you add an `alias fd=fdfind` to your shells initialization file, in order to
+use `fd` in the same way as in this documentation.
+
+### On Fedora
+
+Starting with Fedora 28, you can install `fd` from the official package sources:
+``` bash
+dnf install fd-find
+```
+
+For older versions, you can use this [Fedora copr](https://copr.fedorainfracloud.org/coprs/keefle/fd/) to install `fd`:
+``` bash
+dnf copr enable keefle/fd
+dnf install fd
+```
+
+### On Alpine Linux
+
+You can install [the fd package](https://pkgs.alpinelinux.org/packages?name=fd)
+from the official sources, provided you have the appropriate repository enabled:
+```
+apk add fd
 ```
 
 ### On Arch Linux
 
-You can install [the fd-rs package](https://www.archlinux.org/packages/community/x86_64/fd-rs/) from the official repos:
+You can install [the fd package](https://www.archlinux.org/packages/community/x86_64/fd/) from the official repos:
 ```
-pacman -S fd-rs
+pacman -S fd
+```
+### On Gentoo Linux
+
+You can use [the fd ebuild](https://packages.gentoo.org/packages/sys-apps/fd) from the official repo:
+```
+emerge -av fd
+```
+
+### On openSUSE Linux
+
+You can install [the fd package](https://software.opensuse.org/package/fd) from the official repo:
+```
+zypper in fd
 ```
 
 ### On Void Linux
@@ -149,15 +211,30 @@ xbps-install -S fd
 
 ### On macOS
 
-You can install [this Homebrew package](http://braumeister.org/formula/fd):
+You can install `fd` with [Homebrew](https://formulae.brew.sh/formula/fd):
 ```
 brew install fd
 ```
 
+… or with MacPorts:
+```
+sudo port install fd
+```
+
 ### On Windows
 
 You can download pre-built binaries from the [release page](https://github.com/sharkdp/fd/releases).
 
+Alternatively, you can install `fd` via [Scoop](http://scoop.sh):
+```
+scoop install fd
+```
+
+Or via [Chocolatey](https://chocolatey.org):
+```
+choco install fd
+```
+
 ### On NixOS / via Nix
 
 You can use the [Nix package manager](https://nixos.org/nix/) to install `fd`:
@@ -167,9 +244,17 @@ nix-env -i fd
 
 ### On FreeBSD
 
-You can install `sysutils/fd` via portmaster:
+You can install [the fd-find package](https://www.freshports.org/sysutils/fd) from the official repo:
 ```
-portmaster sysutils/fd
+pkg install fd-find
+```
+
+### From NPM
+
+On linux and macOS, you can install the [fd-find](https://npm.im/fd-find) package:
+
+```
+npm install -g fd-find
 ```
 
 ### From source
@@ -178,7 +263,7 @@ With Rust's package manager [cargo](https://github.com/rust-lang/cargo), you can
 ```
 cargo install fd-find
 ```
-Note that rust version *1.20.0* or later is required.
+Note that rust version *1.36.0* or later is required.
 
 ### From binaries
 
@@ -196,7 +281,7 @@ cargo build
 cargo test
 
 # Install
-cargo install
+cargo install --path .
 ```
 
 ## Command-line options
@@ -206,11 +291,12 @@ USAGE:
 
 FLAGS:
     -H, --hidden            Search hidden files and directories
-    -I, --no-ignore         Do not respect .(git)ignore files
-        --no-ignore-vcs     Do not respect .gitignore files
+    -I, --no-ignore         Do not respect .(git|fd)ignore files
     -s, --case-sensitive    Case-sensitive search (default: smart case)
     -i, --ignore-case       Case-insensitive search (default: smart case)
+    -g, --glob              Glob-based search (default: regular expression)
     -a, --absolute-path     Show absolute instead of relative paths
+    -l, --list-details      Use a long listing format with file metadata
     -L, --follow            Follow symbolic links
     -p, --full-path         Search full path (default: file-/dirname only)
     -0, --print0            Separate results by the null character
@@ -218,19 +304,26 @@ FLAGS:
     -V, --version           Prints version information
 
 OPTIONS:
-    -d, --max-depth <depth>       Set maximum search depth (default: none)
-    -t, --type <filetype>...      Filter by type: f(ile), d(irectory), (sym)l(ink)
-    -e, --extension <ext>...      Filter by file extension
-    -x, --exec <cmd>...           Execute a command for each search result
-    -E, --exclude <pattern>...    Exclude entries that match the given glob pattern
-    -c, --color <when>            When to use colors: never, *auto*, always
-    -j, --threads <num>           Set number of threads to use for searching & executing
+    -d, --max-depth <depth>            Set maximum search depth (default: none)
+    -t, --type <filetype>...           Filter by type: file (f), directory (d), symlink (l),
+                                       executable (x), empty (e), socket (s), pipe (p)
+    -e, --extension <ext>...           Filter by file extension
+    -x, --exec <cmd>                   Execute a command for each search result
+    -X, --exec-batch <cmd>             Execute a command with all search results at once
+    -E, --exclude <pattern>...         Exclude entries that match the given glob pattern
+    -c, --color <when>                 When to use colors: never, *auto*, always
+    -S, --size <size>...               Limit results based on the size of files.
+        --changed-within <date|dur>    Filter by file modification time (newer than)
+        --changed-before <date|dur>    Filter by file modification time (older than)
 
 ARGS:
-    <pattern>    the search pattern, a regular expression (optional)
+    <pattern>    the search pattern - a regular expression unless '--glob' is used (optional)
     <path>...    the root directory for the filesystem search (optional)
 ```
 
+This is the output of `fd -h`. To see the full set of command-line options, use `fd --help` which
+also includes a much more detailed help text.
+
 ## Tutorial
 
 First, to get an overview of all available command line options, you can either run
@@ -260,9 +353,13 @@ X11/xinit/xinitrc
 X11/xinit/xserverrc
 ```
 
+The regular expression syntax used by fd is documented here:
+
+[https://docs.rs/regex/1.0.0/regex/#syntax](https://docs.rs/regex/1.0.0/regex/#syntax)
+
 ### Specifying the root directory
 
-If we want so search a specific directory, it can be given as a second argument to *fd*:
+If we want to search a specific directory, it can be given as a second argument to *fd*:
 ``` bash
 > fd passwd /etc
 /etc/default/passwd
@@ -282,6 +379,15 @@ testenv/mod.rs
 tests.rs
 ```
 
+If you want to use this functionality to list all files in a given directory, you have to use
+a catch-all pattern such as `.` or `^`:
+``` bash
+> fd . fd/tests/
+testenv
+testenv/mod.rs
+tests.rs
+```
+
 ### Searching for a particular file extension
 
 Often, we are interested in all files of a particular type. This can be done with the `-e` (or
@@ -312,7 +418,7 @@ search results. To disable this behavior, we can use the `-H` (or `--hidden`) op
 
 If we work in a directory that is a Git repository (or includes Git repositories), *fd* does not
 search folders (and does not show files) that match one of the `.gitignore` patterns. To disable
-this behavior, we can use the `-I` (or `--ignore`) option:
+this behavior, we can use the `-I` (or `--no-ignore`) option:
 ``` bash
 > fd num_cpu
 > fd -I num_cpu
@@ -322,16 +428,102 @@ target/debug/deps/libnum_cpus-f5ce7ef99006aa05.rlib
 To really search *all* files and directories, simply combine the hidden and ignore features to show
 everything (`-HI`).
 
+### Excluding specific files or directories
+
+Sometimes we want to ignore search results from a specific subdirectory. For example, we might
+want to search all hidden files and directories (`-H`) but exclude all matches from `.git`
+directories. We can use the `-E` (or `--exclude`) option for this. It takes an arbitrary glob
+pattern as an argument:
+``` bash
+> fd -H -E .git …
+```
+
+We can also use this to skip mounted directories:
+``` bash
+> fd -E /mnt/external-drive …
+```
+
+.. or to skip certain file types:
+``` bash
+> fd -E '*.bak' …
+```
+
+To make exclude-patterns like these permanent, you can create a `.fdignore` file. They work like
+`.gitignore` files, but are specific to `fd`. For example:
+``` bash
+> cat ~/.fdignore
+/mnt/external-drive
+*.bak
+```
+Note: `fd` also supports `.ignore` files that are used by other programs such as `rg` or `ag`.
+
+If you want `fd` to ignore these patterns globally, you can put them in `fd`'s global ignore file.
+This is usually located in `~/.config/fd/ignore` in macOS or Linux, and `%APPDATA%\fd\ignore` in
+Windows.
+
 ### Using fd with `xargs` or `parallel`
 
 If we want to run a command on all search results, we can pipe the output to `xargs`:
 ``` bash
 > fd -0 -e rs | xargs -0 wc -l
 ```
-Here, the `-0` option tells *fd* to separate search results by the NULL character (instead of     .
-newlines) In the same way, the `-0` option of `xargs` tells it to read the input in this way      .
+Here, the `-0` option tells *fd* to separate search results by the NULL character (instead of
+newlines). In the same way, the `-0` option of `xargs` tells it to read the input in this way.
 
-### Using fd with `fzf`
+### Deleting files
+
+You can use `fd` to remove all files and directories that are matched by your search pattern.
+If you only want to remove files, you can use the `--exec-batch`/`-X` option to call `rm`. For
+example, to recursively remove all `.DS_Store` files, run:
+``` bash
+> fd -H '^\.DS_Store$' -tf -X rm
+```
+If you are unsure, always call `fd` without `-X rm` first. Alternatively, use `rm`s "interactive"
+option:
+``` bash
+> fd -H '^\.DS_Store$' -tf -X rm -i
+```
+
+If you also want to remove a certain class of directories, you can use the same technique. You will
+have to use `rm`s `--recursive`/`-r` flag to remove directories.
+
+Note: there are scenarios where using `fd … -X rm -r` can cause race conditions: if you have a
+path like `…/foo/bar/foo/…` and want to remove all directories named `foo`, you can end up in a
+situation where the outer `foo` directory is removed first, leading to (harmless) *"'foo/bar/foo':
+No such file or directory"* errors in the `rm` call.
+
+### Troubleshooting
+
+#### `fd` does not find my file!
+
+Remember that `fd` ignores hidden directories and files by default. It also ignores patterns
+from `.gitignore` files. If you want to make sure to find absolutely every possible file, always
+use the options `-H` and `-I` to disable these two features:
+``` bash
+> fd -HI …
+```
+
+#### `fd` doesn't seem to interpret my regex pattern correctly
+
+A lot of special regex characters (like `[]`, `^`, `$`, ..) are also special characters in your
+shell. If in doubt, always make sure to put single quotes around the regex pattern:
+
+``` bash
+> fd '^[A-Z][0-9]+$'
+```
+
+If your pattern starts with a dash, you have to add `--` to signal the end of command line
+options. Otherwise, the pattern will be interpreted as a command-line option. Alternatively,
+use a character class with a single hyphen character:
+
+``` bash
+> fd -- '-pattern'
+> fd '[-]pattern'
+```
+
+### Integration with other programs
+
+#### Using fd with `fzf`
 
 You can use *fd* to generate input for the command-line fuzzy finder [fzf](https://github.com/junegunn/fzf):
 ``` bash
@@ -353,3 +545,49 @@ export FZF_DEFAULT_OPTS="--ansi"
 ```
 
 For more details, see the [Tips section](https://github.com/junegunn/fzf#tips) of the fzf README.
+
+#### Using fd with `emacs`
+
+The emacs package [find-file-in-project](https://github.com/technomancy/find-file-in-project) can
+use *fd* to find files.
+
+After installing `find-file-in-project`, add the line `(setq ffip-use-rust-fd t)` to your
+`~/.emacs` or `~/.emacs.d/init.el` file.
+
+In emacs, run `M-x find-file-in-project-by-selected` to find matching files. Alternatively, run
+`M-x find-file-in-project` to list all available files in the project.
+
+#### Printing fd's output as a tree
+
+To format the output of `fd` similar to the `tree` command, install [`as-tree`] and pipe the output
+of `fd` to `as-tree`:
+```bash
+fd | as-tree
+```
+
+This can be more useful than running `tree` by itself because `tree` does not ignore any files by
+default, nor does it support as rich a set of options as `fd` does to control what to print:
+```bash
+❯ fd --extension rs | as-tree
+.
+├── build.rs
+└── src
+    ├── app.rs
+    └── error.rs
+```
+
+For more information about `as-tree`, see [the `as-tree` README][`as-tree`].
+
+[`as-tree`]: https://github.com/jez/as-tree
+
+## Maintainers
+
+- [sharkdp](https://github.com/sharkdp)
+- [tmccombs](https://github.com/tmccombs)
+
+## License
+Copyright (c) 2017-2020 The fd developers
+
+`fd` is distributed under the terms of both the MIT License and the Apache License 2.0.
+
+See the [LICENSE-APACHE](LICENSE-APACHE) and [LICENSE-MIT](LICENSE-MIT) files for license details.

appveyor.yml

@@ -13,24 +13,6 @@ environment:
       CHANNEL: stable
     - TARGET: x86_64-pc-windows-msvc
       CHANNEL: stable
-    # Beta channel (disabled for speed reasons)
-    #- TARGET: i686-pc-windows-gnu
-    #  CHANNEL: beta
-    #- TARGET: i686-pc-windows-msvc
-    #  CHANNEL: beta
-    #- TARGET: x86_64-pc-windows-gnu
-    #  CHANNEL: beta
-    #- TARGET: x86_64-pc-windows-msvc
-    #  CHANNEL: beta
-    # Nightly channel (disabled for speed reasons)
-    #- TARGET: i686-pc-windows-gnu
-    #  CHANNEL: nightly
-    #- TARGET: i686-pc-windows-msvc
-    #  CHANNEL: nightly
-    #- TARGET: x86_64-pc-windows-gnu
-    #  CHANNEL: nightly
-    #- TARGET: x86_64-pc-windows-msvc
-    #  CHANNEL: nightly
 
 # Install Rust and Cargo
 # (Based on from https://github.com/rust-lang/libc/blob/master/appveyor.yml)
@@ -86,9 +68,4 @@ branches:
     - master
     # IMPORTANT Regex to match tags. Required, or appveyor may not trigger deploys when a new tag
     # is pushed. This regex matches semantic versions like v1.2.3-rc4+2016.02.22
-    - /^v\d+\.\d+\.\d+.*$/
-
-# Disable caching, for now
-#cache:
-#  - '%USERPROFILE%\.cargo'
-#  - 'target -> Cargo.lock'
+    - /^v\d+\.\d+\.\d+.*$/

build.rs

@@ -1,34 +1,22 @@
-// Copyright (c) 2017 fd developers
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0>
-// or the MIT license <LICENSE-MIT or http://opensource.org/licenses/MIT>,
-// at your option. All files in the project carrying such
-// notice may not be copied, modified, or distributed except
-// according to those terms.
-
-#[macro_use]
-extern crate clap;
-extern crate version_check;
+use std::fs;
 
 use clap::Shell;
-use std::io::{self, Write};
-use std::process::exit;
-use std::fs;
 
 include!("src/app.rs");
 
 fn main() {
-    match version_check::is_min_version("1.20") {
-        // rustc >= 1.20
-        Some((true, _)) => {}
-        // rustc < 1.20 or can't figure it out
+    let min_version = "1.36";
+
+    match version_check::is_min_version(min_version) {
+        Some(true) => {}
+        // rustc version too small or can't figure it out
         _ => {
-            writeln!(&mut io::stderr(), "This crate requires rustc >= 1.20").unwrap();
-            exit(1);
+            eprintln!("'fd' requires rustc >= {}", min_version);
+            std::process::exit(1);
         }
     }
 
-    let var = std::env::var_os("SHELL_COMPLETIONS_DIR").or(std::env::var_os("OUT_DIR"));
+    let var = std::env::var_os("SHELL_COMPLETIONS_DIR").or_else(|| std::env::var_os("OUT_DIR"));
     let outdir = match var {
         None => return,
         Some(outdir) => outdir,
@@ -38,6 +26,5 @@ fn main() {
     let mut app = build_app();
     app.gen_completions("fd", Shell::Bash, &outdir);
     app.gen_completions("fd", Shell::Fish, &outdir);
-    app.gen_completions("fd", Shell::Zsh, &outdir);
     app.gen_completions("fd", Shell::PowerShell, &outdir);
 }

ci/.gitattributes

@@ -0,0 +1 @@
+* linguist-vendored

ci/before_deploy.bash

@@ -11,18 +11,25 @@ pack() {
     local tempdir
     local out_dir
     local package_name
+    local gcc_prefix
 
     tempdir=$(mktemp -d 2>/dev/null || mktemp -d -t tmp)
     out_dir=$(pwd)
     package_name="$PROJECT_NAME-$TRAVIS_TAG-$TARGET"
 
+    if [[ $TARGET == arm-unknown-linux-* ]]; then
+        gcc_prefix="arm-linux-gnueabihf-"
+    else
+        gcc_prefix=""
+    fi
+
     # create a "staging" directory
     mkdir "$tempdir/$package_name"
     mkdir "$tempdir/$package_name/autocomplete"
 
     # copying the main binary
     cp "target/$TARGET/release/$PROJECT_NAME" "$tempdir/$package_name/"
-    strip "$tempdir/$package_name/$PROJECT_NAME"
+    "${gcc_prefix}"strip "$tempdir/$package_name/$PROJECT_NAME"
 
     # manpage, readme and license
     cp "doc/$PROJECT_NAME.1" "$tempdir/$package_name"
@@ -33,7 +40,7 @@ pack() {
     # various autocomplete
     cp target/"$TARGET"/release/build/"$PROJECT_NAME"-*/out/"$PROJECT_NAME".bash "$tempdir/$package_name/autocomplete/${PROJECT_NAME}.bash-completion"
     cp target/"$TARGET"/release/build/"$PROJECT_NAME"-*/out/"$PROJECT_NAME".fish "$tempdir/$package_name/autocomplete"
-    cp target/"$TARGET"/release/build/"$PROJECT_NAME"-*/out/_"$PROJECT_NAME" "$tempdir/$package_name/autocomplete"
+    cp contrib/completion/_"$PROJECT_NAME" "$tempdir/$package_name/autocomplete"
 
     # archiving
     pushd "$tempdir"
@@ -48,17 +55,29 @@ make_deb() {
     local version
     local dpkgname
     local conflictname
+    local homepage
+    local maintainer
+    local gcc_prefix
+
+    homepage="https://github.com/sharkdp/fd"
+    maintainer="David Peter <mail@david-peter.de>"
 
     case $TARGET in
         x86_64*)
             architecture=amd64
+            gcc_prefix=""
             ;;
         i686*)
             architecture=i386
+            gcc_prefix=""
+            ;;
+        arm*hf)
+            architecture=armhf
+            gcc_prefix="arm-linux-gnueabihf-"
             ;;
         *)
-            echo "ERROR: unknown target" >&2
-            return 1
+            echo "make_deb: skipping target '${TARGET}'" >&2
+            return 0
             ;;
     esac
     version=${TRAVIS_TAG#v}
@@ -74,20 +93,59 @@ make_deb() {
 
     # copy the main binary
     install -Dm755 "target/$TARGET/release/$PROJECT_NAME" "$tempdir/usr/bin/$PROJECT_NAME"
-    strip "$tempdir/usr/bin/$PROJECT_NAME"
+    "${gcc_prefix}"strip "$tempdir/usr/bin/$PROJECT_NAME"
 
     # manpage
     install -Dm644 "doc/$PROJECT_NAME.1" "$tempdir/usr/share/man/man1/$PROJECT_NAME.1"
+    gzip --best "$tempdir/usr/share/man/man1/$PROJECT_NAME.1"
 
     # readme and license
     install -Dm644 README.md "$tempdir/usr/share/doc/$PROJECT_NAME/README.md"
     install -Dm644 LICENSE-MIT "$tempdir/usr/share/doc/$PROJECT_NAME/LICENSE-MIT"
     install -Dm644 LICENSE-APACHE "$tempdir/usr/share/doc/$PROJECT_NAME/LICENSE-APACHE"
+    cat > "$tempdir/usr/share/doc/$PROJECT_NAME/copyright" <<EOF
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: $PROJECT_NAME
+Source: $homepage
+
+Files: *
+Copyright: $maintainer
+License: Apache-2.0 or MIT
+
+License: Apache-2.0
+ On Debian systems, the complete text of the Apache-2.0 can be found in the
+ file /usr/share/common-licenses/Apache-2.0.
+
+License: MIT
+ Permission is hereby granted, free of charge, to any
+ person obtaining a copy of this software and associated
+ documentation files (the "Software"), to deal in the
+ Software without restriction, including without
+ limitation the rights to use, copy, modify, merge,
+ publish, distribute, sublicense, and/or sell copies of
+ the Software, and to permit persons to whom the Software
+ is furnished to do so, subject to the following
+ conditions:
+ .
+ The above copyright notice and this permission notice
+ shall be included in all copies or substantial portions
+ of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+ SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+ IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+EOF
 
     # completions
     install -Dm644 target/$TARGET/release/build/$PROJECT_NAME-*/out/$PROJECT_NAME.bash "$tempdir/usr/share/bash-completion/completions/${PROJECT_NAME}"
     install -Dm644 target/$TARGET/release/build/$PROJECT_NAME-*/out/$PROJECT_NAME.fish "$tempdir/usr/share/fish/completions/$PROJECT_NAME.fish"
-    install -Dm644 target/$TARGET/release/build/$PROJECT_NAME-*/out/_$PROJECT_NAME "$tempdir/usr/share/zsh/vendor-completions/_$PROJECT_NAME"
+    install -Dm644 contrib/completion/_"$PROJECT_NAME" "$tempdir/usr/share/zsh/vendor-completions/_$PROJECT_NAME"
 
     # Control file
     mkdir "$tempdir/DEBIAN"
@@ -96,14 +154,17 @@ Package: $dpkgname
 Version: $version
 Section: utils
 Priority: optional
-Maintainer: David Peter
+Maintainer: $maintainer
 Architecture: $architecture
 Provides: $PROJECT_NAME
 Conflicts: $conflictname
+Homepage: $homepage
 Description: Simple, fast and user-friendly alternative to find
+ While fd does not seek to mirror all of find's powerful functionality, it
+ provides sensible (opinionated) defaults for 80% of the use cases.
 EOF
 
-    dpkg-deb --build "$tempdir" "${dpkgname}_${version}_${architecture}.deb"
+    fakeroot dpkg-deb --build "$tempdir" "${dpkgname}_${version}_${architecture}.deb"
 }
 
 

ci/before_install.bash

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+set -ex
+
+if [ "$TRAVIS_OS_NAME" != linux ]; then
+    exit 0
+fi
+
+sudo apt-get update
+
+# needed to build deb packages
+sudo apt-get install -y fakeroot
+
+# needed for i686 linux gnu target
+if [[ $TARGET == i686-unknown-linux-gnu ]]; then
+    sudo apt-get install -y gcc-multilib
+fi
+
+# needed for cross-compiling for arm
+if [[ $TARGET == arm-unknown-linux-* ]]; then
+    sudo apt-get install -y \
+        gcc-4.8-arm-linux-gnueabihf \
+        binutils-arm-linux-gnueabihf \
+        libc6-armhf-cross \
+        libc6-dev-armhf-cross
+fi

ci/script.bash

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -ex
+
+# Incorporate TARGET env var to the build and test process
+cargo build --target "$TARGET" --verbose
+
+# We cannot run arm executables on linux
+if [[ $TARGET != arm-unknown-linux-* ]]; then
+    cargo test --target "$TARGET" --verbose
+fi

contrib/completion/_fd

@@ -0,0 +1,268 @@
+#compdef fd
+
+##
+# zsh completion function for fd
+#
+# Based on ripgrep completion function.
+# Originally based on code from the zsh-users project — see copyright notice
+# below.
+
+autoload -U is-at-least
+
+_fd() {
+  local curcontext="$curcontext" no='!' ret=1
+  local -a context line state state_descr _arguments_options fd_types fd_args
+  local -A opt_args
+
+  if is-at-least 5.2; then
+    _arguments_options=( -s -S )
+  else
+    _arguments_options=( -s )
+  fi
+
+  fd_types=(
+    {f,file}'\:"regular files"'
+    {d,directory}'\:"directories"'
+    {l,symlink}'\:"symbolic links"'
+    {e,empty}'\:"empty files or directories"'
+    {x,executable}'\:"executable (files)"'
+    {s,socket}'\:"sockets"'
+    {p,pipe}'\:"named pipes (FIFOs)"'
+  )
+
+  # Do not complete rare options unless either the current prefix
+  # matches one of those options or the user has the `complete-all`
+  # style set. Note that this prefix check has to be updated manually to account
+  # for all of the potential negation options listed below!
+  if
+    # (--[bpsu]* => match all options marked with '$no')
+    [[ $PREFIX$SUFFIX == --[bopsu]* ]] ||
+    zstyle -t ":complete:$curcontext:*" complete-all
+  then
+    no=
+  fi
+
+  # We make heavy use of argument groups here to prevent the option specs from
+  # growing unwieldy. These aren't supported in zsh <5.4, though, so we'll strip
+  # them out below if necessary. This makes the exclusions inaccurate on those
+  # older versions, but oh well — it's not that big a deal
+  fd_args=(
+    + '(hidden)' # hidden files
+    {-H,--hidden}'[search hidden files/directories]'
+
+    + '(no-ignore-full)' # all ignore files
+    '(no-ignore-partial)'{-I,--no-ignore}"[don't respect .(git|fd)ignore and global ignore files]"
+    $no'(no-ignore-partial)*'{-u,--unrestricted}'[alias for --no-ignore, when repeated also alias for --hidden]'
+
+    + no-ignore-partial # some ignore files
+    "(no-ignore-full --no-ignore-vcs)--no-ignore-vcs[don't respect .gitignore files]"
+    "!(no-ignore-full --no-global-ignore-file)--no-global-ignore-file[don't respect the global ignore file]"
+
+    + '(case)' # case-sensitivity
+    {-s,--case-sensitive}'[perform a case-sensitive search]'
+    {-i,--ignore-case}'[perform a case-insensitive search]'
+
+    + '(regex-pattern)' # regex-based search pattern
+    '(no-regex-pattern)--regex[perform a regex-based search (default)]'
+
+    + '(no-regex-pattern)' # non-regex-based search pattern
+    {-g,--glob}'[perform a glob-based search]'
+    {-F,--fixed-strings}'[treat pattern as literal string instead of a regex]'
+
+    + '(match-full)' # match against full path
+    {-p,--full-path}'[match the pattern against the full path instead of the basename]'
+
+    + '(follow)' # follow symlinks
+    {-L,--follow}'[follow symbolic links to directories]'
+
+    + '(abs-path)' # show absolute paths
+    '(long-listing)'{-a,--absolute-path}'[show absolute paths instead of relative paths]'
+
+    + '(null-sep)' # use null separator for output
+    '(long-listing)'{-0,--print0}'[separate search results by the null character]'
+
+    + '(long-listing)' # long-listing output
+    '(abs-path null-sep max-results exec-cmds)'{-l,--list-details}'[use a long listing format with file metadata]'
+
+    + '(max-results)' # max number of results
+    '(long-listing exec-cmds)--max-results=[limit number of search results to given count and quit]:count'
+    '(long-listing exec-cmds)-1[limit to a single search result and quit]'
+
+    + '(fs-errors)' # file-system errors
+    $no'--show-errors[enable the display of filesystem errors]'
+
+    + '(fs-traversal)' # file-system traversal
+    $no"--one-file-system[don't descend into directories on other file systems]"
+    '!--mount'
+    '!--xdev'
+
+    + dir-depth # directory depth
+    '(--exact-depth -d --max-depth)'{-d+,--max-depth=}'[set max directory depth to descend when searching]:depth'
+    '!(--exact-depth -d --max-depth)--maxdepth:depth'
+    '(--exact-depth --min-depth)--min-depth=[set directory depth to descend before start searching]:depth'
+    '(--exact-depth -d --max-depth --maxdepth --min-depth)--exact-depth=[only search at the exact given directory depth]:depth'
+
+    + prune # pruning
+    "--prune[don't traverse into matching directories]"
+
+    + filter-misc # filter search
+    '*'{-t+,--type=}"[filter search by type]:type:(($fd_types))"
+    '*'{-e+,--extension=}'[filter search by file extension]:extension'
+    '*'{-E+,--exclude=}'[exclude files/directories that match the given glob pattern]:glob pattern'
+    '*'{-S+,--size=}'[limit search by file size]:size limit:->size'
+    '(-o --owner)'{-o+,--owner=}'[filter by owning user and/or group]:owner and/or group:->owner'
+
+    + ignore-file # extra ignore files
+    '*--ignore-file=[add a custom, low-precedence ignore-file with .gitignore format]: :_files'
+
+    + '(filter-mtime-newer)' # filter by files modified after than
+    '--changed-within=[limit search to files/directories modified within the given date/duration]:date or duration'
+    '!--change-newer-than=:date/duration'
+    '!--newer=:date/duration'
+
+    + '(filter-mtime-older)' # filter by files modified before than
+    '--changed-before=[limit search to files/directories modified before the given date/duration]:date or duration'
+    '!--change-older-than=:date/duration'
+    '!--older=:date/duration'
+
+    + '(color)' # colorize output
+    {-c+,--color=}'[declare when to colorize search results]:when to colorize:((
+      auto\:"show colors if the output goes to an interactive console (default)"
+      never\:"do not use colorized output"
+      always\:"always use colorized output"
+    ))'
+
+    + '(threads)'
+    {-j+,--threads=}'[set the number of threads for searching and executing]:number of threads'
+
+    + '(exec-cmds)' # execute command
+    '(long-listing max-results)'{-x+,--exec=}'[execute command for each search result]:command: _command_names -e:*\;::program arguments: _normal'
+    '(long-listing max-results)'{-X+,--exec-batch=}'[execute command for all search results at once]:command: _command_names -e:*\;::program arguments: _normal'
+
+    + other
+    '!(--max-buffer-time)--max-buffer-time=[set amount of time to buffer before showing output]:time (ms)'
+
+    + '(about)' # about flags
+    '(: * -)'{-h,--help}'[display help message]'
+    '(: * -)'{-v,--version}'[display version information]'
+
+    + path-sep # set path separator for output
+    $no'(--path-separator)--path-separator=[set the path separator to use when printing file paths]:path separator'
+
+    + search-path
+    $no'(--base-directory)--base-directory=[change the current working directory to the given path]:directory:_files -/'
+    $no'(*)*--search-path=[set search path (instead of positional <path> arguments)]:directory:_files -/'
+
+    + args # positional arguments
+    '1: :_guard "^-*" pattern'
+    '(--search-path)*:directory:_files -/'
+  )
+
+  # Strip out argument groups where unsupported (see above)
+  is-at-least 5.4 ||
+  fd_args=( ${(@)args:#(#i)(+|[a-z0-9][a-z0-9_-]#|\([a-z0-9][a-z0-9_-]#\))} )
+
+  _arguments $_arguments_options : $fd_args && ret=0
+
+  case ${state} in
+    owner)
+      compset -P '(\\|)\!'
+      if compset -P '*:'; then
+        _groups && ret=0
+      else
+        if
+          compset -S ':*' ||
+          # Do not add the colon suffix when completing "!user<TAB>
+          # (with a starting double-quote) otherwise pressing tab again
+          # after the inserted colon "!user:<TAB> will complete history modifiers
+          [[ $IPREFIX == (\\|\!)*  && ($QIPREFIX == \"* && -z $QISUFFIX) ]]
+        then
+          _users && ret=0
+        else
+          local q
+          # Since quotes are needed when using the negation prefix !,
+          # automatically remove the colon suffix also when closing the quote
+          if [[ $QIPREFIX == [\'\"]* ]]; then
+            q=${QIPREFIX:0:1}
+          fi
+          _users -r ": \t\n\-$q" -S : && ret=0
+        fi
+      fi
+      ;;
+
+    size)
+      if compset -P '[-+][0-9]##'; then
+        local -a suff=(
+          'B:bytes'
+          'K:kilobytes  (10^3  = 1000   bytes)'
+          'M:megabytes  (10^6  = 1000^2 bytes)'
+          'G:gigabytes  (10^9  = 1000^3 bytes)'
+          'T:terabytes  (10^12 = 1000^4 bytes)'
+          'Ki:kibibytes  ( 2^10 = 1024   bytes)'
+          'Mi:mebibytes  ( 2^20 = 1024^2 bytes)'
+          'Gi:gigibytes  ( 2^30 = 1024^3 bytes)'
+          'Ti:tebibytes  ( 2^40 = 1024^4 bytes)'
+        )
+        _describe -t units 'size limit units' suff -V 'units'
+      elif compset -P '[-+]'; then
+        _message -e 'size limit number (full format: <+-><number><unit>)'
+      else
+        _values 'size limit prefix (full format: <prefix><number><unit>)' \
+          '\+[file size must be greater or equal to]'\
+          '-[file size must be less than or equal to]' && ret=0
+      fi
+      ;;
+  esac
+
+  return ret
+}
+
+_fd "$@"
+
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL ZSH-USERS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for fd
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * smancill (https://github.com/smancill)
+#
+# ------------------------------------------------------------------------------
+
+# Local Variables:
+# mode: shell-script
+# coding: utf-8-unix
+# indent-tabs-mode: nil
+# sh-indentation: 2
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et

doc/.gitattributes

@@ -0,0 +1 @@
+* linguist-vendored

doc/fd.1

@@ -27,39 +27,77 @@ is a simple, fast and user-friendly alternative to
 .SH OPTIONS
 .TP
 .B \-H, \-\-hidden
-Include hidden files and directories in the search results.
+Include hidden files and directories in the search results
+(default: hidden files and directories are skipped).
 .TP
 .B \-I, \-\-no\-ignore
-Do not respect files like
-.I .gitignore
-and
-.I .ignore
-and include ignored files in the search results.
+Show search results from files and directories that would otherwise be ignored by
+.IR .gitignore ,
+.IR .ignore ,
+.IR .fdignore ,
+or the global ignore file.
+.TP
+.B \-u, \-\-unrestricted
+Alias for '--no-ignore'. Can be repeated; '-uu' is an alias for '--no-ignore --hidden'.
 .TP
 .B \-\-no\-ignore\-vcs
-Do not respect version control ignore files like
-.I ".gitignore"
-and include the respective entries in the search results.
+Show search results from files and directories that would otherwise be ignored by
+.I .gitignore
+files.
 .TP
 .B \-s, \-\-case\-sensitive
-Perform a case-sensitive search (default: smart case).
+Perform a case-sensitive search. By default, fd uses case-insensitive searches, unless the
+pattern contains an uppercase character (smart case).
 .TP
 .B \-i, \-\-ignore\-case
-Perform a case-insensitive search (default: smart case).
+Perform a case-insensitive search. By default, fd uses case-insensitive searches, unless the
+pattern contains an uppercase character (smart case).
+.TP
+.B \-g, \-\-glob
+Perform a glob-based search instead of a regular expression search.
+.TP
+.B \-\-regex
+Perform a regular-expression based search (default). This can be used to override --glob.
+.TP
+.B \-F, \-\-fixed\-strings
+Treat the pattern as a literal string instead of a regular expression. Note that this also
+performs substring comparison. If you want to match on an exact filename, consider using '\-\-glob'.
 .TP
 .B \-a, \-\-absolute\-path
-Show absolute instead of relative paths.
+Shows the full path starting from the root as opposed to relative paths.
+.TP
+.B \-l, \-\-list\-details
+Use a detailed listing format like 'ls -l'. This is basically an alias
+for '--exec-batch ls -l' with some additional 'ls' options. This can be used
+to see more metadata, to show symlink targets and to achieve a deterministic
+sort order.
 .TP
 .B \-L, \-\-follow
-Dereference all symbolic links encountered.
+By default, fd does not descend into symlinked directories. Using this flag, symbolic links are
+also traversed.
 .TP
 .B \-p, \-\-full\-path
-Match the
+By default, the search pattern is only matched against the filename (or directory name). Using
+this flag, the
 .I pattern
-against the full path instead of just the file or directory name.
+is matched against the full path.
 .TP
 .B \-0, \-\-print0
-Separate search results by null characters instead of newlines.
+Separate search results by the null character (instead of newlines). Useful for piping results to
+.IR xargs .
+.TP
+.B \-\-max\-results count
+Limit the number of search results to 'count' and quit immediately.
+.TP
+.B \-1
+Limit the search to a single result and quit immediately. This is an alias for '--max-results=1'.
+.TP
+.B \-\-show-errors
+Enable the display of filesystem errors for situations such as insufficient
+permissions or dead symlinks.
+.TP
+.B \-\-one\-file\-system, \-\-mount, \-\-xdev
+By default, fd will traverse the file system tree as far as other options dictate. With this flag, fd ensures that it does not descend into a different file system than the one it started in. Comparable to the -mount or -xdev filters of find(1).
 .TP
 .B \-h, \-\-help
 Print help information.
@@ -72,15 +110,32 @@ Limit directory traversal to at most
 .I d
 levels of depth. By default, there is no limit on the search depth.
 .TP
+.BI "\-\-min\-depth " d
+Only show search results starting at the given depth. See also: '--max-depth' and '--exact-depth'.
+.TP
+.BI "\-\-exact\-depth " d
+Only show search results at the exact given depth. This is an alias for '--min-depth <depth> --max-depth <depth>'.
+.TP
+.B \-\-prune
+Do not traverse into matching directories.
+.TP
 .BI "\-t, \-\-type " filetype
 Filter search by type:
 .RS
 .IP "f, file"
 regular files
-.IP "d, directories"
+.IP "d, directory"
 directories
-.IP "s, symlink"
+.IP "l, symlink"
 symbolic links
+.IP "x, executable"
+executable (files)
+.IP "e, empty"
+empty files or directories
+.IP "s, socket"
+sockets
+.IP "p, pipe"
+named pipes (FIFOs)
 .RE
 
 .RS
@@ -91,11 +146,21 @@ This option can be used repeatedly to allow for multiple file types.
 Filter search results by file extension
 .IR ext .
 This option can be used repeatedly to allow for multiple possible file extensions.
+
+If you want to search for files without extension, you can use the regex '^[^.]+$'
+as a normal search pattern.
 .TP
 .BI "\-E, \-\-exclude " pattern
 Exclude files/directories that match the given glob pattern.
 This overrides any other ignore logic.
 Multiple exclude patterns can be specified.
+Examples:
+  \-\-exclude '*.pyc'
+  \-\-exclude node_modules
+.TP
+.BI "\-\-ignore-file " path
+Add a custom ignore-file in '.gitignore' format.
+These files have a low precedence.
 .TP
 .BI "\-c, \-\-color " when
 Declare
@@ -111,9 +176,89 @@ Always colorize output.
 .RE
 .TP
 .BI "\-j, \-\-threads " num
-Number of threads to use for searching (default: number of available CPUs).
+Set number of threads to use for searching & executing (default: number of available CPU cores).
 .TP
-.BI "\-x, \-\-exec " command "\fR [args...] ;"
+.BI "\-S, \-\-size " size
+Limit results based on the size of files using the format
+.I <+-><NUM><UNIT>
+.RS
+.IP '+'
+file size must be greater than or equal to this
+.IP '-'
+file size must be less than or equal to this
+.P
+If neither '+' nor '-' is specified, file size must be exactly equal to this.
+.IP 'NUM'
+The numeric size (e.g. 500)
+.IP 'UNIT'
+The units for NUM. They are not case-sensitive.
+Allowed unit values:
+.RS
+.IP 'b'
+bytes
+.IP 'k'
+kilobytes (base ten, 10^3 = 1000 bytes)
+.IP 'm'
+megabytes
+.IP 'g'
+gigabytes
+.IP 't'
+terabytes
+.IP 'ki'
+kibibytes (base two, 2^10 = 1024 bytes)
+.IP 'mi'
+mebibytes
+.IP 'gi'
+gibibytes
+.IP 'ti'
+tebibytes
+.RE
+.RE
+.TP
+.BI "\-\-changed-within " date|duration
+Filter results based on the file modification time. The argument can be provided as a specific
+point in time (\fIYYYY-MM-DD HH:MM:SS\fR) or as a duration (\fI10h, 1d, 35min\fR).
+.B --change-newer-than
+can be used as an alias.
+
+Examples:
+  \-\-changed-within 2weeks
+  \-\-change-newer-than "2018-10-27 10:00:00"
+.TP
+.BI "\-\-changed-before " date|duration
+Filter results based on the file modification time. The argument can be provided as a specific
+point in time (\fIYYYY-MM-DD HH:MM:SS\fR) or as a duration (\fI10h, 1d, 35min\fR).
+.B --change-older-than
+can be used as an alias.
+
+Examples:
+  \-\-changed-before "2018-10-27 10:00:00"
+  \-\-change-older-than 2weeks
+.TP
+.BI "-o, \-\-owner " [user][:group]
+Filter files by their user and/or group. Format: [(user|uid)][:(group|gid)]. Either side
+is optional. Precede either side with a '!' to exclude files instead.
+
+Examples:
+  \-\-owner john
+  \-\-owner :students
+  \-\-owner "!john:students"
+.TP
+.BI "\-\-base\-directory " path
+Change the current working directory of fd to the provided path. This means that search results will
+be shown with respect to the given base path. Note that relative paths which are passed to fd via the
+positional \fIpath\fR argument or the \fB\-\-search\-path\fR option will also be resolved relative to
+this directory.
+.TP
+.BI "\-\-path\-separator " separator
+Set the path separator to use when printinf file paths. The default is the OS-specific separator
+('/' on Unix, '\\' on Windows).
+.TP
+.BI "\-\-search\-path " search\-path
+Provide paths to search as an alternative to the positional \fIpath\fR argument. Changes the usage to
+\'fd [FLAGS/OPTIONS] \-\-search\-path PATH \-\-search\-path PATH2 [PATTERN]\'
+.TP
+.BI "\-x, \-\-exec " command
 Execute
 .I command
 for each search result. The following placeholders are substituted by a path derived from the current search result:
@@ -129,11 +274,48 @@ path without file extension
 .IP {/.}
 basename without file extension
 .RE
+.TP
+.BI "\-X, \-\-exec-batch " command
+Execute
+.I command
+with all search results at once.
+A single occurence of the following placeholders is authorized and substituted by the paths derived from the search results before the command is executed:
+.RS
+.IP {}
+path
+.IP {/}
+basename
+.IP {//}
+parent directory
+.IP {.}
+path without file extension
+.IP {/.}
+basename without file extension
+.RE
+.SH PATTERN SYNTAX
+The regular expression syntax used by fd is documented here:
+
+    https://docs.rs/regex/1.0.0/regex/#syntax
+
+The glob syntax is documented here:
+
+    https://docs.rs/globset/#syntax
 .SH ENVIRONMENT
 .TP
 .B LS_COLORS
 Determines how to colorize search results, see
 .BR dircolors (1) .
+.TP
+.B NO_COLOR
+Disables colorized output.
+.TP
+.B XDG_CONFIG_HOME, HOME
+Used to locate the global ignore file. If
+.B XDG_CONFIG_HOME
+is set, use
+.IR $XDG_CONFIG_HOME/fd/ignore .
+Otherwise, use
+.IR $HOME/.config/fd/ignore .
 .SH EXAMPLES
 .TP
 .RI "Find files and directories that match the pattern '" needle "':"
@@ -144,5 +326,8 @@ $ fd nginx /var/log
 .TP
 .RI "Find all Python files (all files with the extention " .py ") in the current directory:"
 $ fd -e py
+.TP
+.RI "Open all search results with vim:"
+$ fd pattern -X vim
 .SH SEE ALSO
 .BR find (1)

doc/screencast.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+# Designed to be executed via svg-term from the fd root directory:
+# svg-term --command="bash doc/screencast.sh" --out doc/screencast.svg --padding=10
+set -e
+set -u
+
+PROMPT="▶"
+
+enter() {
+    INPUT=$1
+    DELAY=1
+
+    prompt
+    sleep "$DELAY"
+    type "$INPUT"
+    sleep 0.5
+    printf '%b' "\\n"
+    eval "$INPUT"
+    type "\\n"
+}
+
+prompt() {
+  printf '%b ' $PROMPT | pv -q
+}
+
+type() {
+    printf '%b' "$1" | pv -qL $((10+(-2 + RANDOM%5)))
+}
+
+main() {
+    IFS='%'
+
+    enter "fd"
+
+    enter "fd app"
+
+    enter "fd sh"
+
+    enter "fd sh --type f"
+
+    enter "fd -e md"
+
+    enter "fd -e md --exec wc -l"
+
+    enter "fd '^[A-Z]'"
+
+    enter "fd --exclude src"
+
+    enter "fd --hidden sample"
+
+    prompt
+
+    sleep 3
+
+    echo ""
+
+    unset IFS
+}
+
+main

src/app.rs

@@ -1,227 +1,599 @@
-// Copyright (c) 2017 fd developers
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0>
-// or the MIT license <LICENSE-MIT or http://opensource.org/licenses/MIT>,
-// at your option. All files in the project carrying such
-// notice may not be copied, modified, or distributed except
-// according to those terms.
-
-use std::collections::HashMap;
-
-use clap::{App, AppSettings, Arg};
-
-struct Help {
-    short: &'static str,
-    long: &'static str,
-}
-
-macro_rules! doc {
-    ($map:expr, $name:expr, $short:expr) => {
-        doc!($map, $name, $short, $short)
-    };
-    ($map:expr, $name:expr, $short:expr, $long:expr) => {
-        $map.insert($name, Help {
-            short: $short,
-            long: concat!($long, "\n ")
-        });
-    };
-}
+use clap::{crate_version, App, AppSettings, Arg};
 
 pub fn build_app() -> App<'static, 'static> {
-    let helps = usage();
-    let arg = |name| {
-        Arg::with_name(name)
-            .help(helps[name].short)
-            .long_help(helps[name].long)
+    let clap_color_setting = if std::env::var_os("NO_COLOR").is_none() {
+        AppSettings::ColoredHelp
+    } else {
+        AppSettings::ColorNever
     };
 
-    App::new("fd")
+    let mut app = App::new("fd")
         .version(crate_version!())
         .usage("fd [FLAGS/OPTIONS] [<pattern>] [<path>...]")
-        .setting(AppSettings::ColoredHelp)
+        .setting(clap_color_setting)
         .setting(AppSettings::DeriveDisplayOrder)
-        .arg(arg("hidden").long("hidden").short("H"))
-        .arg(arg("no-ignore").long("no-ignore").short("I"))
-        .arg(arg("no-ignore-vcs").long("no-ignore-vcs"))
-        .arg(
-            arg("rg-alias-hidden-ignore")
-                .short("u")
-                .multiple(true)
-                .hidden(true),
+        .after_help(
+            "Note: `fd -h` prints a short and concise overview while `fd --help` gives all \
+                 details.",
         )
         .arg(
-            arg("case-sensitive")
+            Arg::with_name("hidden")
+                .long("hidden")
+                .short("H")
+                .overrides_with("hidden")
+                .help("Search hidden files and directories")
+                .long_help(
+                    "Include hidden directories and files in the search results (default: \
+                         hidden files and directories are skipped). Files and directories are \
+                         considered to be hidden if their name starts with a `.` sign (dot).",
+                ),
+        )
+        .arg(
+            Arg::with_name("no-ignore")
+                .long("no-ignore")
+                .short("I")
+                .overrides_with("no-ignore")
+                .help("Do not respect .(git|fd)ignore files")
+                .long_help(
+                    "Show search results from files and directories that would otherwise be \
+                         ignored by '.gitignore', '.ignore', '.fdignore', or the global ignore file.",
+                ),
+        )
+        .arg(
+            Arg::with_name("no-ignore-vcs")
+                .long("no-ignore-vcs")
+                .overrides_with("no-ignore-vcs")
+                .hidden_short_help(true)
+                .long_help(
+                    "Show search results from files and directories that would otherwise be \
+                         ignored by '.gitignore' files.",
+                ),
+        )
+        .arg(
+            Arg::with_name("no-global-ignore-file")
+                .long("no-global-ignore-file")
+                .hidden(true)
+                .long_help("Do not respect the global ignore file."),
+        )
+        .arg(
+            Arg::with_name("rg-alias-hidden-ignore")
+                .short("u")
+                .long("unrestricted")
+                .multiple(true)
+                .hidden_short_help(true)
+                .long_help(
+                    "Alias for '--no-ignore'. Can be repeated. '-uu' is an alias for \
+                         '--no-ignore --hidden'.",
+                ),
+        )
+        .arg(
+            Arg::with_name("case-sensitive")
                 .long("case-sensitive")
                 .short("s")
-                .overrides_with("ignore-case"),
+                .overrides_with_all(&["ignore-case", "case-sensitive"])
+                .help("Case-sensitive search (default: smart case)")
+                .long_help(
+                    "Perform a case-sensitive search. By default, fd uses case-insensitive \
+                         searches, unless the pattern contains an uppercase character (smart \
+                         case).",
+                ),
         )
         .arg(
-            arg("ignore-case")
+            Arg::with_name("ignore-case")
                 .long("ignore-case")
                 .short("i")
-                .overrides_with("case-sensitive"),
+                .overrides_with_all(&["case-sensitive", "ignore-case"])
+                .help("Case-insensitive search (default: smart case)")
+                .long_help(
+                    "Perform a case-insensitive search. By default, fd uses case-insensitive \
+                         searches, unless the pattern contains an uppercase character (smart \
+                         case).",
+                ),
         )
-        .arg(arg("absolute-path").long("absolute-path").short("a"))
-        .arg(arg("follow").long("follow").short("L").alias("dereference"))
-        .arg(arg("full-path").long("full-path").short("p"))
-        .arg(arg("null_separator").long("print0").short("0"))
-        .arg(arg("depth").long("max-depth").short("d").takes_value(true))
         .arg(
-            arg("file-type")
+            Arg::with_name("glob")
+                .long("glob")
+                .short("g")
+                .conflicts_with("fixed-strings")
+                .overrides_with("glob")
+                .help("Glob-based search (default: regular expression)")
+                .long_help("Perform a glob-based search instead of a regular expression search."),
+        )
+        .arg(
+            Arg::with_name("regex")
+                .long("regex")
+                .overrides_with_all(&["glob", "regex"])
+                .hidden_short_help(true)
+                .long_help(
+                    "Perform a regular-expression based search (default). This can be used to \
+                         override --glob.",
+                ),
+        )
+        .arg(
+            Arg::with_name("fixed-strings")
+                .long("fixed-strings")
+                .short("F")
+                .alias("literal")
+                .overrides_with("fixed-strings")
+                .hidden_short_help(true)
+                .long_help(
+                    "Treat the pattern as a literal string instead of a regular expression. Note \
+                     that this also performs substring comparison. If you want to match on an \
+                     exact filename, consider using '--glob'.",
+                ),
+        )
+        .arg(
+            Arg::with_name("absolute-path")
+                .long("absolute-path")
+                .short("a")
+                .overrides_with("absolute-path")
+                .help("Show absolute instead of relative paths")
+                .long_help(
+                    "Shows the full path starting from the root as opposed to relative paths.",
+                ),
+        )
+        .arg(
+            Arg::with_name("list-details")
+                .long("list-details")
+                .short("l")
+                .conflicts_with("absolute-path")
+                .help("Use a long listing format with file metadata")
+                .long_help(
+                    "Use a detailed listing format like 'ls -l'. This is basically an alias \
+                         for '--exec-batch ls -l' with some additional 'ls' options. This can be \
+                         used to see more metadata, to show symlink targets and to achieve a \
+                         deterministic sort order.",
+                ),
+        )
+        .arg(
+            Arg::with_name("follow")
+                .long("follow")
+                .short("L")
+                .alias("dereference")
+                .overrides_with("follow")
+                .help("Follow symbolic links")
+                .long_help(
+                    "By default, fd does not descend into symlinked directories. Using this \
+                         flag, symbolic links are also traversed.",
+                ),
+        )
+        .arg(
+            Arg::with_name("full-path")
+                .long("full-path")
+                .short("p")
+                .overrides_with("full-path")
+                .help("Search full path (default: file-/dirname only)")
+                .long_help(
+                    "By default, the search pattern is only matched against the filename (or \
+                         directory name). Using this flag, the pattern is matched against the \
+                         full path.",
+                ),
+        )
+        .arg(
+            Arg::with_name("null_separator")
+                .long("print0")
+                .short("0")
+                .overrides_with("print0")
+                .conflicts_with("list-details")
+                .help("Separate results by the null character")
+                .long_help(
+                    "Separate search results by the null character (instead of newlines). \
+                         Useful for piping results to 'xargs'.",
+                ),
+        )
+        .arg(
+            Arg::with_name("max-depth")
+                .long("max-depth")
+                .short("d")
+                .takes_value(true)
+                .value_name("depth")
+                .help("Set maximum search depth (default: none)")
+                .long_help(
+                    "Limit the directory traversal to a given depth. By default, there is no \
+                         limit on the search depth.",
+                ),
+        )
+        // support --maxdepth as well, for compatibility with rg
+        .arg(
+            Arg::with_name("rg-depth")
+                .long("maxdepth")
+                .hidden(true)
+                .takes_value(true)
+        )
+        .arg(
+            Arg::with_name("min-depth")
+                .long("min-depth")
+                .takes_value(true)
+                .value_name("depth")
+                .hidden_short_help(true)
+                .long_help(
+                    "Only show search results starting at the given depth. \
+                     See also: '--max-depth' and '--exact-depth'",
+                ),
+        )
+        .arg(
+            Arg::with_name("exact-depth")
+                .long("exact-depth")
+                .takes_value(true)
+                .value_name("depth")
+                .hidden_short_help(true)
+                .conflicts_with_all(&["max-depth", "min-depth"])
+                .long_help(
+                    "Only show search results at the exact given depth. This is an alias for \
+                     '--min-depth <depth> --max-depth <depth>'.",
+                ),
+        )
+        .arg(
+            Arg::with_name("prune")
+                .long("prune")
+                .conflicts_with_all(&["size", "exact-depth"])
+                .hidden_short_help(true)
+                .long_help("Do not traverse into matching directories.")
+        )
+        .arg(
+            Arg::with_name("file-type")
                 .long("type")
                 .short("t")
                 .multiple(true)
                 .number_of_values(1)
                 .takes_value(true)
                 .value_name("filetype")
-                .possible_values(&["f", "file", "d", "directory", "l", "symlink"])
-                .hide_possible_values(true),
+                .possible_values(&[
+                    "f",
+                    "file",
+                    "d",
+                    "directory",
+                    "l",
+                    "symlink",
+                    "x",
+                    "executable",
+                    "e",
+                    "empty",
+                    "s",
+                    "socket",
+                    "p",
+                    "pipe",
+                ])
+                .hide_possible_values(true)
+                .help(
+                    "Filter by type: file (f), directory (d), symlink (l),\nexecutable (x), \
+                         empty (e), socket (s), pipe (p)",
+                )
+                .long_help(
+                    "Filter the search by type (multiple allowable filetypes can be specified):\n  \
+                       'f' or 'file':         regular files\n  \
+                       'd' or 'directory':    directories\n  \
+                       'l' or 'symlink':      symbolic links\n  \
+                       'x' or 'executable':   executables\n  \
+                       'e' or 'empty':        empty files or directories\n  \
+                       's' or 'socket':       socket\n  \
+                       'p' or 'pipe':         named pipe (FIFO)",
+                ),
         )
         .arg(
-            arg("extension")
+            Arg::with_name("extension")
                 .long("extension")
                 .short("e")
                 .multiple(true)
                 .number_of_values(1)
                 .takes_value(true)
-                .value_name("ext"),
+                .value_name("ext")
+                .help("Filter by file extension")
+                .long_help(
+                    "(Additionally) filter search results by their file extension. Multiple \
+                     allowable file extensions can be specified.\n\
+                     If you want to search for files without extension, \
+                     you can use the regex '^[^.]+$' as a normal search pattern.",
+                ),
         )
         .arg(
-            arg("exec")
+            Arg::with_name("exec")
                 .long("exec")
                 .short("x")
-                .multiple(true)
                 .min_values(1)
                 .allow_hyphen_values(true)
                 .value_terminator(";")
-                .value_name("cmd"),
+                .value_name("cmd")
+                .conflicts_with("list-details")
+                .help("Execute a command for each search result")
+                .long_help(
+                    "Execute a command for each search result.\n\
+                     All arguments following --exec are taken to be arguments to the command until the \
+                     argument ';' is encountered.\n\
+                     Each occurrence of the following placeholders is substituted by a path derived from the \
+                     current search result before the command is executed:\n  \
+                       '{}':   path\n  \
+                       '{/}':  basename\n  \
+                       '{//}': parent directory\n  \
+                       '{.}':  path without file extension\n  \
+                       '{/.}': basename without file extension",
+                ),
         )
         .arg(
-            arg("exclude")
+            Arg::with_name("exec-batch")
+                .long("exec-batch")
+                .short("X")
+                .min_values(1)
+                .allow_hyphen_values(true)
+                .value_terminator(";")
+                .value_name("cmd")
+                .conflicts_with_all(&["exec", "list-details"])
+                .help("Execute a command with all search results at once")
+                .long_help(
+                    "Execute a command with all search results at once.\n\
+                     All arguments following --exec-batch are taken to be arguments to the command until the \
+                     argument ';' is encountered.\n\
+                     A single occurrence of the following placeholders is authorized and substituted by the paths derived from the \
+                     search results before the command is executed:\n  \
+                       '{}':   path\n  \
+                       '{/}':  basename\n  \
+                       '{//}': parent directory\n  \
+                       '{.}':  path without file extension\n  \
+                       '{/.}': basename without file extension",
+                ),
+        )
+        .arg(
+            Arg::with_name("exclude")
                 .long("exclude")
                 .short("E")
                 .takes_value(true)
                 .value_name("pattern")
                 .number_of_values(1)
-                .multiple(true),
+                .multiple(true)
+                .help("Exclude entries that match the given glob pattern")
+                .long_help(
+                    "Exclude files/directories that match the given glob pattern. This \
+                         overrides any other ignore logic. Multiple exclude patterns can be \
+                         specified.\n\n\
+                         Examples:\n  \
+                           --exclude '*.pyc'\n  \
+                           --exclude node_modules",
+                ),
         )
         .arg(
-            arg("color")
+            Arg::with_name("ignore-file")
+                .long("ignore-file")
+                .takes_value(true)
+                .value_name("path")
+                .number_of_values(1)
+                .multiple(true)
+                .hidden_short_help(true)
+                .long_help(
+                    "Add a custom ignore-file in '.gitignore' format. These files have a low \
+                         precedence.",
+                ),
+        )
+        .arg(
+            Arg::with_name("color")
                 .long("color")
                 .short("c")
                 .takes_value(true)
                 .value_name("when")
                 .possible_values(&["never", "auto", "always"])
-                .hide_possible_values(true),
+                .hide_possible_values(true)
+                .help("When to use colors: never, *auto*, always")
+                .long_help(
+                    "Declare when to use color for the pattern match output:\n  \
+                       'auto':      show colors if the output goes to an interactive console (default)\n  \
+                       'never':     do not use colorized output\n  \
+                       'always':    always use colorized output",
+                ),
         )
         .arg(
-            arg("threads")
+            Arg::with_name("threads")
                 .long("threads")
                 .short("j")
                 .takes_value(true)
-                .value_name("num"),
+                .value_name("num")
+                .hidden_short_help(true)
+                .long_help(
+                    "Set number of threads to use for searching & executing (default: number \
+                         of available CPU cores)",
+                ),
         )
         .arg(
-            arg("max-buffer-time")
+            Arg::with_name("size")
+                .long("size")
+                .short("S")
+                .takes_value(true)
+                .number_of_values(1)
+                .allow_hyphen_values(true)
+                .multiple(true)
+                .help("Limit results based on the size of files.")
+                .long_help(
+                    "Limit results based on the size of files using the format <+-><NUM><UNIT>.\n   \
+                        '+': file size must be greater than or equal to this\n   \
+                        '-': file size must be less than or equal to this\n\
+                     If neither '+' nor '-' is specified, file size must be exactly equal to this.\n   \
+                        'NUM':  The numeric size (e.g. 500)\n   \
+                        'UNIT': The units for NUM. They are not case-sensitive.\n\
+                     Allowed unit values:\n    \
+                         'b':  bytes\n    \
+                         'k':  kilobytes (base ten, 10^3 = 1000 bytes)\n    \
+                         'm':  megabytes\n    \
+                         'g':  gigabytes\n    \
+                         't':  terabytes\n    \
+                         'ki': kibibytes (base two, 2^10 = 1024 bytes)\n    \
+                         'mi': mebibytes\n    \
+                         'gi': gibibytes\n    \
+                         'ti': tebibytes",
+                ),
+        )
+        .arg(
+            Arg::with_name("max-buffer-time")
                 .long("max-buffer-time")
                 .takes_value(true)
-                .hidden(true),
+                .hidden(true)
+                .long_help(
+                    "Amount of time in milliseconds to buffer, before streaming the search \
+                         results to the console.",
+                ),
         )
-        .arg(arg("pattern"))
-        .arg(arg("path").multiple(true))
-}
+        .arg(
+            Arg::with_name("changed-within")
+                .long("changed-within")
+                .alias("change-newer-than")
+                .alias("newer")
+                .takes_value(true)
+                .value_name("date|dur")
+                .number_of_values(1)
+                .help("Filter by file modification time (newer than)")
+                .long_help(
+                    "Filter results based on the file modification time. The argument can be provided \
+                     as a specific point in time (YYYY-MM-DD HH:MM:SS) or as a duration (10h, 1d, 35min). \
+                     '--change-newer-than' can be used as an alias.\n\
+                     Examples:\n    \
+                         --changed-within 2weeks\n    \
+                         --change-newer-than '2018-10-27 10:00:00'",
+                ),
+        )
+        .arg(
+            Arg::with_name("changed-before")
+                .long("changed-before")
+                .alias("change-older-than")
+                .alias("older")
+                .takes_value(true)
+                .value_name("date|dur")
+                .number_of_values(1)
+                .help("Filter by file modification time (older than)")
+                .long_help(
+                    "Filter results based on the file modification time. The argument can be provided \
+                     as a specific point in time (YYYY-MM-DD HH:MM:SS) or as a duration (10h, 1d, 35min). \
+                     '--change-older-than' can be used as an alias.\n\
+                     Examples:\n    \
+                         --changed-before '2018-10-27 10:00:00'\n    \
+                         --change-older-than 2weeks",
+                ),
+        )
+        .arg(
+            Arg::with_name("max-results")
+                .long("max-results")
+                .takes_value(true)
+                .value_name("count")
+                // We currently do not support --max-results in combination with
+                // program execution because the results that come up in a --max-results
+                // search are non-deterministic. Users might think that they can run the
+                // same search with `--exec rm` attached and get a reliable removal of
+                // the files they saw in the previous search.
+                .conflicts_with_all(&["exec", "exec-batch", "list-details"])
+                .hidden_short_help(true)
+                .long_help("Limit the number of search results to 'count' and quit immediately."),
+        )
+        .arg(
+            Arg::with_name("max-one-result")
+                .short("1")
+                .hidden_short_help(true)
+                .overrides_with("max-results")
+                .conflicts_with_all(&["exec", "exec-batch", "list-details"])
+                .long_help("Limit the search to a single result and quit immediately. \
+                                This is an alias for '--max-results=1'.")
+        )
+        .arg(
+            Arg::with_name("show-errors")
+                .long("show-errors")
+                .hidden_short_help(true)
+                .overrides_with("show-errors")
+                .long_help(
+                    "Enable the display of filesystem errors for situations such as \
+                         insufficient permissions or dead symlinks.",
+                ),
+        )
+        .arg(
+            Arg::with_name("base-directory")
+                .long("base-directory")
+                .takes_value(true)
+                .value_name("path")
+                .number_of_values(1)
+                .hidden_short_help(true)
+                .long_help(
+                    "Change the current working directory of fd to the provided path. This \
+                         means that search results will be shown with respect to the given base \
+                         path. Note that relative paths which are passed to fd via the positional \
+                         <path> argument or the '--search-path' option will also be resolved \
+                         relative to this directory.",
+                ),
+        )
+        .arg(
+            Arg::with_name("pattern").help(
+                "the search pattern (a regular expression, unless '--glob' is used; optional)",
+            ).long_help(
+                "the search pattern which is either a regular expression (default) or a glob \
+                 pattern (if --glob is used). If no pattern has been specified, every entry \
+                 is considered a match. If your pattern starts with a dash (-), make sure to \
+                 pass '--' first, or it will be considered as a flag (fd -- '-foo').")
+        )
+        .arg(
+            Arg::with_name("path-separator")
+                .takes_value(true)
+                .value_name("separator")
+                .long("path-separator")
+                .hidden_short_help(true)
+                .long_help(
+                    "Set the path separator to use when printing file paths. The default is \
+                         the OS-specific separator ('/' on Unix, '\\' on Windows).",
+                ),
+        )
+        .arg(
+            Arg::with_name("path")
+                .multiple(true)
+                .help("the root directory for the filesystem search (optional)")
+                .long_help(
+                    "The directory where the filesystem search is rooted (optional). If \
+                         omitted, search the current working directory.",
+                ),
+        )
+        .arg(
+            Arg::with_name("search-path")
+                .long("search-path")
+                .takes_value(true)
+                .conflicts_with("path")
+                .multiple(true)
+                .hidden_short_help(true)
+                .number_of_values(1)
+                .long_help(
+                    "Provide paths to search as an alternative to the positional <path> \
+                         argument. Changes the usage to `fd [FLAGS/OPTIONS] --search-path <path> \
+                         --search-path <path2> [<pattern>]`",
+                ),
+        );
 
-#[cfg_attr(rustfmt, rustfmt_skip)]
-fn usage() -> HashMap<&'static str, Help> {
-    let mut h = HashMap::new();
-    doc!(h, "hidden"
-        , "Search hidden files and directories"
-        , "Include hidden directories and files in the search results (default: hidden files \
-           and directories are skipped).");
-    doc!(h, "no-ignore"
-        , "Do not respect .(git)ignore files"
-        , "Show search results from files and directories that would otherwise be ignored by \
-            '.*ignore' files.");
-    doc!(h, "no-ignore-vcs"
-        , "Do not respect .gitignore files"
-        , "Show search results from files and directories that would otherwise be ignored by \
-            '.gitignore' files.");
-    doc!(h, "case-sensitive"
-        , "Case-sensitive search (default: smart case)"
-        , "Perform a case-sensitive search. By default, fd uses case-insensitive searches, \
-           unless the pattern contains an uppercase character (smart case).");
-    doc!(h, "ignore-case"
-        , "Case-insensitive search (default: smart case)"
-        , "Perform a case-insensitive search. By default, fd uses case-insensitive searches, \
-           unless the pattern contains an uppercase character (smart case).");
-    doc!(h, "absolute-path"
-        , "Show absolute instead of relative paths"
-        , "Shows the full path starting from the root as opposed to relative paths.");
-    doc!(h, "follow"
-        , "Follow symbolic links"
-        , "By default, fd does not descend into symlinked directories. Using this flag, symbolic \
-           links are also traversed.");
-    doc!(h, "full-path"
-        , "Search full path (default: file-/dirname only)"
-        , "By default, the search pattern is only matched against the filename (or directory \
-           name). Using this flag, the pattern is matched against the full path.");
-    doc!(h, "null_separator"
-        , "Separate results by the null character"
-        , "Separate search results by the null character (instead of newlines). Useful for \
-           piping results to 'xargs'.");
-    doc!(h, "depth"
-        , "Set maximum search depth (default: none)"
-        , "Limit the directory traversal to a given depth. By default, there is no limit \
-           on the search depth.");
-    doc!(h, "file-type"
-        , "Filter by type: f(ile), d(irectory), (sym)l(ink)"
-        , "Filter the search by type (multiple allowable filetypes can be specified):\n  \
-             'f' or 'file':         regular files\n  \
-             'd' or 'directory':    directories\n  \
-             'l' or 'symlink':      symbolic links");
-    doc!(h, "extension"
-        , "Filter by file extension"
-        , "(Additionally) filter search results by their file extension. Multiple allowable file \
-           extensions can be specified.");
-    doc!(h, "exec"
-        , "Execute a command for each search result"
-        , "Execute a command for each search result.\n\
-           All arguments following --exec are taken to be arguments to the command until the \
-           argument ';' is encountered.\n\
-           Each occurrence of the following placeholders is substituted by a path derived from the \
-           current search result before the command is executed:\n  \
-             '{}':   path\n  \
-             '{/}':  basename\n  \
-             '{//}': parent directory\n  \
-             '{.}':  path without file extension\n  \
-             '{/.}': basename without file extension");
-    doc!(h, "exclude"
-        , "Exclude entries that match the given glob pattern"
-        , "Exclude files/directories that match the given glob pattern. This overrides any \
-           other ignore logic. Multiple exclude patterns can be specified.");
-    doc!(h, "color"
-        , "When to use colors: never, *auto*, always"
-        , "Declare when to use color for the pattern match output:\n  \
-             'auto':      show colors if the output goes to an interactive console (default)\n  \
-             'never':     do not use colorized output\n  \
-             'always':    always use colorized output");
-    doc!(h, "threads"
-        , "Set number of threads to use for searching & executing"
-        , "Set number of threads to use for searching & executing (default: number of available \
-           CPU cores)");
-    doc!(h, "max-buffer-time"
-        , "the time (in ms) to buffer, before streaming to the console"
-        , "Amount of time in milliseconds to buffer, before streaming the search results to\
-           the console.");
-    doc!(h, "pattern"
-        , "the search pattern, a regular expression (optional)");
-    doc!(h, "path"
-        , "the root directory for the filesystem search (optional)"
-        , "The directory where the filesystem search is rooted (optional). \
-           If omitted, search the current working directory.");
-    doc!(h, "rg-alias-hidden-ignore"
-        , "Alias for no-ignore and/or hidden"
-        , "Alias for no-ignore ('u') and no-ignore and hidden ('uu')");
+    if cfg!(unix) {
+        app = app.arg(
+            Arg::with_name("owner")
+                .long("owner")
+                .short("o")
+                .takes_value(true)
+                .value_name("user:group")
+                .help("Filter by owning user and/or group")
+                .long_help(
+                    "Filter files by their user and/or group. \
+                     Format: [(user|uid)][:(group|gid)]. Either side is optional. \
+                     Precede either side with a '!' to exclude files instead.\n\
+                     Examples:\n    \
+                         --owner john\n    \
+                         --owner :students\n    \
+                         --owner '!john:students'",
+                ),
+        );
+    }
 
-    h
+    // Make `--one-file-system` available only on Unix and Windows platforms, as per the
+    // restrictions on the corresponding option in the `ignore` crate.
+    // Provide aliases `mount` and `xdev` for people coming from `find`.
+    if cfg!(any(unix, windows)) {
+        app = app.arg(
+            Arg::with_name("one-file-system")
+                .long("one-file-system")
+                .aliases(&["mount", "xdev"])
+                .hidden_short_help(true)
+                .long_help(
+                    "By default, fd will traverse the file system tree as far as other options \
+                     dictate. With this flag, fd ensures that it does not descend into a \
+                     different file system than the one it started in. Comparable to the -mount \
+                     or -xdev filters of find(1).",
+                ),
+        );
+    }
+
+    app
 }

src/error.rs

@@ -0,0 +1,3 @@
+pub fn print_error(msg: impl Into<String>) {
+    eprintln!("[fd error]: {}", msg.into());
+}

src/exec/command.rs

@@ -1,18 +1,13 @@
-// Copyright (c) 2017 fd developers
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0>
-// or the MIT license <LICENSE-MIT or http://opensource.org/licenses/MIT>,
-// at your option. All files in the project carrying such
-// notice may not be copied, modified, or distributed except
-// according to those terms.
-
-use std::process::Command;
-use std::sync::{Arc, Mutex};
 use std::io;
 use std::io::Write;
+use std::process::Command;
+use std::sync::Mutex;
+
+use crate::error::print_error;
+use crate::exit_codes::ExitCode;
 
 /// Executes a command.
-pub fn execute_command(mut cmd: Command, out_perm: Arc<Mutex<()>>) {
+pub fn execute_command(mut cmd: Command, out_perm: &Mutex<()>) -> ExitCode {
     // Spawn the supplied command.
     let output = cmd.output();
 
@@ -28,13 +23,20 @@ pub fn execute_command(mut cmd: Command, out_perm: Arc<Mutex<()>>) {
 
             let _ = stdout.lock().write_all(&output.stdout);
             let _ = stderr.lock().write_all(&output.stderr);
+
+            if output.status.code() == Some(0) {
+                ExitCode::Success
+            } else {
+                ExitCode::GeneralError
+            }
+        }
+        Err(ref why) if why.kind() == io::ErrorKind::NotFound => {
+            print_error(format!("Command not found: {:?}", cmd));
+            ExitCode::GeneralError
         }
         Err(why) => {
-            if why.kind() == io::ErrorKind::NotFound {
-                eprintln!("fd: execution error: command not found");
-            } else {
-                eprintln!("fd: execution error: {}", why);
-            }
+            print_error(format!("Problem while executing command: {}", why));
+            ExitCode::GeneralError
         }
     }
 }

src/exec/input.rs

@@ -1,165 +1,87 @@
-// Copyright (c) 2017 fd developers
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0>
-// or the MIT license <LICENSE-MIT or http://opensource.org/licenses/MIT>,
-// at your option. All files in the project carrying such
-// notice may not be copied, modified, or distributed except
-// according to those terms.
+use std::ffi::{OsStr, OsString};
+use std::path::{Path, PathBuf};
 
-use std::path::MAIN_SEPARATOR;
+use crate::filesystem::strip_current_dir;
 
 /// Removes the parent component of the path
-pub fn basename(path: &str) -> &str {
-    let mut index = 0;
-    for (id, character) in path.char_indices() {
-        if character == MAIN_SEPARATOR {
-            index = id;
-        }
-    }
-
-    // FIXME: On Windows, should return what for C:file.txt D:file.txt and \\server\share ?
-    if index != 0 {
-        return &path[index + 1..];
-    }
-
-    path
+pub fn basename(path: &Path) -> &OsStr {
+    path.file_name().unwrap_or_else(|| path.as_os_str())
 }
 
 /// Removes the extension from the path
-pub fn remove_extension(path: &str) -> &str {
-    let mut has_dir = false;
-    let mut dir_index = 0;
-    let mut ext_index = 0;
+pub fn remove_extension(path: &Path) -> OsString {
+    let dirname = dirname(path);
+    let stem = path.file_stem().unwrap_or_else(|| path.as_os_str());
 
-    for (id, character) in path.char_indices() {
-        if character == MAIN_SEPARATOR {
-            has_dir = true;
-            dir_index = id;
-        }
-        if character == '.' {
-            ext_index = id;
-        }
-    }
+    let path = PathBuf::from(dirname).join(stem);
 
-    // Account for hidden files and directories
-    if ext_index != 0 && (!has_dir || dir_index + 2 <= ext_index) {
-        return &path[0..ext_index];
-    }
-
-    path
+    strip_current_dir(&path).to_owned().into_os_string()
 }
 
 /// Removes the basename from the path.
-pub fn dirname(path: &str) -> &str {
-    let mut has_dir = false;
-    let mut index = 0;
-    for (id, character) in path.char_indices() {
-        if character == MAIN_SEPARATOR {
-            has_dir = true;
-            index = id;
-        }
-    }
-
-    // FIXME: On Windows, return what for C:file.txt D:file.txt and \\server\share ?
-    if !has_dir {
-        "."
-    } else if index == 0 {
-        &path[..1]
-    } else {
-        &path[0..index]
-    }
+pub fn dirname(path: &Path) -> OsString {
+    path.parent()
+        .map(|p| {
+            if p == OsStr::new("") {
+                OsString::from(".")
+            } else {
+                p.as_os_str().to_owned()
+            }
+        })
+        .unwrap_or_else(|| path.as_os_str().to_owned())
 }
 
 #[cfg(test)]
-mod tests {
-    use super::{basename, dirname, remove_extension, MAIN_SEPARATOR};
+mod path_tests {
+    use super::*;
+    use std::path::MAIN_SEPARATOR;
 
     fn correct(input: &str) -> String {
         input.replace('/', &MAIN_SEPARATOR.to_string())
     }
 
-    #[test]
-    fn path_remove_ext_simple() {
-        assert_eq!(remove_extension("foo.txt"), "foo");
+    macro_rules! func_tests {
+        ($($name:ident: $func:ident for $input:expr => $output:expr)+) => {
+            $(
+                #[test]
+                fn $name() {
+                    let input_path = PathBuf::from(&correct($input));
+                    let output_string = OsString::from(correct($output));
+                    assert_eq!($func(&input_path), output_string);
+                }
+            )+
+        }
+    }
+
+    func_tests! {
+        remove_ext_simple:  remove_extension  for  "foo.txt"      =>  "foo"
+        remove_ext_dir:     remove_extension  for  "dir/foo.txt"  =>  "dir/foo"
+        hidden:             remove_extension  for  ".foo"         =>  ".foo"
+        remove_ext_utf8:    remove_extension  for  "💖.txt"       =>  "💖"
+        remove_ext_empty:   remove_extension  for  ""             =>  ""
+
+        basename_simple:  basename  for  "foo.txt"      =>  "foo.txt"
+        basename_dir:     basename  for  "dir/foo.txt"  =>  "foo.txt"
+        basename_empty:   basename  for  ""             =>  ""
+        basename_utf8_0:  basename  for  "💖/foo.txt"   =>  "foo.txt"
+        basename_utf8_1:  basename  for  "dir/💖.txt"   =>  "💖.txt"
+
+        dirname_simple:  dirname  for  "foo.txt"      =>  "."
+        dirname_dir:     dirname  for  "dir/foo.txt"  =>  "dir"
+        dirname_utf8_0:  dirname  for  "💖/foo.txt"   =>  "💖"
+        dirname_utf8_1:  dirname  for  "dir/💖.txt"   =>  "dir"
     }
 
     #[test]
-    fn path_remove_ext_dir() {
-        assert_eq!(
-            remove_extension(&correct("dir/foo.txt")),
-            correct("dir/foo")
-        );
+    #[cfg(windows)]
+    fn dirname_root() {
+        assert_eq!(dirname(&PathBuf::from("C:")), OsString::from("C:"));
+        assert_eq!(dirname(&PathBuf::from("\\")), OsString::from("\\"));
     }
 
     #[test]
-    fn path_hidden() {
-        assert_eq!(remove_extension(".foo"), ".foo")
-    }
-
-    #[test]
-    fn path_remove_ext_utf8() {
-        assert_eq!(remove_extension("💖.txt"), "💖");
-    }
-
-    #[test]
-    fn path_remove_ext_empty() {
-        assert_eq!(remove_extension(""), "");
-    }
-
-    #[test]
-    fn path_basename_simple() {
-        assert_eq!(basename("foo.txt"), "foo.txt");
-    }
-
-    #[test]
-    fn path_basename_no_ext() {
-        assert_eq!(remove_extension(basename("foo.txt")), "foo");
-    }
-
-    #[test]
-    fn path_basename_dir() {
-        assert_eq!(basename(&correct("dir/foo.txt")), "foo.txt");
-    }
-
-    #[test]
-    fn path_basename_empty() {
-        assert_eq!(basename(""), "");
-    }
-
-    #[test]
-    fn path_basename_utf8() {
-        assert_eq!(basename(&correct("💖/foo.txt")), "foo.txt");
-        assert_eq!(basename(&correct("dir/💖.txt")), "💖.txt");
-    }
-
-    #[test]
-    fn path_dirname_simple() {
-        assert_eq!(dirname("foo.txt"), ".");
-    }
-
-    #[test]
-    fn path_dirname_dir() {
-        assert_eq!(dirname(&correct("dir/foo.txt")), "dir");
-    }
-
-    #[test]
-    fn path_dirname_utf8() {
-        assert_eq!(dirname(&correct("💖/foo.txt")), "💖");
-        assert_eq!(dirname(&correct("dir/💖.txt")), "dir");
-    }
-
-    #[test]
-    fn path_dirname_empty() {
-        assert_eq!(dirname(""), ".");
-    }
-
-    #[test]
-    fn path_dirname_root() {
-        #[cfg(windows)]
-        assert_eq!(dirname("C:\\"), "C:");
-        #[cfg(windows)]
-        assert_eq!(dirname("\\"), "\\");
-        #[cfg(not(windows))]
-        assert_eq!(dirname("/"), "/");
+    #[cfg(not(windows))]
+    fn dirname_root() {
+        assert_eq!(dirname(&PathBuf::from("/")), OsString::from("/"));
     }
 }

src/exec/job.rs

@@ -1,35 +1,62 @@
-// Copyright (c) 2017 fd developers
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0>
-// or the MIT license <LICENSE-MIT or http://opensource.org/licenses/MIT>,
-// at your option. All files in the project carrying such
-// notice may not be copied, modified, or distributed except
-// according to those terms.
-
 use std::path::PathBuf;
-use std::sync::{Arc, Mutex};
 use std::sync::mpsc::Receiver;
+use std::sync::{Arc, Mutex};
+
+use crate::error::print_error;
+use crate::exit_codes::{merge_exitcodes, ExitCode};
+use crate::walk::WorkerResult;
 
 use super::CommandTemplate;
 
 /// An event loop that listens for inputs from the `rx` receiver. Each received input will
 /// generate a command with the supplied command template. The generated command will then
 /// be executed, and this process will continue until the receiver's sender has closed.
-pub fn job(rx: Arc<Mutex<Receiver<PathBuf>>>, cmd: Arc<CommandTemplate>, out_perm: Arc<Mutex<()>>) {
+pub fn job(
+    rx: Arc<Mutex<Receiver<WorkerResult>>>,
+    cmd: Arc<CommandTemplate>,
+    out_perm: Arc<Mutex<()>>,
+    show_filesystem_errors: bool,
+) -> ExitCode {
+    let mut results: Vec<ExitCode> = Vec::new();
     loop {
         // Create a lock on the shared receiver for this thread.
         let lock = rx.lock().unwrap();
 
-        // Obtain the next path from the receiver, else if the channel
+        // Obtain the next result from the receiver, else if the channel
         // has closed, exit from the loop
         let value: PathBuf = match lock.recv() {
-            Ok(value) => value,
+            Ok(WorkerResult::Entry(val)) => val,
+            Ok(WorkerResult::Error(err)) => {
+                if show_filesystem_errors {
+                    print_error(err.to_string());
+                }
+                continue;
+            }
             Err(_) => break,
         };
 
-        // Drop the lock so that other threads can read from the the receiver.
+        // Drop the lock so that other threads can read from the receiver.
         drop(lock);
-        // Generate a command and execute it.
-        cmd.generate_and_execute(&value, Arc::clone(&out_perm));
+        // Generate a command, execute it and store its exit code.
+        results.push(cmd.generate_and_execute(&value, Arc::clone(&out_perm)))
     }
+    // Returns error in case of any error.
+    merge_exitcodes(&results)
+}
+
+pub fn batch(
+    rx: Receiver<WorkerResult>,
+    cmd: &CommandTemplate,
+    show_filesystem_errors: bool,
+) -> ExitCode {
+    let paths = rx.iter().filter_map(|value| match value {
+        WorkerResult::Entry(val) => Some(val),
+        WorkerResult::Error(err) => {
+            if show_filesystem_errors {
+                print_error(err.to_string());
+            }
+            None
+        }
+    });
+    cmd.generate_and_execute_batch(paths)
 }

src/exec/mod.rs

@@ -1,28 +1,33 @@
-// Copyright (c) 2017 fd developers
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0>
-// or the MIT license <LICENSE-MIT or http://opensource.org/licenses/MIT>,
-// at your option. All files in the project carrying such
-// notice may not be copied, modified, or distributed except
-// according to those terms.
-
-// TODO: Possible optimization could avoid pushing characters on a buffer.
 mod command;
-mod token;
-mod job;
 mod input;
+mod job;
+mod token;
 
-use std::borrow::Cow;
-use std::path::Path;
-use std::process::Command;
+use std::ffi::OsString;
+use std::path::{Path, PathBuf};
+use std::process::{Command, Stdio};
 use std::sync::{Arc, Mutex};
 
+use anyhow::{anyhow, Result};
+use lazy_static::lazy_static;
 use regex::Regex;
 
-use self::input::{basename, dirname, remove_extension};
+use crate::exit_codes::ExitCode;
+use crate::filesystem::strip_current_dir;
+
 use self::command::execute_command;
+use self::input::{basename, dirname, remove_extension};
+pub use self::job::{batch, job};
 use self::token::Token;
-pub use self::job::job;
+
+/// Execution mode of the command
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum ExecutionMode {
+    /// Command is executed for each search result
+    OneByOne,
+    /// Command is run for a batch of results at once
+    Batch,
+}
 
 /// Represents a template that is utilized to generate command strings.
 ///
@@ -31,10 +36,36 @@ pub use self::job::job;
 #[derive(Debug, Clone, PartialEq)]
 pub struct CommandTemplate {
     args: Vec<ArgumentTemplate>,
+    mode: ExecutionMode,
 }
 
 impl CommandTemplate {
     pub fn new<I, S>(input: I) -> CommandTemplate
+    where
+        I: IntoIterator<Item = S>,
+        S: AsRef<str>,
+    {
+        Self::build(input, ExecutionMode::OneByOne)
+    }
+
+    pub fn new_batch<I, S>(input: I) -> Result<CommandTemplate>
+    where
+        I: IntoIterator<Item = S>,
+        S: AsRef<str>,
+    {
+        let cmd = Self::build(input, ExecutionMode::Batch);
+        if cmd.number_of_tokens() > 1 {
+            return Err(anyhow!("Only one placeholder allowed for batch commands"));
+        }
+        if cmd.args[0].has_tokens() {
+            return Err(anyhow!(
+                "First argument of exec-batch is expected to be a fixed executable"
+            ));
+        }
+        Ok(cmd)
+    }
+
+    fn build<I, S>(input: I, mode: ExecutionMode) -> CommandTemplate
     where
         I: IntoIterator<Item = S>,
         S: AsRef<str>,
@@ -66,7 +97,7 @@ impl CommandTemplate {
                     "{/}" => tokens.push(Token::Basename),
                     "{//}" => tokens.push(Token::Parent),
                     "{/.}" => tokens.push(Token::BasenameNoExt),
-                    _ => panic!("Unhandled placeholder"),
+                    _ => unreachable!("Unhandled placeholder"),
                 }
 
                 has_placeholder = true;
@@ -91,26 +122,64 @@ impl CommandTemplate {
             args.push(ArgumentTemplate::Tokens(vec![Token::Placeholder]));
         }
 
-        CommandTemplate { args: args }
+        CommandTemplate { args, mode }
+    }
+
+    fn number_of_tokens(&self) -> usize {
+        self.args.iter().filter(|arg| arg.has_tokens()).count()
     }
 
     /// Generates and executes a command.
     ///
     /// Using the internal `args` field, and a supplied `input` variable, a `Command` will be
     /// build. Once all arguments have been processed, the command is executed.
-    pub fn generate_and_execute(&self, input: &Path, out_perm: Arc<Mutex<()>>) {
-        let input = input
-            .strip_prefix(".")
-            .unwrap_or(input)
-            .to_string_lossy()
-            .into_owned();
+    pub fn generate_and_execute(&self, input: &Path, out_perm: Arc<Mutex<()>>) -> ExitCode {
+        let input = strip_current_dir(input);
 
-        let mut cmd = Command::new(self.args[0].generate(&input).as_ref());
+        let mut cmd = Command::new(self.args[0].generate(&input));
         for arg in &self.args[1..] {
-            cmd.arg(arg.generate(&input).as_ref());
+            cmd.arg(arg.generate(&input));
         }
 
-        execute_command(cmd, out_perm)
+        execute_command(cmd, &out_perm)
+    }
+
+    pub fn in_batch_mode(&self) -> bool {
+        self.mode == ExecutionMode::Batch
+    }
+
+    pub fn generate_and_execute_batch<I>(&self, paths: I) -> ExitCode
+    where
+        I: Iterator<Item = PathBuf>,
+    {
+        let mut cmd = Command::new(self.args[0].generate(""));
+        cmd.stdin(Stdio::inherit());
+        cmd.stdout(Stdio::inherit());
+        cmd.stderr(Stdio::inherit());
+
+        let mut paths: Vec<_> = paths.collect();
+        let mut has_path = false;
+
+        for arg in &self.args[1..] {
+            if arg.has_tokens() {
+                paths.sort();
+
+                // A single `Tokens` is expected
+                // So we can directly consume the iterator once and for all
+                for path in &mut paths {
+                    cmd.arg(arg.generate(strip_current_dir(path)));
+                    has_path = true;
+                }
+            } else {
+                cmd.arg(arg.generate(""));
+            }
+        }
+
+        if has_path {
+            execute_command(cmd, &Mutex::new(()))
+        } else {
+            ExitCode::Success
+        }
     }
 }
 
@@ -125,45 +194,59 @@ enum ArgumentTemplate {
 }
 
 impl ArgumentTemplate {
-    pub fn generate<'a>(&'a self, path: &str) -> Cow<'a, str> {
+    pub fn has_tokens(&self) -> bool {
+        match self {
+            ArgumentTemplate::Tokens(_) => true,
+            _ => false,
+        }
+    }
+
+    pub fn generate(&self, path: impl AsRef<Path>) -> OsString {
         use self::Token::*;
 
         match *self {
             ArgumentTemplate::Tokens(ref tokens) => {
-                let mut s = String::new();
+                let mut s = OsString::new();
                 for token in tokens {
                     match *token {
-                        Basename => s += basename(path),
-                        BasenameNoExt => s += remove_extension(basename(path)),
-                        NoExt => s += remove_extension(path),
-                        Parent => s += dirname(path),
-                        Placeholder => s += path,
-                        Text(ref string) => s += string,
+                        Basename => s.push(basename(path.as_ref())),
+                        BasenameNoExt => {
+                            s.push(remove_extension(&PathBuf::from(basename(path.as_ref()))))
+                        }
+                        NoExt => s.push(remove_extension(path.as_ref())),
+                        Parent => s.push(dirname(path.as_ref())),
+                        Placeholder => s.push(path.as_ref()),
+                        Text(ref string) => s.push(string),
                     }
                 }
-                Cow::Owned(s)
+                s
             }
-            ArgumentTemplate::Text(ref text) => Cow::Borrowed(text),
+            ArgumentTemplate::Text(ref text) => OsString::from(text),
         }
     }
 }
 
 #[cfg(test)]
 mod tests {
-    use super::{ArgumentTemplate, CommandTemplate, Token};
+    use super::*;
 
     #[test]
-    fn tokens() {
-        let expected = CommandTemplate {
-            args: vec![
-                ArgumentTemplate::Text("echo".into()),
-                ArgumentTemplate::Text("${SHELL}:".into()),
-                ArgumentTemplate::Tokens(vec![Token::Placeholder]),
-            ],
-        };
-
-        assert_eq!(CommandTemplate::new(&[&"echo", &"${SHELL}:"]), expected);
+    fn tokens_with_placeholder() {
+        assert_eq!(
+            CommandTemplate::new(&[&"echo", &"${SHELL}:"]),
+            CommandTemplate {
+                args: vec![
+                    ArgumentTemplate::Text("echo".into()),
+                    ArgumentTemplate::Text("${SHELL}:".into()),
+                    ArgumentTemplate::Tokens(vec![Token::Placeholder]),
+                ],
+                mode: ExecutionMode::OneByOne,
+            }
+        );
+    }
 
+    #[test]
+    fn tokens_with_no_extension() {
         assert_eq!(
             CommandTemplate::new(&["echo", "{.}"]),
             CommandTemplate {
@@ -171,7 +254,87 @@ mod tests {
                     ArgumentTemplate::Text("echo".into()),
                     ArgumentTemplate::Tokens(vec![Token::NoExt]),
                 ],
+                mode: ExecutionMode::OneByOne,
             }
         );
     }
+
+    #[test]
+    fn tokens_with_basename() {
+        assert_eq!(
+            CommandTemplate::new(&["echo", "{/}"]),
+            CommandTemplate {
+                args: vec![
+                    ArgumentTemplate::Text("echo".into()),
+                    ArgumentTemplate::Tokens(vec![Token::Basename]),
+                ],
+                mode: ExecutionMode::OneByOne,
+            }
+        );
+    }
+
+    #[test]
+    fn tokens_with_parent() {
+        assert_eq!(
+            CommandTemplate::new(&["echo", "{//}"]),
+            CommandTemplate {
+                args: vec![
+                    ArgumentTemplate::Text("echo".into()),
+                    ArgumentTemplate::Tokens(vec![Token::Parent]),
+                ],
+                mode: ExecutionMode::OneByOne,
+            }
+        );
+    }
+
+    #[test]
+    fn tokens_with_basename_no_extension() {
+        assert_eq!(
+            CommandTemplate::new(&["echo", "{/.}"]),
+            CommandTemplate {
+                args: vec![
+                    ArgumentTemplate::Text("echo".into()),
+                    ArgumentTemplate::Tokens(vec![Token::BasenameNoExt]),
+                ],
+                mode: ExecutionMode::OneByOne,
+            }
+        );
+    }
+
+    #[test]
+    fn tokens_multiple() {
+        assert_eq!(
+            CommandTemplate::new(&["cp", "{}", "{/.}.ext"]),
+            CommandTemplate {
+                args: vec![
+                    ArgumentTemplate::Text("cp".into()),
+                    ArgumentTemplate::Tokens(vec![Token::Placeholder]),
+                    ArgumentTemplate::Tokens(vec![
+                        Token::BasenameNoExt,
+                        Token::Text(".ext".into())
+                    ]),
+                ],
+                mode: ExecutionMode::OneByOne,
+            }
+        );
+    }
+
+    #[test]
+    fn tokens_single_batch() {
+        assert_eq!(
+            CommandTemplate::new_batch(&["echo", "{.}"]).unwrap(),
+            CommandTemplate {
+                args: vec![
+                    ArgumentTemplate::Text("echo".into()),
+                    ArgumentTemplate::Tokens(vec![Token::NoExt]),
+                ],
+                mode: ExecutionMode::Batch,
+            }
+        );
+    }
+
+    #[test]
+    fn tokens_multiple_batch() {
+        assert!(CommandTemplate::new_batch(&["echo", "{.}", "{}"]).is_err());
+    }
 }

src/exec/token.rs

@@ -1,11 +1,3 @@
-// Copyright (c) 2017 fd developers
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0>
-// or the MIT license <LICENSE-MIT or http://opensource.org/licenses/MIT>,
-// at your option. All files in the project carrying such
-// notice may not be copied, modified, or distributed except
-// according to those terms.
-
 use std::fmt::{self, Display, Formatter};
 
 /// Designates what should be written to a buffer

src/exit_codes.rs

@@ -1,4 +1,72 @@
-/// exit code 1 represents a general error
-pub const ERROR: i32 = 1;
-/// exit code 130 represents a process killed by signal SIGINT
-pub const SIGINT: i32 = 130;
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum ExitCode {
+    Success,
+    GeneralError,
+    KilledBySigint,
+}
+
+impl Into<i32> for ExitCode {
+    fn into(self) -> i32 {
+        match self {
+            ExitCode::Success => 0,
+            ExitCode::GeneralError => 1,
+            ExitCode::KilledBySigint => 130,
+        }
+    }
+}
+
+impl ExitCode {
+    fn is_error(&self) -> bool {
+        *self != ExitCode::Success
+    }
+}
+
+pub fn merge_exitcodes(results: &[ExitCode]) -> ExitCode {
+    if results.iter().any(ExitCode::is_error) {
+        return ExitCode::GeneralError;
+    }
+    ExitCode::Success
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn success_when_no_results() {
+        assert_eq!(merge_exitcodes(&[]), ExitCode::Success);
+    }
+
+    #[test]
+    fn general_error_if_at_least_one_error() {
+        assert_eq!(
+            merge_exitcodes(&[ExitCode::GeneralError]),
+            ExitCode::GeneralError
+        );
+        assert_eq!(
+            merge_exitcodes(&[ExitCode::KilledBySigint]),
+            ExitCode::GeneralError
+        );
+        assert_eq!(
+            merge_exitcodes(&[ExitCode::KilledBySigint, ExitCode::Success]),
+            ExitCode::GeneralError
+        );
+        assert_eq!(
+            merge_exitcodes(&[ExitCode::Success, ExitCode::GeneralError]),
+            ExitCode::GeneralError
+        );
+        assert_eq!(
+            merge_exitcodes(&[ExitCode::GeneralError, ExitCode::KilledBySigint]),
+            ExitCode::GeneralError
+        );
+    }
+
+    #[test]
+    fn success_if_no_error() {
+        assert_eq!(merge_exitcodes(&[ExitCode::Success]), ExitCode::Success);
+        assert_eq!(
+            merge_exitcodes(&[ExitCode::Success, ExitCode::Success]),
+            ExitCode::Success
+        );
+    }
+}

src/filesystem.rs

@@ -0,0 +1,129 @@
+use std::borrow::Cow;
+use std::env::current_dir;
+use std::ffi::OsStr;
+use std::fs;
+use std::io;
+#[cfg(any(unix, target_os = "redox"))]
+use std::os::unix::fs::{FileTypeExt, PermissionsExt};
+use std::path::{Path, PathBuf};
+
+use crate::walk;
+
+pub fn path_absolute_form(path: &Path) -> io::Result<PathBuf> {
+    if path.is_absolute() {
+        return Ok(path.to_path_buf());
+    }
+
+    let path = path.strip_prefix(".").unwrap_or(path);
+    current_dir().map(|path_buf| path_buf.join(path))
+}
+
+pub fn absolute_path(path: &Path) -> io::Result<PathBuf> {
+    let path_buf = path_absolute_form(path)?;
+
+    #[cfg(windows)]
+    let path_buf = Path::new(
+        path_buf
+            .as_path()
+            .to_string_lossy()
+            .trim_start_matches(r"\\?\"),
+    )
+    .to_path_buf();
+
+    Ok(path_buf)
+}
+
+// Path::is_dir() is not guaranteed to be intuitively correct for "." and ".."
+// See: https://github.com/rust-lang/rust/issues/45302
+pub fn is_dir(path: &Path) -> bool {
+    path.is_dir() && (path.file_name().is_some() || path.canonicalize().is_ok())
+}
+
+#[cfg(any(unix, target_os = "redox"))]
+pub fn is_executable(md: &fs::Metadata) -> bool {
+    md.permissions().mode() & 0o111 != 0
+}
+
+#[cfg(windows)]
+pub fn is_executable(_: &fs::Metadata) -> bool {
+    false
+}
+
+pub fn is_empty(entry: &walk::DirEntry) -> bool {
+    if let Some(file_type) = entry.file_type() {
+        if file_type.is_dir() {
+            if let Ok(mut entries) = fs::read_dir(entry.path()) {
+                entries.next().is_none()
+            } else {
+                false
+            }
+        } else if file_type.is_file() {
+            entry.metadata().map(|m| m.len() == 0).unwrap_or(false)
+        } else {
+            false
+        }
+    } else {
+        false
+    }
+}
+
+#[cfg(any(unix, target_os = "redox"))]
+pub fn is_socket(ft: &fs::FileType) -> bool {
+    ft.is_socket()
+}
+
+#[cfg(windows)]
+pub fn is_socket(_: &fs::FileType) -> bool {
+    false
+}
+
+#[cfg(any(unix, target_os = "redox"))]
+pub fn is_pipe(ft: &fs::FileType) -> bool {
+    ft.is_fifo()
+}
+
+#[cfg(windows)]
+pub fn is_pipe(_: &fs::FileType) -> bool {
+    false
+}
+
+#[cfg(any(unix, target_os = "redox"))]
+pub fn osstr_to_bytes(input: &OsStr) -> Cow<[u8]> {
+    use std::os::unix::ffi::OsStrExt;
+    Cow::Borrowed(input.as_bytes())
+}
+
+#[cfg(windows)]
+pub fn osstr_to_bytes(input: &OsStr) -> Cow<[u8]> {
+    let string = input.to_string_lossy();
+
+    match string {
+        Cow::Owned(string) => Cow::Owned(string.into_bytes()),
+        Cow::Borrowed(string) => Cow::Borrowed(string.as_bytes()),
+    }
+}
+
+/// Remove the `./` prefix from a path.
+pub fn strip_current_dir(path: &Path) -> &Path {
+    path.strip_prefix(".").unwrap_or(path)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::strip_current_dir;
+    use std::path::Path;
+
+    #[test]
+    fn strip_current_dir_basic() {
+        assert_eq!(strip_current_dir(Path::new("./foo")), Path::new("foo"));
+        assert_eq!(strip_current_dir(Path::new("foo")), Path::new("foo"));
+        assert_eq!(
+            strip_current_dir(Path::new("./foo/bar/baz")),
+            Path::new("foo/bar/baz")
+        );
+        assert_eq!(
+            strip_current_dir(Path::new("foo/bar/baz")),
+            Path::new("foo/bar/baz")
+        );
+    }
+}

src/filetypes.rs

@@ -0,0 +1,24 @@
+/// Whether or not to show
+pub struct FileTypes {
+    pub files: bool,
+    pub directories: bool,
+    pub symlinks: bool,
+    pub sockets: bool,
+    pub pipes: bool,
+    pub executables_only: bool,
+    pub empty_only: bool,
+}
+
+impl Default for FileTypes {
+    fn default() -> FileTypes {
+        FileTypes {
+            files: false,
+            directories: false,
+            symlinks: false,
+            sockets: false,
+            pipes: false,
+            executables_only: false,
+            empty_only: false,
+        }
+    }
+}

src/filter/mod.rs

@@ -0,0 +1,11 @@
+pub use self::size::SizeFilter;
+pub use self::time::TimeFilter;
+
+#[cfg(unix)]
+pub use self::owner::OwnerFilter;
+
+mod size;
+mod time;
+
+#[cfg(unix)]
+mod owner;

src/filter/owner.rs

@@ -0,0 +1,123 @@
+use anyhow::{anyhow, Result};
+use std::fs;
+
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct OwnerFilter {
+    uid: Check<u32>,
+    gid: Check<u32>,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq)]
+enum Check<T> {
+    Equal(T),
+    NotEq(T),
+    Ignore,
+}
+
+impl OwnerFilter {
+    /// Parses an owner constraint
+    /// Returns an error if the string is invalid
+    /// Returns Ok(None) when string is acceptable but a noop (such as "" or ":")
+    pub fn from_string(input: &str) -> Result<Option<Self>> {
+        let mut it = input.split(':');
+        let (fst, snd) = (it.next(), it.next());
+
+        if it.next().is_some() {
+            return Err(anyhow!(
+                "more than one ':' present in owner string '{}'. See 'fd --help'.",
+                input
+            ));
+        }
+
+        let uid = Check::parse(fst, |s| {
+            s.parse()
+                .ok()
+                .or_else(|| users::get_user_by_name(s).map(|user| user.uid()))
+                .ok_or_else(|| anyhow!("'{}' is not a recognized user name", s))
+        })?;
+        let gid = Check::parse(snd, |s| {
+            s.parse()
+                .ok()
+                .or_else(|| users::get_group_by_name(s).map(|group| group.gid()))
+                .ok_or_else(|| anyhow!("'{}' is not a recognized group name", s))
+        })?;
+
+        if let (Check::Ignore, Check::Ignore) = (uid, gid) {
+            Ok(None)
+        } else {
+            Ok(Some(OwnerFilter { uid, gid }))
+        }
+    }
+
+    pub fn matches(&self, md: &fs::Metadata) -> bool {
+        use std::os::unix::fs::MetadataExt;
+
+        self.uid.check(md.uid()) && self.gid.check(md.gid())
+    }
+}
+
+impl<T: PartialEq> Check<T> {
+    fn check(&self, v: T) -> bool {
+        match self {
+            Check::Equal(x) => v == *x,
+            Check::NotEq(x) => v != *x,
+            Check::Ignore => true,
+        }
+    }
+
+    fn parse<F>(s: Option<&str>, f: F) -> Result<Self>
+    where
+        F: Fn(&str) -> Result<T>,
+    {
+        let (s, equality) = match s {
+            Some("") | None => return Ok(Check::Ignore),
+            Some(s) if s.starts_with('!') => (&s[1..], false),
+            Some(s) => (s, true),
+        };
+
+        f(s).map(|x| {
+            if equality {
+                Check::Equal(x)
+            } else {
+                Check::NotEq(x)
+            }
+        })
+    }
+}
+
+#[cfg(test)]
+mod owner_parsing {
+    use super::OwnerFilter;
+
+    macro_rules! owner_tests {
+        ($($name:ident: $value:expr => $result:pat,)*) => {
+            $(
+                #[test]
+                fn $name() {
+                    let o = OwnerFilter::from_string($value);
+                    match o {
+                        $result => {},
+                        _ => panic!("{:?} does not match {}", o, stringify!($result)),
+                    }
+                }
+            )*
+        };
+    }
+
+    use super::Check::*;
+    owner_tests! {
+        empty:      ""      => Ok(None),
+        uid_only:   "5"     => Ok(Some(OwnerFilter { uid: Equal(5), gid: Ignore     })),
+        uid_gid:    "9:3"   => Ok(Some(OwnerFilter { uid: Equal(9), gid: Equal(3)   })),
+        gid_only:   ":8"    => Ok(Some(OwnerFilter { uid: Ignore,   gid: Equal(8)   })),
+        colon_only: ":"     => Ok(None),
+        trailing:   "5:"    => Ok(Some(OwnerFilter { uid: Equal(5), gid: Ignore     })),
+
+        uid_negate: "!5"    => Ok(Some(OwnerFilter { uid: NotEq(5), gid: Ignore     })),
+        both_negate:"!4:!3" => Ok(Some(OwnerFilter { uid: NotEq(4), gid: NotEq(3)   })),
+        uid_not_gid:"6:!8"  => Ok(Some(OwnerFilter { uid: Equal(6), gid: NotEq(8)   })),
+
+        more_colons:"3:5:"  => Err(_),
+        only_colons:"::"    => Err(_),
+    }
+}

src/filter/size.rs

@@ -0,0 +1,212 @@
+use lazy_static::lazy_static;
+use regex::Regex;
+
+lazy_static! {
+    static ref SIZE_CAPTURES: Regex = Regex::new(r"(?i)^([+-]?)(\d+)(b|[kmgt]i?b?)$").unwrap();
+}
+
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum SizeFilter {
+    Max(u64),
+    Min(u64),
+    Equals(u64),
+}
+
+// SI prefixes (powers of 10)
+const KILO: u64 = 1000;
+const MEGA: u64 = KILO * 1000;
+const GIGA: u64 = MEGA * 1000;
+const TERA: u64 = GIGA * 1000;
+
+// Binary prefixes (powers of 2)
+const KIBI: u64 = 1024;
+const MEBI: u64 = KIBI * 1024;
+const GIBI: u64 = MEBI * 1024;
+const TEBI: u64 = GIBI * 1024;
+
+impl SizeFilter {
+    pub fn from_string(s: &str) -> Option<Self> {
+        if !SIZE_CAPTURES.is_match(s) {
+            return None;
+        }
+
+        let captures = SIZE_CAPTURES.captures(s)?;
+        let limit_kind = captures.get(1).map_or("+", |m| m.as_str());
+        let quantity = captures
+            .get(2)
+            .and_then(|v| v.as_str().parse::<u64>().ok())?;
+
+        let multiplier = match &captures.get(3).map_or("b", |m| m.as_str()).to_lowercase()[..] {
+            v if v.starts_with("ki") => KIBI,
+            v if v.starts_with('k') => KILO,
+            v if v.starts_with("mi") => MEBI,
+            v if v.starts_with('m') => MEGA,
+            v if v.starts_with("gi") => GIBI,
+            v if v.starts_with('g') => GIGA,
+            v if v.starts_with("ti") => TEBI,
+            v if v.starts_with('t') => TERA,
+            "b" => 1,
+            _ => return None,
+        };
+
+        let size = quantity * multiplier;
+        match limit_kind {
+            "+" => Some(SizeFilter::Min(size)),
+            "-" => Some(SizeFilter::Max(size)),
+            "" => Some(SizeFilter::Equals(size)),
+            _ => None,
+        }
+    }
+
+    pub fn is_within(&self, size: u64) -> bool {
+        match *self {
+            SizeFilter::Max(limit) => size <= limit,
+            SizeFilter::Min(limit) => size >= limit,
+            SizeFilter::Equals(limit) => size == limit,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    macro_rules! gen_size_filter_parse_test {
+        ($($name: ident: $val: expr,)*) => {
+            $(
+                #[test]
+                fn $name() {
+                    let (txt, expected) = $val;
+                    let actual = SizeFilter::from_string(txt).unwrap();
+                    assert_eq!(actual, expected);
+                }
+            )*
+        };
+    }
+
+    // Parsing and size conversion tests data. Ensure that each type gets properly interpreted.
+    // Call with higher base values to ensure expected multiplication (only need a couple)
+    gen_size_filter_parse_test! {
+        byte_plus:                ("+1b",     SizeFilter::Min(1)),
+        byte_plus_multiplier:     ("+10b",    SizeFilter::Min(10)),
+        byte_minus:               ("-1b",     SizeFilter::Max(1)),
+        kilo_plus:                ("+1k",     SizeFilter::Min(1000)),
+        kilo_plus_suffix:         ("+1kb",    SizeFilter::Min(1000)),
+        kilo_minus:               ("-1k",     SizeFilter::Max(1000)),
+        kilo_minus_multiplier:    ("-100k",   SizeFilter::Max(100000)),
+        kilo_minus_suffix:        ("-1kb",    SizeFilter::Max(1000)),
+        kilo_plus_upper:          ("+1K",     SizeFilter::Min(1000)),
+        kilo_plus_suffix_upper:   ("+1KB",    SizeFilter::Min(1000)),
+        kilo_minus_upper:         ("-1K",     SizeFilter::Max(1000)),
+        kilo_minus_suffix_upper:  ("-1Kb",    SizeFilter::Max(1000)),
+        kibi_plus:                ("+1ki",    SizeFilter::Min(1024)),
+        kibi_plus_multiplier:     ("+10ki",   SizeFilter::Min(10240)),
+        kibi_plus_suffix:         ("+1kib",   SizeFilter::Min(1024)),
+        kibi_minus:               ("-1ki",    SizeFilter::Max(1024)),
+        kibi_minus_multiplier:    ("-100ki",  SizeFilter::Max(102400)),
+        kibi_minus_suffix:        ("-1kib",   SizeFilter::Max(1024)),
+        kibi_plus_upper:          ("+1KI",    SizeFilter::Min(1024)),
+        kibi_plus_suffix_upper:   ("+1KiB",   SizeFilter::Min(1024)),
+        kibi_minus_upper:         ("-1Ki",    SizeFilter::Max(1024)),
+        kibi_minus_suffix_upper:  ("-1KIB",   SizeFilter::Max(1024)),
+        mega_plus:                ("+1m",     SizeFilter::Min(1000000)),
+        mega_plus_suffix:         ("+1mb",    SizeFilter::Min(1000000)),
+        mega_minus:               ("-1m",     SizeFilter::Max(1000000)),
+        mega_minus_suffix:        ("-1mb",    SizeFilter::Max(1000000)),
+        mega_plus_upper:          ("+1M",     SizeFilter::Min(1000000)),
+        mega_plus_suffix_upper:   ("+1MB",    SizeFilter::Min(1000000)),
+        mega_minus_upper:         ("-1M",     SizeFilter::Max(1000000)),
+        mega_minus_suffix_upper:  ("-1Mb",    SizeFilter::Max(1000000)),
+        mebi_plus:                ("+1mi",    SizeFilter::Min(1048576)),
+        mebi_plus_suffix:         ("+1mib",   SizeFilter::Min(1048576)),
+        mebi_minus:               ("-1mi",    SizeFilter::Max(1048576)),
+        mebi_minus_suffix:        ("-1mib",   SizeFilter::Max(1048576)),
+        mebi_plus_upper:          ("+1MI",    SizeFilter::Min(1048576)),
+        mebi_plus_suffix_upper:   ("+1MiB",   SizeFilter::Min(1048576)),
+        mebi_minus_upper:         ("-1Mi",    SizeFilter::Max(1048576)),
+        mebi_minus_suffix_upper:  ("-1MIB",   SizeFilter::Max(1048576)),
+        giga_plus:                ("+1g",     SizeFilter::Min(1000000000)),
+        giga_plus_suffix:         ("+1gb",    SizeFilter::Min(1000000000)),
+        giga_minus:               ("-1g",     SizeFilter::Max(1000000000)),
+        giga_minus_suffix:        ("-1gb",    SizeFilter::Max(1000000000)),
+        giga_plus_upper:          ("+1G",     SizeFilter::Min(1000000000)),
+        giga_plus_suffix_upper:   ("+1GB",    SizeFilter::Min(1000000000)),
+        giga_minus_upper:         ("-1G",     SizeFilter::Max(1000000000)),
+        giga_minus_suffix_upper:  ("-1Gb",    SizeFilter::Max(1000000000)),
+        gibi_plus:                ("+1gi",    SizeFilter::Min(1073741824)),
+        gibi_plus_suffix:         ("+1gib",   SizeFilter::Min(1073741824)),
+        gibi_minus:               ("-1gi",    SizeFilter::Max(1073741824)),
+        gibi_minus_suffix:        ("-1gib",   SizeFilter::Max(1073741824)),
+        gibi_plus_upper:          ("+1GI",    SizeFilter::Min(1073741824)),
+        gibi_plus_suffix_upper:   ("+1GiB",   SizeFilter::Min(1073741824)),
+        gibi_minus_upper:         ("-1Gi",    SizeFilter::Max(1073741824)),
+        gibi_minus_suffix_upper:  ("-1GIB",   SizeFilter::Max(1073741824)),
+        tera_plus:                ("+1t",     SizeFilter::Min(1000000000000)),
+        tera_plus_suffix:         ("+1tb",    SizeFilter::Min(1000000000000)),
+        tera_minus:               ("-1t",     SizeFilter::Max(1000000000000)),
+        tera_minus_suffix:        ("-1tb",    SizeFilter::Max(1000000000000)),
+        tera_plus_upper:          ("+1T",     SizeFilter::Min(1000000000000)),
+        tera_plus_suffix_upper:   ("+1TB",    SizeFilter::Min(1000000000000)),
+        tera_minus_upper:         ("-1T",     SizeFilter::Max(1000000000000)),
+        tera_minus_suffix_upper:  ("-1Tb",    SizeFilter::Max(1000000000000)),
+        tebi_plus:                ("+1ti",    SizeFilter::Min(1099511627776)),
+        tebi_plus_suffix:         ("+1tib",   SizeFilter::Min(1099511627776)),
+        tebi_minus:               ("-1ti",    SizeFilter::Max(1099511627776)),
+        tebi_minus_suffix:        ("-1tib",   SizeFilter::Max(1099511627776)),
+        tebi_plus_upper:          ("+1TI",    SizeFilter::Min(1099511627776)),
+        tebi_plus_suffix_upper:   ("+1TiB",   SizeFilter::Min(1099511627776)),
+        tebi_minus_upper:         ("-1Ti",    SizeFilter::Max(1099511627776)),
+        tebi_minus_suffix_upper:  ("-1TIB",   SizeFilter::Max(1099511627776)),
+    }
+
+    /// Invalid parse testing
+    macro_rules! gen_size_filter_failure {
+        ($($name:ident: $value:expr,)*) => {
+            $(
+                #[test]
+                fn $name() {
+                    let i = SizeFilter::from_string($value);
+                    assert!(i.is_none());
+                }
+            )*
+        };
+    }
+
+    // Invalid parse data
+    gen_size_filter_failure! {
+        ensure_missing_number_returns_none: "+g",
+        ensure_missing_unit_returns_none: "+18",
+        ensure_bad_format_returns_none_1: "$10M",
+        ensure_bad_format_returns_none_2: "badval",
+        ensure_bad_format_returns_none_3: "9999",
+        ensure_invalid_unit_returns_none_1: "+50a",
+        ensure_invalid_unit_returns_none_2: "-10v",
+        ensure_invalid_unit_returns_none_3: "+1Mv",
+        ensure_bib_format_returns_none: "+1bib",
+        ensure_bb_format_returns_none: "+1bb",
+    }
+
+    #[test]
+    fn is_within_less_than() {
+        let f = SizeFilter::from_string("-1k").unwrap();
+        assert!(f.is_within(999));
+    }
+
+    #[test]
+    fn is_within_less_than_equal() {
+        let f = SizeFilter::from_string("-1k").unwrap();
+        assert!(f.is_within(1000));
+    }
+
+    #[test]
+    fn is_within_greater_than() {
+        let f = SizeFilter::from_string("+1k").unwrap();
+        assert!(f.is_within(1001));
+    }
+
+    #[test]
+    fn is_within_greater_than_equal() {
+        let f = SizeFilter::from_string("+1K").unwrap();
+        assert!(f.is_within(1000));
+    }
+}

src/filter/time.rs

@@ -0,0 +1,80 @@
+use std::time::SystemTime;
+
+/// Filter based on time ranges.
+#[derive(Debug, PartialEq)]
+pub enum TimeFilter {
+    Before(SystemTime),
+    After(SystemTime),
+}
+
+impl TimeFilter {
+    fn from_str(ref_time: &SystemTime, s: &str) -> Option<SystemTime> {
+        humantime::parse_duration(s)
+            .map(|duration| *ref_time - duration)
+            .or_else(|_| humantime::parse_rfc3339_weak(s))
+            .or_else(|_| humantime::parse_rfc3339_weak(&(s.to_owned() + " 00:00:00")))
+            .ok()
+    }
+
+    pub fn before(ref_time: &SystemTime, s: &str) -> Option<TimeFilter> {
+        TimeFilter::from_str(ref_time, s).map(TimeFilter::Before)
+    }
+
+    pub fn after(ref_time: &SystemTime, s: &str) -> Option<TimeFilter> {
+        TimeFilter::from_str(ref_time, s).map(TimeFilter::After)
+    }
+
+    pub fn applies_to(&self, t: &SystemTime) -> bool {
+        match self {
+            TimeFilter::Before(limit) => t <= limit,
+            TimeFilter::After(limit) => t >= limit,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::time::Duration;
+
+    #[test]
+    fn is_time_filter_applicable() {
+        let ref_time = humantime::parse_rfc3339("2010-10-10T10:10:10Z").unwrap();
+        assert!(TimeFilter::after(&ref_time, "1min")
+            .unwrap()
+            .applies_to(&ref_time));
+        assert!(!TimeFilter::before(&ref_time, "1min")
+            .unwrap()
+            .applies_to(&ref_time));
+
+        let t1m_ago = ref_time - Duration::from_secs(60);
+        assert!(!TimeFilter::after(&ref_time, "30sec")
+            .unwrap()
+            .applies_to(&t1m_ago));
+        assert!(TimeFilter::after(&ref_time, "2min")
+            .unwrap()
+            .applies_to(&t1m_ago));
+
+        assert!(TimeFilter::before(&ref_time, "30sec")
+            .unwrap()
+            .applies_to(&t1m_ago));
+        assert!(!TimeFilter::before(&ref_time, "2min")
+            .unwrap()
+            .applies_to(&t1m_ago));
+
+        let t10s_before = "2010-10-10 10:10:00";
+        assert!(!TimeFilter::before(&ref_time, t10s_before)
+            .unwrap()
+            .applies_to(&ref_time));
+        assert!(TimeFilter::before(&ref_time, t10s_before)
+            .unwrap()
+            .applies_to(&t1m_ago));
+
+        assert!(TimeFilter::after(&ref_time, t10s_before)
+            .unwrap()
+            .applies_to(&ref_time));
+        assert!(!TimeFilter::after(&ref_time, t10s_before)
+            .unwrap()
+            .applies_to(&t1m_ago));
+    }
+}

src/fshelper/mod.rs

@@ -1,44 +0,0 @@
-// Copyright (c) 2017 fd developers
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0>
-// or the MIT license <LICENSE-MIT or http://opensource.org/licenses/MIT>,
-// at your option. All files in the project carrying such
-// notice may not be copied, modified, or distributed except
-// according to those terms.
-
-use std::env::current_dir;
-use std::path::{Path, PathBuf};
-use std::io;
-
-pub fn path_absolute_form(path: &Path) -> io::Result<PathBuf> {
-    if path.is_absolute() {
-        Ok(path.to_path_buf())
-    } else {
-        let path = path.strip_prefix(".").unwrap_or(path);
-        current_dir().map(|path_buf| path_buf.join(path))
-    }
-}
-
-pub fn absolute_path(path: &Path) -> io::Result<PathBuf> {
-    let path_buf = path_absolute_form(path)?;
-
-    #[cfg(windows)]
-    let path_buf = Path::new(
-        path_buf
-            .as_path()
-            .to_string_lossy()
-            .trim_left_matches(r"\\?\"),
-    ).to_path_buf();
-
-    Ok(path_buf)
-}
-
-// Path::is_dir() is not guarandteed to be intuitively correct for "." and ".."
-// See: https://github.com/rust-lang/rust/issues/45302
-pub fn is_dir(path: &Path) -> bool {
-    if path.file_name().is_some() {
-        path.is_dir()
-    } else {
-        path.is_dir() && path.canonicalize().is_ok()
-    }
-}

src/internal.rs

@@ -1,111 +0,0 @@
-// Copyright (c) 2017 fd developers
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0>
-// or the MIT license <LICENSE-MIT or http://opensource.org/licenses/MIT>,
-// at your option. All files in the project carrying such
-// notice may not be copied, modified, or distributed except
-// according to those terms.
-
-use std::collections::HashSet;
-use std::process;
-use std::time;
-use std::io::Write;
-
-use exec::CommandTemplate;
-use lscolors::LsColors;
-use walk::FileType;
-use regex_syntax::{Expr, ExprBuilder};
-
-/// Configuration options for *fd*.
-pub struct FdOptions {
-    /// Whether the search is case-sensitive or case-insensitive.
-    pub case_sensitive: bool,
-
-    /// Whether to search within the full file path or just the base name (filename or directory
-    /// name).
-    pub search_full_path: bool,
-
-    /// Whether to ignore hidden files and directories (or not).
-    pub ignore_hidden: bool,
-
-    /// Whether to respect ignore files (`.gitignore`, `.ignore`, ..) or not.
-    pub read_ignore: bool,
-
-    /// Whether to respect VCS ignore files (`.gitignore`, ..) or not.
-    pub read_gitignore: bool,
-
-    /// Whether to follow symlinks or not.
-    pub follow_links: bool,
-
-    /// Whether elements of output should be separated by a null character
-    pub null_separator: bool,
-
-    /// The maximum search depth, or `None` if no maximum search depth should be set.
-    ///
-    /// A depth of `1` includes all files under the current directory, a depth of `2` also includes
-    /// all files under subdirectories of the current directory, etc.
-    pub max_depth: Option<usize>,
-
-    /// The number of threads to use.
-    pub threads: usize,
-
-    /// Time to buffer results internally before streaming to the console. This is useful to
-    /// provide a sorted output, in case the total execution time is shorter than
-    /// `max_buffer_time`.
-    pub max_buffer_time: Option<time::Duration>,
-
-    /// `None` if the output should not be colorized. Otherwise, a `LsColors` instance that defines
-    /// how to style different filetypes.
-    pub ls_colors: Option<LsColors>,
-
-    /// The type of file to search for. All files other than the specified type will be ignored.
-    pub file_types: HashSet<FileType>,
-
-    /// The extension to search for. Only entries matching the extension will be included.
-    ///
-    /// The value (if present) will be a lowercase string without leading dots.
-    pub extensions: Option<HashSet<String>>,
-
-    /// If a value is supplied, each item found will be used to generate and execute commands.
-    pub command: Option<CommandTemplate>,
-
-    /// A list of glob patterns that should be excluded from the search.
-    pub exclude_patterns: Vec<String>,
-}
-
-/// Print error message to stderr and exit with status `1`.
-pub fn error(message: &str) -> ! {
-    writeln!(&mut ::std::io::stderr(), "{}", message).expect("Failed writing to stderr");
-    process::exit(1);
-}
-
-/// Determine if a regex pattern contains a literal uppercase character.
-pub fn pattern_has_uppercase_char(pattern: &str) -> bool {
-    ExprBuilder::new()
-        .parse(pattern)
-        .map(|expr| expr_has_uppercase_char(&expr))
-        .unwrap_or(false)
-}
-
-/// Determine if a regex expression contains a literal uppercase character.
-fn expr_has_uppercase_char(expr: &Expr) -> bool {
-    match *expr {
-        Expr::Literal { ref chars, .. } => chars.iter().any(|c| c.is_uppercase()),
-        Expr::Class(ref ranges) => ranges
-            .iter()
-            .any(|r| r.start.is_uppercase() || r.end.is_uppercase()),
-        Expr::Group { ref e, .. } | Expr::Repeat { ref e, .. } => expr_has_uppercase_char(e),
-        Expr::Concat(ref es) => es.iter().any(expr_has_uppercase_char),
-        Expr::Alternate(ref es) => es.iter().any(expr_has_uppercase_char),
-        _ => false,
-    }
-}
-
-/// Maximum size of the output buffer before flushing results to the console
-pub const MAX_BUFFER_LENGTH: usize = 1000;
-
-/// Exit code representing a general error
-pub const EXITCODE_ERROR: i32 = 1;
-
-/// Exit code representing that the process was killed by SIGINT
-pub const EXITCODE_SIGINT: i32 = 130;

src/lscolors/mod.rs

@@ -1,232 +0,0 @@
-// Copyright (c) 2017 fd developers
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0>
-// or the MIT license <LICENSE-MIT or http://opensource.org/licenses/MIT>,
-// at your option. All files in the project carrying such
-// notice may not be copied, modified, or distributed except
-// according to those terms.
-
-/// A parser for the `LS_COLORS` environment variable.
-
-use std::collections::HashMap;
-use ansi_term::{Colour, Style};
-
-/// Maps file extensions to ANSI colors / styles.
-pub type ExtensionStyles = HashMap<String, Style>;
-
-/// Maps filenames to ANSI colors / styles.
-pub type FilenameStyles = HashMap<String, Style>;
-
-const LS_CODES: &[&str] = &[
-    "no", "no", "fi", "rs", "di", "ln", "ln", "ln", "or", "mi", "pi", "pi", "so", "bd", "bd", "cd",
-    "cd", "do", "ex", "lc", "lc", "rc", "rc", "ec", "ec", "su", "su", "sg", "sg", "st", "ow", "ow",
-    "tw", "tw", "ca", "mh", "cl",
-];
-
-/// Defines how different file system entries should be colorized / styled.
-#[derive(Debug, PartialEq)]
-pub struct LsColors {
-    /// ANSI Style for directories.
-    pub directory: Style,
-
-    /// ANSI style for symbolic links.
-    pub symlink: Style,
-
-    /// ANSI style for executable files.
-    pub executable: Style,
-
-    /// A map that defines ANSI styles for different file extensions.
-    pub extensions: ExtensionStyles,
-
-    /// A map that defines ANSI styles for different specific filenames.
-    pub filenames: FilenameStyles,
-}
-
-impl Default for LsColors {
-    /// Get a default LsColors structure.
-    fn default() -> LsColors {
-        LsColors {
-            directory: Colour::Blue.bold(),
-            symlink: Colour::Cyan.normal(),
-            executable: Colour::Red.bold(),
-            extensions: HashMap::new(),
-            filenames: HashMap::new(),
-        }
-    }
-}
-
-impl LsColors {
-    /// Parse a single text-decoration code (normal, bold, italic, ...).
-    fn parse_decoration(code: &str) -> Option<fn(Colour) -> Style> {
-        match code {
-            "0" | "00" => Some(Colour::normal),
-            "1" | "01" => Some(Colour::bold),
-            "3" | "03" => Some(Colour::italic),
-            "4" | "04" => Some(Colour::underline),
-            _ => None,
-        }
-    }
-
-    /// Parse ANSI escape sequences like `38;5;10;1`.
-    fn parse_style(code: &str) -> Option<Style> {
-        let mut split = code.split(';');
-
-        if let Some(first) = split.next() {
-            // Try to match the first part as a text-decoration argument
-            let mut decoration = LsColors::parse_decoration(first);
-
-            let c1 = if decoration.is_none() {
-                Some(first)
-            } else {
-                split.next()
-            };
-            let c2 = split.next();
-            let c3 = split.next();
-
-            let color = if c1 == Some("38") && c2 == Some("5") {
-                let n_white = 7;
-                let n = if let Some(num) = c3 {
-                    u8::from_str_radix(num, 10).unwrap_or(n_white)
-                } else {
-                    n_white
-                };
-
-                Colour::Fixed(n)
-            } else if let Some(color_s) = c1 {
-                match color_s {
-                    "30" => Colour::Black,
-                    "31" => Colour::Red,
-                    "32" => Colour::Green,
-                    "33" => Colour::Yellow,
-                    "34" => Colour::Blue,
-                    "35" => Colour::Purple,
-                    "36" => Colour::Cyan,
-                    _ => Colour::White,
-                }
-            } else {
-                Colour::White
-            };
-
-            if decoration.is_none() {
-                // Try to find a decoration somewhere in the sequence
-                decoration = code.split(';').flat_map(LsColors::parse_decoration).next();
-            }
-
-            let ansi_style = decoration.unwrap_or(Colour::normal)(color);
-
-            Some(ansi_style)
-        } else {
-            None
-        }
-    }
-
-    /// Add a new `LS_COLORS` entry.
-    fn add_entry(&mut self, input: &str) {
-        let mut parts = input.trim().split('=');
-        if let Some(pattern) = parts.next() {
-            if let Some(style_code) = parts.next() {
-                // Ensure that the input was split into exactly two parts:
-                if !parts.next().is_none() {
-                    return;
-                }
-
-                if let Some(style) = LsColors::parse_style(style_code) {
-                    // Try to match against one of the known codes
-                    let res = LS_CODES.iter().find(|&&c| c == pattern);
-
-                    if let Some(code) = res {
-                        match code.as_ref() {
-                            "di" => self.directory = style,
-                            "ln" => self.symlink = style,
-                            "ex" => self.executable = style,
-                            _ => return,
-                        }
-                    } else if pattern.starts_with("*.") {
-                        let extension = String::from(pattern).split_off(2);
-                        self.extensions.insert(extension, style);
-                    } else if pattern.starts_with('*') {
-                        let filename = String::from(pattern).split_off(1);
-                        self.filenames.insert(filename, style);
-                    } else {
-                        // Unknown/corrupt pattern
-                        return;
-                    }
-                }
-            }
-        }
-    }
-
-    /// Generate a `LsColors` structure from a string.
-    pub fn from_string(input: &str) -> LsColors {
-        let mut lscolors = LsColors::default();
-
-        for s in input.split(':') {
-            lscolors.add_entry(s);
-        }
-
-        lscolors
-    }
-}
-
-#[test]
-fn test_parse_simple() {
-    assert_eq!(Some(Colour::Red.normal()), LsColors::parse_style("31"));
-}
-
-#[test]
-fn test_parse_decoration() {
-    assert_eq!(Some(Colour::Red.normal()), LsColors::parse_style("00;31"));
-
-    assert_eq!(Some(Colour::Blue.italic()), LsColors::parse_style("03;34"));
-
-    assert_eq!(Some(Colour::Cyan.bold()), LsColors::parse_style("01;36"));
-}
-
-#[test]
-fn test_parse_decoration_backwards() {
-    assert_eq!(Some(Colour::Blue.italic()), LsColors::parse_style("34;03"));
-
-    assert_eq!(Some(Colour::Cyan.bold()), LsColors::parse_style("36;01"));
-
-    assert_eq!(Some(Colour::Red.normal()), LsColors::parse_style("31;00"));
-}
-
-#[test]
-fn test_parse_256() {
-    assert_eq!(
-        Some(Colour::Fixed(115).normal()),
-        LsColors::parse_style("38;5;115")
-    );
-
-    assert_eq!(
-        Some(Colour::Fixed(115).normal()),
-        LsColors::parse_style("00;38;5;115")
-    );
-
-    assert_eq!(
-        Some(Colour::Fixed(119).bold()),
-        LsColors::parse_style("01;38;5;119")
-    );
-
-    assert_eq!(
-        Some(Colour::Fixed(119).bold()),
-        LsColors::parse_style("38;5;119;01")
-    );
-}
-
-#[test]
-fn test_from_string() {
-    assert_eq!(LsColors::default(), LsColors::from_string(&String::new()));
-
-    let result = LsColors::from_string(&String::from(
-        "rs=0:di=03;34:ln=01;36:*.foo=01;35:*README=33",
-    ));
-
-    assert_eq!(Colour::Blue.italic(), result.directory);
-    assert_eq!(Colour::Cyan.bold(), result.symlink);
-    assert_eq!(Some(&Colour::Purple.bold()), result.extensions.get("foo"));
-    assert_eq!(
-        Some(&Colour::Yellow.normal()),
-        result.filenames.get("README")
-    );
-}

src/main.rs

@@ -1,172 +1,472 @@
-// Copyright (c) 2017 fd developers
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0>
-// or the MIT license <LICENSE-MIT or http://opensource.org/licenses/MIT>,
-// at your option. All files in the project carrying such
-// notice may not be copied, modified, or distributed except
-// according to those terms.
-
-extern crate ansi_term;
-extern crate atty;
-#[macro_use]
-extern crate clap;
-extern crate ignore;
-#[macro_use]
-extern crate lazy_static;
-#[cfg(all(unix, not(target_os = "redox")))]
-extern crate libc;
-extern crate num_cpus;
-extern crate regex;
-extern crate regex_syntax;
-
-pub mod fshelper;
-pub mod lscolors;
 mod app;
+mod error;
 mod exec;
-mod internal;
+mod exit_codes;
+mod filesystem;
+mod filetypes;
+mod filter;
+mod options;
 mod output;
+mod regex_helper;
 mod walk;
 
-#[cfg(windows)]
-mod windows;
-
 use std::env;
-use std::error::Error;
 use std::path::{Path, PathBuf};
+use std::process;
 use std::sync::Arc;
 use std::time;
 
+use anyhow::{anyhow, Context, Result};
 use atty::Stream;
-use regex::RegexBuilder;
-
-use exec::CommandTemplate;
-use internal::{error, pattern_has_uppercase_char, FdOptions};
+use globset::GlobBuilder;
 use lscolors::LsColors;
-use walk::FileType;
+use regex::bytes::{RegexBuilder, RegexSetBuilder};
 
-fn main() {
-    let matches = app::build_app().get_matches();
+use crate::error::print_error;
+use crate::exec::CommandTemplate;
+use crate::exit_codes::ExitCode;
+use crate::filetypes::FileTypes;
+#[cfg(unix)]
+use crate::filter::OwnerFilter;
+use crate::filter::{SizeFilter, TimeFilter};
+use crate::options::Options;
+use crate::regex_helper::{pattern_has_uppercase_char, pattern_matches_strings_with_leading_dot};
+
+// We use jemalloc for performance reasons, see https://github.com/sharkdp/fd/pull/481
+// FIXME: re-enable jemalloc on macOS, see comment in Cargo.toml file for more infos
+#[cfg(all(
+    not(windows),
+    not(target_os = "android"),
+    not(target_os = "macos"),
+    not(target_env = "musl")
+))]
+#[global_allocator]
+static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
+
+// vivid --color-mode 8-bit generate molokai
+const DEFAULT_LS_COLORS: &str = "
+ow=0:or=0;38;5;16;48;5;203:no=0:ex=1;38;5;203:cd=0;38;5;203;48;5;236:mi=0;38;5;16;48;5;203:*~=0;38;5;243:st=0:pi=0;38;5;16;48;5;81:fi=0:di=0;38;5;81:so=0;38;5;16;48;5;203:bd=0;38;5;81;48;5;236:tw=0:ln=0;38;5;203:*.m=0;38;5;48:*.o=0;38;5;243:*.z=4;38;5;203:*.a=1;38;5;203:*.r=0;38;5;48:*.c=0;38;5;48:*.d=0;38;5;48:*.t=0;38;5;48:*.h=0;38;5;48:*.p=0;38;5;48:*.cc=0;38;5;48:*.ll=0;38;5;48:*.jl=0;38;5;48:*css=0;38;5;48:*.md=0;38;5;185:*.gz=4;38;5;203:*.nb=0;38;5;48:*.mn=0;38;5;48:*.go=0;38;5;48:*.xz=4;38;5;203:*.so=1;38;5;203:*.rb=0;38;5;48:*.pm=0;38;5;48:*.bc=0;38;5;243:*.py=0;38;5;48:*.as=0;38;5;48:*.pl=0;38;5;48:*.rs=0;38;5;48:*.sh=0;38;5;48:*.7z=4;38;5;203:*.ps=0;38;5;186:*.cs=0;38;5;48:*.el=0;38;5;48:*.rm=0;38;5;208:*.hs=0;38;5;48:*.td=0;38;5;48:*.ui=0;38;5;149:*.ex=0;38;5;48:*.js=0;38;5;48:*.cp=0;38;5;48:*.cr=0;38;5;48:*.la=0;38;5;243:*.kt=0;38;5;48:*.ml=0;38;5;48:*.vb=0;38;5;48:*.gv=0;38;5;48:*.lo=0;38;5;243:*.hi=0;38;5;243:*.ts=0;38;5;48:*.ko=1;38;5;203:*.hh=0;38;5;48:*.pp=0;38;5;48:*.di=0;38;5;48:*.bz=4;38;5;203:*.fs=0;38;5;48:*.png=0;38;5;208:*.zsh=0;38;5;48:*.mpg=0;38;5;208:*.pid=0;38;5;243:*.xmp=0;38;5;149:*.iso=4;38;5;203:*.m4v=0;38;5;208:*.dot=0;38;5;48:*.ods=0;38;5;186:*.inc=0;38;5;48:*.sxw=0;38;5;186:*.aif=0;38;5;208:*.git=0;38;5;243:*.gvy=0;38;5;48:*.tbz=4;38;5;203:*.log=0;38;5;243:*.txt=0;38;5;185:*.ico=0;38;5;208:*.csx=0;38;5;48:*.vob=0;38;5;208:*.pgm=0;38;5;208:*.pps=0;38;5;186:*.ics=0;38;5;186:*.img=4;38;5;203:*.fon=0;38;5;208:*.hpp=0;38;5;48:*.bsh=0;38;5;48:*.sql=0;38;5;48:*TODO=1:*.php=0;38;5;48:*.pkg=4;38;5;203:*.ps1=0;38;5;48:*.csv=0;38;5;185:*.ilg=0;38;5;243:*.ini=0;38;5;149:*.pyc=0;38;5;243:*.psd=0;38;5;208:*.htc=0;38;5;48:*.swp=0;38;5;243:*.mli=0;38;5;48:*hgrc=0;38;5;149:*.bst=0;38;5;149:*.ipp=0;38;5;48:*.fsi=0;38;5;48:*.tcl=0;38;5;48:*.exs=0;38;5;48:*.out=0;38;5;243:*.jar=4;38;5;203:*.xls=0;38;5;186:*.ppm=0;38;5;208:*.apk=4;38;5;203:*.aux=0;38;5;243:*.rpm=4;38;5;203:*.dll=1;38;5;203:*.eps=0;38;5;208:*.exe=1;38;5;203:*.doc=0;38;5;186:*.wma=0;38;5;208:*.deb=4;38;5;203:*.pod=0;38;5;48:*.ind=0;38;5;243:*.nix=0;38;5;149:*.lua=0;38;5;48:*.epp=0;38;5;48:*.dpr=0;38;5;48:*.htm=0;38;5;185:*.ogg=0;38;5;208:*.bin=4;38;5;203:*.otf=0;38;5;208:*.yml=0;38;5;149:*.pro=0;38;5;149:*.cxx=0;38;5;48:*.tex=0;38;5;48:*.fnt=0;38;5;208:*.erl=0;38;5;48:*.sty=0;38;5;243:*.bag=4;38;5;203:*.rst=0;38;5;185:*.pdf=0;38;5;186:*.pbm=0;38;5;208:*.xcf=0;38;5;208:*.clj=0;38;5;48:*.gif=0;38;5;208:*.rar=4;38;5;203:*.elm=0;38;5;48:*.bib=0;38;5;149:*.tsx=0;38;5;48:*.dmg=4;38;5;203:*.tmp=0;38;5;243:*.bcf=0;38;5;243:*.mkv=0;38;5;208:*.svg=0;38;5;208:*.cpp=0;38;5;48:*.vim=0;38;5;48:*.bmp=0;38;5;208:*.ltx=0;38;5;48:*.fls=0;38;5;243:*.flv=0;38;5;208:*.wav=0;38;5;208:*.m4a=0;38;5;208:*.mid=0;38;5;208:*.hxx=0;38;5;48:*.pas=0;38;5;48:*.wmv=0;38;5;208:*.tif=0;38;5;208:*.kex=0;38;5;186:*.mp4=0;38;5;208:*.bak=0;38;5;243:*.xlr=0;38;5;186:*.dox=0;38;5;149:*.swf=0;38;5;208:*.tar=4;38;5;203:*.tgz=4;38;5;203:*.cfg=0;38;5;149:*.xml=0;
+38;5;185:*.jpg=0;38;5;208:*.mir=0;38;5;48:*.sxi=0;38;5;186:*.bz2=4;38;5;203:*.odt=0;38;5;186:*.mov=0;38;5;208:*.toc=0;38;5;243:*.bat=1;38;5;203:*.asa=0;38;5;48:*.awk=0;38;5;48:*.sbt=0;38;5;48:*.vcd=4;38;5;203:*.kts=0;38;5;48:*.arj=4;38;5;203:*.blg=0;38;5;243:*.c++=0;38;5;48:*.odp=0;38;5;186:*.bbl=0;38;5;243:*.idx=0;38;5;243:*.com=1;38;5;203:*.mp3=0;38;5;208:*.avi=0;38;5;208:*.def=0;38;5;48:*.cgi=0;38;5;48:*.zip=4;38;5;203:*.ttf=0;38;5;208:*.ppt=0;38;5;186:*.tml=0;38;5;149:*.fsx=0;38;5;48:*.h++=0;38;5;48:*.rtf=0;38;5;186:*.inl=0;38;5;48:*.yaml=0;38;5;149:*.html=0;38;5;185:*.mpeg=0;38;5;208:*.java=0;38;5;48:*.hgrc=0;38;5;149:*.orig=0;38;5;243:*.conf=0;38;5;149:*.dart=0;38;5;48:*.psm1=0;38;5;48:*.rlib=0;38;5;243:*.fish=0;38;5;48:*.bash=0;38;5;48:*.make=0;38;5;149:*.docx=0;38;5;186:*.json=0;38;5;149:*.psd1=0;38;5;48:*.lisp=0;38;5;48:*.tbz2=4;38;5;203:*.diff=0;38;5;48:*.epub=0;38;5;186:*.xlsx=0;38;5;186:*.pptx=0;38;5;186:*.toml=0;38;5;149:*.h264=0;38;5;208:*.purs=0;38;5;48:*.flac=0;38;5;208:*.tiff=0;38;5;208:*.jpeg=0;38;5;208:*.lock=0;38;5;243:*.less=0;38;5;48:*.dyn_o=0;38;5;243:*.scala=0;38;5;48:*.mdown=0;38;5;185:*.shtml=0;38;5;185:*.class=0;38;5;243:*.cache=0;38;5;243:*.cmake=0;38;5;149:*passwd=0;38;5;149:*.swift=0;38;5;48:*shadow=0;38;5;149:*.xhtml=0;38;5;185:*.patch=0;38;5;48:*.cabal=0;38;5;48:*README=0;38;5;16;48;5;186:*.toast=4;38;5;203:*.ipynb=0;38;5;48:*COPYING=0;38;5;249:*.gradle=0;38;5;48:*.matlab=0;38;5;48:*.config=0;38;5;149:*LICENSE=0;38;5;249:*.dyn_hi=0;38;5;243:*.flake8=0;38;5;149:*.groovy=0;38;5;48:*INSTALL=0;38;5;16;48;5;186:*TODO.md=1:*.ignore=0;38;5;149:*Doxyfile=0;38;5;149:*TODO.txt=1:*setup.py=0;38;5;149:*Makefile=0;38;5;149:*.gemspec=0;38;5;149:*.desktop=0;38;5;149:*.rgignore=0;38;5;149:*.markdown=0;38;5;185:*COPYRIGHT=0;38;5;249:*configure=0;38;5;149:*.DS_Store=0;38;5;243:*.kdevelop=0;38;5;149:*.fdignore=0;38;5;149:*README.md=0;38;5;16;48;5;186:*.cmake.in=0;38;5;149:*SConscript=0;38;5;149:*CODEOWNERS=0;38;5;149:*.localized=0;38;5;243:*.gitignore=0;38;5;149:*Dockerfile=0;38;5;149:*.gitconfig=0;38;5;149:*INSTALL.md=0;38;5;16;48;5;186:*README.txt=0;38;5;16;48;5;186:*SConstruct=0;38;5;149:*.scons_opt=0;38;5;243:*.travis.yml=0;38;5;186:*.gitmodules=0;38;5;149:*.synctex.gz=0;38;5;243:*LICENSE-MIT=0;38;5;249:*MANIFEST.in=0;38;5;149:*Makefile.in=0;38;5;243:*Makefile.am=0;38;5;149:*INSTALL.txt=0;38;5;16;48;5;186:*configure.ac=0;38;5;149:*.applescript=0;38;5;48:*appveyor.yml=0;38;5;186:*.fdb_latexmk=0;38;5;243:*CONTRIBUTORS=0;38;5;16;48;5;186:*.clang-format=0;38;5;149:*LICENSE-APACHE=0;38;5;249:*CMakeLists.txt=0;38;5;149:*CMakeCache.txt=0;38;5;243:*.gitattributes=0;38;5;149:*CONTRIBUTORS.md=0;38;5;16;48;5;186:*.sconsign.dblite=0;38;5;243:*requirements.txt=0;38;5;149:*CONTRIBUTORS.txt=0;38;5;16;48;5;186:*package-lock.json=0;38;5;243:*.CFUserTextEncoding=0;38;5;243
+";
+
+fn run() -> Result<ExitCode> {
+    let matches = app::build_app().get_matches_from(env::args_os());
+
+    // Set the current working directory of the process
+    if let Some(base_directory) = matches.value_of_os("base-directory") {
+        let base_directory = Path::new(base_directory);
+        if !filesystem::is_dir(base_directory) {
+            return Err(anyhow!(
+                "The '--base-directory' path '{}' is not a directory.",
+                base_directory.to_string_lossy()
+            ));
+        }
+        env::set_current_dir(base_directory).with_context(|| {
+            format!(
+                "Could not set '{}' as the current working directory",
+                base_directory.to_string_lossy()
+            )
+        })?;
+    }
+
+    let current_directory = Path::new(".");
+    if !filesystem::is_dir(current_directory) {
+        return Err(anyhow!(
+            "Could not retrieve current directory (has it been deleted?)."
+        ));
+    }
 
     // Get the search pattern
-    let pattern = matches.value_of("pattern").unwrap_or("");
+    let pattern = matches
+        .value_of_os("pattern")
+        .map(|p| {
+            p.to_str()
+                .ok_or_else(|| anyhow!("The search pattern includes invalid UTF-8 sequences."))
+        })
+        .transpose()?
+        .unwrap_or("");
 
-    // Get the current working directory
-    let current_dir = Path::new(".");
-    if !fshelper::is_dir(current_dir) {
-        error("Error: could not get current directory.");
-    }
+    // Get one or more root directories to search.
+    let passed_arguments = matches
+        .values_of_os("path")
+        .or_else(|| matches.values_of_os("search-path"));
 
-    //Get one or more root directories to search.
-    let mut dir_vec: Vec<_> = match matches.values_of("path") {
-        Some(paths) => paths
-            .map(|path| {
-                let path_buffer = PathBuf::from(path);
-                if !fshelper::is_dir(&path_buffer) {
-                    error(&format!(
-                        "Error: '{}' is not a directory.",
-                        path_buffer.to_string_lossy()
-                    ));
-                }
-                path_buffer
-            })
-            .collect::<Vec<_>>(),
-        None => vec![current_dir.to_path_buf()],
+    let mut search_paths = if let Some(paths) = passed_arguments {
+        let mut directories = vec![];
+        for path in paths {
+            let path_buffer = PathBuf::from(path);
+            if filesystem::is_dir(&path_buffer) {
+                directories.push(path_buffer);
+            } else {
+                print_error(format!(
+                    "Search path '{}' is not a directory.",
+                    path_buffer.to_string_lossy()
+                ));
+            }
+        }
+
+        directories
+    } else {
+        vec![current_directory.to_path_buf()]
     };
 
+    // Check if we have no valid search paths.
+    if search_paths.is_empty() {
+        return Err(anyhow!("No valid search paths given."));
+    }
+
     if matches.is_present("absolute-path") {
-        dir_vec = dir_vec
+        search_paths = search_paths
             .iter()
-            .map(|path_buffer| fshelper::absolute_path(path_buffer).unwrap())
+            .map(|path_buffer| {
+                path_buffer
+                    .canonicalize()
+                    .and_then(|pb| filesystem::absolute_path(pb.as_path()))
+                    .unwrap()
+            })
             .collect();
     }
 
+    // Detect if the user accidentally supplied a path instead of a search pattern
+    if !matches.is_present("full-path")
+        && pattern.contains(std::path::MAIN_SEPARATOR)
+        && filesystem::is_dir(Path::new(pattern))
+    {
+        return Err(anyhow!(
+            "The search pattern '{pattern}' contains a path-separation character ('{sep}') \
+             and will not lead to any search results.\n\n\
+             If you want to search for all files inside the '{pattern}' directory, use a match-all pattern:\n\n  \
+             fd . '{pattern}'\n\n\
+             Instead, if you want your pattern to match the full file path, use:\n\n  \
+             fd --full-path '{pattern}'",
+            pattern = pattern,
+            sep = std::path::MAIN_SEPARATOR,
+        ));
+    }
+
+    let pattern_regex = if matches.is_present("glob") && !pattern.is_empty() {
+        let glob = GlobBuilder::new(pattern).literal_separator(true).build()?;
+        glob.regex().to_owned()
+    } else if matches.is_present("fixed-strings") {
+        // Treat pattern as literal string if '--fixed-strings' is used
+        regex::escape(pattern)
+    } else {
+        String::from(pattern)
+    };
+
     // The search will be case-sensitive if the command line flag is set or
     // if the pattern has an uppercase character (smart case).
     let case_sensitive = !matches.is_present("ignore-case")
-        && (matches.is_present("case-sensitive") || pattern_has_uppercase_char(pattern));
+        && (matches.is_present("case-sensitive") || pattern_has_uppercase_char(&pattern_regex));
 
+    #[cfg(windows)]
+    let ansi_colors_support =
+        ansi_term::enable_ansi_support().is_ok() || std::env::var_os("TERM").is_some();
+
+    #[cfg(not(windows))]
+    let ansi_colors_support = true;
+
+    let interactive_terminal = atty::is(Stream::Stdout);
     let colored_output = match matches.value_of("color") {
         Some("always") => true,
         Some("never") => false,
-        _ => atty::is(Stream::Stdout),
+        _ => ansi_colors_support && env::var_os("NO_COLOR").is_none() && interactive_terminal,
     };
 
-    #[cfg(windows)]
-    let colored_output = colored_output && windows::enable_colored_output();
+    let path_separator = matches.value_of("path-separator").map(|str| str.to_owned());
 
     let ls_colors = if colored_output {
-        Some(
-            env::var("LS_COLORS")
-                .ok()
-                .map(|val| LsColors::from_string(&val))
-                .unwrap_or_default(),
-        )
+        Some(LsColors::from_env().unwrap_or_else(|| LsColors::from_string(DEFAULT_LS_COLORS)))
     } else {
         None
     };
 
-    let command = matches.values_of("exec").map(CommandTemplate::new);
+    let command = if let Some(args) = matches.values_of("exec") {
+        Some(CommandTemplate::new(args))
+    } else if let Some(args) = matches.values_of("exec-batch") {
+        Some(CommandTemplate::new_batch(args)?)
+    } else if matches.is_present("list-details") {
+        let color = matches.value_of("color").unwrap_or("auto");
+        let color_arg = ["--color=", color].concat();
 
-    let config = FdOptions {
+        #[allow(unused)]
+        let gnu_ls = |command_name| {
+            vec![
+                command_name,
+                "-l",               // long listing format
+                "--human-readable", // human readable file sizes
+                "--directory",      // list directories themselves, not their contents
+                &color_arg,
+            ]
+        };
+
+        let cmd: Vec<&str> = if cfg!(unix) {
+            if !cfg!(any(
+                target_os = "macos",
+                target_os = "dragonfly",
+                target_os = "freebsd",
+                target_os = "netbsd",
+                target_os = "openbsd"
+            )) {
+                // Assume ls is GNU ls
+                gnu_ls("ls")
+            } else {
+                // MacOS, DragonFlyBSD, FreeBSD
+                use std::process::{Command, Stdio};
+
+                // Use GNU ls, if available (support for --color=auto, better LS_COLORS support)
+                let gnu_ls_exists = Command::new("gls")
+                    .arg("--version")
+                    .stdout(Stdio::null())
+                    .stderr(Stdio::null())
+                    .status()
+                    .is_ok();
+
+                if gnu_ls_exists {
+                    gnu_ls("gls")
+                } else {
+                    let mut cmd = vec![
+                        "ls", // BSD version of ls
+                        "-l", // long listing format
+                        "-h", // '--human-readable' is not available, '-h' is
+                        "-d", // '--directory' is not available, but '-d' is
+                    ];
+
+                    if !cfg!(any(target_os = "netbsd", target_os = "openbsd")) && colored_output {
+                        // -G is not available in NetBSD's and OpenBSD's ls
+                        cmd.push("-G");
+                    }
+
+                    cmd
+                }
+            }
+        } else if cfg!(windows) {
+            use std::process::{Command, Stdio};
+
+            // Use GNU ls, if available
+            let gnu_ls_exists = Command::new("ls")
+                .arg("--version")
+                .stdout(Stdio::null())
+                .stderr(Stdio::null())
+                .status()
+                .is_ok();
+
+            if gnu_ls_exists {
+                gnu_ls("ls")
+            } else {
+                return Err(anyhow!(
+                    "'fd --list-details' is not supported on Windows unless GNU 'ls' is installed."
+                ));
+            }
+        } else {
+            return Err(anyhow!(
+                "'fd --list-details' is not supported on this platform."
+            ));
+        };
+
+        Some(CommandTemplate::new_batch(&cmd).unwrap())
+    } else {
+        None
+    };
+
+    let size_limits = if let Some(vs) = matches.values_of("size") {
+        vs.map(|sf| {
+            SizeFilter::from_string(sf)
+                .ok_or_else(|| anyhow!("'{}' is not a valid size constraint. See 'fd --help'.", sf))
+        })
+        .collect::<Result<Vec<_>>>()?
+    } else {
+        vec![]
+    };
+
+    let now = time::SystemTime::now();
+    let mut time_constraints: Vec<TimeFilter> = Vec::new();
+    if let Some(t) = matches.value_of("changed-within") {
+        if let Some(f) = TimeFilter::after(&now, t) {
+            time_constraints.push(f);
+        } else {
+            return Err(anyhow!(
+                "'{}' is not a valid date or duration. See 'fd --help'.",
+                t
+            ));
+        }
+    }
+    if let Some(t) = matches.value_of("changed-before") {
+        if let Some(f) = TimeFilter::before(&now, t) {
+            time_constraints.push(f);
+        } else {
+            return Err(anyhow!(
+                "'{}' is not a valid date or duration. See 'fd --help'.",
+                t
+            ));
+        }
+    }
+
+    #[cfg(unix)]
+    let owner_constraint = if let Some(s) = matches.value_of("owner") {
+        OwnerFilter::from_string(s)?
+    } else {
+        None
+    };
+
+    let config = Options {
         case_sensitive,
         search_full_path: matches.is_present("full-path"),
         ignore_hidden: !(matches.is_present("hidden")
             || matches.occurrences_of("rg-alias-hidden-ignore") >= 2),
-        read_ignore: !(matches.is_present("no-ignore")
+        read_fdignore: !(matches.is_present("no-ignore")
             || matches.is_present("rg-alias-hidden-ignore")),
-        read_gitignore: !(matches.is_present("no-ignore")
+        read_vcsignore: !(matches.is_present("no-ignore")
             || matches.is_present("rg-alias-hidden-ignore")
             || matches.is_present("no-ignore-vcs")),
+        read_global_ignore: !(matches.is_present("no-ignore")
+            || matches.is_present("rg-alias-hidden-ignore")
+            || matches.is_present("no-global-ignore-file")),
         follow_links: matches.is_present("follow"),
+        one_file_system: matches.is_present("one-file-system"),
         null_separator: matches.is_present("null_separator"),
         max_depth: matches
-            .value_of("depth")
-            .and_then(|n| usize::from_str_radix(n, 10).ok()),
+            .value_of("max-depth")
+            .or_else(|| matches.value_of("rg-depth"))
+            .or_else(|| matches.value_of("exact-depth"))
+            .map(|n| usize::from_str_radix(n, 10))
+            .transpose()
+            .context("Failed to parse argument to --max-depth/--exact-depth")?,
+        min_depth: matches
+            .value_of("min-depth")
+            .or_else(|| matches.value_of("exact-depth"))
+            .map(|n| usize::from_str_radix(n, 10))
+            .transpose()
+            .context("Failed to parse argument to --min-depth/--exact-depth")?,
+        prune: matches.is_present("prune"),
         threads: std::cmp::max(
             matches
                 .value_of("threads")
-                .and_then(|n| usize::from_str_radix(n, 10).ok())
+                .map(|n| usize::from_str_radix(n, 10))
+                .transpose()
+                .context("Failed to parse number of threads")?
+                .map(|n| {
+                    if n > 0 {
+                        Ok(n)
+                    } else {
+                        Err(anyhow!("Number of threads must be positive."))
+                    }
+                })
+                .transpose()?
                 .unwrap_or_else(num_cpus::get),
             1,
         ),
         max_buffer_time: matches
             .value_of("max-buffer-time")
-            .and_then(|n| u64::from_str_radix(n, 10).ok())
+            .map(|n| u64::from_str_radix(n, 10))
+            .transpose()
+            .context("Failed to parse max. buffer time argument")?
             .map(time::Duration::from_millis),
         ls_colors,
-        file_types: match matches.values_of("file-type") {
-            None => vec![
-                FileType::RegularFile,
-                FileType::Directory,
-                FileType::SymLink,
-            ].into_iter()
-                .collect(),
-            Some(values) => values
-                .map(|value| match value {
-                    "f" | "file" => FileType::RegularFile,
-                    "d" | "directory" => FileType::Directory,
-                    "l" | "symlink" => FileType::SymLink,
-                    _ => FileType::RegularFile,
-                })
-                .collect(),
-        },
-        extensions: matches.values_of("extension").map(|exts| {
-            exts.map(|e| e.trim_left_matches('.').to_lowercase())
-                .collect()
+        interactive_terminal,
+        file_types: matches.values_of("file-type").map(|values| {
+            let mut file_types = FileTypes::default();
+            for value in values {
+                match value {
+                    "f" | "file" => file_types.files = true,
+                    "d" | "directory" => file_types.directories = true,
+                    "l" | "symlink" => file_types.symlinks = true,
+                    "x" | "executable" => {
+                        file_types.executables_only = true;
+                        file_types.files = true;
+                    }
+                    "e" | "empty" => file_types.empty_only = true,
+                    "s" | "socket" => file_types.sockets = true,
+                    "p" | "pipe" => file_types.pipes = true,
+                    _ => unreachable!(),
+                }
+            }
+
+            // If only 'empty' was specified, search for both files and directories:
+            if file_types.empty_only && !(file_types.files || file_types.directories) {
+                file_types.files = true;
+                file_types.directories = true;
+            }
+
+            file_types
         }),
-        command,
+        extensions: matches
+            .values_of("extension")
+            .map(|exts| {
+                let patterns = exts
+                    .map(|e| e.trim_start_matches('.'))
+                    .map(|e| format!(r".\.{}$", regex::escape(e)));
+                RegexSetBuilder::new(patterns)
+                    .case_insensitive(true)
+                    .build()
+            })
+            .transpose()?,
+        command: command.map(Arc::new),
         exclude_patterns: matches
             .values_of("exclude")
             .map(|v| v.map(|p| String::from("!") + p).collect())
-            .unwrap_or_else(|| vec![]),
+            .unwrap_or_else(Vec::new),
+        ignore_files: matches
+            .values_of("ignore-file")
+            .map(|vs| vs.map(PathBuf::from).collect())
+            .unwrap_or_else(Vec::new),
+        size_constraints: size_limits,
+        time_constraints,
+        #[cfg(unix)]
+        owner_constraint,
+        show_filesystem_errors: matches.is_present("show-errors"),
+        path_separator,
+        max_results: matches
+            .value_of("max-results")
+            .map(|n| usize::from_str_radix(n, 10))
+            .transpose()
+            .context("Failed to parse --max-results argument")?
+            .filter(|&n| n > 0)
+            .or_else(|| {
+                if matches.is_present("max-one-result") {
+                    Some(1)
+                } else {
+                    None
+                }
+            }),
     };
 
-    match RegexBuilder::new(pattern)
+    if cfg!(unix)
+        && config.ignore_hidden
+        && pattern_matches_strings_with_leading_dot(&pattern_regex)
+    {
+        return Err(anyhow!(
+            "The pattern seems to only match files with a leading dot, but hidden files are \
+            filtered by default. Consider adding -H/--hidden to search hidden files as well \
+            or adjust your search pattern."
+        ));
+    }
+
+    let re = RegexBuilder::new(&pattern_regex)
         .case_insensitive(!config.case_sensitive)
         .dot_matches_new_line(true)
         .build()
-    {
-        Ok(re) => walk::scan(&dir_vec, Arc::new(re), Arc::new(config)),
-        Err(err) => error(err.description()),
+        .map_err(|e| {
+            anyhow!(
+                "{}\n\nNote: You can use the '--fixed-strings' option to search for a \
+                 literal string instead of a regular expression. Alternatively, you can \
+                 also use the '--glob' option to match on a glob pattern.",
+                e.to_string()
+            )
+        })?;
+
+    walk::scan(&search_paths, Arc::new(re), Arc::new(config))
+}
+
+fn main() {
+    let result = run();
+    match result {
+        Ok(exit_code) => {
+            process::exit(exit_code.into());
+        }
+        Err(err) => {
+            eprintln!("[fd error]: {:#}", err);
+            process::exit(ExitCode::GeneralError.into());
+        }
     }
 }

src/options.rs

@@ -0,0 +1,105 @@
+use std::{path::PathBuf, sync::Arc, time::Duration};
+
+use lscolors::LsColors;
+use regex::bytes::RegexSet;
+
+use crate::exec::CommandTemplate;
+use crate::filetypes::FileTypes;
+#[cfg(unix)]
+use crate::filter::OwnerFilter;
+use crate::filter::{SizeFilter, TimeFilter};
+
+/// Configuration options for *fd*.
+pub struct Options {
+    /// Whether the search is case-sensitive or case-insensitive.
+    pub case_sensitive: bool,
+
+    /// Whether to search within the full file path or just the base name (filename or directory
+    /// name).
+    pub search_full_path: bool,
+
+    /// Whether to ignore hidden files and directories (or not).
+    pub ignore_hidden: bool,
+
+    /// Whether to respect `.fdignore` files or not.
+    pub read_fdignore: bool,
+
+    /// Whether to respect VCS ignore files (`.gitignore`, ..) or not.
+    pub read_vcsignore: bool,
+
+    /// Whether to respect the global ignore file or not.
+    pub read_global_ignore: bool,
+
+    /// Whether to follow symlinks or not.
+    pub follow_links: bool,
+
+    /// Whether to limit the search to starting file system or not.
+    pub one_file_system: bool,
+
+    /// Whether elements of output should be separated by a null character
+    pub null_separator: bool,
+
+    /// The maximum search depth, or `None` if no maximum search depth should be set.
+    ///
+    /// A depth of `1` includes all files under the current directory, a depth of `2` also includes
+    /// all files under subdirectories of the current directory, etc.
+    pub max_depth: Option<usize>,
+
+    /// The minimum depth for reported entries, or `None`.
+    pub min_depth: Option<usize>,
+
+    /// Whether to stop traversing into matching directories.
+    pub prune: bool,
+
+    /// The number of threads to use.
+    pub threads: usize,
+
+    /// Time to buffer results internally before streaming to the console. This is useful to
+    /// provide a sorted output, in case the total execution time is shorter than
+    /// `max_buffer_time`.
+    pub max_buffer_time: Option<Duration>,
+
+    /// `None` if the output should not be colorized. Otherwise, a `LsColors` instance that defines
+    /// how to style different filetypes.
+    pub ls_colors: Option<LsColors>,
+
+    /// Whether or not we are writing to an interactive terminal
+    pub interactive_terminal: bool,
+
+    /// The type of file to search for. If set to `None`, all file types are displayed. If
+    /// set to `Some(..)`, only the types that are specified are shown.
+    pub file_types: Option<FileTypes>,
+
+    /// The extension to search for. Only entries matching the extension will be included.
+    ///
+    /// The value (if present) will be a lowercase string without leading dots.
+    pub extensions: Option<RegexSet>,
+
+    /// If a value is supplied, each item found will be used to generate and execute commands.
+    pub command: Option<Arc<CommandTemplate>>,
+
+    /// A list of glob patterns that should be excluded from the search.
+    pub exclude_patterns: Vec<String>,
+
+    /// A list of custom ignore files.
+    pub ignore_files: Vec<PathBuf>,
+
+    /// The given constraints on the size of returned files
+    pub size_constraints: Vec<SizeFilter>,
+
+    /// Constraints on last modification time of files
+    pub time_constraints: Vec<TimeFilter>,
+
+    #[cfg(unix)]
+    /// User/group ownership constraint
+    pub owner_constraint: Option<OwnerFilter>,
+
+    /// Whether or not to display filesystem errors
+    pub show_filesystem_errors: bool,
+
+    /// The separator used to print file paths.
+    pub path_separator: Option<String>,
+
+    /// The maximum number of search results
+    pub max_results: Option<usize>,
+}

src/output.rs

@@ -1,131 +1,119 @@
-// Copyright (c) 2017 fd developers
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0>
-// or the MIT license <LICENSE-MIT or http://opensource.org/licenses/MIT>,
-// at your option. All files in the project carrying such
-// notice may not be copied, modified, or distributed except
-// according to those terms.
-
-use internal::{FdOptions, EXITCODE_ERROR, EXITCODE_SIGINT};
-use lscolors::LsColors;
-
-use std::{fs, process};
-use std::io::{self, Write};
-use std::ops::Deref;
-use std::path::{self, Component, Path, PathBuf};
-use std::sync::Arc;
+use std::io::{self, StdoutLock, Write};
+use std::path::{Path, PathBuf};
+use std::process;
 use std::sync::atomic::{AtomicBool, Ordering};
-#[cfg(any(unix, target_os = "redox"))]
-use std::os::unix::fs::PermissionsExt;
+use std::sync::Arc;
 
-use ansi_term;
+use lscolors::{LsColors, Style};
 
-pub fn print_entry(entry: &PathBuf, config: &FdOptions, wants_to_quit: &Arc<AtomicBool>) {
-    let path = entry.strip_prefix(".").unwrap_or(entry);
+use crate::exit_codes::ExitCode;
+use crate::filesystem::strip_current_dir;
+use crate::options::Options;
+
+pub fn replace_path_separator(path: &str, new_path_separator: &str) -> String {
+    path.replace(std::path::MAIN_SEPARATOR, &new_path_separator)
+}
+
+// TODO: this function is performance critical and can probably be optimized
+pub fn print_entry(
+    stdout: &mut StdoutLock,
+    entry: &PathBuf,
+    config: &Options,
+    wants_to_quit: &Arc<AtomicBool>,
+) {
+    let path = if entry.is_absolute() {
+        entry.as_path()
+    } else {
+        strip_current_dir(entry)
+    };
 
     let r = if let Some(ref ls_colors) = config.ls_colors {
-        print_entry_colorized(path, config, ls_colors, &wants_to_quit)
+        print_entry_colorized(stdout, path, config, ls_colors, &wants_to_quit)
     } else {
-        print_entry_uncolorized(path, config)
+        print_entry_uncolorized(stdout, path, config)
     };
 
     if r.is_err() {
         // Probably a broken pipe. Exit gracefully.
-        process::exit(EXITCODE_ERROR);
+        process::exit(ExitCode::GeneralError.into());
     }
 }
 
+// TODO: this function is performance critical and can probably be optimized
 fn print_entry_colorized(
+    stdout: &mut StdoutLock,
     path: &Path,
-    config: &FdOptions,
+    config: &Options,
     ls_colors: &LsColors,
     wants_to_quit: &Arc<AtomicBool>,
 ) -> io::Result<()> {
     let default_style = ansi_term::Style::default();
 
-    let stdout = io::stdout();
-    let mut handle = stdout.lock();
-
-    // Separator to use before the current component.
-    let mut separator = String::new();
-
-    // Full path to the current component.
-    let mut component_path = PathBuf::new();
-
     // Traverse the path and colorize each component
-    for component in path.components() {
-        let comp_str = component.as_os_str().to_string_lossy();
-        component_path.push(Path::new(comp_str.deref()));
+    for (component, style) in ls_colors.style_for_path_components(path) {
+        let style = style
+            .map(Style::to_ansi_term_style)
+            .unwrap_or(default_style);
 
-        let style = get_path_style(&component_path, ls_colors).unwrap_or(&default_style);
-
-        write!(handle, "{}{}", separator, style.paint(comp_str))?;
-
-        // Determine separator to print before next component.
-        separator = match component {
-            // Prefix needs no separator, as it is always followed by RootDir.
-            Component::Prefix(_) => String::new(),
-            // RootDir is already a separator.
-            Component::RootDir => String::new(),
-            // Everything else uses a separator that is painted the same way as the component.
-            _ => style.paint(path::MAIN_SEPARATOR.to_string()).to_string(),
-        };
+        let mut path_string = component.to_string_lossy();
+        if let Some(ref separator) = config.path_separator {
+            *path_string.to_mut() = replace_path_separator(&path_string, &separator);
+        }
+        write!(stdout, "{}", style.paint(path_string))?;
 
+        // TODO: can we move this out of the if-statement? Why do we call it that often?
         if wants_to_quit.load(Ordering::Relaxed) {
-            write!(handle, "\n")?;
-            process::exit(EXITCODE_SIGINT);
+            writeln!(stdout)?;
+            process::exit(ExitCode::KilledBySigint.into());
         }
     }
 
     if config.null_separator {
-        write!(handle, "\0")
+        write!(stdout, "\0")
     } else {
-        writeln!(handle, "")
+        writeln!(stdout)
     }
 }
 
-fn print_entry_uncolorized(path: &Path, config: &FdOptions) -> io::Result<()> {
+// TODO: this function is performance critical and can probably be optimized
+fn print_entry_uncolorized_base(
+    stdout: &mut StdoutLock,
+    path: &Path,
+    config: &Options,
+) -> io::Result<()> {
     let separator = if config.null_separator { "\0" } else { "\n" };
 
-    let path_str = path.to_string_lossy();
-    write!(&mut io::stdout(), "{}{}", path_str, separator)
+    let mut path_string = path.to_string_lossy();
+    if let Some(ref separator) = config.path_separator {
+        *path_string.to_mut() = replace_path_separator(&path_string, &separator);
+    }
+    write!(stdout, "{}{}", path_string, separator)
 }
 
-fn get_path_style<'a>(path: &Path, ls_colors: &'a LsColors) -> Option<&'a ansi_term::Style> {
-    if path.symlink_metadata()
-        .map(|md| md.file_type().is_symlink())
-        .unwrap_or(false)
-    {
-        return Some(&ls_colors.symlink);
-    }
+#[cfg(not(unix))]
+fn print_entry_uncolorized(
+    stdout: &mut StdoutLock,
+    path: &Path,
+    config: &Options,
+) -> io::Result<()> {
+    print_entry_uncolorized_base(stdout, path, config)
+}
 
-    let metadata = path.metadata();
+#[cfg(unix)]
+fn print_entry_uncolorized(
+    stdout: &mut StdoutLock,
+    path: &Path,
+    config: &Options,
+) -> io::Result<()> {
+    use std::os::unix::ffi::OsStrExt;
 
-    if metadata.as_ref().map(|md| md.is_dir()).unwrap_or(false) {
-        Some(&ls_colors.directory)
-    } else if metadata.map(|md| is_executable(&md)).unwrap_or(false) {
-        Some(&ls_colors.executable)
-    } else if let Some(filename_style) = path.file_name()
-        .and_then(|n| n.to_str())
-        .and_then(|n| ls_colors.filenames.get(n))
-    {
-        Some(filename_style)
-    } else if let Some(extension_style) = path.extension()
-        .and_then(|e| e.to_str())
-        .and_then(|e| ls_colors.extensions.get(e))
-    {
-        Some(extension_style)
+    if config.interactive_terminal || config.path_separator.is_some() {
+        // Fall back to the base implementation
+        print_entry_uncolorized_base(stdout, path, config)
     } else {
-        None
+        // Print path as raw bytes, allowing invalid UTF-8 filenames to be passed to other processes
+        let separator = if config.null_separator { b"\0" } else { b"\n" };
+        stdout.write_all(path.as_os_str().as_bytes())?;
+        stdout.write_all(separator)
     }
 }
-
-#[cfg(any(unix, target_os = "redox"))]
-fn is_executable(md: &fs::Metadata) -> bool {
-    md.permissions().mode() & 0o111 != 0
-}
-
-#[cfg(windows)]
-fn is_executable(_: &fs::Metadata) -> bool {
-    false
-}

src/regex_helper.rs

@@ -0,0 +1,100 @@
+use regex_syntax::hir::Hir;
+use regex_syntax::ParserBuilder;
+
+/// Determine if a regex pattern contains a literal uppercase character.
+pub fn pattern_has_uppercase_char(pattern: &str) -> bool {
+    let mut parser = ParserBuilder::new().allow_invalid_utf8(true).build();
+
+    parser
+        .parse(pattern)
+        .map(|hir| hir_has_uppercase_char(&hir))
+        .unwrap_or(false)
+}
+
+/// Determine if a regex expression contains a literal uppercase character.
+fn hir_has_uppercase_char(hir: &Hir) -> bool {
+    use regex_syntax::hir::*;
+
+    match *hir.kind() {
+        HirKind::Literal(Literal::Unicode(c)) => c.is_uppercase(),
+        HirKind::Literal(Literal::Byte(b)) => char::from(b).is_uppercase(),
+        HirKind::Class(Class::Unicode(ref ranges)) => ranges
+            .iter()
+            .any(|r| r.start().is_uppercase() || r.end().is_uppercase()),
+        HirKind::Class(Class::Bytes(ref ranges)) => ranges
+            .iter()
+            .any(|r| char::from(r.start()).is_uppercase() || char::from(r.end()).is_uppercase()),
+        HirKind::Group(Group { ref hir, .. }) | HirKind::Repetition(Repetition { ref hir, .. }) => {
+            hir_has_uppercase_char(hir)
+        }
+        HirKind::Concat(ref hirs) | HirKind::Alternation(ref hirs) => {
+            hirs.iter().any(hir_has_uppercase_char)
+        }
+        _ => false,
+    }
+}
+
+/// Determine if a regex pattern only matches strings starting with a literal dot (hidden files)
+pub fn pattern_matches_strings_with_leading_dot(pattern: &str) -> bool {
+    let mut parser = ParserBuilder::new().allow_invalid_utf8(true).build();
+
+    parser
+        .parse(pattern)
+        .map(|hir| hir_matches_strings_with_leading_dot(&hir))
+        .unwrap_or(false)
+}
+
+/// See above.
+fn hir_matches_strings_with_leading_dot(hir: &Hir) -> bool {
+    use regex_syntax::hir::*;
+
+    // Note: this only really detects the simplest case where a regex starts with
+    // "^\\.", i.e. a start text anchor and a literal dot character. There are a lot
+    // of other patterns that ONLY match hidden files, e.g. ^(\\.foo|\\.bar) which are
+    // not (yet) detected by this algorithm.
+    match *hir.kind() {
+        HirKind::Concat(ref hirs) => {
+            let mut hirs = hirs.iter();
+            if let Some(hir) = hirs.next() {
+                if *hir.kind() != HirKind::Anchor(Anchor::StartText) {
+                    return false;
+                }
+            } else {
+                return false;
+            }
+
+            if let Some(hir) = hirs.next() {
+                *hir.kind() == HirKind::Literal(Literal::Unicode('.'))
+            } else {
+                false
+            }
+        }
+        _ => false,
+    }
+}
+
+#[test]
+fn pattern_has_uppercase_char_simple() {
+    assert!(pattern_has_uppercase_char("A"));
+    assert!(pattern_has_uppercase_char("foo.EXE"));
+
+    assert!(!pattern_has_uppercase_char("a"));
+    assert!(!pattern_has_uppercase_char("foo.exe123"));
+}
+
+#[test]
+fn pattern_has_uppercase_char_advanced() {
+    assert!(pattern_has_uppercase_char("foo.[a-zA-Z]"));
+
+    assert!(!pattern_has_uppercase_char(r"\Acargo"));
+    assert!(!pattern_has_uppercase_char(r"carg\x6F"));
+}
+
+#[test]
+fn matches_strings_with_leading_dot_simple() {
+    assert!(pattern_matches_strings_with_leading_dot("^\\.gitignore"));
+
+    assert!(!pattern_matches_strings_with_leading_dot("^.gitignore"));
+    assert!(!pattern_matches_strings_with_leading_dot("\\.gitignore"));
+    assert!(!pattern_matches_strings_with_leading_dot("^gitignore"));
+}

src/walk.rs

@@ -1,29 +1,26 @@
-// Copyright (c) 2017 fd developers
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0>
-// or the MIT license <LICENSE-MIT or http://opensource.org/licenses/MIT>,
-// at your option. All files in the project carrying such
-// notice may not be copied, modified, or distributed except
-// according to those terms.
-
-extern crate ctrlc;
-
-use exec;
-use fshelper;
-use internal::{error, FdOptions, EXITCODE_SIGINT, MAX_BUFFER_LENGTH};
-use output;
-
+use std::borrow::Cow;
+use std::ffi::OsStr;
+use std::fs::{FileType, Metadata};
+use std::io;
+use std::path::{Path, PathBuf};
 use std::process;
-use std::path::PathBuf;
-use std::sync::{Arc, Mutex};
 use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::mpsc::channel;
+use std::sync::mpsc::{channel, Receiver, Sender};
+use std::sync::{Arc, Mutex};
 use std::thread;
 use std::time;
 
-use ignore::{self, WalkBuilder};
+use anyhow::{anyhow, Result};
 use ignore::overrides::OverrideBuilder;
-use regex::Regex;
+use ignore::{self, WalkBuilder};
+use regex::bytes::Regex;
+
+use crate::error::print_error;
+use crate::exec;
+use crate::exit_codes::{merge_exitcodes, ExitCode};
+use crate::filesystem;
+use crate::options::Options;
+use crate::output;
 
 /// The receiver thread can either be buffering results or directly streaming to the console.
 enum ReceiverMode {
@@ -35,99 +32,177 @@ enum ReceiverMode {
     Streaming,
 }
 
-/// The types of file to search for.
-#[derive(Copy, Clone, PartialEq, Eq, Hash)]
-pub enum FileType {
-    RegularFile,
-    Directory,
-    SymLink,
+/// The Worker threads can result in a valid entry having PathBuf or an error.
+pub enum WorkerResult {
+    Entry(PathBuf),
+    Error(ignore::Error),
 }
 
+/// Maximum size of the output buffer before flushing results to the console
+pub const MAX_BUFFER_LENGTH: usize = 1000;
+
 /// Recursively scan the given search path for files / pathnames matching the pattern.
 ///
 /// If the `--exec` argument was supplied, this will create a thread pool for executing
 /// jobs in parallel from a given command line and the discovered paths. Otherwise, each
 /// path will simply be written to standard output.
-pub fn scan(path_vec: &[PathBuf], pattern: Arc<Regex>, config: Arc<FdOptions>) {
+pub fn scan(path_vec: &[PathBuf], pattern: Arc<Regex>, config: Arc<Options>) -> Result<ExitCode> {
     let mut path_iter = path_vec.iter();
     let first_path_buf = path_iter
         .next()
         .expect("Error: Path vector can not be empty");
     let (tx, rx) = channel();
-    let threads = config.threads;
 
     let mut override_builder = OverrideBuilder::new(first_path_buf.as_path());
 
     for pattern in &config.exclude_patterns {
-        let res = override_builder.add(pattern);
-        if res.is_err() {
-            error(&format!("Error: malformed exclude pattern '{}'", pattern));
-        }
+        override_builder
+            .add(pattern)
+            .map_err(|e| anyhow!("Malformed exclude pattern: {}", e))?;
     }
-    let overrides = override_builder.build().unwrap_or_else(|_| {
-        error("Mismatch in exclude patterns");
-    });
+    let overrides = override_builder
+        .build()
+        .map_err(|_| anyhow!("Mismatch in exclude patterns"))?;
 
     let mut walker = WalkBuilder::new(first_path_buf.as_path());
     walker
         .hidden(config.ignore_hidden)
-        .ignore(config.read_ignore)
-        .git_ignore(config.read_gitignore)
-        .parents(config.read_ignore || config.read_gitignore)
-        .git_global(config.read_gitignore)
-        .git_exclude(config.read_gitignore)
+        .ignore(config.read_fdignore)
+        .parents(config.read_fdignore || config.read_vcsignore)
+        .git_ignore(config.read_vcsignore)
+        .git_global(config.read_vcsignore)
+        .git_exclude(config.read_vcsignore)
         .overrides(overrides)
         .follow_links(config.follow_links)
+        // No need to check for supported platforms, option is unavailable on unsupported ones
+        .same_file_system(config.one_file_system)
         .max_depth(config.max_depth);
 
+    if config.read_fdignore {
+        walker.add_custom_ignore_filename(".fdignore");
+    }
+
+    if config.read_global_ignore {
+        #[cfg(target_os = "macos")]
+        let config_dir_op = std::env::var_os("XDG_CONFIG_HOME")
+            .map(PathBuf::from)
+            .filter(|p| p.is_absolute())
+            .or_else(|| dirs_next::home_dir().map(|d| d.join(".config")));
+
+        #[cfg(not(target_os = "macos"))]
+        let config_dir_op = dirs_next::config_dir();
+
+        if let Some(global_ignore_file) = config_dir_op
+            .map(|p| p.join("fd").join("ignore"))
+            .filter(|p| p.is_file())
+        {
+            let result = walker.add_ignore(global_ignore_file);
+            match result {
+                Some(ignore::Error::Partial(_)) => (),
+                Some(err) => {
+                    print_error(format!(
+                        "Malformed pattern in global ignore file. {}.",
+                        err.to_string()
+                    ));
+                }
+                None => (),
+            }
+        }
+    }
+
+    for ignore_file in &config.ignore_files {
+        let result = walker.add_ignore(ignore_file);
+        match result {
+            Some(ignore::Error::Partial(_)) => (),
+            Some(err) => {
+                print_error(format!(
+                    "Malformed pattern in custom ignore file. {}.",
+                    err.to_string()
+                ));
+            }
+            None => (),
+        }
+    }
+
     for path_entry in path_iter {
         walker.add(path_entry.as_path());
     }
 
-    let parallel_walker = walker.threads(threads).build_parallel();
+    let parallel_walker = walker.threads(config.threads).build_parallel();
 
     let wants_to_quit = Arc::new(AtomicBool::new(false));
-    let receiver_wtq = Arc::clone(&wants_to_quit);
-    let sender_wtq = Arc::clone(&wants_to_quit);
-    if config.ls_colors.is_some() {
-        let wq = Arc::clone(&receiver_wtq);
+    if config.ls_colors.is_some() && config.command.is_none() {
+        let wq = Arc::clone(&wants_to_quit);
         ctrlc::set_handler(move || {
-            wq.store(true, Ordering::Relaxed);
-        }).unwrap();
+            if wq.load(Ordering::Relaxed) {
+                // Ctrl-C has been pressed twice, exit NOW
+                process::exit(ExitCode::KilledBySigint.into());
+            } else {
+                wq.store(true, Ordering::Relaxed);
+            }
+        })
+        .unwrap();
     }
 
     // Spawn the thread that receives all results through the channel.
-    let rx_config = Arc::clone(&config);
-    let receiver_thread = thread::spawn(move || {
+    let receiver_thread = spawn_receiver(&config, &wants_to_quit, rx);
+
+    // Spawn the sender threads.
+    spawn_senders(&config, &wants_to_quit, pattern, parallel_walker, tx);
+
+    // Wait for the receiver thread to print out all results.
+    let exit_code = receiver_thread.join().unwrap();
+
+    if wants_to_quit.load(Ordering::Relaxed) {
+        Ok(ExitCode::KilledBySigint)
+    } else {
+        Ok(exit_code)
+    }
+}
+
+fn spawn_receiver(
+    config: &Arc<Options>,
+    wants_to_quit: &Arc<AtomicBool>,
+    rx: Receiver<WorkerResult>,
+) -> thread::JoinHandle<ExitCode> {
+    let config = Arc::clone(config);
+    let wants_to_quit = Arc::clone(wants_to_quit);
+
+    let show_filesystem_errors = config.show_filesystem_errors;
+    let threads = config.threads;
+
+    thread::spawn(move || {
         // This will be set to `Some` if the `--exec` argument was supplied.
-        if let Some(ref cmd) = rx_config.command {
-            let shared_rx = Arc::new(Mutex::new(rx));
+        if let Some(ref cmd) = config.command {
+            if cmd.in_batch_mode() {
+                exec::batch(rx, cmd, show_filesystem_errors)
+            } else {
+                let shared_rx = Arc::new(Mutex::new(rx));
 
-            let out_perm = Arc::new(Mutex::new(()));
+                let out_perm = Arc::new(Mutex::new(()));
 
-            // TODO: the following line is a workaround to replace the `unsafe` block that was
-            // previously used here to avoid the (unnecessary?) cloning of the command. The
-            // `unsafe` block caused problems on some platforms (SIGILL instructions on Linux) and
-            // therefore had to be removed.
-            let cmd = Arc::new(cmd.clone());
+                // Each spawned job will store it's thread handle in here.
+                let mut handles = Vec::with_capacity(threads);
+                for _ in 0..threads {
+                    let rx = Arc::clone(&shared_rx);
+                    let cmd = Arc::clone(cmd);
+                    let out_perm = Arc::clone(&out_perm);
 
-            // Each spawned job will store it's thread handle in here.
-            let mut handles = Vec::with_capacity(threads);
-            for _ in 0..threads {
-                let rx = Arc::clone(&shared_rx);
-                let cmd = Arc::clone(&cmd);
-                let out_perm = Arc::clone(&out_perm);
+                    // Spawn a job thread that will listen for and execute inputs.
+                    let handle =
+                        thread::spawn(move || exec::job(rx, cmd, out_perm, show_filesystem_errors));
 
-                // Spawn a job thread that will listen for and execute inputs.
-                let handle = thread::spawn(move || exec::job(rx, cmd, out_perm));
+                    // Push the handle of the spawned thread into the vector for later joining.
+                    handles.push(handle);
+                }
 
-                // Push the handle of the spawned thread into the vector for later joining.
-                handles.push(handle);
-            }
+                // Wait for all threads to exit before exiting the program.
+                let mut results: Vec<ExitCode> = Vec::new();
+                for h in handles {
+                    results.push(h.join().unwrap());
+                }
 
-            // Wait for all threads to exit before exiting the program.
-            for h in handles {
-                h.join().unwrap();
+                merge_exitcodes(&results)
             }
         } else {
             let start = time::Instant::now();
@@ -138,31 +213,58 @@ pub fn scan(path_vec: &[PathBuf], pattern: Arc<Regex>, config: Arc<FdOptions>) {
             let mut mode = ReceiverMode::Buffering;
 
             // Maximum time to wait before we start streaming to the console.
-            let max_buffer_time = rx_config
+            let max_buffer_time = config
                 .max_buffer_time
                 .unwrap_or_else(|| time::Duration::from_millis(100));
 
-            for value in rx {
-                match mode {
-                    ReceiverMode::Buffering => {
-                        buffer.push(value);
+            let stdout = io::stdout();
+            let mut stdout = stdout.lock();
 
-                        // Have we reached the maximum buffer size or maximum buffering time?
-                        if buffer.len() > MAX_BUFFER_LENGTH
-                            || time::Instant::now() - start > max_buffer_time
-                        {
-                            // Flush the buffer
-                            for v in &buffer {
-                                output::print_entry(v, &rx_config, &receiver_wtq);
+            let mut num_results = 0;
+
+            for worker_result in rx {
+                match worker_result {
+                    WorkerResult::Entry(value) => {
+                        match mode {
+                            ReceiverMode::Buffering => {
+                                buffer.push(value);
+
+                                // Have we reached the maximum buffer size or maximum buffering time?
+                                if buffer.len() > MAX_BUFFER_LENGTH
+                                    || time::Instant::now() - start > max_buffer_time
+                                {
+                                    // Flush the buffer
+                                    for v in &buffer {
+                                        output::print_entry(
+                                            &mut stdout,
+                                            v,
+                                            &config,
+                                            &wants_to_quit,
+                                        );
+                                    }
+                                    buffer.clear();
+
+                                    // Start streaming
+                                    mode = ReceiverMode::Streaming;
+                                }
                             }
-                            buffer.clear();
+                            ReceiverMode::Streaming => {
+                                output::print_entry(&mut stdout, &value, &config, &wants_to_quit);
+                            }
+                        }
 
-                            // Start streaming
-                            mode = ReceiverMode::Streaming;
+                        num_results += 1;
+                    }
+                    WorkerResult::Error(err) => {
+                        if show_filesystem_errors {
+                            print_error(err.to_string());
                         }
                     }
-                    ReceiverMode::Streaming => {
-                        output::print_entry(&value, &rx_config, &receiver_wtq);
+                }
+
+                if let Some(max_results) = config.max_results {
+                    if num_results >= max_results {
+                        break;
                     }
                 }
             }
@@ -172,18 +274,64 @@ pub fn scan(path_vec: &[PathBuf], pattern: Arc<Regex>, config: Arc<FdOptions>) {
             if !buffer.is_empty() {
                 buffer.sort();
                 for value in buffer {
-                    output::print_entry(&value, &rx_config, &receiver_wtq);
+                    output::print_entry(&mut stdout, &value, &config, &wants_to_quit);
                 }
             }
-        }
-    });
 
-    // Spawn the sender threads.
+            ExitCode::Success
+        }
+    })
+}
+
+pub enum DirEntry {
+    Normal(ignore::DirEntry),
+    BrokenSymlink(PathBuf),
+}
+
+impl DirEntry {
+    pub fn path(&self) -> &Path {
+        match self {
+            DirEntry::Normal(e) => e.path(),
+            DirEntry::BrokenSymlink(pathbuf) => pathbuf.as_path(),
+        }
+    }
+
+    pub fn file_type(&self) -> Option<FileType> {
+        match self {
+            DirEntry::Normal(e) => e.file_type(),
+            DirEntry::BrokenSymlink(pathbuf) => {
+                pathbuf.symlink_metadata().map(|m| m.file_type()).ok()
+            }
+        }
+    }
+
+    pub fn metadata(&self) -> Option<Metadata> {
+        match self {
+            DirEntry::Normal(e) => e.metadata().ok(),
+            DirEntry::BrokenSymlink(_) => None,
+        }
+    }
+
+    pub fn depth(&self) -> Option<usize> {
+        match self {
+            DirEntry::Normal(e) => Some(e.depth()),
+            DirEntry::BrokenSymlink(_) => None,
+        }
+    }
+}
+
+fn spawn_senders(
+    config: &Arc<Options>,
+    wants_to_quit: &Arc<AtomicBool>,
+    pattern: Arc<Regex>,
+    parallel_walker: ignore::WalkParallel,
+    tx: Sender<WorkerResult>,
+) {
     parallel_walker.run(|| {
-        let config = Arc::clone(&config);
+        let config = Arc::clone(config);
         let pattern = Arc::clone(&pattern);
         let tx_thread = tx.clone();
-        let wants_to_quit = Arc::clone(&sender_wtq);
+        let wants_to_quit = Arc::clone(wants_to_quit);
 
         Box::new(move |entry_o| {
             if wants_to_quit.load(Ordering::Relaxed) {
@@ -191,65 +339,175 @@ pub fn scan(path_vec: &[PathBuf], pattern: Arc<Regex>, config: Arc<FdOptions>) {
             }
 
             let entry = match entry_o {
-                Ok(e) => e,
-                Err(_) => return ignore::WalkState::Continue,
+                Ok(ref e) if e.depth() == 0 => {
+                    // Skip the root directory entry.
+                    return ignore::WalkState::Continue;
+                }
+                Ok(e) => DirEntry::Normal(e),
+                Err(ignore::Error::WithPath {
+                    path,
+                    err: inner_err,
+                }) => match inner_err.as_ref() {
+                    ignore::Error::Io(io_error)
+                        if io_error.kind() == io::ErrorKind::NotFound
+                            && path
+                                .symlink_metadata()
+                                .ok()
+                                .map_or(false, |m| m.file_type().is_symlink()) =>
+                    {
+                        DirEntry::BrokenSymlink(path)
+                    }
+                    _ => {
+                        match tx_thread.send(WorkerResult::Error(ignore::Error::WithPath {
+                            path,
+                            err: inner_err,
+                        })) {
+                            Ok(_) => {
+                                return ignore::WalkState::Continue;
+                            }
+                            Err(_) => {
+                                return ignore::WalkState::Quit;
+                            }
+                        }
+                    }
+                },
+                Err(err) => match tx_thread.send(WorkerResult::Error(err)) {
+                    Ok(_) => {
+                        return ignore::WalkState::Continue;
+                    }
+                    Err(_) => {
+                        return ignore::WalkState::Quit;
+                    }
+                },
             };
 
-            let entry_path = entry.path();
-
-            if entry.depth() == 0 {
-                return ignore::WalkState::Continue;
-            }
-
-            // Filter out unwanted file types.
-            if (entry.file_type().map_or(false, |ft| ft.is_file())
-                && !config.file_types.contains(&FileType::RegularFile))
-                || (entry.file_type().map_or(false, |ft| ft.is_dir())
-                    && !config.file_types.contains(&FileType::Directory))
-                || (entry.file_type().map_or(false, |ft| ft.is_symlink())
-                    && !config.file_types.contains(&FileType::SymLink))
-            {
-                return ignore::WalkState::Continue;
-            }
-
-            // Filter out unwanted extensions.
-            if let Some(ref filter_exts) = config.extensions {
-                let entry_ext = entry_path
-                    .extension()
-                    .map(|e| e.to_string_lossy().to_lowercase());
-                if entry_ext.map_or(true, |ext| !filter_exts.contains(&ext)) {
+            if let Some(min_depth) = config.min_depth {
+                if entry.depth().map_or(true, |d| d < min_depth) {
                     return ignore::WalkState::Continue;
                 }
             }
 
-            let search_str_o = if config.search_full_path {
-                match fshelper::path_absolute_form(entry_path) {
-                    Ok(path_abs_buf) => Some(path_abs_buf.to_string_lossy().into_owned().into()),
-                    Err(_) => error("Error: unable to get full path."),
-                }
+            // Check the name first, since it doesn't require metadata
+            let entry_path = entry.path();
+
+            let search_str: Cow<OsStr> = if config.search_full_path {
+                let path_abs_buf = filesystem::path_absolute_form(entry_path)
+                    .expect("Retrieving absolute path succeeds");
+                Cow::Owned(path_abs_buf.as_os_str().to_os_string())
             } else {
-                entry_path.file_name().map(|f| f.to_string_lossy())
+                match entry_path.file_name() {
+                    Some(filename) => Cow::Borrowed(filename),
+                    None => unreachable!(
+                        "Encountered file system entry without a file name. This should only \
+                         happen for paths like 'foo/bar/..' or '/' which are not supposed to \
+                         appear in a file system traversal."
+                    ),
+                }
             };
 
-            if let Some(search_str) = search_str_o {
-                if pattern.is_match(&*search_str) {
-                    // TODO: take care of the unwrap call
-                    tx_thread.send(entry_path.to_owned()).unwrap()
+            if !pattern.is_match(&filesystem::osstr_to_bytes(search_str.as_ref())) {
+                return ignore::WalkState::Continue;
+            }
+
+            // Filter out unwanted extensions.
+            if let Some(ref exts_regex) = config.extensions {
+                if let Some(path_str) = entry_path.file_name() {
+                    if !exts_regex.is_match(&filesystem::osstr_to_bytes(path_str)) {
+                        return ignore::WalkState::Continue;
+                    }
+                } else {
+                    return ignore::WalkState::Continue;
                 }
             }
 
+            // Filter out unwanted file types.
+            if let Some(ref file_types) = config.file_types {
+                if let Some(ref entry_type) = entry.file_type() {
+                    if (!file_types.files && entry_type.is_file())
+                        || (!file_types.directories && entry_type.is_dir())
+                        || (!file_types.symlinks && entry_type.is_symlink())
+                        || (!file_types.sockets && filesystem::is_socket(entry_type))
+                        || (!file_types.pipes && filesystem::is_pipe(entry_type))
+                        || (file_types.executables_only
+                            && !entry
+                                .metadata()
+                                .map(|m| filesystem::is_executable(&m))
+                                .unwrap_or(false))
+                        || (file_types.empty_only && !filesystem::is_empty(&entry))
+                        || !(entry_type.is_file()
+                            || entry_type.is_dir()
+                            || entry_type.is_symlink()
+                            || filesystem::is_socket(entry_type)
+                            || filesystem::is_pipe(entry_type))
+                    {
+                        return ignore::WalkState::Continue;
+                    }
+                } else {
+                    return ignore::WalkState::Continue;
+                }
+            }
+
+            #[cfg(unix)]
+            {
+                if let Some(ref owner_constraint) = config.owner_constraint {
+                    if let Ok(ref metadata) = entry_path.metadata() {
+                        if !owner_constraint.matches(&metadata) {
+                            return ignore::WalkState::Continue;
+                        }
+                    } else {
+                        return ignore::WalkState::Continue;
+                    }
+                }
+            }
+
+            // Filter out unwanted sizes if it is a file and we have been given size constraints.
+            if !config.size_constraints.is_empty() {
+                if entry_path.is_file() {
+                    if let Ok(metadata) = entry_path.metadata() {
+                        let file_size = metadata.len();
+                        if config
+                            .size_constraints
+                            .iter()
+                            .any(|sc| !sc.is_within(file_size))
+                        {
+                            return ignore::WalkState::Continue;
+                        }
+                    } else {
+                        return ignore::WalkState::Continue;
+                    }
+                } else {
+                    return ignore::WalkState::Continue;
+                }
+            }
+
+            // Filter out unwanted modification times
+            if !config.time_constraints.is_empty() {
+                let mut matched = false;
+                if let Ok(metadata) = entry_path.metadata() {
+                    if let Ok(modified) = metadata.modified() {
+                        matched = config
+                            .time_constraints
+                            .iter()
+                            .all(|tf| tf.applies_to(&modified));
+                    }
+                }
+                if !matched {
+                    return ignore::WalkState::Continue;
+                }
+            }
+
+            let send_result = tx_thread.send(WorkerResult::Entry(entry_path.to_owned()));
+
+            if send_result.is_err() {
+                return ignore::WalkState::Quit;
+            }
+
+            // Apply pruning.
+            if config.prune {
+                return ignore::WalkState::Skip;
+            }
+
             ignore::WalkState::Continue
         })
     });
-
-    // Drop the initial sender. If we don't do this, the receiver will block even
-    // if all threads have finished, since there is still one sender around.
-    drop(tx);
-
-    // Wait for the receiver thread to print out all results.
-    receiver_thread.join().unwrap();
-
-    if wants_to_quit.load(Ordering::Relaxed) {
-        process::exit(EXITCODE_SIGINT);
-    }
 }

src/windows.rs

@@ -1,39 +0,0 @@
-// Copyright (c) 2017 fd developers
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0>
-// or the MIT license <LICENSE-MIT or http://opensource.org/licenses/MIT>,
-// at your option. All files in the project carrying such
-// notice may not be copied, modified, or distributed except
-// according to those terms.
-
-extern crate kernel32;
-extern crate winapi;
-
-use self::kernel32::{GetConsoleMode, GetStdHandle, SetConsoleMode};
-use self::winapi::{INVALID_HANDLE_VALUE, STD_OUTPUT_HANDLE};
-
-const ENABLE_VIRTUAL_TERMINAL_PROCESSING: u32 = 0x0004;
-
-// https://docs.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences#example
-pub fn enable_colored_output() -> bool {
-    unsafe {
-        let handle = GetStdHandle(STD_OUTPUT_HANDLE);
-        if handle == INVALID_HANDLE_VALUE {
-            return false;
-        }
-
-        // https://docs.microsoft.com/en-us/windows/console/getconsolemode
-        let mut mode = 0;
-        if GetConsoleMode(handle, &mut mode) == 0 {
-            return false;
-        }
-        mode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING;
-
-        // https://docs.microsoft.com/en-us/windows/console/setconsolemode
-        //
-        // A console consists of an input buffer and one or more screen buffers.  ...  Setting the
-        // output modes of one screen buffer does not affect the output modes of other screen
-        // buffers.
-        SetConsoleMode(handle, mode) != 0
-    }
-}

tests/testenv/mod.rs

@@ -1,29 +1,14 @@
-// Copyright (c) 2017 fd developers
-// Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0>
-// or the MIT license <LICENSE-MIT or http://opensource.org/licenses/MIT>,
-// at your option. All files in the project carrying such
-// notice may not be copied, modified, or distributed except
-// according to those terms.
-
-use std;
 use std::env;
 use std::fs;
-use std::io;
-use std::io::Write;
+use std::io::{self, Write};
+#[cfg(unix)]
+use std::os::unix;
+#[cfg(windows)]
+use std::os::windows;
 use std::path::{Path, PathBuf};
 use std::process;
 
-#[cfg(unix)]
-use std::os::unix;
-
-#[cfg(windows)]
-use std::os::windows;
-
-extern crate diff;
-extern crate tempdir;
-
-use self::tempdir::TempDir;
+use tempdir::TempDir;
 
 /// Environment for the integration tests.
 pub struct TestEnv {
@@ -32,6 +17,9 @@ pub struct TestEnv {
 
     /// Path to the *fd* executable.
     fd_exe: PathBuf,
+
+    /// Normalize each line by sorting the whitespace-separated words
+    normalize_line: bool,
 }
 
 /// Create the working directory and the test files.
@@ -44,6 +32,9 @@ fn create_working_directory(
     {
         let root = temp_dir.path();
 
+        // Pretend that this is a Git repository in order for `.gitignore` files to be respected
+        fs::create_dir_all(root.join(".git"))?;
+
         for directory in directories {
             fs::create_dir_all(root.join(directory))?;
         }
@@ -60,7 +51,7 @@ fn create_working_directory(
         #[cfg(windows)]
         windows::fs::symlink_dir(root.join("one/two"), root.join("symlink"))?;
 
-        fs::File::create(root.join(".ignore"))?.write_all(b"ignored.foo")?;
+        fs::File::create(root.join(".fdignore"))?.write_all(b"fdignored.foo")?;
 
         fs::File::create(root.join(".gitignore"))?.write_all(b"gitignored.foo")?;
     }
@@ -118,19 +109,24 @@ fn format_output_error(args: &[&str], expected: &str, actual: &str) -> String {
 }
 
 /// Normalize the output for comparison.
-fn normalize_output(s: &str, trim_left: bool) -> String {
+fn normalize_output(s: &str, trim_start: bool, normalize_line: bool) -> String {
     // Split into lines and normalize separators.
-    let mut lines = s.replace('\0', "NULL\n")
+    let mut lines = s
+        .replace('\0', "NULL\n")
         .lines()
         .map(|line| {
-            let line =
-                if trim_left { line.trim_left() } else { line };
-            line.replace('/', &std::path::MAIN_SEPARATOR.to_string())
+            let line = if trim_start { line.trim_start() } else { line };
+            let line = line.replace('/', &std::path::MAIN_SEPARATOR.to_string());
+            if normalize_line {
+                let mut words: Vec<_> = line.split_whitespace().collect();
+                words.sort();
+                return words.join(" ");
+            }
+            line
         })
         .collect::<Vec<_>>();
 
-    lines.sort_by_key(|s| s.clone());
-
+    lines.sort();
     lines.join("\n")
 }
 
@@ -140,11 +136,39 @@ impl TestEnv {
         let fd_exe = find_fd_exe();
 
         TestEnv {
-            temp_dir: temp_dir,
-            fd_exe: fd_exe,
+            temp_dir,
+            fd_exe,
+            normalize_line: false,
         }
     }
 
+    pub fn normalize_line(self, normalize: bool) -> TestEnv {
+        TestEnv {
+            temp_dir: self.temp_dir,
+            fd_exe: self.fd_exe,
+            normalize_line: normalize,
+        }
+    }
+
+    /// Create a broken symlink at the given path in the temp_dir.
+    pub fn create_broken_symlink<P: AsRef<Path>>(
+        &mut self,
+        link_path: P,
+    ) -> Result<PathBuf, io::Error> {
+        let root = self.test_root();
+        let broken_symlink_link = root.join(link_path);
+        {
+            let temp_target_dir = TempDir::new("fd-tests-broken-symlink")?;
+            let broken_symlink_target = temp_target_dir.path().join("broken_symlink_target");
+            fs::File::create(&broken_symlink_target)?;
+            #[cfg(unix)]
+            unix::fs::symlink(&broken_symlink_target, &broken_symlink_link)?;
+            #[cfg(windows)]
+            windows::fs::symlink_file(&broken_symlink_target, &broken_symlink_link)?;
+        }
+        Ok(broken_symlink_link)
+    }
+
     /// Get the root directory for the tests.
     pub fn test_root(&self) -> PathBuf {
         self.temp_dir.path().to_path_buf()
@@ -156,11 +180,42 @@ impl TestEnv {
         PathBuf::from(components.next().expect("root directory").as_os_str())
     }
 
+    /// Assert that calling *fd* in the specified path under the root working directory,
+    /// and with the specified arguments produces the expected output.
+    pub fn assert_success_and_get_output<P: AsRef<Path>>(
+        &self,
+        path: P,
+        args: &[&str],
+    ) -> process::Output {
+        // Setup *fd* command.
+        let mut cmd = process::Command::new(&self.fd_exe);
+        cmd.current_dir(self.temp_dir.path().join(path));
+        cmd.arg("--no-global-ignore-file").args(args);
+
+        // Run *fd*.
+        let output = cmd.output().expect("fd output");
+
+        // Check for exit status.
+        if !output.status.success() {
+            panic!(format_exit_error(args, &output));
+        }
+
+        output
+    }
+
     /// Assert that calling *fd* with the specified arguments produces the expected output.
     pub fn assert_output(&self, args: &[&str], expected: &str) {
         self.assert_output_subdirectory(".", args, expected)
     }
 
+    /// Similar to assert_output, but able to handle non-utf8 output
+    #[cfg(all(unix, not(target_os = "macos")))]
+    pub fn assert_output_raw(&self, args: &[&str], expected: &[u8]) {
+        let output = self.assert_success_and_get_output(".", args);
+
+        assert_eq!(expected, &output.stdout[..]);
+    }
+
     /// Assert that calling *fd* in the specified path under the root working directory,
     /// and with the specified arguments produces the expected output.
     pub fn assert_output_subdirectory<P: AsRef<Path>>(
@@ -169,26 +224,75 @@ impl TestEnv {
         args: &[&str],
         expected: &str,
     ) {
-        // Setup *fd* command.
-        let mut cmd = process::Command::new(&self.fd_exe);
-        cmd.current_dir(self.temp_dir.path().join(path));
-        cmd.args(args);
-
-        // Run *fd*.
-        let output = cmd.output().expect("fd output");
-
-        // Check for exit status.
-        if !output.status.success() {
-            panic!(format_exit_error(args, &output));
-        }
+        let output = self.assert_success_and_get_output(path, args);
 
         // Normalize both expected and actual output.
-        let expected = normalize_output(expected, true);
-        let actual = normalize_output(&String::from_utf8_lossy(&output.stdout), false);
+        let expected = normalize_output(expected, true, self.normalize_line);
+        let actual = normalize_output(
+            &String::from_utf8_lossy(&output.stdout),
+            false,
+            self.normalize_line,
+        );
 
         // Compare actual output to expected output.
         if expected != actual {
             panic!(format_output_error(args, &expected, &actual));
         }
     }
+
+    /// Assert that calling *fd* with the specified arguments produces the expected error,
+    /// and does not succeed.
+    pub fn assert_failure_with_error(&self, args: &[&str], expected: &str) {
+        let status = self.assert_error_subdirectory(".", args, Some(expected));
+        if status.success() {
+            panic!("error '{}' did not occur.", expected);
+        }
+    }
+
+    /// Assert that calling *fd* with the specified arguments does not succeed.
+    pub fn assert_failure(&self, args: &[&str]) {
+        let status = self.assert_error_subdirectory(".", args, None);
+        if status.success() {
+            panic!("Failure did not occur as expected.");
+        }
+    }
+
+    /// Assert that calling *fd* with the specified arguments produces the expected error.
+    pub fn assert_error(&self, args: &[&str], expected: &str) -> process::ExitStatus {
+        self.assert_error_subdirectory(".", args, Some(expected))
+    }
+
+    /// Assert that calling *fd* in the specified path under the root working directory,
+    /// and with the specified arguments produces an error with the expected message.
+    fn assert_error_subdirectory<P: AsRef<Path>>(
+        &self,
+        path: P,
+        args: &[&str],
+        expected: Option<&str>,
+    ) -> process::ExitStatus {
+        // Setup *fd* command.
+        let mut cmd = process::Command::new(&self.fd_exe);
+        cmd.current_dir(self.temp_dir.path().join(path));
+        cmd.arg("--no-global-ignore-file").args(args);
+
+        // Run *fd*.
+        let output = cmd.output().expect("fd output");
+
+        if let Some(expected) = expected {
+            // Normalize both expected and actual output.
+            let expected_error = normalize_output(expected, true, self.normalize_line);
+            let actual_err = normalize_output(
+                &String::from_utf8_lossy(&output.stderr),
+                false,
+                self.normalize_line,
+            );
+
+            // Compare actual output to expected output.
+            if !actual_err.trim_start().starts_with(&expected_error) {
+                panic!(format_output_error(args, &expected_error, &actual_err));
+            }
+        }
+
+        return output.status;
+    }
 }