mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-12-01 02:49:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build break

Browse source
This commit is contained in:
Arun Prakash Jana 2020-02-02 17:25:47 +05:30
parent 47a2f93e02
commit 06f6435ebd
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/nnn.c
View file

@ -6178,12 +6178,12 @@ static char *load_input()
break; break;
if (chunk_count == 512 || !(input = xrealloc(input, (chunk_count + 1) * chunk))) if (chunk_count == 512 || !(input = xrealloc(input, (chunk_count + 1) * chunk)))
goto malloc_2; goto malloc_1;
} }
if (off != total_read) { if (off != total_read) {
if (entries == (1 << 16)) if (entries == (1 << 16))
goto malloc_2; goto malloc_1;
paths[entries++] = input + off; paths[entries++] = input + off;
} }
@ -6195,16 +6195,25 @@ static char *load_input()
g_prefixpath = malloc(sizeof(char) * PATH_MAX); g_prefixpath = malloc(sizeof(char) * PATH_MAX);
if (!g_prefixpath) if (!g_prefixpath)
goto malloc_2; goto malloc_1;
if (!(paths[0] = xrealpath(paths[0], cwd))) if (!(paths[0] = xrealpath(paths[0], cwd)))
goto malloc_2; // free all entries goto malloc_1; // free all entries
xstrlcpy(g_prefixpath, paths[0], strlen(paths[0]) + 1); xstrlcpy(g_prefixpath, paths[0], strlen(paths[0]) + 1);
for (i = 1; i < entries; ++i) for (i = 1; i < entries; ++i) {
if (!(paths[i] = xrealpath(paths[i], cwd)) || !common_prefix(paths[i], g_prefixpath)) if (!(paths[i] = xrealpath(paths[i], cwd))) {
goto malloc_2; // free all entries entries = i; // free from the previous entry
goto malloc_2;
}
if (!common_prefix(paths[i], g_prefixpath)) {
entries = i + 1; // free from the current entry
goto malloc_2;
}
}
if (entries == 1) { if (entries == 1) {
tmp = xmemrchr((uchar *)g_prefixpath, '/', strlen(g_prefixpath)); tmp = xmemrchr((uchar *)g_prefixpath, '/', strlen(g_prefixpath));