Add Options Parser

Author: mjschutz

build.gyp

@@ -195,6 +195,16 @@
 				'test/configfile_test.cpp'
 			],
 		},
+		{
+			'target_name': 'args-test',
+			'type': 'executable',
+			"dependencies": [
+				"CPP-SystemRT-lib"
+			],
+			'sources': [
+				'test/args_test.cpp'
+			],
+		},
 		{
 			'target_name': 'CPP-SystemRT-lib',
 			'type': 'static_library',
@@ -207,6 +217,7 @@
 				'src/log-common.cpp',
 				'src/filestream.cpp',
 				'src/thread.cpp',
+				'src/options.cpp',
 				'src/socket.cpp',
 				'src/path.cpp',
 				'src/configfile.cpp',

include/CppSystemRT.hpp

@@ -4,6 +4,7 @@
 #include "CppSystemRT/stdafx.h"
 
 #include "CppSystemRT/Error.hpp"
+#include "CppSystemRT/Options.hpp"
 #include "CppSystemRT/File.hpp"
 #include "CppSystemRT/FileStream.hpp"
 #include "CppSystemRT/ConfigFile.hpp"

include/CppSystemRT/FileStream.hpp

@@ -45,45 +45,29 @@ class OFileStreamBuf: public std::streambuf {
 	File& file;
 };
 
-class IFileStream
-    : public std::istream
+template <typename StreamType, typename StreamBuf>
+class FileStream
+    : public StreamType
 {
 public:
-    IFileStream(File& file)
-        : std::istream(new IFileStreamBuf(file))
+    FileStream(File& file)
+        : StreamType(new StreamBuf(file))
     {
-        exceptions(std::ios_base::badbit);
+        StreamType::exceptions(std::ios_base::badbit);
     }
-    explicit IFileStream(File* file)
-        : std::istream(new IFileStreamBuf(*file))
+    explicit FileStream(File* file)
+        : StreamType(new StreamBuf(*file))
     {
-        exceptions(std::ios_base::badbit);
+        StreamType::exceptions(std::ios_base::badbit);
     }
-    virtual ~IFileStream()
+    virtual ~FileStream()
     {
-        delete rdbuf();
+        delete StreamType::rdbuf();
     }
 };
 
-class OFileStream
-    : public std::ostream
-{
-public:
-    OFileStream(File& file)
-        : std::ostream(new OFileStreamBuf(file))
-    {
-        exceptions(std::ios_base::badbit);
-    }
-    explicit OFileStream(File* file)
-        : std::ostream(new OFileStreamBuf(*file))
-    {
-        exceptions(std::ios_base::badbit);
-    }
-    virtual ~OFileStream()
-    {
-        delete rdbuf();
-    }
-};
+typedef FileStream<std::istream, IFileStreamBuf> IFileStream;
+typedef FileStream<std::ostream, OFileStreamBuf> OFileStream;
 
 }
 

include/CppSystemRT/Options.hpp

@@ -0,0 +1,12 @@
+#ifndef _CPPSYSTEMRT_OPTIONS_HPP
+#define _CPPSYSTEMRT_OPTIONS_HPP
+
+namespace CppSystemRT {
+	
+namespace Options {
+	void Parse(int const& argc, char** argv, std::function<void(std::string const&, std::string const&)> f_arg);
+};
+
+}
+
+#endif

include/CppSystemRT/stdafx.h

@@ -14,6 +14,7 @@
 #include <vector>
 #include <map>
 #include <sstream>
+#include <functional>
 #include <cctype>
 #include <limits>
 #include <atomic>

src/options.cpp

@@ -0,0 +1,43 @@
+#include <CppSystemRT.hpp>
+
+namespace CppSystemRT {
+	
+void Options::Parse(int const& argc, char** argv, std::function<void(std::string const&, std::string const&)> f_arg) {
+	int current_argc = 0;
+
+	while (current_argc < argc) {
+		char* arg = argv[current_argc++];
+		char* ch = arg;
+		std::string option;
+		std::string value;
+
+		if (*ch == '-') {
+			ch++;
+
+			if (*ch == '-') {
+				option = ++ch;
+			} else if (*ch && isalnum(*ch)) {
+				option = *ch;
+				ch++;
+				
+				if (*ch) {
+					value = ch;
+				}
+			}
+		} else
+			current_argc--;
+
+		if (value.empty() && (current_argc < argc)) {
+			char* c = argv[current_argc];
+			if (*c != '-') {
+				value = c;
+				current_argc++;
+			}
+		}
+
+		if (!option.empty() || !value.empty())
+			f_arg(option, value);
+	}
+}
+
+}

src/path.cpp

@@ -2,6 +2,11 @@
 
 #ifdef _WIN32
 #define getcwd		_getcwd
+#define PATH_SEP	'\\'
+#define GetExecPath(path, pathsz) ::GetModuleFileName(GetModuleHandle(NULL), path, pathsz)
+#else
+#define PATH_SEP	'/'
+#define GetExecPath(path, pathsz) ::readlink("/proc/self/exe", path, pathsz)
 #endif
 
 namespace CppSystemRT {
@@ -12,10 +17,19 @@ namespace {
 class PathParser {
 public:
 	PathParser() {
-		char cwd[Path::MAX_SZ];
-		if (getcwd(cwd, sizeof(cwd)) != NULL)
-			vars["CWD"] = cwd;
-		
+		char path[Path::MAX_SZ]{0};
+		if (getcwd(path, sizeof(path)) != NULL)
+			vars["CWD"] = path;
+
+		if (GetExecPath(path, Path::MAX_SZ) > 0) {
+			vars["EWD"] = path;
+			vars["EWD"] = vars["EWD"].substr(0, vars["EWD"].find_last_of(PATH_SEP));
+		}
+#ifdef _WIN32
+		vars["SYSNAME"] = "win";
+#else
+		vars["SYSNAME"] = "linux";
+#endif
 		vars["EXE"] = Path::EXE_EXT;
 		vars["SOBJ"] = Path::SOBJ_EXT;
 	}

test/args_test.cpp

@@ -0,0 +1,11 @@
+#include <CppSystemRT.hpp>
+
+using namespace CppSystemRT;
+
+int main(int const argc, char** argv) {
+	Options::Parse(argc-1, &argv[1], [] (std::string const& param, std::string const& value) { 
+		std::cout << param << " -> " << value << std::endl;
+	});
+	
+	return 0;
+}