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 9ef321d43304e51fbe35ce29c301d13339a64877..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;
@@
-143,15
+137,14
@@
void gen_write_bytes(const char *foutname, tfc_fsize offset, tfc_fsize nrbytes)
fd = 1;
foutname = TFC_STDOUT_NAME;
}
fd = 1;
foutname = TFC_STDOUT_NAME;
}
- else fd = open(foutname, O_WRONLY | O_CREAT | O_LARGEFILE | write_flags, 0666);
- if (fd == -1) xerror(NO, NO, YES, "%s", foutname);
+ else fd = xopen(foutname, O_WRONLY | O_CREAT | O_LARGEFILE | write_flags);
if (offset) {
if (lseek(fd, offset, SEEK_SET) == -1)
xerror(ignore_seek_errors, NO, NO, "%s: seek failed", foutname);
}
if (offset) {
if (lseek(fd, offset, SEEK_SET) == -1)
xerror(ignore_seek_errors, NO, NO, "%s: seek failed", foutname);
}
- if (
ctr_mode == TFC_MODE
_PLAIN) memset(srcblk, 0, sizeof(srcblk));
+ if (
do_edcrypt == TFC_DO
_PLAIN) memset(srcblk, 0, sizeof(srcblk));
if (verbose) tfc_nfsay(stderr, "%s: writing %lld bytes to %s ... ",
tfc_format_pid(progname), nrbytes, foutname);
if (verbose) tfc_nfsay(stderr, "%s: writing %lld bytes to %s ... ",
tfc_format_pid(progname), nrbytes, foutname);
@@
-163,7
+156,7
@@
void gen_write_bytes(const char *foutname, tfc_fsize offset, tfc_fsize nrbytes)
pblk = srcblk;
lblock = lrem = blk_len_adj(nrbytes, total_processed_src, blksize);
pblk = srcblk;
lblock = lrem = blk_len_adj(nrbytes, total_processed_src, blksize);
- if (
ctr_mode != TFC_MODE
_PLAIN) tfc_getrandom(srcblk, lblock);
+ if (
do_edcrypt != TFC_DO
_PLAIN) tfc_getrandom(srcblk, lblock);
if (error_action == TFC_ERRACT_SYNC) wrpos = tfc_fdgetpos(fd);
_wagain: lio = xwrite(fd, pblk, lrem);
if (error_action == TFC_ERRACT_SYNC) wrpos = tfc_fdgetpos(fd);
_wagain: lio = xwrite(fd, pblk, lrem);
@@
-196,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");
}