mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2025-02-26 03:01:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use standard function for numeric sort

Browse source 
Numeric is numeric i.e., n, -n. +n.
Other forms such as --n, ++n, -c, +c should not be considered numeric.

If size is same (e.g. dirs), use alphanum sort.
This commit is contained in:
Arun Prakash Jana 2017-04-02 11:02:07 +05:30
parent 90e98b832b
commit 691291245a
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 10 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
nnn.c
View file

@ -295,40 +295,23 @@ int xisdigit(const char c) {
static int static int
xstricmp(const char *s1, const char *s2) xstricmp(const char *s1, const char *s2)
{ {
static int s1_num, s2_num; static char *c1, *c2;
static const char *ps1, *ps2;
static long long num1, num2; static long long num1, num2;
s1_num = s2_num = 0; num1 = strtoll(s1, &c1, 10);
num2 = strtoll(s2, &c2, 10);
ps1 = s1;
if (*ps1 == '-')
ps1++;
while (*ps1 && xisdigit(*ps1))
ps1++;
if (!*ps1)
s1_num = 1;
ps2 = s2;
if (*ps2 == '-')
ps2++;
while (*ps2 && xisdigit(*ps2))
ps2++;
if (!*ps2)
s2_num = 1;
if (s1_num && s2_num) {
num1 = strtoll(s1, NULL, 10);
num2 = strtoll(s2, NULL, 10);
if (*c1 == '\0' && *c2 == '\0') {
if (num1 != num2) { if (num1 != num2) {
if (num1 > num2) if (num1 > num2)
return 1; return 1;
else else
return -1; return -1;
} }
} } else if (*c1 == '\0' && *c2 != '\0')
return -1;
else if (*c1 != '\0' && *c2 == '\0')
return 1;
while (*s2 && *s1 && TOUPPER(*s1) == TOUPPER(*s2)) while (*s2 && *s1 && TOUPPER(*s1) == TOUPPER(*s2))
s1++, s2++; s1++, s2++;
@ -410,7 +393,8 @@ entrycmp(const void *va, const void *vb)
return pb->t - pa->t; return pb->t - pa->t;
if (sizeorder) if (sizeorder)
return pb->size - pa->size; if (pb->size != pa->size)
return pb->size - pa->size;
return xstricmp(pa->name, pb->name); return xstricmp(pa->name, pb->name);
} }