X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=cstring.c;h=958062bfe8c0b9d2287f56e6911e1dc1a4f7588e;hb=31f91305483a4efa430fe1ce181f62921c77e39f;hp=e7308efd2054fe1c9f340a9f9104a005f571602f;hpb=76cedc9066d3fd65788f86ea5d0b71db98bb6e24;p=smdp.git diff --git a/cstring.c b/cstring.c index e7308ef..958062b 100644 --- a/cstring.c +++ b/cstring.c @@ -1,3 +1,24 @@ +/* + * An implementation of expandable c strings in heap memory. + * Copyright (C) 2014 Michael Goehler + * + * This file is part of mdp. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + #include // strlen #include // malloc, realloc @@ -26,11 +47,12 @@ void cstring_expand(cstring_t *self, char x) { void cstring_expand_arr(cstring_t *self, char *x) { if(self->size + strlen(x) + sizeof(char) > self->alloc) { - self->alloc += (REALLOC_ADD * sizeof(char)); + self->alloc = ((strlen(x) + self->size + 1) * sizeof(char)); self->text = realloc(self->text, self->alloc); } self->text = strcat(self->text, x); self->size = strlen(self->text); + self->text[self->size+1] = '\0'; } void cstring_reset(cstring_t *self) {