Use a very regular call pattern to pledge, so that we can continue to

grep and compare the use in all programs..

1 files changed, 11 insertions, 10 deletions

diff --git a/bin/ksh/main.c b/bin/ksh/main.c
index fd8fbb14bd2..63508d4dc84 100644
--- a/bin/ksh/main.c
+++ b/bin/ksh/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.94 2018/11/16 06:41:58 nicm Exp $	*/
+/*	$OpenBSD: main.c,v 1.95 2018/11/17 18:14:58 deraadt Exp $	*/
 
 /*
  * startup, main loop, environments and error handling
@@ -142,20 +142,21 @@ main(int argc, char *argv[])
 	char **wp;
 	struct env env;
 	pid_t ppid;
-	int rv;
 
 	kshname = argv[0];
 
 	if (issetugid()) { /* could later drop privileges */
-		rv = pledge("stdio rpath wpath cpath fattr flock getpw proc "
-		    "exec tty id", NULL);
+		if (pledge("stdio rpath wpath cpath fattr flock getpw proc "
+		    "exec tty id", NULL) == -1) {
+			perror("pledge");
+			exit(1);
+		}
 	} else {
-		rv = pledge("stdio rpath wpath cpath fattr flock getpw proc "
-		    "exec tty", NULL);
-	}
-	if (rv == -1) {
-		perror("pledge");
-		exit(1);
+		if (pledge("stdio rpath wpath cpath fattr flock getpw proc "
+		    "exec tty", NULL) == -1) {
+			perror("pledge");
+			exit(1);
+		}
 	}
 
 	ainit(&aperm);		/* initialize permanent Area */