* quote_c_style works on a strbuf instead of a wild buffer. * quote_c_style is now clever enough to not add double quotes if not needed. * write_name_quoted inherits those advantages, but also take a different set of arguments. Now instead of asking for quotes or not, you pass a "terminator". If it's \0 then we assume you don't want to escape, else C escaping is performed. In any case, the terminator is also appended to the stream. It also no longer takes the prefix/prefix_len arguments, as it's seldomly used, and makes some optimizations harder. * write_name_quotedpfx is created to work like write_name_quoted and take the prefix/prefix_len arguments. Thanks to those API changes, diff.c has somehow lost weight, thanks to the removal of functions that were wrappers around the old write_name_quoted trying to give it a semantics like the new one, but performing a lot of allocations for this goal. Now we always write directly to the stream, no intermediate allocation is performed. As a side effect of the refactor in builtin-apply.c, the length of the bar graphs in diffstats are not affected anymore by the fact that the path was clipped. Signed-off-by: Pierre Habouzit <madcoder@debian.org>
		
			
				
	
	
		
			65 lines
		
	
	
		
			1.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			65 lines
		
	
	
		
			1.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
#include "builtin.h"
 | 
						|
#include "cache.h"
 | 
						|
#include "attr.h"
 | 
						|
#include "quote.h"
 | 
						|
 | 
						|
static const char check_attr_usage[] =
 | 
						|
"git-check-attr attr... [--] pathname...";
 | 
						|
 | 
						|
int cmd_check_attr(int argc, const char **argv, const char *prefix)
 | 
						|
{
 | 
						|
	struct git_attr_check *check;
 | 
						|
	int cnt, i, doubledash;
 | 
						|
 | 
						|
	if (read_cache() < 0) {
 | 
						|
		die("invalid cache");
 | 
						|
	}
 | 
						|
 | 
						|
	doubledash = -1;
 | 
						|
	for (i = 1; doubledash < 0 && i < argc; i++) {
 | 
						|
		if (!strcmp(argv[i], "--"))
 | 
						|
			doubledash = i;
 | 
						|
	}
 | 
						|
 | 
						|
	/* If there is no double dash, we handle only one attribute */
 | 
						|
	if (doubledash < 0) {
 | 
						|
		cnt = 1;
 | 
						|
		doubledash = 1;
 | 
						|
	} else
 | 
						|
		cnt = doubledash - 1;
 | 
						|
	doubledash++;
 | 
						|
 | 
						|
	if (cnt <= 0 || argc < doubledash)
 | 
						|
		usage(check_attr_usage);
 | 
						|
	check = xcalloc(cnt, sizeof(*check));
 | 
						|
	for (i = 0; i < cnt; i++) {
 | 
						|
		const char *name;
 | 
						|
		struct git_attr *a;
 | 
						|
		name = argv[i + 1];
 | 
						|
		a = git_attr(name, strlen(name));
 | 
						|
		if (!a)
 | 
						|
			return error("%s: not a valid attribute name", name);
 | 
						|
		check[i].attr = a;
 | 
						|
	}
 | 
						|
 | 
						|
	for (i = doubledash; i < argc; i++) {
 | 
						|
		int j;
 | 
						|
		if (git_checkattr(argv[i], cnt, check))
 | 
						|
			die("git_checkattr died");
 | 
						|
		for (j = 0; j < cnt; j++) {
 | 
						|
			const char *value = check[j].value;
 | 
						|
 | 
						|
			if (ATTR_TRUE(value))
 | 
						|
				value = "set";
 | 
						|
			else if (ATTR_FALSE(value))
 | 
						|
				value = "unset";
 | 
						|
			else if (ATTR_UNSET(value))
 | 
						|
				value = "unspecified";
 | 
						|
 | 
						|
			quote_c_style(argv[i], NULL, stdout, 0);
 | 
						|
			printf(": %s: %s\n", argv[j+1], value);
 | 
						|
		}
 | 
						|
	}
 | 
						|
	return 0;
 | 
						|
}
 |