X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfcrypt.h;h=a571397d5186b9423437ee96803e68b4b37c2ef4;hb=8cf1129abf5f42bd57fe0f6f0c5308d425b95027;hp=1b5f8116faf7977db863e3c0ecc55dbe4c724853;hpb=e48de7c114fc724a6c1e45fd8716dc6111d01372;p=tfcrypt.git diff --git a/tfcrypt.h b/tfcrypt.h index 1b5f811..a571397 100644 --- a/tfcrypt.h +++ b/tfcrypt.h @@ -132,6 +132,7 @@ extern tfc_yesno do_full_key; extern char *progname; extern int exitcode; +extern pid_t progpid; extern 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]; extern struct skein sk; extern struct tfe_stream tfe; @@ -157,7 +158,7 @@ extern int do_edcrypt, do_stop, quiet, error_action; extern int counter_opt, mackey_opt, do_mac, do_outfmt, rawkey; extern int idx, write_flags; extern tfc_yesno catch_all_errors, ignore_seek_errors, password, overwrite_source, do_fsync, do_pad, do_ftrunc; -extern tfc_yesno do_preserve_time, do_stats_in_gibs, do_statline_dynamic, do_less_stats; +extern tfc_yesno do_preserve_time, do_stats_in_gibs, do_statline_dynamic, do_less_stats, show_pid; extern tfc_yesno no_repeat, do_full_hexdump, verbose, statline_was_shown, show_secrets, show_when_done; extern char *srcfname, *dstfname, *do_mac_file, *counter_file, *sksum_hashlist_file; extern char *saltf, *genkeyf, *mackeyf, *tweakf; @@ -169,6 +170,8 @@ extern struct getpasswd_state getps; size_t xread(int fd, void *data, size_t szdata); size_t xwrite(int fd, const void *data, size_t szdata); +extern tfc_yesno xexit_no_nl; + void xerror(tfc_yesno noexit, tfc_yesno noerrno, tfc_yesno nostats, const char *fmt, ...); void xexit(int status); void usage(void); @@ -190,6 +193,7 @@ void xclose(int fd); const char *tfc_modename(int mode); void tfc_getcurtime(tfc_useconds *tx); char *tfc_format_time(tfc_useconds t); +char *tfc_format_pid(const char *str); tfc_fsize tfc_fdsize(int fd); tfc_fsize tfc_fdgetpos(int fd); tfc_fsize tfc_fnamesize(char *fname, tfc_yesno noexit);