xnu-3789.21.4.tar.gz

[apple/xnu.git] / osfmk / libsa / string.h

diff --git a/osfmk/libsa/string.h b/osfmk/libsa/string.h
index e6a0baf637852b29c98fa75d4e0352eba242144d..731cd76539e2c497924be61c0e52791d5ff0a111 100644 (file)
--- a/osfmk/libsa/string.h
+++ b/osfmk/libsa/string.h
@@ -1,16 +1,19 @@
 /*
 /*

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

  *
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @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
  * 
  * 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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER


@@ -20,45 +23,20 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  */
 /*

- * @OSF_COPYRIGHT@
+ * NOTICE: This file was modified by McAfee Research in 2004 to introduce
+ * support for mandatory and extensible security protections.  This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.

  */
 /*
  */
 /*

- * HISTORY
- * 
- * Revision 1.1.1.1  1998/09/22 21:05:51  wsanchez
- * Import of Mac OS X kernel (~semeria)
- *
- * Revision 1.1.1.1  1998/03/07 02:25:35  wsanchez
- * Import of OSF Mach kernel (~mburg)
- *
- * Revision 1.1.4.1  1997/02/21  15:43:21  barbou
- *     Removed "size_t" definition, include "types.h" instead.
- *     [1997/02/21  15:36:54  barbou]
- *
- * Revision 1.1.2.4  1996/10/10  14:13:33  emcmanus
- *     Added memmove() prototype.
- *     [1996/10/10  14:11:51  emcmanus]
- * 
- * Revision 1.1.2.3  1996/10/07  07:20:26  paire
- *     Added strncat() prototype, since it is defined in libsa_mach.
- *     [96/10/07            paire]
- * 
- * Revision 1.1.2.2  1996/10/04  11:36:07  emcmanus
- *     Added strspn() prototype, since it is defined in libsa_mach.
- *     [1996/10/04  11:31:57  emcmanus]
- * 
- * Revision 1.1.2.1  1996/09/17  16:56:15  bruel
- *     created for standalone mach servers.
- *     [96/09/17            bruel]
- * 
- * $EndLog$
+   * HISTORY
+ * @OSF_COPYRIGHT@

  */
  */

-
-#ifndef        _MACH_STRING_H_
-#define        _MACH_STRING_H_ 1
+#ifndef        _STRING_H_
+#define        _STRING_H_      1

 
 #ifdef MACH_KERNEL_PRIVATE
 #include <types.h>
 
 #ifdef MACH_KERNEL_PRIVATE
 #include <types.h>


@@ -71,25 +49,49 @@ extern "C" {
 #endif
 
 #ifndef        NULL
 #endif
 
 #ifndef        NULL

-#define NULL   0
+#if defined (__cplusplus)
+#define NULL 0
+#else
+#define NULL ((void *)0)
+#endif

 #endif
 
 extern void    *memcpy(void *, const void *, size_t);
 #endif
 
 extern void    *memcpy(void *, const void *, size_t);

+extern int     memcmp(const void *, const void *, size_t);

 extern void    *memmove(void *, const void *, size_t);
 extern void    *memset(void *, int, size_t);
 
 extern size_t  strlen(const char *);
 extern void    *memmove(void *, const void *, size_t);
 extern void    *memset(void *, int, size_t);
 
 extern size_t  strlen(const char *);

-extern char    *strcpy(char *, const char *);
+extern size_t  strnlen(const char *, size_t);
+
+/* strcpy() is being deprecated. Please use strlcpy() instead. */
+extern char    *strcpy(char *, const char *) __deprecated;

 extern char    *strncpy(char *, const char *, size_t);
 extern char    *strncpy(char *, const char *, size_t);

-extern char    *strcat(char *, const char *);
+
+extern size_t  strlcat(char *, const char *, size_t);
+extern size_t  strlcpy(char *, const char *, size_t);
+
+/* strcat() is being deprecated. Please use strlcat() instead. */
+extern char    *strcat(char *, const char *) __deprecated;

 extern char    *strncat(char *, const char *, size_t);
 extern char    *strncat(char *, const char *, size_t);

+
+/* strcmp() is being deprecated. Please use strncmp() instead. */

 extern int     strcmp(const char *, const char *);
 extern int     strncmp(const char *,const char *, size_t);
 extern int     strcmp(const char *, const char *);
 extern int     strncmp(const char *,const char *, size_t);

+
+extern int     strcasecmp(const char *s1, const char *s2);
+extern int     strncasecmp(const char *s1, const char *s2, size_t n);
+extern char    *strnstr(char *s, const char *find, size_t slen);

 extern char    *strchr(const char *s, int c);
 extern char    *strchr(const char *s, int c);

-extern size_t  strspn(const char *, const char *);
+extern char    *STRDUP(const char *, int);
+extern int     strprefix(const char *s1, const char *s2);
+
+extern int     bcmp(const void *, const void *, size_t);
+extern void    bcopy(const void *, void *, size_t);
+extern void    bzero(void *, size_t);

 
 #ifdef __cplusplus
 }
 #endif
 
 
 #ifdef __cplusplus
 }
 #endif
 

-#endif /* _MACH_STRING_H_ */
+#endif /* _STRING_H_ */