extern/ctpv
1
0
Fork 0
mirror of https://github.com/NikitaIvanovV/ctpv.git synced 2025-01-07 09:08:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add char_v_append_str()

Browse Source
This commit is contained in:
Nikita Ivanov 2022-05-28 22:31:09 +05:00
parent d2b86ba8b3
commit d921371610
No known key found for this signature in database
GPG Key ID: 6E656AC5B97B5133
2 changed files with 54 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
utils.c
View File

@ -135,30 +135,57 @@ void char_v_free(CharVec *v)
} }
} }
void char_v_append(CharVec *v, char c) static void char_v_create(CharVec *v)
{ {
if (!v->buf) { if (v->buf)
v->buf = malloc(v->cap * sizeof(v->buf[0])); return;
if (!v->buf) {
PRINTINTERR(FUNCFAILED("malloc"), ERRNOS); if (!(v->buf = malloc(v->cap * sizeof(*v->buf)))) {
abort(); PRINTINTERR(FUNCFAILED("malloc"), ERRNOS);
} abort();
v->buf[0] = '\0';
v->len++;
} }
if (v->len + 1 >= v->cap) { v->buf[0] = '\0';
v->len++;
}
static void char_v_check_cap(CharVec *v, size_t len_inc)
{
void *new_buf;
size_t new_len = v->len + len_inc;
if (new_len < v->cap)
return;
while (new_len >= v->cap)
v->cap *= 2; v->cap *= 2;
void *new = realloc(v->buf, v->cap * sizeof(v->buf[0]));
if (!new) { if (!(new_buf = realloc(v->buf, v->cap * sizeof(*v->buf)))) {
free(v->buf); free(v->buf);
PRINTINTERR(FUNCFAILED("realloc"), ERRNOS); PRINTINTERR(FUNCFAILED("realloc"), ERRNOS);
abort(); abort();
}
v->buf = new;
} }
v->buf = new_buf;
}
void char_v_append(CharVec *v, char c)
{
char_v_create(v);
char_v_check_cap(v, 1);
v->buf[v->len - 1] = c; v->buf[v->len - 1] = c;
v->buf[v->len] = '\0'; v->buf[v->len] = '\0';
v->len++; v->len++;
} }
void char_v_append_str(CharVec *v, char *s)
{
size_t len = strlen(s);
char_v_create(v);
char_v_check_cap(v, len);
memcpy(v->buf + v->len * sizeof(*v->buf), s, len + 1);
v->len += len;
}

16
utils.h
View File

@ -21,11 +21,6 @@
va_end(args); \ va_end(args); \
} while (0) } while (0)
typedef struct {
char *buf;
size_t len, cap;
} CharVec;
extern char *program; extern char *program;
int spawn_redirect(const void *arg); int spawn_redirect(const void *arg);
@ -37,8 +32,17 @@ int strcmpnull(char const *s1, char const *s2);
int get_cache_dir(char *buf, size_t len, char *name); int get_cache_dir(char *buf, size_t len, char *name);
int mkpath(char* file_path, mode_t mode); int mkpath(char* file_path, mode_t mode);
#define CHAR_V_LEN(vec) ((vec).len - 1)
#define CHAR_V_STR(vec) ((vec).buf)
typedef struct {
size_t len, cap;
char *buf;
} CharVec;
CharVec char_v_new(size_t cap); CharVec char_v_new(size_t cap);
void char_v_append(CharVec *v, char c);
void char_v_free(CharVec *v); void char_v_free(CharVec *v);
void char_v_append(CharVec *v, char c);
void char_v_append_str(CharVec *v, char *s);
#endif #endif