Lots of die() calls did not actually report the kind of error, which can leave the user confused as to the real problem. Use die_errno() where we check a system/library call that sets errno on failure, or one of the following that wrap such calls: Function Passes on error from -------- -------------------- odb_pack_keep open read_ancestry fopen read_in_full xread strbuf_read xread strbuf_read_file open or strbuf_read_file strbuf_readlink readlink write_in_full xwrite Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
			
				
	
	
		
			42 lines
		
	
	
		
			841 B
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			42 lines
		
	
	
		
			841 B
		
	
	
	
		
			C
		
	
	
	
	
	
#include "cache.h"
 | 
						|
#include "blob.h"
 | 
						|
#include "exec_cmd.h"
 | 
						|
 | 
						|
static char *create_temp_file(unsigned char *sha1)
 | 
						|
{
 | 
						|
	static char path[50];
 | 
						|
	void *buf;
 | 
						|
	enum object_type type;
 | 
						|
	unsigned long size;
 | 
						|
	int fd;
 | 
						|
 | 
						|
	buf = read_sha1_file(sha1, &type, &size);
 | 
						|
	if (!buf || type != OBJ_BLOB)
 | 
						|
		die("unable to read blob object %s", sha1_to_hex(sha1));
 | 
						|
 | 
						|
	strcpy(path, ".merge_file_XXXXXX");
 | 
						|
	fd = xmkstemp(path);
 | 
						|
	if (write_in_full(fd, buf, size) != size)
 | 
						|
		die_errno("unable to write temp-file");
 | 
						|
	close(fd);
 | 
						|
	return path;
 | 
						|
}
 | 
						|
 | 
						|
int main(int argc, char **argv)
 | 
						|
{
 | 
						|
	unsigned char sha1[20];
 | 
						|
 | 
						|
	git_extract_argv0_path(argv[0]);
 | 
						|
 | 
						|
	if (argc != 2)
 | 
						|
		usage("git unpack-file <sha1>");
 | 
						|
	if (get_sha1(argv[1], sha1))
 | 
						|
		die("Not a valid object name %s", argv[1]);
 | 
						|
 | 
						|
	setup_git_directory();
 | 
						|
	git_config(git_default_config, NULL);
 | 
						|
 | 
						|
	puts(create_temp_file(sha1));
 | 
						|
	return 0;
 | 
						|
}
 |