projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Declare fd.
[tinc]
/
src
/
process.c
diff --git
a/src/process.c
b/src/process.c
index
ca992dc
..
264b21d
100644
(file)
--- a/
src/process.c
+++ b/
src/process.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: process.c,v 1.1.2.
6 2000/11/20 22:13:12 guus
Exp $
+ $Id: process.c,v 1.1.2.
9 2000/11/22 17:49:16 zarq
Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-174,6
+174,8
@@
void _execute_script(const char *name)
int error = 0;
char *scriptname;
char *s;
int error = 0;
char *scriptname;
char *s;
+ int fd;
+
cp
if(netname)
{
cp
if(netname)
{
@@
-207,14
+209,20
@@
cp
fcloseall();
/* Open standard input */
fcloseall();
/* Open standard input */
- if(
open("/dev/null", O_RDONLY
) < 0)
+ if(
(fd = open("/dev/null", O_RDONLY)
) < 0)
{
syslog(LOG_ERR, _("Opening `/dev/null' failed: %m"));
error = 1;
}
{
syslog(LOG_ERR, _("Opening `/dev/null' failed: %m"));
error = 1;
}
+ if(dup2(fd, 0) != 0)
+ {
+ syslog(LOG_ERR, _("Couldn't assign /dev/null to standard input: %m"));
+ error = 1;
+ }
if(!error)
{
if(!error)
{
+ close(1); /* fd #1 should be the first available filedescriptor now. */
/* Standard output directly goes to syslog */
openlog(name, LOG_CONS | LOG_PID, LOG_DAEMON);
/* Standard error as well */
/* Standard output directly goes to syslog */
openlog(name, LOG_CONS | LOG_PID, LOG_DAEMON);
/* Standard error as well */
@@
-252,12
+260,10
@@
cp
"fork");
return -1;
}
"fork");
return -1;
}
-cp
+
if(pid)
{
if(pid)
{
- syslog(LOG_DEBUG, "%p, %d (%p)", child_pids, pid, &pid);
list_append(child_pids, &pid);
list_append(child_pids, &pid);
-cp
return 0;
}
cp
return 0;
}
cp