From 72130735d87824b5ebaf645e4a1a25cdae3715c1 Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Fri, 10 Nov 2017 14:53:16 +0000
Subject: [PATCH] Strip EOL whitespace in usr.sbin/{jail,jexec}

---
 usr.sbin/jail/command.c | 6 +++---
 usr.sbin/jail/jail.8    | 4 ++--
 usr.sbin/jail/jail.c    | 4 ++--
 usr.sbin/jexec/jexec.c  | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/usr.sbin/jail/command.c b/usr.sbin/jail/command.c
index f95344cfe4e2..bf6e96da0c88 100644
--- a/usr.sbin/jail/command.c
+++ b/usr.sbin/jail/command.c
@@ -432,7 +432,7 @@ run_command(struct cfjail *j)
 
 		argv[argc] = down ? "-alias" : "alias";
 		argv[argc + 1] = NULL;
-		break;	
+		break;
 #endif
 
 	case IP_VNET_INTERFACE:
@@ -603,13 +603,13 @@ run_command(struct cfjail *j)
 				bg = 1;
 			}
 			comcs = alloca(comstring->len + 1);
-			strcpy(comcs, comstring->s);	
+			strcpy(comcs, comstring->s);
 			argc = 0;
 			for (cs = strtok(comcs, " \t\f\v\r\n"); cs;
 			     cs = strtok(NULL, " \t\f\v\r\n"))
 				argc++;
 			argv = alloca((argc + 1) * sizeof(char *));
-			strcpy(comcs, comstring->s);	
+			strcpy(comcs, comstring->s);
 			argc = 0;
 			for (cs = strtok(comcs, " \t\f\v\r\n"); cs;
 			     cs = strtok(NULL, " \t\f\v\r\n"))
diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8
index 166c79b8b0b0..7a6f1d7d0c38 100644
--- a/usr.sbin/jail/jail.8
+++ b/usr.sbin/jail/jail.8
@@ -483,7 +483,7 @@ and uname -K.
 Some restrictions of the jail environment may be set on a per-jail
 basis.
 With the exception of
-.Va allow.set_hostname 
+.Va allow.set_hostname
 and
 .Va allow.reserved_ports ,
 these boolean parameters are off by default.
@@ -614,7 +614,7 @@ Sockets within a jail are normally restricted to IPv4, IPv6, local
 (UNIX), and route.  This allows access to other protocol stacks that
 have not had jail functionality added to them.
 .It Va allow.reserved_ports
-The jail root may bind to ports lower than 1024. 
+The jail root may bind to ports lower than 1024.
 .El
 .El
 .Pp
diff --git a/usr.sbin/jail/jail.c b/usr.sbin/jail/jail.c
index 24f4536b53f3..c28278366f15 100644
--- a/usr.sbin/jail/jail.c
+++ b/usr.sbin/jail/jail.c
@@ -94,7 +94,7 @@ static const enum intparam startcommands[] = {
     IP_MOUNT_DEVFS,
     IP_MOUNT_FDESCFS,
     IP_MOUNT_PROCFS,
-    IP_EXEC_PRESTART, 
+    IP_EXEC_PRESTART,
     IP__OP,
     IP_VNET_INTERFACE,
     IP_EXEC_START,
@@ -269,7 +269,7 @@ main(int argc, char **argv)
 				    &sysval, &sysvallen, NULL, 0) == 0)
 					add_param(NULL, NULL,
 					    perm_sysctl[pi].ipnum,
-					    (sysval ? 1 : 0) ^ 
+					    (sysval ? 1 : 0) ^
 					    perm_sysctl[pi].rev
 					    ? NULL : "false");
 			}
diff --git a/usr.sbin/jexec/jexec.c b/usr.sbin/jexec/jexec.c
index f8974dc4e916..28ae794bb734 100644
--- a/usr.sbin/jexec/jexec.c
+++ b/usr.sbin/jexec/jexec.c
@@ -187,5 +187,5 @@ usage(void)
 
 	fprintf(stderr, "%s\n",
 	    "usage: jexec [-l] [-u username | -U username] jail [command ...]");
-	exit(1); 
+	exit(1);
 }