From 34ec2d9b45172ab61469aa96d5731d1044d21ca4 Mon Sep 17 00:00:00 2001 From: prozessorkern Date: Mon, 3 Feb 2020 20:45:19 +0100 Subject: [PATCH] removed \e from sourcecode and testcases --- makefile | 4 ++-- src/shellmatta.c | 2 +- src/shellmatta_utils.c | 10 +++++----- .../unittest/shellmatta_utils/test_utils_eraseLine.cpp | 2 +- .../shellmatta_utils/test_utils_forwardCursor.cpp | 4 ++-- .../shellmatta_utils/test_utils_insertChars.cpp | 2 +- .../shellmatta_utils/test_utils_restoreCursorPos.cpp | 2 +- .../shellmatta_utils/test_utils_rewindCursor.cpp | 4 ++-- .../shellmatta_utils/test_utils_saveCursorPos.cpp | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/makefile b/makefile index 8e014f9..60371c7 100644 --- a/makefile +++ b/makefile @@ -43,8 +43,8 @@ UNITTEST_CPPOBJ := $(patsubst %.cpp,$(OBJ_DIR)%.o,$(UNITTEST_SOURCES)) INTEGRATIONTEST_CPPOBJ := $(patsubst %.cpp,$(OBJ_DIR)%.o,$(INTEGRATIONTEST_SOURCES)) -CFLAGS := $(INCLUDES:%=-I%) -g -Wall -Werror -TESTFLAGS := $(INCLUDES:%=-I%) -g -Wall -Werror -fprofile-arcs -ftest-coverage +CFLAGS := $(INCLUDES:%=-I%) -g -Wall -Werror -pedantic +TESTFLAGS := $(INCLUDES:%=-I%) -g -Wall -Werror -fprofile-arcs -ftest-coverage -pedantic TESTLFLAGS := -fprofile-arcs -Wl,--allow-multiple-definition DEPEND = -MT $@ -MF "$(@:%.o=%.d)" -MG -MM diff --git a/src/shellmatta.c b/src/shellmatta.c index 77f2d96..63cf74f 100644 --- a/src/shellmatta.c +++ b/src/shellmatta.c @@ -403,7 +403,7 @@ shellmatta_retCode_t shellmatta_processData(shellmatta_handle_t handle, utils_removeChars(inst, 1u, false); } /** -# check for start of escape sequence */ - else if('\e' == *data) + else if('\x1b' == *data) { inst->escapeCounter = 1u; } diff --git a/src/shellmatta_utils.c b/src/shellmatta_utils.c index 2009f0c..9dc68d0 100644 --- a/src/shellmatta_utils.c +++ b/src/shellmatta_utils.c @@ -91,7 +91,7 @@ uint32_t utils_shellItoa(int32_t value, char *buffer, uint32_t base) */ void utils_saveCursorPos(shellmatta_instance_t *inst) { - utils_writeEcho(inst, "\e[s", 3u); + utils_writeEcho(inst, "\x1b[s", 3u); } /** @@ -100,7 +100,7 @@ void utils_saveCursorPos(shellmatta_instance_t *inst) */ void utils_restoreCursorPos(shellmatta_instance_t *inst) { - utils_writeEcho(inst, "\e[u", 3u); + utils_writeEcho(inst, "\x1b[u", 3u); } /** @@ -110,7 +110,7 @@ void utils_restoreCursorPos(shellmatta_instance_t *inst) */ void utils_eraseLine(shellmatta_instance_t *inst) { - utils_writeEcho(inst, "\e[K", 3u); + utils_writeEcho(inst, "\x1b[K", 3u); } /** @@ -126,7 +126,7 @@ void utils_rewindCursor(shellmatta_instance_t *inst, uint32_t length) length = SHELLMATTA_MIN (length, inst->cursor); if(length > 0u) { - terminalCmd[0] = '\e'; + terminalCmd[0] = '\x1b'; terminalCmd[1] = '['; size = 2u + utils_shellItoa(length, &terminalCmd[2], 10); terminalCmd[size] = 'D'; @@ -148,7 +148,7 @@ void utils_forwardCursor(shellmatta_instance_t *inst, uint32_t length) length = SHELLMATTA_MIN (length, (inst->inputCount - inst->cursor)); if (length > 0u) { - terminalCmd[0] = '\e'; + terminalCmd[0] = '\x1b'; terminalCmd[1] = '['; size = 2u + utils_shellItoa(length, &terminalCmd[2], 10); terminalCmd[size] = 'C'; diff --git a/test/unittest/shellmatta_utils/test_utils_eraseLine.cpp b/test/unittest/shellmatta_utils/test_utils_eraseLine.cpp index b5a93c1..305a876 100644 --- a/test/unittest/shellmatta_utils/test_utils_eraseLine.cpp +++ b/test/unittest/shellmatta_utils/test_utils_eraseLine.cpp @@ -36,5 +36,5 @@ TEST_CASE( "shellmatta_utils_eraseLine" ) { CHECK( write_callCnt == 1u); CHECK( write_length == 3u); - REQUIRE( strncmp("\e[K", write_data, 3u) == 0); + REQUIRE( strncmp("\x1b[K", write_data, 3u) == 0); } diff --git a/test/unittest/shellmatta_utils/test_utils_forwardCursor.cpp b/test/unittest/shellmatta_utils/test_utils_forwardCursor.cpp index 49a7f2b..0b6d5f3 100644 --- a/test/unittest/shellmatta_utils/test_utils_forwardCursor.cpp +++ b/test/unittest/shellmatta_utils/test_utils_forwardCursor.cpp @@ -36,7 +36,7 @@ TEST_CASE( "shellmatta_utils_forwardCursor normal" ) { CHECK( write_callCnt == 1u); CHECK( write_length == 4u); - REQUIRE( strncmp("\e[5C", write_data, 4u) == 0); + REQUIRE( strncmp("\x1b[5C", write_data, 4u) == 0); } TEST_CASE( "shellmatta_utils_forwardCursor normal echo off" ) { @@ -85,7 +85,7 @@ TEST_CASE( "shellmatta_utils_forwardCursor forward by 12 with cursor at 5 and in CHECK( write_callCnt == 1u); CHECK( write_length == 4u); - REQUIRE( strncmp("\e[5C", write_data, 4u) == 0); + REQUIRE( strncmp("\x1b[5C", write_data, 4u) == 0); } TEST_CASE( "shellmatta_utils_forwardCursor forward by 0" ) { diff --git a/test/unittest/shellmatta_utils/test_utils_insertChars.cpp b/test/unittest/shellmatta_utils/test_utils_insertChars.cpp index 91aa3f4..021f42f 100644 --- a/test/unittest/shellmatta_utils/test_utils_insertChars.cpp +++ b/test/unittest/shellmatta_utils/test_utils_insertChars.cpp @@ -36,7 +36,7 @@ TEST_CASE( "shellmatta_insertChars normal call" ) { CHECK( inst.cursor == 12); CHECK( inst.inputCount == 14); CHECK( write_callCnt == 5u ); - CHECK( strncmp("blks\e[K\e[sij\e[u", write_data, 15u) == 0); + CHECK( strncmp("blks\x1b[K\x1b[sij\x1b[u", write_data, 15u) == 0); REQUIRE( strncmp("abcdefghblksij\0\0\0\0\0\0\0", buffer, sizeof(buffer)) == 0); } diff --git a/test/unittest/shellmatta_utils/test_utils_restoreCursorPos.cpp b/test/unittest/shellmatta_utils/test_utils_restoreCursorPos.cpp index de32df5..7ebb0eb 100644 --- a/test/unittest/shellmatta_utils/test_utils_restoreCursorPos.cpp +++ b/test/unittest/shellmatta_utils/test_utils_restoreCursorPos.cpp @@ -36,5 +36,5 @@ TEST_CASE( "shellmatta_utils_restoreCursorPos" ) { CHECK( write_callCnt == 1u); CHECK( write_length == 3u); - REQUIRE( strncmp("\e[u", write_data, 3u) == 0); + REQUIRE( strncmp("\x1b[u", write_data, 3u) == 0); } diff --git a/test/unittest/shellmatta_utils/test_utils_rewindCursor.cpp b/test/unittest/shellmatta_utils/test_utils_rewindCursor.cpp index 4629142..ba7c1a0 100644 --- a/test/unittest/shellmatta_utils/test_utils_rewindCursor.cpp +++ b/test/unittest/shellmatta_utils/test_utils_rewindCursor.cpp @@ -36,7 +36,7 @@ TEST_CASE( "shellmatta_utils_rewindCursor normal" ) { CHECK( write_callCnt == 1u); CHECK( write_length == 4u); - REQUIRE( strncmp("\e[5D", write_data, 4u) == 0); + REQUIRE( strncmp("\x1b[5D", write_data, 4u) == 0); } @@ -61,7 +61,7 @@ TEST_CASE( "shellmatta_utils_rewindCursor rewind by 12 with cursor at 10" ) { CHECK( write_callCnt == 1u); CHECK( write_length == 5u); - REQUIRE( strncmp("\e[10D", write_data, 5u) == 0); + REQUIRE( strncmp("\x1b[10D", write_data, 5u) == 0); } TEST_CASE( "shellmatta_utils_rewindCursor rewind by 0" ) { diff --git a/test/unittest/shellmatta_utils/test_utils_saveCursorPos.cpp b/test/unittest/shellmatta_utils/test_utils_saveCursorPos.cpp index 214cd88..8bc1c0e 100644 --- a/test/unittest/shellmatta_utils/test_utils_saveCursorPos.cpp +++ b/test/unittest/shellmatta_utils/test_utils_saveCursorPos.cpp @@ -36,5 +36,5 @@ TEST_CASE( "shellmatta_utils_saveCursorPos" ) { CHECK( write_callCnt == 1u); CHECK( write_length == 3u); - REQUIRE( strncmp("\e[s", write_data, 3u) == 0); + REQUIRE( strncmp("\x1b[s", write_data, 3u) == 0); }