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

Simplify and fix common prefix calculation

Browse source
This commit is contained in:
Arun Prakash Jana 2020-02-09 00:25:58 +05:30
parent 58357912bc
commit bc5234be8d
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 39 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
src/nnn.c
View file

@ -948,81 +948,46 @@ static void *xmemrchr(uchar *s, uchar ch, size_t n)
} }
/* Assumes both the paths passed are directories */ /* Assumes both the paths passed are directories */
static char *common_prefix(const char *s, char *prefix) static char *common_prefix(const char *path, char *prefix)
{ {
if (!s || !*s || !prefix) const char *x = path, *y = prefix;
char *sep;
if (!path || !*path || !prefix)
return NULL; return NULL;
if (!*prefix) { if (!*prefix) {
xstrlcpy(prefix, s, PATH_MAX); xstrlcpy(prefix, path, PATH_MAX);
return prefix; return prefix;
} }
/* Only accept non-empty strings */ while (*x && *y && (*x == *y))
if (*s == '\0' || *prefix == '\0') ++x, ++y;
return NULL;
ulong *x, *y;
size_t i = 0, j = 0, blocks = 0;
size_t len_s = strlen(s), len_prefix = strlen(prefix);
size_t len = MIN(len_s, len_prefix);
char *tmp;
/*
* To enable -O3 ensure s and prefix are 16-byte aligned
* More info: https://www.felixcloutier.com/x86/MOVDQA:VMOVDQA32:VMOVDQA64
*/
if ((len >= LONG_SIZE) && (((ulong)s & _ALIGNMENT_MASK) == 0
&& ((ulong)prefix & _ALIGNMENT_MASK) == 0)) {
x = (ulong *)s;
y = (ulong *)prefix;
blocks = len >> _WSHIFT;
len &= LONG_SIZE - 1;
while (i < blocks && (*x == *y))
++x, ++y, ++i;
/* This should always return */
if (i < blocks) {
i *= LONG_SIZE;
for (; j < LONG_SIZE; ++j)
if (s[i + j] != prefix[i + j]) {
tmp = xmemrchr((uchar *)prefix, '/', i + j);
if (!tmp)
return NULL;
*(tmp != prefix ? tmp : tmp + 1) = '\0';
/* Strings are same OR prefix is smaller */
if ((!*x && !*y) || !*y)
return prefix; return prefix;
}
}
if (!len) /* Path is smaller */
if (!*x) {
xstrlcpy(prefix, path, path - x + 1);
return prefix; return prefix;
} }
i = blocks * LONG_SIZE; /* Paths deviate and prefix ends with '/' */
while (j < len && s[i + j] == prefix[i + j]) if (y != prefix && *y == '/') {
++j; prefix[y - prefix] = '\0';
if (j < len) {
tmp = xmemrchr((uchar *)prefix, '/', i + j);
if (!tmp)
return NULL;
*(tmp != prefix ? tmp : tmp + 1) = '\0';
return prefix; return prefix;
} }
/* complete match but lenghts might differ */ /* Shorten prefix */
if (len_s < len_prefix || (len_s > len_prefix && s[len_prefix] != '/')) { prefix[y - prefix] = '\0';
tmp = xmemrchr((uchar *)prefix, '/', len);
if (!tmp)
return NULL;
*(tmp != prefix ? tmp : tmp + 1) = '\0'; sep = xmemrchr((uchar *)prefix, '/', y - prefix);
} if (sep != prefix)
*sep = '\0';
else /* Just '/' */
prefix[1] = '\0';
return prefix; return prefix;
} }
@ -1031,7 +996,7 @@ static char *common_prefix(const char *s, char *prefix)
* The library function realpath() resolves symlinks. * The library function realpath() resolves symlinks.
* If there's a symlink in file list we want to show the symlink not what it's points to. * If there's a symlink in file list we want to show the symlink not what it's points to.
*/ */
static char *xrealpath(const char *path, const char *cwd) static char *abspath(const char *path, const char *cwd)
{ {
if (!path || !cwd) if (!path || !cwd)
return NULL; return NULL;
@ -6259,7 +6224,7 @@ static char *load_input()
continue; continue;
} }
if (!(paths[i] = xrealpath(paths[i], cwd))) { if (!(paths[i] = abspath(paths[i], cwd))) {
entries = i; // free from the previous entry entries = i; // free from the previous entry
goto malloc_2; goto malloc_2;
@ -6278,6 +6243,7 @@ static char *load_input()
DPRINTF_S(g_prefixpath); DPRINTF_S(g_prefixpath);
if (g_prefixpath[0]) {
if (entries == 1) { if (entries == 1) {
tmp = xmemrchr((uchar *)g_prefixpath, '/', strlen(g_prefixpath)); tmp = xmemrchr((uchar *)g_prefixpath, '/', strlen(g_prefixpath));
if (!tmp) if (!tmp)
@ -6287,6 +6253,7 @@ static char *load_input()
} }
tmpdir = make_tmp_tree(paths, entries, g_prefixpath); tmpdir = make_tmp_tree(paths, entries, g_prefixpath);
}
malloc_2: malloc_2:
for (i = entries - 1; i >= 0; --i) for (i = entries - 1; i >= 0; --i)