undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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()
This commit is contained in:
Junio C Hamano 2017-11-15 12:14:28 +09:00
commit 6fa1f6f16f
1 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
sequencer.c
View File

@ -2670,6 +2670,19 @@ leave_check:
return res; 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 */ /* skip picking commits whose parents are unchanged */
int skip_unnecessary_picks(void) int skip_unnecessary_picks(void)
{ {
@ -2742,29 +2755,11 @@ int skip_unnecessary_picks(void)
} }
close(fd); close(fd);
fd = open(rebase_path_todo(), O_WRONLY, 0666); if (rewrite_file(rebase_path_todo(), todo_list.buf.buf + offset,
if (fd < 0) { todo_list.buf.len - offset) < 0) {
error_errno(_("could not open '%s' for writing"),
rebase_path_todo());
todo_list_release(&todo_list); todo_list_release(&todo_list);
return -1; 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());
todo_list_release(&todo_list);
close(fd);
return -1;
}
close(fd);
todo_list.current = i; todo_list.current = i;
if (is_fixup(peek_command(&todo_list, 0))) if (is_fixup(peek_command(&todo_list, 0)))
@ -2949,15 +2944,7 @@ int rearrange_squash(void)
} }
} }
fd = open(todo_file, O_WRONLY); res = rewrite_file(todo_file, buf.buf, buf.len);
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);
strbuf_release(&buf); strbuf_release(&buf);
} }