nnn

commit 243301603edb1bfc31087ee20fa6cf90bad8ff64
parent f9281c8eab719e2b61abdfa156a8d2e1c9a85611
Author: Arun Prakash Jana <engineerarun@gmail.com>
Date:   Sun, 15 Jan 2023 11:46:03 +0530

Paging is achieved through shell command now

Diffstat:
M
nnn.1
 | 
1
-
M
plugins/README.md
 | 
1
-
M
src/nnn.c
 | 
14
+++++---------

3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/nnn.1 b/nnn.1
@@ -448,7 +448,6 @@ separated by \fI;\fR:
        add \fB|\fR (pipe) after \fB!\fR
        Note: This option is incompatible with \fB&\fR (terminal output is masked
        for GUI programs) and ignores \fB*\fR (output is already paged for user).
-       \fI$nnn\fR must be the last argument in this case as well.
 
         export NNN_PLUG='m:-!|mediainfo $nnn;t:-!|tree -ps;l:-!|ls -lah --group-directories-first'
 
diff --git a/plugins/README.md b/plugins/README.md
@@ -180,7 +180,6 @@ export NNN_PLUG='m:-!|mediainfo $nnn;t:-!|tree -ps;l:-!|ls -lah --group-director
 ```
 
 This option is incompatible with `&` (terminal output is masked for GUI programs) and ignores `*` (output is already paged for user).
-`$nnn` must be the last argument in this case as well.
 
 Notes:
 
diff --git a/src/nnn.c b/src/nnn.c
@@ -5192,27 +5192,23 @@ static void setexports(void)
 
 static void run_cmd_as_plugin(const char *file, char *runfile, uchar_t flags)
 {
-	size_t len;
-
-	xstrsncpy(g_buf, file, PATH_MAX);
+	size_t len = xstrsncpy(g_buf, file, PATH_MAX) - 1;
 
-	len = xstrlen(g_buf);
 	if (len > 1 && g_buf[len - 1] == '*') {
 		flags &= ~F_CONFIRM; /* Skip user confirmation */
 		g_buf[len - 1] = '\0'; /* Get rid of trailing no confirmation symbol */
 		--len;
 	}
 
-	if ((flags & F_PAGE) || (flags & F_NOTRACE)) {
+	if (flags & F_PAGE)
+		get_output(g_buf, NULL, NULL, -1, TRUE);
+	else if (flags & F_NOTRACE) {
 		if (is_suffix(g_buf, " $nnn"))
 			g_buf[len - 5] = '\0';
 		else
 			runfile = NULL;
 
-		if (flags & F_PAGE)
-			get_output(g_buf, runfile, NULL, -1, TRUE);
-		else // F_NOTRACE
-			spawn(g_buf, runfile, NULL, NULL, flags);
+		spawn(g_buf, runfile, NULL, NULL, flags);
 	} else
 		spawn(utils[UTIL_SH_EXEC], g_buf, NULL, NULL, flags);
 }