1
#include "cache.h"
2
#include "strbuf.h"
3
4
-void strbuf_init(struct strbuf *sb) {
4
+void strbuf_init(struct strbuf *sb, size_t hint) {
5
memset(sb, 0, sizeof(*sb));
6
+ if (hint)
7
+ strbuf_grow(sb, hint);
8
}
9
10
void strbuf_release(struct strbuf *sb) {
20
21
char *strbuf_detach(struct strbuf *sb) {
22
char *res = sb->buf;
21
- strbuf_init(sb);
23
+ strbuf_init(sb, 0);
24
return res;
25
}
26
30
ALLOC_GROW(sb->buf, sb->len + extra + 1, sb->alloc);
31
}
32
33
+void strbuf_rtrim(struct strbuf *sb)
34
+{
35
+ while (sb->len > 0 && isspace((unsigned char)sb->buf[sb->len - 1]))
36
+ sb->len--;
37
+ sb->buf[sb->len] = '\0';
38
+}
39
+
40
+void strbuf_insert(struct strbuf *sb, size_t pos, const void *data, size_t len) {
41
+ strbuf_grow(sb, len);
42
+ if (pos >= sb->len) {
43
+ pos = sb->len;
44
+ } else {
45
+ memmove(sb->buf + pos + len, sb->buf + pos, sb->len - pos);
46
+ }
47
+ memcpy(sb->buf + pos, data, len);
48
+ strbuf_setlen(sb, sb->len + len);
49
+}
50
+
51
void strbuf_add(struct strbuf *sb, const void *data, size_t len) {
52
strbuf_grow(sb, len);
53
memcpy(sb->buf + sb->len, data, len);
64
if (len < 0) {
65
len = 0;
66
}
47
- if (len >= strbuf_avail(sb)) {
67
+ if (len > strbuf_avail(sb)) {
68
strbuf_grow(sb, len);
69
va_start(ap, fmt);
70
len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);
71
va_end(ap);
52
- if (len >= strbuf_avail(sb)) {
72
+ if (len > strbuf_avail(sb)) {
73
die("this should not happen, your snprintf is broken");
74
}
75
}
87
return res;
88
}
89
70
-ssize_t strbuf_read(struct strbuf *sb, int fd)
90
+ssize_t strbuf_read(struct strbuf *sb, int fd, size_t hint)
91
{
92
size_t oldlen = sb->len;
93
94
+ strbuf_grow(sb, hint ? hint : 8192);
95
for (;;) {
96
ssize_t cnt;
97
77
- strbuf_grow(sb, 8192);
98
cnt = xread(fd, sb->buf + sb->len, sb->alloc - sb->len - 1);
99
if (cnt < 0) {
100
strbuf_setlen(sb, oldlen);
103
if (!cnt)
104
break;
105
sb->len += cnt;
106
+ strbuf_grow(sb, 8192);
107
}
108
109
sb->buf[sb->len] = '\0';