From cddfdba1a77b665b307aa575a4453c0ec18f0dd0 Mon Sep 17 00:00:00 2001
From: Mirek Kratochvil <exa.exa@gmail.com>
Date: Sun, 21 Apr 2013 14:22:21 +0200
Subject: [PATCH] iohelpers: input reader, out_bin

---
 src/actions.cpp   |  4 ++--
 src/iohelpers.cpp | 15 +++++++++++++++
 src/iohelpers.h   |  3 +++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/actions.cpp b/src/actions.cpp
index b2eec79..0d1e323 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -252,7 +252,7 @@ int action_export (bool armor,
 		data = envelope_format (ENVELOPE_PUBKEYS, parts, r);
 	}
 
-	out (data);
+	out_bin (data);
 
 	return 0;
 }
@@ -408,7 +408,7 @@ int action_export_sec (bool armor,
 		data = envelope_format (ENVELOPE_SECRETS, parts, r);
 	}
 
-	out (data);
+	out_bin (data);
 
 	return 0;
 }
diff --git a/src/iohelpers.cpp b/src/iohelpers.cpp
index 5b482f1..fa4003c 100644
--- a/src/iohelpers.cpp
+++ b/src/iohelpers.cpp
@@ -35,3 +35,18 @@ bool redirect_cout (const std::string& fn)
 	std::cout.rdbuf (alt_cout.rdbuf() );
 	return true;
 }
+
+#define bufsize 1024
+bool read_all_input (std::string&data)
+{
+	data.clear();
+	char buf[bufsize];
+	for (;;) {
+		std::cin.read (buf, bufsize);
+		if (std::cin) data.append (buf, bufsize);
+		else if (std::cin.eof() ) {
+			data.append (buf, std::cin.gcount() );
+			return true;
+		} else return false;
+	}
+}
diff --git a/src/iohelpers.h b/src/iohelpers.h
index e8dbc9d..7789d94 100644
--- a/src/iohelpers.h
+++ b/src/iohelpers.h
@@ -28,6 +28,7 @@
 #include <string>
 
 #define out(x) std::cout << x << std::endl
+#define out_bin(x) std::cout << x
 #define outeol std::cout << std::endl
 #define err(x) std::cerr << x << std::endl
 #define erreol std::cerr << std::endl
@@ -40,4 +41,6 @@
 bool redirect_cin (const std::string& fn);
 bool redirect_cout (const std::string& fn);
 
+bool read_all_input (std::string&);
+
 #endif