about summary refs log tree commit diff
path: root/stdlib
diff options
context:
space:
mode:
Diffstat (limited to 'stdlib')
-rw-r--r--stdlib/random.c6
-rw-r--r--stdlib/random_r.c12
-rw-r--r--stdlib/stdlib.h19
-rw-r--r--stdlib/testmb.c2
-rw-r--r--stdlib/testrand.c3
-rw-r--r--stdlib/tst-strtol.c30
6 files changed, 54 insertions, 18 deletions
diff --git a/stdlib/random.c b/stdlib/random.c
index c3f8eaa0a3..0ab8f05e5f 100644
--- a/stdlib/random.c
+++ b/stdlib/random.c
@@ -114,7 +114,7 @@
    position of the rear pointer is just
 	(MAX_TYPES * (rptr - state)) + TYPE_3 == TYPE_3.  */
 
-static long int randtbl[DEG_3 + 1] =
+static int32_t randtbl[DEG_3 + 1] =
   {
     TYPE_3,
 
@@ -239,10 +239,10 @@ weak_alias (__setstate, setstate)
    rear pointers can't wrap on the same call by not testing the rear
    pointer if the front one has wrapped.  Returns a 31-bit random number.  */
 
-long int
+int
 __random ()
 {
-  long int retval;
+  int32_t retval;
 
   (void) __random_r (&unsafe_state, &retval);
 
diff --git a/stdlib/random_r.c b/stdlib/random_r.c
index aa7a33fa6b..611deaf804 100644
--- a/stdlib/random_r.c
+++ b/stdlib/random_r.c
@@ -145,7 +145,7 @@ __srandom_r (x, buf)
       buf->rptr = &buf->state[0];
       for (i = 0; i < 10 * buf->rand_deg; ++i)
 	{
-	  long int discard;
+	  int32_t discard;
 	  (void) __random_r (buf, &discard);
 	}
     }
@@ -217,7 +217,7 @@ __initstate_r (seed, arg_state, n, buf)
       buf->rand_sep = SEP_4;
     }
 
-  buf->state = &((long int *) arg_state)[1];	/* First location.  */
+  buf->state = &((int32_t *) arg_state)[1];	/* First location.  */
   /* Must set END_PTR before srandom.  */
   buf->end_ptr = &buf->state[buf->rand_deg];
 
@@ -246,7 +246,7 @@ __setstate_r (arg_state, buf)
      void *arg_state;
      struct random_data *buf;
 {
-  long int *new_state = (long int *) arg_state;
+  int32_t *new_state = (int32_t *) arg_state;
   int type = new_state[0] % MAX_TYPES;
   int rear = new_state[0] / MAX_TYPES;
 
@@ -303,21 +303,21 @@ weak_alias (__setstate_r, setstate_r)
 int
 __random_r (buf, result)
      struct random_data *buf;
-     long int *result;
+     int32_t *result;
 {
   if (buf == NULL || result == NULL)
     return -1;
 
   if (buf->rand_type == TYPE_0)
     {
-      buf->state[0] = ((buf->state[0] * 1103515245) + 12345) & LONG_MAX;
+      buf->state[0] = ((buf->state[0] * 1103515245) + 12345) & 0x7fffffff;
       *result = buf->state[0];
     }
   else
     {
       *buf->fptr += *buf->rptr;
       /* Chucking least random bit.  */
-      *result = (*buf->fptr >> 1) & LONG_MAX;
+      *result = (*buf->fptr >> 1) & 0x7fffffff;
       ++buf->fptr;
       if (buf->fptr >= buf->end_ptr)
 	{
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index 7c9c68974b..65932e3d17 100644
--- a/stdlib/stdlib.h
+++ b/stdlib/stdlib.h
@@ -172,12 +172,16 @@ extern int rand __P ((void));
 /* Seed the random number generator with the given number.  */
 extern void srand __P ((unsigned int __seed));
 
+#ifdef	__USE_BSD
+
+#include <sys/types.h>	/* we need int32_t... */
+
 /* These are the functions that actually do things.  The `random', `srandom',
    `initstate' and `setstate' functions are those from BSD Unices.
    The `rand' and `srand' functions are required by the ANSI standard.
    We provide both interfaces to the same random number generator.  */
 /* Return a random long integer between 0 and RAND_MAX inclusive.  */
-extern long int __random __P ((void));
+extern int32_t __random __P ((void));
 /* Seed the random number generator with the given number.  */
 extern void __srandom __P ((unsigned int __seed));
 
@@ -191,7 +195,6 @@ extern __ptr_t __initstate __P ((unsigned int __seed, __ptr_t __statebuf,
    which should have been previously initialized by `initstate'.  */
 extern __ptr_t __setstate __P ((__ptr_t __statebuf));
 
-#ifdef	__USE_BSD
 extern long int random __P ((void));
 extern void srandom __P ((unsigned int __seed));
 extern __ptr_t initstate __P ((unsigned int __seed, __ptr_t __statebuf,
@@ -217,22 +220,22 @@ extern __inline __ptr_t setstate (__ptr_t __statebuf)
 
 struct random_data
   {
-    long int *fptr;		/* Front pointer.  */
-    long int *rptr;		/* Rear pointer.  */
-    long int *state;		/* Array of state values.  */
+    int32_t *fptr;		/* Front pointer.  */
+    int32_t *rptr;		/* Rear pointer.  */
+    int32_t *state;		/* Array of state values.  */
     int rand_type;		/* Type of random number generator.  */
     int rand_deg;		/* Degree of random number generator.  */
     int rand_sep;		/* Distance between front and rear.  */
-    long int *end_ptr;		/* Pointer behind state table.  */
+    int32_t *end_ptr;		/* Pointer behind state table.  */
   };
 
-extern int __random_r __P ((struct random_data *__buf, long int *__result));
+extern int __random_r __P ((struct random_data *__buf, int32_t *__result));
+extern int random_r __P ((struct random_data *__buf, int32_t *__result));
 extern int __srandom_r __P ((unsigned int __seed, struct random_data *__buf));
 extern int __initstate_r __P ((unsigned int __seed, __ptr_t __statebuf,
 			       size_t __statelen, struct random_data *__buf));
 extern int __setstate_r __P ((__ptr_t __statebuf, struct random_data *__buf));
 
-extern int random_r __P ((struct random_data *__buf, long int *__result));
 extern int srandom_r __P ((unsigned int __seed, struct random_data *__buf));
 extern int initstate_r __P ((unsigned int __seed, __ptr_t __statebuf,
 			     size_t __statelen, struct random_data *__buf));
diff --git a/stdlib/testmb.c b/stdlib/testmb.c
index c840ce195b..a70fe08bee 100644
--- a/stdlib/testmb.c
+++ b/stdlib/testmb.c
@@ -53,7 +53,7 @@ main ()
       }
     else
       {
-	printf ("wide value: 0x%04x\n", (unsigned long) wc);
+	printf ("wide value: 0x%04lx\n", (unsigned long) wc);
 	mbc[0] = '\0';
 	if ((r = wctomb (mbc, wc)) <= 0)
 	  {
diff --git a/stdlib/testrand.c b/stdlib/testrand.c
index b66dca9899..b31082eda9 100644
--- a/stdlib/testrand.c
+++ b/stdlib/testrand.c
@@ -34,6 +34,9 @@ DEFUN_VOID(main)
   srand (1);
   j1 = rand();
   j2 = rand();
+  if (i1 < 0 || i2 < 0 || j1 < 0 || j2 < 0) {
+      puts ("Test FAILED!");
+  }
   if (j1 == i1 && j2 == i2)
     {
       puts ("Test succeeded.");
diff --git a/stdlib/tst-strtol.c b/stdlib/tst-strtol.c
index 0682da3f09..5c3e2cbb08 100644
--- a/stdlib/tst-strtol.c
+++ b/stdlib/tst-strtol.c
@@ -18,6 +18,7 @@ struct ltest
   };
 static CONST struct ltest tests[] =
   {
+#if ~0UL == 0xffffffff
     /* First, signed numbers.  */
     { "   -17",		-17,		0,	0,	0 },
     { " +0x123fg",	0x123f,		0,	'g',	0 },
@@ -40,6 +41,35 @@ static CONST struct ltest tests[] =
     { "-0x123456789",	0xffffffff,	0,	0,	ERANGE },
     { "-0xfedcba98",	-0xfedcba98,	0,	0,	0 },
     { NULL,		0,		0,	0,	0 },
+#else
+    /* assume 64 bit long... */
+
+    /* First, signed numbers.  */
+    { "   -17",			-17,		0,	0,	0 },
+    { " +0x123fg",		0x123f,		0,	'g',	0 },
+    { "2147483647",		2147483647,	0,	0,	0 },
+    { "9223372036854775807",	9223372036854775807,	0,	0,	0 },
+    { "9223372036854775808",	9223372036854775807,	0,	0,	ERANGE },
+    { "922337203685477580777",	9223372036854775807,	0,	0,	ERANGE },
+    { "9223372036854775810",	9223372036854775807,	0,	0,	ERANGE },
+    { "-2147483648",		-2147483648,	0,	0,	0 },
+    { "-9223372036854775808",	-9223372036854775808,	0,	0,	0 },
+    { "-9223372036854775809",	-9223372036854775808,	0,	0,	ERANGE },
+    { "0123",		0123,		0,	0,	0 },
+    { "0x112233445566778899z",	9223372036854775807,	16,	'z',	ERANGE },
+    { "0x0xc",		0,		0,	'x',	0 },
+    { "yz!",		34*36+35,	36,	'!',	0 },
+    { NULL,		0,		0,	0,	0 },
+
+    /* Then unsigned.  */
+    { "  0",		0,		0,	0,	0 },
+    { "0xffffffffg",	0xffffffff,	0,	'g',	0 },
+    { "0xffffffffffffffffg",	0xffffffffffffffff,	0,	'g',	0 },
+    { "0xf1f2f3f4f5f6f7f8f9",	0xffffffffffffffff,	0,	0,	ERANGE },
+    { "-0x123456789abcdef01",	0xffffffffffffffff,	0,	0,	ERANGE },
+    { "-0xfedcba987654321",	-0xfedcba987654321,	0,	0,	0 },
+    { NULL,		0,		0,	0,	0 },
+#endif
   };
 
 static void EXFUN(expand, (char *dst, int c));
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-04 09:05:43 +0000