mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-24 20:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Decouple listpath and initpath

Browse source
This commit is contained in:
Arun Prakash Jana 2020-05-03 15:25:19 +05:30
parent 8b764a5f7c
commit 3f60a1931f
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/nnn.c
View file

@ -1170,14 +1170,14 @@ static size_t seltofile(int fd, uint *pcount)
if (listpath) { if (listpath) {
prefixlen = (ssize_t)xstrlen(prefixpath); prefixlen = (ssize_t)xstrlen(prefixpath);
initlen = (ssize_t)xstrlen(initpath); initlen = (ssize_t)xstrlen(listpath);
} }
while (pos <= lastpos) { while (pos <= lastpos) {
DPRINTF_S(pbuf); DPRINTF_S(pbuf);
len = (ssize_t)xstrlen(pbuf); len = (ssize_t)xstrlen(pbuf);
if (!listpath || strncmp(initpath, pbuf, initlen) != 0) { if (!listpath || strncmp(listpath, pbuf, initlen) != 0) {
if (write(fd, pbuf, len) != len) if (write(fd, pbuf, len) != len)
return pos; return pos;
} else { } else {
@ -4225,8 +4225,9 @@ static void rmlistpath()
{ {
if (listpath) { if (listpath) {
DPRINTF_S(__FUNCTION__); DPRINTF_S(__FUNCTION__);
DPRINTF_S(initpath); DPRINTF_S(listpath);
spawn("rm -rf", initpath, NULL, NULL, F_NOTRACE | F_MULTI); spawn("rm -rf", listpath, NULL, NULL, F_NOTRACE | F_MULTI);
free(listpath);
listpath = NULL; listpath = NULL;
} }
} }
@ -4261,11 +4262,6 @@ static void readpipe(int fd, char **path, char **lastname, char **lastdir)
rmlistpath(); rmlistpath();
nextpath = load_input(fd, *path); nextpath = load_input(fd, *path);
if (nextpath) {
free(initpath);
initpath = nextpath;
DPRINTF_S(initpath);
}
} }
if (nextpath) { if (nextpath) {