-E sync: reform logic. Prequery file position, jump over error hole.

[tfcrypt.git] / tfc_vars.c

diff --git a/tfc_vars.c b/tfc_vars.c
index 7f78b84fad5b70222c3259bb1c725e5098a66608..5f75952bdad9601aa0fbad0108eb1250ffe9f626 100644 (file)
--- a/tfc_vars.c
+++ b/tfc_vars.c
@@ -27,14 +27,11 @@
  */
 
 #include "tfcrypt.h"
+#include "tfcrypt_defs.h"
 
 char *progname;
 int exitcode;
 
-size_t nr_turns = TFC_NR_TURNS;
-int ctr_mode = TFC_CTR_MODE;
-size_t macbits = TF_MAX_BITS;
-
 tfc_byte key[TF_KEY_SIZE], ctr[TF_BLOCK_SIZE], xtskey[TF_KEY_SIZE], mackey[TF_FROM_BITS(TF_MAX_BITS)];
 struct skein sk;
 struct tfe_stream tfe;
@@ -48,6 +45,7 @@ tfc_fsize iseek_blocks, iseek, oseek, maxlen = NOFSIZE;
 tfc_fsize total_processed_src, total_processed_dst;
 tfc_fsize delta_processed;
 tfc_fsize genrandom_nr_bytes, genzero_nr_bytes;
+tfc_fsize rdpos = NOFSIZE;
 int sfd, kfd = -1, dfd = 1;
 struct stat s_stat;
 size_t blksize = TFC_BLKSIZE, xtsblocks = TFC_XTSBLOCKS;
@@ -67,7 +65,7 @@ tfc_yesno catch_all_errors, password, overwrite_source, do_fsync, do_pad, do_tfc
 tfc_yesno do_preserve_time, do_stats_in_gibs, do_statline_dynamic = YES, do_less_stats;
 tfc_yesno no_repeat, do_full_hexdump = YES, verbose, statline_was_shown;
 char *srcfname = TFC_STDIN_NAME, *dstfname = TFC_STDOUT_NAME, *do_mac_file, *counter_file, *sksum_hashlist_file;
-char *genkeyf, *mackeyf, *tweakf;
+char *saltf, *genkeyf, *mackeyf, *tweakf;
 char *pw_prompt, *mac_pw_prompt;
 tfc_useconds status_timer, bench_timer;
 tfc_useconds current_time, delta_time;