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

Optimize link creation

Browse source
This commit is contained in:
Arun Prakash Jana 2022-12-12 18:03:11 +05:30
parent 38d7090e64
commit 17ed380b57
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/nnn.c
View file

@ -1137,7 +1137,19 @@ static size_t mkpath(const char *dir, const char *name, char *out)
{ {
size_t len = 0; size_t len = 0;
if (name[0] != '/') { // NOLINT if (name[0] == '~') { //NOLINT
len = xstrsncpy(out, home, PATH_MAX);
if (!name[1])
return len;
if (name[1] != '/') {
out[0] = '\0';
return 0;
}
--len;
++name;
} else if (name[0] != '/') { // NOLINT
/* Handle root case */ /* Handle root case */
len = istopdir(dir) ? 1 : xstrsncpy(out, dir, PATH_MAX); len = istopdir(dir) ? 1 : xstrsncpy(out, dir, PATH_MAX);
out[len - 1] = '/'; // NOLINT out[len - 1] = '/'; // NOLINT
@ -1275,6 +1287,8 @@ static char *abspath(const char *filepath, char *cwd, char *buf)
if (xstrlen(resolved_path) >= PATH_MAX) { if (xstrlen(resolved_path) >= PATH_MAX) {
if (!buf) if (!buf)
free(resolved_path); free(resolved_path);
else
buf[0] = '\0';
return NULL; return NULL;
} }
@ -3716,10 +3730,14 @@ static int xlink(char *prefix, char *path, char *curfname, char *buf, int type)
link_fn = &link; link_fn = &link;
if (choice == 'c' || (nselected == 1)) { if (choice == 'c' || (nselected == 1)) {
mkpath(path, prefix, lnpath); /* Generate link path */ prefix = abspath(prefix, path, lnpath); /* Generate link path */
mkpath(path, (choice == 'c') ? curfname : pselbuf, buf); /* Generate target file path */ if (!prefix)
return -1;
if (!link_fn(buf, lnpath)) { if (choice == 'c')
mkpath(path, curfname, buf); /* Generate target file path */
if (!link_fn((choice == 'c') ? buf : pselbuf, lnpath)) {
if (choice == 's') if (choice == 's')
clearselection(); clearselection();
return 1; /* One link created */ return 1; /* One link created */
@ -3727,11 +3745,12 @@ static int xlink(char *prefix, char *path, char *curfname, char *buf, int type)
return 0; return 0;
} }
r = xstrsncpy(buf, prefix, NAME_MAX + 1); /* Copy prefix */
while (pos < selbufpos) { while (pos < selbufpos) {
len = xstrlen(psel); len = xstrlen(psel);
fname = xbasename(psel); fname = xbasename(psel);
r = xstrsncpy(buf, prefix, NAME_MAX + 1); /* Copy prefix */
xstrsncpy(buf + r - 1, fname, NAME_MAX - r); /* Suffix target file name */ xstrsncpy(buf + r - 1, fname, NAME_MAX - r); /* Suffix target file name */
mkpath(path, buf, lnpath); /* Generate link path */ mkpath(path, buf, lnpath); /* Generate link path */
@ -7594,7 +7613,7 @@ nochange:
if (r == 'f' || r == 'd') if (r == 'f' || r == 'd')
tmp = xreadline(tmp, messages[MSG_NEW_PATH]); tmp = xreadline(tmp, messages[MSG_NEW_PATH]);
else if (r == 's' || r == 'h') else if (r == 's' || r == 'h')
tmp = xreadline(nselected == 1 ? xbasename(pselbuf) : NULL, tmp = xreadline(NULL,
messages[nselected <= 1 ? MSG_NEW_PATH : MSG_LINK_PREFIX]); messages[nselected <= 1 ? MSG_NEW_PATH : MSG_LINK_PREFIX]);
else else
tmp = NULL; tmp = NULL;