fix bug into goto_line
Some checks failed
Release / Bump Homebrew formula (push) Has been cancelled

This commit is contained in:
2025-11-28 03:12:08 -08:00
parent 734eb6e67d
commit 78e4f84f7b
6 changed files with 77 additions and 41 deletions

View File

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15)
project(ke C) # Specify C language explicitly project(ke C) # Specify C language explicitly
set(CMAKE_C_STANDARD 99) set(CMAKE_C_STANDARD 99)
set(KE_VERSION "2.0.0") set(KE_VERSION "2.0.1")
set(CMAKE_C_FLAGS "-Wall -Wextra -pedantic -Wshadow -Werror -std=c99 -g") set(CMAKE_C_FLAGS "-Wall -Wextra -pedantic -Wshadow -Werror -std=c99 -g")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_DEFAULT_SOURCE -D_XOPEN_SOURCE") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_DEFAULT_SOURCE -D_XOPEN_SOURCE")

33
abuf.c
View File

@@ -6,6 +6,15 @@
#include "core.h" #include "core.h"
static void
abuf_grow(abuf *buf, size_t delta)
{
if (buf->cap - buf->size < delta) {
ab_resize(buf, buf->cap + delta);
}
}
void void
ab_init(abuf *buf) ab_init(abuf *buf)
{ {
@@ -38,6 +47,7 @@ ab_resize(abuf *buf, size_t cap)
void void
ab_appendch(abuf *buf, char c) ab_appendch(abuf *buf, char c)
{ {
abuf_grow(buf, 1);
ab_append(buf, &c, 1); ab_append(buf, &c, 1);
} }
@@ -45,20 +55,10 @@ ab_appendch(abuf *buf, char c)
void void
ab_append(abuf *buf, const char *s, size_t len) ab_append(abuf *buf, const char *s, size_t len)
{ {
char *nc = buf->b; char *nc = NULL;
size_t sz = buf->size + len;
if (sz >= buf->cap) { abuf_grow(buf, len);
while (sz > buf->cap) { nc = buf->b;
if (buf->cap == 0) {
buf->cap = 1;
} else {
buf->cap *= 2;
}
}
nc = realloc(nc, buf->cap);
assert(nc != NULL);
}
memcpy(&nc[buf->size], s, len); memcpy(&nc[buf->size], s, len);
buf->b = nc; buf->b = nc;
@@ -69,6 +69,8 @@ ab_append(abuf *buf, const char *s, size_t len)
void void
ab_prependch(abuf *buf, const char c) ab_prependch(abuf *buf, const char c)
{ {
abuf_grow(buf, 1);
ab_prepend(buf, &c, 1); ab_prepend(buf, &c, 1);
} }
@@ -76,7 +78,10 @@ ab_prependch(abuf *buf, const char c)
void void
ab_prepend(abuf *buf, const char *s, const size_t len) ab_prepend(abuf *buf, const char *s, const size_t len)
{ {
char *nc = realloc(buf->b, buf->size + len); char *nc = NULL;
abuf_grow(buf, len);
nc = buf->b;
assert(nc != NULL); assert(nc != NULL);
memmove(nc + len, nc, buf->size); memmove(nc + len, nc, buf->size);

View File

@@ -71,6 +71,7 @@ buffer_collect_prefix_matches(const char *prefix, int *out_idx, const int max_ou
size_t plen = (prefix ? strlen(prefix) : 0); size_t plen = (prefix ? strlen(prefix) : 0);
for (int i = 0; i < editor.bufcount; i++) { for (int i = 0; i < editor.bufcount; i++) {
matched = 0;
b = editor.buffers[i]; b = editor.buffers[i];
const char *cand1 = b->filename; const char *cand1 = b->filename;
@@ -267,21 +268,35 @@ buffers_init(void)
editor.buffers = NULL; editor.buffers = NULL;
editor.bufcount = 0; editor.bufcount = 0;
editor.curbuf = -1; editor.curbuf = -1;
editor.bufcap = 0;
idx = buffer_add_empty(); idx = buffer_add_empty();
buffer_switch(idx); buffer_switch(idx);
} }
static void
buffer_list_resize(void)
{
buffer **newlist = NULL;
if (editor.bufcount == (int)editor.bufcap) {
editor.bufcap = cap_growth((int)editor.bufcap, editor.bufcount + 1);
newlist = realloc(editor.buffers, sizeof(buffer *) * editor.bufcap);
assert(newlist != NULL);
editor.buffers = newlist;
}
}
int int
buffer_add_empty(void) buffer_add_empty(void)
{ {
buffer *buf = NULL; buffer *buf = NULL;
buffer **newlist = realloc(editor.buffers, sizeof(buffer *) * (editor.bufcount + 1));
int idx = 0; int idx = 0;
assert(newlist != NULL); buffer_list_resize();
editor.buffers = newlist;
buf = calloc(1, sizeof(buffer)); buf = calloc(1, sizeof(buffer));
assert(buf != NULL); assert(buf != NULL);

View File

@@ -92,6 +92,7 @@ init_editor(void)
/* initialize buffer system on first init */ /* initialize buffer system on first init */
if (editor.buffers == NULL && editor.bufcount == 0) { if (editor.buffers == NULL && editor.bufcount == 0) {
editor.bufcap = 0;
buffers_init(); buffers_init();
} }
} }

View File

@@ -32,9 +32,10 @@ struct editor {
time_t msgtm; time_t msgtm;
/* Multi-buffer support */ /* Multi-buffer support */
struct buffer **buffers; /* array of buffers */ struct buffer **buffers; /* array of buffers */
int bufcount; /* number of buffers */ int bufcount; /* number of buffers */
int curbuf; /* current buffer index */ int curbuf; /* current buffer index */
size_t bufcap; /* current buffer capacity */
}; };

56
main.c
View File

@@ -842,23 +842,37 @@ delete_region(void)
void void
jump_to_position(int col, int row) jump_to_position(int col, int row)
{ {
/* clamp position */ /* Handle empty buffer safely */
if (row < 0) { if (ENROWS <= 0) {
row = 0; ECURX = 0;
} else if (row > editor.nrows) { ECURY = 0;
row = editor.nrows - 1; /* Keep legacy globals in sync with per-buffer fields for rendering */
} editor.curx = ECURX;
editor.cury = ECURY;
display_refresh();
return;
}
if (col < 0) { /* clamp position using per-buffer dimensions */
col = 0; if (row < 0) {
} else if (row >= 0 && row < ENROWS && col > (int) EROW[row].size) { row = 0;
col = (int) EROW[row].size; } else if (row >= ENROWS) {
} row = ENROWS - 1;
}
ECURX = col; if (col < 0) {
ECURY = row; col = 0;
} else if (col > (int) EROW[row].size) {
col = (int) EROW[row].size;
}
display_refresh(); ECURX = col;
ECURY = row;
/* Keep legacy globals in sync with per-buffer fields for rendering */
editor.curx = ECURX;
editor.cury = ECURY;
display_refresh();
} }
@@ -872,13 +886,13 @@ goto_line(void)
return; return;
} }
lineno = atoi(query); lineno = atoi(query);
if (lineno < 1 || lineno >= ENROWS) { if (lineno < 1 || lineno > ENROWS) {
editor_set_status("Line number must be between 1 and %d.", editor_set_status("Line number must be between 1 and %d.",
ENROWS); ENROWS);
free(query); free(query);
return; return;
} }
jump_to_position(0, lineno - 1); jump_to_position(0, lineno - 1);
free(query); free(query);