utils: code dedupe

5 files changed, 64 insertions, 162 deletions

diff --git a/utils/decrypt_bmp.cpp b/utils/decrypt_bmp.cpp
index 9032dc2..4842fbd 100644
--- a/utils/decrypt_bmp.cpp
+++ b/utils/decrypt_bmp.cpp
@@ -4,65 +4,29 @@
 // Distributed under the MIT License.
 
 #include "file_cmd_parser.hpp"
+#include "helpers/file.hpp"
 
 #include <aesxx/all.hpp>
 
+#include <Windows.h>
+
 #include <boost/program_options.hpp>
 
-#include <cstdlib>
 #include <cstring>
 
 #include <exception>
-#include <fstream>
 #include <iostream>
-#include <iterator>
 #include <string>
 #include <vector>
 
-#include <Windows.h>
-
 namespace
 {
-    std::ifstream::pos_type get_file_size(const std::string& path)
-    {
-        std::ifstream ifs;
-        ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit);
-        ifs.open(path, std::ifstream::binary | std::ifstream::ate);
-        return ifs.tellg();
-    }
-
-    std::vector<char> read_file(const std::string& path)
-    {
-        const auto size = static_cast<std::size_t>(get_file_size(path));
-
-        std::ifstream ifs;
-        ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit);
-        ifs.open(path, std::ifstream::binary);
-
-        std::vector<char> ciphertext_buf;
-        ciphertext_buf.reserve(size);
-        ciphertext_buf.assign(
-            std::istreambuf_iterator<char>(ifs),
-            std::istreambuf_iterator<char>());
-        return ciphertext_buf;
-    }
-
-    void write_file(
-        const std::string& path,
-        const std::vector<unsigned char>& src)
-    {
-        std::ofstream ofs;
-        ofs.exceptions(std::ofstream::badbit | std::ofstream::failbit);
-        ofs.open(path, std::ofstream::binary);
-        ofs.write(reinterpret_cast<const char*>(src.data()), src.size());
-    }
-
     void decrypt_bmp(
         aes::Box& box,
         const std::string& ciphertext_path,
         const std::string& plaintext_path)
     {
-        const auto ciphertext_buf = read_file(ciphertext_path);
+        const auto ciphertext_buf = file::read_file(ciphertext_path);
 
         const auto bmp_header = reinterpret_cast<const BITMAPFILEHEADER*>(ciphertext_buf.data());
 
@@ -77,7 +41,7 @@ namespace
         std::memcpy(plaintext_buf.data(), bmp_header, header_size);
         std::memcpy(plaintext_buf.data() + header_size, pixels.data(), pixels.size());
 
-        write_file(plaintext_path, plaintext_buf);
+        file::write_file(plaintext_path, plaintext_buf);
     }
 
     void decrypt_bmp(const Settings& settings)
diff --git a/utils/decrypt_file.cpp b/utils/decrypt_file.cpp
index 2697338..3bbbb06 100644
--- a/utils/decrypt_file.cpp
+++ b/utils/decrypt_file.cpp
@@ -4,65 +4,28 @@
 // Distributed under the MIT License.
 
 #include "file_cmd_parser.hpp"
+#include "helpers/file.hpp"
 
 #include <aesxx/all.hpp>
 
 #include <boost/program_options.hpp>
 
-#include <cstdlib>
-
 #include <exception>
-#include <fstream>
 #include <iostream>
-#include <iterator>
 #include <string>
 #include <vector>
 
 namespace
 {
-    std::ifstream::pos_type get_file_size(const std::string& path)
-    {
-        std::ifstream ifs;
-        ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit);
-        ifs.open(path, std::ifstream::binary | std::ifstream::ate);
-        return ifs.tellg();
-    }
-
-    std::vector<char> read_file(const std::string& path)
-    {
-        const auto size = static_cast<std::size_t>(get_file_size(path));
-
-        std::ifstream ifs;
-        ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit);
-        ifs.open(path, std::ifstream::binary);
-
-        std::vector<char> src_buf;
-        src_buf.reserve(size);
-        src_buf.assign(
-            std::istreambuf_iterator<char>(ifs),
-            std::istreambuf_iterator<char>());
-        return src_buf;
-    }
-
-    void write_file(
-        const std::string& path,
-        const std::vector<unsigned char>& src)
-    {
-        std::ofstream ofs;
-        ofs.exceptions(std::ofstream::badbit | std::ofstream::failbit);
-        ofs.open(path, std::ofstream::binary);
-        ofs.write(reinterpret_cast<const char*>(src.data()), src.size());
-    }
-
     void decrypt_file(
         aes::Box& box,
         const std::string& ciphertext_path,
         const std::string& plaintext_path)
     {
-        const auto ciphertext_buf = read_file(ciphertext_path);
+        const auto ciphertext_buf = file::read_file(ciphertext_path);
         const auto plaintext_buf = box.decrypt_buffer(
             ciphertext_buf.data(), ciphertext_buf.size());
-        write_file(plaintext_path, plaintext_buf);
+        file::write_file(plaintext_path, plaintext_buf);
     }
 
     void decrypt_file(const Settings& settings)
diff --git a/utils/encrypt_bmp.cpp b/utils/encrypt_bmp.cpp
index 7fdf7f0..c0fd688 100644
--- a/utils/encrypt_bmp.cpp
+++ b/utils/encrypt_bmp.cpp
@@ -4,65 +4,29 @@
 // Distributed under the MIT License.
 
 #include "file_cmd_parser.hpp"
+#include "helpers/file.hpp"
 
 #include <aesxx/all.hpp>
 
+#include <Windows.h>
+
 #include <boost/program_options.hpp>
 
-#include <cstdlib>
 #include <cstring>
 
 #include <exception>
-#include <fstream>
 #include <iostream>
-#include <iterator>
 #include <string>
 #include <vector>
 
-#include <Windows.h>
-
 namespace
 {
-    std::ifstream::pos_type get_file_size(const std::string& path)
-    {
-        std::ifstream ifs;
-        ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit);
-        ifs.open(path, std::ifstream::binary | std::ifstream::ate);
-        return ifs.tellg();
-    }
-
-    std::vector<char> read_file(const std::string& path)
-    {
-        const auto size = static_cast<std::size_t>(get_file_size(path));
-
-        std::ifstream ifs;
-        ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit);
-        ifs.open(path, std::ifstream::binary);
-
-        std::vector<char> plaintext_buf;
-        plaintext_buf.reserve(size);
-        plaintext_buf.assign(
-            std::istreambuf_iterator<char>(ifs),
-            std::istreambuf_iterator<char>());
-        return plaintext_buf;
-    }
-
-    void write_file(
-        const std::string& path,
-        const std::vector<unsigned char>& src)
-    {
-        std::ofstream ofs;
-        ofs.exceptions(std::ofstream::badbit | std::ofstream::failbit);
-        ofs.open(path, std::ofstream::binary);
-        ofs.write(reinterpret_cast<const char*>(src.data()), src.size());
-    }
-
     void encrypt_bmp(
         aes::Box& box,
         const std::string& plaintext_path,
         const std::string& ciphertext_path)
     {
-        const auto plaintext_buf = read_file(plaintext_path);
+        const auto plaintext_buf = file::read_file(plaintext_path);
 
         const auto bmp_header = reinterpret_cast<const BITMAPFILEHEADER*>(plaintext_buf.data());
 
@@ -77,7 +41,7 @@ namespace
         std::memcpy(ciphertext_buf.data(), bmp_header, header_size);
         std::memcpy(ciphertext_buf.data() + header_size, cipherpixels.data(), cipherpixels.size());
 
-        write_file(ciphertext_path, ciphertext_buf);
+        file::write_file(ciphertext_path, ciphertext_buf);
     }
 
     void encrypt_bmp(const Settings& settings)
diff --git a/utils/encrypt_file.cpp b/utils/encrypt_file.cpp
index 8741f54..721b735 100644
--- a/utils/encrypt_file.cpp
+++ b/utils/encrypt_file.cpp
@@ -4,65 +4,28 @@
 // Distributed under the MIT License.
 
 #include "file_cmd_parser.hpp"
+#include "helpers/file.hpp"
 
 #include <aesxx/all.hpp>
 
 #include <boost/program_options.hpp>
 
-#include <cstdlib>
-
 #include <exception>
-#include <fstream>
 #include <iostream>
-#include <iterator>
 #include <string>
 #include <vector>
 
 namespace
 {
-    std::ifstream::pos_type get_file_size(const std::string& path)
-    {
-        std::ifstream ifs;
-        ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit);
-        ifs.open(path, std::ifstream::binary | std::ifstream::ate);
-        return ifs.tellg();
-    }
-
-    std::vector<char> read_file(const std::string& path)
-    {
-        const auto size = static_cast<std::size_t>(get_file_size(path));
-
-        std::ifstream ifs;
-        ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit);
-        ifs.open(path, std::ifstream::binary);
-
-        std::vector<char> plaintext_buf;
-        plaintext_buf.reserve(size);
-        plaintext_buf.assign(
-            std::istreambuf_iterator<char>(ifs),
-            std::istreambuf_iterator<char>());
-        return plaintext_buf;
-    }
-
-    void write_file(
-        const std::string& path,
-        const std::vector<unsigned char>& src)
-    {
-        std::ofstream ofs;
-        ofs.exceptions(std::ofstream::badbit | std::ofstream::failbit);
-        ofs.open(path, std::ofstream::binary);
-        ofs.write(reinterpret_cast<const char*>(src.data()), src.size());
-    }
-
     void encrypt_file(
         aes::Box& box,
         const std::string& plaintext_path,
         const std::string& ciphertext_path)
     {
-        const auto plaintext_buf = read_file(plaintext_path);
+        const auto plaintext_buf = file::read_file(plaintext_path);
         const auto ciphertext_buf = box.encrypt_buffer(
             plaintext_buf.data(), plaintext_buf.size());
-        write_file(ciphertext_path, ciphertext_buf);
+        file::write_file(ciphertext_path, ciphertext_buf);
     }
 
     void encrypt_file(const Settings& settings)
diff --git a/utils/helpers/file.hpp b/utils/helpers/file.hpp
new file mode 100644
index 0000000..a327c35
--- /dev/null
+++ b/utils/helpers/file.hpp
@@ -0,0 +1,48 @@
+// Copyright (c) 2016 Egor Tensin <Egor.Tensin@gmail.com>
+// This file is part of the "AES tools" project.
+// For details, see https://github.com/egor-tensin/aes-tools.
+// Distributed under the MIT License.
+
+#include <cstddef>
+
+#include <fstream>
+#include <iterator>
+#include <string>
+#include <vector>
+
+namespace file
+{
+    inline std::size_t get_file_size(const std::string& path)
+    {
+        std::ifstream ifs;
+        ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit);
+        ifs.open(path, std::ifstream::binary | std::ifstream::ate);
+        return ifs.tellg();
+    }
+
+    inline std::vector<char> read_file(const std::string& path)
+    {
+        const auto size = get_file_size(path);
+
+        std::ifstream ifs;
+        ifs.exceptions(std::ifstream::badbit | std::ifstream::failbit);
+        ifs.open(path, std::ifstream::binary);
+
+        std::vector<char> src_buf;
+        src_buf.reserve(size);
+        src_buf.assign(
+            std::istreambuf_iterator<char>(ifs),
+            std::istreambuf_iterator<char>());
+        return src_buf;
+    }
+
+    inline void write_file(
+        const std::string& path,
+        const std::vector<unsigned char>& src)
+    {
+        std::ofstream ofs;
+        ofs.exceptions(std::ofstream::badbit | std::ofstream::failbit);
+        ofs.open(path, std::ofstream::binary);
+        ofs.write(reinterpret_cast<const char*>(src.data()), src.size());
+    }
+}