--- a/src/relpipe-in-fstab.cpp	Sat Oct 24 00:08:17 2020 +0200
+++ b/src/relpipe-in-fstab.cpp	Sun May 09 17:20:30 2021 +0200
@@ -28,72 +28,27 @@
 
 #include <relpipe/cli/CLI.h>
 
+#include "CLIParser.h"
+#include "Configuration.h"
+#include "FstabCommand.h"
+
 using namespace relpipe::cli;
 using namespace relpipe::writer;
-
-/**
- * see https://hg.frantovo.cz/sql-api/file/tip/prototyp/prototyp.sql#l49
- */
-void processDataStream(ostream &output, istream* input) {
-	wregex devicePattern = wregex(L"(LABEL|UUID)=(.*)");
-	wregex linePattern = wregex(L"^([^\\s#]+)\\s+([^\\s]+)\\s+([^\\s]+)\\s+([^\\s]+)\\s+(\\d+)\\s+(\\d+)\\s*$");
-	wstring_convert < codecvt_utf8<wchar_t>> convertor; // TODO: support also other encodings.
-
-	std::shared_ptr<RelationalWriter> writer(Factory::create(output));
-
-	writer->startRelation(L"fstab",{
-		{L"scheme", TypeId::STRING},
-		{L"device", TypeId::STRING},
-		{L"mount_point", TypeId::STRING},
-		{L"type", TypeId::STRING},
-		// {L"types", TypeId::STRING}, // TODO: array
-		{L"options", TypeId::STRING}, // TODO: array
-		{L"dump", TypeId::INTEGER},
-		{L"pass", TypeId::INTEGER}
-	}, true);
-
-	string lineBytes;
-	while (getline(*input, lineBytes)) {
-
-		wstring line = convertor.from_bytes(lineBytes);
-		wsmatch lineMatch;
-		if (regex_search(line, lineMatch, linePattern) && lineMatch.size() > 0) {
-			int g = 1;
-			wstring device = lineMatch[g++];
-			wstring mountPoint = lineMatch[g++];
-			wstring type = lineMatch[g++];
-			wstring options = lineMatch[g++];
-			wstring dump = lineMatch[g++];
-			wstring pass = lineMatch[g++];
-
-			wsmatch deviceMatch;
-			if (regex_search(device, deviceMatch, devicePattern)) {
-				writer->writeAttribute(deviceMatch[1]);
-				writer->writeAttribute(deviceMatch[2]);
-			} else {
-				writer->writeAttribute(L""); // TODO: null (requires bitmap)
-				writer->writeAttribute(device);
-			}
-
-			if (mountPoint == L"none") mountPoint = L""; // TODO: null (requires bitmap)
-			writer->writeAttribute(mountPoint);
-			writer->writeAttribute(type);
-			writer->writeAttribute(options);
-			writer->writeAttribute(dump);
-			writer->writeAttribute(pass);
-		}
-	}
-
-}
+using namespace relpipe::in::fstab;
 
 int main(int argc, char** argv) {
 	setlocale(LC_ALL, "");
 	CLI::untieStdIO();
-	//CLI cli(argc, argv);
+	CLI cli(argc, argv);
 
 	int resultCode = CLI::EXIT_CODE_UNEXPECTED_ERROR;
 
 	try {
+		CLIParser cliParser;
+		Configuration configuration = cliParser.parse(cli.arguments());
+		FstabCommand command;
+		std::shared_ptr<RelationalWriter> writer(Factory::create(std::cout));
+
 		if (isatty(fileno(stdin))) {
 			/**
 			 * Our program is executed on TTY without input stream redirection → read from default file location.
@@ -101,7 +56,7 @@
 			 * (we don't expect that user is writing the content of fstab by hand on the terminal)
 			 */
 			ifstream s("/etc/fstab");
-			processDataStream(cout, &s);
+			command.process(s, writer, configuration);
 		} else {
 			/**
 			 * Input stream comes from a file or is piped from other command → read it instead of default file.
@@ -109,11 +64,16 @@
 			 * or $ relpipe-in-fstab < /etc/fstab | … # without UUoC
 			 * or $ ssh example.com cat /etc/fstab | relpipe-in-fstab | …
 			 * or $ cat | relpipe-in-fstab | … # user writes the fstab content by hand
+			 * or $ cat /etc/mtab | relpipe-in-fstab | relpipe-out-tabular | less -RSi # currently mounted filesystems
 			 */
-			processDataStream(cout, &cin);
+			command.process(std::cin, writer, configuration);
 		}
+
 		resultCode = CLI::EXIT_CODE_SUCCESS;
-
+	} catch (RelpipeCLIException e) {
+		fwprintf(stderr, L"Caught CLI exception: %ls\n", e.getMessge().c_str());
+		fwprintf(stderr, L"Debug: Input stream: eof=%ls, lastRead=%d\n", (cin.eof() ? L"true" : L"false"), cin.gcount());
+		resultCode = e.getExitCode();
 	} catch (RelpipeWriterException e) {
 		fwprintf(stderr, L"Caught Writer exception: %ls\n", e.getMessge().c_str());
 		fwprintf(stderr, L"Debug: Input stream: eof=%ls, lastRead=%d\n", (cin.eof() ? L"true" : L"false"), cin.gcount());