xnu-7195.101.1.tar.gz

[apple/xnu.git] / bsd / dev / i386 / stubs.c

diff --git a/bsd/dev/i386/stubs.c b/bsd/dev/i386/stubs.c
index 5a15de0ea898594f32581f2ff15328e4d6b06f78..aeb74b11f6beed925a5984fc318baf851325ad77 100644 (file)
--- a/bsd/dev/i386/stubs.c
+++ b/bsd/dev/i386/stubs.c
@@ -1,23 +1,29 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ *
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ *
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * Copyright (c) 1997 by Apple Computer, Inc., all rights reserved
  */
 /*
  * Copyright (c) 1997 by Apple Computer, Inc., all rights reserved


@@ -37,14 +43,9 @@
 #include <kern/task.h>
 #include <kern/thread.h>
 #include <vm/vm_map.h>
 #include <kern/task.h>
 #include <kern/thread.h>
 #include <vm/vm_map.h>

+#include <machine/machine_routines.h>

 
 

-/* XXX should be elsewhere (cpeak) */
-extern int     set_bsduthreadargs(thread_t, void *, void *);
-extern void    *get_bsduthreadarg(thread_t);
-extern int     *get_bsduthreadrval(thread_t);
-extern int     *get_bsduthreadlowpridelay(thread_t);
-
-/* 
+/*

  * copy a null terminated string from the kernel address space into
  * the user address space.
  *   - if the user is denied write access, return EFAULT.
  * copy a null terminated string from the kernel address space into
  * the user address space.
  *   - if the user is denied write access, return EFAULT.


@@ -57,25 +58,27 @@ extern int  *get_bsduthreadlowpridelay(thread_t);
 int
 copyoutstr(const void *from, user_addr_t to, size_t maxlen, size_t *lencopied)
 {
 int
 copyoutstr(const void *from, user_addr_t to, size_t maxlen, size_t *lencopied)
 {

-       size_t  slen;
-       size_t  len;
-       int     error = 0;
+       size_t  slen;
+       size_t  len;
+       int     error = 0;

 
        slen = strlen(from) + 1;
 
        slen = strlen(from) + 1;

-       if (slen > maxlen)
+       if (slen > maxlen) {

                error = ENAMETOOLONG;
                error = ENAMETOOLONG;

+       }

 
 

-       len = min(maxlen,slen);
-       if (copyout(from, to, len))
+       len = min(maxlen, slen);
+       if (copyout(from, to, len)) {

                error = EFAULT;
                error = EFAULT;

+       }

        *lencopied = len;
 
        return error;
 }
 
 
        *lencopied = len;
 
        return error;
 }
 
 

-/* 
- * copy a null terminated string from one point to another in 
+/*
+ * copy a null terminated string from one point to another in

  * the kernel address space.
  *   - no access checks are performed.
  *   - if the end of string isn't found before
  * the kernel address space.
  *   - no access checks are performed.
  *   - if the end of string isn't found before


@@ -88,79 +91,27 @@ copyoutstr(const void *from, user_addr_t to, size_t maxlen, size_t *lencopied)
 int
 copystr(const void *vfrom, void *vto, size_t maxlen, size_t *lencopied)
 {
 int
 copystr(const void *vfrom, void *vto, size_t maxlen, size_t *lencopied)
 {

-       size_t          l;
-       char const      *from = (char const *) vfrom;
-       char            *to = (char *) vto;
+       size_t          l;
+       char const      *from = (char const *) vfrom;
+       char            *to = (char *) vto;

 
        for (l = 0; l < maxlen; l++) {
                if ((*to++ = *from++) == '\0') {
 
        for (l = 0; l < maxlen; l++) {
                if ((*to++ = *from++) == '\0') {

-                       if (lencopied)
+                       if (lencopied) {

                                *lencopied = l + 1;
                                *lencopied = l + 1;

+                       }

                        return 0;
                }
        }
                        return 0;
                }
        }

-       if (lencopied)
+       if (lencopied) {

                *lencopied = maxlen;
                *lencopied = maxlen;

+       }

        return ENAMETOOLONG;
 }
 
 int
 copywithin(void *src, void *dst, size_t count)
 {
        return ENAMETOOLONG;
 }
 
 int
 copywithin(void *src, void *dst, size_t count)
 {

-       bcopy(src,dst,count);
+       bcopy(src, dst, count);

        return 0;
 }
        return 0;
 }

-
-int
-set_bsduthreadargs(thread_t th, void * pcb, __unused void *ignored_arg)
-{
-       struct uthread * ut;
-       struct proc *p = current_proc();
-
-       ut = get_bsdthread_info(th);
-       ut->uu_ar0 = (int *)pcb;
-
-       /*
-        * Delayed binding of thread credential to process credential.
-        *
-        * XXX This doesn't really belong here, but the i386 code has a
-        * XXX number of seemingly gratuitous structural differences that
-        * XXX make this the most appropriate place to do the work.
-        */
-       if (ut->uu_ucred != p->p_ucred &&
-           (ut->uu_flag & UT_SETUID) == 0) {
-               kauth_cred_t old = ut->uu_ucred;
-               proc_lock(p);
-               ut->uu_ucred = p->p_ucred;
-               kauth_cred_ref(ut->uu_ucred);
-               proc_unlock(p);
-               if (old != NOCRED)
-                       kauth_cred_rele(old);
-       }
-
-       return(1);
-}
-
-void *
-get_bsduthreadarg(thread_t th)
-{
-struct uthread *ut;
-       ut = get_bsdthread_info(th);
-       return((void *)(ut->uu_arg));
-}
-
-int *
-get_bsduthreadrval(thread_t th)
-{
-struct uthread *ut;
-       ut = get_bsdthread_info(th);
-       return(&ut->uu_rval[0]);
-}
-
-int *
-get_bsduthreadlowpridelay(thread_t th)
-{
-struct uthread *ut;
-       ut = get_bsdthread_info(th);
-       return(&ut->uu_lowpri_delay);
-}