projects
/
tfcrypt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
51 broke -E logic completely, rewise it
[tfcrypt.git]
/
tfc_error.c
diff --git
a/tfc_error.c
b/tfc_error.c
index 8e4148251f0a4e15d3f95df252fd8b72b81230b5..b8cc4323b00e610768a5eaf2ce62039a27aaf8d1 100644
(file)
--- a/
tfc_error.c
+++ b/
tfc_error.c
@@
-28,8
+28,6
@@
#include "tfcrypt.h"
#include "tfcrypt.h"
-tfc_yesno xexit_no_nl;
-
void xerror(tfc_yesno noexit, tfc_yesno noerrno, tfc_yesno nostats, const char *fmt, ...)
{
va_list ap;
void xerror(tfc_yesno noexit, tfc_yesno noerrno, tfc_yesno nostats, const char *fmt, ...)
{
va_list ap;
@@
-39,7
+37,7
@@
void xerror(tfc_yesno noexit, tfc_yesno noerrno, tfc_yesno nostats, const char *
va_start(ap, fmt);
va_start(ap, fmt);
- if (
statline_was_shown == YES && do_statline_dynamic == YES
) tfc_esay("\n");
+ if (
noexit == YES && (statline_was_shown == YES && do_statline_dynamic == YES)
) tfc_esay("\n");
tfc_nfsay(stderr, "%s: ", tfc_format_pid(progname));
tfc_vfsay(stderr, NO, fmt, ap);
tfc_nfsay(stderr, "%s: ", tfc_format_pid(progname));
tfc_vfsay(stderr, NO, fmt, ap);
@@
-52,12
+50,9
@@
void xerror(tfc_yesno noexit, tfc_yesno noerrno, tfc_yesno nostats, const char *
va_end(ap);
if (nostats == NO) {
va_end(ap);
if (nostats == NO) {
- print_crypt_status(-1);
- tfc_esay("\n");
+ print_crypt_status(TFC_SIGERR);
}
}
- xexit_no_nl = YES;
-
_do_sil_exit:
if (noexit == YES) {
errno = 0;
_do_sil_exit:
if (noexit == YES) {
errno = 0;
@@
-102,7
+97,6
@@
_do_clean_and_exit:
memset(pwdask, 0, sizeof(pwdask));
memset(pwdagain, 0, sizeof(pwdagain));
memset(pwdask, 0, sizeof(pwdask));
memset(pwdagain, 0, sizeof(pwdagain));
- if (xexit_no_nl == NO) tfc_esay("\n");
exit(status);
}
exit(status);
}
@@
-110,8
+104,6
@@
void usage(void)
{
tfc_yesno is_embedded_prog = NO;
{
tfc_yesno is_embedded_prog = NO;
- xexit_no_nl = YES;
-
if (optopt == 'V') {
tfc_say("tfcrypt toolkit, version %s.", _TFCRYPT_VERSION);
if (do_edcrypt != TFC_DO_PLAIN) {
if (optopt == 'V') {
tfc_say("tfcrypt toolkit, version %s.", _TFCRYPT_VERSION);
if (do_edcrypt != TFC_DO_PLAIN) {