diff options
Diffstat (limited to 'lib/slist.c')
-rw-r--r-- | lib/slist.c | 127 |
1 files changed, 88 insertions, 39 deletions
diff --git a/lib/slist.c b/lib/slist.c index b110350..46e516e 100644 --- a/lib/slist.c +++ b/lib/slist.c @@ -30,2 +30,3 @@ struct gray_slist { struct gray_slist_bucket *free; + int ec; /* error code */ }; @@ -35,7 +36,9 @@ alloc_bucket(size_t size) { - struct gray_slist_bucket *p = gray_malloc(sizeof(*p) + size); - p->buf = (char*)(p + 1); - p->level = 0; - p->size = size; - p->next = NULL; + struct gray_slist_bucket *p = malloc(sizeof(*p) + size); + if (p) { + p->buf = (char*)(p + 1); + p->level = 0; + p->size = size; + p->next = NULL; + } return p; @@ -43,3 +46,3 @@ alloc_bucket(size_t size) -static void +static int alloc_pool(gray_slist_t slist, size_t size) @@ -47,2 +50,6 @@ alloc_pool(gray_slist_t slist, size_t size) struct gray_slist_bucket *p = alloc_bucket(GRAY_SLIST_BUCKET_SIZE); + if (!p) { + slist->ec = errno; + return 1; + } if (slist->tail) @@ -52,5 +59,6 @@ alloc_pool(gray_slist_t slist, size_t size) slist->tail = p; + return 0; } -static size_t +static ssize_t copy_chars(gray_slist_t slist, const char *str, size_t n) @@ -59,5 +67,6 @@ copy_chars(gray_slist_t slist, const char *str, size_t n) - - if (!slist->head || slist->tail->level == slist->tail->size) - alloc_pool(slist, GRAY_SLIST_BUCKET_SIZE); + if (!slist->head || slist->tail->level == slist->tail->size) { + if (alloc_pool(slist, GRAY_SLIST_BUCKET_SIZE)) + return -1; + } rest = slist->tail->size - slist->tail->level; @@ -71,6 +80,9 @@ copy_chars(gray_slist_t slist, const char *str, size_t n) gray_slist_t -gray_slist_create() +gray_slist_create(void) { - gray_slist_t slist = gray_malloc(sizeof(*slist)); - slist->head = slist->tail = slist->free = 0; + gray_slist_t slist = malloc(sizeof(*slist)); + if (slist) { + slist->head = slist->tail = slist->free = 0; + slist->ec = 0; + } return slist; @@ -78,2 +90,14 @@ gray_slist_create() +int +gray_slist_err(gray_slist_t slist) +{ + return slist->ec; +} + +void +gray_slist_clerr(gray_slist_t slist) +{ + slist->ec = 0; +} + void @@ -86,2 +110,3 @@ gray_slist_clear(gray_slist_t slist) } + gray_slist_clerr(slist); } @@ -92,4 +117,4 @@ gray_slist_free(gray_slist_t *slist) { - struct gray_slist_bucket *p; if (*slist) { + struct gray_slist_bucket *p; gray_slist_clear(*slist); @@ -105,17 +130,23 @@ gray_slist_free(gray_slist_t *slist) -void +ssize_t gray_slist_append(gray_slist_t slist, const char *str, size_t n) { - const char *ptr = str; - while (n) { - size_t s = copy_chars(slist, ptr, n); - ptr += s; - n -= s; + ssize_t total; + + if (slist->ec) + return -1; + total = 0; + while (total < n) { + ssize_t s = copy_chars(slist, str + total, n - total); + if (s == -1) + return -1; + total += s; } + return total; } -void +ssize_t gray_slist_append_char(gray_slist_t slist, char c) { - gray_slist_append(slist, &c, 1); + return gray_slist_append(slist, &c, 1); } @@ -132,3 +163,3 @@ gray_slist_size(gray_slist_t slist) -size_t +ssize_t gray_slist_coalesce(gray_slist_t slist) @@ -137,3 +168,5 @@ gray_slist_coalesce(gray_slist_t slist) - if (slist->head && slist->head->next == NULL) + if (slist->ec) + return -1; + else if (slist->head && slist->head->next == NULL) size = slist->head->level; @@ -141,4 +174,7 @@ gray_slist_coalesce(gray_slist_t slist) size = gray_slist_size(slist); - struct gray_slist_bucket *bucket = alloc_bucket(size); - struct gray_slist_bucket *p; + struct gray_slist_bucket *bucket, *p; + + bucket = alloc_bucket(size); + if (!bucket) + return -1; @@ -167,3 +203,6 @@ gray_slist_finish(gray_slist_t slist) { - gray_slist_coalesce(slist); + if (slist->ec) + return NULL; + if (gray_slist_coalesce(slist) == -1) + return NULL; gray_slist_clear(slist); @@ -176,3 +215,3 @@ gray_slist_finish(gray_slist_t slist) -void +int gray_slist_grow_backslash_num(gray_slist_t slist, char *text, char **pend, @@ -183,3 +222,5 @@ gray_slist_grow_backslash_num(gray_slist_t slist, char *text, char **pend, char *start = text; - + + if (slist->ec) + return -1; if (text[0] == '\\') { @@ -198,3 +239,4 @@ gray_slist_grow_backslash_num(gray_slist_t slist, char *text, char **pend, if (i == 0) { - gray_slist_append(slist, start, 1); + if (gray_slist_append(slist, start, 1) != 1) + return -1; if (pend) @@ -202,3 +244,4 @@ gray_slist_grow_backslash_num(gray_slist_t slist, char *text, char **pend, } else { - gray_slist_append_char(slist, val); + if (gray_slist_append_char(slist, val) != 1) + return -1; if (pend) @@ -206,2 +249,3 @@ gray_slist_grow_backslash_num(gray_slist_t slist, char *text, char **pend, } + return 0; } @@ -221,3 +265,3 @@ gray_decode_backslash(int c) -void +int gray_slist_grow_backslash(gray_slist_t slist, char *text, char **endp) @@ -225,11 +269,15 @@ gray_slist_grow_backslash(gray_slist_t slist, char *text, char **endp) if (text[1] == '\\' || (unsigned char)text[1] > 127) { - gray_slist_append_char(slist, text[1]); + if (gray_slist_append_char(slist, text[1]) != 1) + return -1; text += 2; - } else if (isdigit(text[1])) - gray_slist_grow_backslash_num(slist, text, &text, 3, 8); - else if (text[1] == 'x' || text[1] == 'X') - gray_slist_grow_backslash_num(slist, text, &text, 2, 16); - else { + } else if (isdigit(text[1])) { + if (gray_slist_grow_backslash_num(slist, text, &text, 3, 8)) + return -1; + } else if (text[1] == 'x' || text[1] == 'X') { + if (gray_slist_grow_backslash_num(slist, text, &text, 2, 16)) + return -1; + } else { int c = gray_decode_backslash(text[1]); - gray_slist_append_char(slist, c); + if (gray_slist_append_char(slist, c) != 1) + return -1; text += 2; @@ -238,2 +286,3 @@ gray_slist_grow_backslash(gray_slist_t slist, char *text, char **endp) *endp = text; + return 0; } |