xnu-6153.61.1.tar.gz

[apple/xnu.git] / bsd / sys / exec.h

diff --git a/bsd/sys/exec.h b/bsd/sys/exec.h
index 5d4fb571edd5a7ab0560e1bc773a233319dd46a8..d3138193a102ee7cff1ff7fdbdba1f88a9e3f070 100644 (file)
--- a/bsd/sys/exec.h
+++ b/bsd/sys/exec.h
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000-2002 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) 1995 NeXT Computer, Inc. All Rights Reserved */
 /*-
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
 /*-


@@ -60,43 +66,17 @@
  *     @(#)exec.h      8.3 (Berkeley) 1/21/94
  */
 
  *     @(#)exec.h      8.3 (Berkeley) 1/21/94
  */
 

-#ifndef        _SYS_EXEC_H_
-#define        _SYS_EXEC_H_
+#ifndef _SYS_EXEC_H_
+#define _SYS_EXEC_H_

 
 #include <sys/appleapiopts.h>
 
 
 #include <sys/appleapiopts.h>
 

-#ifdef  __APPLE_API_OBSOLETE

 /*
 /*

- * The following structure is found at the top of the user stack of each
- * user process. The ps program uses it to locate argv and environment
- * strings. Programs that wish ps to display other information may modify
- * it; normally ps_argvstr points to the text for argv[0], and ps_nargvstr
- * is the same as the program's argc. The fields ps_envstr and ps_nenvstr
- * are the equivalent for the environment.
+ * XXX at this point, this file only exists for backward compatability with
+ * XXX software which includes <sys/exec.h> instead of the more correct
+ * XXX <machine/exec.h> and/or need the inclusion of <sys/appleapiopts.h>
+ * XXX as a side effect.

  */
  */

-struct ps_strings {
-       char    *ps_argvstr;    /* first of 0 or more argument strings */
-       int     ps_nargvstr;    /* the number of argument strings */
-       char    *ps_envstr;     /* first of 0 or more environment strings */
-       int     ps_nenvstr;     /* the number of environment strings */
-};
-
-#endif /* __APPLE_API_OBSOLETE */
-

 #include <machine/exec.h>
 
 #include <machine/exec.h>
 

-#ifdef KERNEL
-#ifdef __APPLE_API_PRIVATE
-/*
- * Arguments to the exec system call.
- */
-struct execve_args {
-       char    *fname;
-       char    **argp;
-       char    **envp;
-};
-#endif /*__APPLE_API_PRIVATE */
-#endif /* KERNEL */
-

 #endif /* !_SYS_EXEC_H_ */
 #endif /* !_SYS_EXEC_H_ */

-