===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/awk/run.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -c -r1.23 -r1.24
*** src/usr.bin/awk/run.c	2003/08/06 21:08:07	1.23
--- src/usr.bin/awk/run.c	2004/05/08 22:08:51	1.24
***************
*** 1,4 ****
! /*	$OpenBSD: run.c,v 1.23 2003/08/06 21:08:07 millert Exp $	*/
  /****************************************************************
  Copyright (C) Lucent Technologies 1997
  All Rights Reserved
--- 1,4 ----
! /*	$OpenBSD: run.c,v 1.24 2004/05/08 22:08:51 millert Exp $	*/
  /****************************************************************
  Copyright (C) Lucent Technologies 1997
  All Rights Reserved
***************
*** 64,69 ****
--- 64,70 ----
  #endif
  
  jmp_buf env;
+ int use_arc4 = 1;
  extern	int	pairstack[];
  
  Node	*winner = NULL;	/* root of parse tree */
***************
*** 1501,1515 ****
  		u = (Awkfloat) system(getsval(x)) / 256;   /* 256 is unix-dep */
  		break;
  	case FRAND:
! 		/* in principle, rand() returns something in 0..RAND_MAX */
! 		u = (Awkfloat) (rand() % RAND_MAX) / RAND_MAX;
  		break;
  	case FSRAND:
! 		if (isrec(x))	/* no argument provided */
! 			u = time((time_t *)0);
! 		else
  			u = getfval(x);
! 		srand((unsigned int) u);
  		break;
  	case FTOUPPER:
  	case FTOLOWER:
--- 1502,1520 ----
  		u = (Awkfloat) system(getsval(x)) / 256;   /* 256 is unix-dep */
  		break;
  	case FRAND:
! 		if (use_arc4)
! 			u = (Awkfloat) (arc4random() % RAND_MAX) / RAND_MAX;
! 		else
! 			u = (Awkfloat) (random() % RAND_MAX) / RAND_MAX;
  		break;
  	case FSRAND:
! 		if (isrec(x))	/* no argument provided, want arc4random() */
! 			use_arc4 = 1;
! 		else {
  			u = getfval(x);
! 			srandom((unsigned int) u);
! 			use_arc4 = 0;
! 		}
  		break;
  	case FTOUPPER:
  	case FTOLOWER: