andre/cosmopolitan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix AR.COM on RHEL7 (#24)

Browse Source 
Doing this required improving the copyfd() polyfill needed by
copy_file_range() so it'll work harder to avoid short writes.
This commit is contained in:
Justine Tunney
2021-01-17 10:28:52 -08:00
parent 565edd051f
commit 78add3cb17
2 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
build/bootstrap/ar.com
View File

Binary file not shown.

68
libc/calls/copyfd.c
View File

@ -16,57 +16,51 @@
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │ │ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/ ╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/assert.h"
#include "libc/bits/bits.h"
#include "libc/bits/safemacros.h"
#include "libc/calls/calls.h" #include "libc/calls/calls.h"
#include "libc/calls/internal.h"
#include "libc/errno.h" #include "libc/errno.h"
#include "libc/sysv/errfuns.h" #include "libc/macros.h"
/** /**
* Copies data between file descriptors the slow way. * Copies data between file descriptors the slow way.
* *
* @return -1 on error/interrupt, 0 on eof, or [1..uptobytes] on success * @return -1 on error/interrupt, 0 on eof, or [1..size] on success
* @see copy_file_range() for file ↔ file * @see copy_file_range() for file ↔ file
* @see sendfile() for seekable → socket * @see sendfile() for seekable → socket
* @see splice() for fd ↔ pipe * @see splice() for fd ↔ pipe
*/ */
ssize_t copyfd(int infd, int64_t *inopt_out_inoffset, int to_fd, ssize_t copyfd(int infd, int64_t *inoutopt_inoffset, int outfd,
int64_t *inopt_out_outoffset, size_t uptobytes, uint32_t flags) { int64_t *inoutopt_outoffset, size_t size, uint32_t flags) {
size_t i; ssize_t rc;
int64_t offset; char buf[2048];
ssize_t got, wrote; size_t i, j, n;
static unsigned char buf[1024 * 64]; for (i = 0; i < size; i += j) {
/* unsigned char buf[1024 * 3]; */ n = MIN(size - i, sizeof(buf));
uptobytes = min(sizeof(buf), uptobytes); if (inoutopt_inoffset) {
if (inopt_out_inoffset) { rc = pread(infd, buf, n, *inoutopt_inoffset);
got = pread(infd, buf, uptobytes, *inopt_out_inoffset);
} else {
got = read(infd, buf, uptobytes);
}
if (got == -1) return -1;
offset = inopt_out_outoffset ? *inopt_out_outoffset : -1;
for (i = 0; i < got; i += wrote) {
tryagain:
if (inopt_out_outoffset) {
wrote = pwrite(to_fd, buf, got - i, offset + i);
} else { } else {
wrote = write(to_fd, buf, got - i); rc = read(infd, buf, n);
} }
if (wrote != -1) continue; if (!rc) return i;
if (errno == EINTR) { if (rc == -1) {
if (inopt_out_inoffset != NULL) { if (i) return i;
return -1;
}
n = rc;
for (j = 0; j < n; j += rc) {
TryAgain:
if (inoutopt_outoffset) {
rc = pwrite(outfd, buf + j, n - j, *inoutopt_outoffset);
} else {
rc = write(outfd, buf + j, n - j);
}
if (rc == -1) {
if (errno == EINTR) goto TryAgain;
if (errno == EWOULDBLOCK) goto TryAgain; /* suboptimal */
return -1; return -1;
} }
goto tryagain; if (inoutopt_inoffset) *inoutopt_inoffset += rc;
if (inoutopt_outoffset) *inoutopt_outoffset += rc;
} }
if (errno == EWOULDBLOCK) {
assert(inopt_out_inoffset != NULL); /* or caller is nuts */
}
return -1;
} }
if (inopt_out_inoffset) *inopt_out_inoffset += got; return i;
if (inopt_out_outoffset) *inopt_out_outoffset += got;
return got;
} }