Merge "Be more intention-revealing with libcutils' strlcpy." (4c1d4a0e) · Commits · e / os / android_system_core

include/cutils/memory.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ void android_memset16(uint16_t* dst, uint16_t value, size_t size);
		/* size is given in bytes and must be multiple of 4 */
		void android_memset32(uint32_t* dst, uint32_t value, size_t size);

		#if !HAVE_STRLCPY
		#if defined(__GLIBC__) \|\| defined(_WIN32)
		/* Declaration of strlcpy() for platforms that don't already have it. */
		size_t strlcpy(char dst, const char src, size_t size);
		#endif

+1 −1

+7 −19

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2007 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include <cutils/memory.h>

		#if !HAVE_STRLCPY
		/*
		* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
		*
		@@ -33,9 +14,15 @@
		* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
		*/

		#include <features.h>

		#if defined(__GLIBC__) \|\| defined(_WIN32)

		#include <sys/types.h>
		#include <string.h>

		#include <cutils/memory.h>

		/* Implementation of strlcpy() for platforms that don't already have it. */

		/*
		@@ -68,4 +55,5 @@ strlcpy(char dst, const char src, size_t siz)

		return(s - src - 1); /* count does not include NUL */
		}

		#endif