Change stdin member of svc to stdin_fd

'stdin' is a macro in stdio.h, so it shouldn't be used as a member name. GLIBC happens to have "#define stdin stdin", but other libcs don't.
This commit is contained in:
Patrick Stewart
2016-04-13 22:09:05 +01:00
parent ec2505191b
commit 0ba8df5c2d
3 changed files with 5 additions and 5 deletions
Regular → Executable
+1 -1
View File
@@ -167,7 +167,7 @@ static void socket_cb(uev_t *UNUSED(w), void *arg, int UNUSED(events))
memcpy(task->args, svc->args, sizeof(task->args));
snprintf(task->desc, sizeof(task->desc), "%s Connection", svc->desc);
task->stdin = stdin;
task->stdin_fd = stdin;
service_step(task);
if (!svc->inetd.forking) {
+3 -3
View File
@@ -189,8 +189,8 @@ static int service_start(svc_t *svc)
/* Redirect inetd socket to stdin for connection */
#ifndef INETD_DISABLED
if (svc_is_inetd_conn(svc)) {
dup2(svc->stdin, STDIN_FILENO);
close(svc->stdin);
dup2(svc->stdin_fd, STDIN_FILENO);
close(svc->stdin_fd);
dup2(STDIN_FILENO, STDOUT_FILENO);
dup2(STDIN_FILENO, STDERR_FILENO);
} else
@@ -263,7 +263,7 @@ static int service_start(svc_t *svc)
#ifndef INETD_DISABLED
if (svc_is_inetd_conn(svc) && svc->inetd.type == SOCK_STREAM)
close(svc->stdin);
close(svc->stdin_fd);
#endif
plugin_run_hook(HOOK_SVC_START, (void *)(uintptr_t)pid);
Regular → Executable
+1 -1
View File
@@ -99,7 +99,7 @@ typedef struct svc {
/* For inetd services */
inetd_t inetd;
int stdin;
int stdin_fd;
int log;