From a1a559e25a19726b3a62267feb5e89bad2fcd01e Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Wed, 4 Jan 2017 01:32:44 -0600 Subject: Some lib fixes: mark xvfork() noinline, make xsendfile() return bytes copied, make xsocket()'s returned fd CLOEXEC. --- lib/xwrap.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lib/xwrap.c') diff --git a/lib/xwrap.c b/lib/xwrap.c index 66972f2b..611bdb52 100644 --- a/lib/xwrap.c +++ b/lib/xwrap.c @@ -163,7 +163,7 @@ void xflush(void) // share a stack, so child returning from a function would stomp the return // address parent would need. Solution: make vfork() an argument so processes // diverge before function gets called. -pid_t xvforkwrap(pid_t pid) +pid_t __attribute__((noinline)) xvforkwrap(pid_t pid) { if (pid == -1) perror_exit("vfork"); @@ -732,16 +732,20 @@ void xpidfile(char *name) // Copy the rest of in to out and close both files. -void xsendfile(int in, int out) +long long xsendfile(int in, int out) { + long long total = 0; long len; - if (in<0) return; + if (in<0) return 0; for (;;) { len = xread(in, libbuf, sizeof(libbuf)); if (len<1) break; xwrite(out, libbuf, len); + total += len; } + + return total; } // parse fractional seconds with optional s/m/h/d suffix -- cgit v1.2.3