svn commit: r267465 - in stable/10: include include/xlocale lib/libc/string sys/sys
Pedro F. Giffuni
pfg at FreeBSD.org
Sat Jun 14 02:57:42 UTC 2014
Author: pfg
Date: Sat Jun 14 02:57:40 2014
New Revision: 267465
URL: http://svnweb.freebsd.org/changeset/base/267465
Log:
MFC r266865;
Fix strcasecmp_l() and strncasecmp_l() POSIX 2008 compliance.
POSIX.1-2008 specifies that those two functions should be declared by
including <strings.h>, not <string.h> (the latter only has strcoll_l()
and strxfrm_l()):
http://pubs.opengroup.org/onlinepubs/9699919799/functions/strcasecmp.html
Bump __FreeBSD_version for ports that may be using the non-standard
reference.
Obtained from: DragonFlyBSD
Reviewed by: theraven
Added:
stable/10/include/xlocale/_strings.h
- copied unchanged from r266865, head/include/xlocale/_strings.h
Modified:
stable/10/include/strings.h
stable/10/include/xlocale/Makefile
stable/10/include/xlocale/_string.h
stable/10/lib/libc/string/strcasecmp.3
stable/10/sys/sys/param.h
Modified: stable/10/include/strings.h
==============================================================================
--- stable/10/include/strings.h Sat Jun 14 01:58:33 2014 (r267464)
+++ stable/10/include/strings.h Sat Jun 14 02:57:40 2014 (r267465)
@@ -59,6 +59,10 @@ char *rindex(const char *, int) __pure;
#endif
int strcasecmp(const char *, const char *) __pure;
int strncasecmp(const char *, const char *, size_t) __pure;
+
+#if __POSIX_VISIBLE >= 200809 || defined(_XLOCALE_H_)
+#include <xlocale/_strings.h>
+#endif
__END_DECLS
#endif /* _STRINGS_H_ */
Modified: stable/10/include/xlocale/Makefile
==============================================================================
--- stable/10/include/xlocale/Makefile Sat Jun 14 01:58:33 2014 (r267464)
+++ stable/10/include/xlocale/Makefile Sat Jun 14 02:57:40 2014 (r267465)
@@ -2,7 +2,7 @@
NO_OBJ=
INCS= _ctype.h _inttypes.h _langinfo.h _locale.h _monetary.h _stdio.h\
- _stdlib.h _string.h _time.h _uchar.h _wchar.h
+ _stdlib.h _string.h _strings.h _time.h _uchar.h _wchar.h
INCSDIR=${INCLUDEDIR}/xlocale
.include <bsd.prog.mk>
Modified: stable/10/include/xlocale/_string.h
==============================================================================
--- stable/10/include/xlocale/_string.h Sat Jun 14 01:58:33 2014 (r267464)
+++ stable/10/include/xlocale/_string.h Sat Jun 14 02:57:40 2014 (r267465)
@@ -53,9 +53,7 @@ size_t strxfrm_l(char *, const char *,
#ifdef _XLOCALE_H_
#ifndef _XLOCALE_STRING2_H
#define _XLOCALE_STRING2_H
-int strcasecmp_l(const char *, const char *, locale_t);
char *strcasestr_l(const char *, const char *, locale_t);
-int strncasecmp_l(const char *, const char *, size_t, locale_t);
#endif /* _XLOCALE_STRING2_H */
#endif /* _XLOCALE_H_ */
Copied: stable/10/include/xlocale/_strings.h (from r266865, head/include/xlocale/_strings.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/10/include/xlocale/_strings.h Sat Jun 14 02:57:40 2014 (r267465, copy of r266865, head/include/xlocale/_strings.h)
@@ -0,0 +1,48 @@
+/*-
+ * Copyright (c) 2011, 2012 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _LOCALE_T_DEFINED
+#define _LOCALE_T_DEFINED
+typedef struct _xlocale *locale_t;
+#endif
+
+/*
+ * This file is included from both strings.h and xlocale.h. We need to expose
+ * the declarations unconditionally if we are included from xlocale.h, but only
+ * if we are in POSIX2008 mode if included from string.h.
+ */
+
+#ifndef _XLOCALE_STRINGS1_H
+#define _XLOCALE_STRINGS1_H
+
+/*
+ * POSIX2008 functions
+ */
+int strcasecmp_l(const char *, const char *, locale_t);
+int strncasecmp_l(const char *, const char *, size_t, locale_t);
+#endif /* _XLOCALE_STRINGS1_H */
Modified: stable/10/lib/libc/string/strcasecmp.3
==============================================================================
--- stable/10/lib/libc/string/strcasecmp.3 Sat Jun 14 01:58:33 2014 (r267464)
+++ stable/10/lib/libc/string/strcasecmp.3 Sat Jun 14 02:57:40 2014 (r267465)
@@ -30,7 +30,7 @@
.\" @(#)strcasecmp.3 8.1 (Berkeley) 6/9/93
.\" $FreeBSD$
.\"
-.Dd June 9, 1993
+.Dd May 29, 2014
.Dt STRCASECMP 3
.Os
.Sh NAME
@@ -45,7 +45,7 @@
.Fn strcasecmp "const char *s1" "const char *s2"
.Ft int
.Fn strncasecmp "const char *s1" "const char *s2" "size_t len"
-.In string.h
+.In strings.h
.In xlocale.h
.Ft int
.Fn strcasecmp_l "const char *s1" "const char *s2" "locale_t loc"
Modified: stable/10/sys/sys/param.h
==============================================================================
--- stable/10/sys/sys/param.h Sat Jun 14 01:58:33 2014 (r267464)
+++ stable/10/sys/sys/param.h Sat Jun 14 02:57:40 2014 (r267465)
@@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1000709 /* Master, propagated to newvers */
+#define __FreeBSD_version 1000710 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
More information about the svn-src-all
mailing list