Binary files a/dual_control and b/dual_control differ

@@ -19,10 +19,17 @@

 #include "sys_unistd.h"

 #include "sys_pwd.h"

 #include "token.h"

+#include "system.h"

 #include "sys_fstream.h"

 namespace {

-    installer init() {

+    class system init_system() {

+        stdlib stdlib(stdlib::get());

+        sys_time time(sys_time::get());

+        class system system(stdlib, time);

+        return system;

+    }

+    installer init_installer() {

         fstreams fstreams(fstreams::create());

         tokens tokens(tokens::create(fstreams));

         pwd pwd(pwd::create());

@@ -39,7 +46,8 @@ namespace {

 int main (int argc, char *argv[])

 {

-    installer tool(init());

+    class system system(init_system());

+    installer tool(init_installer());

     std::string generated_token = tool.install_token();

     std::cout << generated_token << std::endl;

     return 0;

@@ -4,7 +4,7 @@

 #include "sys_time.h"

 namespace {

-    class impl : public time_ifc {

+    class impl : public sys_time_ifc {

         public:

             time_t time(time_t *timer) const override{

                 return ::time(timer);

@@ -12,7 +12,7 @@ namespace {

     };

 }

-const time_t &time::get() {

-    static time singleton(std::make_shared<impl>());

+const sys_time &sys_time::get() {

+    static sys_time singleton(std::make_shared<impl>());

     return singleton;

 }

@@ -21,7 +21,7 @@ class sys_time {

         time_t time(time_t *timer) const {

             return delegate_->time(timer);

         }

-   static const time_t &get();

+   static const sys_time &get();

 };

@@ -6,5 +6,11 @@

 system::system(const stdlib &stdlib, const sys_time &time) {

     unsigned seed = static_cast<unsigned>(time.time(nullptr));

     stdlib.srand(seed);

+    /* this makes it look like we're more random when the tool

+     * is invoked. it isn't necessary and we shouldn't be using

+     * rand() at all in the final version since it's kind of

+     * dumb.

+     */

+    stdlib.rand();

 }