albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use Proc_Close() to remove no longer unused pipes to child processes 

This removes spurious (but harmless) debug messages.
This commit is contained in:
Alexander Barton 2011-08-23 12:32:05 +02:00
parent be6994aece
commit 69803d6ff1
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ngircd/conn.c
View File

@ -2107,6 +2107,7 @@ cb_Connect_to_Server(int fd, UNUSED short events)
/* Read result from pipe */
len = Proc_Read(&Conf_Server[i].res_stat, dest_addrs, sizeof(dest_addrs));
Proc_Close(&Conf_Server[i].res_stat);
if (len == 0) {
/* Error resolving hostname: reset server structure */
Conf_Server[i].conn_id = NONE;
@ -2166,6 +2167,7 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events )
/* Read result from pipe */
len = Proc_Read(&My_Connections[i].proc_stat, readbuf, sizeof readbuf -1);
Proc_Close(&My_Connections[i].proc_stat);
if (len == 0)
return;

1
src/ngircd/irc-login.c
View File

@ -1009,6 +1009,7 @@ cb_Read_Auth_Result(int r_fd, UNUSED short events)
/* Read result from pipe */
len = Proc_Read(proc, &result, sizeof(result));
Proc_Close(proc);
if (len == 0)
return;

11
src/ngircd/proc.c
View File

@ -138,13 +138,14 @@ Proc_Read(PROC_STAT *proc, void *buffer, size_t buflen)
return 0;
Log(LOG_CRIT, "Can't read from child process %ld: %s",
proc->pid, strerror(errno));
Proc_Close(proc);
bytes_read = 0;
} else if (bytes_read == 0) {
/* EOF: clean up */
LogDebug("Child process %ld: EOF reached, closing pipe.",
proc->pid);
Proc_Close(proc);
}
#if DEBUG
else if (bytes_read == 0)
LogDebug("Can't read from child process %ld: EOF", proc->pid);
#endif
Proc_InitStruct(proc);
return (size_t)bytes_read;
}