mhu/shellmatta
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bugfix - now stdin returns 0 if the heredoc body is empty

Browse Source
This commit is contained in:
prozessorkern 2020-03-26 05:55:38 +01:00
parent 5e84f1b022
commit c2e4324236
2 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/shellmatta.c
View File

@ -486,9 +486,16 @@ shellmatta_retCode_t shellmatta_processData(shellmatta_handle_t handle,
inst->stdinIdx ++; inst->stdinIdx ++;
} }
/** -# calculate length and terminate stdin string */ /** -# calculate length and terminate stdin string */
inst->stdinLength = inst->lastNewlineIdx - inst->stdinIdx; if(inst->stdinIdx < inst->lastNewlineIdx)
inst->buffer[inst->lastNewlineIdx] = '\0'; {
inst->stdinLength = inst->lastNewlineIdx - inst->stdinIdx;
inst->buffer[inst->lastNewlineIdx] = '\0';
}
else
{
inst->stdinLength = 0u;
}
/** -# calculate length and terminate argument string */ /** -# calculate length and terminate argument string */
inst->inputCount = inst->hereStartIdx; inst->inputCount = inst->hereStartIdx;
inst->buffer[inst->hereStartIdx] = '\0'; inst->buffer[inst->hereStartIdx] = '\0';

32
test/integrationtest/test_integration.cpp
View File

@ -175,6 +175,38 @@ TEST_CASE( "shellmatta heredoc test" ) {
REQUIRE( strcmp(dummyData, doSomethingArguments) == 0); REQUIRE( strcmp(dummyData, doSomethingArguments) == 0);
} }
TEST_CASE( "shellmatta heredoc test empty" ) {
shellmatta_instance_t inst;
shellmatta_handle_t handle;
char buffer[1024];
char historyBuffer[1024];
char *dummyData = (char*)"do this ";
shellmatta_doInit( &inst,
&handle,
buffer,
sizeof(buffer),
historyBuffer,
sizeof(historyBuffer),
"shellmatta->",
NULL,
writeFct);
shellmatta_addCmd(handle, &doSomethingCmd);
doSomethingArguments = NULL;
doSomethingLength = 0u;
shellmatta_processData(handle, (char*)"do this << EOF\r\n"
"EOF\r\n"
, 21);
CHECK( doSomethingStdinLength == 0u);
CHECK( NULL == doSomethingStdin );
CHECK( doSomethingLength == 8u);
REQUIRE( strcmp(dummyData, doSomethingArguments) == 0);
}
TEST_CASE( "shellmatta remove function" ) { TEST_CASE( "shellmatta remove function" ) {
shellmatta_instance_t inst; shellmatta_instance_t inst;