X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfc_random.c;h=03f9dad78339d5c5c66ad30fe8b6f455b992167b;hb=0b911d4a813fe164d62ef6ef132c5a4f9a441d57;hp=4b82aee99de018504f09a0686dd43afb1a24ab7e;hpb=efa545d64b910923248233618e774ca3b87efebb;p=tfcrypt.git

diff --git a/tfc_random.c b/tfc_random.c
index 4b82aee..03f9dad 100644
--- 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;
@@ -83,8 +83,10 @@ void tfc_getrandom(void *buf, size_t sz)
 
 void gen_write_bytes(const char *foutname, tfc_fsize offset, tfc_fsize nrbytes)
 {
+	static tfc_fsize wrpos = NOFSIZE;
 	int fd, x;
-	size_t lblock;
+	size_t lblock, lio, lrem;
+	tfc_byte *pblk;
 
 	for (x = 1; x < NSIG; x++) signal(x, SIG_IGN);
 	memset(&sigact, 0, sizeof(sigact));
@@ -128,7 +130,7 @@ void gen_write_bytes(const char *foutname, tfc_fsize offset, tfc_fsize nrbytes)
 
 	if (offset) {
 		if (lseek(fd, offset, SEEK_SET) == -1)
-			xerror(YES, NO, NO, "%s: seek failed", foutname);
+			xerror(ignore_seek_errors, NO, NO, "%s: seek failed", foutname);
 	}
 
 	if (ctr_mode == TFC_MODE_PLAIN) memset(srcblk, 0, sizeof(srcblk));
@@ -140,13 +142,33 @@ void gen_write_bytes(const char *foutname, tfc_fsize offset, tfc_fsize nrbytes)
 	do_stop = NO;
 	while (1) {
 		if (do_stop) break;
-		lblock = blk_len_adj(nrbytes, total_processed_src, sizeof(srcblk));
+		pblk = srcblk;
+		lblock = lrem = blk_len_adj(nrbytes, total_processed_src, blksize);
 
 		if (ctr_mode != TFC_MODE_PLAIN) tfc_getrandom(srcblk, lblock);
 
-		if (write(fd, srcblk, lblock) == -1)
-			xerror(NO, NO, YES, "%s", foutname);
+		if (error_action == TFC_ERRACT_SYNC) wrpos = tfc_fdgetpos(fd);
+_wagain:	lio = xwrite(fd, pblk, lrem);
+		if (lio == NOSIZE) {
+			if (errno != EIO && catch_all_errors != YES)
+				xerror(NO, NO, YES, "%s", foutname);
+			switch (error_action) {
+				case TFC_ERRACT_CONT: xerror(YES, NO, YES, "%s", foutname); goto _wagain; break;
+				case TFC_ERRACT_SYNC:
+				case TFC_ERRACT_LSYNC:
+					xerror(YES, NO, YES, "%s", foutname);
+					if (wrpos == NOFSIZE) lseek(fd, lblock, SEEK_CUR);
+					else lseek(fd, wrpos + lblock, SEEK_SET);
+					break;
+				default: xerror(NO, NO, YES, "%s", foutname); break;
+			}
+		}
 		if (do_fsync && fsync(fd) == -1) xerror(NO, NO, YES, "%s", foutname);
+		if (lio < lrem) {
+			pblk += lio;
+			lrem -= lio;
+			goto _wagain;
+		}
 
 		total_processed_src += lblock;
 		delta_processed += lblock;