progs/mkphrase.c: Fix trailing spaces in usage message.

[catacomb] / rand / noise.c

diff --git a/rand/noise.c b/rand/noise.c
index f01af65..c120e6f 100644 (file)
--- a/rand/noise.c
+++ b/rand/noise.c
@@ -35,6 +35,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 #include <sys/types.h>
 #include <sys/time.h>
@@ -65,12 +66,27 @@
 
 #define NOISE_KIDLIFE 100000           /* @noise_filter@ child lifetime */
 
+#if HAVE_CLOCK_GETTIME && _POSIX_TIMERS > 0
+#  define TIMESTRUCT timespec
+#  define tv_SEC tv_sec
+#  define tv_FRAC tv_nsec
+#  define TIMERES 1000000000
+#  if _POSIX_MONOTONIC_CLOCK > 0
+#    define GETTIME(tv) (clock_gettime(CLOCK_MONOTONIC, (tv)))
+#  else
+#    define GETTIME(tv) (clock_gettime(CLOCK_REALTIME, (tv)))
+#  endif
+#  define TOTIMEVAL(tv, xx)                                            \
+       ((tv)->tv_sec = (xx)->tv_sec,                                   \
+        (tv)->tv_usec = ((xx)->tv_nsec + 500)/1000)
+#else
 #  define TIMESTRUCT timeval
 #  define tv_SEC tv_sec
 #  define tv_FRAC tv_usec
 #  define TIMERES 1000000
 #  define GETTIME(tv) (gettimeofday((tv), 0))
 #  define TOTIMEVAL(tv, xx) (*(tv) = *(xx))
+#endif
 
 /*----- Noise source definition -------------------------------------------*/
 
@@ -201,7 +217,7 @@ int noise_devrandom(rand_pool *r)
   /* --- OpenBSD-flavoured shinies --- */
 
   while (n < sizeof(buf)) {
-    nn = sizeof(buf) - nn;
+    nn = sizeof(buf) - n;
     if (nn > 256) nn = 256;
     if (getentropy(buf + n, nn)) break;
     n += nn;
@@ -372,16 +388,15 @@ int noise_filter(rand_pool *r, int good, const char *c)
     /* --- Play games with uids --- */
 
     if (noise_gid != NOISE_NOSETGID) {
-      setgid(noise_gid);
-      setegid(noise_gid);
+      if (setgid(noise_gid) || setegid(noise_gid)
 #ifdef HAVE_SETGROUPS
-      setgroups(1, &noise_gid);
+         || setgroups(1, &noise_gid)
 #endif
+       ) _exit(127);
     }
 
     if (noise_uid != NOISE_NOSETUID) {
-      setuid(noise_uid);
-      seteuid(noise_uid);
+      if (setuid(noise_uid) || seteuid(noise_uid)) _exit(127);
     }
 
     /* --- Start the process up --- */