fix quiet mode and final reporting when using -O count.

[tfcrypt.git] / tfc_vars.c

diff --git a/tfc_vars.c b/tfc_vars.c
index f62926453225f4d2aefcfa850b0a1d44a484b6d2..359c7e1e1860a13e924a25f6447408502ac7916c 100644 (file)
--- a/tfc_vars.c
+++ b/tfc_vars.c
@@ -2,7 +2,7 @@
  * tfcrypt -- high security Threefish encryption tool.
  *
  * tfcrypt is copyrighted:
- * Copyright (C) 2012-2018 Andrey Rys. All rights reserved.
+ * Copyright (C) 2012-2019 Andrey Rys. All rights reserved.
  *
  * tfcrypt is licensed to you under the terms of std. MIT/X11 license:
  *
@@ -42,7 +42,7 @@ tfc_byte tmpdata[TFC_TMPSIZE];
 char *randsource = TFC_DEFAULT_RANDSOURCE;
 
 tfc_fsize iseek_blocks, iseek, oseek, maxlen = NOFSIZE, ftrunc_dfd = NOFSIZE;
-tfc_fsize total_processed_src, total_processed_dst;
+tfc_fsize total_processed_src, total_processed_dst, total_written_dst;
 tfc_fsize delta_processed;
 tfc_fsize genrandom_nr_bytes, genzero_nr_bytes;
 tfc_fsize rdpos = NOFSIZE;
@@ -62,13 +62,13 @@ size_t sksum_turns;
 int do_edcrypt = TFC_DO_ENCRYPT, do_stop, quiet, error_action;
 int counter_opt, mackey_opt, do_mac, do_outfmt = TFC_OUTFMT_B64, rawkey;
 int idx, write_flags;
-tfc_yesno catch_all_errors, ignore_seek_errors, password, overwrite_source, do_fsync, do_pad;
+tfc_yesno catch_all_errors, ignore_seek_errors, password, overwrite_source, do_fsync, do_pad, do_ftrunc = TFC_NO_FTRUNC;
 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, show_secrets;
 char *srcfname = TFC_STDIN_NAME, *dstfname = TFC_STDOUT_NAME, *do_mac_file, *counter_file, *sksum_hashlist_file;
 char *saltf, *genkeyf, *mackeyf, *tweakf;
 char *pw_prompt, *mac_pw_prompt;
 tfc_useconds status_timer, bench_timer;
-tfc_useconds current_time, delta_time;
+tfc_useconds total_time, current_time, delta_time;
 
 struct getpasswd_state getps;