mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

copy_fd(): do not close the input file descriptor

Browse Source 
The caller, not this function, opened the file descriptor; it is
selfish for the callee to close it when it is done reading from it.
The caller may want an option to rewind and re-read the contents
after it returns.

Simplify the loop to copy the input in full to the output; its
body essentially is what a call to write_in_full() helper does.

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Steffen Prohaska
2014-08-26 17:23:24 +02:00
committed by Junio C Hamano
parent 02710228dd
commit b29763aa9b
2 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lockfile.c
View File

@ -224,8 +224,11 @@ int hold_lock_file_for_append(struct lock_file *lk, const char *path, int flags)
} else if (copy_fd(orig_fd, fd)) {
if (flags & LOCK_DIE_ON_ERROR)
exit(128);
close(orig_fd);
close(fd);
return -1;
} else {
close(orig_fd);
}
return fd;
}