Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-25 00:15:55 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

filter out control character in pty echo

Browse Source 
Signed-off-by: zhanghu5 <zhanghu5@xiaomi.com>
This commit is contained in:
zhanghu5
2023-07-25 16:35:03 +08:00
committed by Xiang Xiao
parent 67cb1d1650
commit 305c213d15
1 changed files with 63 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/serial/pty.c
+63 -1
View File
@@ -24,6 +24,7 @@
#include <nuttx/config.h>
#include <ctype.h>
#include <sys/types.h>
#include <sys/ioctl.h>
#include <stdbool.h>
@@ -36,6 +37,7 @@
#include <assert.h>
#include <errno.h>
#include <nuttx/ascii.h>
#include <nuttx/kmalloc.h>
#include <nuttx/mutex.h>
#include <nuttx/semaphore.h>
@@ -73,6 +75,7 @@ struct pty_dev_s
struct file pd_src; /* Provides data to read() method (pipe output) */
struct file pd_sink; /* Accepts data from write() method (pipe input) */
bool pd_master; /* True: this is the master */
uint8_t pd_escape; /* Number of the character to be escaped */
tcflag_t pd_iflag; /* Terminal input modes */
tcflag_t pd_lflag; /* Terminal local modes */
tcflag_t pd_oflag; /* Terminal output modes */
@@ -473,7 +476,66 @@ static ssize_t pty_read(FAR struct file *filep, FAR char *buffer, size_t len)
if ((dev->pd_lflag & ECHO) && (ntotal > 0))
{
pty_write(filep, buffer, ntotal);
size_t n = 0;
for (i = j = 0; i < ntotal; i++)
{
ch = buffer[i];
/* Check for the beginning of a VT100 escape sequence, 3 byte */
if (ch == ASCII_ESC)
{
/* Mark that we should skip 2 more bytes */
dev->pd_escape = 2;
continue;
}
else if (dev->pd_escape == 2 && ch != ASCII_LBRACKET)
{
/* It's not an <esc>[x 3 byte sequence, show it */
dev->pd_escape = 0;
}
else if (dev->pd_escape > 0)
{
/* Skipping character count down */
if (--dev->pd_escape > 0)
{
continue;
}
}
/* Echo if the character in batch */
if (ch == '\n' || (n != 0 && j + n != i))
{
if (n != 0)
{
pty_write(filep, buffer + j, n);
n = 0;
}
if (ch == '\n')
{
pty_write(filep, "\r\n", 2);
continue;
}
}
/* Record the character can be echo */
if (!iscntrl(ch & 0xff) && n++ == 0)
{
j = i;
}
}
if (n != 0)
{
pty_write(filep, buffer + j, n);
}
}
return ntotal;