Merge "dhcp_utils: Add -f dhcpcd.conf processing"
diff --git a/adb/framebuffer_service.c b/adb/framebuffer_service.c
index 862dd91..20c08d2 100644
--- a/adb/framebuffer_service.c
+++ b/adb/framebuffer_service.c
@@ -19,6 +19,9 @@
#include <unistd.h>
#include <string.h>
#include <fcntl.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/wait.h>
#include "fdevent.h"
#include "adb.h"
@@ -169,6 +172,8 @@
if(writex(fd, buf, fbinfo.size % sizeof(buf))) goto done;
done:
+ TEMP_FAILURE_RETRY(waitpid(pid, NULL, 0));
+
close(fds[0]);
close(fds[1]);
close(fd);
diff --git a/libsparse/sparse.c b/libsparse/sparse.c
index 189b4c0..741e8c6 100644
--- a/libsparse/sparse.c
+++ b/libsparse/sparse.c
@@ -139,7 +139,7 @@
DIV_ROUND_UP(backed_block_len(bb), s->block_size);
}
- pad = s->len - last_block * s->block_size;
+ pad = s->len - (int64_t)last_block * s->block_size;
assert(pad >= 0);
if (pad > 0) {
write_skip_chunk(out, pad);