X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfc_random.c;h=0a529d401b53410f08ef97d436a6fc4b578ab1f6;hb=c0d678824537239f5e17822cd8473ac32f1ed251;hp=0e90f48be408eda3a2bab9d2cec53122955dc85a;hpb=8bdb7b7f595e5fb53dbb261795844ca29c222bfd;p=tfcrypt.git

diff --git a/tfc_random.c b/tfc_random.c
index 0e90f48..0a529d4 100644
--- a/tfc_random.c
+++ b/tfc_random.c
@@ -2,7 +2,7 @@
  * tfcrypt -- high security Threefish encryption tool.
  *
  * tfcrypt is copyrighted:
- * Copyright (C) 2012-2018 Andrey Rys. All rights reserved.
+ * Copyright (C) 2012-2019 Andrey Rys. All rights reserved.
  *
  * tfcrypt is licensed to you under the terms of std. MIT/X11 license:
  *
@@ -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;
@@ -44,7 +58,7 @@ static void get_urandom(const char *src, void *buf, size_t size)
 	if (fd == -1) fd = open("/dev/random", O_RDONLY);
 	if (fd == -1) xerror(NO, YES, YES, "random source is required (tried %s)", src);
 
-_again:	rd = read(fd, ubuf, sz);
+_again:	rd = xread(fd, ubuf, sz);
 	if (rd < sz && rd != NOSIZE) {
 		ubuf += rd;
 		sz -= rd;
@@ -88,27 +102,31 @@ void gen_write_bytes(const char *foutname, tfc_fsize offset, tfc_fsize nrbytes)
 	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;
 	sigact.sa_handler = print_crypt_status;
 	sigaction(SIGUSR1, &sigact, NULL);
-	sigaction(SIGTSTP, &sigact, NULL);
 	sigaction(SIGALRM, &sigact, NULL);
-	if (status_timer) setup_next_alarm(status_timer);
+	if (status_timer) setup_next_alarm(status_timer > 1000000 ? 1000000 : status_timer);
 	sigact.sa_handler = change_status_width;
 	sigaction(SIGQUIT, &sigact, NULL);
 	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;
+		sigaction(SIGTSTP, &sigact, NULL);
 	}
 	memset(&sigact, 0, sizeof(struct sigaction));
 
@@ -125,18 +143,17 @@ 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(YES, NO, NO, "%s: seek failed", foutname);
+			xerror(ignore_seek_errors, NO, NO, "%s: seek failed", foutname);
 	}
 
 	if (ctr_mode == TFC_MODE_PLAIN) memset(srcblk, 0, sizeof(srcblk));
 
 	if (verbose) tfc_nfsay(stderr, "%s: writing %lld bytes to %s ... ",
-		progname, nrbytes, foutname);
+		tfc_format_pid(progname), nrbytes, foutname);
 
 	errno = 0;
 	do_stop = NO;
@@ -148,7 +165,7 @@ void gen_write_bytes(const char *foutname, tfc_fsize offset, tfc_fsize nrbytes)
 		if (ctr_mode != TFC_MODE_PLAIN) tfc_getrandom(srcblk, lblock);
 
 		if (error_action == TFC_ERRACT_SYNC) wrpos = tfc_fdgetpos(fd);
-_wagain:	lio = write(fd, pblk, lrem);
+_wagain:	lio = xwrite(fd, pblk, lrem);
 		if (lio == NOSIZE) {
 			if (errno != EIO && catch_all_errors != YES)
 				xerror(NO, NO, YES, "%s", foutname);
@@ -177,7 +194,10 @@ _wagain:	lio = write(fd, pblk, lrem);
 	}
 
 	if (verbose) tfc_esay("done!");
-	if (verbose || status_timer) print_crypt_status(0);
+	if (verbose || status_timer) {
+		print_crypt_status(0);
+		tfc_esay("\n");
+	}
 
 	xclose(fd);
 	xexit(0);