Fixed a bug which caused a crash when reading non-existent files.

[pspp] / src / algorithm.c

diff --git a/src/algorithm.c b/src/algorithm.c
index 89e813defa12b7ce4b3588ce194a7dc0dfb99e9c..e6b9132b0649dfc17c845eb267ff0ea3a06a1973 100644 (file)
--- a/src/algorithm.c
+++ b/src/algorithm.c
@@ -91,11 +91,12 @@
 
 #include <config.h>
 #include "algorithm.h"
+#include <gsl/gsl_rng.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include "alloc.h"
-#include "random.h"
+#include "settings.h"
 
 /* Some of the assertions in this file are very expensive.  We
    don't use them by default. */
@@ -310,7 +311,8 @@ is_partitioned (const void *array, size_t count, size_t size,
 unsigned
 algo_default_random (unsigned max, void *aux UNUSED) 
 {
-  return rng_get_unsigned (pspp_rng ()) % max;
+  unsigned long r_min = gsl_rng_min (get_rng ());
+  return (gsl_rng_get (get_rng ()) - r_min) % max;
 }
 
 /* Randomly reorders ARRAY, which contains COUNT elements of SIZE
@@ -511,7 +513,10 @@ lexicographical_compare_3way (const void *array1, size_t count1,
    Engineering a sort function; Jon Bentley and M. Douglas McIlroy;
    Software - Practice and Experience; Vol. 23 (11), 1249-1265, 1993.  */
 
+#ifdef HAVE_ALLOCA_H
 #include <alloca.h>
+#endif
+
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>