From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 Dec 2010 19:24:13 +0000 (-0800)
Subject: Merge branch 'ks/maint-getenv-fix'
X-Git-Tag: v1.7.4-rc0~79
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/09a8fbd59cb18c222db732e053c17583f7f06840?hp=-c

Merge branch 'ks/maint-getenv-fix'

* ks/maint-getenv-fix:
setup: make sure git_dir path is in a permanent buffer, getenv(3) case
---

09a8fbd59cb18c222db732e053c17583f7f06840
diff --combined environment.c
index 913b0580af,18aded6dc4..c79f2a9b56
--- a/environment.c
+++ b/environment.c
@@@ -21,7 -21,6 +21,7 @@@ int prefer_symlink_refs
  int is_bare_repository_cfg = -1; /* unspecified */
  int log_all_ref_updates = -1; /* unspecified */
  int warn_ambiguous_refs = 1;
 +int unique_abbrev_extra_length;
  int repository_format_version;
  const char *git_commit_encoding;
  const char *git_log_output_encoding;
@@@ -88,6 -87,7 +88,7 @@@ const char * const local_repo_env[LOCAL
  static void setup_git_env(void)
  {
  	git_dir = getenv(GIT_DIR_ENVIRONMENT);
+ 	git_dir = git_dir ? xstrdup(git_dir) : NULL;
  	if (!git_dir) {
  		git_dir = read_gitfile_gently(DEFAULT_GIT_DIR_ENVIRONMENT);
  		git_dir = git_dir ? xstrdup(git_dir) : NULL;
@@@ -172,43 -172,6 +173,43 @@@ char *get_object_directory(void
  	return git_object_dir;
  }
  
 +int odb_mkstemp(char *template, size_t limit, const char *pattern)
 +{
 +	int fd;
 +	/*
 +	 * we let the umask do its job, don't try to be more
 +	 * restrictive except to remove write permission.
 +	 */
 +	int mode = 0444;
 +	snprintf(template, limit, "%s/%s",
 +		 get_object_directory(), pattern);
 +	fd = git_mkstemp_mode(template, mode);
 +	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_mode(template, mode);
 +}
 +
 +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);
 +}
 +
  char *get_index_file(void)
  {
  	if (!git_index_file)
@@@ -230,14 -193,3 +231,14 @@@ int set_git_dir(const char *path
  	setup_git_env();
  	return 0;
  }
 +
 +const char *get_log_output_encoding(void)
 +{
 +	return git_log_output_encoding ? git_log_output_encoding
 +		: get_commit_output_encoding();
 +}
 +
 +const char *get_commit_output_encoding(void)
 +{
 +	return git_commit_encoding ? git_commit_encoding : "UTF-8";
 +}