[GNUnet-SVN] r12049 - gnunet/contrib

[gnunet]

Author: wachs
Date: 2010-06-29 17:39:42 +0200 (Tue, 29 Jun 2010)
New Revision: 12049

Modified:
   gnunet/contrib/
   gnunet/contrib/Makefile.am
   gnunet/contrib/timeout_watchdog.c
Log:



Property changes on: gnunet/contrib
___________________________________________________________________
Modified: svn:ignore
   - Makefile.in
Makefile

   + INSTALL
configure.lineno
compile
.cproject
.project
.libs
.deps
*.c_
Makefile
Makefile.in
aclocal.m4
app.info
autom4te.cache
config.guess
config.log
config.status
config.sub
configure
depcomp
gnunet_config.h
gnunet_config.h.in
install-sh
libltdl
libtool
ltmain.sh
missing
stamp-h1


Modified: gnunet/contrib/Makefile.am
===================================================================
--- gnunet/contrib/Makefile.am  2010-06-29 13:48:27 UTC (rev 12048)
+++ gnunet/contrib/Makefile.am  2010-06-29 15:39:42 UTC (rev 12049)
@@ -1,3 +1,9 @@
+noinst_PROGRAMS = \
+ timeout_watchdog
+
+timeout_watchdog_SOURCES = \
+ timeout_watchdog.c 
+
 dist_pkgdata_DATA = \
  gnunet-logo-color.png \
  defaults.conf

Modified: gnunet/contrib/timeout_watchdog.c
===================================================================
--- gnunet/contrib/timeout_watchdog.c   2010-06-29 13:48:27 UTC (rev 12048)
+++ gnunet/contrib/timeout_watchdog.c   2010-06-29 15:39:42 UTC (rev 12049)
@@ -24,13 +24,13 @@
  * @author Matthias Wachs
  */
 
-#include "signal.h"
-#include "stdio.h"
-#include "stdlib.h"
+#include <sys/types.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <wait.h>
 
-static int child_died;
 static pid_t child;
 
 static void sigchld_handler(int val)
@@ -55,15 +55,13 @@
 static void sigint_handler(int val)
 { 
   kill(0, val);
-  exit(1);
+  exit(val);
 }
 
-
 int main(int argc, char *argv[])
 {
 int timeout = 0;
-int remain = 0;
-int ret = 0;
+pid_t gpid =0;
 
 if (argc < 3)
 {  
@@ -76,21 +74,22 @@
 if (timeout == 0)
   timeout = 600;   
 
+/* with getpgid() it does not compile, but getpgrp is the BSD version and 
working */
+gpid = getpgrp();
 
-char ** arguments = &argv[3];
-
-pid_t gpid = getpgid(0);
 signal(SIGCHLD, sigchld_handler);
 signal(SIGABRT, sigint_handler);
-signal(SIGKILL, sigint_handler);
+signal(SIGFPE,  sigint_handler);
 signal(SIGILL,  sigint_handler);
+signal(SIGINT,  sigint_handler);
 signal(SIGSEGV, sigint_handler);
-signal(SIGINT,  sigint_handler);
 signal(SIGTERM, sigint_handler);
 
 child = fork();
 if (child==0)
 {
+  /*  int setpgrp(pid_t pid, pid_t pgid); is not working on this machine*/
+   //setpgrp (0, pid_t gpid);
    setpgid(0,gpid);
    execvp(argv[2],&argv[2]);
    exit(1);
@@ -101,6 +100,7 @@
   kill(0,SIGABRT);
   exit(1);
 }  
+exit(1);
 }
 
 /* end of timeout_watchdog.c */