From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Nov 2017 05:05:33 +0000 (+0900)
Subject: Merge branch 'rs/sequencer-rewrite-file-cleanup' into maint
X-Git-Tag: v2.15.1~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1c89be1db2463c970b3b51e576d6f5f5d33c9bfe?ds=inline;hp=-c

Merge branch 'rs/sequencer-rewrite-file-cleanup' into maint

Code cleanup.

* rs/sequencer-rewrite-file-cleanup:
sequencer.c: check return value of close() in rewrite_file()
sequencer: use O_TRUNC to truncate files
sequencer: factor out rewrite_file()
---

1c89be1db2463c970b3b51e576d6f5f5d33c9bfe
diff --combined sequencer.c
index 332a383b03,e0cc2f777e..2882d53120
--- a/sequencer.c
+++ b/sequencer.c
@@@ -1862,15 -1862,12 +1862,15 @@@ static int error_failed_squash(struct c
  
  static int do_exec(const char *command_line)
  {
 +	struct argv_array child_env = ARGV_ARRAY_INIT;
  	const char *child_argv[] = { NULL, NULL };
  	int dirty, status;
  
  	fprintf(stderr, "Executing: %s\n", command_line);
  	child_argv[0] = command_line;
 -	status = run_command_v_opt(child_argv, RUN_USING_SHELL);
 +	argv_array_pushf(&child_env, "GIT_DIR=%s", absolute_path(get_git_dir()));
 +	status = run_command_v_opt_cd_env(child_argv, RUN_USING_SHELL, NULL,
 +					  child_env.argv);
  
  	/* force re-reading of the cache */
  	if (discard_cache() < 0 || read_cache() < 0)
@@@ -1900,8 -1897,6 +1900,8 @@@
  		status = 1;
  	}
  
 +	argv_array_clear(&child_env);
 +
  	return status;
  }
  
@@@ -2670,6 -2665,19 +2670,19 @@@ leave_check
  	return res;
  }
  
+ static int rewrite_file(const char *path, const char *buf, size_t len)
+ {
+ 	int rc = 0;
+ 	int fd = open(path, O_WRONLY | O_TRUNC);
+ 	if (fd < 0)
+ 		return error_errno(_("could not open '%s' for writing"), path);
+ 	if (write_in_full(fd, buf, len) < 0)
+ 		rc = error_errno(_("could not write to '%s'"), path);
+ 	if (close(fd) && !rc)
+ 		rc = error_errno(_("could not close '%s'"), path);
+ 	return rc;
+ }
+ 
  /* skip picking commits whose parents are unchanged */
  int skip_unnecessary_picks(void)
  {
@@@ -2742,29 -2750,11 +2755,11 @@@
  		}
  		close(fd);
  
- 		fd = open(rebase_path_todo(), O_WRONLY, 0666);
- 		if (fd < 0) {
- 			error_errno(_("could not open '%s' for writing"),
- 				    rebase_path_todo());
- 			todo_list_release(&todo_list);
- 			return -1;
- 		}
- 		if (write_in_full(fd, todo_list.buf.buf + offset,
- 				todo_list.buf.len - offset) < 0) {
- 			error_errno(_("could not write to '%s'"),
- 				    rebase_path_todo());
- 			close(fd);
- 			todo_list_release(&todo_list);
- 			return -1;
- 		}
- 		if (ftruncate(fd, todo_list.buf.len - offset) < 0) {
- 			error_errno(_("could not truncate '%s'"),
- 				    rebase_path_todo());
+ 		if (rewrite_file(rebase_path_todo(), todo_list.buf.buf + offset,
+ 				 todo_list.buf.len - offset) < 0) {
  			todo_list_release(&todo_list);
- 			close(fd);
  			return -1;
  		}
- 		close(fd);
  
  		todo_list.current = i;
  		if (is_fixup(peek_command(&todo_list, 0)))
@@@ -2949,15 -2939,7 +2944,7 @@@ int rearrange_squash(void
  			}
  		}
  
- 		fd = open(todo_file, O_WRONLY);
- 		if (fd < 0)
- 			res = error_errno(_("could not open '%s'"), todo_file);
- 		else if (write(fd, buf.buf, buf.len) < 0)
- 			res = error_errno(_("could not write to '%s'"), todo_file);
- 		else if (ftruncate(fd, buf.len) < 0)
- 			res = error_errno(_("could not truncate '%s'"),
- 					   todo_file);
- 		close(fd);
+ 		res = rewrite_file(todo_file, buf.buf, buf.len);
  		strbuf_release(&buf);
  	}