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

checkpatch fix: refactor run script code

Browse source
This commit is contained in:
Arun Prakash Jana 2019-02-23 11:55:29 +05:30
parent 5402e1201c
commit 59a5db2c90
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 36 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
src/nnn.c
View file

@ -3851,42 +3851,46 @@ nochange:
goto nochange; goto nochange;
} }
if (S_ISDIR(sb.st_mode)) { /* Regular script file */
cfg.runscript ^= 1;
if (!cfg.runscript && rundir[0]) {
/*
* If toggled, and still in the script dir,
* switch to original directory
*/
if (strcmp(path, scriptpath) == 0) {
xstrlcpy(path, rundir, PATH_MAX);
xstrlcpy(lastname, runfile, NAME_MAX);
rundir[0] = runfile[0] = '\0';
setdirwatch();
goto begin;
}
break;
}
/* Check if directory is accessible */
if (!xdiraccess(scriptpath))
goto nochange;
xstrlcpy(rundir, path, PATH_MAX);
xstrlcpy(path, scriptpath, PATH_MAX);
if (ndents)
xstrlcpy(runfile, dents[cur].name, NAME_MAX);
cfg.runctx = cfg.curctx;
lastname[0] = '\0';
setdirwatch();
goto begin;
}
if (S_ISREG(sb.st_mode)) { if (S_ISREG(sb.st_mode)) {
tmp = ndents ? dents[cur].name : NULL; tmp = ndents ? dents[cur].name : NULL;
spawn(shell, scriptpath, tmp, path, F_NORMAL | F_SIGINT); spawn(shell, scriptpath, tmp, path, F_NORMAL | F_SIGINT);
break;
} }
break;
/* Must be a directory or a regular file */
if (!S_ISDIR(sb.st_mode))
break;
/* Script directory */
cfg.runscript ^= 1;
if (!cfg.runscript && rundir[0]) {
/*
* If toggled, and still in the script dir,
* switch to original directory
*/
if (strcmp(path, scriptpath) == 0) {
xstrlcpy(path, rundir, PATH_MAX);
xstrlcpy(lastname, runfile, NAME_MAX);
rundir[0] = runfile[0] = '\0';
setdirwatch();
goto begin;
}
break;
}
/* Check if directory is accessible */
if (!xdiraccess(scriptpath))
goto nochange;
xstrlcpy(rundir, path, PATH_MAX);
xstrlcpy(path, scriptpath, PATH_MAX);
if (ndents)
xstrlcpy(runfile, dents[cur].name, NAME_MAX);
cfg.runctx = cfg.curctx;
lastname[0] = '\0';
setdirwatch();
goto begin;
default: /* SEL_RUNCMD */ default: /* SEL_RUNCMD */
#ifndef NORL #ifndef NORL
if (cfg.picker) { if (cfg.picker) {