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

Replace system(3) with spawn()

Browse source
This commit is contained in:
Arun Prakash Jana 2017-05-15 00:51:36 +05:30
parent e4f72170d0
commit 9fb728170a
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 31 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
nnn.c
View file

@ -315,12 +315,14 @@ all_dots(const char* ptr)
/* /*
* Spawns a child process. Behaviour can be controlled using flag: * Spawns a child process. Behaviour can be controlled using flag:
* Limited to a single argument to program, use system(3) if you need more * Limited to 2 arguments to a program
* flag = 1: draw a marker to indicate nnn spawned e.g., a shell * flag works on bit set:
* flag = 2: do not wait in parent for child process e.g. DE file manager * - 0b1: draw a marker to indicate nnn spawned e.g., a shell
* - 0b10: do not wait in parent for child process e.g. DE file manager
* - 0b100: suppress stdout and stderr
*/ */
static void static void
spawn(char *file, char *arg, char *dir, int flag) spawn(char *file, char *arg1, char *arg2, char *dir, unsigned char flag)
{ {
pid_t pid; pid_t pid;
int status; int status;
@ -329,13 +331,23 @@ spawn(char *file, char *arg, char *dir, int flag)
if (pid == 0) { if (pid == 0) {
if (dir != NULL) if (dir != NULL)
status = chdir(dir); status = chdir(dir);
if (flag == 1)
/* Show a marker (to indicate nnn spawned shell) */
if (flag & 0b1)
fprintf(stdout, "\n +-++-++-+\n | n n n |\n +-++-++-+\n\n"); fprintf(stdout, "\n +-++-++-+\n | n n n |\n +-++-++-+\n\n");
execlp(file, file, arg, NULL); /* Suppress stdout and stderr */
if (flag & 0b100) {
int fd = open("/dev/null", O_WRONLY, S_IWUSR);
dup2(fd, 1);
dup2(fd, 2);
close(fd);
}
execlp(file, file, arg1, arg2, NULL);
_exit(1); _exit(1);
} else { } else {
if (flag != 2) if (!(flag & 0b10))
/* Ignore interruptions */ /* Ignore interruptions */
while (waitpid(pid, &status, 0) == -1) while (waitpid(pid, &status, 0) == -1)
DPRINTF_D(status); DPRINTF_D(status);
@ -1570,26 +1582,18 @@ nochange:
/* If NNN_OPENER is set, use it */ /* If NNN_OPENER is set, use it */
if (opener) { if (opener) {
sprintf(cmd, "%s \'", opener); spawn(opener, newpath, NULL, NULL, 4);
xstrlcpy(cmd + strlen(cmd), newpath, MAX_CMD_LEN - strlen(cmd));
strcat(cmd, "\' > /dev/null 2>&1");
r = system(cmd);
continue; continue;
} }
/* Play with nlay if identified */ /* Play with nlay if identified */
mime = getmime(dents[cur].name); mime = getmime(dents[cur].name);
if (mime) { if (mime) {
if (player) {
cmd[0] = '\'';
xstrlcpy(cmd + 1, player, MAX_CMD_LEN);
strcat(cmd, "\' \'");
} else
strcpy(cmd, "nlay \'");
xstrlcpy(cmd + strlen(cmd), newpath, MAX_CMD_LEN - strlen(cmd));
sprintf(cmd + strlen(cmd), "\' %s", mime);
exitcurses(); exitcurses();
r = system(cmd); if (player)
spawn(player, newpath, mime, NULL, 0);
else
spawn("nlay", newpath, mime, NULL, 0);
initcurses(); initcurses();
continue; continue;
} }
@ -1605,14 +1609,11 @@ nochange:
if (strstr(cmd, "text/") == cmd) { if (strstr(cmd, "text/") == cmd) {
exitcurses(); exitcurses();
run = xgetenv("EDITOR", "vi"); run = xgetenv("EDITOR", "vi");
spawn(run, newpath, NULL, 0); spawn(run, newpath, NULL, NULL, 0);
initcurses(); initcurses();
continue; continue;
} else if (fb_opener) { } else if (fb_opener) {
sprintf(cmd, "%s \'", fb_opener); spawn(fb_opener, newpath, NULL, NULL, 4);
xstrlcpy(cmd + strlen(cmd), newpath, MAX_CMD_LEN - strlen(cmd));
strcat(cmd, "\' > /dev/null 2>&1");
r = system(cmd);
continue; continue;
} }
@ -1921,7 +1922,7 @@ nochange:
goto nochange; goto nochange;
} }
spawn(desktop_manager, path, path, 2); spawn(desktop_manager, path, NULL, path, 2);
break; break;
case SEL_FSIZE: case SEL_FSIZE:
sizeorder = !sizeorder; sizeorder = !sizeorder;
@ -1964,7 +1965,7 @@ nochange:
else else
snprintf(newpath, PATH_MAX, "%s/%s", snprintf(newpath, PATH_MAX, "%s/%s",
path, dents[cur].name); path, dents[cur].name);
spawn(copier, newpath, NULL, 0); spawn(copier, newpath, NULL, NULL, 0);
printmsg(newpath); printmsg(newpath);
} else if (!copier) } else if (!copier)
printmsg("NNN_COPIER is not set"); printmsg("NNN_COPIER is not set");
@ -1977,14 +1978,14 @@ nochange:
case SEL_RUN: case SEL_RUN:
run = xgetenv(env, run); run = xgetenv(env, run);
exitcurses(); exitcurses();
spawn(run, NULL, path, 1); spawn(run, NULL, NULL, path, 1);
initcurses(); initcurses();
/* Repopulate as directory content may have changed */ /* Repopulate as directory content may have changed */
goto begin; goto begin;
case SEL_RUNARG: case SEL_RUNARG:
run = xgetenv(env, run); run = xgetenv(env, run);
exitcurses(); exitcurses();
spawn(run, dents[cur].name, path, 0); spawn(run, dents[cur].name, NULL, path, 0);
initcurses(); initcurses();
break; break;
} }
@ -1992,7 +1993,7 @@ nochange:
if (idletimeout != 0 && idle == idletimeout) { if (idletimeout != 0 && idle == idletimeout) {
idle = 0; idle = 0;
exitcurses(); exitcurses();
spawn(idlecmd, NULL, NULL, 0); spawn(idlecmd, NULL, NULL, NULL, 0);
initcurses(); initcurses();
} }
} }
@ -2045,10 +2046,6 @@ main(int argc, char *argv[])
break; break;
case 'p': case 'p':
player = optarg; player = optarg;
if (strlen(player) > 512) {
fprintf(stderr, "path to player must be <= 512 characters\n");
exit(1);
}
break; break;
case 'v': case 'v':
fprintf(stdout, "%s\n", VERSION); fprintf(stdout, "%s\n", VERSION);