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 24016f421bc247c5ec5b958ce1d4c23505fa617d..731cd76539e2c497924be61c0e52791d5ff0a111 100644 (file)
--- a/osfmk/libsa/string.h
+++ b/osfmk/libsa/string.h
@@ -1,14 +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@
+ * @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. 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
@@ -18,9 +23,16 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * 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
  * @OSF_COPYRIGHT@
  */
 #ifndef        _STRING_H_
@@ -37,7 +49,11 @@ extern "C" {
 #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);
@@ -46,15 +62,29 @@ 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    *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);
+
+/* 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     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    *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);