gdsa: Include "dsa.h" for dsa_h2n.

[u/mdw/catacomb] / noise.c

diff --git a/noise.c b/noise.c
index 0244869..e339317 100644 (file)
--- a/noise.c
+++ b/noise.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: noise.c,v 1.8 2004/04/08 01:36:15 mdw Exp $
+ * $Id$
  *
  * Acquisition of environmental noise (Unix-specific)
  *
  * (c) 1998 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,12 +15,12 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- * 
+ *
  * Catacomb is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Library General Public
  * License along with Catacomb; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
@@ -111,7 +111,7 @@ static int timer(rand_pool *r, struct timeval *tv)
   unsigned long x, d, dd;
   int de, dde;
   int ret;
-  
+
   x = tv->tv_usec + MILLION * tv->tv_sec;
   d = x ^ noise_last;
   dd = d ^ noise_diff;
@@ -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 },