nano

commit 0c613cb1ac74eceb8b466dab2e54972e403cbf22
parent 1e5064ef84cd4ceb5e5df7abfb8ac09bb10877b6
Author: Benno Schulenberg <bensberg@telfort.nl>
Date:   Mon, 23 Apr 2018 12:30:14 +0200

tweaks: rename a variable, to be more clear and to match another

Diffstat:
M
src/nano.c
 | 
2
+-
M
src/text.c
 | 
10
+++++-----

2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/nano.c b/src/nano.c
@@ -1099,7 +1099,7 @@ bool scoop_stdin(void)
 	struct sigaction oldaction, newaction;
 		/* Original and temporary handlers for SIGINT. */
 	bool setup_failed = FALSE;
-		/* Whether setting up the SIGINT handler failed. */
+		/* Whether setting up the temporary SIGINT handler failed. */
 	FILE *stream;
 	int thetty;
 
diff --git a/src/text.c b/src/text.c
@@ -1087,8 +1087,8 @@ bool execute_command(const char *command)
 	const char *shellenv;
 	struct sigaction oldaction, newaction;
 		/* Original and temporary handlers for SIGINT. */
-	bool sig_failed = FALSE;
-		/* Did sigaction() fail without changing the signal handlers? */
+	bool setup_failed = FALSE;
+		/* Whether setting up the temporary SIGINT handler failed. */
 
 	/* Make our pipes. */
 	if (pipe(fd) == -1) {
@@ -1128,12 +1128,12 @@ bool execute_command(const char *command)
 
 	/* Set things up so that Ctrl-C will terminate the forked process. */
 	if (sigaction(SIGINT, NULL, &newaction) == -1) {
-		sig_failed = TRUE;
+		setup_failed = TRUE;
 		nperror("sigaction");
 	} else {
 		newaction.sa_handler = cancel_command;
 		if (sigaction(SIGINT, &newaction, &oldaction) == -1) {
-			sig_failed = TRUE;
+			setup_failed = TRUE;
 			nperror("sigaction");
 		}
 	}
@@ -1148,7 +1148,7 @@ bool execute_command(const char *command)
 		nperror("wait");
 
 	/* If it was changed, restore the handler for SIGINT. */
-	if (!sig_failed && sigaction(SIGINT, &oldaction, NULL) == -1)
+	if (!setup_failed && sigaction(SIGINT, &oldaction, NULL) == -1)
 		nperror("sigaction");
 
 	/* Restore the terminal to its desired state, and disable