From 1d2bdf995af658209f5fb63fc42c825411d8da9e Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Wed, 27 Mar 2019 22:45:01 -0400 Subject: dstring: Add a dstrdup() function --- dstring.c | 19 ++++++++++++++----- dstring.h | 10 +++++++++- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dstring.c b/dstring.c index 10e1557..35ea5b2 100644 --- a/dstring.c +++ b/dstring.c @@ -1,6 +1,6 @@ /**************************************************************************** * bfs * - * Copyright (C) 2016-2017 Tavian Barnes * + * Copyright (C) 2016-2019 Tavian Barnes * * * * Permission to use, copy, modify, and/or distribute this software for any * * purpose with or without fee is hereby granted. * @@ -37,16 +37,25 @@ static size_t dstrsize(size_t capacity) { return sizeof(struct dstring) + capacity + 1; } -char *dstralloc(size_t capacity) { +/** Allocate a dstring with the given contents. */ +static char *dstralloc_impl(size_t capacity, size_t length, const char *data) { struct dstring *header = malloc(dstrsize(capacity)); if (!header) { return NULL; } header->capacity = capacity; - header->length = 0; - header->data[0] = '\0'; - return header->data; + header->length = length; + return memcpy(header->data, data, length + 1); +} + +char *dstralloc(size_t capacity) { + return dstralloc_impl(capacity, 0, ""); +} + +char *dstrdup(const char *str) { + size_t len = strlen(str); + return dstralloc_impl(len, len, str); } size_t dstrlen(const char *dstr) { diff --git a/dstring.h b/dstring.h index d43a1f0..0374447 100644 --- a/dstring.h +++ b/dstring.h @@ -1,6 +1,6 @@ /**************************************************************************** * bfs * - * Copyright (C) 2016-2017 Tavian Barnes * + * Copyright (C) 2016-2019 Tavian Barnes * * * * Permission to use, copy, modify, and/or distribute this software for any * * purpose with or without fee is hereby granted. * @@ -31,6 +31,14 @@ */ char *dstralloc(size_t capacity); +/** + * Create a dynamic copy of a string. + * + * @param str + * The NUL-terminated string to copy. + */ +char *dstrdup(const char *str); + /** * Get a dynamic string's length. * -- cgit v1.2.3