From 169a7d34d53c0da1ef60b70fd97982f42a9556ba Mon Sep 17 00:00:00 2001
From: David Schultz <das@FreeBSD.org>
Date: Mon, 17 Mar 2003 02:12:55 +0000
Subject: Make pw_edit() use /bin/sh to interpret the EDITOR environment
 variable.

PR:		48748
Reviewed by:	mike (mentor)
---
 libutil/pw_util.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'libutil/pw_util.c')

diff --git a/libutil/pw_util.c b/libutil/pw_util.c
index d219917..5eb0953 100644
--- a/libutil/pw_util.c
+++ b/libutil/pw_util.c
@@ -62,7 +62,6 @@ static const char rcsid[] =
 #include <ctype.h>
 #include <fcntl.h>
 #include <inttypes.h>
-#include <libgen.h>
 #include <paths.h>
 #include <pwd.h>
 #include <signal.h>
@@ -290,6 +289,8 @@ pw_edit(int notsetuid)
 {
 	struct stat st1, st2;
 	const char *editor;
+	char *editcmd;
+	int editcmdlen;
 	int pstat;
 
 	if ((editor = getenv("EDITOR")) == NULL)
@@ -305,8 +306,17 @@ pw_edit(int notsetuid)
 			(void)setgid(getgid());
 			(void)setuid(getuid());
 		}
+		if ((editcmdlen = sysconf(_SC_ARG_MAX) - 6) <= 0 ||
+		    (editcmd = malloc(editcmdlen)) == NULL)
+			_exit(EXIT_FAILURE);
+		if (snprintf(editcmd, editcmdlen, "%s %s",
+		    editor, tempname) >= editcmdlen) {
+			free(editcmd);	/* pedantry */
+			_exit(EXIT_FAILURE);
+		}
 		errno = 0;
-		execlp(editor, basename(editor), tempname, NULL);
+		execl(_PATH_BSHELL, "sh", "-c", editcmd, NULL);
+		free(editcmd);
 		_exit(errno);
 	default:
 		/* parent */
-- 
cgit v1.2.3-56-ge451