mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-04-01 07:15:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

extract: extract_one() sets a fail flag that extract_finish() reads

Browse source 
This allows us to safely call extract_finish() when extract_one()
failed, and we'll get the expected result; false, indicating
extract_finish() failed.
This commit is contained in:
Daniel Eklöf 2020-07-15 11:32:40 +02:00
parent ffaa19ee22
commit e6acafa118
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
extract.c
View file

@ -10,6 +10,7 @@ struct extraction_context {
size_t size; size_t size;
size_t idx; size_t idx;
size_t empty_count; size_t empty_count;
bool failed;
const struct row *last_row; const struct row *last_row;
const struct cell *last_cell; const struct cell *last_cell;
enum selection_kind selection_kind; enum selection_kind selection_kind;
@ -28,9 +29,18 @@ extract_begin(enum selection_kind kind)
bool bool
extract_finish(struct extraction_context *ctx, char **text, size_t *len) extract_finish(struct extraction_context *ctx, char **text, size_t *len)
{ {
bool ret = false;
if (text == NULL) if (text == NULL)
return false; return false;
*text = NULL;
if (len != NULL)
*len = 0;
if (ctx->failed)
goto out;
if (ctx->idx == 0) { if (ctx->idx == 0) {
/* Selection of empty cells only */ /* Selection of empty cells only */
ctx->buf[ctx->idx] = L'\0'; ctx->buf[ctx->idx] = L'\0';
@ -43,8 +53,6 @@ extract_finish(struct extraction_context *ctx, char **text, size_t *len)
ctx->buf[ctx->idx] = L'\0'; ctx->buf[ctx->idx] = L'\0';
} }
bool ret = false;
size_t _len = wcstombs(NULL, ctx->buf, 0); size_t _len = wcstombs(NULL, ctx->buf, 0);
if (_len == (size_t)-1) { if (_len == (size_t)-1) {
LOG_ERRNO("failed to convert selection to UTF-8"); LOG_ERRNO("failed to convert selection to UTF-8");
@ -105,7 +113,7 @@ extract_one(const struct terminal *term, const struct row *row,
/* Row has a hard linebreak, or either last cell or /* Row has a hard linebreak, or either last cell or
* current cell is empty */ * current cell is empty */
if (!ensure_size(ctx, 1)) if (!ensure_size(ctx, 1))
return false; goto err;
ctx->buf[ctx->idx++] = L'\n'; ctx->buf[ctx->idx++] = L'\n';
ctx->empty_count = 0; ctx->empty_count = 0;
@ -115,7 +123,7 @@ extract_one(const struct terminal *term, const struct row *row,
else if (ctx->selection_kind == SELECTION_BLOCK) { else if (ctx->selection_kind == SELECTION_BLOCK) {
/* Always insert a linebreak */ /* Always insert a linebreak */
if (!ensure_size(ctx, 1)) if (!ensure_size(ctx, 1))
return false; goto err;
ctx->buf[ctx->idx++] = L'\n'; ctx->buf[ctx->idx++] = L'\n';
ctx->empty_count = 0; ctx->empty_count = 0;
@ -131,7 +139,7 @@ extract_one(const struct terminal *term, const struct row *row,
/* Replace empty cells with spaces when followed by non-empty cell */ /* Replace empty cells with spaces when followed by non-empty cell */
if (!ensure_size(ctx, ctx->empty_count)) if (!ensure_size(ctx, ctx->empty_count))
return false; goto err;
for (size_t i = 0; i < ctx->empty_count; i++) for (size_t i = 0; i < ctx->empty_count; i++)
ctx->buf[ctx->idx++] = L' '; ctx->buf[ctx->idx++] = L' ';
@ -144,7 +152,7 @@ extract_one(const struct terminal *term, const struct row *row,
= &term->composed[cell->wc - CELL_COMB_CHARS_LO]; = &term->composed[cell->wc - CELL_COMB_CHARS_LO];
if (!ensure_size(ctx, 1 + composed->count)) if (!ensure_size(ctx, 1 + composed->count))
return false; goto err;
ctx->buf[ctx->idx++] = composed->base; ctx->buf[ctx->idx++] = composed->base;
for (size_t i = 0; i < composed->count; i++) for (size_t i = 0; i < composed->count; i++)
@ -153,11 +161,15 @@ extract_one(const struct terminal *term, const struct row *row,
else { else {
if (!ensure_size(ctx, 1)) if (!ensure_size(ctx, 1))
return false; goto err;
ctx->buf[ctx->idx++] = cell->wc; ctx->buf[ctx->idx++] = cell->wc;
} }
ctx->last_row = row; ctx->last_row = row;
ctx->last_cell = cell; ctx->last_cell = cell;
return true; return true;
err:
ctx->failed = true;
return false;
} }