From: DeaDDooMER <deaddoomer@deadsoftware.ru>
Date: Sat, 18 Aug 2018 09:59:42 +0000 (+0300)
Subject: Now it read stdin if no file specifed. Also fixed segfault on invalid file.
X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=65e6f1bfb5f2e513607f58e9b7653c3bd45b0dfc;p=odcread.git

Now it read stdin if no file specifed. Also fixed segfault on invalid file.
---

diff --git a/main/odcread.cc b/main/odcread.cc
index 9a7f95a..e6e1748 100644
--- a/main/odcread.cc
+++ b/main/odcread.cc
@@ -147,18 +147,20 @@ namespace odc {
 }
 
 int main(int argc, char *argv[]) {
-	if (argc < 2) {
-		return 1;
-	}
-
 	// Set the locale according to the terminal's environment
 	setlocale(LC_ALL, "");
 
-	std::ifstream in(argv[1], std::ios::in | std::ios::binary);
 
 	odc::Store* s;
 	try {
-		s = odc::importDocument(in);
+		if (argc < 2) {
+			s = odc::importDocument(std::cin);
+		} else if (argc = 2) {
+			std::ifstream in(argv[1], std::ios::in | std::ios::binary);
+			s = odc::importDocument(in);
+		} else {
+			return 1;
+		}
 	} catch (int trap) {
 		std::cerr << "Exception in parsing file: BlackBox trap no. " << trap << std::endl;
 		return 2;
@@ -169,6 +171,10 @@ int main(int argc, char *argv[]) {
 //	std::cout << s->toPlainText() << std::endl;
 //	std::cout << std::endl << std::endl;
 
+	if (s == nullptr) {
+		return 1;
+	}
+
 	try {
 		odc::MyVisitor visitor;
 		s->accept(visitor);