From: Jim Meyering <jim@meyering.net>
Date: Fri, 18 Jan 2008 18:35:49 +0000 (+0100)
Subject: fast-import: Don't use a maybe-clobbered errno value
X-Git-Tag: v1.5.4-rc4~15
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5a7b1b571e2bf59c65f9e5333414d2e0f7df6952;p=git.git

fast-import: Don't use a maybe-clobbered errno value

Without this change, each diagnostic could use an errno value
clobbered by the close or unlink in rollback_lock_file.

Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/fast-import.c b/fast-import.c
index 5e89eef1a..45b4edf36 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -1541,9 +1541,10 @@ static void dump_marks(void)
 
 	f = fdopen(mark_fd, "w");
 	if (!f) {
+		int saved_errno = errno;
 		rollback_lock_file(&mark_lock);
 		failure |= error("Unable to write marks file %s: %s",
-			mark_file, strerror(errno));
+			mark_file, strerror(saved_errno));
 		return;
 	}
 
@@ -1556,16 +1557,18 @@ static void dump_marks(void)
 
 	dump_marks_helper(f, 0, marks);
 	if (ferror(f) || fclose(f)) {
+		int saved_errno = errno;
 		rollback_lock_file(&mark_lock);
 		failure |= error("Unable to write marks file %s: %s",
-			mark_file, strerror(errno));
+			mark_file, strerror(saved_errno));
 		return;
 	}
 
 	if (commit_lock_file(&mark_lock)) {
+		int saved_errno = errno;
 		rollback_lock_file(&mark_lock);
 		failure |= error("Unable to commit marks file %s: %s",
-			mark_file, strerror(errno));
+			mark_file, strerror(saved_errno));
 		return;
 	}
 }