tfc_io: xread and xwrite, which transparently handle EINTR case.

[tfcrypt.git] / tfc_random.c

diff --git a/tfc_random.c b/tfc_random.c
index 0e90f48be408eda3a2bab9d2cec53122955dc85a..7c7b0b911d1564b9284c0e2bbc498d4c47429d32 100644 (file)
--- a/tfc_random.c
+++ b/tfc_random.c
@@ -44,7 +44,7 @@ static void get_urandom(const char *src, void *buf, size_t size)
        if (fd == -1) fd = open("/dev/random", O_RDONLY);
        if (fd == -1) xerror(NO, YES, YES, "random source is required (tried %s)", src);
 
-_again:        rd = read(fd, ubuf, sz);
+_again:        rd = xread(fd, ubuf, sz);
        if (rd < sz && rd != NOSIZE) {
                ubuf += rd;
                sz -= rd;
@@ -148,7 +148,7 @@ void gen_write_bytes(const char *foutname, tfc_fsize offset, tfc_fsize nrbytes)
                if (ctr_mode != TFC_MODE_PLAIN) tfc_getrandom(srcblk, lblock);
 
                if (error_action == TFC_ERRACT_SYNC) wrpos = tfc_fdgetpos(fd);
-_wagain:       lio = write(fd, pblk, lrem);
+_wagain:       lio = xwrite(fd, pblk, lrem);
                if (lio == NOSIZE) {
                        if (errno != EIO && catch_all_errors != YES)
                                xerror(NO, NO, YES, "%s", foutname);