[Midnightbsd-cvs] src [11248] trunk/bin/kenv/kenv.c: sync with freebsd

[laffer1 at midnightbsd.org]

Revision: 11248
          http://svnweb.midnightbsd.org/src/?rev=11248
Author:   laffer1
Date:     2018-07-01 17:28:57 -0400 (Sun, 01 Jul 2018)
Log Message:
-----------
sync with freebsd

Modified Paths:
--------------
    trunk/bin/kenv/Makefile
    trunk/bin/kenv/kenv.1
    trunk/bin/kenv/kenv.c

Property Changed:
----------------
    trunk/bin/kenv/kenv.1

Modified: trunk/bin/kenv/Makefile
===================================================================
--- trunk/bin/kenv/Makefile	2018-07-01 21:28:01 UTC (rev 11247)
+++ trunk/bin/kenv/Makefile	2018-07-01 21:28:57 UTC (rev 11248)
@@ -1,5 +1,5 @@
-# $FreeBSD: src/bin/kenv/Makefile,v 1.4 2003/06/13 07:04:02 markm Exp $
 # $MidnightBSD$
+# $FreeBSD: stable/10/bin/kenv/Makefile 116282 2003-06-13 07:04:02Z markm $
 
 PROG=	kenv
 

Modified: trunk/bin/kenv/kenv.1
===================================================================
--- trunk/bin/kenv/kenv.1	2018-07-01 21:28:01 UTC (rev 11247)
+++ trunk/bin/kenv/kenv.1	2018-07-01 21:28:57 UTC (rev 11248)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\"-
 .\" Copyright (c) 2000  Peter Wemm <peter at FreeBSD.org>
 .\"
@@ -22,8 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/bin/kenv/kenv.1,v 1.11.2.1 2005/09/20 13:26:21 rwatson Exp $
-.\" $MidnightBSD: src/bin/kenv/kenv.1,v 1.2 2006/07/19 13:45:35 laffer1 Exp $ 
+.\" $FreeBSD: stable/10/bin/kenv/kenv.1 235316 2012-05-12 02:49:40Z mdf $
 .\"
 .Dd May 11, 2012
 .Dt KENV 1
@@ -97,7 +97,6 @@
 character except '=' is acceptable as part of a name.  Quotes
 are optional and necessary only if the value contains
 whitespace.
-.Pp
 .Sh SEE ALSO
 .Xr kenv 2 ,
 .Xr config 5 ,


Property changes on: trunk/bin/kenv/kenv.1
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/bin/kenv/kenv.c
===================================================================
--- trunk/bin/kenv/kenv.c	2018-07-01 21:28:01 UTC (rev 11247)
+++ trunk/bin/kenv/kenv.c	2018-07-01 21:28:57 UTC (rev 11248)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2000  Peter Wemm <peter at freebsd.org>
  *
@@ -22,10 +23,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $FreeBSD: src/bin/kenv/kenv.c,v 1.7.2.1 2005/09/20 13:26:21 rwatson Exp $ */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/bin/kenv/kenv.c 309867 2016-12-12 02:14:42Z delphij $");
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
@@ -64,7 +64,6 @@
 	char *env, *eq, *val;
 	int ch, error;
 
-	error = 0;
 	val = NULL;
 	env = NULL;
 	while ((ch = getopt(argc, argv, "hNquv")) != -1) {
@@ -129,7 +128,7 @@
 static int
 kdumpenv(void)
 {
-	char *buf, *cp;
+	char *buf, *bp, *cp;
 	int buflen, envlen;
 
 	envlen = kenv(KENV_DUMP, NULL, NULL, 0);
@@ -137,10 +136,9 @@
 		return (-1);
 	for (;;) {
 		buflen = envlen * 120 / 100;
-		buf = malloc(buflen + 1);
+		buf = calloc(1, buflen + 1);
 		if (buf == NULL)
 			return (-1);
-		memset(buf, 0, buflen + 1);	/* Be defensive */
 		envlen = kenv(KENV_DUMP, NULL, buf, buflen);
 		if (envlen < 0) {
 			free(buf);
@@ -152,21 +150,23 @@
 			break;
 	}
 
-	for (; *buf != '\0'; buf += strlen(buf) + 1) {
+	for (bp = buf; *bp != '\0'; bp += strlen(bp) + 1) {
 		if (hflag) {
-			if (strncmp(buf, "hint.", 5) != 0)
+			if (strncmp(bp, "hint.", 5) != 0)
 				continue;
 		}
-		cp = strchr(buf, '=');
+		cp = strchr(bp, '=');
 		if (cp == NULL)
 			continue;
 		*cp++ = '\0';
 		if (Nflag)
-			printf("%s\n", buf);
+			printf("%s\n", bp);
 		else
-			printf("%s=\"%s\"\n", buf, cp);
-		buf = cp;
+			printf("%s=\"%s\"\n", bp, cp);
+		bp = cp;
 	}
+
+	free(buf);
 	return (0);
 }
 
@@ -191,7 +191,7 @@
 {
 	int ret;
 
-	ret = kenv(KENV_SET, env, val, strlen(val)+1);
+	ret = kenv(KENV_SET, env, val, strlen(val) + 1);
 	if (ret == 0)
 		printf("%s=\"%s\"\n", env, val);
 	return (ret);
@@ -201,7 +201,7 @@
 kunsetenv(const char *env)
 {
 	int ret;
-	
+
 	ret = kenv(KENV_UNSET, env, NULL, 0);
 	return (ret);
 }