Renamed units, FPC does namespaces, but is confused by namespaces mor…

…e than 1 dot., Updated readme
hiraethbbs · Feb 23, 2017 · e3545fd · e3545fd
1 parent 4e23838
commit e3545fd
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ begin
   R.Free;
 ```
 
-You can also use a custom random generator.  It needs to implement Renegade.Random.RandomInterface;
+You can also use a custom random generator.  It needs to implement Random.RandomInterface;
 ```pascal
 Program RandomTest;
 {$mode objfpc}{$H+}
@@ -56,8 +56,8 @@ begin
 ```
 
 
-  * On Linux systems TRandom reads from /dev/urandom.
+  * On Linux systems TRandom trys to use syscall(SYS_getrandom) if that fails it reads from /dev/urandom and then /dev/random before failing.
   * On Windows systems TRandom uses Windows built in [CryptGenRandom](https://msdn.microsoft.com/en-us/library/windows/desktop/aa379942(v=vs.85).aspx "CryptGenRandom") function.
-  * On BSD systems TRandom reads from /dev/urandom. (TODO : read from [arc4random_buf](https://www.freebsd.org/cgi/man.cgi?query=arc4random_buf&sektion=3 "arc4random_buf") this is the same on Mac systems, because Mac = FreeBSD)
+  * On BSD systems TRandom uses arc4random_buf. (Done : read from [arc4random_buf](https://www.freebsd.org/cgi/man.cgi?query=arc4random_buf&sektion=3 "arc4random_buf") this is the same on Mac systems, because Mac = FreeBSD)
 
 TRandom will fall back on Free Pascal's [Random](http://www.freepascal.org/docs-html/rtl/system/random.html "Random") function which uses the [Mersenne Twister](https://en.wikipedia.org/wiki/Mersenne_Twister "Mersenne Twister") algorithm to get random bytes.
diff --git a/Renegade.Random.BSDRandom.pas → Random.BSDRandom.pas b/Renegade.Random.BSDRandom.pas → Random.BSDRandom.pas
@@ -33,9 +33,10 @@
 {  `--- ---'                                            }
 {*******************************************************}
 
-{ ???: Todo - use arc4random_buf }
 {$mode objfpc}{$H+}
-Unit Renegade.Random.BSDRandom;
+{$codepage utf-8}
+{namespace Renegade.Random }
+Unit Random.BSDRandom;
 
 interface
 
@@ -44,8 +45,8 @@ interface
   Objects,
   Classes,
   SysUtils,
-  Renegade.Random.RandomInterface,
-  Renegade.Random.URandom;
+  Random.RandomInterface,
+  Random.URandom;
 
 type
   PCChar = ^CChar;

diff --git a/Renegade.Random.Generic.pas → Random.Generic.pas b/Renegade.Random.Generic.pas → Random.Generic.pas
@@ -34,15 +34,16 @@
 {*******************************************************}
 
 {$mode objfpc}{$H+}
-Unit Renegade.Random.Generic;
+{ namespace Renegade.Random }
+Unit Random.Generic;
 
 interface
 
 uses
   Objects,
   Classes,
   SysUtils,
-  Renegade.Random.RandomInterface;
+  Random.RandomInterface;
 
 type
   PRandomGeneric = ^RandomGeneric;

diff --git a/Renegade.Random.LinuxRandom.pas → Random.LinuxRandom.pas b/Renegade.Random.LinuxRandom.pas → Random.LinuxRandom.pas
@@ -34,7 +34,8 @@
 {*******************************************************}
 
 {$mode objfpc}{$H+}
-Unit Renegade.Random.LinuxRandom;
+{ namespace Renegade.Random }
+Unit Random.LinuxRandom;
 
 interface
 
@@ -43,7 +44,7 @@ interface
   Objects,
   Classes,
   SysUtils,
-  Renegade.Random.RandomInterface;
+  Random.RandomInterface;
 
 const
   {$IF DEFINED(CPU64)} SYS_getrandom = 318;
@@ -113,7 +114,7 @@ function LinuxRandom.GetString(NBytes : SizeUInt) : AnsiString;
             end;
           Buffer.Free;
         end
-        else if (not FileExists('/dev/udrandom')) then
+        else if (not FileExists('/dev/urandom')) then
         begin
             Writeln('Random');
             RandomByteBuffer := MTRandomBytes((NBytes*2));

diff --git a/Renegade.Random.RandomInterface.pas → Random.RandomInterface.pas b/Renegade.Random.RandomInterface.pas → Random.RandomInterface.pas
@@ -36,7 +36,8 @@
 {$mode objfpc}{$H+}
 {$interfaces corba}
 {$codepage UTF8}
-Unit Renegade.Random.RandomInterface;
+
+Unit Random.RandomInterface;
 
 interface
 
@@ -74,11 +75,11 @@ function RandomTrait.MTRandomBytes(NBytes : SizeUInt) : TBytes;
 var
   i : SizeUint;
 begin
-  Randomize;
+  System.Randomize;
   SetLength(Result, (NBytes*2));
   for i := 0 to (NBytes*2) do
     begin
-      Result[i] := Random(MaxInt) mod 256;
+      Result[i] := System.Random(MaxInt) mod 256;
     end;
   SetLength(Result, NBytes);
 end;

diff --git a/Renegade.Random.URandom.pas → Random.URandom.pas b/Renegade.Random.URandom.pas → Random.URandom.pas
@@ -34,7 +34,8 @@
 {*******************************************************}
 
 {$mode objfpc}{$H+}
-Unit Renegade.Random.URandom;
+{ namespace Renegade.Random }
+Unit Random.URandom;
 
 interface
 
@@ -43,7 +44,7 @@ interface
   Objects,
   Classes,
   SysUtils,
-  Renegade.Random.RandomInterface;
+  Random.RandomInterface;
 
 const
   {$IF DEFINED(CPU64)} SYS_getrandom = 318;
@@ -113,7 +114,7 @@ function URandom.GetString(NBytes : SizeUInt) : AnsiString;
             end;
           Buffer.Free;
         end
-        else if (not FileExists('/dev/udrandom')) then
+        else if (not FileExists('/dev/urandom')) then
         begin
             Writeln('Random');
             RandomByteBuffer := MTRandomBytes((NBytes*2));

diff --git a/Renegade.Random.WinRandom.pas → Random.WinRandom.pas b/Renegade.Random.WinRandom.pas → Random.WinRandom.pas
@@ -34,7 +34,8 @@
 {*******************************************************}
 
 {$mode objfpc}{$H+}
-Unit Renegade.Random.WinRandom;
+{ namespace Renegade.Random }
+Unit Random.WinRandom;
 
 interface
 
@@ -43,7 +44,7 @@ interface
   Classes,
   SysUtils,
   Windows,
-  Renegade.Random.RandomInterface;
+  Random.RandomInterface;
 
 const
   CRYPT_VERIFYCONTEXT = $F0000000;

diff --git a/Renegade.Random.pas b/Renegade.Random.pas
@@ -35,6 +35,8 @@
 
 {$mode objfpc}{$H+}
 {$interfaces corba}
+{$codepage utf-8}
+{ namespace Renegade.Random }
 Unit Renegade.Random;
 
 interface
@@ -43,15 +45,15 @@ interface
   Objects,
   Classes,
   SysUtils,
-  Renegade.Random.RandomInterface,
+  Random.RandomInterface,
 {$IF DEFINED(LINUX)}
-  Renegade.Random.LinuxRandom
+  Random.LinuxRandom
 {$ELSEIF DEFINED(WINDOWS)}
-  Renegade.Random.WinRandom
+  Random.WinRandom
 {$ELSEIF DEFINED(BSD)}
-  Renegade.Random.BSDRandom
+  Random.BSDRandom
 {$ELSE}
-  Renegade.Random.Generic;
+  Random.Generic;
 {$ENDIF}
  ;
 

diff --git a/tests/RandomTest.pas b/tests/RandomTest.pas
@@ -4,8 +4,8 @@
 
 Uses
   Renegade.Random,
-  Renegade.Random.Generic,
-  Renegade.Random.RandomInterface,
+  Random.Generic,
+  Random.RandomInterface,
   Classes,
   SysUtils;