X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfc_random.c;h=99612d34d3c01d131feb155fd8e8fbf933614ca5;hb=522bfd567b97caa1496044814e42cfd12fbc22d9;hp=d3f2ee303ff09bcd8a9dfe6d93dc19518fb451be;hpb=e16562d4f4180c1364181c92d6d8f285f322f12c;p=tfcrypt.git

diff --git a/tfc_random.c b/tfc_random.c
index d3f2ee3..99612d3 100644
--- a/tfc_random.c
+++ b/tfc_random.c
@@ -28,6 +28,20 @@
 
 #include "tfcrypt.h"
 
+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)
+{
+	if (xexit_no_nl == YES) xexit_no_nl = NO;
+	exit_sigterm(signal);
+}
+
 static void get_urandom(const char *src, void *buf, size_t size)
 {
 	tfc_byte *ubuf = buf;
@@ -102,13 +116,13 @@ void gen_write_bytes(const char *foutname, tfc_fsize offset, tfc_fsize nrbytes)
 	sigact.sa_handler = change_status_timer;
 	sigaction(SIGUSR2, &sigact, NULL);
 	if (quiet == NO) {
-		sigact.sa_handler = print_crypt_status;
+		sigact.sa_handler = print_crypt_status_genrnd;
 		sigaction(SIGINT, &sigact, NULL);
 		sigaction(SIGTERM, &sigact, NULL);
 		sigaction(SIGTSTP, &sigact, NULL);
 	}
 	else {
-		sigact.sa_handler = exit_sigterm;
+		sigact.sa_handler = exit_sigterm_genrnd;
 		sigaction(SIGINT, &sigact, NULL);
 		sigaction(SIGTERM, &sigact, NULL);
 		sigact.sa_handler = handle_sigtstp;
@@ -129,15 +143,14 @@ void gen_write_bytes(const char *foutname, tfc_fsize offset, tfc_fsize nrbytes)
 		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 (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);
@@ -149,7 +162,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);
 
-		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);
@@ -181,8 +194,10 @@ _wagain:	lio = xwrite(fd, pblk, lrem);
 	}
 
 	if (verbose) tfc_esay("done!");
-	if (verbose || status_timer) print_crypt_status(0);
-	if (verbose) tfc_esay("\n");
+	if (verbose || status_timer) {
+		print_crypt_status(0);
+		tfc_esay("\n");
+	}
 
 	xclose(fd);
 	xexit(0);