open()/read() is more common on BlueZ code. Incidentally, get rid of this compilation error (using gcc 4.6.3): plugins/autopair.c: In function ‘autopair_init’: plugins/autopair.c:154:8: error: ignoring return value of ‘fread’, declared with attribute warn_unused_result [-Werror=unused-result] --- plugins/autopair.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) v3: * Fix buggy logic * The obvious code path is tested by just starting bluetoothd, which will call autopair_init() * Maybe overkill, but I used this mockup code to test other unreachable code paths: http://ix.io/5JC * I agree with Marcel that we should just fail if /dev/urandom is not readable. Otherwise, we are introducing code that will 99% of the time not be run (unless someone confirms that we have systems with unusable /dev/urandom). diff --git a/plugins/autopair.c b/plugins/autopair.c index 5d90f9d..5aa80df 100644 --- a/plugins/autopair.c +++ b/plugins/autopair.c @@ -27,6 +27,8 @@ #include <stdbool.h> #include <stdlib.h> +#include <fcntl.h> +#include <unistd.h> #include <bluetooth/bluetooth.h> #include <glib.h> @@ -146,14 +148,20 @@ static struct btd_adapter_driver autopair_driver = { static int autopair_init(void) { /* Initialize the random seed from /dev/urandom */ - unsigned int seed = time(NULL); - FILE *f; + unsigned int seed; + int fd; - f = fopen("/dev/urandom", "rb"); - if (f != NULL) { - fread(&seed, sizeof(seed), 1, f); - fclose(f); - } + fd = open("/dev/urandom", O_RDONLY); + if (fd >= 0) { + ssize_t n; + + n = read(fd, &seed, sizeof(seed)); + if (n < (ssize_t) sizeof(seed)) + seed = time(NULL); + + close(fd); + } else + seed = time(NULL); srand(seed); -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
