review fixes
This commit is contained in:
@@ -880,7 +880,7 @@ bool PITerminal::initialize() {
|
|||||||
execvp(argv[0], argv);
|
execvp(argv[0], argv);
|
||||||
delete[] argv[0];
|
delete[] argv[0];
|
||||||
delete[] argv;
|
delete[] argv;
|
||||||
exit(127);
|
exit(errno);
|
||||||
} else {
|
} else {
|
||||||
if (fr < 0 || PRIVATE->fd < 0) {
|
if (fr < 0 || PRIVATE->fd < 0) {
|
||||||
piCoutObj << "forkpty error," << errorString();
|
piCoutObj << "forkpty error," << errorString();
|
||||||
|
|||||||
@@ -94,7 +94,8 @@ bool PIWaitEvent::wait(int fd, CheckRole role) {
|
|||||||
while (::read(pipe_fd[ReadEnd], &buf, sizeof(buf)) > 0)
|
while (::read(pipe_fd[ReadEnd], &buf, sizeof(buf)) > 0)
|
||||||
;
|
;
|
||||||
// piCout << "wait result" << sr << FD_ISSET(fd, &(fds[CheckExeption])) << FD_ISSET(fd, &(fds[fd_index]));
|
// piCout << "wait result" << sr << FD_ISSET(fd, &(fds[CheckExeption])) << FD_ISSET(fd, &(fds[fd_index]));
|
||||||
if (sr == EBADF || sr == EINTR) return false;
|
if (sr < 0) return false;
|
||||||
|
if (errno == EBADF || errno == EINTR) return false;
|
||||||
if (FD_ISSET(fd, &(fds[CheckExeption]))) return true;
|
if (FD_ISSET(fd, &(fds[CheckExeption]))) return true;
|
||||||
return FD_ISSET(fd, &(fds[fd_index]));
|
return FD_ISSET(fd, &(fds[fd_index]));
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -104,6 +104,7 @@
|
|||||||
PIString getSockAddr(sockaddr * s) {
|
PIString getSockAddr(sockaddr * s) {
|
||||||
if (!s) return PIString();
|
if (!s) return PIString();
|
||||||
char buf[INET_ADDRSTRLEN];
|
char buf[INET_ADDRSTRLEN];
|
||||||
|
memset(&buf, 0, INET_ADDRSTRLEN);
|
||||||
const char * r = inet_ntop(AF_INET, &((sockaddr_in *)s)->sin_addr, buf, sizeof(buf));
|
const char * r = inet_ntop(AF_INET, &((sockaddr_in *)s)->sin_addr, buf, sizeof(buf));
|
||||||
return r ? PIStringAscii(r) : PIString();
|
return r ? PIStringAscii(r) : PIString();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user