From: Karel Zak <kzak@redhat.com>
Date: Thu, 1 Feb 2018 14:40:43 +0000 (+0100)
Subject: text-utils: use errexec()
X-Git-Tag: v2.32-rc1~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62fa0883be6b2a51f8e69275c4cb31557e84b79f;p=thirdparty%2Futil-linux.git

text-utils: use errexec()

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/text-utils/more.c b/text-utils/more.c
index cbff39b113..0b2db22f39 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -1619,6 +1619,7 @@ void execute(char *filename, char *cmd, ...)
 	for (n = 10; (id = fork()) < 0 && n > 0; n--)
 		sleep(5);
 	if (id == 0) {
+		int errsv;
 		if (!isatty(0)) {
 			close(0);
 			open("/dev/tty", 0);
@@ -1647,8 +1648,9 @@ void execute(char *filename, char *cmd, ...)
 		va_end(argp);
 
 		execvp(cmd, args);
+		errsv = errno;
 		putserr(_("exec failed\n"));
-		exit(EXIT_FAILURE);
+		exit(errsv == ENOENT ? EX_EXEC_ENOENT : EX_EXEC_FAILED);
 	}
 	if (id > 0) {
 		signal(SIGINT, SIG_IGN);
diff --git a/text-utils/pg.c b/text-utils/pg.c
index ed9eb415af..f441c04f01 100644
--- a/text-utils/pg.c
+++ b/text-utils/pg.c
@@ -1380,9 +1380,8 @@ static void pgfile(FILE *f, const char *name)
 						my_sigset(SIGTERM, oldterm);
 						execl(sh, sh, "-c",
 						      cmd.cmdline + 1, NULL);
-						warn(_("failed to execute %s"), sh);
-						_exit(0177);
-						/* NOTREACHED */
+						errexec(sh);
+						break;
 					}
 					case -1:
 						mesg(_("fork() failed, "