[Midnightbsd-cvs] src [11397] trunk/libexec/mknetid/parse_group.c: sync with freebsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Jul 6 21:00:27 EDT 2018
Revision: 11397
http://svnweb.midnightbsd.org/src/?rev=11397
Author: laffer1
Date: 2018-07-06 21:00:27 -0400 (Fri, 06 Jul 2018)
Log Message:
-----------
sync with freebsd
Modified Paths:
--------------
trunk/libexec/mknetid/Makefile
trunk/libexec/mknetid/hash.c
trunk/libexec/mknetid/hash.h
trunk/libexec/mknetid/mknetid.8
trunk/libexec/mknetid/mknetid.c
trunk/libexec/mknetid/netid.5
trunk/libexec/mknetid/parse_group.c
Property Changed:
----------------
trunk/libexec/mknetid/mknetid.8
trunk/libexec/mknetid/netid.5
Modified: trunk/libexec/mknetid/Makefile
===================================================================
--- trunk/libexec/mknetid/Makefile 2018-07-07 01:00:17 UTC (rev 11396)
+++ trunk/libexec/mknetid/Makefile 2018-07-07 01:00:27 UTC (rev 11397)
@@ -1,5 +1,5 @@
-# $MidnightBSD: src/libexec/mknetid/Makefile,v 1.2 2012/04/11 00:46:54 laffer1 Exp $
-# $FreeBSD: src/libexec/mknetid/Makefile,v 1.7 2001/08/21 15:39:15 ru Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/libexec/mknetid/Makefile 201380 2010-01-02 09:50:19Z ed $
PROG= mknetid
SRCS= mknetid.c hash.c parse_group.c
Modified: trunk/libexec/mknetid/hash.c
===================================================================
--- trunk/libexec/mknetid/hash.c 2018-07-07 01:00:17 UTC (rev 11396)
+++ trunk/libexec/mknetid/hash.c 2018-07-07 01:00:27 UTC (rev 11397)
@@ -39,7 +39,7 @@
#ifndef lint
static const char rcsid[] =
- "$FreeBSD: src/libexec/mknetid/hash.c,v 1.7 2002/12/30 21:18:03 schweikh Exp $";
+ "$FreeBSD: stable/10/libexec/mknetid/hash.c 108470 2002-12-30 21:18:15Z schweikh $";
#endif /* not lint */
/*
Modified: trunk/libexec/mknetid/hash.h
===================================================================
--- trunk/libexec/mknetid/hash.h 2018-07-07 01:00:17 UTC (rev 11396)
+++ trunk/libexec/mknetid/hash.h 2018-07-07 01:00:27 UTC (rev 11397)
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/libexec/mknetid/hash.h,v 1.6 2002/02/17 19:09:20 imp Exp $
+ * $FreeBSD: stable/10/libexec/mknetid/hash.h 90779 2002-02-17 19:09:20Z imp $
*/
/* Groupid entry hung off a member_entry node. */
Modified: trunk/libexec/mknetid/mknetid.8
===================================================================
--- trunk/libexec/mknetid/mknetid.8 2018-07-07 01:00:17 UTC (rev 11396)
+++ trunk/libexec/mknetid/mknetid.8 2018-07-07 01:00:27 UTC (rev 11397)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 1995, 1996
.\" Bill Paul <wpaul at ctr.columbia.edu>. All rights reserved.
.\"
@@ -28,8 +29,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/libexec/mknetid/mknetid.8,v 1.16 2005/02/13 22:25:14 ru Exp $
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/libexec/mknetid/mknetid.8 141846 2005-02-13 22:25:33Z ru $
.\"
.Dd June 23, 1996
.Dt MKNETID 8
Property changes on: trunk/libexec/mknetid/mknetid.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/libexec/mknetid/mknetid.c
===================================================================
--- trunk/libexec/mknetid/mknetid.c 2018-07-07 01:00:17 UTC (rev 11396)
+++ trunk/libexec/mknetid/mknetid.c 2018-07-07 01:00:27 UTC (rev 11397)
@@ -56,7 +56,7 @@
#ifndef lint
static const char rcsid[] =
- "$FreeBSD: src/libexec/mknetid/mknetid.c,v 1.13 2002/11/12 14:15:59 maxim Exp $";
+ "$FreeBSD: stable/10/libexec/mknetid/mknetid.c 106811 2002-11-12 14:15:59Z maxim $";
#endif /* not lint */
#define LINSIZ 1024
Modified: trunk/libexec/mknetid/netid.5
===================================================================
--- trunk/libexec/mknetid/netid.5 2018-07-07 01:00:17 UTC (rev 11396)
+++ trunk/libexec/mknetid/netid.5 2018-07-07 01:00:27 UTC (rev 11397)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 1996 Mats O Jansson <moj at stacken.kth.se>
.\" All rights reserved.
.\"
@@ -27,8 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/libexec/mknetid/netid.5,v 1.4 2005/01/18 09:29:40 ru Exp $
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/libexec/mknetid/netid.5 140414 2005-01-18 09:29:40Z ru $
.\"
.Dd January 13, 1996
.Dt NETID 5
Property changes on: trunk/libexec/mknetid/netid.5
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/libexec/mknetid/parse_group.c
===================================================================
--- trunk/libexec/mknetid/parse_group.c 2018-07-07 01:00:17 UTC (rev 11396)
+++ trunk/libexec/mknetid/parse_group.c 2018-07-07 01:00:27 UTC (rev 11397)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/libexec/mknetid/parse_group.c,v 1.2 2012/04/11 00:46:54 laffer1 Exp $ */
+/* $MidnightBSD$ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,7 +33,7 @@
static const char sccsid[] = "@(#)getgrent.c 8.2 (Berkeley) 3/21/94";
#endif
static const char rcsid[] =
- "$FreeBSD: src/libexec/mknetid/parse_group.c,v 1.7 2002/02/17 19:09:20 imp Exp $";
+ "$FreeBSD: stable/10/libexec/mknetid/parse_group.c 262435 2014-02-24 08:21:49Z brueffer $";
#endif /* not lint */
/*
@@ -115,7 +111,7 @@
return(0);
bp = line;
/* skip lines that are too big */
- if (!index(line, '\n')) {
+ if (!strchr(line, '\n')) {
int ch;
while ((ch = getc(_gr_fp)) != '\n' && ch != EOF)
More information about the Midnightbsd-cvs
mailing list