mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-28 13:51:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce number of entry movements

Browse source
This commit is contained in:
Arun Prakash Jana 2017-05-17 08:16:33 +05:30
parent 8263c9c419
commit 95cdb78c6c
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 35 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
nnn.c
View file

@ -620,44 +620,47 @@ nextsel(char **run, char **env, int *ch)
return 0; return 0;
} }
static int /*
* Move non-matching entries to the end
*/
static void
fill(struct entry **dents, fill(struct entry **dents,
int (*filter)(regex_t *, char *), regex_t *re) int (*filter)(regex_t *, char *), regex_t *re)
{ {
static struct entry _dent; static int count;
static int count, n;
for (count = 0; count < ndents; count++) {
if (filter(re, (*dents)[count].name) == 0) {
if (count != --ndents) {
static struct entry _dent;
/* Copy count to tmp */
xstrlcpy(_dent.name, (*dents)[count].name, NAME_MAX);
_dent.mode = (*dents)[count].mode;
_dent.t = (*dents)[count].t;
_dent.size = (*dents)[count].size;
_dent.bsize = (*dents)[count].bsize;
/* Copy ndents - 1 to count */
xstrlcpy((*dents)[count].name, (*dents)[ndents].name, NAME_MAX);
(*dents)[count].mode = (*dents)[ndents].mode;
(*dents)[count].t = (*dents)[ndents].t;
(*dents)[count].size = (*dents)[ndents].size;
(*dents)[count].bsize = (*dents)[ndents].bsize;
/* Copy tmp to ndents - 1 */
xstrlcpy((*dents)[ndents].name, _dent.name, NAME_MAX);
(*dents)[ndents].mode = _dent.mode;
(*dents)[ndents].t = _dent.t;
(*dents)[ndents].size = _dent.size;
(*dents)[ndents].bsize = _dent.bsize;
count--;
}
for (count = 0, n = 0; count < ndents; count++) {
if (filter(re, (*dents)[count].name) == 0)
continue; continue;
if (n != count) {
/* Copy to tmp */
xstrlcpy(_dent.name, (*dents)[n].name, NAME_MAX);
_dent.mode = (*dents)[n].mode;
_dent.t = (*dents)[n].t;
_dent.size = (*dents)[n].size;
_dent.bsize = (*dents)[n].bsize;
/* Copy count to n */
xstrlcpy((*dents)[n].name, (*dents)[count].name, NAME_MAX);
(*dents)[n].mode = (*dents)[count].mode;
(*dents)[n].t = (*dents)[count].t;
(*dents)[n].size = (*dents)[count].size;
(*dents)[n].bsize = (*dents)[count].bsize;
/* Copy tmp to count */
xstrlcpy((*dents)[count].name, _dent.name, NAME_MAX);
(*dents)[count].mode = _dent.mode;
(*dents)[count].t = _dent.t;
(*dents)[count].size = _dent.size;
(*dents)[count].bsize = _dent.bsize;
} }
n++;
} }
return n;
} }
static int static int
@ -669,7 +672,7 @@ matches(char *fltr)
if (setfilter(&re, fltr) != 0) if (setfilter(&re, fltr) != 0)
return -1; return -1;
ndents = fill(&dents, visible, &re); fill(&dents, visible, &re);
qsort(dents, ndents, sizeof(*dents), entrycmp); qsort(dents, ndents, sizeof(*dents), entrycmp);
return 0; return 0;