X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfc_vars.c;h=8c6a38c08e493963e9c59c9e5a4f16e8fcd65460;hb=HEAD;hp=1a65ac331968261d16e3bfe983bcda068823090b;hpb=c0dc5614a87ed6d0eed4906447171ef4c73b306e;p=tfcrypt.git diff --git a/tfc_vars.c b/tfc_vars.c index 1a65ac3..8c6a38c 100644 --- a/tfc_vars.c +++ b/tfc_vars.c @@ -31,6 +31,7 @@ char *progname; int exitcode; +pid_t progpid; tfc_byte key[TF_KEY_SIZE], ctr[TF_BLOCK_SIZE], xtskey[TF_KEY_SIZE], mackey[TF_FROM_BITS(TF_MAX_BITS)], tweak[TF_TWEAK_SIZE]; struct skein sk; @@ -42,7 +43,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; @@ -63,8 +64,8 @@ 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, 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; +tfc_yesno do_preserve_time, do_stats_in_gibs, do_statline_dynamic = YES, do_less_stats, show_pid, read_only; +tfc_yesno no_repeat, do_full_hexdump = YES, verbose, statline_was_shown, show_secrets, show_when_done; 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;