[Midnightbsd-cvs] src [10832] trunk/usr.sbin/config: sync

[laffer1 at midnightbsd.org]

Revision: 10832
          http://svnweb.midnightbsd.org/src/?rev=10832
Author:   laffer1
Date:     2018-06-10 16:33:56 -0400 (Sun, 10 Jun 2018)
Log Message:
-----------
sync

Modified Paths:
--------------
    trunk/usr.sbin/config/Makefile
    trunk/usr.sbin/config/config.5
    trunk/usr.sbin/config/config.8
    trunk/usr.sbin/config/config.h
    trunk/usr.sbin/config/lang.l

Modified: trunk/usr.sbin/config/Makefile
===================================================================
--- trunk/usr.sbin/config/Makefile	2018-06-10 20:33:28 UTC (rev 10831)
+++ trunk/usr.sbin/config/Makefile	2018-06-10 20:33:56 UTC (rev 10832)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # 	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD: stable/10/usr.sbin/config/Makefile 249657 2013-04-19 19:45:00Z ed $
 

Modified: trunk/usr.sbin/config/config.5
===================================================================
--- trunk/usr.sbin/config/config.5	2018-06-10 20:33:28 UTC (rev 10831)
+++ trunk/usr.sbin/config/config.5	2018-06-10 20:33:56 UTC (rev 10832)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" Copyright (c) 2003 Joseph Koshy
 .\"
 .\" Redistribution and use in source and binary forms, with or without

Modified: trunk/usr.sbin/config/config.8
===================================================================
--- trunk/usr.sbin/config/config.8	2018-06-10 20:33:28 UTC (rev 10831)
+++ trunk/usr.sbin/config/config.8	2018-06-10 20:33:56 UTC (rev 10832)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"

Modified: trunk/usr.sbin/config/config.h
===================================================================
--- trunk/usr.sbin/config/config.h	2018-06-10 20:33:28 UTC (rev 10831)
+++ trunk/usr.sbin/config/config.h	2018-06-10 20:33:56 UTC (rev 10832)
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)config.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD: stable/10/usr.sbin/config/config.h 264325 2014-04-10 19:51:33Z asomers $
+ * $FreeBSD: stable/10/usr.sbin/config/config.h 293290 2016-01-07 00:40:51Z bdrewery $
  */
 
 /*
@@ -51,7 +51,7 @@
 	int     f_type;                 /* type */
 	u_char	f_flags;		/* see below */
 	char	*f_compilewith;		/* special make rule if present */
-	char	*f_depends;		/* additional dependancies */
+	char	*f_depends;		/* additional dependencies */
 	char	*f_clean;		/* File list to add to clean rule */
 	char	*f_warn;		/* warning message */
 	const char *f_objprefix;	/* prefix string for object name */

Modified: trunk/usr.sbin/config/lang.l
===================================================================
--- trunk/usr.sbin/config/lang.l	2018-06-10 20:33:28 UTC (rev 10831)
+++ trunk/usr.sbin/config/lang.l	2018-06-10 20:33:56 UTC (rev 10832)
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lang.l	8.1 (Berkeley) 6/6/93
- * $FreeBSD: stable/10/usr.sbin/config/lang.l 264325 2014-04-10 19:51:33Z asomers $
+ * $FreeBSD: stable/10/usr.sbin/config/lang.l 300449 2016-05-23 04:47:24Z truckman $
  */
 
 #include <assert.h>
@@ -268,7 +268,8 @@
 		asprintf(&fnamebuf, "../../conf/%s", fname);
 		if (fnamebuf != NULL) {
 			fp = fopen(fnamebuf, "r");
-			free(fnamebuf);
+			if (fp == NULL)
+				free(fnamebuf);
 		}
 	}
 	if (fp == NULL) {
@@ -276,10 +277,10 @@
 			asprintf(&fnamebuf, "%s/%s", ipath->path, fname);
 			if (fnamebuf != NULL) {
 				fp = fopen(fnamebuf, "r");
-				free(fnamebuf);
 			}
 			if (fp != NULL)
 				break;
+			free(fnamebuf);
 		}
 	}
 	if (fp == NULL) {