diff options
author | Junio C Hamano <junkio@cox.net> | 2007-01-07 00:12:47 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-01-07 00:12:47 -0800 |
commit | cf2999eb4cbe39d5a40add574be9e5c019df758b (patch) | |
tree | 7db896f8daee290e2f47a1d00a00b56d4e55e2e3 /write_or_die.c | |
parent | e7bb17a4753f11376a9bc6d3c1435c2602d3a0fc (diff) | |
parent | ecaebf4af1212f8a74bc560a66c76c22e7c87131 (diff) | |
download | git-cf2999eb4cbe39d5a40add574be9e5c019df758b.tar.gz git-cf2999eb4cbe39d5a40add574be9e5c019df758b.tar.xz |
Merge branch 'sp/mmap'
* sp/mmap: (27 commits)
Spell default packedgitlimit slightly differently
Increase packedGit{Limit,WindowSize} on 64 bit systems.
Update packedGit config option documentation.
mmap: set FD_CLOEXEC for file descriptors we keep open for mmap()
pack-objects: fix use of use_pack().
Fix random segfaults in pack-objects.
Cleanup read_cache_from error handling.
Replace mmap with xmmap, better handling MAP_FAILED.
Release pack windows before reporting out of memory.
Default core.packdGitWindowSize to 1 MiB if NO_MMAP.
Test suite for sliding window mmap implementation.
Create pack_report() as a debugging aid.
Support unmapping windows on 'temporary' packfiles.
Improve error message when packfile mmap fails.
Ensure core.packedGitWindowSize cannot be less than 2 pages.
Load core configuration in git-verify-pack.
Fully activate the sliding window pack access.
Unmap individual windows rather than entire files.
Document why header parsing won't exceed a window.
Loop over pack_windows when inflating/accessing data.
...
Conflicts:
cache.h
pack-check.c
Diffstat (limited to 'write_or_die.c')
-rw-r--r-- | write_or_die.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/write_or_die.c b/write_or_die.c index 650f13fc0..6db1d3123 100644 --- a/write_or_die.c +++ b/write_or_die.c @@ -1,5 +1,21 @@ #include "cache.h" +void read_or_die(int fd, void *buf, size_t count) +{ + char *p = buf; + ssize_t loaded; + + while (count > 0) { + loaded = xread(fd, p, count); + if (loaded == 0) + die("unexpected end of file"); + else if (loaded < 0) + die("read error (%s)", strerror(errno)); + count -= loaded; + p += loaded; + } +} + void write_or_die(int fd, const void *buf, size_t count) { const char *p = buf; |