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_skein.c
diff --git
a/tfc_skein.c
b/tfc_skein.c
index 0917819e241196b7f9459e2dbbb4dea8198306e3..a3685783d28333bf58aa5de9b1c32007e8081e9f 100644
(file)
--- a/
tfc_skein.c
+++ b/
tfc_skein.c
@@
-31,7
+31,6
@@
static void exit_sigterm_skein(int signal)
{
static void exit_sigterm_skein(int signal)
{
- if (xexit_no_nl == YES) xexit_no_nl = NO;
exit_sigterm(signal);
}
exit_sigterm(signal);
}
@@
-118,7
+117,7
@@
_again: lio = xread(fd, pblk, lrem);
skein_final(hash, &sk);
if (ctr_mode == TFC_MODE_SKSUM) {
if (verbose || status_timer) {
skein_final(hash, &sk);
if (ctr_mode == TFC_MODE_SKSUM) {
if (verbose || status_timer) {
- print_crypt_status(
-1
);
+ print_crypt_status(
TFC_SIGSTAT
);
tfc_esay("\n");
}
total_processed_src = total_processed_dst = delta_processed = 0;
tfc_esay("\n");
}
total_processed_src = total_processed_dst = delta_processed = 0;
@@
-141,8
+140,6
@@
void do_sksum(char *spec, char **fargv)
int x = 0, xx;
size_t bits;
int x = 0, xx;
size_t bits;
- xexit_no_nl = YES;
-
if (macbits < TF_MAX_BITS) {
bits = macbits;
goto _dothat;
if (macbits < TF_MAX_BITS) {
bits = macbits;
goto _dothat;
@@
-225,7
+222,7
@@
_dothat:
s = strchr(shash, ' ');
if (s && s[1] == ' ') *s = 0;
s = strchr(shash, ' ');
if (s && s[1] == ' ') *s = 0;
- fd =
open(
fname, O_RDONLY | O_LARGEFILE);
+ fd =
xxopen(YES,
fname, O_RDONLY | O_LARGEFILE);
if (fd == -1) {
xerror(YES, NO, YES, "%s", fname);
exitcode = 1;
if (fd == -1) {
xerror(YES, NO, YES, "%s", fname);
exitcode = 1;
@@
-277,7
+274,7
@@
_dothat:
for (x = 0; fargv[x] && xx; x++) {
if (!strcmp(fargv[x], "-")) fd = 0;
for (x = 0; fargv[x] && xx; x++) {
if (!strcmp(fargv[x], "-")) fd = 0;
- else fd =
open(
fargv[x], O_RDONLY | O_LARGEFILE);
+ else fd =
xxopen(YES,
fargv[x], O_RDONLY | O_LARGEFILE);
if (fd == -1) {
xerror(YES, NO, YES, "%s", fargv[x]);
exitcode = 1;
if (fd == -1) {
xerror(YES, NO, YES, "%s", fargv[x]);
exitcode = 1;