From: Jeff King <peff@peff.net>
Date: Fri, 9 Nov 2012 17:42:21 +0000 (-0500)
Subject: Merge branch 'mh/maint-parse-dirstat-fix'
X-Git-Tag: v1.8.1-rc0~81
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8736c9010c23fb1e903fc2b16351f18d477c56aa?ds=inline;hp=-c

Merge branch 'mh/maint-parse-dirstat-fix'

Cleans up some code and avoids a potential bug.

* mh/maint-parse-dirstat-fix:
parse_dirstat_params(): use string_list to split comma-separated string
---

8736c9010c23fb1e903fc2b16351f18d477c56aa
diff --combined diff.c
index 86e5f2a4a8,35cd8f7d78..7fef69d85c
--- a/diff.c
+++ b/diff.c
@@@ -15,6 -15,7 +15,7 @@@
  #include "sigchain.h"
  #include "submodule.h"
  #include "ll-merge.h"
+ #include "string-list.h"
  
  #ifdef NO_FAST_WORKING_DIRECTORY
  #define FAST_WORKING_DIRECTORY 0
@@@ -25,8 -26,7 +26,8 @@@
  static int diff_detect_rename_default;
  static int diff_rename_limit_default = 400;
  static int diff_suppress_blank_empty;
 -int diff_use_color_default = -1;
 +static int diff_use_color_default = -1;
 +static int diff_context_default = 3;
  static const char *diff_word_regex_cfg;
  static const char *external_diff_cmd_cfg;
  int diff_auto_refresh_index = 1;
@@@ -69,26 -69,30 +70,30 @@@ static int parse_diff_color_slot(const 
  	return -1;
  }
  
- static int parse_dirstat_params(struct diff_options *options, const char *params,
+ static int parse_dirstat_params(struct diff_options *options, const char *params_string,
  				struct strbuf *errmsg)
  {
- 	const char *p = params;
- 	int p_len, ret = 0;
+ 	char *params_copy = xstrdup(params_string);
+ 	struct string_list params = STRING_LIST_INIT_NODUP;
+ 	int ret = 0;
+ 	int i;
  
- 	while (*p) {
- 		p_len = strchrnul(p, ',') - p;
- 		if (!memcmp(p, "changes", p_len)) {
+ 	if (*params_copy)
+ 		string_list_split_in_place(&params, params_copy, ',', -1);
+ 	for (i = 0; i < params.nr; i++) {
+ 		const char *p = params.items[i].string;
+ 		if (!strcmp(p, "changes")) {
  			DIFF_OPT_CLR(options, DIRSTAT_BY_LINE);
  			DIFF_OPT_CLR(options, DIRSTAT_BY_FILE);
- 		} else if (!memcmp(p, "lines", p_len)) {
+ 		} else if (!strcmp(p, "lines")) {
  			DIFF_OPT_SET(options, DIRSTAT_BY_LINE);
  			DIFF_OPT_CLR(options, DIRSTAT_BY_FILE);
- 		} else if (!memcmp(p, "files", p_len)) {
+ 		} else if (!strcmp(p, "files")) {
  			DIFF_OPT_CLR(options, DIRSTAT_BY_LINE);
  			DIFF_OPT_SET(options, DIRSTAT_BY_FILE);
- 		} else if (!memcmp(p, "noncumulative", p_len)) {
+ 		} else if (!strcmp(p, "noncumulative")) {
  			DIFF_OPT_CLR(options, DIRSTAT_CUMULATIVE);
- 		} else if (!memcmp(p, "cumulative", p_len)) {
+ 		} else if (!strcmp(p, "cumulative")) {
  			DIFF_OPT_SET(options, DIRSTAT_CUMULATIVE);
  		} else if (isdigit(*p)) {
  			char *end;
@@@ -100,24 -104,21 +105,21 @@@
  				while (isdigit(*++end))
  					; /* nothing */
  			}
- 			if (end - p == p_len)
+ 			if (!*end)
  				options->dirstat_permille = permille;
  			else {
- 				strbuf_addf(errmsg, _("  Failed to parse dirstat cut-off percentage '%.*s'\n"),
- 					    p_len, p);
+ 				strbuf_addf(errmsg, _("  Failed to parse dirstat cut-off percentage '%s'\n"),
+ 					    p);
  				ret++;
  			}
  		} else {
- 			strbuf_addf(errmsg, _("  Unknown dirstat parameter '%.*s'\n"),
- 				    p_len, p);
+ 			strbuf_addf(errmsg, _("  Unknown dirstat parameter '%s'\n"), p);
  			ret++;
  		}
  
- 		p += p_len;
- 
- 		if (*p)
- 			p++; /* more parameters, swallow separator */
  	}
+ 	string_list_clear(&params, 0);
+ 	free(params_copy);
  	return ret;
  }
  
@@@ -142,12 -143,6 +144,12 @@@ int git_diff_ui_config(const char *var
  		diff_use_color_default = git_config_colorbool(var, value);
  		return 0;
  	}
 +	if (!strcmp(var, "diff.context")) {
 +		diff_context_default = git_config_int(var, value);
 +		if (diff_context_default < 0)
 +			return -1;
 +		return 0;
 +	}
  	if (!strcmp(var, "diff.renames")) {
  		diff_detect_rename_default = git_config_rename(var, value);
  		return 0;
@@@ -3177,7 -3172,7 +3179,7 @@@ void diff_setup(struct diff_options *op
  	options->break_opt = -1;
  	options->rename_limit = -1;
  	options->dirstat_permille = diff_dirstat_permille_default;
 -	options->context = 3;
 +	options->context = diff_context_default;
  	DIFF_OPT_SET(options, RENAME_EMPTY);
  
  	options->change = diff_change;