[Midnightbsd-cvs] src [11393] trunk/libexec/rlogind/rlogind.c: sync with freebsd

[laffer1 at midnightbsd.org]

Revision: 11393
          http://svnweb.midnightbsd.org/src/?rev=11393
Author:   laffer1
Date:     2018-07-06 20:59:14 -0400 (Fri, 06 Jul 2018)
Log Message:
-----------
sync with freebsd

Modified Paths:
--------------
    trunk/libexec/rlogind/Makefile
    trunk/libexec/rlogind/rlogind.8
    trunk/libexec/rlogind/rlogind.c

Property Changed:
----------------
    trunk/libexec/rlogind/rlogind.8

Modified: trunk/libexec/rlogind/Makefile
===================================================================
--- trunk/libexec/rlogind/Makefile	2018-07-07 00:58:58 UTC (rev 11392)
+++ trunk/libexec/rlogind/Makefile	2018-07-07 00:59:14 UTC (rev 11393)
@@ -1,6 +1,6 @@
+# $MidnightBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/libexec/rlogind/Makefile,v 1.20 2005/01/28 16:08:05 ru Exp $
-# $MidnightBSD: src/libexec/rlogind/Makefile,v 1.3 2012/10/27 02:51:44 laffer1 Exp $
+# $FreeBSD: stable/10/libexec/rlogind/Makefile 160742 2006-07-27 12:05:05Z yar $
 
 .include <bsd.own.mk>
 

Modified: trunk/libexec/rlogind/rlogind.8
===================================================================
--- trunk/libexec/rlogind/rlogind.8	2018-07-07 00:58:58 UTC (rev 11392)
+++ trunk/libexec/rlogind/rlogind.8	2018-07-07 00:59:14 UTC (rev 11393)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" Copyright (c) 1983, 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -9,11 +10,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.
 .\"
@@ -30,10 +27,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rlogind.8	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/libexec/rlogind/rlogind.8,v 1.24 2005/02/09 20:23:36 ru Exp $
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/libexec/rlogind/rlogind.8 320646 2017-07-04 15:53:54Z allanjude $
 .\"
-.Dd February 9, 2005
+.Dd July 3, 2017
 .Dt RLOGIND 8
 .Os
 .Sh NAME
@@ -42,6 +38,15 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl Daln
+.Sh DEPRECATION NOTICE
+.Nm
+is deprecated and will be removed from future versions of the
+.Fx
+base system.
+If
+.Nm
+is still required, it can be installed from ports or packages
+(net/bsdrcmds).
 .Sh DESCRIPTION
 The
 .Nm


Property changes on: trunk/libexec/rlogind/rlogind.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/libexec/rlogind/rlogind.c
===================================================================
--- trunk/libexec/rlogind/rlogind.c	2018-07-07 00:58:58 UTC (rev 11392)
+++ trunk/libexec/rlogind/rlogind.c	2018-07-07 00:59:14 UTC (rev 11393)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/libexec/rlogind/rlogind.c,v 1.2 2012/04/11 00:46:55 laffer1 Exp $ */
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1983, 1988, 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -18,11 +18,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.
  *
@@ -51,7 +47,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/libexec/rlogind/rlogind.c,v 1.44 2005/05/13 16:31:09 ume Exp $");
+__FBSDID("$FreeBSD: stable/10/libexec/rlogind/rlogind.c 262435 2014-02-24 08:21:49Z brueffer $");
 
 /*
  * remote login server:
@@ -544,16 +540,17 @@
 void
 setup_term(int fd)
 {
-	char *cp = index(term+ENVSIZE, '/');
+	char *cp;
 	char *speed;
 	struct termios tt, def;
 
+	cp = strchr(term + ENVSIZE, '/');
 #ifndef notyet
 	tcgetattr(fd, &tt);
 	if (cp) {
 		*cp++ = '\0';
 		speed = cp;
-		cp = index(speed, '/');
+		cp = strchr(speed, '/');
 		if (cp)
 			*cp++ = '\0';
 		cfsetspeed(&tt, atoi(speed));
@@ -568,7 +565,7 @@
 	if (cp) {
 		*cp++ = '\0';
 		speed = cp;
-		cp = index(speed, '/');
+		cp = strchr(speed, '/');
 		if (cp)
 			*cp++ = '\0';
 		tcgetattr(fd, &tt);