mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

shellwindow: use run_pty() instead of my_popen()

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: c388c7029e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-28 (Sat, 28 Jan 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2017-01-28 23:47:01 +01:00
parent 11ca77a864
commit 7d7c373f36
1 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/gui/widget/shellwindow.cpp
View File

@@ -64,6 +64,24 @@ void CShellWindow::setCommand(const std::string &Command, const int Mode, int* R
exec(); exec();
} }
static int read_line(int fd, struct pollfd *fds, char *b, size_t sz)
{
int ret;
size_t i = 0;
while ((ret = read(fd, b + i, 1)) > 0) {
i++;
if (b[i - 1] == '\n')
break;
if (i >= sz)
break;
fds->revents = 0;
if (poll(fds, 1, 300) < 1)
break;
}
b[i] = 0;
return i;
}
void CShellWindow::exec() void CShellWindow::exec()
{ {
std::string cmd; std::string cmd;
@@ -81,11 +99,11 @@ void CShellWindow::exec()
else { else {
pid_t pid = 0; pid_t pid = 0;
cmd = command + " 2>&1"; cmd = command + " 2>&1";
FILE *f = my_popen(pid, cmd.c_str(), "r"); int f = run_pty(pid, cmd.c_str());
if (!f) { if (f < 0) {
if (res) if (res)
*res = -1; *res = -1;
dprintf(DEBUG_NORMAL, "[CShellWindow] [%s:%d] Error! my_popen errno: %d command: %s\n", __func__, __LINE__, errno, cmd.c_str()); dprintf(DEBUG_NORMAL, "[CShellWindow] [%s:%d] Error! run_pty errno: %d command: %s\n", __func__, __LINE__, errno, cmd.c_str());
return; return;
} }
@@ -100,7 +118,7 @@ void CShellWindow::exec()
textBox->enableSaveScreen(false); textBox->enableSaveScreen(false);
} }
struct pollfd fds; struct pollfd fds;
fds.fd = fileno(f); fds.fd = f;
fds.events = POLLIN | POLLHUP | POLLERR; fds.events = POLLIN | POLLHUP | POLLERR;
fcntl(fds.fd, F_SETFL, fcntl(fds.fd, F_GETFL, 0) | O_NONBLOCK); fcntl(fds.fd, F_SETFL, fcntl(fds.fd, F_GETFL, 0) | O_NONBLOCK);
@@ -115,11 +133,9 @@ void CShellWindow::exec()
fds.revents = 0; fds.revents = 0;
int r = poll(&fds, 1, 300); int r = poll(&fds, 1, 300);
if (r > 0) { if (r > 0) {
if (!feof(f)) { if (fds.revents & POLLIN) {
now = time_monotonic_ms();
unsigned int lines_read = 0; unsigned int lines_read = 0;
while (fgets(output, sizeof(output), f)) { while (read_line(f, &fds, output, sizeof(output)-1)) {
char *outputp = output; char *outputp = output;
dirty = true; dirty = true;
@@ -131,7 +147,9 @@ void CShellWindow::exec()
*outputp = 0; *outputp = 0;
break; break;
case '\r': case '\r':
#if 0
outputp = output; outputp = output;
#endif
break; break;
case '\n': case '\n':
lines_read++; lines_read++;
@@ -166,6 +184,7 @@ void CShellWindow::exec()
else else
dprintf(DEBUG_NORMAL, "[CShellWindow] [%s:%d] res=NULL ok=%d\n", __func__, __LINE__, ok); dprintf(DEBUG_NORMAL, "[CShellWindow] [%s:%d] res=NULL ok=%d\n", __func__, __LINE__, ok);
now = time_monotonic_ms();
if (lines.size() > lines_max) if (lines.size() > lines_max)
lines.pop_front(); lines.pop_front();
txt = ""; txt = "";
@@ -205,7 +224,7 @@ void CShellWindow::exec()
textBox->setText(&txt, textBox->getWindowsPos().iWidth, false); textBox->setText(&txt, textBox->getWindowsPos().iWidth, false);
} }
fclose(f); close(f);
int s; int s;
errno = 0; errno = 0;
int r = waitpid(pid, &s, 0); int r = waitpid(pid, &s, 0);