felixfoertsch/remind
1
0
Fork 0
mirror of https://salsa.debian.org/dskoll/remind.git synced 2026-04-17 14:59:20 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Arrange it so an INCLUDECMD cmd redirect's "cmd's" standard input to /dev/null

Browse Source
This commit is contained in:
Dianne Skoll
2025-10-07 20:27:07 -04:00
parent 453bba5172
commit 303e42f344
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/files.c
View File

@@ -1006,6 +1006,7 @@ static int IncludeCmd(char const *cmd)
CachedFile *h;
char const *fname;
int old_flag;
int stdin_dup, devnull;
got_a_fresh_line();
clear_callstack();
@@ -1071,6 +1072,21 @@ static int IncludeCmd(char const *cmd)
/* Not found in cache */
/* Connect stdin to /dev/null */
stdin_dup = dup(STDIN_FILENO);
if (stdin_dup >= 0) {
devnull = open("/dev/null", O_RDONLY);
if (devnull >= 0) {
if (dup2(devnull, STDIN_FILENO) >= 0) {
set_cloexec(stdin_dup);
} else {
(void) close(stdin_dup);
stdin_dup = -1;
}
(void) close(devnull);
}
}
/* If cmd starts with !, then disable RUN within the cmd output */
if (cmd[0] == '!') {
fp2 = popen(cmd+1, "r");
@@ -1080,6 +1096,10 @@ static int IncludeCmd(char const *cmd)
if (!fp2) {
PopFile();
DBufFree(&buf);
if (stdin_dup >= 0) {
(void) dup2(stdin_dup, STDIN_FILENO);
(void) close(stdin_dup);
}
return E_CANT_OPEN;
}
fp = fp2;
@@ -1095,6 +1115,11 @@ static int IncludeCmd(char const *cmd)
}
r = CacheFile(fname, 1);
if (stdin_dup >= 0) {
(void) dup2(stdin_dup, STDIN_FILENO);
(void) close(stdin_dup);
}
DebugFlag = old_flag;
if (r == OK) {
fp = NULL;

3
src/funcs.c
View File

@@ -2438,6 +2438,9 @@ static int FShell(func_info *info)
if (devnull >= 0) {
if (dup2(devnull, STDIN_FILENO) >= 0) {
set_cloexec(stdin_dup);
} else {
(void) close(stdin_dup);
stdin_dup = -1;
}
(void) close(devnull);
}