Maarrk/tio
1
0
Fork 0
mirror of https://github.com/tio/tio.git synced 2026-05-01 23:07:58 +02:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into feature/timestamp-with-milliseconds

Browse source
This commit is contained in:
Sylvain LAFRASSE 2022-02-04 15:43:54 +01:00
commit 78e7575798
2 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
AUTHORS
View file

@ -28,5 +28,6 @@ Alban Bedel <alban.bedel@aerq.com>
Björn Stenberg <bjorn@haxx.se> Björn Stenberg <bjorn@haxx.se>
Henner Zeller <h.zeller@acm.org> Henner Zeller <h.zeller@acm.org>
Henrik Brix Andersen <henrik@brixandersen.dk> Henrik Brix Andersen <henrik@brixandersen.dk>
Mariusz Midor <dexlab@o2.pl>
Thanks to everyone who has contributed to this project. Thanks to everyone who has contributed to this project.

16
src/tty.c
View file

@ -790,18 +790,19 @@ int tty_connect(void)
output_char = '\n'; output_char = '\n';
/* Map newline character */ /* Map newline character */
if ((output_char == '\n') && (map_o_nl_crnl)) { if ((output_char == '\n' || output_char == '\r') && (map_o_nl_crnl)) {
char r = '\r'; const char *crlf = "\r\n";
optional_local_echo(r); optional_local_echo(crlf[0]);
status = write(fd, &r, 1); optional_local_echo(crlf[1]);
status = write(fd, crlf, 2);
if (status < 0) if (status < 0)
warning_printf("Could not write to tty device"); warning_printf("Could not write to tty device");
tx_total++; tx_total += 2;
delay(option.output_delay); delay(option.output_delay);
} } else
{
/* Send output to tty device */ /* Send output to tty device */
optional_local_echo(output_char); optional_local_echo(output_char);
status = write(fd, &output_char, 1); status = write(fd, &output_char, 1);
@ -815,6 +816,7 @@ int tty_connect(void)
/* Insert output delay */ /* Insert output delay */
delay(option.output_delay); delay(option.output_delay);
} }
}
/* Save previous key */ /* Save previous key */
previous_char = input_char; previous_char = input_char;