Total rewrite

main.cpp

@@ -1,35 +1,30 @@
-//
+#include <cstdlib>
-// main.cpp
-// valid-utf8
-//
-// Created by Bob Polis at 2019-09-21
-// Copyright (c) 2019 SwiftCoder. All rights reserved.
-//
-
-// libcommon
 #include <libscstring.hpp>
-
+#include <stdexcept>
-// UNIX
-#include <unistd.h>
-#include <libgen.h>
-
-// C++
 #include <iostream>
+#include <fstream>
+
 using namespace std;
 
-int main(int argc, const char * argv[]) {
+static int check_file(istream& file) {
-    int result = EXIT_SUCCESS;
+    string line;
-    try {
+    while (getline(file, line)) {
-        string text;
+        if (!sc::is_valid_utf8(line)) return EXIT_FAILURE;
-		if (argc == 1) {
+    }
-			cin >> text;
+    return EXIT_SUCCESS;
-		} else {
+}
-			text = sc::file_get_contents(argv[1]);
+
+int main(int argc, char* argv[]) {
+    try {
+        if (argc == 1) {
+            return check_file(cin);
+        } else {
+            ifstream file {argv[1]};
+            if (!file) throw runtime_error {"could not open file"};
+            return check_file(file);
+        }
+    } catch (const exception& ex) {
+        cerr << "valid-utf8: " << ex.what() << '\n';
+        return EXIT_FAILURE;
     }
-		result = sc::is_valid_utf8(text) ? EXIT_SUCCESS : EXIT_FAILURE;
-    } catch (const exception& ex) {
-        cerr << basename(const_cast<char*>(argv[0])) << ": " << ex.what() << '\n';
-        result = EXIT_FAILURE;
-    }
-    return result;
 }