espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-09-11 03:30:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[posix-host] ot-cli: handle write() return values (#4580)

Browse Source
This commit is contained in:
Diego Ismirlian
2020-02-21 09:18:59 -08:00
committed by GitHub
parent 8fcdcf6fd3
commit f8b8b24b6f
1 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/posix/client.cpp
+32 -12
View File
@@ -146,6 +146,28 @@ static bool FindError(int *aErrorState, char aNowCharacter)
return *aErrorState == 6;
}
static bool DoWrite(int aFile, const void *aBuffer, size_t aSize)
{
bool ret = true;
while (aSize)
{
ssize_t rval = write(aFile, aBuffer, aSize);
if (rval <= 0)
{
VerifyOrExit((rval == -1) && (errno == EINTR), perror("write"); ret = false);
}
else
{
aBuffer = reinterpret_cast<const uint8_t *>(aBuffer) + rval;
aSize -= rval;
}
}
exit:
return ret;
}
static void SendBlockingCommand(int aArgc, char *aArgv[])
{
char buffer[OPENTHREAD_CONFIG_DIAG_CMD_LINE_BUFFER_SIZE];
@@ -154,17 +176,17 @@ static void SendBlockingCommand(int aArgc, char *aArgv[])
for (int i = 0; i < aArgc; i++)
{
VerifyOrExit(write(sSessionFd, aArgv[i], strlen(aArgv[i])) >= 0, perror("Failed to send command"));
VerifyOrExit(write(sSessionFd, " ", 1) >= 0, perror("Failed to send command"));
VerifyOrExit(DoWrite(sSessionFd, aArgv[i], strlen(aArgv[i])));
VerifyOrExit(DoWrite(sSessionFd, " ", 1));
}
VerifyOrExit(write(sSessionFd, "\n", 1) >= 0, perror("Failed to send command"));
VerifyOrExit(DoWrite(sSessionFd, "\n", 1));
while (true)
{
ssize_t rval = read(sSessionFd, buffer, sizeof(buffer));
VerifyOrExit(rval >= 0);
IgnoreReturnValue(write(STDOUT_FILENO, buffer, static_cast<size_t>(rval)));
VerifyOrExit(DoWrite(STDOUT_FILENO, buffer, static_cast<size_t>(rval)));
for (ssize_t i = 0; i < rval; i++)
{
if (FindDone(&doneState, buffer[i]) || FindError(&errorState, buffer[i]))
@@ -219,10 +241,9 @@ int main(int argc, char *argv[])
while (1)
{
fd_set readFdSet;
char buffer[OPENTHREAD_CONFIG_DIAG_CMD_LINE_BUFFER_SIZE];
ssize_t rval;
int maxFd = sSessionFd > STDIN_FILENO ? sSessionFd : STDIN_FILENO;
fd_set readFdSet;
char buffer[OPENTHREAD_CONFIG_DIAG_CMD_LINE_BUFFER_SIZE];
int maxFd = sSessionFd > STDIN_FILENO ? sSessionFd : STDIN_FILENO;
FD_ZERO(&readFdSet);
@@ -245,14 +266,13 @@ int main(int argc, char *argv[])
#else
VerifyOrExit(fgets(buffer, sizeof(buffer), stdin) != NULL, ret = OT_EXIT_FAILURE);
rval = write(sSessionFd, buffer, strlen(buffer));
VerifyOrExit(rval != -1, perror("write"); ret = OT_EXIT_FAILURE);
VerifyOrExit(DoWrite(sSessionFd, buffer, strlen(buffer)), ret = OT_EXIT_FAILURE);
#endif
}
if (FD_ISSET(sSessionFd, &readFdSet))
{
rval = read(sSessionFd, buffer, sizeof(buffer));
ssize_t rval = read(sSessionFd, buffer, sizeof(buffer));
VerifyOrExit(rval != -1, perror("read"); ret = OT_EXIT_FAILURE);
if (rval == 0)
@@ -262,7 +282,7 @@ int main(int argc, char *argv[])
}
else
{
IgnoreReturnValue(write(STDOUT_FILENO, buffer, static_cast<size_t>(rval)));
VerifyOrExit(DoWrite(STDOUT_FILENO, buffer, static_cast<size_t>(rval)), ret = OT_EXIT_FAILURE);
}
}
}