@@ -2,7 +2,8 @@ CXXFLAGS += -fPIC -fno-stack-protector -std=c++11

 CFLAGS += -fPIC -fno-stack-protector

 LDFLAGS = -lpam

-INTEGRATION_OBJS = sys_syslog.o sys_fstream.o sys_unistd.o sys_pwd.o sys_pam.o dual_control_integrate.o

+INTEGRATION_OBJS = sys_syslog.o sys_fstream.o sys_unistd.o sys_pwd.o sys_pam.o \

+                   sys_stdlib.o

 OBJS = dual_control.o request.o validator.o conversation.o user.o token.o logger.o session.o installer.o

 TEST_SOURCES := $(wildcard *_test.cc)

 TESTS := $(patsubst %.cc,%.out,$(TEST_SOURCES))

@@ -20,12 +21,12 @@ version:

 	@echo COMPILER VERSION --------------------------------

 	$(CXX) --version

-dual_control.a: $(OBJS) $(INTEGRATION_OBJS)

+dual_control.a: dual_control.o $(OBJS) $(INTEGRATION_OBJS)

 	ar rvs $@ $^

 	ranlib $@

-dual_control: dual_control_tool.cc

-	$(CXX) $(CXXFLAGS) $(CPPFLAGS)  -o $@ $^

+dual_control: dual_control_tool.o $(OBJS) $(INTEGRATION_OBJS)

+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)  -o $@ $^

 .PHONY: clean

Binary files a/dual_control and b/dual_control differ

@@ -13,10 +13,33 @@

 #include <iostream>

 #include "installer.h"

+#include "generator.h"

+#include "sys_stdlib.h"

+#include "user.h"

+#include "sys_unistd.h"

+#include "sys_pwd.h"

+#include "token.h"

+#include "sys_fstream.h"

+

+namespace {

+    installer init() {

+        fstreams fstreams(fstreams::create());

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

+        pwd pwd(pwd::create());

+        unistd unistd(unistd::create());

+        directory directory(directory::create(unistd, pwd));

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

+        generator generator{make_generator(stdlib)};

+        installer installer(installer::create(tokens, unistd,

+                            directory, generator));

+

+        return installer;

+    }

+}

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

 {

-    installer tool;

+    installer tool(init());

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

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

     return 0;

@@ -16,6 +16,7 @@

 #include "token.h"

 #include "sys_unistd.h"

 #include "user.h"

+#include "generator.h"

 namespace

 {

@@ -29,7 +30,7 @@ private:

     generator generator_;

 public:

     impl (const tokens &tokens, const unistd &unistd,

-          const directory &directory, const installer_ifc::generator &generator) :

+          const directory &directory, const generator &generator) :

         tokens_ (tokens), unistd_ (unistd), directory_ (directory),

         generator_ (generator) {}

     std::string install_token() const override

@@ -58,7 +59,7 @@ public:

 }

 installer installer::create (const tokens &tokens, const unistd &unistd,

-                             const directory &directory, const installer_ifc::generator &generator)

+                             const directory &directory, const generator &generator)

 {

     return installer (std::make_shared<impl> (tokens, unistd, directory,

                       generator));

@@ -19,11 +19,11 @@

 #include "token.h"

 #include "sys_unistd.h"

 #include "user.h"

+#include "generator.h"

 class installer_ifc

 {

 public:

-    using generator = std::function<std::string()>;

     virtual std::string install_token() const

     {

         return "123456";

@@ -44,7 +44,7 @@ public:

         return delegate_->install_token();

     }

     static installer create (const tokens &tokens, const unistd &unistd,

-                             const directory &directory, const installer_ifc::generator &generator);

+                             const directory &directory, const generator &generator);

 };

 #endif

@@ -81,7 +81,7 @@ int installs_token()

     tokens tokens{test_tokens};

     unistd unistd (std::make_shared<fake_unistd> (user_name));

     directory directory (std::make_shared<fake_directory> (user_name));

-    installer_ifc::generator generator = [&] { return token; };

+    generator generator = [&] { return token; };

     installer installer = installer::create (tokens, unistd, directory,

                           generator);

@@ -104,7 +104,7 @@ int unistd_does_not_find_user_name()

     tokens tokens{test_tokens};

     unistd unistd (std::make_shared<fail_unistd>());

     directory directory (std::make_shared<fake_directory> (user_name));

-    installer_ifc::generator generator = [&] { return token; };

+    generator generator = [&] { return token; };

     installer installer = installer::create (tokens, unistd, directory,

                           generator);

@@ -127,7 +127,7 @@ int directory_finds_no_user_info()

     tokens tokens{test_tokens};

     unistd unistd (std::make_shared<fake_unistd> (user_name));

     directory directory (std::make_shared<fake_directory> ("not the user"));

-    installer_ifc::generator generator = [&] { return token; };

+    generator generator = [&] { return token; };

     installer installer = installer::create (tokens, unistd, directory,

                           generator);