From owner-p4-projects@FreeBSD.ORG  Tue Oct  5 23:22:26 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4FEC716A4D0; Tue,  5 Oct 2004 23:22:26 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2A82A16A4CE
	for <perforce@freebsd.org>; Tue,  5 Oct 2004 23:22:26 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1E99B43D1D
	for <perforce@freebsd.org>; Tue,  5 Oct 2004 23:22:26 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i95NMQkY087181
	for <perforce@freebsd.org>; Tue, 5 Oct 2004 23:22:26 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i95NMP5p087178
	for perforce@freebsd.org; Tue, 5 Oct 2004 23:22:25 GMT
	(envelope-from peter@freebsd.org)
Date: Tue, 5 Oct 2004 23:22:25 GMT
Message-Id: <200410052322.i95NMP5p087178@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 62719 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Oct 2004 23:22:26 -0000

http://perforce.freebsd.org/chv.cgi?CH=62719

Change 62719 by peter@peter_daintree on 2004/10/05 23:21:54

	hack hack. begin CTLTYPE_LONG translation WIP.

Affected files ...

.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#16 edit

Differences ...

==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#16 (text+ko) ====

@@ -1198,18 +1198,32 @@
 int
 freebsd32_sysctl(struct thread *td, struct freebsd32_sysctl_args *uap)
 {
-	int error, name[CTL_MAXNAME];
+	int error, name[CTL_MAXNAME + 2];
+	u_char buf[256];
 	size_t j, oldlen;
 
 	if (uap->namelen > CTL_MAXNAME || uap->namelen < 2)
 		return (EINVAL);
 
- 	error = copyin(uap->name, &name, uap->namelen * sizeof(int));
+	name[0] = 0;	/* Internal sysctl function */
+	name[1] = 4;	/* This is magic */
+ 	error = copyin(uap->name, &name[2], uap->namelen * sizeof(int));
  	if (error)
 		return (error);
 
 	mtx_lock(&Giant);
 
+	j = sizeof(buf);
+	error = kernel_sysctl(td, name, uap->namelen + 2, buf, &j, 0, 0, &j);
+	if (error == 0 && j >= sizeof(u_int)) {
+		int kind = *(u_int *)buf;
+		if ((kind & CTLTYPE) == CTLTYPE_LONG ||
+		    (kind & CTLTYPE) == CTLTYPE_ULONG) {
+			printf("sysctl LONG!\n");
+			/* do conversion */
+		}
+	}
+
 	if (uap->oldlenp)
 		oldlen = fuword32(uap->oldlenp);
 	else