test (905e6792) · Commits · jan.koester / libcmdplus

src/cmdplus.cpp

+10 −6

Original line number	Diff line number	Diff line
		@@ -143,9 +143,9 @@ void cmdplus::CmdController::parseCmd(int argc, char** argv) {
		int keytype = -1;

		if (argv[args][0] == '-' && argv[args][1] == '-') {
		keytype = KTKEY; // --longkey
		keytype = KTKEY;
		} else if (argv[args][0] == '-') {
		keytype = KTSKEY; // -s
		keytype = KTSKEY;
		} else {
		break;
		}
		@@ -180,10 +180,10 @@ void cmdplus::CmdController::parseCmd(int argc, char** argv) {
		unsigned long val_start = kendpos + 1;
		unsigned long val_end = strlen(argv[args]);

		if (val_start < val_end) {
		if (val_start <= val_end) {
		curcmd->_Value.clear();
		std::copy(&argv[args][val_start], &argv[args][val_end], std::back_inserter(curcmd->_Value));
		}

		break;
		}
		} else if (keytype == KTSKEY) {
		@@ -191,11 +191,15 @@ void cmdplus::CmdController::parseCmd(int argc, char** argv) {
		curcmd->_Found = true;
		curcmd->_Value.clear();

		if (++args < argc) {
		int val_index = args + 1;

		if (val_index < argc && argv[val_index][0] != '-') {
		args = val_index;

		unsigned long val_len = strlen(argv[args]);
		curcmd->_Value.clear();
		std::copy(&argv[args][0], &argv[args][val_len], std::back_inserter(curcmd->_Value));
		}

		break;
		}
		}