Minor refactor

diff --git a/README.md b/README.md
index 67ce1430b62007e96c00c7d4adc95c86af661d92..9bfab1735584cf255139d4959c488de9551add59 100644 (file)
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ Add to that an awesome [Wiki](https://github.com/jarun/nnn/wiki)!
   - SSHFS mounts (needs sshfs)
   - Cross-directory file selection, all/range selection
   - Batch rename selection or dir entries
-  - Copy, move, delete, archive, link selection
+  - Copy (as), move (as), delete, archive, link selection
   - Create, rename, duplicate files and directories
   - Spawn a shell, run apps, run commands, execute file
   - Lock terminal (needs a locker)
@@ -195,8 +195,8 @@ The list below is from the **dev branch**. Press <kbd>?</kbd> in `nnn` to see th
  NAVIGATION
           ↑ k  Up          PgUp ^U  Scroll up
           ↓ j  Down        PgDn ^D  Scroll down
-          ← h  Parent dir  ~ ` @ -  HOME, /, start, last
-        ↵ → l  Open file/dir     .  Toggle show hidden
+          ← h  Parent      ~ ` @ -  HOME, /, start, last
+        ↵ → l  Open              .  Toggle show hidden
          g ^A  First entry    G ^E  Last entry
             b  Pin current dir  ^B  Go to pinned dir
       (Sh)Tab  Cycle context     d  Toggle detail view
@@ -213,7 +213,7 @@ The list below is from the **dev branch**. Press <kbd>?</kbd> in `nnn` to see th
             a  Select all        K  Edit selection
             P  Copy selection    w  Copy selection as
             V  Move selection    W  Move selection as
-            X  Delete selection ^X  Delete entry
+            X  Del selection    ^X  Del entry
             f  Create archive    T  Mount archive
            ^F  Extract archive   F  List archive
             e  Edit in EDITOR    p  Open in PAGER

diff --git a/src/nnn.c b/src/nnn.c
index 1fb6685e1db6ba5570dd4bec2be29b12b755dca6..2f5bf9956271c34062ba271043ebfe259eec3c54 100644 (file)
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -908,7 +908,7 @@ static void clearselection(void)
        writesel(NULL, 0);
 }
 
-static bool seledit(void)
+static bool editselection(void)
 {
        bool ret = FALSE;
        int fd, lines = 0;
@@ -1338,11 +1338,8 @@ static bool cpmv_rename(const char *path, const char *cmd)
        lines = lines_in_file(fd, buf, sizeof(buf));
        DPRINTF_U(count);
        DPRINTF_U(lines);
-       if (!lines)
-               goto finish;
-
-       if (2 * count != lines) {
-               DPRINTF_S("cannot delete files");
+       if (!lines || (2 * count != lines)) {
+               DPRINTF_S("num mismatch");
                goto finish;
        }
 
@@ -1409,10 +1406,7 @@ static bool batch_rename(const char *path)
        lines = lines_in_file(fd2, buf, sizeof(buf));
        DPRINTF_U(count);
        DPRINTF_U(lines);
-       if (!lines)
-               goto finish;
-
-       if (count != lines) {
+       if (!lines || (count != lines)) {
                DPRINTF_S("cannot delete files");
                goto finish;
        }
@@ -3054,8 +3048,8 @@ static void show_help(const char *path)
                "1NAVIGATION\n"
                "a↑ k  Up          PgUp ^U  Scroll up\n"
                "a↓ j  Down        PgDn ^D  Scroll down\n"
-               "a← h  Parent dir  ~ ` @ -  HOME, /, start, last\n"
-             "8↵ → l  Open file/dir     .  Toggle show hidden\n"
+               "a← h  Parent      ~ ` @ -  HOME, /, start, last\n"
+             "8↵ → l  Open              .  Toggle show hidden\n"
               "9g ^A  First entry    G ^E  Last entry\n"
                  "cb  Pin current dir  ^B  Go to pinned dir\n"
            "6(Sh)Tab  Cycle context     d  Toggle detail view\n"
@@ -3070,9 +3064,9 @@ static void show_help(const char *path)
               "9⎵ ^J  Select entry      r  Batch rename\n"
               "9m ^K  Sel range, clear  M  List selection\n"
                  "ca  Select all        K  Edit selection\n"
-                 "cP Copy selection     w  Copy selection as\n"
-                 "cV Move selection     W  Move selection as\n"
-                 "cX Delete selection  ^X  Delete entry\n"
+                 "cP  Copy selection    w  Copy selection as\n"
+                 "cV  Move selection    W  Move selection as\n"
+                 "cX  Del selection    ^X  Del entry\n"
                  "cf  Create archive    T  Mount archive\n"
                 "b^F  Extract archive   F  List archive\n"
                  "ce  Edit in EDITOR    p  Open in PAGER\n"
@@ -4389,7 +4383,7 @@ nochange:
                        printwait(messages[NONE_SELECTED], &presel);
                        goto nochange;
                case SEL_SELEDIT:
-                       if (!seledit()){
+                       if (!editselection()){
                                printwait(messages[OPERATION_FAILED], &presel);
                                goto nochange;
                        }