commit - 54764e41a11e16a56da805313f209a9937c5173d
commit + 62cbcdae43d424ecc31a54bd67fd22a7120bf9fa
blob - 783a5da41098b7cb9ff34036723bdb5b45654344
blob + 7c47744a8aaf62dd8a7060b3b67a135a1dd415d7
--- telescope.c
+++ telescope.c
static void
handle_imsg_check_cert(struct imsg *imsg)
{
- const char *hash, *host, *port;
+ char *hash;
+ const char *host, *port;
int tofu_res;
+ struct ibuf ibuf;
struct tofu_entry *e;
struct tab *tab;
size_t datalen;
- if ((hash = imsg_borrow_str(imsg)) == NULL)
+ if (imsg_get_ibuf(imsg, &ibuf) == -1 ||
+ ibuf_borrow_str(&ibuf, &hash) == -1)
abort();
datalen = strlen(hash);
case IMSG_ERR:
if ((tab = tab_by_id(imsg_get_id(&imsg))) == NULL)
break;
- if ((str = imsg_borrow_str(&imsg)) == NULL)
+ if (imsg_get_ibuf(&imsg, &ibuf) == -1 ||
+ ibuf_borrow_str(&ibuf, &str) == -1)
die();
if (asprintf(&page, "# Error loading %s\n\n> %s\n",
hist_cur(tab->hist), str) == -1)
blob - c6431d29c53306f0ff5022bde427ea5f47c86f68
blob + fc40369b423e13aa044a9089bfec117e2354b22c
--- utils.c
+++ utils.c
/*
- * Copyright (c) 2021 Omar Polo <op@omarpolo.com>
+ * Copyright (c) 2021, 2024 Omar Polo <op@omarpolo.com>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
return ret;
}
-char *
-imsg_borrow_str(struct imsg *imsg)
-{
- struct ibuf ibuf;
- char *data;
-
- if (imsg_get_ibuf(imsg, &ibuf) == -1 ||
- ibuf_borrow_str(&ibuf, &data) == -1)
- return NULL;
- return data;
-}
-
int
ibuf_borrow_str(struct ibuf *ibuf, char **data)
{
blob - fe2c312b8a9a3f69151634576295d40fd21f2765
blob + 31b6325bd586f3d65c41bb56cb4bd7079883823d
--- utils.h
+++ utils.h
/*
- * Copyright (c) 2022 Omar Polo <op@omarpolo.com>
+ * Copyright (c) 2022, 2024 Omar Polo <op@omarpolo.com>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
void imsg_event_add(struct imsgev *);
int imsg_compose_event(struct imsgev *, uint16_t, uint32_t, pid_t, int, const void *, uint16_t);
-char *imsg_borrow_str(struct imsg *);
int ibuf_borrow_str(struct ibuf *, char **);
void *hash_alloc(size_t, void *);