From 8886f1cd561b4a27ac08c2df65659c52ccc392fc Mon Sep 17 00:00:00 2001
From: Arun Prakash Jana <engineerarun@gmail.com>
Date: Thu, 4 Mar 2021 19:52:06 +0530
Subject: [PATCH] Fix regression in #864
---
src/nnn.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/nnn.c b/src/nnn.c
index 3f352697..a8e9a9fd 100644
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -1330,16 +1330,17 @@ static size_t seltofile(int fd, uint_t *pcount)
return pos;
}
-/* List selection from selection file (another instance) */
-static bool listselfile(void)
+static bool isselfileempty(void)
{
struct stat sb;
- if (stat(selpath, &sb) == -1)
- return FALSE;
+ return (stat(selpath, &sb) == -1) || (!sb.st_size);
+}
- /* Nothing selected if file size is 0 */
- if (!sb.st_size)
+/* List selection from selection file (another instance) */
+static bool listselfile(void)
+{
+ if (isselfileempty())
return FALSE;
snprintf(g_buf, CMD_LEN_MAX, "tr \'\\0\' \'\\n\' < %s", selpath);
@@ -2087,6 +2088,11 @@ static bool cpmvrm_selection(enum action sel, char *path)
{
int r;
+ if (isselfileempty()) {
+ printmsg(messages[MSG_0_SELECTED]);
+ return FALSE;
+ }
+
if (!selsafe())
return FALSE;
--
2.51.0