From c44d5b57bd8eb6bb6ff72fff76adc2129e349aa8 Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Thu, 2 Jan 2020 03:58:09 +0530 Subject: [PATCH] Update docs, early check for empty files --- README.md | 4 ++-- src/nnn.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index b177b709..17d48fda 100644 --- a/README.md +++ b/README.md @@ -91,13 +91,13 @@ A curses library with wide char support (e.g. ncursesw), libreadline (optional) | Dependency | Installation | Operation | | --- | --- | --- | -| xdg-open (Linux), open(1) (macOS), cygstart (Cygwin) | base | desktop opener | +| xdg-open (Linux), open(1) (macOS), cygstart
(Cygwin), open (Haiku) | base | desktop opener | | file, coreutils (cp, mv, rm), xargs | base | file type, copy, move and remove | | tar, (un)zip [atool/bsdtar for more formats] | base | create, list, extract bzip2, (g)zip, tar | | archivemount, fusermount(3) | optional | mount, unmount archives | | sshfs, [rclone](https://rclone.org/), fusermount(3) | optional | mount, unmount remotes | | trash-cli | optional | trash files (default action: rm) | -| vlock (Linux), bashlock (macOS), lock(1) (BSD) | optional | terminal locker (fallback: [cmatrix](https://github.com/abishekvashok/cmatrix)) | +| vlock (Linux), bashlock (macOS), lock(1) (BSD),
peaclock (Haiku) | optional | terminal locker (fallback: [cmatrix](https://github.com/abishekvashok/cmatrix)) | | advcpmv (Linux) ([integration](https://github.com/jarun/nnn/wiki/Advanced-use-cases#show-cp-mv-progress)) | optional | copy, move progress | | `$VISUAL` (else `$EDITOR`), `$PAGER`, `$SHELL` | optional | fallback vi, less, sh | diff --git a/src/nnn.c b/src/nnn.c index ea09ef03..85d52fe9 100644 --- a/src/nnn.c +++ b/src/nnn.c @@ -4551,6 +4551,11 @@ nochange: } } + if (!sb.st_size) { + printwait(messages[MSG_EMPTY_FILE], &presel); + goto nochange; + } + /* If NNN_USE_EDITOR is set, open text in EDITOR */ if (cfg.useeditor && #ifdef FILE_MIME_OPTS @@ -4565,11 +4570,6 @@ nochange: continue; } - if (!sb.st_size) { - printwait(messages[MSG_EMPTY_FILE], &presel); - goto nochange; - } - if (!regexec(&archive_re, dents[cur].name, 0, NULL, 0)) { r = get_input(messages[MSG_ARCHIVE_OPTS]); if (r == 'l' || r == 'x') {