X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfc_error.c;h=9bface14b50b5b13535f703ce82c188df21ecf1f;hb=cdd9119e29f2f865403303adb8b6004b863db968;hp=f69fdbe4ed0bf0800fcad4a101f14a3633f6a4e3;hpb=cd6f1f9a84c17dbdf6ab320a04eae300502b898d;p=tfcrypt.git

diff --git a/tfc_error.c b/tfc_error.c
index f69fdbe..9bface1 100644
--- a/tfc_error.c
+++ b/tfc_error.c
@@ -39,7 +39,7 @@ void xerror(tfc_yesno noexit, tfc_yesno noerrno, tfc_yesno nostats, const char *
 
 	if (statline_was_shown == YES && do_statline_dynamic == YES) tfc_esay("\n");
 
-	tfc_nfsay(stderr, "%s: ", progname);
+	tfc_nfsay(stderr, "%s: ", tfc_format_pid(progname));
 	tfc_vfsay(stderr, NO, fmt, ap);
 	if (errno && noerrno == NO) {
 		s = strerror(errno);
@@ -62,6 +62,8 @@ _ex:
 
 void xexit(int status)
 {
+	if (status > 1) goto _do_clean_and_exit;
+
 	xclose(sfd);
 	if (do_ftrunc > TFC_NO_FTRUNC) {
 		if (do_ftrunc == TFC_FTRUNC_TAIL) ftrunc_dfd = total_processed_dst;
@@ -70,6 +72,7 @@ void xexit(int status)
 	if (do_preserve_time) fcopy_matime(dfd, &s_stat);
 	xclose(dfd);
 
+_do_clean_and_exit:
 	memset(srcblk, 0, sizeof(srcblk));
 	memset(dstblk, 0, sizeof(dstblk));
 
@@ -313,6 +316,8 @@ void usage(void)
 	tfc_say("    statless: emit less information in status line (only processed data).");
 	tfc_say("    norepeat: do not ask for any possible password confirmations.");
 	tfc_say("    showsecrets: show passwords in plaintext instead of masking them.");
+	tfc_say("    finished: add \"finished\" word before status line when work is finished.");
+	tfc_say("    pid: show %s's process id near it's name in error messages, logs etc.", progname);
 	tfc_say("    prompt=str: set main password prompts to this string.");
 	tfc_say("    macprompt=str: set MAC password prompts to this string.");
 	tfc_say("    shorthex: with -H, do not print printable characters, dump only hex string.");