| 69 | } |
| 70 | |
| 71 | char *rbuf_read_str(struct rbuf *rbuf, char term) |
| 72 | { |
| 73 | char *p; |
| 74 | ssize_t r = 0; |
| 75 | size_t prev = 0; |
| 76 | |
| 77 | /* memchr(NULL, ..., 0) is illegal. FML. */ |
| 78 | while (membuf_num_elems(&rbuf->m) == prev |
| 79 | || !(p = memchr(membuf_elems(&rbuf->m) + prev, |
| 80 | term, |
| 81 | membuf_num_elems(&rbuf->m) - prev))) { |
| 82 | prev += r; |
| 83 | r = get_more(rbuf); |
| 84 | if (r < 0) |
| 85 | return NULL; |
| 86 | /* EOF with no term. */ |
| 87 | if (r == 0) { |
| 88 | char *ret; |
| 89 | size_t len = rbuf_len(rbuf); |
| 90 | |
| 91 | /* Nothing read at all? */ |
| 92 | if (!len && term) { |
| 93 | errno = 0; |
| 94 | return NULL; |
| 95 | } |
| 96 | |
| 97 | /* Put term after input (get_more made room). */ |
| 98 | assert(membuf_num_space(&rbuf->m) > 0); |
| 99 | ret = membuf_consume(&rbuf->m, len); |
| 100 | ret[len] = '\0'; |
| 101 | return ret; |
| 102 | } |
| 103 | } |
| 104 | *p = '\0'; |
| 105 | return membuf_consume(&rbuf->m, p + 1 - (char *)rbuf_start(rbuf)); |
| 106 | } |