Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/lib/libc/gen/getcap.c,v retrieving revision 1.10.4.2 retrieving revision 1.11 diff -u -p -r1.10.4.2 -r1.11 --- src/lib/libc/gen/getcap.c 1996/09/19 20:02:39 1.10.4.2 +++ src/lib/libc/gen/getcap.c 1997/01/23 14:01:54 1.11 @@ -1,4 +1,4 @@ -/* $NetBSD: getcap.c,v 1.10.4.2 1996/09/19 20:02:39 jtc Exp $ */ +/* $NetBSD: getcap.c,v 1.11 1997/01/23 14:01:54 mrg Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -40,11 +40,10 @@ #if 0 static char sccsid[] = "@(#)getcap.c 8.3 (Berkeley) 3/25/94"; #else -static char rcsid[] = "$NetBSD: getcap.c,v 1.10.4.2 1996/09/19 20:02:39 jtc Exp $"; +static char rcsid[] = "$NetBSD: getcap.c,v 1.11 1997/01/23 14:01:54 mrg Exp $"; #endif #endif /* LIBC_SCCS and not lint */ -#include "namespace.h" #include #include @@ -57,19 +56,6 @@ static char rcsid[] = "$NetBSD: getcap.c #include #include -#ifdef __weak_alias -__weak_alias(cgetcap,_cgetcap); -__weak_alias(cgetclose,_cgetclose); -__weak_alias(cgetent,_cgetent); -__weak_alias(cgetfirst,_cgetfirst); -__weak_alias(cgetmatch,_cgetmatch); -__weak_alias(cgetnext,_cgetnext); -__weak_alias(cgetnum,_cgetnum); -__weak_alias(cgetset,_cgetset); -__weak_alias(cgetstr,_cgetstr); -__weak_alias(cgetustr,_cgetustr); -#endif - #define BFRAG 1024 #define BSIZE 1024 #define ESC ('[' & 037) /* ASCII ESC */ @@ -110,7 +96,7 @@ cgetset(ent) return (-1); } gottoprec = 0; - (void)strcpy(toprec, ent); + (void)strcpy(toprec, ent); /* XXX: strcpy is safe */ return (0); } @@ -234,7 +220,7 @@ getent(cap, len, db_array, fd, name, dep errno = ENOMEM; return (-2); } - (void)strcpy(record, toprec); + (void)strcpy(record, toprec); /* XXX: strcpy is safe */ myfd = 0; db_p = db_array; rp = record + topreclen + 1; @@ -262,7 +248,7 @@ getent(cap, len, db_array, fd, name, dep */ if (fd >= 0) { - (void)lseek(fd, (off_t)0, SEEK_SET); + (void)lseek(fd, (off_t)0, L_SET); myfd = 0; } else { (void)snprintf(pbuf, sizeof(pbuf), "%s.db", *db_p);