Extract get_line_{file,stringstream} into standalone methods.

1 files changed, 30 insertions, 0 deletions

diff --git a/src/util.cc b/src/util.cc
index 5f4cd39..5510d8e 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -18,8 +18,14 @@
 */
 
 #include "util.h"
+#include <string>
+#include <sstream>
+#include <cstdio>
 
 using std::string;
+using std::stringstream;
+using std::getline;
+using boost::optional;
 
 /** @param s A string.
  *  @return true if the string contains only space, newline or tab characters, or is empty.
@@ -35,3 +41,27 @@ sub::empty_or_white_space (string s)
 
 	return true;
 }
+
+optional<string>
+sub::get_line_stringstream (stringstream* str)
+{
+	string s;
+	getline (*str, s);
+	if (!str->good ()) {
+		return optional<string> ();
+	}
+
+	return s;
+}
+
+optional<string>
+sub::get_line_file (FILE* f)
+{
+	char buffer[256];
+	char* r = fgets (buffer, sizeof (buffer), f);
+	if (r == 0 || feof (f)) {
+		return optional<string> ();
+	}
+
+	return string (buffer);
+}