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

Added a temporary work-around for the doubled shell prompt.

Browse Source 
Added some missing return values.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10309 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-11-30 19:16:31 +00:00
parent be505eacf5
commit f8df8bac3e
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/tty/tty.cpp
+16 -4
View File
@@ -1,7 +1,7 @@
/* /*
** Copyright 2004, Axel Dörfler, [email protected]. All rights reserved. * Copyright 2004, Axel Dörfler, [email protected]. All rights reserved.
** Distributed under the terms of the Haiku License. * Distributed under the terms of the MIT License.
*/ */
// This file could be moved into a generic tty module. // This file could be moved into a generic tty module.
// The whole hardware signaling stuff is missing, though - it's currently // The whole hardware signaling stuff is missing, though - it's currently
@@ -294,6 +294,7 @@ reset_tty(struct tty *tty, int32 index)
status_t status_t
tty_output_getc(struct tty *tty, int *_c) tty_output_getc(struct tty *tty, int *_c)
{ {
return B_ERROR;
} }
@@ -386,6 +387,8 @@ tty_input_putc(struct tty *tty, int c)
// to write if there is still space left in the buffer // to write if there is still space left in the buffer
if (line_buffer_writable(tty->input_buffer)) if (line_buffer_writable(tty->input_buffer))
release_sem_etc(tty->write_sem, 1, B_DO_NOT_RESCHEDULE); release_sem_etc(tty->write_sem, 1, B_DO_NOT_RESCHEDULE);
return B_OK;
} }
@@ -439,13 +442,14 @@ err2:
mutex_destroy(&tty->lock); mutex_destroy(&tty->lock);
err1: err1:
uninit_line_buffer(tty->input_buffer); uninit_line_buffer(tty->input_buffer);
return status;
} }
status_t status_t
tty_ioctl(struct tty *tty, uint32 op, void *buffer, size_t length) tty_ioctl(struct tty *tty, uint32 op, void *buffer, size_t length)
{ {
TRACE(("tty_ioctl: tty %p, op %lu, buffer %p, length %lu\n", &tty, op, buffer, length)); TRACE(("tty_ioctl: tty %p, op %lu, buffer %p, length %lu\n", tty, op, buffer, length));
MutexLocker locker(&tty->lock); MutexLocker locker(&tty->lock);
switch (op) { switch (op) {
@@ -589,6 +593,14 @@ tty_write_to_tty(struct tty *source, struct tty *target, const void *buffer, siz
if (c == '\n' && (source->termios.c_oflag & (OPOST | ONLCR)) == OPOST | ONLCR) { if (c == '\n' && (source->termios.c_oflag & (OPOST | ONLCR)) == OPOST | ONLCR) {
// post-process output and transfrom '\n' to '\r\n' // post-process output and transfrom '\n' to '\r\n'
#if 1
// ToDo: this doesn't fix the bug that is responsible for the doubled shell prompt
// and it's all wrong, too - but it cures the symptoms, and that's good enough
// for now :)
// Apparently, the shell reads only single bytes and handles both, '\r' and '\n'
// as a newline.
if (!sourceIsMaster)
#endif
tty_input_putc_locked(target, '\r'); tty_input_putc_locked(target, '\r');
if (echo) if (echo)
tty_input_putc_locked(source, '\r'); tty_input_putc_locked(source, '\r');