ladspa/remap: make sure we process all requested rewinds unconditionally

[pulseaudio] / src / pulsecore / random.c

diff --git a/src/pulsecore/random.c b/src/pulsecore/random.c
index 3d3357a5ed330714c25a5b4f8be518be185dff39..518c281aa370509f70de75fa458d0cb6c2188c7a 100644 (file)
--- a/src/pulsecore/random.c
+++ b/src/pulsecore/random.c
@@ -1,18 +1,19 @@
-/* $Id$ */
-
 /***
   This file is part of PulseAudio.
- 
+
+  Copyright 2004-2006 Lennart Poettering
+  Copyright 2006 Pierre Ossman <ossman@cendio.se> for Cendio AB
+
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
- 
+
   PulseAudio 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
   Lesser General Public License for more details.
- 
+
   You should have received a copy of the GNU Lesser General Public
   License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -28,21 +29,22 @@
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
-#include <assert.h>
 #include <time.h>
 
 #include <pulsecore/core-util.h>
 #include <pulsecore/log.h>
+#include <pulsecore/macro.h>
 
 #include "random.h"
 
-static int has_whined = 0;
+static pa_bool_t has_whined = TRUE;
 
-static const char *devices[] = { "/dev/urandom", "/dev/random", NULL };
+static const char * const devices[] = { "/dev/urandom", "/dev/random", NULL };
 
 static int random_proper(void *ret_data, size_t length) {
 #ifdef OS_IS_WIN32
-    assert(ret_data && length);
+    pa_assert(ret_data);
+    pa_assert(length > 0);
 
     return -1;
 
@@ -50,26 +52,33 @@ static int random_proper(void *ret_data, size_t length) {
 
     int fd, ret = -1;
     ssize_t r = 0;
-    const char **device;
+    const char *const * device;
 
-    assert(ret_data && length);
+    pa_assert(ret_data);
+    pa_assert(length > 0);
 
     device = devices;
 
     while (*device) {
         ret = 0;
 
-        if ((fd = open(*device, O_RDONLY)) >= 0) {
+        if ((fd = open(*device, O_RDONLY
+#ifdef O_NOCTTY
+                       | O_NOCTTY
+#endif
+             )) >= 0) {
 
-            if ((r = pa_loop_read(fd, ret_data, length)) < 0 || (size_t) r != length)
+            if ((r = pa_loop_read(fd, ret_data, length, NULL)) < 0 || (size_t) r != length)
                 ret = -1;
 
-            close(fd);
+            pa_close(fd);
         } else
             ret = -1;
 
         if (ret == 0)
             break;
+
+        device++;
     }
 
     return ret;
@@ -80,9 +89,11 @@ void pa_random_seed(void) {
     unsigned int seed;
 
     if (random_proper(&seed, sizeof(unsigned int)) < 0) {
-        if (!has_whined)
-            pa_log_warn(__FILE__": failed to get proper entropy. Falling back to seeding with current time.");
-        has_whined = 1;
+
+        if (!has_whined) {
+            pa_log_warn("Failed to get proper entropy. Falling back to seeding with current time.");
+            has_whined = TRUE;
+        }
 
         seed = (unsigned int) time(NULL);
     }
@@ -94,14 +105,16 @@ void pa_random(void *ret_data, size_t length) {
     uint8_t *p;
     size_t l;
 
-    assert(ret_data && length);
+    pa_assert(ret_data);
+    pa_assert(length > 0);
 
     if (random_proper(ret_data, length) >= 0)
         return;
 
-    if (!has_whined)
-        pa_log_warn(__FILE__": failed to get proper entropy. Falling back to unsecure pseudo RNG.");
-    has_whined = 1;
+    if (!has_whined) {
+        pa_log_warn("Failed to get proper entropy. Falling back to unsecure pseudo RNG.");
+        has_whined = TRUE;
+    }
 
     for (p = ret_data, l = length; l > 0; p++, l--)
         *p = (uint8_t) rand();