X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfc_error.c;h=e33131504fa1051b22b1f419202fd137b0d23a97;hb=6a181d607fe6fe8c66b894efb281855bb2eee573;hp=7c001dacf0c52859b974e38e288733ff06e2cc06;hpb=efa545d64b910923248233618e774ca3b87efebb;p=tfcrypt.git diff --git a/tfc_error.c b/tfc_error.c index 7c001da..e331315 100644 --- a/tfc_error.c +++ b/tfc_error.c @@ -151,6 +151,8 @@ void usage(void) tfc_say("convert encrypted data into ASCII format to ease transmission."); tfc_say("\n"); tfc_say(" -e, -d: encrypt, decrypt (it maybe required)."); + tfc_say(" -s : load tfcrypt salt from file."); + tfc_say(" -s disable: disable key salting at all."); tfc_say(" -p: instead of using key, ask for password."); tfc_say(" -k: use raw (%u byte) key instead of deriving it from arbitrary data.", TFC_U(TF_KEY_SIZE)); tfc_say(" -z: ask for key in plain C string form through password asker."); @@ -210,9 +212,13 @@ void usage(void) tfc_say(" cont: print error if not quiet, then continue,"); tfc_say(" no action to pad missing data is attempted."); tfc_say(" may be dangerous when working with block devices."); - tfc_say(" sync: print error if not quiet, then continue."); + tfc_say(" sync: print error if not quiet, then continue,"); tfc_say(" pad missing data block with zeroes."); - tfc_say(" note that sync works only with read errors!"); + tfc_say(" lsync: same as sync, but does not use SEEK_SET logic,"); + tfc_say(" lsync uses only relative seek operations, and does not prequery"); + tfc_say(" the current file position for exact offsets, which maybe unsafe."); + tfc_say(" For this reason, it is HIGHLY recommended to use sync instead!"); + tfc_say(" Note that both sync and lsync work only with read errors!"); tfc_say(" default error action is exit with printing status if not quiet."); tfc_say(" -E xall: turn on error actions above for all errors, not just EIO errors."); tfc_say(" This must be a separate option given before usual -E how option.");