X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=refs.c;h=5e653141ceb8183cfb7922c3ad89fd1a0110647a;hb=326711c16879792da8d7159bf29d080569c3a1e0;hp=eeb1196ec40a64e9ab1d865fbfc42b207fed98ed;hpb=5029f6458f99cabce6d80bba09da2137f86cc59e;p=git.git

diff --git a/refs.c b/refs.c
index eeb1196ec..5e653141c 100644
--- a/refs.c
+++ b/refs.c
@@ -29,7 +29,7 @@ const char *resolve_ref(const char *path, unsigned char *sha1, int reading)
 		if (lstat(path, &st) < 0) {
 			if (reading || errno != ENOENT)
 				return NULL;
-			memset(sha1, 0, 20);
+			hashclr(sha1);
 			return path;
 		}
 
@@ -104,6 +104,11 @@ int create_symref(const char *git_HEAD, const char *refs_heads_master)
 		error("Unable to create %s", git_HEAD);
 		return -3;
 	}
+	if (adjust_shared_perm(git_HEAD)) {
+		unlink(lockpath);
+		error("Unable to fix permissions on %s", lockpath);
+		return -4;
+	}
 	return 0;
 }
 
@@ -142,7 +147,7 @@ static int do_for_each_ref(const char *base, int (*fn)(const char *path, const u
 			namelen = strlen(de->d_name);
 			if (namelen > 255)
 				continue;
-			if (namelen>5 && !strcmp(de->d_name+namelen-5,".lock"))
+			if (has_extension(de->d_name, ".lock"))
 				continue;
 			memcpy(path + baselen, de->d_name, namelen+1);
 			if (stat(git_path("%s", path), &st) < 0)
@@ -259,7 +264,7 @@ int check_ref_format(const char *ref)
 	}
 }
 
-static struct ref_lock* verify_lock(struct ref_lock *lock,
+static struct ref_lock *verify_lock(struct ref_lock *lock,
 	const unsigned char *old_sha1, int mustexist)
 {
 	char buf[40];
@@ -276,7 +281,7 @@ static struct ref_lock* verify_lock(struct ref_lock *lock,
 		unlock_ref(lock);
 		return NULL;
 	}
-	if (memcmp(lock->old_sha1, old_sha1, 20)) {
+	if (hashcmp(lock->old_sha1, old_sha1)) {
 		error("Ref %s is at %s but expected %s", lock->ref_file,
 			sha1_to_hex(lock->old_sha1), sha1_to_hex(old_sha1));
 		unlock_ref(lock);
@@ -285,10 +290,11 @@ static struct ref_lock* verify_lock(struct ref_lock *lock,
 	return lock;
 }
 
-static struct ref_lock* lock_ref_sha1_basic(const char *path,
+static struct ref_lock *lock_ref_sha1_basic(const char *path,
 	int plen,
 	const unsigned char *old_sha1, int mustexist)
 {
+	const char *orig_path = path;
 	struct ref_lock *lock;
 	struct stat st;
 
@@ -298,30 +304,27 @@ static struct ref_lock* lock_ref_sha1_basic(const char *path,
 	plen = strlen(path) - plen;
 	path = resolve_ref(path, lock->old_sha1, mustexist);
 	if (!path) {
+		int last_errno = errno;
+		error("unable to resolve reference %s: %s",
+			orig_path, strerror(errno));
 		unlock_ref(lock);
+		errno = last_errno;
 		return NULL;
 	}
+	lock->lk = xcalloc(1, sizeof(struct lock_file));
 
-	lock->ref_file = strdup(path);
-	lock->lock_file = strdup(mkpath("%s.lock", lock->ref_file));
-	lock->log_file = strdup(git_path("logs/%s", lock->ref_file + plen));
+	lock->ref_file = xstrdup(path);
+	lock->log_file = xstrdup(git_path("logs/%s", lock->ref_file + plen));
 	lock->force_write = lstat(lock->ref_file, &st) && errno == ENOENT;
 
-	if (safe_create_leading_directories(lock->lock_file))
-		die("unable to create directory for %s", lock->lock_file);
-	lock->lock_fd = open(lock->lock_file,
-		O_WRONLY | O_CREAT | O_EXCL, 0666);
-	if (lock->lock_fd < 0) {
-		error("Couldn't open lock file %s: %s",
-			lock->lock_file, strerror(errno));
-		unlock_ref(lock);
-		return NULL;
-	}
+	if (safe_create_leading_directories(lock->ref_file))
+		die("unable to create directory for %s", lock->ref_file);
+	lock->lock_fd = hold_lock_file_for_update(lock->lk, lock->ref_file, 1);
 
 	return old_sha1 ? verify_lock(lock, old_sha1, mustexist) : lock;
 }
 
-struct ref_lock* lock_ref_sha1(const char *ref,
+struct ref_lock *lock_ref_sha1(const char *ref,
 	const unsigned char *old_sha1, int mustexist)
 {
 	if (check_ref_format(ref))
@@ -330,25 +333,23 @@ struct ref_lock* lock_ref_sha1(const char *ref,
 		5 + strlen(ref), old_sha1, mustexist);
 }
 
-struct ref_lock* lock_any_ref_for_update(const char *ref,
+struct ref_lock *lock_any_ref_for_update(const char *ref,
 	const unsigned char *old_sha1, int mustexist)
 {
 	return lock_ref_sha1_basic(git_path("%s", ref),
 		strlen(ref), old_sha1, mustexist);
 }
 
-void unlock_ref (struct ref_lock *lock)
+void unlock_ref(struct ref_lock *lock)
 {
 	if (lock->lock_fd >= 0) {
 		close(lock->lock_fd);
-		unlink(lock->lock_file);
+		/* Do not free lock->lk -- atexit() still looks at them */
+		if (lock->lk)
+			rollback_lock_file(lock->lk);
 	}
-	if (lock->ref_file)
-		free(lock->ref_file);
-	if (lock->lock_file)
-		free(lock->lock_file);
-	if (lock->log_file)
-		free(lock->log_file);
+	free(lock->ref_file);
+	free(lock->log_file);
 	free(lock);
 }
 
@@ -358,7 +359,7 @@ static int log_ref_write(struct ref_lock *lock,
 	int logfd, written, oflags = O_APPEND | O_WRONLY;
 	unsigned maxlen, len;
 	char *logrec;
-	const char *comitter;
+	const char *committer;
 
 	if (log_all_ref_updates) {
 		if (safe_create_leading_directories(lock->log_file) < 0)
@@ -375,23 +376,23 @@ static int log_ref_write(struct ref_lock *lock,
 			lock->log_file, strerror(errno));
 	}
 
-	setup_ident();
-	comitter = git_committer_info(1);
+	committer = git_committer_info(1);
 	if (msg) {
-		maxlen = strlen(comitter) + strlen(msg) + 2*40 + 5;
+		maxlen = strlen(committer) + strlen(msg) + 2*40 + 5;
 		logrec = xmalloc(maxlen);
 		len = snprintf(logrec, maxlen, "%s %s %s\t%s\n",
 			sha1_to_hex(lock->old_sha1),
 			sha1_to_hex(sha1),
-			comitter,
+			committer,
 			msg);
-	} else {
-		maxlen = strlen(comitter) + 2*40 + 4;
+	}
+	else {
+		maxlen = strlen(committer) + 2*40 + 4;
 		logrec = xmalloc(maxlen);
 		len = snprintf(logrec, maxlen, "%s %s %s\n",
 			sha1_to_hex(lock->old_sha1),
 			sha1_to_hex(sha1),
-			comitter);
+			committer);
 	}
 	written = len <= maxlen ? write(logfd, logrec, len) : -1;
 	free(logrec);
@@ -408,14 +409,14 @@ int write_ref_sha1(struct ref_lock *lock,
 
 	if (!lock)
 		return -1;
-	if (!lock->force_write && !memcmp(lock->old_sha1, sha1, 20)) {
+	if (!lock->force_write && !hashcmp(lock->old_sha1, sha1)) {
 		unlock_ref(lock);
 		return 0;
 	}
 	if (write(lock->lock_fd, sha1_to_hex(sha1), 40) != 40 ||
 	    write(lock->lock_fd, &term, 1) != 1
 		|| close(lock->lock_fd) < 0) {
-		error("Couldn't write %s", lock->lock_file);
+		error("Couldn't write %s", lock->lk->filename);
 		unlock_ref(lock);
 		return -1;
 	}
@@ -423,7 +424,7 @@ int write_ref_sha1(struct ref_lock *lock,
 		unlock_ref(lock);
 		return -1;
 	}
-	if (rename(lock->lock_file, lock->ref_file) < 0) {
+	if (commit_lock_file(lock->lk)) {
 		error("Couldn't set %s", lock->ref_file);
 		unlock_ref(lock);
 		return -1;
@@ -472,19 +473,21 @@ int read_ref_at(const char *ref, unsigned long at_time, unsigned char *sha1)
 					die("Log %s is corrupt.", logfile);
 				if (get_sha1_hex(rec + 41, sha1))
 					die("Log %s is corrupt.", logfile);
-				if (memcmp(logged_sha1, sha1, 20)) {
+				if (hashcmp(logged_sha1, sha1)) {
 					tz = strtoul(tz_c, NULL, 10);
 					fprintf(stderr,
 						"warning: Log %s has gap after %s.\n",
 						logfile, show_rfc2822_date(date, tz));
 				}
-			} else if (date == at_time) {
+			}
+			else if (date == at_time) {
 				if (get_sha1_hex(rec + 41, sha1))
 					die("Log %s is corrupt.", logfile);
-			} else {
+			}
+			else {
 				if (get_sha1_hex(rec + 41, logged_sha1))
 					die("Log %s is corrupt.", logfile);
-				if (memcmp(logged_sha1, sha1, 20)) {
+				if (hashcmp(logged_sha1, sha1)) {
 					tz = strtoul(tz_c, NULL, 10);
 					fprintf(stderr,
 						"warning: Log %s unexpectedly ended on %s.\n",