From f8b3a920a895a53b207017249080087d562bd0d2 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 10 Aug 2012 11:39:58 -0700 Subject: Revert "Revert "Switch to NetBSD's strxfrm(3)."" This reverts commit 8793e7c7d21a0434d1b5e63364c88b2b125a3d29, and fixes the build by building upstream NetBSD source as a separate library that's then swallowed whole into libc_common. Change-Id: I6c9317d8c48b5ccaf85a7b185bc07fb31176ff97 --- libc/string/strxfrm.c | 47 ----------------------------------------------- 1 file changed, 47 deletions(-) delete mode 100755 libc/string/strxfrm.c (limited to 'libc/string/strxfrm.c') diff --git a/libc/string/strxfrm.c b/libc/string/strxfrm.c deleted file mode 100755 index 3c4d707..0000000 --- a/libc/string/strxfrm.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2009 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * 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 COPYRIGHT HOLDERS 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 - * COPYRIGHT OWNER 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. - */ -#include - -/* - * Transform string s2 to string s1 using the current locale so that - * strcmp of transformed strings yields the same result as strcoll. - * Since Bionic really does not support locales, we assume we always use - * the C locale. - * - * This function is provided to make libstdc++-v3 usable. - */ -size_t -strxfrm(char *s1, const char *s2, size_t n) -{ - size_t len = strlen(s2) + 1; - - if (len < n) - n = len; - memcpy(s1, s2, n); - return len; -} -- cgit v1.1