From eae8571ae4db48b6c33578d6832d5e6cea7e731a Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Tue, 29 Nov 2005 05:48:06 +0000 Subject: [PATCH] cosmetic fixes git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3222 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- src/text.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/text.c b/src/text.c index ce9a4f30..47b61b26 100644 --- a/src/text.c +++ b/src/text.c @@ -258,6 +258,7 @@ bool execute_command(const char *command) { int fd[2]; FILE *f; + char *shellenv; struct sigaction oldaction, newaction; /* Original and temporary handlers for SIGINT. */ bool sig_failed = FALSE; @@ -269,20 +270,18 @@ bool execute_command(const char *command) return FALSE; } + /* Check $SHELL for the shell to use. If it isn't set, use + * /bin/sh. */ + shellenv = getenv("SHELL"); + if (shellenv == NULL) + shellenv = "/bin/sh"; + /* Fork a child. */ if ((pid = fork()) == 0) { - char *shellenv; - close(fd[0]); dup2(fd[1], fileno(stdout)); dup2(fd[1], fileno(stderr)); - /* Check $SHELL for the shell to use. If it isn't set, use - * /bin/sh. */ - shellenv = getenv("SHELL"); - if (shellenv == NULL) - shellenv = "/bin/sh"; - /* If execl() returns at all, there was an error. */ execl(shellenv, tail(shellenv), "-c", command, NULL); exit(0);