i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tty: Don't ignore errors when setting DTR

Browse Source 
Instead we and the return value of both calls.

So if any fails we return an error.
This commit is contained in:
François Revol
2014-07-23 21:36:07 +02:00
parent 0be89c15ee
commit aec644bf85
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/generic/tty/tty.cpp
+6 -6
View File
@@ -1734,16 +1734,16 @@ tty_control(tty_cookie* cookie, uint32 op, void* buffer, size_t length)
if (user_memcpy(&value, buffer, sizeof(value)) != B_OK)
return B_BAD_ADDRESS;
bool result = false;
bool result = true;
bool dtr = (op == TCSETDTR && value != 0)
|| (op == TIOCMSET && (value & TIOCM_DTR) != 0);
if (op == TCSETDTR || op == TIOCMSET)
result = tty->service_func(tty, TTYSETDTR, &dtr, sizeof(dtr));
result &= tty->service_func(tty, TTYSETDTR, &dtr, sizeof(dtr));
bool rts = (op == TCSETRTS && value != 0)
|| (op == TIOCMSET && (value & TIOCM_RTS) != 0);
if (op == TCSETRTS || op == TIOCMSET)
result = tty->service_func(tty, TTYSETRTS, &rts, sizeof(rts));
result &= tty->service_func(tty, TTYSETRTS, &rts, sizeof(rts));
return result ? B_OK : B_ERROR;
}
@@ -1764,14 +1764,14 @@ tty_control(tty_cookie* cookie, uint32 op, void* buffer, size_t length)
if (user_memcpy(&value, buffer, sizeof(value)) != B_OK)
return B_BAD_ADDRESS;
bool result = false;
bool result = true;
bool dtr = (op == TIOCMBIS);
if (value & TIOCM_DTR)
result = tty->service_func(tty, TTYSETDTR, &dtr, sizeof(dtr));
result &= tty->service_func(tty, TTYSETDTR, &dtr, sizeof(dtr));
bool rts = (op == TIOCMBIS);
if (value & TIOCM_RTS)
result = tty->service_func(tty, TTYSETRTS, &rts, sizeof(rts));
result &= tty->service_func(tty, TTYSETRTS, &rts, sizeof(rts));
return result ? B_OK : B_ERROR;
}