diff options
| author | cgd <cgd@NetBSD.org> | 1995-02-25 15:39:01 +0000 |
|---|---|---|
| committer | cgd <cgd@NetBSD.org> | 1995-02-25 15:39:01 +0000 |
| commit | 63de9506bfcc75b44b659d1cd0032ed9f56d5fcd (patch) | |
| tree | 302bced75c0714bbf14e925d67c37105ae882e38 /lib/libc | |
| parent | 6929ad87a5c37179228b21785018bbb66fe06b56 (diff) | |
merge with Lite, keep local changes. clean up id usage
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/gen/alarm.3 | 11 | ||||
| -rw-r--r-- | lib/libc/gen/alarm.c | 13 | ||||
| -rw-r--r-- | lib/libc/gen/clock.3 | 11 | ||||
| -rw-r--r-- | lib/libc/gen/clock.c | 13 | ||||
| -rw-r--r-- | lib/libc/gen/ctermid.3 | 11 | ||||
| -rw-r--r-- | lib/libc/gen/ctermid.c | 13 | ||||
| -rw-r--r-- | lib/libc/gen/ctime.3 | 13 | ||||
| -rw-r--r-- | lib/libc/gen/ctime.c | 4 | ||||
| -rw-r--r-- | lib/libc/gen/ctype.3 | 5 | ||||
| -rw-r--r-- | lib/libc/gen/ctype_.c | 7 | ||||
| -rw-r--r-- | lib/libc/gen/ualarm.3 | 11 | ||||
| -rw-r--r-- | lib/libc/gen/ualarm.c | 13 | ||||
| -rw-r--r-- | lib/libc/gen/uname.3 | 2 | ||||
| -rw-r--r-- | lib/libc/gen/uname.c | 6 | ||||
| -rw-r--r-- | lib/libc/gen/unvis.3 | 19 | ||||
| -rw-r--r-- | lib/libc/gen/unvis.c | 21 | ||||
| -rw-r--r-- | lib/libc/gen/usleep.3 | 13 | ||||
| -rw-r--r-- | lib/libc/gen/usleep.c | 13 | ||||
| -rw-r--r-- | lib/libc/gen/utime.3 | 17 | ||||
| -rw-r--r-- | lib/libc/gen/utime.c | 25 | ||||
| -rw-r--r-- | lib/libc/gen/valloc.3 | 11 | ||||
| -rw-r--r-- | lib/libc/gen/valloc.c | 13 | ||||
| -rw-r--r-- | lib/libc/gen/vis.3 | 16 | ||||
| -rw-r--r-- | lib/libc/gen/vis.c | 13 | ||||
| -rw-r--r-- | lib/libc/gen/wait.c | 13 | ||||
| -rw-r--r-- | lib/libc/gen/wait3.c | 13 | ||||
| -rw-r--r-- | lib/libc/gen/waitpid.c | 13 |
27 files changed, 213 insertions, 120 deletions
diff --git a/lib/libc/gen/alarm.3 b/lib/libc/gen/alarm.3 index d8b731daf93..b8e652d6069 100644 --- a/lib/libc/gen/alarm.3 +++ b/lib/libc/gen/alarm.3 @@ -1,5 +1,7 @@ -.\" Copyright (c) 1980, 1991 Regents of the University of California. -.\" All rights reserved. +.\" $NetBSD: alarm.3,v 1.9 1995/02/25 15:39:01 cgd Exp $ +.\" +.\" Copyright (c) 1980, 1991, 1993, 1994 +.\" 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 @@ -29,10 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" from: @(#)alarm.3 6.4 (Berkeley) 4/19/91 -.\" $Id: alarm.3,v 1.8 1994/10/17 23:49:28 cgd Exp $ +.\" @(#)alarm.3 8.2 (Berkeley) 4/19/94 .\" -.Dd April 19, 1991 +.Dd April 19, 1994 .Dt ALARM 3 .Os BSD 4 .Sh NAME diff --git a/lib/libc/gen/alarm.c b/lib/libc/gen/alarm.c index e10893f684e..9ad85e63c16 100644 --- a/lib/libc/gen/alarm.c +++ b/lib/libc/gen/alarm.c @@ -1,6 +1,8 @@ +/* $NetBSD: alarm.c,v 1.4 1995/02/25 15:39:04 cgd Exp $ */ + /* - * Copyright (c) 1983 Regents of the University of California. - * All rights reserved. + * Copyright (c) 1983, 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 @@ -32,8 +34,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -/*static char *sccsid = "from: @(#)alarm.c 5.5 (Berkeley) 2/23/91";*/ -static char *rcsid = "$Id: alarm.c,v 1.3 1993/08/26 00:44:15 jtc Exp $"; +#if 0 +static char sccsid[] = "@(#)alarm.c 8.1 (Berkeley) 6/4/93"; +#else +static char rcsid[] = "$NetBSD: alarm.c,v 1.4 1995/02/25 15:39:04 cgd Exp $"; +#endif #endif /* LIBC_SCCS and not lint */ /* diff --git a/lib/libc/gen/clock.3 b/lib/libc/gen/clock.3 index 72daaa380af..4d9a67b2415 100644 --- a/lib/libc/gen/clock.3 +++ b/lib/libc/gen/clock.3 @@ -1,5 +1,7 @@ -.\" Copyright (c) 1990, 1991 The Regents of the University of California. -.\" All rights reserved. +.\" $NetBSD: clock.3,v 1.5 1995/02/25 15:39:07 cgd Exp $ +.\" +.\" Copyright (c) 1990, 1991, 1993 +.\" The Regents of the University of California. All rights reserved. .\" .\" This code is derived from software contributed to Berkeley by .\" the American National Standards Committee X3, on Information @@ -33,10 +35,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" from: @(#)clock.3 5.4 (Berkeley) 6/29/91 -.\" $Id: clock.3,v 1.4 1993/10/04 18:02:47 jtc Exp $ +.\" @(#)clock.3 8.1 (Berkeley) 6/4/93 .\" -.Dd June 29, 1991 +.Dd June 4, 1993 .Dt CLOCK 3 .Os .Sh NAME diff --git a/lib/libc/gen/clock.c b/lib/libc/gen/clock.c index 0b64eddfcc5..ad60e8ea3bc 100644 --- a/lib/libc/gen/clock.c +++ b/lib/libc/gen/clock.c @@ -1,6 +1,8 @@ +/* $NetBSD: clock.c,v 1.5 1995/02/25 15:39:09 cgd Exp $ */ + /* - * Copyright (c) 1989 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1989, 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 @@ -32,8 +34,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -/*static char *sccsid = "from: @(#)clock.c 5.4 (Berkeley) 8/27/90";*/ -static char *rcsid = "$Id: clock.c,v 1.4 1993/08/26 00:44:17 jtc Exp $"; +#if 0 +static char sccsid[] = "@(#)clock.c 8.1 (Berkeley) 6/4/93"; +#else +static char rcsid[] = "$NetBSD: clock.c,v 1.5 1995/02/25 15:39:09 cgd Exp $"; +#endif #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> diff --git a/lib/libc/gen/ctermid.3 b/lib/libc/gen/ctermid.3 index fdf86ae3cd4..cfdc9dd9628 100644 --- a/lib/libc/gen/ctermid.3 +++ b/lib/libc/gen/ctermid.3 @@ -1,5 +1,7 @@ -.\" Copyright (c) 1990, 1991 The Regents of the University of California. -.\" All rights reserved. +.\" $NetBSD: ctermid.3,v 1.4 1995/02/25 15:39:12 cgd Exp $ +.\" +.\" Copyright (c) 1990, 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 @@ -29,10 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" from: @(#)ctermid.3 5.2 (Berkeley) 4/19/91 -.\" $Id: ctermid.3,v 1.3 1993/11/29 19:30:32 jtc Exp $ +.\" @(#)ctermid.3 8.1 (Berkeley) 6/4/93 .\" -.Dd April 19, 1991 +.Dd June 4, 1993 .Dt CTERMID 3 .Os .Sh NAME diff --git a/lib/libc/gen/ctermid.c b/lib/libc/gen/ctermid.c index 0fc5e8b8bf9..def95597365 100644 --- a/lib/libc/gen/ctermid.c +++ b/lib/libc/gen/ctermid.c @@ -1,6 +1,8 @@ +/* $NetBSD: ctermid.c,v 1.4 1995/02/25 15:39:15 cgd Exp $ */ + /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 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 @@ -32,8 +34,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -/*static char *sccsid = "from: @(#)ctermid.c 5.2 (Berkeley) 2/20/91";*/ -static char *rcsid = "$Id: ctermid.c,v 1.3 1993/08/26 00:44:20 jtc Exp $"; +#if 0 +static char sccsid[] = "@(#)ctermid.c 8.1 (Berkeley) 6/4/93"; +#else +static char rcsid[] = "$NetBSD: ctermid.c,v 1.4 1995/02/25 15:39:15 cgd Exp $"; +#endif #endif /* LIBC_SCCS and not lint */ #include <stdio.h> diff --git a/lib/libc/gen/ctime.3 b/lib/libc/gen/ctime.3 index 0be3502e343..2d3983493a6 100644 --- a/lib/libc/gen/ctime.3 +++ b/lib/libc/gen/ctime.3 @@ -1,5 +1,7 @@ -.\" Copyright (c) 1989, 1991 The Regents of the University of California. -.\" All rights reserved. +.\" $NetBSD: ctime.3,v 1.4 1995/02/25 15:39:18 cgd Exp $ +.\" +.\" Copyright (c) 1989, 1991, 1993 +.\" The Regents of the University of California. All rights reserved. .\" .\" This code is derived from software contributed to Berkeley by .\" Arthur Olson. @@ -31,10 +33,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" from: @(#)ctime.3 6.15 (Berkeley) 4/19/91 -.\" $Id: ctime.3,v 1.3 1993/10/04 18:28:59 jtc Exp $ +.\" @(#)ctime.3 8.1 (Berkeley) 6/4/93 .\" -.Dd April 19, 1991 +.Dd June 4, 1993 .Dt CTIME 3 .Os BSD 4.3 .Sh NAME @@ -48,6 +49,7 @@ .Tn ASCII .Sh SYNOPSIS .Fd #include <time.h> +.Vt extern char *tzname[2]; .Ft char * .Fn ctime "const time_t *clock" .Ft double @@ -60,7 +62,6 @@ .Fn gmtime "const time_t *clock" .Ft time_t .Fn mktime "struct tm *tm" -.Vt extern char *tzname[2]; .Sh DESCRIPTION The functions .Fn ctime , diff --git a/lib/libc/gen/ctime.c b/lib/libc/gen/ctime.c index 593c7a7e691..d66091d0104 100644 --- a/lib/libc/gen/ctime.c +++ b/lib/libc/gen/ctime.c @@ -1,3 +1,5 @@ +/* $NetBSD: ctime.c,v 1.10 1995/02/25 15:39:22 cgd Exp $ */ + /* * Copyright (c) 1987, 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -38,7 +40,7 @@ #if 0 static char sccsid[] = "@(#)ctime.c 8.2 (Berkeley) 3/20/94"; #else -static char rcsid[] = "$NetBSD: ctime.c,v 1.9 1995/02/25 14:09:35 cgd Exp $"; +static char rcsid[] = "$NetBSD: ctime.c,v 1.10 1995/02/25 15:39:22 cgd Exp $"; #endif #endif /* LIBC_SCCS and not lint */ diff --git a/lib/libc/gen/ctype.3 b/lib/libc/gen/ctype.3 index 2ec01363365..45f6fbae448 100644 --- a/lib/libc/gen/ctype.3 +++ b/lib/libc/gen/ctype.3 @@ -1,3 +1,5 @@ +.\" $NetBSD: ctype.3,v 1.6 1995/02/25 15:39:26 cgd Exp $ +.\" .\" Copyright (c) 1991 Regents of the University of California. .\" All rights reserved. .\" @@ -30,8 +32,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" from: @(#)ctype.3 6.5 (Berkeley) 4/19/91 -.\" $Id: ctype.3,v 1.5 1993/12/01 18:50:38 jtc Exp $ +.\" @(#)ctype.3 6.5 (Berkeley) 4/19/91 .\" .Dd April 19, 1991 .Dt CTYPE 3 diff --git a/lib/libc/gen/ctype_.c b/lib/libc/gen/ctype_.c index a6dd9976ac5..2325fd638db 100644 --- a/lib/libc/gen/ctype_.c +++ b/lib/libc/gen/ctype_.c @@ -1,3 +1,5 @@ +/* $NetBSD: ctype_.c,v 1.12 1995/02/25 15:39:28 cgd Exp $ */ + /* * Copyright (c) 1989 The Regents of the University of California. * All rights reserved. @@ -37,8 +39,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) +#if 0 /*static char *sccsid = "from: @(#)ctype_.c 5.6 (Berkeley) 6/1/90";*/ -static char *rcsid = "$Id: ctype_.c,v 1.11 1994/05/17 04:13:48 cgd Exp $"; +#else +static char rcsid[] = "$NetBSD: ctype_.c,v 1.12 1995/02/25 15:39:28 cgd Exp $"; +#endif #endif /* LIBC_SCCS and not lint */ #include <ctype.h> diff --git a/lib/libc/gen/ualarm.3 b/lib/libc/gen/ualarm.3 index a9ce94e9973..80cf809a63c 100644 --- a/lib/libc/gen/ualarm.3 +++ b/lib/libc/gen/ualarm.3 @@ -1,5 +1,7 @@ -.\" Copyright (c) 1986, 1991 Regents of the University of California. -.\" All rights reserved. +.\" $NetBSD: ualarm.3,v 1.5 1995/02/25 15:39:31 cgd Exp $ +.\" +.\" Copyright (c) 1986, 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 @@ -29,10 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" from: @(#)ualarm.3 6.5 (Berkeley) 4/19/91 -.\" $Id: ualarm.3,v 1.4 1994/10/17 23:49:30 cgd Exp $ +.\" @(#)ualarm.3 8.2 (Berkeley) 4/19/94 .\" -.Dd April 19, 1991 +.Dd April 19, 1994 .Dt UALARM 3 .Os BSD 4.3 .Sh NAME diff --git a/lib/libc/gen/ualarm.c b/lib/libc/gen/ualarm.c index 5c0c230beed..2448fc6b55a 100644 --- a/lib/libc/gen/ualarm.c +++ b/lib/libc/gen/ualarm.c @@ -1,6 +1,8 @@ +/* $NetBSD: ualarm.c,v 1.4 1995/02/25 15:39:33 cgd Exp $ */ + /* - * Copyright (c) 1985 Regents of the University of California. - * All rights reserved. + * Copyright (c) 1985, 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 @@ -32,8 +34,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -/*static char *sccsid = "from: @(#)ualarm.c 5.5 (Berkeley) 2/23/91";*/ -static char *rcsid = "$Id: ualarm.c,v 1.3 1993/08/26 00:45:21 jtc Exp $"; +#if 0 +static char sccsid[] = "@(#)ualarm.c 8.1 (Berkeley) 6/4/93"; +#else +static char rcsid[] = "$NetBSD: ualarm.c,v 1.4 1995/02/25 15:39:33 cgd Exp $"; +#endif #endif /* LIBC_SCCS and not lint */ #include <sys/time.h> diff --git a/lib/libc/gen/uname.3 b/lib/libc/gen/uname.3 index a72e21f1eb2..92ecffb4ebb 100644 --- a/lib/libc/gen/uname.3 +++ b/lib/libc/gen/uname.3 @@ -1,3 +1,5 @@ +.\" $NetBSD: uname.3,v 1.2 1995/02/25 15:39:35 cgd Exp $ +.\" .\" Copyright (c) 1994 .\" The Regents of the University of California. All rights reserved. .\" diff --git a/lib/libc/gen/uname.c b/lib/libc/gen/uname.c index 9857b29acb6..80a0d6a556d 100644 --- a/lib/libc/gen/uname.c +++ b/lib/libc/gen/uname.c @@ -1,3 +1,5 @@ +/* $NetBSD: uname.c,v 1.2 1995/02/25 15:39:38 cgd Exp $ */ + /*- * Copyright (c) 1994 * The Regents of the University of California. All rights reserved. @@ -32,7 +34,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) +#if 0 static char sccsid[] = "@(#)uname.c 8.1 (Berkeley) 1/4/94"; +#else +static char rcsid[] = "$NetBSD: uname.c,v 1.2 1995/02/25 15:39:38 cgd Exp $"; +#endif #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> diff --git a/lib/libc/gen/unvis.3 b/lib/libc/gen/unvis.3 index bdbeb75dd4e..0d5ac2f504f 100644 --- a/lib/libc/gen/unvis.3 +++ b/lib/libc/gen/unvis.3 @@ -1,5 +1,7 @@ -.\" Copyright (c) 1989, 1991 The Regents of the University of California. -.\" All rights reserved. +.\" $NetBSD: unvis.3,v 1.5 1995/02/25 15:39:41 cgd Exp $ +.\" +.\" Copyright (c) 1989, 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 @@ -29,10 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" from: @(#)unvis.3 1.3 (Berkeley) 4/19/91 -.\" $Id: unvis.3,v 1.4 1994/01/10 23:32:36 jtc Exp $ +.\" @(#)unvis.3 8.2 (Berkeley) 12/11/93 .\" -.Dd April 19, 1991 +.Dd December 11, 1993 .Dt UNVIS 3 .Os .Sh NAME @@ -99,7 +100,7 @@ start decoding a stream of bytes, first initialize an integer to zero. Call .Fn unvis with each successive byte, along with a pointer -to this integer, and a pointer to an destination character. +to this integer, and a pointer to a destination character. The .Xr unvis function @@ -160,6 +161,6 @@ if (unvis(&out, (char)0, &state, UNVIS_END) == UNVIS_VALID) .Xr vis 3 .Sh HISTORY The -.Fn unvis -function is -.Ud . +.Nm unvis +function +first appeared in 4.4BSD. diff --git a/lib/libc/gen/unvis.c b/lib/libc/gen/unvis.c index c59ac137fdf..b527be5acd9 100644 --- a/lib/libc/gen/unvis.c +++ b/lib/libc/gen/unvis.c @@ -1,6 +1,8 @@ +/* $NetBSD: unvis.c,v 1.4 1995/02/25 15:39:44 cgd Exp $ */ + /*- - * Copyright (c) 1989 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1989, 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 @@ -32,8 +34,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -/*static char *sccsid = "from: @(#)unvis.c 1.4 (Berkeley) 2/23/91";*/ -static char *rcsid = "$Id: unvis.c,v 1.3 1993/08/26 00:45:22 jtc Exp $"; +#if 0 +static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/4/93"; +#else +static char rcsid[] = "$NetBSD: unvis.c,v 1.4 1995/02/25 15:39:44 cgd Exp $"; +#endif #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -57,13 +62,9 @@ static char *rcsid = "$Id: unvis.c,v 1.3 1993/08/26 00:45:22 jtc Exp $"; * unvis - decode characters previously encoded by vis */ int -#if __STDC__ -unvis(char *cp, char c, int *astate, int flag) -#else unvis(cp, c, astate, flag) - char *cp, c; - int *astate, flag; -#endif + char *cp; + int c, *astate, flag; { if (flag & UNVIS_END) { diff --git a/lib/libc/gen/usleep.3 b/lib/libc/gen/usleep.3 index f68acf46dd6..7404bf86c48 100644 --- a/lib/libc/gen/usleep.3 +++ b/lib/libc/gen/usleep.3 @@ -1,5 +1,7 @@ -.\" Copyright (c) 1986, 1991 Regents of the University of California. -.\" All rights reserved. +.\" $NetBSD: usleep.3,v 1.3 1995/02/25 15:39:48 cgd Exp $ +.\" +.\" Copyright (c) 1986, 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 @@ -29,10 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" from: @(#)usleep.3 6.4 (Berkeley) 4/19/91 -.\" $Id: usleep.3,v 1.2 1993/07/30 08:40:26 mycroft Exp $ +.\" @(#)usleep.3 8.1 (Berkeley) 6/4/93 .\" -.Dd April 19, 1991 +.Dd June 4, 1993 .Dt USLEEP 3 .Os BSD 4.3 .Sh NAME @@ -44,7 +45,7 @@ .Fn usleep "u_int microseconds" .Sh DESCRIPTION The -.Fn sleep +.Fn usleep function suspends execution of the calling process for diff --git a/lib/libc/gen/usleep.c b/lib/libc/gen/usleep.c index 6f51cfc2391..9ab28ebc853 100644 --- a/lib/libc/gen/usleep.c +++ b/lib/libc/gen/usleep.c @@ -1,6 +1,8 @@ +/* $NetBSD: usleep.c,v 1.4 1995/02/25 15:39:52 cgd Exp $ */ + /* - * Copyright (c) 1989 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1989, 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 @@ -32,8 +34,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -/*static char *sccsid = "from: @(#)usleep.c 5.6 (Berkeley) 2/23/91";*/ -static char *rcsid = "$Id: usleep.c,v 1.3 1993/08/26 00:45:23 jtc Exp $"; +#if 0 +static char sccsid[] = "@(#)usleep.c 8.1 (Berkeley) 6/4/93"; +#else +static char rcsid[] = "$NetBSD: usleep.c,v 1.4 1995/02/25 15:39:52 cgd Exp $"; +#endif #endif /* LIBC_SCCS and not lint */ #include <sys/time.h> diff --git a/lib/libc/gen/utime.3 b/lib/libc/gen/utime.3 index f18234019c9..ba54d797192 100644 --- a/lib/libc/gen/utime.3 +++ b/lib/libc/gen/utime.3 @@ -1,5 +1,7 @@ -.\" Copyright (c) 1980, 1991 Regents of the University of California. -.\" All rights reserved. +.\" $NetBSD: utime.3,v 1.7 1995/02/25 15:39:54 cgd Exp $ +.\" +.\" 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 @@ -29,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)utime.3 6.3 (Berkeley) 4/19/91 +.\" @(#)utime.3 8.1 (Berkeley) 6/4/93 .\" .Dd August 13, 1993 .Dt UTIME 3 @@ -43,6 +45,10 @@ .Ft int .Fn utime "const char *file" "const struct utimbuf *timep" .Sh DESCRIPTION +.Bf -symbolic +This interface is obsoleted by utimes(2) . +.Ef +.Pp The .Fn utime function sets the access and modification times of the named file. @@ -126,6 +132,11 @@ The file system containing the file is mounted read-only. .Sh SEE ALSO .Xr stat 2 , .Xr utimes 2 +.Sh HISTORY +A +.Fn utime +function appeared in +.At v7 . .Sh STANDARDS The .Fn utime diff --git a/lib/libc/gen/utime.c b/lib/libc/gen/utime.c index 8791a0d6e6d..bd4cc7d2a6a 100644 --- a/lib/libc/gen/utime.c +++ b/lib/libc/gen/utime.c @@ -1,6 +1,8 @@ +/* $NetBSD: utime.c,v 1.5 1995/02/25 15:39:58 cgd Exp $ */ + /*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1990, 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 @@ -32,11 +34,15 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -/*static char *sccsid = "from: @(#)utime.c 5.4 (Berkeley) 2/23/91";*/ -static char *rcsid = "$Id: utime.c,v 1.4 1993/08/26 00:45:24 jtc Exp $"; +#if 0 +static char sccsid[] = "@(#)utime.c 8.1 (Berkeley) 6/4/93"; +#else +static char rcsid[] = "$NetBSD: utime.c,v 1.5 1995/02/25 15:39:58 cgd Exp $"; +#endif #endif /* LIBC_SCCS and not lint */ #include <sys/time.h> + #include <utime.h> int @@ -44,14 +50,15 @@ utime(path, times) const char *path; const struct utimbuf *times; { - struct timeval tv[2]; + struct timeval tv[2], *tvp; - if (times == (struct utimbuf *) NULL) { - return(utimes(path, (struct timeval *) NULL)); - } else { + if (times == (struct utimbuf *) NULL) + tvp = NULL; + else { tv[0].tv_sec = times->actime; tv[1].tv_sec = times->modtime; tv[0].tv_usec = tv[1].tv_usec = 0; - return(utimes(path, tv)); + tvp = tv; } + return (utimes(path, tvp)); } diff --git a/lib/libc/gen/valloc.3 b/lib/libc/gen/valloc.3 index 2c5732c26c8..2a958f566b3 100644 --- a/lib/libc/gen/valloc.3 +++ b/lib/libc/gen/valloc.3 @@ -1,5 +1,7 @@ -.\" Copyright (c) 1980, 1991 Regents of the University of California. -.\" All rights reserved. +.\" $NetBSD: valloc.3,v 1.3 1995/02/25 15:40:02 cgd Exp $ +.\" +.\" 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 @@ -29,10 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" from: @(#)valloc.3 6.3 (Berkeley) 4/19/91 -.\" $Id: valloc.3,v 1.2 1993/07/30 08:40:34 mycroft Exp $ +.\" @(#)valloc.3 8.1 (Berkeley) 6/4/93 .\" -.Dd April 19, 1991 +.Dd June 4, 1993 .Dt VALLOC 3 .Os BSD 3 .Sh NAME diff --git a/lib/libc/gen/valloc.c b/lib/libc/gen/valloc.c index 7f0255dac90..dd736306ba5 100644 --- a/lib/libc/gen/valloc.c +++ b/lib/libc/gen/valloc.c @@ -1,6 +1,8 @@ +/* $NetBSD: valloc.c,v 1.5 1995/02/25 15:40:04 cgd Exp $ */ + /* - * Copyright (c) 1980 Regents of the University of California. - * All rights reserved. + * Copyright (c) 1980, 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 @@ -32,8 +34,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -/*static char *sccsid = "from: @(#)valloc.c 5.5 (Berkeley) 2/23/91";*/ -static char *rcsid = "$Id: valloc.c,v 1.4 1994/10/19 03:14:12 cgd Exp $"; +#if 0 +static char sccsid[] = "@(#)valloc.c 8.1 (Berkeley) 6/4/93"; +#else +static char rcsid[] = "$NetBSD: valloc.c,v 1.5 1995/02/25 15:40:04 cgd Exp $"; +#endif #endif /* LIBC_SCCS and not lint */ #include <stdlib.h> diff --git a/lib/libc/gen/vis.3 b/lib/libc/gen/vis.3 index a8f680cc054..0755f2e0c09 100644 --- a/lib/libc/gen/vis.3 +++ b/lib/libc/gen/vis.3 @@ -1,5 +1,7 @@ -.\" Copyright (c) 1989, 1991 The Regents of the University of California. -.\" All rights reserved. +.\" $NetBSD: vis.3,v 1.6 1995/02/25 15:40:07 cgd Exp $ +.\" +.\" Copyright (c) 1989, 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 @@ -29,10 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" from: @(#)vis.3 5.7 (Berkeley) 4/19/91 -.\" $Id: vis.3,v 1.5 1994/04/09 01:29:31 mycroft Exp $ +.\" @(#)vis.3 8.1 (Berkeley) 6/9/93 .\" -.Dd April 19, 1991 +.Dd June 9, 1993 .Dt VIS 3 .Os .Sh NAME @@ -260,6 +261,5 @@ ambiguous and non-invertible. .Xr unvis 1 , .Xr unvis 3 .Sh HISTORY -These -functions are -.Ud . +These functions first appeared in 4.4BSD. + diff --git a/lib/libc/gen/vis.c b/lib/libc/gen/vis.c index 93d94767697..ed6769e9bdd 100644 --- a/lib/libc/gen/vis.c +++ b/lib/libc/gen/vis.c @@ -1,6 +1,8 @@ +/* $NetBSD: vis.c,v 1.6 1995/02/25 15:40:09 cgd Exp $ */ + /*- - * Copyright (c) 1989 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1989, 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 @@ -32,8 +34,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -/*static char *sccsid = "from: @(#)vis.c 5.6 (Berkeley) 2/5/92";*/ -static char *rcsid = "$Id: vis.c,v 1.5 1993/08/26 00:45:26 jtc Exp $"; +#if 0 +static char sccsid[] = "@(#)vis.c 8.1 (Berkeley) 7/19/93"; +#else +static char rcsid[] = "$NetBSD: vis.c,v 1.6 1995/02/25 15:40:09 cgd Exp $"; +#endif #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> diff --git a/lib/libc/gen/wait.c b/lib/libc/gen/wait.c index 0a18c65cd4d..3e68f28c826 100644 --- a/lib/libc/gen/wait.c +++ b/lib/libc/gen/wait.c @@ -1,6 +1,8 @@ +/* $NetBSD: wait.c,v 1.4 1995/02/25 15:40:11 cgd Exp $ */ + /* - * Copyright (c) 1988 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1988, 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 @@ -32,8 +34,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -/*static char *sccsid = "from: @(#)wait.c 5.4 (Berkeley) 2/23/91";*/ -static char *rcsid = "$Id: wait.c,v 1.3 1993/08/26 00:45:27 jtc Exp $"; +#if 0 +static char sccsid[] = "@(#)wait.c 8.1 (Berkeley) 6/4/93"; +#else +static char rcsid[] = "$NetBSD: wait.c,v 1.4 1995/02/25 15:40:11 cgd Exp $"; +#endif #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> diff --git a/lib/libc/gen/wait3.c b/lib/libc/gen/wait3.c index de3b2f75a48..33a31cff182 100644 --- a/lib/libc/gen/wait3.c +++ b/lib/libc/gen/wait3.c @@ -1,6 +1,8 @@ +/* $NetBSD: wait3.c,v 1.4 1995/02/25 15:40:14 cgd Exp $ */ + /* - * Copyright (c) 1988 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1988, 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 @@ -32,8 +34,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -/*static char *sccsid = "from: @(#)wait3.c 5.6 (Berkeley) 2/23/91";*/ -static char *rcsid = "$Id: wait3.c,v 1.3 1993/08/26 00:45:28 jtc Exp $"; +#if 0 +static char sccsid[] = "@(#)wait3.c 8.1 (Berkeley) 6/4/93"; +#else +static char rcsid[] = "$NetBSD: wait3.c,v 1.4 1995/02/25 15:40:14 cgd Exp $"; +#endif #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> diff --git a/lib/libc/gen/waitpid.c b/lib/libc/gen/waitpid.c index 7f26767d95c..84b40c57b61 100644 --- a/lib/libc/gen/waitpid.c +++ b/lib/libc/gen/waitpid.c @@ -1,6 +1,8 @@ +/* $NetBSD: waitpid.c,v 1.4 1995/02/25 15:40:17 cgd Exp $ */ + /* - * Copyright (c) 1988 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1988, 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 @@ -32,8 +34,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -/*static char *sccsid = "from: @(#)waitpid.c 5.4 (Berkeley) 2/23/91";*/ -static char *rcsid = "$Id: waitpid.c,v 1.3 1993/08/26 00:45:30 jtc Exp $"; +#if 0 +static char sccsid[] = "@(#)waitpid.c 8.1 (Berkeley) 6/4/93"; +#else +static char rcsid[] = "$NetBSD: waitpid.c,v 1.4 1995/02/25 15:40:17 cgd Exp $"; +#endif #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> |
