mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-24 20:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant param

Browse source
This commit is contained in:
Arun Prakash Jana 2019-01-21 02:49:05 +05:30
parent 76c366147a
commit b07becb176
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/nnn.c
View file

@ -1533,22 +1533,22 @@ END:
* Updates out with "dir/name or "/name" * Updates out with "dir/name or "/name"
* Returns the number of bytes copied including the terminating NULL byte * Returns the number of bytes copied including the terminating NULL byte
*/ */
static size_t mkpath(char *dir, char *name, char *out, size_t n) static size_t mkpath(char *dir, char *name, char *out)
{ {
static size_t len; static size_t len;
/* Handle absolute path */ /* Handle absolute path */
if (name[0] == '/') if (name[0] == '/')
return xstrlcpy(out, name, n); return xstrlcpy(out, name, PATH_MAX);
/* Handle root case */ /* Handle root case */
if (istopdir(dir)) if (istopdir(dir))
len = 1; len = 1;
else else
len = xstrlcpy(out, dir, n); len = xstrlcpy(out, dir, PATH_MAX);
out[len - 1] = '/'; out[len - 1] = '/';
return (xstrlcpy(out + len, name, n - len) + len); return (xstrlcpy(out + len, name, PATH_MAX - len) + len);
} }
/* /*
@ -1576,7 +1576,7 @@ static int xlink(char *suffix, char *path, char *buf, int type)
while (pos < copybufpos) { while (pos < copybufpos) {
len = strlen(pbuf); len = strlen(pbuf);
fname = xbasename(pbuf); fname = xbasename(pbuf);
r = mkpath(path, fname, buf, PATH_MAX); r = mkpath(path, fname, buf);
xstrlcpy(buf + r - 1, suffix, PATH_MAX - r - 1); xstrlcpy(buf + r - 1, suffix, PATH_MAX - r - 1);
if (!link_fn(pbuf, buf)) if (!link_fn(pbuf, buf))
@ -2366,7 +2366,7 @@ static int dentfill(char *path, struct entry **dents)
if (S_ISDIR(sb.st_mode)) { if (S_ISDIR(sb.st_mode)) {
if (sb_path.st_dev == sb.st_dev) { if (sb_path.st_dev == sb.st_dev) {
ent_blocks = 0; ent_blocks = 0;
mkpath(path, namep, g_buf, PATH_MAX); mkpath(path, namep, g_buf);
if (nftw(g_buf, nftw_fn, open_max, if (nftw(g_buf, nftw_fn, open_max,
FTW_MOUNT | FTW_PHYS) == -1) { FTW_MOUNT | FTW_PHYS) == -1) {
@ -2440,7 +2440,7 @@ static int dentfill(char *path, struct entry **dents)
if (S_ISDIR(sb.st_mode)) { if (S_ISDIR(sb.st_mode)) {
ent_blocks = 0; ent_blocks = 0;
num_saved = num_files + 1; num_saved = num_files + 1;
mkpath(path, namep, g_buf, PATH_MAX); mkpath(path, namep, g_buf);
if (nftw(g_buf, nftw_fn, open_max, FTW_MOUNT | FTW_PHYS) == -1) { if (nftw(g_buf, nftw_fn, open_max, FTW_MOUNT | FTW_PHYS) == -1) {
printmsg(messages[STR_NFTWFAIL_ID]); printmsg(messages[STR_NFTWFAIL_ID]);
@ -2813,7 +2813,7 @@ nochange:
if (!ndents) if (!ndents)
goto begin; goto begin;
mkpath(path, dents[cur].name, newpath, PATH_MAX); mkpath(path, dents[cur].name, newpath);
DPRINTF_S(newpath); DPRINTF_S(newpath);
/* Cannot use stale data in entry, file may be missing by now */ /* Cannot use stale data in entry, file may be missing by now */
@ -2841,7 +2841,7 @@ nochange:
{ {
/* If opened as vim plugin and Enter/^M pressed, pick */ /* If opened as vim plugin and Enter/^M pressed, pick */
if (cfg.picker && sel == SEL_GOIN) { if (cfg.picker && sel == SEL_GOIN) {
r = mkpath(path, dents[cur].name, newpath, PATH_MAX); r = mkpath(path, dents[cur].name, newpath);
appendfpath(newpath, r); appendfpath(newpath, r);
writecp(pcopybuf, copybufpos - 1); writecp(pcopybuf, copybufpos - 1);
@ -2862,7 +2862,7 @@ nochange:
if (strcmp(path, scriptpath) != 0) if (strcmp(path, scriptpath) != 0)
continue; continue;
mkpath(path, dents[cur].name, newpath, PATH_MAX); mkpath(path, dents[cur].name, newpath);
xstrlcpy(path, rundir, PATH_MAX); xstrlcpy(path, rundir, PATH_MAX);
if (runfile[0]) { if (runfile[0]) {
xstrlcpy(lastname, runfile, NAME_MAX); xstrlcpy(lastname, runfile, NAME_MAX);
@ -3156,7 +3156,7 @@ nochange:
if (!ndents) if (!ndents)
break; break;
mkpath(path, dents[cur].name, newpath, PATH_MAX); mkpath(path, dents[cur].name, newpath);
if (lstat(newpath, &sb) == -1 || !show_stats(newpath, dents[cur].name, &sb)) { if (lstat(newpath, &sb) == -1 || !show_stats(newpath, dents[cur].name, &sb)) {
printwarn(); printwarn();
goto nochange; goto nochange;
@ -3177,7 +3177,7 @@ nochange:
case SEL_LOCK: case SEL_LOCK:
{ {
if (ndents) if (ndents)
mkpath(path, dents[cur].name, newpath, PATH_MAX); mkpath(path, dents[cur].name, newpath);
switch (sel) { switch (sel) {
case SEL_MEDIA: case SEL_MEDIA:
@ -3274,13 +3274,13 @@ nochange:
if (!ncp) if (!ncp)
writecp(NULL, 0); writecp(NULL, 0);
r = mkpath(path, dents[cur].name, newpath, PATH_MAX); r = mkpath(path, dents[cur].name, newpath);
if (!appendfpath(newpath, r)) if (!appendfpath(newpath, r))
goto nochange; goto nochange;
++ncp; ++ncp;
} else { } else {
r = mkpath(path, dents[cur].name, newpath, PATH_MAX); r = mkpath(path, dents[cur].name, newpath);
/* Keep the copy buf in sync */ /* Keep the copy buf in sync */
copybufpos = 0; copybufpos = 0;
appendfpath(newpath, r); appendfpath(newpath, r);
@ -3322,7 +3322,7 @@ nochange:
if (copystartid < copyendid) { if (copystartid < copyendid) {
for (r = copystartid; r <= copyendid; ++r) for (r = copystartid; r <= copyendid; ++r)
if (!appendfpath(newpath, mkpath(path, if (!appendfpath(newpath, mkpath(path,
dents[r].name, newpath, PATH_MAX))) dents[r].name, newpath)))
goto nochange; goto nochange;
snprintf(newpath, PATH_MAX, "%d files copied", snprintf(newpath, PATH_MAX, "%d files copied",
@ -3413,7 +3413,7 @@ nochange:
char rm_opts[] = "-ir"; char rm_opts[] = "-ir";
rm_opts[1] = confirm_force(); rm_opts[1] = confirm_force();
mkpath(path, dents[cur].name, newpath, PATH_MAX); mkpath(path, dents[cur].name, newpath);
spawn("rm", rm_opts, newpath, NULL, F_NORMAL | F_SIGINT); spawn("rm", rm_opts, newpath, NULL, F_NORMAL | F_SIGINT);
if (cur && access(newpath, F_OK) == -1) if (cur && access(newpath, F_OK) == -1)
@ -3475,7 +3475,7 @@ nochange:
case SEL_OPENWITH: case SEL_OPENWITH:
dir = NULL; dir = NULL;
getprogarg(tmp, &dir); /* dir used as tmp var */ getprogarg(tmp, &dir); /* dir used as tmp var */
mkpath(path, dents[cur].name, newpath, PATH_MAX); mkpath(path, dents[cur].name, newpath);
spawn(tmp, dir, newpath, path, r); spawn(tmp, dir, newpath, path, r);
break; break;
case SEL_RENAME: case SEL_RENAME:
@ -3592,7 +3592,7 @@ nochange:
goto nochange; goto nochange;
} }
mkpath(path, dents[cur].name, newpath, PATH_MAX); mkpath(path, dents[cur].name, newpath);
DPRINTF_S(newpath); DPRINTF_S(newpath);
spawn(newpath, NULL, NULL, path, F_NORMAL | F_SIGINT); spawn(newpath, NULL, NULL, path, F_NORMAL | F_SIGINT);
break; break;