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

[tfcrypt.git] / tfc_skein.c

diff --git a/tfc_skein.c b/tfc_skein.c
index 369fc234bf2fe06e0335e032faa6e3a02822aa1e..b3b2019d5875d446d3704ea854f8511c72f0ce34 100644 (file)
--- a/tfc_skein.c
+++ b/tfc_skein.c
@@ -77,7 +77,8 @@ tfc_yesno skeinfd(void *hash, size_t bits, const void *key, int fd, tfc_fsize re
                pblk = skblk;
                lblock = lrem = blk_len_adj(readto, total, TFC_BLKSIZE);
                ldone = 0;
-_again:                lio = read(fd, pblk, lrem);
+               if (error_action == TFC_ERRACT_SYNC) rdpos = tfc_fdgetpos(fd);
+_again:                lio = xread(fd, pblk, lrem);
                if (lio == 0) stop = YES;
                if (lio != NOSIZE) ldone += lio;
                else {
@@ -85,11 +86,13 @@ _again:             lio = read(fd, pblk, lrem);
                        switch (error_action) {
                                case TFC_ERRACT_CONT: xerror(YES, NO, NO, "skeinfd: %d", fd); goto _again; break;
                                case TFC_ERRACT_SYNC:
+                               case TFC_ERRACT_LSYNC:
                                        xerror(YES, NO, NO, "skeinfd: %d", fd);
                                        lio = lrem = ldone = lblock;
                                        total += lio;
                                        memset(skblk, 0, lio);
-                                       lseek(fd, lio, SEEK_CUR);
+                                       if (rdpos == NOFSIZE) lseek(fd, lio, SEEK_CUR);
+                                       else lseek(fd, rdpos + lio, SEEK_SET);
                                        break;
                                default: goto _fail; break;
                        }
@@ -286,7 +289,7 @@ _dohash:    if (status_timer) setup_next_alarm(status_timer);
                        for (y = 0; y < sksum_turns; y++) skein(hash, bits, mackey_opt ? mackey : NULL, hash, TF_FROM_BITS(bits));
                }
                if (do_outfmt == TFC_OUTFMT_B64) tfc_printbase64(stdout, hash, TF_FROM_BITS(bits), 0);
-               else if (do_outfmt == TFC_OUTFMT_RAW) write(1, hash, TF_FROM_BITS(bits));
+               else if (do_outfmt == TFC_OUTFMT_RAW) xwrite(1, hash, TF_FROM_BITS(bits));
                else mhexdump(hash, TF_FROM_BITS(bits), TF_FROM_BITS(bits), 0);
                if (do_outfmt != TFC_OUTFMT_RAW) {
                        if (quiet == NO || xx > 1) tfc_say("\t%s", fargv[x] ? fargv[x] : "-");