From fb54abd604080dc2a719934a0a72964a7caf8ff7 Mon Sep 17 00:00:00 2001 From: Brandon Casey Date: Thu, 17 Jan 2008 10:58:34 -0600 Subject: [PATCH] fast-import.c: don't try to commit marks file if write failed We also move the assignment of -1 to the lock file descriptor up, so that rollback_lock_file() can be called safely after a possible attempt to fclose(). This matches the contents of the 'if' statement just above testing success of fdopen(). Signed-off-by: Brandon Casey Acked-by: Shawn O. Pearce Signed-off-by: Junio C Hamano --- fast-import.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/fast-import.c b/fast-import.c index 3609c2428..4cf509297 100644 --- a/fast-import.c +++ b/fast-import.c @@ -1545,19 +1545,27 @@ static void dump_marks(void) return; } - dump_marks_helper(f, 0, marks); - if (ferror(f) || fclose(f)) - failure |= error("Unable to write marks file %s: %s", - mark_file, strerror(errno)); /* - * Since the lock file was fdopen()'ed and then fclose()'ed above, - * assign -1 to the lock file descriptor so that commit_lock_file() + * Since the lock file was fdopen()'ed, it should not be close()'ed. + * Assign -1 to the lock file descriptor so that commit_lock_file() * won't try to close() it. */ mark_lock.fd = -1; - if (commit_lock_file(&mark_lock)) - failure |= error("Unable to write commit file %s: %s", + + dump_marks_helper(f, 0, marks); + if (ferror(f) || fclose(f)) { + rollback_lock_file(&mark_lock); + failure |= error("Unable to write marks file %s: %s", mark_file, strerror(errno)); + return; + } + + if (commit_lock_file(&mark_lock)) { + rollback_lock_file(&mark_lock); + failure |= error("Unable to commit marks file %s: %s", + mark_file, strerror(errno)); + return; + } } static int read_next_command(void) -- 2.30.2