From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 22 Mar 2009 05:53:36 +0000 (-0700)
Subject: Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1
X-Git-Tag: v1.6.2.2~5^2~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2990034f1ed2c3d85d23d5611a1f04d317f785ac;p=git.git

Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1

* jc/maint-1.6.0-pack-directory:
  Fix odb_mkstemp() on AIX
  Make sure objects/pack exists before creating a new pack

Conflicts:
	wrapper.c
---

2990034f1ed2c3d85d23d5611a1f04d317f785ac
diff --cc fast-import.c
index 23e970d58,f0114948e..f246d5347
--- a/fast-import.c
+++ b/fast-import.c
@@@ -878,12 -876,11 +877,11 @@@ static char *create_index(void
  		c = next;
  	}
  
- 	snprintf(tmpfile, sizeof(tmpfile),
- 		"%s/pack/tmp_idx_XXXXXX", get_object_directory());
- 	idx_fd = xmkstemp(tmpfile);
+ 	idx_fd = odb_mkstemp(tmpfile, sizeof(tmpfile),
+ 			     "pack/tmp_idx_XXXXXX");
  	f = sha1fd(idx_fd, tmpfile);
  	sha1write(f, array, 256 * sizeof(int));
 -	SHA1_Init(&ctx);
 +	git_SHA1_Init(&ctx);
  	for (c = idx; c != last; c++) {
  		uint32_t offset = htonl((*c)->offset);
  		sha1write(f, &offset, 4);
diff --cc wrapper.c
index c85ca52ec,5e9de294d..d8efb1365
--- a/wrapper.c
+++ b/wrapper.c
@@@ -197,62 -197,35 +197,95 @@@ int xmkstemp(char *template
  	return fd;
  }
  
 +/*
 + * zlib wrappers to make sure we don't silently miss errors
 + * at init time.
 + */
 +void git_inflate_init(z_streamp strm)
 +{
 +	const char *err;
 +
 +	switch (inflateInit(strm)) {
 +	case Z_OK:
 +		return;
 +
 +	case Z_MEM_ERROR:
 +		err = "out of memory";
 +		break;
 +	case Z_VERSION_ERROR:
 +		err = "wrong version";
 +		break;
 +	default:
 +		err = "error";
 +	}
 +	die("inflateInit: %s (%s)", err, strm->msg ? strm->msg : "no message");
 +}
 +
 +void git_inflate_end(z_streamp strm)
 +{
 +	if (inflateEnd(strm) != Z_OK)
 +		error("inflateEnd: %s", strm->msg ? strm->msg : "failed");
 +}
 +
 +int git_inflate(z_streamp strm, int flush)
 +{
 +	int ret = inflate(strm, flush);
 +	const char *err;
 +
 +	switch (ret) {
 +	/* Out of memory is fatal. */
 +	case Z_MEM_ERROR:
 +		die("inflate: out of memory");
 +
 +	/* Data corruption errors: we may want to recover from them (fsck) */
 +	case Z_NEED_DICT:
 +		err = "needs dictionary"; break;
 +	case Z_DATA_ERROR:
 +		err = "data stream error"; break;
 +	case Z_STREAM_ERROR:
 +		err = "stream consistency error"; break;
 +	default:
 +		err = "unknown error"; break;
 +
 +	/* Z_BUF_ERROR: normal, needs more space in the output buffer */
 +	case Z_BUF_ERROR:
 +	case Z_OK:
 +	case Z_STREAM_END:
 +		return ret;
 +	}
 +	error("inflate: %s (%s)", err, strm->msg ? strm->msg : "no message");
 +	return ret;
 +}
++
+ int odb_mkstemp(char *template, size_t limit, const char *pattern)
+ {
+ 	int fd;
+ 
+ 	snprintf(template, limit, "%s/%s",
+ 		 get_object_directory(), pattern);
+ 	fd = mkstemp(template);
+ 	if (0 <= fd)
+ 		return fd;
+ 
+ 	/* slow path */
+ 	/* some mkstemp implementations erase template on failure */
+ 	snprintf(template, limit, "%s/%s",
+ 		 get_object_directory(), pattern);
+ 	safe_create_leading_directories(template);
+ 	return xmkstemp(template);
+ }
+ 
+ int odb_pack_keep(char *name, size_t namesz, unsigned char *sha1)
+ {
+ 	int fd;
+ 
+ 	snprintf(name, namesz, "%s/pack/pack-%s.keep",
+ 		 get_object_directory(), sha1_to_hex(sha1));
+ 	fd = open(name, O_RDWR|O_CREAT|O_EXCL, 0600);
+ 	if (0 <= fd)
+ 		return fd;
+ 
+ 	/* slow path */
+ 	safe_create_leading_directories(name);
+ 	return open(name, O_RDWR|O_CREAT|O_EXCL, 0600);
+ }