Christopher Li | 812666c | 2005-04-26 12:00:58 -0700 | [diff] [blame] | 1 | #include "cache.h" |
Junio C Hamano | a2fab53 | 2009-03-21 14:35:51 -0700 | [diff] [blame] | 2 | #include "refs.h" |
Elijah Newren | f6f7755 | 2018-04-19 10:58:08 -0700 | [diff] [blame] | 3 | #include "string-list.h" |
Jeff King | d4241f5 | 2014-05-22 05:30:14 -0400 | [diff] [blame] | 4 | #include "utf8.h" |
Junio C Hamano | d1df574 | 2005-04-25 18:26:45 -0700 | [diff] [blame] | 5 | |
Christian Couder | 9566231 | 2013-12-01 08:49:16 +0100 | [diff] [blame] | 6 | int starts_with(const char *str, const char *prefix) |
| 7 | { |
| 8 | for (; ; str++, prefix++) |
| 9 | if (!*prefix) |
| 10 | return 1; |
| 11 | else if (*str != *prefix) |
| 12 | return 0; |
| 13 | } |
| 14 | |
Lars Schneider | 66b8af3 | 2018-03-09 18:35:29 +0100 | [diff] [blame] | 15 | int istarts_with(const char *str, const char *prefix) |
| 16 | { |
| 17 | for (; ; str++, prefix++) |
| 18 | if (!*prefix) |
| 19 | return 1; |
| 20 | else if (tolower(*str) != tolower(*prefix)) |
| 21 | return 0; |
| 22 | } |
| 23 | |
Christian Couder | afaef55 | 2017-12-09 21:40:07 +0100 | [diff] [blame] | 24 | int skip_to_optional_arg_default(const char *str, const char *prefix, |
| 25 | const char **arg, const char *def) |
| 26 | { |
| 27 | const char *p; |
| 28 | |
| 29 | if (!skip_prefix(str, prefix, &p)) |
| 30 | return 0; |
| 31 | |
| 32 | if (!*p) { |
| 33 | if (arg) |
| 34 | *arg = def; |
| 35 | return 1; |
| 36 | } |
| 37 | |
| 38 | if (*p != '=') |
| 39 | return 0; |
| 40 | |
| 41 | if (arg) |
| 42 | *arg = p + 1; |
| 43 | return 1; |
| 44 | } |
| 45 | |
Pierre Habouzit | b315c5c | 2007-09-27 12:58:23 +0200 | [diff] [blame] | 46 | /* |
| 47 | * Used as the default ->buf value, so that people can always assume |
| 48 | * buf is non NULL and ->buf is NUL terminated even for a freshly |
| 49 | * initialized strbuf. |
| 50 | */ |
| 51 | char strbuf_slopbuf[1]; |
| 52 | |
Pierre Habouzit | 917c9a7 | 2007-09-15 15:56:50 +0200 | [diff] [blame] | 53 | void strbuf_init(struct strbuf *sb, size_t hint) |
| 54 | { |
Pierre Habouzit | b315c5c | 2007-09-27 12:58:23 +0200 | [diff] [blame] | 55 | sb->alloc = sb->len = 0; |
| 56 | sb->buf = strbuf_slopbuf; |
Thomas Rast | 8c74ef1 | 2011-08-29 23:16:12 +0200 | [diff] [blame] | 57 | if (hint) |
Pierre Habouzit | f1696ee | 2007-09-10 12:35:04 +0200 | [diff] [blame] | 58 | strbuf_grow(sb, hint); |
Junio C Hamano | d1df574 | 2005-04-25 18:26:45 -0700 | [diff] [blame] | 59 | } |
| 60 | |
Pierre Habouzit | 917c9a7 | 2007-09-15 15:56:50 +0200 | [diff] [blame] | 61 | void strbuf_release(struct strbuf *sb) |
| 62 | { |
Pierre Habouzit | b315c5c | 2007-09-27 12:58:23 +0200 | [diff] [blame] | 63 | if (sb->alloc) { |
| 64 | free(sb->buf); |
| 65 | strbuf_init(sb, 0); |
| 66 | } |
Pierre Habouzit | b449f4c | 2007-09-06 13:20:05 +0200 | [diff] [blame] | 67 | } |
| 68 | |
Pierre Habouzit | b315c5c | 2007-09-27 12:58:23 +0200 | [diff] [blame] | 69 | char *strbuf_detach(struct strbuf *sb, size_t *sz) |
Pierre Habouzit | 917c9a7 | 2007-09-15 15:56:50 +0200 | [diff] [blame] | 70 | { |
Jeff King | 08ad56f | 2012-10-18 06:00:12 -0400 | [diff] [blame] | 71 | char *res; |
| 72 | strbuf_grow(sb, 0); |
| 73 | res = sb->buf; |
Pierre Habouzit | b315c5c | 2007-09-27 12:58:23 +0200 | [diff] [blame] | 74 | if (sz) |
| 75 | *sz = sb->len; |
Pierre Habouzit | f1696ee | 2007-09-10 12:35:04 +0200 | [diff] [blame] | 76 | strbuf_init(sb, 0); |
Pierre Habouzit | b449f4c | 2007-09-06 13:20:05 +0200 | [diff] [blame] | 77 | return res; |
Junio C Hamano | d1df574 | 2005-04-25 18:26:45 -0700 | [diff] [blame] | 78 | } |
| 79 | |
Pierre Habouzit | 917c9a7 | 2007-09-15 15:56:50 +0200 | [diff] [blame] | 80 | void strbuf_attach(struct strbuf *sb, void *buf, size_t len, size_t alloc) |
| 81 | { |
| 82 | strbuf_release(sb); |
| 83 | sb->buf = buf; |
| 84 | sb->len = len; |
| 85 | sb->alloc = alloc; |
| 86 | strbuf_grow(sb, 0); |
| 87 | sb->buf[sb->len] = '\0'; |
| 88 | } |
| 89 | |
| 90 | void strbuf_grow(struct strbuf *sb, size_t extra) |
| 91 | { |
Thomas Rast | 8c74ef1 | 2011-08-29 23:16:12 +0200 | [diff] [blame] | 92 | int new_buf = !sb->alloc; |
Jonathan Nieder | 1368f65 | 2010-10-10 21:59:26 -0500 | [diff] [blame] | 93 | if (unsigned_add_overflows(extra, 1) || |
| 94 | unsigned_add_overflows(sb->len, extra + 1)) |
Pierre Habouzit | b449f4c | 2007-09-06 13:20:05 +0200 | [diff] [blame] | 95 | die("you want to use way too much memory"); |
Thomas Rast | 8c74ef1 | 2011-08-29 23:16:12 +0200 | [diff] [blame] | 96 | if (new_buf) |
Pierre Habouzit | b315c5c | 2007-09-27 12:58:23 +0200 | [diff] [blame] | 97 | sb->buf = NULL; |
Pierre Habouzit | b449f4c | 2007-09-06 13:20:05 +0200 | [diff] [blame] | 98 | ALLOC_GROW(sb->buf, sb->len + extra + 1, sb->alloc); |
Thomas Rast | 8c74ef1 | 2011-08-29 23:16:12 +0200 | [diff] [blame] | 99 | if (new_buf) |
| 100 | sb->buf[0] = '\0'; |
Pierre Habouzit | b449f4c | 2007-09-06 13:20:05 +0200 | [diff] [blame] | 101 | } |
| 102 | |
Lukas Sandström | eacd6dc | 2008-07-13 20:29:18 +0200 | [diff] [blame] | 103 | void strbuf_trim(struct strbuf *sb) |
| 104 | { |
Brian Gesiak | 3bb55e8 | 2014-04-30 17:58:06 +0900 | [diff] [blame] | 105 | strbuf_rtrim(sb); |
| 106 | strbuf_ltrim(sb); |
Lukas Sandström | eacd6dc | 2008-07-13 20:29:18 +0200 | [diff] [blame] | 107 | } |
Nguyễn Thái Ngọc Duy | c64a8d2 | 2018-02-12 16:49:37 +0700 | [diff] [blame] | 108 | |
Pierre Habouzit | f1696ee | 2007-09-10 12:35:04 +0200 | [diff] [blame] | 109 | void strbuf_rtrim(struct strbuf *sb) |
| 110 | { |
| 111 | while (sb->len > 0 && isspace((unsigned char)sb->buf[sb->len - 1])) |
| 112 | sb->len--; |
| 113 | sb->buf[sb->len] = '\0'; |
| 114 | } |
| 115 | |
Nguyễn Thái Ngọc Duy | c64a8d2 | 2018-02-12 16:49:37 +0700 | [diff] [blame] | 116 | void strbuf_trim_trailing_dir_sep(struct strbuf *sb) |
| 117 | { |
| 118 | while (sb->len > 0 && is_dir_sep((unsigned char)sb->buf[sb->len - 1])) |
| 119 | sb->len--; |
| 120 | sb->buf[sb->len] = '\0'; |
| 121 | } |
| 122 | |
Pratik Karki | f957362 | 2018-08-08 20:51:16 +0545 | [diff] [blame] | 123 | void strbuf_trim_trailing_newline(struct strbuf *sb) |
| 124 | { |
| 125 | if (sb->len > 0 && sb->buf[sb->len - 1] == '\n') { |
| 126 | if (--sb->len > 0 && sb->buf[sb->len - 1] == '\r') |
| 127 | --sb->len; |
| 128 | sb->buf[sb->len] = '\0'; |
| 129 | } |
| 130 | } |
| 131 | |
Lukas Sandström | eacd6dc | 2008-07-13 20:29:18 +0200 | [diff] [blame] | 132 | void strbuf_ltrim(struct strbuf *sb) |
| 133 | { |
| 134 | char *b = sb->buf; |
| 135 | while (sb->len > 0 && isspace(*b)) { |
| 136 | b++; |
| 137 | sb->len--; |
| 138 | } |
| 139 | memmove(sb->buf, b, sb->len); |
| 140 | sb->buf[sb->len] = '\0'; |
| 141 | } |
| 142 | |
Jeff King | d4241f5 | 2014-05-22 05:30:14 -0400 | [diff] [blame] | 143 | int strbuf_reencode(struct strbuf *sb, const char *from, const char *to) |
| 144 | { |
| 145 | char *out; |
Jeff King | c7d017d | 2018-07-24 06:50:33 -0400 | [diff] [blame] | 146 | size_t len; |
Jeff King | d4241f5 | 2014-05-22 05:30:14 -0400 | [diff] [blame] | 147 | |
| 148 | if (same_encoding(from, to)) |
| 149 | return 0; |
| 150 | |
| 151 | out = reencode_string_len(sb->buf, sb->len, to, from, &len); |
| 152 | if (!out) |
| 153 | return -1; |
| 154 | |
| 155 | strbuf_attach(sb, out, len, len); |
| 156 | return 0; |
| 157 | } |
| 158 | |
Jeff King | ffb20ce | 2014-05-23 16:03:47 -0400 | [diff] [blame] | 159 | void strbuf_tolower(struct strbuf *sb) |
| 160 | { |
| 161 | char *p = sb->buf, *end = sb->buf + sb->len; |
| 162 | for (; p < end; p++) |
| 163 | *p = tolower(*p); |
| 164 | } |
| 165 | |
Michael Haggerty | 17b73dc | 2012-11-04 07:46:53 +0100 | [diff] [blame] | 166 | struct strbuf **strbuf_split_buf(const char *str, size_t slen, |
| 167 | int terminator, int max) |
Lukas Sandström | eacd6dc | 2008-07-13 20:29:18 +0200 | [diff] [blame] | 168 | { |
Michael Haggerty | b8c2c1f | 2012-11-04 07:46:51 +0100 | [diff] [blame] | 169 | struct strbuf **ret = NULL; |
| 170 | size_t nr = 0, alloc = 0; |
Lukas Sandström | eacd6dc | 2008-07-13 20:29:18 +0200 | [diff] [blame] | 171 | struct strbuf *t; |
| 172 | |
Michael Haggerty | 1173bb3 | 2012-11-04 07:46:52 +0100 | [diff] [blame] | 173 | while (slen) { |
| 174 | int len = slen; |
| 175 | if (max <= 0 || nr + 1 < max) { |
Michael Haggerty | 17b73dc | 2012-11-04 07:46:53 +0100 | [diff] [blame] | 176 | const char *end = memchr(str, terminator, slen); |
Michael Haggerty | 1173bb3 | 2012-11-04 07:46:52 +0100 | [diff] [blame] | 177 | if (end) |
| 178 | len = end - str + 1; |
| 179 | } |
Lukas Sandström | eacd6dc | 2008-07-13 20:29:18 +0200 | [diff] [blame] | 180 | t = xmalloc(sizeof(struct strbuf)); |
| 181 | strbuf_init(t, len); |
Michael Haggerty | 1173bb3 | 2012-11-04 07:46:52 +0100 | [diff] [blame] | 182 | strbuf_add(t, str, len); |
Michael Haggerty | b8c2c1f | 2012-11-04 07:46:51 +0100 | [diff] [blame] | 183 | ALLOC_GROW(ret, nr + 2, alloc); |
| 184 | ret[nr++] = t; |
Michael Haggerty | 1173bb3 | 2012-11-04 07:46:52 +0100 | [diff] [blame] | 185 | str += len; |
| 186 | slen -= len; |
Lukas Sandström | eacd6dc | 2008-07-13 20:29:18 +0200 | [diff] [blame] | 187 | } |
Michael Haggerty | b8c2c1f | 2012-11-04 07:46:51 +0100 | [diff] [blame] | 188 | ALLOC_GROW(ret, nr + 1, alloc); /* In case string was empty */ |
| 189 | ret[nr] = NULL; |
Lukas Sandström | eacd6dc | 2008-07-13 20:29:18 +0200 | [diff] [blame] | 190 | return ret; |
| 191 | } |
| 192 | |
Elijah Newren | f6f7755 | 2018-04-19 10:58:08 -0700 | [diff] [blame] | 193 | void strbuf_add_separated_string_list(struct strbuf *str, |
| 194 | const char *sep, |
| 195 | struct string_list *slist) |
| 196 | { |
| 197 | struct string_list_item *item; |
| 198 | int sep_needed = 0; |
| 199 | |
| 200 | for_each_string_list_item(item, slist) { |
| 201 | if (sep_needed) |
| 202 | strbuf_addstr(str, sep); |
| 203 | strbuf_addstr(str, item->string); |
| 204 | sep_needed = 1; |
| 205 | } |
| 206 | } |
| 207 | |
Lukas Sandström | eacd6dc | 2008-07-13 20:29:18 +0200 | [diff] [blame] | 208 | void strbuf_list_free(struct strbuf **sbs) |
| 209 | { |
| 210 | struct strbuf **s = sbs; |
| 211 | |
| 212 | while (*s) { |
| 213 | strbuf_release(*s); |
| 214 | free(*s++); |
| 215 | } |
| 216 | free(sbs); |
| 217 | } |
| 218 | |
Lukas Sandström | 9b200fd | 2008-07-13 20:28:24 +0200 | [diff] [blame] | 219 | int strbuf_cmp(const struct strbuf *a, const struct strbuf *b) |
Pierre Habouzit | 45f66f6 | 2007-09-24 11:25:03 +0200 | [diff] [blame] | 220 | { |
Jeff King | 26114c0 | 2018-07-24 06:51:08 -0400 | [diff] [blame] | 221 | size_t len = a->len < b->len ? a->len: b->len; |
Alex Riesen | 8f02465 | 2009-03-19 23:27:32 +0100 | [diff] [blame] | 222 | int cmp = memcmp(a->buf, b->buf, len); |
| 223 | if (cmp) |
| 224 | return cmp; |
| 225 | return a->len < b->len ? -1: a->len != b->len; |
Pierre Habouzit | 45f66f6 | 2007-09-24 11:25:03 +0200 | [diff] [blame] | 226 | } |
| 227 | |
Pierre Habouzit | 917c9a7 | 2007-09-15 15:56:50 +0200 | [diff] [blame] | 228 | void strbuf_splice(struct strbuf *sb, size_t pos, size_t len, |
| 229 | const void *data, size_t dlen) |
| 230 | { |
Jonathan Nieder | 1368f65 | 2010-10-10 21:59:26 -0500 | [diff] [blame] | 231 | if (unsigned_add_overflows(pos, len)) |
Pierre Habouzit | 917c9a7 | 2007-09-15 15:56:50 +0200 | [diff] [blame] | 232 | die("you want to use way too much memory"); |
| 233 | if (pos > sb->len) |
| 234 | die("`pos' is too far after the end of the buffer"); |
| 235 | if (pos + len > sb->len) |
| 236 | die("`pos + len' is too far after the end of the buffer"); |
| 237 | |
| 238 | if (dlen >= len) |
| 239 | strbuf_grow(sb, dlen - len); |
| 240 | memmove(sb->buf + pos + dlen, |
| 241 | sb->buf + pos + len, |
| 242 | sb->len - pos - len); |
| 243 | memcpy(sb->buf + pos, data, dlen); |
| 244 | strbuf_setlen(sb, sb->len + dlen - len); |
| 245 | } |
| 246 | |
Pierre Habouzit | c76689d | 2007-09-20 00:42:12 +0200 | [diff] [blame] | 247 | void strbuf_insert(struct strbuf *sb, size_t pos, const void *data, size_t len) |
| 248 | { |
| 249 | strbuf_splice(sb, pos, 0, data, len); |
| 250 | } |
| 251 | |
Paul-Sebastian Ungureanu | 5ef264d | 2019-02-25 23:16:07 +0000 | [diff] [blame] | 252 | void strbuf_vinsertf(struct strbuf *sb, size_t pos, const char *fmt, va_list ap) |
| 253 | { |
| 254 | int len, len2; |
| 255 | char save; |
| 256 | va_list cp; |
| 257 | |
| 258 | if (pos > sb->len) |
| 259 | die("`pos' is too far after the end of the buffer"); |
| 260 | va_copy(cp, ap); |
| 261 | len = vsnprintf(sb->buf + sb->len, 0, fmt, cp); |
| 262 | va_end(cp); |
| 263 | if (len < 0) |
| 264 | BUG("your vsnprintf is broken (returned %d)", len); |
| 265 | if (!len) |
| 266 | return; /* nothing to do */ |
| 267 | if (unsigned_add_overflows(sb->len, len)) |
| 268 | die("you want to use way too much memory"); |
| 269 | strbuf_grow(sb, len); |
| 270 | memmove(sb->buf + pos + len, sb->buf + pos, sb->len - pos); |
| 271 | /* vsnprintf() will append a NUL, overwriting one of our characters */ |
| 272 | save = sb->buf[pos + len]; |
| 273 | len2 = vsnprintf(sb->buf + pos, len + 1, fmt, ap); |
| 274 | sb->buf[pos + len] = save; |
| 275 | if (len2 != len) |
| 276 | BUG("your vsnprintf is broken (returns inconsistent lengths)"); |
| 277 | strbuf_setlen(sb, sb->len + len); |
| 278 | } |
| 279 | |
| 280 | void strbuf_insertf(struct strbuf *sb, size_t pos, const char *fmt, ...) |
| 281 | { |
| 282 | va_list ap; |
| 283 | va_start(ap, fmt); |
| 284 | strbuf_vinsertf(sb, pos, fmt, ap); |
| 285 | va_end(ap); |
| 286 | } |
| 287 | |
Pierre Habouzit | c76689d | 2007-09-20 00:42:12 +0200 | [diff] [blame] | 288 | void strbuf_remove(struct strbuf *sb, size_t pos, size_t len) |
| 289 | { |
René Scharfe | a8342a4 | 2016-09-13 18:40:22 +0200 | [diff] [blame] | 290 | strbuf_splice(sb, pos, len, "", 0); |
Pierre Habouzit | c76689d | 2007-09-20 00:42:12 +0200 | [diff] [blame] | 291 | } |
| 292 | |
Pierre Habouzit | 917c9a7 | 2007-09-15 15:56:50 +0200 | [diff] [blame] | 293 | void strbuf_add(struct strbuf *sb, const void *data, size_t len) |
| 294 | { |
Pierre Habouzit | b449f4c | 2007-09-06 13:20:05 +0200 | [diff] [blame] | 295 | strbuf_grow(sb, len); |
| 296 | memcpy(sb->buf + sb->len, data, len); |
| 297 | strbuf_setlen(sb, sb->len + len); |
| 298 | } |
| 299 | |
René Scharfe | 31471ba | 2016-07-21 18:46:44 +0200 | [diff] [blame] | 300 | void strbuf_addbuf(struct strbuf *sb, const struct strbuf *sb2) |
| 301 | { |
| 302 | strbuf_grow(sb, sb2->len); |
| 303 | memcpy(sb->buf + sb->len, sb2->buf, sb2->len); |
| 304 | strbuf_setlen(sb, sb->len + sb2->len); |
| 305 | } |
| 306 | |
Paul-Sebastian Ungureanu | e71c4a8 | 2019-02-25 23:16:06 +0000 | [diff] [blame] | 307 | const char *strbuf_join_argv(struct strbuf *buf, |
| 308 | int argc, const char **argv, char delim) |
| 309 | { |
| 310 | if (!argc) |
| 311 | return buf->buf; |
| 312 | |
| 313 | strbuf_addstr(buf, *argv); |
| 314 | while (--argc) { |
| 315 | strbuf_addch(buf, delim); |
| 316 | strbuf_addstr(buf, *(++argv)); |
| 317 | } |
| 318 | |
| 319 | return buf->buf; |
| 320 | } |
| 321 | |
René Scharfe | d07235a | 2014-09-07 09:03:32 +0200 | [diff] [blame] | 322 | void strbuf_addchars(struct strbuf *sb, int c, size_t n) |
| 323 | { |
| 324 | strbuf_grow(sb, n); |
| 325 | memset(sb->buf + sb->len, c, n); |
| 326 | strbuf_setlen(sb, sb->len + n); |
| 327 | } |
| 328 | |
Pierre Habouzit | 917c9a7 | 2007-09-15 15:56:50 +0200 | [diff] [blame] | 329 | void strbuf_addf(struct strbuf *sb, const char *fmt, ...) |
| 330 | { |
Pierre Habouzit | b449f4c | 2007-09-06 13:20:05 +0200 | [diff] [blame] | 331 | va_list ap; |
Jeff King | ebeb609 | 2011-02-25 23:08:53 -0600 | [diff] [blame] | 332 | va_start(ap, fmt); |
| 333 | strbuf_vaddf(sb, fmt, ap); |
| 334 | va_end(ap); |
| 335 | } |
| 336 | |
Junio C Hamano | eff80a9 | 2013-01-16 20:18:48 +0100 | [diff] [blame] | 337 | static void add_lines(struct strbuf *out, |
| 338 | const char *prefix1, |
| 339 | const char *prefix2, |
| 340 | const char *buf, size_t size) |
| 341 | { |
| 342 | while (size) { |
| 343 | const char *prefix; |
| 344 | const char *next = memchr(buf, '\n', size); |
| 345 | next = next ? (next + 1) : (buf + size); |
| 346 | |
Junio C Hamano | d55aeb7 | 2014-10-27 14:13:15 -0700 | [diff] [blame] | 347 | prefix = ((prefix2 && (buf[0] == '\n' || buf[0] == '\t')) |
| 348 | ? prefix2 : prefix1); |
Junio C Hamano | eff80a9 | 2013-01-16 20:18:48 +0100 | [diff] [blame] | 349 | strbuf_addstr(out, prefix); |
| 350 | strbuf_add(out, buf, next - buf); |
| 351 | size -= next - buf; |
| 352 | buf = next; |
| 353 | } |
| 354 | strbuf_complete_line(out); |
| 355 | } |
| 356 | |
| 357 | void strbuf_add_commented_lines(struct strbuf *out, const char *buf, size_t size) |
| 358 | { |
| 359 | static char prefix1[3]; |
| 360 | static char prefix2[2]; |
| 361 | |
| 362 | if (prefix1[0] != comment_line_char) { |
Jeff King | 5096d49 | 2015-09-24 17:06:08 -0400 | [diff] [blame] | 363 | xsnprintf(prefix1, sizeof(prefix1), "%c ", comment_line_char); |
| 364 | xsnprintf(prefix2, sizeof(prefix2), "%c", comment_line_char); |
Junio C Hamano | eff80a9 | 2013-01-16 20:18:48 +0100 | [diff] [blame] | 365 | } |
| 366 | add_lines(out, prefix1, prefix2, buf, size); |
| 367 | } |
| 368 | |
| 369 | void strbuf_commented_addf(struct strbuf *sb, const char *fmt, ...) |
| 370 | { |
| 371 | va_list params; |
| 372 | struct strbuf buf = STRBUF_INIT; |
| 373 | int incomplete_line = sb->len && sb->buf[sb->len - 1] != '\n'; |
| 374 | |
| 375 | va_start(params, fmt); |
| 376 | strbuf_vaddf(&buf, fmt, params); |
| 377 | va_end(params); |
| 378 | |
| 379 | strbuf_add_commented_lines(sb, buf.buf, buf.len); |
| 380 | if (incomplete_line) |
| 381 | sb->buf[--sb->len] = '\0'; |
| 382 | |
| 383 | strbuf_release(&buf); |
| 384 | } |
| 385 | |
Jeff King | ebeb609 | 2011-02-25 23:08:53 -0600 | [diff] [blame] | 386 | void strbuf_vaddf(struct strbuf *sb, const char *fmt, va_list ap) |
| 387 | { |
| 388 | int len; |
| 389 | va_list cp; |
Pierre Habouzit | b449f4c | 2007-09-06 13:20:05 +0200 | [diff] [blame] | 390 | |
Shawn O. Pearce | f141bd8 | 2007-11-13 03:22:44 -0500 | [diff] [blame] | 391 | if (!strbuf_avail(sb)) |
| 392 | strbuf_grow(sb, 64); |
Jeff King | ebeb609 | 2011-02-25 23:08:53 -0600 | [diff] [blame] | 393 | va_copy(cp, ap); |
| 394 | len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, cp); |
| 395 | va_end(cp); |
Shawn O. Pearce | f141bd8 | 2007-11-13 03:22:44 -0500 | [diff] [blame] | 396 | if (len < 0) |
Johannes Schindelin | 033abf9 | 2018-05-02 11:38:39 +0200 | [diff] [blame] | 397 | BUG("your vsnprintf is broken (returned %d)", len); |
Pierre Habouzit | f1696ee | 2007-09-10 12:35:04 +0200 | [diff] [blame] | 398 | if (len > strbuf_avail(sb)) { |
Pierre Habouzit | b449f4c | 2007-09-06 13:20:05 +0200 | [diff] [blame] | 399 | strbuf_grow(sb, len); |
Pierre Habouzit | b449f4c | 2007-09-06 13:20:05 +0200 | [diff] [blame] | 400 | len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap); |
Jeff King | ebeb609 | 2011-02-25 23:08:53 -0600 | [diff] [blame] | 401 | if (len > strbuf_avail(sb)) |
Johannes Schindelin | 033abf9 | 2018-05-02 11:38:39 +0200 | [diff] [blame] | 402 | BUG("your vsnprintf is broken (insatiable)"); |
Pierre Habouzit | b449f4c | 2007-09-06 13:20:05 +0200 | [diff] [blame] | 403 | } |
| 404 | strbuf_setlen(sb, sb->len + len); |
Junio C Hamano | d1df574 | 2005-04-25 18:26:45 -0700 | [diff] [blame] | 405 | } |
| 406 | |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 407 | void strbuf_expand(struct strbuf *sb, const char *format, expand_fn_t fn, |
| 408 | void *context) |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 409 | { |
| 410 | for (;;) { |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 411 | const char *percent; |
| 412 | size_t consumed; |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 413 | |
| 414 | percent = strchrnul(format, '%'); |
| 415 | strbuf_add(sb, format, percent - format); |
| 416 | if (!*percent) |
| 417 | break; |
| 418 | format = percent + 1; |
| 419 | |
Jeff King | 0a0416a | 2010-01-13 12:35:31 -0500 | [diff] [blame] | 420 | if (*format == '%') { |
| 421 | strbuf_addch(sb, '%'); |
| 422 | format++; |
| 423 | continue; |
| 424 | } |
| 425 | |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 426 | consumed = fn(sb, format, context); |
| 427 | if (consumed) |
| 428 | format += consumed; |
| 429 | else |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 430 | strbuf_addch(sb, '%'); |
| 431 | } |
| 432 | } |
| 433 | |
Anders Waldenborg | fd2015b | 2019-01-28 22:33:36 +0100 | [diff] [blame] | 434 | size_t strbuf_expand_literal_cb(struct strbuf *sb, |
| 435 | const char *placeholder, |
| 436 | void *context) |
| 437 | { |
| 438 | int ch; |
| 439 | |
| 440 | switch (placeholder[0]) { |
| 441 | case 'n': /* newline */ |
| 442 | strbuf_addch(sb, '\n'); |
| 443 | return 1; |
| 444 | case 'x': |
| 445 | /* %x00 == NUL, %x0a == LF, etc. */ |
| 446 | ch = hex2chr(placeholder + 1); |
| 447 | if (ch < 0) |
| 448 | return 0; |
| 449 | strbuf_addch(sb, ch); |
| 450 | return 3; |
| 451 | } |
| 452 | return 0; |
| 453 | } |
| 454 | |
René Scharfe | 9b864e7 | 2008-11-23 00:09:30 +0100 | [diff] [blame] | 455 | size_t strbuf_expand_dict_cb(struct strbuf *sb, const char *placeholder, |
| 456 | void *context) |
| 457 | { |
| 458 | struct strbuf_expand_dict_entry *e = context; |
| 459 | size_t len; |
| 460 | |
| 461 | for (; e->placeholder && (len = strlen(e->placeholder)); e++) { |
| 462 | if (!strncmp(placeholder, e->placeholder, len)) { |
| 463 | if (e->value) |
| 464 | strbuf_addstr(sb, e->value); |
| 465 | return len; |
| 466 | } |
| 467 | } |
| 468 | return 0; |
| 469 | } |
| 470 | |
Jeff King | 361df5d | 2010-01-13 12:36:42 -0500 | [diff] [blame] | 471 | void strbuf_addbuf_percentquote(struct strbuf *dst, const struct strbuf *src) |
| 472 | { |
Jeff King | 26114c0 | 2018-07-24 06:51:08 -0400 | [diff] [blame] | 473 | size_t i, len = src->len; |
Jeff King | 361df5d | 2010-01-13 12:36:42 -0500 | [diff] [blame] | 474 | |
| 475 | for (i = 0; i < len; i++) { |
| 476 | if (src->buf[i] == '%') |
| 477 | strbuf_addch(dst, '%'); |
| 478 | strbuf_addch(dst, src->buf[i]); |
| 479 | } |
| 480 | } |
| 481 | |
Pierre Habouzit | 917c9a7 | 2007-09-15 15:56:50 +0200 | [diff] [blame] | 482 | size_t strbuf_fread(struct strbuf *sb, size_t size, FILE *f) |
| 483 | { |
Pierre Habouzit | b449f4c | 2007-09-06 13:20:05 +0200 | [diff] [blame] | 484 | size_t res; |
René Scharfe | 2fc6470 | 2009-01-06 21:41:14 +0100 | [diff] [blame] | 485 | size_t oldalloc = sb->alloc; |
Pierre Habouzit | b449f4c | 2007-09-06 13:20:05 +0200 | [diff] [blame] | 486 | |
| 487 | strbuf_grow(sb, size); |
| 488 | res = fread(sb->buf + sb->len, 1, size, f); |
René Scharfe | 2fc6470 | 2009-01-06 21:41:14 +0100 | [diff] [blame] | 489 | if (res > 0) |
Pierre Habouzit | b449f4c | 2007-09-06 13:20:05 +0200 | [diff] [blame] | 490 | strbuf_setlen(sb, sb->len + res); |
Roel Kluin | 6651c3f | 2009-06-22 18:42:33 +0200 | [diff] [blame] | 491 | else if (oldalloc == 0) |
René Scharfe | 2fc6470 | 2009-01-06 21:41:14 +0100 | [diff] [blame] | 492 | strbuf_release(sb); |
Pierre Habouzit | b449f4c | 2007-09-06 13:20:05 +0200 | [diff] [blame] | 493 | return res; |
| 494 | } |
| 495 | |
Pierre Habouzit | f1696ee | 2007-09-10 12:35:04 +0200 | [diff] [blame] | 496 | ssize_t strbuf_read(struct strbuf *sb, int fd, size_t hint) |
Pierre Habouzit | b449f4c | 2007-09-06 13:20:05 +0200 | [diff] [blame] | 497 | { |
| 498 | size_t oldlen = sb->len; |
René Scharfe | 2fc6470 | 2009-01-06 21:41:14 +0100 | [diff] [blame] | 499 | size_t oldalloc = sb->alloc; |
Pierre Habouzit | b449f4c | 2007-09-06 13:20:05 +0200 | [diff] [blame] | 500 | |
Pierre Habouzit | f1696ee | 2007-09-10 12:35:04 +0200 | [diff] [blame] | 501 | strbuf_grow(sb, hint ? hint : 8192); |
Pierre Habouzit | b449f4c | 2007-09-06 13:20:05 +0200 | [diff] [blame] | 502 | for (;;) { |
Jim Hill | 3ebbd00 | 2015-05-31 11:16:45 -0700 | [diff] [blame] | 503 | ssize_t want = sb->alloc - sb->len - 1; |
| 504 | ssize_t got = read_in_full(fd, sb->buf + sb->len, want); |
Pierre Habouzit | b449f4c | 2007-09-06 13:20:05 +0200 | [diff] [blame] | 505 | |
Jim Hill | 3ebbd00 | 2015-05-31 11:16:45 -0700 | [diff] [blame] | 506 | if (got < 0) { |
René Scharfe | 2fc6470 | 2009-01-06 21:41:14 +0100 | [diff] [blame] | 507 | if (oldalloc == 0) |
| 508 | strbuf_release(sb); |
| 509 | else |
| 510 | strbuf_setlen(sb, oldlen); |
Pierre Habouzit | b449f4c | 2007-09-06 13:20:05 +0200 | [diff] [blame] | 511 | return -1; |
| 512 | } |
Jim Hill | 3ebbd00 | 2015-05-31 11:16:45 -0700 | [diff] [blame] | 513 | sb->len += got; |
| 514 | if (got < want) |
Pierre Habouzit | b449f4c | 2007-09-06 13:20:05 +0200 | [diff] [blame] | 515 | break; |
Pierre Habouzit | f1696ee | 2007-09-10 12:35:04 +0200 | [diff] [blame] | 516 | strbuf_grow(sb, 8192); |
Pierre Habouzit | b449f4c | 2007-09-06 13:20:05 +0200 | [diff] [blame] | 517 | } |
| 518 | |
| 519 | sb->buf[sb->len] = '\0'; |
| 520 | return sb->len - oldlen; |
Junio C Hamano | d1df574 | 2005-04-25 18:26:45 -0700 | [diff] [blame] | 521 | } |
| 522 | |
Stefan Beller | b4e04fb | 2015-12-15 16:04:08 -0800 | [diff] [blame] | 523 | ssize_t strbuf_read_once(struct strbuf *sb, int fd, size_t hint) |
| 524 | { |
René Scharfe | c3ff8f6 | 2017-12-07 21:51:26 +0100 | [diff] [blame] | 525 | size_t oldalloc = sb->alloc; |
Stefan Beller | b4e04fb | 2015-12-15 16:04:08 -0800 | [diff] [blame] | 526 | ssize_t cnt; |
| 527 | |
| 528 | strbuf_grow(sb, hint ? hint : 8192); |
| 529 | cnt = xread(fd, sb->buf + sb->len, sb->alloc - sb->len - 1); |
| 530 | if (cnt > 0) |
| 531 | strbuf_setlen(sb, sb->len + cnt); |
René Scharfe | c3ff8f6 | 2017-12-07 21:51:26 +0100 | [diff] [blame] | 532 | else if (oldalloc == 0) |
| 533 | strbuf_release(sb); |
Stefan Beller | b4e04fb | 2015-12-15 16:04:08 -0800 | [diff] [blame] | 534 | return cnt; |
| 535 | } |
| 536 | |
Stefan Beller | 2dac9b5 | 2016-02-29 18:07:15 -0800 | [diff] [blame] | 537 | ssize_t strbuf_write(struct strbuf *sb, FILE *f) |
| 538 | { |
| 539 | return sb->len ? fwrite(sb->buf, 1, sb->len, f) : 0; |
| 540 | } |
| 541 | |
| 542 | |
Linus Torvalds | b11b7e1 | 2008-12-17 09:36:40 -0800 | [diff] [blame] | 543 | #define STRBUF_MAXLINK (2*PATH_MAX) |
| 544 | |
| 545 | int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint) |
| 546 | { |
René Scharfe | 2fc6470 | 2009-01-06 21:41:14 +0100 | [diff] [blame] | 547 | size_t oldalloc = sb->alloc; |
| 548 | |
Linus Torvalds | b11b7e1 | 2008-12-17 09:36:40 -0800 | [diff] [blame] | 549 | if (hint < 32) |
| 550 | hint = 32; |
| 551 | |
| 552 | while (hint < STRBUF_MAXLINK) { |
Jeff King | f3e76ed | 2018-07-24 06:51:25 -0400 | [diff] [blame] | 553 | ssize_t len; |
Linus Torvalds | b11b7e1 | 2008-12-17 09:36:40 -0800 | [diff] [blame] | 554 | |
| 555 | strbuf_grow(sb, hint); |
| 556 | len = readlink(path, sb->buf, hint); |
| 557 | if (len < 0) { |
| 558 | if (errno != ERANGE) |
| 559 | break; |
| 560 | } else if (len < hint) { |
| 561 | strbuf_setlen(sb, len); |
| 562 | return 0; |
| 563 | } |
| 564 | |
| 565 | /* .. the buffer was too small - try again */ |
| 566 | hint *= 2; |
| 567 | } |
René Scharfe | 2fc6470 | 2009-01-06 21:41:14 +0100 | [diff] [blame] | 568 | if (oldalloc == 0) |
| 569 | strbuf_release(sb); |
Linus Torvalds | b11b7e1 | 2008-12-17 09:36:40 -0800 | [diff] [blame] | 570 | return -1; |
| 571 | } |
| 572 | |
René Scharfe | f22a76e | 2014-07-28 20:24:29 +0200 | [diff] [blame] | 573 | int strbuf_getcwd(struct strbuf *sb) |
| 574 | { |
| 575 | size_t oldalloc = sb->alloc; |
| 576 | size_t guessed_len = 128; |
| 577 | |
| 578 | for (;; guessed_len *= 2) { |
| 579 | strbuf_grow(sb, guessed_len); |
| 580 | if (getcwd(sb->buf, sb->alloc)) { |
| 581 | strbuf_setlen(sb, strlen(sb->buf)); |
| 582 | return 0; |
| 583 | } |
René Scharfe | a54e938 | 2017-03-26 15:43:50 +0200 | [diff] [blame] | 584 | |
| 585 | /* |
| 586 | * If getcwd(3) is implemented as a syscall that falls |
| 587 | * back to a regular lookup using readdir(3) etc. then |
| 588 | * we may be able to avoid EACCES by providing enough |
| 589 | * space to the syscall as it's not necessarily bound |
| 590 | * to the same restrictions as the fallback. |
| 591 | */ |
| 592 | if (errno == EACCES && guessed_len < PATH_MAX) |
| 593 | continue; |
| 594 | |
René Scharfe | f22a76e | 2014-07-28 20:24:29 +0200 | [diff] [blame] | 595 | if (errno != ERANGE) |
| 596 | break; |
| 597 | } |
| 598 | if (oldalloc == 0) |
| 599 | strbuf_release(sb); |
| 600 | else |
| 601 | strbuf_reset(sb); |
| 602 | return -1; |
| 603 | } |
| 604 | |
Jeff King | 0cc30e0 | 2015-04-16 05:01:38 -0400 | [diff] [blame] | 605 | #ifdef HAVE_GETDELIM |
| 606 | int strbuf_getwholeline(struct strbuf *sb, FILE *fp, int term) |
| 607 | { |
| 608 | ssize_t r; |
| 609 | |
| 610 | if (feof(fp)) |
| 611 | return EOF; |
| 612 | |
| 613 | strbuf_reset(sb); |
| 614 | |
| 615 | /* Translate slopbuf to NULL, as we cannot call realloc on it */ |
| 616 | if (!sb->alloc) |
| 617 | sb->buf = NULL; |
René Scharfe | 642956c | 2017-08-10 22:56:40 +0200 | [diff] [blame] | 618 | errno = 0; |
Jeff King | 0cc30e0 | 2015-04-16 05:01:38 -0400 | [diff] [blame] | 619 | r = getdelim(&sb->buf, &sb->alloc, term, fp); |
| 620 | |
| 621 | if (r > 0) { |
| 622 | sb->len = r; |
| 623 | return 0; |
| 624 | } |
| 625 | assert(r == -1); |
| 626 | |
| 627 | /* |
| 628 | * Normally we would have called xrealloc, which will try to free |
| 629 | * memory and recover. But we have no way to tell getdelim() to do so. |
| 630 | * Worse, we cannot try to recover ENOMEM ourselves, because we have |
| 631 | * no idea how many bytes were read by getdelim. |
| 632 | * |
| 633 | * Dying here is reasonable. It mirrors what xrealloc would do on |
| 634 | * catastrophic memory failure. We skip the opportunity to free pack |
| 635 | * memory and retry, but that's unlikely to help for a malloc small |
| 636 | * enough to hold a single line of input, anyway. |
| 637 | */ |
| 638 | if (errno == ENOMEM) |
| 639 | die("Out of memory, getdelim failed"); |
| 640 | |
Jeff King | b709043 | 2016-03-05 13:43:30 -0500 | [diff] [blame] | 641 | /* |
| 642 | * Restore strbuf invariants; if getdelim left us with a NULL pointer, |
| 643 | * we can just re-init, but otherwise we should make sure that our |
| 644 | * length is empty, and that the result is NUL-terminated. |
| 645 | */ |
Jeff King | 0cc30e0 | 2015-04-16 05:01:38 -0400 | [diff] [blame] | 646 | if (!sb->buf) |
| 647 | strbuf_init(sb, 0); |
Jeff King | b709043 | 2016-03-05 13:43:30 -0500 | [diff] [blame] | 648 | else |
| 649 | strbuf_reset(sb); |
Jeff King | 0cc30e0 | 2015-04-16 05:01:38 -0400 | [diff] [blame] | 650 | return EOF; |
| 651 | } |
| 652 | #else |
Brandon Casey | c7e4f0d | 2009-08-04 22:31:56 -0500 | [diff] [blame] | 653 | int strbuf_getwholeline(struct strbuf *sb, FILE *fp, int term) |
Pierre Habouzit | 917c9a7 | 2007-09-15 15:56:50 +0200 | [diff] [blame] | 654 | { |
Junio C Hamano | d1df574 | 2005-04-25 18:26:45 -0700 | [diff] [blame] | 655 | int ch; |
Pierre Habouzit | e6c019d | 2007-09-17 11:19:04 +0200 | [diff] [blame] | 656 | |
Pierre Habouzit | e6c019d | 2007-09-17 11:19:04 +0200 | [diff] [blame] | 657 | if (feof(fp)) |
| 658 | return EOF; |
Pierre Habouzit | b449f4c | 2007-09-06 13:20:05 +0200 | [diff] [blame] | 659 | |
| 660 | strbuf_reset(sb); |
Jeff King | 82912d1 | 2015-04-16 04:49:06 -0400 | [diff] [blame] | 661 | flockfile(fp); |
| 662 | while ((ch = getc_unlocked(fp)) != EOF) { |
Jeff King | f80c153 | 2015-04-16 04:58:54 -0400 | [diff] [blame] | 663 | if (!strbuf_avail(sb)) |
| 664 | strbuf_grow(sb, 1); |
Pierre Habouzit | b449f4c | 2007-09-06 13:20:05 +0200 | [diff] [blame] | 665 | sb->buf[sb->len++] = ch; |
Brandon Casey | c7e4f0d | 2009-08-04 22:31:56 -0500 | [diff] [blame] | 666 | if (ch == term) |
| 667 | break; |
Junio C Hamano | d1df574 | 2005-04-25 18:26:45 -0700 | [diff] [blame] | 668 | } |
Jeff King | 82912d1 | 2015-04-16 04:49:06 -0400 | [diff] [blame] | 669 | funlockfile(fp); |
Pierre Habouzit | e6c019d | 2007-09-17 11:19:04 +0200 | [diff] [blame] | 670 | if (ch == EOF && sb->len == 0) |
| 671 | return EOF; |
Pierre Habouzit | b449f4c | 2007-09-06 13:20:05 +0200 | [diff] [blame] | 672 | |
Pierre Habouzit | b449f4c | 2007-09-06 13:20:05 +0200 | [diff] [blame] | 673 | sb->buf[sb->len] = '\0'; |
Pierre Habouzit | e6c019d | 2007-09-17 11:19:04 +0200 | [diff] [blame] | 674 | return 0; |
Junio C Hamano | d1df574 | 2005-04-25 18:26:45 -0700 | [diff] [blame] | 675 | } |
Jeff King | 0cc30e0 | 2015-04-16 05:01:38 -0400 | [diff] [blame] | 676 | #endif |
Kristian Høgsberg | a9390b9 | 2007-09-17 20:06:46 -0400 | [diff] [blame] | 677 | |
Junio C Hamano | 1a0c8df | 2016-01-13 18:32:23 -0800 | [diff] [blame] | 678 | static int strbuf_getdelim(struct strbuf *sb, FILE *fp, int term) |
Brandon Casey | c7e4f0d | 2009-08-04 22:31:56 -0500 | [diff] [blame] | 679 | { |
| 680 | if (strbuf_getwholeline(sb, fp, term)) |
| 681 | return EOF; |
Junio C Hamano | dce80bd | 2016-01-13 15:10:45 -0800 | [diff] [blame] | 682 | if (sb->buf[sb->len - 1] == term) |
| 683 | strbuf_setlen(sb, sb->len - 1); |
Brandon Casey | c7e4f0d | 2009-08-04 22:31:56 -0500 | [diff] [blame] | 684 | return 0; |
| 685 | } |
| 686 | |
Junio C Hamano | 1a0c8df | 2016-01-13 18:32:23 -0800 | [diff] [blame] | 687 | int strbuf_getline(struct strbuf *sb, FILE *fp) |
Junio C Hamano | c8aa9fd | 2015-10-28 13:17:29 -0700 | [diff] [blame] | 688 | { |
| 689 | if (strbuf_getwholeline(sb, fp, '\n')) |
| 690 | return EOF; |
| 691 | if (sb->buf[sb->len - 1] == '\n') { |
| 692 | strbuf_setlen(sb, sb->len - 1); |
| 693 | if (sb->len && sb->buf[sb->len - 1] == '\r') |
| 694 | strbuf_setlen(sb, sb->len - 1); |
| 695 | } |
| 696 | return 0; |
| 697 | } |
| 698 | |
Junio C Hamano | 8f309ae | 2016-01-13 15:31:17 -0800 | [diff] [blame] | 699 | int strbuf_getline_lf(struct strbuf *sb, FILE *fp) |
| 700 | { |
Junio C Hamano | 1a0c8df | 2016-01-13 18:32:23 -0800 | [diff] [blame] | 701 | return strbuf_getdelim(sb, fp, '\n'); |
Junio C Hamano | 8f309ae | 2016-01-13 15:31:17 -0800 | [diff] [blame] | 702 | } |
| 703 | |
| 704 | int strbuf_getline_nul(struct strbuf *sb, FILE *fp) |
| 705 | { |
Junio C Hamano | 1a0c8df | 2016-01-13 18:32:23 -0800 | [diff] [blame] | 706 | return strbuf_getdelim(sb, fp, '\0'); |
Junio C Hamano | 8f309ae | 2016-01-13 15:31:17 -0800 | [diff] [blame] | 707 | } |
| 708 | |
Thomas Rast | 5e8617f | 2012-02-22 20:34:22 +0100 | [diff] [blame] | 709 | int strbuf_getwholeline_fd(struct strbuf *sb, int fd, int term) |
| 710 | { |
| 711 | strbuf_reset(sb); |
| 712 | |
| 713 | while (1) { |
| 714 | char ch; |
| 715 | ssize_t len = xread(fd, &ch, 1); |
| 716 | if (len <= 0) |
| 717 | return EOF; |
| 718 | strbuf_addch(sb, ch); |
| 719 | if (ch == term) |
| 720 | break; |
| 721 | } |
| 722 | return 0; |
| 723 | } |
| 724 | |
Michael Haggerty | 6c8afe4 | 2015-07-03 15:59:32 +0200 | [diff] [blame] | 725 | ssize_t strbuf_read_file(struct strbuf *sb, const char *path, size_t hint) |
Kristian Høgsberg | a9390b9 | 2007-09-17 20:06:46 -0400 | [diff] [blame] | 726 | { |
Michael Haggerty | 6c8afe4 | 2015-07-03 15:59:32 +0200 | [diff] [blame] | 727 | int fd; |
| 728 | ssize_t len; |
Jeff King | 79f0ba1 | 2018-02-23 02:00:54 -0500 | [diff] [blame] | 729 | int saved_errno; |
Kristian Høgsberg | a9390b9 | 2007-09-17 20:06:46 -0400 | [diff] [blame] | 730 | |
| 731 | fd = open(path, O_RDONLY); |
| 732 | if (fd < 0) |
| 733 | return -1; |
Pierre Habouzit | 387e7e1 | 2007-09-27 15:25:55 +0200 | [diff] [blame] | 734 | len = strbuf_read(sb, fd, hint); |
Jeff King | 79f0ba1 | 2018-02-23 02:00:54 -0500 | [diff] [blame] | 735 | saved_errno = errno; |
Kristian Høgsberg | a9390b9 | 2007-09-17 20:06:46 -0400 | [diff] [blame] | 736 | close(fd); |
Jeff King | 79f0ba1 | 2018-02-23 02:00:54 -0500 | [diff] [blame] | 737 | if (len < 0) { |
| 738 | errno = saved_errno; |
Kristian Høgsberg | a9390b9 | 2007-09-17 20:06:46 -0400 | [diff] [blame] | 739 | return -1; |
Jeff King | 79f0ba1 | 2018-02-23 02:00:54 -0500 | [diff] [blame] | 740 | } |
Kristian Høgsberg | a9390b9 | 2007-09-17 20:06:46 -0400 | [diff] [blame] | 741 | |
| 742 | return len; |
| 743 | } |
Junio C Hamano | 895680f | 2011-11-04 21:06:30 -0700 | [diff] [blame] | 744 | |
| 745 | void strbuf_add_lines(struct strbuf *out, const char *prefix, |
| 746 | const char *buf, size_t size) |
| 747 | { |
Junio C Hamano | eff80a9 | 2013-01-16 20:18:48 +0100 | [diff] [blame] | 748 | add_lines(out, prefix, NULL, buf, size); |
Junio C Hamano | 895680f | 2011-11-04 21:06:30 -0700 | [diff] [blame] | 749 | } |
Junio C Hamano | 367d20e | 2011-12-19 16:05:16 -0800 | [diff] [blame] | 750 | |
Michael Haggerty | 5963c03 | 2012-11-25 12:08:34 +0100 | [diff] [blame] | 751 | void strbuf_addstr_xml_quoted(struct strbuf *buf, const char *s) |
| 752 | { |
| 753 | while (*s) { |
| 754 | size_t len = strcspn(s, "\"<>&"); |
| 755 | strbuf_add(buf, s, len); |
| 756 | s += len; |
| 757 | switch (*s) { |
| 758 | case '"': |
| 759 | strbuf_addstr(buf, """); |
| 760 | break; |
| 761 | case '<': |
| 762 | strbuf_addstr(buf, "<"); |
| 763 | break; |
| 764 | case '>': |
| 765 | strbuf_addstr(buf, ">"); |
| 766 | break; |
| 767 | case '&': |
| 768 | strbuf_addstr(buf, "&"); |
| 769 | break; |
| 770 | case 0: |
| 771 | return; |
| 772 | } |
| 773 | s++; |
| 774 | } |
| 775 | } |
| 776 | |
Matthew DeVore | c269495 | 2019-06-27 15:54:11 -0700 | [diff] [blame] | 777 | int is_rfc3986_reserved_or_unreserved(char ch) |
Jeff King | c505116 | 2011-12-10 05:34:20 -0500 | [diff] [blame] | 778 | { |
Matthew DeVore | c269495 | 2019-06-27 15:54:11 -0700 | [diff] [blame] | 779 | if (is_rfc3986_unreserved(ch)) |
| 780 | return 1; |
Jeff King | c505116 | 2011-12-10 05:34:20 -0500 | [diff] [blame] | 781 | switch (ch) { |
| 782 | case '!': case '*': case '\'': case '(': case ')': case ';': |
| 783 | case ':': case '@': case '&': case '=': case '+': case '$': |
| 784 | case ',': case '/': case '?': case '#': case '[': case ']': |
| 785 | return 1; |
| 786 | } |
| 787 | return 0; |
| 788 | } |
| 789 | |
Matthew DeVore | c269495 | 2019-06-27 15:54:11 -0700 | [diff] [blame] | 790 | int is_rfc3986_unreserved(char ch) |
Jeff King | c505116 | 2011-12-10 05:34:20 -0500 | [diff] [blame] | 791 | { |
| 792 | return isalnum(ch) || |
| 793 | ch == '-' || ch == '_' || ch == '.' || ch == '~'; |
| 794 | } |
| 795 | |
Junio C Hamano | ea03a8e | 2012-09-15 22:43:15 -0700 | [diff] [blame] | 796 | static void strbuf_add_urlencode(struct strbuf *sb, const char *s, size_t len, |
Matthew DeVore | c269495 | 2019-06-27 15:54:11 -0700 | [diff] [blame] | 797 | char_predicate allow_unencoded_fn) |
Jeff King | c505116 | 2011-12-10 05:34:20 -0500 | [diff] [blame] | 798 | { |
| 799 | strbuf_grow(sb, len); |
| 800 | while (len--) { |
| 801 | char ch = *s++; |
Matthew DeVore | c269495 | 2019-06-27 15:54:11 -0700 | [diff] [blame] | 802 | if (allow_unencoded_fn(ch)) |
Jeff King | c505116 | 2011-12-10 05:34:20 -0500 | [diff] [blame] | 803 | strbuf_addch(sb, ch); |
| 804 | else |
Julien Dusser | 4c267f2 | 2017-12-22 18:24:37 +0100 | [diff] [blame] | 805 | strbuf_addf(sb, "%%%02x", (unsigned char)ch); |
Jeff King | c505116 | 2011-12-10 05:34:20 -0500 | [diff] [blame] | 806 | } |
| 807 | } |
| 808 | |
| 809 | void strbuf_addstr_urlencode(struct strbuf *sb, const char *s, |
Matthew DeVore | c269495 | 2019-06-27 15:54:11 -0700 | [diff] [blame] | 810 | char_predicate allow_unencoded_fn) |
Jeff King | c505116 | 2011-12-10 05:34:20 -0500 | [diff] [blame] | 811 | { |
Matthew DeVore | c269495 | 2019-06-27 15:54:11 -0700 | [diff] [blame] | 812 | strbuf_add_urlencode(sb, s, strlen(s), allow_unencoded_fn); |
Jeff King | c505116 | 2011-12-10 05:34:20 -0500 | [diff] [blame] | 813 | } |
Nguyễn Thái Ngọc Duy | 9a0a30a | 2012-04-23 19:30:22 +0700 | [diff] [blame] | 814 | |
Dimitriy Ryazantcev | 8f354a1 | 2019-07-02 21:22:48 +0300 | [diff] [blame] | 815 | static void strbuf_humanise(struct strbuf *buf, off_t bytes, |
| 816 | int humanise_rate) |
Antoine Pelisse | 079b546 | 2013-04-10 21:03:23 +0200 | [diff] [blame] | 817 | { |
| 818 | if (bytes > 1 << 30) { |
Dimitriy Ryazantcev | 8f354a1 | 2019-07-02 21:22:48 +0300 | [diff] [blame] | 819 | strbuf_addf(buf, |
| 820 | humanise_rate == 0 ? |
| 821 | /* TRANSLATORS: IEC 80000-13:2008 gibibyte */ |
| 822 | _("%u.%2.2u GiB") : |
| 823 | /* TRANSLATORS: IEC 80000-13:2008 gibibyte/second */ |
| 824 | _("%u.%2.2u GiB/s"), |
Jeff King | 7726d36 | 2018-07-24 06:52:29 -0400 | [diff] [blame] | 825 | (unsigned)(bytes >> 30), |
| 826 | (unsigned)(bytes & ((1 << 30) - 1)) / 10737419); |
Antoine Pelisse | 079b546 | 2013-04-10 21:03:23 +0200 | [diff] [blame] | 827 | } else if (bytes > 1 << 20) { |
Jeff King | 7726d36 | 2018-07-24 06:52:29 -0400 | [diff] [blame] | 828 | unsigned x = bytes + 5243; /* for rounding */ |
Dimitriy Ryazantcev | 8f354a1 | 2019-07-02 21:22:48 +0300 | [diff] [blame] | 829 | strbuf_addf(buf, |
| 830 | humanise_rate == 0 ? |
| 831 | /* TRANSLATORS: IEC 80000-13:2008 mebibyte */ |
| 832 | _("%u.%2.2u MiB") : |
| 833 | /* TRANSLATORS: IEC 80000-13:2008 mebibyte/second */ |
| 834 | _("%u.%2.2u MiB/s"), |
Antoine Pelisse | 079b546 | 2013-04-10 21:03:23 +0200 | [diff] [blame] | 835 | x >> 20, ((x & ((1 << 20) - 1)) * 100) >> 20); |
| 836 | } else if (bytes > 1 << 10) { |
Jeff King | 7726d36 | 2018-07-24 06:52:29 -0400 | [diff] [blame] | 837 | unsigned x = bytes + 5; /* for rounding */ |
Dimitriy Ryazantcev | 8f354a1 | 2019-07-02 21:22:48 +0300 | [diff] [blame] | 838 | strbuf_addf(buf, |
| 839 | humanise_rate == 0 ? |
| 840 | /* TRANSLATORS: IEC 80000-13:2008 kibibyte */ |
| 841 | _("%u.%2.2u KiB") : |
| 842 | /* TRANSLATORS: IEC 80000-13:2008 kibibyte/second */ |
| 843 | _("%u.%2.2u KiB/s"), |
Antoine Pelisse | 079b546 | 2013-04-10 21:03:23 +0200 | [diff] [blame] | 844 | x >> 10, ((x & ((1 << 10) - 1)) * 100) >> 10); |
| 845 | } else { |
Dimitriy Ryazantcev | 8f354a1 | 2019-07-02 21:22:48 +0300 | [diff] [blame] | 846 | strbuf_addf(buf, |
| 847 | humanise_rate == 0 ? |
| 848 | /* TRANSLATORS: IEC 80000-13:2008 byte */ |
| 849 | Q_("%u byte", "%u bytes", (unsigned)bytes) : |
| 850 | /* TRANSLATORS: IEC 80000-13:2008 byte/second */ |
| 851 | Q_("%u byte/s", "%u bytes/s", (unsigned)bytes), |
| 852 | (unsigned)bytes); |
Antoine Pelisse | 079b546 | 2013-04-10 21:03:23 +0200 | [diff] [blame] | 853 | } |
| 854 | } |
| 855 | |
Dimitriy Ryazantcev | 8f354a1 | 2019-07-02 21:22:48 +0300 | [diff] [blame] | 856 | void strbuf_humanise_bytes(struct strbuf *buf, off_t bytes) |
| 857 | { |
| 858 | strbuf_humanise(buf, bytes, 0); |
| 859 | } |
| 860 | |
| 861 | void strbuf_humanise_rate(struct strbuf *buf, off_t bytes) |
| 862 | { |
| 863 | strbuf_humanise(buf, bytes, 1); |
| 864 | } |
| 865 | |
René Scharfe | 679eebe | 2014-07-28 20:33:55 +0200 | [diff] [blame] | 866 | void strbuf_add_absolute_path(struct strbuf *sb, const char *path) |
| 867 | { |
| 868 | if (!*path) |
| 869 | die("The empty string is not a valid path"); |
| 870 | if (!is_absolute_path(path)) { |
| 871 | struct stat cwd_stat, pwd_stat; |
| 872 | size_t orig_len = sb->len; |
| 873 | char *cwd = xgetcwd(); |
| 874 | char *pwd = getenv("PWD"); |
| 875 | if (pwd && strcmp(pwd, cwd) && |
| 876 | !stat(cwd, &cwd_stat) && |
| 877 | (cwd_stat.st_dev || cwd_stat.st_ino) && |
| 878 | !stat(pwd, &pwd_stat) && |
| 879 | pwd_stat.st_dev == cwd_stat.st_dev && |
| 880 | pwd_stat.st_ino == cwd_stat.st_ino) |
| 881 | strbuf_addstr(sb, pwd); |
| 882 | else |
| 883 | strbuf_addstr(sb, cwd); |
| 884 | if (sb->len > orig_len && !is_dir_sep(sb->buf[sb->len - 1])) |
| 885 | strbuf_addch(sb, '/'); |
| 886 | free(cwd); |
| 887 | } |
| 888 | strbuf_addstr(sb, path); |
| 889 | } |
| 890 | |
René Scharfe | 33ad9dd | 2017-02-25 17:00:33 +0100 | [diff] [blame] | 891 | void strbuf_add_real_path(struct strbuf *sb, const char *path) |
| 892 | { |
| 893 | if (sb->len) { |
| 894 | struct strbuf resolved = STRBUF_INIT; |
| 895 | strbuf_realpath(&resolved, path, 1); |
| 896 | strbuf_addbuf(sb, &resolved); |
| 897 | strbuf_release(&resolved); |
| 898 | } else |
| 899 | strbuf_realpath(sb, path, 1); |
| 900 | } |
| 901 | |
Nguyễn Thái Ngọc Duy | 9a0a30a | 2012-04-23 19:30:22 +0700 | [diff] [blame] | 902 | int printf_ln(const char *fmt, ...) |
| 903 | { |
| 904 | int ret; |
| 905 | va_list ap; |
| 906 | va_start(ap, fmt); |
| 907 | ret = vprintf(fmt, ap); |
| 908 | va_end(ap); |
| 909 | if (ret < 0 || putchar('\n') == EOF) |
| 910 | return -1; |
| 911 | return ret + 1; |
| 912 | } |
| 913 | |
| 914 | int fprintf_ln(FILE *fp, const char *fmt, ...) |
| 915 | { |
| 916 | int ret; |
| 917 | va_list ap; |
| 918 | va_start(ap, fmt); |
| 919 | ret = vfprintf(fp, fmt, ap); |
| 920 | va_end(ap); |
| 921 | if (ret < 0 || putc('\n', fp) == EOF) |
| 922 | return -1; |
| 923 | return ret + 1; |
| 924 | } |
Jeff King | 88d5a6f | 2014-05-22 05:44:09 -0400 | [diff] [blame] | 925 | |
| 926 | char *xstrdup_tolower(const char *string) |
| 927 | { |
| 928 | char *result; |
| 929 | size_t len, i; |
| 930 | |
| 931 | len = strlen(string); |
Jeff King | 3733e69 | 2016-02-22 17:44:28 -0500 | [diff] [blame] | 932 | result = xmallocz(len); |
Jeff King | 88d5a6f | 2014-05-22 05:44:09 -0400 | [diff] [blame] | 933 | for (i = 0; i < len; i++) |
| 934 | result[i] = tolower(string[i]); |
Jeff King | 88d5a6f | 2014-05-22 05:44:09 -0400 | [diff] [blame] | 935 | return result; |
| 936 | } |
Jeff King | 30a0ddb | 2014-06-18 16:01:34 -0400 | [diff] [blame] | 937 | |
Lars Schneider | 13ecb463 | 2018-02-15 16:27:06 +0100 | [diff] [blame] | 938 | char *xstrdup_toupper(const char *string) |
| 939 | { |
| 940 | char *result; |
| 941 | size_t len, i; |
| 942 | |
| 943 | len = strlen(string); |
| 944 | result = xmallocz(len); |
| 945 | for (i = 0; i < len; i++) |
| 946 | result[i] = toupper(string[i]); |
Junio C Hamano | d1df574 | 2005-04-25 18:26:45 -0700 | [diff] [blame] | 947 | return result; |
| 948 | } |
Jeff King | 30a0ddb | 2014-06-18 16:01:34 -0400 | [diff] [blame] | 949 | |
| 950 | char *xstrvfmt(const char *fmt, va_list ap) |
| 951 | { |
| 952 | struct strbuf buf = STRBUF_INIT; |
| 953 | strbuf_vaddf(&buf, fmt, ap); |
| 954 | return strbuf_detach(&buf, NULL); |
| 955 | } |
| 956 | |
| 957 | char *xstrfmt(const char *fmt, ...) |
| 958 | { |
| 959 | va_list ap; |
| 960 | char *ret; |
| 961 | |
| 962 | va_start(ap, fmt); |
| 963 | ret = xstrvfmt(fmt, ap); |
| 964 | va_end(ap); |
| 965 | |
| 966 | return ret; |
| 967 | } |
Jeff King | aa1462c | 2015-06-25 12:55:45 -0400 | [diff] [blame] | 968 | |
René Scharfe | c3fbf81 | 2017-06-15 14:29:53 +0200 | [diff] [blame] | 969 | void strbuf_addftime(struct strbuf *sb, const char *fmt, const struct tm *tm, |
Ævar Arnfjörð Bjarmason | 3b70223 | 2017-07-01 13:15:47 +0000 | [diff] [blame] | 970 | int tz_offset, int suppress_tz_name) |
Jeff King | aa1462c | 2015-06-25 12:55:45 -0400 | [diff] [blame] | 971 | { |
René Scharfe | c3fbf81 | 2017-06-15 14:29:53 +0200 | [diff] [blame] | 972 | struct strbuf munged_fmt = STRBUF_INIT; |
Jeff King | e4f031e | 2015-06-30 09:26:53 -0400 | [diff] [blame] | 973 | size_t hint = 128; |
Jeff King | aa1462c | 2015-06-25 12:55:45 -0400 | [diff] [blame] | 974 | size_t len; |
| 975 | |
Jeff King | e4f031e | 2015-06-30 09:26:53 -0400 | [diff] [blame] | 976 | if (!*fmt) |
| 977 | return; |
| 978 | |
René Scharfe | c3fbf81 | 2017-06-15 14:29:53 +0200 | [diff] [blame] | 979 | /* |
| 980 | * There is no portable way to pass timezone information to |
| 981 | * strftime, so we handle %z and %Z here. |
| 982 | */ |
| 983 | for (;;) { |
| 984 | const char *percent = strchrnul(fmt, '%'); |
| 985 | strbuf_add(&munged_fmt, fmt, percent - fmt); |
| 986 | if (!*percent) |
| 987 | break; |
| 988 | fmt = percent + 1; |
| 989 | switch (*fmt) { |
| 990 | case '%': |
| 991 | strbuf_addstr(&munged_fmt, "%%"); |
| 992 | fmt++; |
| 993 | break; |
| 994 | case 'z': |
| 995 | strbuf_addf(&munged_fmt, "%+05d", tz_offset); |
| 996 | fmt++; |
| 997 | break; |
| 998 | case 'Z': |
Ævar Arnfjörð Bjarmason | 3b70223 | 2017-07-01 13:15:47 +0000 | [diff] [blame] | 999 | if (suppress_tz_name) { |
René Scharfe | c3fbf81 | 2017-06-15 14:29:53 +0200 | [diff] [blame] | 1000 | fmt++; |
| 1001 | break; |
| 1002 | } |
| 1003 | /* FALLTHROUGH */ |
| 1004 | default: |
| 1005 | strbuf_addch(&munged_fmt, '%'); |
| 1006 | } |
| 1007 | } |
| 1008 | fmt = munged_fmt.buf; |
| 1009 | |
Jeff King | e4f031e | 2015-06-30 09:26:53 -0400 | [diff] [blame] | 1010 | strbuf_grow(sb, hint); |
Jeff King | aa1462c | 2015-06-25 12:55:45 -0400 | [diff] [blame] | 1011 | len = strftime(sb->buf + sb->len, sb->alloc - sb->len, fmt, tm); |
| 1012 | |
| 1013 | if (!len) { |
| 1014 | /* |
Jeff King | e4f031e | 2015-06-30 09:26:53 -0400 | [diff] [blame] | 1015 | * strftime reports "0" if it could not fit the result in the buffer. |
| 1016 | * Unfortunately, it also reports "0" if the requested time string |
| 1017 | * takes 0 bytes. So our strategy is to munge the format so that the |
| 1018 | * output contains at least one character, and then drop the extra |
| 1019 | * character before returning. |
Jeff King | aa1462c | 2015-06-25 12:55:45 -0400 | [diff] [blame] | 1020 | */ |
René Scharfe | c3fbf81 | 2017-06-15 14:29:53 +0200 | [diff] [blame] | 1021 | strbuf_addch(&munged_fmt, ' '); |
Jeff King | e4f031e | 2015-06-30 09:26:53 -0400 | [diff] [blame] | 1022 | while (!len) { |
| 1023 | hint *= 2; |
| 1024 | strbuf_grow(sb, hint); |
| 1025 | len = strftime(sb->buf + sb->len, sb->alloc - sb->len, |
| 1026 | munged_fmt.buf, tm); |
| 1027 | } |
Jeff King | e4f031e | 2015-06-30 09:26:53 -0400 | [diff] [blame] | 1028 | len--; /* drop munged space */ |
Jeff King | aa1462c | 2015-06-25 12:55:45 -0400 | [diff] [blame] | 1029 | } |
René Scharfe | c3fbf81 | 2017-06-15 14:29:53 +0200 | [diff] [blame] | 1030 | strbuf_release(&munged_fmt); |
Jeff King | e4f031e | 2015-06-30 09:26:53 -0400 | [diff] [blame] | 1031 | strbuf_setlen(sb, sb->len + len); |
Jeff King | aa1462c | 2015-06-25 12:55:45 -0400 | [diff] [blame] | 1032 | } |
Jeff King | af49c6d | 2015-09-24 17:05:45 -0400 | [diff] [blame] | 1033 | |
brian m. carlson | 30e677e | 2018-03-12 02:27:28 +0000 | [diff] [blame] | 1034 | void strbuf_add_unique_abbrev(struct strbuf *sb, const struct object_id *oid, |
Jeff King | af49c6d | 2015-09-24 17:05:45 -0400 | [diff] [blame] | 1035 | int abbrev_len) |
| 1036 | { |
| 1037 | int r; |
brian m. carlson | 4b048c9 | 2018-07-16 01:27:57 +0000 | [diff] [blame] | 1038 | strbuf_grow(sb, GIT_MAX_HEXSZ + 1); |
brian m. carlson | aab9583 | 2018-03-12 02:27:30 +0000 | [diff] [blame] | 1039 | r = find_unique_abbrev_r(sb->buf + sb->len, oid, abbrev_len); |
Jeff King | af49c6d | 2015-09-24 17:05:45 -0400 | [diff] [blame] | 1040 | strbuf_setlen(sb, sb->len + r); |
| 1041 | } |
Junio C Hamano | 1ad7c0f | 2015-10-26 15:55:20 -0700 | [diff] [blame] | 1042 | |
Tobias Klauser | 63af4a8 | 2015-10-16 17:16:42 +0200 | [diff] [blame] | 1043 | /* |
| 1044 | * Returns the length of a line, without trailing spaces. |
| 1045 | * |
| 1046 | * If the line ends with newline, it will be removed too. |
| 1047 | */ |
| 1048 | static size_t cleanup(char *line, size_t len) |
| 1049 | { |
| 1050 | while (len) { |
| 1051 | unsigned char c = line[len - 1]; |
| 1052 | if (!isspace(c)) |
| 1053 | break; |
| 1054 | len--; |
| 1055 | } |
| 1056 | |
| 1057 | return len; |
| 1058 | } |
| 1059 | |
| 1060 | /* |
| 1061 | * Remove empty lines from the beginning and end |
| 1062 | * and also trailing spaces from every line. |
| 1063 | * |
| 1064 | * Turn multiple consecutive empty lines between paragraphs |
| 1065 | * into just one empty line. |
| 1066 | * |
| 1067 | * If the input has only empty lines and spaces, |
| 1068 | * no output will be produced. |
| 1069 | * |
| 1070 | * If last line does not have a newline at the end, one is added. |
| 1071 | * |
| 1072 | * Enable skip_comments to skip every line starting with comment |
| 1073 | * character. |
| 1074 | */ |
| 1075 | void strbuf_stripspace(struct strbuf *sb, int skip_comments) |
| 1076 | { |
Jeff King | 26114c0 | 2018-07-24 06:51:08 -0400 | [diff] [blame] | 1077 | size_t empties = 0; |
Tobias Klauser | 63af4a8 | 2015-10-16 17:16:42 +0200 | [diff] [blame] | 1078 | size_t i, j, len, newlen; |
| 1079 | char *eol; |
| 1080 | |
| 1081 | /* We may have to add a newline. */ |
| 1082 | strbuf_grow(sb, 1); |
| 1083 | |
| 1084 | for (i = j = 0; i < sb->len; i += len, j += newlen) { |
| 1085 | eol = memchr(sb->buf + i, '\n', sb->len - i); |
| 1086 | len = eol ? eol - (sb->buf + i) + 1 : sb->len - i; |
| 1087 | |
| 1088 | if (skip_comments && len && sb->buf[i] == comment_line_char) { |
| 1089 | newlen = 0; |
| 1090 | continue; |
| 1091 | } |
| 1092 | newlen = cleanup(sb->buf + i, len); |
| 1093 | |
| 1094 | /* Not just an empty line? */ |
| 1095 | if (newlen) { |
| 1096 | if (empties > 0 && j > 0) |
| 1097 | sb->buf[j++] = '\n'; |
| 1098 | empties = 0; |
| 1099 | memmove(sb->buf + j, sb->buf + i, newlen); |
| 1100 | sb->buf[newlen + j++] = '\n'; |
| 1101 | } else { |
| 1102 | empties++; |
| 1103 | } |
| 1104 | } |
| 1105 | |
| 1106 | strbuf_setlen(sb, j); |
| 1107 | } |
Jeff King | 670c359 | 2016-10-03 16:34:17 -0400 | [diff] [blame] | 1108 | |
| 1109 | int strbuf_normalize_path(struct strbuf *src) |
| 1110 | { |
| 1111 | struct strbuf dst = STRBUF_INIT; |
| 1112 | |
| 1113 | strbuf_grow(&dst, src->len); |
| 1114 | if (normalize_path_copy(dst.buf, src->buf) < 0) { |
| 1115 | strbuf_release(&dst); |
| 1116 | return -1; |
| 1117 | } |
| 1118 | |
| 1119 | /* |
| 1120 | * normalize_path does not tell us the new length, so we have to |
| 1121 | * compute it by looking for the new NUL it placed |
| 1122 | */ |
| 1123 | strbuf_setlen(&dst, strlen(dst.buf)); |
| 1124 | strbuf_swap(src, &dst); |
| 1125 | strbuf_release(&dst); |
| 1126 | return 0; |
| 1127 | } |