Libc-1439.100.3.tar.gz

[apple/libc.git] / gen / FreeBSD / sysctl.c

diff --git a/gen/FreeBSD/sysctl.c b/gen/FreeBSD/sysctl.c
index 7205820f6882a422b37593f3b500d2e723e969c4..3cbe7488a3d8cb85c69c79392b01beb5508fade0 100644 (file)
--- a/gen/FreeBSD/sysctl.c
+++ b/gen/FreeBSD/sysctl.c
@@ -43,15 +43,12 @@ __FBSDID("$FreeBSD: src/lib/libc/gen/sysctl.c,v 1.6 2007/01/09 00:27:55 imp Exp
 #include <unistd.h>
 #include <string.h>
 
-extern int __sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp,
-    void *newp, size_t newlen);
+#include "sysctl_internal.h"
+
 
 int
-sysctl(name, namelen, oldp, oldlenp, newp, newlen)
-       int *name;
-       u_int namelen;
-       void *oldp, *newp;
-       size_t *oldlenp, newlen;
+sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, size_t newlen)
+__attribute__((disable_tail_calls))
 {
        if (name[0] != CTL_USER) {
                if (namelen == 2 && name[0] == CTL_KERN && name[1] == KERN_EXEC) {
@@ -79,7 +76,15 @@ sysctl(name, namelen, oldp, oldlenp, newp, newlen)
                        *oldlenp = 2;
                        return 0;
                }
-               return (__sysctl(name, namelen, oldp, oldlenp, newp, newlen));
+
+
+               int error = __sysctl(name, namelen, oldp, oldlenp, newp, newlen);
+               if (error < 0) {
+                       return error;
+               }
+
+
+               return error;
        }
 
        if (newp != NULL) {