zhangyiss/editline
1
0
Fork 0
mirror of https://github.com/troglobit/editline.git synced 2025-07-20 02:31:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor move_cursor_forward() into tty_forwardn()

Browse Source 
- Use same namespace like other tty movement functions
- Replace globally exposed itoa() and dangerous strcpy() with snprintf()

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson 2020-01-05 07:33:23 +01:00
parent cf8f962e4f
commit e36aae07f8
1 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/editline.c
View File

@ -262,6 +262,14 @@ static void tty_backn(int n)
tty_back();
}
static void tty_forwardn(int n)
{
char buf[12];
snprintf(buf, sizeof(buf), "\x1b[%dC", n);
tty_puts(buf);
}
static void tty_info(void)
{
rl_reset_terminal(NULL);
@ -371,40 +379,12 @@ static void reposition(int key)
}
}
void itoa(int val, char* buf)
{
int digits = 0;
int temp = val;
while (temp != 0) {
temp = temp / 10;
++digits;
}
*(buf+digits) = 'C';
int i = 5; digits--;
for(; val && i ; --i, val /= 10) {
*(buf+digits) = "0123456789"[val % 10];
digits--;
}
}
static void move_cursor_forward(int columns)
{
const char* line_forward = "\x1b[";
char buf[12] = {0};
strcpy(buf, line_forward);
itoa(columns, buf + 2);
tty_puts(buf);
}
static void left(el_status_t Change)
{
if (rl_point) {
if ((rl_point + prompt_len) % tty_cols == 0) {
tty_puts(line_up);
move_cursor_forward(tty_cols);
tty_forwardn(tty_cols);
} else {
tty_back();
}
@ -572,7 +552,7 @@ static void ceol(void)
for (i += extras; i > rl_point; i--) {
if ((i + prompt_len) % tty_cols == 0) {
tty_puts(line_up);
move_cursor_forward(tty_cols);
tty_forwardn(tty_cols);
} else {
tty_back();
}