Merge branch 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/public-git/catacomb/

[u/mdw/catacomb] / noise.c

diff --git a/noise.c b/noise.c
index 0244869..c122506 100644 (file)
--- a/noise.c
+++ b/noise.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: noise.c,v 1.8 2004/04/08 01:36:15 mdw Exp $
+ * $Id$
  *
  * Acquisition of environmental noise (Unix-specific)
  *
@@ -390,7 +390,8 @@ int noise_freewheel(rand_pool *r)
 
 done:
   signal(SIGALRM, sigal);
-  TV_SUB(&oitv.it_value, &oitv.it_value, &itv.it_value);
+  if (oitv.it_value.tv_sec || oitv.it_value.tv_usec)
+    TV_SUB(&oitv.it_value, &oitv.it_value, &itv.it_value);
   setitimer(ITIMER_REAL, &oitv, 0);
   return (rc);
 }
@@ -423,6 +424,7 @@ int noise_enquire(rand_pool *r)
   } tab[] = {
     { "ps alxww || ps -elf",   16 },
     { "netstat -n",             6 },
+    { "ifconfig -a",            8 },
     { "df",                    20 },
     { "w",                      6 },
     { "ls -align /tmp/.",      10 },