aboutsummaryrefslogtreecommitdiff
path: root/lib/libcompat
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libcompat')
-rw-r--r--lib/libcompat/4.1/ftime.380
-rw-r--r--lib/libcompat/4.1/ftime.c52
-rw-r--r--lib/libcompat/4.3/re_comp.32
-rw-r--r--lib/libcompat/4.3/re_comp.c2
-rw-r--r--lib/libcompat/4.3/rexec.32
-rw-r--r--lib/libcompat/4.3/rexec.c12
-rw-r--r--lib/libcompat/4.4/cuserid.c2
-rw-r--r--lib/libcompat/Makefile9
8 files changed, 3 insertions, 158 deletions
diff --git a/lib/libcompat/4.1/ftime.3 b/lib/libcompat/4.1/ftime.3
deleted file mode 100644
index 48eb465aed31..000000000000
--- a/lib/libcompat/4.1/ftime.3
+++ /dev/null
@@ -1,80 +0,0 @@
-.\" Copyright (c) 1980, 1991, 1993
-.\" The Regents of the University of California. All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 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. 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" @(#)ftime.3 8.1 (Berkeley) 6/4/93
-.\"
-.Dd August 4, 2018
-.Dt FTIME 3
-.Os
-.Sh NAME
-.Nm ftime
-.Nd get date and time
-.Sh LIBRARY
-.Lb libcompat
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/timeb.h
-.Ft int
-.Fn ftime "struct timeb *tp"
-.Sh DESCRIPTION
-.Bf -symbolic
-This interface is obsoleted by
-.Xr gettimeofday 2 .
-.Ef
-.Pp
-The
-.Fn ftime
-routine fills in a structure pointed to by its argument,
-as defined by
-.In sys/timeb.h :
-.Bd -literal -offset indent
-/*
- * Structure returned by ftime system call
- */
-struct timeb
-{
- time_t time;
- unsigned short millitm;
- short timezone;
- short dstflag;
-};
-.Ed
-.Pp
-The structure contains the time since the epoch in seconds,
-up to 1000 milliseconds of more-precise interval,
-The kernel no longer maintains the timezone and dstflag info, so 0 is
-always returned for these fields.
-.Sh SEE ALSO
-.Xr gettimeofday 2 ,
-.Xr settimeofday 2 ,
-.Xr ctime 3 ,
-.Xr time 3
-.Sh HISTORY
-The
-.Nm
-function appeared in
-.At v7 .
diff --git a/lib/libcompat/4.1/ftime.c b/lib/libcompat/4.1/ftime.c
deleted file mode 100644
index 5ea57bca40fd..000000000000
--- a/lib/libcompat/4.1/ftime.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
- * Copyright (c) 1994 Christopher G. Demetriou
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 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 Christopher G. Demetriou.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/timeb.h>
-
-int
-ftime(struct timeb *tbp)
-{
- struct timezone tz;
- struct timeval t;
-
- if (gettimeofday(&t, &tz) < 0)
- return (-1);
- tbp->millitm = t.tv_usec / 1000;
- tbp->time = t.tv_sec;
- tbp->timezone = tz.tz_minuteswest;
- tbp->dstflag = tz.tz_dsttime;
-
- return (0);
-}
diff --git a/lib/libcompat/4.3/re_comp.3 b/lib/libcompat/4.3/re_comp.3
index 3826665ba65e..504519a77459 100644
--- a/lib/libcompat/4.3/re_comp.3
+++ b/lib/libcompat/4.3/re_comp.3
@@ -25,8 +25,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" @(#)re_comp.3 8.1 (Berkeley) 6/4/93
-.\"
.Dd June 4, 1993
.Dt RE_COMP 3
.Os
diff --git a/lib/libcompat/4.3/re_comp.c b/lib/libcompat/4.3/re_comp.c
index dfbfb82f0889..a45f06769c57 100644
--- a/lib/libcompat/4.3/re_comp.c
+++ b/lib/libcompat/4.3/re_comp.c
@@ -32,8 +32,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-__SCCSID("@(#)regex.c 5.1 (Berkeley) 3/29/92");
/*
* Compatibility routines that implement the old re_comp/re_exec interface in
diff --git a/lib/libcompat/4.3/rexec.3 b/lib/libcompat/4.3/rexec.3
index 8b24d19b3f83..165e7002ebf3 100644
--- a/lib/libcompat/4.3/rexec.3
+++ b/lib/libcompat/4.3/rexec.3
@@ -25,8 +25,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" @(#)rexec.3 8.1 (Berkeley) 6/4/93
-.\"
.Dd June 4, 1993
.Dt REXEC 3
.Os
diff --git a/lib/libcompat/4.3/rexec.c b/lib/libcompat/4.3/rexec.c
index 3dac5ff18da3..b2f37a09c0fb 100644
--- a/lib/libcompat/4.3/rexec.c
+++ b/lib/libcompat/4.3/rexec.c
@@ -29,8 +29,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-__SCCSID("@(#)rexec.c 8.1 (Berkeley) 6/4/93");
#include <sys/types.h>
#include <sys/uio.h>
@@ -51,7 +49,6 @@ __SCCSID("@(#)rexec.c 8.1 (Berkeley) 6/4/93");
#include <unistd.h>
int rexecoptions;
-char *getpass(), *getlogin();
/*
* Options and other state info.
@@ -132,8 +129,7 @@ token()
}
static int
-ruserpass(host, aname, apass, aacct)
- char *host, **aname, **apass, **aacct;
+ruserpass(char *host, char **aname, char **apass, char **aacct)
{
char *hdir, buf[BUFSIZ], *tmp;
char myname[MAXHOSTNAMELEN], *mydomain;
@@ -291,11 +287,7 @@ bad:
}
int
-rexec(ahost, rport, name, pass, cmd, fd2p)
- char **ahost;
- int rport;
- char *name, *pass, *cmd;
- int *fd2p;
+rexec(char **ahost, int rport, char *name, char *pass, char *cmd, int *fd2p)
{
struct sockaddr_in sin, sin2, from;
struct hostent *hp;
diff --git a/lib/libcompat/4.4/cuserid.c b/lib/libcompat/4.4/cuserid.c
index a27b009878eb..188330927897 100644
--- a/lib/libcompat/4.4/cuserid.c
+++ b/lib/libcompat/4.4/cuserid.c
@@ -29,8 +29,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-__SCCSID("@(#)cuserid.c 8.1 (Berkeley) 6/4/93");
#include <pwd.h>
#include <stdio.h>
diff --git a/lib/libcompat/Makefile b/lib/libcompat/Makefile
index 7c99556e7513..2612568a9da7 100644
--- a/lib/libcompat/Makefile
+++ b/lib/libcompat/Makefile
@@ -1,5 +1,3 @@
-# @(#)Makefile 8.1 (Berkeley) 6/4/93
-
PACKAGE=lib${LIB}
LIB= compat
CFLAGS+=-I${SRCTOP}/lib/libc/locale
@@ -7,12 +5,7 @@ NO_PIC=
WARNS?= 0
-.PATH: ${.CURDIR}/4.1 ${.CURDIR}/4.3 ${.CURDIR}/4.4
-
-# compat 4.1 sources
-SRCS+= ftime.c
-
-MAN+= 4.1/ftime.3
+.PATH: ${.CURDIR}/4.3 ${.CURDIR}/4.4
# compat 4.3 sources
SRCS+= re_comp.c rexec.c