Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 20 Jun 2020 06:20:00 +0000 (UTC)
From:      Piotr Pawel Stefaniak <pstef@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r362430 - head/lib/libutil
Message-ID:  <202006200620.05K6K0vh003202@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: pstef
Date: Sat Jun 20 06:20:00 2020
New Revision: 362430
URL: https://svnweb.freebsd.org/changeset/base/362430

Log:
  Make vipw error message less cryptic
  
  Unable to find an editor, vipw would give this error:
  # env EDITOR=fnord vipw
  vipw: pw_edit(): No such file or directory
  
  vigr or crontab do better:
  # env EDITOR=fnord crontab -e
  crontab: no crontab for root - using an empty one
  crontab: fnord: No such file or directory
  crontab: "fnord" exited with status 1
  
  After this change, vipw behaves more like vigr or crontab:
  # env EDITOR=fnord vipw
  vipw: fnord: No such file or directory
  vipw: "fnord" exited with status 1
  
  Reviewed by:	rpokala, emaste
  MFC after:	1 week
  Differential Revision:	https://reviews.freebsd.org/D25369

Modified:
  head/lib/libutil/pw_util.c

Modified: head/lib/libutil/pw_util.c
==============================================================================
--- head/lib/libutil/pw_util.c	Sat Jun 20 06:10:42 2020	(r362429)
+++ head/lib/libutil/pw_util.c	Sat Jun 20 06:20:00 2020	(r362430)
@@ -308,12 +308,13 @@ pw_edit(int notsetuid)
 		sigaction(SIGQUIT, &sa_quit, NULL);
 		sigprocmask(SIG_SETMASK, &oldsigset, NULL);
 		if (notsetuid) {
-			(void)setgid(getgid());
-			(void)setuid(getuid());
+			if (setgid(getgid()) == -1)
+				err(1, "setgid");
+			if (setuid(getuid()) == -1)
+				err(1, "setuid");
 		}
-		errno = 0;
 		execlp(editor, editor, tempname, (char *)NULL);
-		_exit(errno);
+		err(1, "%s", editor);
 	default:
 		/* parent */
 		break;
@@ -327,7 +328,9 @@ pw_edit(int notsetuid)
 			break;
 		} else if (WIFSTOPPED(pstat)) {
 			raise(WSTOPSIG(pstat));
-		} else if (WIFEXITED(pstat) && WEXITSTATUS(pstat) == 0) {
+		} else if (WIFEXITED(pstat)) {
+			if (WEXITSTATUS(pstat) != 0)
+				errx(1, "\"%s\" exited with status %d", editor, WEXITSTATUS(pstat));
 			editpid = -1;
 			break;
 		} else {

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006200620.05K6K0vh003202>