Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename sysctlnametomib() to sysctlgetmibinfo() and add FreeBSD 

compatible sysctlnametomib() and sysctlbyname() functions.

These are intended to move to libc real soon now.
This commit is contained in:
atatat 2004-02-19 06:40:14 +00:00
parent 816a869868
commit a44f68529b
2 changed files with 57 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sbin/sysctl/sysctl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sysctl.c,v 1.77 2004/01/05 23:23:33 jmmv Exp $ */
/* $NetBSD: sysctl.c,v 1.78 2004/02/19 06:40:14 atatat Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@ -72,7 +72,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = "@(#)sysctl.c 8.1 (Berkeley) 6/6/93";
#else
__RCSID("$NetBSD: sysctl.c,v 1.77 2004/01/05 23:23:33 jmmv Exp $");
__RCSID("$NetBSD: sysctl.c,v 1.78 2004/02/19 06:40:14 atatat Exp $");
#endif
#endif /* not lint */
@ -146,8 +146,9 @@ static void sysctlerror(int);
* unexported from some place else (XXX tbd)
*/
int learn_tree(int *, u_int, struct sysctlnode *);
int sysctlnametomib(const char *, int *, u_int *,
char *, size_t *, struct sysctlnode **);
int sysctlbyname(const char *, void *, size_t *, void *, size_t);
int sysctlgetmibinfo(const char *, int *, u_int *,
char *, size_t *, struct sysctlnode **);
/*
* "handlers"
@ -724,7 +725,7 @@ parse(char *l)
namelen = CTL_MAXNAME;
sz = sizeof(gsname);
if (sysctlnametomib(key, &name[0], &namelen, gsname, &sz, &node) == -1)
if (sysctlgetmibinfo(key, &name[0], &namelen, gsname, &sz, &node) == -1)
{
fprintf(warnfp, "%s: %s level name '%s' in '%s' is invalid\n",
getprogname(), lname[namelen], gsname, l);
@ -1205,8 +1206,8 @@ cparse(char *l)
namelen = sizeof(name) / sizeof(name[0]);
sz = sizeof(gsname);
*t = '\0';
rc = sysctlnametomib(nname, &name[0], &namelen,
gsname, &sz, NULL);
rc = sysctlgetmibinfo(nname, &name[0], &namelen,
gsname, &sz, NULL);
*t = sep[0];
if (rc == -1) {
fprintf(warnfp,
@ -1248,7 +1249,7 @@ dparse(char *l)
memset(name, 0, sizeof(name));
namelen = sizeof(name) / sizeof(name[0]);
sz = sizeof(gsname);
rc = sysctlnametomib(l, &name[0], &namelen, gsname, &sz, NULL);
rc = sysctlgetmibinfo(l, &name[0], &namelen, gsname, &sz, NULL);
if (rc == -1) {
fprintf(warnfp,
"%s: %s level name '%s' in '%s' is invalid\n",

59
sbin/sysctl/sysctlutil.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sysctlutil.c,v 1.3 2004/02/19 03:16:24 atatat Exp $ */
/* $NetBSD: sysctlutil.c,v 1.4 2004/02/19 06:40:14 atatat Exp $ */
#include <sys/param.h>
#define __USE_NEW_SYSCTL
@ -36,8 +36,10 @@ static int compar(const void *, const void *);
int learn_tree(int *, u_int, struct sysctlnode *);
static void free_children(struct sysctlnode *);
static void relearnhead(void);
int sysctlnametomib(const char *, int *, u_int *,
char *, size_t *, struct sysctlnode **);
int sysctlnametomib(const char *, int *, size_t *);
int sysctlbyname(const char *, void *, size_t *, void *, size_t);
int sysctlgetmibinfo(const char *, int *, u_int *,
char *, size_t *, struct sysctlnode **);
/*
* for ordering nodes -- a query may or may not be given them in
@ -308,6 +310,41 @@ relearnhead(void)
free(o);
}
/*
* freebsd compatible sysctlnametomib() function, implemented as an
* extremely thin wrapper around sysctlgetmibinfo(). i think the use
* of size_t as the third argument is erroneous, but what can we do
* about that?
*/
int
sysctlnametomib(const char *gname, int *iname, size_t *namelenp)
{
u_int unamelen;
int rc;
unamelen = *namelenp;
rc = sysctlgetmibinfo(gname, iname, &unamelen, NULL, NULL, NULL);
*namelenp = unamelen;
return (rc);
}
/*
* trivial sysctlbyname() function for the "lazy".
*/
int
sysctlbyname(const char *gname, void *oldp, size_t *oldlenp, void *newp,
size_t newlen)
{
int name[CTL_MAXNAME], rc;
u_int namelen;
rc = sysctlgetmibinfo(gname, &name[0], &namelen, NULL, NULL, NULL);
if (rc == 0)
rc = sysctl(&name[0], namelen, oldp, oldlenp, newp, newlen);
return (rc);
}
/*
* that's "given name" as a string, the integer form of the name fit
* to be passed to sysctl(), "canonicalized name" (optional), and a
@ -323,28 +360,28 @@ relearnhead(void)
*/
#ifdef _REENTRANT
static mutex_t sysctl_mutex = MUTEX_INITIALIZER;
static int sysctlnametomib_unlocked(const char *, int *, u_int *,
char *, size_t *, struct sysctlnode **);
static int sysctlgetmibinfo_unlocked(const char *, int *, u_int *,
char *, size_t *, struct sysctlnode **);
#endif /* __REENTRANT */
int
sysctlnametomib(const char *gname, int *iname, u_int *namelenp,
char *cname, size_t *csz, struct sysctlnode **rnode)
sysctlgetmibinfo(const char *gname, int *iname, u_int *namelenp,
char *cname, size_t *csz, struct sysctlnode **rnode)
#ifdef _REENTRANT
{
int rc;
mutex_lock(&sysctl_mutex);
rc = sysctlnametomib_unlocked(gname, iname, namelenp, cname, csz,
rnode);
rc = sysctlgetmibinfo_unlocked(gname, iname, namelenp, cname, csz,
rnode);
mutex_unlock(&sysctl_mutex);
return (rc);
}
static int
sysctlnametomib_unlocked(const char *gname, int *iname, u_int *namelenp,
char *cname, size_t *csz, struct sysctlnode **rnode)
sysctlgetmibinfo_unlocked(const char *gname, int *iname, u_int *namelenp,
char *cname, size_t *csz, struct sysctlnode **rnode)
#endif /* _REENTRANT */
{
struct sysctlnode *pnode, *node;