X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/1caa23ff879cec7f8f36b32a987f0610291ef177..19e9a588dc058584fbda9d31080a2581c3fd5269:/util.c diff --git a/util.c b/util.c index fff5b6d..f5f3d75 100644 --- a/util.c +++ b/util.c @@ -166,6 +166,7 @@ static const char *phases[NR_PHASES]={ "PHASE_GETOPTS", "PHASE_READCONFIG", "PHASE_SETUP", + "PHASE_DAEMONIZE", "PHASE_GETRESOURCES", "PHASE_DROPPRIV", "PHASE_RUN", @@ -268,6 +269,7 @@ void *buf_unappend(struct buffer_if *buf, int32_t amount) { void *buf_unprepend(struct buffer_if *buf, int32_t amount) { void *p; + if (buf->size < amount) return 0; p=buf->start; buf->start+=amount; buf->size-=amount; @@ -299,6 +301,18 @@ void buffer_new(struct buffer_if *buf, int32_t len) buf->base=safe_malloc(len,"buffer_new"); } +void buffer_copy(struct buffer_if *dst, const struct buffer_if *src) +{ + if (dst->len < src->len) { + dst->base=realloc(dst->base,src->len); + if (!dst->base) fatal_perror("buffer_copy"); + dst->len = src->len; + } + dst->start = dst->base + (src->start - src->base); + dst->size = src->size; + memcpy(dst->start, src->start, dst->size); +} + static list_t *buffer_apply(closure_t *self, struct cloc loc, dict_t *context, list_t *args) {