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_random.c
diff --git
a/tfc_random.c
b/tfc_random.c
index 99612d34d3c01d131feb155fd8e8fbf933614ca5..321f97a6d1c3016e20e5e75048ad62bfa5db9929 100644
(file)
--- a/
tfc_random.c
+++ b/
tfc_random.c
@@
-30,15
+30,11
@@
static void print_crypt_status_genrnd(int signal)
{
static void print_crypt_status_genrnd(int signal)
{
- if (signal == SIGTERM || signal == SIGINT) {
- if (xexit_no_nl == YES) xexit_no_nl = NO;
- }
print_crypt_status(signal);
}
static void exit_sigterm_genrnd(int signal)
{
print_crypt_status(signal);
}
static void exit_sigterm_genrnd(int signal)
{
- if (xexit_no_nl == YES) xexit_no_nl = NO;
exit_sigterm(signal);
}
exit_sigterm(signal);
}
@@
-102,8
+98,6
@@
void gen_write_bytes(const char *foutname, tfc_fsize offset, tfc_fsize nrbytes)
size_t lblock, lio, lrem;
tfc_byte *pblk;
size_t lblock, lio, lrem;
tfc_byte *pblk;
- xexit_no_nl = YES;
-
for (x = 1; x < NSIG; x++) signal(x, SIG_IGN);
memset(&sigact, 0, sizeof(sigact));
sigact.sa_flags = SA_RESTART;
for (x = 1; x < NSIG; x++) signal(x, SIG_IGN);
memset(&sigact, 0, sizeof(sigact));
sigact.sa_flags = SA_RESTART;
@@
-195,7
+189,7
@@
_wagain: lio = xwrite(fd, pblk, lrem);
if (verbose) tfc_esay("done!");
if (verbose || status_timer) {
if (verbose) tfc_esay("done!");
if (verbose || status_timer) {
- print_crypt_status(
0
);
+ print_crypt_status(
TFC_SIGSTAT
);
tfc_esay("\n");
}
tfc_esay("\n");
}