From: Junio C Hamano Date: Mon, 12 Sep 2011 04:53:13 +0000 (-0700) Subject: Merge branch 'jk/maint-config-param' into maint X-Git-Tag: v1.7.6.3~9 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/eff7c32cfd12867000d6449d335fad0e7c9751f1?ds=inline;hp=-c Merge branch 'jk/maint-config-param' into maint * jk/maint-config-param: config: use strbuf_split_str instead of a temporary strbuf strbuf: allow strbuf_split to work on non-strbufs config: avoid segfault when parsing command-line config config: die on error in command-line config fix "git -c" parsing of values with equals signs strbuf_split: add a max parameter --- eff7c32cfd12867000d6449d335fad0e7c9751f1 diff --combined config.c index 113723bf3b,44b2c93b24..49e5250dc5 --- a/config.c +++ b/config.c @@@ -42,10 -42,10 +42,10 @@@ void git_config_push_parameter(const ch static int git_config_parse_parameter(const char *text, config_fn_t fn, void *data) { - struct strbuf tmp = STRBUF_INIT; struct strbuf **pair; - strbuf_addstr(&tmp, text); - pair = strbuf_split(&tmp, '='); + pair = strbuf_split_str(text, '=', 2); + if (!pair[0]) + return error("bogus config parameter: %s", text); if (pair[0]->len && pair[0]->buf[pair[0]->len - 1] == '=') strbuf_setlen(pair[0], pair[0]->len - 1); strbuf_trim(pair[0]); @@@ -121,21 -121,23 +121,21 @@@ static int get_next_char(void static char *parse_value(void) { - static char value[1024]; - int quote = 0, comment = 0, len = 0, space = 0; + static struct strbuf value = STRBUF_INIT; + int quote = 0, comment = 0, space = 0; + strbuf_reset(&value); for (;;) { int c = get_next_char(); - if (len >= sizeof(value) - 1) - return NULL; if (c == '\n') { if (quote) return NULL; - value[len] = 0; - return value; + return value.buf; } if (comment) continue; if (isspace(c) && !quote) { - if (len) + if (value.len) space++; continue; } @@@ -146,7 -148,7 +146,7 @@@ } } for (; space; space--) - value[len++] = ' '; + strbuf_addch(&value, ' '); if (c == '\\') { c = get_next_char(); switch (c) { @@@ -168,14 -170,14 +168,14 @@@ default: return NULL; } - value[len++] = c; + strbuf_addch(&value, c); continue; } if (c == '"') { quote = 1-quote; continue; } - value[len++] = c; + strbuf_addch(&value, c); } } @@@ -571,7 -573,7 +571,7 @@@ static int git_default_core_config(cons if (!strcmp(var, "core.autocrlf")) { if (value && !strcasecmp(value, "input")) { - if (eol == EOL_CRLF) + if (core_eol == EOL_CRLF) return error("core.autocrlf=input conflicts with core.eol=crlf"); auto_crlf = AUTO_CRLF_INPUT; return 0; @@@ -591,14 -593,14 +591,14 @@@ if (!strcmp(var, "core.eol")) { if (value && !strcasecmp(value, "lf")) - eol = EOL_LF; + core_eol = EOL_LF; else if (value && !strcasecmp(value, "crlf")) - eol = EOL_CRLF; + core_eol = EOL_CRLF; else if (value && !strcasecmp(value, "native")) - eol = EOL_NATIVE; + core_eol = EOL_NATIVE; else - eol = EOL_UNSET; - if (eol == EOL_CRLF && auto_crlf == AUTO_CRLF_INPUT) + core_eol = EOL_UNSET; + if (core_eol == EOL_CRLF && auto_crlf == AUTO_CRLF_INPUT) return error("core.autocrlf=input conflicts with core.eol=crlf"); return 0; } @@@ -856,7 -858,7 +856,7 @@@ int git_config_early(config_fn_t fn, vo switch (git_config_from_parameters(fn, data)) { case -1: /* error */ - ret--; + die("unable to parse command-line config"); break; case 0: /* found nothing */ break; @@@ -1102,12 -1104,12 +1102,12 @@@ int git_config_parse_key(const char *ke if (last_dot == NULL || last_dot == key) { error("key does not contain a section: %s", key); - return -2; + return -CONFIG_NO_SECTION_OR_NAME; } if (!last_dot[1]) { error("key does not contain variable name: %s", key); - return -2; + return -CONFIG_NO_SECTION_OR_NAME; } baselen = last_dot - key; @@@ -1144,7 -1146,7 +1144,7 @@@ out_free_ret_1: free(*store_key); - return -1; + return -CONFIG_INVALID_KEY; } /* @@@ -1200,7 -1202,7 +1200,7 @@@ int git_config_set_multivar(const char if (fd < 0) { error("could not lock config file %s: %s", config_filename, strerror(errno)); free(store.key); - ret = -1; + ret = CONFIG_NO_LOCK; goto out_free; } @@@ -1214,12 -1216,12 +1214,12 @@@ if ( ENOENT != errno ) { error("opening %s: %s", config_filename, strerror(errno)); - ret = 3; /* same as "invalid config file" */ + ret = CONFIG_INVALID_FILE; /* same as "invalid config file" */ goto out_free; } /* if nothing to unset, error out */ if (value == NULL) { - ret = 5; + ret = CONFIG_NOTHING_SET; goto out_free; } @@@ -1247,7 -1249,7 +1247,7 @@@ REG_EXTENDED)) { error("invalid pattern: %s", value_regex); free(store.value_regex); - ret = 6; + ret = CONFIG_INVALID_PATTERN; goto out_free; } } @@@ -1269,7 -1271,7 +1269,7 @@@ regfree(store.value_regex); free(store.value_regex); } - ret = 3; + ret = CONFIG_INVALID_FILE; goto out_free; } @@@ -1282,7 -1284,7 +1282,7 @@@ /* if nothing to unset, or too many matches, error out */ if ((store.seen == 0 && value == NULL) || (store.seen > 1 && multi_replace == 0)) { - ret = 5; + ret = CONFIG_NOTHING_SET; goto out_free; } @@@ -1343,7 -1345,7 +1343,7 @@@ if (commit_lock_file(lock) < 0) { error("could not commit config file %s", config_filename); - ret = 4; + ret = CONFIG_NO_WRITE; goto out_free; } @@@ -1479,10 -1481,10 +1479,10 @@@ int git_config_rename_section(const cha } } fclose(config_file); - unlock_and_out: +unlock_and_out: if (commit_lock_file(lock) < 0) ret = error("could not commit config file %s", config_filename); - out: +out: free(config_filename); return ret; } diff --combined strbuf.c index 09c43ae59a,a71de9cd63..1a7df12e8f --- a/strbuf.c +++ b/strbuf.c @@@ -30,10 -30,8 +30,10 @@@ void strbuf_init(struct strbuf *sb, siz { sb->alloc = sb->len = 0; sb->buf = strbuf_slopbuf; - if (hint) + if (hint) { strbuf_grow(sb, hint); + sb->buf[0] = '\0'; + } } void strbuf_release(struct strbuf *sb) @@@ -103,24 -101,27 +103,27 @@@ void strbuf_ltrim(struct strbuf *sb sb->buf[sb->len] = '\0'; } - struct strbuf **strbuf_split(const struct strbuf *sb, int delim) + struct strbuf **strbuf_split_buf(const char *str, size_t slen, int delim, int max) { int alloc = 2, pos = 0; - char *n, *p; + const char *n, *p; struct strbuf **ret; struct strbuf *t; ret = xcalloc(alloc, sizeof(struct strbuf *)); - p = n = sb->buf; - while (n < sb->buf + sb->len) { + p = n = str; + while (n < str + slen) { int len; - n = memchr(n, delim, sb->len - (n - sb->buf)); + if (max <= 0 || pos + 1 < max) + n = memchr(n, delim, slen - (n - str)); + else + n = NULL; if (pos + 1 >= alloc) { alloc = alloc * 2; ret = xrealloc(ret, sizeof(struct strbuf *) * alloc); } if (!n) - n = sb->buf + sb->len - 1; + n = str + slen - 1; len = n - p + 1; t = xmalloc(sizeof(struct strbuf)); strbuf_init(t, len); diff --combined strbuf.h index 9e6d9fa53f,e7e674bf1f..46a33f8c46 --- a/strbuf.h +++ b/strbuf.h @@@ -3,6 -3,8 +3,6 @@@ /* See Documentation/technical/api-strbuf.txt */ -#include - extern char strbuf_slopbuf[]; struct strbuf { size_t alloc; @@@ -31,8 -33,9 +31,8 @@@ static inline size_t strbuf_avail(cons extern void strbuf_grow(struct strbuf *, size_t); static inline void strbuf_setlen(struct strbuf *sb, size_t len) { - if (!sb->alloc) - strbuf_grow(sb, 0); - assert(len < sb->alloc); + if (len > (sb->alloc ? sb->alloc - 1 : 0)) + die("BUG: strbuf_setlen() beyond buffer"); sb->len = len; sb->buf[len] = '\0'; } @@@ -44,7 -47,22 +44,22 @@@ extern void strbuf_rtrim(struct strbuf extern void strbuf_ltrim(struct strbuf *); extern int strbuf_cmp(const struct strbuf *, const struct strbuf *); - extern struct strbuf **strbuf_split(const struct strbuf *, int delim); + extern struct strbuf **strbuf_split_buf(const char *, size_t, + int delim, int max); + static inline struct strbuf **strbuf_split_str(const char *str, + int delim, int max) + { + return strbuf_split_buf(str, strlen(str), delim, max); + } + static inline struct strbuf **strbuf_split_max(const struct strbuf *sb, + int delim, int max) + { + return strbuf_split_buf(sb->buf, sb->len, delim, max); + } + static inline struct strbuf **strbuf_split(const struct strbuf *sb, int delim) + { + return strbuf_split_max(sb, delim, 0); + } extern void strbuf_list_free(struct strbuf **); /*----- add data in your buffer -----*/