commit 7def65fc0210ef8c4697af4abfeb583ff765ec9d
parent a2deaf57f310518855160eb8f8363c532b1b611d
Author: Arun Prakash Jana <engineerarun@gmail.com>
Date: Sun, 25 Aug 2024 09:30:59 +0530
Add option -0 to use null separator for file paths in picker mode
Diffstat:
5 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/misc/auto-completion/bash/nnn-completion.bash b/misc/auto-completion/bash/nnn-completion.bash
@@ -44,6 +44,7 @@ _nnn ()
-U
-V
-x
+ -0
-h
)
if [[ $prev == -b ]]; then
diff --git a/misc/auto-completion/fish/nnn.fish b/misc/auto-completion/fish/nnn.fish
@@ -43,4 +43,5 @@ complete -c nnn -s u -d 'use selection (no prompt)'
complete -c nnn -s U -d 'show user and group'
complete -c nnn -s V -d 'show program version and exit'
complete -c nnn -s x -d 'notis, sel to system clipboard, xterm title'
+complete -c nnn -s 0 -d 'use null separator in picker mode'
complete -c nnn -s h -d 'show program help'
diff --git a/misc/auto-completion/zsh/_nnn b/misc/auto-completion/zsh/_nnn
@@ -42,6 +42,7 @@ args=(
'(-U)-U[show user and group]'
'(-V)-V[show program version and exit]'
'(-x)-x[notis, sel to system clipboard, xterm title]'
+ '(-0)-0[use null separator in picker mode]'
'(-h)-h[show program help]'
'*:filename:_files'
)
diff --git a/nnn.1 b/nnn.1
@@ -165,6 +165,9 @@ supports the following options:
copy path to system clipboard on selection (requires \fI.cbcp\fR plugin)
show xterm title (if non-picker mode)
.Pp
+.Fl 0
+ use null separator (instead of newline) to separate file paths in picker mode outout
+.Pp
.Fl h
show program help and exit
.Sh CONFIGURATION
diff --git a/src/nnn.c b/src/nnn.c
@@ -192,6 +192,10 @@
#define MSGWAIT '$'
#define SELECT ' '
#define PROMPT ">>> "
+#undef NEWLINE
+#define NEWLINE "\n"
+#undef NUL
+#define NUL "\0"
#define REGEX_MAX 48
#define ENTRY_INCR 64 /* Number of dir 'entry' structures to allocate per shot */
#define NAMEBUF_INCR 0x800 /* 64 dir entries at once, avg. 32 chars per file name = 64*32B = 2KB */
@@ -1611,7 +1615,7 @@ static void selbufrealloc(const size_t alloclen)
}
/* Write selected file paths to fd, linefeed separated */
-static size_t seltofile(int fd, uint_t *pcount)
+static size_t seltofile(int fd, uint_t *pcount, const char *separator)
{
uint_t lastpos, count = 0;
char *pbuf = pselbuf;
@@ -1647,7 +1651,7 @@ static size_t seltofile(int fd, uint_t *pcount)
pos += len;
if (pos <= lastpos) {
- if (write(fd, "\n", 1) != 1)
+ if (write(fd, separator, 1) != 1)
return pos;
pbuf += len + 1;
}
@@ -1972,7 +1976,7 @@ static void endselection(bool endselmode)
return;
}
- seltofile(fd, NULL);
+ seltofile(fd, NULL, NEWLINE);
if (close(fd)) {
DPRINTF_S(strerror(errno));
printwarn(NULL);
@@ -2036,7 +2040,7 @@ static int editselection(void)
return -1;
}
- seltofile(fd, NULL);
+ seltofile(fd, NULL, NEWLINE);
if (close(fd)) {
DPRINTF_S(strerror(errno));
return -1;
@@ -2644,7 +2648,7 @@ static bool cpmv_rename(int choice, const char *path)
if (!count)
goto finish;
} else
- seltofile(fd, &count);
+ seltofile(fd, &count, NEWLINE);
close(fd);
@@ -2764,8 +2768,8 @@ static bool batch_rename(void)
for (i = 0; i < ndents; ++i)
appendfpath(pdents[i].name, NAME_MAX);
- seltofile(fd1, &count);
- seltofile(fd2, NULL);
+ seltofile(fd1, &count, NEWLINE);
+ seltofile(fd2, NULL, NEWLINE);
close(fd2);
if (dir) /* Don't retain dir entries in selection */
@@ -6074,7 +6078,7 @@ static void send_to_explorer(int *presel)
{
if (nselected) {
int fd = open(fifopath, O_WRONLY|O_NONBLOCK|O_CLOEXEC, 0600);
- if ((fd == -1) || (seltofile(fd, NULL) != (size_t)(selbufpos)))
+ if ((fd == -1) || (seltofile(fd, NULL, NEWLINE) != (size_t)(selbufpos)))
printwarn(presel);
else {
resetselind();
@@ -8426,6 +8430,7 @@ static void usage(void)
#ifndef NOX11
" -x notis, selection sync, xterm title\n"
#endif
+ " -0 null separator in picker mode\n"
" -h show help\n\n"
"v%s\n%s\n", __func__, VERSION, GENERAL_INFO);
}
@@ -8566,6 +8571,7 @@ int main(int argc, char *argv[])
char *arg = NULL;
char *session = NULL;
int fd, opt, sort = 0, pkey = '\0'; /* Plugin key */
+ bool sepnul = FALSE;
#ifndef NOMOUSE
mmask_t mask;
char *middle_click_env = xgetenv(env_cfg[NNN_MCLICK], "\0");
@@ -8583,7 +8589,7 @@ int main(int argc, char *argv[])
while ((opt = (env_opts_id > 0
? env_opts[--env_opts_id]
- : getopt(argc, argv, "aAb:BcCdDeEfF:gHiJKl:nNop:P:QrRs:St:T:uUVxh"))) != -1) {
+ : getopt(argc, argv, "aAb:BcCdDeEfF:gHiJKl:nNop:P:QrRs:St:T:uUVx0h"))) != -1) {
switch (opt) {
#ifndef NOFIFO
case 'a':
@@ -8728,6 +8734,9 @@ int main(int argc, char *argv[])
case 'x':
cfg.x11 = 1;
break;
+ case '0':
+ sepnul = TRUE;
+ break;
case 'h':
usage();
return EXIT_SUCCESS;
@@ -9045,7 +9054,7 @@ int main(int argc, char *argv[])
if (g_state.picker) {
if (selbufpos) {
fd = selpath ? open(selpath, O_WRONLY | O_CREAT | O_TRUNC, 0600) : STDOUT_FILENO;
- if ((fd == -1) || (seltofile(fd, NULL) != (size_t)(selbufpos)))
+ if ((fd == -1) || (seltofile(fd, NULL, sepnul ? NUL : NEWLINE) != (size_t)(selbufpos)))
xerror();
if (fd > 1)
